Skip to content

Commit 205c83f

Browse files
Gargronhiyuki2578
authored andcommitted
Fix remote poll expiration time (mastodon#10144)
1 parent e1119d8 commit 205c83f

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

app/lib/activitypub/activity/create.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ def process_poll
216216
expires_at = begin
217217
if @object['closed'].is_a?(String)
218218
@object['closed']
219-
elsif !@object['closed'].is_a?(FalseClass)
219+
elsif !@object['closed'].nil? && !@object['closed'].is_a?(FalseClass)
220220
Time.now.utc
221221
else
222222
@object['endTime']

app/services/activitypub/fetch_remote_poll_service.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ def call(poll, on_behalf_of = nil)
1111
expires_at = begin
1212
if @json['closed'].is_a?(String)
1313
@json['closed']
14-
elsif !@json['closed'].is_a?(FalseClass)
14+
elsif !@object['closed'].nil? && !@object['closed'].is_a?(FalseClass)
1515
Time.now.utc
1616
else
1717
@json['endTime']

0 commit comments

Comments
 (0)