diff options
author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2021-02-04 14:26:03 +0000 |
---|---|---|
committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2021-02-04 14:26:03 +0000 |
commit | ea5469961a537d12ca799bf7470e53cb636b1439 (patch) | |
tree | 46d0eec9d81ef1260c6b5702ee25a05524e24e6c /lib | |
parent | 49741961f234816c1fff278adca397e9ff7cabe7 (diff) | |
parent | ecff02741817e5622da58365855dce09c789ca83 (diff) |
Merge branch 'bugfix/notice-external-redirect' into 'develop'
Redirect non-local activities when /notice/:id is used
See merge request pleroma/pleroma!3300
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) |