projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 828259f)
Include metadata in static FE conversations and profiles.
authorPhil Hagelberg <phil@hagelb.org>
Wed, 6 Nov 2019 05:28:36 +0000 (21:28 -0800)
committerPhil Hagelberg <phil@hagelb.org>
Sun, 10 Nov 2019 02:08:08 +0000 (18:08 -0800)
lib/pleroma/web/static_fe/static_fe_controller.ex patch | blob | history
lib/pleroma/web/templates/layout/static_fe.html.eex patch | blob | history

diff --git a/lib/pleroma/web/static_fe/static_fe_controller.ex b/lib/pleroma/web/static_fe/static_fe_controller.ex
index 4798cad247f626b6aab2ce682464e8320129847a..10bd3fecd4ed8ac4ef3420d91c0bebd1c810f352 100644 (file)
--- a/lib/pleroma/web/static_fe/static_fe_controller.ex
+++ b/lib/pleroma/web/static_fe/static_fe_controller.ex
@@ -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 @@ defmodule Pleroma.Web.StaticFE.StaticFEController 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 @@ defmodule Pleroma.Web.StaticFE.StaticFEController 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 @@ defmodule Pleroma.Web.StaticFE.StaticFEController 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
         })
 
       _ ->
diff --git a/lib/pleroma/web/templates/layout/static_fe.html.eex b/lib/pleroma/web/templates/layout/static_fe.html.eex
index 4b889bb192af9c93b6442371eecba405510e27a5..5d820bb4bf36a2df8fc75d97a406937ef1d97d61 100644 (file)
--- a/lib/pleroma/web/templates/layout/static_fe.html.eex
+++ b/lib/pleroma/web/templates/layout/static_fe.html.eex
@@ -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>
Fork of https://akkoma.dev/AkkomaGang/akkoma.git