X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=test%2Fweb%2Ftwitter_api%2Frepresenters%2Factivity_representer_test.exs;h=f9998e614922f165354613b63de22dee8af8c7ac;hb=5dc278b1a68a244ad09853ef3e9a100851a51420;hp=a9129bcccd1bb1ae30fd3290e7d20639109ce91a;hpb=9a8c348aed7772c9e2173163687e63943cf491fb;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 a9129bccc..f9998e614 100644
--- a/test/web/twitter_api/representers/activity_representer_test.exs
+++ b/test/web/twitter_api/representers/activity_representer_test.exs
@@ -1,9 +1,10 @@
 defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do
   use Pleroma.DataCase
   alias Pleroma.{User, Activity, Object}
-  alias Pleroma.Web.TwitterAPI.Representers.{UserRepresenter, ActivityRepresenter, ObjectRepresenter}
+  alias Pleroma.Web.TwitterAPI.Representers.{ActivityRepresenter, ObjectRepresenter}
   alias Pleroma.Web.ActivityPub.ActivityPub
   alias Pleroma.Builders.UserBuilder
+  alias Pleroma.Web.TwitterAPI.UserView
   import Pleroma.Factory
 
   test "an announce activity" do
@@ -18,12 +19,15 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do
     status = ActivityRepresenter.to_map(announce_activity, %{users: [user, activity_actor], announced_activity: note_activity, for: user})
 
     assert status["id"] == announce_activity.id
-    assert status["user"] == UserRepresenter.to_map(user, %{for: user})
+    assert status["user"] == UserView.render("show.json", %{user: user, for: user})
 
     retweeted_status = ActivityRepresenter.to_map(note_activity, %{user: activity_actor, for: user})
     assert retweeted_status["repeated"] == true
+    assert retweeted_status["id"] == note_activity.id
+    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
@@ -41,12 +45,16 @@ 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
     {:ok, user} = UserBuilder.insert
-    {:ok, mentioned_user } = UserBuilder.insert(%{nickname: "shp", ap_id: "shp"})
-    {:ok, follower} = UserBuilder.insert(%{following: [User.ap_followers(user)]})
+    #   {:ok, mentioned_user } = UserBuilder.insert(%{nickname: "shp", ap_id: "shp"})
+    mentioned_user = insert(:user, %{nickname: "shp"})
+
+    # {:ok, follower} = UserBuilder.insert(%{following: [User.ap_followers(user)]})
+    follower = insert(:user, %{following: [User.ap_followers(user)]})
 
     object = %Object{
       data: %{
@@ -62,14 +70,17 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do
       }
     }
 
-    content_html = "Some content mentioning <a href='shp'>@shp</shp>"
+    content_html = "<script>alert('YAY')</script>Some 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
+
     activity = %Activity{
       id: 1,
       data: %{
         "type" => "Create",
+        "id" => "id",
         "to" => [
           User.ap_followers(user),
           "https://www.w3.org/ns/activitystreams#Public",
@@ -81,41 +92,59 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do
           "type" => "Note",
           "content" => content_html,
           "inReplyToStatusId" => 213123,
-          "statusnetConversationId" => 4711,
           "attachment" => [
             object
           ],
+          "external_url" => "some url",
           "like_count" => 5,
-          "announcement_count" => 3
+          "announcement_count" => 3,
+          "context" => "2hu",
+          "tag" => ["content", "mentioning", "nsfw"]
         },
-        "published" => date
-      }
+        "published" => date,
+        "context" => "2hu"
+      },
+      local: false
     }
 
 
     expected_status = %{
       "id" => activity.id,
-      "user" => UserRepresenter.to_map(user, %{for: follower}),
-      "is_local" => true,
-      "attentions" => [],
-      "statusnet_html" => content_html,
+      "user" => UserView.render("show.json", %{user: user, for: follower}),
+      "is_local" => false,
+      "statusnet_html" => HtmlSanitizeEx.basic_html(content_html),
       "text" => content,
       "is_post_verb" => true,
       "created_at" => "Tue May 24 13:26:08 +0000 2016",
       "in_reply_to_status_id" => 213123,
-      "statusnet_conversation_id" => 4711,
+      "statusnet_conversation_id" => convo_object.id,
       "attachments" => [
         ObjectRepresenter.to_map(object)
       ],
       "attentions" => [
-        UserRepresenter.to_map(mentioned_user, %{for: follower})
+        UserView.render("show.json", %{user: mentioned_user, for: follower})
       ],
       "fave_num" => 5,
       "repeat_num" => 3,
       "favorited" => false,
-      "repeated" => false
+      "repeated" => false,
+      "external_url" => "some url",
+      "tags" => ["content", "mentioning", "nsfw"],
+      "activity_type" => "post"
     }
 
     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
 end