Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Fix namespace parsing in Atom feeds

Browse source
This commit is contained in:
Eugen Rochko 2016-10-10 18:05:52 +02:00
parent f49ed8c819
commit 87b618ab02
3 changed files with 23 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/services/process_interaction_service.rb
View file

@ -1,4 +1,6 @@
class ProcessInteractionService < BaseService
ACTIVITY_NS = 'http://activitystrea.ms/spec/1.0/'.freeze
# Record locally the remote interaction with our user
# @param [String] envelope Salmon envelope
# @param [Account] target_account Account the Salmon was addressed to
@ -53,7 +55,7 @@ class ProcessInteractionService < BaseService
end
def verb(xml)
xml.at_xpath('//activity:verb').content.gsub('http://activitystrea.ms/schema/1.0/', '').gsub('http://ostatus.org/schema/1.0/', '').to_sym
xml.at_xpath('//activity:verb', activity: ACTIVITY_NS).content.gsub('http://activitystrea.ms/schema/1.0/', '').gsub('http://ostatus.org/schema/1.0/', '').to_sym
rescue
:post
end
@ -92,7 +94,7 @@ class ProcessInteractionService < BaseService
end
def activity_id(xml)
xml.at_xpath('//activity:object/xmlns:id').content
xml.at_xpath('//activity:object/xmlns:id', activity: ACTIVITY_NS).content
end
def salmon