paravielfalt/mastodon
5
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Activity Actions

Fix refollowing (#4931)

Browse source 
* Make RefollowWorker ActivityPub-only to avoid potential identifier mismatches

* Don't call RefollowWorker on new accounts
This commit is contained in:
ThibG 2017-09-14 00:05:25 +02:00 committed by Eugen Rochko
parent 9239e4ce4d
commit af00220d79
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/services/activitypub/process_account_service.rb
View file

@ -15,11 +15,11 @@ class ActivityPub::ProcessAccountService < BaseService
@account = Account.find_by(uri: @uri) @account = Account.find_by(uri: @uri)
@collections = {} @collections = {}
old_public_key = @account&.public_key
create_account if @account.nil? create_account if @account.nil?
upgrade_account if @account.ostatus? upgrade_account if @account.ostatus?
old_public_key = @account.public_key
update_account update_account
RefollowWorker.perform_async(@account.id) if old_public_key != @account.public_key RefollowWorker.perform_async(@account.id) if !old_public_key.nil? && old_public_key != @account.public_key
@account @account
rescue Oj::ParseError rescue Oj::ParseError

2
app/services/resolve_remote_account_service.rb
View file

@ -85,10 +85,8 @@ class ResolveRemoteAccountService < BaseService
def handle_ostatus def handle_ostatus
create_account if @account.nil? create_account if @account.nil?
old_public_key = @account.public_key
update_account update_account
update_account_profile if update_profile? update_account_profile if update_profile?
RefollowWorker.perform_async(@account.id) if old_public_key != @account.public_key
end end
def update_profile? def update_profile?

1
app/workers/refollow_worker.rb
View file

@ -7,6 +7,7 @@ class RefollowWorker
def perform(target_account_id) def perform(target_account_id)
target_account = Account.find(target_account_id) target_account = Account.find(target_account_id)
return unless target_account.protocol == :activitypub
target_account.followers.where(domain: nil).find_each do |follower| target_account.followers.where(domain: nil).find_each do |follower|
# Locally unfollow remote account # Locally unfollow remote account