forked from AkkomaGang/akkoma
Include metadata in static FE conversations and profiles.
This commit is contained in:
parent
828259fb65
commit
bfd5d79826
2 changed files with 11 additions and 5 deletions
|
@ -9,6 +9,7 @@ defmodule Pleroma.Web.StaticFE.StaticFEController do
|
|||
alias Pleroma.Object
|
||||
alias Pleroma.User
|
||||
alias Pleroma.Web.ActivityPub.ActivityPub
|
||||
alias Pleroma.Web.Metadata
|
||||
alias Pleroma.Web.Router.Helpers
|
||||
|
||||
plug(:put_layout, :static_fe)
|
||||
|
@ -63,13 +64,16 @@ def represent(%Activity{object: %Object{data: data}} = activity, selected) do
|
|||
def show(%{assigns: %{notice_id: notice_id}} = conn, _params) do
|
||||
case Activity.get_by_id_with_object(notice_id) do
|
||||
%Activity{} = activity ->
|
||||
%User{} = user = User.get_by_ap_id(activity.object.data["actor"])
|
||||
meta = Metadata.build_tags(%{activity_id: notice_id, object: activity.object, user: user})
|
||||
|
||||
timeline =
|
||||
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})
|
||||
render(conn, "conversation.html", %{activities: timeline, meta: meta})
|
||||
|
||||
_ ->
|
||||
conn
|
||||
|
@ -81,6 +85,8 @@ def show(%{assigns: %{notice_id: notice_id}} = conn, _params) do
|
|||
def show(%{assigns: %{username_or_id: username_or_id}} = conn, params) do
|
||||
case User.get_cached_by_nickname_or_id(username_or_id) do
|
||||
%User{} = user ->
|
||||
meta = Metadata.build_tags(%{user: user})
|
||||
|
||||
timeline =
|
||||
ActivityPub.fetch_user_activities(user, nil, Map.take(params, @page_keys))
|
||||
|> Enum.map(&represent/1)
|
||||
|
@ -95,7 +101,8 @@ def show(%{assigns: %{username_or_id: username_or_id}} = conn, params) do
|
|||
user: user,
|
||||
timeline: timeline,
|
||||
prev_page_id: prev_page_id,
|
||||
next_page_id: next_page_id
|
||||
next_page_id: next_page_id,
|
||||
meta: meta
|
||||
})
|
||||
|
||||
_ ->
|
||||
|
|
|
@ -3,9 +3,8 @@
|
|||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<meta name="viewport" content="width=device-width,initial-scale=1,minimal-ui" />
|
||||
<title>
|
||||
<%= Pleroma.Config.get([:instance, :name]) %>
|
||||
</title>
|
||||
<title><%= Pleroma.Config.get([:instance, :name]) %></title>
|
||||
<%= Phoenix.HTML.raw(@meta || "") %>
|
||||
<link rel="stylesheet" href="/static/static-fe.css">
|
||||
</head>
|
||||
<body>
|
||||
|
|
Loading…
Reference in a new issue