diff options
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | walrss/internal/db/db.go | 6 | ||||
| -rw-r--r-- | walrss/internal/http/edit.go | 4 | ||||
| -rw-r--r-- | walrss/internal/http/views/main.qtpl.html | 2 | ||||
| -rw-r--r-- | walrss/internal/http/views/main.qtpl.html.go | 4 |
5 files changed, 18 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 62cbf7a..0d88a36 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ## Unreleased +## 0.3.8 - 2025-01-18 +### Fixed +* Cached feed content and corresponding etags/last modified headers are now cleared when the URL of a feed entry is updated + ## 0.3.7 - 2023-04-08 ### Fixed * Remove potential race condition caused by using `RLock` instead of `Lock` diff --git a/walrss/internal/db/db.go b/walrss/internal/db/db.go index 604ef91..880644f 100644 --- a/walrss/internal/db/db.go +++ b/walrss/internal/db/db.go @@ -62,6 +62,12 @@ func (f *Feed) CacheWithLastModified(lastModified, content string) { f.CachedContent = content } +func (f *Feed) ClearCache() { + f.LastEtag = "" + f.LastModified = "" + f.CachedContent = "" +} + type FeedSlice []*Feed func (f FeedSlice) Len() int { diff --git a/walrss/internal/http/edit.go b/walrss/internal/http/edit.go index 657989a..f126710 100644 --- a/walrss/internal/http/edit.go +++ b/walrss/internal/http/edit.go @@ -107,6 +107,10 @@ func (s *Server) editFeedItem(ctx *fiber.Ctx) error { feed.Name = ctx.FormValue("name") feed.URL = ctx.FormValue("url") + if urlChanged := feed.URL != ctx.FormValue("old-url"); urlChanged { + feed.ClearCache() + } + if err := core.UpdateFeed(s.state, feed); err != nil { return err } diff --git a/walrss/internal/http/views/main.qtpl.html b/walrss/internal/http/views/main.qtpl.html index 191f8f7..a6b5843 100644 --- a/walrss/internal/http/views/main.qtpl.html +++ b/walrss/internal/http/views/main.qtpl.html @@ -186,7 +186,7 @@ name="url" id="feed-{%s= id %}-url" value="{%j url %}" - ></td> + ><input type="hidden" name="old-url" value="{%j url %}"></td> <td> <div class="btn-group btn-group-sm" role="group" aria-label="Basic example"> <button diff --git a/walrss/internal/http/views/main.qtpl.html.go b/walrss/internal/http/views/main.qtpl.html.go index e078f7d..f9c5dc0 100644 --- a/walrss/internal/http/views/main.qtpl.html.go +++ b/walrss/internal/http/views/main.qtpl.html.go @@ -298,7 +298,9 @@ func StreamRenderFeedEditRow(qw422016 *qt422016.Writer, id, name, url string) { value="`) qw422016.E().J(url) qw422016.N().S(`" - ></td> + ><input type="hidden" name="old-url" value="`) + qw422016.E().J(url) + qw422016.N().S(`"></td> <td> <div class="btn-group btn-group-sm" role="group" aria-label="Basic example"> <button |