ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix processing poll Updates (#10333) 

ActivityPub::ProcessPollService was checking the JSON-LD context although
it was passed only the `Question` object embedded in the `Update` activity.
rebase/4.0.0rc2
ThibG 2019-03-21 14:24:09 +01:00 committed by Eugen Rochko
parent d66bbdd353
commit 62dd0b7f9c
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,6 +5,7 @@ class ActivityPub::FetchRemotePollService < BaseService
def call(poll, on_behalf_of = nil) def call(poll, on_behalf_of = nil)
json = fetch_resource(poll.status.uri, true, on_behalf_of) json = fetch_resource(poll.status.uri, true, on_behalf_of)
return unless supported_context?(json)
ActivityPub::ProcessPollService.new.call(poll, json) ActivityPub::ProcessPollService.new.call(poll, json)
end end
end end

6
app/services/activitypub/process_poll_service.rb
View File

@ -5,7 +5,7 @@ class ActivityPub::ProcessPollService < BaseService
def call(poll, json) def call(poll, json)
@json = json @json = json
return unless supported_context? && expected_type? return unless expected_type?
previous_expires_at = poll.expires_at previous_expires_at = poll.expires_at
@ -54,10 +54,6 @@ class ActivityPub::ProcessPollService < BaseService
private private
def supported_context?
super(@json)
end
def expected_type? def expected_type?
equals_or_includes_any?(@json['type'], %w(Question)) equals_or_includes_any?(@json['type'], %w(Question))
end end