diff options
| author | ThibG <thib@sitedethib.com> | 2019-03-13 16:55:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-13 16:55:07 +0100 |
| commit | 3005e473a0df4d2ea942dcc33e01c5e4c15b81fa (patch) | |
| tree | 8d0b0e635bf12a56ae99278ab206684da2a9aad1 /app/models/concerns/expireable.rb | |
| parent | c2857c976c7d4a8bbd02c3c18569913f2bf8a034 (diff) | |
| parent | 387f253f3100317ae247928aa9168f431879ecb6 (diff) | |
Merge pull request #957 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/concerns/expireable.rb')
| -rw-r--r-- | app/models/concerns/expireable.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/models/concerns/expireable.rb b/app/models/concerns/expireable.rb index 2c0631476..f7d2bab49 100644 --- a/app/models/concerns/expireable.rb +++ b/app/models/concerns/expireable.rb @@ -18,7 +18,11 @@ module Expireable end def expired? - !expires_at.nil? && expires_at < Time.now.utc + expires? && expires_at < Time.now.utc + end + + def expires? + !expires_at.nil? end end end |