diff --git a/app/javascript/mastodon/features/ui/components/navigation_panel.jsx b/app/javascript/mastodon/features/ui/components/navigation_panel.jsx
index da82462f9c..95b763e4db 100644
--- a/app/javascript/mastodon/features/ui/components/navigation_panel.jsx
+++ b/app/javascript/mastodon/features/ui/components/navigation_panel.jsx
@@ -7,7 +7,8 @@ import { Link } from 'react-router-dom';
import { WordmarkLogo } from 'mastodon/components/logo';
import NavigationPortal from 'mastodon/components/navigation_portal';
-import { timelinePreview, showTrends } from 'mastodon/initial_state';
+import { timelinePreview, trendsEnabled } from 'mastodon/initial_state';
+import { transientSingleColumn } from 'mastodon/is_mobile';
import ColumnLink from './column_link';
import DisabledAccountBanner from './disabled_account_banner';
@@ -30,6 +31,7 @@ const messages = defineMessages({
followsAndFollowers: { id: 'navigation_bar.follows_and_followers', defaultMessage: 'Follows and followers' },
about: { id: 'navigation_bar.about', defaultMessage: 'About' },
search: { id: 'navigation_bar.search', defaultMessage: 'Search' },
+ advancedInterface: { id: 'navigation_bar.advanced_interface', defaultMessage: 'Open in advanced web interface' },
});
class NavigationPanel extends Component {
@@ -51,7 +53,7 @@ class NavigationPanel extends Component {
const { intl } = this.props;
const { signedIn, disabledAccountId } = this.context.identity;
- const explorer = (showTrends ? (
+ const explorer = (trendsEnabled ? (
) : (
@@ -61,6 +63,12 @@ class NavigationPanel extends Component {
diff --git a/app/javascript/mastodon/features/ui/components/report_modal.jsx b/app/javascript/mastodon/features/ui/components/report_modal.jsx
index 9958df6180..7ed5742588 100644
--- a/app/javascript/mastodon/features/ui/components/report_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/report_modal.jsx
@@ -45,25 +45,26 @@ class ReportModal extends ImmutablePureComponent {
state = {
step: 'category',
selectedStatusIds: OrderedSet(this.props.statusId ? [this.props.statusId] : []),
+ selectedDomains: OrderedSet(),
comment: '',
category: null,
selectedRuleIds: OrderedSet(),
- forward: true,
isSubmitting: false,
isSubmitted: false,
};
handleSubmit = () => {
const { dispatch, accountId } = this.props;
- const { selectedStatusIds, comment, category, selectedRuleIds, forward } = this.state;
+ const { selectedStatusIds, selectedDomains, comment, category, selectedRuleIds } = this.state;
this.setState({ isSubmitting: true });
dispatch(submitReport({
account_id: accountId,
status_ids: selectedStatusIds.toArray(),
+ selected_domains: selectedDomains.toArray(),
comment,
- forward,
+ forward: selectedDomains.size > 0,
category,
rule_ids: selectedRuleIds.toArray(),
}, this.handleSuccess, this.handleFail));
@@ -87,13 +88,19 @@ class ReportModal extends ImmutablePureComponent {
}
};
- handleRuleToggle = (ruleId, checked) => {
- const { selectedRuleIds } = this.state;
-
+ handleDomainToggle = (domain, checked) => {
if (checked) {
- this.setState({ selectedRuleIds: selectedRuleIds.add(ruleId) });
+ this.setState((state) => ({ selectedDomains: state.selectedDomains.add(domain) }));
} else {
- this.setState({ selectedRuleIds: selectedRuleIds.remove(ruleId) });
+ this.setState((state) => ({ selectedDomains: state.selectedDomains.remove(domain) }));
+ }
+ };
+
+ handleRuleToggle = (ruleId, checked) => {
+ if (checked) {
+ this.setState((state) => ({ selectedRuleIds: state.selectedRuleIds.add(ruleId) }));
+ } else {
+ this.setState((state) => ({ selectedRuleIds: state.selectedRuleIds.remove(ruleId) }));
}
};
@@ -105,10 +112,6 @@ class ReportModal extends ImmutablePureComponent {
this.setState({ comment });
};
- handleChangeForward = forward => {
- this.setState({ forward });
- };
-
handleNextStep = step => {
this.setState({ step });
};
@@ -136,8 +139,8 @@ class ReportModal extends ImmutablePureComponent {
step,
selectedStatusIds,
selectedRuleIds,
+ selectedDomains,
comment,
- forward,
category,
isSubmitting,
isSubmitted,
@@ -185,10 +188,11 @@ class ReportModal extends ImmutablePureComponent {
isSubmitting={isSubmitting}
isRemote={isRemote}
comment={comment}
- forward={forward}
domain={domain}
onChangeComment={this.handleChangeComment}
- onChangeForward={this.handleChangeForward}
+ statusIds={selectedStatusIds}
+ selectedDomains={selectedDomains}
+ onToggleDomain={this.handleDomainToggle}
/>
);
break;
diff --git a/app/javascript/mastodon/features/ui/containers/notifications_container.js b/app/javascript/mastodon/features/ui/containers/notifications_container.js
index c1d19f7100..3d60cfdad1 100644
--- a/app/javascript/mastodon/features/ui/containers/notifications_container.js
+++ b/app/javascript/mastodon/features/ui/containers/notifications_container.js
@@ -7,26 +7,27 @@ import { NotificationStack } from 'react-notification';
import { dismissAlert } from '../../../actions/alerts';
import { getAlerts } from '../../../selectors';
-const mapStateToProps = (state, { intl }) => {
- const notifications = getAlerts(state);
+const formatIfNeeded = (intl, message, values) => {
+ if (typeof message === 'object') {
+ return intl.formatMessage(message, values);
+ }
- notifications.forEach(notification => ['title', 'message'].forEach(key => {
- const value = notification[key];
-
- if (typeof value === 'object') {
- notification[key] = intl.formatMessage(value, notification[`${key}_values`]);
- }
- }));
-
- return { notifications };
+ return message;
};
-const mapDispatchToProps = (dispatch) => {
- return {
- onDismiss: alert => {
- dispatch(dismissAlert(alert));
- },
- };
-};
+const mapStateToProps = (state, { intl }) => ({
+ notifications: getAlerts(state).map(alert => ({
+ ...alert,
+ action: formatIfNeeded(intl, alert.action, alert.values),
+ title: formatIfNeeded(intl, alert.title, alert.values),
+ message: formatIfNeeded(intl, alert.message, alert.values),
+ })),
+});
+
+const mapDispatchToProps = (dispatch) => ({
+ onDismiss (alert) {
+ dispatch(dismissAlert(alert));
+ },
+});
export default injectIntl(connect(mapStateToProps, mapDispatchToProps)(NotificationStack));
diff --git a/app/javascript/mastodon/features/ui/index.jsx b/app/javascript/mastodon/features/ui/index.jsx
index 463234f92e..d68dff201c 100644
--- a/app/javascript/mastodon/features/ui/index.jsx
+++ b/app/javascript/mastodon/features/ui/index.jsx
@@ -22,7 +22,7 @@ import { clearHeight } from '../../actions/height_cache';
import { expandNotifications } from '../../actions/notifications';
import { fetchServer, fetchServerTranslationLanguages } from '../../actions/server';
import { expandHomeTimeline } from '../../actions/timelines';
-import initialState, { me, owner, singleUserMode, showTrends, trendsAsLanding } from '../../initial_state';
+import initialState, { me, owner, singleUserMode, trendsEnabled, trendsAsLanding } from '../../initial_state';
import BundleColumnError from './components/bundle_column_error';
import Header from './components/header';
@@ -132,11 +132,11 @@ class SwitchingColumnsArea extends PureComponent {
static propTypes = {
children: PropTypes.node,
location: PropTypes.object,
- mobile: PropTypes.bool,
+ singleColumn: PropTypes.bool,
};
UNSAFE_componentWillMount () {
- if (this.props.mobile) {
+ if (this.props.singleColumn) {
document.body.classList.toggle('layout-single-column', true);
document.body.classList.toggle('layout-multiple-columns', false);
} else {
@@ -150,9 +150,9 @@ class SwitchingColumnsArea extends PureComponent {
this.node.handleChildrenContentChange();
}
- if (prevProps.mobile !== this.props.mobile) {
- document.body.classList.toggle('layout-single-column', this.props.mobile);
- document.body.classList.toggle('layout-multiple-columns', !this.props.mobile);
+ if (prevProps.singleColumn !== this.props.singleColumn) {
+ document.body.classList.toggle('layout-single-column', this.props.singleColumn);
+ document.body.classList.toggle('layout-multiple-columns', !this.props.singleColumn);
}
}
@@ -163,30 +163,34 @@ class SwitchingColumnsArea extends PureComponent {
};
render () {
- const { children, mobile } = this.props;
+ const { children, singleColumn } = this.props;
const { signedIn } = this.context.identity;
+ const pathName = this.props.location.pathname;
let redirect;
if (signedIn) {
- if (mobile) {
+ if (singleColumn) {
redirect =
;
} else {
- redirect =
;
+ redirect =
;
}
} else if (singleUserMode && owner && initialState?.accounts[owner]) {
redirect =
;
- } else if (showTrends && trendsAsLanding) {
+ } else if (trendsEnabled && trendsAsLanding) {
redirect =
;
} else {
redirect =
;
}
return (
-
+
{redirect}
+ {singleColumn ? : null}
+ {singleColumn && pathName.startsWith('/deck/') ? : null}
+
@@ -592,7 +596,7 @@ class UI extends PureComponent {
-
+
{children}
diff --git a/app/javascript/mastodon/features/ui/util/react_router_helpers.jsx b/app/javascript/mastodon/features/ui/util/react_router_helpers.jsx
index 66cfee9708..9927726857 100644
--- a/app/javascript/mastodon/features/ui/util/react_router_helpers.jsx
+++ b/app/javascript/mastodon/features/ui/util/react_router_helpers.jsx
@@ -11,13 +11,21 @@ import BundleContainer from '../containers/bundle_container';
// Small wrapper to pass multiColumn to the route components
export class WrappedSwitch extends PureComponent {
+ static contextTypes = {
+ router: PropTypes.object,
+ };
render () {
const { multiColumn, children } = this.props;
+ const { location } = this.context.router.route;
+
+ const decklessLocation = multiColumn && location.pathname.startsWith('/deck')
+ ? {...location, pathname: location.pathname.slice(5)}
+ : location;
return (
-
- {Children.map(children, child => cloneElement(child, { multiColumn }))}
+
+ {Children.map(children, child => child ? cloneElement(child, { multiColumn }) : null)}
);
}
diff --git a/app/javascript/mastodon/initial_state.js b/app/javascript/mastodon/initial_state.js
index ed070ddb74..71a221d128 100644
--- a/app/javascript/mastodon/initial_state.js
+++ b/app/javascript/mastodon/initial_state.js
@@ -72,12 +72,13 @@
* @property {boolean} reduce_motion
* @property {string} repository
* @property {boolean} search_enabled
+ * @property {boolean} trends_enabled
* @property {boolean} single_user_mode
* @property {string} source_url
* @property {string} streaming_api_base_url
* @property {boolean} timeline_preview
* @property {string} title
- * @property {boolean} trends
+ * @property {boolean} show_trends
* @property {boolean} trends_as_landing_page
* @property {boolean} unfollow_modal
* @property {boolean} use_blurhash
@@ -96,6 +97,13 @@ const element = document.getElementById('initial-state');
/** @type {InitialState | undefined} */
const initialState = element?.textContent && JSON.parse(element.textContent);
+/** @type {string} */
+const initialPath = document.querySelector("head meta[name=initialPath]")?.getAttribute("content") ?? '';
+/** @type {boolean} */
+export const hasMultiColumnPath = initialPath === '/'
+ || initialPath === '/getting-started'
+ || initialPath.startsWith('/deck');
+
/**
* @template {keyof InitialStateMeta} K
* @param {K} prop
@@ -127,7 +135,8 @@ export const reduceMotion = getMeta('reduce_motion');
export const registrationsOpen = getMeta('registrations_open');
export const repository = getMeta('repository');
export const searchEnabled = getMeta('search_enabled');
-export const showTrends = getMeta('trends');
+export const trendsEnabled = getMeta('trends_enabled');
+export const showTrends = getMeta('show_trends');
export const singleUserMode = getMeta('single_user_mode');
export const source_url = getMeta('source_url');
export const timelinePreview = getMeta('timeline_preview');
diff --git a/app/javascript/mastodon/is_mobile.ts b/app/javascript/mastodon/is_mobile.ts
index 36cde21332..7f339e287b 100644
--- a/app/javascript/mastodon/is_mobile.ts
+++ b/app/javascript/mastodon/is_mobile.ts
@@ -1,19 +1,21 @@
import { supportsPassiveEvents } from 'detect-passive-events';
-import { forceSingleColumn } from './initial_state';
+import { forceSingleColumn, hasMultiColumnPath } from './initial_state';
const LAYOUT_BREAKPOINT = 630;
export const isMobile = (width: number) => width <= LAYOUT_BREAKPOINT;
+export const transientSingleColumn = !forceSingleColumn && !hasMultiColumnPath;
+
export type LayoutType = 'mobile' | 'single-column' | 'multi-column';
export const layoutFromWindow = (): LayoutType => {
if (isMobile(window.innerWidth)) {
return 'mobile';
- } else if (forceSingleColumn) {
- return 'single-column';
- } else {
+ } else if (!forceSingleColumn && !transientSingleColumn) {
return 'multi-column';
+ } else {
+ return 'single-column';
}
};
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index dd5092266a..9bc193da5f 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -140,6 +140,8 @@
"community.column_settings.remote_only": "Remote only",
"compose.language.change": "Change language",
"compose.language.search": "Search languages...",
+ "compose.published.body": "Post published.",
+ "compose.published.open": "Open",
"compose_form.direct_message_warning_learn_more": "Learn more",
"compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any sensitive information over Mastodon.",
"compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is not public. Only public posts can be searched by hashtag.",
@@ -392,6 +394,7 @@
"mute_modal.hide_notifications": "Hide notifications from this user?",
"mute_modal.indefinite": "Indefinite",
"navigation_bar.about": "About",
+ "navigation_bar.advanced_interface": "Open in advanced web interface",
"navigation_bar.antennas": "Antenna",
"navigation_bar.blocks": "Blocked users",
"navigation_bar.bookmarks": "Bookmarks",
@@ -647,6 +650,8 @@
"status.history.created": "{name} created {date}",
"status.history.edited": "{name} edited {date}",
"status.load_more": "Load more",
+ "status.media.open": "Click to open",
+ "status.media.show": "Click to show",
"status.media_hidden": "Media hidden",
"status.mention": "Mention @{name}",
"status.more": "More",
@@ -678,7 +683,7 @@
"status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {{attachmentCount} attachments}}",
"status.translate": "Translate",
"status.translated_from_with": "Translated from {lang} using {provider}",
- "status.uncached_media_warning": "Not available",
+ "status.uncached_media_warning": "Preview not available",
"status.unmute_conversation": "Unmute conversation",
"status.unpin": "Unpin from profile",
"subscribed_languages.lead": "Only posts in selected languages will appear on your home and list timelines after the change. Select none to receive posts in all languages.",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index 75b7890d27..13eb9762ef 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -368,6 +368,7 @@
"mute_modal.hide_notifications": "Masquer les notifications de cette personne ?",
"mute_modal.indefinite": "Indéfinie",
"navigation_bar.about": "À propos",
+ "navigation_bar.advanced_interface": "Ouvrir dans l’interface avancée",
"navigation_bar.blocks": "Comptes bloqués",
"navigation_bar.bookmarks": "Marque-pages",
"navigation_bar.community_timeline": "Fil public local",
diff --git a/app/javascript/mastodon/locales/global_locale.ts b/app/javascript/mastodon/locales/global_locale.ts
index 01133ca239..2d4329c764 100644
--- a/app/javascript/mastodon/locales/global_locale.ts
+++ b/app/javascript/mastodon/locales/global_locale.ts
@@ -3,15 +3,19 @@ export interface LocaleData {
messages: Record;
}
-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;
diff --git a/app/javascript/mastodon/locales/load_locale.ts b/app/javascript/mastodon/locales/load_locale.ts
index 8a69123174..d21675b179 100644
--- a/app/javascript/mastodon/locales/load_locale.ts
+++ b/app/javascript/mastodon/locales/load_locale.ts
@@ -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('html')?.lang || 'en';
// We use a Semaphore here so only one thing can try to load the locales at
diff --git a/app/javascript/mastodon/polyfills/base_polyfills.ts b/app/javascript/mastodon/polyfills/base_polyfills.ts
index 3cde1b1ede..71565236cd 100644
--- a/app/javascript/mastodon/polyfills/base_polyfills.ts
+++ b/app/javascript/mastodon/polyfills/base_polyfills.ts
@@ -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 {
diff --git a/app/javascript/mastodon/polyfills/index.ts b/app/javascript/mastodon/polyfills/index.ts
index b2dbfdac0a..e166c09d0e 100644
--- a/app/javascript/mastodon/polyfills/index.ts
+++ b/app/javascript/mastodon/polyfills/index.ts
@@ -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(),
diff --git a/app/javascript/mastodon/polyfills/intl.ts b/app/javascript/mastodon/polyfills/intl.ts
index 4d5ee3ccf9..b825da6621 100644
--- a/app/javascript/mastodon/polyfills/intl.ts
+++ b/app/javascript/mastodon/polyfills/intl.ts
@@ -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
diff --git a/app/javascript/mastodon/reducers/alerts.js b/app/javascript/mastodon/reducers/alerts.js
index bd49d748f9..1ca9b62a02 100644
--- a/app/javascript/mastodon/reducers/alerts.js
+++ b/app/javascript/mastodon/reducers/alerts.js
@@ -1,4 +1,4 @@
-import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
+import { List as ImmutableList } from 'immutable';
import {
ALERT_SHOW,
@@ -8,17 +8,20 @@ import {
const initialState = ImmutableList([]);
+let id = 0;
+
+const addAlert = (state, alert) =>
+ state.push({
+ key: id++,
+ ...alert,
+ });
+
export default function alerts(state = initialState, action) {
switch(action.type) {
case ALERT_SHOW:
- return state.push(ImmutableMap({
- key: state.size > 0 ? state.last().get('key') + 1 : 0,
- title: action.title,
- message: action.message,
- message_values: action.message_values,
- }));
+ return addAlert(state, action.alert);
case ALERT_DISMISS:
- return state.filterNot(item => item.get('key') === action.alert.key);
+ return state.filterNot(item => item.key === action.alert.key);
case ALERT_CLEAR:
return state.clear();
default:
diff --git a/app/javascript/mastodon/reducers/index.ts b/app/javascript/mastodon/reducers/index.ts
index 4a1cc95b57..c0794bfbed 100644
--- a/app/javascript/mastodon/reducers/index.ts
+++ b/app/javascript/mastodon/reducers/index.ts
@@ -29,7 +29,6 @@ import lists from './lists';
import markers from './markers';
import media_attachments from './media_attachments';
import meta from './meta';
-import { missedUpdatesReducer } from './missed_updates';
import { modalReducer } from './modal';
import mutes from './mutes';
import notifications from './notifications';
@@ -89,7 +88,6 @@ const reducers = {
suggestions,
polls,
trends,
- missed_updates: missedUpdatesReducer,
markers,
picture_in_picture,
history,
@@ -109,7 +107,7 @@ const initialRootState = Object.fromEntries(
reducer(undefined, {
// empty action
}),
- ])
+ ]),
);
const RootStateRecord = ImmutableRecord(initialRootState, 'RootState');
diff --git a/app/javascript/mastodon/reducers/missed_updates.ts b/app/javascript/mastodon/reducers/missed_updates.ts
deleted file mode 100644
index a587fcb036..0000000000
--- a/app/javascript/mastodon/reducers/missed_updates.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { Record } from 'immutable';
-
-import type { Action } from 'redux';
-
-import { focusApp, unfocusApp } from '../actions/app';
-import { NOTIFICATIONS_UPDATE } from '../actions/notifications';
-
-interface MissedUpdatesState {
- focused: boolean;
- unread: number;
-}
-const initialState = Record({
- focused: true,
- unread: 0,
-})();
-
-export function missedUpdatesReducer(
- state = initialState,
- action: Action
-) {
- switch (action.type) {
- case focusApp.type:
- return state.set('focused', true).set('unread', 0);
- case unfocusApp.type:
- return state.set('focused', false);
- case NOTIFICATIONS_UPDATE:
- return state.get('focused')
- ? state
- : state.update('unread', (x) => x + 1);
- default:
- return state;
- }
-}
diff --git a/app/javascript/mastodon/reducers/modal.ts b/app/javascript/mastodon/reducers/modal.ts
index 6afbcc367c..dab1e8301c 100644
--- a/app/javascript/mastodon/reducers/modal.ts
+++ b/app/javascript/mastodon/reducers/modal.ts
@@ -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;
- }>
+ }>,
) {
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;
diff --git a/app/javascript/mastodon/scroll.ts b/app/javascript/mastodon/scroll.ts
index 625aab0c04..35e13a4527 100644
--- a/app/javascript/mastodon/scroll.ts
+++ b/app/javascript/mastodon/scroll.ts
@@ -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);
+};
diff --git a/app/javascript/mastodon/selectors/index.js b/app/javascript/mastodon/selectors/index.js
index f92e7fe48d..0968fb090b 100644
--- a/app/javascript/mastodon/selectors/index.js
+++ b/app/javascript/mastodon/selectors/index.js
@@ -84,26 +84,16 @@ export const makeGetPictureInPicture = () => {
}));
};
-const getAlertsBase = state => state.get('alerts');
+const ALERT_DEFAULTS = {
+ dismissAfter: 5000,
+ style: false,
+};
-export const getAlerts = createSelector([getAlertsBase], (base) => {
- let arr = [];
-
- base.forEach(item => {
- arr.push({
- message: item.get('message'),
- message_values: item.get('message_values'),
- title: item.get('title'),
- key: item.get('key'),
- dismissAfter: 5000,
- barStyle: {
- zIndex: 200,
- },
- });
- });
-
- return arr;
-});
+export const getAlerts = createSelector(state => state.get('alerts'), alerts =>
+ alerts.map(item => ({
+ ...ALERT_DEFAULTS,
+ ...item,
+ })).toArray());
export const makeGetNotification = () => createSelector([
(_, base) => base,
diff --git a/app/javascript/mastodon/store/index.ts b/app/javascript/mastodon/store/index.ts
index 1ef9cb8184..f748662794 100644
--- a/app/javascript/mastodon/store/index.ts
+++ b/app/javascript/mastodon/store/index.ts
@@ -30,7 +30,7 @@ export const store = configureStore({
.concat(
loadingBarMiddleware({
promiseTypeSuffixes: ['REQUEST', 'SUCCESS', 'FAIL'],
- })
+ }),
)
.concat(errorsMiddleware)
.concat(soundsMiddleware()),
diff --git a/app/javascript/mastodon/store/middlewares/loading_bar.ts b/app/javascript/mastodon/store/middlewares/loading_bar.ts
index 0f997fd349..379b3758a1 100644
--- a/app/javascript/mastodon/store/middlewares/loading_bar.ts
+++ b/app/javascript/mastodon/store/middlewares/loading_bar.ts
@@ -14,9 +14,9 @@ const defaultTypeSuffixes: Config['promiseTypeSuffixes'] = [
];
export const loadingBarMiddleware = (
- config: Config = {}
+ config: Config = {},
): Middleware, 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());
diff --git a/app/javascript/mastodon/store/middlewares/sounds.ts b/app/javascript/mastodon/store/middlewares/sounds.ts
index 6005d3649e..092f403f5f 100644
--- a/app/javascript/mastodon/store/middlewares/sounds.ts
+++ b/app/javascript/mastodon/store/middlewares/sounds.ts
@@ -1,5 +1,8 @@
import type { Middleware, AnyAction } from 'redux';
+import ready from 'mastodon/ready';
+import { assetHost } from 'mastodon/utils/config';
+
import type { RootState } from '..';
interface AudioSource {
@@ -35,25 +38,27 @@ export const soundsMiddleware = (): Middleware<
Record,
RootState
> => {
- const soundCache: { [key: string]: HTMLAudioElement } = {
- boop: createAudio([
+ const soundCache: Record = {};
+
+ void ready(() => {
+ soundCache.boop = createAudio([
{
- src: '/sounds/boop.ogg',
+ src: `${assetHost}/sounds/boop.ogg`,
type: 'audio/ogg',
},
{
- src: '/sounds/boop.mp3',
+ src: `${assetHost}/sounds/boop.mp3`,
type: 'audio/mpeg',
},
- ]),
- };
+ ]);
+ });
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]);
}
diff --git a/app/javascript/mastodon/utils/filters.ts b/app/javascript/mastodon/utils/filters.ts
index e5c6422e0a..d299e80c40 100644
--- a/app/javascript/mastodon/utils/filters.ts
+++ b/app/javascript/mastodon/utils/filters.ts
@@ -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
diff --git a/app/javascript/mastodon/utils/hashtags.ts b/app/javascript/mastodon/utils/hashtags.ts
index 4c76cd7ded..0c5505c6c9 100644
--- a/app/javascript/mastodon/utils/hashtags.ts
+++ b/app/javascript/mastodon/utils/hashtags.ts
@@ -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;
diff --git a/app/javascript/mastodon/utils/numbers.ts b/app/javascript/mastodon/utils/numbers.ts
index 4c8465f577..0a73061f69 100644
--- a/app/javascript/mastodon/utils/numbers.ts
+++ b/app/javascript/mastodon/utils/numbers.ts
@@ -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;
diff --git a/app/javascript/mastodon/uuid.ts b/app/javascript/mastodon/uuid.ts
index 0b4d55beb6..4d0a8a8036 100644
--- a/app/javascript/mastodon/uuid.ts
+++ b/app/javascript/mastodon/uuid.ts
@@ -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);
}
diff --git a/app/javascript/styles/fonts/roboto-mono.scss b/app/javascript/styles/fonts/roboto-mono.scss
index 10dd630099..d07aae07ab 100644
--- a/app/javascript/styles/fonts/roboto-mono.scss
+++ b/app/javascript/styles/fonts/roboto-mono.scss
@@ -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')
diff --git a/app/javascript/styles/fonts/roboto.scss b/app/javascript/styles/fonts/roboto.scss
index 672eab086c..2a7b8fb90c 100644
--- a/app/javascript/styles/fonts/roboto.scss
+++ b/app/javascript/styles/fonts/roboto.scss
@@ -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'),
diff --git a/app/javascript/styles/mailer.scss b/app/javascript/styles/mailer.scss
index a12f74fc02..92d00cae8b 100644
--- a/app/javascript/styles/mailer.scss
+++ b/app/javascript/styles/mailer.scss
@@ -541,7 +541,7 @@ ul.rules-list {
padding-top: 0;
}
-@media only screen and (min-device-width: 768px) and (max-device-width: 1024px) and (orientation: landscape) {
+@media only screen and (device-width >= 768px) and (device-width <= 1024px) and (orientation: landscape) {
body {
min-height: 1024px !important;
}
diff --git a/app/javascript/styles/mastodon-light/diff.scss b/app/javascript/styles/mastodon-light/diff.scss
index cdf56ca066..a5246a041b 100644
--- a/app/javascript/styles/mastodon-light/diff.scss
+++ b/app/javascript/styles/mastodon-light/diff.scss
@@ -636,14 +636,6 @@ html {
}
}
-.button.logo-button {
- color: $white;
-
- svg {
- fill: $white;
- }
-}
-
.notification__filter-bar button.active::after,
.account__section-headline a.active::after {
border-color: transparent transparent $white;
diff --git a/app/javascript/styles/mastodon/basics.scss b/app/javascript/styles/mastodon/basics.scss
index a344c7fa4f..ff00c797c8 100644
--- a/app/javascript/styles/mastodon/basics.scss
+++ b/app/javascript/styles/mastodon/basics.scss
@@ -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 {
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index fddead545f..aa75a16262 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -754,7 +754,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 {
@@ -1725,10 +1727,6 @@ a.account__display-name {
color: inherit;
}
-.detailed-status .button.logo-button {
- margin-bottom: 15px;
-}
-
.detailed-status__display-name {
color: $darker-text-color;
display: flex;
@@ -4013,7 +4011,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;
@@ -4268,34 +4268,31 @@ a.status-card.compact:hover {
}
&__overlay {
- display: block;
- background: transparent;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ background: rgba($black, 0.5);
width: 100%;
height: 100%;
+ padding: 0;
+ margin: 0;
border: 0;
+ border-radius: 4px;
&__label {
- display: inline-block;
- background: rgba($base-overlay-background, 0.5);
- border-radius: 8px;
- padding: 8px 12px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ gap: 8px;
+ flex-direction: column;
color: $primary-text-color;
font-weight: 500;
font-size: 14px;
}
- &:hover,
- &:focus,
- &:active {
- .spoiler-button__overlay__label {
- background: rgba($base-overlay-background, 0.8);
- }
- }
-
- &:disabled {
- .spoiler-button__overlay__label {
- background: rgba($base-overlay-background, 0.5);
- }
+ &__action {
+ font-weight: 400;
+ font-size: 13px;
}
}
}
@@ -5874,6 +5871,7 @@ a.status-card.compact:hover {
&__toggle {
display: flex;
align-items: center;
+ margin-bottom: 10px;
& > span {
font-size: 17px;
@@ -7045,7 +7043,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);
}
@@ -7058,12 +7057,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;
}
}
@@ -9214,3 +9216,63 @@ noscript {
}
}
}
+
+.notification-list {
+ position: fixed;
+ bottom: 2rem;
+ inset-inline-start: 0;
+ z-index: 999;
+ display: flex;
+ flex-direction: column;
+ gap: 4px;
+}
+
+.notification-bar {
+ flex: 0 0 auto;
+ position: relative;
+ inset-inline-start: -100%;
+ width: auto;
+ padding: 15px;
+ margin: 0;
+ color: $white;
+ background: rgba($black, 0.85);
+ 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),
+ 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);
+ transform: translateZ(0);
+ font-size: 15px;
+ line-height: 21px;
+
+ &.notification-bar-active {
+ inset-inline-start: 1rem;
+ }
+}
+
+.notification-bar-title {
+ margin-inline-end: 5px;
+}
+
+.notification-bar-title,
+.notification-bar-action {
+ font-weight: 700;
+}
+
+.notification-bar-action {
+ text-transform: uppercase;
+ margin-inline-start: 10px;
+ cursor: pointer;
+ color: $blurple-300;
+ border-radius: 4px;
+ padding: 0 4px;
+
+ &:hover,
+ &:focus,
+ &:active {
+ background: rgba($ui-base-color, 0.85);
+ }
+}
diff --git a/app/javascript/styles/mastodon/statuses.scss b/app/javascript/styles/mastodon/statuses.scss
index 590d03fb8d..b6d4f98cce 100644
--- a/app/javascript/styles/mastodon/statuses.scss
+++ b/app/javascript/styles/mastodon/statuses.scss
@@ -77,66 +77,18 @@
}
}
-.button.logo-button {
- flex: 0 auto;
- font-size: 14px;
- background: darken($ui-highlight-color, 2%);
- color: $primary-text-color;
- text-transform: none;
- line-height: 1.2;
+.button.logo-button svg {
+ width: 20px;
height: auto;
- min-height: 36px;
- min-width: 88px;
- white-space: normal;
- overflow-wrap: break-word;
- hyphens: auto;
- padding: 0 15px;
- border: 0;
-
- svg {
- width: 20px;
- height: auto;
- vertical-align: middle;
- margin-inline-end: 5px;
- fill: $primary-text-color;
- }
-
- &:active,
- &:focus,
- &:hover {
- background: $ui-highlight-color;
- }
-
- &:disabled,
- &.disabled {
- &:active,
- &:focus,
- &:hover {
- background: $ui-primary-color;
- }
- }
-
- &.button--destructive {
- &:active,
- &:focus,
- &:hover {
- background: $error-red;
- }
- }
+ vertical-align: middle;
+ margin-inline-end: 5px;
+ fill: $primary-text-color;
@media screen and (max-width: $no-gap-breakpoint) {
- svg {
- display: none;
- }
+ display: none;
}
}
-a.button.logo-button {
- display: inline-flex;
- align-items: center;
- justify-content: center;
-}
-
.embed {
.status__content[data-spoiler='folded'] {
.e-content {
diff --git a/app/lib/activitypub/activity.rb b/app/lib/activitypub/activity.rb
index 670f910096..45ce7252f4 100644
--- a/app/lib/activitypub/activity.rb
+++ b/app/lib/activitypub/activity.rb
@@ -143,11 +143,11 @@ class ActivityPub::Activity
end
def follow_request_from_object
- @follow_request ||= FollowRequest.find_by(target_account: @account, uri: object_uri) unless object_uri.nil?
+ @follow_request_from_object ||= FollowRequest.find_by(target_account: @account, uri: object_uri) unless object_uri.nil?
end
def follow_from_object
- @follow ||= ::Follow.find_by(target_account: @account, uri: object_uri) unless object_uri.nil?
+ @follow_from_object ||= ::Follow.find_by(target_account: @account, uri: object_uri) unless object_uri.nil?
end
def fetch_remote_original_status
diff --git a/app/lib/activitypub/activity/flag.rb b/app/lib/activitypub/activity/flag.rb
index dc1932f597..304cf0ad2f 100644
--- a/app/lib/activitypub/activity/flag.rb
+++ b/app/lib/activitypub/activity/flag.rb
@@ -4,13 +4,14 @@ class ActivityPub::Activity::Flag < ActivityPub::Activity
def perform
return if skip_reports?
- target_accounts = object_uris.filter_map { |uri| account_from_uri(uri) }.select(&:local?)
- target_statuses_by_account = object_uris.filter_map { |uri| status_from_uri(uri) }.select(&:local?).group_by(&:account_id)
+ target_accounts = object_uris.filter_map { |uri| account_from_uri(uri) }
+ target_statuses_by_account = object_uris.filter_map { |uri| status_from_uri(uri) }.group_by(&:account_id)
target_accounts.each do |target_account|
- target_statuses = target_statuses_by_account[target_account.id]
+ target_statuses = target_statuses_by_account[target_account.id]
+ replied_to_accounts = Account.local.where(id: target_statuses.filter_map(&:in_reply_to_account_id))
- next if target_account.suspended?
+ next if target_account.suspended? || (!target_account.local? && replied_to_accounts.none?)
ReportService.new.call(
@account,
diff --git a/app/lib/connection_pool/shared_connection_pool.rb b/app/lib/connection_pool/shared_connection_pool.rb
index 7415296525..3ca22d0eff 100644
--- a/app/lib/connection_pool/shared_connection_pool.rb
+++ b/app/lib/connection_pool/shared_connection_pool.rb
@@ -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)
diff --git a/app/lib/emoji_formatter.rb b/app/lib/emoji_formatter.rb
index d968b5ac3c..639542b25f 100644
--- a/app/lib/emoji_formatter.rb
+++ b/app/lib/emoji_formatter.rb
@@ -53,7 +53,7 @@ class EmojiFormatter
end
end
- result << Nokogiri::XML::Text.new(text[last_index..-1], tree.document)
+ result << Nokogiri::XML::Text.new(text[last_index..], tree.document)
node.replace(result)
end
diff --git a/app/lib/inline_renderer.rb b/app/lib/inline_renderer.rb
index 7a9f0e7f1d..7071bb6804 100644
--- a/app/lib/inline_renderer.rb
+++ b/app/lib/inline_renderer.rb
@@ -39,7 +39,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: {
diff --git a/app/lib/request_pool.rb b/app/lib/request_pool.rb
index 86c825498d..82d9a71c95 100644
--- a/app/lib/request_pool.rb
+++ b/app/lib/request_pool.rb
@@ -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
diff --git a/app/lib/rss/channel.rb b/app/lib/rss/channel.rb
index 1dba94e47e..9013ed066a 100644
--- a/app/lib/rss/channel.rb
+++ b/app/lib/rss/channel.rb
@@ -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)
diff --git a/app/lib/rss/item.rb b/app/lib/rss/item.rb
index c02991ace2..6739a2c184 100644
--- a/app/lib/rss/item.rb
+++ b/app/lib/rss/item.rb
@@ -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)
diff --git a/app/lib/text_formatter.rb b/app/lib/text_formatter.rb
index da54234a26..46fdb65f1a 100644
--- a/app/lib/text_formatter.rb
+++ b/app/lib/text_formatter.rb
@@ -62,8 +62,8 @@ class TextFormatter
prefix = url.match(URL_PREFIX_REGEX).to_s
display_url = url[prefix.length, 30]
- suffix = url[prefix.length + 30..-1]
- cutoff = url[prefix.length..-1].length > 30
+ suffix = url[prefix.length + 30..]
+ cutoff = url[prefix.length..].length > 30
<<~HTML.squish.html_safe # rubocop:disable Rails/OutputSafety
#{h(prefix)}#{h(display_url)}#{h(suffix)}
@@ -89,7 +89,7 @@ class TextFormatter
indices.last
end
- result << h(text[last_index..-1])
+ result << h(text[last_index..])
result
end
@@ -219,7 +219,7 @@ class TextFormatter
private
def process_program_code(code)
- code.gsub(/\n/, '
')
+ code.gsub("\n", '
')
end
end
end
diff --git a/app/mailers/admin_mailer.rb b/app/mailers/admin_mailer.rb
index bc6d87ae6f..5baf9b38a5 100644
--- a/app/mailers/admin_mailer.rb
+++ b/app/mailers/admin_mailer.rb
@@ -6,45 +6,52 @@ class AdminMailer < ApplicationMailer
helper :accounts
helper :languages
- def new_report(recipient, report)
- @report = report
- @me = recipient
- @instance = Rails.configuration.x.local_domain
+ before_action :process_params
+ before_action :set_instance
+
+ default to: -> { @me.user_email }
+
+ def new_report(report)
+ @report = report
locale_for_account(@me) do
- mail to: @me.user_email, subject: I18n.t('admin_mailer.new_report.subject', instance: @instance, id: @report.id)
+ mail subject: default_i18n_subject(instance: @instance, id: @report.id)
end
end
- def new_appeal(recipient, appeal)
- @appeal = appeal
- @me = recipient
- @instance = Rails.configuration.x.local_domain
+ def new_appeal(appeal)
+ @appeal = appeal
locale_for_account(@me) do
- mail to: @me.user_email, subject: I18n.t('admin_mailer.new_appeal.subject', instance: @instance, username: @appeal.account.username)
+ mail subject: default_i18n_subject(instance: @instance, username: @appeal.account.username)
end
end
- def new_pending_account(recipient, user)
- @account = user.account
- @me = recipient
- @instance = Rails.configuration.x.local_domain
+ def new_pending_account(user)
+ @account = user.account
locale_for_account(@me) do
- mail to: @me.user_email, subject: I18n.t('admin_mailer.new_pending_account.subject', instance: @instance, username: @account.username)
+ mail subject: default_i18n_subject(instance: @instance, username: @account.username)
end
end
- def new_trends(recipient, links, tags, statuses)
+ def new_trends(links, tags, statuses)
@links = links
@tags = tags
@statuses = statuses
- @me = recipient
- @instance = Rails.configuration.x.local_domain
locale_for_account(@me) do
- mail to: @me.user_email, subject: I18n.t('admin_mailer.new_trends.subject', instance: @instance)
+ mail subject: default_i18n_subject(instance: @instance)
end
end
+
+ private
+
+ def process_params
+ @me = params[:recipient]
+ end
+
+ def set_instance
+ @instance = Rails.configuration.x.local_domain
+ end
end
diff --git a/app/mailers/notification_mailer.rb b/app/mailers/notification_mailer.rb
index 7cd3bab1af..277612366b 100644
--- a/app/mailers/notification_mailer.rb
+++ b/app/mailers/notification_mailer.rb
@@ -1,83 +1,76 @@
# frozen_string_literal: true
class NotificationMailer < ApplicationMailer
- helper :accounts
- helper :statuses
+ helper :accounts,
+ :statuses,
+ :routing
- helper RoutingHelper
+ before_action :process_params
+ before_action :set_status, only: [:mention, :favourite, :reblog]
+ before_action :set_account, only: [:follow, :favourite, :reblog, :follow_request]
- def mention(recipient, notification)
- @me = recipient
- @user = recipient.user
- @type = 'mention'
- @status = notification.target_status
+ default to: -> { email_address_with_name(@user.email, @me.username) }
+ def mention
return unless @user.functional? && @status.present?
locale_for_account(@me) do
thread_by_conversation(@status.conversation)
- mail to: email_address_with_name(@user.email, @me.username), subject: I18n.t('notification_mailer.mention.subject', name: @status.account.acct)
+ mail subject: default_i18n_subject(name: @status.account.acct)
end
end
- def follow(recipient, notification)
- @me = recipient
- @user = recipient.user
- @type = 'follow'
- @account = notification.from_account
-
+ def follow
return unless @user.functional?
locale_for_account(@me) do
- mail to: email_address_with_name(@user.email, @me.username), subject: I18n.t('notification_mailer.follow.subject', name: @account.acct)
+ mail subject: default_i18n_subject(name: @account.acct)
end
end
- def favourite(recipient, notification)
- @me = recipient
- @user = recipient.user
- @type = 'favourite'
- @account = notification.from_account
- @status = notification.target_status
-
+ def favourite
return unless @user.functional? && @status.present?
locale_for_account(@me) do
thread_by_conversation(@status.conversation)
- mail to: email_address_with_name(@user.email, @me.username), subject: I18n.t('notification_mailer.favourite.subject', name: @account.acct)
+ mail subject: default_i18n_subject(name: @account.acct)
end
end
- def reblog(recipient, notification)
- @me = recipient
- @user = recipient.user
- @type = 'reblog'
- @account = notification.from_account
- @status = notification.target_status
-
+ def reblog
return unless @user.functional? && @status.present?
locale_for_account(@me) do
thread_by_conversation(@status.conversation)
- mail to: email_address_with_name(@user.email, @me.username), subject: I18n.t('notification_mailer.reblog.subject', name: @account.acct)
+ mail subject: default_i18n_subject(name: @account.acct)
end
end
- def follow_request(recipient, notification)
- @me = recipient
- @user = recipient.user
- @type = 'follow_request'
- @account = notification.from_account
-
+ def follow_request
return unless @user.functional?
locale_for_account(@me) do
- mail to: email_address_with_name(@user.email, @me.username), subject: I18n.t('notification_mailer.follow_request.subject', name: @account.acct)
+ mail subject: default_i18n_subject(name: @account.acct)
end
end
private
+ def process_params
+ @notification = params[:notification]
+ @me = params[:recipient]
+ @user = @me.user
+ @type = action_name
+ end
+
+ def set_status
+ @status = @notification.target_status
+ end
+
+ def set_account
+ @account = @notification.from_account
+ end
+
def thread_by_conversation(conversation)
return if conversation.nil?
diff --git a/app/models/account_alias.rb b/app/models/account_alias.rb
index b7267d6320..f859344fa2 100644
--- a/app/models/account_alias.rb
+++ b/app/models/account_alias.rb
@@ -25,7 +25,7 @@ class AccountAlias < ApplicationRecord
def acct=(val)
val = val.to_s.strip
- super(val.start_with?('@') ? val[1..-1] : val)
+ super(val.start_with?('@') ? val[1..] : val)
end
def pretty_acct
diff --git a/app/models/announcement.rb b/app/models/announcement.rb
index 5d30d03fef..7b3d24aadb 100644
--- a/app/models/announcement.rb
+++ b/app/models/announcement.rb
@@ -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
diff --git a/app/models/concerns/account_search.rb b/app/models/concerns/account_search.rb
index 46cf68e1a3..9f7720f11b 100644
--- a/app/models/concerns/account_search.rb
+++ b/app/models/concerns/account_search.rb
@@ -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
diff --git a/app/models/concerns/status_safe_reblog_insert.rb b/app/models/concerns/status_safe_reblog_insert.rb
index a7ccb52e9a..5d464697c5 100644
--- a/app/models/concerns/status_safe_reblog_insert.rb
+++ b/app/models/concerns/status_safe_reblog_insert.rb
@@ -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
diff --git a/app/models/domain_block.rb b/app/models/domain_block.rb
index 40112eb668..36998957e0 100644
--- a/app/models/domain_block.rb
+++ b/app/models/domain_block.rb
@@ -121,7 +121,7 @@ class DomainBlock < ApplicationRecord
uri = Addressable::URI.new.tap { |u| u.host = domain.strip.delete('/') }
segments = uri.normalized_host.split('.')
- variants = segments.map.with_index { |_, i| segments[i..-1].join('.') }
+ variants = segments.map.with_index { |_, i| segments[i..].join('.') }
where(domain: variants).order(Arel.sql('char_length(domain) desc')).first
rescue Addressable::URI::InvalidURIError, IDN::Idna::IdnaError
diff --git a/app/models/email_domain_block.rb b/app/models/email_domain_block.rb
index 3c9be51cab..60e90208db 100644
--- a/app/models/email_domain_block.rb
+++ b/app/models/email_domain_block.rb
@@ -64,7 +64,7 @@ class EmailDomainBlock < ApplicationRecord
segments = uri.normalized_host.split('.')
- segments.map.with_index { |_, i| segments[i..-1].join('.') }
+ segments.map.with_index { |_, i| segments[i..].join('.') }
end
end
diff --git a/app/models/notification.rb b/app/models/notification.rb
index eb56e32913..8f15435c2a 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -125,7 +125,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
diff --git a/app/models/preview_card_provider.rb b/app/models/preview_card_provider.rb
index 9f5f6d3cb9..f3e4b49013 100644
--- a/app/models/preview_card_provider.rb
+++ b/app/models/preview_card_provider.rb
@@ -54,6 +54,6 @@ class PreviewCardProvider < ApplicationRecord
def self.matching_domain(domain)
segments = domain.split('.')
- where(domain: segments.map.with_index { |_, i| segments[i..-1].join('.') }).order(Arel.sql('char_length(domain) desc')).first
+ where(domain: segments.map.with_index { |_, i| segments[i..].join('.') }).order(Arel.sql('char_length(domain) desc')).first
end
end
diff --git a/app/models/status.rb b/app/models/status.rb
index 054e4d6c24..e6fbca59ab 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -116,7 +116,9 @@ class Status < ApplicationRecord
scope :not_domain_blocked_by_account, ->(account) { account.excluded_from_timeline_domains.blank? ? left_outer_joins(:account) : left_outer_joins(:account).where('accounts.domain IS NULL OR accounts.domain NOT IN (?)', account.excluded_from_timeline_domains) }
scope :tagged_with_all, lambda { |tag_ids|
Array(tag_ids).map(&:to_i).reduce(self) do |result, id|
- result.joins("INNER JOIN statuses_tags t#{id} ON t#{id}.status_id = statuses.id AND t#{id}.tag_id = #{id}")
+ result.where(<<~SQL.squish, tag_id: id)
+ EXISTS(SELECT 1 FROM statuses_tags WHERE statuses_tags.status_id = statuses.id AND statuses_tags.tag_id = :tag_id)
+ SQL
end
}
scope :tagged_with_none, lambda { |tag_ids|
diff --git a/app/models/trends.rb b/app/models/trends.rb
index d07d62b71b..7ca51e0b3d 100644
--- a/app/models/trends.rb
+++ b/app/models/trends.rb
@@ -35,7 +35,7 @@ module Trends
return if links_requiring_review.empty? && tags_requiring_review.empty? && statuses_requiring_review.empty?
User.those_who_can(:manage_taxonomies).includes(:account).find_each do |user|
- AdminMailer.new_trends(user.account, links_requiring_review, tags_requiring_review, statuses_requiring_review).deliver_later! if user.allows_trends_review_emails?
+ AdminMailer.with(recipient: user.account).new_trends(links_requiring_review, tags_requiring_review, statuses_requiring_review).deliver_later! if user.allows_trends_review_emails?
end
end
diff --git a/app/models/trends/links.rb b/app/models/trends/links.rb
index c94f7c0237..fcbdb1a5f5 100644
--- a/app/models/trends/links.rb
+++ b/app/models/trends/links.rb
@@ -3,6 +3,8 @@
class Trends::Links < Trends::Base
PREFIX = 'trending_links'
+ BATCH_SIZE = 100
+
self.default_options = {
threshold: 5,
review_threshold: 3,
@@ -67,8 +69,21 @@ class Trends::Links < Trends::Base
end
def refresh(at_time = Time.now.utc)
- preview_cards = PreviewCard.where(id: (recently_used_ids(at_time) + PreviewCardTrend.pluck(:preview_card_id)).uniq)
- calculate_scores(preview_cards, at_time)
+ # First, recalculate scores for links that were trending previously. We split the queries
+ # to avoid having to load all of the IDs into Ruby just to send them back into Postgres
+ PreviewCard.where(id: PreviewCardTrend.select(:preview_card_id)).find_in_batches(batch_size: BATCH_SIZE) do |preview_cards|
+ calculate_scores(preview_cards, at_time)
+ end
+
+ # Then, calculate scores for links that were used today. There are potentially some
+ # duplicate items here that we might process one more time, but that should be fine
+ PreviewCard.where(id: recently_used_ids(at_time)).find_in_batches(batch_size: BATCH_SIZE) do |preview_cards|
+ calculate_scores(preview_cards, at_time)
+ end
+
+ # Now that all trends have up-to-date scores, and all the ones below the threshold have
+ # been removed, we can recalculate their positions
+ PreviewCardTrend.connection.exec_update('UPDATE preview_card_trends SET rank = t0.calculated_rank FROM (SELECT id, row_number() OVER w AS calculated_rank FROM preview_card_trends WINDOW w AS (PARTITION BY language ORDER BY score DESC)) t0 WHERE preview_card_trends.id = t0.id')
end
def request_review
@@ -139,10 +154,7 @@ class Trends::Links < Trends::Base
to_insert = items.filter { |(score, _)| score >= options[:decay_threshold] }
to_delete = items.filter { |(score, _)| score < options[:decay_threshold] }
- PreviewCardTrend.transaction do
- PreviewCardTrend.upsert_all(to_insert.map { |(score, preview_card)| { preview_card_id: preview_card.id, score: score, language: preview_card.language, allowed: preview_card.trendable? || false } }, unique_by: :preview_card_id) if to_insert.any?
- PreviewCardTrend.where(preview_card_id: to_delete.map { |(_, preview_card)| preview_card.id }).delete_all if to_delete.any?
- PreviewCardTrend.connection.exec_update('UPDATE preview_card_trends SET rank = t0.calculated_rank FROM (SELECT id, row_number() OVER w AS calculated_rank FROM preview_card_trends WINDOW w AS (PARTITION BY language ORDER BY score DESC)) t0 WHERE preview_card_trends.id = t0.id')
- end
+ PreviewCardTrend.upsert_all(to_insert.map { |(score, preview_card)| { preview_card_id: preview_card.id, score: score, language: preview_card.language, allowed: preview_card.trendable? || false } }, unique_by: :preview_card_id) if to_insert.any?
+ PreviewCardTrend.where(preview_card_id: to_delete.map { |(_, preview_card)| preview_card.id }).delete_all if to_delete.any?
end
end
diff --git a/app/models/trends/query.rb b/app/models/trends/query.rb
index cd5571bc62..c4edbba6b8 100644
--- a/app/models/trends/query.rb
+++ b/app/models/trends/query.rb
@@ -68,12 +68,10 @@ class Trends::Query
alias to_a to_ary
def to_arel
- tmp_ids = ids
-
- if tmp_ids.empty?
+ if ids_for_key.empty?
klass.none
else
- scope = klass.joins("join unnest(array[#{tmp_ids.join(',')}]) with ordinality as x (id, ordering) on #{klass.table_name}.id = x.id").reorder('x.ordering')
+ scope = klass.joins(sanitized_join_sql).reorder('x.ordering')
scope = scope.offset(@offset) if @offset.present?
scope = scope.limit(@limit) if @limit.present?
scope
@@ -95,8 +93,22 @@ class Trends::Query
self
end
- def ids
- redis.zrevrange(key, 0, -1).map(&:to_i)
+ def ids_for_key
+ @ids_for_key ||= redis.zrevrange(key, 0, -1).map(&:to_i)
+ end
+
+ def sanitized_join_sql
+ ActiveRecord::Base.sanitize_sql_array(join_sql_array)
+ end
+
+ def join_sql_array
+ [join_sql_query, ids_for_key]
+ end
+
+ def join_sql_query
+ <<~SQL.squish
+ JOIN unnest(array[?]) WITH ordinality AS x (id, ordering) ON #{klass.table_name}.id = x.id
+ SQL
end
def perform_queries
diff --git a/app/models/trends/statuses.rb b/app/models/trends/statuses.rb
index 16497cbdf3..d4b7031a81 100644
--- a/app/models/trends/statuses.rb
+++ b/app/models/trends/statuses.rb
@@ -3,6 +3,8 @@
class Trends::Statuses < Trends::Base
PREFIX = 'trending_statuses'
+ BATCH_SIZE = 100
+
self.default_options = {
threshold: 5,
review_threshold: 3,
@@ -58,8 +60,21 @@ class Trends::Statuses < Trends::Base
end
def refresh(at_time = Time.now.utc)
- statuses = Status.where(id: (recently_used_ids(at_time) + StatusTrend.pluck(:status_id)).uniq).includes(:status_stat, :account)
- calculate_scores(statuses, at_time)
+ # First, recalculate scores for statuses that were trending previously. We split the queries
+ # to avoid having to load all of the IDs into Ruby just to send them back into Postgres
+ Status.where(id: StatusTrend.select(:status_id)).includes(:status_stat, :account).find_in_batches(batch_size: BATCH_SIZE) do |statuses|
+ calculate_scores(statuses, at_time)
+ end
+
+ # Then, calculate scores for statuses that were used today. There are potentially some
+ # duplicate items here that we might process one more time, but that should be fine
+ Status.where(id: recently_used_ids(at_time)).includes(:status_stat, :account).find_in_batches(batch_size: BATCH_SIZE) do |statuses|
+ calculate_scores(statuses, at_time)
+ end
+
+ # Now that all trends have up-to-date scores, and all the ones below the threshold have
+ # been removed, we can recalculate their positions
+ StatusTrend.connection.exec_update('UPDATE status_trends SET rank = t0.calculated_rank FROM (SELECT id, row_number() OVER w AS calculated_rank FROM status_trends WINDOW w AS (PARTITION BY language ORDER BY score DESC)) t0 WHERE status_trends.id = t0.id')
end
def request_review
@@ -117,10 +132,7 @@ class Trends::Statuses < Trends::Base
to_insert = items.filter { |(score, _)| score >= options[:decay_threshold] }
to_delete = items.filter { |(score, _)| score < options[:decay_threshold] }
- StatusTrend.transaction do
- StatusTrend.upsert_all(to_insert.map { |(score, status)| { status_id: status.id, account_id: status.account_id, score: score, language: status.language, allowed: status.trendable? || false } }, unique_by: :status_id) if to_insert.any?
- StatusTrend.where(status_id: to_delete.map { |(_, status)| status.id }).delete_all if to_delete.any?
- StatusTrend.connection.exec_update('UPDATE status_trends SET rank = t0.calculated_rank FROM (SELECT id, row_number() OVER w AS calculated_rank FROM status_trends WINDOW w AS (PARTITION BY language ORDER BY score DESC)) t0 WHERE status_trends.id = t0.id')
- end
+ StatusTrend.upsert_all(to_insert.map { |(score, status)| { status_id: status.id, account_id: status.account_id, score: score, language: status.language, allowed: status.trendable? || false } }, unique_by: :status_id) if to_insert.any?
+ StatusTrend.where(status_id: to_delete.map { |(_, status)| status.id }).delete_all if to_delete.any?
end
end
diff --git a/app/models/user.rb b/app/models/user.rb
index 83c7d5e356..74e6baa3d1 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -477,7 +477,7 @@ class User < ApplicationRecord
User.those_who_can(:manage_users).includes(:account).find_each do |u|
next unless u.allows_pending_account_emails?
- AdminMailer.new_pending_account(u.account, self).deliver_later
+ AdminMailer.with(recipient: u.account).new_pending_account(self).deliver_later
end
end
diff --git a/app/serializers/initial_state_serializer.rb b/app/serializers/initial_state_serializer.rb
index f87e3c4aea..944e03b389 100644
--- a/app/serializers/initial_state_serializer.rb
+++ b/app/serializers/initial_state_serializer.rb
@@ -25,7 +25,7 @@ class InitialStateSerializer < ActiveModel::Serializer
limited_federation_mode: Rails.configuration.x.whitelist_mode,
mascot: instance_presenter.mascot&.file&.url,
profile_directory: Setting.profile_directory,
- trends: Setting.trends,
+ trends_enabled: Setting.trends,
registrations_open: Setting.registrations_mode != 'none' && !Rails.configuration.x.single_user_mode,
timeline_preview: Setting.timeline_preview,
activity_api_enabled: Setting.activity_api_enabled,
@@ -50,7 +50,7 @@ class InitialStateSerializer < ActiveModel::Serializer
store[:advanced_layout] = object.current_account.user.setting_advanced_layout
store[:use_blurhash] = object.current_account.user.setting_use_blurhash
store[:use_pending_items] = object.current_account.user.setting_use_pending_items
- store[:trends] = Setting.trends && object.current_account.user.setting_trends
+ store[:show_trends] = Setting.trends && object.current_account.user.setting_trends
store[:crop_images] = object.current_account.user.setting_crop_images
else
store[:auto_play_gif] = Setting.auto_play_gif
@@ -87,7 +87,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
diff --git a/app/serializers/web/notification_serializer.rb b/app/serializers/web/notification_serializer.rb
index c5a908b199..fb2f7248a6 100644
--- a/app/serializers/web/notification_serializer.rb
+++ b/app/serializers/web/notification_serializer.rb
@@ -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
diff --git a/app/services/account_search_service.rb b/app/services/account_search_service.rb
index 3c9e73c124..b732fbcec3 100644
--- a/app/services/account_search_service.rb
+++ b/app/services/account_search_service.rb
@@ -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
@@ -133,8 +133,12 @@ class AccountSearchService < BaseService
end
def must_clause
- fields = %w(username username.* display_name display_name.*)
- fields << 'text' << 'text.*' if options[:use_searchable_text]
+ if options[:start_with_hashtag]
+ fields = %w(text text.*)
+ else
+ fields = %w(username username.* display_name display_name.*)
+ fields << 'text' << 'text.*' if options[:use_searchable_text]
+ end
[
{
diff --git a/app/services/activitypub/process_account_service.rb b/app/services/activitypub/process_account_service.rb
index 0903a5652a..791107f66f 100644
--- a/app/services/activitypub/process_account_service.rb
+++ b/app/services/activitypub/process_account_service.rb
@@ -79,6 +79,9 @@ class ActivityPub::ProcessAccountService < BaseService
@account.silenced_at = domain_block.created_at if auto_silence?
@account.searchability = :private # not null
@account.dissubscribable = false # not null
+
+ set_immediate_protocol_attributes!
+
@account.save
end
diff --git a/app/services/appeal_service.rb b/app/services/appeal_service.rb
index 399a053d6a..ef052e3547 100644
--- a/app/services/appeal_service.rb
+++ b/app/services/appeal_service.rb
@@ -23,7 +23,7 @@ class AppealService < BaseService
def notify_staff!
User.those_who_can(:manage_appeals).includes(:account).each do |u|
- AdminMailer.new_appeal(u.account, @appeal).deliver_later if u.allows_appeal_emails?
+ AdminMailer.with(recipient: u.account).new_appeal(@appeal).deliver_later if u.allows_appeal_emails?
end
end
end
diff --git a/app/services/batched_remove_status_service.rb b/app/services/batched_remove_status_service.rb
index 7e9b671266..f5cb339cdf 100644
--- a/app/services/batched_remove_status_service.rb
+++ b/app/services/batched_remove_status_service.rb
@@ -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(&:unlink_from_conversations!)
diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb
index 604a34666d..5243ed516c 100644
--- a/app/services/notify_service.rb
+++ b/app/services/notify_service.rb
@@ -163,7 +163,12 @@ class NotifyService < BaseService
end
def send_email!
- NotificationMailer.public_send(@notification.type, @recipient, @notification).deliver_later(wait: 2.minutes) if NotificationMailer.respond_to?(@notification.type)
+ return unless NotificationMailer.respond_to?(@notification.type)
+
+ NotificationMailer
+ .with(recipient: @recipient, notification: @notification)
+ .public_send(@notification.type)
+ .deliver_later(wait: 2.minutes)
end
def email_needed?
diff --git a/app/services/report_service.rb b/app/services/report_service.rb
index 30272685a3..9e690262b2 100644
--- a/app/services/report_service.rb
+++ b/app/services/report_service.rb
@@ -16,7 +16,11 @@ class ReportService < BaseService
create_report!
notify_staff!
- forward_to_origin! if forward?
+
+ if forward?
+ forward_to_origin!
+ forward_to_replied_to!
+ end
@report
end
@@ -29,7 +33,7 @@ class ReportService < BaseService
status_ids: reported_status_ids,
comment: @comment,
uri: @options[:uri],
- forwarded: forward?,
+ forwarded: forward_to_origin?,
category: @category,
rule_ids: @rule_ids
)
@@ -40,22 +44,38 @@ class ReportService < BaseService
User.those_who_can(:manage_reports).includes(:account).each do |u|
LocalNotificationWorker.perform_async(u.account_id, @report.id, 'Report', 'admin.report')
- AdminMailer.new_report(u.account, @report).deliver_later if u.allows_report_emails?
+ AdminMailer.with(recipient: u.account).new_report(@report).deliver_later if u.allows_report_emails?
end
end
def forward_to_origin!
- ActivityPub::DeliveryWorker.perform_async(
- payload,
- some_local_account.id,
- @target_account.inbox_url
- )
+ return unless forward_to_origin?
+
+ # Send report to the server where the account originates from
+ ActivityPub::DeliveryWorker.perform_async(payload, some_local_account.id, @target_account.inbox_url)
+ end
+
+ def forward_to_replied_to!
+ # Send report to servers to which the account was replying to, so they also have a chance to act
+ inbox_urls = Account.remote.where(domain: forward_to_domains).where(id: Status.where(id: reported_status_ids).where.not(in_reply_to_account_id: nil).select(:in_reply_to_account_id)).inboxes - [@target_account.inbox_url]
+
+ inbox_urls.each do |inbox_url|
+ ActivityPub::DeliveryWorker.perform_async(payload, some_local_account.id, inbox_url)
+ end
end
def forward?
!@target_account.local? && ActiveModel::Type::Boolean.new.cast(@options[:forward])
end
+ def forward_to_origin?
+ forward? && forward_to_domains.include?(@target_account.domain)
+ end
+
+ def forward_to_domains
+ @forward_to_domains ||= (@options[:forward_to_domains] || [@target_account.domain]).filter_map { |domain| TagManager.instance.normalize_domain(domain&.strip) }.uniq
+ end
+
def reported_status_ids
return AccountStatusesFilter.new(@target_account, @source_account).results.with_discarded.find(Array(@status_ids)).pluck(:id) if @source_account.local?
diff --git a/app/services/resolve_url_service.rb b/app/services/resolve_url_service.rb
index d6e528654f..19a94e77ad 100644
--- a/app/services/resolve_url_service.rb
+++ b/app/services/resolve_url_service.rb
@@ -63,7 +63,7 @@ class ResolveURLService < BaseService
end
def fetch_resource_service
- @_fetch_resource_service ||= FetchResourceService.new
+ @fetch_resource_service ||= FetchResourceService.new
end
def resource_url
diff --git a/app/services/search_service.rb b/app/services/search_service.rb
index f8a96ddb7b..17f8a75ec7 100644
--- a/app/services/search_service.rb
+++ b/app/services/search_service.rb
@@ -38,7 +38,8 @@ class SearchService < BaseService
resolve: @resolve,
offset: @offset,
use_searchable_text: true,
- following: @following
+ following: @following,
+ start_with_hashtag: @query.start_with?('#')
)
end
@@ -102,7 +103,7 @@ class SearchService < BaseService
end
def url_resource
- @_url_resource ||= ResolveURLService.new.call(@query, on_behalf_of: @account)
+ @url_resource ||= ResolveURLService.new.call(@query, on_behalf_of: @account)
end
def url_resource_symbol
@@ -112,11 +113,11 @@ class SearchService < BaseService
def full_text_searchable?
return false unless Chewy.enabled?
- statuses_search? && !@account.nil? && !((@query.start_with?('#') || @query.include?('@')) && !@query.include?(' '))
+ statuses_search? && !@account.nil? && !(@query.include?('@') && !@query.include?(' '))
end
def account_searchable?
- account_search? && !(@query.start_with?('#') || (@query.include?('@') && @query.include?(' ')))
+ account_search? && !(@query.include?('@') && @query.include?(' '))
end
def hashtag_searchable?
diff --git a/app/validators/status_length_validator.rb b/app/validators/status_length_validator.rb
index e107912b77..727d24d919 100644
--- a/app/validators/status_length_validator.rb
+++ b/app/validators/status_length_validator.rb
@@ -53,7 +53,7 @@ class StatusLengthValidator < ActiveModel::Validator
entity[:indices].last
end
- result << str[last_index..-1]
+ result << str[last_index..]
result
end
end
diff --git a/app/views/accounts/show.rss.ruby b/app/views/accounts/show.rss.ruby
index 7a77511ceb..33ba8364b4 100644
--- a/app/views/accounts/show.rss.ruby
+++ b/app/views/accounts/show.rss.ruby
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
RSS::Builder.build do |doc|
doc.title(display_name(@account))
doc.description(I18n.t('rss.descriptions.account', acct: @account.local_username_and_domain))
diff --git a/app/views/admin/trends/links/preview_card_providers/index.html.haml b/app/views/admin/trends/links/preview_card_providers/index.html.haml
index c3648c35e9..025270c128 100644
--- a/app/views/admin/trends/links/preview_card_providers/index.html.haml
+++ b/app/views/admin/trends/links/preview_card_providers/index.html.haml
@@ -29,7 +29,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
diff --git a/app/views/shared/_web_app.html.haml b/app/views/shared/_web_app.html.haml
index 998cee9fa9..9a1c3dc0bf 100644
--- a/app/views/shared/_web_app.html.haml
+++ b/app/views/shared/_web_app.html.haml
@@ -3,6 +3,7 @@
= preload_pack_asset 'features/compose.js', crossorigin: 'anonymous'
= preload_pack_asset 'features/home_timeline.js', crossorigin: 'anonymous'
= preload_pack_asset 'features/notifications.js', crossorigin: 'anonymous'
+ %meta{ name: 'initialPath', content: request.path }
%meta{ name: 'applicationServerKey', content: Rails.configuration.x.vapid_public_key }
diff --git a/app/views/tags/show.rss.ruby b/app/views/tags/show.rss.ruby
index bbda1ad4b5..5a2b4fb567 100644
--- a/app/views/tags/show.rss.ruby
+++ b/app/views/tags/show.rss.ruby
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
RSS::Builder.build do |doc|
doc.title("##{@tag.display_name}")
doc.description(I18n.t('rss.descriptions.tag', hashtag: @tag.display_name))
diff --git a/app/views/well_known/host_meta/show.xml.ruby b/app/views/well_known/host_meta/show.xml.ruby
index bb5a01a1b5..25c5cf3948 100644
--- a/app/views/well_known/host_meta/show.xml.ruby
+++ b/app/views/well_known/host_meta/show.xml.ruby
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
doc = Ox::Document.new(version: '1.0')
doc << Ox::Element.new('XRD').tap do |xrd|
diff --git a/app/workers/feed_insert_worker.rb b/app/workers/feed_insert_worker.rb
index bbd1962a74..e3e644c24f 100644
--- a/app/workers/feed_insert_worker.rb
+++ b/app/workers/feed_insert_worker.rb
@@ -2,21 +2,26 @@
class FeedInsertWorker
include Sidekiq::Worker
+ include DatabaseHelper
def perform(status_id, id, type = 'home', options = {})
- @type = type.to_sym
- @status = Status.find(status_id)
- @options = options.symbolize_keys
+ with_primary do
+ @type = type.to_sym
+ @status = Status.find(status_id)
+ @options = options.symbolize_keys
- case @type
- when :home, :tags
- @follower = Account.find(id)
- when :list
- @list = List.find(id)
- @follower = @list.account
+ case @type
+ when :home, :tags
+ @follower = Account.find(id)
+ when :list
+ @list = List.find(id)
+ @follower = @list.account
+ end
end
- check_and_insert
+ with_read_replica do
+ check_and_insert
+ end
rescue ActiveRecord::RecordNotFound
true
end
diff --git a/app/workers/merge_worker.rb b/app/workers/merge_worker.rb
index e526d2887b..8e1614ad21 100644
--- a/app/workers/merge_worker.rb
+++ b/app/workers/merge_worker.rb
@@ -3,9 +3,17 @@
class MergeWorker
include Sidekiq::Worker
include Redisable
+ include DatabaseHelper
def perform(from_account_id, into_account_id)
- FeedManager.instance.merge_into_home(Account.find(from_account_id), Account.find(into_account_id))
+ with_primary do
+ @from_account = Account.find(from_account_id)
+ @into_account = Account.find(into_account_id)
+ end
+
+ with_read_replica do
+ FeedManager.instance.merge_into_home(@from_account, @into_account)
+ end
rescue ActiveRecord::RecordNotFound
true
ensure
diff --git a/app/workers/regeneration_worker.rb b/app/workers/regeneration_worker.rb
index 5c13c894fe..4228f897d3 100644
--- a/app/workers/regeneration_worker.rb
+++ b/app/workers/regeneration_worker.rb
@@ -2,12 +2,18 @@
class RegenerationWorker
include Sidekiq::Worker
+ include DatabaseHelper
sidekiq_options lock: :until_executed
def perform(account_id, _ = :home)
- account = Account.find(account_id)
- PrecomputeFeedService.new.call(account)
+ with_primary do
+ @account = Account.find(account_id)
+ end
+
+ with_read_replica do
+ PrecomputeFeedService.new.call(@account)
+ end
rescue ActiveRecord::RecordNotFound
true
end
diff --git a/app/workers/unmerge_worker.rb b/app/workers/unmerge_worker.rb
index 1a23faae51..e8ac535dfe 100644
--- a/app/workers/unmerge_worker.rb
+++ b/app/workers/unmerge_worker.rb
@@ -2,11 +2,19 @@
class UnmergeWorker
include Sidekiq::Worker
+ include DatabaseHelper
sidekiq_options queue: 'pull'
def perform(from_account_id, into_account_id)
- FeedManager.instance.unmerge_from_home(Account.find(from_account_id), Account.find(into_account_id))
+ with_primary do
+ @from_account = Account.find(from_account_id)
+ @into_account = Account.find(into_account_id)
+ end
+
+ with_read_replica do
+ FeedManager.instance.unmerge_from_home(@from_account, @into_account)
+ end
rescue ActiveRecord::RecordNotFound
true
end
diff --git a/config/application.rb b/config/application.rb
index 8c4ec27e7f..aa0f80cd08 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
require_relative 'boot'
require 'rails'
@@ -58,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.
@@ -194,10 +204,10 @@ module Mastodon
config.to_prepare do
Doorkeeper::AuthorizationsController.layout 'modal'
Doorkeeper::AuthorizedApplicationsController.layout 'admin'
- Doorkeeper::Application.send :include, ApplicationExtension
- Doorkeeper::AccessToken.send :include, AccessTokenExtension
- Devise::FailureApp.send :include, AbstractController::Callbacks
- Devise::FailureApp.send :include, Localized
+ Doorkeeper::Application.include ApplicationExtension
+ Doorkeeper::AccessToken.include AccessTokenExtension
+ Devise::FailureApp.include AbstractController::Callbacks
+ Devise::FailureApp.include Localized
end
end
end
diff --git a/config/boot.rb b/config/boot.rb
index 3a1d1d6d24..3e44cbe581 100644
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
unless ENV.key?('RAILS_ENV')
STDERR.puts 'ERROR: Missing RAILS_ENV environment variable, please set it to "production", "development", or "test".'
exit 1
diff --git a/config/brakeman.ignore b/config/brakeman.ignore
index 80c5f6d4e5..9b9330a758 100644
--- a/config/brakeman.ignore
+++ b/config/brakeman.ignore
@@ -1,65 +1,5 @@
{
"ignored_warnings": [
- {
- "warning_type": "SQL Injection",
- "warning_code": 0,
- "fingerprint": "19df3740b8d02a9fe0eb52c939b4b87d3a2a591162a6adfa8d64e9c26aeebe6d",
- "check_name": "SQL",
- "message": "Possible SQL injection",
- "file": "app/models/status.rb",
- "line": 106,
- "link": "https://brakemanscanner.org/docs/warning_types/sql_injection/",
- "code": "result.joins(\"INNER JOIN statuses_tags t#{id} ON t#{id}.status_id = statuses.id AND t#{id}.tag_id = #{id}\")",
- "render_path": null,
- "location": {
- "type": "method",
- "class": "Status",
- "method": null
- },
- "user_input": "id",
- "confidence": "Weak",
- "note": ""
- },
- {
- "warning_type": "SQL Injection",
- "warning_code": 0,
- "fingerprint": "30dfe36e87fe1b8f239df9a33d576e44a9863f73b680198d4713be6540ae61d3",
- "check_name": "SQL",
- "message": "Possible SQL injection",
- "file": "app/models/trends/query.rb",
- "line": 76,
- "link": "https://brakemanscanner.org/docs/warning_types/sql_injection/",
- "code": "klass.joins(\"join unnest(array[#{ids.join(\",\")}]) with ordinality as x (id, ordering) on #{klass.table_name}.id = x.id\")",
- "render_path": null,
- "location": {
- "type": "method",
- "class": "Trends::Query",
- "method": "to_arel"
- },
- "user_input": "ids.join(\",\")",
- "confidence": "Weak",
- "note": ""
- },
- {
- "warning_type": "Redirect",
- "warning_code": 18,
- "fingerprint": "5fad11cd67f905fab9b1d5739d01384a1748ebe78c5af5ac31518201925265a7",
- "check_name": "Redirect",
- "message": "Possible unprotected redirect",
- "file": "app/controllers/remote_interaction_controller.rb",
- "line": 24,
- "link": "https://brakemanscanner.org/docs/warning_types/redirect/",
- "code": "redirect_to(RemoteFollow.new(resource_params).interact_address_for(Status.find(params[:id])))",
- "render_path": null,
- "location": {
- "type": "method",
- "class": "RemoteInteractionController",
- "method": "create"
- },
- "user_input": "RemoteFollow.new(resource_params).interact_address_for(Status.find(params[:id]))",
- "confidence": "High",
- "note": ""
- },
{
"warning_type": "Cross-Site Scripting",
"warning_code": 2,
@@ -88,46 +28,33 @@
},
"user_input": "(Unresolved Model).new.strike",
"confidence": "Weak",
+ "cwe_id": [
+ 79
+ ],
"note": ""
},
{
- "warning_type": "SQL Injection",
- "warning_code": 0,
- "fingerprint": "75fcd147b7611763ab6915faf8c5b0709e612b460f27c05c72d8b9bd0a6a77f8",
- "check_name": "SQL",
- "message": "Possible SQL injection",
- "file": "lib/mastodon/snowflake.rb",
- "line": 87,
- "link": "https://brakemanscanner.org/docs/warning_types/sql_injection/",
- "code": "connection.execute(\"CREATE OR REPLACE FUNCTION timestamp_id(table_name text)\\nRETURNS bigint AS\\n$$\\n DECLARE\\n time_part bigint;\\n sequence_base bigint;\\n tail bigint;\\n BEGIN\\n time_part := (\\n -- Get the time in milliseconds\\n ((date_part('epoch', now()) * 1000))::bigint\\n -- And shift it over two bytes\\n << 16);\\n\\n sequence_base := (\\n 'x' ||\\n -- Take the first two bytes (four hex characters)\\n substr(\\n -- Of the MD5 hash of the data we documented\\n md5(table_name || '#{SecureRandom.hex(16)}' || time_part::text),\\n 1, 4\\n )\\n -- And turn it into a bigint\\n )::bit(16)::bigint;\\n\\n -- Finally, add our sequence number to our base, and chop\\n -- it to the last two bytes\\n tail := (\\n (sequence_base + nextval(table_name || '_id_seq'))\\n & 65535);\\n\\n -- Return the time part and the sequence part. OR appears\\n -- faster here than addition, but they're equivalent:\\n -- time_part has no trailing two bytes, and tail is only\\n -- the last two bytes.\\n RETURN time_part | tail;\\n END\\n$$ LANGUAGE plpgsql VOLATILE;\\n\")",
+ "warning_type": "Denial of Service",
+ "warning_code": 76,
+ "fingerprint": "7b6abba5699755348e7ee82a4694bfbf574b41c7cce2d0db0f7c11ae3f983c72",
+ "check_name": "RegexDoS",
+ "message": "Model attribute used in regular expression",
+ "file": "lib/mastodon/cli/domains.rb",
+ "line": 128,
+ "link": "https://brakemanscanner.org/docs/warning_types/denial_of_service/",
+ "code": "/\\.?(#{DomainBlock.where(:severity => 1).pluck(:domain).map do\n Regexp.escape(domain)\n end.join(\"|\")})$/",
"render_path": null,
"location": {
"type": "method",
- "class": "Mastodon::Snowflake",
- "method": "define_timestamp_id"
+ "class": "Mastodon::CLI::Domains",
+ "method": "crawl"
},
- "user_input": "SecureRandom.hex(16)",
- "confidence": "Medium",
- "note": ""
- },
- {
- "warning_type": "Mass Assignment",
- "warning_code": 105,
- "fingerprint": "7631e93d0099506e7c3e5c91ba8d88523b00a41a0834ae30031a5a4e8bb3020a",
- "check_name": "PermitAttributes",
- "message": "Potentially dangerous key allowed for mass assignment",
- "file": "app/controllers/api/v2/search_controller.rb",
- "line": 28,
- "link": "https://brakemanscanner.org/docs/warning_types/mass_assignment/",
- "code": "params.permit(:type, :offset, :min_id, :max_id, :account_id)",
- "render_path": null,
- "location": {
- "type": "method",
- "class": "Api::V2::SearchController",
- "method": "search_params"
- },
- "user_input": ":account_id",
- "confidence": "High",
+ "user_input": "DomainBlock.where(:severity => 1).pluck(:domain)",
+ "confidence": "Weak",
+ "cwe_id": [
+ 20,
+ 185
+ ],
"note": ""
},
{
@@ -137,7 +64,7 @@
"check_name": "PermitAttributes",
"message": "Potentially dangerous key allowed for mass assignment",
"file": "app/controllers/api/v1/admin/reports_controller.rb",
- "line": 90,
+ "line": 88,
"link": "https://brakemanscanner.org/docs/warning_types/mass_assignment/",
"code": "params.permit(:resolved, :account_id, :target_account_id)",
"render_path": null,
@@ -148,6 +75,9 @@
},
"user_input": ":account_id",
"confidence": "High",
+ "cwe_id": [
+ 915
+ ],
"note": ""
},
{
@@ -157,7 +87,7 @@
"check_name": "PermitAttributes",
"message": "Potentially dangerous key allowed for mass assignment",
"file": "app/controllers/api/v1/notifications_controller.rb",
- "line": 81,
+ "line": 77,
"link": "https://brakemanscanner.org/docs/warning_types/mass_assignment/",
"code": "params.permit(:account_id, :types => ([]), :exclude_types => ([]))",
"render_path": null,
@@ -168,26 +98,32 @@
},
"user_input": ":account_id",
"confidence": "High",
+ "cwe_id": [
+ 915
+ ],
"note": ""
},
{
- "warning_type": "Redirect",
- "warning_code": 18,
- "fingerprint": "ba568ac09683f98740f663f3d850c31785900215992e8c090497d359a2563d50",
- "check_name": "Redirect",
- "message": "Possible unprotected redirect",
- "file": "app/controllers/remote_follow_controller.rb",
- "line": 21,
- "link": "https://brakemanscanner.org/docs/warning_types/redirect/",
- "code": "redirect_to(RemoteFollow.new(resource_params).subscribe_address_for(@account))",
+ "warning_type": "Mass Assignment",
+ "warning_code": 105,
+ "fingerprint": "b0dd0a26d24f5ede9713fe49210e9638be5f5548af9eee0b5a16fe9dbc80ffcd",
+ "check_name": "PermitAttributes",
+ "message": "Potentially dangerous key allowed for mass assignment",
+ "file": "app/controllers/api/v2/search_controller.rb",
+ "line": 42,
+ "link": "https://brakemanscanner.org/docs/warning_types/mass_assignment/",
+ "code": "params.permit(:type, :offset, :min_id, :max_id, :account_id, :following)",
"render_path": null,
"location": {
"type": "method",
- "class": "RemoteFollowController",
- "method": "create"
+ "class": "Api::V2::SearchController",
+ "method": "search_params"
},
- "user_input": "RemoteFollow.new(resource_params).subscribe_address_for(@account)",
+ "user_input": ":account_id",
"confidence": "High",
+ "cwe_id": [
+ 915
+ ],
"note": ""
},
{
@@ -218,18 +154,21 @@
},
"user_input": "(Unresolved Model).new.url",
"confidence": "Weak",
+ "cwe_id": [
+ 79
+ ],
"note": ""
},
{
"warning_type": "Mass Assignment",
"warning_code": 105,
- "fingerprint": "f9de0ca4b04ae4b51b74d98db14dcbb6dae6809e627b58e711019cf9b4a47866",
+ "fingerprint": "d0511f0287aea4ed9511f5a744f880cb15af77a8ec88f81b7365b00b642cf427",
"check_name": "PermitAttributes",
"message": "Potentially dangerous key allowed for mass assignment",
"file": "app/controllers/api/v1/reports_controller.rb",
"line": 26,
"link": "https://brakemanscanner.org/docs/warning_types/mass_assignment/",
- "code": "params.permit(:account_id, :comment, :category, :forward, :status_ids => ([]), :rule_ids => ([]))",
+ "code": "params.permit(:account_id, :comment, :category, :forward, :forward_to_domains => ([]), :status_ids => ([]), :rule_ids => ([]))",
"render_path": null,
"location": {
"type": "method",
@@ -238,9 +177,12 @@
},
"user_input": ":account_id",
"confidence": "High",
+ "cwe_id": [
+ 915
+ ],
"note": ""
}
],
- "updated": "2022-03-22 07:48:32 +0100",
- "brakeman_version": "5.2.1"
+ "updated": "2023-07-12 11:20:51 -0400",
+ "brakeman_version": "6.0.0"
}
diff --git a/config/database.yml b/config/database.yml
index 34acf2f19a..f7ecbd9814 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -27,10 +27,20 @@ test:
port: <%= ENV['DB_PORT'] %>
production:
- <<: *default
- database: <%= ENV['DB_NAME'] || 'mastodon_production' %>
- username: <%= ENV['DB_USER'] || 'mastodon' %>
- password: <%= (ENV['DB_PASS'] || '').to_json %>
- host: <%= ENV['DB_HOST'] || 'localhost' %>
- port: <%= ENV['DB_PORT'] || 5432 %>
- prepared_statements: <%= ENV['PREPARED_STATEMENTS'] || 'true' %>
+ primary:
+ <<: *default
+ database: <%= ENV['DB_NAME'] || 'mastodon_production' %>
+ username: <%= ENV['DB_USER'] || 'mastodon' %>
+ password: <%= (ENV['DB_PASS'] || '').to_json %>
+ host: <%= ENV['DB_HOST'] || 'localhost' %>
+ port: <%= ENV['DB_PORT'] || 5432 %>
+ prepared_statements: <%= ENV['PREPARED_STATEMENTS'] || 'true' %>
+ read:
+ <<: *default
+ database: <%= ENV['DB_REPLICA_NAME'] ||ENV['DB_NAME'] || 'mastodon_production' %>
+ username: <%= ENV['DB_REPLICA_USER'] ||ENV['DB_USER'] || 'mastodon' %>
+ password: <%= (ENV['DB_REPLICA_PASS'] || ENV['DB_PASS'] || '').to_json %>
+ host: <%= ENV['DB_REPLICA_HOST'] ||ENV['DB_HOST'] || 'localhost' %>
+ port: <%= ENV['DB_REPLICA_PORT'] ||ENV['DB_PORT'] || 5432 %>
+ prepared_statements: <%= ENV['PREPARED_STATEMENTS'] || 'true' %>
+ replica: true
diff --git a/config/environment.rb b/config/environment.rb
index caae5f1a0b..637d3829a9 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
# Load the Rails application.
require_relative 'application'
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 306324c046..31a3962458 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -1,8 +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
@@ -12,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
@@ -41,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.
@@ -57,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
- # 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
+ # Annotate rendered view with file names.
+ # config.action_view.annotate_rendered_view_with_filenames = true
+
+ # 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' }
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 018d3c1c22..4d80a66af6 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -1,3 +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.
@@ -19,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: {
@@ -40,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
@@ -50,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
@@ -73,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
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 08cc4c4d3c..d90dca429e 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -1,25 +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.
@@ -27,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' }
@@ -46,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
@@ -57,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')
diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml
index 035a0e999d..cb00a62d5f 100644
--- a/config/i18n-tasks.yml
+++ b/config/i18n-tasks.yml
@@ -63,6 +63,7 @@ ignore_unused:
- 'admin_mailer.new_appeal.actions.*'
- 'statuses.attached.*'
- 'move_handler.carry_{mutes,blocks}_over_text'
+ - 'admin_mailer.*.subject'
- 'notification_mailer.*'
- 'imports.overwrite_preambles.{following,blocking,muting,domain_blocking,bookmarks}_html'
- 'imports.preambles.{following,blocking,muting,domain_blocking,bookmarks}_html'
diff --git a/config/initializers/0_post_deployment_migrations.rb b/config/initializers/0_post_deployment_migrations.rb
index 61121ccd70..8e4d63a2e5 100644
--- a/config/initializers/0_post_deployment_migrations.rb
+++ b/config/initializers/0_post_deployment_migrations.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
# Post deployment migrations are included by default. This file must be loaded
# before other initializers as Rails may otherwise memoize a list of migrations
# excluding the post deployment migrations.
diff --git a/config/initializers/active_model_serializers.rb b/config/initializers/active_model_serializers.rb
index 0e69e1d96c..46f2bb8b98 100644
--- a/config/initializers/active_model_serializers.rb
+++ b/config/initializers/active_model_serializers.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
ActiveModelSerializers.config.tap do |config|
config.default_includes = '**'
end
diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb
index 89d2efab2b..f4556db399 100644
--- a/config/initializers/application_controller_renderer.rb
+++ b/config/initializers/application_controller_renderer.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
# Be sure to restart your server when you modify this file.
# ActiveSupport::Reloader.to_prepare do
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index 53b39718da..e1fd5f8ced 100644
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -1,13 +1,16 @@
+# frozen_string_literal: true
+
# Be sure to restart your server when you modify this file.
# 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
diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb
index 33699c3091..74f30e8875 100644
--- a/config/initializers/backtrace_silencers.rb
+++ b/config/initializers/backtrace_silencers.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
# Be sure to restart your server when you modify this file.
# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
diff --git a/config/initializers/cache_logging.rb b/config/initializers/cache_logging.rb
index 08aa807421..4f4b2ebe98 100644
--- a/config/initializers/cache_logging.rb
+++ b/config/initializers/cache_logging.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
# Log cache errors with Rail's logger
# This used to be the default in old Rails versions: https://github.com/rails/rails/commit/7fcf8590e788cef8b64cc266f75931c418902ca9#diff-f0748f0be8a653eea13369ebb1cadabcad71ede7cfaf20282447e64329817befL86
Rails.cache.logger = Rails.logger
diff --git a/config/initializers/chewy.rb b/config/initializers/chewy.rb
index daf4a5f326..dc90176213 100644
--- a/config/initializers/chewy.rb
+++ b/config/initializers/chewy.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
enabled = ENV['ES_ENABLED'] == 'true'
host = ENV.fetch('ES_HOST') { 'localhost' }
port = ENV.fetch('ES_PORT') { 9200 }
diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb
index 442bdd4e17..2e402bbd75 100644
--- a/config/initializers/content_security_policy.rb
+++ b/config/initializers/content_security_policy.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
# Define an application-wide content security policy
# For further information see the following documentation
# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy
diff --git a/config/initializers/cookie_rotator.rb b/config/initializers/cookie_rotator.rb
new file mode 100644
index 0000000000..349c363f14
--- /dev/null
+++ b/config/initializers/cookie_rotator.rb
@@ -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
diff --git a/config/initializers/cookies_serializer.rb b/config/initializers/cookies_serializer.rb
index 5a6a32d371..ee8dff9c99 100644
--- a/config/initializers/cookies_serializer.rb
+++ b/config/initializers/cookies_serializer.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
# Be sure to restart your server when you modify this file.
# Specify a serializer for the signed and encrypted cookie jars.
diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb
index 55f8c9c919..1fde35f9d0 100644
--- a/config/initializers/cors.rb
+++ b/config/initializers/cors.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
# Be sure to restart your server when you modify this file.
# Avoid CORS issues when API is called from the frontend app.
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index d7b252c3f2..7bbaff71f0 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
require 'devise/strategies/authenticatable'
Warden::Manager.after_set_user except: :fetch do |user, warden|
diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb
index ee9e32d253..ffce438008 100644
--- a/config/initializers/doorkeeper.rb
+++ b/config/initializers/doorkeeper.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
Doorkeeper.configure do
# Change the ORM that doorkeeper will use (needs plugins)
orm :active_record
diff --git a/config/initializers/fast_blank.rb b/config/initializers/fast_blank.rb
index f0b7cac78b..349fc023c3 100644
--- a/config/initializers/fast_blank.rb
+++ b/config/initializers/fast_blank.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
if String.method_defined?(:blank_as?)
class String
alias blank? blank_as?
diff --git a/config/initializers/ffmpeg.rb b/config/initializers/ffmpeg.rb
index cd5914eb55..30ea617fcd 100644
--- a/config/initializers/ffmpeg.rb
+++ b/config/initializers/ffmpeg.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
if ENV['FFMPEG_BINARY'].present?
FFMPEG.ffmpeg_binary = ENV['FFMPEG_BINARY']
end
diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb
index 06cb15bbb1..ca55f952da 100644
--- a/config/initializers/filter_parameter_logging.rb
+++ b/config/initializers/filter_parameter_logging.rb
@@ -1,4 +1,10 @@
+# frozen_string_literal: true
+
# 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
+]
diff --git a/config/initializers/http_client_proxy.rb b/config/initializers/http_client_proxy.rb
index b29e9edd75..7332ffb53b 100644
--- a/config/initializers/http_client_proxy.rb
+++ b/config/initializers/http_client_proxy.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
Rails.application.configure do
config.x.http_client_proxy = {}
diff --git a/config/initializers/httplog.rb b/config/initializers/httplog.rb
index 5cfc16a8b5..02fcef4120 100644
--- a/config/initializers/httplog.rb
+++ b/config/initializers/httplog.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
HttpLog.configure do |config|
config.logger = Rails.logger
config.color = { color: :yellow }
diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb
index 95f0b5788b..0dad009b1f 100644
--- a/config/initializers/inflections.rb
+++ b/config/initializers/inflections.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
# Be sure to restart your server when you modify this file.
# Add new inflection rules using the following format. Inflections
diff --git a/config/initializers/mail_delivery_job.rb b/config/initializers/mail_delivery_job.rb
index 3278173966..5c8af84216 100644
--- a/config/initializers/mail_delivery_job.rb
+++ b/config/initializers/mail_delivery_job.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
ActionMailer::MailDeliveryJob.class_eval do
discard_on ActiveJob::DeserializationError
end
diff --git a/config/initializers/makara.rb b/config/initializers/makara.rb
deleted file mode 100644
index dc88fa63cd..0000000000
--- a/config/initializers/makara.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-Makara::Cookie::DEFAULT_OPTIONS[:same_site] = :lax
-Makara::Cookie::DEFAULT_OPTIONS[:secure] = Rails.env.production? || ENV['LOCAL_HTTPS'] == 'true'
diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb
index 58a6c0063e..b843c09ead 100644
--- a/config/initializers/mime_types.rb
+++ b/config/initializers/mime_types.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
# Be sure to restart your server when you modify this file.
Mime::Type.register 'application/json', :json, %w(text/x-json application/jsonrequest application/jrd+json application/activity+json application/ld+json)
diff --git a/config/initializers/new_framework_defaults_7_0.rb b/config/initializers/new_framework_defaults_7_0.rb
new file mode 100644
index 0000000000..edaf819447
--- /dev/null
+++ b/config/initializers/new_framework_defaults_7_0.rb
@@ -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
diff --git a/config/initializers/oj.rb b/config/initializers/oj.rb
index de3e17f2eb..9b2d908637 100644
--- a/config/initializers/oj.rb
+++ b/config/initializers/oj.rb
@@ -1 +1,3 @@
+# frozen_string_literal: true
+
Oj.default_options = { mode: :compat, time_format: :ruby, use_to_json: true }
diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb
index c2cd444f08..0f968bd66a 100644
--- a/config/initializers/omniauth.rb
+++ b/config/initializers/omniauth.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
Rails.application.config.middleware.use OmniAuth::Builder do
# Vanilla omniauth strategies
end
diff --git a/config/initializers/open_uri_redirection.rb b/config/initializers/open_uri_redirection.rb
index 0e57c53c63..cf1f27c5c5 100644
--- a/config/initializers/open_uri_redirection.rb
+++ b/config/initializers/open_uri_redirection.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
require 'open-uri'
module OpenURI
diff --git a/config/initializers/permissions_policy.rb b/config/initializers/permissions_policy.rb
index 00f64d71b0..50bcf4eade 100644
--- a/config/initializers/permissions_policy.rb
+++ b/config/initializers/permissions_policy.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
# Define an application-wide HTTP permissions policy. For further
# information see https://developers.google.com/web/updates/2018/06/feature-policy
#
diff --git a/config/initializers/pghero.rb b/config/initializers/pghero.rb
index 0c77d6d0ff..dc26397b34 100644
--- a/config/initializers/pghero.rb
+++ b/config/initializers/pghero.rb
@@ -1 +1,3 @@
+# frozen_string_literal: true
+
PgHero.show_migrations = Rails.env.development?
diff --git a/config/initializers/preload_link_headers.rb b/config/initializers/preload_link_headers.rb
index 364a7cc1be..168b887811 100644
--- a/config/initializers/preload_link_headers.rb
+++ b/config/initializers/preload_link_headers.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
# Since Rails 6.1, ActionView adds preload links for javascript files
# in the Links header per default.
diff --git a/config/initializers/premailer_rails.rb b/config/initializers/premailer_rails.rb
index 31c02dffab..98b2082719 100644
--- a/config/initializers/premailer_rails.rb
+++ b/config/initializers/premailer_rails.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
require_relative '../../lib/mastodon/premailer_webpack_strategy'
Premailer::Rails.config.merge!(remove_ids: true,
diff --git a/config/initializers/rack_attack.rb b/config/initializers/rack_attack.rb
index da0b04af11..d0af0fe940 100644
--- a/config/initializers/rack_attack.rb
+++ b/config/initializers/rack_attack.rb
@@ -5,9 +5,9 @@ require 'doorkeeper/grape/authorization_decorator'
class Rack::Attack
class Request
def authenticated_token
- return @token if defined?(@token)
+ return @authenticated_token if defined?(@authenticated_token)
- @token = Doorkeeper::OAuth::Token.authenticate(
+ @authenticated_token = Doorkeeper::OAuth::Token.authenticate(
Doorkeeper::Grape::AuthorizationDecorator.new(self),
*Doorkeeper.configuration.access_token_methods
)
diff --git a/config/initializers/rack_attack_logging.rb b/config/initializers/rack_attack_logging.rb
index ab4822e96b..458bc799f9 100644
--- a/config/initializers/rack_attack_logging.rb
+++ b/config/initializers/rack_attack_logging.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
ActiveSupport::Notifications.subscribe(/rack_attack/) do |_name, _start, _finish, _request_id, payload|
req = payload[:request]
diff --git a/config/initializers/redis.rb b/config/initializers/redis.rb
index f2bbd1e456..8865d85780 100644
--- a/config/initializers/redis.rb
+++ b/config/initializers/redis.rb
@@ -1 +1,3 @@
+# frozen_string_literal: true
+
Redis.sadd_returns_boolean = false
diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
index 210964b1f3..b29e0a8159 100644
--- a/config/initializers/session_store.rb
+++ b/config/initializers/session_store.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
# Be sure to restart your server when you modify this file.
Rails.application.config.session_store :cookie_store,
diff --git a/config/initializers/simple_form.rb b/config/initializers/simple_form.rb
index df81259cba..3cdaed7d03 100644
--- a/config/initializers/simple_form.rb
+++ b/config/initializers/simple_form.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
# Use this setup block to configure all options available in SimpleForm.
module AppendComponent
diff --git a/config/initializers/stoplight.rb b/config/initializers/stoplight.rb
index 8c3c5755ae..72fe40600e 100644
--- a/config/initializers/stoplight.rb
+++ b/config/initializers/stoplight.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
require 'stoplight'
Rails.application.reloader.to_prepare do
diff --git a/config/initializers/trusted_proxies.rb b/config/initializers/trusted_proxies.rb
index 3c2afd8cdb..aa2f4510c2 100644
--- a/config/initializers/trusted_proxies.rb
+++ b/config/initializers/trusted_proxies.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
module Rack
class Request
def trusted_proxy?(ip)
diff --git a/config/initializers/twitter_regex.rb b/config/initializers/twitter_regex.rb
index 2e80cabcdb..4673fbdd41 100644
--- a/config/initializers/twitter_regex.rb
+++ b/config/initializers/twitter_regex.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
module Twitter::TwitterText
class Configuration
def emoji_parsing_enabled
diff --git a/config/initializers/webauthn.rb b/config/initializers/webauthn.rb
index a4f027947c..924ce6d877 100644
--- a/config/initializers/webauthn.rb
+++ b/config/initializers/webauthn.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
WebAuthn.configure do |config|
# This value needs to match `window.location.origin` evaluated by
# the User Agent during registration and authentication ceremonies.
diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb
index bbfc3961bf..2f3c0db471 100644
--- a/config/initializers/wrap_parameters.rb
+++ b/config/initializers/wrap_parameters.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
# Be sure to restart your server when you modify this file.
# This file contains settings for ActionController::ParamsWrapper which
diff --git a/config/locales/sr-Latn.rb b/config/locales/sr-Latn.rb
index fc2dafc94c..b7a403a8e1 100644
--- a/config/locales/sr-Latn.rb
+++ b/config/locales/sr-Latn.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
require 'rails_i18n/common_pluralizations/romanian'
::RailsI18n::Pluralization::Romanian.with_locale(:'sr-Latn')
diff --git a/config/locales/sr.rb b/config/locales/sr.rb
index 86b89a07e1..0605de3348 100644
--- a/config/locales/sr.rb
+++ b/config/locales/sr.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
require 'rails_i18n/common_pluralizations/romanian'
::RailsI18n::Pluralization::Romanian.with_locale(:sr)
diff --git a/config/puma.rb b/config/puma.rb
index c4e2b0b85c..ac9ccac209 100644
--- a/config/puma.rb
+++ b/config/puma.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
persistent_timeout ENV.fetch('PERSISTENT_TIMEOUT') { 20 }.to_i
max_threads_count = ENV.fetch('MAX_THREADS') { 5 }.to_i
diff --git a/config/routes.rb b/config/routes.rb
index 4eda9b0bea..94da8b2f44 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -33,6 +33,7 @@ Rails.application.routes.draw do
/mutes
/followed_tags
/statuses/(*any)
+ /deck/(*any)
).freeze
root 'home#index'
diff --git a/config/routes/admin.rb b/config/routes/admin.rb
index 3f8d689057..b7edca79e7 100644
--- a/config/routes/admin.rb
+++ b/config/routes/admin.rb
@@ -68,7 +68,7 @@ namespace :admin do
end
end
- resources :instances, only: [:index, :show, :destroy], constraints: { id: %r{[^/]+} } do
+ resources :instances, only: [:index, :show, :destroy], constraints: { id: %r{[^/]+} }, format: 'html' do
member do
post :clear_delivery_errors
post :restart_delivery
diff --git a/config/routes/api.rb b/config/routes/api.rb
index 89c2301aac..9a04565942 100644
--- a/config/routes/api.rb
+++ b/config/routes/api.rb
@@ -311,7 +311,7 @@ namespace :api, format: false do
namespace :web do
resource :settings, only: [:update]
- resource :embed, only: [:create]
+ resources :embeds, only: [:show]
resources :push_subscriptions, only: [:create] do
member do
put :update
diff --git a/db/migrate/20160220174730_create_accounts.rb b/db/migrate/20160220174730_create_accounts.rb
index daf7c65526..d23ed1f38f 100644
--- a/db/migrate/20160220174730_create_accounts.rb
+++ b/db/migrate/20160220174730_create_accounts.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateAccounts < ActiveRecord::Migration[4.2]
def change
create_table :accounts do |t|
diff --git a/db/migrate/20160220211917_create_statuses.rb b/db/migrate/20160220211917_create_statuses.rb
index b174685687..b8439eff8b 100644
--- a/db/migrate/20160220211917_create_statuses.rb
+++ b/db/migrate/20160220211917_create_statuses.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateStatuses < ActiveRecord::Migration[4.2]
def change
create_table :statuses do |t|
diff --git a/db/migrate/20160221003140_create_users.rb b/db/migrate/20160221003140_create_users.rb
index 267466a949..076ee5da38 100644
--- a/db/migrate/20160221003140_create_users.rb
+++ b/db/migrate/20160221003140_create_users.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateUsers < ActiveRecord::Migration[4.2]
def change
create_table :users do |t|
diff --git a/db/migrate/20160221003621_create_follows.rb b/db/migrate/20160221003621_create_follows.rb
index 17287d09bc..65d745e70c 100644
--- a/db/migrate/20160221003621_create_follows.rb
+++ b/db/migrate/20160221003621_create_follows.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateFollows < ActiveRecord::Migration[4.2]
def change
create_table :follows do |t|
diff --git a/db/migrate/20160222122600_create_stream_entries.rb b/db/migrate/20160222122600_create_stream_entries.rb
index 00782abc33..598cc469ec 100644
--- a/db/migrate/20160222122600_create_stream_entries.rb
+++ b/db/migrate/20160222122600_create_stream_entries.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateStreamEntries < ActiveRecord::Migration[4.2]
def change
create_table :stream_entries do |t|
diff --git a/db/migrate/20160222143943_add_profile_fields_to_accounts.rb b/db/migrate/20160222143943_add_profile_fields_to_accounts.rb
index cf279a535d..058eb702c3 100644
--- a/db/migrate/20160222143943_add_profile_fields_to_accounts.rb
+++ b/db/migrate/20160222143943_add_profile_fields_to_accounts.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddProfileFieldsToAccounts < ActiveRecord::Migration[4.2]
def change
add_column :accounts, :note, :text, null: false, default: ''
diff --git a/db/migrate/20160223162837_add_metadata_to_statuses.rb b/db/migrate/20160223162837_add_metadata_to_statuses.rb
index d11d5f5cdf..c564d69422 100644
--- a/db/migrate/20160223162837_add_metadata_to_statuses.rb
+++ b/db/migrate/20160223162837_add_metadata_to_statuses.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddMetadataToStatuses < ActiveRecord::Migration[4.2]
def change
add_column :statuses, :in_reply_to_id, :integer, null: true
diff --git a/db/migrate/20160223164502_make_uris_nullable_in_statuses.rb b/db/migrate/20160223164502_make_uris_nullable_in_statuses.rb
index 24b9b6e190..fff07093c8 100644
--- a/db/migrate/20160223164502_make_uris_nullable_in_statuses.rb
+++ b/db/migrate/20160223164502_make_uris_nullable_in_statuses.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class MakeUrisNullableInStatuses < ActiveRecord::Migration[4.2]
def change
change_column :statuses, :uri, :string, null: true, default: nil
diff --git a/db/migrate/20160223165723_add_url_to_statuses.rb b/db/migrate/20160223165723_add_url_to_statuses.rb
index fee7f9c59f..6e4884afa9 100644
--- a/db/migrate/20160223165723_add_url_to_statuses.rb
+++ b/db/migrate/20160223165723_add_url_to_statuses.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddURLToStatuses < ActiveRecord::Migration[4.2]
def change
add_column :statuses, :url, :string, null: true, default: nil
diff --git a/db/migrate/20160223165855_add_url_to_accounts.rb b/db/migrate/20160223165855_add_url_to_accounts.rb
index a4db8814af..a6d0e50031 100644
--- a/db/migrate/20160223165855_add_url_to_accounts.rb
+++ b/db/migrate/20160223165855_add_url_to_accounts.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddURLToAccounts < ActiveRecord::Migration[4.2]
def change
add_column :accounts, :url, :string, null: true, default: nil
diff --git a/db/migrate/20160223171800_create_favourites.rb b/db/migrate/20160223171800_create_favourites.rb
index 64f5cf1197..dda1c30801 100644
--- a/db/migrate/20160223171800_create_favourites.rb
+++ b/db/migrate/20160223171800_create_favourites.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateFavourites < ActiveRecord::Migration[4.2]
def change
create_table :favourites do |t|
diff --git a/db/migrate/20160224223247_create_mentions.rb b/db/migrate/20160224223247_create_mentions.rb
index 6dd742d3b1..92df6d01d2 100644
--- a/db/migrate/20160224223247_create_mentions.rb
+++ b/db/migrate/20160224223247_create_mentions.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateMentions < ActiveRecord::Migration[4.2]
def change
create_table :mentions do |t|
diff --git a/db/migrate/20160227230233_add_attachment_avatar_to_accounts.rb b/db/migrate/20160227230233_add_attachment_avatar_to_accounts.rb
index c107c4c7fa..3666abf1cc 100644
--- a/db/migrate/20160227230233_add_attachment_avatar_to_accounts.rb
+++ b/db/migrate/20160227230233_add_attachment_avatar_to_accounts.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddAttachmentAvatarToAccounts < ActiveRecord::Migration[4.2]
def self.up
change_table :accounts do |t|
diff --git a/db/migrate/20160305115639_add_devise_to_users.rb b/db/migrate/20160305115639_add_devise_to_users.rb
index fa1e521b2c..5b9a817c60 100644
--- a/db/migrate/20160305115639_add_devise_to_users.rb
+++ b/db/migrate/20160305115639_add_devise_to_users.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddDeviseToUsers < ActiveRecord::Migration[4.2]
def self.up
change_table(:users) do |t|
diff --git a/db/migrate/20160306172223_create_doorkeeper_tables.rb b/db/migrate/20160306172223_create_doorkeeper_tables.rb
index 462343e888..0137520d27 100644
--- a/db/migrate/20160306172223_create_doorkeeper_tables.rb
+++ b/db/migrate/20160306172223_create_doorkeeper_tables.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateDoorkeeperTables < ActiveRecord::Migration[4.2]
def change
create_table :oauth_applications do |t|
diff --git a/db/migrate/20160312193225_add_attachment_header_to_accounts.rb b/db/migrate/20160312193225_add_attachment_header_to_accounts.rb
index ac9562cbbe..37108fc189 100644
--- a/db/migrate/20160312193225_add_attachment_header_to_accounts.rb
+++ b/db/migrate/20160312193225_add_attachment_header_to_accounts.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddAttachmentHeaderToAccounts < ActiveRecord::Migration[4.2]
def self.up
change_table :accounts do |t|
diff --git a/db/migrate/20160314164231_add_owner_to_application.rb b/db/migrate/20160314164231_add_owner_to_application.rb
index 553c18b5eb..d4eda38df0 100644
--- a/db/migrate/20160314164231_add_owner_to_application.rb
+++ b/db/migrate/20160314164231_add_owner_to_application.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddOwnerToApplication < ActiveRecord::Migration[4.2]
def change
add_column :oauth_applications, :owner_id, :integer, null: true
diff --git a/db/migrate/20160316103650_add_missing_indices.rb b/db/migrate/20160316103650_add_missing_indices.rb
index 8b6bc5771b..76ac7e3904 100644
--- a/db/migrate/20160316103650_add_missing_indices.rb
+++ b/db/migrate/20160316103650_add_missing_indices.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddMissingIndices < ActiveRecord::Migration[4.2]
def change
add_index :users, :account_id
diff --git a/db/migrate/20160322193748_add_avatar_remote_url_to_accounts.rb b/db/migrate/20160322193748_add_avatar_remote_url_to_accounts.rb
index 0792863a37..fbfd0fc2df 100644
--- a/db/migrate/20160322193748_add_avatar_remote_url_to_accounts.rb
+++ b/db/migrate/20160322193748_add_avatar_remote_url_to_accounts.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddAvatarRemoteURLToAccounts < ActiveRecord::Migration[4.2]
def change
add_column :accounts, :avatar_remote_url, :string, null: true, default: nil
diff --git a/db/migrate/20160325130944_add_admin_to_users.rb b/db/migrate/20160325130944_add_admin_to_users.rb
index b0cd35e008..6b701ebcc8 100644
--- a/db/migrate/20160325130944_add_admin_to_users.rb
+++ b/db/migrate/20160325130944_add_admin_to_users.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddAdminToUsers < ActiveRecord::Migration[4.2]
def change
add_column :users, :admin, :boolean, default: false
diff --git a/db/migrate/20160826155805_add_superapp_to_oauth_applications.rb b/db/migrate/20160826155805_add_superapp_to_oauth_applications.rb
index a1b92fada3..af8bd922fc 100644
--- a/db/migrate/20160826155805_add_superapp_to_oauth_applications.rb
+++ b/db/migrate/20160826155805_add_superapp_to_oauth_applications.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddSuperappToOauthApplications < ActiveRecord::Migration[5.0]
def change
add_column :oauth_applications, :superapp, :boolean, default: false, null: false
diff --git a/db/migrate/20160905150353_create_media_attachments.rb b/db/migrate/20160905150353_create_media_attachments.rb
index 32d0897d86..3903a7b9a1 100644
--- a/db/migrate/20160905150353_create_media_attachments.rb
+++ b/db/migrate/20160905150353_create_media_attachments.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateMediaAttachments < ActiveRecord::Migration[5.0]
def change
create_table :media_attachments do |t|
diff --git a/db/migrate/20160919221059_add_subscription_expires_at_to_accounts.rb b/db/migrate/20160919221059_add_subscription_expires_at_to_accounts.rb
index 5fd7f39e6a..12aaffa97a 100644
--- a/db/migrate/20160919221059_add_subscription_expires_at_to_accounts.rb
+++ b/db/migrate/20160919221059_add_subscription_expires_at_to_accounts.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddSubscriptionExpiresAtToAccounts < ActiveRecord::Migration[5.0]
def change
add_column :accounts, :subscription_expires_at, :datetime, null: true, default: nil
diff --git a/db/migrate/20160920003904_remove_verify_token_from_accounts.rb b/db/migrate/20160920003904_remove_verify_token_from_accounts.rb
index ab6a6c84cb..132b4c9741 100644
--- a/db/migrate/20160920003904_remove_verify_token_from_accounts.rb
+++ b/db/migrate/20160920003904_remove_verify_token_from_accounts.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class RemoveVerifyTokenFromAccounts < ActiveRecord::Migration[5.0]
def change
remove_column :accounts, :verify_token, :string, null: false, default: ''
diff --git a/db/migrate/20160926213048_remove_owner_from_application.rb b/db/migrate/20160926213048_remove_owner_from_application.rb
index a42f53a294..0be01dc4cb 100644
--- a/db/migrate/20160926213048_remove_owner_from_application.rb
+++ b/db/migrate/20160926213048_remove_owner_from_application.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class RemoveOwnerFromApplication < ActiveRecord::Migration[5.0]
def change
remove_index :oauth_applications, [:owner_id, :owner_type]
diff --git a/db/migrate/20161003142332_add_confirmable_to_users.rb b/db/migrate/20161003142332_add_confirmable_to_users.rb
index cbef4c4df2..b33c9eadad 100644
--- a/db/migrate/20161003142332_add_confirmable_to_users.rb
+++ b/db/migrate/20161003142332_add_confirmable_to_users.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddConfirmableToUsers < ActiveRecord::Migration[5.0]
def change
add_column :users, :confirmation_token, :string
diff --git a/db/migrate/20161003145426_create_blocks.rb b/db/migrate/20161003145426_create_blocks.rb
index 14bae1e7f2..fec513c657 100644
--- a/db/migrate/20161003145426_create_blocks.rb
+++ b/db/migrate/20161003145426_create_blocks.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateBlocks < ActiveRecord::Migration[5.0]
def change
create_table :blocks do |t|
diff --git a/db/migrate/20161006213403_rails_settings_migration.rb b/db/migrate/20161006213403_rails_settings_migration.rb
index 02932610c2..401b7a83b7 100644
--- a/db/migrate/20161006213403_rails_settings_migration.rb
+++ b/db/migrate/20161006213403_rails_settings_migration.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
MIGRATION_BASE_CLASS = if ActiveRecord::VERSION::MAJOR >= 5
ActiveRecord::Migration[5.0]
else
diff --git a/db/migrate/20161009120834_create_domain_blocks.rb b/db/migrate/20161009120834_create_domain_blocks.rb
index dda1606d3f..9006f601ab 100644
--- a/db/migrate/20161009120834_create_domain_blocks.rb
+++ b/db/migrate/20161009120834_create_domain_blocks.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateDomainBlocks < ActiveRecord::Migration[5.0]
def change
create_table :domain_blocks do |t|
diff --git a/db/migrate/20161027172456_add_silenced_to_accounts.rb b/db/migrate/20161027172456_add_silenced_to_accounts.rb
index cd3b9f8d03..1b06d381f0 100644
--- a/db/migrate/20161027172456_add_silenced_to_accounts.rb
+++ b/db/migrate/20161027172456_add_silenced_to_accounts.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddSilencedToAccounts < ActiveRecord::Migration[5.0]
def change
add_column :accounts, :silenced, :boolean, null: false, default: false
diff --git a/db/migrate/20161104173623_create_tags.rb b/db/migrate/20161104173623_create_tags.rb
index d6831ff8f3..d8f120956a 100644
--- a/db/migrate/20161104173623_create_tags.rb
+++ b/db/migrate/20161104173623_create_tags.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateTags < ActiveRecord::Migration[5.0]
def change
create_table :tags do |t|
diff --git a/db/migrate/20161105130633_create_statuses_tags_join_table.rb b/db/migrate/20161105130633_create_statuses_tags_join_table.rb
index 8a436c6ea0..b140f84c4a 100644
--- a/db/migrate/20161105130633_create_statuses_tags_join_table.rb
+++ b/db/migrate/20161105130633_create_statuses_tags_join_table.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateStatusesTagsJoinTable < ActiveRecord::Migration[5.0]
def change
create_join_table :statuses, :tags do |t|
diff --git a/db/migrate/20161116162355_add_locale_to_users.rb b/db/migrate/20161116162355_add_locale_to_users.rb
index ec1a42ef1e..ce8e55119a 100644
--- a/db/migrate/20161116162355_add_locale_to_users.rb
+++ b/db/migrate/20161116162355_add_locale_to_users.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddLocaleToUsers < ActiveRecord::Migration[5.0]
def change
add_column :users, :locale, :string
diff --git a/db/migrate/20161119211120_create_notifications.rb b/db/migrate/20161119211120_create_notifications.rb
index e6bf1d66ee..5f2e8e71bc 100644
--- a/db/migrate/20161119211120_create_notifications.rb
+++ b/db/migrate/20161119211120_create_notifications.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateNotifications < ActiveRecord::Migration[5.0]
def change
create_table :notifications do |t|
diff --git a/db/migrate/20161122163057_remove_unneeded_indexes.rb b/db/migrate/20161122163057_remove_unneeded_indexes.rb
index 12cc9c5b23..7ed92127d7 100644
--- a/db/migrate/20161122163057_remove_unneeded_indexes.rb
+++ b/db/migrate/20161122163057_remove_unneeded_indexes.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class RemoveUnneededIndexes < ActiveRecord::Migration[5.0]
def change
remove_index :notifications, name: 'index_notifications_on_account_id'
diff --git a/db/migrate/20161123093447_add_sensitive_to_statuses.rb b/db/migrate/20161123093447_add_sensitive_to_statuses.rb
index 109f761ed7..7487b2ee33 100644
--- a/db/migrate/20161123093447_add_sensitive_to_statuses.rb
+++ b/db/migrate/20161123093447_add_sensitive_to_statuses.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddSensitiveToStatuses < ActiveRecord::Migration[5.0]
def change
add_column :statuses, :sensitive, :boolean, default: false
diff --git a/db/migrate/20161128103007_create_subscriptions.rb b/db/migrate/20161128103007_create_subscriptions.rb
index 46443680ad..c6ddc5d3eb 100644
--- a/db/migrate/20161128103007_create_subscriptions.rb
+++ b/db/migrate/20161128103007_create_subscriptions.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateSubscriptions < ActiveRecord::Migration[5.0]
def change
create_table :subscriptions do |t|
diff --git a/db/migrate/20161130142058_add_last_successful_delivery_at_to_subscriptions.rb b/db/migrate/20161130142058_add_last_successful_delivery_at_to_subscriptions.rb
index 614155b910..6f06794f6a 100644
--- a/db/migrate/20161130142058_add_last_successful_delivery_at_to_subscriptions.rb
+++ b/db/migrate/20161130142058_add_last_successful_delivery_at_to_subscriptions.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddLastSuccessfulDeliveryAtToSubscriptions < ActiveRecord::Migration[5.0]
def change
add_column :subscriptions, :last_successful_delivery_at, :datetime, null: true, default: nil
diff --git a/db/migrate/20161130185319_add_visibility_to_statuses.rb b/db/migrate/20161130185319_add_visibility_to_statuses.rb
index 3ad2abe011..e38755b563 100644
--- a/db/migrate/20161130185319_add_visibility_to_statuses.rb
+++ b/db/migrate/20161130185319_add_visibility_to_statuses.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddVisibilityToStatuses < ActiveRecord::Migration[5.0]
def change
add_column :statuses, :visibility, :integer, null: false, default: 0
diff --git a/db/migrate/20161202132159_add_in_reply_to_account_id_to_statuses.rb b/db/migrate/20161202132159_add_in_reply_to_account_id_to_statuses.rb
index 3a559ccd6d..111c48610d 100644
--- a/db/migrate/20161202132159_add_in_reply_to_account_id_to_statuses.rb
+++ b/db/migrate/20161202132159_add_in_reply_to_account_id_to_statuses.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddInReplyToAccountIdToStatuses < ActiveRecord::Migration[5.0]
def up
add_column :statuses, :in_reply_to_account_id, :integer, null: true, default: nil
diff --git a/db/migrate/20161203164520_add_from_account_id_to_notifications.rb b/db/migrate/20161203164520_add_from_account_id_to_notifications.rb
index 142adbe9ca..484cb9f4dc 100644
--- a/db/migrate/20161203164520_add_from_account_id_to_notifications.rb
+++ b/db/migrate/20161203164520_add_from_account_id_to_notifications.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddFromAccountIdToNotifications < ActiveRecord::Migration[5.0]
def up
add_column :notifications, :from_account_id, :integer
diff --git a/db/migrate/20161205214545_add_suspended_to_accounts.rb b/db/migrate/20161205214545_add_suspended_to_accounts.rb
index 0d7e2beac7..d389cd0e32 100644
--- a/db/migrate/20161205214545_add_suspended_to_accounts.rb
+++ b/db/migrate/20161205214545_add_suspended_to_accounts.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddSuspendedToAccounts < ActiveRecord::Migration[5.0]
def change
add_column :accounts, :suspended, :boolean, null: false, default: false
diff --git a/db/migrate/20161221152630_add_hidden_to_stream_entries.rb b/db/migrate/20161221152630_add_hidden_to_stream_entries.rb
index 0d2def7f87..c3e0bb4546 100644
--- a/db/migrate/20161221152630_add_hidden_to_stream_entries.rb
+++ b/db/migrate/20161221152630_add_hidden_to_stream_entries.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddHiddenToStreamEntries < ActiveRecord::Migration[5.0]
def change
add_column :stream_entries, :hidden, :boolean, null: false, default: false
diff --git a/db/migrate/20161222201034_add_locked_to_accounts.rb b/db/migrate/20161222201034_add_locked_to_accounts.rb
index c246a90cef..367dbb3952 100644
--- a/db/migrate/20161222201034_add_locked_to_accounts.rb
+++ b/db/migrate/20161222201034_add_locked_to_accounts.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddLockedToAccounts < ActiveRecord::Migration[5.0]
def change
add_column :accounts, :locked, :boolean, null: false, default: false
diff --git a/db/migrate/20161222204147_create_follow_requests.rb b/db/migrate/20161222204147_create_follow_requests.rb
index fbe5edf3de..572c2215fd 100644
--- a/db/migrate/20161222204147_create_follow_requests.rb
+++ b/db/migrate/20161222204147_create_follow_requests.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateFollowRequests < ActiveRecord::Migration[5.0]
def change
create_table :follow_requests do |t|
diff --git a/db/migrate/20170105224407_add_shortcode_to_media_attachments.rb b/db/migrate/20170105224407_add_shortcode_to_media_attachments.rb
index fba46a4b63..5f1dd62af0 100644
--- a/db/migrate/20170105224407_add_shortcode_to_media_attachments.rb
+++ b/db/migrate/20170105224407_add_shortcode_to_media_attachments.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddShortcodeToMediaAttachments < ActiveRecord::Migration[5.0]
def up
add_column :media_attachments, :shortcode, :string, null: true, default: nil
diff --git a/db/migrate/20170109120109_create_web_settings.rb b/db/migrate/20170109120109_create_web_settings.rb
index 2aeae1f919..75ad5fa915 100644
--- a/db/migrate/20170109120109_create_web_settings.rb
+++ b/db/migrate/20170109120109_create_web_settings.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateWebSettings < ActiveRecord::Migration[5.0]
def change
create_table :web_settings do |t|
diff --git a/db/migrate/20170112154826_migrate_settings.rb b/db/migrate/20170112154826_migrate_settings.rb
index 0f5afe1d39..a1dc0fe4e4 100644
--- a/db/migrate/20170112154826_migrate_settings.rb
+++ b/db/migrate/20170112154826_migrate_settings.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class MigrateSettings < ActiveRecord::Migration[4.2]
def up
remove_index :settings, [:target_type, :target_id, :var]
diff --git a/db/migrate/20170114194937_add_application_to_statuses.rb b/db/migrate/20170114194937_add_application_to_statuses.rb
index b699db2ac6..c8e8310c1e 100644
--- a/db/migrate/20170114194937_add_application_to_statuses.rb
+++ b/db/migrate/20170114194937_add_application_to_statuses.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddApplicationToStatuses < ActiveRecord::Migration[5.0]
def change
add_column :statuses, :application_id, :int
diff --git a/db/migrate/20170114203041_add_website_to_oauth_application.rb b/db/migrate/20170114203041_add_website_to_oauth_application.rb
index ee674be722..5a0f2b7901 100644
--- a/db/migrate/20170114203041_add_website_to_oauth_application.rb
+++ b/db/migrate/20170114203041_add_website_to_oauth_application.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddWebsiteToOauthApplication < ActiveRecord::Migration[5.0]
def change
add_column :oauth_applications, :website, :string
diff --git a/db/migrate/20170119214911_create_preview_cards.rb b/db/migrate/20170119214911_create_preview_cards.rb
index 70ed91bbd5..41a4da6b3d 100644
--- a/db/migrate/20170119214911_create_preview_cards.rb
+++ b/db/migrate/20170119214911_create_preview_cards.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreatePreviewCards < ActiveRecord::Migration[5.0]
def change
create_table :preview_cards do |t|
diff --git a/db/migrate/20170123162658_add_severity_to_domain_blocks.rb b/db/migrate/20170123162658_add_severity_to_domain_blocks.rb
index dcbc32a1af..3bdee44580 100644
--- a/db/migrate/20170123162658_add_severity_to_domain_blocks.rb
+++ b/db/migrate/20170123162658_add_severity_to_domain_blocks.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddSeverityToDomainBlocks < ActiveRecord::Migration[5.0]
def change
add_column :domain_blocks, :severity, :integer, default: 0
diff --git a/db/migrate/20170123203248_add_reject_media_to_domain_blocks.rb b/db/migrate/20170123203248_add_reject_media_to_domain_blocks.rb
index 999fccda05..5282602ce9 100644
--- a/db/migrate/20170123203248_add_reject_media_to_domain_blocks.rb
+++ b/db/migrate/20170123203248_add_reject_media_to_domain_blocks.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddRejectMediaToDomainBlocks < ActiveRecord::Migration[5.0]
def change
add_column :domain_blocks, :reject_media, :boolean
diff --git a/db/migrate/20170125145934_add_spoiler_text_to_statuses.rb b/db/migrate/20170125145934_add_spoiler_text_to_statuses.rb
index 39cd41c00f..7d46af3002 100644
--- a/db/migrate/20170125145934_add_spoiler_text_to_statuses.rb
+++ b/db/migrate/20170125145934_add_spoiler_text_to_statuses.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddSpoilerTextToStatuses < ActiveRecord::Migration[5.0]
def change
add_column :statuses, :spoiler_text, :text, default: '', null: false
diff --git a/db/migrate/20170127165745_add_devise_two_factor_to_users.rb b/db/migrate/20170127165745_add_devise_two_factor_to_users.rb
index f4183e4a92..f4eb72a6b7 100644
--- a/db/migrate/20170127165745_add_devise_two_factor_to_users.rb
+++ b/db/migrate/20170127165745_add_devise_two_factor_to_users.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddDeviseTwoFactorToUsers < ActiveRecord::Migration[5.0]
def change
add_column :users, :encrypted_otp_secret, :string
diff --git a/db/migrate/20170205175257_remove_devices.rb b/db/migrate/20170205175257_remove_devices.rb
index 9ef5c440ef..643e196bf3 100644
--- a/db/migrate/20170205175257_remove_devices.rb
+++ b/db/migrate/20170205175257_remove_devices.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class RemoveDevices < ActiveRecord::Migration[5.0]
def change
drop_table :devices if table_exists?(:devices)
diff --git a/db/migrate/20170209184350_add_reply_to_statuses.rb b/db/migrate/20170209184350_add_reply_to_statuses.rb
index b8b5c13068..ffef97609d 100644
--- a/db/migrate/20170209184350_add_reply_to_statuses.rb
+++ b/db/migrate/20170209184350_add_reply_to_statuses.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddReplyToStatuses < ActiveRecord::Migration[5.0]
def up
add_column :statuses, :reply, :boolean, nil: false, default: false
diff --git a/db/migrate/20170214110202_create_reports.rb b/db/migrate/20170214110202_create_reports.rb
index aa772803b8..547fbf203f 100644
--- a/db/migrate/20170214110202_create_reports.rb
+++ b/db/migrate/20170214110202_create_reports.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateReports < ActiveRecord::Migration[5.0]
def change
create_table :reports do |t|
diff --git a/db/migrate/20170217012631_add_reblog_of_id_foreign_key_to_statuses.rb b/db/migrate/20170217012631_add_reblog_of_id_foreign_key_to_statuses.rb
index 175d4048fc..21007a9207 100644
--- a/db/migrate/20170217012631_add_reblog_of_id_foreign_key_to_statuses.rb
+++ b/db/migrate/20170217012631_add_reblog_of_id_foreign_key_to_statuses.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddReblogOfIdForeignKeyToStatuses < ActiveRecord::Migration[5.0]
def change
add_foreign_key :statuses, :statuses, column: :reblog_of_id, on_delete: :cascade
diff --git a/db/migrate/20170301222600_create_mutes.rb b/db/migrate/20170301222600_create_mutes.rb
index 4c27eca1e3..56c0b52134 100644
--- a/db/migrate/20170301222600_create_mutes.rb
+++ b/db/migrate/20170301222600_create_mutes.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateMutes < ActiveRecord::Migration[5.0]
def change
create_table :mutes do |t|
diff --git a/db/migrate/20170303212857_add_last_emailed_at_to_users.rb b/db/migrate/20170303212857_add_last_emailed_at_to_users.rb
index 9ae3da4fbb..c288140cee 100644
--- a/db/migrate/20170303212857_add_last_emailed_at_to_users.rb
+++ b/db/migrate/20170303212857_add_last_emailed_at_to_users.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddLastEmailedAtToUsers < ActiveRecord::Migration[5.0]
def change
add_column :users, :last_emailed_at, :datetime, null: true, default: nil
diff --git a/db/migrate/20170304202101_add_type_to_media_attachments.rb b/db/migrate/20170304202101_add_type_to_media_attachments.rb
index 5140799580..bbf14f515a 100644
--- a/db/migrate/20170304202101_add_type_to_media_attachments.rb
+++ b/db/migrate/20170304202101_add_type_to_media_attachments.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddTypeToMediaAttachments < ActiveRecord::Migration[5.0]
def up
add_column :media_attachments, :type, :integer, default: 0, null: false
diff --git a/db/migrate/20170317193015_add_search_index_to_accounts.rb b/db/migrate/20170317193015_add_search_index_to_accounts.rb
index 14e1741470..e29da61b15 100644
--- a/db/migrate/20170317193015_add_search_index_to_accounts.rb
+++ b/db/migrate/20170317193015_add_search_index_to_accounts.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddSearchIndexToAccounts < ActiveRecord::Migration[5.0]
def up
execute 'CREATE INDEX search_index ON accounts USING gin((setweight(to_tsvector(\'simple\', accounts.display_name), \'A\') || setweight(to_tsvector(\'simple\', accounts.username), \'B\') || setweight(to_tsvector(\'simple\', coalesce(accounts.domain, \'\')), \'C\')));'
diff --git a/db/migrate/20170318214217_add_header_remote_url_to_accounts.rb b/db/migrate/20170318214217_add_header_remote_url_to_accounts.rb
index 20c9659880..e9c9863688 100644
--- a/db/migrate/20170318214217_add_header_remote_url_to_accounts.rb
+++ b/db/migrate/20170318214217_add_header_remote_url_to_accounts.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddHeaderRemoteURLToAccounts < ActiveRecord::Migration[5.0]
def change
add_column :accounts, :header_remote_url, :string, null: false, default: ''
diff --git a/db/migrate/20170322021028_add_lowercase_index_to_accounts.rb b/db/migrate/20170322021028_add_lowercase_index_to_accounts.rb
index 43032747a8..16f9aab01f 100644
--- a/db/migrate/20170322021028_add_lowercase_index_to_accounts.rb
+++ b/db/migrate/20170322021028_add_lowercase_index_to_accounts.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddLowercaseIndexToAccounts < ActiveRecord::Migration[5.0]
def up
execute 'CREATE INDEX index_accounts_on_username_and_domain_lower ON accounts (lower(username), lower(domain))'
diff --git a/db/migrate/20170322143850_change_primary_key_to_bigint_on_statuses.rb b/db/migrate/20170322143850_change_primary_key_to_bigint_on_statuses.rb
index 16b5db7dda..09959100ac 100644
--- a/db/migrate/20170322143850_change_primary_key_to_bigint_on_statuses.rb
+++ b/db/migrate/20170322143850_change_primary_key_to_bigint_on_statuses.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class ChangePrimaryKeyToBigintOnStatuses < ActiveRecord::Migration[5.0]
def change
change_column :statuses, :id, :bigint
diff --git a/db/migrate/20170322162804_add_search_index_to_tags.rb b/db/migrate/20170322162804_add_search_index_to_tags.rb
index 415dff9a07..87ae87eadd 100644
--- a/db/migrate/20170322162804_add_search_index_to_tags.rb
+++ b/db/migrate/20170322162804_add_search_index_to_tags.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddSearchIndexToTags < ActiveRecord::Migration[5.0]
def up
execute 'CREATE INDEX hashtag_search_index ON tags USING gin(to_tsvector(\'simple\', tags.name));'
diff --git a/db/migrate/20170330021336_add_counter_caches.rb b/db/migrate/20170330021336_add_counter_caches.rb
index cf064b9e1c..a9e496ad2f 100644
--- a/db/migrate/20170330021336_add_counter_caches.rb
+++ b/db/migrate/20170330021336_add_counter_caches.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddCounterCaches < ActiveRecord::Migration[5.0]
def change
add_column :statuses, :favourites_count, :integer, null: false, default: 0
diff --git a/db/migrate/20170330163835_create_imports.rb b/db/migrate/20170330163835_create_imports.rb
index d6f74823d7..6bd9e28b5b 100644
--- a/db/migrate/20170330163835_create_imports.rb
+++ b/db/migrate/20170330163835_create_imports.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateImports < ActiveRecord::Migration[5.0]
def change
create_table :imports do |t|
diff --git a/db/migrate/20170330164118_add_attachment_data_to_imports.rb b/db/migrate/20170330164118_add_attachment_data_to_imports.rb
index 2deda18861..908d4da96a 100644
--- a/db/migrate/20170330164118_add_attachment_data_to_imports.rb
+++ b/db/migrate/20170330164118_add_attachment_data_to_imports.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddAttachmentDataToImports < ActiveRecord::Migration[4.2]
def self.up
change_table :imports do |t|
diff --git a/db/migrate/20170403172249_add_action_taken_by_account_id_to_reports.rb b/db/migrate/20170403172249_add_action_taken_by_account_id_to_reports.rb
index 2d4e121980..9afe7b9607 100644
--- a/db/migrate/20170403172249_add_action_taken_by_account_id_to_reports.rb
+++ b/db/migrate/20170403172249_add_action_taken_by_account_id_to_reports.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddActionTakenByAccountIdToReports < ActiveRecord::Migration[5.0]
def change
add_column :reports, :action_taken_by_account_id, :integer
diff --git a/db/migrate/20170405112956_add_index_on_mentions_status_id.rb b/db/migrate/20170405112956_add_index_on_mentions_status_id.rb
index 3ed1a20cff..20f783517e 100644
--- a/db/migrate/20170405112956_add_index_on_mentions_status_id.rb
+++ b/db/migrate/20170405112956_add_index_on_mentions_status_id.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddIndexOnMentionsStatusId < ActiveRecord::Migration[5.0]
def change
add_index :mentions, :status_id
diff --git a/db/migrate/20170406215816_add_notifications_and_favourites_indices.rb b/db/migrate/20170406215816_add_notifications_and_favourites_indices.rb
index 00e41bf3ab..29df295d25 100644
--- a/db/migrate/20170406215816_add_notifications_and_favourites_indices.rb
+++ b/db/migrate/20170406215816_add_notifications_and_favourites_indices.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddNotificationsAndFavouritesIndices < ActiveRecord::Migration[5.0]
def change
add_index :notifications, [:activity_id, :activity_type]
diff --git a/db/migrate/20170409170753_add_last_webfingered_at_to_accounts.rb b/db/migrate/20170409170753_add_last_webfingered_at_to_accounts.rb
index 08c916fe2a..6b66911e14 100644
--- a/db/migrate/20170409170753_add_last_webfingered_at_to_accounts.rb
+++ b/db/migrate/20170409170753_add_last_webfingered_at_to_accounts.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddLastWebfingeredAtToAccounts < ActiveRecord::Migration[5.0]
def change
add_column :accounts, :last_webfingered_at, :datetime
diff --git a/db/migrate/20170414080609_add_devise_two_factor_backupable_to_users.rb b/db/migrate/20170414080609_add_devise_two_factor_backupable_to_users.rb
index 65517d9f44..ee9db34342 100644
--- a/db/migrate/20170414080609_add_devise_two_factor_backupable_to_users.rb
+++ b/db/migrate/20170414080609_add_devise_two_factor_backupable_to_users.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddDeviseTwoFactorBackupableToUsers < ActiveRecord::Migration[5.0]
def change
add_column :users, :otp_backup_codes, :string, array: true
diff --git a/db/migrate/20170414132105_add_language_to_statuses.rb b/db/migrate/20170414132105_add_language_to_statuses.rb
index 59d51cb861..43bff1f0e2 100644
--- a/db/migrate/20170414132105_add_language_to_statuses.rb
+++ b/db/migrate/20170414132105_add_language_to_statuses.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddLanguageToStatuses < ActiveRecord::Migration[5.0]
def change
add_column :statuses, :language, :string, null: false, default: 'en'
diff --git a/db/migrate/20170418160728_add_indexes_to_reports_for_accounts.rb b/db/migrate/20170418160728_add_indexes_to_reports_for_accounts.rb
index cd69bb8b14..cf0817829b 100644
--- a/db/migrate/20170418160728_add_indexes_to_reports_for_accounts.rb
+++ b/db/migrate/20170418160728_add_indexes_to_reports_for_accounts.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddIndexesToReportsForAccounts < ActiveRecord::Migration[5.0]
def change
add_index :reports, :account_id
diff --git a/db/migrate/20170423005413_add_allowed_languages_to_user.rb b/db/migrate/20170423005413_add_allowed_languages_to_user.rb
index 044a13334c..134815f3ef 100644
--- a/db/migrate/20170423005413_add_allowed_languages_to_user.rb
+++ b/db/migrate/20170423005413_add_allowed_languages_to_user.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddAllowedLanguagesToUser < ActiveRecord::Migration[5.0]
def change
add_column :users, :allowed_languages, :string, array: true, default: [], null: false
diff --git a/db/migrate/20170424003227_create_account_domain_blocks.rb b/db/migrate/20170424003227_create_account_domain_blocks.rb
index b9448aca4e..ebdf0eeb28 100644
--- a/db/migrate/20170424003227_create_account_domain_blocks.rb
+++ b/db/migrate/20170424003227_create_account_domain_blocks.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateAccountDomainBlocks < ActiveRecord::Migration[5.0]
def change
create_table :account_domain_blocks do |t|
diff --git a/db/migrate/20170424112722_add_status_id_index_to_statuses_tags.rb b/db/migrate/20170424112722_add_status_id_index_to_statuses_tags.rb
index d1db8cc629..83bb553730 100644
--- a/db/migrate/20170424112722_add_status_id_index_to_statuses_tags.rb
+++ b/db/migrate/20170424112722_add_status_id_index_to_statuses_tags.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddStatusIdIndexToStatusesTags < ActiveRecord::Migration[5.0]
def change
add_index :statuses_tags, :status_id
diff --git a/db/migrate/20170425131920_add_media_attachment_meta.rb b/db/migrate/20170425131920_add_media_attachment_meta.rb
index c4da656354..0cc6997ee6 100644
--- a/db/migrate/20170425131920_add_media_attachment_meta.rb
+++ b/db/migrate/20170425131920_add_media_attachment_meta.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddMediaAttachmentMeta < ActiveRecord::Migration[5.0]
def change
add_column :media_attachments, :file_meta, :json
diff --git a/db/migrate/20170425202925_add_oembed_to_preview_cards.rb b/db/migrate/20170425202925_add_oembed_to_preview_cards.rb
index 6a932bbf2a..f71d2c27ec 100644
--- a/db/migrate/20170425202925_add_oembed_to_preview_cards.rb
+++ b/db/migrate/20170425202925_add_oembed_to_preview_cards.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddOEmbedToPreviewCards < ActiveRecord::Migration[5.0]
def change
add_column :preview_cards, :type, :integer, default: 0, null: false
diff --git a/db/migrate/20170427011934_re_add_owner_to_application.rb b/db/migrate/20170427011934_re_add_owner_to_application.rb
index a41d71d2a1..182ce36d2a 100644
--- a/db/migrate/20170427011934_re_add_owner_to_application.rb
+++ b/db/migrate/20170427011934_re_add_owner_to_application.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class ReAddOwnerToApplication < ActiveRecord::Migration[5.0]
def change
add_column :oauth_applications, :owner_id, :integer, null: true
diff --git a/db/migrate/20170506235850_create_conversations.rb b/db/migrate/20170506235850_create_conversations.rb
index eaf66ded7c..92fd3f3279 100644
--- a/db/migrate/20170506235850_create_conversations.rb
+++ b/db/migrate/20170506235850_create_conversations.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateConversations < ActiveRecord::Migration[5.0]
def change
create_table :conversations, id: :bigserial do |t|
diff --git a/db/migrate/20170507000211_add_conversation_id_to_statuses.rb b/db/migrate/20170507000211_add_conversation_id_to_statuses.rb
index d1ef7c2905..4cf7fb5e58 100644
--- a/db/migrate/20170507000211_add_conversation_id_to_statuses.rb
+++ b/db/migrate/20170507000211_add_conversation_id_to_statuses.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddConversationIdToStatuses < ActiveRecord::Migration[5.0]
def change
add_column :statuses, :conversation_id, :bigint, null: true, default: nil
diff --git a/db/migrate/20170507141759_optimize_index_subscriptions.rb b/db/migrate/20170507141759_optimize_index_subscriptions.rb
index 26acd5c4d3..cf0305fc76 100644
--- a/db/migrate/20170507141759_optimize_index_subscriptions.rb
+++ b/db/migrate/20170507141759_optimize_index_subscriptions.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class OptimizeIndexSubscriptions < ActiveRecord::Migration[5.0]
def up
add_index :subscriptions, [:account_id, :callback_url], unique: true
diff --git a/db/migrate/20170508230434_create_conversation_mutes.rb b/db/migrate/20170508230434_create_conversation_mutes.rb
index 81edf2733f..01122c4516 100644
--- a/db/migrate/20170508230434_create_conversation_mutes.rb
+++ b/db/migrate/20170508230434_create_conversation_mutes.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateConversationMutes < ActiveRecord::Migration[5.0]
def change
create_table :conversation_mutes do |t|
diff --git a/db/migrate/20170516072309_add_index_accounts_on_uri.rb b/db/migrate/20170516072309_add_index_accounts_on_uri.rb
index d98e9faa5a..19c4a1400f 100644
--- a/db/migrate/20170516072309_add_index_accounts_on_uri.rb
+++ b/db/migrate/20170516072309_add_index_accounts_on_uri.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddIndexAccountsOnUri < ActiveRecord::Migration[5.0]
def change
add_index :accounts, :uri
diff --git a/db/migrate/20170520145338_change_language_filter_to_opt_out.rb b/db/migrate/20170520145338_change_language_filter_to_opt_out.rb
index 8dac98ee87..12e045480a 100644
--- a/db/migrate/20170520145338_change_language_filter_to_opt_out.rb
+++ b/db/migrate/20170520145338_change_language_filter_to_opt_out.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class ChangeLanguageFilterToOptOut < ActiveRecord::Migration[5.0]
def change
remove_index :users, :allowed_languages
diff --git a/db/migrate/20170601210557_add_index_on_media_attachments_account_id.rb b/db/migrate/20170601210557_add_index_on_media_attachments_account_id.rb
index c51ab28e52..a0ce062eaa 100644
--- a/db/migrate/20170601210557_add_index_on_media_attachments_account_id.rb
+++ b/db/migrate/20170601210557_add_index_on_media_attachments_account_id.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddIndexOnMediaAttachmentsAccountId < ActiveRecord::Migration[5.1]
def change
add_index :media_attachments, :account_id
diff --git a/db/migrate/20170604144747_add_foreign_keys_for_accounts.rb b/db/migrate/20170604144747_add_foreign_keys_for_accounts.rb
index 76a836ca08..039679ec5a 100644
--- a/db/migrate/20170604144747_add_foreign_keys_for_accounts.rb
+++ b/db/migrate/20170604144747_add_foreign_keys_for_accounts.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddForeignKeysForAccounts < ActiveRecord::Migration[5.1]
def change
add_foreign_key :statuses, :accounts, on_delete: :cascade
diff --git a/db/migrate/20170606113804_change_tag_search_index_to_btree.rb b/db/migrate/20170606113804_change_tag_search_index_to_btree.rb
index 979df2e744..12ebbde60c 100644
--- a/db/migrate/20170606113804_change_tag_search_index_to_btree.rb
+++ b/db/migrate/20170606113804_change_tag_search_index_to_btree.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class ChangeTagSearchIndexToBtree < ActiveRecord::Migration[5.1]
def up
remove_index :tags, name: :hashtag_search_index
diff --git a/db/migrate/20170609145826_remove_default_language_from_statuses.rb b/db/migrate/20170609145826_remove_default_language_from_statuses.rb
index 46b90ae892..28b4172a8c 100644
--- a/db/migrate/20170609145826_remove_default_language_from_statuses.rb
+++ b/db/migrate/20170609145826_remove_default_language_from_statuses.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class RemoveDefaultLanguageFromStatuses < ActiveRecord::Migration[5.1]
def change
change_column :statuses, :language, :string, default: nil, null: true
diff --git a/db/migrate/20170610000000_add_statuses_index_on_account_id_id.rb b/db/migrate/20170610000000_add_statuses_index_on_account_id_id.rb
index 86e4255599..fce70663b3 100644
--- a/db/migrate/20170610000000_add_statuses_index_on_account_id_id.rb
+++ b/db/migrate/20170610000000_add_statuses_index_on_account_id_id.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddStatusesIndexOnAccountIdId < ActiveRecord::Migration[5.1]
disable_ddl_transaction!
diff --git a/db/migrate/20170623152212_create_session_activations.rb b/db/migrate/20170623152212_create_session_activations.rb
index 81c776135e..0535320bdb 100644
--- a/db/migrate/20170623152212_create_session_activations.rb
+++ b/db/migrate/20170623152212_create_session_activations.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateSessionActivations < ActiveRecord::Migration[5.1]
def change
create_table :session_activations do |t|
diff --git a/db/migrate/20170624134742_add_description_to_session_activations.rb b/db/migrate/20170624134742_add_description_to_session_activations.rb
index 9dbb155641..78f9e7a8d9 100644
--- a/db/migrate/20170624134742_add_description_to_session_activations.rb
+++ b/db/migrate/20170624134742_add_description_to_session_activations.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddDescriptionToSessionActivations < ActiveRecord::Migration[5.1]
def change
add_column :session_activations, :user_agent, :string, null: false, default: ''
diff --git a/db/migrate/20170625140443_add_access_token_id_to_session_activations.rb b/db/migrate/20170625140443_add_access_token_id_to_session_activations.rb
index 213a77a83d..591dd88333 100644
--- a/db/migrate/20170625140443_add_access_token_id_to_session_activations.rb
+++ b/db/migrate/20170625140443_add_access_token_id_to_session_activations.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddAccessTokenIdToSessionActivations < ActiveRecord::Migration[5.1]
def change
add_column :session_activations, :access_token_id, :integer
diff --git a/db/migrate/20170711225116_fix_null_booleans.rb b/db/migrate/20170711225116_fix_null_booleans.rb
index aabb81f217..12cc9b8b86 100644
--- a/db/migrate/20170711225116_fix_null_booleans.rb
+++ b/db/migrate/20170711225116_fix_null_booleans.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class FixNullBooleans < ActiveRecord::Migration[5.1]
def change
safety_assured do
diff --git a/db/migrate/20170713112503_make_tag_search_case_insensitive.rb b/db/migrate/20170713112503_make_tag_search_case_insensitive.rb
index 33ed6c0050..e99b795b49 100644
--- a/db/migrate/20170713112503_make_tag_search_case_insensitive.rb
+++ b/db/migrate/20170713112503_make_tag_search_case_insensitive.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class MakeTagSearchCaseInsensitive < ActiveRecord::Migration[5.1]
def up
remove_index :tags, name: :hashtag_search_index
diff --git a/db/migrate/20170713175513_create_web_push_subscriptions.rb b/db/migrate/20170713175513_create_web_push_subscriptions.rb
index 4e5c2ba001..405050f465 100644
--- a/db/migrate/20170713175513_create_web_push_subscriptions.rb
+++ b/db/migrate/20170713175513_create_web_push_subscriptions.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateWebPushSubscriptions < ActiveRecord::Migration[5.1]
def change
create_table :web_push_subscriptions do |t|
diff --git a/db/migrate/20170713190709_add_web_push_subscription_to_session_activations.rb b/db/migrate/20170713190709_add_web_push_subscription_to_session_activations.rb
index d69cdfa508..0113c52ce7 100644
--- a/db/migrate/20170713190709_add_web_push_subscription_to_session_activations.rb
+++ b/db/migrate/20170713190709_add_web_push_subscription_to_session_activations.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddWebPushSubscriptionToSessionActivations < ActiveRecord::Migration[5.1]
def change
add_column :session_activations, :web_push_subscription_id, :integer
diff --git a/db/migrate/20170714184731_add_domain_to_subscriptions.rb b/db/migrate/20170714184731_add_domain_to_subscriptions.rb
index 7c01a64f57..313758c44a 100644
--- a/db/migrate/20170714184731_add_domain_to_subscriptions.rb
+++ b/db/migrate/20170714184731_add_domain_to_subscriptions.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddDomainToSubscriptions < ActiveRecord::Migration[5.1]
def change
add_column :subscriptions, :domain, :string
diff --git a/db/migrate/20170716191202_add_hide_notifications_to_mute.rb b/db/migrate/20170716191202_add_hide_notifications_to_mute.rb
index a498396b75..b817d512de 100644
--- a/db/migrate/20170716191202_add_hide_notifications_to_mute.rb
+++ b/db/migrate/20170716191202_add_hide_notifications_to_mute.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
require Rails.root.join('lib', 'mastodon', 'migration_helpers')
class AddHideNotificationsToMute < ActiveRecord::Migration[5.1]
diff --git a/db/migrate/20170718211102_add_activitypub_to_accounts.rb b/db/migrate/20170718211102_add_activitypub_to_accounts.rb
index c08e38bb90..83a45f13a9 100644
--- a/db/migrate/20170718211102_add_activitypub_to_accounts.rb
+++ b/db/migrate/20170718211102_add_activitypub_to_accounts.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddActivityPubToAccounts < ActiveRecord::Migration[5.1]
def change
add_column :accounts, :inbox_url, :string, null: false, default: ''
diff --git a/db/migrate/20170720000000_add_index_favourites_on_account_id_and_id.rb b/db/migrate/20170720000000_add_index_favourites_on_account_id_and_id.rb
index 99903584c9..f50f91f2e1 100644
--- a/db/migrate/20170720000000_add_index_favourites_on_account_id_and_id.rb
+++ b/db/migrate/20170720000000_add_index_favourites_on_account_id_and_id.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddIndexFavouritesOnAccountIdAndId < ActiveRecord::Migration[5.1]
def change
# Used to query favourites of an account ordered by id.
diff --git a/db/migrate/20170823162448_create_status_pins.rb b/db/migrate/20170823162448_create_status_pins.rb
index 9a6d4a7b9b..c8d3fab3a5 100644
--- a/db/migrate/20170823162448_create_status_pins.rb
+++ b/db/migrate/20170823162448_create_status_pins.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateStatusPins < ActiveRecord::Migration[5.1]
def change
create_table :status_pins do |t|
diff --git a/db/migrate/20170824103029_add_timestamps_to_status_pins.rb b/db/migrate/20170824103029_add_timestamps_to_status_pins.rb
index 09f0fbeaf2..837b1e10cb 100644
--- a/db/migrate/20170824103029_add_timestamps_to_status_pins.rb
+++ b/db/migrate/20170824103029_add_timestamps_to_status_pins.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddTimestampsToStatusPins < ActiveRecord::Migration[5.1]
def change
add_timestamps :status_pins, null: false, default: -> { 'CURRENT_TIMESTAMP' }
diff --git a/db/migrate/20170829215220_remove_status_pins_account_index.rb b/db/migrate/20170829215220_remove_status_pins_account_index.rb
index e0144242eb..5c8643915c 100644
--- a/db/migrate/20170829215220_remove_status_pins_account_index.rb
+++ b/db/migrate/20170829215220_remove_status_pins_account_index.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class RemoveStatusPinsAccountIndex < ActiveRecord::Migration[5.1]
def change
remove_index :status_pins, :account_id
diff --git a/db/migrate/20170901141119_truncate_preview_cards.rb b/db/migrate/20170901141119_truncate_preview_cards.rb
index 4d9802f3bd..22a7731099 100644
--- a/db/migrate/20170901141119_truncate_preview_cards.rb
+++ b/db/migrate/20170901141119_truncate_preview_cards.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class TruncatePreviewCards < ActiveRecord::Migration[5.1]
def up
rename_table :preview_cards, :deprecated_preview_cards
diff --git a/db/migrate/20170901142658_create_join_table_preview_cards_statuses.rb b/db/migrate/20170901142658_create_join_table_preview_cards_statuses.rb
index be7f533b50..34808877eb 100644
--- a/db/migrate/20170901142658_create_join_table_preview_cards_statuses.rb
+++ b/db/migrate/20170901142658_create_join_table_preview_cards_statuses.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateJoinTablePreviewCardsStatuses < ActiveRecord::Migration[5.1]
def change
create_join_table :preview_cards, :statuses do |t|
diff --git a/db/migrate/20170905044538_add_index_id_account_id_activity_type_on_notifications.rb b/db/migrate/20170905044538_add_index_id_account_id_activity_type_on_notifications.rb
index c47cea9e26..cb86555cf1 100644
--- a/db/migrate/20170905044538_add_index_id_account_id_activity_type_on_notifications.rb
+++ b/db/migrate/20170905044538_add_index_id_account_id_activity_type_on_notifications.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddIndexIdAccountIdActivityTypeOnNotifications < ActiveRecord::Migration[5.1]
def change
add_index :notifications, [:id, :account_id, :activity_type], order: { id: :desc }
diff --git a/db/migrate/20170905165803_add_local_to_statuses.rb b/db/migrate/20170905165803_add_local_to_statuses.rb
index fb4e7019df..cb6307c265 100644
--- a/db/migrate/20170905165803_add_local_to_statuses.rb
+++ b/db/migrate/20170905165803_add_local_to_statuses.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddLocalToStatuses < ActiveRecord::Migration[5.1]
def change
add_column :statuses, :local, :boolean, null: true, default: nil
diff --git a/db/migrate/20170913000752_create_site_uploads.rb b/db/migrate/20170913000752_create_site_uploads.rb
index 2246e48cdd..43a793806f 100644
--- a/db/migrate/20170913000752_create_site_uploads.rb
+++ b/db/migrate/20170913000752_create_site_uploads.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateSiteUploads < ActiveRecord::Migration[5.1]
def change
create_table :site_uploads do |t|
diff --git a/db/migrate/20170917153509_create_custom_emojis.rb b/db/migrate/20170917153509_create_custom_emojis.rb
index 4040c83125..984fcd2181 100644
--- a/db/migrate/20170917153509_create_custom_emojis.rb
+++ b/db/migrate/20170917153509_create_custom_emojis.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateCustomEmojis < ActiveRecord::Migration[5.1]
def change
create_table :custom_emojis do |t|
diff --git a/db/migrate/20170918125918_ids_to_bigints.rb b/db/migrate/20170918125918_ids_to_bigints.rb
index e3fc34a517..83c5ab971b 100644
--- a/db/migrate/20170918125918_ids_to_bigints.rb
+++ b/db/migrate/20170918125918_ids_to_bigints.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
require_relative '../../lib/mastodon/migration_helpers'
require_relative '../../lib/mastodon/migration_warning'
diff --git a/db/migrate/20170920024819_status_ids_to_timestamp_ids.rb b/db/migrate/20170920024819_status_ids_to_timestamp_ids.rb
index 82e91f1e11..b923373361 100644
--- a/db/migrate/20170920024819_status_ids_to_timestamp_ids.rb
+++ b/db/migrate/20170920024819_status_ids_to_timestamp_ids.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class StatusIdsToTimestampIds < ActiveRecord::Migration[5.1]
def up
# Prepare the function we will use to generate IDs.
diff --git a/db/migrate/20170920032311_fix_reblogs_in_feeds.rb b/db/migrate/20170920032311_fix_reblogs_in_feeds.rb
index 7e2db0ff3e..fd6ad39f08 100644
--- a/db/migrate/20170920032311_fix_reblogs_in_feeds.rb
+++ b/db/migrate/20170920032311_fix_reblogs_in_feeds.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class FixReblogsInFeeds < ActiveRecord::Migration[5.1]
def up
redis = RedisConfiguration.pool.checkout
diff --git a/db/migrate/20170924022025_ids_to_bigints2.rb b/db/migrate/20170924022025_ids_to_bigints2.rb
index db8ccd919a..f194d0e494 100644
--- a/db/migrate/20170924022025_ids_to_bigints2.rb
+++ b/db/migrate/20170924022025_ids_to_bigints2.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class IdsToBigints2 < ActiveRecord::Migration[5.1]
def up
change_column :statuses_tags, :tag_id, :bigint
diff --git a/db/migrate/20170927215609_add_description_to_media_attachments.rb b/db/migrate/20170927215609_add_description_to_media_attachments.rb
index 9c3312373b..8d27d4756c 100644
--- a/db/migrate/20170927215609_add_description_to_media_attachments.rb
+++ b/db/migrate/20170927215609_add_description_to_media_attachments.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddDescriptionToMediaAttachments < ActiveRecord::Migration[5.2]
def change
add_column :media_attachments, :description, :text
diff --git a/db/migrate/20170928082043_create_email_domain_blocks.rb b/db/migrate/20170928082043_create_email_domain_blocks.rb
index 2baed54ef6..0af561680b 100644
--- a/db/migrate/20170928082043_create_email_domain_blocks.rb
+++ b/db/migrate/20170928082043_create_email_domain_blocks.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateEmailDomainBlocks < ActiveRecord::Migration[5.2]
def change
create_table :email_domain_blocks do |t|
diff --git a/db/migrate/20171005102658_create_account_moderation_notes.rb b/db/migrate/20171005102658_create_account_moderation_notes.rb
index afa2f5f253..254da20ef3 100644
--- a/db/migrate/20171005102658_create_account_moderation_notes.rb
+++ b/db/migrate/20171005102658_create_account_moderation_notes.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateAccountModerationNotes < ActiveRecord::Migration[5.2]
def change
create_table :account_moderation_notes do |t|
diff --git a/db/migrate/20171005171936_add_disabled_to_custom_emojis.rb b/db/migrate/20171005171936_add_disabled_to_custom_emojis.rb
index 7cf007ae9e..d6fd228f95 100644
--- a/db/migrate/20171005171936_add_disabled_to_custom_emojis.rb
+++ b/db/migrate/20171005171936_add_disabled_to_custom_emojis.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
require Rails.root.join('lib', 'mastodon', 'migration_helpers')
class AddDisabledToCustomEmojis < ActiveRecord::Migration[5.2]
diff --git a/db/migrate/20171006142024_add_uri_to_custom_emojis.rb b/db/migrate/20171006142024_add_uri_to_custom_emojis.rb
index ff62aed20d..a9d760d04b 100644
--- a/db/migrate/20171006142024_add_uri_to_custom_emojis.rb
+++ b/db/migrate/20171006142024_add_uri_to_custom_emojis.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddUriToCustomEmojis < ActiveRecord::Migration[5.2]
def change
add_column :custom_emojis, :uri, :string
diff --git a/db/migrate/20171010023049_add_foreign_key_to_account_moderation_notes.rb b/db/migrate/20171010023049_add_foreign_key_to_account_moderation_notes.rb
index a2c0fbcc41..c66a61ffee 100644
--- a/db/migrate/20171010023049_add_foreign_key_to_account_moderation_notes.rb
+++ b/db/migrate/20171010023049_add_foreign_key_to_account_moderation_notes.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddForeignKeyToAccountModerationNotes < ActiveRecord::Migration[5.2]
def change
safety_assured { add_foreign_key :account_moderation_notes, :accounts }
diff --git a/db/migrate/20171010025614_change_accounts_nonnullable_in_account_moderation_notes.rb b/db/migrate/20171010025614_change_accounts_nonnullable_in_account_moderation_notes.rb
index 62725c88df..02ccf5b452 100644
--- a/db/migrate/20171010025614_change_accounts_nonnullable_in_account_moderation_notes.rb
+++ b/db/migrate/20171010025614_change_accounts_nonnullable_in_account_moderation_notes.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class ChangeAccountsNonnullableInAccountModerationNotes < ActiveRecord::Migration[5.2]
def change
safety_assured do
diff --git a/db/migrate/20171020084748_add_visible_in_picker_to_custom_emoji.rb b/db/migrate/20171020084748_add_visible_in_picker_to_custom_emoji.rb
index 5f7c60a3eb..2874066d0d 100644
--- a/db/migrate/20171020084748_add_visible_in_picker_to_custom_emoji.rb
+++ b/db/migrate/20171020084748_add_visible_in_picker_to_custom_emoji.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddVisibleInPickerToCustomEmoji < ActiveRecord::Migration[5.2]
def change
safety_assured do
diff --git a/db/migrate/20171028221157_add_reblogs_to_follows.rb b/db/migrate/20171028221157_add_reblogs_to_follows.rb
index 773904249d..0dab84c799 100644
--- a/db/migrate/20171028221157_add_reblogs_to_follows.rb
+++ b/db/migrate/20171028221157_add_reblogs_to_follows.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
require Rails.root.join('lib', 'mastodon', 'migration_helpers')
class AddReblogsToFollows < ActiveRecord::Migration[5.2]
diff --git a/db/migrate/20171107143332_add_memorial_to_accounts.rb b/db/migrate/20171107143332_add_memorial_to_accounts.rb
index 4fb1216a14..3cf782b81f 100644
--- a/db/migrate/20171107143332_add_memorial_to_accounts.rb
+++ b/db/migrate/20171107143332_add_memorial_to_accounts.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
require Rails.root.join('lib', 'mastodon', 'migration_helpers')
class AddMemorialToAccounts < ActiveRecord::Migration[5.2]
diff --git a/db/migrate/20171107143624_add_disabled_to_users.rb b/db/migrate/20171107143624_add_disabled_to_users.rb
index fb736786d5..4ab4df7372 100644
--- a/db/migrate/20171107143624_add_disabled_to_users.rb
+++ b/db/migrate/20171107143624_add_disabled_to_users.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
require Rails.root.join('lib', 'mastodon', 'migration_helpers')
class AddDisabledToUsers < ActiveRecord::Migration[5.2]
diff --git a/db/migrate/20171109012327_add_moderator_to_accounts.rb b/db/migrate/20171109012327_add_moderator_to_accounts.rb
index 70b0b598c2..e8fc313c8c 100644
--- a/db/migrate/20171109012327_add_moderator_to_accounts.rb
+++ b/db/migrate/20171109012327_add_moderator_to_accounts.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
require Rails.root.join('lib', 'mastodon', 'migration_helpers')
class AddModeratorToAccounts < ActiveRecord::Migration[5.2]
diff --git a/db/migrate/20171114080328_add_index_domain_to_email_domain_blocks.rb b/db/migrate/20171114080328_add_index_domain_to_email_domain_blocks.rb
index 34dc6ff004..3fc966a9e3 100644
--- a/db/migrate/20171114080328_add_index_domain_to_email_domain_blocks.rb
+++ b/db/migrate/20171114080328_add_index_domain_to_email_domain_blocks.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddIndexDomainToEmailDomainBlocks < ActiveRecord::Migration[5.2]
disable_ddl_transaction!
diff --git a/db/migrate/20171114231651_create_lists.rb b/db/migrate/20171114231651_create_lists.rb
index b7761abe49..4103d38e4f 100644
--- a/db/migrate/20171114231651_create_lists.rb
+++ b/db/migrate/20171114231651_create_lists.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateLists < ActiveRecord::Migration[5.2]
def change
create_table :lists do |t|
diff --git a/db/migrate/20171116161857_create_list_accounts.rb b/db/migrate/20171116161857_create_list_accounts.rb
index 7dbb78d8d5..ff9ab3faad 100644
--- a/db/migrate/20171116161857_create_list_accounts.rb
+++ b/db/migrate/20171116161857_create_list_accounts.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateListAccounts < ActiveRecord::Migration[5.2]
def change
create_table :list_accounts do |t|
diff --git a/db/migrate/20171118012443_add_moved_to_account_id_to_accounts.rb b/db/migrate/20171118012443_add_moved_to_account_id_to_accounts.rb
index 893972848a..21915426f4 100644
--- a/db/migrate/20171118012443_add_moved_to_account_id_to_accounts.rb
+++ b/db/migrate/20171118012443_add_moved_to_account_id_to_accounts.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddMovedToAccountIdToAccounts < ActiveRecord::Migration[5.2]
def change
add_column :accounts, :moved_to_account_id, :bigint, null: true, default: nil
diff --git a/db/migrate/20171119172437_create_admin_action_logs.rb b/db/migrate/20171119172437_create_admin_action_logs.rb
index 80d5a3dba7..a1758bdfcf 100644
--- a/db/migrate/20171119172437_create_admin_action_logs.rb
+++ b/db/migrate/20171119172437_create_admin_action_logs.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateAdminActionLogs < ActiveRecord::Migration[5.2]
def change
create_table :admin_action_logs do |t|
diff --git a/db/migrate/20171122120436_add_index_account_and_reblog_of_id_to_statuses.rb b/db/migrate/20171122120436_add_index_account_and_reblog_of_id_to_statuses.rb
index a02ffe09d6..556427d126 100644
--- a/db/migrate/20171122120436_add_index_account_and_reblog_of_id_to_statuses.rb
+++ b/db/migrate/20171122120436_add_index_account_and_reblog_of_id_to_statuses.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddIndexAccountAndReblogOfIdToStatuses < ActiveRecord::Migration[5.2]
disable_ddl_transaction!
diff --git a/db/migrate/20171125024930_create_invites.rb b/db/migrate/20171125024930_create_invites.rb
index 2e814babfc..4219b26f47 100644
--- a/db/migrate/20171125024930_create_invites.rb
+++ b/db/migrate/20171125024930_create_invites.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateInvites < ActiveRecord::Migration[5.2]
def change
create_table :invites do |t|
diff --git a/db/migrate/20171125031751_add_invite_id_to_users.rb b/db/migrate/20171125031751_add_invite_id_to_users.rb
index 2ff6c34308..45eadef157 100644
--- a/db/migrate/20171125031751_add_invite_id_to_users.rb
+++ b/db/migrate/20171125031751_add_invite_id_to_users.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddInviteIdToUsers < ActiveRecord::Migration[5.2]
def change
safety_assured { add_reference :users, :invite, null: true, default: nil, foreign_key: { on_delete: :nullify }, index: false }
diff --git a/db/migrate/20171125185353_add_index_reblog_of_id_and_account_to_statuses.rb b/db/migrate/20171125185353_add_index_reblog_of_id_and_account_to_statuses.rb
index 8952387b59..80556438bc 100644
--- a/db/migrate/20171125185353_add_index_reblog_of_id_and_account_to_statuses.rb
+++ b/db/migrate/20171125185353_add_index_reblog_of_id_and_account_to_statuses.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddIndexReblogOfIdAndAccountToStatuses < ActiveRecord::Migration[5.2]
disable_ddl_transaction!
diff --git a/db/migrate/20171125190735_remove_old_reblog_index_on_statuses.rb b/db/migrate/20171125190735_remove_old_reblog_index_on_statuses.rb
index dc7e09a25c..14a6888a72 100644
--- a/db/migrate/20171125190735_remove_old_reblog_index_on_statuses.rb
+++ b/db/migrate/20171125190735_remove_old_reblog_index_on_statuses.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class RemoveOldReblogIndexOnStatuses < ActiveRecord::Migration[5.2]
disable_ddl_transaction!
diff --git a/db/migrate/20171129172043_add_index_on_stream_entries.rb b/db/migrate/20171129172043_add_index_on_stream_entries.rb
index 4580fb42f6..c959135c22 100644
--- a/db/migrate/20171129172043_add_index_on_stream_entries.rb
+++ b/db/migrate/20171129172043_add_index_on_stream_entries.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddIndexOnStreamEntries < ActiveRecord::Migration[5.2]
disable_ddl_transaction!
diff --git a/db/migrate/20171130000000_add_embed_url_to_preview_cards.rb b/db/migrate/20171130000000_add_embed_url_to_preview_cards.rb
index 811f6ceae6..e78373b24c 100644
--- a/db/migrate/20171130000000_add_embed_url_to_preview_cards.rb
+++ b/db/migrate/20171130000000_add_embed_url_to_preview_cards.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
require Rails.root.join('lib', 'mastodon', 'migration_helpers')
class AddEmbedURLToPreviewCards < ActiveRecord::Migration[5.2]
diff --git a/db/migrate/20171201000000_change_account_id_nonnullable_in_lists.rb b/db/migrate/20171201000000_change_account_id_nonnullable_in_lists.rb
index e8e8786112..4aa9027c05 100644
--- a/db/migrate/20171201000000_change_account_id_nonnullable_in_lists.rb
+++ b/db/migrate/20171201000000_change_account_id_nonnullable_in_lists.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class ChangeAccountIdNonnullableInLists < ActiveRecord::Migration[5.2]
def change
safety_assured do
diff --git a/db/migrate/20171212195226_remove_duplicate_indexes_in_lists.rb b/db/migrate/20171212195226_remove_duplicate_indexes_in_lists.rb
index f3007c77c7..362b1367df 100644
--- a/db/migrate/20171212195226_remove_duplicate_indexes_in_lists.rb
+++ b/db/migrate/20171212195226_remove_duplicate_indexes_in_lists.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class RemoveDuplicateIndexesInLists < ActiveRecord::Migration[5.2]
def change
remove_index :list_accounts, name: 'index_list_accounts_on_account_id'
diff --git a/db/migrate/20171226094803_more_faster_index_on_notifications.rb b/db/migrate/20171226094803_more_faster_index_on_notifications.rb
index e0e73b27ab..429eab96a1 100644
--- a/db/migrate/20171226094803_more_faster_index_on_notifications.rb
+++ b/db/migrate/20171226094803_more_faster_index_on_notifications.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class MoreFasterIndexOnNotifications < ActiveRecord::Migration[5.2]
disable_ddl_transaction!
diff --git a/db/migrate/20180106000232_add_index_on_statuses_for_api_v1_accounts_account_id_statuses.rb b/db/migrate/20180106000232_add_index_on_statuses_for_api_v1_accounts_account_id_statuses.rb
index eb277d3bc7..1531c4dd29 100644
--- a/db/migrate/20180106000232_add_index_on_statuses_for_api_v1_accounts_account_id_statuses.rb
+++ b/db/migrate/20180106000232_add_index_on_statuses_for_api_v1_accounts_account_id_statuses.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddIndexOnStatusesForApiV1AccountsAccountIdStatuses < ActiveRecord::Migration[5.2]
disable_ddl_transaction!
diff --git a/db/migrate/20180109143959_add_remember_token_to_users.rb b/db/migrate/20180109143959_add_remember_token_to_users.rb
index f244fc6f62..0d2185e9e5 100644
--- a/db/migrate/20180109143959_add_remember_token_to_users.rb
+++ b/db/migrate/20180109143959_add_remember_token_to_users.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddRememberTokenToUsers < ActiveRecord::Migration[5.2]
def change
add_column :users, :remember_token, :string, null: true
diff --git a/db/migrate/20180204034416_create_identities.rb b/db/migrate/20180204034416_create_identities.rb
index 68288aadfa..c9efe91525 100644
--- a/db/migrate/20180204034416_create_identities.rb
+++ b/db/migrate/20180204034416_create_identities.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateIdentities < ActiveRecord::Migration[5.2]
def change
create_table :identities, id: :integer do |t|
diff --git a/db/migrate/20180206000000_change_user_id_nonnullable.rb b/db/migrate/20180206000000_change_user_id_nonnullable.rb
index 1196383871..16e18fce9b 100644
--- a/db/migrate/20180206000000_change_user_id_nonnullable.rb
+++ b/db/migrate/20180206000000_change_user_id_nonnullable.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class ChangeUserIdNonnullable < ActiveRecord::Migration[5.2]
def change
safety_assured do
diff --git a/db/migrate/20180211015820_create_backups.rb b/db/migrate/20180211015820_create_backups.rb
index 4aaeed83ba..67ad0f893e 100644
--- a/db/migrate/20180211015820_create_backups.rb
+++ b/db/migrate/20180211015820_create_backups.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateBackups < ActiveRecord::Migration[5.2]
def change
create_table :backups do |t|
diff --git a/db/migrate/20180304013859_add_featured_collection_url_to_accounts.rb b/db/migrate/20180304013859_add_featured_collection_url_to_accounts.rb
index 46842a9e36..3a427cc30e 100644
--- a/db/migrate/20180304013859_add_featured_collection_url_to_accounts.rb
+++ b/db/migrate/20180304013859_add_featured_collection_url_to_accounts.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddFeaturedCollectionURLToAccounts < ActiveRecord::Migration[5.2]
def change
add_column :accounts, :featured_collection_url, :string
diff --git a/db/migrate/20180310000000_change_columns_in_notifications_nonnullable.rb b/db/migrate/20180310000000_change_columns_in_notifications_nonnullable.rb
index 8577d02356..778b900b09 100644
--- a/db/migrate/20180310000000_change_columns_in_notifications_nonnullable.rb
+++ b/db/migrate/20180310000000_change_columns_in_notifications_nonnullable.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class ChangeColumnsInNotificationsNonnullable < ActiveRecord::Migration[5.2]
def change
safety_assured do
diff --git a/db/migrate/20180402031200_add_assigned_account_id_to_reports.rb b/db/migrate/20180402031200_add_assigned_account_id_to_reports.rb
index 27cbd6c2a1..be5ab47677 100644
--- a/db/migrate/20180402031200_add_assigned_account_id_to_reports.rb
+++ b/db/migrate/20180402031200_add_assigned_account_id_to_reports.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddAssignedAccountIdToReports < ActiveRecord::Migration[5.2]
def change
safety_assured { add_reference :reports, :assigned_account, null: true, default: nil, foreign_key: { on_delete: :nullify, to_table: :accounts }, index: false }
diff --git a/db/migrate/20180402040909_create_report_notes.rb b/db/migrate/20180402040909_create_report_notes.rb
index 5d5a336275..40b42abd20 100644
--- a/db/migrate/20180402040909_create_report_notes.rb
+++ b/db/migrate/20180402040909_create_report_notes.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateReportNotes < ActiveRecord::Migration[5.2]
def change
create_table :report_notes do |t|
diff --git a/db/migrate/20180410204633_add_fields_to_accounts.rb b/db/migrate/20180410204633_add_fields_to_accounts.rb
index a1b9504b6a..8e39e6db77 100644
--- a/db/migrate/20180410204633_add_fields_to_accounts.rb
+++ b/db/migrate/20180410204633_add_fields_to_accounts.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddFieldsToAccounts < ActiveRecord::Migration[5.2]
def change
add_column :accounts, :fields, :jsonb
diff --git a/db/migrate/20180416210259_add_uri_to_relationships.rb b/db/migrate/20180416210259_add_uri_to_relationships.rb
index d8eaca450b..4bafffeffb 100644
--- a/db/migrate/20180416210259_add_uri_to_relationships.rb
+++ b/db/migrate/20180416210259_add_uri_to_relationships.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddUriToRelationships < ActiveRecord::Migration[5.2]
def change
add_column :follows, :uri, :string
diff --git a/db/migrate/20180506221944_add_actor_type_to_accounts.rb b/db/migrate/20180506221944_add_actor_type_to_accounts.rb
index 7cfed640f7..38b2c3b63c 100644
--- a/db/migrate/20180506221944_add_actor_type_to_accounts.rb
+++ b/db/migrate/20180506221944_add_actor_type_to_accounts.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddActorTypeToAccounts < ActiveRecord::Migration[5.2]
def change
add_column :accounts, :actor_type, :string
diff --git a/db/migrate/20180510214435_add_access_token_id_to_web_push_subscriptions.rb b/db/migrate/20180510214435_add_access_token_id_to_web_push_subscriptions.rb
index f607165328..5426d3bbbb 100644
--- a/db/migrate/20180510214435_add_access_token_id_to_web_push_subscriptions.rb
+++ b/db/migrate/20180510214435_add_access_token_id_to_web_push_subscriptions.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddAccessTokenIdToWebPushSubscriptions < ActiveRecord::Migration[5.2]
def change
safety_assured do
diff --git a/db/migrate/20180510230049_migrate_web_push_subscriptions.rb b/db/migrate/20180510230049_migrate_web_push_subscriptions.rb
index 6de1bed795..a9c0be49a3 100644
--- a/db/migrate/20180510230049_migrate_web_push_subscriptions.rb
+++ b/db/migrate/20180510230049_migrate_web_push_subscriptions.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class MigrateWebPushSubscriptions < ActiveRecord::Migration[5.2]
disable_ddl_transaction!
diff --git a/db/migrate/20180528141303_fix_accounts_unique_index.rb b/db/migrate/20180528141303_fix_accounts_unique_index.rb
index 1e67b4bb4d..d21422b05d 100644
--- a/db/migrate/20180528141303_fix_accounts_unique_index.rb
+++ b/db/migrate/20180528141303_fix_accounts_unique_index.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
require_relative '../../lib/mastodon/migration_warning'
class FixAccountsUniqueIndex < ActiveRecord::Migration[5.2]
diff --git a/db/migrate/20180608213548_reject_following_blocked_users.rb b/db/migrate/20180608213548_reject_following_blocked_users.rb
index bb21bd8fa0..4cb6395469 100644
--- a/db/migrate/20180608213548_reject_following_blocked_users.rb
+++ b/db/migrate/20180608213548_reject_following_blocked_users.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class RejectFollowingBlockedUsers < ActiveRecord::Migration[5.2]
disable_ddl_transaction!
diff --git a/db/migrate/20180609104432_migrate_web_push_subscriptions2.rb b/db/migrate/20180609104432_migrate_web_push_subscriptions2.rb
index 510db64d23..aed1329df8 100644
--- a/db/migrate/20180609104432_migrate_web_push_subscriptions2.rb
+++ b/db/migrate/20180609104432_migrate_web_push_subscriptions2.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class MigrateWebPushSubscriptions2 < ActiveRecord::Migration[5.2]
disable_ddl_transaction!
diff --git a/db/migrate/20180615122121_add_autofollow_to_invites.rb b/db/migrate/20180615122121_add_autofollow_to_invites.rb
index 8c5fb74105..ef129003a1 100644
--- a/db/migrate/20180615122121_add_autofollow_to_invites.rb
+++ b/db/migrate/20180615122121_add_autofollow_to_invites.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
require Rails.root.join('lib', 'mastodon', 'migration_helpers')
class AddAutofollowToInvites < ActiveRecord::Migration[5.2]
diff --git a/db/migrate/20180616192031_add_chosen_languages_to_users.rb b/db/migrate/20180616192031_add_chosen_languages_to_users.rb
index 48b53019d6..eae8d6b4e1 100644
--- a/db/migrate/20180616192031_add_chosen_languages_to_users.rb
+++ b/db/migrate/20180616192031_add_chosen_languages_to_users.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddChosenLanguagesToUsers < ActiveRecord::Migration[5.2]
def change
add_column :users, :chosen_languages, :string, array: true, null: true, default: nil
diff --git a/db/migrate/20180617162849_remove_unused_indexes.rb b/db/migrate/20180617162849_remove_unused_indexes.rb
index 9cd6b91648..14766589fd 100644
--- a/db/migrate/20180617162849_remove_unused_indexes.rb
+++ b/db/migrate/20180617162849_remove_unused_indexes.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class RemoveUnusedIndexes < ActiveRecord::Migration[5.2]
def change
remove_index :statuses, name: 'index_statuses_on_conversation_id'
diff --git a/db/migrate/20180628181026_create_custom_filters.rb b/db/migrate/20180628181026_create_custom_filters.rb
index d19cf2e9d6..1e7f4463f3 100644
--- a/db/migrate/20180628181026_create_custom_filters.rb
+++ b/db/migrate/20180628181026_create_custom_filters.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateCustomFilters < ActiveRecord::Migration[5.2]
def change
create_table :custom_filters do |t|
diff --git a/db/migrate/20180707154237_add_whole_word_to_custom_filter.rb b/db/migrate/20180707154237_add_whole_word_to_custom_filter.rb
index 63ecb87415..793c3e6cfb 100644
--- a/db/migrate/20180707154237_add_whole_word_to_custom_filter.rb
+++ b/db/migrate/20180707154237_add_whole_word_to_custom_filter.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
require Rails.root.join('lib', 'mastodon', 'migration_helpers')
class AddWholeWordToCustomFilter < ActiveRecord::Migration[5.2]
diff --git a/db/migrate/20180711152640_create_relays.rb b/db/migrate/20180711152640_create_relays.rb
index 8762f473a2..2d2f546d16 100644
--- a/db/migrate/20180711152640_create_relays.rb
+++ b/db/migrate/20180711152640_create_relays.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateRelays < ActiveRecord::Migration[5.2]
def change
create_table :relays do |t|
diff --git a/db/migrate/20180808175627_create_account_pins.rb b/db/migrate/20180808175627_create_account_pins.rb
index 43d8185be9..551496c342 100644
--- a/db/migrate/20180808175627_create_account_pins.rb
+++ b/db/migrate/20180808175627_create_account_pins.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateAccountPins < ActiveRecord::Migration[5.2]
def change
create_table :account_pins do |t|
diff --git a/db/migrate/20180812123222_change_relays_enabled.rb b/db/migrate/20180812123222_change_relays_enabled.rb
index c4fd8179be..7424b91c7e 100644
--- a/db/migrate/20180812123222_change_relays_enabled.rb
+++ b/db/migrate/20180812123222_change_relays_enabled.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class ChangeRelaysEnabled < ActiveRecord::Migration[5.2]
def up
# The relays table is supposed to be very small,
diff --git a/db/migrate/20180812162710_create_status_stats.rb b/db/migrate/20180812162710_create_status_stats.rb
index d4da36fe78..882efce833 100644
--- a/db/migrate/20180812162710_create_status_stats.rb
+++ b/db/migrate/20180812162710_create_status_stats.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateStatusStats < ActiveRecord::Migration[5.2]
def change
create_table :status_stats do |t|
diff --git a/db/migrate/20180812173710_copy_status_stats.rb b/db/migrate/20180812173710_copy_status_stats.rb
index 45eb9501ce..20baeeca6b 100644
--- a/db/migrate/20180812173710_copy_status_stats.rb
+++ b/db/migrate/20180812173710_copy_status_stats.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CopyStatusStats < ActiveRecord::Migration[5.2]
disable_ddl_transaction!
diff --git a/db/migrate/20180814171349_add_confidential_to_doorkeeper_application.rb b/db/migrate/20180814171349_add_confidential_to_doorkeeper_application.rb
index 7077a4e659..7360c71ac9 100644
--- a/db/migrate/20180814171349_add_confidential_to_doorkeeper_application.rb
+++ b/db/migrate/20180814171349_add_confidential_to_doorkeeper_application.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
require Rails.root.join('lib', 'mastodon', 'migration_helpers')
class AddConfidentialToDoorkeeperApplication < ActiveRecord::Migration[5.2]
diff --git a/db/migrate/20180831171112_create_bookmarks.rb b/db/migrate/20180831171112_create_bookmarks.rb
index a08e60739e..5509f64bb7 100644
--- a/db/migrate/20180831171112_create_bookmarks.rb
+++ b/db/migrate/20180831171112_create_bookmarks.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateBookmarks < ActiveRecord::Migration[5.2]
def change
create_table :bookmarks do |t|
diff --git a/db/migrate/20180929222014_create_account_conversations.rb b/db/migrate/20180929222014_create_account_conversations.rb
index 53fa137e15..9386b86e7c 100644
--- a/db/migrate/20180929222014_create_account_conversations.rb
+++ b/db/migrate/20180929222014_create_account_conversations.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateAccountConversations < ActiveRecord::Migration[5.2]
def change
create_table :account_conversations do |t|
diff --git a/db/migrate/20181007025445_create_pghero_space_stats.rb b/db/migrate/20181007025445_create_pghero_space_stats.rb
index 6198a6f846..ddaf4aef31 100644
--- a/db/migrate/20181007025445_create_pghero_space_stats.rb
+++ b/db/migrate/20181007025445_create_pghero_space_stats.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreatePgheroSpaceStats < ActiveRecord::Migration[5.2]
def change
create_table :pghero_space_stats do |t|
diff --git a/db/migrate/20181010141500_add_silent_to_mentions.rb b/db/migrate/20181010141500_add_silent_to_mentions.rb
index dbb4fba263..f9bfc51694 100644
--- a/db/migrate/20181010141500_add_silent_to_mentions.rb
+++ b/db/migrate/20181010141500_add_silent_to_mentions.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
require Rails.root.join('lib', 'mastodon', 'migration_helpers')
class AddSilentToMentions < ActiveRecord::Migration[5.2]
diff --git a/db/migrate/20181017170937_add_reject_reports_to_domain_blocks.rb b/db/migrate/20181017170937_add_reject_reports_to_domain_blocks.rb
index f05d50fcd9..b6cfd31d25 100644
--- a/db/migrate/20181017170937_add_reject_reports_to_domain_blocks.rb
+++ b/db/migrate/20181017170937_add_reject_reports_to_domain_blocks.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
require Rails.root.join('lib', 'mastodon', 'migration_helpers')
class AddRejectReportsToDomainBlocks < ActiveRecord::Migration[5.2]
diff --git a/db/migrate/20181018205649_add_unread_to_account_conversations.rb b/db/migrate/20181018205649_add_unread_to_account_conversations.rb
index 3c28b9a641..fec9476398 100644
--- a/db/migrate/20181018205649_add_unread_to_account_conversations.rb
+++ b/db/migrate/20181018205649_add_unread_to_account_conversations.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
require Rails.root.join('lib', 'mastodon', 'migration_helpers')
class AddUnreadToAccountConversations < ActiveRecord::Migration[5.2]
diff --git a/db/migrate/20181024224956_migrate_account_conversations.rb b/db/migrate/20181024224956_migrate_account_conversations.rb
index e4dcdb18b3..18f9aca97c 100644
--- a/db/migrate/20181024224956_migrate_account_conversations.rb
+++ b/db/migrate/20181024224956_migrate_account_conversations.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
require_relative '../../lib/mastodon/migration_warning'
class MigrateAccountConversations < ActiveRecord::Migration[5.2]
diff --git a/db/migrate/20181026034033_remove_faux_remote_account_duplicates.rb b/db/migrate/20181026034033_remove_faux_remote_account_duplicates.rb
index 40537e9c9e..12998f0af8 100644
--- a/db/migrate/20181026034033_remove_faux_remote_account_duplicates.rb
+++ b/db/migrate/20181026034033_remove_faux_remote_account_duplicates.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class RemoveFauxRemoteAccountDuplicates < ActiveRecord::Migration[5.2]
disable_ddl_transaction!
diff --git a/db/migrate/20181116165755_create_account_stats.rb b/db/migrate/20181116165755_create_account_stats.rb
index a798e8166e..e21c499486 100644
--- a/db/migrate/20181116165755_create_account_stats.rb
+++ b/db/migrate/20181116165755_create_account_stats.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateAccountStats < ActiveRecord::Migration[5.2]
def change
create_table :account_stats do |t|
diff --git a/db/migrate/20181116173541_copy_account_stats.rb b/db/migrate/20181116173541_copy_account_stats.rb
index f908575cb1..88dc0c1fe9 100644
--- a/db/migrate/20181116173541_copy_account_stats.rb
+++ b/db/migrate/20181116173541_copy_account_stats.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CopyAccountStats < ActiveRecord::Migration[5.2]
disable_ddl_transaction!
diff --git a/db/migrate/20181127130500_identity_id_to_bigint.rb b/db/migrate/20181127130500_identity_id_to_bigint.rb
index 5f388aca7c..51420c79d6 100644
--- a/db/migrate/20181127130500_identity_id_to_bigint.rb
+++ b/db/migrate/20181127130500_identity_id_to_bigint.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
require Rails.root.join('lib', 'mastodon', 'migration_helpers')
class IdentityIdToBigint < ActiveRecord::Migration[5.2]
diff --git a/db/migrate/20181127165847_add_show_replies_to_lists.rb b/db/migrate/20181127165847_add_show_replies_to_lists.rb
index f68c98dafc..45d457b748 100644
--- a/db/migrate/20181127165847_add_show_replies_to_lists.rb
+++ b/db/migrate/20181127165847_add_show_replies_to_lists.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
require Rails.root.join('lib', 'mastodon', 'migration_helpers')
class AddShowRepliesToLists < ActiveRecord::Migration[5.2]
diff --git a/db/migrate/20181203003808_create_accounts_tags_join_table.rb b/db/migrate/20181203003808_create_accounts_tags_join_table.rb
index 3c275c2b78..4344176472 100644
--- a/db/migrate/20181203003808_create_accounts_tags_join_table.rb
+++ b/db/migrate/20181203003808_create_accounts_tags_join_table.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateAccountsTagsJoinTable < ActiveRecord::Migration[5.2]
def change
create_join_table :accounts, :tags do |t|
diff --git a/db/migrate/20181203021853_add_discoverable_to_accounts.rb b/db/migrate/20181203021853_add_discoverable_to_accounts.rb
index 5bbae2203e..16576aa043 100644
--- a/db/migrate/20181203021853_add_discoverable_to_accounts.rb
+++ b/db/migrate/20181203021853_add_discoverable_to_accounts.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddDiscoverableToAccounts < ActiveRecord::Migration[5.2]
def change
add_column :accounts, :discoverable, :boolean
diff --git a/db/migrate/20181204193439_add_last_status_at_to_account_stats.rb b/db/migrate/20181204193439_add_last_status_at_to_account_stats.rb
index 9466627071..dc1c6084b1 100644
--- a/db/migrate/20181204193439_add_last_status_at_to_account_stats.rb
+++ b/db/migrate/20181204193439_add_last_status_at_to_account_stats.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddLastStatusAtToAccountStats < ActiveRecord::Migration[5.2]
def change
add_column :account_stats, :last_status_at, :datetime
diff --git a/db/migrate/20181204215309_create_account_tag_stats.rb b/db/migrate/20181204215309_create_account_tag_stats.rb
index 15ed8587e3..1d4477c9c5 100644
--- a/db/migrate/20181204215309_create_account_tag_stats.rb
+++ b/db/migrate/20181204215309_create_account_tag_stats.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateAccountTagStats < ActiveRecord::Migration[5.2]
def change
create_table :account_tag_stats do |t|
diff --git a/db/migrate/20181207011115_downcase_custom_emoji_domains.rb b/db/migrate/20181207011115_downcase_custom_emoji_domains.rb
index e27e0249d9..3f3da937a5 100644
--- a/db/migrate/20181207011115_downcase_custom_emoji_domains.rb
+++ b/db/migrate/20181207011115_downcase_custom_emoji_domains.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class DowncaseCustomEmojiDomains < ActiveRecord::Migration[5.2]
disable_ddl_transaction!
diff --git a/db/migrate/20181213184704_create_account_warnings.rb b/db/migrate/20181213184704_create_account_warnings.rb
index e768be2778..35989c986f 100644
--- a/db/migrate/20181213184704_create_account_warnings.rb
+++ b/db/migrate/20181213184704_create_account_warnings.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateAccountWarnings < ActiveRecord::Migration[5.2]
def change
create_table :account_warnings do |t|
diff --git a/db/migrate/20181213185533_create_account_warning_presets.rb b/db/migrate/20181213185533_create_account_warning_presets.rb
index 9c81f1b5e6..f8a1017136 100644
--- a/db/migrate/20181213185533_create_account_warning_presets.rb
+++ b/db/migrate/20181213185533_create_account_warning_presets.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateAccountWarningPresets < ActiveRecord::Migration[5.2]
def change
create_table :account_warning_presets do |t|
diff --git a/db/migrate/20181219235220_add_created_by_application_id_to_users.rb b/db/migrate/20181219235220_add_created_by_application_id_to_users.rb
index 81c9237e83..0663d9c109 100644
--- a/db/migrate/20181219235220_add_created_by_application_id_to_users.rb
+++ b/db/migrate/20181219235220_add_created_by_application_id_to_users.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddCreatedByApplicationIdToUsers < ActiveRecord::Migration[5.2]
disable_ddl_transaction!
diff --git a/db/migrate/20181226021420_add_also_known_as_to_accounts.rb b/db/migrate/20181226021420_add_also_known_as_to_accounts.rb
index 1fd9566803..b0310fc324 100644
--- a/db/migrate/20181226021420_add_also_known_as_to_accounts.rb
+++ b/db/migrate/20181226021420_add_also_known_as_to_accounts.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddAlsoKnownAsToAccounts < ActiveRecord::Migration[5.2]
def change
add_column :accounts, :also_known_as, :string, array: true
diff --git a/db/migrate/20190103124649_create_scheduled_statuses.rb b/db/migrate/20190103124649_create_scheduled_statuses.rb
index 2b78073b85..a66546187e 100644
--- a/db/migrate/20190103124649_create_scheduled_statuses.rb
+++ b/db/migrate/20190103124649_create_scheduled_statuses.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateScheduledStatuses < ActiveRecord::Migration[5.2]
def change
create_table :scheduled_statuses do |t|
diff --git a/db/migrate/20190103124754_add_scheduled_status_id_to_media_attachments.rb b/db/migrate/20190103124754_add_scheduled_status_id_to_media_attachments.rb
index 7d904af60f..d575bdcaf2 100644
--- a/db/migrate/20190103124754_add_scheduled_status_id_to_media_attachments.rb
+++ b/db/migrate/20190103124754_add_scheduled_status_id_to_media_attachments.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddScheduledStatusIdToMediaAttachments < ActiveRecord::Migration[5.2]
disable_ddl_transaction!
diff --git a/db/migrate/20190117114553_create_tombstones.rb b/db/migrate/20190117114553_create_tombstones.rb
index 06d6d8c5ad..b25d7964ee 100644
--- a/db/migrate/20190117114553_create_tombstones.rb
+++ b/db/migrate/20190117114553_create_tombstones.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateTombstones < ActiveRecord::Migration[5.2]
def change
create_table :tombstones do |t|
diff --git a/db/migrate/20190201012802_add_overwrite_to_imports.rb b/db/migrate/20190201012802_add_overwrite_to_imports.rb
index 89b262cc72..fe9423ed04 100644
--- a/db/migrate/20190201012802_add_overwrite_to_imports.rb
+++ b/db/migrate/20190201012802_add_overwrite_to_imports.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
require Rails.root.join('lib', 'mastodon', 'migration_helpers')
class AddOverwriteToImports < ActiveRecord::Migration[5.2]
diff --git a/db/migrate/20190203180359_create_featured_tags.rb b/db/migrate/20190203180359_create_featured_tags.rb
index b08410a3a7..fe525aef83 100644
--- a/db/migrate/20190203180359_create_featured_tags.rb
+++ b/db/migrate/20190203180359_create_featured_tags.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateFeaturedTags < ActiveRecord::Migration[5.2]
def change
create_table :featured_tags do |t|
diff --git a/db/migrate/20190225031541_create_polls.rb b/db/migrate/20190225031541_create_polls.rb
index ea9ad0425f..33497c5cb6 100644
--- a/db/migrate/20190225031541_create_polls.rb
+++ b/db/migrate/20190225031541_create_polls.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreatePolls < ActiveRecord::Migration[5.2]
def change
create_table :polls do |t|
diff --git a/db/migrate/20190225031625_create_poll_votes.rb b/db/migrate/20190225031625_create_poll_votes.rb
index a0849d3a55..4b0504e82e 100644
--- a/db/migrate/20190225031625_create_poll_votes.rb
+++ b/db/migrate/20190225031625_create_poll_votes.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreatePollVotes < ActiveRecord::Migration[5.2]
def change
create_table :poll_votes do |t|
diff --git a/db/migrate/20190226003449_add_poll_id_to_statuses.rb b/db/migrate/20190226003449_add_poll_id_to_statuses.rb
index 692e8f814f..8d0af7ba0d 100644
--- a/db/migrate/20190226003449_add_poll_id_to_statuses.rb
+++ b/db/migrate/20190226003449_add_poll_id_to_statuses.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddPollIdToStatuses < ActiveRecord::Migration[5.2]
def change
add_column :statuses, :poll_id, :bigint
diff --git a/db/migrate/20190304152020_add_uri_to_poll_votes.rb b/db/migrate/20190304152020_add_uri_to_poll_votes.rb
index f6b81f1ba3..37a7f0aa89 100644
--- a/db/migrate/20190304152020_add_uri_to_poll_votes.rb
+++ b/db/migrate/20190304152020_add_uri_to_poll_votes.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddUriToPollVotes < ActiveRecord::Migration[5.2]
def change
add_column :poll_votes, :uri, :string
diff --git a/db/migrate/20190306145741_add_lock_version_to_polls.rb b/db/migrate/20190306145741_add_lock_version_to_polls.rb
index c9fa471ad9..760818d97b 100644
--- a/db/migrate/20190306145741_add_lock_version_to_polls.rb
+++ b/db/migrate/20190306145741_add_lock_version_to_polls.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
require Rails.root.join('lib', 'mastodon', 'migration_helpers')
class AddLockVersionToPolls < ActiveRecord::Migration[5.2]
diff --git a/db/migrate/20190307234537_add_approved_to_users.rb b/db/migrate/20190307234537_add_approved_to_users.rb
index c57a66dbc3..9abab29c93 100644
--- a/db/migrate/20190307234537_add_approved_to_users.rb
+++ b/db/migrate/20190307234537_add_approved_to_users.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
require Rails.root.join('lib', 'mastodon', 'migration_helpers')
class AddApprovedToUsers < ActiveRecord::Migration[5.2]
diff --git a/db/migrate/20190314181829_migrate_open_registrations_setting.rb b/db/migrate/20190314181829_migrate_open_registrations_setting.rb
index d2f6bf2c1c..3b1a963423 100644
--- a/db/migrate/20190314181829_migrate_open_registrations_setting.rb
+++ b/db/migrate/20190314181829_migrate_open_registrations_setting.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class MigrateOpenRegistrationsSetting < ActiveRecord::Migration[5.2]
def up
open_registrations = Setting.find_by(var: 'open_registrations')
diff --git a/db/migrate/20190316190352_create_account_identity_proofs.rb b/db/migrate/20190316190352_create_account_identity_proofs.rb
index ddcbce3f36..7055dc37b9 100644
--- a/db/migrate/20190316190352_create_account_identity_proofs.rb
+++ b/db/migrate/20190316190352_create_account_identity_proofs.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateAccountIdentityProofs < ActiveRecord::Migration[5.2]
def change
create_table :account_identity_proofs do |t|
diff --git a/db/migrate/20190317135723_add_uri_to_reports.rb b/db/migrate/20190317135723_add_uri_to_reports.rb
index 47c0f2a21d..722e6af8ed 100644
--- a/db/migrate/20190317135723_add_uri_to_reports.rb
+++ b/db/migrate/20190317135723_add_uri_to_reports.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddUriToReports < ActiveRecord::Migration[5.2]
def change
add_column :reports, :uri, :string
diff --git a/db/migrate/20190403141604_add_comment_to_invites.rb b/db/migrate/20190403141604_add_comment_to_invites.rb
index f0d7b1dcdd..5f87a0fe43 100644
--- a/db/migrate/20190403141604_add_comment_to_invites.rb
+++ b/db/migrate/20190403141604_add_comment_to_invites.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddCommentToInvites < ActiveRecord::Migration[5.2]
def change
add_column :invites, :comment, :text
diff --git a/db/migrate/20190409054914_create_user_invite_requests.rb b/db/migrate/20190409054914_create_user_invite_requests.rb
index 974e0f69fe..233b5a5584 100644
--- a/db/migrate/20190409054914_create_user_invite_requests.rb
+++ b/db/migrate/20190409054914_create_user_invite_requests.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateUserInviteRequests < ActiveRecord::Migration[5.2]
def change
create_table :user_invite_requests do |t|
diff --git a/db/migrate/20190420025523_add_blurhash_to_media_attachments.rb b/db/migrate/20190420025523_add_blurhash_to_media_attachments.rb
index f2bbe0a856..0f2f684894 100644
--- a/db/migrate/20190420025523_add_blurhash_to_media_attachments.rb
+++ b/db/migrate/20190420025523_add_blurhash_to_media_attachments.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddBlurhashToMediaAttachments < ActiveRecord::Migration[5.2]
def change
add_column :media_attachments, :blurhash, :string
diff --git a/db/migrate/20190509164208_add_by_moderator_to_tombstone.rb b/db/migrate/20190509164208_add_by_moderator_to_tombstone.rb
index 80c2448428..656cd0af58 100644
--- a/db/migrate/20190509164208_add_by_moderator_to_tombstone.rb
+++ b/db/migrate/20190509164208_add_by_moderator_to_tombstone.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddByModeratorToTombstone < ActiveRecord::Migration[5.2]
def change
add_column :tombstones, :by_moderator, :boolean
diff --git a/db/migrate/20190511134027_add_silenced_at_suspended_at_to_accounts.rb b/db/migrate/20190511134027_add_silenced_at_suspended_at_to_accounts.rb
index 1e5cd669c3..7301e960d5 100644
--- a/db/migrate/20190511134027_add_silenced_at_suspended_at_to_accounts.rb
+++ b/db/migrate/20190511134027_add_silenced_at_suspended_at_to_accounts.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddSilencedAtSuspendedAtToAccounts < ActiveRecord::Migration[5.2]
class Account < ApplicationRecord
# Dummy class, to make migration possible across version changes
diff --git a/db/migrate/20190529143559_preserve_old_layout_for_existing_users.rb b/db/migrate/20190529143559_preserve_old_layout_for_existing_users.rb
index 1c18b85cbc..88dcea4360 100644
--- a/db/migrate/20190529143559_preserve_old_layout_for_existing_users.rb
+++ b/db/migrate/20190529143559_preserve_old_layout_for_existing_users.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class PreserveOldLayoutForExistingUsers < ActiveRecord::Migration[5.2]
disable_ddl_transaction!
diff --git a/db/migrate/20190627222225_create_custom_emoji_categories.rb b/db/migrate/20190627222225_create_custom_emoji_categories.rb
index 4713793e66..5d8a8b49ba 100644
--- a/db/migrate/20190627222225_create_custom_emoji_categories.rb
+++ b/db/migrate/20190627222225_create_custom_emoji_categories.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateCustomEmojiCategories < ActiveRecord::Migration[5.2]
def change
create_table :custom_emoji_categories do |t|
diff --git a/db/migrate/20190627222826_add_category_id_to_custom_emojis.rb b/db/migrate/20190627222826_add_category_id_to_custom_emojis.rb
index 873b4d05fe..b8d102de57 100644
--- a/db/migrate/20190627222826_add_category_id_to_custom_emojis.rb
+++ b/db/migrate/20190627222826_add_category_id_to_custom_emojis.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddCategoryIdToCustomEmojis < ActiveRecord::Migration[5.2]
def change
add_column :custom_emojis, :category_id, :bigint
diff --git a/db/migrate/20190701022101_add_trust_level_to_accounts.rb b/db/migrate/20190701022101_add_trust_level_to_accounts.rb
index 917486d2ed..2a906e15f2 100644
--- a/db/migrate/20190701022101_add_trust_level_to_accounts.rb
+++ b/db/migrate/20190701022101_add_trust_level_to_accounts.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddTrustLevelToAccounts < ActiveRecord::Migration[5.2]
def change
add_column :accounts, :trust_level, :integer
diff --git a/db/migrate/20190705002136_create_domain_allows.rb b/db/migrate/20190705002136_create_domain_allows.rb
index 83b0728d9d..cdd8c65d65 100644
--- a/db/migrate/20190705002136_create_domain_allows.rb
+++ b/db/migrate/20190705002136_create_domain_allows.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateDomainAllows < ActiveRecord::Migration[5.2]
def change
create_table :domain_allows do |t|
diff --git a/db/migrate/20190715164535_add_instance_actor.rb b/db/migrate/20190715164535_add_instance_actor.rb
index 0ae53199ac..3785dc2553 100644
--- a/db/migrate/20190715164535_add_instance_actor.rb
+++ b/db/migrate/20190715164535_add_instance_actor.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddInstanceActor < ActiveRecord::Migration[5.2]
class Account < ApplicationRecord
# Dummy class, to make migration possible across version changes
diff --git a/db/migrate/20190726175042_add_case_insensitive_index_to_tags.rb b/db/migrate/20190726175042_add_case_insensitive_index_to_tags.rb
index 3a6527f652..f2d3aa8ee8 100644
--- a/db/migrate/20190726175042_add_case_insensitive_index_to_tags.rb
+++ b/db/migrate/20190726175042_add_case_insensitive_index_to_tags.rb
@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
class AddCaseInsensitiveIndexToTags < ActiveRecord::Migration[5.2]
disable_ddl_transaction!
def up
Tag.connection.select_all('SELECT string_agg(id::text, \',\') AS ids FROM tags GROUP BY lower(name) HAVING count(*) > 1').to_ary.each do |row|
canonical_tag_id = row['ids'].split(',').first
- redundant_tag_ids = row['ids'].split(',')[1..-1]
+ redundant_tag_ids = row['ids'].split(',')[1..]
safety_assured do
execute "UPDATE accounts_tags AS t0 SET tag_id = #{canonical_tag_id} WHERE tag_id IN (#{redundant_tag_ids.join(', ')}) AND NOT EXISTS (SELECT t1.tag_id FROM accounts_tags AS t1 WHERE t1.tag_id = #{canonical_tag_id} AND t1.account_id = t0.account_id)"
diff --git a/db/migrate/20190729185330_add_score_to_tags.rb b/db/migrate/20190729185330_add_score_to_tags.rb
index 75fee4b570..b990209c67 100644
--- a/db/migrate/20190729185330_add_score_to_tags.rb
+++ b/db/migrate/20190729185330_add_score_to_tags.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddScoreToTags < ActiveRecord::Migration[5.2]
def change
add_column :tags, :score, :int
diff --git a/db/migrate/20190805123746_add_capabilities_to_tags.rb b/db/migrate/20190805123746_add_capabilities_to_tags.rb
index 43c7763b1b..623b56a831 100644
--- a/db/migrate/20190805123746_add_capabilities_to_tags.rb
+++ b/db/migrate/20190805123746_add_capabilities_to_tags.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddCapabilitiesToTags < ActiveRecord::Migration[5.2]
def change
add_column :tags, :usable, :boolean
diff --git a/db/migrate/20190807135426_add_comments_to_domain_blocks.rb b/db/migrate/20190807135426_add_comments_to_domain_blocks.rb
index 79b9f02125..7cca3229c9 100644
--- a/db/migrate/20190807135426_add_comments_to_domain_blocks.rb
+++ b/db/migrate/20190807135426_add_comments_to_domain_blocks.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddCommentsToDomainBlocks < ActiveRecord::Migration[5.2]
def change
add_column :domain_blocks, :private_comment, :text
diff --git a/db/migrate/20190815225426_add_last_status_at_to_tags.rb b/db/migrate/20190815225426_add_last_status_at_to_tags.rb
index d83537c47f..03181988c6 100644
--- a/db/migrate/20190815225426_add_last_status_at_to_tags.rb
+++ b/db/migrate/20190815225426_add_last_status_at_to_tags.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddLastStatusAtToTags < ActiveRecord::Migration[5.2]
def change
add_column :tags, :last_status_at, :datetime
diff --git a/db/migrate/20190819134503_add_deleted_at_to_statuses.rb b/db/migrate/20190819134503_add_deleted_at_to_statuses.rb
index 5af109097e..43a3333754 100644
--- a/db/migrate/20190819134503_add_deleted_at_to_statuses.rb
+++ b/db/migrate/20190819134503_add_deleted_at_to_statuses.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddDeletedAtToStatuses < ActiveRecord::Migration[5.2]
def change
add_column :statuses, :deleted_at, :datetime
diff --git a/db/migrate/20190820003045_update_statuses_index.rb b/db/migrate/20190820003045_update_statuses_index.rb
index 5c2ea1f6a2..df9ce0638f 100644
--- a/db/migrate/20190820003045_update_statuses_index.rb
+++ b/db/migrate/20190820003045_update_statuses_index.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class UpdateStatusesIndex < ActiveRecord::Migration[5.2]
disable_ddl_transaction!
diff --git a/db/migrate/20190823221802_add_local_index_to_statuses.rb b/db/migrate/20190823221802_add_local_index_to_statuses.rb
index deca25c351..b5baa30287 100644
--- a/db/migrate/20190823221802_add_local_index_to_statuses.rb
+++ b/db/migrate/20190823221802_add_local_index_to_statuses.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddLocalIndexToStatuses < ActiveRecord::Migration[5.2]
disable_ddl_transaction!
diff --git a/db/migrate/20190901035623_add_max_score_to_tags.rb b/db/migrate/20190901035623_add_max_score_to_tags.rb
index f936e98718..42a5796949 100644
--- a/db/migrate/20190901035623_add_max_score_to_tags.rb
+++ b/db/migrate/20190901035623_add_max_score_to_tags.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddMaxScoreToTags < ActiveRecord::Migration[5.2]
def change
add_column :tags, :max_score, :float
diff --git a/db/migrate/20190904222339_create_markers.rb b/db/migrate/20190904222339_create_markers.rb
index 71ca70ac3d..5d469ddef6 100644
--- a/db/migrate/20190904222339_create_markers.rb
+++ b/db/migrate/20190904222339_create_markers.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateMarkers < ActiveRecord::Migration[5.2]
def change
create_table :markers do |t|
diff --git a/db/migrate/20190914202517_create_account_migrations.rb b/db/migrate/20190914202517_create_account_migrations.rb
index cb9d71c096..44353e08c7 100644
--- a/db/migrate/20190914202517_create_account_migrations.rb
+++ b/db/migrate/20190914202517_create_account_migrations.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateAccountMigrations < ActiveRecord::Migration[5.2]
def change
create_table :account_migrations do |t|
diff --git a/db/migrate/20190915194355_create_account_aliases.rb b/db/migrate/20190915194355_create_account_aliases.rb
index 32ce031d91..f5d648e6d1 100644
--- a/db/migrate/20190915194355_create_account_aliases.rb
+++ b/db/migrate/20190915194355_create_account_aliases.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateAccountAliases < ActiveRecord::Migration[5.2]
def change
create_table :account_aliases do |t|
diff --git a/db/migrate/20190927232842_add_voters_count_to_polls.rb b/db/migrate/20190927232842_add_voters_count_to_polls.rb
index 8463857009..02d6e4bda5 100644
--- a/db/migrate/20190927232842_add_voters_count_to_polls.rb
+++ b/db/migrate/20190927232842_add_voters_count_to_polls.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddVotersCountToPolls < ActiveRecord::Migration[5.2]
def change
add_column :polls, :voters_count, :bigint
diff --git a/db/migrate/20191001213028_add_lock_version_to_account_stats.rb b/db/migrate/20191001213028_add_lock_version_to_account_stats.rb
index 47f37cca29..0dc1655596 100644
--- a/db/migrate/20191001213028_add_lock_version_to_account_stats.rb
+++ b/db/migrate/20191001213028_add_lock_version_to_account_stats.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
require Rails.root.join('lib', 'mastodon', 'migration_helpers')
class AddLockVersionToAccountStats < ActiveRecord::Migration[5.2]
diff --git a/db/migrate/20191007013357_update_pt_locales.rb b/db/migrate/20191007013357_update_pt_locales.rb
index 9e8f8b4241..a3a4e6b60e 100644
--- a/db/migrate/20191007013357_update_pt_locales.rb
+++ b/db/migrate/20191007013357_update_pt_locales.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class UpdatePtLocales < ActiveRecord::Migration[5.2]
class User < ApplicationRecord
# Dummy class, to make migration possible across version changes
diff --git a/db/migrate/20191031163205_change_list_account_follow_nullable.rb b/db/migrate/20191031163205_change_list_account_follow_nullable.rb
index 43ebfe8922..2416d4e916 100644
--- a/db/migrate/20191031163205_change_list_account_follow_nullable.rb
+++ b/db/migrate/20191031163205_change_list_account_follow_nullable.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class ChangeListAccountFollowNullable < ActiveRecord::Migration[5.2]
def change
safety_assured do
diff --git a/db/migrate/20191212003415_increase_backup_size.rb b/db/migrate/20191212003415_increase_backup_size.rb
index a5192263cf..c531a198b4 100644
--- a/db/migrate/20191212003415_increase_backup_size.rb
+++ b/db/migrate/20191212003415_increase_backup_size.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
require Rails.root.join('lib', 'mastodon', 'migration_helpers')
class IncreaseBackupSize < ActiveRecord::Migration[5.2]
diff --git a/db/migrate/20191212163405_add_hide_collections_to_accounts.rb b/db/migrate/20191212163405_add_hide_collections_to_accounts.rb
index fa99b32e5c..d6740f19b8 100644
--- a/db/migrate/20191212163405_add_hide_collections_to_accounts.rb
+++ b/db/migrate/20191212163405_add_hide_collections_to_accounts.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddHideCollectionsToAccounts < ActiveRecord::Migration[5.2]
def change
add_column :accounts, :hide_collections, :boolean
diff --git a/db/migrate/20191218153258_create_announcements.rb b/db/migrate/20191218153258_create_announcements.rb
index 58e143c920..632a912b1e 100644
--- a/db/migrate/20191218153258_create_announcements.rb
+++ b/db/migrate/20191218153258_create_announcements.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateAnnouncements < ActiveRecord::Migration[5.2]
def change
create_table :announcements do |t|
diff --git a/db/migrate/20200113125135_create_announcement_mutes.rb b/db/migrate/20200113125135_create_announcement_mutes.rb
index c588e7fcd3..42c45d7738 100644
--- a/db/migrate/20200113125135_create_announcement_mutes.rb
+++ b/db/migrate/20200113125135_create_announcement_mutes.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateAnnouncementMutes < ActiveRecord::Migration[5.2]
def change
create_table :announcement_mutes do |t|
diff --git a/db/migrate/20200114113335_create_announcement_reactions.rb b/db/migrate/20200114113335_create_announcement_reactions.rb
index 226c81a18e..f74d05fc02 100644
--- a/db/migrate/20200114113335_create_announcement_reactions.rb
+++ b/db/migrate/20200114113335_create_announcement_reactions.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateAnnouncementReactions < ActiveRecord::Migration[5.2]
def change
create_table :announcement_reactions do |t|
diff --git a/db/migrate/20200119112504_add_public_index_to_statuses.rb b/db/migrate/20200119112504_add_public_index_to_statuses.rb
index db007848e0..6451b9254e 100644
--- a/db/migrate/20200119112504_add_public_index_to_statuses.rb
+++ b/db/migrate/20200119112504_add_public_index_to_statuses.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddPublicIndexToStatuses < ActiveRecord::Migration[5.2]
disable_ddl_transaction!
diff --git a/db/migrate/20200126203551_add_published_at_to_announcements.rb b/db/migrate/20200126203551_add_published_at_to_announcements.rb
index d99f956942..98a3a95920 100644
--- a/db/migrate/20200126203551_add_published_at_to_announcements.rb
+++ b/db/migrate/20200126203551_add_published_at_to_announcements.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddPublishedAtToAnnouncements < ActiveRecord::Migration[5.2]
def change
add_column :announcements, :published_at, :datetime
diff --git a/db/migrate/20200306035625_add_processing_to_media_attachments.rb b/db/migrate/20200306035625_add_processing_to_media_attachments.rb
index 131ffa52ae..4506c03665 100644
--- a/db/migrate/20200306035625_add_processing_to_media_attachments.rb
+++ b/db/migrate/20200306035625_add_processing_to_media_attachments.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddProcessingToMediaAttachments < ActiveRecord::Migration[5.2]
def change
add_column :media_attachments, :processing, :integer
diff --git a/db/migrate/20200309150742_add_forwarded_to_reports.rb b/db/migrate/20200309150742_add_forwarded_to_reports.rb
index df278240ba..60db0167e3 100644
--- a/db/migrate/20200309150742_add_forwarded_to_reports.rb
+++ b/db/migrate/20200309150742_add_forwarded_to_reports.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddForwardedToReports < ActiveRecord::Migration[5.2]
def change
add_column :reports, :forwarded, :boolean
diff --git a/db/migrate/20200312144258_add_title_to_account_warning_presets.rb b/db/migrate/20200312144258_add_title_to_account_warning_presets.rb
index 46a5350e7c..78b854f82c 100644
--- a/db/migrate/20200312144258_add_title_to_account_warning_presets.rb
+++ b/db/migrate/20200312144258_add_title_to_account_warning_presets.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
require Rails.root.join('lib', 'mastodon', 'migration_helpers')
class AddTitleToAccountWarningPresets < ActiveRecord::Migration[5.2]
diff --git a/db/migrate/20200312162302_add_status_ids_to_announcements.rb b/db/migrate/20200312162302_add_status_ids_to_announcements.rb
index 704d3773e7..a892b7396f 100644
--- a/db/migrate/20200312162302_add_status_ids_to_announcements.rb
+++ b/db/migrate/20200312162302_add_status_ids_to_announcements.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddStatusIdsToAnnouncements < ActiveRecord::Migration[5.2]
def change
add_column :announcements, :status_ids, :bigint, array: true
diff --git a/db/migrate/20200312185443_add_parent_id_to_email_domain_blocks.rb b/db/migrate/20200312185443_add_parent_id_to_email_domain_blocks.rb
index 54ca3b87c8..585a097bda 100644
--- a/db/migrate/20200312185443_add_parent_id_to_email_domain_blocks.rb
+++ b/db/migrate/20200312185443_add_parent_id_to_email_domain_blocks.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddParentIdToEmailDomainBlocks < ActiveRecord::Migration[5.2]
def change
safety_assured { add_reference :email_domain_blocks, :parent, null: true, default: nil, foreign_key: { on_delete: :cascade, to_table: :email_domain_blocks }, index: false }
diff --git a/db/migrate/20200317021758_add_expires_at_to_mutes.rb b/db/migrate/20200317021758_add_expires_at_to_mutes.rb
index eaae8319d7..75bf3ed85c 100644
--- a/db/migrate/20200317021758_add_expires_at_to_mutes.rb
+++ b/db/migrate/20200317021758_add_expires_at_to_mutes.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddExpiresAtToMutes < ActiveRecord::Migration[5.2]
def change
add_column :mutes, :expires_at, :datetime
diff --git a/db/migrate/20200407201300_create_unavailable_domains.rb b/db/migrate/20200407201300_create_unavailable_domains.rb
index 56b477da5d..cbddcab80f 100644
--- a/db/migrate/20200407201300_create_unavailable_domains.rb
+++ b/db/migrate/20200407201300_create_unavailable_domains.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateUnavailableDomains < ActiveRecord::Migration[5.2]
def change
create_table :unavailable_domains do |t|
diff --git a/db/migrate/20200407202420_migrate_unavailable_inboxes.rb b/db/migrate/20200407202420_migrate_unavailable_inboxes.rb
index 05a01be284..a79045839b 100644
--- a/db/migrate/20200407202420_migrate_unavailable_inboxes.rb
+++ b/db/migrate/20200407202420_migrate_unavailable_inboxes.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class MigrateUnavailableInboxes < ActiveRecord::Migration[5.2]
disable_ddl_transaction!
diff --git a/db/migrate/20200417125749_add_storage_schema_version.rb b/db/migrate/20200417125749_add_storage_schema_version.rb
index 7438f97bae..b504537311 100644
--- a/db/migrate/20200417125749_add_storage_schema_version.rb
+++ b/db/migrate/20200417125749_add_storage_schema_version.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddStorageSchemaVersion < ActiveRecord::Migration[5.2]
def change
add_column :preview_cards, :image_storage_schema_version, :integer
diff --git a/db/migrate/20200508212852_reset_unique_jobs_locks.rb b/db/migrate/20200508212852_reset_unique_jobs_locks.rb
index d717ffc547..16e5c060b9 100644
--- a/db/migrate/20200508212852_reset_unique_jobs_locks.rb
+++ b/db/migrate/20200508212852_reset_unique_jobs_locks.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class ResetUniqueJobsLocks < ActiveRecord::Migration[5.2]
disable_ddl_transaction!
diff --git a/db/migrate/20200510110808_reset_web_app_secret.rb b/db/migrate/20200510110808_reset_web_app_secret.rb
index 8c0c06a83e..9f5a77a195 100644
--- a/db/migrate/20200510110808_reset_web_app_secret.rb
+++ b/db/migrate/20200510110808_reset_web_app_secret.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class ResetWebAppSecret < ActiveRecord::Migration[5.2]
disable_ddl_transaction!
diff --git a/db/migrate/20200510181721_remove_duplicated_indexes_pghero.rb b/db/migrate/20200510181721_remove_duplicated_indexes_pghero.rb
index 59bb1b9e2a..ce575d6284 100644
--- a/db/migrate/20200510181721_remove_duplicated_indexes_pghero.rb
+++ b/db/migrate/20200510181721_remove_duplicated_indexes_pghero.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class RemoveDuplicatedIndexesPghero < ActiveRecord::Migration[5.2]
def up
remove_index :account_conversations, name: :index_account_conversations_on_account_id if index_exists?(:account_conversations, :account_id, name: :index_account_conversations_on_account_id)
diff --git a/db/migrate/20200516180352_create_devices.rb b/db/migrate/20200516180352_create_devices.rb
index 04a628a897..a3e22c1457 100644
--- a/db/migrate/20200516180352_create_devices.rb
+++ b/db/migrate/20200516180352_create_devices.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateDevices < ActiveRecord::Migration[5.2]
def change
create_table :devices do |t|
diff --git a/db/migrate/20200516183822_create_one_time_keys.rb b/db/migrate/20200516183822_create_one_time_keys.rb
index 642b9e6323..4245ceef16 100644
--- a/db/migrate/20200516183822_create_one_time_keys.rb
+++ b/db/migrate/20200516183822_create_one_time_keys.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateOneTimeKeys < ActiveRecord::Migration[5.2]
def change
create_table :one_time_keys do |t|
diff --git a/db/migrate/20200518083523_create_encrypted_messages.rb b/db/migrate/20200518083523_create_encrypted_messages.rb
index 486726303c..a8b2976e61 100644
--- a/db/migrate/20200518083523_create_encrypted_messages.rb
+++ b/db/migrate/20200518083523_create_encrypted_messages.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateEncryptedMessages < ActiveRecord::Migration[5.2]
def change
create_table :encrypted_messages do |t|
diff --git a/db/migrate/20200521180606_encrypted_message_ids_to_timestamp_ids.rb b/db/migrate/20200521180606_encrypted_message_ids_to_timestamp_ids.rb
index c5c80b7953..422e4f43fa 100644
--- a/db/migrate/20200521180606_encrypted_message_ids_to_timestamp_ids.rb
+++ b/db/migrate/20200521180606_encrypted_message_ids_to_timestamp_ids.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class EncryptedMessageIdsToTimestampIds < ActiveRecord::Migration[5.2]
def up
safety_assured do
diff --git a/db/migrate/20200529214050_add_devices_url_to_accounts.rb b/db/migrate/20200529214050_add_devices_url_to_accounts.rb
index 1323f8df7e..6f868579fe 100644
--- a/db/migrate/20200529214050_add_devices_url_to_accounts.rb
+++ b/db/migrate/20200529214050_add_devices_url_to_accounts.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddDevicesURLToAccounts < ActiveRecord::Migration[5.2]
def change
add_column :accounts, :devices_url, :string
diff --git a/db/migrate/20200601222558_create_system_keys.rb b/db/migrate/20200601222558_create_system_keys.rb
index fd9d221aa2..38ec147d4d 100644
--- a/db/migrate/20200601222558_create_system_keys.rb
+++ b/db/migrate/20200601222558_create_system_keys.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateSystemKeys < ActiveRecord::Migration[5.2]
def change
create_table :system_keys do |t|
diff --git a/db/migrate/20200605155027_add_blurhash_to_preview_cards.rb b/db/migrate/20200605155027_add_blurhash_to_preview_cards.rb
index dc4b7a9849..f89dc7b2b1 100644
--- a/db/migrate/20200605155027_add_blurhash_to_preview_cards.rb
+++ b/db/migrate/20200605155027_add_blurhash_to_preview_cards.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddBlurhashToPreviewCards < ActiveRecord::Migration[5.2]
def change
add_column :preview_cards, :blurhash, :string
diff --git a/db/migrate/20200608113046_add_sign_in_token_to_users.rb b/db/migrate/20200608113046_add_sign_in_token_to_users.rb
index baa63c10f2..5b71276a24 100644
--- a/db/migrate/20200608113046_add_sign_in_token_to_users.rb
+++ b/db/migrate/20200608113046_add_sign_in_token_to_users.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddSignInTokenToUsers < ActiveRecord::Migration[5.2]
def change
add_column :users, :sign_in_token, :string
diff --git a/db/migrate/20200614002136_add_sensitized_to_accounts.rb b/db/migrate/20200614002136_add_sensitized_to_accounts.rb
index bc2dfcb636..bf5d363c81 100644
--- a/db/migrate/20200614002136_add_sensitized_to_accounts.rb
+++ b/db/migrate/20200614002136_add_sensitized_to_accounts.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddSensitizedToAccounts < ActiveRecord::Migration[5.2]
def change
add_column :accounts, :sensitized_at, :datetime
diff --git a/db/migrate/20200620164023_add_fixed_lowercase_index_to_accounts.rb b/db/migrate/20200620164023_add_fixed_lowercase_index_to_accounts.rb
index b350ee9f28..fa81ac1649 100644
--- a/db/migrate/20200620164023_add_fixed_lowercase_index_to_accounts.rb
+++ b/db/migrate/20200620164023_add_fixed_lowercase_index_to_accounts.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
require Rails.root.join('lib', 'mastodon', 'migration_helpers')
class AddFixedLowercaseIndexToAccounts < ActiveRecord::Migration[5.2]
diff --git a/db/migrate/20200622213645_media_attachment_ids_to_timestamp_ids.rb b/db/migrate/20200622213645_media_attachment_ids_to_timestamp_ids.rb
index 7c141e7afd..4b1caeddb5 100644
--- a/db/migrate/20200622213645_media_attachment_ids_to_timestamp_ids.rb
+++ b/db/migrate/20200622213645_media_attachment_ids_to_timestamp_ids.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class MediaAttachmentIdsToTimestampIds < ActiveRecord::Migration[5.2]
def up
# Set up the media_attachments.id column to use our timestamp-based IDs.
diff --git a/db/migrate/20200627125810_add_thumbnail_columns_to_media_attachments.rb b/db/migrate/20200627125810_add_thumbnail_columns_to_media_attachments.rb
index f9c87a53cc..a3c6b55fd2 100644
--- a/db/migrate/20200627125810_add_thumbnail_columns_to_media_attachments.rb
+++ b/db/migrate/20200627125810_add_thumbnail_columns_to_media_attachments.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddThumbnailColumnsToMediaAttachments < ActiveRecord::Migration[5.2]
def up
add_attachment :media_attachments, :thumbnail
diff --git a/db/migrate/20200628133322_create_account_notes.rb b/db/migrate/20200628133322_create_account_notes.rb
index 022e0ff3aa..dd2366198d 100644
--- a/db/migrate/20200628133322_create_account_notes.rb
+++ b/db/migrate/20200628133322_create_account_notes.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateAccountNotes < ActiveRecord::Migration[5.2]
def change
create_table :account_notes do |t|
diff --git a/db/migrate/20200630190240_create_webauthn_credentials.rb b/db/migrate/20200630190240_create_webauthn_credentials.rb
index ea924238d4..21c60ce008 100644
--- a/db/migrate/20200630190240_create_webauthn_credentials.rb
+++ b/db/migrate/20200630190240_create_webauthn_credentials.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateWebauthnCredentials < ActiveRecord::Migration[5.2]
def change
create_table :webauthn_credentials do |t|
diff --git a/db/migrate/20200630190544_add_webauthn_id_to_users.rb b/db/migrate/20200630190544_add_webauthn_id_to_users.rb
index 95d3c92a86..e2628b65bf 100644
--- a/db/migrate/20200630190544_add_webauthn_id_to_users.rb
+++ b/db/migrate/20200630190544_add_webauthn_id_to_users.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddWebauthnIdToUsers < ActiveRecord::Migration[5.2]
def change
add_column :users, :webauthn_id, :string
diff --git a/db/migrate/20200908193330_create_account_deletion_requests.rb b/db/migrate/20200908193330_create_account_deletion_requests.rb
index e03183ae45..1f543ca332 100644
--- a/db/migrate/20200908193330_create_account_deletion_requests.rb
+++ b/db/migrate/20200908193330_create_account_deletion_requests.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateAccountDeletionRequests < ActiveRecord::Migration[5.2]
def change
create_table :account_deletion_requests do |t|
diff --git a/db/migrate/20200917192924_add_notify_to_follows.rb b/db/migrate/20200917192924_add_notify_to_follows.rb
index 342eaa38d0..a57bb36dc2 100644
--- a/db/migrate/20200917192924_add_notify_to_follows.rb
+++ b/db/migrate/20200917192924_add_notify_to_follows.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
require Rails.root.join('lib', 'mastodon', 'migration_helpers')
class AddNotifyToFollows < ActiveRecord::Migration[5.2]
diff --git a/db/migrate/20200917193034_add_type_to_notifications.rb b/db/migrate/20200917193034_add_type_to_notifications.rb
index 002be3aa00..b0fb3bfe3a 100644
--- a/db/migrate/20200917193034_add_type_to_notifications.rb
+++ b/db/migrate/20200917193034_add_type_to_notifications.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddTypeToNotifications < ActiveRecord::Migration[5.2]
def change
add_column :notifications, :type, :string
diff --git a/db/migrate/20200917222316_add_index_notifications_on_type.rb b/db/migrate/20200917222316_add_index_notifications_on_type.rb
index 9bd23c1d3d..a819f23ee2 100644
--- a/db/migrate/20200917222316_add_index_notifications_on_type.rb
+++ b/db/migrate/20200917222316_add_index_notifications_on_type.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddIndexNotificationsOnType < ActiveRecord::Migration[5.2]
disable_ddl_transaction!
diff --git a/db/migrate/20201008202037_create_ip_blocks.rb b/db/migrate/20201008202037_create_ip_blocks.rb
index 32acd6ede1..76b86d648b 100644
--- a/db/migrate/20201008202037_create_ip_blocks.rb
+++ b/db/migrate/20201008202037_create_ip_blocks.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateIpBlocks < ActiveRecord::Migration[5.2]
def change
create_table :ip_blocks do |t|
diff --git a/db/migrate/20201008220312_add_sign_up_ip_to_users.rb b/db/migrate/20201008220312_add_sign_up_ip_to_users.rb
index 66cd624bbb..58d1a7aedc 100644
--- a/db/migrate/20201008220312_add_sign_up_ip_to_users.rb
+++ b/db/migrate/20201008220312_add_sign_up_ip_to_users.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddSignUpIpToUsers < ActiveRecord::Migration[5.2]
def change
add_column :users, :sign_up_ip, :inet
diff --git a/db/migrate/20201017233919_add_suspension_origin_to_accounts.rb b/db/migrate/20201017233919_add_suspension_origin_to_accounts.rb
index f0db02143a..1150f10941 100644
--- a/db/migrate/20201017233919_add_suspension_origin_to_accounts.rb
+++ b/db/migrate/20201017233919_add_suspension_origin_to_accounts.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddSuspensionOriginToAccounts < ActiveRecord::Migration[5.2]
def change
add_column :accounts, :suspension_origin, :integer
diff --git a/db/migrate/20201206004238_create_instances.rb b/db/migrate/20201206004238_create_instances.rb
index a4b866894a..965ab26e27 100644
--- a/db/migrate/20201206004238_create_instances.rb
+++ b/db/migrate/20201206004238_create_instances.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateInstances < ActiveRecord::Migration[5.2]
def change
create_view :instances, materialized: true
diff --git a/db/migrate/20201218054746_add_obfuscate_to_domain_blocks.rb b/db/migrate/20201218054746_add_obfuscate_to_domain_blocks.rb
index 26f4ddb851..91bba38c58 100644
--- a/db/migrate/20201218054746_add_obfuscate_to_domain_blocks.rb
+++ b/db/migrate/20201218054746_add_obfuscate_to_domain_blocks.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
require Rails.root.join('lib', 'mastodon', 'migration_helpers')
class AddObfuscateToDomainBlocks < ActiveRecord::Migration[5.2]
diff --git a/db/migrate/20210221045109_create_rules.rb b/db/migrate/20210221045109_create_rules.rb
index abe2fd42a0..293a1a6c43 100644
--- a/db/migrate/20210221045109_create_rules.rb
+++ b/db/migrate/20210221045109_create_rules.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateRules < ActiveRecord::Migration[5.2]
def change
create_table :rules do |t|
diff --git a/db/migrate/20210306164523_account_ids_to_timestamp_ids.rb b/db/migrate/20210306164523_account_ids_to_timestamp_ids.rb
index b287c60dd5..0b3f1f638a 100644
--- a/db/migrate/20210306164523_account_ids_to_timestamp_ids.rb
+++ b/db/migrate/20210306164523_account_ids_to_timestamp_ids.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AccountIdsToTimestampIds < ActiveRecord::Migration[5.2]
def up
# Set up the accounts.id column to use our timestamp-based IDs.
diff --git a/db/migrate/20210322164601_create_account_summaries.rb b/db/migrate/20210322164601_create_account_summaries.rb
index bc9011113f..8d18e9eeb4 100644
--- a/db/migrate/20210322164601_create_account_summaries.rb
+++ b/db/migrate/20210322164601_create_account_summaries.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateAccountSummaries < ActiveRecord::Migration[5.2]
def change
create_view :account_summaries, materialized: { no_data: true }
diff --git a/db/migrate/20210323114347_create_follow_recommendations.rb b/db/migrate/20210323114347_create_follow_recommendations.rb
index 77e7290320..b63564a030 100644
--- a/db/migrate/20210323114347_create_follow_recommendations.rb
+++ b/db/migrate/20210323114347_create_follow_recommendations.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateFollowRecommendations < ActiveRecord::Migration[5.2]
def change
create_view :follow_recommendations
diff --git a/db/migrate/20210324171613_create_follow_recommendation_suppressions.rb b/db/migrate/20210324171613_create_follow_recommendation_suppressions.rb
index c17a0be635..a2040ca983 100644
--- a/db/migrate/20210324171613_create_follow_recommendation_suppressions.rb
+++ b/db/migrate/20210324171613_create_follow_recommendation_suppressions.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateFollowRecommendationSuppressions < ActiveRecord::Migration[6.1]
def change
create_table :follow_recommendation_suppressions do |t|
diff --git a/db/migrate/20210416200740_create_canonical_email_blocks.rb b/db/migrate/20210416200740_create_canonical_email_blocks.rb
index 32c44646c3..a18539fa1c 100644
--- a/db/migrate/20210416200740_create_canonical_email_blocks.rb
+++ b/db/migrate/20210416200740_create_canonical_email_blocks.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateCanonicalEmailBlocks < ActiveRecord::Migration[6.1]
def change
create_table :canonical_email_blocks do |t|
diff --git a/db/migrate/20210421121431_add_case_insensitive_btree_index_to_tags.rb b/db/migrate/20210421121431_add_case_insensitive_btree_index_to_tags.rb
index a3cc854d7c..43b4e5a6f6 100644
--- a/db/migrate/20210421121431_add_case_insensitive_btree_index_to_tags.rb
+++ b/db/migrate/20210421121431_add_case_insensitive_btree_index_to_tags.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
require Rails.root.join('lib', 'mastodon', 'migration_helpers')
class AddCaseInsensitiveBtreeIndexToTags < ActiveRecord::Migration[5.2]
diff --git a/db/migrate/20210425135952_add_index_on_media_attachments_account_id_status_id.rb b/db/migrate/20210425135952_add_index_on_media_attachments_account_id_status_id.rb
index 5ef2d3c398..68fdcd51e9 100644
--- a/db/migrate/20210425135952_add_index_on_media_attachments_account_id_status_id.rb
+++ b/db/migrate/20210425135952_add_index_on_media_attachments_account_id_status_id.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddIndexOnMediaAttachmentsAccountIdStatusId < ActiveRecord::Migration[5.2]
disable_ddl_transaction!
diff --git a/db/migrate/20210505174616_update_follow_recommendations_to_version_2.rb b/db/migrate/20210505174616_update_follow_recommendations_to_version_2.rb
index 56c0b4cb0a..22c27a0e7a 100644
--- a/db/migrate/20210505174616_update_follow_recommendations_to_version_2.rb
+++ b/db/migrate/20210505174616_update_follow_recommendations_to_version_2.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class UpdateFollowRecommendationsToVersion2 < ActiveRecord::Migration[6.1]
# We're switching from a normal to a materialized view so we need
# custom `up` and `down` paths.
diff --git a/db/migrate/20210609202149_create_login_activities.rb b/db/migrate/20210609202149_create_login_activities.rb
index 38e147c327..f2da335997 100644
--- a/db/migrate/20210609202149_create_login_activities.rb
+++ b/db/migrate/20210609202149_create_login_activities.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateLoginActivities < ActiveRecord::Migration[6.1]
def change
create_table :login_activities do |t|
diff --git a/db/migrate/20210616214526_create_user_ips.rb b/db/migrate/20210616214526_create_user_ips.rb
index 68e81a9d81..4aaf9a4746 100644
--- a/db/migrate/20210616214526_create_user_ips.rb
+++ b/db/migrate/20210616214526_create_user_ips.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateUserIps < ActiveRecord::Migration[6.1]
def change
create_view :user_ips
diff --git a/db/migrate/20210621221010_add_skip_sign_in_token_to_users.rb b/db/migrate/20210621221010_add_skip_sign_in_token_to_users.rb
index 43ad9b9545..8c5d9c368a 100644
--- a/db/migrate/20210621221010_add_skip_sign_in_token_to_users.rb
+++ b/db/migrate/20210621221010_add_skip_sign_in_token_to_users.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddSkipSignInTokenToUsers < ActiveRecord::Migration[6.1]
def change
add_column :users, :skip_sign_in_token, :boolean
diff --git a/db/migrate/20210630000137_fix_canonical_email_blocks_foreign_key.rb b/db/migrate/20210630000137_fix_canonical_email_blocks_foreign_key.rb
index 64cf84448b..9b475966bb 100644
--- a/db/migrate/20210630000137_fix_canonical_email_blocks_foreign_key.rb
+++ b/db/migrate/20210630000137_fix_canonical_email_blocks_foreign_key.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class FixCanonicalEmailBlocksForeignKey < ActiveRecord::Migration[6.1]
def up
safety_assured do
diff --git a/db/migrate/20210722120340_create_account_statuses_cleanup_policies.rb b/db/migrate/20210722120340_create_account_statuses_cleanup_policies.rb
index db168676a1..334c375a4e 100644
--- a/db/migrate/20210722120340_create_account_statuses_cleanup_policies.rb
+++ b/db/migrate/20210722120340_create_account_statuses_cleanup_policies.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateAccountStatusesCleanupPolicies < ActiveRecord::Migration[6.1]
def change
create_table :account_statuses_cleanup_policies do |t|
diff --git a/db/migrate/20210904215403_add_edited_at_to_statuses.rb b/db/migrate/20210904215403_add_edited_at_to_statuses.rb
index 216ad8e138..545c6f79c4 100644
--- a/db/migrate/20210904215403_add_edited_at_to_statuses.rb
+++ b/db/migrate/20210904215403_add_edited_at_to_statuses.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddEditedAtToStatuses < ActiveRecord::Migration[6.1]
def change
add_column :statuses, :edited_at, :datetime
diff --git a/db/migrate/20210908220918_create_status_edits.rb b/db/migrate/20210908220918_create_status_edits.rb
index 6c90149d00..dfc2c51743 100644
--- a/db/migrate/20210908220918_create_status_edits.rb
+++ b/db/migrate/20210908220918_create_status_edits.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateStatusEdits < ActiveRecord::Migration[6.1]
def change
create_table :status_edits do |t|
diff --git a/db/migrate/20211031031021_create_preview_card_providers.rb b/db/migrate/20211031031021_create_preview_card_providers.rb
index 0bd46198e2..83255614b6 100644
--- a/db/migrate/20211031031021_create_preview_card_providers.rb
+++ b/db/migrate/20211031031021_create_preview_card_providers.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreatePreviewCardProviders < ActiveRecord::Migration[6.1]
def change
create_table :preview_card_providers do |t|
diff --git a/db/migrate/20211112011713_add_language_to_preview_cards.rb b/db/migrate/20211112011713_add_language_to_preview_cards.rb
index 995934de4c..b9049e9795 100644
--- a/db/migrate/20211112011713_add_language_to_preview_cards.rb
+++ b/db/migrate/20211112011713_add_language_to_preview_cards.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddLanguageToPreviewCards < ActiveRecord::Migration[6.1]
def change
add_column :preview_cards, :language, :string
diff --git a/db/migrate/20211115032527_add_trendable_to_preview_cards.rb b/db/migrate/20211115032527_add_trendable_to_preview_cards.rb
index 87bf3d7a23..21fc4ecf46 100644
--- a/db/migrate/20211115032527_add_trendable_to_preview_cards.rb
+++ b/db/migrate/20211115032527_add_trendable_to_preview_cards.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddTrendableToPreviewCards < ActiveRecord::Migration[6.1]
def change
add_column :preview_cards, :trendable, :boolean
diff --git a/db/migrate/20211123212714_add_link_type_to_preview_cards.rb b/db/migrate/20211123212714_add_link_type_to_preview_cards.rb
index 9f57e02194..68a2a92cbf 100644
--- a/db/migrate/20211123212714_add_link_type_to_preview_cards.rb
+++ b/db/migrate/20211123212714_add_link_type_to_preview_cards.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddLinkTypeToPreviewCards < ActiveRecord::Migration[6.1]
def change
add_column :preview_cards, :link_type, :int
diff --git a/db/migrate/20211213040746_update_account_summaries_to_version_2.rb b/db/migrate/20211213040746_update_account_summaries_to_version_2.rb
index 0d1f092ec6..e347a874ff 100644
--- a/db/migrate/20211213040746_update_account_summaries_to_version_2.rb
+++ b/db/migrate/20211213040746_update_account_summaries_to_version_2.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class UpdateAccountSummariesToVersion2 < ActiveRecord::Migration[6.1]
def up
reapplication_follow_recommendations_v2 do
diff --git a/db/migrate/20211231080958_add_category_to_reports.rb b/db/migrate/20211231080958_add_category_to_reports.rb
index c2b495c635..97a59f8c23 100644
--- a/db/migrate/20211231080958_add_category_to_reports.rb
+++ b/db/migrate/20211231080958_add_category_to_reports.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
require Rails.root.join('lib', 'mastodon', 'migration_helpers')
class AddCategoryToReports < ActiveRecord::Migration[6.1]
diff --git a/db/migrate/20220105163928_remove_mentions_status_id_index.rb b/db/migrate/20220105163928_remove_mentions_status_id_index.rb
index 56e9037192..58d665f85c 100644
--- a/db/migrate/20220105163928_remove_mentions_status_id_index.rb
+++ b/db/migrate/20220105163928_remove_mentions_status_id_index.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class RemoveMentionsStatusIdIndex < ActiveRecord::Migration[6.1]
def up
remove_index :mentions, name: :mentions_status_id_index if index_exists?(:mentions, :status_id, name: :mentions_status_id_index)
diff --git a/db/migrate/20220115125126_add_report_id_to_account_warnings.rb b/db/migrate/20220115125126_add_report_id_to_account_warnings.rb
index a1c20c99ef..43e5adcfee 100644
--- a/db/migrate/20220115125126_add_report_id_to_account_warnings.rb
+++ b/db/migrate/20220115125126_add_report_id_to_account_warnings.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddReportIdToAccountWarnings < ActiveRecord::Migration[6.1]
def change
safety_assured { add_reference :account_warnings, :report, foreign_key: { on_delete: :cascade }, index: false }
diff --git a/db/migrate/20220115125341_fix_account_warning_actions.rb b/db/migrate/20220115125341_fix_account_warning_actions.rb
index 25cc17fd39..5a580e92ce 100644
--- a/db/migrate/20220115125341_fix_account_warning_actions.rb
+++ b/db/migrate/20220115125341_fix_account_warning_actions.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class FixAccountWarningActions < ActiveRecord::Migration[6.1]
disable_ddl_transaction!
diff --git a/db/migrate/20220116202951_add_deleted_at_index_on_statuses.rb b/db/migrate/20220116202951_add_deleted_at_index_on_statuses.rb
index dc33625528..7615111824 100644
--- a/db/migrate/20220116202951_add_deleted_at_index_on_statuses.rb
+++ b/db/migrate/20220116202951_add_deleted_at_index_on_statuses.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddDeletedAtIndexOnStatuses < ActiveRecord::Migration[6.1]
disable_ddl_transaction!
diff --git a/db/migrate/20220124141035_create_appeals.rb b/db/migrate/20220124141035_create_appeals.rb
index afb3efbd53..03911172a3 100644
--- a/db/migrate/20220124141035_create_appeals.rb
+++ b/db/migrate/20220124141035_create_appeals.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateAppeals < ActiveRecord::Migration[6.1]
def change
create_table :appeals do |t|
diff --git a/db/migrate/20220202200743_add_trendable_to_accounts.rb b/db/migrate/20220202200743_add_trendable_to_accounts.rb
index 414df5108d..20de235c2d 100644
--- a/db/migrate/20220202200743_add_trendable_to_accounts.rb
+++ b/db/migrate/20220202200743_add_trendable_to_accounts.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddTrendableToAccounts < ActiveRecord::Migration[6.1]
def change
add_column :accounts, :trendable, :boolean
diff --git a/db/migrate/20220202200926_add_trendable_to_statuses.rb b/db/migrate/20220202200926_add_trendable_to_statuses.rb
index 7f38c8ca71..5d101132b8 100644
--- a/db/migrate/20220202200926_add_trendable_to_statuses.rb
+++ b/db/migrate/20220202200926_add_trendable_to_statuses.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddTrendableToStatuses < ActiveRecord::Migration[6.1]
def change
add_column :statuses, :trendable, :boolean
diff --git a/db/migrate/20220210153119_add_overruled_at_to_account_warnings.rb b/db/migrate/20220210153119_add_overruled_at_to_account_warnings.rb
index a082da774c..68ca277e39 100644
--- a/db/migrate/20220210153119_add_overruled_at_to_account_warnings.rb
+++ b/db/migrate/20220210153119_add_overruled_at_to_account_warnings.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddOverruledAtToAccountWarnings < ActiveRecord::Migration[6.1]
def change
add_column :account_warnings, :overruled_at, :datetime
diff --git a/db/migrate/20220224010024_add_ips_to_email_domain_blocks.rb b/db/migrate/20220224010024_add_ips_to_email_domain_blocks.rb
index 1b19a2aa1f..f70dbe5e32 100644
--- a/db/migrate/20220224010024_add_ips_to_email_domain_blocks.rb
+++ b/db/migrate/20220224010024_add_ips_to_email_domain_blocks.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddIpsToEmailDomainBlocks < ActiveRecord::Migration[6.1]
def change
add_column :email_domain_blocks, :ips, :inet, array: true
diff --git a/db/migrate/20220227041951_add_last_used_at_to_oauth_access_tokens.rb b/db/migrate/20220227041951_add_last_used_at_to_oauth_access_tokens.rb
index 6b46e60a8b..a733fa1c4b 100644
--- a/db/migrate/20220227041951_add_last_used_at_to_oauth_access_tokens.rb
+++ b/db/migrate/20220227041951_add_last_used_at_to_oauth_access_tokens.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddLastUsedAtToOauthAccessTokens < ActiveRecord::Migration[6.1]
def change
add_column :oauth_access_tokens, :last_used_at, :datetime
diff --git a/db/migrate/20220302232632_add_ordered_media_attachment_ids_to_statuses.rb b/db/migrate/20220302232632_add_ordered_media_attachment_ids_to_statuses.rb
index 5443f32a2e..3a08963a78 100644
--- a/db/migrate/20220302232632_add_ordered_media_attachment_ids_to_statuses.rb
+++ b/db/migrate/20220302232632_add_ordered_media_attachment_ids_to_statuses.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddOrderedMediaAttachmentIdsToStatuses < ActiveRecord::Migration[6.1]
def change
add_column :statuses, :ordered_media_attachment_ids, :bigint, array: true
diff --git a/db/migrate/20220303000827_add_ordered_media_attachment_ids_to_status_edits.rb b/db/migrate/20220303000827_add_ordered_media_attachment_ids_to_status_edits.rb
index b1071f3593..b8ebee6f07 100644
--- a/db/migrate/20220303000827_add_ordered_media_attachment_ids_to_status_edits.rb
+++ b/db/migrate/20220303000827_add_ordered_media_attachment_ids_to_status_edits.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddOrderedMediaAttachmentIdsToStatusEdits < ActiveRecord::Migration[6.1]
def change
add_column :status_edits, :ordered_media_attachment_ids, :bigint, array: true
diff --git a/db/migrate/20220304195405_migrate_hide_network_preference.rb b/db/migrate/20220304195405_migrate_hide_network_preference.rb
index 102ee46d6f..0083e0422a 100644
--- a/db/migrate/20220304195405_migrate_hide_network_preference.rb
+++ b/db/migrate/20220304195405_migrate_hide_network_preference.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class MigrateHideNetworkPreference < ActiveRecord::Migration[6.1]
disable_ddl_transaction!
diff --git a/db/migrate/20220307094650_fix_featured_tags_constraints.rb b/db/migrate/20220307094650_fix_featured_tags_constraints.rb
index bad1c90d41..db2e9f4f7b 100644
--- a/db/migrate/20220307094650_fix_featured_tags_constraints.rb
+++ b/db/migrate/20220307094650_fix_featured_tags_constraints.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class FixFeaturedTagsConstraints < ActiveRecord::Migration[6.1]
def up
safety_assured do
diff --git a/db/migrate/20220309213005_fix_reblog_deleted_at.rb b/db/migrate/20220309213005_fix_reblog_deleted_at.rb
index 8ec1813d95..e3474beeb1 100644
--- a/db/migrate/20220309213005_fix_reblog_deleted_at.rb
+++ b/db/migrate/20220309213005_fix_reblog_deleted_at.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class FixReblogDeletedAt < ActiveRecord::Migration[6.1]
disable_ddl_transaction!
diff --git a/db/migrate/20220316233212_update_kurdish_locales.rb b/db/migrate/20220316233212_update_kurdish_locales.rb
index 36586622fb..fa8ced0fdb 100644
--- a/db/migrate/20220316233212_update_kurdish_locales.rb
+++ b/db/migrate/20220316233212_update_kurdish_locales.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class UpdateKurdishLocales < ActiveRecord::Migration[6.1]
class User < ApplicationRecord
# Dummy class, to make migration possible across version changes
diff --git a/db/migrate/20220428112511_add_index_statuses_on_account_id.rb b/db/migrate/20220428112511_add_index_statuses_on_account_id.rb
index 87a601b728..b1ace18df8 100644
--- a/db/migrate/20220428112511_add_index_statuses_on_account_id.rb
+++ b/db/migrate/20220428112511_add_index_statuses_on_account_id.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddIndexStatusesOnAccountId < ActiveRecord::Migration[6.1]
disable_ddl_transaction!
diff --git a/db/migrate/20220428112727_add_index_statuses_pins_on_status_id.rb b/db/migrate/20220428112727_add_index_statuses_pins_on_status_id.rb
index 26a5430876..0358da9b5a 100644
--- a/db/migrate/20220428112727_add_index_statuses_pins_on_status_id.rb
+++ b/db/migrate/20220428112727_add_index_statuses_pins_on_status_id.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddIndexStatusesPinsOnStatusId < ActiveRecord::Migration[6.1]
disable_ddl_transaction!
diff --git a/db/migrate/20220428114454_add_index_reports_on_assigned_account_id.rb b/db/migrate/20220428114454_add_index_reports_on_assigned_account_id.rb
index c260c9732a..6b3888c422 100644
--- a/db/migrate/20220428114454_add_index_reports_on_assigned_account_id.rb
+++ b/db/migrate/20220428114454_add_index_reports_on_assigned_account_id.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddIndexReportsOnAssignedAccountId < ActiveRecord::Migration[6.1]
disable_ddl_transaction!
diff --git a/db/migrate/20220428114902_add_index_reports_on_action_taken_by_account_id.rb b/db/migrate/20220428114902_add_index_reports_on_action_taken_by_account_id.rb
index aed88cd80a..3c2d9dac90 100644
--- a/db/migrate/20220428114902_add_index_reports_on_action_taken_by_account_id.rb
+++ b/db/migrate/20220428114902_add_index_reports_on_action_taken_by_account_id.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddIndexReportsOnActionTakenByAccountId < ActiveRecord::Migration[6.1]
disable_ddl_transaction!
diff --git a/db/migrate/20220606044941_create_webhooks.rb b/db/migrate/20220606044941_create_webhooks.rb
index cca48fce65..0e70fbeadc 100644
--- a/db/migrate/20220606044941_create_webhooks.rb
+++ b/db/migrate/20220606044941_create_webhooks.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateWebhooks < ActiveRecord::Migration[6.1]
def change
create_table :webhooks do |t|
diff --git a/db/migrate/20220611210335_create_user_roles.rb b/db/migrate/20220611210335_create_user_roles.rb
index 6b7f2b6371..c778b70591 100644
--- a/db/migrate/20220611210335_create_user_roles.rb
+++ b/db/migrate/20220611210335_create_user_roles.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateUserRoles < ActiveRecord::Migration[6.1]
def change
create_table :user_roles do |t|
diff --git a/db/migrate/20220611212541_add_role_id_to_users.rb b/db/migrate/20220611212541_add_role_id_to_users.rb
index 2fda647d4c..9c1cb2fad8 100644
--- a/db/migrate/20220611212541_add_role_id_to_users.rb
+++ b/db/migrate/20220611212541_add_role_id_to_users.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddRoleIdToUsers < ActiveRecord::Migration[6.1]
disable_ddl_transaction!
diff --git a/db/migrate/20220710102457_add_display_name_to_tags.rb b/db/migrate/20220710102457_add_display_name_to_tags.rb
index aa78676459..b74de5085d 100644
--- a/db/migrate/20220710102457_add_display_name_to_tags.rb
+++ b/db/migrate/20220710102457_add_display_name_to_tags.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddDisplayNameToTags < ActiveRecord::Migration[6.1]
def change
add_column :tags, :display_name, :string
diff --git a/db/migrate/20220714171049_create_tag_follows.rb b/db/migrate/20220714171049_create_tag_follows.rb
index a393e90f50..9a3f3e0930 100644
--- a/db/migrate/20220714171049_create_tag_follows.rb
+++ b/db/migrate/20220714171049_create_tag_follows.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateTagFollows < ActiveRecord::Migration[6.1]
def change
create_table :tag_follows do |t|
diff --git a/db/migrate/20220824164433_add_human_identifier_to_admin_action_logs.rb b/db/migrate/20220824164433_add_human_identifier_to_admin_action_logs.rb
index 2cb8cddf19..90bc767288 100644
--- a/db/migrate/20220824164433_add_human_identifier_to_admin_action_logs.rb
+++ b/db/migrate/20220824164433_add_human_identifier_to_admin_action_logs.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddHumanIdentifierToAdminActionLogs < ActiveRecord::Migration[6.1]
def change
add_column :admin_action_logs, :human_identifier, :string
diff --git a/db/migrate/20220824233535_create_status_trends.rb b/db/migrate/20220824233535_create_status_trends.rb
index cea0abf355..52dcbf8f38 100644
--- a/db/migrate/20220824233535_create_status_trends.rb
+++ b/db/migrate/20220824233535_create_status_trends.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreateStatusTrends < ActiveRecord::Migration[6.1]
def change
create_table :status_trends do |t|
diff --git a/db/migrate/20220827195229_change_canonical_email_blocks_nullable.rb b/db/migrate/20220827195229_change_canonical_email_blocks_nullable.rb
index 5b3ec47275..e794824afc 100644
--- a/db/migrate/20220827195229_change_canonical_email_blocks_nullable.rb
+++ b/db/migrate/20220827195229_change_canonical_email_blocks_nullable.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class ChangeCanonicalEmailBlocksNullable < ActiveRecord::Migration[6.1]
def change
safety_assured { change_column :canonical_email_blocks, :reference_account_id, :bigint, null: true, default: nil }
diff --git a/db/migrate/20220829192633_add_languages_to_follows.rb b/db/migrate/20220829192633_add_languages_to_follows.rb
index f6cf48880a..ad88396bdc 100644
--- a/db/migrate/20220829192633_add_languages_to_follows.rb
+++ b/db/migrate/20220829192633_add_languages_to_follows.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddLanguagesToFollows < ActiveRecord::Migration[6.1]
def change
add_column :follows, :languages, :string, array: true
diff --git a/db/migrate/20220829192658_add_languages_to_follow_requests.rb b/db/migrate/20220829192658_add_languages_to_follow_requests.rb
index f98fabb220..94031fd873 100644
--- a/db/migrate/20220829192658_add_languages_to_follow_requests.rb
+++ b/db/migrate/20220829192658_add_languages_to_follow_requests.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddLanguagesToFollowRequests < ActiveRecord::Migration[6.1]
def change
add_column :follow_requests, :languages, :string, array: true
diff --git a/db/migrate/20221006061337_create_preview_card_trends.rb b/db/migrate/20221006061337_create_preview_card_trends.rb
index baad9c31c3..934a06e24d 100644
--- a/db/migrate/20221006061337_create_preview_card_trends.rb
+++ b/db/migrate/20221006061337_create_preview_card_trends.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class CreatePreviewCardTrends < ActiveRecord::Migration[6.1]
def change
create_table :preview_card_trends do |t|
diff --git a/db/migrate/20221012181003_add_blurhash_to_site_uploads.rb b/db/migrate/20221012181003_add_blurhash_to_site_uploads.rb
index e1c87712b1..3ed2eb9682 100644
--- a/db/migrate/20221012181003_add_blurhash_to_site_uploads.rb
+++ b/db/migrate/20221012181003_add_blurhash_to_site_uploads.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddBlurhashToSiteUploads < ActiveRecord::Migration[6.1]
def change
add_column :site_uploads, :blurhash, :string
diff --git a/db/migrate/20221021055441_add_index_featured_tags_on_account_id_and_tag_id.rb b/db/migrate/20221021055441_add_index_featured_tags_on_account_id_and_tag_id.rb
index 74d7673f7d..7925aae939 100644
--- a/db/migrate/20221021055441_add_index_featured_tags_on_account_id_and_tag_id.rb
+++ b/db/migrate/20221021055441_add_index_featured_tags_on_account_id_and_tag_id.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddIndexFeaturedTagsOnAccountIdAndTagId < ActiveRecord::Migration[6.1]
disable_ddl_transaction!
diff --git a/db/migrate/20221025171544_add_index_ip_blocks_on_ip.rb b/db/migrate/20221025171544_add_index_ip_blocks_on_ip.rb
index 0221369b7e..a1d824c4e4 100644
--- a/db/migrate/20221025171544_add_index_ip_blocks_on_ip.rb
+++ b/db/migrate/20221025171544_add_index_ip_blocks_on_ip.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddIndexIpBlocksOnIp < ActiveRecord::Migration[6.1]
disable_ddl_transaction!
diff --git a/db/migrate/20221104133904_add_name_to_featured_tags.rb b/db/migrate/20221104133904_add_name_to_featured_tags.rb
index 7c8c8ebfbc..44b9e64486 100644
--- a/db/migrate/20221104133904_add_name_to_featured_tags.rb
+++ b/db/migrate/20221104133904_add_name_to_featured_tags.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class AddNameToFeaturedTags < ActiveRecord::Migration[6.1]
def change
add_column :featured_tags, :name, :string
diff --git a/db/post_migrate/20190519130537_remove_boosts_widening_audience.rb b/db/post_migrate/20190519130537_remove_boosts_widening_audience.rb
index f1708b2e11..89a95041ee 100644
--- a/db/post_migrate/20190519130537_remove_boosts_widening_audience.rb
+++ b/db/post_migrate/20190519130537_remove_boosts_widening_audience.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class RemoveBoostsWideningAudience < ActiveRecord::Migration[5.2]
disable_ddl_transaction!
diff --git a/db/post_migrate/20210308133107_remove_subscription_expires_at_from_accounts.rb b/db/post_migrate/20210308133107_remove_subscription_expires_at_from_accounts.rb
index 511104cef3..f95e96297e 100644
--- a/db/post_migrate/20210308133107_remove_subscription_expires_at_from_accounts.rb
+++ b/db/post_migrate/20210308133107_remove_subscription_expires_at_from_accounts.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class RemoveSubscriptionExpiresAtFromAccounts < ActiveRecord::Migration[5.2]
def change
safety_assured do
diff --git a/db/post_migrate/20220118183123_remove_rememberable_from_users.rb b/db/post_migrate/20220118183123_remove_rememberable_from_users.rb
index 1e274c6e0b..0acd686145 100644
--- a/db/post_migrate/20220118183123_remove_rememberable_from_users.rb
+++ b/db/post_migrate/20220118183123_remove_rememberable_from_users.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
class RemoveRememberableFromUsers < ActiveRecord::Migration[6.1]
def change
safety_assured do
diff --git a/db/schema.rb b/db/schema.rb
index 9a8b7af616..fed2ce2b7e 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1,5 +1,3 @@
-# rubocop:disable all
-
# This file is auto-generated from the current state of the database. Instead
# of editing this file, please use the migrations feature of Active Record to
# incrementally modify your database, and then regenerate this schema definition.
@@ -12,8 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 2023_07_14_004824) do
-
+ActiveRecord::Schema[7.0].define(version: 2023_07_14_004824) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -21,8 +18,8 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
t.bigint "account_id"
t.string "acct", default: "", null: false
t.string "uri", default: "", null: false
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
t.index ["account_id"], name: "index_account_aliases_on_account_id"
end
@@ -40,15 +37,15 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
create_table "account_deletion_requests", force: :cascade do |t|
t.bigint "account_id"
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
t.index ["account_id"], name: "index_account_deletion_requests_on_account_id"
end
create_table "account_domain_blocks", force: :cascade do |t|
t.string "domain"
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
t.bigint "account_id"
t.index ["account_id", "domain"], name: "index_account_domain_blocks_on_account_id_and_domain", unique: true
end
@@ -58,8 +55,8 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
t.string "acct", default: "", null: false
t.bigint "followers_count", default: 0, null: false
t.bigint "target_account_id"
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
t.index ["account_id"], name: "index_account_migrations_on_account_id"
t.index ["target_account_id"], name: "index_account_migrations_on_target_account_id", where: "(target_account_id IS NOT NULL)"
end
@@ -68,8 +65,8 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
t.text "content", null: false
t.bigint "account_id", null: false
t.bigint "target_account_id", null: false
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
t.index ["account_id"], name: "index_account_moderation_notes_on_account_id"
t.index ["target_account_id"], name: "index_account_moderation_notes_on_target_account_id"
end
@@ -78,8 +75,8 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
t.bigint "account_id"
t.bigint "target_account_id"
t.text "comment", null: false
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
t.index ["account_id", "target_account_id"], name: "index_account_notes_on_account_id_and_target_account_id", unique: true
t.index ["target_account_id"], name: "index_account_notes_on_target_account_id"
end
@@ -87,8 +84,8 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
create_table "account_pins", force: :cascade do |t|
t.bigint "account_id"
t.bigint "target_account_id"
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
t.index ["account_id", "target_account_id"], name: "index_account_pins_on_account_id_and_target_account_id", unique: true
t.index ["target_account_id"], name: "index_account_pins_on_target_account_id"
end
@@ -98,9 +95,9 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
t.bigint "statuses_count", default: 0, null: false
t.bigint "following_count", default: 0, null: false
t.bigint "followers_count", default: 0, null: false
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
- t.datetime "last_status_at"
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
+ t.datetime "last_status_at", precision: nil
t.integer "group_activitypub_count"
t.index ["account_id"], name: "index_account_stats_on_account_id", unique: true
end
@@ -117,8 +114,8 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
t.boolean "keep_self_bookmark", default: true, null: false
t.integer "min_favs"
t.integer "min_reblogs"
- t.datetime "created_at", precision: 6, null: false
- t.datetime "updated_at", precision: 6, null: false
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
t.integer "min_emojis"
t.boolean "keep_self_emoji", default: true, null: false
t.index ["account_id"], name: "index_account_statuses_cleanup_policies_on_account_id"
@@ -126,8 +123,8 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
create_table "account_warning_presets", force: :cascade do |t|
t.text "text", default: "", null: false
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
t.string "title", default: "", null: false
end
@@ -136,11 +133,11 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
t.bigint "target_account_id"
t.integer "action", default: 0, null: false
t.text "text", default: "", null: false
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
t.bigint "report_id"
t.string "status_ids", array: true
- t.datetime "overruled_at"
+ t.datetime "overruled_at", precision: nil
t.index ["account_id"], name: "index_account_warnings_on_account_id"
t.index ["target_account_id"], name: "index_account_warnings_on_target_account_id"
end
@@ -150,8 +147,8 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
t.string "domain"
t.text "private_key"
t.text "public_key", default: "", null: false
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
t.text "note", default: "", null: false
t.string "display_name", default: "", null: false
t.string "uri", default: "", null: false
@@ -159,15 +156,15 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
t.string "avatar_file_name"
t.string "avatar_content_type"
t.integer "avatar_file_size"
- t.datetime "avatar_updated_at"
+ t.datetime "avatar_updated_at", precision: nil
t.string "header_file_name"
t.string "header_content_type"
t.integer "header_file_size"
- t.datetime "header_updated_at"
+ t.datetime "header_updated_at", precision: nil
t.string "avatar_remote_url"
t.boolean "locked", default: false, null: false
t.string "header_remote_url", default: "", null: false
- t.datetime "last_webfingered_at"
+ t.datetime "last_webfingered_at", precision: nil
t.string "inbox_url", default: "", null: false
t.string "outbox_url", default: "", null: false
t.string "shared_inbox_url", default: "", null: false
@@ -180,17 +177,17 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
t.string "actor_type"
t.boolean "discoverable"
t.string "also_known_as", array: true
- t.datetime "silenced_at"
- t.datetime "suspended_at"
+ t.datetime "silenced_at", precision: nil
+ t.datetime "suspended_at", precision: nil
t.boolean "hide_collections"
t.integer "avatar_storage_schema_version"
t.integer "header_storage_schema_version"
t.string "devices_url"
t.integer "suspension_origin"
- t.datetime "sensitized_at"
+ t.datetime "sensitized_at", precision: nil
t.boolean "trendable"
- t.datetime "reviewed_at"
- t.datetime "requested_review_at"
+ t.datetime "reviewed_at", precision: nil
+ t.datetime "requested_review_at", precision: nil
t.boolean "group_allow_private_message"
t.integer "searchability", default: 2, null: false
t.boolean "dissubscribable", default: false, null: false
@@ -214,8 +211,8 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
t.string "action", default: "", null: false
t.string "target_type"
t.bigint "target_id"
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
t.string "human_identifier"
t.string "route_param"
t.string "permalink"
@@ -226,8 +223,8 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
create_table "announcement_mutes", force: :cascade do |t|
t.bigint "account_id"
t.bigint "announcement_id"
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
t.index ["account_id", "announcement_id"], name: "index_announcement_mutes_on_account_id_and_announcement_id", unique: true
t.index ["announcement_id"], name: "index_announcement_mutes_on_announcement_id"
end
@@ -237,8 +234,8 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
t.bigint "announcement_id"
t.string "name", default: "", null: false
t.bigint "custom_emoji_id"
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
t.index ["account_id", "announcement_id", "name"], name: "index_announcement_reactions_on_account_id_and_announcement_id", unique: true
t.index ["announcement_id"], name: "index_announcement_reactions_on_announcement_id"
t.index ["custom_emoji_id"], name: "index_announcement_reactions_on_custom_emoji_id", where: "(custom_emoji_id IS NOT NULL)"
@@ -248,12 +245,12 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
t.text "text", default: "", null: false
t.boolean "published", default: false, null: false
t.boolean "all_day", default: false, null: false
- t.datetime "scheduled_at"
- t.datetime "starts_at"
- t.datetime "ends_at"
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
- t.datetime "published_at"
+ t.datetime "scheduled_at", precision: nil
+ t.datetime "starts_at", precision: nil
+ t.datetime "ends_at", precision: nil
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
+ t.datetime "published_at", precision: nil
t.bigint "status_ids", array: true
end
@@ -261,8 +258,8 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
t.bigint "antenna_id", null: false
t.bigint "account_id", null: false
t.boolean "exclude", default: false, null: false
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
t.index ["account_id"], name: "index_antenna_accounts_on_account_id"
t.index ["antenna_id"], name: "index_antenna_accounts_on_antenna_id"
t.index ["exclude"], name: "index_antenna_accounts_on_exclude"
@@ -272,8 +269,8 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
t.bigint "antenna_id", null: false
t.string "name"
t.boolean "exclude", default: false, null: false
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
t.index ["antenna_id"], name: "index_antenna_domains_on_antenna_id"
t.index ["exclude"], name: "index_antenna_domains_on_exclude"
t.index ["name"], name: "index_antenna_domains_on_name"
@@ -283,8 +280,8 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
t.bigint "antenna_id", null: false
t.bigint "tag_id", null: false
t.boolean "exclude", default: false, null: false
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
t.index ["antenna_id"], name: "index_antenna_tags_on_antenna_id"
t.index ["exclude"], name: "index_antenna_tags_on_exclude"
t.index ["tag_id"], name: "index_antenna_tags_on_tag_id"
@@ -301,9 +298,9 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
t.boolean "any_accounts", default: true, null: false
t.boolean "any_keywords", default: true, null: false
t.boolean "available", default: true, null: false
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
- t.datetime "expires_at"
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
+ t.datetime "expires_at", precision: nil
t.boolean "with_media_only", default: false, null: false
t.jsonb "exclude_domains"
t.jsonb "exclude_accounts"
@@ -325,12 +322,12 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
t.bigint "account_id", null: false
t.bigint "account_warning_id", null: false
t.text "text", default: "", null: false
- t.datetime "approved_at"
+ t.datetime "approved_at", precision: nil
t.bigint "approved_by_account_id"
- t.datetime "rejected_at"
+ t.datetime "rejected_at", precision: nil
t.bigint "rejected_by_account_id"
- t.datetime "created_at", precision: 6, null: false
- t.datetime "updated_at", precision: 6, null: false
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
t.index ["account_id"], name: "index_appeals_on_account_id"
t.index ["account_warning_id"], name: "index_appeals_on_account_warning_id", unique: true
t.index ["approved_by_account_id"], name: "index_appeals_on_approved_by_account_id", where: "(approved_by_account_id IS NOT NULL)"
@@ -341,17 +338,17 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
t.bigint "user_id"
t.string "dump_file_name"
t.string "dump_content_type"
- t.datetime "dump_updated_at"
+ t.datetime "dump_updated_at", precision: nil
t.boolean "processed", default: false, null: false
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
t.bigint "dump_file_size"
t.index ["user_id"], name: "index_backups_on_user_id"
end
create_table "blocks", force: :cascade do |t|
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
t.bigint "account_id", null: false
t.bigint "target_account_id", null: false
t.string "uri"
@@ -362,8 +359,8 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
create_table "bookmarks", force: :cascade do |t|
t.bigint "account_id", null: false
t.bigint "status_id", null: false
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
t.index ["account_id", "status_id"], name: "index_bookmarks_on_account_id_and_status_id", unique: true
t.index ["status_id"], name: "index_bookmarks_on_status_id"
end
@@ -371,8 +368,8 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
create_table "bulk_import_rows", force: :cascade do |t|
t.bigint "bulk_import_id", null: false
t.jsonb "data"
- t.datetime "created_at", precision: 6, null: false
- t.datetime "updated_at", precision: 6, null: false
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
t.index ["bulk_import_id"], name: "index_bulk_import_rows_on_bulk_import_id"
end
@@ -382,13 +379,13 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
t.integer "total_items", default: 0, null: false
t.integer "imported_items", default: 0, null: false
t.integer "processed_items", default: 0, null: false
- t.datetime "finished_at"
+ t.datetime "finished_at", precision: nil
t.boolean "overwrite", default: false, null: false
t.boolean "likely_mismatched", default: false, null: false
t.string "original_filename", default: "", null: false
t.bigint "account_id", null: false
- t.datetime "created_at", precision: 6, null: false
- t.datetime "updated_at", precision: 6, null: false
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
t.index ["account_id"], name: "index_bulk_imports_on_account_id"
t.index ["id"], name: "index_bulk_imports_unconfirmed", where: "(state = 0)"
end
@@ -396,8 +393,8 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
create_table "canonical_email_blocks", force: :cascade do |t|
t.string "canonical_email_hash", default: "", null: false
t.bigint "reference_account_id"
- t.datetime "created_at", precision: 6, null: false
- t.datetime "updated_at", precision: 6, null: false
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
t.index ["canonical_email_hash"], name: "index_canonical_email_blocks_on_canonical_email_hash", unique: true
t.index ["reference_account_id"], name: "index_canonical_email_blocks_on_reference_account_id"
end
@@ -410,15 +407,15 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
create_table "conversations", force: :cascade do |t|
t.string "uri"
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
t.index ["uri"], name: "index_conversations_on_uri", unique: true, opclass: :text_pattern_ops, where: "(uri IS NOT NULL)"
end
create_table "custom_emoji_categories", force: :cascade do |t|
t.string "name"
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
t.index ["name"], name: "index_custom_emoji_categories_on_name", unique: true
end
@@ -428,9 +425,9 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
t.string "image_file_name"
t.string "image_content_type"
t.integer "image_file_size"
- t.datetime "image_updated_at"
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "image_updated_at", precision: nil
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
t.boolean "disabled", default: false, null: false
t.string "uri"
t.string "image_remote_url"
@@ -449,27 +446,27 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
t.bigint "custom_filter_id", null: false
t.text "keyword", default: "", null: false
t.boolean "whole_word", default: false, null: false
- t.datetime "created_at", precision: 6, null: false
- t.datetime "updated_at", precision: 6, null: false
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
t.index ["custom_filter_id"], name: "index_custom_filter_keywords_on_custom_filter_id"
end
create_table "custom_filter_statuses", force: :cascade do |t|
t.bigint "custom_filter_id", null: false
t.bigint "status_id", null: false
- t.datetime "created_at", precision: 6, null: false
- t.datetime "updated_at", precision: 6, null: false
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
t.index ["custom_filter_id"], name: "index_custom_filter_statuses_on_custom_filter_id"
t.index ["status_id"], name: "index_custom_filter_statuses_on_status_id"
end
create_table "custom_filters", force: :cascade do |t|
t.bigint "account_id"
- t.datetime "expires_at"
+ t.datetime "expires_at", precision: nil
t.text "phrase", default: "", null: false
t.string "context", default: [], null: false, array: true
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
t.integer "action", default: 0, null: false
t.boolean "exclude_follows", default: false, null: false
t.boolean "exclude_localusers", default: false, null: false
@@ -483,23 +480,23 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
t.string "name", default: "", null: false
t.text "fingerprint_key", default: "", null: false
t.text "identity_key", default: "", null: false
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
t.index ["access_token_id"], name: "index_devices_on_access_token_id"
t.index ["account_id"], name: "index_devices_on_account_id"
end
create_table "domain_allows", force: :cascade do |t|
t.string "domain", default: "", null: false
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
t.index ["domain"], name: "index_domain_allows_on_domain", unique: true
end
create_table "domain_blocks", force: :cascade do |t|
t.string "domain", default: "", null: false
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
t.integer "severity", default: 0
t.boolean "reject_media", default: false, null: false
t.boolean "reject_reports", default: false, null: false
@@ -525,8 +522,8 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
create_table "email_domain_blocks", force: :cascade do |t|
t.string "domain", default: "", null: false
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
t.bigint "parent_id"
t.index ["domain"], name: "index_email_domain_blocks_on_domain", unique: true
end
@@ -537,8 +534,8 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
t.string "name", default: "", null: false
t.bigint "custom_emoji_id"
t.string "uri"
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
t.index ["account_id"], name: "index_emoji_reactions_on_account_id"
t.index ["custom_emoji_id"], name: "index_emoji_reactions_on_custom_emoji_id"
t.index ["status_id"], name: "index_emoji_reactions_on_status_id"
@@ -552,15 +549,15 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
t.text "body", default: "", null: false
t.text "digest", default: "", null: false
t.text "message_franking", default: "", null: false
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
t.index ["device_id"], name: "index_encrypted_messages_on_device_id"
t.index ["from_account_id"], name: "index_encrypted_messages_on_from_account_id"
end
create_table "favourites", force: :cascade do |t|
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
t.bigint "account_id", null: false
t.bigint "status_id", null: false
t.index ["account_id", "id"], name: "index_favourites_on_account_id_and_id"
@@ -572,9 +569,9 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
t.bigint "account_id", null: false
t.bigint "tag_id", null: false
t.bigint "statuses_count", default: 0, null: false
- t.datetime "last_status_at"
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "last_status_at", precision: nil
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
t.string "name"
t.index ["account_id", "tag_id"], name: "index_featured_tags_on_account_id_and_tag_id", unique: true
t.index ["tag_id"], name: "index_featured_tags_on_tag_id"
@@ -582,14 +579,14 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
create_table "follow_recommendation_suppressions", force: :cascade do |t|
t.bigint "account_id", null: false
- t.datetime "created_at", precision: 6, null: false
- t.datetime "updated_at", precision: 6, null: false
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
t.index ["account_id"], name: "index_follow_recommendation_suppressions_on_account_id", unique: true
end
create_table "follow_requests", force: :cascade do |t|
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
t.bigint "account_id", null: false
t.bigint "target_account_id", null: false
t.boolean "show_reblogs", default: true, null: false
@@ -600,8 +597,8 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
end
create_table "follows", force: :cascade do |t|
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
t.bigint "account_id", null: false
t.bigint "target_account_id", null: false
t.boolean "show_reblogs", default: true, null: false
@@ -615,8 +612,8 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
create_table "identities", force: :cascade do |t|
t.string "provider", default: "", null: false
t.string "uid", default: "", null: false
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
t.bigint "user_id"
t.index ["user_id"], name: "index_identities_on_user_id"
end
@@ -624,12 +621,12 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
create_table "imports", force: :cascade do |t|
t.integer "type", null: false
t.boolean "approved", default: false, null: false
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
t.string "data_file_name"
t.string "data_content_type"
t.integer "data_file_size"
- t.datetime "data_updated_at"
+ t.datetime "data_updated_at", precision: nil
t.bigint "account_id", null: false
t.boolean "overwrite", default: false, null: false
end
@@ -637,11 +634,11 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
create_table "invites", force: :cascade do |t|
t.bigint "user_id", null: false
t.string "code", default: "", null: false
- t.datetime "expires_at"
+ t.datetime "expires_at", precision: nil
t.integer "max_uses"
t.integer "uses", default: 0, null: false
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
t.boolean "autofollow", default: false, null: false
t.text "comment"
t.index ["code"], name: "index_invites_on_code", unique: true
@@ -649,9 +646,9 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
end
create_table "ip_blocks", force: :cascade do |t|
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
- t.datetime "expires_at"
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
+ t.datetime "expires_at", precision: nil
t.inet "ip", default: "0.0.0.0", null: false
t.integer "severity", default: 0, null: false
t.text "comment", default: "", null: false
@@ -672,8 +669,8 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
create_table "lists", force: :cascade do |t|
t.bigint "account_id", null: false
t.string "title", default: "", null: false
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
t.integer "replies_policy", default: 0, null: false
t.boolean "exclusive", default: false, null: false
t.index ["account_id"], name: "index_lists_on_account_id"
@@ -687,7 +684,7 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
t.string "failure_reason"
t.inet "ip"
t.string "user_agent"
- t.datetime "created_at"
+ t.datetime "created_at", precision: nil
t.index ["user_id"], name: "index_login_activities_on_user_id"
end
@@ -696,8 +693,8 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
t.string "timeline", default: "", null: false
t.bigint "last_read_id", default: 0, null: false
t.integer "lock_version", default: 0, null: false
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
t.index ["user_id", "timeline"], name: "index_markers_on_user_id_and_timeline", unique: true
end
@@ -706,10 +703,10 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
t.string "file_file_name"
t.string "file_content_type"
t.integer "file_file_size"
- t.datetime "file_updated_at"
+ t.datetime "file_updated_at", precision: nil
t.string "remote_url", default: "", null: false
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
t.string "shortcode"
t.integer "type", default: 0, null: false
t.json "file_meta"
@@ -722,7 +719,7 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
t.string "thumbnail_file_name"
t.string "thumbnail_content_type"
t.integer "thumbnail_file_size"
- t.datetime "thumbnail_updated_at"
+ t.datetime "thumbnail_updated_at", precision: nil
t.string "thumbnail_remote_url"
t.index ["account_id", "status_id"], name: "index_media_attachments_on_account_id_and_status_id", order: { status_id: :desc }
t.index ["scheduled_status_id"], name: "index_media_attachments_on_scheduled_status_id", where: "(scheduled_status_id IS NOT NULL)"
@@ -732,8 +729,8 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
create_table "mentions", force: :cascade do |t|
t.bigint "status_id"
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
t.bigint "account_id"
t.boolean "silent", default: false, null: false
t.index ["account_id", "status_id"], name: "index_mentions_on_account_id_and_status_id", unique: true
@@ -741,12 +738,12 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
end
create_table "mutes", force: :cascade do |t|
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
t.boolean "hide_notifications", default: true, null: false
t.bigint "account_id", null: false
t.bigint "target_account_id", null: false
- t.datetime "expires_at"
+ t.datetime "expires_at", precision: nil
t.index ["account_id", "target_account_id"], name: "index_mutes_on_account_id_and_target_account_id", unique: true
t.index ["target_account_id"], name: "index_mutes_on_target_account_id"
end
@@ -754,8 +751,8 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
create_table "notifications", force: :cascade do |t|
t.bigint "activity_id", null: false
t.string "activity_type", null: false
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
t.bigint "account_id", null: false
t.bigint "from_account_id", null: false
t.string "type"
@@ -768,8 +765,8 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
t.string "token", null: false
t.integer "expires_in", null: false
t.text "redirect_uri", null: false
- t.datetime "created_at", null: false
- t.datetime "revoked_at"
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "revoked_at", precision: nil
t.string "scopes"
t.bigint "application_id", null: false
t.bigint "resource_owner_id", null: false
@@ -781,12 +778,12 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
t.string "token", null: false
t.string "refresh_token"
t.integer "expires_in"
- t.datetime "revoked_at"
- t.datetime "created_at", null: false
+ t.datetime "revoked_at", precision: nil
+ t.datetime "created_at", precision: nil, null: false
t.string "scopes"
t.bigint "application_id"
t.bigint "resource_owner_id"
- t.datetime "last_used_at"
+ t.datetime "last_used_at", precision: nil
t.inet "last_used_ip"
t.index ["refresh_token"], name: "index_oauth_access_tokens_on_refresh_token", unique: true, opclass: :text_pattern_ops, where: "(refresh_token IS NOT NULL)"
t.index ["resource_owner_id"], name: "index_oauth_access_tokens_on_resource_owner_id", where: "(resource_owner_id IS NOT NULL)"
@@ -799,8 +796,8 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
t.string "secret", null: false
t.text "redirect_uri", null: false
t.string "scopes", default: "", null: false
- t.datetime "created_at"
- t.datetime "updated_at"
+ t.datetime "created_at", precision: nil
+ t.datetime "updated_at", precision: nil
t.boolean "superapp", default: false, null: false
t.string "website"
t.string "owner_type"
@@ -816,8 +813,8 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
t.string "key_id", default: "", null: false
t.text "key", default: "", null: false
t.text "signature", default: "", null: false
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
t.index ["device_id"], name: "index_one_time_keys_on_device_id"
t.index ["key_id"], name: "index_one_time_keys_on_key_id"
end
@@ -827,7 +824,7 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
t.text "schema"
t.text "relation"
t.bigint "size"
- t.datetime "captured_at"
+ t.datetime "captured_at", precision: nil
t.index ["database", "captured_at"], name: "index_pghero_space_stats_on_database_and_captured_at"
end
@@ -835,8 +832,8 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
t.bigint "account_id"
t.bigint "poll_id"
t.integer "choice", default: 0, null: false
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
t.string "uri"
t.index ["account_id"], name: "index_poll_votes_on_account_id"
t.index ["poll_id"], name: "index_poll_votes_on_poll_id"
@@ -845,15 +842,15 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
create_table "polls", force: :cascade do |t|
t.bigint "account_id"
t.bigint "status_id"
- t.datetime "expires_at"
+ t.datetime "expires_at", precision: nil
t.string "options", default: [], null: false, array: true
t.bigint "cached_tallies", default: [], null: false, array: true
t.boolean "multiple", default: false, null: false
t.boolean "hide_totals", default: false, null: false
t.bigint "votes_count", default: 0, null: false
- t.datetime "last_fetched_at"
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "last_fetched_at", precision: nil
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
t.integer "lock_version", default: 0, null: false
t.bigint "voters_count"
t.index ["account_id"], name: "index_polls_on_account_id"
@@ -865,12 +862,12 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
t.string "icon_file_name"
t.string "icon_content_type"
t.bigint "icon_file_size"
- t.datetime "icon_updated_at"
+ t.datetime "icon_updated_at", precision: nil
t.boolean "trendable"
- t.datetime "reviewed_at"
- t.datetime "requested_review_at"
- t.datetime "created_at", precision: 6, null: false
- t.datetime "updated_at", precision: 6, null: false
+ t.datetime "reviewed_at", precision: nil
+ t.datetime "requested_review_at", precision: nil
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
t.index ["domain"], name: "index_preview_card_providers_on_domain", unique: true
end
@@ -890,7 +887,7 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
t.string "image_file_name"
t.string "image_content_type"
t.integer "image_file_size"
- t.datetime "image_updated_at"
+ t.datetime "image_updated_at", precision: nil
t.integer "type", default: 0, null: false
t.text "html", default: "", null: false
t.string "author_name", default: "", null: false
@@ -899,14 +896,14 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
t.string "provider_url", default: "", null: false
t.integer "width", default: 0, null: false
t.integer "height", default: 0, null: false
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
t.string "embed_url", default: "", null: false
t.integer "image_storage_schema_version"
t.string "blurhash"
t.string "language"
t.float "max_score"
- t.datetime "max_score_at"
+ t.datetime "max_score_at", precision: nil
t.boolean "trendable"
t.integer "link_type"
t.index ["url"], name: "index_preview_cards_on_url", unique: true
@@ -921,8 +918,8 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
create_table "relays", force: :cascade do |t|
t.string "inbox_url", default: "", null: false
t.string "follow_activity_id"
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
t.integer "state", default: 0, null: false
end
@@ -930,8 +927,8 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
t.text "content", null: false
t.bigint "report_id", null: false
t.bigint "account_id", null: false
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
t.index ["account_id"], name: "index_report_notes_on_account_id"
t.index ["report_id"], name: "index_report_notes_on_report_id"
end
@@ -939,8 +936,8 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
create_table "reports", force: :cascade do |t|
t.bigint "status_ids", default: [], null: false, array: true
t.text "comment", default: "", null: false
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
t.bigint "account_id", null: false
t.bigint "action_taken_by_account_id"
t.bigint "target_account_id", null: false
@@ -948,7 +945,7 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
t.string "uri"
t.boolean "forwarded"
t.integer "category", default: 0, null: false
- t.datetime "action_taken_at"
+ t.datetime "action_taken_at", precision: nil
t.bigint "rule_ids", array: true
t.index ["account_id"], name: "index_reports_on_account_id"
t.index ["action_taken_by_account_id"], name: "index_reports_on_action_taken_by_account_id", where: "(action_taken_by_account_id IS NOT NULL)"
@@ -958,18 +955,18 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
create_table "rules", force: :cascade do |t|
t.integer "priority", default: 0, null: false
- t.datetime "deleted_at"
+ t.datetime "deleted_at", precision: nil
t.text "text", default: "", null: false
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
end
create_table "scheduled_expiration_statuses", force: :cascade do |t|
t.bigint "account_id"
t.bigint "status_id", null: false
- t.datetime "scheduled_at"
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "scheduled_at", precision: nil
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
t.index ["account_id"], name: "index_scheduled_expiration_statuses_on_account_id"
t.index ["scheduled_at"], name: "index_scheduled_expiration_statuses_on_scheduled_at"
t.index ["status_id"], name: "index_scheduled_expiration_statuses_on_status_id"
@@ -977,7 +974,7 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
create_table "scheduled_statuses", force: :cascade do |t|
t.bigint "account_id"
- t.datetime "scheduled_at"
+ t.datetime "scheduled_at", precision: nil
t.jsonb "params"
t.index ["account_id"], name: "index_scheduled_statuses_on_account_id"
t.index ["scheduled_at"], name: "index_scheduled_statuses_on_scheduled_at"
@@ -985,8 +982,8 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
create_table "session_activations", force: :cascade do |t|
t.string "session_id", null: false
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
t.string "user_agent", default: "", null: false
t.inet "ip"
t.bigint "access_token_id"
@@ -1001,8 +998,8 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
t.string "var", null: false
t.text "value"
t.string "thing_type"
- t.datetime "created_at"
- t.datetime "updated_at"
+ t.datetime "created_at", precision: nil
+ t.datetime "updated_at", precision: nil
t.bigint "thing_id"
t.index ["thing_type", "thing_id", "var"], name: "index_settings_on_thing_type_and_thing_id_and_var", unique: true
end
@@ -1012,10 +1009,10 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
t.string "file_file_name"
t.string "file_content_type"
t.integer "file_file_size"
- t.datetime "file_updated_at"
+ t.datetime "file_updated_at", precision: nil
t.json "meta"
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
t.string "blurhash"
t.index ["var"], name: "index_site_uploads_on_var", unique: true
end
@@ -1025,8 +1022,8 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
t.bigint "account_id"
t.text "text", default: "", null: false
t.text "spoiler_text", default: "", null: false
- t.datetime "created_at", precision: 6, null: false
- t.datetime "updated_at", precision: 6, null: false
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
t.bigint "ordered_media_attachment_ids", array: true
t.text "media_descriptions", array: true
t.string "poll_options", array: true
@@ -1039,8 +1036,8 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
create_table "status_pins", force: :cascade do |t|
t.bigint "account_id", null: false
t.bigint "status_id", null: false
- t.datetime "created_at", default: -> { "now()" }, null: false
- t.datetime "updated_at", default: -> { "now()" }, null: false
+ t.datetime "created_at", precision: nil, default: -> { "now()" }, null: false
+ t.datetime "updated_at", precision: nil, default: -> { "now()" }, null: false
t.index ["account_id", "status_id"], name: "index_status_pins_on_account_id_and_status_id", unique: true
t.index ["status_id"], name: "index_status_pins_on_status_id"
end
@@ -1048,8 +1045,8 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
create_table "status_references", force: :cascade do |t|
t.bigint "status_id", null: false
t.bigint "target_status_id", null: false
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
t.index ["status_id"], name: "index_status_references_on_status_id"
t.index ["target_status_id"], name: "index_status_references_on_target_status_id"
end
@@ -1059,8 +1056,8 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
t.bigint "replies_count", default: 0, null: false
t.bigint "reblogs_count", default: 0, null: false
t.bigint "favourites_count", default: 0, null: false
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
t.string "emoji_reactions"
t.integer "emoji_reactions_count", default: 0, null: false
t.integer "test", default: 0, null: false
@@ -1083,8 +1080,8 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
create_table "statuses", id: :bigint, default: -> { "timestamp_id('statuses'::text)" }, force: :cascade do |t|
t.string "uri"
t.text "text", default: "", null: false
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
t.bigint "in_reply_to_id"
t.bigint "reblog_of_id"
t.string "url"
@@ -1099,8 +1096,8 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
t.bigint "application_id"
t.bigint "in_reply_to_account_id"
t.bigint "poll_id"
- t.datetime "deleted_at"
- t.datetime "edited_at"
+ t.datetime "deleted_at", precision: nil
+ t.datetime "edited_at", precision: nil
t.boolean "trendable"
t.bigint "ordered_media_attachment_ids", array: true
t.integer "searchability"
@@ -1124,31 +1121,31 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
create_table "system_keys", force: :cascade do |t|
t.binary "key"
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
end
create_table "tag_follows", force: :cascade do |t|
t.bigint "tag_id", null: false
t.bigint "account_id", null: false
- t.datetime "created_at", precision: 6, null: false
- t.datetime "updated_at", precision: 6, null: false
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
t.index ["account_id", "tag_id"], name: "index_tag_follows_on_account_id_and_tag_id", unique: true
t.index ["tag_id"], name: "index_tag_follows_on_tag_id"
end
create_table "tags", force: :cascade do |t|
t.string "name", default: "", null: false
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
t.boolean "usable"
t.boolean "trendable"
t.boolean "listable"
- t.datetime "reviewed_at"
- t.datetime "requested_review_at"
- t.datetime "last_status_at"
+ t.datetime "reviewed_at", precision: nil
+ t.datetime "requested_review_at", precision: nil
+ t.datetime "last_status_at", precision: nil
t.float "max_score"
- t.datetime "max_score_at"
+ t.datetime "max_score_at", precision: nil
t.string "display_name"
t.index "lower((name)::text) text_pattern_ops", name: "index_tags_on_name_lower_btree", unique: true
end
@@ -1156,8 +1153,8 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
create_table "tombstones", force: :cascade do |t|
t.bigint "account_id"
t.string "uri", null: false
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
t.boolean "by_moderator"
t.index ["account_id"], name: "index_tombstones_on_account_id"
t.index ["uri"], name: "index_tombstones_on_uri"
@@ -1165,16 +1162,16 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
create_table "unavailable_domains", force: :cascade do |t|
t.string "domain", default: "", null: false
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
t.index ["domain"], name: "index_unavailable_domains_on_domain", unique: true
end
create_table "user_invite_requests", force: :cascade do |t|
t.bigint "user_id"
t.text "text"
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
t.index ["user_id"], name: "index_user_invite_requests_on_user_id"
end
@@ -1184,24 +1181,24 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
t.integer "position", default: 0, null: false
t.bigint "permissions", default: 0, null: false
t.boolean "highlighted", default: false, null: false
- t.datetime "created_at", precision: 6, null: false
- t.datetime "updated_at", precision: 6, null: false
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
end
create_table "users", force: :cascade do |t|
t.string "email", default: "", null: false
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
t.string "encrypted_password", default: "", null: false
t.string "reset_password_token"
- t.datetime "reset_password_sent_at"
+ t.datetime "reset_password_sent_at", precision: nil
t.integer "sign_in_count", default: 0, null: false
- t.datetime "current_sign_in_at"
- t.datetime "last_sign_in_at"
+ t.datetime "current_sign_in_at", precision: nil
+ t.datetime "last_sign_in_at", precision: nil
t.boolean "admin", default: false, null: false
t.string "confirmation_token"
- t.datetime "confirmed_at"
- t.datetime "confirmation_sent_at"
+ t.datetime "confirmed_at", precision: nil
+ t.datetime "confirmation_sent_at", precision: nil
t.string "unconfirmed_email"
t.string "locale"
t.string "encrypted_otp_secret"
@@ -1209,7 +1206,7 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
t.string "encrypted_otp_secret_salt"
t.integer "consumed_timestep"
t.boolean "otp_required_for_login", default: false, null: false
- t.datetime "last_emailed_at"
+ t.datetime "last_emailed_at", precision: nil
t.string "otp_backup_codes", array: true
t.bigint "account_id", null: false
t.boolean "disabled", default: false, null: false
@@ -1219,7 +1216,7 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
t.bigint "created_by_application_id"
t.boolean "approved", default: true, null: false
t.string "sign_in_token"
- t.datetime "sign_in_token_sent_at"
+ t.datetime "sign_in_token_sent_at", precision: nil
t.string "webauthn_id"
t.inet "sign_up_ip"
t.boolean "skip_sign_in_token"
@@ -1240,8 +1237,8 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
t.string "key_p256dh", null: false
t.string "key_auth", null: false
t.json "data"
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
t.bigint "access_token_id"
t.bigint "user_id"
t.index ["access_token_id"], name: "index_web_push_subscriptions_on_access_token_id", where: "(access_token_id IS NOT NULL)"
@@ -1250,8 +1247,8 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
create_table "web_settings", force: :cascade do |t|
t.json "data"
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
t.bigint "user_id", null: false
t.index ["user_id"], name: "index_web_settings_on_user_id", unique: true
end
@@ -1262,8 +1259,8 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
t.string "nickname", null: false
t.bigint "sign_count", default: 0, null: false
t.bigint "user_id"
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "created_at", precision: nil, null: false
+ t.datetime "updated_at", precision: nil, null: false
t.index ["external_id"], name: "index_webauthn_credentials_on_external_id", unique: true
t.index ["user_id"], name: "index_webauthn_credentials_on_user_id"
end
@@ -1273,8 +1270,8 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
t.string "events", default: [], null: false, array: true
t.string "secret", default: "", null: false
t.boolean "enabled", default: true, null: false
- t.datetime "created_at", precision: 6, null: false
- t.datetime "updated_at", precision: 6, null: false
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
t.text "template"
t.index ["url"], name: "index_webhooks_on_url", unique: true
end
@@ -1509,5 +1506,3 @@ ActiveRecord::Schema.define(version: 2023_07_14_004824) do
add_index "follow_recommendations", ["account_id"], name: "index_follow_recommendations_on_account_id", unique: true
end
-
-# rubocop:enable all
diff --git a/db/seeds/01_web_app.rb b/db/seeds/01_web_app.rb
index a457a883b3..a9d8fd3bae 100644
--- a/db/seeds/01_web_app.rb
+++ b/db/seeds/01_web_app.rb
@@ -1 +1,3 @@
+# frozen_string_literal: true
+
Doorkeeper::Application.create_with(name: 'Web', redirect_uri: Doorkeeper.configuration.native_redirect_uri, scopes: 'read write follow push').find_or_create_by(superapp: true)
diff --git a/db/seeds/02_instance_actor.rb b/db/seeds/02_instance_actor.rb
index f9aa372f1c..55e83e8a08 100644
--- a/db/seeds/02_instance_actor.rb
+++ b/db/seeds/02_instance_actor.rb
@@ -1 +1,3 @@
+# frozen_string_literal: true
+
Account.create_with(actor_type: 'Application', locked: true, username: 'mastodon.internal').find_or_create_by(id: -99)
diff --git a/db/seeds/03_roles.rb b/db/seeds/03_roles.rb
index 7fedf0f711..8b359582b5 100644
--- a/db/seeds/03_roles.rb
+++ b/db/seeds/03_roles.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
# Pre-create base role
UserRole.everyone
diff --git a/db/seeds/04_admin.rb b/db/seeds/04_admin.rb
index a67040e4ec..ec0287a454 100644
--- a/db/seeds/04_admin.rb
+++ b/db/seeds/04_admin.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
if Rails.env.development?
domain = ENV['LOCAL_DOMAIN'] || Rails.configuration.x.local_domain
diff --git a/lib/active_record/batches.rb b/lib/active_record/batches.rb
index 55d29e52ef..91e50cc43d 100644
--- a/lib/active_record/batches.rb
+++ b/lib/active_record/batches.rb
@@ -29,7 +29,7 @@ module ActiveRecord
if flatten
yield record[1]
else
- yield record[1..-1]
+ yield record[1..]
end
end
diff --git a/lib/mastodon/premailer_webpack_strategy.rb b/lib/mastodon/premailer_webpack_strategy.rb
index 45e87603f0..6816d04745 100644
--- a/lib/mastodon/premailer_webpack_strategy.rb
+++ b/lib/mastodon/premailer_webpack_strategy.rb
@@ -12,7 +12,7 @@ module PremailerWebpackStrategy
css = if url.start_with?('http')
HTTP.get(url).to_s
else
- url = url[1..-1] if url.start_with?('/')
+ url = url[1..] if url.start_with?('/')
Rails.public_path.join(url).read
end
diff --git a/lib/mastodon/snowflake.rb b/lib/mastodon/snowflake.rb
index 32ed140c30..8b79541da2 100644
--- a/lib/mastodon/snowflake.rb
+++ b/lib/mastodon/snowflake.rb
@@ -64,46 +64,7 @@ module Mastodon::Snowflake
def define_timestamp_id
return if already_defined?
- connection.execute(<<~SQL)
- CREATE OR REPLACE FUNCTION timestamp_id(table_name text)
- RETURNS bigint AS
- $$
- DECLARE
- time_part bigint;
- sequence_base bigint;
- tail bigint;
- BEGIN
- time_part := (
- -- Get the time in milliseconds
- ((date_part('epoch', now()) * 1000))::bigint
- -- And shift it over two bytes
- << 16);
-
- sequence_base := (
- 'x' ||
- -- Take the first two bytes (four hex characters)
- substr(
- -- Of the MD5 hash of the data we documented
- md5(table_name || '#{SecureRandom.hex(16)}' || time_part::text),
- 1, 4
- )
- -- And turn it into a bigint
- )::bit(16)::bigint;
-
- -- Finally, add our sequence number to our base, and chop
- -- it to the last two bytes
- tail := (
- (sequence_base + nextval(table_name || '_id_seq'))
- & 65535);
-
- -- Return the time part and the sequence part. OR appears
- -- faster here than addition, but they're equivalent:
- -- time_part has no trailing two bytes, and tail is only
- -- the last two bytes.
- RETURN time_part | tail;
- END
- $$ LANGUAGE plpgsql VOLATILE;
- SQL
+ connection.execute(sanitized_timestamp_id_sql)
end
def ensure_id_sequences_exist
@@ -153,6 +114,57 @@ module Mastodon::Snowflake
SQL
end
+ def sanitized_timestamp_id_sql
+ ActiveRecord::Base.sanitize_sql_array(timestamp_id_sql_array)
+ end
+
+ def timestamp_id_sql_array
+ [timestamp_id_sql_string, { random_string: SecureRandom.hex(16) }]
+ end
+
+ def timestamp_id_sql_string
+ <<~SQL
+ CREATE OR REPLACE FUNCTION timestamp_id(table_name text)
+ RETURNS bigint AS
+ $$
+ DECLARE
+ time_part bigint;
+ sequence_base bigint;
+ tail bigint;
+ BEGIN
+ time_part := (
+ -- Get the time in milliseconds
+ ((date_part('epoch', now()) * 1000))::bigint
+ -- And shift it over two bytes
+ << 16);
+
+ sequence_base := (
+ 'x' ||
+ -- Take the first two bytes (four hex characters)
+ substr(
+ -- Of the MD5 hash of the data we documented
+ md5(table_name || :random_string || time_part::text),
+ 1, 4
+ )
+ -- And turn it into a bigint
+ )::bit(16)::bigint;
+
+ -- Finally, add our sequence number to our base, and chop
+ -- it to the last two bytes
+ tail := (
+ (sequence_base + nextval(table_name || '_id_seq'))
+ & 65535);
+
+ -- Return the time part and the sequence part. OR appears
+ -- faster here than addition, but they're equivalent:
+ -- time_part has no trailing two bytes, and tail is only
+ -- the last two bytes.
+ RETURN time_part | tail;
+ END
+ $$ LANGUAGE plpgsql VOLATILE;
+ SQL
+ end
+
def connection
ActiveRecord::Base.connection
end
diff --git a/lib/rails/engine_extensions.rb b/lib/rails/engine_extensions.rb
index 1f5c2cd6cd..68535570d4 100644
--- a/lib/rails/engine_extensions.rb
+++ b/lib/rails/engine_extensions.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
module Rails
module EngineExtensions
# Rewrite task loading code to filter digitalocean.rake task
diff --git a/lib/tasks/branding.rake b/lib/tasks/branding.rake
index d97c97c99e..608fb3af9c 100644
--- a/lib/tasks/branding.rake
+++ b/lib/tasks/branding.rake
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
namespace :branding do
desc 'Generate necessary graphic assets for branding from source SVG files'
task generate: :environment do
diff --git a/lib/tasks/repo.rake b/lib/tasks/repo.rake
index 888337b4f2..33c454444e 100644
--- a/lib/tasks/repo.rake
+++ b/lib/tasks/repo.rake
@@ -50,7 +50,7 @@ namespace :repo do
file.each_line do |line|
if line.start_with?('-')
new_line = line.gsub(/#([[:digit:]]+)*/) do |pull_request_reference|
- pull_request_number = pull_request_reference[1..-1]
+ pull_request_number = pull_request_reference[1..]
response = nil
loop do
diff --git a/package.json b/package.json
index 7e9b5ba0d9..7a946d90cb 100644
--- a/package.json
+++ b/package.json
@@ -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",
"arrow-key-navigation": "^1.2.0",
@@ -107,6 +107,7 @@
"react-overlays": "^5.2.1",
"react-redux": "^8.0.4",
"react-redux-loading-bar": "^5.0.4",
+ "react-router": "^4.3.1",
"react-router-dom": "^4.1.1",
"react-router-scroll-4": "^1.0.0-beta.1",
"react-select": "^5.7.3",
@@ -182,8 +183,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",
@@ -192,7 +193,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",
@@ -200,10 +201,10 @@
"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.6.2",
- "stylelint-config-standard-scss": "^9.0.0",
+ "stylelint": "^15.10.1",
+ "stylelint-config-standard-scss": "^10.0.0",
"typescript": "^5.0.4",
"webpack-dev-server": "^3.11.3",
"yargs": "^17.7.2"
diff --git a/spec/controllers/admin/domain_blocks_controller_spec.rb b/spec/controllers/admin/domain_blocks_controller_spec.rb
index fb7fb2957f..9be55906ed 100644
--- a/spec/controllers/admin/domain_blocks_controller_spec.rb
+++ b/spec/controllers/admin/domain_blocks_controller_spec.rb
@@ -166,10 +166,11 @@ RSpec.describe Admin::DomainBlocksController do
end
describe 'PUT #update' do
- let!(:remote_account) { Fabricate(:account, domain: 'example.com') }
- let(:subject) do
+ subject do
post :update, params: { :id => domain_block.id, :domain_block => { domain: 'example.com', severity: new_severity }, 'confirm' => '' }
end
+
+ let!(:remote_account) { Fabricate(:account, domain: 'example.com') }
let(:domain_block) { Fabricate(:domain_block, domain: 'example.com', severity: original_severity) }
before do
diff --git a/spec/controllers/api/base_controller_spec.rb b/spec/controllers/api/base_controller_spec.rb
index 9f3ba81474..db1e8777f7 100644
--- a/spec/controllers/api/base_controller_spec.rb
+++ b/spec/controllers/api/base_controller_spec.rb
@@ -88,10 +88,11 @@ describe Api::BaseController do
Mastodon::NotPermittedError => 403,
}.each do |error, code|
it "Handles error class of #{error}" do
- expect(FakeService).to receive(:new).and_raise(error)
+ allow(FakeService).to receive(:new).and_raise(error)
get 'error'
expect(response).to have_http_status(code)
+ expect(FakeService).to have_received(:new)
end
end
end
diff --git a/spec/controllers/api/v1/media_controller_spec.rb b/spec/controllers/api/v1/media_controller_spec.rb
index 79a9d1474a..94b2a0a98f 100644
--- a/spec/controllers/api/v1/media_controller_spec.rb
+++ b/spec/controllers/api/v1/media_controller_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Api::V1::MediaController do
describe 'with paperclip errors' do
context 'when imagemagick cant identify the file type' do
it 'returns http 422' do
- expect_any_instance_of(Account).to receive_message_chain(:media_attachments, :create!).and_raise(Paperclip::Errors::NotIdentifiedByImageMagickError)
+ allow_any_instance_of(Account).to receive_message_chain(:media_attachments, :create!).and_raise(Paperclip::Errors::NotIdentifiedByImageMagickError)
post :create, params: { file: fixture_file_upload('attachment.jpg', 'image/jpeg') }
expect(response).to have_http_status(422)
@@ -25,7 +25,7 @@ RSpec.describe Api::V1::MediaController do
context 'when there is a generic error' do
it 'returns http 422' do
- expect_any_instance_of(Account).to receive_message_chain(:media_attachments, :create!).and_raise(Paperclip::Error)
+ allow_any_instance_of(Account).to receive_message_chain(:media_attachments, :create!).and_raise(Paperclip::Error)
post :create, params: { file: fixture_file_upload('attachment.jpg', 'image/jpeg') }
expect(response).to have_http_status(500)
diff --git a/spec/controllers/api/v1/reports_controller_spec.rb b/spec/controllers/api/v1/reports_controller_spec.rb
index 01b7e4a71c..f923ff0794 100644
--- a/spec/controllers/api/v1/reports_controller_spec.rb
+++ b/spec/controllers/api/v1/reports_controller_spec.rb
@@ -23,8 +23,6 @@ RSpec.describe Api::V1::ReportsController do
let(:rule_ids) { nil }
before do
- allow(AdminMailer).to receive(:new_report)
- .and_return(instance_double(ActionMailer::MessageDelivery, deliver_later: nil))
post :create, params: { status_ids: [status.id], account_id: target_account.id, comment: 'reasons', category: category, rule_ids: rule_ids, forward: forward }
end
@@ -41,7 +39,7 @@ RSpec.describe Api::V1::ReportsController do
end
it 'sends e-mails to admins' do
- expect(AdminMailer).to have_received(:new_report).with(admin.account, Report)
+ expect(ActionMailer::Base.deliveries.first.to).to eq([admin.email])
end
context 'when a status does not belong to the reported account' do
diff --git a/spec/controllers/api/web/embeds_controller_spec.rb b/spec/controllers/api/web/embeds_controller_spec.rb
deleted file mode 100644
index 8c4e1a8f26..0000000000
--- a/spec/controllers/api/web/embeds_controller_spec.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe Api::Web::EmbedsController do
- render_views
-
- let(:user) { Fabricate(:user) }
-
- before { sign_in user }
-
- describe 'POST #create' do
- subject(:body) { JSON.parse(response.body, symbolize_names: true) }
-
- let(:response) { post :create, params: { url: url } }
-
- context 'when successfully finds status' do
- let(:status) { Fabricate(:status) }
- let(:url) { "http://#{Rails.configuration.x.web_domain}/@#{status.account.username}/#{status.id}" }
-
- it 'returns a right response' do
- expect(response).to have_http_status 200
- expect(body[:author_name]).to eq status.account.username
- end
- end
-
- context 'when fails to find status' do
- let(:url) { 'https://host.test/oembed.html' }
- let(:service_instance) { instance_double(FetchOEmbedService) }
-
- before do
- allow(FetchOEmbedService).to receive(:new) { service_instance }
- allow(service_instance).to receive(:call) { call_result }
- end
-
- context 'when successfully fetching oembed' do
- let(:call_result) { { result: :ok } }
-
- it 'returns a right response' do
- expect(response).to have_http_status 200
- expect(body[:result]).to eq 'ok'
- end
- end
-
- context 'when fails to fetch oembed' do
- let(:call_result) { nil }
-
- it 'returns a right response' do
- expect(response).to have_http_status 404
- end
- end
- end
- end
-end
diff --git a/spec/controllers/auth/registrations_controller_spec.rb b/spec/controllers/auth/registrations_controller_spec.rb
index ec82cd07b6..a9b24a1004 100644
--- a/spec/controllers/auth/registrations_controller_spec.rb
+++ b/spec/controllers/auth/registrations_controller_spec.rb
@@ -15,20 +15,22 @@ RSpec.describe Auth::RegistrationsController do
it 'redirects if it is in single user mode while it is open for registration' do
Fabricate(:account)
Setting.registrations_mode = 'open'
- expect(Rails.configuration.x).to receive(:single_user_mode).and_return(true)
+ allow(Rails.configuration.x).to receive(:single_user_mode).and_return(true)
get path
expect(response).to redirect_to '/'
+ expect(Rails.configuration.x).to have_received(:single_user_mode)
end
it 'redirects if it is not open for registration while it is not in single user mode' do
Setting.registrations_mode = 'none'
- expect(Rails.configuration.x).to receive(:single_user_mode).and_return(false)
+ allow(Rails.configuration.x).to receive(:single_user_mode).and_return(false)
get path
expect(response).to redirect_to '/'
+ expect(Rails.configuration.x).to have_received(:single_user_mode)
end
end
diff --git a/spec/controllers/disputes/appeals_controller_spec.rb b/spec/controllers/disputes/appeals_controller_spec.rb
index a0f9c7b910..c8444a2a96 100644
--- a/spec/controllers/disputes/appeals_controller_spec.rb
+++ b/spec/controllers/disputes/appeals_controller_spec.rb
@@ -14,13 +14,11 @@ RSpec.describe Disputes::AppealsController do
let(:strike) { Fabricate(:account_warning, target_account: current_user.account) }
before do
- allow(AdminMailer).to receive(:new_appeal)
- .and_return(instance_double(ActionMailer::MessageDelivery, deliver_later: nil))
post :create, params: { strike_id: strike.id, appeal: { text: 'Foo' } }
end
it 'notifies staff about new appeal' do
- expect(AdminMailer).to have_received(:new_appeal).with(admin.account, Appeal.last)
+ expect(ActionMailer::Base.deliveries.first.to).to eq([admin.email])
end
it 'redirects back to the strike page' do
diff --git a/spec/controllers/settings/two_factor_authentication/confirmations_controller_spec.rb b/spec/controllers/settings/two_factor_authentication/confirmations_controller_spec.rb
index 84dfd60b38..37381fe1f7 100644
--- a/spec/controllers/settings/two_factor_authentication/confirmations_controller_spec.rb
+++ b/spec/controllers/settings/two_factor_authentication/confirmations_controller_spec.rb
@@ -104,7 +104,7 @@ describe Settings::TwoFactorAuthentication::ConfirmationsController do
post :create,
params: { form_two_factor_confirmation: { otp_attempt: '123456' } },
session: { challenge_passed_at: Time.now.utc, new_otp_secret: 'thisisasecretforthespecofnewview' }
- end.to not_change { user.reload.otp_secret }
+ end.to(not_change { user.reload.otp_secret })
end
it 'renders the new view' do
diff --git a/spec/controllers/settings/two_factor_authentication/otp_authentication_controller_spec.rb b/spec/controllers/settings/two_factor_authentication/otp_authentication_controller_spec.rb
index c8ba6f9a88..007df87d95 100644
--- a/spec/controllers/settings/two_factor_authentication/otp_authentication_controller_spec.rb
+++ b/spec/controllers/settings/two_factor_authentication/otp_authentication_controller_spec.rb
@@ -63,7 +63,7 @@ describe Settings::TwoFactorAuthentication::OtpAuthenticationController do
expect do
post :create, session: { challenge_passed_at: Time.now.utc }
end.to not_change { user.reload.otp_secret }
- .and change { session[:new_otp_secret] }
+ .and(change { session[:new_otp_secret] })
expect(response).to redirect_to(new_settings_two_factor_authentication_confirmation_path)
end
@@ -80,7 +80,7 @@ describe Settings::TwoFactorAuthentication::OtpAuthenticationController do
expect do
post :create, session: { challenge_passed_at: Time.now.utc }
end.to not_change { user.reload.otp_secret }
- .and change { session[:new_otp_secret] }
+ .and(change { session[:new_otp_secret] })
expect(response).to redirect_to(new_settings_two_factor_authentication_confirmation_path)
end
diff --git a/spec/fabricators_spec.rb b/spec/fabricators_spec.rb
index 3b76c56ce6..53193378c8 100644
--- a/spec/fabricators_spec.rb
+++ b/spec/fabricators_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
require 'rails_helper'
Fabrication.manager.load_definitions if Fabrication.manager.empty?
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index d191265cad..d0b2900d62 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -77,19 +77,17 @@ describe ApplicationHelper do
describe 'open_registrations?' do
it 'returns true when open for registrations' do
- without_partial_double_verification do
- expect(Setting).to receive(:registrations_mode).and_return('open')
- end
+ allow(Setting).to receive(:[]).with('registrations_mode').and_return('open')
expect(helper.open_registrations?).to be true
+ expect(Setting).to have_received(:[]).with('registrations_mode')
end
it 'returns false when closed for registrations' do
- without_partial_double_verification do
- expect(Setting).to receive(:registrations_mode).and_return('none')
- end
+ allow(Setting).to receive(:[]).with('registrations_mode').and_return('none')
expect(helper.open_registrations?).to be false
+ expect(Setting).to have_received(:[]).with('registrations_mode')
end
end
@@ -296,8 +294,9 @@ describe ApplicationHelper do
it 'returns site title on production environment' do
Setting.site_title = 'site title'
- expect(Rails.env).to receive(:production?).and_return(true)
+ allow(Rails.env).to receive(:production?).and_return(true)
expect(helper.title).to eq 'site title'
+ expect(Rails.env).to have_received(:production?)
end
end
end
diff --git a/spec/lib/status_filter_spec.rb b/spec/lib/status_filter_spec.rb
index 98e2ef913a..c994ad419f 100644
--- a/spec/lib/status_filter_spec.rb
+++ b/spec/lib/status_filter_spec.rb
@@ -23,7 +23,7 @@ describe StatusFilter do
context 'when status policy does not allow show' do
it 'filters the status' do
- expect_any_instance_of(StatusPolicy).to receive(:show?).and_return(false)
+ allow_any_instance_of(StatusPolicy).to receive(:show?).and_return(false)
expect(filter).to be_filtered
end
@@ -74,7 +74,7 @@ describe StatusFilter do
context 'when status policy does not allow show' do
it 'filters the status' do
- expect_any_instance_of(StatusPolicy).to receive(:show?).and_return(false)
+ allow_any_instance_of(StatusPolicy).to receive(:show?).and_return(false)
expect(filter).to be_filtered
end
diff --git a/spec/lib/status_finder_spec.rb b/spec/lib/status_finder_spec.rb
index 61483f4bfe..53f5039af9 100644
--- a/spec/lib/status_finder_spec.rb
+++ b/spec/lib/status_finder_spec.rb
@@ -18,10 +18,13 @@ describe StatusFinder do
it 'raises an error if action is not :show' do
recognized = Rails.application.routes.recognize_path(url)
- expect(recognized).to receive(:[]).with(:action).and_return(:create)
- expect(Rails.application.routes).to receive(:recognize_path).with(url).and_return(recognized)
+ allow(recognized).to receive(:[]).with(:action).and_return(:create)
+ allow(Rails.application.routes).to receive(:recognize_path).with(url).and_return(recognized)
expect { subject.status }.to raise_error(ActiveRecord::RecordNotFound)
+
+ expect(Rails.application.routes).to have_received(:recognize_path)
+ expect(recognized).to have_received(:[])
end
end
diff --git a/spec/lib/webfinger_resource_spec.rb b/spec/lib/webfinger_resource_spec.rb
index 2cad04fccd..558a318927 100644
--- a/spec/lib/webfinger_resource_spec.rb
+++ b/spec/lib/webfinger_resource_spec.rb
@@ -27,13 +27,14 @@ describe WebfingerResource do
recognized = Rails.application.routes.recognize_path(resource)
allow(recognized).to receive(:[]).with(:controller).and_return('accounts')
allow(recognized).to receive(:[]).with(:username).and_return('alice')
- expect(recognized).to receive(:[]).with(:action).and_return('create')
+ allow(recognized).to receive(:[]).with(:action).and_return('create')
expect(Rails.application.routes).to receive(:recognize_path).with(resource).and_return(recognized).at_least(:once)
expect do
described_class.new(resource).username
end.to raise_error(ActiveRecord::RecordNotFound)
+ expect(recognized).to have_received(:[]).exactly(3).times
end
it 'raises with a string that doesnt start with URL' do
diff --git a/spec/mailers/admin_mailer_spec.rb b/spec/mailers/admin_mailer_spec.rb
index 8e2eec40fd..9123804a48 100644
--- a/spec/mailers/admin_mailer_spec.rb
+++ b/spec/mailers/admin_mailer_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe AdminMailer do
let(:sender) { Fabricate(:account, username: 'John') }
let(:recipient) { Fabricate(:account, username: 'Mike') }
let(:report) { Fabricate(:report, account: sender, target_account: recipient) }
- let(:mail) { described_class.new_report(recipient, report) }
+ let(:mail) { described_class.with(recipient: recipient).new_report(report) }
before do
recipient.user.update(locale: :en)
@@ -27,7 +27,7 @@ RSpec.describe AdminMailer do
describe '.new_appeal' do
let(:appeal) { Fabricate(:appeal) }
let(:recipient) { Fabricate(:account, username: 'Kurt') }
- let(:mail) { described_class.new_appeal(recipient, appeal) }
+ let(:mail) { described_class.with(recipient: recipient).new_appeal(appeal) }
before do
recipient.user.update(locale: :en)
@@ -47,7 +47,7 @@ RSpec.describe AdminMailer do
describe '.new_pending_account' do
let(:recipient) { Fabricate(:account, username: 'Barklums') }
let(:user) { Fabricate(:user) }
- let(:mail) { described_class.new_pending_account(recipient, user) }
+ let(:mail) { described_class.with(recipient: recipient).new_pending_account(user) }
before do
recipient.user.update(locale: :en)
@@ -69,7 +69,7 @@ RSpec.describe AdminMailer do
let(:links) { [] }
let(:statuses) { [] }
let(:tags) { [] }
- let(:mail) { described_class.new_trends(recipient, links, tags, statuses) }
+ let(:mail) { described_class.with(recipient: recipient).new_trends(links, tags, statuses) }
before do
recipient.user.update(locale: :en)
diff --git a/spec/mailers/notification_mailer_spec.rb b/spec/mailers/notification_mailer_spec.rb
index bf364b6253..3efb97cb18 100644
--- a/spec/mailers/notification_mailer_spec.rb
+++ b/spec/mailers/notification_mailer_spec.rb
@@ -23,7 +23,8 @@ RSpec.describe NotificationMailer do
describe 'mention' do
let(:mention) { Mention.create!(account: receiver.account, status: foreign_status) }
- let(:mail) { described_class.mention(receiver.account, Notification.create!(account: receiver.account, activity: mention)) }
+ let(:notification) { Notification.create!(account: receiver.account, activity: mention) }
+ let(:mail) { prepared_mailer_for(receiver.account).mention }
include_examples 'localized subject', 'notification_mailer.mention.subject', name: 'bob'
@@ -40,7 +41,8 @@ RSpec.describe NotificationMailer do
describe 'follow' do
let(:follow) { sender.follow!(receiver.account) }
- let(:mail) { described_class.follow(receiver.account, Notification.create!(account: receiver.account, activity: follow)) }
+ let(:notification) { Notification.create!(account: receiver.account, activity: follow) }
+ let(:mail) { prepared_mailer_for(receiver.account).follow }
include_examples 'localized subject', 'notification_mailer.follow.subject', name: 'bob'
@@ -56,7 +58,8 @@ RSpec.describe NotificationMailer do
describe 'favourite' do
let(:favourite) { Favourite.create!(account: sender, status: own_status) }
- let(:mail) { described_class.favourite(own_status.account, Notification.create!(account: receiver.account, activity: favourite)) }
+ let(:notification) { Notification.create!(account: receiver.account, activity: favourite) }
+ let(:mail) { prepared_mailer_for(own_status.account).favourite }
include_examples 'localized subject', 'notification_mailer.favourite.subject', name: 'bob'
@@ -73,7 +76,8 @@ RSpec.describe NotificationMailer do
describe 'reblog' do
let(:reblog) { Status.create!(account: sender, reblog: own_status) }
- let(:mail) { described_class.reblog(own_status.account, Notification.create!(account: receiver.account, activity: reblog)) }
+ let(:notification) { Notification.create!(account: receiver.account, activity: reblog) }
+ let(:mail) { prepared_mailer_for(own_status.account).reblog }
include_examples 'localized subject', 'notification_mailer.reblog.subject', name: 'bob'
@@ -90,7 +94,8 @@ RSpec.describe NotificationMailer do
describe 'follow_request' do
let(:follow_request) { Fabricate(:follow_request, account: sender, target_account: receiver.account) }
- let(:mail) { described_class.follow_request(receiver.account, Notification.create!(account: receiver.account, activity: follow_request)) }
+ let(:notification) { Notification.create!(account: receiver.account, activity: follow_request) }
+ let(:mail) { prepared_mailer_for(receiver.account).follow_request }
include_examples 'localized subject', 'notification_mailer.follow_request.subject', name: 'bob'
@@ -103,4 +108,10 @@ RSpec.describe NotificationMailer do
expect(mail.body.encoded).to match('bob has requested to follow you')
end
end
+
+ private
+
+ def prepared_mailer_for(recipient)
+ described_class.with(recipient: recipient, notification: notification)
+ end
end
diff --git a/spec/mailers/previews/admin_mailer_preview.rb b/spec/mailers/previews/admin_mailer_preview.rb
index 9572768cd7..bc8f0193b9 100644
--- a/spec/mailers/previews/admin_mailer_preview.rb
+++ b/spec/mailers/previews/admin_mailer_preview.rb
@@ -5,16 +5,16 @@
class AdminMailerPreview < ActionMailer::Preview
# Preview this email at http://localhost:3000/rails/mailers/admin_mailer/new_pending_account
def new_pending_account
- AdminMailer.new_pending_account(Account.first, User.pending.first)
+ AdminMailer.with(recipient: Account.first).new_pending_account(User.pending.first)
end
# Preview this email at http://localhost:3000/rails/mailers/admin_mailer/new_trends
def new_trends
- AdminMailer.new_trends(Account.first, PreviewCard.joins(:trend).limit(3), Tag.limit(3), Status.joins(:trend).where(reblog_of_id: nil).limit(3))
+ AdminMailer.with(recipient: Account.first).new_trends(PreviewCard.joins(:trend).limit(3), Tag.limit(3), Status.joins(:trend).where(reblog_of_id: nil).limit(3))
end
# Preview this email at http://localhost:3000/rails/mailers/admin_mailer/new_appeal
def new_appeal
- AdminMailer.new_appeal(Account.first, Appeal.first)
+ AdminMailer.with(recipient: Account.first).new_appeal(Appeal.first)
end
end
diff --git a/spec/mailers/previews/notification_mailer_preview.rb b/spec/mailers/previews/notification_mailer_preview.rb
index bc41662a16..a63c20c27c 100644
--- a/spec/mailers/previews/notification_mailer_preview.rb
+++ b/spec/mailers/previews/notification_mailer_preview.rb
@@ -5,36 +5,40 @@
class NotificationMailerPreview < ActionMailer::Preview
# Preview this email at http://localhost:3000/rails/mailers/notification_mailer/mention
def mention
- m = Mention.last
- NotificationMailer.mention(m.account, Notification.find_by(activity: m))
+ activity = Mention.last
+ mailer_for(activity.account, activity).mention
end
# Preview this email at http://localhost:3000/rails/mailers/notification_mailer/follow
def follow
- f = Follow.last
- NotificationMailer.follow(f.target_account, Notification.find_by(activity: f))
+ activity = Follow.last
+ mailer_for(activity.target_account, activity).follow
end
# Preview this email at http://localhost:3000/rails/mailers/notification_mailer/follow_request
def follow_request
- f = Follow.last
- NotificationMailer.follow_request(f.target_account, Notification.find_by(activity: f))
+ activity = Follow.last
+ mailer_for(activity.target_account, activity).follow_request
end
# Preview this email at http://localhost:3000/rails/mailers/notification_mailer/favourite
def favourite
- f = Favourite.last
- NotificationMailer.favourite(f.status.account, Notification.find_by(activity: f))
+ activity = Favourite.last
+ mailer_for(activity.status.account, activity).favourite
end
# Preview this email at http://localhost:3000/rails/mailers/notification_mailer/reblog
def reblog
- r = Status.where.not(reblog_of_id: nil).first
- NotificationMailer.reblog(r.reblog.account, Notification.find_by(activity: r))
+ activity = Status.where.not(reblog_of_id: nil).first
+ mailer_for(activity.reblog.account, activity).reblog
end
- # Preview this email at http://localhost:3000/rails/mailers/notification_mailer/digest
- def digest
- NotificationMailer.digest(Account.first, since: 90.days.ago)
+ private
+
+ def mailer_for(account, activity)
+ NotificationMailer.with(
+ recipient: account,
+ notification: Notification.find_by(activity: activity)
+ )
end
end
diff --git a/spec/models/account_migration_spec.rb b/spec/models/account_migration_spec.rb
index f4544740b1..1f32c6082e 100644
--- a/spec/models/account_migration_spec.rb
+++ b/spec/models/account_migration_spec.rb
@@ -4,11 +4,11 @@ require 'rails_helper'
RSpec.describe AccountMigration do
describe 'validations' do
+ subject { described_class.new(account: source_account, acct: target_acct) }
+
let(:source_account) { Fabricate(:account) }
let(:target_acct) { target_account.acct }
- let(:subject) { described_class.new(account: source_account, acct: target_acct) }
-
context 'with valid properties' do
let(:target_account) { Fabricate(:account, username: 'target', domain: 'remote.org') }
diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index 7cd914774a..d473a819e7 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -20,7 +20,9 @@ RSpec.describe Account do
end
context 'when the account is of a local user' do
- let!(:subject) { Fabricate(:user, email: 'foo+bar@domain.org').account }
+ subject { local_user_account }
+
+ let!(:local_user_account) { Fabricate(:user, email: 'foo+bar@domain.org').account }
it 'creates a canonical domain block' do
subject.suspend!
diff --git a/spec/models/relationship_filter_spec.rb b/spec/models/relationship_filter_spec.rb
index b3e855c122..ac31885774 100644
--- a/spec/models/relationship_filter_spec.rb
+++ b/spec/models/relationship_filter_spec.rb
@@ -7,7 +7,7 @@ describe RelationshipFilter do
describe '#results' do
context 'when default params are used' do
- let(:subject) do
+ subject do
described_class.new(account, 'order' => 'active').results
end
diff --git a/spec/models/user_role_spec.rb b/spec/models/user_role_spec.rb
index 27b9674146..f7cfe9bb04 100644
--- a/spec/models/user_role_spec.rb
+++ b/spec/models/user_role_spec.rb
@@ -93,7 +93,7 @@ RSpec.describe UserRole do
describe '#computed_permissions' do
context 'when the role is nobody' do
- let(:subject) { described_class.nobody }
+ subject { described_class.nobody }
it 'returns none' do
expect(subject.computed_permissions).to eq UserRole::Flags::NONE
@@ -101,7 +101,7 @@ RSpec.describe UserRole do
end
context 'when the role is everyone' do
- let(:subject) { described_class.everyone }
+ subject { described_class.everyone }
it 'returns permissions' do
expect(subject.computed_permissions).to eq subject.permissions
diff --git a/spec/policies/account_moderation_note_policy_spec.rb b/spec/policies/account_moderation_note_policy_spec.rb
index 90abdfea76..8c37acc39f 100644
--- a/spec/policies/account_moderation_note_policy_spec.rb
+++ b/spec/policies/account_moderation_note_policy_spec.rb
@@ -4,7 +4,8 @@ require 'rails_helper'
require 'pundit/rspec'
RSpec.describe AccountModerationNotePolicy do
- let(:subject) { described_class }
+ subject { described_class }
+
let(:admin) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')).account }
let(:john) { Fabricate(:account) }
diff --git a/spec/policies/account_policy_spec.rb b/spec/policies/account_policy_spec.rb
index 9f4e94a6c8..d7a21d8e39 100644
--- a/spec/policies/account_policy_spec.rb
+++ b/spec/policies/account_policy_spec.rb
@@ -4,7 +4,8 @@ require 'rails_helper'
require 'pundit/rspec'
RSpec.describe AccountPolicy do
- let(:subject) { described_class }
+ subject { described_class }
+
let(:admin) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')).account }
let(:john) { Fabricate(:account) }
let(:alice) { Fabricate(:account) }
diff --git a/spec/policies/backup_policy_spec.rb b/spec/policies/backup_policy_spec.rb
index 488d48f52a..28cb65d789 100644
--- a/spec/policies/backup_policy_spec.rb
+++ b/spec/policies/backup_policy_spec.rb
@@ -4,8 +4,9 @@ require 'rails_helper'
require 'pundit/rspec'
RSpec.describe BackupPolicy do
- let(:subject) { described_class }
- let(:john) { Fabricate(:account) }
+ subject { described_class }
+
+ let(:john) { Fabricate(:account) }
permissions :create? do
context 'when not user_signed_in?' do
diff --git a/spec/policies/custom_emoji_policy_spec.rb b/spec/policies/custom_emoji_policy_spec.rb
index cf7e7d924b..cb869c7d9a 100644
--- a/spec/policies/custom_emoji_policy_spec.rb
+++ b/spec/policies/custom_emoji_policy_spec.rb
@@ -4,7 +4,8 @@ require 'rails_helper'
require 'pundit/rspec'
RSpec.describe CustomEmojiPolicy do
- let(:subject) { described_class }
+ subject { described_class }
+
let(:admin) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')).account }
let(:john) { Fabricate(:account) }
diff --git a/spec/policies/domain_block_policy_spec.rb b/spec/policies/domain_block_policy_spec.rb
index e254e2cf4d..4c89f3f374 100644
--- a/spec/policies/domain_block_policy_spec.rb
+++ b/spec/policies/domain_block_policy_spec.rb
@@ -4,7 +4,8 @@ require 'rails_helper'
require 'pundit/rspec'
RSpec.describe DomainBlockPolicy do
- let(:subject) { described_class }
+ subject { described_class }
+
let(:admin) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')).account }
let(:john) { Fabricate(:account) }
diff --git a/spec/policies/email_domain_block_policy_spec.rb b/spec/policies/email_domain_block_policy_spec.rb
index 6e57b1372f..7ecff4be49 100644
--- a/spec/policies/email_domain_block_policy_spec.rb
+++ b/spec/policies/email_domain_block_policy_spec.rb
@@ -4,7 +4,8 @@ require 'rails_helper'
require 'pundit/rspec'
RSpec.describe EmailDomainBlockPolicy do
- let(:subject) { described_class }
+ subject { described_class }
+
let(:admin) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')).account }
let(:john) { Fabricate(:account) }
diff --git a/spec/policies/instance_policy_spec.rb b/spec/policies/instance_policy_spec.rb
index 3e047bbe9e..a0d9a008b7 100644
--- a/spec/policies/instance_policy_spec.rb
+++ b/spec/policies/instance_policy_spec.rb
@@ -4,7 +4,8 @@ require 'rails_helper'
require 'pundit/rspec'
RSpec.describe InstancePolicy do
- let(:subject) { described_class }
+ subject { described_class }
+
let(:admin) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')).account }
let(:john) { Fabricate(:account) }
diff --git a/spec/policies/invite_policy_spec.rb b/spec/policies/invite_policy_spec.rb
index 50a312f44f..cbe3735d80 100644
--- a/spec/policies/invite_policy_spec.rb
+++ b/spec/policies/invite_policy_spec.rb
@@ -4,7 +4,8 @@ require 'rails_helper'
require 'pundit/rspec'
RSpec.describe InvitePolicy do
- let(:subject) { described_class }
+ subject { described_class }
+
let(:admin) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')).account }
let(:john) { Fabricate(:user).account }
diff --git a/spec/policies/relay_policy_spec.rb b/spec/policies/relay_policy_spec.rb
index 0d479e0ca7..29ba02c26a 100644
--- a/spec/policies/relay_policy_spec.rb
+++ b/spec/policies/relay_policy_spec.rb
@@ -4,7 +4,8 @@ require 'rails_helper'
require 'pundit/rspec'
RSpec.describe RelayPolicy do
- let(:subject) { described_class }
+ subject { described_class }
+
let(:admin) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')).account }
let(:john) { Fabricate(:account) }
diff --git a/spec/policies/report_note_policy_spec.rb b/spec/policies/report_note_policy_spec.rb
index a657fce4bd..b40a878887 100644
--- a/spec/policies/report_note_policy_spec.rb
+++ b/spec/policies/report_note_policy_spec.rb
@@ -4,7 +4,8 @@ require 'rails_helper'
require 'pundit/rspec'
RSpec.describe ReportNotePolicy do
- let(:subject) { described_class }
+ subject { described_class }
+
let(:admin) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')).account }
let(:john) { Fabricate(:account) }
diff --git a/spec/policies/report_policy_spec.rb b/spec/policies/report_policy_spec.rb
index 8f2533fa6b..4fc4178075 100644
--- a/spec/policies/report_policy_spec.rb
+++ b/spec/policies/report_policy_spec.rb
@@ -4,7 +4,8 @@ require 'rails_helper'
require 'pundit/rspec'
RSpec.describe ReportPolicy do
- let(:subject) { described_class }
+ subject { described_class }
+
let(:admin) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')).account }
let(:john) { Fabricate(:account) }
diff --git a/spec/policies/settings_policy_spec.rb b/spec/policies/settings_policy_spec.rb
index 576bfa4ab7..4a99314905 100644
--- a/spec/policies/settings_policy_spec.rb
+++ b/spec/policies/settings_policy_spec.rb
@@ -4,7 +4,8 @@ require 'rails_helper'
require 'pundit/rspec'
RSpec.describe SettingsPolicy do
- let(:subject) { described_class }
+ subject { described_class }
+
let(:admin) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')).account }
let(:john) { Fabricate(:account) }
diff --git a/spec/policies/tag_policy_spec.rb b/spec/policies/tag_policy_spec.rb
index 7791cde152..35da3cc62a 100644
--- a/spec/policies/tag_policy_spec.rb
+++ b/spec/policies/tag_policy_spec.rb
@@ -4,7 +4,8 @@ require 'rails_helper'
require 'pundit/rspec'
RSpec.describe TagPolicy do
- let(:subject) { described_class }
+ subject { described_class }
+
let(:admin) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')).account }
let(:john) { Fabricate(:account) }
diff --git a/spec/policies/user_policy_spec.rb b/spec/policies/user_policy_spec.rb
index 384119f250..fa476a9fc3 100644
--- a/spec/policies/user_policy_spec.rb
+++ b/spec/policies/user_policy_spec.rb
@@ -4,7 +4,8 @@ require 'rails_helper'
require 'pundit/rspec'
RSpec.describe UserPolicy do
- let(:subject) { described_class }
+ subject { described_class }
+
let(:admin) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')).account }
let(:john) { Fabricate(:account) }
diff --git a/spec/requests/api/web/embeds_spec.rb b/spec/requests/api/web/embeds_spec.rb
new file mode 100644
index 0000000000..6314f43aaf
--- /dev/null
+++ b/spec/requests/api/web/embeds_spec.rb
@@ -0,0 +1,161 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe '/api/web/embed' do
+ subject { get "/api/web/embeds/#{id}", headers: headers }
+
+ context 'when accessed anonymously' do
+ let(:headers) { {} }
+
+ context 'when the requested status is local' do
+ let(:id) { status.id }
+
+ context 'when the requested status is public' do
+ let(:status) { Fabricate(:status, visibility: :public) }
+
+ it 'returns JSON with an html attribute' do
+ subject
+
+ expect(response).to have_http_status(200)
+ expect(body_as_json[:html]).to be_present
+ end
+ end
+
+ context 'when the requested status is private' do
+ let(:status) { Fabricate(:status, visibility: :private) }
+
+ it 'returns http not found' do
+ subject
+
+ expect(response).to have_http_status(404)
+ end
+ end
+ end
+
+ context 'when the requested status is remote' do
+ let(:remote_account) { Fabricate(:account, domain: 'example.com') }
+ let(:status) { Fabricate(:status, visibility: :public, account: remote_account, url: 'https://example.com/statuses/1') }
+ let(:id) { status.id }
+
+ it 'returns http not found' do
+ subject
+
+ expect(response).to have_http_status(404)
+ end
+ end
+
+ context 'when the requested status does not exist' do
+ let(:id) { -1 }
+
+ it 'returns http not found' do
+ subject
+
+ expect(response).to have_http_status(404)
+ end
+ end
+ end
+
+ context 'with an API token' do
+ let(:user) { Fabricate(:user) }
+ let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read') }
+ let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
+
+ context 'when the requested status is local' do
+ let(:id) { status.id }
+
+ context 'when the requested status is public' do
+ let(:status) { Fabricate(:status, visibility: :public) }
+
+ it 'returns JSON with an html attribute' do
+ subject
+
+ expect(response).to have_http_status(200)
+ expect(body_as_json[:html]).to be_present
+ end
+
+ context 'when the requesting user is blocked' do
+ before do
+ status.account.block!(user.account)
+ end
+
+ it 'returns http not found' do
+ subject
+
+ expect(response).to have_http_status(404)
+ end
+ end
+ end
+
+ context 'when the requested status is private' do
+ let(:status) { Fabricate(:status, visibility: :private) }
+
+ before do
+ user.account.follow!(status.account)
+ end
+
+ it 'returns http not found' do
+ subject
+
+ expect(response).to have_http_status(404)
+ end
+ end
+ end
+
+ context 'when the requested status is remote' do
+ let(:remote_account) { Fabricate(:account, domain: 'example.com') }
+ let(:status) { Fabricate(:status, visibility: :public, account: remote_account, url: 'https://example.com/statuses/1') }
+ let(:id) { status.id }
+
+ let(:service_instance) { instance_double(FetchOEmbedService) }
+
+ before do
+ allow(FetchOEmbedService).to receive(:new) { service_instance }
+ allow(service_instance).to receive(:call) { call_result }
+ end
+
+ context 'when the requesting user is blocked' do
+ before do
+ status.account.block!(user.account)
+ end
+
+ it 'returns http not found' do
+ subject
+
+ expect(response).to have_http_status(404)
+ end
+ end
+
+ context 'when successfully fetching OEmbed' do
+ let(:call_result) { { html: 'ok' } }
+
+ it 'returns JSON with an html attribute' do
+ subject
+
+ expect(response).to have_http_status(200)
+ expect(body_as_json[:html]).to be_present
+ end
+ end
+
+ context 'when failing to fetch OEmbed' do
+ let(:call_result) { nil }
+
+ it 'returns http not found' do
+ subject
+
+ expect(response).to have_http_status(404)
+ end
+ end
+ end
+
+ context 'when the requested status does not exist' do
+ let(:id) { -1 }
+
+ it 'returns http not found' do
+ subject
+
+ expect(response).to have_http_status(404)
+ end
+ end
+ end
+end
diff --git a/spec/services/activitypub/process_account_service_spec.rb b/spec/services/activitypub/process_account_service_spec.rb
index db454d7ad9..c02a0800a3 100644
--- a/spec/services/activitypub/process_account_service_spec.rb
+++ b/spec/services/activitypub/process_account_service_spec.rb
@@ -113,11 +113,7 @@ RSpec.describe ActivityPub::ProcessAccountService, type: :service do
end
context 'when discovering many subdomains in a short timeframe' do
- before do
- stub_const 'ActivityPub::ProcessAccountService::SUBDOMAINS_RATELIMIT', 5
- end
-
- let(:subject) do
+ subject do
8.times do |i|
domain = "test#{i}.testdomain.com"
json = {
@@ -129,6 +125,10 @@ RSpec.describe ActivityPub::ProcessAccountService, type: :service do
end
end
+ before do
+ stub_const 'ActivityPub::ProcessAccountService::SUBDOMAINS_RATELIMIT', 5
+ end
+
it 'creates at least some accounts' do
expect { subject }.to change { Account.remote.count }.by_at_least(2)
end
diff --git a/spec/services/activitypub/process_collection_service_spec.rb b/spec/services/activitypub/process_collection_service_spec.rb
index 1433d0c505..3cd60a6195 100644
--- a/spec/services/activitypub/process_collection_service_spec.rb
+++ b/spec/services/activitypub/process_collection_service_spec.rb
@@ -70,7 +70,7 @@ RSpec.describe ActivityPub::ProcessCollectionService, type: :service do
let(:forwarder) { Fabricate(:account, domain: 'example.com', uri: 'http://example.com/other_account') }
it 'does not process payload if no signature exists' do
- expect_any_instance_of(ActivityPub::LinkedDataSignature).to receive(:verify_actor!).and_return(nil)
+ allow_any_instance_of(ActivityPub::LinkedDataSignature).to receive(:verify_actor!).and_return(nil)
expect(ActivityPub::Activity).to_not receive(:factory)
subject.call(json, forwarder)
@@ -79,7 +79,7 @@ RSpec.describe ActivityPub::ProcessCollectionService, type: :service do
it 'processes payload with actor if valid signature exists' do
payload['signature'] = { 'type' => 'RsaSignature2017' }
- expect_any_instance_of(ActivityPub::LinkedDataSignature).to receive(:verify_actor!).and_return(actor)
+ allow_any_instance_of(ActivityPub::LinkedDataSignature).to receive(:verify_actor!).and_return(actor)
expect(ActivityPub::Activity).to receive(:factory).with(instance_of(Hash), actor, instance_of(Hash))
subject.call(json, forwarder)
@@ -88,7 +88,7 @@ RSpec.describe ActivityPub::ProcessCollectionService, type: :service do
it 'does not process payload if invalid signature exists' do
payload['signature'] = { 'type' => 'RsaSignature2017' }
- expect_any_instance_of(ActivityPub::LinkedDataSignature).to receive(:verify_actor!).and_return(nil)
+ allow_any_instance_of(ActivityPub::LinkedDataSignature).to receive(:verify_actor!).and_return(nil)
expect(ActivityPub::Activity).to_not receive(:factory)
subject.call(json, forwarder)
diff --git a/spec/services/activitypub/process_status_update_service_spec.rb b/spec/services/activitypub/process_status_update_service_spec.rb
index 9d90e5eb80..f7bcfaf7fb 100644
--- a/spec/services/activitypub/process_status_update_service_spec.rb
+++ b/spec/services/activitypub/process_status_update_service_spec.rb
@@ -214,11 +214,11 @@ RSpec.describe ActivityPub::ProcessStatusUpdateService, type: :service do
end
it 'does not create any edits' do
- expect { subject.call(status, json) }.to_not change { status.reload.edits.pluck(&:id) }
+ expect { subject.call(status, json) }.to_not(change { status.reload.edits.pluck(&:id) })
end
it 'does not update the text, spoiler_text or edited_at' do
- expect { subject.call(status, json) }.to_not change { s = status.reload; [s.text, s.spoiler_text, s.edited_at] }
+ expect { subject.call(status, json) }.to_not(change { s = status.reload; [s.text, s.spoiler_text, s.edited_at] })
end
end
diff --git a/spec/services/post_status_service_spec.rb b/spec/services/post_status_service_spec.rb
index d201292e17..7d7679c889 100644
--- a/spec/services/post_status_service_spec.rb
+++ b/spec/services/post_status_service_spec.rb
@@ -52,7 +52,7 @@ RSpec.describe PostStatusService, type: :service do
end
it 'does not change statuses count' do
- expect { subject.call(account, text: 'Hi future!', scheduled_at: future, thread: previous_status) }.to_not change { [account.statuses_count, previous_status.replies_count] }
+ expect { subject.call(account, text: 'Hi future!', scheduled_at: future, thread: previous_status) }.to_not(change { [account.statuses_count, previous_status.replies_count] })
end
end
diff --git a/spec/services/report_service_spec.rb b/spec/services/report_service_spec.rb
index b8ceedb851..616368bf48 100644
--- a/spec/services/report_service_spec.rb
+++ b/spec/services/report_service_spec.rb
@@ -17,24 +17,63 @@ RSpec.describe ReportService, type: :service do
context 'with a remote account' do
let(:remote_account) { Fabricate(:account, domain: 'example.com', protocol: :activitypub, inbox_url: 'http://example.com/inbox') }
+ let(:forward) { false }
before do
stub_request(:post, 'http://example.com/inbox').to_return(status: 200)
end
- it 'sends ActivityPub payload when forward is true' do
- subject.call(source_account, remote_account, forward: true)
- expect(a_request(:post, 'http://example.com/inbox')).to have_been_made
+ context 'when forward is true' do
+ let(:forward) { true }
+
+ it 'sends ActivityPub payload when forward is true' do
+ subject.call(source_account, remote_account, forward: forward)
+ expect(a_request(:post, 'http://example.com/inbox')).to have_been_made
+ end
+
+ it 'has an uri' do
+ report = subject.call(source_account, remote_account, forward: forward)
+ expect(report.uri).to_not be_nil
+ end
+
+ context 'when reporting a reply' do
+ let(:remote_thread_account) { Fabricate(:account, domain: 'foo.com', protocol: :activitypub, inbox_url: 'http://foo.com/inbox') }
+ let(:reported_status) { Fabricate(:status, account: remote_account, thread: Fabricate(:status, account: remote_thread_account)) }
+
+ before do
+ stub_request(:post, 'http://foo.com/inbox').to_return(status: 200)
+ end
+
+ context 'when forward_to_domains includes both the replied-to domain and the origin domain' do
+ it 'sends ActivityPub payload to both the author of the replied-to post and the reported user' do
+ subject.call(source_account, remote_account, status_ids: [reported_status.id], forward: forward, forward_to_domains: [remote_account.domain, remote_thread_account.domain])
+ expect(a_request(:post, 'http://foo.com/inbox')).to have_been_made
+ expect(a_request(:post, 'http://example.com/inbox')).to have_been_made
+ end
+ end
+
+ context 'when forward_to_domains includes only the replied-to domain' do
+ it 'sends ActivityPub payload only to the author of the replied-to post' do
+ subject.call(source_account, remote_account, status_ids: [reported_status.id], forward: forward, forward_to_domains: [remote_thread_account.domain])
+ expect(a_request(:post, 'http://foo.com/inbox')).to have_been_made
+ expect(a_request(:post, 'http://example.com/inbox')).to_not have_been_made
+ end
+ end
+
+ context 'when forward_to_domains does not include the replied-to domain' do
+ it 'does not send ActivityPub payload to the author of the replied-to post' do
+ subject.call(source_account, remote_account, status_ids: [reported_status.id], forward: forward)
+ expect(a_request(:post, 'http://foo.com/inbox')).to_not have_been_made
+ end
+ end
+ end
end
- it 'does not send anything when forward is false' do
- subject.call(source_account, remote_account, forward: false)
- expect(a_request(:post, 'http://example.com/inbox')).to_not have_been_made
- end
-
- it 'has an uri' do
- report = subject.call(source_account, remote_account, forward: true)
- expect(report.uri).to_not be_nil
+ context 'when forward is false' do
+ it 'does not send anything' do
+ subject.call(source_account, remote_account, forward: forward)
+ expect(a_request(:post, 'http://example.com/inbox')).to_not have_been_made
+ end
end
end
diff --git a/spec/services/search_service_spec.rb b/spec/services/search_service_spec.rb
index 497ec74474..123bd4f560 100644
--- a/spec/services/search_service_spec.rb
+++ b/spec/services/search_service_spec.rb
@@ -68,7 +68,7 @@ describe SearchService, type: :service do
allow(AccountSearchService).to receive(:new).and_return(service)
results = subject.call(query, nil, 10)
- expect(service).to have_received(:call).with(query, nil, limit: 10, offset: 0, resolve: false, use_searchable_text: true, following: false)
+ expect(service).to have_received(:call).with(query, nil, limit: 10, offset: 0, resolve: false, start_with_hashtag: false, use_searchable_text: true, following: false)
expect(results).to eq empty_results.merge(accounts: [account])
end
end
@@ -92,15 +92,6 @@ describe SearchService, type: :service do
expect(Tag).to_not have_received(:search_for)
expect(results).to eq empty_results
end
-
- it 'does not include account when starts with # character' do
- query = '#tag'
- allow(AccountSearchService).to receive(:new)
-
- results = subject.call(query, nil, 10)
- expect(AccountSearchService).to_not have_received(:new)
- expect(results).to eq empty_results
- end
end
end
end
diff --git a/spec/services/unallow_domain_service_spec.rb b/spec/services/unallow_domain_service_spec.rb
index e583a22de3..f27b6fdf39 100644
--- a/spec/services/unallow_domain_service_spec.rb
+++ b/spec/services/unallow_domain_service_spec.rb
@@ -14,7 +14,7 @@ RSpec.describe UnallowDomainService, type: :service do
context 'with limited federation mode' do
before do
- allow(subject).to receive(:whitelist_mode?).and_return(true)
+ allow(Rails.configuration.x).to receive(:whitelist_mode).and_return(true)
end
describe '#call' do
@@ -40,7 +40,7 @@ RSpec.describe UnallowDomainService, type: :service do
context 'without limited federation mode' do
before do
- allow(subject).to receive(:whitelist_mode?).and_return(false)
+ allow(Rails.configuration.x).to receive(:whitelist_mode).and_return(false)
end
describe '#call' do
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index ed228abebf..7b3af0f90b 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -3,6 +3,7 @@
if ENV['DISABLE_SIMPLECOV'] != 'true'
require 'simplecov'
SimpleCov.start 'rails' do
+ add_filter 'lib/linter'
add_group 'Policies', 'app/policies'
add_group 'Presenters', 'app/presenters'
add_group 'Serializers', 'app/serializers'
diff --git a/spec/validators/blacklisted_email_validator_spec.rb b/spec/validators/blacklisted_email_validator_spec.rb
index 3d3d50f659..bfe2a11a99 100644
--- a/spec/validators/blacklisted_email_validator_spec.rb
+++ b/spec/validators/blacklisted_email_validator_spec.rb
@@ -11,14 +11,15 @@ RSpec.describe BlacklistedEmailValidator, type: :validator do
before do
allow(user).to receive(:valid_invitation?).and_return(false)
- allow_any_instance_of(described_class).to receive(:blocked_email_provider?) { blocked_email }
+ allow(EmailDomainBlock).to receive(:block?) { blocked_email }
end
context 'when e-mail provider is blocked' do
let(:blocked_email) { true }
it 'adds error' do
- expect(subject).to have_received(:add).with(:email, :blocked)
+ described_class.new.validate(user)
+ expect(errors).to have_received(:add).with(:email, :blocked).once
end
end
@@ -26,7 +27,8 @@ RSpec.describe BlacklistedEmailValidator, type: :validator do
let(:blocked_email) { false }
it 'does not add errors' do
- expect(subject).to_not have_received(:add).with(:email, :blocked)
+ described_class.new.validate(user)
+ expect(errors).to_not have_received(:add)
end
context 'when canonical e-mail is blocked' do
@@ -37,7 +39,8 @@ RSpec.describe BlacklistedEmailValidator, type: :validator do
end
it 'adds error' do
- expect(subject).to have_received(:add).with(:email, :taken)
+ described_class.new.validate(user)
+ expect(errors).to have_received(:add).with(:email, :taken).once
end
end
end
diff --git a/yarn.lock b/yarn.lock
index 22731c47e2..b77618b8b2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -31,33 +31,43 @@
dependencies:
"@babel/highlight" "^7.22.5"
-"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.22.5":
- version "7.22.5"
- resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.22.5.tgz#b1f6c86a02d85d2dd3368a2b67c09add8cd0c255"
- integrity sha512-4Jc/YuIaYqKnDDz892kPIledykKg12Aw1PYX5i/TY28anJtacvM1Rrr8wbieB9GfEJwlzqT0hUEao0CxEebiDA==
+"@babel/compat-data@^7.22.5", "@babel/compat-data@^7.22.6":
+ version "7.22.6"
+ resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.22.6.tgz#15606a20341de59ba02cd2fcc5086fcbe73bf544"
+ integrity sha512-29tfsWTq2Ftu7MXmimyC0C5FDZv5DYxOZkh3XD3+QW4V/BYuv/LyEsjj3c0hqedEaDt6DBfDvexMKU8YevdqFg==
"@babel/core@^7.10.4", "@babel/core@^7.11.1", "@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.22.1":
- version "7.22.5"
- resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.22.5.tgz#d67d9747ecf26ee7ecd3ebae1ee22225fe902a89"
- integrity sha512-SBuTAjg91A3eKOvD+bPEz3LlhHZRNu1nFOVts9lzDJTXshHTjII0BAtDS3Y2DAkdZdDKWVZGVwkDfc4Clxn1dg==
+ version "7.22.8"
+ resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.22.8.tgz#386470abe884302db9c82e8e5e87be9e46c86785"
+ integrity sha512-75+KxFB4CZqYRXjx4NlR4J7yGvKumBuZTmV4NV6v09dVXXkuYVYLT68N6HCzLvfJ+fWCxQsntNzKwwIXL4bHnw==
dependencies:
"@ampproject/remapping" "^2.2.0"
"@babel/code-frame" "^7.22.5"
- "@babel/generator" "^7.22.5"
- "@babel/helper-compilation-targets" "^7.22.5"
+ "@babel/generator" "^7.22.7"
+ "@babel/helper-compilation-targets" "^7.22.6"
"@babel/helper-module-transforms" "^7.22.5"
- "@babel/helpers" "^7.22.5"
- "@babel/parser" "^7.22.5"
+ "@babel/helpers" "^7.22.6"
+ "@babel/parser" "^7.22.7"
"@babel/template" "^7.22.5"
- "@babel/traverse" "^7.22.5"
+ "@babel/traverse" "^7.22.8"
"@babel/types" "^7.22.5"
+ "@nicolo-ribaudo/semver-v6" "^6.3.3"
convert-source-map "^1.7.0"
debug "^4.1.0"
gensync "^1.0.0-beta.2"
json5 "^2.2.2"
- semver "^6.3.0"
-"@babel/generator@^7.22.5", "@babel/generator@^7.7.2":
+"@babel/generator@^7.22.5", "@babel/generator@^7.22.7":
+ version "7.22.7"
+ resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.22.7.tgz#a6b8152d5a621893f2c9dacf9a4e286d520633d5"
+ integrity sha512-p+jPjMG+SI8yvIaxGgeW24u7q9+5+TGpZh8/CuB7RhBKd7RCy8FayNEFNNKrNK/eUcY/4ExQqLmyrvBXKsIcwQ==
+ dependencies:
+ "@babel/types" "^7.22.5"
+ "@jridgewell/gen-mapping" "^0.3.2"
+ "@jridgewell/trace-mapping" "^0.3.17"
+ jsesc "^2.5.1"
+
+"@babel/generator@^7.7.2":
version "7.22.5"
resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.22.5.tgz#1e7bf768688acfb05cf30b2369ef855e82d984f7"
integrity sha512-+lcUbnTRhd0jOewtFSedLyiPsD5tswKkbgcezOqqWFUVNEwoUTlpPOBmvhG7OXWLR4jMdv0czPGH5XbflnD1EA==
@@ -89,21 +99,21 @@
"@babel/helper-annotate-as-pure" "^7.22.5"
"@babel/types" "^7.22.5"
-"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.22.5":
- version "7.22.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.5.tgz#fc7319fc54c5e2fa14b2909cf3c5fd3046813e02"
- integrity sha512-Ji+ywpHeuqxB8WDxraCiqR0xfhYjiDE/e6k7FuIaANnoOFxAHskHChz4vA1mJC9Lbm01s1PVAGhQY4FUKSkGZw==
+"@babel/helper-compilation-targets@^7.22.5", "@babel/helper-compilation-targets@^7.22.6":
+ version "7.22.6"
+ resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.6.tgz#e30d61abe9480aa5a83232eb31c111be922d2e52"
+ integrity sha512-534sYEqWD9VfUm3IPn2SLcH4Q3P86XL+QvqdC7ZsFrzyyPF3T4XGiVghF6PTYNdWg6pXuoqXxNQAhbYeEInTzA==
dependencies:
- "@babel/compat-data" "^7.22.5"
+ "@babel/compat-data" "^7.22.6"
"@babel/helper-validator-option" "^7.22.5"
- browserslist "^4.21.3"
+ "@nicolo-ribaudo/semver-v6" "^6.3.3"
+ browserslist "^4.21.9"
lru-cache "^5.1.1"
- semver "^6.3.0"
"@babel/helper-create-class-features-plugin@^7.22.5":
- version "7.22.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.5.tgz#2192a1970ece4685fbff85b48da2c32fcb130b7c"
- integrity sha512-xkb58MyOYIslxu3gKmVXmjTtUPvBU4odYzbiIQbWwLKIHCsx6UGZGX6F1IznMFVnDdirseUZopzN+ZRt8Xb33Q==
+ version "7.22.6"
+ resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.6.tgz#58564873c889a6fea05a538e23f9f6d201f10950"
+ integrity sha512-iwdzgtSiBxF6ni6mzVnZCF3xt5qE6cEA0J7nFt8QOAWZ0zjCFceEgpn3vtb2V7WFR6QzP2jmIFOHMTRo7eNJjQ==
dependencies:
"@babel/helper-annotate-as-pure" "^7.22.5"
"@babel/helper-environment-visitor" "^7.22.5"
@@ -112,29 +122,28 @@
"@babel/helper-optimise-call-expression" "^7.22.5"
"@babel/helper-replace-supers" "^7.22.5"
"@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
- "@babel/helper-split-export-declaration" "^7.22.5"
- semver "^6.3.0"
+ "@babel/helper-split-export-declaration" "^7.22.6"
+ "@nicolo-ribaudo/semver-v6" "^6.3.3"
"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.22.5":
- version "7.22.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.5.tgz#bb2bf0debfe39b831986a4efbf4066586819c6e4"
- integrity sha512-1VpEFOIbMRaXyDeUwUfmTIxExLwQ+zkW+Bh5zXpApA3oQedBx9v/updixWxnx/bZpKw7u8VxWjb/qWpIcmPq8A==
+ version "7.22.6"
+ resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.6.tgz#87afd63012688ad792de430ceb3b6dc28e4e7a40"
+ integrity sha512-nBookhLKxAWo/TUCmhnaEJyLz2dekjQvv5SRpE9epWQBcpedWLKt8aZdsuT9XV5ovzR3fENLjRXVT0GsSlGGhA==
dependencies:
"@babel/helper-annotate-as-pure" "^7.22.5"
+ "@nicolo-ribaudo/semver-v6" "^6.3.3"
regexpu-core "^5.3.1"
- semver "^6.3.0"
-"@babel/helper-define-polyfill-provider@^0.4.0":
- version "0.4.0"
- resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.0.tgz#487053f103110f25b9755c5980e031e93ced24d8"
- integrity sha512-RnanLx5ETe6aybRi1cO/edaRH+bNYWaryCEmjDDYyNr4wnSzyOp8T0dWipmqVHKEY3AbVKUom50AKSlj1zmKbg==
+"@babel/helper-define-polyfill-provider@^0.4.1":
+ version "0.4.1"
+ resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.1.tgz#af1429c4a83ac316a6a8c2cc8ff45cb5d2998d3a"
+ integrity sha512-kX4oXixDxG197yhX+J3Wp+NpL2wuCFjWQAr6yX2jtCnflK9ulMI51ULFGIrWiX1jGfvAxdHp+XQCcP2bZGPs9A==
dependencies:
- "@babel/helper-compilation-targets" "^7.17.7"
- "@babel/helper-plugin-utils" "^7.16.7"
+ "@babel/helper-compilation-targets" "^7.22.6"
+ "@babel/helper-plugin-utils" "^7.22.5"
debug "^4.1.1"
lodash.debounce "^4.0.8"
resolve "^1.14.2"
- semver "^6.1.2"
"@babel/helper-environment-visitor@^7.22.5":
version "7.22.5"
@@ -191,7 +200,7 @@
dependencies:
"@babel/types" "^7.22.5"
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
version "7.22.5"
resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz#dd7ee3735e8a313b9f7b05a773d892e88e6d7295"
integrity sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==
@@ -232,10 +241,10 @@
dependencies:
"@babel/types" "^7.22.5"
-"@babel/helper-split-export-declaration@^7.22.5":
- version "7.22.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.5.tgz#88cf11050edb95ed08d596f7a044462189127a08"
- integrity sha512-thqK5QFghPKWLhAV321lxF95yCg2K3Ob5yw+M3VHWfdia0IkPXUtoLH8x/6Fh486QUvzhb8YOWHChTVen2/PoQ==
+"@babel/helper-split-export-declaration@^7.22.5", "@babel/helper-split-export-declaration@^7.22.6":
+ version "7.22.6"
+ resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c"
+ integrity sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==
dependencies:
"@babel/types" "^7.22.5"
@@ -264,13 +273,13 @@
"@babel/traverse" "^7.22.5"
"@babel/types" "^7.22.5"
-"@babel/helpers@^7.22.5":
- version "7.22.5"
- resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.22.5.tgz#74bb4373eb390d1ceed74a15ef97767e63120820"
- integrity sha512-pSXRmfE1vzcUIDFQcSGA5Mr+GxBV9oiRKDuDxXvWQQBCh8HoIjs/2DlDB7H8smac1IVrB9/xdXj2N3Wol9Cr+Q==
+"@babel/helpers@^7.22.6":
+ version "7.22.6"
+ resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.22.6.tgz#8e61d3395a4f0c5a8060f309fb008200969b5ecd"
+ integrity sha512-YjDs6y/fVOYFV8hAf1rxd1QvR9wJe1pDBZ2AREKq/SDayfPzgk0PBnVuTCE5X1acEpMMNOVUqoe+OwiZGJ+OaA==
dependencies:
"@babel/template" "^7.22.5"
- "@babel/traverse" "^7.22.5"
+ "@babel/traverse" "^7.22.6"
"@babel/types" "^7.22.5"
"@babel/highlight@^7.22.5":
@@ -282,11 +291,16 @@
chalk "^2.0.0"
js-tokens "^4.0.0"
-"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.22.5":
+"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7":
version "7.22.5"
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.5.tgz#721fd042f3ce1896238cf1b341c77eb7dee7dbea"
integrity sha512-DFZMC9LJUG9PLOclRC32G63UXwzqS2koQC8dkx+PLdmt1xSePYpbT/NbsrJy8Q/muXz7o/h/d4A7Fuyixm559Q==
+"@babel/parser@^7.22.5", "@babel/parser@^7.22.7":
+ version "7.22.7"
+ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.7.tgz#df8cf085ce92ddbdbf668a7f186ce848c9036cae"
+ integrity sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q==
+
"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.22.5":
version "7.22.5"
resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.5.tgz#87245a21cd69a73b0b81bcda98d443d6df08f05e"
@@ -471,10 +485,10 @@
dependencies:
"@babel/helper-plugin-utils" "^7.22.5"
-"@babel/plugin-transform-async-generator-functions@^7.22.5":
- version "7.22.5"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.5.tgz#7336356d23380eda9a56314974f053a020dab0c3"
- integrity sha512-gGOEvFzm3fWoyD5uZq7vVTD57pPJ3PczPUD/xCFGjzBpUosnklmXyKnGQbbbGs1NPNPskFex0j93yKbHt0cHyg==
+"@babel/plugin-transform-async-generator-functions@^7.22.7":
+ version "7.22.7"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.7.tgz#053e76c0a903b72b573cb1ab7d6882174d460a1b"
+ integrity sha512-7HmE7pk/Fmke45TODvxvkxRMV9RazV+ZZzhOL9AG8G29TLrr3jkjwF7uJfxZ30EoXpO+LJkq4oA8NjO2DTnEDg==
dependencies:
"@babel/helper-environment-visitor" "^7.22.5"
"@babel/helper-plugin-utils" "^7.22.5"
@@ -521,19 +535,19 @@
"@babel/helper-plugin-utils" "^7.22.5"
"@babel/plugin-syntax-class-static-block" "^7.14.5"
-"@babel/plugin-transform-classes@^7.22.5":
- version "7.22.5"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.5.tgz#635d4e98da741fad814984639f4c0149eb0135e1"
- integrity sha512-2edQhLfibpWpsVBx2n/GKOz6JdGQvLruZQfGr9l1qes2KQaWswjBzhQF7UDUZMNaMMQeYnQzxwOMPsbYF7wqPQ==
+"@babel/plugin-transform-classes@^7.22.6":
+ version "7.22.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.6.tgz#e04d7d804ed5b8501311293d1a0e6d43e94c3363"
+ integrity sha512-58EgM6nuPNG6Py4Z3zSuu0xWu2VfodiMi72Jt5Kj2FECmaYk1RrTXA45z6KBFsu9tRgwQDwIiY4FXTt+YsSFAQ==
dependencies:
"@babel/helper-annotate-as-pure" "^7.22.5"
- "@babel/helper-compilation-targets" "^7.22.5"
+ "@babel/helper-compilation-targets" "^7.22.6"
"@babel/helper-environment-visitor" "^7.22.5"
"@babel/helper-function-name" "^7.22.5"
"@babel/helper-optimise-call-expression" "^7.22.5"
"@babel/helper-plugin-utils" "^7.22.5"
"@babel/helper-replace-supers" "^7.22.5"
- "@babel/helper-split-export-declaration" "^7.22.5"
+ "@babel/helper-split-export-declaration" "^7.22.6"
globals "^11.1.0"
"@babel/plugin-transform-computed-properties@^7.22.5":
@@ -729,10 +743,10 @@
"@babel/helper-plugin-utils" "^7.22.5"
"@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
-"@babel/plugin-transform-optional-chaining@^7.22.5":
- version "7.22.5"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.5.tgz#1003762b9c14295501beb41be72426736bedd1e0"
- integrity sha512-AconbMKOMkyG+xCng2JogMCDcqW8wedQAqpVIL4cOSescZ7+iW8utC6YDZLMCSUIReEA733gzRSaOSXMAt/4WQ==
+"@babel/plugin-transform-optional-chaining@^7.22.5", "@babel/plugin-transform-optional-chaining@^7.22.6":
+ version "7.22.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.6.tgz#4bacfe37001fe1901117672875e931d439811564"
+ integrity sha512-Vd5HiWml0mDVtcLHIoEU5sw6HOUW/Zk0acLs/SAeuLzkGNOPc9DB4nkUajemhCmTIz3eiaKREZn2hQQqF79YTg==
dependencies:
"@babel/helper-plugin-utils" "^7.22.5"
"@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
@@ -827,16 +841,16 @@
"@babel/helper-plugin-utils" "^7.22.5"
"@babel/plugin-transform-runtime@^7.22.4":
- version "7.22.5"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.22.5.tgz#ca975fb5e260044473c8142e1b18b567d33c2a3b"
- integrity sha512-bg4Wxd1FWeFx3daHFTWk1pkSWK/AyQuiyAoeZAOkAOUBjnZPH6KT7eMxouV47tQ6hl6ax2zyAWBdWZXbrvXlaw==
+ version "7.22.7"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.22.7.tgz#eb9094b5fb756cc2d98d398b2c88aeefa9205de9"
+ integrity sha512-o02xM7iY7mSPI+TvaYDH0aYl+lg3+KT7qrD705JlsB/GrZSNaYO/4i+aDFKPiJ7ubq3hgv8NNLCdyB5MFxT8mg==
dependencies:
"@babel/helper-module-imports" "^7.22.5"
"@babel/helper-plugin-utils" "^7.22.5"
- babel-plugin-polyfill-corejs2 "^0.4.3"
- babel-plugin-polyfill-corejs3 "^0.8.1"
- babel-plugin-polyfill-regenerator "^0.5.0"
- semver "^6.3.0"
+ "@nicolo-ribaudo/semver-v6" "^6.3.3"
+ babel-plugin-polyfill-corejs2 "^0.4.4"
+ babel-plugin-polyfill-corejs3 "^0.8.2"
+ babel-plugin-polyfill-regenerator "^0.5.1"
"@babel/plugin-transform-shorthand-properties@^7.22.5":
version "7.22.5"
@@ -916,12 +930,12 @@
"@babel/helper-plugin-utils" "^7.22.5"
"@babel/preset-env@^7.11.0", "@babel/preset-env@^7.22.4":
- version "7.22.5"
- resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.22.5.tgz#3da66078b181f3d62512c51cf7014392c511504e"
- integrity sha512-fj06hw89dpiZzGZtxn+QybifF07nNiZjZ7sazs2aVDcysAZVGjW7+7iFYxg6GLNM47R/thYfLdrXc+2f11Vi9A==
+ version "7.22.7"
+ resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.22.7.tgz#a1ef34b64a80653c22ce4d9c25603cfa76fc168a"
+ integrity sha512-1whfDtW+CzhETuzYXfcgZAh8/GFMeEbz0V5dVgya8YeJyCU6Y/P2Gnx4Qb3MylK68Zu9UiwUvbPMPTpFAOJ+sQ==
dependencies:
- "@babel/compat-data" "^7.22.5"
- "@babel/helper-compilation-targets" "^7.22.5"
+ "@babel/compat-data" "^7.22.6"
+ "@babel/helper-compilation-targets" "^7.22.6"
"@babel/helper-plugin-utils" "^7.22.5"
"@babel/helper-validator-option" "^7.22.5"
"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.22.5"
@@ -946,13 +960,13 @@
"@babel/plugin-syntax-top-level-await" "^7.14.5"
"@babel/plugin-syntax-unicode-sets-regex" "^7.18.6"
"@babel/plugin-transform-arrow-functions" "^7.22.5"
- "@babel/plugin-transform-async-generator-functions" "^7.22.5"
+ "@babel/plugin-transform-async-generator-functions" "^7.22.7"
"@babel/plugin-transform-async-to-generator" "^7.22.5"
"@babel/plugin-transform-block-scoped-functions" "^7.22.5"
"@babel/plugin-transform-block-scoping" "^7.22.5"
"@babel/plugin-transform-class-properties" "^7.22.5"
"@babel/plugin-transform-class-static-block" "^7.22.5"
- "@babel/plugin-transform-classes" "^7.22.5"
+ "@babel/plugin-transform-classes" "^7.22.6"
"@babel/plugin-transform-computed-properties" "^7.22.5"
"@babel/plugin-transform-destructuring" "^7.22.5"
"@babel/plugin-transform-dotall-regex" "^7.22.5"
@@ -977,7 +991,7 @@
"@babel/plugin-transform-object-rest-spread" "^7.22.5"
"@babel/plugin-transform-object-super" "^7.22.5"
"@babel/plugin-transform-optional-catch-binding" "^7.22.5"
- "@babel/plugin-transform-optional-chaining" "^7.22.5"
+ "@babel/plugin-transform-optional-chaining" "^7.22.6"
"@babel/plugin-transform-parameters" "^7.22.5"
"@babel/plugin-transform-private-methods" "^7.22.5"
"@babel/plugin-transform-private-property-in-object" "^7.22.5"
@@ -995,11 +1009,11 @@
"@babel/plugin-transform-unicode-sets-regex" "^7.22.5"
"@babel/preset-modules" "^0.1.5"
"@babel/types" "^7.22.5"
- babel-plugin-polyfill-corejs2 "^0.4.3"
- babel-plugin-polyfill-corejs3 "^0.8.1"
- babel-plugin-polyfill-regenerator "^0.5.0"
- core-js-compat "^3.30.2"
- semver "^6.3.0"
+ "@nicolo-ribaudo/semver-v6" "^6.3.3"
+ babel-plugin-polyfill-corejs2 "^0.4.4"
+ babel-plugin-polyfill-corejs3 "^0.8.2"
+ babel-plugin-polyfill-regenerator "^0.5.1"
+ core-js-compat "^3.31.0"
"@babel/preset-modules@^0.1.5":
version "0.1.5"
@@ -1048,9 +1062,9 @@
regenerator-runtime "^0.12.0"
"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.8", "@babel/runtime@^7.15.4", "@babel/runtime@^7.18.3", "@babel/runtime@^7.2.0", "@babel/runtime@^7.20.13", "@babel/runtime@^7.20.7", "@babel/runtime@^7.22.3", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
- version "7.22.5"
- resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.22.5.tgz#8564dd588182ce0047d55d7a75e93921107b57ec"
- integrity sha512-ecjvYlnAaZ/KVneE/OdKYBYfgXV3Ptu6zQWmgEF7vwKhQnvVS6bjMD2XYgj+SNvQ1GfK/pjgokfPkC/2CO8CuA==
+ version "7.22.6"
+ resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.22.6.tgz#57d64b9ae3cff1d67eb067ae117dac087f5bd438"
+ integrity sha512-wDb5pWm4WDdF6LFUde3Jl8WzPA+3ZbxYqkC6xAXuD3irdEHN1k0NfTRrJD8ZD378SJ61miMLCqIOXYhd8x+AJQ==
dependencies:
regenerator-runtime "^0.13.11"
@@ -1063,7 +1077,7 @@
"@babel/parser" "^7.22.5"
"@babel/types" "^7.22.5"
-"@babel/traverse@7", "@babel/traverse@^7.22.5", "@babel/traverse@^7.7.2":
+"@babel/traverse@7", "@babel/traverse@^7.7.2":
version "7.22.5"
resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.22.5.tgz#44bd276690db6f4940fdb84e1cb4abd2f729ccd1"
integrity sha512-7DuIjPgERaNo6r+PZwItpjCZEa5vyw4eJGufeLxrPdBXBoLcCJCIasvK6pK/9DVNrLZTLFhUGqaC6X/PA007TQ==
@@ -1079,6 +1093,22 @@
debug "^4.1.0"
globals "^11.1.0"
+"@babel/traverse@^7.22.5", "@babel/traverse@^7.22.6", "@babel/traverse@^7.22.8":
+ version "7.22.8"
+ resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.22.8.tgz#4d4451d31bc34efeae01eac222b514a77aa4000e"
+ integrity sha512-y6LPR+wpM2I3qJrsheCTwhIinzkETbplIgPBbwvqPKc+uljeA5gP+3nP8irdYt1mjQaDnlIcG+dw8OjAco4GXw==
+ dependencies:
+ "@babel/code-frame" "^7.22.5"
+ "@babel/generator" "^7.22.7"
+ "@babel/helper-environment-visitor" "^7.22.5"
+ "@babel/helper-function-name" "^7.22.5"
+ "@babel/helper-hoist-variables" "^7.22.5"
+ "@babel/helper-split-export-declaration" "^7.22.6"
+ "@babel/parser" "^7.22.7"
+ "@babel/types" "^7.22.5"
+ debug "^4.1.0"
+ globals "^11.1.0"
+
"@babel/types@^7.0.0", "@babel/types@^7.0.0-beta.49", "@babel/types@^7.12.11", "@babel/types@^7.20.7", "@babel/types@^7.22.5", "@babel/types@^7.3.3", "@babel/types@^7.4.4":
version "7.22.5"
resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.22.5.tgz#cd93eeaab025880a3a47ec881f4b096a5b786fbe"
@@ -1093,25 +1123,25 @@
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
-"@csstools/css-parser-algorithms@^2.2.0":
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/@csstools/css-parser-algorithms/-/css-parser-algorithms-2.2.0.tgz#1268b07196d1118296443aeff41bca27d94b0981"
- integrity sha512-9BoQ/jSrPq4vv3b9jjLW+PNNv56KlDH5JMx5yASSNrCtvq70FCNZUjXRvbCeR9hYj9ZyhURtqpU/RFIgg6kiOw==
+"@csstools/css-parser-algorithms@^2.3.0":
+ version "2.3.0"
+ resolved "https://registry.yarnpkg.com/@csstools/css-parser-algorithms/-/css-parser-algorithms-2.3.0.tgz#0cc3a656dc2d638370ecf6f98358973bfbd00141"
+ integrity sha512-dTKSIHHWc0zPvcS5cqGP+/TPFUJB0ekJ9dGKvMAFoNuBFhDPBt9OMGNZiIA5vTiNdGHHBeScYPXIGBMnVOahsA==
"@csstools/css-tokenizer@^2.1.1":
version "2.1.1"
resolved "https://registry.yarnpkg.com/@csstools/css-tokenizer/-/css-tokenizer-2.1.1.tgz#07ae11a0a06365d7ec686549db7b729bc036528e"
integrity sha512-GbrTj2Z8MCTUv+52GE0RbFGM527xuXZ0Xa5g0Z+YN573uveS4G0qi6WNOMyz3yrFM/jaILTTwJ0+umx81EzqfA==
-"@csstools/media-query-list-parser@^2.1.0":
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/@csstools/media-query-list-parser/-/media-query-list-parser-2.1.0.tgz#6e1a5e12e0d103cd13b94bddb88b878bd6866103"
- integrity sha512-MXkR+TeaS2q9IkpyO6jVCdtA/bfpABJxIrfkLswThFN8EZZgI2RfAHhm6sDNDuYV25d5+b8Lj1fpTccIcSLPsQ==
+"@csstools/media-query-list-parser@^2.1.2":
+ version "2.1.2"
+ resolved "https://registry.yarnpkg.com/@csstools/media-query-list-parser/-/media-query-list-parser-2.1.2.tgz#6ef642b728d30c1009bfbba3211c7e4c11302728"
+ integrity sha512-M8cFGGwl866o6++vIY7j1AKuq9v57cf+dGepScwCcbut9ypJNr4Cj+LLTWligYUZ0uyhEoJDKt5lvyBfh2L3ZQ==
-"@csstools/selector-specificity@^2.2.0":
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/@csstools/selector-specificity/-/selector-specificity-2.2.0.tgz#2cbcf822bf3764c9658c4d2e568bd0c0cb748016"
- integrity sha512-+OJ9konv95ClSTOJCmMZqpd5+YGsB2S+x6w3E1oaM8UuR5j8nTNHYSz8c9BEPGDOCMQYIEEGlVPj/VY64iTbGw==
+"@csstools/selector-specificity@^3.0.0":
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/@csstools/selector-specificity/-/selector-specificity-3.0.0.tgz#798622546b63847e82389e473fd67f2707d82247"
+ integrity sha512-hBI9tfBtuPIi885ZsZ32IMEU/5nlZH/KOVYJCOh7gyMxaVLGmLedYqFN6Ui1LXkI8JlC8IsuC0rF0btcRZKd5g==
"@discoveryjs/json-ext@0.5.7":
version "0.5.7"
@@ -1215,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==
@@ -1655,6 +1685,11 @@
"@jridgewell/resolve-uri" "3.1.0"
"@jridgewell/sourcemap-codec" "1.4.14"
+"@nicolo-ribaudo/semver-v6@^6.3.3":
+ version "6.3.3"
+ resolved "https://registry.yarnpkg.com/@nicolo-ribaudo/semver-v6/-/semver-v6-6.3.3.tgz#ea6d23ade78a325f7a52750aab1526b02b628c29"
+ integrity sha512-3Yc1fUTs69MG/uZbJlLSI3JISMn2UV2rg+1D/vROUqZyh3l6iYHCs7GMp+M40ZD7yOdDbYjJcU1oTJhrc+dGKg==
+
"@nodelib/fs.scandir@2.1.5":
version "2.1.5"
resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
@@ -1719,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"
@@ -2080,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==
@@ -2115,7 +2150,7 @@
resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca"
integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==
-"@types/minimist@^1.2.0":
+"@types/minimist@^1.2.2":
version "1.2.2"
resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c"
integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==
@@ -2443,59 +2478,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==
+"@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.4.0"
- "@typescript-eslint/scope-manager" "5.59.11"
- "@typescript-eslint/type-utils" "5.59.11"
- "@typescript-eslint/utils" "5.59.11"
+ "@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"
@@ -2510,32 +2549,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"
@@ -2545,13 +2584,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"
@@ -3230,29 +3269,29 @@ babel-plugin-macros@^3.0.1, babel-plugin-macros@^3.1.0:
cosmiconfig "^7.0.0"
resolve "^1.19.0"
-babel-plugin-polyfill-corejs2@^0.4.3:
- version "0.4.3"
- resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.3.tgz#75044d90ba5043a5fb559ac98496f62f3eb668fd"
- integrity sha512-bM3gHc337Dta490gg+/AseNB9L4YLHxq1nGKZZSHbhXv4aTYU2MD2cjza1Ru4S6975YLTaL1K8uJf6ukJhhmtw==
+babel-plugin-polyfill-corejs2@^0.4.4:
+ version "0.4.4"
+ resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.4.tgz#9f9a0e1cd9d645cc246a5e094db5c3aa913ccd2b"
+ integrity sha512-9WeK9snM1BfxB38goUEv2FLnA6ja07UMfazFHzCXUb3NyDZAwfXvQiURQ6guTTMeHcOsdknULm1PDhs4uWtKyA==
dependencies:
- "@babel/compat-data" "^7.17.7"
- "@babel/helper-define-polyfill-provider" "^0.4.0"
- semver "^6.1.1"
+ "@babel/compat-data" "^7.22.6"
+ "@babel/helper-define-polyfill-provider" "^0.4.1"
+ "@nicolo-ribaudo/semver-v6" "^6.3.3"
-babel-plugin-polyfill-corejs3@^0.8.1:
- version "0.8.1"
- resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.1.tgz#39248263c38191f0d226f928d666e6db1b4b3a8a"
- integrity sha512-ikFrZITKg1xH6pLND8zT14UPgjKHiGLqex7rGEZCH2EvhsneJaJPemmpQaIZV5AL03II+lXylw3UmddDK8RU5Q==
+babel-plugin-polyfill-corejs3@^0.8.2:
+ version "0.8.2"
+ resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.2.tgz#d406c5738d298cd9c66f64a94cf8d5904ce4cc5e"
+ integrity sha512-Cid+Jv1BrY9ReW9lIfNlNpsI53N+FN7gE+f73zLAUbr9C52W4gKLWSByx47pfDJsEysojKArqOtOKZSVIIUTuQ==
dependencies:
- "@babel/helper-define-polyfill-provider" "^0.4.0"
- core-js-compat "^3.30.1"
+ "@babel/helper-define-polyfill-provider" "^0.4.1"
+ core-js-compat "^3.31.0"
-babel-plugin-polyfill-regenerator@^0.5.0:
- version "0.5.0"
- resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.0.tgz#e7344d88d9ef18a3c47ded99362ae4a757609380"
- integrity sha512-hDJtKjMLVa7Z+LwnTCxoDLQj6wdc+B8dun7ayF2fYieI6OzfuvcLMB32ihJZ4UhCBwNYGl5bg/x/P9cMdnkc2g==
+babel-plugin-polyfill-regenerator@^0.5.1:
+ version "0.5.1"
+ resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.1.tgz#ace7a5eced6dff7d5060c335c52064778216afd3"
+ integrity sha512-L8OyySuI6OSQ5hFy9O+7zFjyr4WhAfRjLIOkhQGYl+emwJkd/S4XXT1JpfrgR1jrQ1NcGiOh+yAdGlF8pnC3Jw==
dependencies:
- "@babel/helper-define-polyfill-provider" "^0.4.0"
+ "@babel/helper-define-polyfill-provider" "^0.4.1"
babel-plugin-preval@^5.1.0:
version "5.1.0"
@@ -3526,7 +3565,7 @@ browserify-zlib@^0.2.0:
dependencies:
pako "~1.0.5"
-browserslist@^4.0.0, browserslist@^4.21.3, browserslist@^4.21.4, browserslist@^4.21.5:
+browserslist@^4.0.0, browserslist@^4.21.4, browserslist@^4.21.5:
version "4.21.8"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.8.tgz#db2498e1f4b80ed199c076248a094935860b6017"
integrity sha512-j+7xYe+v+q2Id9qbBeCI8WX5NmZSRe8es1+0xntD/+gaWXznP8tFEkv5IgSaHf5dS1YwVMbX/4W6m937mj+wQw==
@@ -3536,6 +3575,16 @@ browserslist@^4.0.0, browserslist@^4.21.3, browserslist@^4.21.4, browserslist@^4
node-releases "^2.0.12"
update-browserslist-db "^1.0.11"
+browserslist@^4.21.9:
+ version "4.21.9"
+ resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.9.tgz#e11bdd3c313d7e2a9e87e8b4b0c7872b13897635"
+ integrity sha512-M0MFoZzbUrRU4KNfCrDLnvyE7gub+peetoTid3TBIqtunaDJyXlwhakT+/VkvSXcfIzFfK/nkCs4nmyTmxdNSg==
+ dependencies:
+ caniuse-lite "^1.0.30001503"
+ electron-to-chromium "^1.4.431"
+ node-releases "^2.0.12"
+ update-browserslist-db "^1.0.11"
+
bser@2.1.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05"
@@ -3666,21 +3715,22 @@ callsites@^3.0.0:
resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
-camelcase-keys@^6.2.2:
- version "6.2.2"
- resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-6.2.2.tgz#5e755d6ba51aa223ec7d3d52f25778210f9dc3c0"
- integrity sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==
+camelcase-keys@^7.0.0:
+ version "7.0.2"
+ resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-7.0.2.tgz#d048d8c69448745bb0de6fc4c1c52a30dfbe7252"
+ integrity sha512-Rjs1H+A9R+Ig+4E/9oyB66UC5Mj9Xq3N//vcLf2WzgdTi/3gUu3Z9KoqmlrEG4VuuLK8wJHofxzdQXz/knhiYg==
dependencies:
- camelcase "^5.3.1"
- map-obj "^4.0.0"
- quick-lru "^4.0.1"
+ camelcase "^6.3.0"
+ map-obj "^4.1.0"
+ quick-lru "^5.1.1"
+ type-fest "^1.2.1"
camelcase@^5.0.0, camelcase@^5.3.1:
version "5.3.1"
resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
-camelcase@^6.2.0:
+camelcase@^6.2.0, camelcase@^6.3.0:
version "6.3.0"
resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a"
integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
@@ -3695,11 +3745,16 @@ caniuse-api@^3.0.0:
lodash.memoize "^4.1.2"
lodash.uniq "^4.5.0"
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001464, caniuse-lite@^1.0.30001502:
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001464:
version "1.0.30001503"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001503.tgz#88b6ff1b2cf735f1f3361dc1a15b59f0561aa398"
integrity sha512-Sf9NiF+wZxPfzv8Z3iS0rXM1Do+iOy2Lxvib38glFX+08TCYYYGR5fRJXk4d77C4AYwhUjgYgMsMudbh2TqCKw==
+caniuse-lite@^1.0.30001502, caniuse-lite@^1.0.30001503:
+ version "1.0.30001515"
+ resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001515.tgz#418aefeed9d024cd3129bfae0ccc782d4cb8f12b"
+ integrity sha512-eEFDwUOZbE24sb+Ecsx3+OvNETqjWIdabMy52oOkIgcUtAsQifjUG9q4U9dgTHJM2mfk4uEPxc0+xuFdJ629QA==
+
chalk@5.2.0:
version "5.2.0"
resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.2.0.tgz#249623b7d66869c673699fb66d65723e54dfcfb3"
@@ -4079,12 +4134,12 @@ copy-descriptor@^0.1.0:
resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
integrity sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==
-core-js-compat@^3.30.1, core-js-compat@^3.30.2:
- version "3.31.0"
- resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.31.0.tgz#4030847c0766cc0e803dcdfb30055d7ef2064bf1"
- integrity sha512-hM7YCu1cU6Opx7MXNu0NuumM0ezNeAeRKadixyiQELWY3vT3De9S4J5ZBMraWV2vZnrE1Cirl0GtFtDtMUXzPw==
+core-js-compat@^3.31.0:
+ version "3.31.1"
+ resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.31.1.tgz#5084ad1a46858df50ff89ace152441a63ba7aae0"
+ integrity sha512-wIDWd2s5/5aJSdpOJHfSibxNODxoGoWOBHt8JSPB41NOE94M7kuTPZCYLOlTtuoXTsBPKobpJ6T+y0SSy5L9SA==
dependencies:
- browserslist "^4.21.5"
+ browserslist "^4.21.9"
core-js@^2.5.0:
version "2.6.12"
@@ -4092,9 +4147,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"
@@ -4418,6 +4473,11 @@ decamelize@^1.1.0, decamelize@^1.2.0:
resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==
+decamelize@^5.0.0:
+ version "5.0.1"
+ resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-5.0.1.tgz#db11a92e58c741ef339fb0a2868d8a06a9a7b1e9"
+ integrity sha512-VfxadyCECXgQlkoEAjeghAr5gY3Hf+IKjKb+X8tGVDtveCjN+USwprd2q3QXBR9T1+x2DG0XZF5/w+7HAtSaXA==
+
decimal.js@^10.4.2, decimal.js@^10.4.3:
version "10.4.3"
resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.3.tgz#1044092884d245d1b7f65725fa4ad4c6f781cc23"
@@ -4762,10 +4822,10 @@ ejs@^3.1.6:
dependencies:
jake "^10.8.5"
-electron-to-chromium@^1.4.428:
- version "1.4.430"
- resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.430.tgz#52693c812a81800fafb5b312c1a850142e2fc9eb"
- integrity sha512-FytjTbGwz///F+ToZ5XSeXbbSaXalsVRXsz2mHityI5gfxft7ieW3HqFLkU5V1aIrY42aflICqbmFoDxW10etg==
+electron-to-chromium@^1.4.428, electron-to-chromium@^1.4.431:
+ version "1.4.457"
+ resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.457.tgz#3fdc7b4f97d628ac6b51e8b4b385befb362fe343"
+ integrity sha512-/g3UyNDmDd6ebeWapmAoiyy+Sy2HyJ+/X8KyvNeHfKRFfHaA2W8oF5fxD5F3tjBDcjpwo0iek6YNgxNXDBoEtA==
elliptic@^6.5.3:
version "6.5.4"
@@ -5101,12 +5161,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"
@@ -5460,6 +5521,17 @@ fast-glob@^3.2.11, fast-glob@^3.2.12, fast-glob@^3.2.9:
merge2 "^1.3.0"
micromatch "^4.0.4"
+fast-glob@^3.3.0:
+ version "3.3.0"
+ resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.0.tgz#7c40cb491e1e2ed5664749e87bfb516dbe8727c0"
+ integrity sha512-ChDuvbOypPuNjO8yIDf36x7BlZX1smcUMTTcyoIjycexOxd6DFsKsg21qVBzEmr3G7fUKIRy2/psii+CIUt7FA==
+ dependencies:
+ "@nodelib/fs.stat" "^2.0.2"
+ "@nodelib/fs.walk" "^1.2.3"
+ glob-parent "^5.1.2"
+ merge2 "^1.3.0"
+ micromatch "^4.0.4"
+
fast-json-stable-stringify@^2.0.0, fast-json-stable-stringify@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
@@ -5843,15 +5915,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"
@@ -6137,11 +6209,6 @@ homedir-polyfill@^1.0.1:
dependencies:
parse-passwd "^1.0.0"
-hosted-git-info@^2.1.4:
- version "2.8.9"
- resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
- integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
-
hosted-git-info@^4.0.1:
version "4.1.0"
resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz#827b82867e9ff1c8d0c4d9d53880397d2c86d224"
@@ -6376,6 +6443,11 @@ indent-string@^4.0.0:
resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
+indent-string@^5.0.0:
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-5.0.0.tgz#4fd2980fccaf8622d14c64d694f4cf33c81951a5"
+ integrity sha512-m6FAo/spmsW2Ab2fU35JTYwtOKa2yAwXSwgjSv1TJzh4Mh7mC3lzAOVLBprb72XsTrgkEIsl7YrFNAiDiRhIGg==
+
infer-owner@^1.0.4:
version "1.0.4"
resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"
@@ -7780,10 +7852,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"
@@ -7828,7 +7900,7 @@ map-obj@^1.0.0:
resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
integrity sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==
-map-obj@^4.0.0:
+map-obj@^4.1.0:
version "4.3.0"
resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.3.0.tgz#9304f906e93faae70880da102a9f1df0ea8bb05a"
integrity sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==
@@ -7905,23 +7977,23 @@ memory-fs@^0.5.0:
errno "^0.1.3"
readable-stream "^2.0.1"
-meow@^9.0.0:
- version "9.0.0"
- resolved "https://registry.yarnpkg.com/meow/-/meow-9.0.0.tgz#cd9510bc5cac9dee7d03c73ee1f9ad959f4ea364"
- integrity sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==
+meow@^10.1.5:
+ version "10.1.5"
+ resolved "https://registry.yarnpkg.com/meow/-/meow-10.1.5.tgz#be52a1d87b5f5698602b0f32875ee5940904aa7f"
+ integrity sha512-/d+PQ4GKmGvM9Bee/DPa8z3mXs/pkvJE2KEThngVNOqtmljC6K7NMPxtc2JeZYTmpWb9k/TmxjeL18ez3h7vCw==
dependencies:
- "@types/minimist" "^1.2.0"
- camelcase-keys "^6.2.2"
- decamelize "^1.2.0"
+ "@types/minimist" "^1.2.2"
+ camelcase-keys "^7.0.0"
+ decamelize "^5.0.0"
decamelize-keys "^1.1.0"
hard-rejection "^2.1.0"
minimist-options "4.1.0"
- normalize-package-data "^3.0.0"
- read-pkg-up "^7.0.1"
- redent "^3.0.0"
- trim-newlines "^3.0.0"
- type-fest "^0.18.0"
- yargs-parser "^20.2.3"
+ normalize-package-data "^3.0.2"
+ read-pkg-up "^8.0.0"
+ redent "^4.0.0"
+ trim-newlines "^4.0.2"
+ type-fest "^1.2.2"
+ yargs-parser "^20.2.9"
merge-descriptors@1.0.1:
version "1.0.1"
@@ -8010,7 +8082,7 @@ mimic-fn@^4.0.0:
resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-4.0.0.tgz#60a90550d5cb0b239cca65d893b1a53b29871ecc"
integrity sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==
-min-indent@^1.0.0:
+min-indent@^1.0.0, min-indent@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==
@@ -8049,9 +8121,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"
@@ -8102,10 +8174,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"
@@ -8282,21 +8354,11 @@ node-libs-browser@^2.2.1:
vm-browserify "^1.0.1"
node-releases@^2.0.12:
- version "2.0.12"
- resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.12.tgz#35627cc224a23bfb06fb3380f2b3afaaa7eb1039"
- integrity sha512-QzsYKWhXTWx8h1kIvqfnC++o0pEmpRQA/aenALsL2F4pqNVr7YzcdMlDij5WBnwftRbJCNJL/O7zdKaxKPHqgQ==
+ version "2.0.13"
+ resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.13.tgz#d5ed1627c23e3461e819b02e57b75e4899b1c81d"
+ integrity sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==
-normalize-package-data@^2.5.0:
- version "2.5.0"
- resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
- integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
- dependencies:
- hosted-git-info "^2.1.4"
- resolve "^1.10.0"
- semver "2 || 3 || 4 || 5"
- validate-npm-package-license "^3.0.1"
-
-normalize-package-data@^3.0.0:
+normalize-package-data@^3.0.2:
version "3.0.3"
resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.3.tgz#dbcc3e2da59509a0983422884cd172eefdfa525e"
integrity sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==
@@ -8730,13 +8792,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"
@@ -8781,12 +8843,7 @@ pg-cloudflare@^1.1.1:
resolved "https://registry.yarnpkg.com/pg-cloudflare/-/pg-cloudflare-1.1.1.tgz#e6d5833015b170e23ae819e8c5d7eaedb472ca98"
integrity sha512-xWPagP/4B6BgFO+EKz3JONXv3YDgvkbVrGw2mTo3D6tVDQRh1e7cqVGvyR3BE+eQgAvx1XhW/iEASj4/jCWl3Q==
-pg-connection-string@^2.6.0:
- version "2.6.1"
- resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.6.1.tgz#78c23c21a35dd116f48e12e23c0965e8d9e2cbfb"
- integrity sha512-w6ZzNu6oMmIzEAYVw+RLK0+nqHPt8K3ZnknKi+g48Ak2pr3dtljJW3o+D/n2zzCG07Zoe9VOX3aiKpj+BN0pjg==
-
-pg-connection-string@^2.6.1:
+pg-connection-string@^2.6.0, pg-connection-string@^2.6.1:
version "2.6.1"
resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.6.1.tgz#78c23c21a35dd116f48e12e23c0965e8d9e2cbfb"
integrity sha512-w6ZzNu6oMmIzEAYVw+RLK0+nqHPt8K3ZnknKi+g48Ak2pr3dtljJW3o+D/n2zzCG07Zoe9VOX3aiKpj+BN0pjg==
@@ -9201,9 +9258,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"
@@ -9275,10 +9332,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"
@@ -9422,10 +9479,10 @@ queue-microtask@^1.2.2:
resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
-quick-lru@^4.0.1:
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f"
- integrity sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==
+quick-lru@^5.1.1:
+ version "5.1.1"
+ resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932"
+ integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==
raf-schd@^4.0.2:
version "4.0.3"
@@ -9744,9 +9801,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"
@@ -9776,24 +9833,24 @@ react@^18.2.0:
dependencies:
loose-envify "^1.1.0"
-read-pkg-up@^7.0.1:
- version "7.0.1"
- resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507"
- integrity sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==
+read-pkg-up@^8.0.0:
+ version "8.0.0"
+ resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-8.0.0.tgz#72f595b65e66110f43b052dd9af4de6b10534670"
+ integrity sha512-snVCqPczksT0HS2EC+SxUndvSzn6LRCwpfSvLrIfR5BKDQQZMaI6jPRC9dYvYFDRAuFEAnkwww8kBBNE/3VvzQ==
dependencies:
- find-up "^4.1.0"
- read-pkg "^5.2.0"
- type-fest "^0.8.1"
+ find-up "^5.0.0"
+ read-pkg "^6.0.0"
+ type-fest "^1.0.1"
-read-pkg@^5.2.0:
- version "5.2.0"
- resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc"
- integrity sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==
+read-pkg@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-6.0.0.tgz#a67a7d6a1c2b0c3cd6aa2ea521f40c458a4a504c"
+ integrity sha512-X1Fu3dPuk/8ZLsMhEj5f4wFAF0DWoK7qhGJvgaijocXxBmSToKfbFtqbxMO7bVjNA1dmE5huAzjXj/ey86iw9Q==
dependencies:
"@types/normalize-package-data" "^2.4.0"
- normalize-package-data "^2.5.0"
- parse-json "^5.0.0"
- type-fest "^0.6.0"
+ normalize-package-data "^3.0.2"
+ parse-json "^5.2.0"
+ type-fest "^1.0.1"
readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.3.3, readable-stream@^2.3.6:
version "2.3.8"
@@ -9851,6 +9908,14 @@ redent@^3.0.0:
indent-string "^4.0.0"
strip-indent "^3.0.0"
+redent@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/redent/-/redent-4.0.0.tgz#0c0ba7caabb24257ab3bb7a4fd95dd1d5c5681f9"
+ integrity sha512-tYkDkVVtYkSVhuQ4zBgfvciymHaeuel+zFKXShfDnFP5SyVEP7qo70Rf1jTOTCx3vGNAbnEi/xFkcfQVMIBWag==
+ dependencies:
+ indent-string "^5.0.0"
+ strip-indent "^4.0.0"
+
redis@^4.6.5:
version "4.6.7"
resolved "https://registry.yarnpkg.com/redis/-/redis-4.6.7.tgz#c73123ad0b572776223f172ec78185adb72a6b57"
@@ -10052,7 +10117,7 @@ resolve.exports@^2.0.0:
resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-2.0.2.tgz#f8c934b8e6a13f539e38b7098e2e36134f01e800"
integrity sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==
-resolve@^1.10.0, resolve@^1.14.2, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.22.1:
+resolve@^1.14.2, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.22.1:
version "1.22.2"
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.2.tgz#0ed0943d4e301867955766c9f3e1ae6d01c6845f"
integrity sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==
@@ -10282,16 +10347,21 @@ selfsigned@^1.10.8:
dependencies:
node-forge "^0.10.0"
-"semver@2 || 3 || 4 || 5", semver@^5.5.0:
+semver@^5.5.0:
version "5.7.1"
resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
-semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
+semver@^6.0.0:
version "6.3.0"
resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
+semver@^6.3.0:
+ version "6.3.1"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
+ integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
+
semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.5.1:
version "7.5.1"
resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.1.tgz#c90c4d631cf74720e46b21c1d37ea07edfab91ec"
@@ -10299,6 +10369,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"
@@ -10888,6 +10965,7 @@ stringz@^2.1.0:
char-regex "^1.0.2"
"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+ name strip-ansi-cjs
version "6.0.1"
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -10952,6 +11030,13 @@ strip-indent@^3.0.0:
dependencies:
min-indent "^1.0.0"
+strip-indent@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-4.0.0.tgz#b41379433dd06f5eae805e21d631e07ee670d853"
+ integrity sha512-mnVSV2l+Zv6BLpSD/8V87CW/y9EmmbYzGCIavsnsI6/nwn26DwffM/yztm30Z/I2DY9wdS3vXVCMnHDgZaVNoA==
+ dependencies:
+ min-indent "^1.0.1"
+
strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
version "3.1.1"
resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
@@ -10970,26 +11055,26 @@ stylehacks@^6.0.0:
browserslist "^4.21.4"
postcss-selector-parser "^6.0.4"
-stylelint-config-recommended-scss@^11.0.0:
- version "11.0.0"
- resolved "https://registry.yarnpkg.com/stylelint-config-recommended-scss/-/stylelint-config-recommended-scss-11.0.0.tgz#7b933ecac99cd3b52d14d1746e3ecd36f421b4b6"
- integrity sha512-EDghTDU7aOv2LTsRZvcT1w8mcjUaMhuy+t38iV5I/0Qiu6ixdkRwhLEMul3K/fnB2v9Nwqvb3xpvJfPH+HduDw==
+stylelint-config-recommended-scss@^12.0.0:
+ version "12.0.0"
+ resolved "https://registry.yarnpkg.com/stylelint-config-recommended-scss/-/stylelint-config-recommended-scss-12.0.0.tgz#9d9e82c46012649f11bfebcbc788f58e61860f33"
+ integrity sha512-5Bb2mlGy6WLa30oNeKpZvavv2lowJUsUJO25+OA68GFTemlwd1zbFsL7q0bReKipOSU3sG47hKneZ6Nd+ctrFA==
dependencies:
postcss-scss "^4.0.6"
stylelint-config-recommended "^12.0.0"
- stylelint-scss "^4.6.0"
+ stylelint-scss "^5.0.0"
stylelint-config-recommended@^12.0.0:
version "12.0.0"
resolved "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-12.0.0.tgz#d0993232fca017065fd5acfcb52dd8a188784ef4"
integrity sha512-x6x8QNARrGO2sG6iURkzqL+Dp+4bJorPMMRNPScdvaUK8PsynriOcMW7AFDKqkWAS5wbue/u8fUT/4ynzcmqdQ==
-stylelint-config-standard-scss@^9.0.0:
- version "9.0.0"
- resolved "https://registry.yarnpkg.com/stylelint-config-standard-scss/-/stylelint-config-standard-scss-9.0.0.tgz#70c66e1179612519fdf6ca1dbff23c804def1b6b"
- integrity sha512-yPKpJsrZn4ybuQZx/DkEHuCjw7pJginErE/47dFhCnrvD48IJ4UYec8tSiCuJWMA3HRjbIa3nh5ZeSauDGuVAg==
+stylelint-config-standard-scss@^10.0.0:
+ version "10.0.0"
+ resolved "https://registry.yarnpkg.com/stylelint-config-standard-scss/-/stylelint-config-standard-scss-10.0.0.tgz#159a54a01b80649bf0143fa7ba086b676a1a749e"
+ integrity sha512-bChBEo1p3xUVWh/wenJI+josoMk21f2yuLDGzGjmKYcALfl2u3DFltY+n4UHswYiXghqXaA8mRh+bFy/q1hQlg==
dependencies:
- stylelint-config-recommended-scss "^11.0.0"
+ stylelint-config-recommended-scss "^12.0.0"
stylelint-config-standard "^33.0.0"
stylelint-config-standard@^33.0.0:
@@ -10999,32 +11084,32 @@ stylelint-config-standard@^33.0.0:
dependencies:
stylelint-config-recommended "^12.0.0"
-stylelint-scss@^4.6.0:
- version "4.7.0"
- resolved "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-4.7.0.tgz#f986bf8c5a4b93eae2b67d3a3562eef822657908"
- integrity sha512-TSUgIeS0H3jqDZnby1UO1Qv3poi1N8wUYIJY6D1tuUq2MN3lwp/rITVo0wD+1SWTmRm0tNmGO0b7nKInnqF6Hg==
+stylelint-scss@^5.0.0:
+ version "5.0.1"
+ resolved "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-5.0.1.tgz#b33a6580b5734eace083cfc2cc3021225e28547f"
+ integrity sha512-n87iCRZrr2J7//I/QFsDXxFLnHKw633U4qvWZ+mOW6KDAp/HLj06H+6+f9zOuTYy+MdGdTuCSDROCpQIhw5fvQ==
dependencies:
postcss-media-query-parser "^0.2.3"
postcss-resolve-nested-selector "^0.1.1"
- postcss-selector-parser "^6.0.11"
+ postcss-selector-parser "^6.0.13"
postcss-value-parser "^4.2.0"
-stylelint@^15.6.2:
- version "15.7.0"
- resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-15.7.0.tgz#945939a2ce9516998a198580e69b1ceef8a7c5f3"
- integrity sha512-fQRwHwWuZsDn4ENyE9AsKkOkV9WlD2CmYiVDbdZPdS3iZh0ceypOn1EuwTNuZ8xTrHF+jVeIEzLtFFSlD/nJHg==
+stylelint@^15.10.1:
+ version "15.10.1"
+ resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-15.10.1.tgz#93f189958687e330c106b010cbec0c41dcae506d"
+ integrity sha512-CYkzYrCFfA/gnOR+u9kJ1PpzwG10WLVnoxHDuBA/JiwGqdM9+yx9+ou6SE/y9YHtfv1mcLo06fdadHTOx4gBZQ==
dependencies:
- "@csstools/css-parser-algorithms" "^2.2.0"
+ "@csstools/css-parser-algorithms" "^2.3.0"
"@csstools/css-tokenizer" "^2.1.1"
- "@csstools/media-query-list-parser" "^2.1.0"
- "@csstools/selector-specificity" "^2.2.0"
+ "@csstools/media-query-list-parser" "^2.1.2"
+ "@csstools/selector-specificity" "^3.0.0"
balanced-match "^2.0.0"
colord "^2.9.3"
cosmiconfig "^8.2.0"
css-functions-list "^3.1.0"
css-tree "^2.3.1"
debug "^4.3.4"
- fast-glob "^3.2.12"
+ fast-glob "^3.3.0"
fastest-levenshtein "^1.0.16"
file-entry-cache "^6.0.1"
global-modules "^2.0.0"
@@ -11037,12 +11122,11 @@ stylelint@^15.6.2:
is-plain-object "^5.0.0"
known-css-properties "^0.27.0"
mathml-tag-names "^2.1.3"
- meow "^9.0.0"
+ meow "^10.1.5"
micromatch "^4.0.5"
normalize-path "^3.0.0"
picocolors "^1.0.0"
postcss "^8.4.24"
- postcss-media-query-parser "^0.2.3"
postcss-resolve-nested-selector "^0.1.1"
postcss-safe-parser "^6.0.0"
postcss-selector-parser "^6.0.13"
@@ -11054,7 +11138,6 @@ stylelint@^15.6.2:
supports-hyperlinks "^3.0.0"
svg-tags "^1.0.0"
table "^6.8.1"
- v8-compile-cache "^2.3.0"
write-file-atomic "^5.0.1"
stylis@4.2.0:
@@ -11379,10 +11462,15 @@ tr46@~0.0.3:
resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==
-trim-newlines@^3.0.0:
- version "3.0.1"
- resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144"
- integrity sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==
+trim-newlines@^4.0.2:
+ version "4.1.1"
+ 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"
@@ -11460,11 +11548,6 @@ type-fest@^0.16.0:
resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.16.0.tgz#3240b891a78b0deae910dbeb86553e552a148860"
integrity sha512-eaBzG6MxNzEn9kiwvtre90cXaNLkmadMWa1zQMs3XORCXNbsH/OewwbxC5ia9dCxIxnTAsSxXJaa/p5y8DlvJg==
-type-fest@^0.18.0:
- version "0.18.1"
- resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.18.1.tgz#db4bc151a4a2cf4eebf9add5db75508db6cc841f"
- integrity sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==
-
type-fest@^0.20.2:
version "0.20.2"
resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
@@ -11475,15 +11558,10 @@ type-fest@^0.21.3:
resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"
integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==
-type-fest@^0.6.0:
- version "0.6.0"
- resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b"
- integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==
-
-type-fest@^0.8.1:
- version "0.8.1"
- resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
- integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
+type-fest@^1.0.1, type-fest@^1.2.1, type-fest@^1.2.2:
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-1.4.0.tgz#e9fb813fe3bf1744ec359d55d1affefa76f14be1"
+ integrity sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==
type-is@~1.6.18:
version "1.6.18"
@@ -11735,7 +11813,7 @@ uuid@^9.0.0:
resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.0.tgz#592f550650024a38ceb0c562f2f6aa435761efb5"
integrity sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==
-v8-compile-cache@^2.1.1, v8-compile-cache@^2.3.0:
+v8-compile-cache@^2.1.1:
version "2.3.0"
resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
@@ -12421,7 +12499,7 @@ yargs-parser@^13.1.2:
camelcase "^5.0.0"
decamelize "^1.2.0"
-yargs-parser@^20.2.1, yargs-parser@^20.2.3:
+yargs-parser@^20.2.1, yargs-parser@^20.2.9:
version "20.2.9"
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==