diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-07-28 16:28:05 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-07-28 16:28:05 +0200 |
| commit | bca3825c17dd2087f826d9269bb80537bd4ff395 (patch) | |
| tree | 51043b99ec56d263f9d126091afb923292a9e301 /app/models/invite.rb | |
| parent | 91da921dbb51f55bc926c3997ae558d735292a67 (diff) | |
| parent | cfb2ed78231758a79af038a964ab7f7b7b35274e (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
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 |