diff options
| author | Haelwenn (lanodan) Monnier <contact@hacktivis.me> | 2021-02-03 17:53:09 +0100 |
|---|---|---|
| committer | Haelwenn (lanodan) Monnier <contact@hacktivis.me> | 2021-02-04 15:17:40 +0100 |
| commit | ecff02741817e5622da58365855dce09c789ca83 (patch) | |
| tree | 97cd0a0bcb9651c1232d3289423e97ac61db914b /lib | |
| parent | fd2477dfba1f167c7519a029bedd7ae6884a9f1d (diff) | |
| download | pleroma-ecff02741817e5622da58365855dce09c789ca83.tar.gz pleroma-ecff02741817e5622da58365855dce09c789ca83.zip | |
Redirect non-local activities when /notice/:id is used
Related-to: https://git.pleroma.social/pleroma/pleroma/-/issues/2496
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/o_status/o_status_controller.ex | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/lib/pleroma/web/o_status/o_status_controller.ex b/lib/pleroma/web/o_status/o_status_controller.ex index 450aae042..da3264149 100644 --- a/lib/pleroma/web/o_status/o_status_controller.ex +++ b/lib/pleroma/web/o_status/o_status_controller.ex @@ -73,12 +73,8 @@ defmodule Pleroma.Web.OStatus.OStatusController do %User{} = user <- User.get_cached_by_ap_id(activity.data["actor"]) do cond do format in ["json", "activity+json"] -> - if activity.local do - %{data: %{"id" => redirect_url}} = Object.normalize(activity, fetch: false) - redirect(conn, external: redirect_url) - else - {:error, :not_found} - end + %{data: %{"id" => redirect_url}} = Object.normalize(activity, fetch: false) + redirect(conn, external: redirect_url) activity.data["type"] == "Create" -> %Object{} = object = Object.normalize(activity, fetch: false) |