Skip to content

Commit

Permalink
Wip: スタンプの転送 (#81)
Browse files Browse the repository at this point in the history
* Fix: 自分で自分に絵文字リアクションをつけた時、他サーバーに転送されない問題

* 修正

* 修正
  • Loading branch information
kmycode authored Oct 11, 2023
1 parent 1630529 commit 674cce1
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 2 deletions.
28 changes: 27 additions & 1 deletion app/services/emoji_react_service.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ class EmojiReactService < BaseService
def call(account, status, name)
status = status.reblog if status.reblog? && !status.reblog.nil?
authorize_with account, status, :emoji_reaction?
@status = status

emoji_reaction = nil

Expand All @@ -36,6 +37,9 @@ def call(account, status, name)
notify_to_followers(emoji_reaction)
bump_potential_friendship(account, status)
write_stream(emoji_reaction)
forward_for_emoji_reaction!(emoji_reaction)
relay_for_emoji_reaction!(emoji_reaction)
relay_friend_for_emoji_reaction!(emoji_reaction)

emoji_reaction
end
Expand Down Expand Up @@ -79,11 +83,33 @@ def bump_potential_friendship(account, status)
end

def build_json(emoji_reaction)
Oj.dump(serialize_payload(emoji_reaction, ActivityPub::EmojiReactionSerializer, signer: emoji_reaction.account))
@build_json = Oj.dump(serialize_payload(emoji_reaction, ActivityPub::EmojiReactionSerializer, signer: emoji_reaction.account))
end

def render_emoji_reaction(emoji_group)
# @rendered_emoji_reaction ||= InlineRenderer.render(HashObject.new(emoji_group), nil, :emoji_reaction)
@render_emoji_reaction ||= Oj.dump(event: :emoji_reaction, payload: emoji_group.to_json)
end

def forward_for_emoji_reaction!(emoji_reaction)
return unless @status.local?

ActivityPub::RawDistributionWorker.perform_async(build_json(emoji_reaction), @status.account.id, [@status.account.preferred_inbox_url])
end

def relay_for_emoji_reaction!(emoji_reaction)
return unless @status.local? && @status.public_visibility?

ActivityPub::DeliveryWorker.push_bulk(Relay.enabled.pluck(:inbox_url)) do |inbox_url|
[build_json(emoji_reaction), @status.account.id, inbox_url]
end
end

def relay_friend_for_emoji_reaction!(emoji_reaction)
return unless @status.local? && @status.distributable_friend?

ActivityPub::DeliveryWorker.push_bulk(FriendDomain.distributables.pluck(:inbox_url)) do |inbox_url|
[build_json(emoji_reaction), @status.account.id, inbox_url]
end
end
end
28 changes: 27 additions & 1 deletion app/services/un_emoji_react_service.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ def call(account_id, status_id, emoji_reaction = nil)
create_notification(emoji_reaction) if !@status.account.local? && @status.account.activitypub?
notify_to_followers(emoji_reaction) if @status.account.local?
write_stream(emoji_reaction)

forward_for_undo_emoji_reaction!(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)
Expand Down Expand Up @@ -52,11 +56,33 @@ def write_stream(emoji_reaction)
end

def build_json(emoji_reaction)
Oj.dump(serialize_payload(emoji_reaction, ActivityPub::UndoEmojiReactionSerializer, signer: emoji_reaction.account))
@build_json = Oj.dump(serialize_payload(emoji_reaction, ActivityPub::UndoEmojiReactionSerializer, signer: emoji_reaction.account))
end

def render_emoji_reaction(emoji_group)
# @rendered_emoji_reaction ||= InlineRenderer.render(emoji_group, nil, :emoji_reaction)
Oj.dump(event: :emoji_reaction, payload: emoji_group.to_json)
end

def forward_for_undo_emoji_reaction!(emoji_reaction)
return unless @status.local?

ActivityPub::RawDistributionWorker.perform_async(build_json(emoji_reaction), @status.account.id, [@status.account.preferred_inbox_url])
end

def relay_for_undo_emoji_reaction!(emoji_reaction)
return unless @status.local? && @status.public_visibility?

ActivityPub::DeliveryWorker.push_bulk(Relay.enabled.pluck(:inbox_url)) do |inbox_url|
[build_json(emoji_reaction), @status.account.id, inbox_url]
end
end

def relay_friend_for_undo_emoji_reaction!(emoji_reaction)
return unless @status.local? && @status.distributable_friend?

ActivityPub::DeliveryWorker.push_bulk(FriendDomain.distributables.pluck(:inbox_url)) do |inbox_url|
[build_json(emoji_reaction), @status.account.id, inbox_url]
end
end
end

0 comments on commit 674cce1

Please sign in to comment.