projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/missing-own_votes' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
activity_pub
/
mrf
/
tag_policy.ex
diff --git
a/lib/pleroma/web/activity_pub/mrf/tag_policy.ex
b/lib/pleroma/web/activity_pub/mrf/tag_policy.ex
index 95864156f9d6e33f5c088ba1f43c82bc482e9842..5739cee6319a3c0c2423a5406fb2b751222a0cd0 100644
(file)
--- a/
lib/pleroma/web/activity_pub/mrf/tag_policy.ex
+++ b/
lib/pleroma/web/activity_pub/mrf/tag_policy.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-20
19
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-20
21
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.ActivityPub.MRF.TagPolicy do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.ActivityPub.MRF.TagPolicy do
@@
-134,12
+134,13
@@
defmodule Pleroma.Web.ActivityPub.MRF.TagPolicy do
if user.local == true do
{:ok, message}
else
if user.local == true do
{:ok, message}
else
- {:reject, nil}
+ {:reject,
+ "[TagPolicy] Follow from #{actor} tagged with mrf_tag:disable-remote-subscription"}
end
end
end
end
- defp process_tag("mrf_tag:disable-any-subscription", %{"type" => "Follow"}),
- do: {:reject,
nil
}
+ defp process_tag("mrf_tag:disable-any-subscription", %{"type" => "Follow"
, "actor" => actor
}),
+ do: {:reject,
"[TagPolicy] Follow from #{actor} tagged with mrf_tag:disable-any-subscription"
}
defp process_tag(_, message), do: {:ok, message}
defp process_tag(_, message), do: {:ok, message}
@@
-167,5
+168,5
@@
defmodule Pleroma.Web.ActivityPub.MRF.TagPolicy do
def filter(message), do: {:ok, message}
@impl true
def filter(message), do: {:ok, message}
@impl true
- def describe
()
, do: {:ok, %{}}
+ def describe, do: {:ok, %{}}
end
end