From: Stanislas <angristan@pm.me>
Date: Sat, 17 Aug 2019 20:59:40 +0000 (+0200)
Subject: Limit "tootctl accounts follow" to local accounts (#11592)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=3a77090d015203a1ae20376ed69ca699eed3976d;p=mastodon.git

Limit "tootctl accounts follow" to local accounts (#11592)

To (somewhat) limit mass remote follow. Fix #11360
---

diff --git a/lib/mastodon/accounts_cli.rb b/lib/mastodon/accounts_cli.rb
index 7d0215313..d1854acc0 100644
--- a/lib/mastodon/accounts_cli.rb
+++ b/lib/mastodon/accounts_cli.rb
@@ -314,11 +314,15 @@ module Mastodon
 
     desc 'follow ACCT', 'Make all local accounts follow account specified by ACCT'
     long_desc <<-LONG_DESC
-      Make all local accounts follow an account specified by ACCT. ACCT can be
-      a simple username, in case of a local user. It can also be in the format
-      username@domain, in case of a remote user.
+      Make all local accounts follow another local account specified by ACCT.
+      ACCT should be the username only.
     LONG_DESC
     def follow(acct)
+      if acct.include? '@'
+        say('Target account name should not contain a target instance, since it has to be a local account.', :red)
+        exit(1)
+      end
+
       target_account = ResolveAccountService.new.call(acct)
       processed      = 0
       failed         = 0