mirrors/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/pleroma.git synced 2024-12-24 17:10:28 +00:00
Code Issues Projects Releases Wiki Activity

twitterapi: fix remaining test failures

Browse source
This commit is contained in:
William Pitcock 2018-11-25 21:16:44 +00:00
parent 6f5f589f73
commit e8570758f9
2 changed files with 23 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/pleroma/web/twitter_api/representers/activity_representer.ex
View file

@ -141,7 +141,7 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do
end end
def to_map( def to_map(
%Activity{data: %{"object" => %{"content" => content} = object}} = activity, %Activity{data: %{"object" => object}} = activity,
%{user: user} = opts %{user: user} = opts
) do ) do
object = Object.normalize(object) object = Object.normalize(object)

41
test/web/twitter_api/representers/activity_representer_test.exs
View file

@ -87,6 +87,26 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do
{:ok, convo_object} = Object.context_mapping("2hu") |> Repo.insert() {:ok, convo_object} = Object.context_mapping("2hu") |> Repo.insert()
note_object = %{
"id" => "https://example.com/id/1",
"published" => date,
"type" => "Note",
"content" => content_html,
"summary" => "2hu",
"inReplyToStatusId" => 213_123,
"attachment" => [object.data],
"external_url" => "some url",
"like_count" => 5,
"announcement_count" => 3,
"context" => "2hu",
"tag" => ["content", "mentioning", "nsfw"],
"emoji" => %{
"2hu" => "corndog.png"
}
}
Object.create(note_object)
to = [ to = [
User.ap_followers(user), User.ap_followers(user),
"https://www.w3.org/ns/activitystreams#Public", "https://www.w3.org/ns/activitystreams#Public",
@ -100,24 +120,7 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do
"id" => "id", "id" => "id",
"to" => to, "to" => to,
"actor" => User.ap_id(user), "actor" => User.ap_id(user),
"object" => %{ "object" => note_object["id"],
"published" => date,
"type" => "Note",
"content" => content_html,
"summary" => "2hu",
"inReplyToStatusId" => 213_123,
"attachment" => [
object
],
"external_url" => "some url",
"like_count" => 5,
"announcement_count" => 3,
"context" => "2hu",
"tag" => ["content", "mentioning", "nsfw"],
"emoji" => %{
"2hu" => "corndog.png"
}
},
"published" => date, "published" => date,
"context" => "2hu" "context" => "2hu"
}, },
@ -158,7 +161,7 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do
"tags" => ["nsfw", "content", "mentioning"], "tags" => ["nsfw", "content", "mentioning"],
"activity_type" => "post", "activity_type" => "post",
"possibly_sensitive" => true, "possibly_sensitive" => true,
"uri" => activity.data["object"]["id"], "uri" => note_object["id"],
"visibility" => "direct", "visibility" => "direct",
"summary" => "2hu" "summary" => "2hu"
} }