aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/pleroma/web/static_fe/static_fe_controller.ex15
-rw-r--r--lib/pleroma/web/templates/layout/static_fe.html.eex6
-rw-r--r--lib/pleroma/web/templates/static_fe/static_fe/_notice.html.eex7
3 files changed, 26 insertions, 2 deletions
diff --git a/lib/pleroma/web/static_fe/static_fe_controller.ex b/lib/pleroma/web/static_fe/static_fe_controller.ex
index fe2fb09c4..d2e72b476 100644
--- a/lib/pleroma/web/static_fe/static_fe_controller.ex
+++ b/lib/pleroma/web/static_fe/static_fe_controller.ex
@@ -24,6 +24,16 @@ defmodule Pleroma.Web.StaticFE.StaticFEController do
defp get_title(_), do: nil
+ def get_counts(%Activity{} = activity) do
+ %Object{data: data} = Object.normalize(activity)
+
+ %{
+ likes: data["like_count"] || 0,
+ replies: data["repliesCount"] || 0,
+ announces: data["announcement_count"] || 0
+ }
+ end
+
def represent(%Activity{} = activity, %User{} = user, selected) do
%{
user: user,
@@ -33,7 +43,8 @@ defmodule Pleroma.Web.StaticFE.StaticFEController do
link: Helpers.o_status_url(Pleroma.Web.Endpoint, :notice, activity.id),
published: activity.object.data["published"],
sensitive: activity.object.data["sensitive"],
- selected: selected
+ selected: selected,
+ counts: get_counts(activity)
}
end
@@ -50,7 +61,7 @@ defmodule Pleroma.Web.StaticFE.StaticFEController do
represented =
for a <- Enum.reverse(activities) do
- represent(activity, a.object.id == activity.object.id)
+ represent(a, a.object.id == activity.object.id)
end
render(conn, "conversation.html", %{activities: represented, instance_name: instance_name})
diff --git a/lib/pleroma/web/templates/layout/static_fe.html.eex b/lib/pleroma/web/templates/layout/static_fe.html.eex
index 9d7ee366a..e42047de9 100644
--- a/lib/pleroma/web/templates/layout/static_fe.html.eex
+++ b/lib/pleroma/web/templates/layout/static_fe.html.eex
@@ -24,6 +24,7 @@
.activity {
padding: 1em;
+ padding-bottom: 2em;
margin-bottom: 1em;
}
@@ -46,6 +47,11 @@
background-color: #1b2735;
}
+ .counts dt, .counts dd {
+ float: left;
+ margin-left: 1em;
+ }
+
a {
color: white;
}
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 9841fcf84..2a46dadb4 100644
--- a/lib/pleroma/web/templates/static_fe/static_fe/_notice.html.eex
+++ b/lib/pleroma/web/templates/static_fe/static_fe/_notice.html.eex
@@ -27,4 +27,11 @@
<% end %>
<% end %>
</div>
+ <%= if @selected do %>
+ <dl class="counts">
+ <dt><%= Gettext.gettext("replies") %></dt><dd><%= @counts.replies %></dd>
+ <dt><%= Gettext.gettext("announces") %></dt><dd><%= @counts.announces %></dd>
+ <dt><%= Gettext.gettext("likes") %></dt><dd><%= @counts.likes %></dd>
+ </dl>
+ <% end %>
</div>