Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix file and thumbnail URLs from fireden.net.

Browse Source
This commit is contained in:
ccd0 2015-07-07 01:45:17 -07:00
parent 2f48140752
commit a3e4bad854
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/General/lib/fetcher.class
View File

@ -81,7 +81,7 @@ class Fetcher
return false unless url = Redirect.to 'post', {@boardID, @postID} return false unless url = Redirect.to 'post', {@boardID, @postID}
if /^https:\/\//.test(url) or location.protocol is 'http:' if /^https:\/\//.test(url) or location.protocol is 'http:'
$.cache url, $.cache url,
do (self = @) -> -> self.parseArchivedPost @response do (self = @) -> -> self.parseArchivedPost @response, url
, ,
responseType: 'json' responseType: 'json'
withCredentials: url.archive.withCredentials withCredentials: url.archive.withCredentials
@ -93,11 +93,11 @@ class Fetcher
# Image/thumbnail URLs loaded over HTTP can be modified in transit. # Image/thumbnail URLs loaded over HTTP can be modified in transit.
# Require them to be from a known HTTP host so that no referrer is sent to them from an HTTPS page. # Require them to be from a known HTTP host so that no referrer is sent to them from an HTTPS page.
delete media[key] unless media[key]? and media[key].match(/^(http:\/\/[^\/]+\/)?/)[0] in url.archive.imagehosts delete media[key] unless media[key]? and media[key].match(/^(http:\/\/[^\/]+\/)?/)[0] in url.archive.imagehosts
@parseArchivedPost response @parseArchivedPost response, url
return true return true
return false return false
parseArchivedPost: (data) -> parseArchivedPost: (data, url) ->
# In case of multiple callbacks for the same request, # In case of multiple callbacks for the same request,
# don't parse the same original post more than once. # don't parse the same original post more than once.
if post = g.posts["#{@boardID}.#{@postID}"] if post = g.posts["#{@boardID}.#{@postID}"]
@ -147,6 +147,9 @@ class Fetcher
commentHTML: comment commentHTML: comment
delete o.info.uniqueID if o.info.capcode delete o.info.uniqueID if o.info.capcode
if data.media?.media_filename if data.media?.media_filename
# Fix URLs missing origin
for key, val of data.media when /_link$/.test(key) and val?[0] is '/'
data.media[key] = url.split('/', 3).join('/') + val
o.file = o.file =
name: data.media.media_filename name: data.media.media_filename
url: data.media.media_link or data.media.remote_media_link or url: data.media.media_link or data.media.remote_media_link or