X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fweb%2Fostatus%2Factivity_representer_test.exs;h=8bf3bc775b9d8175fad8654df5c9b081016996b2;hb=18837c2fedfc5dc79e78751d5b1b16ea1f0dce87;hp=06ffbdf698f47f6a0493215cab2edfd4fc3c1453;hpb=1085675ec41702b6e6416ae9f905905466228c01;p=akkoma
diff --git a/test/web/ostatus/activity_representer_test.exs b/test/web/ostatus/activity_representer_test.exs
index 06ffbdf69..8bf3bc775 100644
--- a/test/web/ostatus/activity_representer_test.exs
+++ b/test/web/ostatus/activity_representer_test.exs
@@ -4,15 +4,28 @@ 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{}
+ )
+ end
+
test "a note activity" do
note_activity = insert(:note_activity)
- updated_at = note_activity.updated_at
- |> NaiveDateTime.to_iso8601
- inserted_at = note_activity.inserted_at
- |> NaiveDateTime.to_iso8601
user = User.get_cached_by_ap_id(note_activity.data["actor"])
@@ -22,18 +35,21 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
#{note_activity.data["object"]["id"]}
New note by #{user.nickname}
#{note_activity.data["object"]["content"]}
- #{inserted_at}
- #{updated_at}
- #{note_activity.data["context"]}
+ #{note_activity.data["object"]["published"]}
+ #{note_activity.data["object"]["published"]}
+ #{note_activity.data["context"]}
+ #{note_activity.data["object"]["summary"]}
+
+
"""
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
@@ -47,10 +63,11 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
data = %{answer.data | "object" => object}
answer = %{answer | data: data}
- updated_at = answer.updated_at
- |> NaiveDateTime.to_iso8601
- inserted_at = answer.inserted_at
- |> NaiveDateTime.to_iso8601
+ 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"])
@@ -60,19 +77,22 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
#{answer.data["object"]["id"]}
New note by #{user.nickname}
#{answer.data["object"]["content"]}
- #{inserted_at}
- #{updated_at}
- #{answer.data["context"]}
+ #{answer.data["object"]["published"]}
+ #{answer.data["object"]["published"]}
+ #{answer.data["context"]}
+ 2hu
+
-
+
+
"""
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
@@ -82,20 +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
- updated_at = announce.updated_at
- |> NaiveDateTime.to_iso8601
- inserted_at = announce.inserted_at
- |> NaiveDateTime.to_iso8601
+ note_xml =
+ ActivityRepresenter.to_simple_form(note, note_user, true)
+ |> :xmerl.export_simple_content(:xmerl_xml)
+ |> to_string
expected = """
http://activitystrea.ms/schema/1.0/activity
@@ -103,20 +120,24 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
#{announce.data["id"]}
#{user.nickname} repeated a notice
RT #{note.data["object"]["content"]}
- #{inserted_at}
- #{updated_at}
- #{announce.data["context"]}
+ #{announce.data["published"]}
+ #{announce.data["published"]}
+ #{announce.data["context"]}
#{note_xml}
-
+
+
"""
- 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
@@ -126,33 +147,30 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
user = insert(:user)
{:ok, like, _note} = ActivityPub.like(user, note)
- # TODO: Are these the correct dates?
- updated_at = like.updated_at
- |> NaiveDateTime.to_iso8601
- inserted_at = like.inserted_at
- |> NaiveDateTime.to_iso8601
-
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 = """
http://activitystrea.ms/schema/1.0/favorite
#{like.data["id"]}
New favorite by #{user.nickname}
#{user.nickname} favorited something
- #{inserted_at}
- #{updated_at}
+ #{like.data["published"]}
+ #{like.data["published"]}
http://activitystrea.ms/schema/1.0/note
#{note.data["id"]}
- #{like.data["context"]}
+ #{like.data["context"]}
-
+
+
"""
assert clean(res) == clean(expected)
@@ -161,25 +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]
- })
-
- # TODO: Are these the correct dates?
- updated_at = activity.updated_at
- |> NaiveDateTime.to_iso8601
- inserted_at = activity.inserted_at
- |> NaiveDateTime.to_iso8601
+ {: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 = """
http://activitystrea.ms/schema/1.0/activity
@@ -187,15 +200,17 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
#{activity.data["id"]}
#{follower.nickname} started following #{activity.data["object"]}
#{follower.nickname} started following #{activity.data["object"]}
- #{inserted_at}
- #{updated_at}
+ #{activity.data["published"]}
+ #{activity.data["published"]}
http://activitystrea.ms/schema/1.0/person
#{activity.data["object"]}
#{activity.data["object"]}
-
+
"""
assert clean(res) == clean(expected)
@@ -207,17 +222,11 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
{:ok, _activity} = ActivityPub.follow(follower, followed)
{:ok, activity} = ActivityPub.unfollow(follower, followed)
- # TODO: Are these the correct dates?
- updated_at = activity.updated_at
- |> NaiveDateTime.to_iso8601
- inserted_at = activity.inserted_at
- |> NaiveDateTime.to_iso8601
-
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 = """
http://activitystrea.ms/schema/1.0/activity
@@ -225,15 +234,49 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
#{activity.data["id"]}
#{follower.nickname} stopped following #{followed.ap_id}
#{follower.nickname} stopped following #{followed.ap_id}
- #{inserted_at}
- #{updated_at}
+ #{activity.data["published"]}
+ #{activity.data["published"]}
http://activitystrea.ms/schema/1.0/person
#{followed.ap_id}
#{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 = """
+ http://activitystrea.ms/schema/1.0/activity
+ http://activitystrea.ms/schema/1.0/delete
+ #{activity.data["object"]}
+ An object was deleted
+ An object was deleted
+ #{activity.data["published"]}
+ #{activity.data["published"]}
"""
assert clean(res) == clean(expected)