Add permalinks to the static-fe notice rendering.

diff --git a/lib/pleroma/web/static_fe/activity_representer.ex b/lib/pleroma/web/static_fe/activity_representer.ex
index 446c6023eae2b2db75b1cd420bb17e5c8ecd0a54..e383b8415f96903207e97d8b7ec71939646fca44 100644 (file)
--- a/lib/pleroma/web/static_fe/activity_representer.ex
+++ b/lib/pleroma/web/static_fe/activity_representer.ex
@@ -7,18 +7,21 @@ defmodule Pleroma.Web.StaticFE.ActivityRepresenter do
   alias Pleroma.Object
   alias Pleroma.User
   alias Pleroma.Web.ActivityPub.Visibility
   alias Pleroma.Object
   alias Pleroma.User
   alias Pleroma.Web.ActivityPub.Visibility

+  alias Pleroma.Web.Router.Helpers

 
 

-  def prepare_activity(%User{} = user, %Object{} = object) do
+  def prepare_activity(%User{} = user, %Object{} = object, activity_id) do

     %{}
     |> set_user(user)
     |> set_object(object)
     |> set_title(object)
     |> set_content(object)
     %{}
     |> set_user(user)
     |> set_object(object)
     |> set_title(object)
     |> set_content(object)

+    |> set_link(activity_id)
+    |> set_published(object)

     |> set_attachments(object)
   end
 
   def prepare_activity(%User{} = user, %Activity{} = activity),
     |> set_attachments(object)
   end
 
   def prepare_activity(%User{} = user, %Activity{} = activity),

-    do: prepare_activity(user, Object.normalize(activity.data["object"]))
+    do: prepare_activity(user, Object.normalize(activity.data["object"]), activity.id)

 
   defp set_user(data, %User{} = user), do: Map.put(data, :user, user)
 
 
   defp set_user(data, %User{} = user), do: Map.put(data, :user, user)
 


@@ -37,6 +40,12 @@ defmodule Pleroma.Web.StaticFE.ActivityRepresenter do
 
   defp set_content(data, _), do: Map.put(data, :content, nil)
 
 
   defp set_content(data, _), do: Map.put(data, :content, nil)
 

+  defp set_link(data, activity_id),
+    do: Map.put(data, :link, Helpers.o_status_url(Pleroma.Web.Endpoint, :notice, activity_id))
+
+  defp set_published(data, %Object{data: %{"published" => published}}),
+    do: Map.put(data, :published, published)
+

   # TODO: attachments
   defp set_attachments(data, _), do: Map.put(data, :attachments, [])
 
   # TODO: attachments
   defp set_attachments(data, _), do: Map.put(data, :attachments, [])
 


@@ -45,7 +54,7 @@ defmodule Pleroma.Web.StaticFE.ActivityRepresenter do
          true <- Visibility.is_public?(activity),
          %Object{} = object <- Object.normalize(activity.data["object"]),
          %User{} = user <- User.get_or_fetch(activity.data["actor"]),
          true <- Visibility.is_public?(activity),
          %Object{} = object <- Object.normalize(activity.data["object"]),
          %User{} = user <- User.get_or_fetch(activity.data["actor"]),

-         data <- prepare_activity(user, object) do
+         data <- prepare_activity(user, object, activity_id) do

       {:ok, data}
     else
       e ->
       {:ok, data}
     else
       e ->

diff --git a/lib/pleroma/web/templates/static_fe/static_fe/notice.html.eex b/lib/pleroma/web/templates/static_fe/static_fe/notice.html.eex
index 791bd256205c20a8c9b0068e2dff9d0878367900..d305d9057f1b73f5b4dc3366509aeb468cb867de 100644 (file)
--- a/lib/pleroma/web/templates/static_fe/static_fe/notice.html.eex
+++ b/lib/pleroma/web/templates/static_fe/static_fe/notice.html.eex
@@ -1,13 +1,15 @@
 <div class="activity">
   <%= render("user_card.html", %{user: @data.user}) %>
   <div class="activity-content">
 <div class="activity">
   <%= render("user_card.html", %{user: @data.user}) %>
   <div class="activity-content">

-    <%= if @data.title do %>
+    <%= if @data.title != "" do %>

     <details>
       <summary><%= raw @data.title %></summary>
     <% end %>
       <div class="e-content"><%= raw @data.content %></div>
     <details>
       <summary><%= raw @data.title %></summary>
     <% end %>
       <div class="e-content"><%= raw @data.content %></div>

-    <%= if @data.title do %>
+    <%= if @data.title != "" do %>

     </details>
     <% end %>
     </details>
     <% end %>

+    <p class="pull-right">
+      <a href="<%= @data.link %>" class="activity-link"><%= @data.published %></a></p>

   </div>
 </div>
   </div>
 </div>