Move static FE routing into its own plug.
Previously it was piggybacking on FallbackRedirectController for users and OStatusController for notices; now it's all in one place.
This commit is contained in:
parent
c6c706161e
commit
dc3b87d153
4 changed files with 53 additions and 53 deletions
|
|
@ -14,7 +14,6 @@ defmodule Pleroma.Web.StaticFE.StaticFEController do
|
|||
plug(:put_layout, :static_fe)
|
||||
plug(:put_view, Pleroma.Web.StaticFE.StaticFEView)
|
||||
plug(:assign_id)
|
||||
action_fallback(:not_found)
|
||||
|
||||
defp get_title(%Object{data: %{"name" => name}}) when is_binary(name),
|
||||
do: name
|
||||
|
|
@ -34,14 +33,15 @@ defmodule Pleroma.Web.StaticFE.StaticFEController do
|
|||
}
|
||||
end
|
||||
|
||||
def represent(%Activity{} = activity), do: represent(activity, false)
|
||||
|
||||
def represent(%Activity{object: %Object{data: data}} = activity, selected) do
|
||||
{:ok, user} = User.get_or_fetch(activity.object.data["actor"])
|
||||
|
||||
link =
|
||||
if user.local do
|
||||
Helpers.o_status_url(Pleroma.Web.Endpoint, :notice, activity)
|
||||
else
|
||||
data["url"] || data["external_url"] || data["id"]
|
||||
case user.local do
|
||||
true -> Helpers.o_status_url(Pleroma.Web.Endpoint, :notice, activity)
|
||||
_ -> data["url"] || data["external_url"] || data["id"]
|
||||
end
|
||||
|
||||
%{
|
||||
|
|
@ -57,28 +57,27 @@ defmodule Pleroma.Web.StaticFE.StaticFEController do
|
|||
}
|
||||
end
|
||||
|
||||
def show_notice(%{assigns: %{notice_id: notice_id}} = conn, _params) do
|
||||
def show(%{assigns: %{notice_id: notice_id}} = conn, _params) do
|
||||
instance_name = Pleroma.Config.get([:instance, :name], "Pleroma")
|
||||
activity = Activity.get_by_id_with_object(notice_id)
|
||||
context = activity.object.data["context"]
|
||||
activities = ActivityPub.fetch_activities_for_context(context, %{})
|
||||
|
||||
represented =
|
||||
timeline =
|
||||
for a <- Enum.reverse(activities) do
|
||||
represent(a, a.object.id == activity.object.id)
|
||||
end
|
||||
|
||||
render(conn, "conversation.html", %{activities: represented, instance_name: instance_name})
|
||||
render(conn, "conversation.html", %{activities: timeline, instance_name: instance_name})
|
||||
end
|
||||
|
||||
def show_user(%{assigns: %{username_or_id: username_or_id}} = conn, _params) do
|
||||
def show(%{assigns: %{username_or_id: username_or_id}} = conn, _params) do
|
||||
instance_name = Pleroma.Config.get([:instance, :name], "Pleroma")
|
||||
%User{} = user = User.get_cached_by_nickname_or_id(username_or_id)
|
||||
|
||||
timeline =
|
||||
for activity <- ActivityPub.fetch_user_activities(user, nil, %{}) do
|
||||
represent(activity, false)
|
||||
end
|
||||
ActivityPub.fetch_user_activities(user, nil, %{})
|
||||
|> Enum.map(&represent/1)
|
||||
|
||||
render(conn, "profile.html", %{user: user, timeline: timeline, instance_name: instance_name})
|
||||
end
|
||||
|
|
@ -89,15 +88,5 @@ defmodule Pleroma.Web.StaticFE.StaticFEController do
|
|||
def assign_id(%{path_info: ["users", user_id]} = conn, _opts),
|
||||
do: assign(conn, :username_or_id, user_id)
|
||||
|
||||
def assign_id(%{path_info: [user_id]} = conn, _opts),
|
||||
do: assign(conn, :username_or_id, user_id)
|
||||
|
||||
def assign_id(conn, _opts), do: conn
|
||||
|
||||
# Fallback for unhandled types
|
||||
def not_found(conn, _opts) do
|
||||
conn
|
||||
|> put_status(404)
|
||||
|> text("Not found")
|
||||
end
|
||||
end
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue