github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-06 02:24:47 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #300 from goshakkk/cleanup

Browse Source 
Minor cleanup, using AR querying DSL over raw SQL in some places
This commit is contained in:
Robin Ward
2013-03-01 07:52:34 -08:00
parent 27ba923fd4 6e5399d544
commit b66b17bf19
41 changed files with 230 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/models/user.rb
View File

@ -55,7 +55,7 @@ class User < ActiveRecord::Base
end
def self.suggest_username(name)
return nil unless name.present?
return unless name.present?
# If it's an email
if name =~ /([^@]+)@([^\.]+)/
@ -266,7 +266,7 @@ class User < ActiveRecord::Base
end
def has_visit_record?(date)
user_visits.where(["visited_at =? ", date]).first
user_visits.where(visited_at: date).first
end
def adding_visit_record(date)
@ -361,7 +361,7 @@ class User < ActiveRecord::Base
end
def flags_received_count
posts.includes(:post_actions).where('post_actions.post_action_type_id in (?)', PostActionType.FlagTypes).count
posts.includes(:post_actions).where(post_actions: { post_action_type_id: PostActionType.FlagTypes }).count
end
def private_topics_count
@ -435,7 +435,7 @@ class User < ActiveRecord::Base
if last_seen.present?
diff = (Time.now.to_f - last_seen.to_f).round
if diff > 0 && diff < MAX_TIME_READ_DIFF
User.update_all ["time_read = time_read + ?", diff], ["id = ? and time_read = ?", id, time_read]
User.update_all ["time_read = time_read + ?", diff], id: id, time_read: time_read
end
end
$redis.set(last_seen_key, Time.now.to_f)