X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fostatus%2Factivity_representer.ex;h=1a1b74bb0b987b09a26e1a26bc5f18ac3d44c55b;hb=34fc0dca2e879bcbb73acc80fdc72678411d0ebf;hp=26d02a83111ca67586411dc0dd351c2b9333a750;hpb=42268b0981e47cacd9f27b985dcd0bf08819258b;p=akkoma

diff --git a/lib/pleroma/web/ostatus/activity_representer.ex b/lib/pleroma/web/ostatus/activity_representer.ex
index 26d02a831..1a1b74bb0 100644
--- a/lib/pleroma/web/ostatus/activity_representer.ex
+++ b/lib/pleroma/web/ostatus/activity_representer.ex
@@ -1,7 +1,13 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
 defmodule Pleroma.Web.OStatus.ActivityRepresenter do
-  alias Pleroma.{Activity, User, Object}
+  alias Pleroma.Activity
+  alias Pleroma.Object
+  alias Pleroma.User
   alias Pleroma.Web.OStatus.UserRepresenter
-  alias Pleroma.Formatter
+
   require Logger
 
   defp get_href(id) do
@@ -180,12 +186,15 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenter do
     _in_reply_to = get_in_reply_to(activity.data)
     author = if with_author, do: [{:author, UserRepresenter.to_simple_form(user)}], else: []
 
-    retweeted_activity = Activity.get_create_activity_by_object_ap_id(activity.data["object"])
+    retweeted_activity = Activity.get_create_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, true)
 
-    mentions = activity.recipients |> get_mentions
+    mentions =
+      ([retweeted_user.ap_id] ++ activity.recipients)
+      |> Enum.uniq()
+      |> get_mentions()
 
     [
       {:"activity:object-type", ['http://activitystrea.ms/schema/1.0/activity']},
@@ -233,7 +242,12 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenter do
   end
 
   # Only undos of follow for now. Will need to get redone once there are more
-  def to_simple_form(%{data: %{"type" => "Undo"}} = activity, user, with_author) do
+  def to_simple_form(
+        %{data: %{"type" => "Undo", "object" => %{"type" => "Follow"} = follow_activity}} =
+          activity,
+        user,
+        with_author
+      ) do
     h = fn str -> [to_charlist(str)] end
 
     updated_at = activity.data["published"]
@@ -241,38 +255,26 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenter do
 
     author = if with_author, do: [{:author, UserRepresenter.to_simple_form(user)}], else: []
 
-    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
+    follow_activity = Activity.normalize(follow_activity)
 
-    case follow_activity.data["type"] do
-      "Follow" ->
-        [
-          {:"activity:object-type", ['http://activitystrea.ms/schema/1.0/activity']},
-          {:"activity:verb", ['http://activitystrea.ms/schema/1.0/unfollow']},
-          {:id, h.(activity.data["id"])},
-          {:title, ['#{user.nickname} stopped following #{follow_activity.data["object"]}']},
-          {:content, [type: 'html'],
-           ['#{user.nickname} stopped following #{follow_activity.data["object"]}']},
-          {:published, h.(inserted_at)},
-          {:updated, h.(updated_at)},
-          {:"activity:object",
-           [
-             {:"activity:object-type", ['http://activitystrea.ms/schema/1.0/person']},
-             {:id, h.(follow_activity.data["object"])},
-             {:uri, h.(follow_activity.data["object"])}
-           ]},
-          {:link, [rel: 'self', type: ['application/atom+xml'], href: h.(activity.data["id"])],
-           []}
-        ] ++ mentions ++ author
-
-      _ -> []
-    end
+    [
+      {:"activity:object-type", ['http://activitystrea.ms/schema/1.0/activity']},
+      {:"activity:verb", ['http://activitystrea.ms/schema/1.0/unfollow']},
+      {:id, h.(activity.data["id"])},
+      {:title, ['#{user.nickname} stopped following #{follow_activity.data["object"]}']},
+      {:content, [type: 'html'],
+       ['#{user.nickname} stopped following #{follow_activity.data["object"]}']},
+      {:published, h.(inserted_at)},
+      {:updated, h.(updated_at)},
+      {:"activity:object",
+       [
+         {:"activity:object-type", ['http://activitystrea.ms/schema/1.0/person']},
+         {:id, h.(follow_activity.data["object"])},
+         {:uri, h.(follow_activity.data["object"])}
+       ]},
+      {:link, [rel: 'self', type: ['application/atom+xml'], href: h.(activity.data["id"])], []}
+    ] ++ mentions ++ author
   end
 
   def to_simple_form(%{data: %{"type" => "Delete"}} = activity, user, with_author) do