IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

[FEATURE] Disallow ignoring self, admins or moderators users (#7202)

Browse Source
This commit is contained in:
Tarek Khalil
2019-03-20 10:18:46 +00:00
committed by Régis Hanol
parent fed2dd9148
commit 3b59ff0d02
10 changed files with 90 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/serializers/basic_post_serializer.rb
View File

@@ -44,8 +44,11 @@ class BasicPostSerializer < ApplicationSerializer
end
def ignored
object.is_first_post? && IgnoredUser.where(user_id: scope.current_user&.id,
ignored_user_id: object.user_id).exists?
object.is_first_post? &&
scope.current_user&.id != object.user_id &&
!object.user&.staff? &&
IgnoredUser.where(user_id: scope.current_user&.id,
ignored_user_id: object.user_id).exists?
end
def include_name?

2
app/serializers/user_serializer.rb
View File

@@ -282,7 +282,7 @@ class UserSerializer < BasicUserSerializer
end
def can_ignore_user
SiteSetting.ignore_user_enabled
SiteSetting.ignore_user_enabled? && !object.staff? && scope.current_user != object
end
# Needed because 'send_private_message_to_user' will always return false