projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'feature/activitypub' into 'develop'
[akkoma]
/
test
/
web
/
twitter_api
/
representers
/
activity_representer_test.exs
diff --git
a/test/web/twitter_api/representers/activity_representer_test.exs
b/test/web/twitter_api/representers/activity_representer_test.exs
index 385bf8e841b0e35425188359639fcbfa2eb36a57..98a1705b09fd4bc4df9bd87be50a4023eacc3c2c 100644
(file)
--- a/
test/web/twitter_api/representers/activity_representer_test.exs
+++ b/
test/web/twitter_api/representers/activity_representer_test.exs
@@
-75,17
+75,17
@@
defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do
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
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
-
+ 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",
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,
"actor" => User.ap_id(user),
"object" => %{
"published" => date,
@@
-108,7
+108,8
@@
defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do
"published" => date,
"context" => "2hu"
},
"published" => date,
"context" => "2hu"
},
- local: false
+ local: false,
+ recipients: to
}
expected_html = "<span>2hu</span><br />alert('YAY')Some <img height='32px' width='32px' alt='2hu' title='2hu' src='corndog.png' /> content mentioning <a href=\"#{mentioned_user.ap_id}\">@shp</a>"
}
expected_html = "<span>2hu</span><br />alert('YAY')Some <img height='32px' width='32px' alt='2hu' title='2hu' src='corndog.png' /> content mentioning <a href=\"#{mentioned_user.ap_id}\">@shp</a>"
@@
-134,7
+135,7
@@
defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do
"favorited" => false,
"repeated" => false,
"external_url" => "some url",
"favorited" => false,
"repeated" => false,
"external_url" => "some url",
- "tags" => ["
content", "mentioning", "nsfw
"],
+ "tags" => ["
nsfw", "content", "mentioning
"],
"activity_type" => "post",
"possibly_sensitive" => true,
"uri" => activity.data["object"]["id"]
"activity_type" => "post",
"possibly_sensitive" => true,
"uri" => activity.data["object"]["id"]