From 298fd5bed14fa31c04dcf8d9cb5785c8c86c3c36 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Tue, 26 Apr 2022 16:46:48 -0300
Subject: [PATCH] centralizar la forma en que se obtienen los hostnames

relacionado con !50
---
 app/jobs/uri_collection_job.rb | 22 +---------------------
 app/models/site.rb             | 24 +++++++++++++++++++++++-
 2 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/app/jobs/uri_collection_job.rb b/app/jobs/uri_collection_job.rb
index cad05cbb..ea968fa0 100644
--- a/app/jobs/uri_collection_job.rb
+++ b/app/jobs/uri_collection_job.rb
@@ -26,7 +26,7 @@ class UriCollectionJob < PeriodicJob
     name = 'host|uri'
     beginning = beginning_of_interval
 
-    hostnames.each do |host|
+    site.hostnames.each do |host|
       break if stop?
 
       uris.each do |uri|
@@ -102,26 +102,6 @@ class UriCollectionJob < PeriodicJob
     @destination ||= site.deploys.find_by(type: 'DeployLocal').destination
   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
   #
   # @return [Array]
diff --git a/app/models/site.rb b/app/models/site.rb
index 5b78d625..bcc9e60b 100644
--- a/app/models/site.rb
+++ b/app/models/site.rb
@@ -101,6 +101,26 @@ class Site < ApplicationRecord
     "https://#{hostname}#{slash ? '/' : ''}"
   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
   #
   # @return Array
@@ -123,7 +143,9 @@ class Site < ApplicationRecord
   #
   # @return Array
   def urls(slash: true)
-    alternative_urls(slash: slash) << url(slash: slash)
+    @urls ||= hostnames.map do |h|
+      "https://#{h}#{slash ? '/' : ''}"
+    end
   end
 
   def invitade?(usuarie)