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

clean up first day user definition and object model

Browse Source
This commit is contained in:
Sam
2015-03-26 16:48:36 +11:00
parent 9834d11503
commit 5aa1272f05
4 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/models/user.rb
View File

@ -311,6 +311,12 @@ class User < ActiveRecord::Base
self.password_hash == hash_password(password, salt)
end
def first_day_user?
!staff? &&
trust_level < TrustLevel[2] &&
created_at >= 24.hours.ago
end
def new_user?
(created_at >= 24.hours.ago || trust_level == TrustLevel[0]) &&
trust_level < TrustLevel[2] &&
@ -562,10 +568,6 @@ class User < ActiveRecord::Base
uploaded_avatar.present?
end
def added_a_day_ago?
created_at > 1.day.ago
end
def generate_api_key(created_by)
if api_key.present?
api_key.regenerate!(created_by)