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

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

View file

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