diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-08-07 00:23:58 +0300 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-08-07 00:23:58 +0300 |
| commit | 03ad31328c264a1154b7d3b5697b429452a1e6b0 (patch) | |
| tree | 14c606ecf2ab4cce552992a2887c27a01fb7b1e7 | |
| parent | 73d8d5c49f66d77ea77540223aaa8f94d91f63f8 (diff) | |
| download | pleroma-03ad31328c264a1154b7d3b5697b429452a1e6b0.tar.gz | |
OStatus Announce Representer: Do not depend on the object being embedded
in the Create activity
| -rw-r--r-- | lib/pleroma/web/ostatus/activity_representer.ex | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/web/ostatus/activity_representer.ex b/lib/pleroma/web/ostatus/activity_representer.ex index 760345301..8e55b9f0b 100644 --- a/lib/pleroma/web/ostatus/activity_representer.ex +++ b/lib/pleroma/web/ostatus/activity_representer.ex @@ -183,6 +183,7 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenter do author = if with_author, do: [{:author, UserRepresenter.to_simple_form(user)}], else: [] retweeted_activity = Activity.get_create_by_object_ap_id(activity.data["object"]) + retweeted_object = Object.normalize(retweeted_activity) retweeted_user = User.get_cached_by_ap_id(retweeted_activity.data["actor"]) retweeted_xml = to_simple_form(retweeted_activity, retweeted_user, true) @@ -197,7 +198,7 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenter do {:"activity:verb", ['http://activitystrea.ms/schema/1.0/share']}, {:id, h.(activity.data["id"])}, {:title, ['#{user.nickname} repeated a notice']}, - {:content, [type: 'html'], ['RT #{retweeted_activity.data["object"]["content"]}']}, + {:content, [type: 'html'], ['RT #{retweeted_object.data["content"]}']}, {:published, h.(inserted_at)}, {:updated, h.(updated_at)}, {:"ostatus:conversation", [ref: h.(activity.data["context"])], |