projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Conversations: Create or bump on inserting a dm.
[akkoma]
/
lib
/
pleroma
/
web
/
activity_pub
/
activity_pub.ex
diff --git
a/lib/pleroma/web/activity_pub/activity_pub.ex
b/lib/pleroma/web/activity_pub/activity_pub.ex
index 9cb4a0542ca35343fd54a03cdc977bca4c6b64fe..880d19a5ee56eea698e937c4f027442acb209852 100644
(file)
--- a/
lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/
lib/pleroma/web/activity_pub/activity_pub.ex
@@
-4,6
+4,7
@@
defmodule Pleroma.Web.ActivityPub.ActivityPub do
alias Pleroma.Activity
defmodule Pleroma.Web.ActivityPub.ActivityPub do
alias Pleroma.Activity
+ alias Pleroma.Conversation
alias Pleroma.Instances
alias Pleroma.Notification
alias Pleroma.Object
alias Pleroma.Instances
alias Pleroma.Notification
alias Pleroma.Object
@@
-143,6
+144,7
@@
defmodule Pleroma.Web.ActivityPub.ActivityPub do
end)
Notification.create_notifications(activity)
end)
Notification.create_notifications(activity)
+ Conversation.create_or_bump_for(activity)
stream_out(activity)
{:ok, activity}
else
stream_out(activity)
{:ok, activity}
else
@@
-150,10
+152,6
@@
defmodule Pleroma.Web.ActivityPub.ActivityPub do
{:ok, activity}
{:fake, true, map, recipients} ->
{:ok, activity}
{:fake, true, map, recipients} ->
- map =
- map
- |> put_in(["object", "fake"], true)
-
activity = %Activity{
data: map,
local: local,
activity = %Activity{
data: map,
local: local,