M .eslintrc.js => .eslintrc.js +4 -3
@@ 330,8 330,8 @@ module.exports = {
extends: [
'eslint:recommended',
- 'plugin:@typescript-eslint/recommended',
- 'plugin:@typescript-eslint/recommended-requiring-type-checking',
+ 'plugin:@typescript-eslint/strict-type-checked',
+ 'plugin:@typescript-eslint/stylistic-type-checked',
'plugin:react/recommended',
'plugin:react-hooks/recommended',
'plugin:jsx-a11y/recommended',
@@ 343,7 343,7 @@ module.exports = {
],
parserOptions: {
- project: './tsconfig.json',
+ project: true,
tsconfigRootDir: __dirname,
},
@@ 353,6 353,7 @@ module.exports = {
'@typescript-eslint/consistent-type-definitions': ['warn', 'interface'],
'@typescript-eslint/consistent-type-exports': 'error',
'@typescript-eslint/consistent-type-imports': 'error',
+ "@typescript-eslint/prefer-nullish-coalescing": ['error', {ignorePrimitives: {boolean: true}}],
'jsdoc/require-jsdoc': 'off',
M .rubocop_todo.yml => .rubocop_todo.yml +1 -3
@@ 1,6 1,6 @@
# This configuration was generated by
# `rubocop --auto-gen-config --auto-gen-only-exclude --no-exclude-limit --no-offense-counts --no-auto-gen-timestamp`
-# using RuboCop version 1.52.1.
+# using RuboCop version 1.54.1.
# The point is for the user to remove these configuration records
# one by one as the offenses are removed from the code base.
# Note that changes in the inspected code, or installation of new
@@ 28,7 28,6 @@ Layout/ArgumentAlignment:
# SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
Layout/HashAlignment:
Exclude:
- - 'config/boot.rb'
- 'config/environments/production.rb'
- 'config/initializers/rack_attack.rb'
- 'config/routes.rb'
@@ 254,7 253,6 @@ RSpec/HookArgument:
- 'spec/serializers/activitypub/note_serializer_spec.rb'
- 'spec/serializers/activitypub/update_poll_serializer_spec.rb'
- 'spec/services/import_service_spec.rb'
- - 'spec/spec_helper.rb'
# Configuration parameters: AssignmentOnly.
RSpec/InstanceVariable:
M Gemfile => Gemfile +2 -2
@@ 4,7 4,7 @@ source 'https://rubygems.org'
ruby '>= 3.0.0'
gem 'puma', '~> 6.3'
-gem 'rails', '~> 6.1.7'
+gem 'rails', '~> 7.0'
gem 'sprockets', '~> 3.7.2'
gem 'thor', '~> 1.2'
gem 'rack', '~> 2.2.7'
@@ 66,7 66,7 @@ gem 'pundit', '~> 2.3'
gem 'premailer-rails'
gem 'rack-attack', '~> 6.6'
gem 'rack-cors', '~> 2.0', require: 'rack/cors'
-gem 'rails-i18n', '~> 6.0'
+gem 'rails-i18n', '~> 7.0'
gem 'rails-settings-cached', '~> 0.6', git: 'https://github.com/mastodon/rails-settings-cached.git', branch: 'v0.6.6-aliases-true'
gem 'redcarpet', '~> 3.6'
gem 'redis', '~> 4.5', require: ['redis', 'redis/connection/hiredis']
M Gemfile.lock => Gemfile.lock +72 -64
@@ 18,40 18,47 @@ GIT
GEM
remote: https://rubygems.org/
specs:
- actioncable (6.1.7.4)
- actionpack (= 6.1.7.4)
- activesupport (= 6.1.7.4)
+ actioncable (7.0.6)
+ actionpack (= 7.0.6)
+ activesupport (= 7.0.6)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
- actionmailbox (6.1.7.4)
- actionpack (= 6.1.7.4)
- activejob (= 6.1.7.4)
- activerecord (= 6.1.7.4)
- activestorage (= 6.1.7.4)
- activesupport (= 6.1.7.4)
+ actionmailbox (7.0.6)
+ actionpack (= 7.0.6)
+ activejob (= 7.0.6)
+ activerecord (= 7.0.6)
+ activestorage (= 7.0.6)
+ activesupport (= 7.0.6)
mail (>= 2.7.1)
- actionmailer (6.1.7.4)
- actionpack (= 6.1.7.4)
- actionview (= 6.1.7.4)
- activejob (= 6.1.7.4)
- activesupport (= 6.1.7.4)
+ net-imap
+ net-pop
+ net-smtp
+ actionmailer (7.0.6)
+ actionpack (= 7.0.6)
+ actionview (= 7.0.6)
+ activejob (= 7.0.6)
+ activesupport (= 7.0.6)
mail (~> 2.5, >= 2.5.4)
+ net-imap
+ net-pop
+ net-smtp
rails-dom-testing (~> 2.0)
- actionpack (6.1.7.4)
- actionview (= 6.1.7.4)
- activesupport (= 6.1.7.4)
- rack (~> 2.0, >= 2.0.9)
+ actionpack (7.0.6)
+ actionview (= 7.0.6)
+ activesupport (= 7.0.6)
+ rack (~> 2.0, >= 2.2.4)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
- actiontext (6.1.7.4)
- actionpack (= 6.1.7.4)
- activerecord (= 6.1.7.4)
- activestorage (= 6.1.7.4)
- activesupport (= 6.1.7.4)
+ actiontext (7.0.6)
+ actionpack (= 7.0.6)
+ activerecord (= 7.0.6)
+ activestorage (= 7.0.6)
+ activesupport (= 7.0.6)
+ globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
- actionview (6.1.7.4)
- activesupport (= 6.1.7.4)
+ actionview (7.0.6)
+ activesupport (= 7.0.6)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
@@ 61,27 68,26 @@ GEM
activemodel (>= 4.1, < 7.1)
case_transform (>= 0.2)
jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
- activejob (6.1.7.4)
- activesupport (= 6.1.7.4)
+ activejob (7.0.6)
+ activesupport (= 7.0.6)
globalid (>= 0.3.6)
- activemodel (6.1.7.4)
- activesupport (= 6.1.7.4)
- activerecord (6.1.7.4)
- activemodel (= 6.1.7.4)
- activesupport (= 6.1.7.4)
- activestorage (6.1.7.4)
- actionpack (= 6.1.7.4)
- activejob (= 6.1.7.4)
- activerecord (= 6.1.7.4)
- activesupport (= 6.1.7.4)
+ activemodel (7.0.6)
+ activesupport (= 7.0.6)
+ activerecord (7.0.6)
+ activemodel (= 7.0.6)
+ activesupport (= 7.0.6)
+ activestorage (7.0.6)
+ actionpack (= 7.0.6)
+ activejob (= 7.0.6)
+ activerecord (= 7.0.6)
+ activesupport (= 7.0.6)
marcel (~> 1.0)
mini_mime (>= 1.1.0)
- activesupport (6.1.7.4)
+ activesupport (7.0.6)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
- zeitwerk (~> 2.3)
addressable (2.8.4)
public_suffix (>= 2.0.2, < 6.0)
aes_key_wrap (1.1.0)
@@ 167,7 173,7 @@ GEM
activesupport
cbor (0.5.9.6)
charlock_holmes (0.7.7)
- chewy (7.3.2)
+ chewy (7.3.3)
activesupport (>= 5.2)
elasticsearch (>= 7.12.0, < 7.14.0)
elasticsearch-dsl
@@ 373,6 379,7 @@ GEM
marcel (~> 1.0.1)
mime-types
terrapin (~> 0.6.0)
+ language_server-protocol (3.17.0.3)
launchy (2.5.2)
addressable (~> 2.8)
letter_opener (1.8.1)
@@ 508,21 515,20 @@ GEM
rack
rack-test (2.1.0)
rack (>= 1.3)
- rails (6.1.7.4)
- actioncable (= 6.1.7.4)
- actionmailbox (= 6.1.7.4)
- actionmailer (= 6.1.7.4)
- actionpack (= 6.1.7.4)
- actiontext (= 6.1.7.4)
- actionview (= 6.1.7.4)
- activejob (= 6.1.7.4)
- activemodel (= 6.1.7.4)
- activerecord (= 6.1.7.4)
- activestorage (= 6.1.7.4)
- activesupport (= 6.1.7.4)
+ rails (7.0.6)
+ actioncable (= 7.0.6)
+ actionmailbox (= 7.0.6)
+ actionmailer (= 7.0.6)
+ actionpack (= 7.0.6)
+ actiontext (= 7.0.6)
+ actionview (= 7.0.6)
+ activejob (= 7.0.6)
+ activemodel (= 7.0.6)
+ activerecord (= 7.0.6)
+ activestorage (= 7.0.6)
+ activesupport (= 7.0.6)
bundler (>= 1.15.0)
- railties (= 6.1.7.4)
- sprockets-rails (>= 2.0.0)
+ railties (= 7.0.6)
rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1)
actionview (>= 5.0.1.rc1)
@@ 533,15 539,16 @@ GEM
rails-html-sanitizer (1.6.0)
loofah (~> 2.21)
nokogiri (~> 1.14)
- rails-i18n (6.0.0)
+ rails-i18n (7.0.7)
i18n (>= 0.7, < 2)
- railties (>= 6.0.0, < 7)
- railties (6.1.7.4)
- actionpack (= 6.1.7.4)
- activesupport (= 6.1.7.4)
+ railties (>= 6.0.0, < 8)
+ railties (7.0.6)
+ actionpack (= 7.0.6)
+ activesupport (= 7.0.6)
method_source
rake (>= 12.2)
thor (~> 1.0)
+ zeitwerk (~> 2.5)
rainbow (3.1.1)
rake (13.0.6)
rdf (3.2.11)
@@ 589,8 596,9 @@ GEM
sidekiq (>= 2.4.0)
rspec-support (3.12.0)
rspec_chunked (0.6)
- rubocop (1.52.1)
+ rubocop (1.54.1)
json (~> 2.3)
+ language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
parser (>= 3.2.2.3)
rainbow (>= 2.2.2, < 4.0)
@@ 608,7 616,7 @@ GEM
rubocop-performance (1.18.0)
rubocop (>= 1.7.0, < 2.0)
rubocop-ast (>= 0.4.0)
- rubocop-rails (2.19.1)
+ rubocop-rails (2.20.2)
activesupport (>= 4.2.0)
rack (>= 1.1)
rubocop (>= 1.33.0, < 2.0)
@@ 688,7 696,7 @@ GEM
climate_control (>= 0.0.3, < 1.0)
thor (1.2.2)
tilt (2.2.0)
- timeout (0.3.2)
+ timeout (0.4.0)
tpm-key_attestation (0.12.0)
bindata (~> 2.4)
openssl (> 2.0)
@@ 839,9 847,9 @@ DEPENDENCIES
rack-attack (~> 6.6)
rack-cors (~> 2.0)
rack-test (~> 2.1)
- rails (~> 6.1.7)
+ rails (~> 7.0)
rails-controller-testing (~> 1.0)
- rails-i18n (~> 6.0)
+ rails-i18n (~> 7.0)
rails-settings-cached (~> 0.6)!
rdf-normalize (~> 0.5)
redcarpet (~> 3.6)
M app/controllers/api/v1/markers_controller.rb => app/controllers/api/v1/markers_controller.rb +4 -1
@@ 7,7 7,10 @@ class Api::V1::MarkersController < Api::BaseController
before_action :require_user!
def index
- @markers = current_user.markers.where(timeline: Array(params[:timeline])).index_by(&:timeline)
+ with_read_replica do
+ @markers = current_user.markers.where(timeline: Array(params[:timeline])).index_by(&:timeline)
+ end
+
render json: serialize_map(@markers)
end
M app/controllers/api/v1/notifications_controller.rb => app/controllers/api/v1/notifications_controller.rb +6 -2
@@ 9,8 9,12 @@ class Api::V1::NotificationsController < Api::BaseController
DEFAULT_NOTIFICATIONS_LIMIT = 40
def index
- @notifications = load_notifications
- render json: @notifications, each_serializer: REST::NotificationSerializer, relationships: StatusRelationshipsPresenter.new(target_statuses_from_notifications, current_user&.account_id)
+ with_read_replica do
+ @notifications = load_notifications
+ @relationships = StatusRelationshipsPresenter.new(target_statuses_from_notifications, current_user&.account_id)
+ end
+
+ render json: @notifications, each_serializer: REST::NotificationSerializer, relationships: @relationships
end
def show
M app/controllers/api/v1/timelines/home_controller.rb => app/controllers/api/v1/timelines/home_controller.rb +1 -1
@@ 6,7 6,7 @@ class Api::V1::Timelines::HomeController < Api::BaseController
after_action :insert_pagination_headers, unless: -> { @statuses.empty? }
def show
- ApplicationRecord.connected_to(role: :read, prevent_writes: true) do
+ with_read_replica do
@statuses = load_statuses
@relationships = StatusRelationshipsPresenter.new(@statuses, current_user&.account_id)
end
M app/controllers/application_controller.rb => app/controllers/application_controller.rb +1 -0
@@ 11,6 11,7 @@ class ApplicationController < ActionController::Base
include CacheConcern
include DomainControlHelper
include ThemingConcern
+ include DatabaseHelper
helper_method :current_account
helper_method :current_session
M app/helpers/accounts_helper.rb => app/helpers/accounts_helper.rb +1 -1
@@ 22,7 22,7 @@ module AccountsHelper
def account_action_button(account)
return if account.memorial? || account.moved?
- link_to ActivityPub::TagManager.instance.url_for(account), class: 'button', target: '_new' do
+ link_to ActivityPub::TagManager.instance.url_for(account), class: 'button logo-button', target: '_new' do
safe_join([logo_as_symbol, t('accounts.follow')])
end
end
A app/helpers/database_helper.rb => app/helpers/database_helper.rb +11 -0
@@ 0,0 1,11 @@
+# frozen_string_literal: true
+
+module DatabaseHelper
+ def with_read_replica(&block)
+ ApplicationRecord.connected_to(role: :read, prevent_writes: true, &block)
+ end
+
+ def with_primary(&block)
+ ApplicationRecord.connected_to(role: :primary, &block)
+ end
+end
M app/helpers/domain_control_helper.rb => app/helpers/domain_control_helper.rb +1 -1
@@ 2,7 2,7 @@
module DomainControlHelper
def domain_not_allowed?(uri_or_domain)
- return if uri_or_domain.blank?
+ return false if uri_or_domain.blank?
domain = if uri_or_domain.include?('://')
Addressable::URI.parse(uri_or_domain).host
M app/javascript/flavours/glitch/blurhash.ts => app/javascript/flavours/glitch/blurhash.ts +2 -3
@@ 86,10 86,9 @@ const DIGIT_CHARACTERS = [
export const decode83 = (str: string) => {
let value = 0;
- let c, digit;
+ let digit;
- for (let i = 0; i < str.length; i++) {
- c = str[i];
+ for (const c of str) {
digit = DIGIT_CHARACTERS.indexOf(c);
value = value * 83 + digit;
}
M app/javascript/flavours/glitch/components/animated_number.tsx => app/javascript/flavours/glitch/components/animated_number.tsx +1 -1
@@ 33,7 33,7 @@ export const AnimatedNumber: React.FC<Props> = ({ value, obfuscate }) => {
const willEnter = useCallback(() => ({ y: -1 * direction }), [direction]);
const willLeave = useCallback(
() => ({ y: spring(1 * direction, { damping: 35, stiffness: 400 }) }),
- [direction]
+ [direction],
);
if (reduceMotion) {
M app/javascript/flavours/glitch/components/autosuggest_hashtag.tsx => app/javascript/flavours/glitch/components/autosuggest_hashtag.tsx +2 -2
@@ 6,11 6,11 @@ interface Props {
tag: {
name: string;
url?: string;
- history?: Array<{
+ history?: {
uses: number;
accounts: string;
day: string;
- }>;
+ }[];
following?: boolean;
type: 'hashtag';
};
M app/javascript/flavours/glitch/components/avatar.tsx => app/javascript/flavours/glitch/components/avatar.tsx +2 -2
@@ 33,7 33,7 @@ export const Avatar: React.FC<Props> = ({
if (account) {
style.backgroundImage = `url(${account.get(
- hovering ? 'avatar' : 'avatar_static'
+ hovering ? 'avatar' : 'avatar_static',
)})`;
}
@@ 42,7 42,7 @@ export const Avatar: React.FC<Props> = ({
className={classNames(
'account__avatar',
{ 'account__avatar-inline': inline },
- className
+ className,
)}
onMouseEnter={handleMouseEnter}
onMouseLeave={handleMouseLeave}
M app/javascript/flavours/glitch/components/counters.tsx => app/javascript/flavours/glitch/components/counters.tsx +3 -3
@@ 4,7 4,7 @@ import { FormattedMessage } from 'react-intl';
export const StatusesCounter = (
displayNumber: React.ReactNode,
- pluralReady: number
+ pluralReady: number,
) => (
<FormattedMessage
id='account.statuses_counter'
@@ 18,7 18,7 @@ export const StatusesCounter = (
export const FollowingCounter = (
displayNumber: React.ReactNode,
- pluralReady: number
+ pluralReady: number,
) => (
<FormattedMessage
id='account.following_counter'
@@ 32,7 32,7 @@ export const FollowingCounter = (
export const FollowersCounter = (
displayNumber: React.ReactNode,
- pluralReady: number
+ pluralReady: number,
) => (
<FormattedMessage
id='account.followers_counter'
M app/javascript/flavours/glitch/components/display_name.tsx => app/javascript/flavours/glitch/components/display_name.tsx +15 -12
@@ 11,11 11,12 @@ import { autoPlayGif } from '../initial_state';
import { Skeleton } from './skeleton';
interface Props {
- account: Account;
- others: List<Account>;
- localDomain: string;
+ account?: Account;
+ others?: List<Account>;
+ localDomain?: string;
inline?: boolean;
}
+
export class DisplayName extends React.PureComponent<Props> {
handleMouseEnter: React.ReactEventHandler<HTMLSpanElement> = ({
currentTarget,
@@ 52,7 53,15 @@ export class DisplayName extends React.PureComponent<Props> {
render() {
const { others, localDomain, inline } = this.props;
- let displayName: React.ReactNode, suffix: React.ReactNode, account: Account;
+ let displayName: React.ReactNode,
+ suffix: React.ReactNode,
+ account: Account | undefined;
+
+ if (others && others.size > 0) {
+ account = others.first();
+ } else if (this.props.account) {
+ account = this.props.account;
+ }
if (others && others.size > 1) {
displayName = others
@@ 70,16 79,10 @@ export class DisplayName extends React.PureComponent<Props> {
if (others.size - 2 > 0) {
suffix = `+${others.size - 2}`;
}
- } else if ((others && others.size > 0) || this.props.account) {
- if (others && others.size > 0) {
- account = others.first();
- } else {
- account = this.props.account;
- }
-
+ } else if (account) {
let acct = account.get('acct');
- if (acct.indexOf('@') === -1 && localDomain) {
+ if (!acct.includes('@') && localDomain) {
acct = `${acct}@${localDomain}`;
}
M app/javascript/flavours/glitch/components/gifv.tsx => app/javascript/flavours/glitch/components/gifv.tsx +1 -1
@@ 33,7 33,7 @@ export const GIFV: React.FC<Props> = ({
onClick();
}
},
- [onClick]
+ [onClick],
);
return (
M app/javascript/flavours/glitch/components/relative_timestamp.tsx => app/javascript/flavours/glitch/components/relative_timestamp.tsx +7 -7
@@ 108,7 108,7 @@ export const timeAgoString = (
now: number,
year: number,
timeGiven: boolean,
- short?: boolean
+ short?: boolean,
) => {
const delta = now - date.getTime();
@@ 118,28 118,28 @@ export const timeAgoString = (
relativeTime = intl.formatMessage(messages.today);
} else if (delta < 10 * SECOND) {
relativeTime = intl.formatMessage(
- short ? messages.just_now : messages.just_now_full
+ short ? messages.just_now : messages.just_now_full,
);
} else if (delta < 7 * DAY) {
if (delta < MINUTE) {
relativeTime = intl.formatMessage(
short ? messages.seconds : messages.seconds_full,
- { number: Math.floor(delta / SECOND) }
+ { number: Math.floor(delta / SECOND) },
);
} else if (delta < HOUR) {
relativeTime = intl.formatMessage(
short ? messages.minutes : messages.minutes_full,
- { number: Math.floor(delta / MINUTE) }
+ { number: Math.floor(delta / MINUTE) },
);
} else if (delta < DAY) {
relativeTime = intl.formatMessage(
short ? messages.hours : messages.hours_full,
- { number: Math.floor(delta / HOUR) }
+ { number: Math.floor(delta / HOUR) },
);
} else {
relativeTime = intl.formatMessage(
short ? messages.days : messages.days_full,
- { number: Math.floor(delta / DAY) }
+ { number: Math.floor(delta / DAY) },
);
}
} else if (date.getFullYear() === year) {
@@ 158,7 158,7 @@ const timeRemainingString = (
intl: IntlShape,
date: Date,
now: number,
- timeGiven = true
+ timeGiven = true,
) => {
const delta = date.getTime() - now;
M app/javascript/flavours/glitch/components/short_number.tsx => app/javascript/flavours/glitch/components/short_number.tsx +4 -4
@@ 6,7 6,7 @@ import { toShortNumber, pluralReady, DECIMAL_UNITS } from '../utils/numbers';
type ShortNumberRenderer = (
displayNumber: JSX.Element,
- pluralReady: number
+ pluralReady: number,
) => JSX.Element;
interface ShortNumberProps {
@@ 25,16 25,16 @@ export const ShortNumberRenderer: React.FC<ShortNumberProps> = ({
if (children && renderer) {
console.warn(
- 'Both renderer prop and renderer as a child provided. This is a mistake and you really should fix that. Only renderer passed as a child will be used.'
+ 'Both renderer prop and renderer as a child provided. This is a mistake and you really should fix that. Only renderer passed as a child will be used.',
);
}
- const customRenderer = children || renderer || null;
+ const customRenderer = children ?? renderer ?? null;
const displayNumber = <ShortNumberCounter value={shortNumber} />;
return (
- customRenderer?.(displayNumber, pluralReady(value, division)) ||
+ customRenderer?.(displayNumber, pluralReady(value, division)) ??
displayNumber
);
};
M app/javascript/flavours/glitch/features/emoji/emoji_compressed.d.ts => app/javascript/flavours/glitch/features/emoji/emoji_compressed.d.ts +6 -5
@@ 25,12 25,13 @@ export type SearchData = [
BaseEmoji['native'],
Emoji['short_names'],
Search,
- Emoji['unified']
+ Emoji['unified'],
];
-export interface ShortCodesToEmojiData {
- [key: ShortCodesToEmojiDataKey]: [FilenameData, SearchData];
-}
+export type ShortCodesToEmojiData = Record<
+ ShortCodesToEmojiDataKey,
+ [FilenameData, SearchData]
+>;
export type EmojisWithoutShortCodes = FilenameData[];
export type EmojiCompressed = [
@@ 38,7 39,7 @@ export type EmojiCompressed = [
Skins,
Category[],
Data['aliases'],
- EmojisWithoutShortCodes
+ EmojisWithoutShortCodes,
];
/*
M app/javascript/flavours/glitch/features/emoji/emoji_mart_data_light.ts => app/javascript/flavours/glitch/features/emoji/emoji_mart_data_light.ts +1 -1
@@ 9,7 9,7 @@ import emojiCompressed from './emoji_compressed';
import { unicodeToUnifiedName } from './unicode_to_unified_name';
type Emojis = {
- [key in keyof ShortCodesToEmojiData]: {
+ [key in NonNullable<keyof ShortCodesToEmojiData>]: {
native: BaseEmoji['native'];
search: Search;
short_names: Emoji['short_names'];
D app/javascript/flavours/glitch/features/home_timeline/components/column_settings.jsx => app/javascript/flavours/glitch/features/home_timeline/components/column_settings.jsx +0 -54
@@ 1,54 0,0 @@
-import PropTypes from 'prop-types';
-import { PureComponent } from 'react';
-
-import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
-
-import ImmutablePropTypes from 'react-immutable-proptypes';
-
-import SettingText from 'flavours/glitch/components/setting_text';
-import SettingToggle from 'flavours/glitch/features/notifications/components/setting_toggle';
-
-const messages = defineMessages({
- filter_regex: { id: 'home.column_settings.filter_regex', defaultMessage: 'Filter out by regular expressions' },
- settings: { id: 'home.settings', defaultMessage: 'Column settings' },
-});
-
-class ColumnSettings extends PureComponent {
-
- static propTypes = {
- settings: ImmutablePropTypes.map.isRequired,
- onChange: PropTypes.func.isRequired,
- intl: PropTypes.object.isRequired,
- };
-
- render () {
- const { settings, onChange, intl } = this.props;
-
- return (
- <div>
- <span className='column-settings__section'><FormattedMessage id='home.column_settings.basic' defaultMessage='Basic' /></span>
-
- <div className='column-settings__row'>
- <SettingToggle prefix='home_timeline' settings={settings} settingPath={['shows', 'reblog']} onChange={onChange} label={<FormattedMessage id='home.column_settings.show_reblogs' defaultMessage='Show boosts' />} />
- </div>
-
- <div className='column-settings__row'>
- <SettingToggle prefix='home_timeline' settings={settings} settingPath={['shows', 'reply']} onChange={onChange} label={<FormattedMessage id='home.column_settings.show_replies' defaultMessage='Show replies' />} />
- </div>
-
- <div className='column-settings__row'>
- <SettingToggle prefix='home_timeline' settings={settings} settingPath={['shows', 'direct']} onChange={onChange} label={<FormattedMessage id='home.column_settings.show_direct' defaultMessage='Show private mentions' />} />
- </div>
-
- <span className='column-settings__section'><FormattedMessage id='home.column_settings.advanced' defaultMessage='Advanced' /></span>
-
- <div className='column-settings__row'>
- <SettingText prefix='home_timeline' settings={settings} settingPath={['regex', 'body']} onChange={onChange} label={intl.formatMessage(messages.filter_regex)} />
- </div>
- </div>
- );
- }
-
-}
-
-export default injectIntl(ColumnSettings);
A app/javascript/flavours/glitch/features/home_timeline/components/column_settings.tsx => app/javascript/flavours/glitch/features/home_timeline/components/column_settings.tsx +109 -0
@@ 0,0 1,109 @@
+/* eslint-disable @typescript-eslint/no-unsafe-call,
+ @typescript-eslint/no-unsafe-return,
+ @typescript-eslint/no-unsafe-assignment,
+ @typescript-eslint/no-unsafe-member-access
+ -- the settings store is not yet typed */
+import { useCallback } from 'react';
+
+import { FormattedMessage, defineMessages, useIntl } from 'react-intl';
+
+import SettingText from 'flavours/glitch/components/setting_text';
+import { useAppSelector, useAppDispatch } from 'flavours/glitch/store';
+
+import { changeSetting } from '../../../actions/settings';
+import SettingToggle from '../../notifications/components/setting_toggle';
+
+const messages = defineMessages({
+ filter_regex: {
+ id: 'home.column_settings.filter_regex',
+ defaultMessage: 'Filter out by regular expressions',
+ },
+ settings: { id: 'home.settings', defaultMessage: 'Column settings' },
+});
+
+export const ColumnSettings: React.FC = () => {
+ const settings = useAppSelector((state) => state.settings.get('home'));
+
+ const intl = useIntl();
+
+ const dispatch = useAppDispatch();
+ const onChange = useCallback(
+ (key: string, checked: boolean) => {
+ dispatch(changeSetting(['home', ...key], checked));
+ },
+ [dispatch],
+ );
+
+ return (
+ <div>
+ <span className='column-settings__section'>
+ <FormattedMessage
+ id='home.column_settings.basic'
+ defaultMessage='Basic'
+ />
+ </span>
+
+ <div className='column-settings__row'>
+ <SettingToggle
+ prefix='home_timeline'
+ settings={settings}
+ settingPath={['shows', 'reblog']}
+ onChange={onChange}
+ label={
+ <FormattedMessage
+ id='home.column_settings.show_reblogs'
+ defaultMessage='Show boosts'
+ />
+ }
+ />
+ </div>
+
+ <div className='column-settings__row'>
+ <SettingToggle
+ prefix='home_timeline'
+ settings={settings}
+ settingPath={['shows', 'reply']}
+ onChange={onChange}
+ label={
+ <FormattedMessage
+ id='home.column_settings.show_replies'
+ defaultMessage='Show replies'
+ />
+ }
+ />
+ </div>
+
+ <div className='column-settings__row'>
+ <SettingToggle
+ prefix='home_timeline'
+ settings={settings}
+ settingPath={['shows', 'direct']}
+ onChange={onChange}
+ label={
+ <FormattedMessage
+ id='home.column_settings.show_direct'
+ defaultMessage='Show private mentions'
+ />
+ }
+ />
+ </div>
+
+ <span className='column-settings__section'>
+ <FormattedMessage
+ id='home.column_settings.advanced'
+ defaultMessage='Advanced'
+ />
+ </span>
+
+ <div className='column-settings__row'>
+ <SettingText
+ prefix='home_timeline'
+ settings={settings}
+ settingPath={['regex', 'body']}
+ onChange={onChange}
+ label={intl.formatMessage(messages.filter_regex)}
+ />
+ </div>
+ </div>
+ );
+};
D app/javascript/flavours/glitch/features/home_timeline/components/explore_prompt.jsx => app/javascript/flavours/glitch/features/home_timeline/components/explore_prompt.jsx +0 -25
@@ 1,25 0,0 @@
-import React from 'react';
-
-import { FormattedMessage } from 'react-intl';
-
-import { Link } from 'react-router-dom';
-
-import { DismissableBanner } from 'flavours/glitch/components/dismissable_banner';
-import background from 'mastodon/../images/friends-cropped.png';
-
-
-export const ExplorePrompt = () => (
- <DismissableBanner id='home.explore_prompt'>
- <img src={background} alt='' className='dismissable-banner__background-image' />
-
- <h1><FormattedMessage id='home.explore_prompt.title' defaultMessage='This is your home base within Mastodon.' /></h1>
- <p><FormattedMessage id='home.explore_prompt.body' defaultMessage="Your home feed will have a mix of posts from the hashtags you've chosen to follow, the people you've chosen to follow, and the posts they boost. It's looking pretty quiet right now, so how about:" /></p>
-
- <div className='dismissable-banner__message__actions__wrapper'>
- <div className='dismissable-banner__message__actions'>
- <Link to='/explore' className='button'><FormattedMessage id='home.actions.go_to_explore' defaultMessage="See what's trending" /></Link>
- <Link to='/explore/suggestions' className='button button-tertiary'><FormattedMessage id='home.actions.go_to_suggestions' defaultMessage='Find people to follow' /></Link>
- </div>
- </div>
- </DismissableBanner>
-);
A app/javascript/flavours/glitch/features/home_timeline/components/explore_prompt.tsx => app/javascript/flavours/glitch/features/home_timeline/components/explore_prompt.tsx +46 -0
@@ 0,0 1,46 @@
+import { FormattedMessage } from 'react-intl';
+
+import { Link } from 'react-router-dom';
+
+import { DismissableBanner } from 'flavours/glitch/components/dismissable_banner';
+import background from 'mastodon/../images/friends-cropped.png';
+
+export const ExplorePrompt = () => (
+ <DismissableBanner id='home.explore_prompt'>
+ <img
+ src={background}
+ alt=''
+ className='dismissable-banner__background-image'
+ />
+
+ <h1>
+ <FormattedMessage
+ id='home.explore_prompt.title'
+ defaultMessage='This is your home base within Mastodon.'
+ />
+ </h1>
+ <p>
+ <FormattedMessage
+ id='home.explore_prompt.body'
+ defaultMessage="Your home feed will have a mix of posts from the hashtags you've chosen to follow, the people you've chosen to follow, and the posts they boost. It's looking pretty quiet right now, so how about:"
+ />
+ </p>
+
+ <div className='dismissable-banner__message__wrapper'>
+ <div className='dismissable-banner__message__actions'>
+ <Link to='/explore' className='button'>
+ <FormattedMessage
+ id='home.actions.go_to_explore'
+ defaultMessage="See what's trending"
+ />
+ </Link>
+ <Link to='/explore/suggestions' className='button button-tertiary'>
+ <FormattedMessage
+ id='home.actions.go_to_suggestions'
+ defaultMessage='Find people to follow'
+ />
+ </Link>
+ </div>
+ </div>
+ </DismissableBanner>
+);
D app/javascript/flavours/glitch/features/home_timeline/containers/column_settings_container.js => app/javascript/flavours/glitch/features/home_timeline/containers/column_settings_container.js +0 -23
@@ 1,23 0,0 @@
-import { connect } from 'react-redux';
-
-import { changeSetting, saveSettings } from 'flavours/glitch/actions/settings';
-
-import ColumnSettings from '../components/column_settings';
-
-const mapStateToProps = state => ({
- settings: state.getIn(['settings', 'home']),
-});
-
-const mapDispatchToProps = dispatch => ({
-
- onChange (path, checked) {
- dispatch(changeSetting(['home', ...path], checked));
- },
-
- onSave () {
- dispatch(saveSettings());
- },
-
-});
-
-export default connect(mapStateToProps, mapDispatchToProps)(ColumnSettings);
M app/javascript/flavours/glitch/features/home_timeline/index.jsx => app/javascript/flavours/glitch/features/home_timeline/index.jsx +2 -2
@@ 22,8 22,8 @@ import Column from '../../components/column';
import ColumnHeader from '../../components/column_header';
import StatusListContainer from '../ui/containers/status_list_container';
+import { ColumnSettings } from './components/column_settings';
import { ExplorePrompt } from './components/explore_prompt';
-import ColumnSettingsContainer from './containers/column_settings_container';
const messages = defineMessages({
title: { id: 'column.home', defaultMessage: 'Home' },
@@ 192,7 192,7 @@ class HomeTimeline extends PureComponent {
extraButton={announcementsButton}
appendContent={hasAnnouncements && showAnnouncements && <AnnouncementsContainer />}
>
- <ColumnSettingsContainer />
+ <ColumnSettings />
</ColumnHeader>
{signedIn ? (
M app/javascript/flavours/glitch/locales/global_locale.ts => app/javascript/flavours/glitch/locales/global_locale.ts +8 -4
@@ 3,15 3,19 @@ export interface LocaleData {
messages: Record<string, string>;
}
-let loadedLocale: LocaleData;
+let loadedLocale: LocaleData | undefined;
export function setLocale(locale: LocaleData) {
loadedLocale = locale;
}
-export function getLocale() {
- if (!loadedLocale && process.env.NODE_ENV === 'development') {
- throw new Error('getLocale() called before any locale has been set');
+export function getLocale(): LocaleData {
+ if (!loadedLocale) {
+ if (process.env.NODE_ENV === 'development') {
+ throw new Error('getLocale() called before any locale has been set');
+ } else {
+ return { locale: 'unknown', messages: {} };
+ }
}
return loadedLocale;
M app/javascript/flavours/glitch/locales/load_locale.ts => app/javascript/flavours/glitch/locales/load_locale.ts +1 -0
@@ 6,6 6,7 @@ import { isLocaleLoaded, setLocale } from './global_locale';
const localeLoadingSemaphore = new Semaphore(1);
export async function loadLocale() {
+ // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing -- we want to match empty strings
const locale = document.querySelector<HTMLElement>('html')?.lang || 'en';
// We use a Semaphore here so only one thing can try to load the locales at
M app/javascript/flavours/glitch/polyfills/base_polyfills.ts => app/javascript/flavours/glitch/polyfills/base_polyfills.ts +3 -3
@@ 4,7 4,7 @@ import 'core-js/features/symbol';
import 'core-js/features/promise/finally';
import { decode as decodeBase64 } from '../utils/base64';
-if (!HTMLCanvasElement.prototype.toBlob) {
+if (!Object.hasOwn(HTMLCanvasElement.prototype, 'toBlob')) {
const BASE64_MARKER = ';base64,';
Object.defineProperty(HTMLCanvasElement.prototype, 'toBlob', {
@@ 12,12 12,12 @@ if (!HTMLCanvasElement.prototype.toBlob) {
this: HTMLCanvasElement,
callback: BlobCallback,
type = 'image/png',
- quality: unknown
+ quality: unknown,
) {
const dataURL: string = this.toDataURL(type, quality);
let data;
- if (dataURL.indexOf(BASE64_MARKER) >= 0) {
+ if (dataURL.includes(BASE64_MARKER)) {
const [, base64] = dataURL.split(BASE64_MARKER);
data = decodeBase64(base64);
} else {
M app/javascript/flavours/glitch/polyfills/index.ts => app/javascript/flavours/glitch/polyfills/index.ts +2 -0
@@ 24,6 24,7 @@ export function loadPolyfills() {
// Latest version of Firefox and Safari do not have IntersectionObserver.
// Edge does not have requestIdleCallback.
// This avoids shipping them all the polyfills.
+ /* eslint-disable @typescript-eslint/no-unnecessary-condition -- those properties might not exist in old browsers, even if they are always here in types */
const needsExtraPolyfills = !(
window.AbortController &&
window.IntersectionObserver &&
@@ 31,6 32,7 @@ export function loadPolyfills() {
'isIntersecting' in IntersectionObserverEntry.prototype &&
window.requestIdleCallback
);
+ /* eslint-enable @typescript-eslint/no-unnecessary-condition */
return Promise.all([
loadIntlPolyfills(),
M app/javascript/flavours/glitch/polyfills/intl.ts => app/javascript/flavours/glitch/polyfills/intl.ts +1 -0
@@ 80,6 80,7 @@ async function loadIntlPluralRulesPolyfills(locale: string) {
// }
export async function loadIntlPolyfills() {
+ // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing -- we want to match empty strings
const locale = document.querySelector('html')?.lang || 'en';
// order is important here
M app/javascript/flavours/glitch/reducers/index.ts => app/javascript/flavours/glitch/reducers/index.ts +1 -1
@@ 105,7 105,7 @@ const initialRootState = Object.fromEntries(
reducer(undefined, {
// empty action
}),
- ])
+ ]),
);
const RootStateRecord = ImmutableRecord(initialRootState, 'RootState');
M app/javascript/flavours/glitch/reducers/modal.ts => app/javascript/flavours/glitch/reducers/modal.ts +7 -7
@@ 35,7 35,7 @@ interface PopModalOption {
}
const popModal = (
state: State,
- { modalType, ignoreFocus }: PopModalOption
+ { modalType, ignoreFocus }: PopModalOption,
): State => {
if (
modalType === undefined ||
@@ 52,12 52,12 @@ const popModal = (
const pushModal = (
state: State,
modalType: ModalType,
- modalProps: ModalProps
+ modalProps: ModalProps,
): State => {
return state.withMutations((record) => {
record.set('ignoreFocus', false);
record.update('stack', (stack) =>
- stack.unshift(Modal({ modalType, modalProps }))
+ stack.unshift(Modal({ modalType, modalProps })),
);
});
};
@@ 68,14 68,14 @@ export function modalReducer(
modalType: ModalType;
ignoreFocus: boolean;
modalProps: Record<string, unknown>;
- }>
+ }>,
) {
switch (action.type) {
case openModal.type:
return pushModal(
state,
action.payload.modalType,
- action.payload.modalProps
+ action.payload.modalProps,
);
case closeModal.type:
return popModal(state, action.payload);
@@ 85,8 85,8 @@ export function modalReducer(
return state.update('stack', (stack) =>
stack.filterNot(
// @ts-expect-error TIMELINE_DELETE action is not typed yet.
- (modal) => modal.get('modalProps').statusId === action.id
- )
+ (modal) => modal.get('modalProps').statusId === action.id,
+ ),
);
default:
return state;
M app/javascript/flavours/glitch/scroll.ts => app/javascript/flavours/glitch/scroll.ts +12 -10
@@ 3,12 3,12 @@ const easingOutQuint = (
t: number,
b: number,
c: number,
- d: number
+ d: number,
) => c * ((t = t / d - 1) * t * t * t * t + 1) + b;
const scroll = (
node: Element,
key: 'scrollTop' | 'scrollLeft',
- target: number
+ target: number,
) => {
const startTime = Date.now();
const offset = node[key];
@@ 38,11 38,13 @@ const scroll = (
const isScrollBehaviorSupported =
'scrollBehavior' in document.documentElement.style;
-export const scrollRight = (node: Element, position: number) =>
- isScrollBehaviorSupported
- ? node.scrollTo({ left: position, behavior: 'smooth' })
- : scroll(node, 'scrollLeft', position);
-export const scrollTop = (node: Element) =>
- isScrollBehaviorSupported
- ? node.scrollTo({ top: 0, behavior: 'smooth' })
- : scroll(node, 'scrollTop', 0);
+export const scrollRight = (node: Element, position: number) => {
+ if (isScrollBehaviorSupported)
+ node.scrollTo({ left: position, behavior: 'smooth' });
+ else scroll(node, 'scrollLeft', position);
+};
+
+export const scrollTop = (node: Element) => {
+ if (isScrollBehaviorSupported) node.scrollTo({ top: 0, behavior: 'smooth' });
+ else scroll(node, 'scrollTop', 0);
+};
M app/javascript/flavours/glitch/store/index.ts => app/javascript/flavours/glitch/store/index.ts +1 -1
@@ 30,7 30,7 @@ export const store = configureStore({
.concat(
loadingBarMiddleware({
promiseTypeSuffixes: ['REQUEST', 'SUCCESS', 'FAIL'],
- })
+ }),
)
.concat(errorsMiddleware)
.concat(soundsMiddleware()),
M app/javascript/flavours/glitch/store/middlewares/loading_bar.ts => app/javascript/flavours/glitch/store/middlewares/loading_bar.ts +3 -3
@@ 14,9 14,9 @@ const defaultTypeSuffixes: Config['promiseTypeSuffixes'] = [
];
export const loadingBarMiddleware = (
- config: Config = {}
+ config: Config = {},
): Middleware<Record<string, never>, RootState> => {
- const promiseTypeSuffixes = config.promiseTypeSuffixes || defaultTypeSuffixes;
+ const promiseTypeSuffixes = config.promiseTypeSuffixes ?? defaultTypeSuffixes;
return ({ dispatch }) =>
(next) =>
@@ 32,7 32,7 @@ export const loadingBarMiddleware = (
if (action.type.match(isPending)) {
dispatch(showLoading());
} else if (
- action.type.match(isFulfilled) ||
+ action.type.match(isFulfilled) ??
action.type.match(isRejected)
) {
dispatch(hideLoading());
M app/javascript/flavours/glitch/store/middlewares/sounds.ts => app/javascript/flavours/glitch/store/middlewares/sounds.ts +3 -3
@@ 38,7 38,7 @@ export const soundsMiddleware = (): Middleware<
Record<string, never>,
RootState
> => {
- const soundCache: { [key: string]: HTMLAudioElement } = {};
+ const soundCache: Record<string, HTMLAudioElement> = {};
void ready(() => {
soundCache.boop = createAudio([
@@ 56,9 56,9 @@ export const soundsMiddleware = (): Middleware<
return () =>
(next) =>
(action: AnyAction & { meta?: { sound?: string } }) => {
- const sound = action?.meta?.sound;
+ const sound = action.meta?.sound;
- if (sound && soundCache[sound]) {
+ if (sound && Object.hasOwn(soundCache, sound)) {
play(soundCache[sound]);
}
M app/javascript/flavours/glitch/styles/basics.scss => app/javascript/flavours/glitch/styles/basics.scss +13 -3
@@ 31,9 31,19 @@ body {
// Droid Sans => Older Androids (<4.0)
// Helvetica Neue => Older macOS <10.11
// $font-sans-serif => web-font (Roboto) fallback and newer Androids (>=4.0)
- font-family: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
- Oxygen, Ubuntu, Cantarell, 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
- $font-sans-serif, sans-serif;
+ font-family:
+ system-ui,
+ -apple-system,
+ BlinkMacSystemFont,
+ 'Segoe UI',
+ Oxygen,
+ Ubuntu,
+ Cantarell,
+ 'Fira Sans',
+ 'Droid Sans',
+ 'Helvetica Neue',
+ $font-sans-serif,
+ sans-serif;
}
&.app-body {
M app/javascript/flavours/glitch/styles/components/columns.scss => app/javascript/flavours/glitch/styles/components/columns.scss +3 -1
@@ 480,7 480,9 @@ $ui-header-height: 55px;
overflow: hidden;
overflow-y: auto;
color: $darker-text-color;
- transition: max-height 150ms ease-in-out, opacity 300ms linear;
+ transition:
+ max-height 150ms ease-in-out,
+ opacity 300ms linear;
opacity: 1;
z-index: 1;
position: relative;
M app/javascript/flavours/glitch/styles/components/compose_form.scss => app/javascript/flavours/glitch/styles/components/compose_form.scss +3 -1
@@ 26,7 26,9 @@
}
.no-reduce-motion .spoiler-input {
- transition: height 0.4s ease, opacity 0.4s ease;
+ transition:
+ height 0.4s ease,
+ opacity 0.4s ease;
}
.spoiler-input {
M app/javascript/flavours/glitch/styles/components/drawer.scss => app/javascript/flavours/glitch/styles/components/drawer.scss +4 -2
@@ 253,14 253,16 @@
@for $i from 0 through 3 {
.mbstobon-#{$i} .drawer__inner__mastodon {
@if $i == 3 {
- background: url('~flavours/glitch/images/wave-drawer.png')
+ background:
+ url('~flavours/glitch/images/wave-drawer.png')
no-repeat
bottom /
100%
auto,
lighten($ui-base-color, 13%);
} @else {
- background: url('~flavours/glitch/images/wave-drawer-glitched.png')
+ background:
+ url('~flavours/glitch/images/wave-drawer-glitched.png')
no-repeat
bottom /
100%
M app/javascript/flavours/glitch/styles/statuses.scss => app/javascript/flavours/glitch/styles/statuses.scss +12 -0
@@ 73,6 73,18 @@
}
}
+.button.logo-button svg {
+ width: 20px;
+ height: auto;
+ vertical-align: middle;
+ margin-inline-end: 5px;
+ fill: $primary-text-color;
+
+ @media screen and (max-width: $no-gap-breakpoint) {
+ display: none;
+ }
+}
+
.embed {
.status__content[data-spoiler='folded'] {
.e-content {
M app/javascript/flavours/glitch/utils/filters.ts => app/javascript/flavours/glitch/utils/filters.ts +1 -1
@@ 7,7 7,7 @@ export const toServerSideType = (columnType: string) => {
case 'account':
return columnType;
default:
- if (columnType.indexOf('list:') > -1) {
+ if (columnType.includes('list:')) {
return 'home';
} else {
return 'public'; // community, account, hashtag
M app/javascript/flavours/glitch/utils/numbers.ts => app/javascript/flavours/glitch/utils/numbers.ts +1 -1
@@ 55,7 55,7 @@ export function toShortNumber(sourceNumber: number): ShortNumber {
*/
export function pluralReady(
sourceNumber: number,
- division: DecimalUnits
+ division: DecimalUnits | null,
): number {
if (division == null || division < DECIMAL_UNITS.HUNDRED) {
return sourceNumber;
M app/javascript/flavours/glitch/uuid.ts => app/javascript/flavours/glitch/uuid.ts +1 -2
@@ 4,6 4,5 @@ export function uuid(a?: string): string {
(a as unknown as number) ^
((Math.random() * 16) >> ((a as unknown as number) / 4))
).toString(16)
- : // eslint-disable-next-line @typescript-eslint/restrict-plus-operands
- ('' + 1e7 + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, uuid);
+ : ('' + 1e7 + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, uuid);
}
M app/javascript/mastodon/blurhash.ts => app/javascript/mastodon/blurhash.ts +2 -3
@@ 86,10 86,9 @@ const DIGIT_CHARACTERS = [
export const decode83 = (str: string) => {
let value = 0;
- let c, digit;
+ let digit;
- for (let i = 0; i < str.length; i++) {
- c = str[i];
+ for (const c of str) {
digit = DIGIT_CHARACTERS.indexOf(c);
value = value * 83 + digit;
}
M app/javascript/mastodon/components/animated_number.tsx => app/javascript/mastodon/components/animated_number.tsx +1 -1
@@ 32,7 32,7 @@ export const AnimatedNumber: React.FC<Props> = ({ value, obfuscate }) => {
const willEnter = useCallback(() => ({ y: -1 * direction }), [direction]);
const willLeave = useCallback(
() => ({ y: spring(1 * direction, { damping: 35, stiffness: 400 }) }),
- [direction]
+ [direction],
);
if (reduceMotion) {
M app/javascript/mastodon/components/autosuggest_hashtag.tsx => app/javascript/mastodon/components/autosuggest_hashtag.tsx +2 -2
@@ 6,11 6,11 @@ interface Props {
tag: {
name: string;
url?: string;
- history?: Array<{
+ history?: {
uses: number;
accounts: string;
day: string;
- }>;
+ }[];
following?: boolean;
type: 'hashtag';
};
M app/javascript/mastodon/components/avatar.tsx => app/javascript/mastodon/components/avatar.tsx +1 -1
@@ 5,7 5,7 @@ import type { Account } from '../../types/resources';
import { autoPlayGif } from '../initial_state';
interface Props {
- account: Account;
+ account: Account | undefined; // FIXME: remove `undefined` once we know for sure its always there
size: number;
style?: React.CSSProperties;
inline?: boolean;
M app/javascript/mastodon/components/avatar_overlay.tsx => app/javascript/mastodon/components/avatar_overlay.tsx +2 -2
@@ 3,8 3,8 @@ import type { Account } from '../../types/resources';
import { autoPlayGif } from '../initial_state';
interface Props {
- account: Account;
- friend: Account;
+ account: Account | undefined; // FIXME: remove `undefined` once we know for sure its always there
+ friend: Account | undefined; // FIXME: remove `undefined` once we know for sure its always there
size?: number;
baseSize?: number;
overlaySize?: number;
M app/javascript/mastodon/components/counters.tsx => app/javascript/mastodon/components/counters.tsx +3 -3
@@ 4,7 4,7 @@ import { FormattedMessage } from 'react-intl';
export const StatusesCounter = (
displayNumber: React.ReactNode,
- pluralReady: number
+ pluralReady: number,
) => (
<FormattedMessage
id='account.statuses_counter'
@@ 18,7 18,7 @@ export const StatusesCounter = (
export const FollowingCounter = (
displayNumber: React.ReactNode,
- pluralReady: number
+ pluralReady: number,
) => (
<FormattedMessage
id='account.following_counter'
@@ 32,7 32,7 @@ export const FollowingCounter = (
export const FollowersCounter = (
displayNumber: React.ReactNode,
- pluralReady: number
+ pluralReady: number,
) => (
<FormattedMessage
id='account.followers_counter'
M app/javascript/mastodon/components/display_name.tsx => app/javascript/mastodon/components/display_name.tsx +1 -1
@@ 78,7 78,7 @@ export class DisplayName extends React.PureComponent<Props> {
} else if (account) {
let acct = account.get('acct');
- if (acct.indexOf('@') === -1 && localDomain) {
+ if (!acct.includes('@') && localDomain) {
acct = `${acct}@${localDomain}`;
}
M app/javascript/mastodon/components/gifv.tsx => app/javascript/mastodon/components/gifv.tsx +1 -1
@@ 32,7 32,7 @@ export const GIFV: React.FC<Props> = ({
onClick();
}
},
- [onClick]
+ [onClick],
);
return (
M app/javascript/mastodon/components/relative_timestamp.tsx => app/javascript/mastodon/components/relative_timestamp.tsx +7 -7
@@ 108,7 108,7 @@ export const timeAgoString = (
now: number,
year: number,
timeGiven: boolean,
- short?: boolean
+ short?: boolean,
) => {
const delta = now - date.getTime();
@@ 118,28 118,28 @@ export const timeAgoString = (
relativeTime = intl.formatMessage(messages.today);
} else if (delta < 10 * SECOND) {
relativeTime = intl.formatMessage(
- short ? messages.just_now : messages.just_now_full
+ short ? messages.just_now : messages.just_now_full,
);
} else if (delta < 7 * DAY) {
if (delta < MINUTE) {
relativeTime = intl.formatMessage(
short ? messages.seconds : messages.seconds_full,
- { number: Math.floor(delta / SECOND) }
+ { number: Math.floor(delta / SECOND) },
);
} else if (delta < HOUR) {
relativeTime = intl.formatMessage(
short ? messages.minutes : messages.minutes_full,
- { number: Math.floor(delta / MINUTE) }
+ { number: Math.floor(delta / MINUTE) },
);
} else if (delta < DAY) {
relativeTime = intl.formatMessage(
short ? messages.hours : messages.hours_full,
- { number: Math.floor(delta / HOUR) }
+ { number: Math.floor(delta / HOUR) },
);
} else {
relativeTime = intl.formatMessage(
short ? messages.days : messages.days_full,
- { number: Math.floor(delta / DAY) }
+ { number: Math.floor(delta / DAY) },
);
}
} else if (date.getFullYear() === year) {
@@ 158,7 158,7 @@ const timeRemainingString = (
intl: IntlShape,
date: Date,
now: number,
- timeGiven = true
+ timeGiven = true,
) => {
const delta = date.getTime() - now;
M app/javascript/mastodon/components/short_number.tsx => app/javascript/mastodon/components/short_number.tsx +4 -4
@@ 6,7 6,7 @@ import { toShortNumber, pluralReady, DECIMAL_UNITS } from '../utils/numbers';
type ShortNumberRenderer = (
displayNumber: JSX.Element,
- pluralReady: number
+ pluralReady: number,
) => JSX.Element;
interface ShortNumberProps {
@@ 25,16 25,16 @@ export const ShortNumberRenderer: React.FC<ShortNumberProps> = ({
if (children && renderer) {
console.warn(
- 'Both renderer prop and renderer as a child provided. This is a mistake and you really should fix that. Only renderer passed as a child will be used.'
+ 'Both renderer prop and renderer as a child provided. This is a mistake and you really should fix that. Only renderer passed as a child will be used.',
);
}
- const customRenderer = children || renderer || null;
+ const customRenderer = children ?? renderer ?? null;
const displayNumber = <ShortNumberCounter value={shortNumber} />;
return (
- customRenderer?.(displayNumber, pluralReady(value, division)) ||
+ customRenderer?.(displayNumber, pluralReady(value, division)) ??
displayNumber
);
};
M app/javascript/mastodon/features/emoji/emoji_compressed.d.ts => app/javascript/mastodon/features/emoji/emoji_compressed.d.ts +6 -5
@@ 25,12 25,13 @@ export type SearchData = [
BaseEmoji['native'],
Emoji['short_names'],
Search,
- Emoji['unified']
+ Emoji['unified'],
];
-export interface ShortCodesToEmojiData {
- [key: ShortCodesToEmojiDataKey]: [FilenameData, SearchData];
-}
+export type ShortCodesToEmojiData = Record<
+ ShortCodesToEmojiDataKey,
+ [FilenameData, SearchData]
+>;
export type EmojisWithoutShortCodes = FilenameData[];
export type EmojiCompressed = [
@@ 38,7 39,7 @@ export type EmojiCompressed = [
Skins,
Category[],
Data['aliases'],
- EmojisWithoutShortCodes
+ EmojisWithoutShortCodes,
];
/*
M app/javascript/mastodon/features/emoji/emoji_mart_data_light.ts => app/javascript/mastodon/features/emoji/emoji_mart_data_light.ts +1 -1
@@ 9,7 9,7 @@ import emojiCompressed from './emoji_compressed';
import { unicodeToUnifiedName } from './unicode_to_unified_name';
type Emojis = {
- [key in keyof ShortCodesToEmojiData]: {
+ [key in NonNullable<keyof ShortCodesToEmojiData>]: {
native: BaseEmoji['native'];
search: Search;
short_names: Emoji['short_names'];
D app/javascript/mastodon/features/home_timeline/components/column_settings.jsx => app/javascript/mastodon/features/home_timeline/components/column_settings.jsx +0 -38
@@ 1,38 0,0 @@
-import PropTypes from 'prop-types';
-import { PureComponent } from 'react';
-
-import { injectIntl, FormattedMessage } from 'react-intl';
-
-import ImmutablePropTypes from 'react-immutable-proptypes';
-
-import SettingToggle from '../../notifications/components/setting_toggle';
-
-class ColumnSettings extends PureComponent {
-
- static propTypes = {
- settings: ImmutablePropTypes.map.isRequired,
- onChange: PropTypes.func.isRequired,
- intl: PropTypes.object.isRequired,
- };
-
- render () {
- const { settings, onChange } = this.props;
-
- return (
- <div>
- <span className='column-settings__section'><FormattedMessage id='home.column_settings.basic' defaultMessage='Basic' /></span>
-
- <div className='column-settings__row'>
- <SettingToggle prefix='home_timeline' settings={settings} settingPath={['shows', 'reblog']} onChange={onChange} label={<FormattedMessage id='home.column_settings.show_reblogs' defaultMessage='Show boosts' />} />
- </div>
-
- <div className='column-settings__row'>
- <SettingToggle prefix='home_timeline' settings={settings} settingPath={['shows', 'reply']} onChange={onChange} label={<FormattedMessage id='home.column_settings.show_replies' defaultMessage='Show replies' />} />
- </div>
- </div>
- );
- }
-
-}
-
-export default injectIntl(ColumnSettings);
A app/javascript/mastodon/features/home_timeline/components/column_settings.tsx => app/javascript/mastodon/features/home_timeline/components/column_settings.tsx +66 -0
@@ 0,0 1,66 @@
+/* eslint-disable @typescript-eslint/no-unsafe-call,
+ @typescript-eslint/no-unsafe-return,
+ @typescript-eslint/no-unsafe-assignment,
+ @typescript-eslint/no-unsafe-member-access
+ -- the settings store is not yet typed */
+import { useCallback } from 'react';
+
+import { FormattedMessage } from 'react-intl';
+
+import { useAppSelector, useAppDispatch } from 'mastodon/store';
+
+import { changeSetting } from '../../../actions/settings';
+import SettingToggle from '../../notifications/components/setting_toggle';
+
+export const ColumnSettings: React.FC = () => {
+ const settings = useAppSelector((state) => state.settings.get('home'));
+
+ const dispatch = useAppDispatch();
+ const onChange = useCallback(
+ (key: string, checked: boolean) => {
+ dispatch(changeSetting(['home', ...key], checked));
+ },
+ [dispatch],
+ );
+
+ return (
+ <div>
+ <span className='column-settings__section'>
+ <FormattedMessage
+ id='home.column_settings.basic'
+ defaultMessage='Basic'
+ />
+ </span>
+
+ <div className='column-settings__row'>
+ <SettingToggle
+ prefix='home_timeline'
+ settings={settings}
+ settingPath={['shows', 'reblog']}
+ onChange={onChange}
+ label={
+ <FormattedMessage
+ id='home.column_settings.show_reblogs'
+ defaultMessage='Show boosts'
+ />
+ }
+ />
+ </div>
+
+ <div className='column-settings__row'>
+ <SettingToggle
+ prefix='home_timeline'
+ settings={settings}
+ settingPath={['shows', 'reply']}
+ onChange={onChange}
+ label={
+ <FormattedMessage
+ id='home.column_settings.show_replies'
+ defaultMessage='Show replies'
+ />
+ }
+ />
+ </div>
+ </div>
+ );
+};
D app/javascript/mastodon/features/home_timeline/components/explore_prompt.jsx => app/javascript/mastodon/features/home_timeline/components/explore_prompt.jsx +0 -25
@@ 1,25 0,0 @@
-import React from 'react';
-
-import { FormattedMessage } from 'react-intl';
-
-import { Link } from 'react-router-dom';
-
-import background from 'mastodon/../images/friends-cropped.png';
-import { DismissableBanner } from 'mastodon/components/dismissable_banner';
-
-
-export const ExplorePrompt = () => (
- <DismissableBanner id='home.explore_prompt'>
- <img src={background} alt='' className='dismissable-banner__background-image' />
-
- <h1><FormattedMessage id='home.explore_prompt.title' defaultMessage='This is your home base within Mastodon.' /></h1>
- <p><FormattedMessage id='home.explore_prompt.body' defaultMessage="Your home feed will have a mix of posts from the hashtags you've chosen to follow, the people you've chosen to follow, and the posts they boost. It's looking pretty quiet right now, so how about:" /></p>
-
- <div className='dismissable-banner__message__actions__wrapper'>
- <div className='dismissable-banner__message__actions'>
- <Link to='/explore' className='button'><FormattedMessage id='home.actions.go_to_explore' defaultMessage="See what's trending" /></Link>
- <Link to='/explore/suggestions' className='button button-tertiary'><FormattedMessage id='home.actions.go_to_suggestions' defaultMessage='Find people to follow' /></Link>
- </div>
- </div>
- </DismissableBanner>
-);
A app/javascript/mastodon/features/home_timeline/components/explore_prompt.tsx => app/javascript/mastodon/features/home_timeline/components/explore_prompt.tsx +46 -0
@@ 0,0 1,46 @@
+import { FormattedMessage } from 'react-intl';
+
+import { Link } from 'react-router-dom';
+
+import background from 'mastodon/../images/friends-cropped.png';
+import { DismissableBanner } from 'mastodon/components/dismissable_banner';
+
+export const ExplorePrompt = () => (
+ <DismissableBanner id='home.explore_prompt'>
+ <img
+ src={background}
+ alt=''
+ className='dismissable-banner__background-image'
+ />
+
+ <h1>
+ <FormattedMessage
+ id='home.explore_prompt.title'
+ defaultMessage='This is your home base within Mastodon.'
+ />
+ </h1>
+ <p>
+ <FormattedMessage
+ id='home.explore_prompt.body'
+ defaultMessage="Your home feed will have a mix of posts from the hashtags you've chosen to follow, the people you've chosen to follow, and the posts they boost. It's looking pretty quiet right now, so how about:"
+ />
+ </p>
+
+ <div className='dismissable-banner__message__wrapper'>
+ <div className='dismissable-banner__message__actions'>
+ <Link to='/explore' className='button'>
+ <FormattedMessage
+ id='home.actions.go_to_explore'
+ defaultMessage="See what's trending"
+ />
+ </Link>
+ <Link to='/explore/suggestions' className='button button-tertiary'>
+ <FormattedMessage
+ id='home.actions.go_to_suggestions'
+ defaultMessage='Find people to follow'
+ />
+ </Link>
+ </div>
+ </div>
+ </DismissableBanner>
+);
D app/javascript/mastodon/features/home_timeline/containers/column_settings_container.js => app/javascript/mastodon/features/home_timeline/containers/column_settings_container.js +0 -22
@@ 1,22 0,0 @@
-import { connect } from 'react-redux';
-
-import { changeSetting, saveSettings } from '../../../actions/settings';
-import ColumnSettings from '../components/column_settings';
-
-const mapStateToProps = state => ({
- settings: state.getIn(['settings', 'home']),
-});
-
-const mapDispatchToProps = dispatch => ({
-
- onChange (key, checked) {
- dispatch(changeSetting(['home', ...key], checked));
- },
-
- onSave () {
- dispatch(saveSettings());
- },
-
-});
-
-export default connect(mapStateToProps, mapDispatchToProps)(ColumnSettings);
M app/javascript/mastodon/features/home_timeline/index.jsx => app/javascript/mastodon/features/home_timeline/index.jsx +2 -2
@@ 22,8 22,8 @@ import Column from '../../components/column';
import ColumnHeader from '../../components/column_header';
import StatusListContainer from '../ui/containers/status_list_container';
+import { ColumnSettings } from './components/column_settings';
import { ExplorePrompt } from './components/explore_prompt';
-import ColumnSettingsContainer from './containers/column_settings_container';
const messages = defineMessages({
title: { id: 'column.home', defaultMessage: 'Home' },
@@ 191,7 191,7 @@ class HomeTimeline extends PureComponent {
extraButton={announcementsButton}
appendContent={hasAnnouncements && showAnnouncements && <AnnouncementsContainer />}
>
- <ColumnSettingsContainer />
+ <ColumnSettings />
</ColumnHeader>
{signedIn ? (
M app/javascript/mastodon/locales/global_locale.ts => app/javascript/mastodon/locales/global_locale.ts +8 -4
@@ 3,15 3,19 @@ export interface LocaleData {
messages: Record<string, string>;
}
-let loadedLocale: LocaleData;
+let loadedLocale: LocaleData | undefined;
export function setLocale(locale: LocaleData) {
loadedLocale = locale;
}
-export function getLocale() {
- if (!loadedLocale && process.env.NODE_ENV === 'development') {
- throw new Error('getLocale() called before any locale has been set');
+export function getLocale(): LocaleData {
+ if (!loadedLocale) {
+ if (process.env.NODE_ENV === 'development') {
+ throw new Error('getLocale() called before any locale has been set');
+ } else {
+ return { locale: 'unknown', messages: {} };
+ }
}
return loadedLocale;
M app/javascript/mastodon/locales/load_locale.ts => app/javascript/mastodon/locales/load_locale.ts +1 -0
@@ 6,6 6,7 @@ import { isLocaleLoaded, setLocale } from './global_locale';
const localeLoadingSemaphore = new Semaphore(1);
export async function loadLocale() {
+ // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing -- we want to match empty strings
const locale = document.querySelector<HTMLElement>('html')?.lang || 'en';
// We use a Semaphore here so only one thing can try to load the locales at
M app/javascript/mastodon/polyfills/base_polyfills.ts => app/javascript/mastodon/polyfills/base_polyfills.ts +3 -3
@@ 4,7 4,7 @@ import 'core-js/features/symbol';
import 'core-js/features/promise/finally';
import { decode as decodeBase64 } from '../utils/base64';
-if (!HTMLCanvasElement.prototype.toBlob) {
+if (!Object.hasOwn(HTMLCanvasElement.prototype, 'toBlob')) {
const BASE64_MARKER = ';base64,';
Object.defineProperty(HTMLCanvasElement.prototype, 'toBlob', {
@@ 12,12 12,12 @@ if (!HTMLCanvasElement.prototype.toBlob) {
this: HTMLCanvasElement,
callback: BlobCallback,
type = 'image/png',
- quality: unknown
+ quality: unknown,
) {
const dataURL: string = this.toDataURL(type, quality);
let data;
- if (dataURL.indexOf(BASE64_MARKER) >= 0) {
+ if (dataURL.includes(BASE64_MARKER)) {
const [, base64] = dataURL.split(BASE64_MARKER);
data = decodeBase64(base64);
} else {
M app/javascript/mastodon/polyfills/index.ts => app/javascript/mastodon/polyfills/index.ts +2 -0
@@ 24,6 24,7 @@ export function loadPolyfills() {
// Latest version of Firefox and Safari do not have IntersectionObserver.
// Edge does not have requestIdleCallback.
// This avoids shipping them all the polyfills.
+ /* eslint-disable @typescript-eslint/no-unnecessary-condition -- those properties might not exist in old browsers, even if they are always here in types */
const needsExtraPolyfills = !(
window.AbortController &&
window.IntersectionObserver &&
@@ 31,6 32,7 @@ export function loadPolyfills() {
'isIntersecting' in IntersectionObserverEntry.prototype &&
window.requestIdleCallback
);
+ /* eslint-enable @typescript-eslint/no-unnecessary-condition */
return Promise.all([
loadIntlPolyfills(),
M app/javascript/mastodon/polyfills/intl.ts => app/javascript/mastodon/polyfills/intl.ts +1 -0
@@ 80,6 80,7 @@ async function loadIntlPluralRulesPolyfills(locale: string) {
// }
export async function loadIntlPolyfills() {
+ // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing -- we want to match empty strings
const locale = document.querySelector('html')?.lang || 'en';
// order is important here
M app/javascript/mastodon/reducers/index.ts => app/javascript/mastodon/reducers/index.ts +1 -1
@@ 99,7 99,7 @@ const initialRootState = Object.fromEntries(
reducer(undefined, {
// empty action
}),
- ])
+ ]),
);
const RootStateRecord = ImmutableRecord(initialRootState, 'RootState');
M app/javascript/mastodon/reducers/modal.ts => app/javascript/mastodon/reducers/modal.ts +7 -7
@@ 35,7 35,7 @@ interface PopModalOption {
}
const popModal = (
state: State,
- { modalType, ignoreFocus }: PopModalOption
+ { modalType, ignoreFocus }: PopModalOption,
): State => {
if (
modalType === undefined ||
@@ 52,12 52,12 @@ const popModal = (
const pushModal = (
state: State,
modalType: ModalType,
- modalProps: ModalProps
+ modalProps: ModalProps,
): State => {
return state.withMutations((record) => {
record.set('ignoreFocus', false);
record.update('stack', (stack) =>
- stack.unshift(Modal({ modalType, modalProps }))
+ stack.unshift(Modal({ modalType, modalProps })),
);
});
};
@@ 68,14 68,14 @@ export function modalReducer(
modalType: ModalType;
ignoreFocus: boolean;
modalProps: Record<string, unknown>;
- }>
+ }>,
) {
switch (action.type) {
case openModal.type:
return pushModal(
state,
action.payload.modalType,
- action.payload.modalProps
+ action.payload.modalProps,
);
case closeModal.type:
return popModal(state, action.payload);
@@ 85,8 85,8 @@ export function modalReducer(
return state.update('stack', (stack) =>
stack.filterNot(
// @ts-expect-error TIMELINE_DELETE action is not typed yet.
- (modal) => modal.get('modalProps').statusId === action.id
- )
+ (modal) => modal.get('modalProps').statusId === action.id,
+ ),
);
default:
return state;
M app/javascript/mastodon/scroll.ts => app/javascript/mastodon/scroll.ts +12 -10
@@ 3,12 3,12 @@ const easingOutQuint = (
t: number,
b: number,
c: number,
- d: number
+ d: number,
) => c * ((t = t / d - 1) * t * t * t * t + 1) + b;
const scroll = (
node: Element,
key: 'scrollTop' | 'scrollLeft',
- target: number
+ target: number,
) => {
const startTime = Date.now();
const offset = node[key];
@@ 38,11 38,13 @@ const scroll = (
const isScrollBehaviorSupported =
'scrollBehavior' in document.documentElement.style;
-export const scrollRight = (node: Element, position: number) =>
- isScrollBehaviorSupported
- ? node.scrollTo({ left: position, behavior: 'smooth' })
- : scroll(node, 'scrollLeft', position);
-export const scrollTop = (node: Element) =>
- isScrollBehaviorSupported
- ? node.scrollTo({ top: 0, behavior: 'smooth' })
- : scroll(node, 'scrollTop', 0);
+export const scrollRight = (node: Element, position: number) => {
+ if (isScrollBehaviorSupported)
+ node.scrollTo({ left: position, behavior: 'smooth' });
+ else scroll(node, 'scrollLeft', position);
+};
+
+export const scrollTop = (node: Element) => {
+ if (isScrollBehaviorSupported) node.scrollTo({ top: 0, behavior: 'smooth' });
+ else scroll(node, 'scrollTop', 0);
+};
M app/javascript/mastodon/store/index.ts => app/javascript/mastodon/store/index.ts +1 -1
@@ 30,7 30,7 @@ export const store = configureStore({
.concat(
loadingBarMiddleware({
promiseTypeSuffixes: ['REQUEST', 'SUCCESS', 'FAIL'],
- })
+ }),
)
.concat(errorsMiddleware)
.concat(soundsMiddleware()),
M app/javascript/mastodon/store/middlewares/loading_bar.ts => app/javascript/mastodon/store/middlewares/loading_bar.ts +3 -3
@@ 14,9 14,9 @@ const defaultTypeSuffixes: Config['promiseTypeSuffixes'] = [
];
export const loadingBarMiddleware = (
- config: Config = {}
+ config: Config = {},
): Middleware<Record<string, never>, RootState> => {
- const promiseTypeSuffixes = config.promiseTypeSuffixes || defaultTypeSuffixes;
+ const promiseTypeSuffixes = config.promiseTypeSuffixes ?? defaultTypeSuffixes;
return ({ dispatch }) =>
(next) =>
@@ 32,7 32,7 @@ export const loadingBarMiddleware = (
if (action.type.match(isPending)) {
dispatch(showLoading());
} else if (
- action.type.match(isFulfilled) ||
+ action.type.match(isFulfilled) ??
action.type.match(isRejected)
) {
dispatch(hideLoading());
M app/javascript/mastodon/store/middlewares/sounds.ts => app/javascript/mastodon/store/middlewares/sounds.ts +3 -3
@@ 38,7 38,7 @@ export const soundsMiddleware = (): Middleware<
Record<string, never>,
RootState
> => {
- const soundCache: { [key: string]: HTMLAudioElement } = {};
+ const soundCache: Record<string, HTMLAudioElement> = {};
void ready(() => {
soundCache.boop = createAudio([
@@ 56,9 56,9 @@ export const soundsMiddleware = (): Middleware<
return () =>
(next) =>
(action: AnyAction & { meta?: { sound?: string } }) => {
- const sound = action?.meta?.sound;
+ const sound = action.meta?.sound;
- if (sound && soundCache[sound]) {
+ if (sound && Object.hasOwn(soundCache, sound)) {
play(soundCache[sound]);
}
M app/javascript/mastodon/utils/filters.ts => app/javascript/mastodon/utils/filters.ts +1 -1
@@ 7,7 7,7 @@ export const toServerSideType = (columnType: string) => {
case 'account':
return columnType;
default:
- if (columnType.indexOf('list:') > -1) {
+ if (columnType.includes('list:')) {
return 'home';
} else {
return 'public'; // community, account, hashtag
M app/javascript/mastodon/utils/hashtags.ts => app/javascript/mastodon/utils/hashtags.ts +2 -2
@@ 6,7 6,7 @@ const buildHashtagPatternRegex = () => {
try {
return new RegExp(
`(?:^|[^\\/\\)\\w])#(([${WORD}_][${WORD}${HASHTAG_SEPARATORS}]*[${ALPHA}${HASHTAG_SEPARATORS}][${WORD}${HASHTAG_SEPARATORS}]*[${WORD}_])|([${WORD}_]*[${ALPHA}][${WORD}_]*))`,
- 'iu'
+ 'iu',
);
} catch {
return /(?:^|[^/)\w])#(\w*[a-zA-Z·]\w*)/i;
@@ 17,7 17,7 @@ const buildHashtagRegex = () => {
try {
return new RegExp(
`^(([${WORD}_][${WORD}${HASHTAG_SEPARATORS}]*[${ALPHA}${HASHTAG_SEPARATORS}][${WORD}${HASHTAG_SEPARATORS}]*[${WORD}_])|([${WORD}_]*[${ALPHA}][${WORD}_]*))$`,
- 'iu'
+ 'iu',
);
} catch {
return /^(\w*[a-zA-Z·]\w*)$/i;
M app/javascript/mastodon/utils/numbers.ts => app/javascript/mastodon/utils/numbers.ts +1 -1
@@ 55,7 55,7 @@ export function toShortNumber(sourceNumber: number): ShortNumber {
*/
export function pluralReady(
sourceNumber: number,
- division: DecimalUnits
+ division: DecimalUnits | null,
): number {
if (division == null || division < DECIMAL_UNITS.HUNDRED) {
return sourceNumber;
M app/javascript/mastodon/uuid.ts => app/javascript/mastodon/uuid.ts +1 -2
@@ 4,6 4,5 @@ export function uuid(a?: string): string {
(a as unknown as number) ^
((Math.random() * 16) >> ((a as unknown as number) / 4))
).toString(16)
- : // eslint-disable-next-line @typescript-eslint/restrict-plus-operands
- ('' + 1e7 + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, uuid);
+ : ('' + 1e7 + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, uuid);
}
M app/javascript/styles/fonts/roboto-mono.scss => app/javascript/styles/fonts/roboto-mono.scss +2 -1
@@ 1,6 1,7 @@
@font-face {
font-family: mastodon-font-monospace;
- src: local('Roboto Mono'),
+ src:
+ local('Roboto Mono'),
url('~fonts/roboto-mono/robotomono-regular-webfont.woff2') format('woff2'),
url('~fonts/roboto-mono/robotomono-regular-webfont.woff') format('woff'),
url('~fonts/roboto-mono/robotomono-regular-webfont.ttf') format('truetype'),
M app/javascript/styles/fonts/roboto.scss => app/javascript/styles/fonts/roboto.scss +8 -4
@@ 1,6 1,7 @@
@font-face {
font-family: mastodon-font-sans-serif;
- src: local('Roboto Italic'),
+ src:
+ local('Roboto Italic'),
url('~fonts/roboto/roboto-italic-webfont.woff2') format('woff2'),
url('~fonts/roboto/roboto-italic-webfont.woff') format('woff'),
url('~fonts/roboto/roboto-italic-webfont.ttf') format('truetype'),
@@ 13,7 14,8 @@
@font-face {
font-family: mastodon-font-sans-serif;
- src: local('Roboto Bold'),
+ src:
+ local('Roboto Bold'),
url('~fonts/roboto/roboto-bold-webfont.woff2') format('woff2'),
url('~fonts/roboto/roboto-bold-webfont.woff') format('woff'),
url('~fonts/roboto/roboto-bold-webfont.ttf') format('truetype'),
@@ 26,7 28,8 @@
@font-face {
font-family: mastodon-font-sans-serif;
- src: local('Roboto Medium'),
+ src:
+ local('Roboto Medium'),
url('~fonts/roboto/roboto-medium-webfont.woff2') format('woff2'),
url('~fonts/roboto/roboto-medium-webfont.woff') format('woff'),
url('~fonts/roboto/roboto-medium-webfont.ttf') format('truetype'),
@@ 39,7 42,8 @@
@font-face {
font-family: mastodon-font-sans-serif;
- src: local('Roboto'),
+ src:
+ local('Roboto'),
url('~fonts/roboto/roboto-regular-webfont.woff2') format('woff2'),
url('~fonts/roboto/roboto-regular-webfont.woff') format('woff'),
url('~fonts/roboto/roboto-regular-webfont.ttf') format('truetype'),
M app/javascript/styles/mastodon/basics.scss => app/javascript/styles/mastodon/basics.scss +13 -3
@@ 31,9 31,19 @@ body {
// Droid Sans => Older Androids (<4.0)
// Helvetica Neue => Older macOS <10.11
// $font-sans-serif => web-font (Roboto) fallback and newer Androids (>=4.0)
- font-family: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
- Oxygen, Ubuntu, Cantarell, 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
- $font-sans-serif, sans-serif;
+ font-family:
+ system-ui,
+ -apple-system,
+ BlinkMacSystemFont,
+ 'Segoe UI',
+ Oxygen,
+ Ubuntu,
+ Cantarell,
+ 'Fira Sans',
+ 'Droid Sans',
+ 'Helvetica Neue',
+ $font-sans-serif,
+ sans-serif;
}
&.app-body {
M app/javascript/styles/mastodon/components.scss => app/javascript/styles/mastodon/components.scss +15 -6
@@ 747,7 747,9 @@ body > [data-popper-placement] {
}
.no-reduce-motion .spoiler-input {
- transition: height 0.4s ease, opacity 0.4s ease;
+ transition:
+ height 0.4s ease,
+ opacity 0.4s ease;
}
.sign-in-banner {
@@ 3954,7 3956,9 @@ a.status-card.compact:hover {
overflow-y: auto;
border-bottom: 1px solid lighten($ui-base-color, 8%);
color: $darker-text-color;
- transition: max-height 150ms ease-in-out, opacity 300ms linear;
+ transition:
+ max-height 150ms ease-in-out,
+ opacity 300ms linear;
opacity: 1;
z-index: 1;
position: relative;
@@ 6935,7 6939,8 @@ noscript {
.navigation-bar {
& > a:first-child {
will-change: margin-top, margin-inline-start, margin-inline-end, width;
- transition: margin-top $duration $delay,
+ transition:
+ margin-top $duration $delay,
margin-inline-start $duration ($duration + $delay),
margin-inline-end $duration ($duration + $delay);
}
@@ 6948,12 6953,15 @@ noscript {
.navigation-bar__actions {
& > .icon-button.close {
will-change: opacity transform;
- transition: opacity $duration * 0.5 $delay, transform $duration $delay;
+ transition:
+ opacity $duration * 0.5 $delay,
+ transform $duration $delay;
}
& > .compose__action-bar .icon-button {
will-change: opacity transform;
- transition: opacity $duration * 0.5 $delay + $duration * 0.5,
+ transition:
+ opacity $duration * 0.5 $delay + $duration * 0.5,
transform $duration $delay;
}
}
@@ 9094,7 9102,8 @@ noscript {
backdrop-filter: blur(8px);
border: 1px solid rgba(lighten($classic-base-color, 4%), 0.85);
border-radius: 8px;
- box-shadow: 0 10px 15px -3px rgba($base-shadow-color, 0.25),
+ box-shadow:
+ 0 10px 15px -3px rgba($base-shadow-color, 0.25),
0 4px 6px -4px rgba($base-shadow-color, 0.25);
cursor: default;
transition: 0.5s cubic-bezier(0.89, 0.01, 0.5, 1.1);
M app/javascript/styles/mastodon/statuses.scss => app/javascript/styles/mastodon/statuses.scss +12 -0
@@ 77,6 77,18 @@
}
}
+.button.logo-button svg {
+ width: 20px;
+ height: auto;
+ vertical-align: middle;
+ margin-inline-end: 5px;
+ fill: $primary-text-color;
+
+ @media screen and (max-width: $no-gap-breakpoint) {
+ display: none;
+ }
+}
+
.embed {
.status__content[data-spoiler='folded'] {
.e-content {
M app/lib/connection_pool/shared_connection_pool.rb => app/lib/connection_pool/shared_connection_pool.rb +1 -1
@@ 1,7 1,7 @@
# frozen_string_literal: true
require 'connection_pool'
-require_relative './shared_timed_stack'
+require_relative 'shared_timed_stack'
class ConnectionPool::SharedConnectionPool < ConnectionPool
def initialize(options = {}, &block)
M app/lib/inline_renderer.rb => app/lib/inline_renderer.rb +1 -1
@@ 37,7 37,7 @@ class InlineRenderer
private
def preload_associations_for_status
- ActiveRecord::Associations::Preloader.new.preload(@object, {
+ ActiveRecord::Associations::Preloader.new(records: @object, associations: {
active_mentions: :account,
reblog: {
M app/lib/request_pool.rb => app/lib/request_pool.rb +1 -1
@@ 1,6 1,6 @@
# frozen_string_literal: true
-require_relative './connection_pool/shared_connection_pool'
+require_relative 'connection_pool/shared_connection_pool'
class RequestPool
def self.current
M => +1 -1
@@ 16,7 16,7 @@ class RSS::Channel < RSS::Element
end
def last_build_date(date)
append_element('lastBuildDate', date.to_formatted_s(:rfc822))
append_element('lastBuildDate', date.to_fs(:rfc822))
end
def image(url, title, link)
M => +1 -1
@@ 20,7 20,7 @@ class RSS::Item < RSS::Element
end
def pub_date(date)
append_element('pubDate', date.to_formatted_s(:rfc822))
append_element('pubDate', date.to_fs(:rfc822))
end
def description(str)
M app/models/announcement.rb => app/models/announcement.rb +1 -1
@@ 80,7 80,7 @@ class Announcement < ApplicationRecord
end
end
- ActiveRecord::Associations::Preloader.new.preload(records, :custom_emoji)
+ ActiveRecord::Associations::Preloader.new(records: records, associations: :custom_emoji)
records
end
M app/models/concerns/account_search.rb => app/models/concerns/account_search.rb +2 -2
@@ 122,7 122,7 @@ module AccountSearch
tsquery = generate_query_for_search(terms)
find_by_sql([BASIC_SEARCH_SQL, { limit: limit, offset: offset, tsquery: tsquery }]).tap do |records|
- ActiveRecord::Associations::Preloader.new.preload(records, :account_stat)
+ ActiveRecord::Associations::Preloader.new(records: records, associations: :account_stat)
end
end
@@ 131,7 131,7 @@ module AccountSearch
sql_template = following ? ADVANCED_SEARCH_WITH_FOLLOWING : ADVANCED_SEARCH_WITHOUT_FOLLOWING
find_by_sql([sql_template, { id: account.id, limit: limit, offset: offset, tsquery: tsquery }]).tap do |records|
- ActiveRecord::Associations::Preloader.new.preload(records, :account_stat)
+ ActiveRecord::Associations::Preloader.new(records: records, associations: :account_stat)
end
end
M app/models/concerns/status_safe_reblog_insert.rb => app/models/concerns/status_safe_reblog_insert.rb +24 -24
@@ 4,41 4,41 @@ module StatusSafeReblogInsert
extend ActiveSupport::Concern
class_methods do
- # This is a hack to ensure that no reblogs of discarded statuses are created,
- # as this cannot be enforced through database constraints the same way we do
- # for reblogs of deleted statuses.
+ # This patch overwrites the built-in ActiveRecord `_insert_record` method to
+ # ensure that no reblogs of discarded statuses are created, as this cannot be
+ # enforced through DB constraints the same way as reblogs of deleted statuses
#
- # To achieve this, we redefine the internal method responsible for issuing
- # the "INSERT" statement and replace the "INSERT INTO ... VALUES ..." query
- # with an "INSERT INTO ... SELECT ..." query with a "WHERE deleted_at IS NULL"
- # clause on the reblogged status to ensure consistency at the database level.
+ # We redefine the internal method responsible for issuing the `INSERT`
+ # statement and replace the `INSERT INTO ... VALUES ...` query with an `INSERT
+ # INTO ... SELECT ...` query with a `WHERE deleted_at IS NULL` clause on the
+ # reblogged status to ensure consistency at the database level.
#
- # Otherwise, the code is kept as close as possible to ActiveRecord::Persistence
- # code, and actually calls it if we are not handling a reblog.
+ # The code is kept similar to ActiveRecord::Persistence code and calls it
+ # directly when we are not handling a reblog.
def _insert_record(values)
- return super unless values.is_a?(Hash) && values['reblog_of_id'].present?
+ return super unless values.is_a?(Hash) && values['reblog_of_id']&.value.present?
primary_key = self.primary_key
primary_key_value = nil
- if primary_key
- primary_key_value = values[primary_key]
-
- if !primary_key_value && prefetch_primary_key?
+ if prefetch_primary_key? && primary_key
+ values[primary_key] ||= begin
primary_key_value = next_sequence_value
- values[primary_key] = primary_key_value
+ _default_attributes[primary_key].with_cast_value(primary_key_value)
end
end
- # The following line is where we differ from stock ActiveRecord implementation
+ # The following line departs from stock ActiveRecord
+ # Original code was:
+ # im.insert(values.transform_keys { |name| arel_table[name] })
+ # Instead, we use a custom builder when a reblog is happening:
im = _compile_reblog_insert(values)
- # Since we are using SELECT instead of VALUES, a non-error `nil` return is possible.
- # For our purposes, it's equivalent to a foreign key constraint violation
- result = connection.insert(im, "#{self} Create", primary_key || false, primary_key_value)
- raise ActiveRecord::InvalidForeignKey, "(reblog_of_id)=(#{values['reblog_of_id']}) is not present in table \"statuses\"" if result.nil?
-
- result
+ connection.insert(im, "#{self} Create", primary_key || false, primary_key_value).tap do |result|
+ # Since we are using SELECT instead of VALUES, a non-error `nil` return is possible.
+ # For our purposes, it's equivalent to a foreign key constraint violation
+ raise ActiveRecord::InvalidForeignKey, "(reblog_of_id)=(#{values['reblog_of_id'].value}) is not present in table \"statuses\"" if result.nil?
+ end
end
def _compile_reblog_insert(values)
@@ 54,9 54,9 @@ module StatusSafeReblogInsert
binds = []
reblog_bind = nil
- values.each do |name, value|
+ values.each do |name, attribute|
attr = arel_table[name]
- bind = predicate_builder.build_bind_attribute(attr.name, value)
+ bind = predicate_builder.build_bind_attribute(attr.name, attribute.value)
im.columns << attr
binds << bind
M app/models/notification.rb => app/models/notification.rb +1 -1
@@ 111,7 111,7 @@ class Notification < ApplicationRecord
# Instead of using the usual `includes`, manually preload each type.
# If polymorphic associations are loaded with the usual `includes`, other types of associations will be loaded more.
- ActiveRecord::Associations::Preloader.new.preload(grouped_notifications, associations)
+ ActiveRecord::Associations::Preloader.new(records: grouped_notifications, associations: associations)
end
unique_target_statuses = notifications.filter_map(&:target_status).uniq
M app/serializers/initial_state_serializer.rb => app/serializers/initial_state_serializer.rb +4 -1
@@ 100,7 100,10 @@ class InitialStateSerializer < ActiveModel::Serializer
def accounts
store = {}
- ActiveRecord::Associations::Preloader.new.preload([object.current_account, object.admin, object.owner, object.disabled_account, object.moved_to_account].compact, [:account_stat, :user, { moved_to_account: [:account_stat, :user] }])
+ ActiveRecord::Associations::Preloader.new(
+ records: [object.current_account, object.admin, object.owner, object.disabled_account, object.moved_to_account].compact,
+ associations: [:account_stat, :user, { moved_to_account: [:account_stat, :user] }]
+ )
store[object.current_account.id.to_s] = ActiveModelSerializers::SerializableResource.new(object.current_account, serializer: REST::AccountSerializer) if object.current_account
store[object.admin.id.to_s] = ActiveModelSerializers::SerializableResource.new(object.admin, serializer: REST::AccountSerializer) if object.admin
M app/serializers/web/notification_serializer.rb => app/serializers/web/notification_serializer.rb +1 -1
@@ 33,7 33,7 @@ class Web::NotificationSerializer < ActiveModel::Serializer
end
def body
- str = strip_tags(object.target_status&.spoiler_text&.presence || object.target_status&.text || object.from_account.note)
+ str = strip_tags(object.target_status&.spoiler_text.presence || object.target_status&.text || object.from_account.note)
truncate(HTMLEntities.new.decode(str.to_str), length: 140, escape: false) # Do not encode entities, since this value will not be used in HTML
end
end
M app/services/account_search_service.rb => app/services/account_search_service.rb +1 -1
@@ 93,7 93,7 @@ class AccountSearchService < BaseService
.objects
.compact
- ActiveRecord::Associations::Preloader.new.preload(records, :account_stat)
+ ActiveRecord::Associations::Preloader.new(records: records, associations: :account_stat)
records
rescue Faraday::ConnectionFailed, Parslet::ParseFailed
M app/services/batched_remove_status_service.rb => app/services/batched_remove_status_service.rb +8 -2
@@ 8,7 8,10 @@ class BatchedRemoveStatusService < BaseService
# @param [Hash] options
# @option [Boolean] :skip_side_effects Do not modify feeds and send updates to streaming API
def call(statuses, **options)
- ActiveRecord::Associations::Preloader.new.preload(statuses, options[:skip_side_effects] ? :reblogs : [:account, :tags, reblogs: :account])
+ ActiveRecord::Associations::Preloader.new(
+ records: statuses,
+ associations: options[:skip_side_effects] ? :reblogs : [:account, :tags, reblogs: :account]
+ )
statuses_and_reblogs = statuses.flat_map { |status| [status] + status.reblogs }
@@ 17,7 20,10 @@ class BatchedRemoveStatusService < BaseService
# rely on direct visibility statuses being relatively rare.
statuses_with_account_conversations = statuses.select(&:direct_visibility?)
- ActiveRecord::Associations::Preloader.new.preload(statuses_with_account_conversations, [mentions: :account])
+ ActiveRecord::Associations::Preloader.new(
+ records: statuses_with_account_conversations,
+ associations: [mentions: :account]
+ )
statuses_with_account_conversations.each do |status|
status.unlink_from_conversations!
M app/views/admin/trends/links/preview_card_providers/index.html.haml => app/views/admin/trends/links/preview_card_providers/index.html.haml +1 -1
@@ 26,7 26,7 @@
- Trends::PreviewCardProviderFilter::KEYS.each do |key|
= hidden_field_tag key, params[key] if params[key].present?
- .batch-table.optional
+ .batch-table
.batch-table__toolbar
%label.batch-table__toolbar__select.batch-checkbox-all
= check_box_tag :batch_checkbox_all, nil, false
M app/workers/feed_insert_worker.rb => app/workers/feed_insert_worker.rb +3 -2
@@ 2,9 2,10 @@
class FeedInsertWorker
include Sidekiq::Worker
+ include DatabaseHelper
def perform(status_id, id, type = 'home', options = {})
- ApplicationRecord.connected_to(role: :primary) do
+ with_primary do
@type = type.to_sym
@status = Status.find(status_id)
@options = options.symbolize_keys
@@ 20,7 21,7 @@ class FeedInsertWorker
end
end
- ApplicationRecord.connected_to(role: :read, prevent_writes: true) do
+ with_read_replica do
check_and_insert
end
rescue ActiveRecord::RecordNotFound
M app/workers/merge_worker.rb => app/workers/merge_worker.rb +3 -2
@@ 3,14 3,15 @@
class MergeWorker
include Sidekiq::Worker
include Redisable
+ include DatabaseHelper
def perform(from_account_id, into_account_id)
- ApplicationRecord.connected_to(role: :primary) do
+ with_primary do
@from_account = Account.find(from_account_id)
@into_account = Account.find(into_account_id)
end
- ApplicationRecord.connected_to(role: :read, prevent_writes: true) do
+ with_read_replica do
FeedManager.instance.merge_into_home(@from_account, @into_account)
end
rescue ActiveRecord::RecordNotFound
M app/workers/regeneration_worker.rb => app/workers/regeneration_worker.rb +3 -2
@@ 2,15 2,16 @@
class RegenerationWorker
include Sidekiq::Worker
+ include DatabaseHelper
sidekiq_options lock: :until_executed
def perform(account_id, _ = :home)
- ApplicationRecord.connected_to(role: :primary) do
+ with_primary do
@account = Account.find(account_id)
end
- ApplicationRecord.connected_to(role: :read, prevent_writes: true) do
+ with_read_replica do
PrecomputeFeedService.new.call(@account)
end
rescue ActiveRecord::RecordNotFound
M app/workers/unmerge_worker.rb => app/workers/unmerge_worker.rb +3 -2
@@ 2,16 2,17 @@
class UnmergeWorker
include Sidekiq::Worker
+ include DatabaseHelper
sidekiq_options queue: 'pull'
def perform(from_account_id, into_account_id)
- ApplicationRecord.connected_to(role: :primary) do
+ with_primary do
@from_account = Account.find(from_account_id)
@into_account = Account.find(into_account_id)
end
- ApplicationRecord.connected_to(role: :read, prevent_writes: true) do
+ with_read_replica do
FeedManager.instance.unmerge_from_home(@from_account, @into_account)
end
rescue ActiveRecord::RecordNotFound
M config/application.rb => config/application.rb +9 -1
@@ 60,7 60,15 @@ require_relative '../lib/mastodon/redis_config'
module Mastodon
class Application < Rails::Application
# Initialize configuration defaults for originally generated Rails version.
- config.load_defaults 6.1
+ config.load_defaults 7.0
+
+ # TODO: Release a version which uses the 7.0 defaults as specified above,
+ # but preserves the 6.1 cache format as set below. In a subsequent change,
+ # remove this line setting to 6.1 cache format, and then release another version.
+ # https://guides.rubyonrails.org/upgrading_ruby_on_rails.html#new-activesupport-cache-serialization-format
+ # https://github.com/mastodon/mastodon/pull/24241#discussion_r1162890242
+ config.active_support.cache_format_version = 6.1
+
config.add_autoload_paths_to_load_path = false
# Settings in config/environments/* take precedence over those specified here.
M config/environments/development.rb => config/environments/development.rb +29 -9
@@ 1,10 1,12 @@
# frozen_string_literal: true
+require 'active_support/core_ext/integer/time'
+
Rails.application.configure do
# Settings specified here will take precedence over those in config/application.rb.
- # In the development environment your application's code is reloaded on
- # every request. This slows down response time but is perfect for development
+ # In the development environment your application's code is reloaded any time
+ # it changes. This slows down response time but is perfect for development
# since you don't have to restart the web server when you make code changes.
config.cache_classes = false
@@ 14,13 16,22 @@ Rails.application.configure do
# Show full error reports.
config.consider_all_requests_local = true
+ # Enable server timing
+ config.server_timing = true
+
# Enable/disable caching. By default caching is disabled.
# Run rails dev:cache to toggle caching.
if Rails.root.join('tmp', 'caching-dev.txt').exist?
config.action_controller.perform_caching = true
+ config.action_controller.enable_fragment_cache_logging = true
+
config.cache_store = :redis_cache_store, REDIS_CACHE_PARAMS
+ config.public_file_server.headers = {
+ 'Cache-Control' => "public, max-age=#{2.days.to_i}",
+ }
else
config.action_controller.perform_caching = false
+
config.cache_store = :null_store
end
@@ 43,12 54,19 @@ Rails.application.configure do
# Print deprecation notices to the Rails logger.
config.active_support.deprecation = :log
+ # Raise exceptions for disallowed deprecations.
+ config.active_support.disallowed_deprecation = :raise
+
+ # Tell Active Support which deprecation messages to disallow.
+ config.active_support.disallowed_deprecation_warnings = []
+
# Raise an error on page load if there are pending migrations.
config.active_record.migration_error = :page_load
+ # Highlight code that triggered database queries in logs.
+ config.active_record.verbose_query_logs = true
+
# Debug mode disables concatenation and preprocessing of assets.
- # This option may cause significant delays in view rendering with a large
- # number of complex assets.
config.assets.debug = true
# Suppress logger output for asset requests.
@@ 59,12 77,14 @@ Rails.application.configure do
# Raises helpful error messages.
config.assets.raise_runtime_errors = true
- # Raises error for missing translations
- # config.action_view.raise_on_missing_translations = true
+ # Raises error for missing translations.
+ # config.i18n.raise_on_missing_translations = true
+
+ # Annotate rendered view with file names.
+ # config.action_view.annotate_rendered_view_with_filenames = true
- # Use an evented file watcher to asynchronously detect changes in source code,
- # routes, locales, etc. This feature depends on the listen gem.
- # config.file_watcher = ActiveSupport::EventedFileUpdateChecker
+ # Uncomment if you wish to allow Action Cable access from any origin.
+ # config.action_cable.disable_request_forgery_protection = true
config.action_mailer.default_options = { from: 'notifications@localhost' }
M config/environments/production.rb => config/environments/production.rb +27 -4
@@ 1,5 1,7 @@
# frozen_string_literal: true
+require "active_support/core_ext/integer/time"
+
Rails.application.configure do
# Settings specified here will take precedence over those in config/application.rb.
@@ 21,20 23,24 @@ Rails.application.configure do
# or in config/master.key. This key is used to decrypt credentials (and other encrypted files).
# config.require_master_key = true
- ActiveSupport::Logger.new(STDOUT).tap do |logger|
- logger.formatter = config.log_formatter
- config.logger = ActiveSupport::TaggedLogging.new(logger)
- end
+ # Compress CSS using a preprocessor.
+ # config.assets.css_compressor = :sass
# Do not fallback to assets pipeline if a precompiled asset is missed.
config.assets.compile = false
+ # Enable serving of images, stylesheets, and JavaScripts from an asset server.
+ # config.asset_host = "http://assets.example.com"
+
# Specifies the header that your server uses for sending files.
config.action_dispatch.x_sendfile_header = ENV['SENDFILE_HEADER'] if ENV['SENDFILE_HEADER'].present?
+ # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for Apache
+ # config.action_dispatch.x_sendfile_header = "X-Accel-Redirect" # for NGINX
# Allow to specify public IP of reverse proxy if it's needed
config.action_dispatch.trusted_proxies = ENV['TRUSTED_PROXY_IP'].split(/(?:\s*,\s*|\s+)/).map { |item| IPAddr.new(item) } if ENV['TRUSTED_PROXY_IP'].present?
+ # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
config.force_ssl = true
config.ssl_options = {
redirect: {
@@ 42,6 48,8 @@ Rails.application.configure do
}
}
+ # Include generic and useful information about system operation, but avoid logging too much
+ # information to avoid inadvertent exposure of personally identifiable information (PII).
# Use the lowest log level to ensure availability of diagnostic information
# when problems arise.
config.log_level = ENV.fetch('RAILS_LOG_LEVEL', 'info').to_sym
@@ 52,6 60,12 @@ Rails.application.configure do
# Use a different cache store in production.
config.cache_store = :redis_cache_store, REDIS_CACHE_PARAMS
+ # Use a real queuing backend for Active Job (and separate queues per environment).
+ # config.active_job.queue_adapter = :resque
+ # config.active_job.queue_name_prefix = "mastodon_production"
+
+ config.action_mailer.perform_caching = false
+
# Ignore bad email addresses and do not raise email delivery errors.
# Set this to true and configure the email server for immediate delivery to raise delivery errors.
# config.action_mailer.raise_delivery_errors = false
@@ 75,6 89,15 @@ Rails.application.configure do
end
end
+ # Use a different logger for distributed setups.
+ # require "syslog/logger"
+ # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new "app-name")
+
+ ActiveSupport::Logger.new(STDOUT).tap do |logger|
+ logger.formatter = config.log_formatter
+ config.logger = ActiveSupport::TaggedLogging.new(logger)
+ end
+
# Do not dump schema after migrations.
config.active_record.dump_schema_after_migration = false
M config/environments/test.rb => config/environments/test.rb +25 -14
@@ 1,27 1,28 @@
# frozen_string_literal: true
+require 'active_support/core_ext/integer/time'
+
+# The test environment is used exclusively to run your application's
+# test suite. You never need to work with it otherwise. Remember that
+# your test database is "scratch space" for the test suite and is wiped
+# and recreated between test runs. Don't rely on the data there!
+
Rails.application.configure do
# Settings specified here will take precedence over those in config/application.rb.
- # The test environment is used exclusively to run your application's
- # test suite. You never need to work with it otherwise. Remember that
- # your test database is "scratch space" for the test suite and is wiped
- # and recreated between test runs. Don't rely on the data there!
+ # Turn false under Spring and add config.action_view.cache_template_loading = true.
config.cache_classes = true
- # Do not eager load code on boot. This avoids loading your whole application
- # just for the purpose of running a single test. If you are using a tool that
- # preloads Rails for running tests, you may have to set it to true.
- config.eager_load = false
+ # Eager loading loads your whole application. When running a single test locally,
+ # this probably isn't necessary. It's a good idea to do in a continuous integration
+ # system, or in some way before deploying your code.
+ config.eager_load = ENV['CI'].present?
- config.assets.digest = false
+ config.assets_digest = false
# Show full error reports and disable caching.
config.consider_all_requests_local = true
config.action_controller.perform_caching = false
-
- # The default store, file_store is shared by processes parallelly executed
- # and should not be used.
config.cache_store = :memory_store
# Raise exceptions instead of rendering exception templates.
@@ 29,6 30,7 @@ Rails.application.configure do
# Disable request forgery protection in test environment.
config.action_controller.allow_forgery_protection = false
+
config.action_mailer.perform_caching = false
config.action_mailer.default_options = { from: 'notifications@localhost' }
@@ 48,8 50,8 @@ Rails.application.configure do
config.x.vapid_private_key = vapid_key.private_key
config.x.vapid_public_key = vapid_key.public_key
- # Raises error for missing translations
- # config.action_view.raise_on_missing_translations = true
+ # Raise exceptions for disallowed deprecations.
+ config.active_support.disallowed_deprecation = :raise
config.i18n.default_locale = :en
config.i18n.fallbacks = true
@@ 59,6 61,15 @@ Rails.application.configure do
# Ref: https://github.com/mastodon/mastodon/issues/23644
10.times { |i| Status.allocate.instance_variable_set(:"@ivar_#{i}", nil) }
end
+
+ # Tell Active Support which deprecation messages to disallow.
+ config.active_support.disallowed_deprecation_warnings = []
+
+ # Raises error for missing translations.
+ # config.i18n.raise_on_missing_translations = true
+
+ # Annotate rendered view with file names.
+ # config.action_view.annotate_rendered_view_with_filenames = true
end
Paperclip::Attachment.default_options[:path] = Rails.root.join('spec', 'test_files', ':class', ':id_partition', ':style.:extension')
M config/initializers/assets.rb => config/initializers/assets.rb +5 -4
@@ 5,11 5,12 @@
# Version of your assets, change this if you want to expire all your assets.
Rails.application.config.assets.version = '1.0'
-# Add additional assets to the asset load path
-# Rails.application.config.assets.paths << 'node_modules'
+# Add additional assets to the asset load path.
+# Rails.application.config.assets.paths << Emoji.images_path
# Precompile additional assets.
-# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
-# Rails.application.config.assets.precompile += %w()
+# application.js, application.css, and all non-JS/CSS in the app/assets
+# folder are already added.
+# Rails.application.config.assets.precompile += %w( admin.js admin.css )
Rails.application.config.assets.initialize_on_precompile = true
A config/initializers/cookie_rotator.rb => config/initializers/cookie_rotator.rb +21 -0
@@ 0,0 1,21 @@
+# frozen_string_literal: true
+
+Rails.application.config.after_initialize do
+ Rails.application.config.action_dispatch.cookies_rotations.tap do |cookies|
+ authenticated_encrypted_cookie_salt = Rails.application.config.action_dispatch.authenticated_encrypted_cookie_salt
+ signed_cookie_salt = Rails.application.config.action_dispatch.signed_cookie_salt
+
+ secret_key_base = Rails.application.secret_key_base
+
+ key_generator = ActiveSupport::KeyGenerator.new(
+ secret_key_base, iterations: 1000, hash_digest_class: OpenSSL::Digest::SHA1
+ )
+ key_len = ActiveSupport::MessageEncryptor.key_len
+
+ old_encrypted_secret = key_generator.generate_key(authenticated_encrypted_cookie_salt, key_len)
+ old_signed_secret = key_generator.generate_key(signed_cookie_salt)
+
+ cookies.rotate :encrypted, old_encrypted_secret
+ cookies.rotate :signed, old_signed_secret
+ end
+end
M config/initializers/filter_parameter_logging.rb => config/initializers/filter_parameter_logging.rb +6 -2
@@ 2,5 2,9 @@
# Be sure to restart your server when you modify this file.
-# Configure sensitive parameters which will be filtered from the log file.
-Rails.application.config.filter_parameters += [:password, :private_key, :public_key, :otp_attempt]
+# Configure parameters to be filtered from the log file. Use this to limit dissemination of
+# sensitive information. See the ActiveSupport::ParameterFilter documentation for supported
+# notations and behaviors.
+Rails.application.config.filter_parameters += [
+ :passw, :secret, :token, :_key, :crypt, :salt, :certificate, :otp, :ssn
+]
A config/initializers/new_framework_defaults_7_0.rb => config/initializers/new_framework_defaults_7_0.rb +10 -0
@@ 0,0 1,10 @@
+# frozen_string_literal: true
+
+# TODO
+# The Rails 7.0 framework default here is to set this true. However, we have a
+# location in devise that redirects where we don't have an easy ability to
+# override a method or set a config option, but where the redirect does not
+# provide this option.
+# https://github.com/heartcombo/devise/blob/v4.9.2/app/controllers/devise/confirmations_controller.rb#L28
+# Once a solution is found, this line can be removed.
+Rails.application.config.action_controller.raise_on_open_redirects = false
M db/schema.rb => db/schema.rb +1 -1
@@ 10,7 10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 2023_07_02_151753) do
+ActiveRecord::Schema[6.1].define(version: 2023_07_02_151753) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
M package.json => package.json +5 -5
@@ 44,7 44,7 @@
"@formatjs/intl-pluralrules": "^5.2.2",
"@gamestdio/websocket": "^0.3.2",
"@github/webauthn-json": "^2.1.1",
- "@rails/ujs": "^6.1.7",
+ "@rails/ujs": "^7.0.6",
"@reduxjs/toolkit": "^1.9.5",
"abortcontroller-polyfill": "^1.7.5",
"atrament": "0.2.4",
@@ 184,8 184,8 @@
"@types/uuid": "^9.0.0",
"@types/webpack": "^4.41.33",
"@types/yargs": "^17.0.24",
- "@typescript-eslint/eslint-plugin": "^5.59.8",
- "@typescript-eslint/parser": "^5.59.8",
+ "@typescript-eslint/eslint-plugin": "^6.0.0",
+ "@typescript-eslint/parser": "^6.0.0",
"babel-jest": "^29.5.0",
"eslint": "^8.41.0",
"eslint-config-prettier": "^8.8.0",
@@ 194,7 194,7 @@
"eslint-plugin-import": "~2.27.5",
"eslint-plugin-jsdoc": "^46.1.0",
"eslint-plugin-jsx-a11y": "~6.7.1",
- "eslint-plugin-prettier": "^4.2.1",
+ "eslint-plugin-prettier": "^5.0.0",
"eslint-plugin-promise": "~6.1.1",
"eslint-plugin-react": "~7.32.2",
"eslint-plugin-react-hooks": "^4.6.0",
@@ 202,7 202,7 @@
"jest": "^29.5.0",
"jest-environment-jsdom": "^29.5.0",
"lint-staged": "^13.2.2",
- "prettier": "^2.8.8",
+ "prettier": "^3.0.0",
"react-test-renderer": "^18.2.0",
"stylelint": "^15.10.1",
"stylelint-config-standard-scss": "^10.0.0",
M yarn.lock => yarn.lock +123 -106
@@ 1245,14 1245,14 @@
esquery "^1.5.0"
jsdoc-type-pratt-parser "~4.0.0"
-"@eslint-community/eslint-utils@^4.2.0":
+"@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.3.0":
version "4.4.0"
resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59"
integrity sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==
dependencies:
eslint-visitor-keys "^3.3.0"
-"@eslint-community/regexpp@^4.4.0":
+"@eslint-community/regexpp@^4.4.0", "@eslint-community/regexpp@^4.5.0":
version "4.5.1"
resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.5.1.tgz#cdd35dce4fa1a89a4fd42b1599eb35b3af408884"
integrity sha512-Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ==
@@ 1754,10 1754,10 @@
resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.8.tgz#6b79032e760a0899cd4204710beede972a3a185f"
integrity sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==
-"@rails/ujs@^6.1.7":
- version "6.1.7"
- resolved "https://registry.yarnpkg.com/@rails/ujs/-/ujs-6.1.7.tgz#b09dc5b2105dd267e8374c47e4490240451dc7f6"
- integrity sha512-0e7WQ4LE/+LEfW2zfAw9ppsB6A8RmxbdAUPAF++UT80epY+7emuQDkKXmaK0a9lp6An50RvzezI0cIQjp1A58w==
+"@rails/ujs@^7.0.6":
+ version "7.0.6"
+ resolved "https://registry.yarnpkg.com/@rails/ujs/-/ujs-7.0.6.tgz#fd8937c92335f3da9495e07292511ad5f7547a6a"
+ integrity sha512-s5v3AC6AywOIFMz0RIMW83Xc8FPIvKMkP3ZHFlM4ISNkhdUwP9HdhVtxxo6z3dIhe9vI0Our2A8kN/QpUV02Qg==
"@redis/bloom@1.2.0":
version "1.2.0"
@@ 2115,7 2115,7 @@
"@types/tough-cookie" "*"
parse5 "^7.0.0"
-"@types/json-schema@*", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
+"@types/json-schema@*", "@types/json-schema@^7.0.11", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8":
version "7.0.12"
resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.12.tgz#d70faba7039d5fca54c83c7dbab41051d2b6f6cb"
integrity sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==
@@ 2468,59 2468,63 @@
dependencies:
"@types/yargs-parser" "*"
-"@typescript-eslint/eslint-plugin@^5.59.8":
- version "5.59.11"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.11.tgz#8d466aa21abea4c3f37129997b198d141f09e76f"
- integrity sha512-XxuOfTkCUiOSyBWIvHlUraLw/JT/6Io1365RO6ZuI88STKMavJZPNMU0lFcUTeQXEhHiv64CbxYxBNoDVSmghg==
- dependencies:
- "@eslint-community/regexpp" "^4.4.0"
- "@typescript-eslint/scope-manager" "5.59.11"
- "@typescript-eslint/type-utils" "5.59.11"
- "@typescript-eslint/utils" "5.59.11"
+"@typescript-eslint/eslint-plugin@^6.0.0":
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.0.0.tgz#19ff4f1cab8d6f8c2c1825150f7a840bc5d9bdc4"
+ integrity sha512-xuv6ghKGoiq856Bww/yVYnXGsKa588kY3M0XK7uUW/3fJNNULKRfZfSBkMTSpqGG/8ZCXCadfh8G/z/B4aqS/A==
+ dependencies:
+ "@eslint-community/regexpp" "^4.5.0"
+ "@typescript-eslint/scope-manager" "6.0.0"
+ "@typescript-eslint/type-utils" "6.0.0"
+ "@typescript-eslint/utils" "6.0.0"
+ "@typescript-eslint/visitor-keys" "6.0.0"
debug "^4.3.4"
grapheme-splitter "^1.0.4"
- ignore "^5.2.0"
+ graphemer "^1.4.0"
+ ignore "^5.2.4"
+ natural-compare "^1.4.0"
natural-compare-lite "^1.4.0"
- semver "^7.3.7"
- tsutils "^3.21.0"
+ semver "^7.5.0"
+ ts-api-utils "^1.0.1"
-"@typescript-eslint/parser@^5.59.8":
- version "5.59.11"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.59.11.tgz#af7d4b7110e3068ce0b97550736de455e4250103"
- integrity sha512-s9ZF3M+Nym6CAZEkJJeO2TFHHDsKAM3ecNkLuH4i4s8/RCPnF5JRip2GyviYkeEAcwGMJxkqG9h2dAsnA1nZpA==
+"@typescript-eslint/parser@^6.0.0":
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.0.0.tgz#46b2600fd1f67e62fc00a28093a75f41bf7effc4"
+ integrity sha512-TNaufYSPrr1U8n+3xN+Yp9g31vQDJqhXzzPSHfQDLcaO4tU+mCfODPxCwf4H530zo7aUBE3QIdxCXamEnG04Tg==
dependencies:
- "@typescript-eslint/scope-manager" "5.59.11"
- "@typescript-eslint/types" "5.59.11"
- "@typescript-eslint/typescript-estree" "5.59.11"
+ "@typescript-eslint/scope-manager" "6.0.0"
+ "@typescript-eslint/types" "6.0.0"
+ "@typescript-eslint/typescript-estree" "6.0.0"
+ "@typescript-eslint/visitor-keys" "6.0.0"
debug "^4.3.4"
-"@typescript-eslint/scope-manager@5.59.11":
- version "5.59.11"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.59.11.tgz#5d131a67a19189c42598af9fb2ea1165252001ce"
- integrity sha512-dHFOsxoLFtrIcSj5h0QoBT/89hxQONwmn3FOQ0GOQcLOOXm+MIrS8zEAhs4tWl5MraxCY3ZJpaXQQdFMc2Tu+Q==
+"@typescript-eslint/scope-manager@6.0.0":
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.0.0.tgz#8ede47a37cb2b7ed82d329000437abd1113b5e11"
+ integrity sha512-o4q0KHlgCZTqjuaZ25nw5W57NeykZT9LiMEG4do/ovwvOcPnDO1BI5BQdCsUkjxFyrCL0cSzLjvIMfR9uo7cWg==
dependencies:
- "@typescript-eslint/types" "5.59.11"
- "@typescript-eslint/visitor-keys" "5.59.11"
+ "@typescript-eslint/types" "6.0.0"
+ "@typescript-eslint/visitor-keys" "6.0.0"
-"@typescript-eslint/type-utils@5.59.11":
- version "5.59.11"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.59.11.tgz#5eb67121808a84cb57d65a15f48f5bdda25f2346"
- integrity sha512-LZqVY8hMiVRF2a7/swmkStMYSoXMFlzL6sXV6U/2gL5cwnLWQgLEG8tjWPpaE4rMIdZ6VKWwcffPlo1jPfk43g==
+"@typescript-eslint/type-utils@6.0.0":
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.0.0.tgz#0478d8a94f05e51da2877cc0500f1b3c27ac7e18"
+ integrity sha512-ah6LJvLgkoZ/pyJ9GAdFkzeuMZ8goV6BH7eC9FPmojrnX9yNCIsfjB+zYcnex28YO3RFvBkV6rMV6WpIqkPvoQ==
dependencies:
- "@typescript-eslint/typescript-estree" "5.59.11"
- "@typescript-eslint/utils" "5.59.11"
+ "@typescript-eslint/typescript-estree" "6.0.0"
+ "@typescript-eslint/utils" "6.0.0"
debug "^4.3.4"
- tsutils "^3.21.0"
+ ts-api-utils "^1.0.1"
"@typescript-eslint/types@5.59.0":
version "5.59.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.59.0.tgz#3fcdac7dbf923ec5251545acdd9f1d42d7c4fe32"
integrity sha512-yR2h1NotF23xFFYKHZs17QJnB51J/s+ud4PYU4MqdZbzeNxpgUr05+dNeCN/bb6raslHvGdd6BFCkVhpPk/ZeA==
-"@typescript-eslint/types@5.59.11":
- version "5.59.11"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.59.11.tgz#1a9018fe3c565ba6969561f2a49f330cf1fe8db1"
- integrity sha512-epoN6R6tkvBYSc+cllrz+c2sOFWkbisJZWkOE+y3xHtvYaOE6Wk6B8e114McRJwFRjGvYdJwLXQH5c9osME/AA==
+"@typescript-eslint/types@6.0.0":
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.0.0.tgz#19795f515f8decbec749c448b0b5fc76d82445a1"
+ integrity sha512-Zk9KDggyZM6tj0AJWYYKgF0yQyrcnievdhG0g5FqyU3Y2DRxJn4yWY21sJC0QKBckbsdKKjYDV2yVrrEvuTgxg==
"@typescript-eslint/typescript-estree@5.59.0":
version "5.59.0"
@@ 2535,32 2539,32 @@
semver "^7.3.7"
tsutils "^3.21.0"
-"@typescript-eslint/typescript-estree@5.59.11":
- version "5.59.11"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.11.tgz#b2caaa31725e17c33970c1197bcd54e3c5f42b9f"
- integrity sha512-YupOpot5hJO0maupJXixi6l5ETdrITxeo5eBOeuV7RSKgYdU3G5cxO49/9WRnJq9EMrB7AuTSLH/bqOsXi7wPA==
+"@typescript-eslint/typescript-estree@6.0.0":
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.0.0.tgz#1e09aab7320e404fb9f83027ea568ac24e372f81"
+ integrity sha512-2zq4O7P6YCQADfmJ5OTDQTP3ktajnXIRrYAtHM9ofto/CJZV3QfJ89GEaM2BNGeSr1KgmBuLhEkz5FBkS2RQhQ==
dependencies:
- "@typescript-eslint/types" "5.59.11"
- "@typescript-eslint/visitor-keys" "5.59.11"
+ "@typescript-eslint/types" "6.0.0"
+ "@typescript-eslint/visitor-keys" "6.0.0"
debug "^4.3.4"
globby "^11.1.0"
is-glob "^4.0.3"
- semver "^7.3.7"
- tsutils "^3.21.0"
+ semver "^7.5.0"
+ ts-api-utils "^1.0.1"
-"@typescript-eslint/utils@5.59.11":
- version "5.59.11"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.59.11.tgz#9dbff49dc80bfdd9289f9f33548f2e8db3c59ba1"
- integrity sha512-didu2rHSOMUdJThLk4aZ1Or8IcO3HzCw/ZvEjTTIfjIrcdd5cvSIwwDy2AOlE7htSNp7QIZ10fLMyRCveesMLg==
+"@typescript-eslint/utils@6.0.0":
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.0.0.tgz#27a16d0d8f2719274a39417b9782f7daa3802db0"
+ integrity sha512-SOr6l4NB6HE4H/ktz0JVVWNXqCJTOo/mHnvIte1ZhBQ0Cvd04x5uKZa3zT6tiodL06zf5xxdK8COiDvPnQ27JQ==
dependencies:
- "@eslint-community/eslint-utils" "^4.2.0"
- "@types/json-schema" "^7.0.9"
+ "@eslint-community/eslint-utils" "^4.3.0"
+ "@types/json-schema" "^7.0.11"
"@types/semver" "^7.3.12"
- "@typescript-eslint/scope-manager" "5.59.11"
- "@typescript-eslint/types" "5.59.11"
- "@typescript-eslint/typescript-estree" "5.59.11"
+ "@typescript-eslint/scope-manager" "6.0.0"
+ "@typescript-eslint/types" "6.0.0"
+ "@typescript-eslint/typescript-estree" "6.0.0"
eslint-scope "^5.1.1"
- semver "^7.3.7"
+ semver "^7.5.0"
"@typescript-eslint/visitor-keys@5.59.0":
version "5.59.0"
@@ 2570,13 2574,13 @@
"@typescript-eslint/types" "5.59.0"
eslint-visitor-keys "^3.3.0"
-"@typescript-eslint/visitor-keys@5.59.11":
- version "5.59.11"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.11.tgz#dca561ddad169dc27d62396d64f45b2d2c3ecc56"
- integrity sha512-KGYniTGG3AMTuKF9QBD7EIrvufkB6O6uX3knP73xbKLMpH+QRPcgnCxjWXSHjMRuOxFLovljqQgQpR0c7GvjoA==
+"@typescript-eslint/visitor-keys@6.0.0":
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.0.0.tgz#0b49026049fbd096d2c00c5e784866bc69532a31"
+ integrity sha512-cvJ63l8c0yXdeT5POHpL0Q1cZoRcmRKFCtSjNGJxPkcP571EfZMcNbzWAc7oK3D1dRzm/V5EwtkANTZxqvuuUA==
dependencies:
- "@typescript-eslint/types" "5.59.11"
- eslint-visitor-keys "^3.3.0"
+ "@typescript-eslint/types" "6.0.0"
+ eslint-visitor-keys "^3.4.1"
"@webassemblyjs/ast@1.9.0":
version "1.9.0"
@@ 4138,9 4142,9 @@ core-js@^2.5.0:
integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
core-js@^3.30.2:
- version "3.31.0"
- resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.31.0.tgz#4471dd33e366c79d8c0977ed2d940821719db344"
- integrity sha512-NIp2TQSGfR6ba5aalZD+ZQ1fSxGhDo/s1w0nx3RYzf2pnJxt7YynxFlFScP6eV7+GZsKO95NSjGxyJsU3DZgeQ==
+ version "3.31.1"
+ resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.31.1.tgz#f2b0eea9be9da0def2c5fece71064a7e5d687653"
+ integrity sha512-2sKLtfq1eFST7l7v62zaqXacPc7uG8ZAya8ogijLhTtaKNcpzpB4TMoTw2Si+8GYKRwFPMMtUT0263QFWFfqyQ==
core-util-is@~1.0.0:
version "1.0.3"
@@ 5145,12 5149,13 @@ eslint-plugin-jsx-a11y@~6.7.1:
object.fromentries "^2.0.6"
semver "^6.3.0"
-eslint-plugin-prettier@^4.2.1:
- version "4.2.1"
- resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-4.2.1.tgz#651cbb88b1dab98bfd42f017a12fa6b2d993f94b"
- integrity sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==
+eslint-plugin-prettier@^5.0.0:
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-5.0.0.tgz#6887780ed95f7708340ec79acfdf60c35b9be57a"
+ integrity sha512-AgaZCVuYDXHUGxj/ZGu1u8H8CYgDY3iG6w5kUFw4AzMVXzB7VvbKgYR4nATIN+OvUrghMbiDLeimVjVY5ilq3w==
dependencies:
prettier-linter-helpers "^1.0.0"
+ synckit "^0.8.5"
eslint-plugin-promise@~6.1.1:
version "6.1.1"
@@ 5908,15 5913,15 @@ glob-parent@^6.0.2:
is-glob "^4.0.3"
glob@^10.2.5, glob@^10.2.6:
- version "10.3.0"
- resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.0.tgz#763d02a894f3cdfc521b10bbbbc8e0309e750cce"
- integrity sha512-AQ1/SB9HH0yCx1jXAT4vmCbTOPe5RQ+kCurjbel5xSCGhebumUv+GJZfa1rEqor3XIViqwSEmlkZCQD43RWrBg==
+ version "10.3.3"
+ resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.3.tgz#8360a4ffdd6ed90df84aa8d52f21f452e86a123b"
+ integrity sha512-92vPiMb/iqpmEgsOoIDvTjc50wf9CCCvMzsi6W0JLPeUKE8TWP1a73PgqSrqy7iAZxaSD1YdzU7QZR5LF51MJw==
dependencies:
foreground-child "^3.1.0"
jackspeak "^2.0.3"
minimatch "^9.0.1"
- minipass "^5.0.0 || ^6.0.2"
- path-scurry "^1.7.0"
+ minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
+ path-scurry "^1.10.1"
glob@^7.0.3, glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
version "7.2.3"
@@ 7845,10 7850,10 @@ lru-cache@^6.0.0:
dependencies:
yallist "^4.0.0"
-lru-cache@^9.1.1:
- version "9.1.2"
- resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-9.1.2.tgz#255fdbc14b75589d6d0e73644ca167a8db506835"
- integrity sha512-ERJq3FOzJTxBbFjZ7iDs+NiK4VI9Wz+RdrrAB8dio1oV+YvdPzUEE4QNiT2VD51DkIbCYRUUzCRkssXCHqSnKQ==
+"lru-cache@^9.1.1 || ^10.0.0":
+ version "10.0.0"
+ resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.0.0.tgz#b9e2a6a72a129d81ab317202d93c7691df727e61"
+ integrity sha512-svTf/fzsKHffP42sujkO/Rjs37BCIsQVRCeNYIm9WN8rgT7ffoUnRtZCqU+6BqcSBdv8gwJeTz8knJpgACeQMw==
lz-string@^1.5.0:
version "1.5.0"
@@ 8109,9 8114,9 @@ minimatch@^5.0.1:
brace-expansion "^2.0.1"
minimatch@^9.0.1:
- version "9.0.2"
- resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.2.tgz#397e387fff22f6795844d00badc903a3d5de7057"
- integrity sha512-PZOT9g5v2ojiTL7r1xF6plNHLtOeTpSlDI007As2NlA2aYBMfVom17yqa6QzhmDP8QOhn7LjHTg7DFCVSSa6yg==
+ version "9.0.3"
+ resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825"
+ integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==
dependencies:
brace-expansion "^2.0.1"
@@ 8162,10 8167,10 @@ minipass@^5.0.0:
resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d"
integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==
-"minipass@^5.0.0 || ^6.0.2":
- version "6.0.2"
- resolved "https://registry.yarnpkg.com/minipass/-/minipass-6.0.2.tgz#542844b6c4ce95b202c0995b0a471f1229de4c81"
- integrity sha512-MzWSV5nYVT7mVyWCwn2o7JH13w2TBRmmSqSRCKzTw+lmft9X4z+3wjvs06Tzijo5z4W/kahUCDpRXTF+ZrmF/w==
+"minipass@^5.0.0 || ^6.0.2 || ^7.0.0":
+ version "7.0.2"
+ resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.0.2.tgz#58a82b7d81c7010da5bd4b2c0c85ac4b4ec5131e"
+ integrity sha512-eL79dXrE1q9dBbDCLg7xfn/vl7MS4F1gvJAgjJrQli/jbQWdUttuVawphqpffoIYfRdq78LHx6GP4bU/EQ2ATA==
minizlib@^2.1.1:
version "2.1.2"
@@ 8780,13 8785,13 @@ path-parse@^1.0.7:
resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
-path-scurry@^1.7.0:
- version "1.9.2"
- resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.9.2.tgz#90f9d296ac5e37e608028e28a447b11d385b3f63"
- integrity sha512-qSDLy2aGFPm8i4rsbHd4MNyTcrzHFsLQykrtbuGRknZZCBBVXSv2tSCDN2Cg6Rt/GFRw8GoW9y9Ecw5rIPG1sg==
+path-scurry@^1.10.1:
+ version "1.10.1"
+ resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.10.1.tgz#9ba6bf5aa8500fe9fd67df4f0d9483b2b0bfc698"
+ integrity sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==
dependencies:
- lru-cache "^9.1.1"
- minipass "^5.0.0 || ^6.0.2"
+ lru-cache "^9.1.1 || ^10.0.0"
+ minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
path-to-regexp@0.1.7:
version "0.1.7"
@@ 9246,9 9251,9 @@ postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0:
integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
postcss@^8.2.15, postcss@^8.4.24:
- version "8.4.24"
- resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.24.tgz#f714dba9b2284be3cc07dbd2fc57ee4dc972d2df"
- integrity sha512-M0RzbcI0sO/XJNucsGjvWU9ERWxb/ytp1w6dKtxTKgixdtQDq4rmx/g8W1hnaheq9jgwL/oyEdH5Bc4WwJKMqg==
+ version "8.4.25"
+ resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.25.tgz#4a133f5e379eda7f61e906c3b1aaa9b81292726f"
+ integrity sha512-7taJ/8t2av0Z+sQEvNzCkpDynl0tX3uJMCODi6nT3PfASC7dYCWV9aQ+uiCf+KBD4SEFcu+GvJdGdwzQ6OSjCw==
dependencies:
nanoid "^3.3.6"
picocolors "^1.0.0"
@@ 9320,10 9325,10 @@ prettier-linter-helpers@^1.0.0:
dependencies:
fast-diff "^1.1.2"
-prettier@^2.8.8:
- version "2.8.8"
- resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da"
- integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==
+prettier@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.0.0.tgz#e7b19f691245a21d618c68bc54dc06122f6105ae"
+ integrity sha512-zBf5eHpwHOGPC47h0zrPyNn+eAEIdEzfywMoYn2XPi0P44Zp0tSq64rq0xAREh4auw2cJZHo9QUob+NqCQky4g==
pretty-bytes@^5.3.0, pretty-bytes@^5.4.1:
version "5.6.0"
@@ 9759,9 9764,9 @@ react-test-renderer@^18.2.0:
scheduler "^0.23.0"
react-textarea-autosize@*, react-textarea-autosize@^8.4.1:
- version "8.5.0"
- resolved "https://registry.yarnpkg.com/react-textarea-autosize/-/react-textarea-autosize-8.5.0.tgz#bb0f7faf9849850f1c20b6e7fac0309d4b92f87b"
- integrity sha512-cp488su3U9RygmHmGpJp0KEt0i/+57KCK33XVPH+50swVRBhIZYh0fGduz2YLKXwl9vSKBZ9HUXcg9PQXUXqIw==
+ version "8.5.2"
+ resolved "https://registry.yarnpkg.com/react-textarea-autosize/-/react-textarea-autosize-8.5.2.tgz#6421df2b5b50b9ca8c5e96fd31be688ea7fa2f9d"
+ integrity sha512-uOkyjkEl0ByEK21eCJMHDGBAAd/BoFQBawYK5XItjAmCTeSbjxghd8qnt7nzsLYzidjnoObu6M26xts0YGKsGg==
dependencies:
"@babel/runtime" "^7.20.13"
use-composed-ref "^1.3.0"
@@ 10327,6 10332,13 @@ semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.5.1:
dependencies:
lru-cache "^6.0.0"
+semver@^7.5.0:
+ version "7.5.4"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
+ integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
+ dependencies:
+ lru-cache "^6.0.0"
+
send@0.18.0:
version "0.18.0"
resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be"
@@ 11418,6 11430,11 @@ trim-newlines@^4.0.2:
resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-4.1.1.tgz#28c88deb50ed10c7ba6dc2474421904a00139125"
integrity sha512-jRKj0n0jXWo6kh62nA5TEh3+4igKDXLvzBJcPpiizP7oOolUrYIxmVBG9TOtHYFHoddUk6YvAkGeGoSVTXfQXQ==
+ts-api-utils@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.0.1.tgz#8144e811d44c749cd65b2da305a032510774452d"
+ integrity sha512-lC/RGlPmwdrIBFTX59wwNzqh7aR2otPNPR/5brHZm/XKFYKsfqxihXUe9pU3JI+3vGkl+vyCoNNnPhJn3aLK1A==
+
tsconfig-paths@^3.14.1:
version "3.14.2"
resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz#6e32f1f79412decd261f92d633a9dc1cfa99f088"