luna/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity

Don't try to fetch OP if none is there.

Browse source
This commit is contained in:
lain 2018-03-27 17:43:08 +02:00
parent d2099c849d
commit ff7afe46b9
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/pleroma/web/mastodon_api/views/status_view.ex
View file

@ -73,7 +73,11 @@ def render("status.json", %{activity: %{data: %{"object" => object}} = activity}
created_at = Utils.to_masto_date(object["published"]) created_at = Utils.to_masto_date(object["published"])
# TODO: Add cached version. # TODO: Add cached version.
reply_to = Activity.get_create_activity_by_object_ap_id(object["inReplyTo"]) reply_to = if object["inReplyTo"] && object["inReplyTo"] != "" do
Activity.get_create_activity_by_object_ap_id(object["inReplyTo"])
else
nil
end
reply_to_user = reply_to && User.get_cached_by_ap_id(reply_to.data["actor"]) reply_to_user = reply_to && User.get_cached_by_ap_id(reply_to.data["actor"])
emojis = (activity.data["object"]["emoji"] || []) emojis = (activity.data["object"]["emoji"] || [])

8
test/web/mastodon_api/status_view_test.exs
View file

@ -54,6 +54,14 @@ test "a note activity" do
assert status == expected assert status == expected
end end
test "a reply" do
note = insert(:note_activity)
user = insert(:user)
{:ok, activity} = CommonAPI.post(user, %{"status" => "he", "in_reply_to_status_id" => note.id})
assert activity.data["object"]["inReplyTo"] == note.data["object"]["id"]
end
test "contains mentions" do test "contains mentions" do
incoming = File.read!("test/fixtures/incoming_reply_mastodon.xml") incoming = File.read!("test/fixtures/incoming_reply_mastodon.xml")
# a user with this ap id might be in the cache. # a user with this ap id might be in the cache.