Thibaut Girka
6 years ago
parent
1b35ca17a9
commit
bb96a74637
@ -1,43 +0,0 @@ |
||||
# frozen_string_literal: true |
||||
|
||||
class ActivityPub::Activity::Move < ActivityPub::Activity |
||||
PROCESSING_COOLDOWN = 7.days.seconds |
||||
|
||||
def perform |
||||
return if origin_account.uri != object_uri || processed? |
||||
|
||||
mark_as_processing! |
||||
|
||||
target_account = ActivityPub::FetchRemoteAccountService.new.call(target_uri) |
||||
|
||||
return if target_account.nil? || !target_account.also_known_as.include?(origin_account.uri) |
||||
|
||||
# In case for some reason we didn't have a redirect for the profile already, set it |
||||
origin_account.update(moved_to_account: target_account) if origin_account.moved_to_account_id.nil? |
||||
|
||||
# Initiate a re-follow for each follower |
||||
origin_account.followers.local.select(:id).find_in_batches do |follower_accounts| |
||||
UnfollowFollowWorker.push_bulk(follower_accounts.map(&:id)) do |follower_account_id| |
||||
[follower_account_id, origin_account.id, target_account.id] |
||||
end |
||||
end |
||||
end |
||||
|
||||
private |
||||
|
||||
def origin_account |
||||
@account |
||||
end |
||||
|
||||
def target_uri |
||||
value_or_id(@json['target']) |
||||
end |
||||
|
||||
def processed? |
||||
redis.exists("move_in_progress:#{@account.id}") |
||||
end |
||||
|
||||
def mark_as_processing! |
||||
redis.setex("move_in_progress:#{@account.id}", PROCESSING_COOLDOWN, true) |
||||
end |
||||
end |
||||
@ -1,18 +0,0 @@ |
||||
# frozen_string_literal: true |
||||
|
||||
class UnfollowFollowWorker |
||||
include Sidekiq::Worker |
||||
|
||||
sidekiq_options queue: 'pull' |
||||
|
||||
def perform(follower_account_id, old_target_account_id, new_target_account_id) |
||||
follower_account = Account.find(follower_account_id) |
||||
old_target_account = Account.find(old_target_account_id) |
||||
new_target_account = Account.find(new_target_account_id) |
||||
|
||||
UnfollowService.new.call(follower_account, old_target_account) |
||||
FollowService.new.call(follower_account, new_target_account) |
||||
rescue ActiveRecord::RecordNotFound |
||||
true |
||||
end |
||||
end |
||||
@ -1,5 +0,0 @@ |
||||
class AddAlsoKnownAsToAccounts < ActiveRecord::Migration[5.2] |
||||
def change |
||||
add_column :accounts, :also_known_as, :string, array: true |
||||
end |
||||
end |
||||
@ -1,52 +0,0 @@ |
||||
require 'rails_helper' |
||||
|
||||
RSpec.describe ActivityPub::Activity::Move do |
||||
let(:follower) { Fabricate(:account) } |
||||
let(:old_account) { Fabricate(:account) } |
||||
let(:new_account) { Fabricate(:account) } |
||||
|
||||
before do |
||||
follower.follow!(old_account) |
||||
|
||||
old_account.update!(uri: 'https://example.org/alice', domain: 'example.org', protocol: :activitypub, inbox_url: 'https://example.org/inbox') |
||||
new_account.update!(uri: 'https://example.com/alice', domain: 'example.com', protocol: :activitypub, inbox_url: 'https://example.com/inbox', also_known_as: [old_account.uri]) |
||||
|
||||
stub_request(:post, 'https://example.org/inbox').to_return(status: 200) |
||||
stub_request(:post, 'https://example.com/inbox').to_return(status: 200) |
||||
|
||||
service_stub = double |
||||
allow(ActivityPub::FetchRemoteAccountService).to receive(:new).and_return(service_stub) |
||||
allow(service_stub).to receive(:call).and_return(new_account) |
||||
end |
||||
|
||||
let(:json) do |
||||
{ |
||||
'@context': 'https://www.w3.org/ns/activitystreams', |
||||
id: 'foo', |
||||
type: 'Move', |
||||
actor: old_account.uri, |
||||
object: old_account.uri, |
||||
target: new_account.uri, |
||||
}.with_indifferent_access |
||||
end |
||||
|
||||
describe '#perform' do |
||||
subject { described_class.new(json, old_account) } |
||||
|
||||
before do |
||||
subject.perform |
||||
end |
||||
|
||||
it 'sets moved account on old account' do |
||||
expect(old_account.reload.moved_to_account_id).to eq new_account.id |
||||
end |
||||
|
||||
it 'makes followers unfollow old account' do |
||||
expect(follower.following?(old_account)).to be false |
||||
end |
||||
|
||||
it 'makes followers follow-request the new account' do |
||||
expect(follower.requested?(new_account)).to be true |
||||
end |
||||
end |
||||
end |
||||
Loading…
Reference in new issue