sergiotarxz/Pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Redirect to frontend on html notice path.

Browse Source
This commit is contained in:
Roger Braun 2017-05-31 17:48:22 +02:00
parent c6aa60c829
commit 80705c7a20
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/pleroma/web/ostatus/ostatus_controller.ex
View File

@ -47,7 +47,10 @@ def object(conn, %{"uuid" => uuid}) do
with id <- o_status_url(conn, :object, uuid), with id <- o_status_url(conn, :object, uuid),
%Activity{} = activity <- Activity.get_create_activity_by_object_ap_id(id), %Activity{} = activity <- Activity.get_create_activity_by_object_ap_id(id),
%User{} = user <- User.get_cached_by_ap_id(activity.data["actor"]) do %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
end end
@ -55,7 +58,10 @@ def activity(conn, %{"uuid" => uuid}) do
with id <- o_status_url(conn, :activity, uuid), with id <- o_status_url(conn, :activity, uuid),
%Activity{} = activity <- Activity.get_by_ap_id(id), %Activity{} = activity <- Activity.get_by_ap_id(id),
%User{} = user <- User.get_cached_by_ap_id(activity.data["actor"]) do %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
end end

3
lib/pleroma/web/router.ex
View File

@ -70,7 +70,7 @@ def user_fetcher(username) do
end end
pipeline :ostatus do pipeline :ostatus do
plug :accepts, ["xml", "atom"] plug :accepts, ["xml", "atom", "html"]
end end
scope "/", Pleroma.Web do scope "/", Pleroma.Web do
@ -97,7 +97,6 @@ def user_fetcher(username) do
scope "/", Fallback do scope "/", Fallback do
get "/*path", RedirectController, :redirector get "/*path", RedirectController, :redirector
end end
end end
defmodule Fallback.RedirectController do defmodule Fallback.RedirectController do