mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-09 16:35:48 +00:00
6d6a429af8
* Rewrite Atom generation from stream entries to use Ox instead of Nokogiri::Builder StreamEntry is now limited to only statuses, which allows some optimization. Removed extra queries on AccountsController#show. AtomSerializer instead of AtomBuilderHelper used in AccountsController#show, StreamEntriesController#show, StreamEntryRenderer and PubSubHubbub::DistributionWorker PubSubHubbub::DistributionWorker moves n+1 DomainBlock query to PubSubHubbub::DeliveryWorker instead. All Salmon slaps that aren't based on StreamEntry still use AtomBuilderHelper and Nokogiri * All Salmon slaps now use Ox instead of Nokogiri. No touch from status on account
24 lines
700 B
Ruby
24 lines
700 B
Ruby
# frozen_string_literal: true
|
|
|
|
class BlockService < BaseService
|
|
include StreamEntryRenderer
|
|
|
|
def call(account, target_account)
|
|
return if account.id == target_account.id
|
|
|
|
UnfollowService.new.call(account, target_account) if account.following?(target_account)
|
|
UnfollowService.new.call(target_account, account) if target_account.following?(account)
|
|
|
|
block = account.block!(target_account)
|
|
|
|
BlockWorker.perform_async(account.id, target_account.id)
|
|
NotificationWorker.perform_async(build_xml(block), account.id, target_account.id) unless target_account.local?
|
|
end
|
|
|
|
private
|
|
|
|
def build_xml(block)
|
|
AtomSerializer.render(AtomSerializer.new.block_salmon(block))
|
|
end
|
|
end
|