From 712514bc8c03b0ccd9f0289e3956aeddc8993c0b Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Thu, 20 Apr 2023 18:11:43 -0300
Subject: [PATCH 01/51] feat: avisar que hay que publicar al cambiar la
 configuracion #13114

---
 app/controllers/sites_controller.rb | 1 +
 app/views/layouts/_flash.haml       | 2 +-
 config/locales/en.yml               | 2 ++
 config/locales/es.yml               | 2 ++
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/controllers/sites_controller.rb b/app/controllers/sites_controller.rb
index 63865e44..17287eb0 100644
--- a/app/controllers/sites_controller.rb
+++ b/app/controllers/sites_controller.rb
@@ -57,6 +57,7 @@ class SitesController < ApplicationController
                               usuarie: current_usuarie)
 
     if service.update.valid?
+      flash[:notice] = I18n.t('sites.update.post')
       redirect_to site_posts_path(site, locale: site.default_locale)
     else
       render 'edit'
diff --git a/app/views/layouts/_flash.haml b/app/views/layouts/_flash.haml
index 7bd7ec0b..2d65ff78 100644
--- a/app/views/layouts/_flash.haml
+++ b/app/views/layouts/_flash.haml
@@ -1,4 +1,4 @@
 - flash.each do |type, message|
   - unless type == 'js'
     = render 'bootstrap/alert' do
-      = message
+      = sanitize_markdown message, tags: %w[a strong em]
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 3ddf681d..b37214e5 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -402,6 +402,8 @@ en:
       title: 'Edit %{site}'
       submit: 'Save changes'
       btn: 'Configuration'
+    update:
+      post: "Your changes have been saved.  **If you enabled a publication method, don't forget to publish changes.**"
     form:
       errors:
         title: There were errors and we couldn't save your changes :(
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 01f1085c..aaff1a24 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -408,6 +408,8 @@ es:
       title: 'Editar %{site}'
       submit: 'Guardar cambios'
       btn: 'Configuración'
+    update:
+      post: "Tus cambios han sido guardados.  **Si agregaste un método de publicación, no te olvides de publicar cambios.**"
     form:
       errors:
         title: Hubo errores y no pudimos guardar tus cambios :(

From a9bce070e8753c28dc208e650366b30013f5d9fa Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Wed, 26 Apr 2023 15:25:09 -0300
Subject: [PATCH 02/51] fix: temporalmente deshabilitar el cambio de plantillas
 #13260

---
 app/views/sites/_form.haml | 59 +++++++++++++++++++-------------------
 config/locales/en.yml      |  2 +-
 config/locales/es.yml      |  2 +-
 3 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/app/views/sites/_form.haml b/app/views/sites/_form.haml
index 69997ffa..0dcccbe3 100644
--- a/app/views/sites/_form.haml
+++ b/app/views/sites/_form.haml
@@ -46,36 +46,37 @@
       .invalid-feedback= site.errors.messages[:description].join(', ')
     %hr/
 
-  .form-group#design_id
-    %h2= t('.design.title')
-    %p.lead= t('.help.design')
-    - if invalid? site, :design_id
-      = render 'bootstrap/alert' do
-        = t('activerecord.errors.models.site.attributes.design_id.layout_incompatible.help',
-          layouts: site.incompatible_layouts.to_sentence)
-    .row.row-cols-1.row-cols-md-2.designs
-      -# Demasiado complejo para un f.collection_radio_buttons
-      - Design.all.order(priority: :desc).each do |design|
-        .design.col.d-flex.flex-column
-          .custom-control.custom-radio
-            = f.radio_button :design_id, design.id,
-              checked: design.id == site.design_id,
-              disabled: design.disabled,
-              required: true, class: 'custom-control-input'
-            = f.label "design_id_#{design.id}", design.name,
-              class: 'custom-control-label'
-          .flex-fill
-            = sanitize_markdown design.description,
-              tags: %w[p a strong em]
+  - unless site.persisted?
+    .form-group#design_id
+      %h2= t('.design.title')
+      %p.lead= t('.help.design')
+      - if invalid? site, :design_id
+        = render 'bootstrap/alert' do
+          = t('activerecord.errors.models.site.attributes.design_id.layout_incompatible.help',
+            layouts: site.incompatible_layouts.to_sentence)
+      .row.row-cols-1.row-cols-md-2.designs
+        -# Demasiado complejo para un f.collection_radio_buttons
+        - Design.all.order(priority: :desc).each do |design|
+          .design.col.d-flex.flex-column
+            .custom-control.custom-radio
+              = f.radio_button :design_id, design.id,
+                checked: design.id == site.design_id,
+                disabled: design.disabled,
+                required: true, class: 'custom-control-input'
+              = f.label "design_id_#{design.id}", design.name,
+                class: 'custom-control-label'
+            .flex-fill
+              = sanitize_markdown design.description,
+                tags: %w[p a strong em]
 
-          .btn-group{ role: 'group', 'aria-label': t('.design.actions') }
-            - if design.url
-              = link_to t('.design.url'), design.url,
-                target: '_blank', class: 'btn'
-            - if design.license
-              = link_to t('.design.license'), design.license,
-                target: '_blank', class: 'btn'
-    %hr/
+            .btn-group{ role: 'group', 'aria-label': t('.design.actions') }
+              - if design.url
+                = link_to t('.design.url'), design.url,
+                  target: '_blank', class: 'btn'
+              - if design.license
+                = link_to t('.design.license'), design.license,
+                  target: '_blank', class: 'btn'
+      %hr/
 
   .form-group.licenses#license_id
     %h2= t('.licencia.title')
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 2628ffb1..1f46ffed 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -410,7 +410,7 @@ en:
         name: "The name of your site.  It can only include numbers and letters."
         title: 'The title can be anything you want'
         description: 'You site description that appears in search engines.  Between 50 and 160 characters.'
-        design: 'Select the design for your site.  You can change it later.  We add more designs from time to time!'
+        design: 'Select the design for your site.  We add more designs from time to time!'
         licencia: 'Everything we publish has automatic copyright.  This
         means nobody can use our works without explicit permission.  By
         using licenses, we stablish conditions by which we want to share
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 6ad61228..3630ea25 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -416,7 +416,7 @@ es:
         name: 'El nombre de tu sitio que formará parte de la dirección (**ejemplo**.sutty.nl). Solo puede contener letras minúsculas, números y guiones.'
         title: 'El título de tu sitio puede ser lo que quieras.'
         description: 'La descripción del sitio, que saldrá en buscadores.  Entre 50 y 160 caracteres.'
-        design: 'Elegí el diseño que va a tener tu sitio aquí. Podés cambiarlo luego. De tanto en tanto vamos sumando diseños nuevos.'
+        design: 'Elegí el diseño que va a tener tu sitio aquí. De tanto en tanto vamos sumando diseños nuevos.'
         licencia: 'Todo lo que publicamos posee automáticamente derechos
         de autore.  Esto significa que nadie puede hacer uso de nuestras
         obras sin permiso explícito.  Con las licencias establecemos

From 1839d48893ca278a71208d40c17f3ed4d009233a Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Sat, 29 Apr 2023 18:10:28 -0300
Subject: [PATCH 03/51] fix: permitir el atributo start #13321

---
 app/models/metadata_template.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/metadata_template.rb b/app/models/metadata_template.rb
index 5de54be1..b324e71c 100644
--- a/app/models/metadata_template.rb
+++ b/app/models/metadata_template.rb
@@ -202,7 +202,7 @@ MetadataTemplate = Struct.new(:site, :document, :name, :label, :type,
 
   def allowed_attributes
     @allowed_attributes ||= %w[style href src alt controls data-align data-multimedia data-multimedia-inner id
-                               name].freeze
+                               name start].freeze
   end
 
   def allowed_tags

From 068bed5c0ad58be73949dd9b01304db4295f7002 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Fri, 19 May 2023 14:34:24 -0300
Subject: [PATCH 04/51] Revert "deshabilitar el paginado temporalmente"

This reverts commit 9c4a0a86f3eeec8f578e3872096896a710e01632.
---
 app/controllers/posts_controller.rb | 4 ++--
 app/views/posts/index.haml          | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
index 9720fe13..21a6dc06 100644
--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -23,7 +23,7 @@ class PostsController < ApplicationController
     return unless stale?([current_usuarie, site, filter_params])
 
     # Todos los artículos de este sitio para el idioma actual
-    @posts = site.indexed_posts.where(locale: locale)
+    @posts = site.indexed_posts.where(locale: locale).page(filter_params.delete(:page))
     # De este tipo
     @posts = @posts.where(layout: filter_params[:layout]) if filter_params[:layout]
     # Que estén dentro de la categoría
@@ -154,7 +154,7 @@ class PostsController < ApplicationController
   #
   # @return [Hash]
   def filter_params
-    @filter_params ||= params.permit(:q, :category, :layout).to_hash.select do |_, v|
+    @filter_params ||= params.permit(:q, :category, :layout, :page).to_hash.select do |_, v|
       v.present?
     end.transform_keys(&:to_sym)
   end
diff --git a/app/views/posts/index.haml b/app/views/posts/index.haml
index e8c3dea7..470e9641 100644
--- a/app/views/posts/index.haml
+++ b/app/views/posts/index.haml
@@ -85,6 +85,8 @@
                     %button.btn{ data: { action: 'reorder#bottom' } }= t('posts.reorder.bottom')
 
                   %div
+                    = link_to_prev_page @posts, t('posts.prev'), class: 'btn'
+                    = link_to_next_page @posts, t('posts.next'), class: 'btn'
           %tbody
             - dir = @site.data.dig(params[:locale], 'dir')
             - size = @posts.size

From 3540886554455ac1627b190327d32117e04bf129 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Fri, 19 May 2023 14:36:42 -0300
Subject: [PATCH 05/51] feat: poder paginar solo algunos sitios #12714

---
 app/controllers/posts_controller.rb                 | 3 ++-
 app/views/posts/index.haml                          | 7 ++++---
 db/migrate/20230519143500_add_pagination_to_site.rb | 8 ++++++++
 3 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 db/migrate/20230519143500_add_pagination_to_site.rb

diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
index 21a6dc06..057c3068 100644
--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -23,7 +23,8 @@ class PostsController < ApplicationController
     return unless stale?([current_usuarie, site, filter_params])
 
     # Todos los artículos de este sitio para el idioma actual
-    @posts = site.indexed_posts.where(locale: locale).page(filter_params.delete(:page))
+    @posts = site.indexed_posts.where(locale: locale)
+    @posts = @posts.page(filter_params.delete(:page)) if site.pagination
     # De este tipo
     @posts = @posts.where(layout: filter_params[:layout]) if filter_params[:layout]
     # Que estén dentro de la categoría
diff --git a/app/views/posts/index.haml b/app/views/posts/index.haml
index 470e9641..ae53aa7a 100644
--- a/app/views/posts/index.haml
+++ b/app/views/posts/index.haml
@@ -84,9 +84,10 @@
                     %button.btn{ data: { action: 'reorder#top' } }= t('posts.reorder.top')
                     %button.btn{ data: { action: 'reorder#bottom' } }= t('posts.reorder.bottom')
 
-                  %div
-                    = link_to_prev_page @posts, t('posts.prev'), class: 'btn'
-                    = link_to_next_page @posts, t('posts.next'), class: 'btn'
+                  - if @site.pagination
+                    %div
+                      = link_to_prev_page @posts, t('posts.prev'), class: 'btn'
+                      = link_to_next_page @posts, t('posts.next'), class: 'btn'
           %tbody
             - dir = @site.data.dig(params[:locale], 'dir')
             - size = @posts.size
diff --git a/db/migrate/20230519143500_add_pagination_to_site.rb b/db/migrate/20230519143500_add_pagination_to_site.rb
new file mode 100644
index 00000000..776fa318
--- /dev/null
+++ b/db/migrate/20230519143500_add_pagination_to_site.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+# Agrega la opción de paginación a los sitios
+class AddPaginationToSites < ActiveRecord::Migration[6.1]
+  def change
+    add_column :sites, :pagination, :boolean, default: false
+  end
+end

From d0f7843fbf90ef936afe955b046d8cab1ee6f7d8 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Fri, 19 May 2023 14:40:42 -0300
Subject: [PATCH 06/51] fixup! feat: poder paginar solo algunos sitios #12714

---
 db/migrate/20230519143500_add_pagination_to_site.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/migrate/20230519143500_add_pagination_to_site.rb b/db/migrate/20230519143500_add_pagination_to_site.rb
index 776fa318..387dc588 100644
--- a/db/migrate/20230519143500_add_pagination_to_site.rb
+++ b/db/migrate/20230519143500_add_pagination_to_site.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Agrega la opción de paginación a los sitios
-class AddPaginationToSites < ActiveRecord::Migration[6.1]
+class AddPaginationToSite < ActiveRecord::Migration[6.1]
   def change
     add_column :sites, :pagination, :boolean, default: false
   end

From e35bddf915ea332c0a169556d581d41744b6f0ad Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Wed, 24 May 2023 10:04:22 -0300
Subject: [PATCH 07/51] fix: no permitir que les usuaries elijan un idioma que
 no existe
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

porque se les rompe el panel después
---
 app/models/usuarie.rb | 12 ++++++++++++
 config/locales/en.yml |  4 ++++
 config/locales/es.yml |  4 ++++
 3 files changed, 20 insertions(+)

diff --git a/app/models/usuarie.rb b/app/models/usuarie.rb
index 2bc7a1b5..42f20c0b 100644
--- a/app/models/usuarie.rb
+++ b/app/models/usuarie.rb
@@ -10,6 +10,7 @@ class Usuarie < ApplicationRecord
 
   validates_uniqueness_of :email
   validates_with EmailAddress::ActiveRecordValidator, field: :email
+  validate :locale_available!
 
   before_create :lang_from_locale!
   before_update :remove_confirmation_invitation_inconsistencies!
@@ -78,4 +79,15 @@ class Usuarie < ApplicationRecord
       self.invitation_accepted_at ||= Time.now.utc
     end
   end
+
+  # Muestra un error si el idioma no está disponible al cambiar el
+  # idioma de la cuenta.
+  #
+  # @return [nil]
+  def locale_available!
+    return if I18n.locale_available? self.lang
+
+    errors.add(:lang, I18n.t('activerecord.errors.models.usuarie.attributes.lang.not_available'))
+    nil
+  end
 end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 5f97a8b9..ab6a9305 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -194,6 +194,10 @@ en:
               layout_incompatible:
                 error: "Design can't be changed because there are posts with incompatible layouts"
                 help: "Your site has posts with layouts only compatible with the current design.  If you change it, the site won't work as you expect.  If you're trying out designs, you can delete posts in the following incompatible layouts:: %{layouts}."
+        usuarie:
+          attributes:
+            lang:
+              not_available: "This language is not yet available, would you help us by translating Sutty into it?"
   errors:
     argument_error: 'Argument `%{argument}` must be an instance of %{class}'
     unknown_locale: 'Unknown %{locale} locale'
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 9e0b8945..e3c271da 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -194,6 +194,10 @@ es:
               layout_incompatible:
                 error: 'No se puede cambiar la plantilla porque hay artículos con formatos incompatibles'
                 help: 'En tu sitio hay artículos que solo son compatibles con el diseño actual, si cambias la plantilla el sitio no funcionará como esperas.  Si estás probando plantillas, puedes eliminar los artículos en los formatos incompatibles: %{layouts}.'
+        usuarie:
+          attributes:
+            lang:
+              not_available: "Este idioma todavía no está disponible, ¿nos ayudas a agregarlo y mantenerlo?"
   errors:
     argument_error: 'El argumento `%{argument}` debe ser una instancia de %{class}'
     unknown_locale: 'El idioma %{locale} es desconocido'

From 4e002e042bc5b0e5c129ab8cac3df03cf340fefb Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Wed, 24 May 2023 10:06:11 -0300
Subject: [PATCH 08/51] fix: no permitir idiomas que no existen en el cambio de
 idioma #13493

---
 app/controllers/application_controller.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index ee153394..2746ab10 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -59,7 +59,11 @@ class ApplicationController < ActionController::Base
   #
   # @return [String,Symbol]
   def current_locale
-    session[:locale] = params[:change_locale_to] if params[:change_locale_to].present?
+    locale = params[:change_locale_to]
+
+    if locale.present? && I18n.locale_available?(locale)
+      session[:locale] = params[:change_locale_to]
+    end
 
     session[:locale] || current_usuarie&.lang || I18n.locale
   end

From 8d7d1c10b18cd4725f994c9f5900517947f3f9d3 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Thu, 15 Jun 2023 12:04:44 -0300
Subject: [PATCH 09/51] fix: indexar posts luego de crear el sitio #13610
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

se producía una condición donde el sitio se quería indexar sin haber
terminado de instalar las gemas y todo fallaba.

no tenemos que usar más callbacks, solo servicios
---
 app/models/site/index.rb     | 2 --
 app/services/site_service.rb | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/models/site/index.rb b/app/models/site/index.rb
index e11095e3..c2c55ade 100644
--- a/app/models/site/index.rb
+++ b/app/models/site/index.rb
@@ -8,8 +8,6 @@ class Site
     extend ActiveSupport::Concern
 
     included do
-      # TODO: Debería ser un Job?
-      after_create :index_posts!
       has_many :indexed_posts, dependent: :destroy
 
       def index_posts!
diff --git a/app/services/site_service.rb b/app/services/site_service.rb
index 2c29538c..367d3b08 100644
--- a/app/services/site_service.rb
+++ b/app/services/site_service.rb
@@ -33,6 +33,7 @@ SiteService = Struct.new(:site, :usuarie, :params, keyword_init: true) do
         add_licencias &&
         add_code_of_conduct &&
         add_privacy_policy &&
+        site.index_posts! &&
         deploy
     end
 

From 6e4247206719c8330f6229139df17858e8de734c Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Thu, 15 Jun 2023 13:33:25 -0300
Subject: [PATCH 10/51] =?UTF-8?q?fix:=20darle=20bola=20a=20los=20mensajes?=
 =?UTF-8?q?=20de=20deprecaci=C3=B3n=20de=20bundler=20#13610?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

se configuraban las opciones que le pasábamos pero no se aplicaban en el
comando actual, con lo que quería instalar las gemas globalmente y
fallaba la creación de sitios.
---
 app/models/deploy_local.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/models/deploy_local.rb b/app/models/deploy_local.rb
index 75ea8b1c..ed5f1919 100644
--- a/app/models/deploy_local.rb
+++ b/app/models/deploy_local.rb
@@ -138,7 +138,12 @@ class DeployLocal < Deploy
   end
 
   def bundle(output: false)
-    run %(bundle install --deployment --no-cache --path="#{gems_dir}" --clean --without test development), output: output
+    run %(bundle config set --local clean 'true'), output: output
+    run %(bundle config set --local deployment 'true'), output: output
+    run %(bundle config set --local path '#{gems_dir}'), output: output
+    run %(bundle config set --local without 'test development'), output: output
+    run %(bundle config set --local cache_all 'false'), output: output
+    run %(bundle install), output: output
   end
 
   def jekyll_build(output: false)

From 6d64fa144392d0b011ca56ec677f99f095857a27 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Thu, 15 Jun 2023 18:51:16 -0300
Subject: [PATCH 11/51] fix: generar un registro cuando falla distributed press
 #13628

---
 app/models/deploy_distributed_press.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/models/deploy_distributed_press.rb b/app/models/deploy_distributed_press.rb
index 889d8e34..2c892b55 100644
--- a/app/models/deploy_distributed_press.rb
+++ b/app/models/deploy_distributed_press.rb
@@ -52,7 +52,12 @@ class DeployDistributedPress < Deploy
         end
       end
 
-      status = c.publish(publishing_site, deploy_local.destination)
+      begin
+        status = c.publish(publishing_site, deploy_local.destination)
+      rescue DistributedPress::V1::Error => e
+        ExceptionNotifier.notify_exception(e, data: { site: site.name })
+        status = false
+      end
 
       if status
         self.remote_info[:distributed_press] = c.show(publishing_site).to_h

From d77b8ba67be5d4955cfaeb141197a1ab0ab86963 Mon Sep 17 00:00:00 2001
From: jazzari <jazzari@sutty.coop.ar>
Date: Thu, 20 Jul 2023 14:58:21 -0300
Subject: [PATCH 12/51] feat: created job to make git pull #12980

---
 app/jobs/git_pull_job.rb | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 app/jobs/git_pull_job.rb

diff --git a/app/jobs/git_pull_job.rb b/app/jobs/git_pull_job.rb
new file mode 100644
index 00000000..0c9ef237
--- /dev/null
+++ b/app/jobs/git_pull_job.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+# Permite traer los cambios cada vez que se
+# hace un push al repositorio
+class GitPullJob < ApplicationJob
+    # @param :site [Site]
+    # @return [nil]
+    def perform(site)
+      # hace un fetch para ver cambios
+      site.repository.fetch
+      
+      # hace un merge 
+      site.repository.merge(site.usuarie)
+      site.repository.git_sh("git lfs fetch")
+
+    end
+  end
\ No newline at end of file

From 3e12bfbe9ec950ec4dfd639717664742bc0491b6 Mon Sep 17 00:00:00 2001
From: jazzari <jazzari@sutty.coop.ar>
Date: Fri, 21 Jul 2023 17:12:26 -0300
Subject: [PATCH 13/51] fix: add git lfs fetch to repository#fetch method
 #12980

---
 app/jobs/git_pull_job.rb      | 12 ++++--------
 app/models/site/repository.rb |  6 +++++-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/jobs/git_pull_job.rb b/app/jobs/git_pull_job.rb
index 0c9ef237..de263403 100644
--- a/app/jobs/git_pull_job.rb
+++ b/app/jobs/git_pull_job.rb
@@ -4,14 +4,10 @@
 # hace un push al repositorio
 class GitPullJob < ApplicationJob
     # @param :site [Site]
+    # @param :usuarie [Usuarie]
     # @return [nil]
-    def perform(site)
-      # hace un fetch para ver cambios
+    def perform(site, usuarie)
       site.repository.fetch
-      
-      # hace un merge 
-      site.repository.merge(site.usuarie)
-      site.repository.git_sh("git lfs fetch")
-
+      site.repository.merge(usuarie)
     end
-  end
\ No newline at end of file
+end
\ No newline at end of file
diff --git a/app/models/site/repository.rb b/app/models/site/repository.rb
index 62e4c45e..d2832091 100644
--- a/app/models/site/repository.rb
+++ b/app/models/site/repository.rb
@@ -45,7 +45,9 @@ class Site
     # @return [Integer]
     def fetch
       if origin.check_connection(:fetch, credentials: credentials)
-        rugged.fetch(origin, credentials: credentials)[:received_objects]
+        rugged.fetch(origin, credentials: credentials)[:received_objects].tap do |objects|
+          git_sh("git", "lfs", "fetch", "origin", default_branch) if objects&.positive?
+        end   
       else
         0
       end
@@ -75,6 +77,8 @@ class Site
       # Forzamos el checkout para mover el HEAD al último commit y
       # escribir los cambios
       rugged.checkout 'HEAD', strategy: :force
+      # reemplaza los pointers por los archivos correspondientes            
+      git_sh("git", "lfs", "checkout")
       commit
     end
 

From b7e93cd8c8e8a9cbccc40d865571e21ecf0abfc3 Mon Sep 17 00:00:00 2001
From: jazzari <jazzari@sutty.coop.ar>
Date: Wed, 26 Jul 2023 14:44:11 -0300
Subject: [PATCH 14/51] feat: controlador para gestionar los webhooks #13903

---
 app/controllers/api/v1/webhooks_controller.rb | 17 +++++++++++++++++
 app/models/site/repository.rb                 |  4 ++--
 config/locales/en.yml                         |  3 +++
 config/locales/es.yml                         |  3 +++
 config/routes.rb                              |  2 ++
 5 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 app/controllers/api/v1/webhooks_controller.rb

diff --git a/app/controllers/api/v1/webhooks_controller.rb b/app/controllers/api/v1/webhooks_controller.rb
new file mode 100644
index 00000000..4811d792
--- /dev/null
+++ b/app/controllers/api/v1/webhooks_controller.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Api
+    module V1
+      # Recibe webhooks y lanza jobs
+      class WebhooksController < BaseController
+        def pull 
+          # encontrar el sitio
+          site = Site.find_by_name(params[:site_id])
+          usuarie = GitAuthor.new email: "webhook@#{Site.domain}", name: 'Webhook'
+          message = I18n.t('webhooks.pull.message')
+
+          GitPullJob.perform_later(site, usuarie, message)
+        end
+      end
+    end
+end
\ No newline at end of file
diff --git a/app/models/site/repository.rb b/app/models/site/repository.rb
index 404cde3e..a3487bc5 100644
--- a/app/models/site/repository.rb
+++ b/app/models/site/repository.rb
@@ -56,7 +56,7 @@ class Site
     # Incorpora los cambios en el repositorio actual
     #
     # @return [Rugged::Commit]
-    def merge(usuarie)
+    def merge(usuarie, message)
       merge = rugged.merge_commits(head_commit, remote_head_commit)
 
       # No hacemos nada si hay conflictos, pero notificarnos
@@ -71,7 +71,7 @@ class Site
                .create(rugged, update_ref: 'HEAD',
                                parents: [head_commit, remote_head_commit],
                                tree: merge.write_tree(rugged),
-                               message: I18n.t('sites.fetch.merge.message'),
+                               message: message,
                                author: author(usuarie), committer: committer)
 
       # Forzamos el checkout para mover el HEAD al último commit y
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 5f97a8b9..05fcf1e5 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -466,6 +466,9 @@ en:
         success: 'Site upgrade has been completed.  Your next build will run this upgrade :)'
         error: "There was an error when trying to upgrade your site.  This could be due to conflicts that couldn't be solved automatically.  A report of the issue has already been sent to our admins. Sorry for the inconvenience! :("
         message: 'Skeleton upgrade'
+  webhooks_controller:
+    pull:
+      message: 'Webhooks upgrade'
   footer:
     powered_by: 'is developed by'
   i18n:
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 9e0b8945..af5a7db7 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -474,6 +474,9 @@ es:
         success: 'Ya se incorporaron los cambios en el sitio, se aplicarán en la próxima compilación que hagas :)'
         error: 'Hubo un error al incorporar los cambios en el sitio.  Esto puede deberse a conflictos entre cambios que no se pueden resolver automáticamente.  Hemos enviado un reporte del problema a les administradores de Sutty para que estén al tanto de la situación.  ¡Lo sentimos! :('
         message: 'Actualización del esqueleto'
+  webhooks_controller:
+    pull:
+      message: 'Actualización desde Webhooks'
   footer:
     powered_by: 'es desarrollada por'
   i18n:
diff --git a/config/routes.rb b/config/routes.rb
index 3828915c..f2487066 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -17,6 +17,8 @@ Rails.application.routes.draw do
 
           get  :'contact/cookie', to: 'invitades#contact_cookie'
           post :'contact/:form', to: 'contact#receive', as: :contact
+
+          post :'webhooks/pull', to: 'webhooks#pull'
         end
       end
     end

From 8947942cb9066f2775faf4b0864e2874a1c39907 Mon Sep 17 00:00:00 2001
From: jazzari <jazzari@sutty.coop.ar>
Date: Thu, 27 Jul 2023 16:46:32 -0300
Subject: [PATCH 15/51] fix: commit message fixed #13903

---
 app/controllers/api/v1/webhooks_controller.rb | 9 ++++++---
 app/jobs/git_pull_job.rb                      | 4 ++--
 app/models/site/repository.rb                 | 2 +-
 config/locales/en.yml                         | 2 +-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/controllers/api/v1/webhooks_controller.rb b/app/controllers/api/v1/webhooks_controller.rb
index 4811d792..40187915 100644
--- a/app/controllers/api/v1/webhooks_controller.rb
+++ b/app/controllers/api/v1/webhooks_controller.rb
@@ -4,11 +4,14 @@ module Api
     module V1
       # Recibe webhooks y lanza jobs
       class WebhooksController < BaseController
+        # Trae los cambios a partir de un post de Webhooks:
+        # (Gitlab, Github, Guitea, etc)
         def pull 
-          # encontrar el sitio
-          site = Site.find_by_name(params[:site_id])
+          site = Site.find_by_name!(params[:site_id])
           usuarie = GitAuthor.new email: "webhook@#{Site.domain}", name: 'Webhook'
-          message = I18n.t('webhooks.pull.message')
+          message = I18n.with_locale(site.default_locale) do
+            I18n.t('webhooks.pull.message')
+          end
 
           GitPullJob.perform_later(site, usuarie, message)
         end
diff --git a/app/jobs/git_pull_job.rb b/app/jobs/git_pull_job.rb
index de263403..5cd86981 100644
--- a/app/jobs/git_pull_job.rb
+++ b/app/jobs/git_pull_job.rb
@@ -6,8 +6,8 @@ class GitPullJob < ApplicationJob
     # @param :site [Site]
     # @param :usuarie [Usuarie]
     # @return [nil]
-    def perform(site, usuarie)
+    def perform(site, usuarie, message)
       site.repository.fetch
-      site.repository.merge(usuarie)
+      site.repository.merge(usuarie, message) if site.repository.fetch&.positive?
     end
 end
\ No newline at end of file
diff --git a/app/models/site/repository.rb b/app/models/site/repository.rb
index a3487bc5..a864e8b9 100644
--- a/app/models/site/repository.rb
+++ b/app/models/site/repository.rb
@@ -56,7 +56,7 @@ class Site
     # Incorpora los cambios en el repositorio actual
     #
     # @return [Rugged::Commit]
-    def merge(usuarie, message)
+    def merge(usuarie, message= I18n.t('sites.fetch.merge.message'))
       merge = rugged.merge_commits(head_commit, remote_head_commit)
 
       # No hacemos nada si hay conflictos, pero notificarnos
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 05fcf1e5..8ae8cce5 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -468,7 +468,7 @@ en:
         message: 'Skeleton upgrade'
   webhooks_controller:
     pull:
-      message: 'Webhooks upgrade'
+      message: 'Webhooks pull'
   footer:
     powered_by: 'is developed by'
   i18n:

From 9f5364a738825e7dc17b8482ecdd882f069d1ba4 Mon Sep 17 00:00:00 2001
From: jazzari <jazzari@sutty.coop.ar>
Date: Thu, 27 Jul 2023 17:02:48 -0300
Subject: [PATCH 16/51] fix: add documentation to pull job #13903

---
 app/jobs/git_pull_job.rb      | 2 +-
 app/models/site/repository.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/jobs/git_pull_job.rb b/app/jobs/git_pull_job.rb
index 5cd86981..a0c15950 100644
--- a/app/jobs/git_pull_job.rb
+++ b/app/jobs/git_pull_job.rb
@@ -5,9 +5,9 @@
 class GitPullJob < ApplicationJob
     # @param :site [Site]
     # @param :usuarie [Usuarie]
+    # @param :message [String]
     # @return [nil]
     def perform(site, usuarie, message)
-      site.repository.fetch
       site.repository.merge(usuarie, message) if site.repository.fetch&.positive?
     end
 end
\ No newline at end of file
diff --git a/app/models/site/repository.rb b/app/models/site/repository.rb
index a864e8b9..c0607d84 100644
--- a/app/models/site/repository.rb
+++ b/app/models/site/repository.rb
@@ -56,7 +56,7 @@ class Site
     # Incorpora los cambios en el repositorio actual
     #
     # @return [Rugged::Commit]
-    def merge(usuarie, message= I18n.t('sites.fetch.merge.message'))
+    def merge(usuarie, message = I18n.t('sites.fetch.merge.message'))
       merge = rugged.merge_commits(head_commit, remote_head_commit)
 
       # No hacemos nada si hay conflictos, pero notificarnos

From 9f94ee3bc704dfe9a7787ce6be0b8015a2fcb676 Mon Sep 17 00:00:00 2001
From: jazzari <jazzari@sutty.coop.ar>
Date: Thu, 27 Jul 2023 17:23:40 -0300
Subject: [PATCH 17/51] fix: add response status to pull method #13903

---
 app/controllers/api/v1/webhooks_controller.rb | 2 ++
 config/locales/es.yml                         | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/controllers/api/v1/webhooks_controller.rb b/app/controllers/api/v1/webhooks_controller.rb
index 40187915..a538d99f 100644
--- a/app/controllers/api/v1/webhooks_controller.rb
+++ b/app/controllers/api/v1/webhooks_controller.rb
@@ -14,6 +14,8 @@ module Api
           end
 
           GitPullJob.perform_later(site, usuarie, message)
+          
+          head :ok
         end
       end
     end
diff --git a/config/locales/es.yml b/config/locales/es.yml
index af5a7db7..b03a222f 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -476,7 +476,7 @@ es:
         message: 'Actualización del esqueleto'
   webhooks_controller:
     pull:
-      message: 'Actualización desde Webhooks'
+      message: 'Pull de webhooks'
   footer:
     powered_by: 'es desarrollada por'
   i18n:

From 9a78c628b4aac8bffe44e4dffb80d0c268be6b83 Mon Sep 17 00:00:00 2001
From: jazzari <jazzari@sutty.coop.ar>
Date: Mon, 31 Jul 2023 12:29:27 -0300
Subject: [PATCH 18/51] fix: fix typo in es.yml #13864

---
 config/locales/es.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/locales/es.yml b/config/locales/es.yml
index 9e0b8945..eabddcc9 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -693,7 +693,7 @@ es:
         new: 'Crear'
         edit: 'Configurar'
       posts:
-        new: 'Nuevo %{layout}'
+        new: 'Agregar %{layout}'
         edit: 'Editando'
       usuaries:
         index: 'Usuaries'

From 06ebb63d9389c260e547c73487eb89c108dacb0b Mon Sep 17 00:00:00 2001
From: jazzari <jazzari@sutty.coop.ar>
Date: Mon, 31 Jul 2023 14:18:07 -0300
Subject: [PATCH 19/51] =?UTF-8?q?fix:=20movido=20git=20lfs=20a=20m=C3=A9to?=
 =?UTF-8?q?do=20merge=20en=20repository.rb=20#13903?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/jobs/git_pull_job.rb      | 4 ++--
 app/models/site/repository.rb | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/jobs/git_pull_job.rb b/app/jobs/git_pull_job.rb
index a0c15950..dc4a285c 100644
--- a/app/jobs/git_pull_job.rb
+++ b/app/jobs/git_pull_job.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-# Permite traer los cambios cada vez que se
-# hace un push al repositorio
+# Permite traer los cambios desde webhooks
+
 class GitPullJob < ApplicationJob
     # @param :site [Site]
     # @param :usuarie [Usuarie]
diff --git a/app/models/site/repository.rb b/app/models/site/repository.rb
index c0607d84..9c4d873f 100644
--- a/app/models/site/repository.rb
+++ b/app/models/site/repository.rb
@@ -45,9 +45,7 @@ class Site
     # @return [Integer]
     def fetch
       if origin.check_connection(:fetch, credentials: credentials)
-        rugged.fetch(origin, credentials: credentials)[:received_objects].tap do |objects|
-          git_sh("git", "lfs", "fetch", "origin", default_branch) if objects&.positive?
-        end   
+        rugged.fetch(origin, credentials: credentials)[:received_objects]
       else
         0
       end
@@ -77,6 +75,8 @@ class Site
       # Forzamos el checkout para mover el HEAD al último commit y
       # escribir los cambios
       rugged.checkout 'HEAD', strategy: :force
+      
+      git_sh("git", "lfs", "fetch", "origin", default_branch)
       # reemplaza los pointers por los archivos correspondientes            
       git_sh("git", "lfs", "checkout")
       commit

From 579e1776842774733c036b6b621ccf087b2b06cc Mon Sep 17 00:00:00 2001
From: jazzari <jazzari@sutty.coop.ar>
Date: Mon, 31 Jul 2023 17:32:14 -0300
Subject: [PATCH 20/51] feat: agregada columna token a model rol #13903

---
 app/models/rol.rb                               | 10 ++++++++++
 db/migrate/20230731195050_add_token_to_roles.rb |  5 +++++
 db/migrate/20230731202003_change_token_name.rb  |  5 +++++
 3 files changed, 20 insertions(+)
 create mode 100644 db/migrate/20230731195050_add_token_to_roles.rb
 create mode 100644 db/migrate/20230731202003_change_token_name.rb

diff --git a/app/models/rol.rb b/app/models/rol.rb
index fcd07037..f17bf418 100644
--- a/app/models/rol.rb
+++ b/app/models/rol.rb
@@ -14,6 +14,9 @@ class Rol < ApplicationRecord
 
   validates_inclusion_of :rol, in: ROLES
 
+  encrypts :token
+  before_save :add_token_if_missing!
+
   def invitade?
     rol == INVITADE
   end
@@ -25,4 +28,11 @@ class Rol < ApplicationRecord
   def self.role?(rol)
     ROLES.include? rol
   end
+
+  private
+
+  # Asegurarse que tenga un token
+  def add_token_if_missing!
+    self.token ||= SecureRandom.hex(64)
+  end
 end
diff --git a/db/migrate/20230731195050_add_token_to_roles.rb b/db/migrate/20230731195050_add_token_to_roles.rb
new file mode 100644
index 00000000..635e065c
--- /dev/null
+++ b/db/migrate/20230731195050_add_token_to_roles.rb
@@ -0,0 +1,5 @@
+class AddTokenToRoles < ActiveRecord::Migration[6.1]
+  def change
+    add_column :roles, :token, :text
+  end
+end
diff --git a/db/migrate/20230731202003_change_token_name.rb b/db/migrate/20230731202003_change_token_name.rb
new file mode 100644
index 00000000..50fc0c40
--- /dev/null
+++ b/db/migrate/20230731202003_change_token_name.rb
@@ -0,0 +1,5 @@
+class ChangeTokenName < ActiveRecord::Migration[6.1]
+  def change
+    rename_column :roles, :token, :token_cyphertext
+  end
+end

From c19c834f10962e3c58d2b08418ee7790430318c9 Mon Sep 17 00:00:00 2001
From: jazzari <jazzari@sutty.coop.ar>
Date: Mon, 31 Jul 2023 18:46:07 -0300
Subject: [PATCH 21/51] =?UTF-8?q?fix:=20cambio=20nombre=20comuna=20token?=
 =?UTF-8?q?=5Fcyphertext=20en=20modelo=20rol=20y=20asignaci=C3=B3n=20retro?=
 =?UTF-8?q?activa=20#13903?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/migrate/20230731202003_change_token_name.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/db/migrate/20230731202003_change_token_name.rb b/db/migrate/20230731202003_change_token_name.rb
index 50fc0c40..c3fce3c0 100644
--- a/db/migrate/20230731202003_change_token_name.rb
+++ b/db/migrate/20230731202003_change_token_name.rb
@@ -1,5 +1,6 @@
 class ChangeTokenName < ActiveRecord::Migration[6.1]
   def change
     rename_column :roles, :token, :token_cyphertext
+    Rol.find_each { |m| m.update_column( :token_cyphertext, SecureRandom.hex(64) ) } 
   end
 end

From 705d15c0c1959d3e50b2f8646830a15372c4797e Mon Sep 17 00:00:00 2001
From: jazzari <jazzari@sutty.coop.ar>
Date: Thu, 10 Aug 2023 16:05:14 -0300
Subject: [PATCH 22/51] fix: change token attribute from encrypted to normal in
 Rol model #13903

---
 app/controllers/api/v1/webhooks_controller.rb | 22 ++++++++++++++-----
 app/models/rol.rb                             |  1 -
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/app/controllers/api/v1/webhooks_controller.rb b/app/controllers/api/v1/webhooks_controller.rb
index a538d99f..1933f24e 100644
--- a/app/controllers/api/v1/webhooks_controller.rb
+++ b/app/controllers/api/v1/webhooks_controller.rb
@@ -2,19 +2,31 @@
 
 module Api
     module V1
-      # Recibe webhooks y lanza jobs
+      # Recibe webhooks y lanza un PullJob
       class WebhooksController < BaseController
+        rescue_from ActiveRecord::RecordNotFound, with: :platforms_answer
+
+        def site 
+          @site ||= Site.find_by_name!(params[:site_id])
+        end
+
+        # valida la plataforma del webhook
+        def usuarie
+          # Gitlab 
+          token = request.headers["X-Gitlab-Token"]
+          @usuarie = site.roles.find_by!(temporal: false, rol: 'usuarie', token: token).usuarie
+        end
+
         # Trae los cambios a partir de un post de Webhooks:
         # (Gitlab, Github, Guitea, etc)
         def pull 
-          site = Site.find_by_name!(params[:site_id])
-          usuarie = GitAuthor.new email: "webhook@#{Site.domain}", name: 'Webhook'
           message = I18n.with_locale(site.default_locale) do
             I18n.t('webhooks.pull.message')
           end
-
           GitPullJob.perform_later(site, usuarie, message)
-          
+        end
+
+        def platforms_answer
           head :ok
         end
       end
diff --git a/app/models/rol.rb b/app/models/rol.rb
index f17bf418..37332400 100644
--- a/app/models/rol.rb
+++ b/app/models/rol.rb
@@ -14,7 +14,6 @@ class Rol < ApplicationRecord
 
   validates_inclusion_of :rol, in: ROLES
 
-  encrypts :token
   before_save :add_token_if_missing!
 
   def invitade?

From 63fd91ee48f3a9cab4417f6e9bd21be6604440f0 Mon Sep 17 00:00:00 2001
From: jazzari <jazzari@sutty.coop.ar>
Date: Thu, 10 Aug 2023 16:13:13 -0300
Subject: [PATCH 23/51] feat: add token to existing records #13903

---
 db/migrate/20230731195050_add_token_to_roles.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/db/migrate/20230731195050_add_token_to_roles.rb b/db/migrate/20230731195050_add_token_to_roles.rb
index 635e065c..620c9fef 100644
--- a/db/migrate/20230731195050_add_token_to_roles.rb
+++ b/db/migrate/20230731195050_add_token_to_roles.rb
@@ -1,5 +1,6 @@
 class AddTokenToRoles < ActiveRecord::Migration[6.1]
   def change
     add_column :roles, :token, :text
+    Rol.find_each { |m| m.update_column( :token, SecureRandom.hex(64) ) } 
   end
 end

From 23732bbfe0ed8c4920bd7188b700f63ed5612b51 Mon Sep 17 00:00:00 2001
From: jazzari <jazzari@sutty.coop.ar>
Date: Mon, 14 Aug 2023 12:50:18 -0300
Subject: [PATCH 24/51] feat: add method to validate token from diff platforms
 in webhooks controller #13903

---
 app/controllers/api/v1/webhooks_controller.rb | 29 +++++++++++++++++--
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/app/controllers/api/v1/webhooks_controller.rb b/app/controllers/api/v1/webhooks_controller.rb
index 1933f24e..091d467e 100644
--- a/app/controllers/api/v1/webhooks_controller.rb
+++ b/app/controllers/api/v1/webhooks_controller.rb
@@ -10,10 +10,32 @@ module Api
           @site ||= Site.find_by_name!(params[:site_id])
         end
 
-        # valida la plataforma del webhook
+        # valida el token que envía la plataforma del webhook
+        def token 
+          @token ||=
+            begin
+              # Gitlab
+              if request.headers['X-Gitlab-Token']
+                request.headers["X-Gitlab-Token"]
+              # Github
+              elsif request.headers['X-HUB-SIGNATURE-256']
+                signature(request.env['HTTP_X_HUB_SIGNATURE_256'])
+              # Guitea
+              else
+                signature(request.env['HTTP_X_GITEA_SIGNATURE'])
+              end
+            end 
+        end
+
+        def token_from_signature(signature)
+          payload = request.body.read  
+          site.roles.where(temporal: false, rol: 'usuarie').pluck(:token).find do |token|
+            new_signature = hash_mac(OpenSSL::Digest.new('sha256'), token, payload)
+            @token ||= Rack::Utils.secure_compare(new_signature, signature)
+          end
+        end
+
         def usuarie
-          # Gitlab 
-          token = request.headers["X-Gitlab-Token"]
           @usuarie = site.roles.find_by!(temporal: false, rol: 'usuarie', token: token).usuarie
         end
 
@@ -23,6 +45,7 @@ module Api
           message = I18n.with_locale(site.default_locale) do
             I18n.t('webhooks.pull.message')
           end
+
           GitPullJob.perform_later(site, usuarie, message)
         end
 

From f2236bb305573e7a471e1b3a94ab50d486bc0d63 Mon Sep 17 00:00:00 2001
From: jazzari <jazzari@sutty.coop.ar>
Date: Mon, 14 Aug 2023 16:49:24 -0300
Subject: [PATCH 25/51] feat: move methods to private #13903

---
 app/controllers/api/v1/webhooks_controller.rb | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/app/controllers/api/v1/webhooks_controller.rb b/app/controllers/api/v1/webhooks_controller.rb
index 091d467e..b356d20a 100644
--- a/app/controllers/api/v1/webhooks_controller.rb
+++ b/app/controllers/api/v1/webhooks_controller.rb
@@ -6,6 +6,19 @@ module Api
       class WebhooksController < BaseController
         rescue_from ActiveRecord::RecordNotFound, with: :platforms_answer
 
+        # Trae los cambios a partir de un post de Webhooks:
+        # (Gitlab, Github, Guitea, etc)
+        def pull 
+          message = I18n.with_locale(site.default_locale) do
+            I18n.t('webhooks.pull.message')
+          end
+
+          GitPullJob.perform_later(site, usuarie, message)
+          platforms_answer
+        end
+
+        private 
+
         def site 
           @site ||= Site.find_by_name!(params[:site_id])
         end
@@ -37,17 +50,7 @@ module Api
 
         def usuarie
           @usuarie = site.roles.find_by!(temporal: false, rol: 'usuarie', token: token).usuarie
-        end
-
-        # Trae los cambios a partir de un post de Webhooks:
-        # (Gitlab, Github, Guitea, etc)
-        def pull 
-          message = I18n.with_locale(site.default_locale) do
-            I18n.t('webhooks.pull.message')
-          end
-
-          GitPullJob.perform_later(site, usuarie, message)
-        end
+        end        
 
         def platforms_answer
           head :ok

From a098e1baa7d2e7e96b18bc16be7a21cc413c8f38 Mon Sep 17 00:00:00 2001
From: jazzari <jazzari@sutty.coop.ar>
Date: Tue, 15 Aug 2023 16:14:34 -0300
Subject: [PATCH 26/51] fix: change migration methods to add token to roles
 #13903

---
 db/migrate/20230731195050_add_token_to_roles.rb | 12 +++++++++---
 db/migrate/20230731202003_change_token_name.rb  |  6 ------
 2 files changed, 9 insertions(+), 9 deletions(-)
 delete mode 100644 db/migrate/20230731202003_change_token_name.rb

diff --git a/db/migrate/20230731195050_add_token_to_roles.rb b/db/migrate/20230731195050_add_token_to_roles.rb
index 620c9fef..c38b0526 100644
--- a/db/migrate/20230731195050_add_token_to_roles.rb
+++ b/db/migrate/20230731195050_add_token_to_roles.rb
@@ -1,6 +1,12 @@
 class AddTokenToRoles < ActiveRecord::Migration[6.1]
-  def change
-    add_column :roles, :token, :text
-    Rol.find_each { |m| m.update_column( :token, SecureRandom.hex(64) ) } 
+  def up
+    add_column :roles, :token, :string
+    Rol.find_each do |m|
+      m.update_column( :token, SecureRandom.hex(64) ) 
+    end
+  end
+
+  def down
+    remove_column :roles, :token 
   end
 end
diff --git a/db/migrate/20230731202003_change_token_name.rb b/db/migrate/20230731202003_change_token_name.rb
deleted file mode 100644
index c3fce3c0..00000000
--- a/db/migrate/20230731202003_change_token_name.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-class ChangeTokenName < ActiveRecord::Migration[6.1]
-  def change
-    rename_column :roles, :token, :token_cyphertext
-    Rol.find_each { |m| m.update_column( :token_cyphertext, SecureRandom.hex(64) ) } 
-  end
-end

From c5406acb26221e591804d481ac6547072dd38952 Mon Sep 17 00:00:00 2001
From: jazzari <jazzari@sutty.coop.ar>
Date: Tue, 15 Aug 2023 16:59:16 -0300
Subject: [PATCH 27/51] fix: add documentation and fix typos #13903

---
 app/controllers/api/v1/webhooks_controller.rb | 101 ++++++++++--------
 config/locales/es.yml                         |   2 +-
 2 files changed, 56 insertions(+), 47 deletions(-)

diff --git a/app/controllers/api/v1/webhooks_controller.rb b/app/controllers/api/v1/webhooks_controller.rb
index b356d20a..20cc0ddc 100644
--- a/app/controllers/api/v1/webhooks_controller.rb
+++ b/app/controllers/api/v1/webhooks_controller.rb
@@ -1,60 +1,69 @@
 # frozen_string_literal: true
 
 module Api
-    module V1
-      # Recibe webhooks y lanza un PullJob
-      class WebhooksController < BaseController
-        rescue_from ActiveRecord::RecordNotFound, with: :platforms_answer
+  module V1
+    # Recibe webhooks y lanza un PullJob
+    class WebhooksController < BaseController
+      # responde con forbidden si falla la validación del token
+      rescue_from ActiveRecord::RecordNotFound, with: :platforms_answer
 
-        # Trae los cambios a partir de un post de Webhooks:
-        # (Gitlab, Github, Guitea, etc)
-        def pull 
-          message = I18n.with_locale(site.default_locale) do
-            I18n.t('webhooks.pull.message')
-          end
-
-          GitPullJob.perform_later(site, usuarie, message)
-          platforms_answer
+      # Trae los cambios a partir de un post de Webhooks:
+      # (Gitlab, Github, Gitea, etc)
+      def pull 
+        message = I18n.with_locale(site.default_locale) do
+          I18n.t('webhooks.pull.message')
         end
 
-        private 
+        GitPullJob.perform_later(site, usuarie, message)
+        head :ok
+      end
 
-        def site 
-          @site ||= Site.find_by_name!(params[:site_id])
-        end
+      private 
 
-        # valida el token que envía la plataforma del webhook
-        def token 
-          @token ||=
-            begin
-              # Gitlab
-              if request.headers['X-Gitlab-Token']
-                request.headers["X-Gitlab-Token"]
-              # Github
-              elsif request.headers['X-HUB-SIGNATURE-256']
-                signature(request.env['HTTP_X_HUB_SIGNATURE_256'])
-              # Guitea
-              else
-                signature(request.env['HTTP_X_GITEA_SIGNATURE'])
-              end
-            end 
-        end
+      # encuentra el sitio a partir de la url
+      def site 
+        @site ||= Site.find_by_name!(params[:site_id])
+      end
 
-        def token_from_signature(signature)
-          payload = request.body.read  
-          site.roles.where(temporal: false, rol: 'usuarie').pluck(:token).find do |token|
-            new_signature = hash_mac(OpenSSL::Digest.new('sha256'), token, payload)
-            @token ||= Rack::Utils.secure_compare(new_signature, signature)
-          end
-        end
+      # valida el token que envía la plataforma del webhook
+      #
+      # @return [String]
+      def token 
+        @token ||=
+          begin
+            # Gitlab
+            if request.headers['X-Gitlab-Token']
+              request.headers['X-Gitlab-Token']
+            # Github
+            elsif request.headers['X-HUB-SIGNATURE-256']
+              request.env['HTTP_X_HUB_SIGNATURE_256']
+            # Gitea
+            else
+              request.env['HTTP_X_GITEA_SIGNATURE']
+            end
+          end 
+      end
 
-        def usuarie
-          @usuarie = site.roles.find_by!(temporal: false, rol: 'usuarie', token: token).usuarie
-        end        
-
-        def platforms_answer
-          head :ok
+      # valida token a partir de firma de webhook
+      #
+      # @return [String]
+      def token_from_signature(signature)
+        payload = request.body.read  
+        site.roles.where(temporal: false, rol: 'usuarie').pluck(:token).find do |token|
+          new_signature = 'sha256=' + OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new('sha256'), token, payload)
+          ActiveSupport::SecurityUtils.secure_compare(new_signature, signature)
         end
       end
+
+      # encuentra le usuarie 
+      def usuarie
+        @usuarie ||= site.roles.find_by!(temporal: false, rol: 'usuarie', token: token).usuarie
+      end        
+
+      # respuesta de error a plataformas
+      def platforms_answer
+        head :forbidden
+      end
     end
+  end
 end
\ No newline at end of file
diff --git a/config/locales/es.yml b/config/locales/es.yml
index b03a222f..7a83483f 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -476,7 +476,7 @@ es:
         message: 'Actualización del esqueleto'
   webhooks_controller:
     pull:
-      message: 'Pull de webhooks'
+      message: 'Traer los cambios a partir de un evento remoto'
   footer:
     powered_by: 'es desarrollada por'
   i18n:

From aeb2105dc7273cf603ab8e86f7bc90780f96093f Mon Sep 17 00:00:00 2001
From: jazzari <jazzari@sutty.coop.ar>
Date: Tue, 15 Aug 2023 19:25:06 -0300
Subject: [PATCH 28/51] fix: add rescue in token_from_signature method #13903

---
 app/controllers/api/v1/webhooks_controller.rb | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/controllers/api/v1/webhooks_controller.rb b/app/controllers/api/v1/webhooks_controller.rb
index 20cc0ddc..0ecca9d7 100644
--- a/app/controllers/api/v1/webhooks_controller.rb
+++ b/app/controllers/api/v1/webhooks_controller.rb
@@ -9,6 +9,8 @@ module Api
 
       # Trae los cambios a partir de un post de Webhooks:
       # (Gitlab, Github, Gitea, etc)
+      #
+      # @return [nil]
       def pull 
         message = I18n.with_locale(site.default_locale) do
           I18n.t('webhooks.pull.message')
@@ -36,22 +38,27 @@ module Api
               request.headers['X-Gitlab-Token']
             # Github
             elsif request.headers['X-HUB-SIGNATURE-256']
-              request.env['HTTP_X_HUB_SIGNATURE_256']
+              token_from_signature(request.env['HTTP_X_HUB_SIGNATURE_256'])
             # Gitea
             else
-              request.env['HTTP_X_GITEA_SIGNATURE']
+              token_from_signatureq(request.env['HTTP_X_GITEA_SIGNATURE'])
             end
           end 
       end
 
       # valida token a partir de firma de webhook
       #
-      # @return [String]
+      # @return [String, Boolean]
       def token_from_signature(signature)
         payload = request.body.read  
         site.roles.where(temporal: false, rol: 'usuarie').pluck(:token).find do |token|
           new_signature = 'sha256=' + OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new('sha256'), token, payload)
           ActiveSupport::SecurityUtils.secure_compare(new_signature, signature)
+        end.tap do |t|
+          raise ArgumentError, 'token no encontrado' if t.nil?
+        rescue ArgumentError => e
+          ExceptionNotifier.notify_exception(e, data: { params: params.to_h })
+          raise ActiveRecord::RecordNotFound
         end
       end
 

From 5ac628b38a0032a26e0f9d29f1c4e1266069360b Mon Sep 17 00:00:00 2001
From: jazzari <jazzari@sutty.coop.ar>
Date: Wed, 16 Aug 2023 12:58:14 -0300
Subject: [PATCH 29/51] fix: fix typo and change response to platforms #13903

---
 app/controllers/api/v1/webhooks_controller.rb | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/controllers/api/v1/webhooks_controller.rb b/app/controllers/api/v1/webhooks_controller.rb
index 0ecca9d7..40f2f06d 100644
--- a/app/controllers/api/v1/webhooks_controller.rb
+++ b/app/controllers/api/v1/webhooks_controller.rb
@@ -40,8 +40,10 @@ module Api
             elsif request.headers['X-HUB-SIGNATURE-256']
               token_from_signature(request.env['HTTP_X_HUB_SIGNATURE_256'])
             # Gitea
+            elsif
+              token_from_signature(request.env['HTTP_X_GITEA_SIGNATURE'])
             else
-              token_from_signatureq(request.env['HTTP_X_GITEA_SIGNATURE'])
+              raise ActiveRecord::RecordNotFound 
             end
           end 
       end
@@ -55,10 +57,7 @@ module Api
           new_signature = 'sha256=' + OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new('sha256'), token, payload)
           ActiveSupport::SecurityUtils.secure_compare(new_signature, signature)
         end.tap do |t|
-          raise ArgumentError, 'token no encontrado' if t.nil?
-        rescue ArgumentError => e
-          ExceptionNotifier.notify_exception(e, data: { params: params.to_h })
-          raise ActiveRecord::RecordNotFound
+          raise ActiveRecord::RecordNotFound if t.nil?
         end
       end
 
@@ -70,6 +69,9 @@ module Api
       # respuesta de error a plataformas
       def platforms_answer
         head :forbidden
+        raise ArgumentError, 'token no encontrado'
+      rescue ArgumentError => e
+        ExceptionNotifier.notify_exception(e, data: { params: params.to_h })
       end
     end
   end

From 35dca9d7565f40f2a037b095ea8005cd2a953232 Mon Sep 17 00:00:00 2001
From: jazzari <jazzari@sutty.coop.ar>
Date: Wed, 16 Aug 2023 13:39:29 -0300
Subject: [PATCH 30/51] fix: fix exception in platforms_answer method #13903

---
 app/controllers/api/v1/webhooks_controller.rb | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/controllers/api/v1/webhooks_controller.rb b/app/controllers/api/v1/webhooks_controller.rb
index 40f2f06d..13a227ce 100644
--- a/app/controllers/api/v1/webhooks_controller.rb
+++ b/app/controllers/api/v1/webhooks_controller.rb
@@ -57,7 +57,7 @@ module Api
           new_signature = 'sha256=' + OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new('sha256'), token, payload)
           ActiveSupport::SecurityUtils.secure_compare(new_signature, signature)
         end.tap do |t|
-          raise ActiveRecord::RecordNotFound if t.nil?
+          raise ActiveRecord::RecordNotFound, 'token no encontrado' if t.nil?
         end
       end
 
@@ -67,12 +67,9 @@ module Api
       end        
 
       # respuesta de error a plataformas
-      def platforms_answer
+      def platforms_answer(exception)
         head :forbidden
-        raise ArgumentError, 'token no encontrado'
-      rescue ArgumentError => e
-        ExceptionNotifier.notify_exception(e, data: { params: params.to_h })
-      end
+        ExceptionNotifier.notify_exception(exception, data: { params: params.to_h })
     end
   end
 end
\ No newline at end of file

From cefd053d1d7f70233f07cd047fd1dc5d321dd8b5 Mon Sep 17 00:00:00 2001
From: jazzari <jazzari@sutty.coop.ar>
Date: Wed, 16 Aug 2023 14:57:01 -0300
Subject: [PATCH 31/51] fix: add condition in elsif in token method #13903

---
 app/controllers/api/v1/webhooks_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/api/v1/webhooks_controller.rb b/app/controllers/api/v1/webhooks_controller.rb
index 13a227ce..3af9abee 100644
--- a/app/controllers/api/v1/webhooks_controller.rb
+++ b/app/controllers/api/v1/webhooks_controller.rb
@@ -40,7 +40,7 @@ module Api
             elsif request.headers['X-HUB-SIGNATURE-256']
               token_from_signature(request.env['HTTP_X_HUB_SIGNATURE_256'])
             # Gitea
-            elsif
+            elsif request.headers['HTTP_X_GITEA_SIGNATURE']
               token_from_signature(request.env['HTTP_X_GITEA_SIGNATURE'])
             else
               raise ActiveRecord::RecordNotFound 

From 114fe4b2d5dce83874735cf1de97af6e89b925d5 Mon Sep 17 00:00:00 2001
From: jazzari <jazzari@sutty.coop.ar>
Date: Wed, 16 Aug 2023 15:43:57 -0300
Subject: [PATCH 32/51] fix: fix in es.yml & en.yml and missing end #13903

---
 app/controllers/api/v1/webhooks_controller.rb | 11 ++++++-----
 config/locales/en.yml                         |  2 +-
 config/locales/es.yml                         |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/controllers/api/v1/webhooks_controller.rb b/app/controllers/api/v1/webhooks_controller.rb
index 3af9abee..8ef943be 100644
--- a/app/controllers/api/v1/webhooks_controller.rb
+++ b/app/controllers/api/v1/webhooks_controller.rb
@@ -38,12 +38,12 @@ module Api
               request.headers['X-Gitlab-Token']
             # Github
             elsif request.headers['X-HUB-SIGNATURE-256']
-              token_from_signature(request.env['HTTP_X_HUB_SIGNATURE_256'])
+              token_from_signature(request.env['HTTP_X_HUB_SIGNATURE_256'], 'sha256=')
             # Gitea
             elsif request.headers['HTTP_X_GITEA_SIGNATURE']
               token_from_signature(request.env['HTTP_X_GITEA_SIGNATURE'])
             else
-              raise ActiveRecord::RecordNotFound 
+              raise ActiveRecord::RecordNotFound, 'proveedor no soportado'
             end
           end 
       end
@@ -51,10 +51,10 @@ module Api
       # valida token a partir de firma de webhook
       #
       # @return [String, Boolean]
-      def token_from_signature(signature)
+      def token_from_signature(signature. prepend = '')
         payload = request.body.read  
         site.roles.where(temporal: false, rol: 'usuarie').pluck(:token).find do |token|
-          new_signature = 'sha256=' + OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new('sha256'), token, payload)
+          new_signature = prepend + OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new('sha256'), token, payload)
           ActiveSupport::SecurityUtils.secure_compare(new_signature, signature)
         end.tap do |t|
           raise ActiveRecord::RecordNotFound, 'token no encontrado' if t.nil?
@@ -69,7 +69,8 @@ module Api
       # respuesta de error a plataformas
       def platforms_answer(exception)
         head :forbidden
-        ExceptionNotifier.notify_exception(exception, data: { params: params.to_h })
+        ExceptionNotifier.notify_exception(exception, env: request.env)
+      end
     end
   end
 end
\ No newline at end of file
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8ae8cce5..c9a723bc 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -466,7 +466,7 @@ en:
         success: 'Site upgrade has been completed.  Your next build will run this upgrade :)'
         error: "There was an error when trying to upgrade your site.  This could be due to conflicts that couldn't be solved automatically.  A report of the issue has already been sent to our admins. Sorry for the inconvenience! :("
         message: 'Skeleton upgrade'
-  webhooks_controller:
+  webhooks:
     pull:
       message: 'Webhooks pull'
   footer:
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 7a83483f..857217ec 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -474,7 +474,7 @@ es:
         success: 'Ya se incorporaron los cambios en el sitio, se aplicarán en la próxima compilación que hagas :)'
         error: 'Hubo un error al incorporar los cambios en el sitio.  Esto puede deberse a conflictos entre cambios que no se pueden resolver automáticamente.  Hemos enviado un reporte del problema a les administradores de Sutty para que estén al tanto de la situación.  ¡Lo sentimos! :('
         message: 'Actualización del esqueleto'
-  webhooks_controller:
+  webhooks:
     pull:
       message: 'Traer los cambios a partir de un evento remoto'
   footer:

From 5ef601139fab2f99952dcda124a6a06bd10dc054 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Wed, 16 Aug 2023 16:21:48 -0300
Subject: [PATCH 33/51] fix: eliminar espacio en blanco

---
 app/controllers/api/v1/webhooks_controller.rb | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/controllers/api/v1/webhooks_controller.rb b/app/controllers/api/v1/webhooks_controller.rb
index 8ef943be..fb4a710c 100644
--- a/app/controllers/api/v1/webhooks_controller.rb
+++ b/app/controllers/api/v1/webhooks_controller.rb
@@ -11,7 +11,7 @@ module Api
       # (Gitlab, Github, Gitea, etc)
       #
       # @return [nil]
-      def pull 
+      def pull
         message = I18n.with_locale(site.default_locale) do
           I18n.t('webhooks.pull.message')
         end
@@ -20,17 +20,17 @@ module Api
         head :ok
       end
 
-      private 
+      private
 
       # encuentra el sitio a partir de la url
-      def site 
+      def site
         @site ||= Site.find_by_name!(params[:site_id])
       end
 
       # valida el token que envía la plataforma del webhook
       #
       # @return [String]
-      def token 
+      def token
         @token ||=
           begin
             # Gitlab
@@ -45,14 +45,14 @@ module Api
             else
               raise ActiveRecord::RecordNotFound, 'proveedor no soportado'
             end
-          end 
+          end
       end
 
       # valida token a partir de firma de webhook
       #
       # @return [String, Boolean]
       def token_from_signature(signature. prepend = '')
-        payload = request.body.read  
+        payload = request.body.read
         site.roles.where(temporal: false, rol: 'usuarie').pluck(:token).find do |token|
           new_signature = prepend + OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new('sha256'), token, payload)
           ActiveSupport::SecurityUtils.secure_compare(new_signature, signature)
@@ -61,10 +61,10 @@ module Api
         end
       end
 
-      # encuentra le usuarie 
+      # encuentra le usuarie
       def usuarie
         @usuarie ||= site.roles.find_by!(temporal: false, rol: 'usuarie', token: token).usuarie
-      end        
+      end
 
       # respuesta de error a plataformas
       def platforms_answer(exception)
@@ -73,4 +73,4 @@ module Api
       end
     end
   end
-end
\ No newline at end of file
+end

From 690efe329c571c0d8c601645735d186b7890a572 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Wed, 16 Aug 2023 16:22:57 -0300
Subject: [PATCH 34/51] fix: llamar a los headers consistentemente

---
 app/controllers/api/v1/webhooks_controller.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/controllers/api/v1/webhooks_controller.rb b/app/controllers/api/v1/webhooks_controller.rb
index fb4a710c..1d1258fd 100644
--- a/app/controllers/api/v1/webhooks_controller.rb
+++ b/app/controllers/api/v1/webhooks_controller.rb
@@ -37,11 +37,11 @@ module Api
             if request.headers['X-Gitlab-Token']
               request.headers['X-Gitlab-Token']
             # Github
-            elsif request.headers['X-HUB-SIGNATURE-256']
-              token_from_signature(request.env['HTTP_X_HUB_SIGNATURE_256'], 'sha256=')
+            elsif request.headers['X-Hub-Signature-256']
+              token_from_signature(request.headers['X_Hub_Signature_256'], 'sha256=')
             # Gitea
-            elsif request.headers['HTTP_X_GITEA_SIGNATURE']
-              token_from_signature(request.env['HTTP_X_GITEA_SIGNATURE'])
+            elsif request.headers['X_Gitea_Signature']
+              token_from_signature(request.headers['X_Gitea_Signature'])
             else
               raise ActiveRecord::RecordNotFound, 'proveedor no soportado'
             end

From a99e03ce15d13122f36e2aab976fd5229156300e Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Wed, 16 Aug 2023 16:23:39 -0300
Subject: [PATCH 35/51] feat: enviar los headers en el reporte

---
 app/controllers/api/v1/webhooks_controller.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/controllers/api/v1/webhooks_controller.rb b/app/controllers/api/v1/webhooks_controller.rb
index 1d1258fd..6be6c2dc 100644
--- a/app/controllers/api/v1/webhooks_controller.rb
+++ b/app/controllers/api/v1/webhooks_controller.rb
@@ -68,8 +68,9 @@ module Api
 
       # respuesta de error a plataformas
       def platforms_answer(exception)
+        ExceptionNotifier.notify_exception(exception, env: request.env, data: { headers: request.headers.to_h })
+
         head :forbidden
-        ExceptionNotifier.notify_exception(exception, env: request.env)
       end
     end
   end

From 42e6a0b6eb5432773d2337ed33ac154defd2c042 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Wed, 16 Aug 2023 16:24:33 -0300
Subject: [PATCH 36/51] fix: typo

---
 app/controllers/api/v1/webhooks_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/api/v1/webhooks_controller.rb b/app/controllers/api/v1/webhooks_controller.rb
index 6be6c2dc..ab2fce6b 100644
--- a/app/controllers/api/v1/webhooks_controller.rb
+++ b/app/controllers/api/v1/webhooks_controller.rb
@@ -51,7 +51,7 @@ module Api
       # valida token a partir de firma de webhook
       #
       # @return [String, Boolean]
-      def token_from_signature(signature. prepend = '')
+      def token_from_signature(signature, prepend = '')
         payload = request.body.read
         site.roles.where(temporal: false, rol: 'usuarie').pluck(:token).find do |token|
           new_signature = prepend + OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new('sha256'), token, payload)

From b9083c492cd3e50971bbbca9a549b81c4781efe3 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Wed, 16 Aug 2023 16:26:39 -0300
Subject: [PATCH 37/51] fix: presencia

---
 app/controllers/api/v1/webhooks_controller.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/api/v1/webhooks_controller.rb b/app/controllers/api/v1/webhooks_controller.rb
index ab2fce6b..23bfae22 100644
--- a/app/controllers/api/v1/webhooks_controller.rb
+++ b/app/controllers/api/v1/webhooks_controller.rb
@@ -34,13 +34,13 @@ module Api
         @token ||=
           begin
             # Gitlab
-            if request.headers['X-Gitlab-Token']
+            if request.headers['X-Gitlab-Token'].present?
               request.headers['X-Gitlab-Token']
             # Github
-            elsif request.headers['X-Hub-Signature-256']
+            elsif request.headers['X-Hub-Signature-256'].present?
               token_from_signature(request.headers['X_Hub_Signature_256'], 'sha256=')
             # Gitea
-            elsif request.headers['X_Gitea_Signature']
+            elsif request.headers['X_Gitea_Signature'].present?
               token_from_signature(request.headers['X_Gitea_Signature'])
             else
               raise ActiveRecord::RecordNotFound, 'proveedor no soportado'

From a2678c3e81f7943368edf9a51e9de80354af603f Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Wed, 16 Aug 2023 16:35:36 -0300
Subject: [PATCH 38/51] fix: no ignorar excepciones como record not found

---
 config/environments/production.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/environments/production.rb b/config/environments/production.rb
index 4cc1cb39..5e089ff9 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -142,7 +142,7 @@ Rails.application.configure do
   }
   config.action_mailer.default_options = { from: ENV.fetch('DEFAULT_FROM', "noreply@sutty.nl") }
 
-  config.middleware.use ExceptionNotification::Rack, gitlab: {}, ignore_exceptions: (['DeployJob::DeployAlreadyRunningException'] + ExceptionNotifier.ignored_exceptions)
+  config.middleware.use ExceptionNotification::Rack, gitlab: {}, ignore_exceptions: ['DeployJob::DeployAlreadyRunningException']
 
   Rails.application.routes.default_url_options[:host] = "panel.#{ENV.fetch('SUTTY', 'sutty.nl')}"
   Rails.application.routes.default_url_options[:protocol] = 'https'

From ef8ed271d75dd1e4bdf079c11f8bcaf450af25ac Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Wed, 16 Aug 2023 16:46:11 -0300
Subject: [PATCH 39/51] fix: consistencia al llamar a headers

---
 app/controllers/api/v1/webhooks_controller.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/api/v1/webhooks_controller.rb b/app/controllers/api/v1/webhooks_controller.rb
index 23bfae22..95439cd4 100644
--- a/app/controllers/api/v1/webhooks_controller.rb
+++ b/app/controllers/api/v1/webhooks_controller.rb
@@ -38,10 +38,10 @@ module Api
               request.headers['X-Gitlab-Token']
             # Github
             elsif request.headers['X-Hub-Signature-256'].present?
-              token_from_signature(request.headers['X_Hub_Signature_256'], 'sha256=')
+              token_from_signature(request.headers['X-Hub-Signature-256'], 'sha256=')
             # Gitea
-            elsif request.headers['X_Gitea_Signature'].present?
-              token_from_signature(request.headers['X_Gitea_Signature'])
+            elsif request.headers['X-Gitea-Signature'].present?
+              token_from_signature(request.headers['X-Gitea-Signature'])
             else
               raise ActiveRecord::RecordNotFound, 'proveedor no soportado'
             end

From 4a7ac981e5029ce8c23fa0c54c5ba99268dcb3ee Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Wed, 16 Aug 2023 17:04:34 -0300
Subject: [PATCH 40/51] fix: no fallar si la firma es nil

closes #14089
---
 app/controllers/api/v1/webhooks_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/api/v1/webhooks_controller.rb b/app/controllers/api/v1/webhooks_controller.rb
index 95439cd4..1730034e 100644
--- a/app/controllers/api/v1/webhooks_controller.rb
+++ b/app/controllers/api/v1/webhooks_controller.rb
@@ -55,7 +55,7 @@ module Api
         payload = request.body.read
         site.roles.where(temporal: false, rol: 'usuarie').pluck(:token).find do |token|
           new_signature = prepend + OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new('sha256'), token, payload)
-          ActiveSupport::SecurityUtils.secure_compare(new_signature, signature)
+          ActiveSupport::SecurityUtils.secure_compare(new_signature, signature.to_s)
         end.tap do |t|
           raise ActiveRecord::RecordNotFound, 'token no encontrado' if t.nil?
         end

From 7793c5f96d63bad20243b6eb3bb0d8bc79e92e6d Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Fri, 22 Sep 2023 13:03:28 -0300
Subject: [PATCH 41/51] =?UTF-8?q?fix:=20no=20enviar=20el=20env=20en=20la?=
 =?UTF-8?q?=20notificaci=C3=B3n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/api/v1/webhooks_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/api/v1/webhooks_controller.rb b/app/controllers/api/v1/webhooks_controller.rb
index 1730034e..36e6a6d1 100644
--- a/app/controllers/api/v1/webhooks_controller.rb
+++ b/app/controllers/api/v1/webhooks_controller.rb
@@ -68,7 +68,7 @@ module Api
 
       # respuesta de error a plataformas
       def platforms_answer(exception)
-        ExceptionNotifier.notify_exception(exception, env: request.env, data: { headers: request.headers.to_h })
+        ExceptionNotifier.notify_exception(exception, data: { headers: request.headers.to_h }
 
         head :forbidden
       end

From 59f8f8aabbab3ef93572dacae14e56ea724364c8 Mon Sep 17 00:00:00 2001
From: jazzari <jazzari@sutty.coop.ar>
Date: Wed, 27 Sep 2023 14:29:28 -0300
Subject: [PATCH 42/51] fix: arreglado typo en breadcrumbs en en.yml #13864

---
 config/locales/en.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 5f97a8b9..6b73205a 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -685,7 +685,7 @@ en:
         new: 'Create'
         edit: 'Configure'
       posts:
-        new: 'New %{layout}'
+        new: 'Add %{layout}'
         edit: 'Editing'
       usuaries:
         index: 'Users'

From 134d1105f62256b23d64ff4fb88582a880882ec9 Mon Sep 17 00:00:00 2001
From: jazzari <jazzari@sutty.coop.ar>
Date: Wed, 27 Sep 2023 15:48:53 -0300
Subject: [PATCH 43/51] =?UTF-8?q?fix:=20agregada=20la=20fecha=20de=20creac?=
 =?UTF-8?q?ion=20del=20post=20para=20seleccionar=20posts=20por=20t=C3=ADtu?=
 =?UTF-8?q?lo=20si=20est=C3=A1n=20duplicados=20#14179?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/metadata_related_posts.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/metadata_related_posts.rb b/app/models/metadata_related_posts.rb
index 092f219a..f20ea85c 100644
--- a/app/models/metadata_related_posts.rb
+++ b/app/models/metadata_related_posts.rb
@@ -34,7 +34,7 @@ class MetadataRelatedPosts < MetadataArray
   end
 
   def title(post)
-    "#{post&.title&.value || post&.slug&.value} (#{post.layout.humanized_name})"
+    "#{post&.title&.value || post&.slug&.value} #{post&.date&.values.trftime('%F')} (#{post.layout.humanized_name})"
   end
 
   # Encuentra el filtro

From 5e05ba7d7b4dcffbb05bf54a2276619ea4de366f Mon Sep 17 00:00:00 2001
From: jazzari <jazzari@sutty.coop.ar>
Date: Wed, 27 Sep 2023 15:52:33 -0300
Subject: [PATCH 44/51] fix: fix typo #14179

---
 app/models/metadata_related_posts.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/metadata_related_posts.rb b/app/models/metadata_related_posts.rb
index f20ea85c..25eb3fd1 100644
--- a/app/models/metadata_related_posts.rb
+++ b/app/models/metadata_related_posts.rb
@@ -34,7 +34,7 @@ class MetadataRelatedPosts < MetadataArray
   end
 
   def title(post)
-    "#{post&.title&.value || post&.slug&.value} #{post&.date&.values.trftime('%F')} (#{post.layout.humanized_name})"
+    "#{post&.title&.value || post&.slug&.value} #{post&.date&.values.strftime('%F')} (#{post.layout.humanized_name})"
   end
 
   # Encuentra el filtro

From 8376e663ced7c232d18e3575ce4b6d68abc4af89 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Wed, 27 Sep 2023 15:39:12 -0300
Subject: [PATCH 45/51] =?UTF-8?q?feat:=20almacenar=20el=20=C3=BAltimo=20co?=
 =?UTF-8?q?mmit=20indexado=20#13780?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../20230927153926_add_last_indexed_commit_to_sites.rb    | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 db/migrate/20230927153926_add_last_indexed_commit_to_sites.rb

diff --git a/db/migrate/20230927153926_add_last_indexed_commit_to_sites.rb b/db/migrate/20230927153926_add_last_indexed_commit_to_sites.rb
new file mode 100644
index 00000000..2d22cbd7
--- /dev/null
+++ b/db/migrate/20230927153926_add_last_indexed_commit_to_sites.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+# Almacenar el último commit indexado
+class AddLastIndexedCommitToSites < ActiveRecord::Migration[6.1]
+  def change
+    add_column :sites, :last_indexed_commit, :string, null: true
+  end
+end

From f18d0213dfc4d769ce58fc8ad3d898fd8a65f508 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Wed, 27 Sep 2023 15:40:14 -0300
Subject: [PATCH 46/51] =?UTF-8?q?feat:=20guardar=20el=20=C3=BAltimo=20comm?=
 =?UTF-8?q?it=20indexado?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/site/index.rb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/models/site/index.rb b/app/models/site/index.rb
index e11095e3..f728b48b 100644
--- a/app/models/site/index.rb
+++ b/app/models/site/index.rb
@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-# Indexa todos los artículos de un sitio
-#
-# TODO: Hacer opcional
 class Site
+  # Indexa todos los artículos de un sitio
+  #
+  # TODO: Hacer opcional
   module Index
     extend ActiveSupport::Concern
 
@@ -15,6 +15,8 @@ class Site
       def index_posts!
         Site.transaction do
           docs.each(&:index!)
+
+          update(last_indexed_commit: repository.head_commit.oid)
         end
       end
     end

From 074cb49752fcbbacd8a3ab9424a4210b062ffbc4 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Wed, 27 Sep 2023 16:20:57 -0300
Subject: [PATCH 47/51] feat: reindexar cambios #13780

---
 app/models/site/index.rb | 100 +++++++++++++++++++++++++++++++++++++++
 config/locales/en.yml    |   3 ++
 config/locales/es.yml    |   3 ++
 3 files changed, 106 insertions(+)

diff --git a/app/models/site/index.rb b/app/models/site/index.rb
index f728b48b..ed0932bb 100644
--- a/app/models/site/index.rb
+++ b/app/models/site/index.rb
@@ -12,6 +12,10 @@ class Site
       after_create :index_posts!
       has_many :indexed_posts, dependent: :destroy
 
+      MODIFIED_STATUSES = %i[added modified].freeze
+      DELETED_STATUSES = %i[deleted].freeze
+      LOCALE_FROM_PATH = /\A_/.freeze
+
       def index_posts!
         Site.transaction do
           docs.each(&:index!)
@@ -19,6 +23,102 @@ class Site
           update(last_indexed_commit: repository.head_commit.oid)
         end
       end
+
+      # Encuentra los artículos modificados entre dos commits y los
+      # reindexa.
+      def reindex_changes!
+        return unless reindexable?
+
+        Site.transaction do
+          remove_deleted_posts!
+          reindex_modified_posts!
+
+          update(last_indexed_commit: repository.head_commit.oid)
+        end
+      end
+
+      # No hacer nada si el repositorio no cambió o no hubo cambios
+      # necesarios
+      def reindexable?
+        return false if last_indexed_commit.blank?
+        return false if last_indexed_commit == repository.head_commit.oid
+
+        !indexable_posts.empty?
+      end
+
+      private
+
+      # Trae el último commit indexado desde el repositorio
+      #
+      # @return [Rugged::Commit]
+      def indexed_commit
+        @indexed_commit ||= repository.rugged.lookup(last_indexed_commit)
+      end
+
+      # Calcula la diferencia entre el último commit indexado y el
+      # actual
+      #
+      # XXX: Esto no tiene en cuenta modificaciones en la historia como
+      # cambio de ramas, reverts y etc, solo asume que se mueve hacia
+      # adelante en la misma rama o las dos ramas están relacionadas.
+      #
+      # @return [Rugged::Diff]
+      def diff_with_head
+        @diff_with_head ||= indexed_commit.diff(repository.head_commit)
+      end
+
+      # Obtiene todos los archivos a reindexar
+      #
+      # @return [Array<Rugged::Delta>]
+      def indexable_posts
+        @indexable_posts ||=
+          diff_with_head.each_delta.select do |delta|
+            locales.any? do |locale|
+              delta.old_file[:path].start_with? "_#{locale}/"
+            end
+          end
+      end
+
+      # Elimina los artículos eliminados o que cambiaron de ubicación
+      # del índice
+      def remove_deleted_posts!
+        indexable_posts.select do |delta|
+          DELETED_STATUSES.include? delta.status
+        end.each do |delta|
+          locale, path = locale_and_path_from(delta.old_file[:path])
+
+          indexed_posts.destroy_by(locale: locale, path: path).tap do |destroyed_posts|
+            next unless destroyed_posts.empty?
+
+            Rails.logger.info I18n.t('indexed_posts.deleted', site: name, path: path, records: destroyed_posts.count)
+          end
+        end
+      end
+
+      # Reindexa artículos que cambiaron de ubicación, se agregaron
+      # o fueron modificados
+      def reindex_modified_posts!
+        indexable_posts.select do |delta|
+          MODIFIED_STATUSES.include? delta.status
+        end.each do |delta|
+          locale, path = locale_and_path_from(delta.new_file[:path])
+
+          site.posts(lang: locale).find(path).index!
+        end
+      end
+
+      # Obtiene el idioma y la ruta del post a partir de la ubicación en
+      # el disco
+      #
+      # @return [Array<String>]
+      def locale_and_path_from(path)
+        locale, path = path.split(File::SEPARATOR, 2)
+
+        [
+          locale.sub(LOCALE_FROM_PATH, ''),
+          File.basename(path, '.*')
+        ]
+      end
     end
   end
 end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 5f97a8b9..f2c0d94c 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -167,6 +167,7 @@ en:
       usuarie: User
       licencia: License
       design: Design
+      indexed_post: Indexed post
     attributes:
       usuarie:
         email: 'E-mail address'
@@ -709,3 +710,5 @@ en:
   build_stats:
     index:
       title: "Publications"
+  indexed_posts:
+    deleted: "Deleted indexed post %{path} from %{site} (records: %{records})"
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 9e0b8945..73de7b18 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -167,6 +167,7 @@ es:
       usuarie: Usuarie
       licencia: Licencia
       design: Diseño
+      indexed_post: Artículo indexado
     attributes:
       usuarie:
         email: 'Correo electrónico'
@@ -717,3 +718,5 @@ es:
   build_stats:
     index:
       title: "Publicaciones"
+  indexed_posts:
+    deleted: "Eliminado artículo %{path} de %{site} (filas: %{records})"

From 1e13985ef82c0dde7068db2bd0e027e8f8419434 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Wed, 27 Sep 2023 16:31:23 -0300
Subject: [PATCH 48/51] =?UTF-8?q?fix:=20asumir=20que=20todos=20los=20sitio?=
 =?UTF-8?q?s=20ya=20est=C3=A1n=20indexados?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...0230927153926_add_last_indexed_commit_to_sites.rb | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/db/migrate/20230927153926_add_last_indexed_commit_to_sites.rb b/db/migrate/20230927153926_add_last_indexed_commit_to_sites.rb
index 2d22cbd7..71e08f37 100644
--- a/db/migrate/20230927153926_add_last_indexed_commit_to_sites.rb
+++ b/db/migrate/20230927153926_add_last_indexed_commit_to_sites.rb
@@ -2,7 +2,17 @@
 
 # Almacenar el último commit indexado
 class AddLastIndexedCommitToSites < ActiveRecord::Migration[6.1]
-  def change
+  def up
     add_column :sites, :last_indexed_commit, :string, null: true
+
+    Site.find_each do |site|
+      site.update_columns(last_indexed_commit: site.repository.head_commit.oid)
+    rescue Rugged::Error, Rugged::OSError => e
+      puts "Falló #{site.name}, ignorando: #{e.message}"
+    end
+  end
+
+  def down
+    remove_column :sites, :last_indexed_commit
   end
 end

From 997114a89688bb735347f2c12966c24097662a5c Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Wed, 27 Sep 2023 16:38:19 -0300
Subject: [PATCH 49/51] fix: ya estamos en el contexto del sitio

---
 app/models/site/index.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/site/index.rb b/app/models/site/index.rb
index ed0932bb..06c8821b 100644
--- a/app/models/site/index.rb
+++ b/app/models/site/index.rb
@@ -103,7 +103,7 @@ class Site
         end.each do |delta|
           locale, path = locale_and_path_from(delta.new_file[:path])
 
-          site.posts(lang: locale).find(path).index!
+          posts(lang: locale).find(path).index!
         end
       end
 

From cb2c1b0e7daeab32fdc3f01fca9f7158eaf6918e Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Fri, 29 Sep 2023 10:10:18 -0300
Subject: [PATCH 50/51] =?UTF-8?q?fix:=20usar=20la=20codificaci=C3=B3n=20co?=
 =?UTF-8?q?rrecta?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

los archivos con tildes fallaban
---
 app/models/site/index.rb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/models/site/index.rb b/app/models/site/index.rb
index 06c8821b..6f4714c6 100644
--- a/app/models/site/index.rb
+++ b/app/models/site/index.rb
@@ -108,11 +108,14 @@ class Site
       end
 
       # Obtiene el idioma y la ruta del post a partir de la ubicación en
-      # el disco
+      # el disco.
+      #
+      # Las rutas vienen en ASCII-9BIT desde Rugged, pero en realidad
+      # son UTF-8
       #
       # @return [Array<String>]
       def locale_and_path_from(path)
-        locale, path = path.split(File::SEPARATOR, 2)
+        locale, path = path.force_encoding('utf-8').split(File::SEPARATOR, 2)
 
         [
           locale.sub(LOCALE_FROM_PATH, ''),

From 86436aafd70ba21b385e40b5b07a4001552adf64 Mon Sep 17 00:00:00 2001
From: jazzari <jazzari@sutty.coop.ar>
Date: Mon, 2 Oct 2023 14:36:36 -0300
Subject: [PATCH 51/51] fix: typo en metadata_related_posts.rb #14179

---
 app/models/metadata_related_posts.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/metadata_related_posts.rb b/app/models/metadata_related_posts.rb
index 25eb3fd1..42d1381b 100644
--- a/app/models/metadata_related_posts.rb
+++ b/app/models/metadata_related_posts.rb
@@ -34,7 +34,7 @@ class MetadataRelatedPosts < MetadataArray
   end
 
   def title(post)
-    "#{post&.title&.value || post&.slug&.value} #{post&.date&.values.strftime('%F')} (#{post.layout.humanized_name})"
+    "#{post&.title&.value || post&.slug&.value} #{post&.date&.value.strftime('%F')} (#{post.layout.humanized_name})"
   end
 
   # Encuentra el filtro