Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-26 20:36:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '670e4655d13975e0597bd1c74ebeeeeffc4edc37' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Claire
2024-08-07 19:22:25 +02:00
parent 241d76075c 670e4655d1
commit 06e034db15
123 changed files with 253 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/services/dismiss_notification_request_service.rb Normal file
View File

@@ -0,0 +1,8 @@
# frozen_string_literal: true
class DismissNotificationRequestService < BaseService
def call(request)
FilteredNotificationCleanupWorker.perform_async(request.account_id, request.from_account_id)
request.destroy!
end
end

2
app/services/notify_service.rb
View File

@@ -48,7 +48,7 @@ class NotifyService < BaseService
end
def from_staff?
@sender.local? && @sender.user.present? && @sender.user_role&.overrides?(@recipient.user_role)
@sender.local? && @sender.user.present? && @sender.user_role&.overrides?(@recipient.user_role) && @sender.user_role&.highlighted? && @sender.user_role&.can?(*UserRole::Flags::CATEGORIES[:moderation])
end
def from_self?