Fix remote poll expiration time (mastodon#10144)

ProjectMyosotis · Oct 2, 2019 · 205c83f · 205c83f
1 parent e1119d8
commit 205c83f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb
@@ -216,7 +216,7 @@ def process_poll
     expires_at = begin
       if @object['closed'].is_a?(String)
         @object['closed']
-      elsif !@object['closed'].is_a?(FalseClass)
+      elsif !@object['closed'].nil? && !@object['closed'].is_a?(FalseClass)
         Time.now.utc
       else
         @object['endTime']

diff --git a/app/services/activitypub/fetch_remote_poll_service.rb b/app/services/activitypub/fetch_remote_poll_service.rb
@@ -11,7 +11,7 @@ def call(poll, on_behalf_of = nil)
     expires_at = begin
       if @json['closed'].is_a?(String)
         @json['closed']
-      elsif !@json['closed'].is_a?(FalseClass)
+      elsif !@object['closed'].nil? && !@object['closed'].is_a?(FalseClass)
         Time.now.utc
       else
         @json['endTime']