Make many of the improvements suggested in review.

This commit is contained in:
Phil Hagelberg 2019-11-04 22:02:10 -08:00
commit 8969c5522d
6 changed files with 25 additions and 20 deletions

View file

@ -58,28 +58,24 @@ defmodule Pleroma.Web.StaticFE.StaticFEController do
end
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, %{})
timeline =
for a <- Enum.reverse(activities) do
represent(a, a.object.id == activity.object.id)
end
activity.object.data["context"]
|> ActivityPub.fetch_activities_for_context(%{})
|> Enum.reverse()
|> Enum.map(&represent(&1, &1.object.id == activity.object.id))
render(conn, "conversation.html", %{activities: timeline, instance_name: instance_name})
render(conn, "conversation.html", %{activities: timeline})
end
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 =
ActivityPub.fetch_user_activities(user, nil, %{})
|> Enum.map(&represent/1)
render(conn, "profile.html", %{user: user, timeline: timeline, instance_name: instance_name})
render(conn, "profile.html", %{user: user, timeline: timeline})
end
def assign_id(%{path_info: ["notice", notice_id]} = conn, _opts),

View file

@ -36,4 +36,6 @@ defmodule Pleroma.Web.StaticFE.StaticFEView do
{:ok, date, _} = DateTime.from_iso8601(date)
Strftime.strftime!(date, "%Y/%m/%d %l:%M:%S %p UTC")
end
def instance_name, do: Pleroma.Config.get([:instance, :name], "Pleroma")
end