projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'develop' of ssh://git.pleroma.social/pleroma/pleroma into feature/delet...
[akkoma]
/
lib
/
pleroma
/
web
/
activity_pub
/
pipeline.ex
diff --git
a/lib/pleroma/web/activity_pub/pipeline.ex
b/lib/pleroma/web/activity_pub/pipeline.ex
index 7ccee54c9d829d14204bde726a2958c6e41c54c5..017e39abb7a8f033eb8b0abaf0d101fd1438b2f3 100644
(file)
--- a/
lib/pleroma/web/activity_pub/pipeline.ex
+++ b/
lib/pleroma/web/activity_pub/pipeline.ex
@@
-29,7
+29,9
@@
defmodule Pleroma.Web.ActivityPub.Pipeline do
defp maybe_federate(activity, meta) do
with {:ok, local} <- Keyword.fetch(meta, :local) do
- if local do
+ do_not_federate = meta[:do_not_federate]
+
+ if !do_not_federate && local do
Federator.publish(activity)
{:ok, :federated}
else