5
0
Fork 0
mirror of https://0xacab.org/sutty/sutty synced 2024-11-24 07:36:22 +00:00

chore: rubocop

This commit is contained in:
f 2024-05-02 16:05:35 -03:00
parent b11282997b
commit c2cc08007e
No known key found for this signature in database
24 changed files with 52 additions and 49 deletions

View file

@ -14,7 +14,7 @@ class ApplicationController < ActionController::Base
after_action :store_location! after_action :store_location!
before_action do 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 end
# No tenemos índice de sutty, vamos directamente a ver el listado de # No tenemos índice de sutty, vamos directamente a ver el listado de
@ -58,9 +58,7 @@ class ApplicationController < ActionController::Base
def current_locale def current_locale
locale = params[:change_locale_to] locale = params[:change_locale_to]
if locale.present? && I18n.locale_available?(locale) session[: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 session[:locale] || current_usuarie&.lang || I18n.locale
end end
@ -119,5 +117,4 @@ class ApplicationController < ActionController::Base
session[:usuarie_return_to] = request.fullpath session[:usuarie_return_to] = request.fullpath
end end
end end

View file

@ -13,7 +13,7 @@ module ApplicationHelper
root = names.shift root = names.shift
names.each do |n| names.each do |n|
root += '[' + n.to_s + ']' root += "[#{n}]"
end end
[root, name] [root, name]
@ -22,7 +22,7 @@ module ApplicationHelper
def plain_field_name_for(*names) def plain_field_name_for(*names)
root, name = field_name_for(*names) root, name = field_name_for(*names)
root + '[' + name.to_s + ']' "#{root}[#{name}]"
end end
def distance_of_time_in_words_if_more_than_a_minute(seconds) def distance_of_time_in_words_if_more_than_a_minute(seconds)

View file

@ -50,7 +50,8 @@ class ActivityPub
content = FastJsonparser.parse(response.body) content = FastJsonparser.parse(response.body)
# Modificar atómicamente # 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) object = ::ActivityPub::Object.find(object_id)
# Actualiza la mención # Actualiza la mención

View file

@ -43,7 +43,9 @@ class ActivityPub
# Si alguna falló, reintentar # Si alguna falló, reintentar
raise if logs.present? raise if logs.present?
rescue Exception => e 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 raise
end end

View file

@ -8,7 +8,7 @@ class ApplicationJob < ActiveJob::Base
# superpongan tareas # superpongan tareas
# #
# @return [Array<Integer>] # @return [Array<Integer>]
RANDOM_WAIT = [3, 5, 7, 11, 13] RANDOM_WAIT = [3, 5, 7, 11, 13].freeze
# @return [ActiveSupport::Duration] # @return [ActiveSupport::Duration]
def self.random_wait def self.random_wait
@ -17,8 +17,6 @@ class ApplicationJob < ActiveJob::Base
attr_reader :site attr_reader :site
private
# Si falla por cualquier cosa informar y descartar # Si falla por cualquier cosa informar y descartar
discard_on(Exception) do |job, error| discard_on(Exception) do |job, error|
ExceptionNotifier.notify_exception(error, data: { job: job }) ExceptionNotifier.notify_exception(error, data: { job: job })

View file

@ -64,7 +64,7 @@ class ActivityPub < ApplicationRecord
# Array<String> o mezcla y obtener el que más nos convenga o # Array<String> o mezcla y obtener el que más nos convenga o
# adivinar uno. # adivinar uno.
when Array when Array
links = object['url'].map.with_index do |link, i| links = object['url'].map.with_index do |link, _i|
case link case link
when Hash then link when Hash then link
else { 'href' => link.to_s } else { 'href' => link.to_s }
@ -93,7 +93,8 @@ class ActivityPub < ApplicationRecord
# Gestionar todos los errores # Gestionar todos los errores
error_on_all_events do |e| 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 end
# Se puede volver a pausa en caso de actualización remota, para # Se puede volver a pausa en caso de actualización remota, para

View file

@ -37,7 +37,7 @@ class ActivityPub
HOSTNAME_HEADERS = { HOSTNAME_HEADERS = {
'mastodon' => '#domain', 'mastodon' => '#domain',
'fediblock' => 'domain' 'fediblock' => 'domain'
} }.freeze
def client def client
@client ||= Client.new @client ||= Client.new

View file

@ -39,13 +39,14 @@ class ActivityPub
def referenced(site) def referenced(site)
require 'distributed_press/v1/social/referenced_object' 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 end
private private
def uri_is_content_id? 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') errors.add(:activity_pub_objects, 'El ID del objeto no coincide con su URI')
end end

View file

@ -40,7 +40,8 @@ class ActivityPub
def content def content
{ {
'@context' => 'https://www.w3.org/ns/activitystreams', '@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', 'type' => 'Flag',
'actor' => main_site.social_inbox.actor_id, 'actor' => main_site.social_inbox.actor_id,
'content' => message.to_s, 'content' => message.to_s,
@ -53,7 +54,7 @@ class ActivityPub
# #
# @return [Site] # @return [Site]
def main_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 end
end end

View file

@ -17,7 +17,7 @@ module Tienda
return t if new_record? 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 end
end end

View file

@ -45,7 +45,8 @@ class FediblockState < ApplicationRecord
private private
def block_instances! 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 end
# Pausar todas las moderaciones de las instancias que no estén # Pausar todas las moderaciones de las instancias que no estén

View file

@ -16,7 +16,9 @@ class InstanceModeration < ApplicationRecord
state :blocked state :blocked
error_on_all_events do |e| 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 end
after_all_events do after_all_events do

View file

@ -134,7 +134,7 @@ MetadataTemplate = Struct.new(:site, :document, :name, :label, :type,
# En caso de que algún campo necesite realizar acciones antes de ser # En caso de que algún campo necesite realizar acciones antes de ser
# guardado # guardado
def save def save
if !changed? unless changed?
self[:value] = document_value if private? self[:value] = document_value if private?
return true return true

View file

@ -45,7 +45,7 @@ class SocialInbox
# @param url [String] # @param url [String]
# @return [DistributedPress::V1::Social::Client] # @return [DistributedPress::V1::Social::Client]
def client_for(url) def client_for(url)
raise "Falló generar un cliente" if url.blank? raise 'Falló generar un cliente' if url.blank?
@client_for ||= {} @client_for ||= {}
@client_for[url] ||= @client_for[url] ||=
@ -54,7 +54,7 @@ class SocialInbox
public_key_url: public_key_url, public_key_url: public_key_url,
private_key_pem: site.private_key_pem, private_key_pem: site.private_key_pem,
logger: Rails.logger, 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 end

View file

@ -222,8 +222,6 @@ SiteService = Struct.new(:site, :usuarie, :params, keyword_init: true) do
end end
end end
private
# Asignar un rol a cada deploy si no lo tenía ya # Asignar un rol a cada deploy si no lo tenía ya
def add_role_to_deploys!(role = current_role) def add_role_to_deploys!(role = current_role)
site.deploys.each do |deploy| site.deploys.each do |deploy|

View file

@ -62,7 +62,7 @@ Rails.application.configure do
config.log_tags = %i[request_id] config.log_tags = %i[request_id]
# Use a different cache store in production. # 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 config.action_mailer.perform_caching = false
@ -87,7 +87,7 @@ Rails.application.configure do
config.lograge.enabled = true config.lograge.enabled = true
# Use default logging formatter so that PID and timestamp are not # Use default logging formatter so that PID and timestamp are not
# suppressed. # suppressed.
config.log_formatter = ::Logger::Formatter.new config.log_formatter = Logger::Formatter.new
# Use a different logger for distributed setups. # Use a different logger for distributed setups.
require 'syslog/logger' require 'syslog/logger'
@ -140,9 +140,10 @@ Rails.application.configure do
domain: ENV.fetch('SUTTY', 'sutty.nl'), domain: ENV.fetch('SUTTY', 'sutty.nl'),
enable_starttls_auto: false 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[:host] = "panel.#{ENV.fetch('SUTTY', 'sutty.nl')}"
Rails.application.routes.default_url_options[:protocol] = 'https' Rails.application.routes.default_url_options[:protocol] = 'https'

View file

@ -1,5 +1,5 @@
# frozen_string_literal: true # frozen_string_literal: true
Que::Web.use(Rack::Auth::Basic) do |user, password| 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 end

View file

@ -16,9 +16,7 @@ class CreateFediblockStates < ActiveRecord::Migration[6.1]
# Todas las listas están activas por defecto # Todas las listas están activas por defecto
DeploySocialDistributedPress.find_each do |deploy| DeploySocialDistributedPress.find_each do |deploy|
ActivityPub::Fediblock.find_each do |fediblock| ActivityPub::Fediblock.find_each do |fediblock|
FediblockState.create(site: deploy.site, fediblock: fediblock, aasm_state: 'disabled').tap do |f| FediblockState.create(site: deploy.site, fediblock: fediblock, aasm_state: 'disabled').tap(&:enable!)
f.enable!
end
end end
end end
end end

View file

@ -4,9 +4,11 @@
# decompresión # decompresión
class BrsDecompressorCorruptedSourceError < ActiveRecord::Migration[6.1] class BrsDecompressorCorruptedSourceError < ActiveRecord::Migration[6.1]
def up 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 end
def down; end def down; end

View file

@ -4,7 +4,9 @@
class FixActivityType < ActiveRecord::Migration[6.1] class FixActivityType < ActiveRecord::Migration[6.1]
def up def up
%w[Like Announce].each do |type| %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
end end

View file

@ -3,7 +3,7 @@
# De alguna forma se guardaron objetos duplicados! # De alguna forma se guardaron objetos duplicados!
class FixDuplicateObjects < ActiveRecord::Migration[6.1] class FixDuplicateObjects < ActiveRecord::Migration[6.1]
def up 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) objects = ActivityPub::Object.where(uri: uri)
deleted_ids = objects[1..].map(&:delete).map(&:id) deleted_ids = objects[1..].map(&:delete).map(&:id)

View file

@ -14,9 +14,7 @@ class AddFedipactToFediblocks < ActiveRecord::Migration[6.1]
) )
DeploySocialDistributedPress.find_each do |deploy| DeploySocialDistributedPress.find_each do |deploy|
FediblockState.create(site: deploy.site, fediblock: fedipact, aasm_state: 'disabled').tap do |f| FediblockState.create(site: deploy.site, fediblock: fedipact, aasm_state: 'disabled').tap(&:enable!)
f.enable!
end
end end
end end

View file

@ -4,14 +4,14 @@
# no es válida y por eso teníamos objetos duplicados. # no es válida y por eso teníamos objetos duplicados.
class AddMissingUniqueIndexes < ActiveRecord::Migration[6.1] class AddMissingUniqueIndexes < ActiveRecord::Migration[6.1]
def up 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) objects = ActivityPub::Object.where(uri: uri)
deleted_ids = objects[1..].map(&:delete).map(&:id) 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) ActivityPub.where(object_id: deleted_ids).update_all(object_id: objects.first.id, updated_at: Time.now)
end 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) objects = ActivityPub::Actor.where(uri: uri)
deleted_ids = objects[1..].map(&:delete).map(&:id) 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) ActivityPub::RemoteFlag.where(actor_id: deleted_ids).update_all(actor_id: objects.first.id, updated_at: Time.now)
end 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) objects = ActivityPub::Instance.where(hostname: hostname)
deleted_ids = objects[1..].map(&:delete).map(&:id) deleted_ids = objects[1..].map(&:delete).map(&:id)