Merge branch 'issue-13903' of https://0xacab.org/sutty/sutty into 17.3.alpine.panel.sutty.nl

app/controllers/api/v1/webhooks_controller.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+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 
+          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)
+          
+          head :ok
+        end
+      end
+    end
+end

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)
+    def perform(site, usuarie, message)
-      site.repository.fetch
+      site.repository.merge(usuarie, message) if site.repository.fetch&.positive?
-      site.repository.merge(usuarie)
     end
 end

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 = I18n.t('sites.fetch.merge.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

config/locales/en.yml

@@ -469,6 +469,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 pull'
   footer:
     powered_by: 'is developed by'
   i18n:

config/locales/es.yml

@@ -477,6 +477,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: 'Pull de webhooks'
   footer:
     powered_by: 'es desarrollada por'
   i18n:

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