PonyMirrors/philomena
1
0
Fork 0
mirror of https://github.com/philomena-dev/philomena.git synced 2024-11-27 13:47:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

format

Browse source
This commit is contained in:
byte[] 2021-02-09 17:24:41 -05:00
parent 702d096ecf
commit 62143a3910
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/philomena_web/controllers/image_controller.ex
View file

@ -134,10 +134,14 @@ defmodule PhilomenaWeb.ImageController do
end end
end end
defp maybe_skip_to_last_comment_page(conn, image, %{comments_newest_first: false, comments_always_jump_to_last: true}) do defp maybe_skip_to_last_comment_page(conn, image, %{
comments_newest_first: false,
comments_always_jump_to_last: true
}) do
page = CommentLoader.last_page(conn, image) page = CommentLoader.last_page(conn, image)
conn conn
|> assign(:comment_scrivener, Keyword.merge(conn.assigns.comment_scrivener, [page: page])) |> assign(:comment_scrivener, Keyword.merge(conn.assigns.comment_scrivener, page: page))
end end
defp maybe_skip_to_last_comment_page(conn, _image, _user), do: conn defp maybe_skip_to_last_comment_page(conn, _image, _user), do: conn

2
lib/philomena_web/router.ex
View file

@ -418,7 +418,7 @@ defmodule PhilomenaWeb.Router do
scope "/", PhilomenaWeb do scope "/", PhilomenaWeb do
pipe_through [:browser, :ensure_totp, :ensure_tor_authorized] pipe_through [:browser, :ensure_totp, :ensure_tor_authorized]
get "/", ActivityController, :index, [assigns: %{index: true}] get "/", ActivityController, :index, assigns: %{index: true}
resources "/activity", ActivityController, only: [:index] resources "/activity", ActivityController, only: [:index]