feat: don't add inbox condition for admins in search (#12028)
This commit is contained in:
@@ -1,6 +1,10 @@
|
||||
class SearchService
|
||||
pattr_initialize [:current_user!, :current_account!, :params!, :search_type!]
|
||||
|
||||
def account_user
|
||||
@account_user ||= current_account.account_users.find_by(user: current_user)
|
||||
end
|
||||
|
||||
def perform
|
||||
case search_type
|
||||
when 'Message'
|
||||
@@ -78,8 +82,9 @@ class SearchService
|
||||
end
|
||||
|
||||
def message_base_query
|
||||
current_account.messages.where(inbox_id: accessable_inbox_ids)
|
||||
.where('created_at >= ?', 3.months.ago)
|
||||
query = current_account.messages.where('created_at >= ?', 3.months.ago)
|
||||
query = query.where(inbox_id: accessable_inbox_ids) unless account_user.administrator?
|
||||
query
|
||||
end
|
||||
|
||||
def use_gin_search
|
||||
|
||||
Reference in New Issue
Block a user