From: Roger Braun <roger@rogerbraun.net>
Date: Wed, 3 May 2017 15:51:36 +0000 (+0200)
Subject: Add user to announced status.
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=b34b046f16a44172ac96709dd0b6f5bced96d0b5;p=akkoma

Add user to announced status.
---

diff --git a/lib/pleroma/web/ostatus/activity_representer.ex b/lib/pleroma/web/ostatus/activity_representer.ex
index 9e3a9abcb..d064b09ee 100644
--- a/lib/pleroma/web/ostatus/activity_representer.ex
+++ b/lib/pleroma/web/ostatus/activity_representer.ex
@@ -98,7 +98,7 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenter do
     retweeted_activity = Activity.get_create_activity_by_object_ap_id(activity.data["object"])
     retweeted_user = User.get_cached_by_ap_id(retweeted_activity.data["actor"])
 
-    retweeted_xml = to_simple_form(retweeted_activity, retweeted_user)
+    retweeted_xml = to_simple_form(retweeted_activity, retweeted_user, true)
 
     mentions = activity.data["to"] |> get_mentions
     [
diff --git a/test/web/ostatus/activity_representer_test.exs b/test/web/ostatus/activity_representer_test.exs
index d3c32e938..7f003226b 100644
--- a/test/web/ostatus/activity_representer_test.exs
+++ b/test/web/ostatus/activity_representer_test.exs
@@ -84,9 +84,9 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
 
     note_user = User.get_cached_by_ap_id(note.data["actor"])
     note = Repo.get(Activity, note.id)
-    note_xml = ActivityRepresenter.to_simple_form(note, note_user)
+    note_xml = ActivityRepresenter.to_simple_form(note, note_user, true)
     |> :xmerl.export_simple_content(:xmerl_xml)
-    |> IO.iodata_to_binary
+    |> to_string
 
     updated_at = announce.updated_at
     |> NaiveDateTime.to_iso8601
@@ -111,7 +111,7 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
 
     announce_xml = ActivityRepresenter.to_simple_form(announce, user)
     |> :xmerl.export_simple_content(:xmerl_xml)
-    |> IO.iodata_to_binary
+    |> to_string
 
     assert clean(expected) == clean(announce_xml)
   end