dice/impress
1
0
Fork 0
forked from OpenNeo/impress
Code Pull requests Activity

Merge pull request #5 from openneo:https-swf-asset-url-bug

Browse source 
Oops, fix mall spider bug, added by our HTTPS fix
This commit is contained in:
Emi Dunn-Rankin 2022-08-23 03:06:28 -07:00 committed by GitHub
commit 9bd2b27a4d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/models/swf_asset.rb
View file

@ -11,6 +11,9 @@ class SwfAsset < ActiveRecord::Base
'Cache-Control' => 'max-age=315360000', 'Cache-Control' => 'max-age=315360000',
'Content-Type' => 'image/png' 'Content-Type' => 'image/png'
} }
# This is the URL origin we should use when loading from images.neopets.com.
# It can be overridden in .env as `NEOPETS_IMAGES_URL_ORIGIN`, to use our
# asset proxy instead.
NEOPETS_IMAGES_URL_ORIGIN = ENV['NEOPETS_IMAGES_URL_ORIGIN'] || 'http://images.neopets.com' NEOPETS_IMAGES_URL_ORIGIN = ENV['NEOPETS_IMAGES_URL_ORIGIN'] || 'http://images.neopets.com'
set_inheritance_column 'inheritance_type' set_inheritance_column 'inheritance_type'
@ -248,7 +251,7 @@ class SwfAsset < ActiveRecord::Base
def mall_data=(data) def mall_data=(data)
self.zone_id = data['zone'].to_i self.zone_id = data['zone'].to_i
self.url = "#{NEOPETS_IMAGES_URL_ORIGIN}/#{data['url']}" self.url = "https://images.neopets.com/#{data['url']}"
end end
def self.from_wardrobe_link_params(ids) def self.from_wardrobe_link_params(ids)