summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2023-02-09 19:09:23 +0000
committerlain <lain@soykaf.club>2023-02-09 19:09:23 +0000
commit4d3c2fb21b2ec1a80d6a3076f1044f572dfcc4c6 (patch)
tree04449eb78dca9ec36a55b6e449970e7a56eebb81 /lib
parent16276c8f872a43b8d30f2918ec92283e484b0b6a (diff)
parent7467b24730657e33c1f88627ef5609a3c9bd742e (diff)
downloadpleroma-4d3c2fb21b2ec1a80d6a3076f1044f572dfcc4c6.tar.gz
pleroma-4d3c2fb21b2ec1a80d6a3076f1044f572dfcc4c6.zip
Merge branch 'tusooa/notif-setting' into 'develop'
Fix block_from_stranger setting See merge request pleroma/pleroma!3833
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/notification.ex2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/notification.ex b/lib/pleroma/notification.ex
index aba6096bc..60c1a80ba 100644
--- a/lib/pleroma/notification.ex
+++ b/lib/pleroma/notification.ex
@@ -679,7 +679,7 @@ defmodule Pleroma.Notification do
cond do
opts[:type] == "poll" -> false
user.ap_id == actor -> false
- !User.following?(follower, user) -> true
+ !User.following?(user, follower) -> true
true -> false
end
end