X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fweb%2Ftwitter_api%2Frepresenters%2Factivity_representer_test.exs;h=894d2004998d872e37e7e638c2fc5f63d069700b;hb=1c9e539b47ff594d75c9548a04e64cb0c61cff8c;hp=f9998e614922f165354613b63de22dee8af8c7ac;hpb=5dc278b1a68a244ad09853ef3e9a100851a51420;p=akkoma
diff --git a/test/web/twitter_api/representers/activity_representer_test.exs b/test/web/twitter_api/representers/activity_representer_test.exs
index f9998e614..894d20049 100644
--- a/test/web/twitter_api/representers/activity_representer_test.exs
+++ b/test/web/twitter_api/representers/activity_representer_test.exs
@@ -16,12 +16,19 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do
{:ok, announce_activity, _object} = ActivityPub.announce(user, object)
note_activity = Activity.get_by_ap_id(note_activity.data["id"])
- status = ActivityRepresenter.to_map(announce_activity, %{users: [user, activity_actor], announced_activity: note_activity, for: user})
+ status =
+ ActivityRepresenter.to_map(announce_activity, %{
+ users: [user, activity_actor],
+ announced_activity: note_activity,
+ for: user
+ })
assert status["id"] == announce_activity.id
assert status["user"] == UserView.render("show.json", %{user: user, for: user})
- retweeted_status = ActivityRepresenter.to_map(note_activity, %{user: activity_actor, for: user})
+ retweeted_status =
+ ActivityRepresenter.to_map(note_activity, %{user: activity_actor, for: user})
+
assert retweeted_status["repeated"] == true
assert retweeted_status["id"] == note_activity.id
assert status["statusnet_conversation_id"] == retweeted_status["statusnet_conversation_id"]
@@ -36,7 +43,9 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do
object = Object.get_by_ap_id(note_activity.data["object"]["id"])
{:ok, like_activity, _object} = ActivityPub.like(user, object)
- status = ActivityRepresenter.to_map(like_activity, %{user: user, liked_activity: note_activity})
+
+ status =
+ ActivityRepresenter.to_map(like_activity, %{user: user, liked_activity: note_activity})
assert status["id"] == like_activity.id
assert status["in_reply_to_status_id"] == note_activity.id
@@ -49,7 +58,7 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do
end
test "an activity" do
- {:ok, user} = UserBuilder.insert
+ {:ok, user} = UserBuilder.insert()
# {:ok, mentioned_user } = UserBuilder.insert(%{nickname: "shp", ap_id: "shp"})
mentioned_user = insert(:user, %{nickname: "shp"})
@@ -70,28 +79,33 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do
}
}
- content_html = "Some content mentioning @shp"
+ content_html =
+ "Some :2hu: content mentioning @shp"
+
content = HtmlSanitizeEx.strip_tags(content_html)
- date = DateTime.from_naive!(~N[2016-05-24 13:26:08.003], "Etc/UTC") |> DateTime.to_iso8601
+ date = DateTime.from_naive!(~N[2016-05-24 13:26:08.003], "Etc/UTC") |> DateTime.to_iso8601()
- {:ok, convo_object} = Object.context_mapping("2hu") |> Repo.insert
+ {:ok, convo_object} = Object.context_mapping("2hu") |> Repo.insert()
+
+ to = [
+ User.ap_followers(user),
+ "https://www.w3.org/ns/activitystreams#Public",
+ mentioned_user.ap_id
+ ]
activity = %Activity{
id: 1,
data: %{
"type" => "Create",
"id" => "id",
- "to" => [
- User.ap_followers(user),
- "https://www.w3.org/ns/activitystreams#Public",
- mentioned_user.ap_id
- ],
+ "to" => to,
"actor" => User.ap_id(user),
"object" => %{
"published" => date,
"type" => "Note",
"content" => content_html,
- "inReplyToStatusId" => 213123,
+ "summary" => "2hu",
+ "inReplyToStatusId" => 213_123,
"attachment" => [
object
],
@@ -99,24 +113,32 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do
"like_count" => 5,
"announcement_count" => 3,
"context" => "2hu",
- "tag" => ["content", "mentioning", "nsfw"]
+ "tag" => ["content", "mentioning", "nsfw"],
+ "emoji" => %{
+ "2hu" => "corndog.png"
+ }
},
"published" => date,
"context" => "2hu"
},
- local: false
+ local: false,
+ recipients: to
}
+ expected_html =
+ "2hu
alert('YAY')Some content mentioning @shp"
expected_status = %{
"id" => activity.id,
"user" => UserView.render("show.json", %{user: user, for: follower}),
"is_local" => false,
- "statusnet_html" => HtmlSanitizeEx.basic_html(content_html),
- "text" => content,
+ "statusnet_html" => expected_html,
+ "text" => "2hu" <> content,
"is_post_verb" => true,
"created_at" => "Tue May 24 13:26:08 +0000 2016",
- "in_reply_to_status_id" => 213123,
+ "in_reply_to_status_id" => 213_123,
"statusnet_conversation_id" => convo_object.id,
"attachments" => [
ObjectRepresenter.to_map(object)
@@ -129,22 +151,43 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do
"favorited" => false,
"repeated" => false,
"external_url" => "some url",
- "tags" => ["content", "mentioning", "nsfw"],
- "activity_type" => "post"
+ "tags" => ["nsfw", "content", "mentioning"],
+ "activity_type" => "post",
+ "possibly_sensitive" => true,
+ "uri" => activity.data["object"]["id"],
+ "visibility" => "direct",
+ "summary" => "2hu"
}
- assert ActivityRepresenter.to_map(activity, %{user: user, for: follower, mentioned: [mentioned_user]}) == expected_status
+ assert ActivityRepresenter.to_map(activity, %{
+ user: user,
+ for: follower,
+ mentioned: [mentioned_user]
+ }) == expected_status
end
test "an undo for a follow" do
follower = insert(:user)
followed = insert(:user)
- {:ok, follow} = ActivityPub.follow(follower, followed)
+ {:ok, _follow} = ActivityPub.follow(follower, followed)
{:ok, unfollow} = ActivityPub.unfollow(follower, followed)
map = ActivityRepresenter.to_map(unfollow, %{user: follower})
assert map["is_post_verb"] == false
assert map["activity_type"] == "undo"
end
+
+ test "a delete activity" do
+ object = insert(:note)
+ user = User.get_by_ap_id(object.data["actor"])
+
+ {:ok, delete} = ActivityPub.delete(object)
+
+ map = ActivityRepresenter.to_map(delete, %{user: user})
+
+ assert map["is_post_verb"] == false
+ assert map["activity_type"] == "delete"
+ assert map["uri"] == object.data["id"]
+ end
end