tarrien/Mastodon
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix remote poll expiration time (#10144)

Browse Source
This commit is contained in:
Eugen Rochko authored and GitHub committed 2019-03-04 00:44:34 +01:00
1 parent f821eca3b3
commit ae1b9cf70a
2 files changed
+2 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/lib/activitypub/activity/create.rb
+1 -1
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']
app/services/activitypub/fetch_remote_poll_service.rb
+1 -1
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 !@object['closed'].nil? && !@object['closed'].is_a?(FalseClass)
Time.now.utc
else
@json['endTime']