From 3a4d994c40962a9abe45565a34e3d7a3ca1ccd49 Mon Sep 17 00:00:00 2001
From: ThibG <thib@sitedethib.com>
Date: Tue, 1 Oct 2019 15:10:00 +0200
Subject: [PATCH] Fix BootstrapTimelineService crashing when bootstrapped
accounts are invalid (#12037)
* Add test to handle suspended and missing users in BootstrapTimelineService
* Fix BootstrapTimelineService crashing when bootstrapped accounts are invalid
---
app/services/bootstrap_timeline_service.rb | 8 +++++++-
spec/services/bootstrap_timeline_service_spec.rb | 7 ++++++-
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/app/services/bootstrap_timeline_service.rb b/app/services/bootstrap_timeline_service.rb
index db2c83e5d..c489601c1 100644
--- a/app/services/bootstrap_timeline_service.rb
+++ b/app/services/bootstrap_timeline_service.rb
@@ -17,7 +17,11 @@ class BootstrapTimelineService < BaseService
def autofollow_bootstrap_timeline_accounts!
bootstrap_timeline_accounts.each do |target_account|
- FollowService.new.call(@source_account, target_account)
+ begin
+ FollowService.new.call(@source_account, target_account)
+ rescue ActiveRecord::RecordNotFound, Mastodon::NotPermittedError
+ nil
+ end
end
end
@@ -40,7 +44,9 @@ class BootstrapTimelineService < BaseService
def local_unlocked_accounts(usernames)
Account.local
+ .without_suspended
.where(username: usernames)
.where(locked: false)
+ .where(moved_to_account_id: nil)
end
end
diff --git a/spec/services/bootstrap_timeline_service_spec.rb b/spec/services/bootstrap_timeline_service_spec.rb
index a765de791..a28d2407c 100644
--- a/spec/services/bootstrap_timeline_service_spec.rb
+++ b/spec/services/bootstrap_timeline_service_spec.rb
@@ -22,9 +22,10 @@ RSpec.describe BootstrapTimelineService, type: :service do
context 'when setting is set' do
let!(:alice) { Fabricate(:account, username: 'alice') }
let!(:bob) { Fabricate(:account, username: 'bob') }
+ let!(:eve) { Fabricate(:account, username: 'eve', suspended: true) }
before do
- Setting.bootstrap_timeline_accounts = 'alice, bob'
+ Setting.bootstrap_timeline_accounts = 'alice, @bob, eve, unknown'
subject.call(source_account)
end
@@ -32,6 +33,10 @@ RSpec.describe BootstrapTimelineService, type: :service do
expect(source_account.following?(alice)).to be true
expect(source_account.following?(bob)).to be true
end
+
+ it 'does not follow suspended account' do
+ expect(source_account.following?(eve)).to be false
+ end
end
end
end