about summary refs log tree commit diff
path: root/app/models
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2019-03-12 22:58:59 +0100
committerGitHub <noreply@github.com>2019-03-12 22:58:59 +0100
commit9f5b55ad4f6788f2a2e70a0d11bf12bcc121653d (patch)
tree6e0924de0082defc0a3af9bbd21f0bf320c8997e /app/models
parenta41afef80c03df0aa64158a538920a2f68bea044 (diff)
Fix poll update handler calling method was that was not available (#10246)
* Fix poll update handler calling method was that was not available

Fix regression from #10209

* Refactor VoteService

* Refactor ActivityPub::DistributePollUpdateWorker and optimize it

* Fix typo

* Fix typo
Diffstat (limited to 'app/models')
-rw-r--r--app/models/concerns/expireable.rb6
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