fix selected fixme

Author: TheMightyGit

internal/rssole/endpoints.go

@@ -39,9 +39,10 @@ func feedlistCommon(w http.ResponseWriter, selected string, logger *slog.Logger)
 		}
 	}()
 
-	allFeeds.Selected = selected
-
-	if err := templates["feedlist.go.html"].Execute(w, allFeeds); err != nil {
+	if err := templates["feedlist.go.html"].Execute(w, map[string]any{
+		"Selected": selected,
+		"Feeds":    allFeeds,
+	}); err != nil {
 		logger.Error("feedlist.go.html", "error", err)
 	}
 }

internal/rssole/feeds.go

@@ -16,7 +16,6 @@ type feeds struct {
 	Config     ConfigSection `json:"config"`
 	Feeds      []*feed       `json:"feeds"`
 	UpdateTime time.Duration `json:"-"`
-	Selected   string        `json:"-"` // FIXME: Ugh! viewer state held here is bad as we coud have multiple simultaneous viewers.
 	mu         sync.RWMutex
 	filename   string
 }

internal/rssole/templates/feedlist.go.html

@@ -1,5 +1,5 @@
 <div hx-get="/feeds?{{if .Selected}}selected={{.Selected}}{{end}}" id="feeds" hx-trigger="every 30s" {{if .Selected}}hx-swap-oob="true"{{end}}>
-  {{range $category, $feeds := .FeedTree}}
+  {{range $category, $feeds := .Feeds.FeedTree}}
   <small><small>{{$category}}</small></small>
   <div class="list-group list-group-flush">
     {{range $feeds}}