X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fweb%2Fostatus%2Fostatus_test.exs;h=e38a195d97d5564bca45df300cd71991a82c23d5;hb=dd12cf7296566be206ca17044281ab2460fb7b9e;hp=7f168ee548912ce113475f32c285edfdfd92a356;hpb=fa2610c7959500c18b64d70828123a817de78864;p=akkoma

diff --git a/test/web/ostatus/ostatus_test.exs b/test/web/ostatus/ostatus_test.exs
index 7f168ee54..e38a195d9 100644
--- a/test/web/ostatus/ostatus_test.exs
+++ b/test/web/ostatus/ostatus_test.exs
@@ -2,12 +2,13 @@ defmodule Pleroma.Web.OStatusTest do
   use Pleroma.DataCase
   alias Pleroma.Web.OStatus
   alias Pleroma.Web.XML
-  alias Pleroma.{Object, Repo}
+  alias Pleroma.{Object, Repo, User, Activity}
+  import Pleroma.Factory
 
   test "don't insert create notes twice" do
     incoming = File.read!("test/fixtures/incoming_note_activity.xml")
-    {:ok, [_activity]} = OStatus.handle_incoming(incoming)
-    assert {:ok, [{:error, "duplicate activity"}]} == OStatus.handle_incoming(incoming)
+    {:ok, [activity]} = OStatus.handle_incoming(incoming)
+    assert {:ok, [activity]} == OStatus.handle_incoming(incoming)
   end
 
   test "handle incoming note - GS, Salmon" do
@@ -31,6 +32,8 @@ defmodule Pleroma.Web.OStatusTest do
     assert activity.data["object"]["type"] == "Note"
     assert activity.data["object"]["actor"] == "https://social.heldscal.la/user/23211"
     assert activity.data["object"]["content"] == "Will it blend?"
+    user = User.get_cached_by_ap_id(activity.data["actor"])
+    assert User.ap_followers(user) in activity.data["to"]
   end
 
   test "handle incoming notes with attachments - GS, subscription" do
@@ -59,6 +62,23 @@ defmodule Pleroma.Web.OStatusTest do
     assert activity.data["context"] == "2hu"
   end
 
+  test "handle incoming notes - Mastodon, with CW" do
+    incoming = File.read!("test/fixtures/mastodon-note-cw.xml")
+    {:ok, [activity]} = OStatus.handle_incoming(incoming)
+
+    assert activity.data["type"] == "Create"
+    assert activity.data["object"]["type"] == "Note"
+    assert activity.data["object"]["actor"] == "https://mastodon.social/users/lambadalambda"
+    assert String.contains?(activity.data["object"]["content"], "technologic")
+  end
+
+  test "handle incoming retweets - Mastodon, with CW" do
+    incoming = File.read!("test/fixtures/cw_retweet.xml")
+    {:ok, [[activity, retweeted_activity]]} = OStatus.handle_incoming(incoming)
+
+    assert String.contains?(retweeted_activity.data["object"]["content"], "Hey.")
+  end
+
   test "handle incoming notes - GS, subscription, reply" do
     incoming = File.read!("test/fixtures/ostatus_incoming_reply.xml")
     {:ok, [activity]} = OStatus.handle_incoming(incoming)
@@ -77,10 +97,40 @@ defmodule Pleroma.Web.OStatusTest do
     assert activity.data["type"] == "Announce"
     assert activity.data["actor"] == "https://social.heldscal.la/user/23211"
     assert activity.data["object"] == retweeted_activity.data["object"]["id"]
+    assert "https://pleroma.soykaf.com/users/lain" in activity.data["to"]
     refute activity.local
+
+    retweeted_activity = Repo.get(Activity, retweeted_activity.id)
     assert retweeted_activity.data["type"] == "Create"
     assert retweeted_activity.data["actor"] == "https://pleroma.soykaf.com/users/lain"
     refute retweeted_activity.local
+    assert retweeted_activity.data["object"]["announcement_count"] == 1
+    assert String.contains?(retweeted_activity.data["object"]["content"], "mastodon")
+    refute String.contains?(retweeted_activity.data["object"]["content"], "Test account")
+  end
+
+  test "handle incoming retweets - GS, subscription - local message" do
+    incoming = File.read!("test/fixtures/share-gs-local.xml")
+    note_activity = insert(:note_activity)
+    user = User.get_cached_by_ap_id(note_activity.data["actor"])
+    incoming = incoming
+    |> String.replace("LOCAL_ID", note_activity.data["object"]["id"])
+    |> String.replace("LOCAL_USER", user.ap_id)
+
+    {:ok, [[activity, retweeted_activity]]} = OStatus.handle_incoming(incoming)
+
+    assert activity.data["type"] == "Announce"
+    assert activity.data["actor"] == "https://social.heldscal.la/user/23211"
+    assert activity.data["object"] == retweeted_activity.data["object"]["id"]
+    assert user.ap_id in activity.data["to"]
+    refute activity.local
+
+    retweeted_activity = Repo.get(Activity, retweeted_activity.id)
+    assert note_activity.id == retweeted_activity.id
+    assert retweeted_activity.data["type"] == "Create"
+    assert retweeted_activity.data["actor"] == user.ap_id
+    assert retweeted_activity.local
+    assert retweeted_activity.data["object"]["announcement_count"] == 1
   end
 
   test "handle incoming retweets - Mastodon, salmon" do
@@ -90,24 +140,45 @@ defmodule Pleroma.Web.OStatusTest do
     assert activity.data["type"] == "Announce"
     assert activity.data["actor"] == "https://mastodon.social/users/lambadalambda"
     assert activity.data["object"] == retweeted_activity.data["object"]["id"]
+    assert activity.data["id"] == "tag:mastodon.social,2017-05-03:objectId=4934452:objectType=Status"
+
     refute activity.local
     assert retweeted_activity.data["type"] == "Create"
     assert retweeted_activity.data["actor"] == "https://pleroma.soykaf.com/users/lain"
     refute retweeted_activity.local
+    refute String.contains?(retweeted_activity.data["object"]["content"], "Test account")
   end
 
   test "handle incoming favorites - GS, websub" do
     incoming = File.read!("test/fixtures/favorite.xml")
-    {:ok, [[activity, retweeted_activity]]} = OStatus.handle_incoming(incoming)
+    {:ok, [[activity, favorited_activity]]} = OStatus.handle_incoming(incoming)
 
     assert activity.data["type"] == "Like"
     assert activity.data["actor"] == "https://social.heldscal.la/user/23211"
-    assert activity.data["object"] == retweeted_activity.data["object"]["id"]
+    assert activity.data["object"] == favorited_activity.data["object"]["id"]
+    assert activity.data["id"] == "tag:social.heldscal.la,2017-05-05:fave:23211:comment:2061643:2017-05-05T09:12:50+00:00"
+
     refute activity.local
-    assert retweeted_activity.data["type"] == "Create"
-    assert retweeted_activity.data["actor"] == "https://shitposter.club/user/1"
-    assert retweeted_activity.data["object"]["id"] == "tag:shitposter.club,2017-05-05:noticeId=2827873:objectType=comment"
-    refute retweeted_activity.local
+    assert favorited_activity.data["type"] == "Create"
+    assert favorited_activity.data["actor"] == "https://shitposter.club/user/1"
+    assert favorited_activity.data["object"]["id"] == "tag:shitposter.club,2017-05-05:noticeId=2827873:objectType=comment"
+    refute favorited_activity.local
+  end
+
+  test "handle incoming favorites with locally available object - GS, websub" do
+    note_activity = insert(:note_activity)
+
+    incoming = File.read!("test/fixtures/favorite_with_local_note.xml")
+    |> String.replace("localid", note_activity.data["object"]["id"])
+
+    {:ok, [[activity, favorited_activity]]} = OStatus.handle_incoming(incoming)
+
+    assert activity.data["type"] == "Like"
+    assert activity.data["actor"] == "https://social.heldscal.la/user/23211"
+    assert activity.data["object"] == favorited_activity.data["object"]["id"]
+    refute activity.local
+    assert note_activity.id == favorited_activity.id
+    assert favorited_activity.local
   end
 
   test "handle incoming replies" do
@@ -118,11 +189,33 @@ defmodule Pleroma.Web.OStatusTest do
     assert activity.data["object"]["type"] == "Note"
     assert activity.data["object"]["inReplyTo"] == "http://pleroma.example.org:4000/objects/55bce8fc-b423-46b1-af71-3759ab4670bc"
     assert "http://pleroma.example.org:4000/users/lain5" in activity.data["to"]
+    assert activity.data["object"]["id"] == "tag:gs.example.org:4040,2017-04-25:noticeId=55:objectType=note"
+  end
+
+  test "handle incoming follows" do
+    incoming = File.read!("test/fixtures/follow.xml")
+    {:ok, [activity]} = OStatus.handle_incoming(incoming)
+    assert activity.data["type"] == "Follow"
+    assert activity.data["id"] == "tag:social.heldscal.la,2017-05-07:subscription:23211:person:44803:2017-05-07T09:54:48+00:00"
+    assert activity.data["actor"] == "https://social.heldscal.la/user/23211"
+    assert activity.data["object"] == "https://pawoo.net/users/pekorino"
+    refute activity.local
+
+    follower = User.get_by_ap_id(activity.data["actor"])
+    followed = User.get_by_ap_id(activity.data["object"])
+
+    assert User.following?(follower, followed)
   end
 
   describe "new remote user creation" do
+    test "returns local users" do
+      local_user = insert(:user)
+      {:ok, user} = OStatus.find_or_make_user(local_user.ap_id)
+
+      assert user == local_user
+    end
+
     test "tries to use the information in poco fields" do
-      # TODO make test local
       uri = "https://social.heldscal.la/user/23211"
 
       {:ok, user} = OStatus.find_or_make_user(uri)
@@ -141,7 +234,6 @@ defmodule Pleroma.Web.OStatusTest do
     end
 
     test "find_make_or_update_user takes an author element and returns an updated user" do
-      # TODO make test local
       uri = "https://social.heldscal.la/user/23211"
 
       {:ok, user} = OStatus.find_or_make_user(uri)
@@ -213,6 +305,6 @@ defmodule Pleroma.Web.OStatusTest do
 
       assert activity.data["actor"] == "https://shitposter.club/user/1"
       assert activity.data["object"]["id"] == "tag:shitposter.club,2017-05-05:noticeId=2827873:objectType=comment"
-    end 
+    end
   end
 end