X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fweb%2Fostatus%2Fostatus_test.exs;h=959b744afaa4dd2d5f5cfc1540f57a2f6d2c308d;hb=72ca58c540ee03de50631ea08a419f2589a0fe8e;hp=41e1c3448709ac45ec0fd4a5d2b9fdc8b0db8b13;hpb=c51e15975a2ca3c948098efa1aee6fc97335d198;p=akkoma

diff --git a/test/web/ostatus/ostatus_test.exs b/test/web/ostatus/ostatus_test.exs
index 41e1c3448..959b744af 100644
--- a/test/web/ostatus/ostatus_test.exs
+++ b/test/web/ostatus/ostatus_test.exs
@@ -2,23 +2,26 @@ defmodule Pleroma.Web.OStatusTest do
   use Pleroma.DataCase
   alias Pleroma.Web.OStatus
   alias Pleroma.Web.XML
-  alias Pleroma.{Object, Repo, User}
+  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
     incoming = File.read!("test/fixtures/incoming_note_activity.xml")
     {:ok, [activity]} = OStatus.handle_incoming(incoming)
 
+    user = User.get_by_ap_id(activity.data["actor"])
+    assert user.info["note_count"] == 1
     assert activity.data["type"] == "Create"
     assert activity.data["object"]["type"] == "Note"
     assert activity.data["object"]["id"] == "tag:gs.example.org:4040,2017-04-23:noticeId=29:objectType=note"
     assert activity.data["published"] == "2017-04-23T14:51:03+00:00"
+    assert activity.data["object"]["published"] == "2017-04-23T14:51:03+00:00"
     assert activity.data["context"] == "tag:gs.example.org:4040,2017-04-23:objectType=thread:nonce=f09e22f58abd5c7b"
     assert "http://pleroma.example.org:4000/users/lain3" in activity.data["to"]
     assert activity.local == false
@@ -34,6 +37,7 @@ defmodule Pleroma.Web.OStatusTest do
     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"]
+    assert "https://www.w3.org/ns/activitystreams#Public" in activity.data["to"]
   end
 
   test "handle incoming notes with attachments - GS, subscription" do
@@ -44,6 +48,16 @@ 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"]["attachment"] |> length == 2
+    assert activity.data["object"]["external_url"] == "https://social.heldscal.la/notice/2020923"
+    assert "https://www.w3.org/ns/activitystreams#Public" in activity.data["to"]
+  end
+
+  test "handle incoming notes with tags" do
+    incoming = File.read!("test/fixtures/ostatus_incoming_post_tag.xml")
+    {:ok, [activity]} = OStatus.handle_incoming(incoming)
+
+    assert activity.data["object"]["tag"] == ["nsfw"]
+    assert "https://www.w3.org/ns/activitystreams#Public" in activity.data["to"]
   end
 
   test "handle incoming notes - Mastodon, salmon, reply" do
@@ -60,6 +74,25 @@ defmodule Pleroma.Web.OStatusTest do
     assert activity.data["object"]["type"] == "Note"
     assert activity.data["object"]["actor"] == "https://mastodon.social/users/lambadalambda"
     assert activity.data["context"] == "2hu"
+    assert "https://www.w3.org/ns/activitystreams#Public" in activity.data["to"]
+  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")
+    assert "https://www.w3.org/ns/activitystreams#Public" in activity.data["to"]
+  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
@@ -71,6 +104,7 @@ defmodule Pleroma.Web.OStatusTest do
     assert activity.data["object"]["actor"] == "https://social.heldscal.la/user/23211"
     assert activity.data["object"]["content"] == "@<a href=\"https://gs.archae.me/user/4687\" class=\"h-card u-url p-nickname mention\" title=\"shpbot\">shpbot</a> why not indeed."
     assert activity.data["object"]["inReplyTo"] == "tag:gs.archae.me,2017-04-30:noticeId=778260:objectType=note"
+    assert "https://www.w3.org/ns/activitystreams#Public" in activity.data["to"]
   end
 
   test "handle incoming retweets - GS, subscription" do
@@ -80,10 +114,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
@@ -93,10 +157,13 @@ 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
@@ -106,6 +173,8 @@ defmodule Pleroma.Web.OStatusTest do
     assert activity.data["type"] == "Like"
     assert activity.data["actor"] == "https://social.heldscal.la/user/23211"
     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 favorited_activity.data["type"] == "Create"
     assert favorited_activity.data["actor"] == "https://shitposter.club/user/1"
@@ -137,6 +206,23 @@ 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"
+    assert "https://www.w3.org/ns/activitystreams#Public" in activity.data["to"]
+  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
@@ -158,6 +244,7 @@ defmodule Pleroma.Web.OStatusTest do
       assert user.local == false
       assert user.info["uri"] == uri
       assert user.ap_id == uri
+      assert user.bio == "Call me Deacon Blues."
       assert user.avatar["type"] == "Image"
 
       {:ok, user_again} = OStatus.find_or_make_user(uri)
@@ -169,7 +256,9 @@ defmodule Pleroma.Web.OStatusTest do
       uri = "https://social.heldscal.la/user/23211"
 
       {:ok, user} = OStatus.find_or_make_user(uri)
-      change = Ecto.Changeset.change(user, %{avatar: nil})
+      old_name = user.name
+      old_bio = user.bio
+      change = Ecto.Changeset.change(user, %{avatar: nil, bio: nil, old_name: nil})
 
       {:ok, user} = Repo.update(change)
       refute user.avatar
@@ -178,6 +267,8 @@ defmodule Pleroma.Web.OStatusTest do
       [author] = :xmerl_xpath.string('//author[1]', doc)
       {:ok, user} = OStatus.find_make_or_update_user(author)
       assert user.avatar["type"] == "Image"
+      assert user.name == old_name
+      assert user.bio == old_bio
 
       {:ok, user_again} = OStatus.find_make_or_update_user(author)
       assert user_again == user
@@ -202,6 +293,7 @@ defmodule Pleroma.Web.OStatusTest do
         "uri" => "https://social.heldscal.la/user/29191",
         "host" => "social.heldscal.la",
         "fqn" => user,
+        "bio" => "cofe",
         "avatar" => %{"type" => "Image", "url" => [%{"href" => "https://social.heldscal.la/avatar/29191-original-20170421154949.jpeg", "mediaType" => "image/jpeg", "type" => "Link"}]}
       }
       assert data == expected
@@ -224,6 +316,7 @@ defmodule Pleroma.Web.OStatusTest do
         "uri" => "https://social.heldscal.la/user/29191",
         "host" => "social.heldscal.la",
         "fqn" => user,
+        "bio" => "cofe",
         "avatar" => %{"type" => "Image", "url" => [%{"href" => "https://social.heldscal.la/avatar/29191-original-20170421154949.jpeg", "mediaType" => "image/jpeg", "type" => "Link"}]}
       }
       assert data == expected
@@ -237,6 +330,13 @@ 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
+
+  test "insert or update a user from given data" do
+    user = insert(:user, %{nickname: "nick@name.de"})
+    data = %{ ap_id: user.ap_id <> "xxx", name: user.name, nickname: user.nickname }
+
+    assert {:ok, %User{}} = OStatus.insert_or_update_user(data)
   end
 end