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

Change: #185 『スタンプをつけられた人』ではなく『スタンプをつけた人』のフォロワーにスタンプを転送 (#232)

Browse source 
* Change: #185 『スタンプをつけられた人』ではなく『スタンプをつけた人』のフォロワーにスタンプを転送

* Fix: 絵文字削除が届かない問題

* Test: 送る方にも同じテストを追加
This commit is contained in:
KMY（雪あすか） 2023-11-04 21:27:59 +09:00 • committed by GitHub
parent a1d197dfef
commit 24909f9760
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 134 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

24
app/services/emoji_react_service.rb
View file

@ -46,29 +46,15 @@ class EmojiReactService < BaseService
def create_notification
status = @emoji_reaction.status
return unless status.account.local?
return unless status.account.user&.setting_enable_emoji_reaction
if status.account.local?
if status.account.user&.setting_enable_emoji_reaction
LocalNotificationWorker.perform_async(status.account_id, @emoji_reaction.id, 'EmojiReaction', 'reaction') if status.account.user&.setting_emoji_reaction_streaming_notify_impl2
LocalNotificationWorker.perform_async(status.account_id, @emoji_reaction.id, 'EmojiReaction', 'emoji_reaction')
end
elsif status.account.activitypub?
ActivityPub::DeliveryWorker.perform_async(payload, @emoji_reaction.account_id, status.account.inbox_url)
end
LocalNotificationWorker.perform_async(status.account_id, @emoji_reaction.id, 'EmojiReaction', 'reaction') if status.account.user&.setting_emoji_reaction_streaming_notify_impl2
LocalNotificationWorker.perform_async(status.account_id, @emoji_reaction.id, 'EmojiReaction', 'emoji_reaction')
end
def notify_to_followers
status = @emoji_reaction.status
return unless status.account.local?
ActivityPub::DeliveryWorker.push_bulk(inboxes, limit: 1_000) do |inbox_url|
[payload, @status.account.id, inbox_url]
end
end
def inboxes
StatusReachFinder.new(@status).all_inboxes
ActivityPub::EmojiReactionDistributionWorker.perform_async(@emoji_reaction.id)
end
def write_stream!

18
app/services/un_emoji_react_service.rb
View file

@ -4,23 +4,23 @@ class UnEmojiReactService < BaseService
include Redisable
include Payloadable
def call(account_id, status_id, emoji_reaction = nil)
@status = Status.find(status_id)
def call(account, status, emoji_reaction = nil)
@account = account
@status = status
if emoji_reaction
emoji_reaction.destroy!
@status.touch # rubocop:disable Rails/SkipsModelValidations
status.touch # rubocop:disable Rails/SkipsModelValidations
create_notification(emoji_reaction) if !@status.account.local? && @status.account.activitypub?
notify_to_followers(emoji_reaction) if @status.account.local?
notify_to_followers(emoji_reaction)
write_stream(emoji_reaction)
relay_for_undo_emoji_reaction!(emoji_reaction)
relay_friend_for_undo_emoji_reaction!(emoji_reaction)
else
account = Account.find(account_id)
bulk(account, @status)
bulk(account, status)
end
emoji_reaction
end
@ -28,8 +28,8 @@ class UnEmojiReactService < BaseService
private
def bulk(account, status)
EmojiReaction.where(account: account).where(status: status).each do |emoji_reaction|
call(account.id, status.id, emoji_reaction)
EmojiReaction.where(account: account, status: status).each do |emoji_reaction|
call(account, status, emoji_reaction)
end
end
@ -38,7 +38,7 @@ class UnEmojiReactService < BaseService
end
def notify_to_followers(emoji_reaction)
ActivityPub::RawDistributionWorker.perform_async(build_json(emoji_reaction), @status.account_id)
ActivityPub::RawDistributionWorker.perform_async(build_json(emoji_reaction), @account.id)
end
def write_stream(emoji_reaction)