fix: handle when to display first year

believer · Nov 27, 2023 · 6537a48 · 6537a48
1 parent a04ec34
commit 6537a48
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/handlers/handlers.go b/handlers/handlers.go
@@ -32,8 +32,9 @@ func HandleFeed(c *fiber.Ctx) error {
 
 	if strings.Contains(c.Get("Accept"), "hyperview") {
 		template := "feed"
+		shouldUpdate := c.Query("refresh") == "true" || c.Query("reset") == "true"
 
-		if page != 1 || c.Query("refresh") == "true" {
+		if page != 1 || shouldUpdate {
 			template = "feed_pages"
 		}
 
@@ -44,7 +45,7 @@ func HandleFeed(c *fiber.Ctx) error {
 			"Page":          page + 1,
 			"CurrentYear":   time.Now().Year(),
 			"LastMovieYear": lastMovieYear,
-			"Refresh":       c.Query("refresh"),
+			"DisplayYear":   c.Query("reset") == "true" || page == 1,
 		})
 	}
 

diff --git a/views/feed.xml b/views/feed.xml
@@ -47,11 +47,6 @@
       <view style="Body" keyboard-dismiss-mode="interactive">
         {{ template "search" . }}
         <list style="movieList" id="movies" trigger="refresh" href="/?refresh=true" action="replace-inner" target="movie-items">
-          <item style="Year__Wrap">
-            <text style="Year">
-              {{ .CurrentYear }}
-            </text>
-          </item>
           {{ template "feed_pages" .}}
         </list>
         <view style="FAB">

diff --git a/views/feed_pages.xml b/views/feed_pages.xml
@@ -4,12 +4,12 @@
   {{ if .SearchQuery}}
   <item>
     <text style="Body__Text">
-      <behavior action="replace-inner" href="/?refresh=true" target="movie-items" />
+      <behavior action="replace-inner" href="/?reset=true" target="movie-items" />
       Search results for "{{ .SearchQuery }}". Click to reset.
     </text>
   </item>
   {{ end }}
-  {{ if .Refresh }}
+  {{ if .DisplayYear }}
   <item style="Year__Wrap">
     <text style="Year">
       {{ .CurrentYear }}