nrd.li/akkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Make sure notice link is remote if the post is remote.

Browse source
This commit is contained in:
Phil Hagelberg 2019-10-31 18:26:34 -07:00
parent 274cc18e8a
commit c6c706161e
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/pleroma/web/static_fe/static_fe_controller.ex
View file

@ -37,12 +37,19 @@ def get_counts(%Activity{} = activity) do
def represent(%Activity{object: %Object{data: data}} = activity, selected) do def represent(%Activity{object: %Object{data: data}} = activity, selected) do
{:ok, user} = User.get_or_fetch(activity.object.data["actor"]) {:ok, user} = User.get_or_fetch(activity.object.data["actor"])
link =
if user.local do
Helpers.o_status_url(Pleroma.Web.Endpoint, :notice, activity)
else
data["url"] || data["external_url"] || data["id"]
end
%{ %{
user: user, user: user,
title: get_title(activity.object), title: get_title(activity.object),
content: data["content"] || nil, content: data["content"] || nil,
attachment: data["attachment"], attachment: data["attachment"],
link: Helpers.o_status_url(Pleroma.Web.Endpoint, :notice, activity.id), link: link,
published: data["published"], published: data["published"],
sensitive: data["sensitive"], sensitive: data["sensitive"],
selected: selected, selected: selected,