diff options
| author | Reverite <github@reverite.sh> | 2019-07-31 01:41:31 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-07-31 01:41:31 -0700 |
| commit | 7a312a38f904e853f5703a0b678d0aec83fa858c (patch) | |
| tree | eba4b787f6a617e1c2c5f7d4b5be66320212be1d /app/models/invite.rb | |
| parent | 3013c6cb78358ed8a95a35d5db79608fcb06963f (diff) | |
| parent | 4ecfa8f298399d9857737f212fc8f5767ffa7c6d (diff) | |
Merge branch 'glitch' into production
Diffstat (limited to 'app/models/invite.rb')
| -rw-r--r-- | app/models/invite.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/invite.rb b/app/models/invite.rb index fe2322462..02ab8e0b2 100644 --- a/app/models/invite.rb +++ b/app/models/invite.rb @@ -17,7 +17,7 @@ class Invite < ApplicationRecord include Expireable - belongs_to :user + belongs_to :user, inverse_of: :invites has_many :users, inverse_of: :invite scope :available, -> { where(expires_at: nil).or(where('expires_at >= ?', Time.now.utc)) } @@ -25,7 +25,7 @@ class Invite < ApplicationRecord before_validation :set_code def valid_for_use? - (max_uses.nil? || uses < max_uses) && !expired? + (max_uses.nil? || uses < max_uses) && !expired? && !(user.nil? || user.disabled?) end private |