Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'static-remote-redirect' into 'develop'

Browse Source 
For remote notices, redirect to the original instead of 404 in static-fe

See merge request pleroma/pleroma!1974
This commit is contained in:
lain 2019-11-13 10:16:00 +00:00
commit facc37aaa6
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/pleroma/web/static_fe/static_fe_controller.ex
View File

@ -77,6 +77,11 @@ defmodule Pleroma.Web.StaticFE.StaticFEController do
render(conn, "conversation.html", %{activities: timeline, meta: meta}) render(conn, "conversation.html", %{activities: timeline, meta: meta})
else else
%Activity{object: %Object{data: data}} ->
conn
|> put_status(:found)
|> redirect(external: data["url"] || data["external_url"] || data["id"])
_ -> _ ->
conn conn
|> put_status(404) |> put_status(404)

4
test/web/static_fe/static_fe_controller_test.exs
View File

@ -151,7 +151,7 @@ defmodule Pleroma.Web.StaticFE.StaticFEControllerTest do
assert html_response(conn, 404) =~ "not found" assert html_response(conn, 404) =~ "not found"
end end
test "404 for remote cached status", %{conn: conn} do test "302 for remote cached status", %{conn: conn} do
user = insert(:user) user = insert(:user)
message = %{ message = %{
@ -175,7 +175,7 @@ defmodule Pleroma.Web.StaticFE.StaticFEControllerTest do
|> put_req_header("accept", "text/html") |> put_req_header("accept", "text/html")
|> get("/notice/#{activity.id}") |> get("/notice/#{activity.id}")
assert html_response(conn, 404) =~ "not found" assert html_response(conn, 302) =~ "redirected"
end end
end end
end end