X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fweb%2Ftwitter_api%2Ftwitter_api_test.exs;h=06c1ba6ec8ca71ced6a63163dbe64aa21eaa93e2;hb=1555c66650967c5023b2a4f7a44a683d803091c6;hp=df1022d6bfaa2e27a51f80e893e46f3589923610;hpb=c6aa60c829abb7eeff3e0aec0b8b5eb33b8a4947;p=akkoma

diff --git a/test/web/twitter_api/twitter_api_test.exs b/test/web/twitter_api/twitter_api_test.exs
index df1022d6b..06c1ba6ec 100644
--- a/test/web/twitter_api/twitter_api_test.exs
+++ b/test/web/twitter_api/twitter_api_test.exs
@@ -1,16 +1,15 @@
 defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
   use Pleroma.DataCase
-  alias Pleroma.Builders.{UserBuilder, ActivityBuilder}
-  alias Pleroma.Web.TwitterAPI.TwitterAPI
-  alias Pleroma.Web.TwitterAPI.Utils
+  alias Pleroma.Builders.UserBuilder
+  alias Pleroma.Web.TwitterAPI.{TwitterAPI, UserView}
   alias Pleroma.{Activity, User, Object, Repo}
-  alias Pleroma.Web.TwitterAPI.Representers.{ActivityRepresenter, UserRepresenter}
   alias Pleroma.Web.ActivityPub.ActivityPub
+  alias Pleroma.Web.TwitterAPI.ActivityView
 
   import Pleroma.Factory
 
   test "create a status" do
-    user = UserBuilder.build(%{ap_id: "142344"})
+    user = insert(:user)
     _mentioned_user = UserBuilder.insert(%{nickname: "shp", ap_id: "shp"})
 
     object_data = %{
@@ -28,21 +27,33 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
     object = Repo.insert!(%Object{data: object_data})
 
     input = %{
-      "status" => "Hello again, @shp.<script></script>\nThis is on another line. #2hu #epic #phantasmagoric",
+      "status" =>
+        "Hello again, @shp.<script></script>\nThis is on another :moominmamma: line. #2hu #epic #phantasmagoric",
       "media_ids" => [object.id]
     }
 
-    { :ok, activity = %Activity{} } = TwitterAPI.create_status(user, input)
+    {:ok, activity = %Activity{}} = TwitterAPI.create_status(user, input)
+
+    expected_text =
+      "Hello again, <span><a class='mention' href='shp'>@<span>shp</span></a></span>.&lt;script&gt;&lt;/script&gt;<br>This is on another :moominmamma: line. <a href='http://localhost:4001/tag/2hu' rel='tag'>#2hu</a> <a href='http://localhost:4001/tag/epic' rel='tag'>#epic</a> <a href='http://localhost:4001/tag/phantasmagoric' rel='tag'>#phantasmagoric</a><br><a href=\"http://example.org/image.jpg\" class='attachment'>image.jpg</a>"
 
-    assert get_in(activity.data, ["object", "content"]) == "Hello again, <a href='shp'>@shp</a>.<br>\nThis is on another line. #2hu #epic #phantasmagoric<br>\n<a href='http://example.org/image.jpg' class='attachment'>image.jpg</a>"
+    assert get_in(activity.data, ["object", "content"]) == expected_text
     assert get_in(activity.data, ["object", "type"]) == "Note"
     assert get_in(activity.data, ["object", "actor"]) == user.ap_id
     assert get_in(activity.data, ["actor"]) == user.ap_id
-    assert Enum.member?(get_in(activity.data, ["to"]), User.ap_followers(user))
-    assert Enum.member?(get_in(activity.data, ["to"]), "https://www.w3.org/ns/activitystreams#Public")
-    assert Enum.member?(get_in(activity.data, ["to"]), "shp")
+    assert Enum.member?(get_in(activity.data, ["cc"]), User.ap_followers(user))
+
+    assert Enum.member?(
+             get_in(activity.data, ["to"]),
+             "https://www.w3.org/ns/activitystreams#Public"
+           )
+
+    assert Enum.member?(get_in(activity.data, ["cc"]), "shp")
     assert activity.local == true
 
+    assert %{"moominmamma" => "http://localhost:4001/finmoji/128px/moominmamma-128.png"} =
+             activity.data["object"]["emoji"]
+
     # hashtags
     assert activity.data["object"]["tag"] == ["2hu", "epic", "phantasmagoric"]
 
@@ -53,130 +64,45 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
     assert is_list(activity.data["object"]["attachment"])
 
     assert activity.data["object"] == Object.get_by_ap_id(activity.data["object"]["id"]).data
+
+    user = User.get_by_ap_id(user.ap_id)
+
+    assert user.info["note_count"] == 1
   end
 
   test "create a status that is a reply" do
-    user = UserBuilder.build(%{ap_id: "some_cool_id"})
+    user = insert(:user)
+
     input = %{
       "status" => "Hello again."
     }
 
-    { :ok, activity = %Activity{} } = TwitterAPI.create_status(user, input)
+    {:ok, activity = %Activity{}} = TwitterAPI.create_status(user, input)
 
     input = %{
       "status" => "Here's your (you).",
       "in_reply_to_status_id" => activity.id
     }
 
-    { :ok, reply = %Activity{} } = TwitterAPI.create_status(user, input)
+    {:ok, reply = %Activity{}} = TwitterAPI.create_status(user, input)
 
     assert get_in(reply.data, ["context"]) == get_in(activity.data, ["context"])
-    assert get_in(reply.data, ["object", "context"]) == get_in(activity.data, ["object", "context"])
-    assert get_in(reply.data, ["object", "inReplyTo"]) == get_in(activity.data, ["object", "id"])
-    assert get_in(reply.data, ["object", "inReplyToStatusId"]) == activity.id
-    assert Enum.member?(get_in(reply.data, ["to"]), "some_cool_id")
-  end
-
-  test "fetch public statuses, excluding remote ones." do
-    %{ public: activity, user: user } = ActivityBuilder.public_and_non_public
-    insert(:note_activity, %{local: false})
-
-    follower = insert(:user, following: [User.ap_followers(user)])
-
-    statuses = TwitterAPI.fetch_public_statuses(follower)
-
-    assert length(statuses) == 1
-    assert Enum.at(statuses, 0) == ActivityRepresenter.to_map(activity, %{user: user, for: follower})
-  end
-
-  test "fetch whole known network statuses" do
-    %{ public: activity, user: user } = ActivityBuilder.public_and_non_public
-    insert(:note_activity, %{local: false})
-
-    follower = insert(:user, following: [User.ap_followers(user)])
-
-    statuses = TwitterAPI.fetch_public_and_external_statuses(follower)
-
-    assert length(statuses) == 2
-    assert Enum.at(statuses, 0) == ActivityRepresenter.to_map(activity, %{user: user, for: follower})
-  end
-
-  test "fetch friends' statuses" do
-    user = insert(:user, %{following: ["someguy/followers"]})
-    {:ok, activity} = ActivityBuilder.insert(%{"to" => ["someguy/followers"]})
-    {:ok, direct_activity} = ActivityBuilder.insert(%{"to" => [user.ap_id]})
-
-    statuses = TwitterAPI.fetch_friend_statuses(user)
-
-    activity_user = Repo.get_by(User, ap_id: activity.data["actor"])
-    direct_activity_user = Repo.get_by(User, ap_id: direct_activity.data["actor"])
-
-    assert length(statuses) == 2
-    assert Enum.at(statuses, 0) == ActivityRepresenter.to_map(activity, %{user: activity_user})
-    assert Enum.at(statuses, 1) == ActivityRepresenter.to_map(direct_activity, %{user: direct_activity_user, mentioned: [user]})
-  end
-
-  test "fetch user's mentions" do
-    user = insert(:user)
-    {:ok, activity} = ActivityBuilder.insert(%{"to" => [user.ap_id]})
-    activity_user = Repo.get_by(User, ap_id: activity.data["actor"])
-
-    statuses = TwitterAPI.fetch_mentions(user)
-
-    assert length(statuses) == 1
-    assert Enum.at(statuses, 0) == ActivityRepresenter.to_map(activity, %{user: activity_user, mentioned: [user]})
-  end
-
-  test "get a user by params" do
-    user1_result = {:ok, user1} = UserBuilder.insert(%{ap_id: "some id", email: "test@pleroma"})
-    {:ok, user2} = UserBuilder.insert(%{ap_id: "some other id", nickname: "testname2", email: "test2@pleroma"})
-
-    assert {:error, "You need to specify screen_name or user_id"} == TwitterAPI.get_user(nil, nil)
-    assert user1_result == TwitterAPI.get_user(nil, %{"user_id" => user1.id})
-    assert user1_result == TwitterAPI.get_user(nil, %{"screen_name" => user1.nickname})
-    assert user1_result == TwitterAPI.get_user(user1, nil)
-    assert user1_result == TwitterAPI.get_user(user2, %{"user_id" => user1.id})
-    assert user1_result == TwitterAPI.get_user(user2, %{"screen_name" => user1.nickname})
-    assert {:error, "No user with such screen_name"} == TwitterAPI.get_user(nil, %{"screen_name" => "Satan"})
-    assert {:error, "No user with such user_id"} == TwitterAPI.get_user(nil, %{"user_id" => 666})
-  end
-
-  test "fetch user's statuses" do
-    {:ok, user1} = UserBuilder.insert(%{ap_id: "some id", email: "test@pleroma"})
-    {:ok, user2} = UserBuilder.insert(%{ap_id: "some other id", nickname: "testname2", email: "test2@pleroma"})
-
-    {:ok, status1} = ActivityBuilder.insert(%{"id" => 1}, %{user: user1})
-    {:ok, status2} = ActivityBuilder.insert(%{"id" => 2}, %{user: user2})
 
-    user1_statuses = TwitterAPI.fetch_user_statuses(user1, %{"actor_id" => user1.ap_id})
+    assert get_in(reply.data, ["object", "context"]) ==
+             get_in(activity.data, ["object", "context"])
 
-    assert length(user1_statuses) == 1
-    assert Enum.at(user1_statuses, 0) == ActivityRepresenter.to_map(status1, %{user: user1})
-
-    user2_statuses = TwitterAPI.fetch_user_statuses(user1, %{"actor_id" => user2.ap_id})
-
-    assert length(user2_statuses) == 1
-    assert Enum.at(user2_statuses, 0) == ActivityRepresenter.to_map(status2, %{user: user2})
-  end
-
-  test "fetch a single status" do
-    {:ok, activity} = ActivityBuilder.insert()
-    {:ok, user} = UserBuilder.insert()
-    actor = Repo.get_by!(User, ap_id: activity.data["actor"])
-
-    status = TwitterAPI.fetch_status(user, activity.id)
-
-    assert status == ActivityRepresenter.to_map(activity, %{for: user, user: actor})
+    assert get_in(reply.data, ["object", "inReplyTo"]) == get_in(activity.data, ["object", "id"])
+    assert get_in(reply.data, ["object", "inReplyToStatusId"]) == activity.id
   end
 
   test "Follow another user using user_id" do
     user = insert(:user)
     followed = insert(:user)
 
-    {:ok, user, followed, _activity } = TwitterAPI.follow(user, %{"user_id" => followed.id})
-    assert user.following == [User.ap_followers(followed)]
+    {:ok, user, followed, _activity} = TwitterAPI.follow(user, %{"user_id" => followed.id})
+    assert User.ap_followers(followed) in user.following
 
-    { :error, msg } = TwitterAPI.follow(user, %{"user_id" => followed.id})
+    {:error, msg} = TwitterAPI.follow(user, %{"user_id" => followed.id})
     assert msg == "Could not follow user: #{followed.nickname} is already on your list."
   end
 
@@ -184,10 +110,15 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
     user = insert(:user)
     followed = insert(:user)
 
-    {:ok, user, followed, _activity } = TwitterAPI.follow(user, %{"screen_name" => followed.nickname})
-    assert user.following == [User.ap_followers(followed)]
+    {:ok, user, followed, _activity} =
+      TwitterAPI.follow(user, %{"screen_name" => followed.nickname})
+
+    assert User.ap_followers(followed) in user.following
 
-    { :error, msg } = TwitterAPI.follow(user, %{"screen_name" => followed.nickname})
+    followed = User.get_by_ap_id(followed.ap_id)
+    assert followed.info["follower_count"] == 1
+
+    {:error, msg} = TwitterAPI.follow(user, %{"screen_name" => followed.nickname})
     assert msg == "Could not follow user: #{followed.nickname} is already on your list."
   end
 
@@ -196,10 +127,10 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
     user = insert(:user, %{following: [User.ap_followers(unfollowed)]})
     ActivityPub.follow(user, unfollowed)
 
-    {:ok, user, unfollowed } = TwitterAPI.unfollow(user, %{"user_id" => unfollowed.id})
+    {:ok, user, unfollowed} = TwitterAPI.unfollow(user, %{"user_id" => unfollowed.id})
     assert user.following == []
 
-    { :error, msg } = TwitterAPI.unfollow(user, %{"user_id" => unfollowed.id})
+    {:error, msg} = TwitterAPI.unfollow(user, %{"user_id" => unfollowed.id})
     assert msg == "Not subscribed!"
   end
 
@@ -209,100 +140,103 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
 
     ActivityPub.follow(user, unfollowed)
 
-    {:ok, user, unfollowed } = TwitterAPI.unfollow(user, %{"screen_name" => unfollowed.nickname})
+    {:ok, user, unfollowed} = TwitterAPI.unfollow(user, %{"screen_name" => unfollowed.nickname})
     assert user.following == []
 
-    { :error, msg } = TwitterAPI.unfollow(user, %{"screen_name" => unfollowed.nickname})
+    {:error, msg} = TwitterAPI.unfollow(user, %{"screen_name" => unfollowed.nickname})
     assert msg == "Not subscribed!"
   end
 
-  test "fetch statuses in a context using the conversation id" do
-    {:ok, user} = UserBuilder.insert()
-    {:ok, activity} = ActivityBuilder.insert(%{"context" => "2hu"})
-    {:ok, activity_two} = ActivityBuilder.insert(%{"context" => "2hu"})
-    {:ok, _activity_three} = ActivityBuilder.insert(%{"context" => "3hu"})
-
-    {:ok, object} = Object.context_mapping("2hu") |> Repo.insert
-
-    statuses = TwitterAPI.fetch_conversation(user, object.id)
+  test "Block another user using user_id" do
+    user = insert(:user)
+    blocked = insert(:user)
 
-    assert length(statuses) == 2
-    assert Enum.at(statuses, 0)["id"] == activity.id
-    assert Enum.at(statuses, 1)["id"] == activity_two.id
+    {:ok, user, blocked} = TwitterAPI.block(user, %{"user_id" => blocked.id})
+    assert User.blocks?(user, blocked)
   end
 
-  test "upload a file" do
-    file = %Plug.Upload{content_type: "image/jpg", path: Path.absname("test/fixtures/image.jpg"), filename: "an_image.jpg"}
-
-    response = TwitterAPI.upload(file)
+  test "Block another user using screen_name" do
+    user = insert(:user)
+    blocked = insert(:user)
 
-    assert is_binary(response)
+    {:ok, user, blocked} = TwitterAPI.block(user, %{"screen_name" => blocked.nickname})
+    assert User.blocks?(user, blocked)
   end
 
-  test "it can parse mentions and return the relevant users" do
-    text = "@gsimg According to @archaeme, that is @daggsy. Also hello @archaeme@archae.me"
+  test "Unblock another user using user_id" do
+    unblocked = insert(:user)
+    user = insert(:user)
+    {:ok, user, _unblocked} = TwitterAPI.block(user, %{"user_id" => unblocked.id})
 
-    gsimg = insert(:user, %{nickname: "gsimg"})
-    archaeme = insert(:user, %{nickname: "archaeme"})
-    archaeme_remote = insert(:user, %{nickname: "archaeme@archae.me"})
+    {:ok, user, _unblocked} = TwitterAPI.unblock(user, %{"user_id" => unblocked.id})
+    assert user.info["blocks"] == []
+  end
 
-    expected_result = [
-      {"@gsimg", gsimg},
-      {"@archaeme", archaeme},
-      {"@archaeme@archae.me", archaeme_remote},
-    ]
+  test "Unblock another user using screen_name" do
+    unblocked = insert(:user)
+    user = insert(:user)
+    {:ok, user, _unblocked} = TwitterAPI.block(user, %{"screen_name" => unblocked.nickname})
 
-    assert TwitterAPI.parse_mentions(text) == expected_result
+    {:ok, user, _unblocked} = TwitterAPI.unblock(user, %{"screen_name" => unblocked.nickname})
+    assert user.info["blocks"] == []
   end
 
-  test "it adds user links to an existing text" do
-    text = "@gsimg According to @archaeme, that is @daggsy. Also hello @archaeme@archae.me"
-
-    gsimg = insert(:user, %{nickname: "gsimg"})
-    archaeme = insert(:user, %{nickname: "archaeme"})
-    archaeme_remote = insert(:user, %{nickname: "archaeme@archae.me"})
+  test "upload a file" do
+    file = %Plug.Upload{
+      content_type: "image/jpg",
+      path: Path.absname("test/fixtures/image.jpg"),
+      filename: "an_image.jpg"
+    }
 
-    mentions = TwitterAPI.parse_mentions(text)
-    expected_text = "<a href='#{gsimg.ap_id}'>@gsimg</a> According to <a href='#{archaeme.ap_id}'>@archaeme</a>, that is @daggsy. Also hello <a href='#{archaeme_remote.ap_id}'>@archaeme</a>"
+    response = TwitterAPI.upload(file)
 
-    assert Utils.add_user_links(text, mentions) == expected_text
+    assert is_binary(response)
   end
 
-  test "it favorites a status, returns the updated status" do
+  test "it favorites a status, returns the updated activity" do
     user = insert(:user)
     note_activity = insert(:note_activity)
-    activity_user = Repo.get_by!(User, ap_id: note_activity.data["actor"])
 
-    {:ok, status} = TwitterAPI.favorite(user, note_activity)
+    {:ok, status} = TwitterAPI.fav(user, note_activity.id)
     updated_activity = Activity.get_by_ap_id(note_activity.data["id"])
 
-    assert status == ActivityRepresenter.to_map(updated_activity, %{user: activity_user, for: user})
+    assert status == updated_activity
   end
 
-  test "it unfavorites a status, returns the updated status" do
+  test "it unfavorites a status, returns the updated activity" do
     user = insert(:user)
     note_activity = insert(:note_activity)
-    activity_user = Repo.get_by!(User, ap_id: note_activity.data["actor"])
     object = Object.get_by_ap_id(note_activity.data["object"]["id"])
 
-    {:ok, _like_activity, _object } = ActivityPub.like(user, object)
+    {:ok, _like_activity, _object} = ActivityPub.like(user, object)
     updated_activity = Activity.get_by_ap_id(note_activity.data["id"])
-    assert ActivityRepresenter.to_map(updated_activity, %{user: activity_user, for: user})["fave_num"] == 1
 
-    {:ok, status} = TwitterAPI.unfavorite(user, note_activity)
+    assert ActivityView.render("activity.json", activity: updated_activity)["fave_num"] == 1
+
+    {:ok, activity} = TwitterAPI.unfav(user, note_activity.id)
 
-    assert status["fave_num"] == 0
+    assert ActivityView.render("activity.json", activity: activity)["fave_num"] == 0
   end
 
   test "it retweets a status and returns the retweet" do
     user = insert(:user)
     note_activity = insert(:note_activity)
-    activity_user = Repo.get_by!(User, ap_id: note_activity.data["actor"])
 
-    {:ok, status} = TwitterAPI.retweet(user, note_activity)
+    {:ok, status} = TwitterAPI.repeat(user, note_activity.id)
     updated_activity = Activity.get_by_ap_id(note_activity.data["id"])
 
-    assert status == ActivityRepresenter.to_map(updated_activity, %{user: activity_user, for: user})
+    assert status == updated_activity
+  end
+
+  test "it unretweets an already retweeted status" do
+    user = insert(:user)
+    note_activity = insert(:note_activity)
+
+    {:ok, _status} = TwitterAPI.repeat(user, note_activity.id)
+    {:ok, status} = TwitterAPI.unrepeat(user, note_activity.id)
+    updated_activity = Activity.get_by_ap_id(note_activity.data["id"])
+
+    assert status == updated_activity
   end
 
   test "it registers a new user and returns the user." do
@@ -318,7 +252,9 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
     {:ok, user} = TwitterAPI.register_user(data)
 
     fetched_user = Repo.get_by(User, nickname: "lain")
-    assert user == UserRepresenter.to_map(fetched_user)
+
+    assert UserView.render("show.json", %{user: user}) ==
+             UserView.render("show.json", %{user: fetched_user})
   end
 
   test "it returns the error on registration problems" do
@@ -338,8 +274,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
 
   test "it assigns an integer conversation_id" do
     note_activity = insert(:note_activity)
-    user = User.get_cached_by_ap_id(note_activity.data["actor"])
-    status = ActivityRepresenter.to_map(note_activity, %{user: user})
+    status = ActivityView.render("activity.json", activity: note_activity)
 
     assert is_number(status["statusnet_conversation_id"])
   end
@@ -359,7 +294,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
     end
 
     test "returns an existing mapping for an existing object" do
-      {:ok, object} = Object.context_mapping("random context") |> Repo.insert
+      {:ok, object} = Object.context_mapping("random context") |> Repo.insert()
       conversation_id = TwitterAPI.context_to_conversation_id("random context")
 
       assert conversation_id == object.id
@@ -368,10 +303,15 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
 
   describe "fetching a user by uri" do
     test "fetches a user by uri" do
+      id = "https://mastodon.social/users/lambadalambda"
       user = insert(:user)
+      {:ok, represented} = TwitterAPI.get_external_profile(user, id)
+      remote = User.get_by_ap_id(id)
+
+      assert represented["id"] == UserView.render("show.json", %{user: remote, for: user})["id"]
 
-      {:ok, represented} = TwitterAPI.get_external_profile(user, user.ap_id)
-      assert represented = UserRepresenter.to_map(user, %{for: user})
+      # Also fetches the feed.
+      # assert Activity.get_create_activity_by_object_ap_id("tag:mastodon.social,2017-04-05:objectId=1641750:objectType=Status")
     end
   end
 end