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:
Phil Hagelberg 2019-11-01 19:47:18 -07:00
parent c6c706161e
commit dc3b87d153
4 changed files with 53 additions and 53 deletions

View File

@ -0,0 +1,14 @@
# Pleroma: A lightweight social networking server
# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Plugs.StaticFEPlug do
def init(options), do: options
def call(conn, _) do
case Pleroma.Config.get([:instance, :static_fe], false) do
true -> Pleroma.Web.StaticFE.StaticFEController.call(conn, :show)
_ -> conn
end
end
end

View File

@ -76,41 +76,37 @@ def activity(%{assigns: %{format: format}} = conn, %{"uuid" => uuid}) do
end end
def notice(%{assigns: %{format: format}} = conn, %{"id" => id}) do def notice(%{assigns: %{format: format}} = conn, %{"id" => id}) do
if Pleroma.Config.get([:instance, :static_fe], false) do with {_, %Activity{} = activity} <- {:activity, Activity.get_by_id_with_object(id)},
Pleroma.Web.StaticFE.StaticFEController.call(conn, :show_notice) {_, true} <- {:public?, Visibility.is_public?(activity)},
else %User{} = user <- User.get_cached_by_ap_id(activity.data["actor"]) do
with {_, %Activity{} = activity} <- {:activity, Activity.get_by_id_with_object(id)}, cond do
{_, true} <- {:public?, Visibility.is_public?(activity)}, format == "html" && activity.data["type"] == "Create" ->
%User{} = user <- User.get_cached_by_ap_id(activity.data["actor"]) do %Object{} = object = Object.normalize(activity)
cond do
format == "html" && activity.data["type"] == "Create" ->
%Object{} = object = Object.normalize(activity)
RedirectController.redirector_with_meta( RedirectController.redirector_with_meta(
conn, conn,
%{ %{
activity_id: activity.id, activity_id: activity.id,
object: object, object: object,
url: Router.Helpers.o_status_url(Endpoint, :notice, activity.id), url: Router.Helpers.o_status_url(Endpoint, :notice, activity.id),
user: user user: user
} }
) )
format == "html" -> format == "html" ->
RedirectController.redirector(conn, nil) RedirectController.redirector(conn, nil)
true -> true ->
represent_activity(conn, format, activity, user) 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
else
reason when reason in [{:public?, false}, {:activity, nil}] ->
conn
|> put_status(404)
|> RedirectController.redirector(nil, 404)
e ->
e
end end
end end

View File

@ -495,6 +495,7 @@ defmodule Pleroma.Web.Router do
pipeline :ostatus do pipeline :ostatus do
plug(:accepts, ["html", "xml", "atom", "activity+json", "json"]) plug(:accepts, ["html", "xml", "atom", "activity+json", "json"])
plug(Pleroma.Plugs.StaticFEPlug)
end end
pipeline :oembed do pipeline :oembed do

View File

@ -14,7 +14,6 @@ defmodule Pleroma.Web.StaticFE.StaticFEController do
plug(:put_layout, :static_fe) plug(:put_layout, :static_fe)
plug(:put_view, Pleroma.Web.StaticFE.StaticFEView) plug(:put_view, Pleroma.Web.StaticFE.StaticFEView)
plug(:assign_id) plug(:assign_id)
action_fallback(:not_found)
defp get_title(%Object{data: %{"name" => name}}) when is_binary(name), defp get_title(%Object{data: %{"name" => name}}) when is_binary(name),
do: name do: name
@ -34,14 +33,15 @@ def get_counts(%Activity{} = activity) do
} }
end end
def represent(%Activity{} = activity), do: represent(activity, false)
def represent(%Activity{object: %Object{data: data}} = activity, selected) do def represent(%Activity{object: %Object{data: data}} = activity, selected) do
{:ok, user} = User.get_or_fetch(activity.object.data["actor"]) {:ok, user} = User.get_or_fetch(activity.object.data["actor"])
link = link =
if user.local do case user.local do
Helpers.o_status_url(Pleroma.Web.Endpoint, :notice, activity) true -> Helpers.o_status_url(Pleroma.Web.Endpoint, :notice, activity)
else _ -> data["url"] || data["external_url"] || data["id"]
data["url"] || data["external_url"] || data["id"]
end end
%{ %{
@ -57,28 +57,27 @@ def represent(%Activity{object: %Object{data: data}} = activity, selected) do
} }
end 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") instance_name = Pleroma.Config.get([:instance, :name], "Pleroma")
activity = Activity.get_by_id_with_object(notice_id) activity = Activity.get_by_id_with_object(notice_id)
context = activity.object.data["context"] context = activity.object.data["context"]
activities = ActivityPub.fetch_activities_for_context(context, %{}) activities = ActivityPub.fetch_activities_for_context(context, %{})
represented = timeline =
for a <- Enum.reverse(activities) do for a <- Enum.reverse(activities) do
represent(a, a.object.id == activity.object.id) represent(a, a.object.id == activity.object.id)
end end
render(conn, "conversation.html", %{activities: represented, instance_name: instance_name}) render(conn, "conversation.html", %{activities: timeline, instance_name: instance_name})
end 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") instance_name = Pleroma.Config.get([:instance, :name], "Pleroma")
%User{} = user = User.get_cached_by_nickname_or_id(username_or_id) %User{} = user = User.get_cached_by_nickname_or_id(username_or_id)
timeline = timeline =
for activity <- ActivityPub.fetch_user_activities(user, nil, %{}) do ActivityPub.fetch_user_activities(user, nil, %{})
represent(activity, false) |> Enum.map(&represent/1)
end
render(conn, "profile.html", %{user: user, timeline: timeline, instance_name: instance_name}) render(conn, "profile.html", %{user: user, timeline: timeline, instance_name: instance_name})
end end
@ -89,15 +88,5 @@ def assign_id(%{path_info: ["notice", notice_id]} = conn, _opts),
def assign_id(%{path_info: ["users", user_id]} = conn, _opts), def assign_id(%{path_info: ["users", user_id]} = conn, _opts),
do: assign(conn, :username_or_id, user_id) 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 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 end