X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fweb%2Ftwitter_api%2Ftwitter_api_test.exs;h=da880e67c5652e6b8d5dc6a94b69b20d6f6f73d7;hb=1af9c777365f3b54edcb572cea4e2e6f185b3099;hp=273093ebad5814f309799bf2b495502cd6df9bfc;hpb=361a8c42197a92f044fc3d0ceadeee5e3590e96f;p=akkoma
diff --git a/test/web/twitter_api/twitter_api_test.exs b/test/web/twitter_api/twitter_api_test.exs
index 273093eba..da880e67c 100644
--- a/test/web/twitter_api/twitter_api_test.exs
+++ b/test/web/twitter_api/twitter_api_test.exs
@@ -2,6 +2,7 @@ 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.{Activity, User, Object, Repo}
alias Pleroma.Web.TwitterAPI.Representers.{ActivityRepresenter, UserRepresenter}
alias Pleroma.Web.ActivityPub.ActivityPub
@@ -27,25 +28,27 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
object = Repo.insert!(%Object{data: object_data})
input = %{
- "status" => "Hello again, @shp.\nThis is on another line.",
+ "status" => "Hello again, @shp.\nThis is on another line. #2hu #epic #phantasmagoric",
"media_ids" => [object.id]
}
{ :ok, activity = %Activity{} } = TwitterAPI.create_status(user, input)
- assert get_in(activity.data, ["object", "content"]) == "Hello again, @shp.
This is on another line."
+ assert get_in(activity.data, ["object", "content"]) == "Hello again, @shp.
\nThis is on another line. #2hu #epic #phantasmagoric
\nimage.jpg"
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 activity.local == true
- # Add a context + 'statusnet_conversation_id'
+ # hashtags
+ assert activity.data["object"]["tag"] == ["2hu", "epic", "phantasmagoric"]
+
+ # Add a context
assert is_binary(get_in(activity.data, ["context"]))
assert is_binary(get_in(activity.data, ["object", "context"]))
- assert get_in(activity.data, ["object", "statusnetConversationId"]) == activity.id
- assert get_in(activity.data, ["statusnetConversationId"]) == activity.id
assert is_list(activity.data["object"]["attachment"])
@@ -69,15 +72,14 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
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, ["statusnetConversationId"]) == get_in(activity.data, ["statusnetConversationId"])
- assert get_in(reply.data, ["object", "statusnetConversationId"]) == get_in(activity.data, ["object", "statusnetConversationId"])
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" do
+ 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)])
@@ -87,6 +89,18 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
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"]})
@@ -119,6 +133,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
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, %{"user_id" => user1.nickname})
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})
@@ -155,42 +170,62 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
assert status == ActivityRepresenter.to_map(activity, %{for: user, user: actor})
end
- test "Follow another user" do
+ test "Follow another user using user_id" do
user = insert(:user)
followed = insert(:user)
- { :ok, user, followed, activity } = TwitterAPI.follow(user, followed.id)
+ {:ok, user, followed, _activity } = TwitterAPI.follow(user, %{"user_id" => followed.id})
+ assert user.following == [User.ap_followers(followed)]
+
+ { :error, msg } = TwitterAPI.follow(user, %{"user_id" => followed.id})
+ assert msg == "Could not follow user: #{followed.nickname} is already on your list."
+ end
- user = Repo.get(User, user.id)
- follow = Repo.get(Activity, activity.id)
+ test "Follow another user using screen_name" 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)]
- assert follow == activity
- { :error, msg } = TwitterAPI.follow(user, followed.id)
+ { :error, msg } = TwitterAPI.follow(user, %{"screen_name" => followed.nickname})
assert msg == "Could not follow user: #{followed.nickname} is already on your list."
end
- test "Unfollow another user" do
- followed = insert(:user)
- user = insert(:user, %{following: [User.ap_followers(followed)]})
+ test "Unfollow another user using user_id" do
+ unfollowed = insert(:user)
+ user = insert(:user, %{following: [User.ap_followers(unfollowed)]})
+ ActivityPub.follow(user, unfollowed)
+
+ {:ok, user, unfollowed } = TwitterAPI.unfollow(user, %{"user_id" => unfollowed.id})
+ assert user.following == []
+
+ { :error, msg } = TwitterAPI.unfollow(user, %{"user_id" => unfollowed.id})
+ assert msg == "Not subscribed!"
+ end
- { :ok, user, _followed } = TwitterAPI.unfollow(user, followed.id)
+ test "Unfollow another user using screen_name" do
+ unfollowed = insert(:user)
+ user = insert(:user, %{following: [User.ap_followers(unfollowed)]})
- user = Repo.get(User, user.id)
+ ActivityPub.follow(user, unfollowed)
+ {:ok, user, unfollowed } = TwitterAPI.unfollow(user, %{"screen_name" => unfollowed.nickname})
assert user.following == []
- { :error, msg } = TwitterAPI.unfollow(user, followed.id)
+
+ { :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(%{"statusnetConversationId" => 1, "context" => "2hu"})
- {:ok, activity_two} = ActivityBuilder.insert(%{"statusnetConversationId" => 1,"context" => "2hu"})
+ {:ok, activity} = ActivityBuilder.insert(%{"context" => "2hu"})
+ {:ok, activity_two} = ActivityBuilder.insert(%{"context" => "2hu"})
{:ok, _activity_three} = ActivityBuilder.insert(%{"context" => "3hu"})
- statuses = TwitterAPI.fetch_conversation(user, 1)
+ {:ok, object} = Object.context_mapping("2hu") |> Repo.insert
+
+ statuses = TwitterAPI.fetch_conversation(user, object.id)
assert length(statuses) == 2
assert Enum.at(statuses, 0)["id"] == activity.id
@@ -205,30 +240,17 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
assert is_binary(response)
end
- test "it can parse mentions and return the relevant users" do
- text = "@gsimg According to @archaeme , that is @daggsy."
-
- gsimg = insert(:user, %{nickname: "gsimg"})
- archaeme = insert(:user, %{nickname: "archaeme"})
-
- expected_result = [
- {"@gsimg", gsimg},
- {"@archaeme", archaeme}
- ]
-
- assert TwitterAPI.parse_mentions(text) == expected_result
- end
-
test "it adds user links to an existing text" do
- text = "@gsimg According to @archaeme , that is @daggsy."
+ 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"})
- mentions = TwitterAPI.parse_mentions(text)
- expected_text = "@gsimg According to @archaeme , that is @daggsy."
+ mentions = Pleroma.Formatter.parse_mentions(text)
+ expected_text = "@gsimg According to @archaeme, that is @daggsy. Also hello @archaeme"
- assert TwitterAPI.add_user_links(text, mentions) == expected_text
+ assert Utils.add_user_links(text, mentions) == expected_text
end
test "it favorites a status, returns the updated status" do
@@ -299,9 +321,42 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
refute Repo.get_by(User, nickname: "lain")
end
+ 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})
+
+ assert is_number(status["statusnet_conversation_id"])
+ end
+
setup do
Supervisor.terminate_child(Pleroma.Supervisor, Cachex)
Supervisor.restart_child(Pleroma.Supervisor, Cachex)
:ok
end
+
+ describe "context_to_conversation_id" do
+ test "creates a mapping object" do
+ conversation_id = TwitterAPI.context_to_conversation_id("random context")
+ object = Object.get_by_ap_id("random context")
+
+ assert conversation_id == object.id
+ end
+
+ test "returns an existing mapping for an existing object" do
+ {:ok, object} = Object.context_mapping("random context") |> Repo.insert
+ conversation_id = TwitterAPI.context_to_conversation_id("random context")
+
+ assert conversation_id == object.id
+ end
+ end
+
+ describe "fetching a user by uri" do
+ test "fetches a user by uri" do
+ user = insert(:user)
+
+ {:ok, represented} = TwitterAPI.get_external_profile(user, user.ap_id)
+ assert represented = UserRepresenter.to_map(user, %{for: user})
+ end
+ end
end