X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fweb%2Ftwitter_api%2Frepresenters%2Factivity_representer_test.exs;h=365c7f6599310ea2ead8b2847086222f8d680427;hb=833161b5d21f85e2276cd0cee3e148ecbe6e1f05;hp=7e2ea630ca185f8bee57df0ad280b3266c8802a0;hpb=30e9b22f96f2bf1cd895e993190f40afba159bb6;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 7e2ea630c..365c7f659 100644
--- a/test/web/twitter_api/representers/activity_representer_test.exs
+++ b/test/web/twitter_api/representers/activity_representer_test.exs
@@ -1,9 +1,15 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
 defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do
   use Pleroma.DataCase
-  alias Pleroma.{User, Activity, Object}
-  alias Pleroma.Web.TwitterAPI.Representers.{ActivityRepresenter, ObjectRepresenter}
+  alias Pleroma.User
+  alias Pleroma.Activity
+  alias Pleroma.Object
+  alias Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter
+  alias Pleroma.Web.TwitterAPI.Representers.ObjectRepresenter
   alias Pleroma.Web.ActivityPub.ActivityPub
-  alias Pleroma.Builders.UserBuilder
   alias Pleroma.Web.TwitterAPI.UserView
   import Pleroma.Factory
 
@@ -16,12 +22,19 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do
     {:ok, announce_activity, _object} = ActivityPub.announce(user, object)
     note_activity = Activity.get_by_ap_id(note_activity.data["id"])
 
-    status = ActivityRepresenter.to_map(announce_activity, %{users: [user, activity_actor], announced_activity: note_activity, for: user})
+    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"] == UserView.render("show.json", %{user: user, for: user})
 
-    retweeted_status = ActivityRepresenter.to_map(note_activity, %{user: activity_actor, 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"]
@@ -36,7 +49,9 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do
     object = Object.get_by_ap_id(note_activity.data["object"]["id"])
 
     {:ok, like_activity, _object} = ActivityPub.like(user, object)
-    status = ActivityRepresenter.to_map(like_activity, %{user: user, liked_activity: note_activity})
+
+    status =
+      ActivityRepresenter.to_map(like_activity, %{user: user, liked_activity: note_activity})
 
     assert status["id"] == like_activity.id
     assert status["in_reply_to_status_id"] == note_activity.id
@@ -49,7 +64,7 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do
   end
 
   test "an activity" do
-    {:ok, user} = UserBuilder.insert
+    user = insert(:user)
     #   {:ok, mentioned_user } = UserBuilder.insert(%{nickname: "shp", ap_id: "shp"})
     mentioned_user = insert(:user, %{nickname: "shp"})
 
@@ -70,29 +85,33 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do
       }
     }
 
-    content_html = "<script>alert('YAY')</script>Some :2hu: 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
+    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()
 
-    {: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,
+          "summary" => "2hu :2hu:",
+          "inReplyToStatusId" => 213_123,
           "attachment" => [
             object
           ],
@@ -108,20 +127,28 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do
         "published" => date,
         "context" => "2hu"
       },
-      local: false
+      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_html =
+      "<p>2hu <img height=\"32px\" width=\"32px\" alt=\"2hu\" title=\"2hu\" src=\"corndog.png\" /></p>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" => false,
       "statusnet_html" => expected_html,
-      "text" => "2hu" <> content,
+      "text" => "2hu :2hu:" <> content,
       "is_post_verb" => true,
       "created_at" => "Tue May 24 13:26:08 +0000 2016",
-      "in_reply_to_status_id" => 213123,
+      "in_reply_to_status_id" => 213_123,
+      "in_reply_to_screen_name" => nil,
+      "in_reply_to_user_id" => nil,
+      "in_reply_to_profileurl" => nil,
+      "in_reply_to_ostatus_uri" => nil,
       "statusnet_conversation_id" => convo_object.id,
       "attachments" => [
         ObjectRepresenter.to_map(object)
@@ -133,21 +160,31 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do
       "repeat_num" => 3,
       "favorited" => false,
       "repeated" => false,
+      "pinned" => false,
       "external_url" => "some url",
-      "tags" => ["content", "mentioning", "nsfw"],
+      "tags" => ["nsfw", "content", "mentioning"],
       "activity_type" => "post",
       "possibly_sensitive" => true,
-      "uri" => activity.data["object"]["id"]
+      "uri" => activity.data["object"]["id"],
+      "visibility" => "direct",
+      "card" => nil,
+      "summary" => "2hu :2hu:",
+      "summary_html" =>
+        "2hu <img height=\"32px\" width=\"32px\" alt=\"2hu\" title=\"2hu\" src=\"corndog.png\" />"
     }
 
-    assert ActivityRepresenter.to_map(activity, %{user: user, for: follower, mentioned: [mentioned_user]}) == expected_status
+    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, _follow} = ActivityPub.follow(follower, followed)
     {:ok, unfollow} = ActivityPub.unfollow(follower, followed)
 
     map = ActivityRepresenter.to_map(unfollow, %{user: follower})