X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fweb%2Ftwitter_api%2Frepresenters%2Factivity_representer_test.exs;h=98a1705b09fd4bc4df9bd87be50a4023eacc3c2c;hb=460062f2b04220ffcd8f20aa842cc95582d1f849;hp=781ef8536ff76bf60e1eb1fdc01bd80617d78f77;hpb=069daf644d984c479eae6483595a3307e923950b;p=akkoma

diff --git a/test/web/twitter_api/representers/activity_representer_test.exs b/test/web/twitter_api/representers/activity_representer_test.exs
index 781ef8536..98a1705b0 100644
--- a/test/web/twitter_api/representers/activity_representer_test.exs
+++ b/test/web/twitter_api/representers/activity_representer_test.exs
@@ -27,6 +27,7 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do
     assert status["statusnet_conversation_id"] == retweeted_status["statusnet_conversation_id"]
 
     assert status["retweeted_status"] == retweeted_status
+    assert status["activity_type"] == "repeat"
   end
 
   test "a like activity" do
@@ -44,6 +45,7 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do
     activity_actor = Repo.get_by(User, ap_id: note_activity.data["actor"])
     liked_status = ActivityRepresenter.to_map(note_activity, %{user: activity_actor, for: user})
     assert liked_status["favorited"] == true
+    assert status["activity_type"] == "like"
   end
 
   test "an activity" do
@@ -68,48 +70,56 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do
       }
     }
 
-    content_html = "<script>alert('YAY')</script>Some content mentioning <a href='#{mentioned_user.ap_id}'>@shp</shp>"
+    content_html = "<script>alert('YAY')</script>Some :2hu: content mentioning <a href='#{mentioned_user.ap_id}'>@shp</shp>"
     content = HtmlSanitizeEx.strip_tags(content_html)
     date = DateTime.from_naive!(~N[2016-05-24 13:26:08.003], "Etc/UTC") |> DateTime.to_iso8601
 
     {:ok, convo_object} = Object.context_mapping("2hu") |> Repo.insert
-
+    to = [
+      User.ap_followers(user),
+      "https://www.w3.org/ns/activitystreams#Public",
+      mentioned_user.ap_id
+    ]
     activity = %Activity{
       id: 1,
       data: %{
         "type" => "Create",
         "id" => "id",
-        "to" => [
-          User.ap_followers(user),
-          "https://www.w3.org/ns/activitystreams#Public",
-          mentioned_user.ap_id
-        ],
+        "to" => to,
         "actor" => User.ap_id(user),
         "object" => %{
           "published" => date,
           "type" => "Note",
           "content" => content_html,
+          "summary" => "2hu",
           "inReplyToStatusId" => 213123,
           "attachment" => [
             object
           ],
+          "external_url" => "some url",
           "like_count" => 5,
           "announcement_count" => 3,
           "context" => "2hu",
-          "tag" => ["content", "mentioning", "nsfw"]
+          "tag" => ["content", "mentioning", "nsfw"],
+          "emoji" => %{
+            "2hu" => "corndog.png"
+          }
         },
         "published" => date,
         "context" => "2hu"
-      }
+      },
+      local: false,
+      recipients: to
     }
 
+    expected_html = "<span>2hu</span><br />alert('YAY')Some <img height='32px' width='32px' alt='2hu' title='2hu' src='corndog.png' /> content mentioning <a href=\"#{mentioned_user.ap_id}\">@shp</a>"
 
     expected_status = %{
       "id" => activity.id,
       "user" => UserView.render("show.json", %{user: user, for: follower}),
-      "is_local" => true,
-      "statusnet_html" => HtmlSanitizeEx.basic_html(content_html),
-      "text" => content,
+      "is_local" => false,
+      "statusnet_html" => expected_html,
+      "text" => "2hu" <> content,
       "is_post_verb" => true,
       "created_at" => "Tue May 24 13:26:08 +0000 2016",
       "in_reply_to_status_id" => 213123,
@@ -124,10 +134,38 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do
       "repeat_num" => 3,
       "favorited" => false,
       "repeated" => false,
-      "external_url" => activity.data["id"],
-      "tags" => ["content", "mentioning", "nsfw"]
+      "external_url" => "some url",
+      "tags" => ["nsfw", "content", "mentioning"],
+      "activity_type" => "post",
+      "possibly_sensitive" => true,
+      "uri" => activity.data["object"]["id"]
     }
 
     assert ActivityRepresenter.to_map(activity, %{user: user, for: follower, mentioned: [mentioned_user]}) == expected_status
   end
+
+  test "an undo for a follow" do
+    follower = insert(:user)
+    followed = insert(:user)
+
+    {:ok, _follow} = ActivityPub.follow(follower, followed)
+    {:ok, unfollow} = ActivityPub.unfollow(follower, followed)
+
+    map = ActivityRepresenter.to_map(unfollow, %{user: follower})
+    assert map["is_post_verb"] == false
+    assert map["activity_type"] == "undo"
+  end
+
+  test "a delete activity" do
+    object = insert(:note)
+    user = User.get_by_ap_id(object.data["actor"])
+
+    {:ok, delete} = ActivityPub.delete(object)
+
+    map = ActivityRepresenter.to_map(delete, %{user: user})
+
+    assert map["is_post_verb"] == false
+    assert map["activity_type"] == "delete"
+    assert map["uri"] == object.data["id"]
+  end
 end