X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fweb%2Fostatus%2Factivity_representer_test.exs;h=8bf3bc775b9d8175fad8654df5c9b081016996b2;hb=0a6c897c9488b26273a5fbb2de1ae1bfa0c96675;hp=b23334d55a9120fd1eaac9fccc194bb9663df125;hpb=94e980d6b4ab91ee37c30b266eb91e748e23861c;p=akkoma

diff --git a/test/web/ostatus/activity_representer_test.exs b/test/web/ostatus/activity_representer_test.exs
index b23334d55..8bf3bc775 100644
--- a/test/web/ostatus/activity_representer_test.exs
+++ b/test/web/ostatus/activity_representer_test.exs
@@ -4,9 +4,26 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
   alias Pleroma.Web.OStatus.ActivityRepresenter
   alias Pleroma.{User, Activity, Object}
   alias Pleroma.Web.ActivityPub.ActivityPub
+  alias Pleroma.Web.OStatus
 
   import Pleroma.Factory
 
+  test "an external note activity" do
+    incoming = File.read!("test/fixtures/mastodon-note-cw.xml")
+    {:ok, [activity]} = OStatus.handle_incoming(incoming)
+
+    user = User.get_cached_by_ap_id(activity.data["actor"])
+
+    tuple = ActivityRepresenter.to_simple_form(activity, user)
+
+    res = :xmerl.export_simple_content(tuple, :xmerl_xml) |> IO.iodata_to_binary()
+
+    assert String.contains?(
+             res,
+             ~s{<link type="text/html" href="https://mastodon.social/users/lambadalambda/updates/2314748" rel="alternate"/>}
+           )
+  end
+
   test "a note activity" do
     note_activity = insert(:note_activity)
 
@@ -18,18 +35,21 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
     <id>#{note_activity.data["object"]["id"]}</id>
     <title>New note by #{user.nickname}</title>
     <content type="html">#{note_activity.data["object"]["content"]}</content>
-    <published>#{note_activity.data["published"]}</published>
-    <updated>#{note_activity.data["published"]}</updated>
-    <ostatus:conversation>#{note_activity.data["context"]}</ostatus:conversation>
-    <link href="#{note_activity.data["context"]}" rel="ostatus:conversation" />
+    <published>#{note_activity.data["object"]["published"]}</published>
+    <updated>#{note_activity.data["object"]["published"]}</updated>
+    <ostatus:conversation ref="#{note_activity.data["context"]}">#{note_activity.data["context"]}</ostatus:conversation>
+    <link ref="#{note_activity.data["context"]}" rel="ostatus:conversation" />
+    <summary>#{note_activity.data["object"]["summary"]}</summary>
     <link type="application/atom+xml" href="#{note_activity.data["object"]["id"]}" rel="self" />
+    <link type="text/html" href="#{note_activity.data["object"]["id"]}" rel="alternate" />
     <category term="2hu"/>
     <link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/collection" href="http://activityschema.org/collection/public"/>
+    <link name="2hu" rel="emoji" href="corndog.png" />
     """
 
     tuple = ActivityRepresenter.to_simple_form(note_activity, user)
 
-    res = :xmerl.export_simple_content(tuple, :xmerl_xml) |> IO.iodata_to_binary
+    res = :xmerl.export_simple_content(tuple, :xmerl_xml) |> IO.iodata_to_binary()
 
     assert clean(res) == clean(expected)
   end
@@ -43,6 +63,12 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
     data = %{answer.data | "object" => object}
     answer = %{answer | data: data}
 
+    note_object = Object.get_by_ap_id(note.data["object"]["id"])
+
+    Repo.update!(
+      Object.change(note_object, %{data: Map.put(note_object.data, "external_url", "someurl")})
+    )
+
     user = User.get_cached_by_ap_id(answer.data["actor"])
 
     expected = """
@@ -51,19 +77,22 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
     <id>#{answer.data["object"]["id"]}</id>
     <title>New note by #{user.nickname}</title>
     <content type="html">#{answer.data["object"]["content"]}</content>
-    <published>#{answer.data["published"]}</published>
-    <updated>#{answer.data["published"]}</updated>
-    <ostatus:conversation>#{answer.data["context"]}</ostatus:conversation>
-    <link href="#{answer.data["context"]}" rel="ostatus:conversation" />
+    <published>#{answer.data["object"]["published"]}</published>
+    <updated>#{answer.data["object"]["published"]}</updated>
+    <ostatus:conversation ref="#{answer.data["context"]}">#{answer.data["context"]}</ostatus:conversation>
+    <link ref="#{answer.data["context"]}" rel="ostatus:conversation" />
+    <summary>2hu</summary>
     <link type="application/atom+xml" href="#{answer.data["object"]["id"]}" rel="self" />
+    <link type="text/html" href="#{answer.data["object"]["id"]}" rel="alternate" />
     <category term="2hu"/>
-    <thr:in-reply-to ref="#{note.data["object"]["id"]}" />
+    <thr:in-reply-to ref="#{note.data["object"]["id"]}" href="someurl" />
     <link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/collection" href="http://activityschema.org/collection/public"/>
+    <link name="2hu" rel="emoji" href="corndog.png" />
     """
 
     tuple = ActivityRepresenter.to_simple_form(answer, user)
 
-    res = :xmerl.export_simple_content(tuple, :xmerl_xml) |> IO.iodata_to_binary
+    res = :xmerl.export_simple_content(tuple, :xmerl_xml) |> IO.iodata_to_binary()
 
     assert clean(res) == clean(expected)
   end
@@ -73,15 +102,17 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
     user = insert(:user)
     object = Object.get_cached_by_ap_id(note.data["object"]["id"])
 
-    {:ok, announce, object} = ActivityPub.announce(user, object)
+    {:ok, announce, _object} = ActivityPub.announce(user, object)
 
     announce = Repo.get(Activity, announce.id)
 
     note_user = User.get_cached_by_ap_id(note.data["actor"])
     note = Repo.get(Activity, note.id)
-    note_xml = ActivityRepresenter.to_simple_form(note, note_user, true)
-    |> :xmerl.export_simple_content(:xmerl_xml)
-    |> to_string
+
+    note_xml =
+      ActivityRepresenter.to_simple_form(note, note_user, true)
+      |> :xmerl.export_simple_content(:xmerl_xml)
+      |> to_string
 
     expected = """
     <activity:object-type>http://activitystrea.ms/schema/1.0/activity</activity:object-type>
@@ -91,18 +122,22 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
     <content type="html">RT #{note.data["object"]["content"]}</content>
     <published>#{announce.data["published"]}</published>
     <updated>#{announce.data["published"]}</updated>
-    <ostatus:conversation>#{announce.data["context"]}</ostatus:conversation>
-    <link href="#{announce.data["context"]}" rel="ostatus:conversation" />
+    <ostatus:conversation ref="#{announce.data["context"]}">#{announce.data["context"]}</ostatus:conversation>
+    <link ref="#{announce.data["context"]}" rel="ostatus:conversation" />
     <link rel="self" type="application/atom+xml" href="#{announce.data["id"]}"/>
     <activity:object>
       #{note_xml}
     </activity:object>
-    <link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/person" href="#{note.data["actor"]}"/>
+    <link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/person" href="#{
+      note.data["actor"]
+    }"/>
+    <link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/collection" href="http://activityschema.org/collection/public"/>
     """
 
-    announce_xml = ActivityRepresenter.to_simple_form(announce, user)
-    |> :xmerl.export_simple_content(:xmerl_xml)
-    |> to_string
+    announce_xml =
+      ActivityRepresenter.to_simple_form(announce, user)
+      |> :xmerl.export_simple_content(:xmerl_xml)
+      |> to_string
 
     assert clean(expected) == clean(announce_xml)
   end
@@ -115,7 +150,7 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
     tuple = ActivityRepresenter.to_simple_form(like, user)
     refute is_nil(tuple)
 
-    res = :xmerl.export_simple_content(tuple, :xmerl_xml) |> IO.iodata_to_binary
+    res = :xmerl.export_simple_content(tuple, :xmerl_xml) |> IO.iodata_to_binary()
 
     expected = """
     <activity:verb>http://activitystrea.ms/schema/1.0/favorite</activity:verb>
@@ -128,11 +163,14 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
       <activity:object-type>http://activitystrea.ms/schema/1.0/note</activity:object-type>
       <id>#{note.data["id"]}</id>
     </activity:object>
-    <ostatus:conversation>#{like.data["context"]}</ostatus:conversation>
-    <link href="#{like.data["context"]}" rel="ostatus:conversation" />
+    <ostatus:conversation ref="#{like.data["context"]}">#{like.data["context"]}</ostatus:conversation>
+    <link ref="#{like.data["context"]}" rel="ostatus:conversation" />
     <link rel="self" type="application/atom+xml" href="#{like.data["id"]}"/>
     <thr:in-reply-to ref="#{note.data["id"]}" />
-    <link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/person" href="#{note.data["actor"]}"/>
+    <link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/person" href="#{
+      note.data["actor"]
+    }"/>
+    <link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/collection" href="http://activityschema.org/collection/public"/>
     """
 
     assert clean(res) == clean(expected)
@@ -141,18 +179,20 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
   test "a follow activity" do
     follower = insert(:user)
     followed = insert(:user)
-    {:ok, activity} = ActivityPub.insert(%{
-          "type" => "Follow",
-          "actor" => follower.ap_id,
-          "object" => followed.ap_id,
-          "to" => [followed.ap_id]
-    })
+
+    {:ok, activity} =
+      ActivityPub.insert(%{
+        "type" => "Follow",
+        "actor" => follower.ap_id,
+        "object" => followed.ap_id,
+        "to" => [followed.ap_id]
+      })
 
     tuple = ActivityRepresenter.to_simple_form(activity, follower)
 
     refute is_nil(tuple)
 
-    res = :xmerl.export_simple_content(tuple, :xmerl_xml) |> IO.iodata_to_binary
+    res = :xmerl.export_simple_content(tuple, :xmerl_xml) |> IO.iodata_to_binary()
 
     expected = """
     <activity:object-type>http://activitystrea.ms/schema/1.0/activity</activity:object-type>
@@ -168,7 +208,9 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
       <uri>#{activity.data["object"]}</uri>
     </activity:object>
     <link rel="self" type="application/atom+xml" href="#{activity.data["id"]}"/>
-    <link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/person" href="#{activity.data["object"]}"/>
+    <link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/person" href="#{
+      activity.data["object"]
+    }"/>
     """
 
     assert clean(res) == clean(expected)
@@ -184,7 +226,7 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
 
     refute is_nil(tuple)
 
-    res = :xmerl.export_simple_content(tuple, :xmerl_xml) |> IO.iodata_to_binary
+    res = :xmerl.export_simple_content(tuple, :xmerl_xml) |> IO.iodata_to_binary()
 
     expected = """
     <activity:object-type>http://activitystrea.ms/schema/1.0/activity</activity:object-type>
@@ -200,7 +242,41 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
       <uri>#{followed.ap_id}</uri>
     </activity:object>
     <link rel="self" type="application/atom+xml" href="#{activity.data["id"]}"/>
-    <link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/person" href="#{followed.ap_id}"/>
+    <link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/person" href="#{
+      followed.ap_id
+    }"/>
+    """
+
+    assert clean(res) == clean(expected)
+  end
+
+  test "a delete" do
+    user = insert(:user)
+
+    activity = %Activity{
+      data: %{
+        "id" => "ap_id",
+        "type" => "Delete",
+        "actor" => user.ap_id,
+        "object" => "some_id",
+        "published" => "2017-06-18T12:00:18+00:00"
+      }
+    }
+
+    tuple = ActivityRepresenter.to_simple_form(activity, nil)
+
+    refute is_nil(tuple)
+
+    res = :xmerl.export_simple_content(tuple, :xmerl_xml) |> IO.iodata_to_binary()
+
+    expected = """
+    <activity:object-type>http://activitystrea.ms/schema/1.0/activity</activity:object-type>
+    <activity:verb>http://activitystrea.ms/schema/1.0/delete</activity:verb>
+    <id>#{activity.data["object"]}</id>
+    <title>An object was deleted</title>
+    <content type="html">An object was deleted</content>
+    <published>#{activity.data["published"]}</published>
+    <updated>#{activity.data["published"]}</updated>
     """
 
     assert clean(res) == clean(expected)