Sutty/panel
5
0
Fork 0
mirror of https://0xacab.org/sutty/sutty synced 2024-11-16 13:51:41 +00:00
Code Issues Projects Releases Wiki Activity

centralizar la forma en que se obtienen los hostnames

Browse source 
relacionado con !50
This commit is contained in:
f 2022-04-26 16:46:48 -03:00
parent 47a74b5848
commit 298fd5bed1
2 changed files with 24 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
app/jobs/uri_collection_job.rb
View file

@ -26,7 +26,7 @@ class UriCollectionJob < PeriodicJob
name = 'host|uri' name = 'host|uri'
beginning = beginning_of_interval beginning = beginning_of_interval
hostnames.each do |host| site.hostnames.each do |host|
break if stop? break if stop?
uris.each do |uri| uris.each do |uri|
@ -102,26 +102,6 @@ class UriCollectionJob < PeriodicJob
@destination ||= site.deploys.find_by(type: 'DeployLocal').destination @destination ||= site.deploys.find_by(type: 'DeployLocal').destination
end end
# TODO: Cambiar al mergear origin-referer
#
# @return [Array]
def hostnames
@hostnames ||= site.deploys.map do |deploy|
case deploy
when DeployLocal
site.hostname
when DeployWww
deploy.fqdn
when DeployAlternativeDomain
deploy.hostname.dup.tap do |h|
h.replace(h.end_with?('.') ? h[0..-2] : "#{h}.#{Site.domain}")
end
when DeployHiddenService
deploy.onion
end
end.compact
end
# Recolecta todas las URIs menos imágenes # Recolecta todas las URIs menos imágenes
# #
# @return [Array] # @return [Array]

24
app/models/site.rb
View file

@ -101,6 +101,26 @@ class Site < ApplicationRecord
"https://#{hostname}#{slash ? '/' : ''}" "https://#{hostname}#{slash ? '/' : ''}"
end end
# TODO: Cambiar al mergear origin-referer
#
# @return [Array]
def hostnames
@hostnames ||= deploys.map do |deploy|
case deploy
when DeployLocal
hostname
when DeployWww
deploy.fqdn
when DeployAlternativeDomain
deploy.hostname.dup.tap do |h|
h.replace(h.end_with?('.') ? h[0..-2] : "#{h}.#{Site.domain}")
end
when DeployHiddenService
deploy.onion
end
end.compact
end
# Obtiene los dominios alternativos # Obtiene los dominios alternativos
# #
# @return Array # @return Array
@ -123,7 +143,9 @@ class Site < ApplicationRecord
# #
# @return Array # @return Array
def urls(slash: true) def urls(slash: true)
alternative_urls(slash: slash) << url(slash: slash) @urls ||= hostnames.map do |h|
"https://#{h}#{slash ? '/' : ''}"
end
end end
def invitade?(usuarie) def invitade?(usuarie)