From: Francis Dinh <normandy@firemail.cc>
Date: Fri, 11 May 2018 15:53:28 +0000 (-0400)
Subject: Revert "Do not send non-follow undos over ostatus for now"
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=4151cbe6b279a0db8b2920b9ebfc0d496f0cb395;p=akkoma

Revert "Do not send non-follow undos over ostatus for now"

This reverts commit 07fdc072382007812dc6af80fa2912f6b6d987b8.
---

diff --git a/lib/pleroma/web/ostatus/activity_representer.ex b/lib/pleroma/web/ostatus/activity_representer.ex
index 4f1976e1e..1e9d4a7fb 100644
--- a/lib/pleroma/web/ostatus/activity_representer.ex
+++ b/lib/pleroma/web/ostatus/activity_representer.ex
@@ -250,30 +250,23 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenter do
 
     mentions = (activity.recipients || []) |> get_mentions
 
-    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
-
-      _ ->
-        nil
-    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