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

This commit is contained in:
KMY 2024-08-30 08:17:34 +09:00
commit 206021455e
25 changed files with 378 additions and 144 deletions

View file

@ -240,7 +240,7 @@ class NotifyService < BaseService
private
def notification_group_key
return nil if @notification.filtered || %i(favourite emoji_reaction reblog).exclude?(@notification.type)
return nil if @notification.filtered || Notification::GROUPABLE_NOTIFICATION_TYPES.exclude?(@notification.type)
type_prefix = "#{@notification.type}-#{@notification.target_status.id}"
redis_key = "notif-group/#{@recipient.id}/#{type_prefix}"