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

This commit is contained in:
KMY 2025-04-03 08:36:36 +09:00
commit 32f5604499
265 changed files with 6227 additions and 3383 deletions

View file

@ -0,0 +1,10 @@
# frozen_string_literal: true
module Fasp::Provider::DebugConcern
extend ActiveSupport::Concern
def perform_debug_call
Fasp::Request.new(self)
.post('/debug/v0/callback/logs', body: { hello: 'world' })
end
end

View file

@ -4,7 +4,7 @@ module Notification::Groups
extend ActiveSupport::Concern
# `set_group_key!` needs to be updated if this list changes
GROUPABLE_NOTIFICATION_TYPES = %i(favourite reblog follow emoji_reaction).freeze
GROUPABLE_NOTIFICATION_TYPES = %i(favourite reblog follow emoji_reaction admin.sign_up).freeze
MAXIMUM_GROUP_SPAN_HOURS = 12
included do
@ -17,7 +17,7 @@ module Notification::Groups
type_prefix = case type
when :favourite, :reblog, :emoji_reaction
[type, target_status&.id].join('-')
when :follow
when :follow, :'admin.sign_up'
type
else
raise NotImplementedError