forked from AkkomaGang/akkoma
Redirect to frontend on html notice path.
This commit is contained in:
parent
c6aa60c829
commit
80705c7a20
2 changed files with 9 additions and 4 deletions
lib/pleroma/web
|
@ -47,7 +47,10 @@ def object(conn, %{"uuid" => uuid}) do
|
|||
with id <- o_status_url(conn, :object, uuid),
|
||||
%Activity{} = activity <- Activity.get_create_activity_by_object_ap_id(id),
|
||||
%User{} = user <- User.get_cached_by_ap_id(activity.data["actor"]) do
|
||||
represent_activity(conn, activity, user)
|
||||
case get_format(conn) do
|
||||
"html" -> redirect(conn, to: "/notice/#{activity.id}")
|
||||
_ -> represent_activity(conn, activity, user)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -55,7 +58,10 @@ def activity(conn, %{"uuid" => uuid}) do
|
|||
with id <- o_status_url(conn, :activity, uuid),
|
||||
%Activity{} = activity <- Activity.get_by_ap_id(id),
|
||||
%User{} = user <- User.get_cached_by_ap_id(activity.data["actor"]) do
|
||||
represent_activity(conn, activity, user)
|
||||
case get_format(conn) do
|
||||
"html" -> redirect(conn, to: "/notice/#{activity.id}")
|
||||
_ -> represent_activity(conn, activity, user)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -70,7 +70,7 @@ def user_fetcher(username) do
|
|||
end
|
||||
|
||||
pipeline :ostatus do
|
||||
plug :accepts, ["xml", "atom"]
|
||||
plug :accepts, ["xml", "atom", "html"]
|
||||
end
|
||||
|
||||
scope "/", Pleroma.Web do
|
||||
|
@ -97,7 +97,6 @@ def user_fetcher(username) do
|
|||
scope "/", Fallback do
|
||||
get "/*path", RedirectController, :redirector
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
defmodule Fallback.RedirectController do
|
||||
|
|
Loading…
Reference in a new issue