gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'parent/main' into upstream-20240426

Browse source
This commit is contained in:
KMY 2024-04-26 09:16:08 +09:00
commit c4017eb993
22 changed files with 389 additions and 146 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/services/notify_service.rb
View file

@ -12,7 +12,7 @@ class NotifyService < BaseService
status_reference
status
list_status
warning
moderation_warning
# TODO: this probably warrants an email notification
severed_relationships
).freeze
@ -26,7 +26,7 @@ class NotifyService < BaseService
def dismiss?
blocked = @recipient.unavailable?
blocked ||= from_self? && @notification.type != :poll && @notification.type != :severed_relationships
blocked ||= from_self? && %i(poll severed_relationships moderation_warning).exclude?(@notification.type)
return blocked if message? && from_staff?
@ -79,6 +79,7 @@ class NotifyService < BaseService
admin.report
poll
update
account_warning
).freeze
def initialize(notification)