Fix OStatus controller to know about StaticFEController.
But only when it's configured to be on.
This commit is contained in:
parent
e79d8985ab
commit
0cf04e1088
1 changed files with 33 additions and 29 deletions
|
@ -76,37 +76,41 @@ def activity(%{assigns: %{format: format}} = conn, %{"uuid" => uuid}) do
|
|||
end
|
||||
|
||||
def notice(%{assigns: %{format: format}} = conn, %{"id" => id}) do
|
||||
with {_, %Activity{} = activity} <- {:activity, Activity.get_by_id_with_object(id)},
|
||||
{_, true} <- {:public?, Visibility.is_public?(activity)},
|
||||
%User{} = user <- User.get_cached_by_ap_id(activity.data["actor"]) do
|
||||
cond do
|
||||
format == "html" && activity.data["type"] == "Create" ->
|
||||
%Object{} = object = Object.normalize(activity)
|
||||
|
||||
RedirectController.redirector_with_meta(
|
||||
conn,
|
||||
%{
|
||||
activity_id: activity.id,
|
||||
object: object,
|
||||
url: Router.Helpers.o_status_url(Endpoint, :notice, activity.id),
|
||||
user: user
|
||||
}
|
||||
)
|
||||
|
||||
format == "html" ->
|
||||
RedirectController.redirector(conn, nil)
|
||||
|
||||
true ->
|
||||
represent_activity(conn, format, activity, user)
|
||||
end
|
||||
if Pleroma.Config.get([:instance, :static_fe], false) do
|
||||
Pleroma.Web.StaticFE.StaticFEController.show(conn, %{"notice_id" => id})
|
||||
else
|
||||
reason when reason in [{:public?, false}, {:activity, nil}] ->
|
||||
conn
|
||||
|> put_status(404)
|
||||
|> RedirectController.redirector(nil, 404)
|
||||
with {_, %Activity{} = activity} <- {:activity, Activity.get_by_id_with_object(id)},
|
||||
{_, true} <- {:public?, Visibility.is_public?(activity)},
|
||||
%User{} = user <- User.get_cached_by_ap_id(activity.data["actor"]) do
|
||||
cond do
|
||||
format == "html" && activity.data["type"] == "Create" ->
|
||||
%Object{} = object = Object.normalize(activity)
|
||||
|
||||
e ->
|
||||
e
|
||||
RedirectController.redirector_with_meta(
|
||||
conn,
|
||||
%{
|
||||
activity_id: activity.id,
|
||||
object: object,
|
||||
url: Router.Helpers.o_status_url(Endpoint, :notice, activity.id),
|
||||
user: user
|
||||
}
|
||||
)
|
||||
|
||||
format == "html" ->
|
||||
RedirectController.redirector(conn, nil)
|
||||
|
||||
true ->
|
||||
represent_activity(conn, format, activity, user)
|
||||
end
|
||||
else
|
||||
reason when reason in [{:public?, false}, {:activity, nil}] ->
|
||||
conn
|
||||
|> put_status(404)
|
||||
|> RedirectController.redirector(nil, 404)
|
||||
|
||||
e ->
|
||||
e
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in a new issue