Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add permalinks to the static-fe notice rendering.

Browse Source
This commit is contained in:
Phil Hagelberg 2019-10-27 16:37:57 -07:00
parent d1320160f4
commit c1fc139986
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/pleroma/web/static_fe/activity_representer.ex
View File

@ -7,18 +7,21 @@ defmodule Pleroma.Web.StaticFE.ActivityRepresenter do
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_link(activity_id)
|> set_published(object)
|> 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)
@ -37,6 +40,12 @@ defmodule Pleroma.Web.StaticFE.ActivityRepresenter do
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, [])
@ -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"]),
data <- prepare_activity(user, object) do
data <- prepare_activity(user, object, activity_id) do
{:ok, data}
else
e ->

6
lib/pleroma/web/templates/static_fe/static_fe/notice.html.eex
View File

@ -1,13 +1,15 @@
<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>
<%= if @data.title do %>
<%= if @data.title != "" do %>
</details>
<% end %>
<p class="pull-right">
<a href="<%= @data.link %>" class="activity-link"><%= @data.published %></a></p>
</div>
</div>