IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-25 10:20:58 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: extract filter pm and categories from UserAction (#14569)

Browse Source 
Those two methods are useful for different places like discourse-reactions:

213d90b82f (diff-00e1224615af30993a63193531b5073c11d5c20e91c46e2a59c1cd25e8952da6R203)
This commit is contained in:
Krzysztof Kotlarek 2021-10-12 17:37:09 +11:00 committed by GitHub
parent eeecb2460d
commit 300ed6ea75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/models/user_action.rb
View File

@ -417,6 +417,11 @@ class UserAction < ActiveRecord::Base
builder.where("a.action_type not in (#{BOOKMARK})")
end
filter_private_messages(builder, user_id, guardian, ignore_private_messages)
filter_categories(builder, guardian)
end
def self.filter_private_messages(builder, user_id, guardian, ignore_private_messages = false)
if !guardian.can_see_private_messages?(user_id) || ignore_private_messages || !guardian.user
builder.where("t.archetype <> :private_message", private_message: Archetype::private_message)
else
@ -436,7 +441,10 @@ class UserAction < ActiveRecord::Base
builder.where(sql, private_message: Archetype::private_message, current_user_id: guardian.user.id)
end
end
builder
end
def self.filter_categories(builder, guardian)
unless guardian.is_admin?
allowed = guardian.secure_category_ids
if allowed.present?
@ -447,6 +455,7 @@ class UserAction < ActiveRecord::Base
builder.where("(c.read_restricted IS NULL OR NOT c.read_restricted)")
end
end
builder
end
def self.require_parameters(data, *params)