Fix all rubocop warnings

This commit is contained in:
Yamagishi Kazutoshi 2022-06-28 12:48:43 +00:00 committed by GitHub
parent 05e39dc619
commit bf851133ae
48 changed files with 124 additions and 97 deletions

View file

@ -25,7 +25,7 @@ class AccountAlias < ApplicationRecord
def acct=(val)
val = val.to_s.strip
super(val.start_with?('@') ? val[1..-1] : val)
super(val.start_with?('@') ? val[1..] : val)
end
def pretty_acct

View file

@ -16,6 +16,7 @@
#
class AccountWarning < ApplicationRecord
# rubocop:disable Lint/RedundantCopDisableDirective, Layout/FirstHashElementIndentation
enum action: {
none: 0,
disable: 1_000,
@ -25,6 +26,7 @@ class AccountWarning < ApplicationRecord
silence: 3_000,
suspend: 4_000,
}, _suffix: :action
# rubocop:enable Lint/RedundantCopDisableDirective, Layout/FirstHashElementIndentation
belongs_to :account, inverse_of: :account_warnings
belongs_to :target_account, class_name: 'Account', inverse_of: :strikes

View file

@ -1,6 +1,6 @@
# frozen_string_literal: true
module AccountInteractions
module AccountInteractions # rubocop:disable Metrics/ModuleLength
extend ActiveSupport::Concern
class_methods do

View file

@ -17,7 +17,7 @@ module Expireable
end
def expires_in=(interval)
self.expires_at = interval.present? ? interval.to_i.seconds.from_now : nil
self.expires_at = interval.present? ? interval.to_i.seconds.from_now : nil
@expires_in = interval
end

View file

@ -46,7 +46,7 @@ class CustomEmoji < ApplicationRecord
scope :local, -> { where(domain: nil) }
scope :remote, -> { where.not(domain: nil) }
scope :alphabetic, -> { order(domain: :asc, shortcode: :asc) }
scope :by_domain_and_subdomains, ->(domain) { where(domain: domain).or(where(arel_table[:domain].matches('%.' + domain))) }
scope :by_domain_and_subdomains, ->(domain) { where(domain: domain).or(where(arel_table[:domain].matches("%.#{domain}"))) }
scope :listed, -> { local.where(disabled: false).where(visible_in_picker: true) }
remotable_attachment :image, LIMIT

View file

@ -63,7 +63,7 @@ class DomainBlock < ApplicationRecord
uri = Addressable::URI.new.tap { |u| u.host = domain.strip.gsub(/[\/]/, '') }
segments = uri.normalized_host.split('.')
variants = segments.map.with_index { |_, i| segments[i..-1].join('.') }
variants = segments.map.with_index { |_, i| segments[i..].join('.') }
where(domain: variants).order(Arel.sql('char_length(domain) desc')).first
rescue Addressable::URI::InvalidURIError, IDN::Idna::IdnaError

View file

@ -52,6 +52,6 @@ class PreviewCardProvider < ApplicationRecord
def self.matching_domain(domain)
segments = domain.split('.')
where(domain: segments.map.with_index { |_, i| segments[i..-1].join('.') }).order(Arel.sql('char_length(domain) desc')).first
where(domain: segments.map.with_index { |_, i| segments[i..].join('.') }).order(Arel.sql('char_length(domain) desc')).first
end
end