Merge branch 'develop' of https://code.gab.com/gab/social/gab-social into feature/frontend_refactor

2020-05-15 00:00:44 -04:00
parent e321c36c25 589605c46e
commit 3946728353
5 changed files with 43 additions and 35 deletions
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -352,7 +352,9 @@ class User < ApplicationRecord
  def set_unique_email
    user, domain = self.email.split('@')
    user = user.split('+').first
-    user = user.gsub('.', '') if domain == 'gmail.com'
+    if ((domain == 'gmail.com') || (domain == 'hotmail.com'))
+      user = user.gsub('.', '')
+    end
    self.unique_email = "#{user}@#{domain}"
  end
 end