about summary refs log tree commit diff
path: root/app/workers/import
diff options
context:
space:
mode:
authorStarfall <us@starfall.systems>2021-01-07 10:25:39 -0600
committerStarfall <us@starfall.systems>2021-01-07 10:25:39 -0600
commit29227b32e150894e15098bcf216b1f5c08763200 (patch)
treeafa3ac9c52a63ca672e619876c84cf59f2dbb36f /app/workers/import
parent6ed4e874c5ace36344f77b3f096c4089d9b11e01 (diff)
parentd42e7e01dcd464f80637682d4eee6e5a7f36f26e (diff)
Merge remote-tracking branch 'glitchsoc/master' into main
Diffstat (limited to 'app/workers/import')
-rw-r--r--app/workers/import/relationship_worker.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/workers/import/relationship_worker.rb b/app/workers/import/relationship_worker.rb
index 4a455f3ae..4a7100435 100644
--- a/app/workers/import/relationship_worker.rb
+++ b/app/workers/import/relationship_worker.rb
@@ -15,7 +15,11 @@ class Import::RelationshipWorker
 
     case relationship
     when 'follow'
-      FollowService.new.call(from_account, target_account, options)
+      begin
+        FollowService.new.call(from_account, target_account, options)
+      rescue ActiveRecord::RecordInvalid
+        raise if FollowLimitValidator.limit_for_account(from_account) < from_account.following_count
+      end
     when 'unfollow'
       UnfollowService.new.call(from_account, target_account)
     when 'block'