Skip to content

Commit

Permalink
Fix accounts created through tootctl not being always pre-approved (m…
Browse files Browse the repository at this point in the history
…astodon#10684)

Add `--approve` option to `tootctl accounts modify`
  • Loading branch information
Gargron authored May 3, 2019
1 parent 527c3f1 commit b119596
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion lib/mastodon/accounts_cli.rb
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ def rotate(username = nil)
def create(username)
account = Account.new(username: username)
password = SecureRandom.hex
user = User.new(email: options[:email], password: password, agreement: true, admin: options[:role] == 'admin', moderator: options[:role] == 'moderator', confirmed_at: options[:confirmed] ? Time.now.utc : nil)
user = User.new(email: options[:email], password: password, agreement: true, approved: true, admin: options[:role] == 'admin', moderator: options[:role] == 'moderator', confirmed_at: options[:confirmed] ? Time.now.utc : nil)

if options[:reattach]
account = Account.find_local(username) || Account.new(username: username)
Expand Down Expand Up @@ -115,6 +115,7 @@ def create(username)
option :enable, type: :boolean
option :disable, type: :boolean
option :disable_2fa, type: :boolean
option :approve, type: :boolean
desc 'modify USERNAME', 'Modify a user'
long_desc <<-LONG_DESC
Modify a user account.
Expand All @@ -128,6 +129,9 @@ def create(username)
With the --disable option, lock the user out of their account. The
--enable option is the opposite.
With the --approve option, the account will be approved, if it was
previously not due to not having open registrations.
With the --disable-2fa option, the two-factor authentication
requirement for the user can be removed.
LONG_DESC
Expand All @@ -147,6 +151,7 @@ def modify(username)
user.email = options[:email] if options[:email]
user.disabled = false if options[:enable]
user.disabled = true if options[:disable]
user.approved = true if options[:approve]
user.otp_required_for_login = false if options[:disable_2fa]
user.confirm if options[:confirm]

Expand Down

0 comments on commit b119596

Please sign in to comment.