Fix remote poll expiration time (#10144)

6 years ago · ae1b9cf70a
parent f821eca3b3
commit ae1b9cf70a
2 changed files with 2 additions and 2 deletions
--- a/app/lib/activitypub/activity/create.rb
+++ b/app/lib/activitypub/activity/create.rb
@ -216,7 +216,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
    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']
--- a/app/services/activitypub/fetch_remote_poll_service.rb
+++ b/app/services/activitypub/fetch_remote_poll_service.rb
@ -11,7 +11,7 @@ class ActivityPub::FetchRemotePollService < BaseService
    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']