Browse Source

Fix remote poll expiration time (#10144)

pull/4/head
Eugen Rochko 5 years ago
committed by GitHub
parent
commit
ae1b9cf70a
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
  1. +1
    -1
      app/lib/activitypub/activity/create.rb
  2. +1
    -1
      app/services/activitypub/fetch_remote_poll_service.rb

+ 1
- 1
app/lib/activitypub/activity/create.rb View File

@ -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']

+ 1
- 1
app/services/activitypub/fetch_remote_poll_service.rb View File

@ -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 !@objectspan>[n>'closed'].nil? && !@object['closed'].is_a?(FalseClass)
Time.now.utc
else
@json['endTime']

Loading…
Cancel
Save