From d62d12262ddc3013593a4dab168bcad931703847 Mon Sep 17 00:00:00 2001
From: Shadowfacts <me@shadowfacts.net>
Date: Wed, 15 Sep 2021 10:38:46 -0400
Subject: [PATCH] Fix current page changing when marking items as read

---
 lib/frenzy_web/templates/feed/show.html.eex  | 4 ++--
 lib/frenzy_web/templates/group/read.html.eex | 4 ++--
 lib/frenzy_web/views/feed_view.ex            | 1 +
 lib/frenzy_web/views/group_view.ex           | 1 +
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/frenzy_web/templates/feed/show.html.eex b/lib/frenzy_web/templates/feed/show.html.eex
index 18e01d5..c351206 100644
--- a/lib/frenzy_web/templates/feed/show.html.eex
+++ b/lib/frenzy_web/templates/feed/show.html.eex
@@ -41,12 +41,12 @@
         <td class="py-0 align-middle">
           <%= if item.read do %>
             <%= form_tag Routes.item_path(@conn, :unread, item.id), method: :post do %>
-              <input type="hidden" name="redirect" value="<%=Routes.feed_path(@conn, :show, @feed.id) %>">
+              <input type="hidden" name="redirect" value="<%= current_path(@conn) %>">
               <%= submit "Unread", class: "btn btn-sm btn-secondary" %>
             <% end %>
           <% else %>
             <%= form_tag Routes.item_path(@conn, :read, item.id), method: :post do %>
-              <input type="hidden" name="redirect" value="<%=Routes.feed_path(@conn, :show, @feed.id) %>">
+              <input type="hidden" name="redirect" value="<%= current_path(@conn) %>">
               <%= submit "Read", class: "btn btn-sm btn-secondary" %>
             <% end %>
           <% end %>
diff --git a/lib/frenzy_web/templates/group/read.html.eex b/lib/frenzy_web/templates/group/read.html.eex
index 6b1a834..4b5bb97 100644
--- a/lib/frenzy_web/templates/group/read.html.eex
+++ b/lib/frenzy_web/templates/group/read.html.eex
@@ -32,12 +32,12 @@
         <td class="py-0 align-middle">
           <%= if item.read do %>
             <%= form_tag Routes.item_path(@conn, :unread, item.id), method: :post do %>
-              <input type="hidden" name="redirect" value="<%=Routes.group_path(@conn, :read, @group.id) %>">
+              <input type="hidden" name="redirect" value="<%= current_path(@conn) %>">
               <%= submit "Unread", class: "btn btn-sm btn-secondary" %>
             <% end %>
           <% else %>
             <%= form_tag Routes.item_path(@conn, :read, item.id), method: :post do %>
-              <input type="hidden" name="redirect" value="<%=Routes.group_path(@conn, :read, @group.id) %>">
+              <input type="hidden" name="redirect" value="<%= current_path(@conn) %>">
               <%= submit "Read", class: "btn btn-sm btn-secondary" %>
             <% end %>
           <% end %>
diff --git a/lib/frenzy_web/views/feed_view.ex b/lib/frenzy_web/views/feed_view.ex
index 71e6dbe..c6ee277 100644
--- a/lib/frenzy_web/views/feed_view.ex
+++ b/lib/frenzy_web/views/feed_view.ex
@@ -1,6 +1,7 @@
 defmodule FrenzyWeb.FeedView do
   use FrenzyWeb, :view
   alias Frenzy.Feed
+  import Phoenix.Controller, only: [current_path: 1]
 
   @spec feed_site_url(feed :: Feed.t()) :: String.t()
   def feed_site_url(%Feed{site_url: site_url}) when is_binary(site_url) do
diff --git a/lib/frenzy_web/views/group_view.ex b/lib/frenzy_web/views/group_view.ex
index 539cc26..4c172a1 100644
--- a/lib/frenzy_web/views/group_view.ex
+++ b/lib/frenzy_web/views/group_view.ex
@@ -1,5 +1,6 @@
 defmodule FrenzyWeb.GroupView do
   use FrenzyWeb, :view
+  import Phoenix.Controller, only: [current_path: 1]
 
   def title(:index, _) do
     "Groups"