From 2ac1ece652621df9adf591255f4506564a8ace68 Mon Sep 17 00:00:00 2001
From: Phil Hagelberg <phil@hagelb.org>
Date: Wed, 30 Oct 2019 20:21:10 -0700
Subject: [PATCH] Fix a bug where reblogs were displayed under the wrong user.
---
lib/pleroma/web/static_fe/static_fe_controller.ex | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/lib/pleroma/web/static_fe/static_fe_controller.ex b/lib/pleroma/web/static_fe/static_fe_controller.ex
index d2e72b476..9b565d07d 100644
--- a/lib/pleroma/web/static_fe/static_fe_controller.ex
+++ b/lib/pleroma/web/static_fe/static_fe_controller.ex
@@ -34,7 +34,9 @@ defmodule Pleroma.Web.StaticFE.StaticFEController do
}
end
- def represent(%Activity{} = activity, %User{} = user, selected) do
+ def represent(%Activity{} = activity, selected) do
+ {:ok, user} = User.get_or_fetch(activity.object.data["actor"])
+
%{
user: user,
title: get_title(activity.object),
@@ -48,11 +50,6 @@ defmodule Pleroma.Web.StaticFE.StaticFEController do
}
end
- def represent(%Activity{} = activity, selected) do
- {:ok, user} = User.get_or_fetch(activity.data["actor"])
- represent(activity, user, selected)
- end
-
def show_notice(%{assigns: %{notice_id: notice_id}} = conn, _params) do
instance_name = Pleroma.Config.get([:instance, :name], "Pleroma")
activity = Activity.get_by_id_with_object(notice_id)
@@ -73,7 +70,7 @@ defmodule Pleroma.Web.StaticFE.StaticFEController do
timeline =
for activity <- ActivityPub.fetch_user_activities(user, nil, %{}) do
- represent(activity, user, false)
+ represent(activity, false)
end
render(conn, "profile.html", %{user: user, timeline: timeline, instance_name: instance_name})