zydronium/neocities
1
0
Fork 0
mirror of https://github.com/neocities/neocities.git synced 2025-06-13 16:04:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

add htm to uri, use site.uri for screenshot

Browse source
This commit is contained in:
Kyle Drake 2024-09-19 12:47:21 -05:00
parent 0e827319cd
commit 3a41029313
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
models/site.rb
View file

@ -1438,7 +1438,7 @@ class Site < Sequel::Model
return uri unless path return uri unless path
path = '' if path == '/' || path =~ ROOT_INDEX_HTML_REGEX path = '' if path == '/' || path =~ ROOT_INDEX_HTML_REGEX
path = path.sub(%r{^/}, '').sub(%r{/index\.html$}, '/').sub(/\.html$/, '') path = path.sub(%r{^/}, '').sub(%r{/index\.html?$}, '/').sub(/\.html?$/, '')
unless path.empty? unless path.empty?
escaped_path = self.class.escape_path path escaped_path = self.class.escape_path path

2
tests/workers/screenshot_worker_tests.rb
View file

@ -12,7 +12,7 @@ describe ScreenshotWorker do
base_host += ":#{uri.port}" base_host += ":#{uri.port}"
end end
stub_request(:get, "#{base_host}/?url=#{site.uri}/#{path}&wait_time=#{ScreenshotWorker::PAGE_WAIT_TIME}"). stub_request(:get, "#{base_host}/?url=#{site.uri(path)}&wait_time=#{ScreenshotWorker::PAGE_WAIT_TIME}").
with(basic_auth: [uri.user, uri.password]). with(basic_auth: [uri.user, uri.password]).
to_return(status: 200, headers: {}, body: File.read('tests/files/img/screenshot.png')) to_return(status: 200, headers: {}, body: File.read('tests/files/img/screenshot.png'))

4
workers/screenshot_worker.rb
View file

@ -37,11 +37,11 @@ class ScreenshotWorker
uri = Addressable::URI.parse $config['screenshot_urls'].sample uri = Addressable::URI.parse $config['screenshot_urls'].sample
api_user, api_password = uri.user, uri.password api_user, api_password = uri.user, uri.password
uri = "#{uri.scheme}://#{uri.host}:#{uri.port}" + '?' + Rack::Utils.build_query( uri = "#{uri.scheme}://#{uri.host}:#{uri.port}" + '?' + Rack::Utils.build_query(
url: Site.select(:username,:domain).where(username: username).first.uri + path, url: site.uri(path),
wait_time: PAGE_WAIT_TIME wait_time: PAGE_WAIT_TIME
) )
begin begin
base_image_tmpfile_path = "/tmp/#{SecureRandom.uuid}.png" base_image_tmpfile_path = "/tmp/#{SecureRandom.uuid}.png"