hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Federate correct activity

Browse source
This commit is contained in:
Francis Dinh 2018-05-08 21:52:21 -04:00
commit 4d5ec883b7
2 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/pleroma/web/ostatus/activity_representer.ex
View file

@ -240,7 +240,13 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenter do
inserted_at = activity.data["published"]
author = if with_author, do: [{:author, UserRepresenter.to_simple_form(user)}], else: []
follow_activity = Activity.get_by_ap_id(activity.data["object"])
follow_activity =
if is_map(activity.data["object"]) do
Activity.get_by_ap_id(activity.data["object"]["id"])
else
Activity.get_by_ap_id(activity.data["object"])
end
mentions = (activity.recipients || []) |> get_mentions