Various code cleanup (#1782)

* Remove duplicate in_chosen_languages definition

* Use `DEFAULT_FIELDS_SIZE` instead of `MAX_FIELDS` to reduce code differences with upstream

* Remove duplicate annotation

* Fix incorrect cross-flavor imports

* Remove deprecated `hide_network` setting (replaced by account column)

* Remove unused KeywordMutesHelper

* Remove trailing spaces

* Remove commit_hash from InstancePresenter, as it has been unused since mid-2017
This commit is contained in:
Claire 2022-05-25 12:27:11 +02:00 committed by GitHub
parent 4ab3ad3bef
commit 3fd2aadb23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 8 additions and 44 deletions

View File

@ -1,2 +0,0 @@
module Settings::KeywordMutesHelper
end

View File

@ -7,7 +7,7 @@ import Motion from 'flavours/glitch/util/optional_motion';
import spring from 'react-motion/lib/spring'; import spring from 'react-motion/lib/spring';
import { supportsPassiveEvents } from 'detect-passive-events'; import { supportsPassiveEvents } from 'detect-passive-events';
import classNames from 'classnames'; import classNames from 'classnames';
import { CircularProgress } from 'mastodon/components/loading_indicator'; import { CircularProgress } from 'flavours/glitch/components/loading_indicator';
const listenerOptions = supportsPassiveEvents ? { passive: true } : false; const listenerOptions = supportsPassiveEvents ? { passive: true } : false;
let id = 0; let id = 0;

View File

@ -8,7 +8,7 @@ import {
unfollowAccount, unfollowAccount,
muteAccount, muteAccount,
blockAccount, blockAccount,
} from 'mastodon/actions/accounts'; } from 'flavours/glitch/actions/accounts';
const mapStateToProps = () => ({}); const mapStateToProps = () => ({});

View File

@ -34,7 +34,6 @@ class UserSettingsDecorator
user.settings['noindex'] = noindex_preference if change?('setting_noindex') user.settings['noindex'] = noindex_preference if change?('setting_noindex')
user.settings['flavour'] = flavour_preference if change?('setting_flavour') user.settings['flavour'] = flavour_preference if change?('setting_flavour')
user.settings['skin'] = skin_preference if change?('setting_skin') user.settings['skin'] = skin_preference if change?('setting_skin')
user.settings['hide_network'] = hide_network_preference if change?('setting_hide_network')
user.settings['aggregate_reblogs'] = aggregate_reblogs_preference if change?('setting_aggregate_reblogs') user.settings['aggregate_reblogs'] = aggregate_reblogs_preference if change?('setting_aggregate_reblogs')
user.settings['show_application'] = show_application_preference if change?('setting_show_application') user.settings['show_application'] = show_application_preference if change?('setting_show_application')
user.settings['advanced_layout'] = advanced_layout_preference if change?('setting_advanced_layout') user.settings['advanced_layout'] = advanced_layout_preference if change?('setting_advanced_layout')
@ -118,10 +117,6 @@ class UserSettingsDecorator
settings['setting_skin'] settings['setting_skin']
end end
def hide_network_preference
boolean_cast_setting 'setting_hide_network'
end
def show_application_preference def show_application_preference
boolean_cast_setting 'setting_show_application' boolean_cast_setting 'setting_show_application'
end end

View File

@ -79,7 +79,7 @@ class Account < ApplicationRecord
MAX_DISPLAY_NAME_LENGTH = (ENV['MAX_DISPLAY_NAME_CHARS'] || 30).to_i MAX_DISPLAY_NAME_LENGTH = (ENV['MAX_DISPLAY_NAME_CHARS'] || 30).to_i
MAX_NOTE_LENGTH = (ENV['MAX_BIO_CHARS'] || 500).to_i MAX_NOTE_LENGTH = (ENV['MAX_BIO_CHARS'] || 500).to_i
MAX_FIELDS = (ENV['MAX_PROFILE_FIELDS'] || 4).to_i DEFAULT_FIELDS_SIZE = (ENV['MAX_PROFILE_FIELDS'] || 4).to_i
enum protocol: [:ostatus, :activitypub] enum protocol: [:ostatus, :activitypub]
enum suspension_origin: [:local, :remote], _prefix: true enum suspension_origin: [:local, :remote], _prefix: true
@ -95,7 +95,7 @@ class Account < ApplicationRecord
validates_with UnreservedUsernameValidator, if: -> { local? && will_save_change_to_username? } validates_with UnreservedUsernameValidator, if: -> { local? && will_save_change_to_username? }
validates :display_name, length: { maximum: MAX_DISPLAY_NAME_LENGTH }, if: -> { local? && will_save_change_to_display_name? } validates :display_name, length: { maximum: MAX_DISPLAY_NAME_LENGTH }, if: -> { local? && will_save_change_to_display_name? }
validates :note, note_length: { maximum: MAX_NOTE_LENGTH }, if: -> { local? && will_save_change_to_note? } validates :note, note_length: { maximum: MAX_NOTE_LENGTH }, if: -> { local? && will_save_change_to_note? }
validates :fields, length: { maximum: MAX_FIELDS }, if: -> { local? && will_save_change_to_fields? } validates :fields, length: { maximum: DEFAULT_FIELDS_SIZE }, if: -> { local? && will_save_change_to_fields? }
scope :remote, -> { where.not(domain: nil) } scope :remote, -> { where.not(domain: nil) }
scope :local, -> { where(domain: nil) } scope :local, -> { where(domain: nil) }
@ -329,12 +329,12 @@ class Account < ApplicationRecord
end end
def build_fields def build_fields
return if fields.size >= MAX_FIELDS return if fields.size >= DEFAULT_FIELDS_SIZE
tmp = self[:fields] || [] tmp = self[:fields] || []
tmp = [] if tmp.is_a?(Hash) tmp = [] if tmp.is_a?(Hash)
(MAX_FIELDS - tmp.size).times do (DEFAULT_FIELDS_SIZE - tmp.size).times do
tmp << { name: '', value: '' } tmp << { name: '', value: '' }
end end

View File

@ -6,7 +6,6 @@
# id :bigint(8) not null, primary key # id :bigint(8) not null, primary key
# created_at :datetime not null # created_at :datetime not null
# updated_at :datetime not null # updated_at :datetime not null
# hide_notifications :boolean default(TRUE), not null
# account_id :bigint(8) not null # account_id :bigint(8) not null
# target_account_id :bigint(8) not null # target_account_id :bigint(8) not null
# hide_notifications :boolean default(TRUE), not null # hide_notifications :boolean default(TRUE), not null

View File

@ -322,10 +322,6 @@ class Status < ApplicationRecord
visibilities.keys - %w(direct limited) visibilities.keys - %w(direct limited)
end end
def in_chosen_languages(account)
where(language: nil).or where(language: account.chosen_languages)
end
def as_direct_timeline(account, limit = 20, max_id = nil, since_id = nil, cache_ids = false) def as_direct_timeline(account, limit = 20, max_id = nil, since_id = nil, cache_ids = false)
# direct timeline is mix of direct message from_me and to_me. # direct timeline is mix of direct message from_me and to_me.
# 2 queries are executed with pagination. # 2 queries are executed with pagination.

View File

@ -97,7 +97,7 @@ class StatusPolicy < ApplicationPolicy
def author def author
record.account record.account
end end
def local_only? def local_only?
record.local_only? record.local_only?
end end

View File

@ -44,15 +44,6 @@ class InstancePresenter
Mastodon::Version Mastodon::Version
end end
def commit_hash
current_release_file = Pathname.new('CURRENT_RELEASE').expand_path
if current_release_file.file?
IO.read(current_release_file).strip!
else
''
end
end
def source_url def source_url
Mastodon::Version.source_url Mastodon::Version.source_url
end end

View File

@ -2,7 +2,7 @@
class StatusPinValidator < ActiveModel::Validator class StatusPinValidator < ActiveModel::Validator
MAX_PINNED = (ENV['MAX_PINNED_TOOTS'] || 5).to_i MAX_PINNED = (ENV['MAX_PINNED_TOOTS'] || 5).to_i
def validate(pin) def validate(pin)
pin.errors.add(:base, I18n.t('statuses.pin_errors.reblog')) if pin.status.reblog? pin.errors.add(:base, I18n.t('statuses.pin_errors.reblog')) if pin.status.reblog?
pin.errors.add(:base, I18n.t('statuses.pin_errors.ownership')) if pin.account_id != pin.status.account_id pin.errors.add(:base, I18n.t('statuses.pin_errors.ownership')) if pin.account_id != pin.status.account_id

View File

@ -1,15 +0,0 @@
require 'rails_helper'
# Specs in this file have access to a helper object that includes
# the Settings::KeywordMutesHelper. For example:
#
# describe Settings::KeywordMutesHelper do
# describe "string concat" do
# it "concats two strings with spaces" do
# expect(helper.concat_strings("this","that")).to eq("this that")
# end
# end
# end
RSpec.describe Settings::KeywordMutesHelper, type: :helper do
pending "add some examples to (or delete) #{__FILE__}"
end