fedi/akkoma
1
0
Fork 0
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-11-23 15:05:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

SideEffects: Stream out chat messages.

Browse source
This commit is contained in:
lain 2020-05-29 15:44:03 +02:00
parent c86a88edec
commit 863c02b25d
2 changed files with 23 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/pleroma/web/activity_pub/side_effects.ex
View file

@ -14,6 +14,7 @@ defmodule Pleroma.Web.ActivityPub.SideEffects do
alias Pleroma.Web.ActivityPub.ActivityPub alias Pleroma.Web.ActivityPub.ActivityPub
alias Pleroma.Web.ActivityPub.Pipeline alias Pleroma.Web.ActivityPub.Pipeline
alias Pleroma.Web.ActivityPub.Utils alias Pleroma.Web.ActivityPub.Utils
alias Pleroma.Web.Streamer
def handle(object, meta \\ []) def handle(object, meta \\ [])
@ -126,6 +127,7 @@ defmodule Pleroma.Web.ActivityPub.SideEffects do
def handle_object_creation(%{"type" => "ChatMessage"} = object, meta) do def handle_object_creation(%{"type" => "ChatMessage"} = object, meta) do
with {:ok, object, meta} <- Pipeline.common_pipeline(object, meta) do with {:ok, object, meta} <- Pipeline.common_pipeline(object, meta) do
Streamer.stream(["user", "user:pleroma_chat"], object)
actor = User.get_cached_by_ap_id(object.data["actor"]) actor = User.get_cached_by_ap_id(object.data["actor"])
recipient = User.get_cached_by_ap_id(hd(object.data["to"])) recipient = User.get_cached_by_ap_id(hd(object.data["to"]))

21
test/web/activity_pub/side_effects_test.exs
View file

@ -309,6 +309,27 @@ defmodule Pleroma.Web.ActivityPub.SideEffectsTest do
assert Repo.get_by(Notification, user_id: recipient.id, activity_id: create_activity.id) assert Repo.get_by(Notification, user_id: recipient.id, activity_id: create_activity.id)
end end
test "it streams the created ChatMessage" do
author = insert(:user, local: true)
recipient = insert(:user, local: true)
{:ok, chat_message_data, _meta} = Builder.chat_message(author, recipient.ap_id, "hey")
{:ok, create_activity_data, _meta} =
Builder.create(author, chat_message_data["id"], [recipient.ap_id])
{:ok, create_activity, _meta} = ActivityPub.persist(create_activity_data, local: false)
with_mock Pleroma.Web.Streamer, [], stream: fn _, _ -> nil end do
{:ok, _create_activity, _meta} =
SideEffects.handle(create_activity, local: false, object_data: chat_message_data)
object = Object.normalize(create_activity, false)
assert called(Pleroma.Web.Streamer.stream(["user", "user:pleroma_chat"], object))
end
end
test "it creates a Chat for the local users and bumps the unread count, except for the author" do test "it creates a Chat for the local users and bumps the unread count, except for the author" do
author = insert(:user, local: true) author = insert(:user, local: true)
recipient = insert(:user, local: true) recipient = insert(:user, local: true)