hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'bugfix/notice-external-redirect' into 'develop'

Browse source 
Redirect non-local activities when /notice/:id is used

See merge request pleroma/pleroma!3300
This commit is contained in:
Haelwenn 2021-02-04 14:26:03 +00:00
commit ea5469961a
3 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/pleroma/web/o_status/o_status_controller.ex
View file

@ -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)