diff options
| author | Phil Hagelberg <phil@hagelb.org> | 2019-10-31 18:26:34 -0700 |
|---|---|---|
| committer | Phil Hagelberg <phil@hagelb.org> | 2019-11-09 18:08:08 -0800 |
| commit | c6c706161e462bb6190cb4471e81e5a8c3b66d20 (patch) | |
| tree | a037ea12b8f8af2cccdb27dc9106b070020957ea | |
| parent | 274cc18e8a585bd72353f9135c18aec0cb8e7ce3 (diff) | |
| download | pleroma-c6c706161e462bb6190cb4471e81e5a8c3b66d20.tar.gz | |
Make sure notice link is remote if the post is remote.
| -rw-r--r-- | lib/pleroma/web/static_fe/static_fe_controller.ex | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/pleroma/web/static_fe/static_fe_controller.ex b/lib/pleroma/web/static_fe/static_fe_controller.ex index c35657d8e..5f69218ce 100644 --- a/lib/pleroma/web/static_fe/static_fe_controller.ex +++ b/lib/pleroma/web/static_fe/static_fe_controller.ex @@ -37,12 +37,19 @@ defmodule Pleroma.Web.StaticFE.StaticFEController do def represent(%Activity{object: %Object{data: data}} = activity, selected) do {: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, title: get_title(activity.object), content: data["content"] || nil, attachment: data["attachment"], - link: Helpers.o_status_url(Pleroma.Web.Endpoint, :notice, activity.id), + link: link, published: data["published"], sensitive: data["sensitive"], selected: selected, |