mirror of
https://0xacab.org/sutty/sutty
synced 2025-02-23 23:41:51 +00:00
Merge branch 'rails' of 0xacab.org:sutty/sutty into production.panel.sutty.nl
This commit is contained in:
f
commit
4e989fa845
31 changed files with 98 additions and 79 deletions
|
|
@ -6,9 +6,15 @@
|
|||
- paths:
|
||||
- "vendor/ruby"
|
||||
- ".bundle"
|
||||
key:
|
||||
files:
|
||||
- "Gemfile.lock"
|
||||
.cache-node: &cache-node
|
||||
- paths:
|
||||
- "node_modules"
|
||||
key:
|
||||
files:
|
||||
- "yarn.lock"
|
||||
.cache-task: &cache-task
|
||||
- paths:
|
||||
- ".task"
|
||||
|
|
@ -22,7 +28,8 @@ assets:
|
|||
stage: "deploy"
|
||||
only:
|
||||
- "rails"
|
||||
- "17.3.alpine.panel.sutty.nl"
|
||||
- "production.panel.sutty.nl"
|
||||
- "panel.sutty.nl"
|
||||
except:
|
||||
- "schedules"
|
||||
cache:
|
||||
|
|
@ -30,14 +37,14 @@ assets:
|
|||
- *cache-node
|
||||
- *cache-task
|
||||
before_script:
|
||||
- *apk-add
|
||||
- "gitlab_ci_log_section --name git --header=\"Configuring git\""
|
||||
- "git config --global user.email \"${GIT_USER_EMAIL:-$GITLAB_USER_EMAIL}\""
|
||||
- "git config --global user.name \"${GIT_USER_NAME:-$GITLAB_USER_NAME}\""
|
||||
- "git remote set-url --push origin \"https://${GITLAB_USERNAME}:${GITLAB_TOKEN}@${CI_SERVER_HOST}/${CI_PROJECT_PATH}.git\""
|
||||
- "git remote set-url --push origin \"https://${GITLAB_USERNAME}:${GITLAB_CI_PUSH_TOKEN}@${CI_SERVER_HOST}/${CI_PROJECT_PATH}.git\""
|
||||
- "gitlab_ci_log_section --name git --end"
|
||||
- "gitlab_ci_log_section --name apk --header=\"Installing dependencies\""
|
||||
- "apk add brotli"
|
||||
- *apk-add
|
||||
- *disable-hainish
|
||||
- "gitlab_ci_log_section --name apk --end"
|
||||
script:
|
||||
|
|
@ -45,7 +52,7 @@ assets:
|
|||
- "go-task assets"
|
||||
after_script:
|
||||
- "git add public && git commit -m \"ci: assets [skip ci]\""
|
||||
- "git push -o ci.skip"
|
||||
- "git push -o ci.skip origin HEAD:${CI_COMMIT_BRANCH}"
|
||||
gem-audit:
|
||||
stage: "test"
|
||||
only:
|
||||
|
|
|
|||
|
|
@ -185,9 +185,13 @@ tasks:
|
|||
- "test -f ../hain/usr/bin/bundler-audit"
|
||||
rubocop:
|
||||
desc: "Ruby linting"
|
||||
deps:
|
||||
- "gems"
|
||||
cmds:
|
||||
- "./bin/modified_files | ./bin/with_extension rb | xargs -r {{.HAINISH}} bundle exec rubocop {{.CLI_ARGS}}"
|
||||
haml-lint:
|
||||
desc: "HAML linting"
|
||||
deps:
|
||||
- "gems"
|
||||
cmds:
|
||||
- "./bin/modified_files | ./bin/with_extension haml | xargs -r {{.HAINISH}} bundle exec haml-lint {{.CLI_ARGS}}"
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ class ApplicationController < ActionController::Base
|
|||
after_action :store_location!
|
||||
|
||||
before_action do
|
||||
Rack::MiniProfiler.authorize_request if current_usuarie&.email&.ends_with?('@' + ENV.fetch('SUTTY', 'sutty.nl'))
|
||||
Rack::MiniProfiler.authorize_request if current_usuarie&.email&.ends_with?("@#{ENV.fetch('SUTTY', 'sutty.nl')}")
|
||||
end
|
||||
|
||||
# No tenemos índice de sutty, vamos directamente a ver el listado de
|
||||
|
|
@ -58,9 +58,7 @@ class ApplicationController < ActionController::Base
|
|||
def current_locale
|
||||
locale = params[:change_locale_to]
|
||||
|
||||
if locale.present? && I18n.locale_available?(locale)
|
||||
session[:locale] = params[:change_locale_to]
|
||||
end
|
||||
session[:locale] = params[:change_locale_to] if locale.present? && I18n.locale_available?(locale)
|
||||
|
||||
session[:locale] || current_usuarie&.lang || I18n.locale
|
||||
end
|
||||
|
|
@ -119,5 +117,4 @@ class ApplicationController < ActionController::Base
|
|||
|
||||
session[:usuarie_return_to] = request.fullpath
|
||||
end
|
||||
|
||||
end
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ module ApplicationHelper
|
|||
root = names.shift
|
||||
|
||||
names.each do |n|
|
||||
root += '[' + n.to_s + ']'
|
||||
root += "[#{n}]"
|
||||
end
|
||||
|
||||
[root, name]
|
||||
|
|
@ -22,7 +22,7 @@ module ApplicationHelper
|
|||
def plain_field_name_for(*names)
|
||||
root, name = field_name_for(*names)
|
||||
|
||||
root + '[' + name.to_s + ']'
|
||||
"#{root}[#{name}]"
|
||||
end
|
||||
|
||||
def distance_of_time_in_words_if_more_than_a_minute(seconds)
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ class ActivityPub
|
|||
class FetchJob < ApplicationJob
|
||||
self.priority = 50
|
||||
|
||||
attr_reader :site, :object, :response
|
||||
attr_reader :object, :response
|
||||
|
||||
# Notificar errores de JSON con el contenido, tomar los errores de
|
||||
# validación y conexión como errores temporales y notificar todo lo
|
||||
|
|
@ -50,7 +50,8 @@ class ActivityPub
|
|||
content = FastJsonparser.parse(response.body)
|
||||
|
||||
# Modificar atómicamente
|
||||
::ActivityPub::Object.lock.find(object_id).update!(content: content, type: ActivityPub::Object.type_from(content).name)
|
||||
::ActivityPub::Object.lock.find(object_id).update!(content: content,
|
||||
type: ActivityPub::Object.type_from(content).name)
|
||||
|
||||
object = ::ActivityPub::Object.find(object_id)
|
||||
# Actualiza la mención
|
||||
|
|
|
|||
|
|
@ -43,7 +43,9 @@ class ActivityPub
|
|||
# Si alguna falló, reintentar
|
||||
raise if logs.present?
|
||||
rescue Exception => e
|
||||
ExceptionNotifier.notify_exception(e, data: { site: site.name, logs: logs, blocklist: blocklist, allowlist: allowlist, pauselist: pauselist })
|
||||
ExceptionNotifier.notify_exception(e,
|
||||
data: { site: site.name, logs: logs, blocklist: blocklist,
|
||||
allowlist: allowlist, pauselist: pauselist })
|
||||
|
||||
raise
|
||||
end
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ class ApplicationJob < ActiveJob::Base
|
|||
# superpongan tareas
|
||||
#
|
||||
# @return [Array<Integer>]
|
||||
RANDOM_WAIT = [3, 5, 7, 11, 13]
|
||||
RANDOM_WAIT = [3, 5, 7, 11, 13].freeze
|
||||
|
||||
# @return [ActiveSupport::Duration]
|
||||
def self.random_wait
|
||||
|
|
|
|||
|
|
@ -55,9 +55,7 @@ class BacktraceJob < ApplicationJob
|
|||
x['backtrace']
|
||||
end.flatten.map do |x|
|
||||
x['file'].split('@').last
|
||||
end.uniq.select do |x|
|
||||
%r{\Ahttps://} =~ x
|
||||
end
|
||||
end.uniq.grep(%r{\Ahttps://})
|
||||
end
|
||||
|
||||
# Descarga y devuelve los datos de un archivo
|
||||
|
|
|
|||
|
|
@ -27,12 +27,11 @@ class DeployJob < ApplicationJob
|
|||
if site.building?
|
||||
notify = false
|
||||
|
||||
if 10.minutes.ago >= time
|
||||
raise DeployTimedOutException,
|
||||
"#{site.name} la tarea estuvo más de 10 minutos esperando, volviendo al estado original"
|
||||
else
|
||||
raise DeployAlreadyRunningException
|
||||
end
|
||||
raise DeployAlreadyRunningException unless 10.minutes.ago >= time
|
||||
|
||||
raise DeployTimedOutException,
|
||||
"#{site.name} la tarea estuvo más de 10 minutos esperando, volviendo al estado original"
|
||||
|
||||
end
|
||||
|
||||
@deployed = {}
|
||||
|
|
@ -50,9 +49,7 @@ class DeployJob < ApplicationJob
|
|||
nil
|
||||
end.compact
|
||||
|
||||
if d == site.deployment_list.last && !status
|
||||
raise DeployException, 'Falló la compilación'
|
||||
end
|
||||
raise DeployException, 'Falló la compilación' if d == site.deployment_list.last && !status
|
||||
rescue StandardError => e
|
||||
status = false
|
||||
seconds ||= 0
|
||||
|
|
@ -73,7 +70,7 @@ class DeployJob < ApplicationJob
|
|||
|
||||
return unless output
|
||||
|
||||
puts (Terminal::Table.new do |t|
|
||||
puts(Terminal::Table.new do |t|
|
||||
t << (%w[type] + @deployed.values.first.keys)
|
||||
t.add_separator
|
||||
@deployed.each do |type, row|
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ class ActivityPub < ApplicationRecord
|
|||
# Array<String> o mezcla y obtener el que más nos convenga o
|
||||
# adivinar uno.
|
||||
when Array
|
||||
links = object['url'].map.with_index do |link, i|
|
||||
links = object['url'].map.with_index do |link, _i|
|
||||
case link
|
||||
when Hash then link
|
||||
else { 'href' => link.to_s }
|
||||
|
|
@ -93,7 +93,8 @@ class ActivityPub < ApplicationRecord
|
|||
|
||||
# Gestionar todos los errores
|
||||
error_on_all_events do |e|
|
||||
ExceptionNotifier.notify_exception(e, data: { site: site.name, activity_pub: self.id, activity: activities.first.uri })
|
||||
ExceptionNotifier.notify_exception(e,
|
||||
data: { site: site.name, activity_pub: id, activity: activities.first.uri })
|
||||
end
|
||||
|
||||
# Se puede volver a pausa en caso de actualización remota, para
|
||||
|
|
|
|||
|
|
@ -35,9 +35,9 @@ class ActivityPub
|
|||
validates_inclusion_of :format, in: %w[mastodon fediblock none]
|
||||
|
||||
HOSTNAME_HEADERS = {
|
||||
'mastodon' => '#domain',
|
||||
'mastodon' => '#domain',
|
||||
'fediblock' => 'domain'
|
||||
}
|
||||
}.freeze
|
||||
|
||||
def client
|
||||
@client ||= Client.new
|
||||
|
|
|
|||
|
|
@ -39,13 +39,14 @@ class ActivityPub
|
|||
def referenced(site)
|
||||
require 'distributed_press/v1/social/referenced_object'
|
||||
|
||||
@referenced ||= DistributedPress::V1::Social::ReferencedObject.new(object: content, dereferencer: site.social_inbox.dereferencer)
|
||||
@referenced ||= DistributedPress::V1::Social::ReferencedObject.new(object: content,
|
||||
dereferencer: site.social_inbox.dereferencer)
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def uri_is_content_id?
|
||||
return if self.uri == content['id']
|
||||
return if uri == content['id']
|
||||
|
||||
errors.add(:activity_pub_objects, 'El ID del objeto no coincide con su URI')
|
||||
end
|
||||
|
|
|
|||
|
|
@ -40,7 +40,8 @@ class ActivityPub
|
|||
def content
|
||||
{
|
||||
'@context' => 'https://www.w3.org/ns/activitystreams',
|
||||
'id' => Rails.application.routes.url_helpers.v1_activity_pub_remote_flag_url(self, host: site.social_inbox_hostname),
|
||||
'id' => Rails.application.routes.url_helpers.v1_activity_pub_remote_flag_url(self,
|
||||
host: site.social_inbox_hostname),
|
||||
'type' => 'Flag',
|
||||
'actor' => main_site.social_inbox.actor_id,
|
||||
'content' => message.to_s,
|
||||
|
|
@ -53,7 +54,7 @@ class ActivityPub
|
|||
#
|
||||
# @return [Site]
|
||||
def main_site
|
||||
@main_site ||= Site.find(ENV.fetch('PANEL_ACTOR_SITE_ID') { 1 })
|
||||
@main_site ||= Site.find(ENV.fetch('PANEL_ACTOR_SITE_ID', 1))
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ module Tienda
|
|||
|
||||
return t if new_record?
|
||||
|
||||
t.blank? ? 'https://' + name + '.' + ENV.fetch('TIENDA', 'tienda.sutty.nl') : t
|
||||
t.blank? ? "https://#{name}.#{ENV.fetch('TIENDA', 'tienda.sutty.nl')}" : t
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -45,7 +45,8 @@ class FediblockState < ApplicationRecord
|
|||
private
|
||||
|
||||
def block_instances!
|
||||
ActivityPub::InstanceModerationJob.perform_later(site: site, hostnames: fediblock.hostnames, perform_remotely: false)
|
||||
ActivityPub::InstanceModerationJob.perform_later(site: site, hostnames: fediblock.hostnames,
|
||||
perform_remotely: false)
|
||||
end
|
||||
|
||||
# Pausar todas las moderaciones de las instancias que no estén
|
||||
|
|
|
|||
|
|
@ -16,7 +16,9 @@ class InstanceModeration < ApplicationRecord
|
|||
state :blocked
|
||||
|
||||
error_on_all_events do |e|
|
||||
ExceptionNotifier.notify_exception(e, data: { site: site.name, instance: instance.hostname, instance_moderation: id })
|
||||
ExceptionNotifier.notify_exception(e,
|
||||
data: { site: site.name, instance: instance.hostname,
|
||||
instance_moderation: id })
|
||||
end
|
||||
|
||||
after_all_events do
|
||||
|
|
|
|||
|
|
@ -130,7 +130,7 @@ MetadataTemplate = Struct.new(:site, :document, :name, :label, :type,
|
|||
# En caso de que algún campo necesite realizar acciones antes de ser
|
||||
# guardado
|
||||
def save
|
||||
if !changed?
|
||||
unless changed?
|
||||
self[:value] = document_value if private?
|
||||
|
||||
return true
|
||||
|
|
|
|||
|
|
@ -294,11 +294,11 @@ class Site < ApplicationRecord
|
|||
# layouts. Si pasamos un layout que no existe, obtenemos un
|
||||
# NoMethodError
|
||||
@layouts_struct ||= Struct.new(*layout_keys, keyword_init: true)
|
||||
@layouts ||= @layouts_struct.new(**data['layouts'].map do |name, metadata|
|
||||
@layouts ||= @layouts_struct.new(**data['layouts'].to_h do |name, metadata|
|
||||
[name.to_sym,
|
||||
Layout.new(site: self, name: name.to_sym, meta: metadata.delete('meta')&.with_indifferent_access,
|
||||
metadata: metadata.with_indifferent_access)]
|
||||
end.to_h)
|
||||
end)
|
||||
end
|
||||
|
||||
# TODO: Si la estructura de datos no existe, vamos a producir una
|
||||
|
|
@ -391,7 +391,7 @@ class Site < ApplicationRecord
|
|||
end
|
||||
|
||||
def reload
|
||||
super.tap do |s|
|
||||
super.tap do |_s|
|
||||
reload_jekyll!
|
||||
end
|
||||
self
|
||||
|
|
@ -481,7 +481,7 @@ class Site < ApplicationRecord
|
|||
def clone_skel!
|
||||
return if jekyll?
|
||||
|
||||
Rugged::Repository.clone_at(ENV['SKEL_SUTTY'], path, checkout_branch: design.gem)
|
||||
Rugged::Repository.clone_at(ENV.fetch('SKEL_SUTTY', nil), path, checkout_branch: design.gem)
|
||||
|
||||
# Necesita un bloque
|
||||
repository.rugged.remotes.rename('origin', 'upstream') {}
|
||||
|
|
@ -575,11 +575,11 @@ class Site < ApplicationRecord
|
|||
deploy_local = deploys.find_by_type('DeployLocal')
|
||||
deploy_local.git_lfs
|
||||
|
||||
if !gems_installed? || gemfile_updated? || gemfile_lock_updated?
|
||||
deploy_local.bundle
|
||||
touch
|
||||
FileUtils.touch(gemfile_path)
|
||||
end
|
||||
return unless !gems_installed? || gemfile_updated? || gemfile_lock_updated?
|
||||
|
||||
deploy_local.bundle
|
||||
touch
|
||||
FileUtils.touch(gemfile_path)
|
||||
end
|
||||
|
||||
def gem_path
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ class SocialInbox
|
|||
# @param url [String]
|
||||
# @return [DistributedPress::V1::Social::Client]
|
||||
def client_for(url)
|
||||
raise "Falló generar un cliente" if url.blank?
|
||||
raise 'Falló generar un cliente' if url.blank?
|
||||
|
||||
@client_for ||= {}
|
||||
@client_for[url] ||=
|
||||
|
|
@ -54,7 +54,7 @@ class SocialInbox
|
|||
public_key_url: public_key_url,
|
||||
private_key_pem: site.private_key_pem,
|
||||
logger: Rails.logger,
|
||||
cache_store: HTTParty::Cache::Store::Redis.new(redis_url: ENV['REDIS_SERVER'])
|
||||
cache_store: HTTParty::Cache::Store::Redis.new(redis_url: ENV.fetch('REDIS_SERVER', nil))
|
||||
)
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -76,10 +76,10 @@ class Usuarie < ApplicationRecord
|
|||
# Si le usuarie (re)confirma su cuenta con una invitación pendiente,
|
||||
# considerarla aceptada también.
|
||||
def accept_invitation_after_confirmation!
|
||||
if confirmed?
|
||||
self.invitation_token = nil
|
||||
self.invitation_accepted_at ||= Time.now.utc
|
||||
end
|
||||
return unless confirmed?
|
||||
|
||||
self.invitation_token = nil
|
||||
self.invitation_accepted_at ||= Time.now.utc
|
||||
end
|
||||
|
||||
# Muestra un error si el idioma no está disponible al cambiar el
|
||||
|
|
@ -87,7 +87,7 @@ class Usuarie < ApplicationRecord
|
|||
#
|
||||
# @return [nil]
|
||||
def locale_available!
|
||||
return if I18n.locale_available? self.lang
|
||||
return if I18n.locale_available? lang
|
||||
|
||||
errors.add(:lang, I18n.t('activerecord.errors.models.usuarie.attributes.lang.not_available'))
|
||||
nil
|
||||
|
|
|
|||
|
|
@ -246,8 +246,6 @@ SiteService = Struct.new(:site, :usuarie, :params, keyword_init: true) do
|
|||
end
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
# Asignar un rol a cada deploy si no lo tenía ya
|
||||
def add_role_to_deploys!(role = current_role)
|
||||
site.deploys.each do |deploy|
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ Rails.application.configure do
|
|||
config.log_tags = %i[request_id]
|
||||
|
||||
# Use a different cache store in production.
|
||||
config.cache_store = :redis_cache_store, { url: ENV['REDIS_SERVER'] }
|
||||
config.cache_store = :redis_cache_store, { url: ENV.fetch('REDIS_SERVER', nil) }
|
||||
|
||||
config.action_mailer.perform_caching = false
|
||||
|
||||
|
|
@ -87,7 +87,7 @@ Rails.application.configure do
|
|||
config.lograge.enabled = true
|
||||
# Use default logging formatter so that PID and timestamp are not
|
||||
# suppressed.
|
||||
config.log_formatter = ::Logger::Formatter.new
|
||||
config.log_formatter = Logger::Formatter.new
|
||||
|
||||
# Use a different logger for distributed setups.
|
||||
require 'syslog/logger'
|
||||
|
|
@ -140,9 +140,10 @@ Rails.application.configure do
|
|||
domain: ENV.fetch('SUTTY', 'sutty.nl'),
|
||||
enable_starttls_auto: false
|
||||
}
|
||||
config.action_mailer.default_options = { from: ENV.fetch('DEFAULT_FROM', "noreply@sutty.nl") }
|
||||
config.action_mailer.default_options = { from: ENV.fetch('DEFAULT_FROM', 'noreply@sutty.nl') }
|
||||
|
||||
config.middleware.use ExceptionNotification::Rack, gitlab: {}, error_grouping: true, ignore_exceptions: ['DeployJob::DeployAlreadyRunningException']
|
||||
config.middleware.use ExceptionNotification::Rack, gitlab: {}, error_grouping: true,
|
||||
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'
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
Que::Web.use(Rack::Auth::Basic) do |user, password|
|
||||
[user, password] == [ENV['HTTP_BASIC_USER'], ENV['HTTP_BASIC_PASSWORD']]
|
||||
[user, password] == [ENV.fetch('HTTP_BASIC_USER', nil), ENV.fetch('HTTP_BASIC_PASSWORD', nil)]
|
||||
end
|
||||
|
|
|
|||
|
|
@ -16,9 +16,7 @@ class CreateFediblockStates < ActiveRecord::Migration[6.1]
|
|||
# Todas las listas están activas por defecto
|
||||
DeploySocialDistributedPress.find_each do |deploy|
|
||||
ActivityPub::Fediblock.find_each do |fediblock|
|
||||
FediblockState.create(site: deploy.site, fediblock: fediblock, aasm_state: 'disabled').tap do |f|
|
||||
f.enable!
|
||||
end
|
||||
FediblockState.create(site: deploy.site, fediblock: fediblock, aasm_state: 'disabled').tap(&:enable!)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -4,9 +4,11 @@
|
|||
# decompresión
|
||||
class BrsDecompressorCorruptedSourceError < ActiveRecord::Migration[6.1]
|
||||
def up
|
||||
raise unless HTTParty.get("https://mas.to/api/v2/instance", headers: { "Accept-Encoding": "br;q=1.0,gzip;q=1.0,deflate;q=0.6,identity;q=0.3" }).ok?
|
||||
raise unless HTTParty.get('https://mas.to/api/v2/instance',
|
||||
headers: { 'Accept-Encoding': 'br;q=1.0,gzip;q=1.0,deflate;q=0.6,identity;q=0.3' }).ok?
|
||||
|
||||
QueJob.where("last_error_message like '%BRS::DecompressorCorruptedSourceError%'").update_all(error_count: 0, run_at: Time.now)
|
||||
QueJob.where("last_error_message like '%BRS::DecompressorCorruptedSourceError%'").update_all(error_count: 0,
|
||||
run_at: Time.now)
|
||||
end
|
||||
|
||||
def down; end
|
||||
|
|
|
|||
|
|
@ -4,7 +4,9 @@
|
|||
class FixActivityType < ActiveRecord::Migration[6.1]
|
||||
def up
|
||||
%w[Like Announce].each do |type|
|
||||
ActivityPub::Activity.where(Arel.sql("content->>'type' = '#{type}'")).update_all(type: "ActivityPub::Activity::#{type}", updated_at: Time.now)
|
||||
ActivityPub::Activity.where(Arel.sql("content->>'type' = '#{type}'")).update_all(
|
||||
type: "ActivityPub::Activity::#{type}", updated_at: Time.now
|
||||
)
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
# De alguna forma se guardaron objetos duplicados!
|
||||
class FixDuplicateObjects < ActiveRecord::Migration[6.1]
|
||||
def up
|
||||
ActivityPub::Object.group(:uri).count.select { |_, v| v > 1 }.keys.each do |uri|
|
||||
ActivityPub::Object.group(:uri).count.select { |_, v| v > 1 }.each_key do |uri|
|
||||
objects = ActivityPub::Object.where(uri: uri)
|
||||
deleted_ids = objects[1..].map(&:delete).map(&:id)
|
||||
|
||||
|
|
|
|||
|
|
@ -14,9 +14,7 @@ class AddFedipactToFediblocks < ActiveRecord::Migration[6.1]
|
|||
)
|
||||
|
||||
DeploySocialDistributedPress.find_each do |deploy|
|
||||
FediblockState.create(site: deploy.site, fediblock: fedipact, aasm_state: 'disabled').tap do |f|
|
||||
f.enable!
|
||||
end
|
||||
FediblockState.create(site: deploy.site, fediblock: fedipact, aasm_state: 'disabled').tap(&:enable!)
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -4,14 +4,14 @@
|
|||
# no es válida y por eso teníamos objetos duplicados.
|
||||
class AddMissingUniqueIndexes < ActiveRecord::Migration[6.1]
|
||||
def up
|
||||
ActivityPub::Object.group(:uri).count.select { |_, v| v > 1 }.keys.each do |uri|
|
||||
ActivityPub::Object.group(:uri).count.select { |_, v| v > 1 }.each_key do |uri|
|
||||
objects = ActivityPub::Object.where(uri: uri)
|
||||
deleted_ids = objects[1..].map(&:delete).map(&:id)
|
||||
|
||||
ActivityPub.where(object_id: deleted_ids).update_all(object_id: objects.first.id, updated_at: Time.now)
|
||||
end
|
||||
|
||||
ActivityPub::Actor.group(:uri).count.select { |_, v| v > 1 }.keys.each do |uri|
|
||||
ActivityPub::Actor.group(:uri).count.select { |_, v| v > 1 }.each_key do |uri|
|
||||
objects = ActivityPub::Actor.where(uri: uri)
|
||||
deleted_ids = objects[1..].map(&:delete).map(&:id)
|
||||
|
||||
|
|
@ -21,7 +21,7 @@ class AddMissingUniqueIndexes < ActiveRecord::Migration[6.1]
|
|||
ActivityPub::RemoteFlag.where(actor_id: deleted_ids).update_all(actor_id: objects.first.id, updated_at: Time.now)
|
||||
end
|
||||
|
||||
ActivityPub::Instance.group(:hostname).count.select { |_, v| v > 1 }.keys.each do |hostname|
|
||||
ActivityPub::Instance.group(:hostname).count.select { |_, v| v > 1 }.each_key do |hostname|
|
||||
objects = ActivityPub::Instance.where(hostname: hostname)
|
||||
deleted_ids = objects[1..].map(&:delete).map(&:id)
|
||||
|
||||
|
|
|
|||
|
|
@ -91,6 +91,14 @@
|
|||
description_en: "We're working towards adding more themes for you to use. [Contact us!](https://sutty.nl/en/#contact)"
|
||||
description_es: "Estamos trabajando para que puedas tener más diseños. [¡Escribinos!](https://sutty.nl/#contacto)"
|
||||
priority: '3'
|
||||
- name_en: 'Worker-recovered factory'
|
||||
name_es: 'Empresa recuperada'
|
||||
gem: 'empresa-recuperada-jekyll-theme'
|
||||
url: 'https://empresa-recuperada.sutty.nl/'
|
||||
disabled: true
|
||||
description_en: "A template for [empresas recuperadas](https://en.wikipedia.org/wiki/Workers%27_self-management#Empresas_recuperadas_movement). We're working towards adding more themes for you to use. [Contact us!](https://sutty.nl/en/#contact)"
|
||||
description_es: "Estamos trabajando para que puedas tener más diseños. [¡Escribinos!](https://sutty.nl/#contacto)"
|
||||
priority: '3'
|
||||
- name_en: 'More themes'
|
||||
name_es: 'Más plantillas'
|
||||
gem: 'sutty-theme-own'
|
||||
|
|
|
|||
Loading…
Reference in a new issue