Merge pull request #271 from goshakkk/topic-refactor

Refactor Topic

app/models/user.rb

@@ -167,10 +167,14 @@ class User < ActiveRecord::Base
   def self.find_by_temporary_key(key)
     user_id = $redis.get("temporary_key:#{key}")
     if user_id.present?
-      User.where(id: user_id.to_i).first
+      where(id: user_id.to_i).first
     end
   end
 
+  def self.find_by_username_or_email(username_or_email)
+    where("username_lower = :user or lower(username) = :user or lower(email) = :user or lower(name) = :user", user: username_or_email.downcase)
+  end
+
   # tricky, we need our bus to be subscribed from the right spot
   def sync_notification_channel_position
     @unread_notifications_by_type = nil