From: kaiyou <pierre@jaury.eu>
Date: Thu, 30 Apr 2020 12:39:05 +0000 (+0200)
Subject: Only check locally when deduplicating usernames (#13581)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=3511528e508aa365e7f88b7e3b6a3b8f99c531cc;p=mastodon.git

Only check locally when deduplicating usernames (#13581)

When deduplicating account usernames for OAuthable users, the routine did check if any account was known with that username, including remote accounts. This caused some unnecessary deduplication, and usernames ending with unexpected trailing _1.
This fixes #13580
---

diff --git a/app/models/concerns/omniauthable.rb b/app/models/concerns/omniauthable.rb
index 960784222..736da6c1d 100644
--- a/app/models/concerns/omniauthable.rb
+++ b/app/models/concerns/omniauthable.rb
@@ -82,7 +82,7 @@ module Omniauthable
       username = starting_username
       i        = 0
 
-      while Account.exists?(username: username)
+      while Account.exists?(username: username, domain: nil)
         i       += 1
         username = "#{starting_username}_#{i}"
       end