hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-restrict-domain

Browse source
This commit is contained in:
lain 2020-11-04 15:05:01 +01:00
commit 329aa19c9f
177 changed files with 4028 additions and 2257 deletions
Download patch file Download diff file Expand all files Collapse all files

4
test/pleroma/web/streamer_test.exs
View file

@ -263,7 +263,9 @@ defmodule Pleroma.Web.StreamerTest do
} do
other_user = insert(:user)
{:ok, create_activity} = CommonAPI.post_chat_message(other_user, user, "hey cirno")
{:ok, create_activity} =
CommonAPI.post_chat_message(other_user, user, "hey cirno", idempotency_key: "123")
object = Object.normalize(create_activity, false)
chat = Chat.get(user.id, other_user.ap_id)
cm_ref = MessageReference.for_chat_and_object(chat, object)