diff options
| author | lain <lain@soykaf.club> | 2019-11-13 10:16:00 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-11-13 10:16:00 +0000 |
| commit | facc37aaa6db427ef4d6a1023247997d404bf976 (patch) | |
| tree | 112ef8776bafa40da4d700b803804db305dbde8f /lib | |
| parent | 1025c526c003460e62ddfff09ba65461feceb1f6 (diff) | |
| parent | 62f3a93049649dee0ccd7b883887be2fd343fb3e (diff) | |
| download | pleroma-facc37aaa6db427ef4d6a1023247997d404bf976.tar.gz pleroma-facc37aaa6db427ef4d6a1023247997d404bf976.zip | |
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
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/static_fe/static_fe_controller.ex | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/pleroma/web/static_fe/static_fe_controller.ex b/lib/pleroma/web/static_fe/static_fe_controller.ex index 5e60c82b0..ba44b8a4f 100644 --- a/lib/pleroma/web/static_fe/static_fe_controller.ex +++ b/lib/pleroma/web/static_fe/static_fe_controller.ex @@ -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) |