tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
	app/lib/user_settings_decorator.rb
	app/models/user.rb
	app/serializers/initial_state_serializer.rb
	app/views/stream_entries/_simple_status.html.haml
	config/locales/simple_form.en.yml
	config/locales/simple_form.ja.yml
	config/locales/simple_form.pl.yml
	config/routes.rb
This commit is contained in:
Thibaut Girka
2018-10-01 12:43:20 +02:00
parent 4e60a0d543 5d5d1b528e
commit c91d9b7389
181 changed files with 1321 additions and 762 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/mastodon/accounts_cli.rb
View File

@ -83,7 +83,8 @@ module Mastodon
end
end
user.account = account
account.suspended = false
user.account = account
if user.save
if options[:confirmed]
@ -170,11 +171,32 @@ module Mastodon
exit(1)
end
say("Deleting user with #{account.statuses_count}, this might take a while...")
say("Deleting user with #{account.statuses_count} statuses, this might take a while...")
SuspendAccountService.new.call(account, remove_user: true)
say('OK', :green)
end
desc 'backup USERNAME', 'Request a backup for a user'
long_desc <<-LONG_DESC
Request a new backup for an account with a given USERNAME.
The backup will be created in Sidekiq asynchronously, and
the user will receive an e-mail with a link to it once
it's done.
LONG_DESC
def backup(username)
account = Account.find_local(username)
if account.nil?
say('No user with such username', :red)
exit(1)
end
backup = account.user.backups.create!
BackupWorker.perform_async(backup.id)
say('OK', :green)
end
option :dry_run, type: :boolean
desc 'cull', 'Remove remote accounts that no longer exist'
long_desc <<-LONG_DESC