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

2019-05-15 17:11:40 +02:00
parent cd534830ad f4f22391b2
commit 6badf2d252
39 changed files with 271 additions and 155 deletions
--- a/lib/cli.rb
+++ b/lib/cli.rb
@@ -106,7 +106,7 @@ module Mastodon
            [json, account.id, inbox_url]
          end

-          account.update_column(:suspended, true)
+          account.suspend!
        end

        processed += 1
--- a/lib/mastodon/accounts_cli.rb
+++ b/lib/mastodon/accounts_cli.rb
@@ -87,8 +87,8 @@ module Mastodon
        end
      end

-      account.suspended = false
-      user.account      = account
+      account.suspended_at = nil
+      user.account         = account

      if user.save
        if options[:confirmed]