tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity

Federate blocks with the http://mastodon.social/schema/1.0 verb namespace

Browse Source
This commit is contained in:
Eugen Rochko 2017-01-02 12:17:51 +01:00
parent 9f9e11ce07
commit c04002b340
3 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/lib/tag_manager.rb
View File

@ -14,6 +14,8 @@ class TagManager
delete: 'http://activitystrea.ms/schema/1.0/delete', delete: 'http://activitystrea.ms/schema/1.0/delete',
follow: 'http://activitystrea.ms/schema/1.0/follow', follow: 'http://activitystrea.ms/schema/1.0/follow',
unfollow: 'http://ostatus.org/schema/1.0/unfollow', unfollow: 'http://ostatus.org/schema/1.0/unfollow',
block: 'http://mastodon.social/schema/1.0/block',
unblock: 'http://mastodon.social/schema/1.0/unblock',
}.freeze }.freeze
TYPES = { TYPES = {

4
app/services/block_service.rb
View File

@ -7,10 +7,12 @@ class BlockService < BaseService
UnfollowService.new.call(account, target_account) if account.following?(target_account) UnfollowService.new.call(account, target_account) if account.following?(target_account)
UnfollowService.new.call(target_account, account) if target_account.following?(account) UnfollowService.new.call(target_account, account) if target_account.following?(account)
account.block!(target_account) block = account.block!(target_account)
clear_timelines(account, target_account) clear_timelines(account, target_account)
clear_notifications(account, target_account) clear_notifications(account, target_account)
NotificationWorker.perform_async(block.stream_entry.id, target_account.id) unless target_account.local?
end end
private private

13
app/services/process_interaction_service.rb
View File

@ -41,6 +41,10 @@ class ProcessInteractionService < BaseService
add_post!(body, account) unless status(xml).nil? add_post!(body, account) unless status(xml).nil?
when :delete when :delete
delete_post!(xml, account) delete_post!(xml, account)
when :block
reflect_block!(account, target_account)
when :unblock
reflect_unblock!(account, target_account)
end end
end end
rescue Goldfinger::Error, HTTP::Error, OStatus2::BadSalmonError rescue Goldfinger::Error, HTTP::Error, OStatus2::BadSalmonError
@ -74,6 +78,15 @@ class ProcessInteractionService < BaseService
account.unfollow!(target_account) account.unfollow!(target_account)
end end
def reflect_block!(account, target_account)
UnfollowService.new.call(target_account, account) if target_account.following?(account)
account.block!(target_account)
end
def reflect_unblock!(account, target_account)
UnblockService.new.call(account, target_account)
end
def delete_post!(xml, account) def delete_post!(xml, account)
status = Status.find(xml.at_xpath('//xmlns:id', xmlns: TagManager::XMLNS).content) status = Status.find(xml.at_xpath('//xmlns:id', xmlns: TagManager::XMLNS).content)