From 22e3f4240ab828bfd5d400f801ef93ddeac89990 Mon Sep 17 00:00:00 2001 From: Matchu Date: Wed, 25 Oct 2023 15:16:46 -0700 Subject: [PATCH] Update most URLs to use HTTPS I noticed we didn't have the little lock icon in the browser, and yeah huh there's a lot of `http://` still floating around! Let's fix that! --- Gemfile | 2 +- Gemfile.lock | 2 +- app/assets/javascripts/modeling.js.jsx | 2 +- app/assets/javascripts/outfits/new.js | 4 +-- app/assets/javascripts/pet_query.js | 2 +- app/assets/javascripts/pets/bulk.js | 2 +- app/assets/stylesheets/campaigns/_show.sass | 2 +- app/helpers/application_helper.rb | 14 +++++----- app/helpers/closet_hangers_helper.rb | 6 ++--- app/helpers/closet_pages_helper.rb | 2 +- app/helpers/contribution_helper.rb | 2 +- app/helpers/donations_helper.rb | 26 +++++++++---------- app/helpers/items_helper.rb | 10 +++---- .../wardrobe-2020/ItemPageLayout.js | 10 +++---- .../support/AppearanceLayerSupportModal.js | 6 ++--- .../wardrobe-2020/components/OutfitPreview.js | 2 +- app/models/neopets_page.rb | 6 ++--- app/models/neopets_user.rb | 2 +- app/models/pet_state.rb | 2 +- app/models/pet_type.rb | 2 +- app/views/closet_hangers/index.html.haml | 2 +- app/views/closet_hangers/petpage.html.haml | 2 +- app/views/items/needed.html.haml | 4 +-- app/views/layouts/application.html.haml | 4 +-- app/views/layouts/items.html.haml | 2 +- app/views/outfits/new.html.haml | 2 +- app/views/pets/bulk.html.haml | 2 +- app/views/sitemap/index.xml.haml | 4 +-- app/views/static/image_mode.html.haml | 10 +++---- config/environments/production.rb | 3 +++ deploy/files/initial-placeholder/Gemfile | 2 +- deploy/files/initial-placeholder/Gemfile.lock | 3 ++- lib/tasks/pet_types.rake | 2 +- lib/tasks/translate.rake | 2 +- 34 files changed, 77 insertions(+), 73 deletions(-) diff --git a/Gemfile b/Gemfile index fd91cad9..f30a4a87 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,4 @@ -source 'http://rubygems.org' +source 'https://rubygems.org' ruby '3.1.4' gem 'rails', '~> 7.1', '>= 7.1.1' diff --git a/Gemfile.lock b/Gemfile.lock index f1c7c89d..fb2dce4b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -5,7 +5,7 @@ GIT RocketAMF (1.0.0) GEM - remote: http://rubygems.org/ + remote: https://rubygems.org/ specs: actioncable (7.1.1) actionpack (= 7.1.1) diff --git a/app/assets/javascripts/modeling.js.jsx b/app/assets/javascripts/modeling.js.jsx index 78582d31..c6634373 100644 --- a/app/assets/javascripts/modeling.js.jsx +++ b/app/assets/javascripts/modeling.js.jsx @@ -344,7 +344,7 @@ var Neopia = (function ($, I18n) { } var itemName = this.props.item.name; var imageSrc = - "http://pets.neopets.com/cpn/" + + "https://pets.neopets.com/cpn/" + petName + "/1/1.png?" + this.appearanceQuery(); diff --git a/app/assets/javascripts/outfits/new.js b/app/assets/javascripts/outfits/new.js index bec8b8ed..dd9d2cdf 100644 --- a/app/assets/javascripts/outfits/new.js +++ b/app/assets/javascripts/outfits/new.js @@ -48,7 +48,7 @@ function loadNotable() { // TODO: add HTTPS to notables - // $.getJSON('http://notables.openneo.net/api/1/days/ago/1?callback=?', function (response) { + // $.getJSON('https://notables.openneo.net/api/1/days/ago/1?callback=?', function (response) { // var notables = response.notables; // var i = Math.floor(Math.random() * notables.length); // Preview.Job.fallback = new Preview.Job.Name(notables[i].petName); @@ -87,7 +87,7 @@ // lol lazy code for prank image :P // TODO: HTTPS? return ( - "http://swfimages.impress.openneo.net" + + "https://swfimages.impress.openneo.net" + "/biology/000/000/0-2/" + key.substr(2) + "/300x300.png" diff --git a/app/assets/javascripts/pet_query.js b/app/assets/javascripts/pet_query.js index a217b6fd..15eea679 100644 --- a/app/assets/javascripts/pet_query.js +++ b/app/assets/javascripts/pet_query.js @@ -1,5 +1,5 @@ function petImage(id, size) { - return 'http://pets.neopets.com/' + id + '/1/' + size + '.png'; + return 'https://pets.neopets.com/' + id + '/1/' + size + '.png'; } var PetQuery = {}, diff --git a/app/assets/javascripts/pets/bulk.js b/app/assets/javascripts/pets/bulk.js index 47b83ebf..a86b9e7f 100644 --- a/app/assets/javascripts/pets/bulk.js +++ b/app/assets/javascripts/pets/bulk.js @@ -63,7 +63,7 @@ var DEBUG = (document.location.search.substr(0, 6) == '?debug'); } function petThumbnailUrl(pet_name) { - return 'http://pets.neopets.com/cpn/' + pet_name + '/1/1.png'; + return 'https://pets.neopets.com/cpn/' + pet_name + '/1/1.png'; } /* Items */ diff --git a/app/assets/stylesheets/campaigns/_show.sass b/app/assets/stylesheets/campaigns/_show.sass index e1066d01..5313c3db 100644 --- a/app/assets/stylesheets/campaigns/_show.sass +++ b/app/assets/stylesheets/campaigns/_show.sass @@ -191,7 +191,7 @@ body.campaigns-show, body.campaigns-current width: $outfit-inner-width &.banner - background-image: url(http://images.neopets.com/themes/004_bir_a2e60/footer_bg.png) + background-image: url(https://images.neopets.com/themes/004_bir_a2e60/footer_bg.png) background-position: 0 -60px border: 2px solid #006 color: white diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index e5d6fc76..a6636c54 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -92,13 +92,13 @@ module ApplicationHelper end JAVASCRIPT_LIBRARIES = { - :addthis => '//s7.addthis.com/js/250/addthis_widget.js#username=openneo', - :bitly => '//bit.ly/javascript-api.js?version=latest&login=openneo&apiKey=R_4d0438829b7a99860de1d3edf55d8dc8', - :html5 => '//html5shim.googlecode.com/svn/trunk/html5.js', - :jquery => '//ajax.googleapis.com/ajax/libs/jquery/1.4.3/jquery.min.js', - :jquery20 => '//ajax.googleapis.com/ajax/libs/jquery/2.0.3/jquery.min.js', - :jquery_tmpl => '//ajax.microsoft.com/ajax/jquery.templates/beta1/jquery.tmpl.min.js', - :swfobject => '//ajax.googleapis.com/ajax/libs/swfobject/2.2/swfobject.js' + :addthis => 'https://s7.addthis.com/js/250/addthis_widget.js#username=openneo', + :bitly => 'https://bit.ly/javascript-api.js?version=latest&login=openneo&apiKey=R_4d0438829b7a99860de1d3edf55d8dc8', + :html5 => 'https://html5shim.googlecode.com/svn/trunk/html5.js', + :jquery => 'https://ajax.googleapis.com/ajax/libs/jquery/1.4.3/jquery.min.js', + :jquery20 => 'https://ajax.googleapis.com/ajax/libs/jquery/2.0.3/jquery.min.js', + :jquery_tmpl => 'https://ajax.microsoft.com/ajax/jquery.templates/beta1/jquery.tmpl.min.js', + :swfobject => 'https://ajax.googleapis.com/ajax/libs/swfobject/2.2/swfobject.js' } def include_javascript_libraries(*library_names) diff --git a/app/helpers/closet_hangers_helper.rb b/app/helpers/closet_hangers_helper.rb index 263bd44b..110dda93 100644 --- a/app/helpers/closet_hangers_helper.rb +++ b/app/helpers/closet_hangers_helper.rb @@ -13,11 +13,11 @@ module ClosetHangersHelper end def send_neomail_url(neopets_username) - "http://www.neopets.com/neomessages.phtml?type=send&recipient=#{CGI.escape neopets_username}" + "https://www.neopets.com/neomessages.phtml?type=send&recipient=#{CGI.escape neopets_username}" end def neopets_lookup_url(neopets_username) - "http://www.neopets.com/userlookup.phtml?user=#{CGI.escape neopets_username}" + "https://www.neopets.com/userlookup.phtml?user=#{CGI.escape neopets_username}" end def hangers_group_visibility_field_name(owned) @@ -75,7 +75,7 @@ module ClosetHangersHelper end def nc_icon_url - "http://#{request.host}#{image_path 'nc.png'}" + "https://#{request.host}#{image_path 'nc.png'}" end def petpage_closet_list_checked(closet_list, owned) diff --git a/app/helpers/closet_pages_helper.rb b/app/helpers/closet_pages_helper.rb index 1ed8454c..209ba29b 100644 --- a/app/helpers/closet_pages_helper.rb +++ b/app/helpers/closet_pages_helper.rb @@ -4,7 +4,7 @@ module ClosetPagesHelper end def neopets_login_url - "http://www.neopets.com/loginpage.phtml" + "https://www.neopets.com/loginpage.phtml" end end diff --git a/app/helpers/contribution_helper.rb b/app/helpers/contribution_helper.rb index 894066d7..da8a77d7 100644 --- a/app/helpers/contribution_helper.rb +++ b/app/helpers/contribution_helper.rb @@ -26,7 +26,7 @@ module ContributionHelper end end - PET_TYPE_IMAGE_FORMAT = 'http://pets.neopets.com/cp/%s/1/3.png' + PET_TYPE_IMAGE_FORMAT = 'https://pets.neopets.com/cp/%s/1/3.png' def contributed_pet_type(main_key, pet_type, show_image) span = content_tag(:span, pet_type.human_name, :class => 'contributed-name') description = translate('contributions.contributed_description.parents.pet_type_html', diff --git a/app/helpers/donations_helper.rb b/app/helpers/donations_helper.rb index 2121233d..e50e0849 100644 --- a/app/helpers/donations_helper.rb +++ b/app/helpers/donations_helper.rb @@ -1,18 +1,18 @@ module DonationsHelper THANK_YOU_GREETINGS = [ - 'http://images.neopets.com/new_greetings/1368.gif', - 'http://images.neopets.com/new_greetings/466.gif', - 'http://images.neopets.com/new_greetings/48.gif', - 'http://images.neopets.com/new_greetings/49.gif', - 'http://images.neopets.com/new_greetings/64.gif', - 'http://images.neopets.com/new_greetings/65.gif', - 'http://images.neopets.com/new_greetings/66.gif', - 'http://images.neopets.com/new_greetings/67.gif', - 'http://images.neopets.com/new_greetings/69.gif', - 'http://images.neopets.com/new_greetings/71.gif', - 'http://images.neopets.com/new_greetings/72.gif', - 'http://images.neopets.com/new_greetings/103.gif', - 'http://images.neopets.com/new_greetings/420.gif' + 'https://images.neopets.com/new_greetings/1368.gif', + 'https://images.neopets.com/new_greetings/466.gif', + 'https://images.neopets.com/new_greetings/48.gif', + 'https://images.neopets.com/new_greetings/49.gif', + 'https://images.neopets.com/new_greetings/64.gif', + 'https://images.neopets.com/new_greetings/65.gif', + 'https://images.neopets.com/new_greetings/66.gif', + 'https://images.neopets.com/new_greetings/67.gif', + 'https://images.neopets.com/new_greetings/69.gif', + 'https://images.neopets.com/new_greetings/71.gif', + 'https://images.neopets.com/new_greetings/72.gif', + 'https://images.neopets.com/new_greetings/103.gif', + 'https://images.neopets.com/new_greetings/420.gif' ] def thank_you_greeting_url diff --git a/app/helpers/items_helper.rb b/app/helpers/items_helper.rb index 71c19c58..0a8dd638 100644 --- a/app/helpers/items_helper.rb +++ b/app/helpers/items_helper.rb @@ -2,7 +2,7 @@ module ItemsHelper JNItemsURLFormat = 'https://items.jellyneo.net/search/?name=%s&name_type=3' module PetTypeImage - Format = 'http://pets.neopets.com/cp/%s/%i/%i.png' + Format = 'https://pets.neopets.com/cp/%s/%i/%i.png' Emotions = { :happy => 1, @@ -85,19 +85,19 @@ module ItemsHelper end def shop_wizard_url_for(item) - "http://www.neopets.com/market.phtml?type=wizard&string=#{CGI::escape item.name}" + "https://www.neopets.com/market.phtml?type=wizard&string=#{CGI::escape item.name}" end def super_shop_wizard_url_for(item) - "http://www.neopets.com/portal/supershopwiz.phtml?string=#{CGI::escape item.name}" + "https://www.neopets.com/portal/supershopwiz.phtml?string=#{CGI::escape item.name}" end def trading_post_url_for(item) - "http://www.neopets.com/island/tradingpost.phtml?type=browse&criteria=item_exact&search_string=#{CGI::escape item.name}" + "https://www.neopets.com/island/tradingpost.phtml?type=browse&criteria=item_exact&search_string=#{CGI::escape item.name}" end def auction_genie_url_for(item) - "http://www.neopets.com/genie.phtml?type=process_genie&criteria=exact&auctiongenie=#{CGI::escape item.name}" + "https://www.neopets.com/genie.phtml?type=process_genie&criteria=exact&auctiongenie=#{CGI::escape item.name}" end def trading_closet_hangers_header(owned, count) diff --git a/app/javascript/wardrobe-2020/ItemPageLayout.js b/app/javascript/wardrobe-2020/ItemPageLayout.js index 98bf92b1..38d7203e 100644 --- a/app/javascript/wardrobe-2020/ItemPageLayout.js +++ b/app/javascript/wardrobe-2020/ItemPageLayout.js @@ -159,7 +159,7 @@ function ItemPageBadges({ item, isEmbedded }) { } > {item?.ncTradeValueText && ( - + OWLS: {item?.ncTradeValueText} )} @@ -169,7 +169,7 @@ function ItemPageBadges({ item, isEmbedded }) { {!item?.isNc && !item?.isPb && ( Type.new( get_name: lambda { I18n.translate('neopets_page_import_tasks.names.closet') }, - get_url: lambda { |index| "http://www.neopets.com/closet.phtml?per_page=50&page=#{index}" }, + get_url: lambda { |index| "https://www.neopets.com/closet.phtml?per_page=50&page=#{index}" }, parser: Parser.new( selectors: { items: "form[action=\"process_closet.phtml\"] tr[bgcolor!=silver][bgcolor!=\"#E4E4E4\"]", @@ -220,7 +220,7 @@ class NeopetsPage ), 'safety_deposit' => Type.new( get_name: lambda { I18n.translate('neopets_page_import_tasks.names.safety_deposit') }, - get_url: lambda { |index| "http://www.neopets.com/safetydeposit.phtml?offset=#{(index - 1) * 30}" }, + get_url: lambda { |index| "https://www.neopets.com/safetydeposit.phtml?offset=#{(index - 1) * 30}" }, parser: Parser.new( selectors: { items: "#content tr[bgcolor=\"#DFEAF7\"]", @@ -242,7 +242,7 @@ class NeopetsPage ), 'gallery' => Type.new( get_name: lambda { I18n.translate('neopets_page_import_tasks.names.gallery') }, - get_url: lambda { |index| "http://www.neopets.com/gallery/index.phtml?view=all" }, + get_url: lambda { |index| "https://www.neopets.com/gallery/index.phtml?view=all" }, parser: Parser.new( selectors: { items: "form[name=gallery_form] td[valign=top]", diff --git a/app/models/neopets_user.rb b/app/models/neopets_user.rb index 56b6c066..276ff89c 100644 --- a/app/models/neopets_user.rb +++ b/app/models/neopets_user.rb @@ -5,7 +5,7 @@ class NeopetsUser include ActiveModel::Conversion extend ActiveModel::Naming - NEOPETS_URL_ORIGIN = ENV['NEOPETS_URL_ORIGIN'] || 'http://www.neopets.com' + NEOPETS_URL_ORIGIN = ENV['NEOPETS_URL_ORIGIN'] || 'https://www.neopets.com' GATEWAY_URL = NEOPETS_URL_ORIGIN + '/amfphp/gateway.php' GET_PETS_METHOD = RocketAMF::RemoteGateway.new(GATEWAY_URL). service('MobileService').action('getPets') diff --git a/app/models/pet_state.rb b/app/models/pet_state.rb index e92ffe41..69b390f0 100644 --- a/app/models/pet_state.rb +++ b/app/models/pet_state.rb @@ -145,7 +145,7 @@ class PetState < ApplicationRecord def artist_url if artist_neopets_username - "http://www.neopets.com/userlookup.phtml?user=#{artist_neopets_username}" + "https://www.neopets.com/userlookup.phtml?user=#{artist_neopets_username}" else nil end diff --git a/app/models/pet_type.rb b/app/models/pet_type.rb index bd4224ec..feaea0b8 100644 --- a/app/models/pet_type.rb +++ b/app/models/pet_type.rb @@ -1,5 +1,5 @@ class PetType < ApplicationRecord - IMAGE_CPN_FORMAT = 'http://pets.neopets.com/cpn/%s/1/1.png'; + IMAGE_CPN_FORMAT = 'https://pets.neopets.com/cpn/%s/1/1.png'; IMAGE_CP_LOCATION_REGEX = %r{^/cp/(.+?)/[0-9]+/[0-9]+\.png$}; IMAGE_CPN_ACCEPTABLE_NAME = /^[a-z0-9_]+$/ diff --git a/app/views/closet_hangers/index.html.haml b/app/views/closet_hangers/index.html.haml index 39b9b0cf..b806e4b3 100644 --- a/app/views/closet_hangers/index.html.haml +++ b/app/views/closet_hangers/index.html.haml @@ -150,7 +150,7 @@ -# TODO: remove me? - content_for :stylesheets do - = stylesheet_link_tag 'http://ajax.googleapis.com/ajax/libs/jqueryui/1.9.0/themes/south-street/jquery-ui.css' + = stylesheet_link_tag 'https://ajax.googleapis.com/ajax/libs/jqueryui/1.9.0/themes/south-street/jquery-ui.css' - content_for :javascripts do = include_javascript_libraries :jquery, :jquery_tmpl diff --git a/app/views/closet_hangers/petpage.html.haml b/app/views/closet_hangers/petpage.html.haml index 2dd42d90..025f48ef 100644 --- a/app/views/closet_hangers/petpage.html.haml +++ b/app/views/closet_hangers/petpage.html.haml @@ -5,7 +5,7 @@ #intro %p= t '.description' %p= twl '.instructions', - :edit_petpage_link_url => 'http://www.neopets.com/edithomepage.phtml' + :edit_petpage_link_url => 'https://www.neopets.com/edithomepage.phtml' = form_tag petpage_user_closet_hangers_path(@user), :method => :get, :id => 'petpage-closet-lists' do = hidden_field_tag 'filter', '1' diff --git a/app/views/items/needed.html.haml b/app/views/items/needed.html.haml index 13063786..ae5516af 100644 --- a/app/views/items/needed.html.haml +++ b/app/views/items/needed.html.haml @@ -1,6 +1,6 @@ - title "Needed items for #{@pet_type.human_name}" %h2 - = image_tag "http://pets.neopets.com/cpn/#{@pet_name}/1/1.png", + = image_tag "https://pets.neopets.com/cpn/#{@pet_name}/1/1.png", :class => 'inline-image' %span.pet-name= @pet_name can model… @@ -11,6 +11,6 @@ = hidden_field_tag 'name', @pet_name = submit_tag "I'm wearing one now!", :class => 'loud' %li - = link_to 'What do I own?', 'http://www.neopets.com/closet.phtml', + = link_to 'What do I own?', 'https://www.neopets.com/closet.phtml', :class => 'button', :target => '_blank' = render @items diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 3a8eb059..e5ff06c4 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -60,8 +60,8 @@ %noscript= submit_tag 'Go' %ul - %li= link_to t('organization_name'), 'http://openneo.net/' - %li= link_to t('.footer.blog'), 'http://blog.openneo.net/' + %li= link_to t('organization_name'), 'https://openneo.net/' + %li= link_to t('.footer.blog'), 'https://blog.openneo.net/' %li= link_to t('.footer.source_code'), 'https://github.com/openneo/impress' %li= link_to t('.footer.terms'), terms_path diff --git a/app/views/layouts/items.html.haml b/app/views/layouts/items.html.haml index 2d5dcc23..151b226e 100644 --- a/app/views/layouts/items.html.haml +++ b/app/views/layouts/items.html.haml @@ -4,7 +4,7 @@ - content_for :before_flashes do %h1 = link_to items_path do - = image_tag 'http://images.neopets.com/items/mall_floatingneggfaerie.gif' + = image_tag 'https://images.neopets.com/items/mall_floatingneggfaerie.gif' %span= t 'infinite_closet' - content_for :content do = form_tag items_path, :method => :get do diff --git a/app/views/outfits/new.html.haml b/app/views/outfits/new.html.haml index 8151d1ea..f49c7e83 100644 --- a/app/views/outfits/new.html.haml +++ b/app/views/outfits/new.html.haml @@ -65,7 +65,7 @@ %li = link_to bulk_pets_path do - = image_tag 'http://images.neopets.com/items/mall_ac_garland_spotlight.gif' + = image_tag 'https://images.neopets.com/items/mall_ac_garland_spotlight.gif' %h3= link_to t('modeling_hub'), bulk_pets_path %div %h4= t '.modeling_hub.tagline' diff --git a/app/views/pets/bulk.html.haml b/app/views/pets/bulk.html.haml index ff24f50f..1e4ea308 100644 --- a/app/views/pets/bulk.html.haml +++ b/app/views/pets/bulk.html.haml @@ -68,7 +68,7 @@ %script#bulk-pets-submission-template{:type => 'text/x-jquery/tmpl'} %li.waiting - %img{:src => 'http://pets.neopets.com/cpn/${pet_name}/1/1.png'} + %img{:src => 'https://pets.neopets.com/cpn/${pet_name}/1/1.png'} %span.name ${pet_name} %span.waiting-message= t '.bulk_pets.waiting' %span.loading-message= t '.bulk_pets.loading' diff --git a/app/views/sitemap/index.xml.haml b/app/views/sitemap/index.xml.haml index ee110b35..af42187e 100644 --- a/app/views/sitemap/index.xml.haml +++ b/app/views/sitemap/index.xml.haml @@ -1,8 +1,8 @@ !!! XML -%urlset{:xmlns => "http://www.sitemaps.org/schemas/sitemap/0.9"} +%urlset{:xmlns => "https://www.sitemaps.org/schemas/sitemap/0.9"} - for item in @items %url - %loc http://#{request.host_with_port}#{url_for(item)} + %loc https://#{request.host_with_port}#{url_for(item)} %changefreq monthly %priority 0.5 diff --git a/app/views/static/image_mode.html.haml b/app/views/static/image_mode.html.haml index e6068ddc..6808f530 100644 --- a/app/views/static/image_mode.html.haml +++ b/app/views/static/image_mode.html.haml @@ -49,11 +49,11 @@ Downloading currently only works for modern browsers that support the new canvas feature. It is, however, supported in the latest versions of, - * [Google Chrome](http://www.google.com/chrome) - * [Mozilla Firefox](http://www.firefox.com/) - * [Opera](http://www.opera.com/) - * [Safari](http://www.apple.com/safari/) - * [Internet Explorer](http://www.microsoft.com/ie) + * [Google Chrome](https://www.google.com/chrome) + * [Mozilla Firefox](https://www.firefox.com/) + * [Opera](https://www.opera.com/) + * [Safari](https://www.apple.com/safari/) + * [Internet Explorer](https://www.microsoft.com/ie) However, Internet Explorer currently is having trouble running Dress to Impress in general, so is not recommended. diff --git a/config/environments/production.rb b/config/environments/production.rb index 52213839..d232e46b 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -26,6 +26,9 @@ Rails.application.configure do # Compress CSS using a preprocessor. # config.assets.css_compressor = :sass + # Compress JS using a preprocessor. + config.assets.js_compressor = :terser + # Do not fallback to assets pipeline if a precompiled asset is missed. config.assets.compile = false diff --git a/deploy/files/initial-placeholder/Gemfile b/deploy/files/initial-placeholder/Gemfile index a1d525e2..d924ac61 100644 --- a/deploy/files/initial-placeholder/Gemfile +++ b/deploy/files/initial-placeholder/Gemfile @@ -1,2 +1,2 @@ -source 'http://rubygems.org' +source 'https://rubygems.org' gem 'puma', '~> 6.3' \ No newline at end of file diff --git a/deploy/files/initial-placeholder/Gemfile.lock b/deploy/files/initial-placeholder/Gemfile.lock index 85651768..a6fc75df 100644 --- a/deploy/files/initial-placeholder/Gemfile.lock +++ b/deploy/files/initial-placeholder/Gemfile.lock @@ -1,11 +1,12 @@ GEM - remote: http://rubygems.org/ + remote: https://rubygems.org/ specs: nio4r (2.5.9) puma (6.3.0) nio4r (~> 2.0) PLATFORMS + x86_64-darwin-21 x86_64-linux DEPENDENCIES diff --git a/lib/tasks/pet_types.rake b/lib/tasks/pet_types.rake index e3c0a116..b6ff60b1 100644 --- a/lib/tasks/pet_types.rake +++ b/lib/tasks/pet_types.rake @@ -50,7 +50,7 @@ namespace :pet_types do desc "Download the Rainbow Pool data for the given locale" task :download_basic_image_hashes => :environment do Species.find_each do |species| - pool_url = "http://www.neopets.com/pool/all_pb.phtml" + pool_url = "https://www.neopets.com/pool/all_pb.phtml" pool_options = { :cookies => {:neologin => URI.encode(ENV['NEOLOGIN'])}, :params => {:lang => 'en', :f_species_id => species.id} diff --git a/lib/tasks/translate.rake b/lib/tasks/translate.rake index 3426305b..3b14ee1d 100644 --- a/lib/tasks/translate.rake +++ b/lib/tasks/translate.rake @@ -26,7 +26,7 @@ namespace :translate do desc "Download the Rainbow Pool data for the given locale" task :pet_attributes => :environment do with_given_locale do |neopets_language_code| - pool_url = "http://www.neopets.com/pool/all_pb.phtml" + pool_url = "https://www.neopets.com/pool/all_pb.phtml" pool_options = { :cookies => {:neologin => URI.encode(ENV['NEOLOGIN'])}, :params => {:lang => neopets_language_code}