diff options
| author | r <r@freesoftwareextremist.com> | 2024-04-21 15:34:07 +0000 |
|---|---|---|
| committer | r <r@freesoftwareextremist.com> | 2024-04-21 15:34:07 +0000 |
| commit | ce1680dfd050990d8f3e484b92eb0db350bc3f2c (patch) | |
| tree | ac1d27517473410310f744498fa428fe2f7fec00 | |
| parent | df77ca02265aec9031871db0edf026d70156532e (diff) | |
| download | bloat-ce1680dfd050990d8f3e484b92eb0db350bc3f2c.tar.gz bloat-ce1680dfd050990d8f3e484b92eb0db350bc3f2c.zip | |
Make refresh button point to the first page on timeline
| -rw-r--r-- | renderer/model.go | 13 | ||||
| -rw-r--r-- | service/service.go | 18 | ||||
| -rw-r--r-- | templates/timeline.tmpl | 2 |
3 files changed, 19 insertions, 14 deletions
diff --git a/renderer/model.go b/renderer/model.go index 3862976..59e7cb9 100644 --- a/renderer/model.go +++ b/renderer/model.go @@ -54,12 +54,13 @@ type RootData struct { type TimelineData struct { *CommonData - Title string - Type string - Instance string - Statuses []*mastodon.Status - NextLink string - PrevLink string + Title string + Type string + Instance string + Statuses []*mastodon.Status + NextLink string + PrevLink string + RefreshLink string } type ListsData struct { diff --git a/service/service.go b/service/service.go index 4122f14..32912f6 100644 --- a/service/service.go +++ b/service/service.go @@ -131,6 +131,7 @@ func (s *service) TimelinePage(c *client, tType, instance, listId, maxID, MinID: minID, Limit: 20, } + var refreshLink = "/timeline/" + tType switch tType { default: @@ -159,6 +160,7 @@ func (s *service) TimelinePage(c *client, tType, instance, listId, maxID, if err != nil { return err } + refreshLink += "?instance=" + instance } title = "Remote Timeline" case "twkn": @@ -177,6 +179,7 @@ func (s *service) TimelinePage(c *client, tType, instance, listId, maxID, return err } title = "List Timeline - " + list.Title + refreshLink += "?list=" + listId } for i := range statuses { @@ -211,13 +214,14 @@ func (s *service) TimelinePage(c *client, tType, instance, listId, maxID, cdata := s.cdata(c, title, 0, 0, "") data := &renderer.TimelineData{ - Title: title, - Type: tType, - Instance: instance, - Statuses: statuses, - NextLink: nextLink, - PrevLink: prevLink, - CommonData: cdata, + Title: title, + Type: tType, + Instance: instance, + Statuses: statuses, + NextLink: nextLink, + PrevLink: prevLink, + RefreshLink: refreshLink, + CommonData: cdata, } return s.renderer.Render(c.rctx, c.w, renderer.TimelinePage, data) } diff --git a/templates/timeline.tmpl b/templates/timeline.tmpl index 8de6705..b3421ba 100644 --- a/templates/timeline.tmpl +++ b/templates/timeline.tmpl @@ -1,6 +1,6 @@ {{with .Data}} {{template "header.tmpl" (WithContext .CommonData $.Ctx)}} -<h1>{{.Title}} <a class="page-link" href="{{$.Ctx.Referrer}}" accesskey="T" title="Refresh (T)">refresh</a></h1> +<h1>{{.Title}} <a class="page-link" href="{{.RefreshLink}}" accesskey="T" title="Refresh (T)">refresh</a></h1> {{if eq .Type "remote"}} <form action="/timeline/remote" method="GET"> |