From: Thibaut Girka Date: Thu, 31 Oct 2019 13:40:58 +0000 (+0100) Subject: Do not consider moved accounts as non-functional X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=b25665d2e87548b79b2bab3eab5c78b2328e2dbb;p=mastodon.git Do not consider moved accounts as non-functional This might be somewhat controversial, but putting a redirection up makes the account unusable, which works against use cases such as using the moved account as backup in case the new one temporarily fails (sure, the redirection can be temporarily removed, but it is a hassle) --- diff --git a/app/models/user.rb b/app/models/user.rb index e33610d54..49cfc25ca 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -169,7 +169,7 @@ class User < ApplicationRecord end def functional? - confirmed? && approved? && !disabled? && !account.suspended? && account.moved_to_account_id.nil? + confirmed? && approved? && !disabled? && !account.suspended? end def unconfirmed_or_pending?