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

Fix for thread resolve service and process feed service url method

rebase/4.0.0rc2
Eugen Rochko 2016-11-08 19:09:22 +01:00
parent 2f21f4cc01
commit cff0b03cbb
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/services/fetch_atom_service.rb
View File

@ -3,6 +3,11 @@ class FetchAtomService < BaseService
response = http_client.head(url) response = http_client.head(url)
Rails.logger.debug "Remote status HEAD request returned code #{response.code}" Rails.logger.debug "Remote status HEAD request returned code #{response.code}"
response = http_client.get(url) if response.code == 405
Rails.logger.debug "Remote status GET request returned code #{response.code}"
return nil if response.code != 200 return nil if response.code != 200
if response.mime_type == 'application/atom+xml' if response.mime_type == 'application/atom+xml'

3
app/services/process_feed_service.rb
View File

@ -175,8 +175,7 @@ class ProcessFeedService < BaseService
def url(xml = @xml) def url(xml = @xml)
link = xml.at_xpath('./xmlns:link[@rel="alternate"]') link = xml.at_xpath('./xmlns:link[@rel="alternate"]')
link['href'] unless link.nil? link.nil? ? nil : link['href']
nil
end end
def content(xml = @xml) def content(xml = @xml)