-
+ menu.push({ text: intl.formatMessage(messages.delete), action: handleDelete });
-
-
-
- {unread && }
-
+ const names = accounts.map(a => (
+
+
+
+
+
+ )).reduce((prev, cur) => [prev, ', ', cur]);
-
- {names} }} />
-
+ const handlers = {
+ reply: handleReply,
+ open: handleClick,
+ moveUp: handleHotkeyMoveUp,
+ moveDown: handleHotkeyMoveDown,
+ toggleHidden: handleShowMore,
+ };
+
+ return (
+
+
+
+
+
+
+
+ {unread && }
-
+ {names} }} />
+
+
+
+
+
+ {lastStatus.get('media_attachments').size > 0 && (
+
+ )}
- {lastStatus.get('media_attachments').size > 0 && (
-
+
+
+
- );
- }
+
+
+ );
+};
-}
-
-export default withRouter(injectIntl(Conversation));
+Conversation.propTypes = {
+ conversation: ImmutablePropTypes.map.isRequired,
+ scrollKey: PropTypes.string,
+ onMoveUp: PropTypes.func,
+ onMoveDown: PropTypes.func,
+};
diff --git a/app/javascript/mastodon/features/direct_timeline/components/conversations_list.jsx b/app/javascript/mastodon/features/direct_timeline/components/conversations_list.jsx
index 8c12ea9e5f..c9fc098a52 100644
--- a/app/javascript/mastodon/features/direct_timeline/components/conversations_list.jsx
+++ b/app/javascript/mastodon/features/direct_timeline/components/conversations_list.jsx
@@ -1,77 +1,72 @@
import PropTypes from 'prop-types';
+import { useRef, useMemo, useCallback } from 'react';
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
+import { useSelector, useDispatch } from 'react-redux';
import { debounce } from 'lodash';
-import ScrollableList from '../../../components/scrollable_list';
-import ConversationContainer from '../containers/conversation_container';
+import { expandConversations } from 'mastodon/actions/conversations';
+import ScrollableList from 'mastodon/components/scrollable_list';
-export default class ConversationsList extends ImmutablePureComponent {
+import { Conversation } from './conversation';
- static propTypes = {
- conversations: ImmutablePropTypes.list.isRequired,
- scrollKey: PropTypes.string.isRequired,
- hasMore: PropTypes.bool,
- isLoading: PropTypes.bool,
- onLoadMore: PropTypes.func,
- };
+const focusChild = (node, index, alignTop) => {
+ const element = node.querySelector(`article:nth-of-type(${index + 1}) .focusable`);
- getCurrentIndex = id => this.props.conversations.findIndex(x => x.get('id') === id);
-
- handleMoveUp = id => {
- const elementIndex = this.getCurrentIndex(id) - 1;
- this._selectChild(elementIndex, true);
- };
-
- handleMoveDown = id => {
- const elementIndex = this.getCurrentIndex(id) + 1;
- this._selectChild(elementIndex, false);
- };
-
- _selectChild (index, align_top) {
- const container = this.node.node;
- const element = container.querySelector(`article:nth-of-type(${index + 1}) .focusable`);
-
- if (element) {
- if (align_top && container.scrollTop > element.offsetTop) {
- element.scrollIntoView(true);
- } else if (!align_top && container.scrollTop + container.clientHeight < element.offsetTop + element.offsetHeight) {
- element.scrollIntoView(false);
- }
- element.focus();
+ if (element) {
+ if (alignTop && node.scrollTop > element.offsetTop) {
+ element.scrollIntoView(true);
+ } else if (!alignTop && node.scrollTop + node.clientHeight < element.offsetTop + element.offsetHeight) {
+ element.scrollIntoView(false);
}
+
+ element.focus();
}
+};
- setRef = c => {
- this.node = c;
- };
+export const ConversationsList = ({ scrollKey, ...other }) => {
+ const listRef = useRef();
+ const conversations = useSelector(state => state.getIn(['conversations', 'items']));
+ const isLoading = useSelector(state => state.getIn(['conversations', 'isLoading'], true));
+ const hasMore = useSelector(state => state.getIn(['conversations', 'hasMore'], false));
+ const dispatch = useDispatch();
+ const lastStatusId = conversations.last()?.get('last_status');
- handleLoadOlder = debounce(() => {
- const last = this.props.conversations.last();
+ const handleMoveUp = useCallback(id => {
+ const elementIndex = conversations.findIndex(x => x.get('id') === id) - 1;
+ focusChild(listRef.current.node, elementIndex, true);
+ }, [listRef, conversations]);
- if (last && last.get('last_status')) {
- this.props.onLoadMore(last.get('last_status'));
+ const handleMoveDown = useCallback(id => {
+ const elementIndex = conversations.findIndex(x => x.get('id') === id) + 1;
+ focusChild(listRef.current.node, elementIndex, false);
+ }, [listRef, conversations]);
+
+ const debouncedLoadMore = useMemo(() => debounce(id => {
+ dispatch(expandConversations({ maxId: id }));
+ }, 300, { leading: true }), [dispatch]);
+
+ const handleLoadMore = useCallback(() => {
+ if (lastStatusId) {
+ debouncedLoadMore(lastStatusId);
}
- }, 300, { leading: true });
+ }, [debouncedLoadMore, lastStatusId]);
- render () {
- const { conversations, isLoading, onLoadMore, ...other } = this.props;
+ return (
+
+ {conversations.map(item => (
+
+ ))}
+
+ );
+};
- return (
-
- {conversations.map(item => (
-
- ))}
-
- );
- }
-
-}
+ConversationsList.propTypes = {
+ scrollKey: PropTypes.string.isRequired,
+};
diff --git a/app/javascript/mastodon/features/direct_timeline/containers/conversation_container.js b/app/javascript/mastodon/features/direct_timeline/containers/conversation_container.js
deleted file mode 100644
index 456fc7d7cc..0000000000
--- a/app/javascript/mastodon/features/direct_timeline/containers/conversation_container.js
+++ /dev/null
@@ -1,80 +0,0 @@
-import { defineMessages, injectIntl } from 'react-intl';
-
-import { connect } from 'react-redux';
-
-import { replyCompose } from 'mastodon/actions/compose';
-import { markConversationRead, deleteConversation } from 'mastodon/actions/conversations';
-import { openModal } from 'mastodon/actions/modal';
-import { muteStatus, unmuteStatus, hideStatus, revealStatus } from 'mastodon/actions/statuses';
-import { makeGetStatus } from 'mastodon/selectors';
-
-import Conversation from '../components/conversation';
-
-const messages = defineMessages({
- replyConfirm: { id: 'confirmations.reply.confirm', defaultMessage: 'Reply' },
- replyMessage: { id: 'confirmations.reply.message', defaultMessage: 'Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?' },
-});
-
-const mapStateToProps = () => {
- const getStatus = makeGetStatus();
-
- return (state, { conversationId }) => {
- const conversation = state.getIn(['conversations', 'items']).find(x => x.get('id') === conversationId);
- const lastStatusId = conversation.get('last_status', null);
-
- return {
- accounts: conversation.get('accounts').map(accountId => state.getIn(['accounts', accountId], null)),
- unread: conversation.get('unread'),
- lastStatus: lastStatusId && getStatus(state, { id: lastStatusId }),
- };
- };
-};
-
-const mapDispatchToProps = (dispatch, { intl, conversationId }) => ({
-
- markRead () {
- dispatch(markConversationRead(conversationId));
- },
-
- reply (status, router) {
- dispatch((_, getState) => {
- let state = getState();
-
- if (state.getIn(['compose', 'text']).trim().length !== 0) {
- dispatch(openModal({
- modalType: 'CONFIRM',
- modalProps: {
- message: intl.formatMessage(messages.replyMessage),
- confirm: intl.formatMessage(messages.replyConfirm),
- onConfirm: () => dispatch(replyCompose(status, router)),
- },
- }));
- } else {
- dispatch(replyCompose(status, router));
- }
- });
- },
-
- delete () {
- dispatch(deleteConversation(conversationId));
- },
-
- onMute (status) {
- if (status.get('muted')) {
- dispatch(unmuteStatus(status.get('id')));
- } else {
- dispatch(muteStatus(status.get('id')));
- }
- },
-
- onToggleHidden (status) {
- if (status.get('hidden')) {
- dispatch(revealStatus(status.get('id')));
- } else {
- dispatch(hideStatus(status.get('id')));
- }
- },
-
-});
-
-export default injectIntl(connect(mapStateToProps, mapDispatchToProps)(Conversation));
diff --git a/app/javascript/mastodon/features/direct_timeline/containers/conversations_list_container.js b/app/javascript/mastodon/features/direct_timeline/containers/conversations_list_container.js
deleted file mode 100644
index 1dcd3ec1bd..0000000000
--- a/app/javascript/mastodon/features/direct_timeline/containers/conversations_list_container.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import { connect } from 'react-redux';
-
-import { expandConversations } from '../../../actions/conversations';
-import ConversationsList from '../components/conversations_list';
-
-const mapStateToProps = state => ({
- conversations: state.getIn(['conversations', 'items']),
- isLoading: state.getIn(['conversations', 'isLoading'], true),
- hasMore: state.getIn(['conversations', 'hasMore'], false),
-});
-
-const mapDispatchToProps = dispatch => ({
- onLoadMore: maxId => dispatch(expandConversations({ maxId })),
-});
-
-export default connect(mapStateToProps, mapDispatchToProps)(ConversationsList);
diff --git a/app/javascript/mastodon/features/direct_timeline/index.jsx b/app/javascript/mastodon/features/direct_timeline/index.jsx
index af29d7a5b8..7aee83ec10 100644
--- a/app/javascript/mastodon/features/direct_timeline/index.jsx
+++ b/app/javascript/mastodon/features/direct_timeline/index.jsx
@@ -1,11 +1,11 @@
import PropTypes from 'prop-types';
-import { PureComponent } from 'react';
+import { useRef, useCallback, useEffect } from 'react';
-import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+import { defineMessages, useIntl, FormattedMessage } from 'react-intl';
import { Helmet } from 'react-helmet';
-import { connect } from 'react-redux';
+import { useDispatch } from 'react-redux';
import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
import { addColumn, removeColumn, moveColumn } from 'mastodon/actions/columns';
@@ -14,103 +14,79 @@ import { connectDirectStream } from 'mastodon/actions/streaming';
import Column from 'mastodon/components/column';
import ColumnHeader from 'mastodon/components/column_header';
-import ConversationsListContainer from './containers/conversations_list_container';
+import { ConversationsList } from './components/conversations_list';
const messages = defineMessages({
title: { id: 'column.direct', defaultMessage: 'Private mentions' },
});
-class DirectTimeline extends PureComponent {
-
- static propTypes = {
- dispatch: PropTypes.func.isRequired,
- columnId: PropTypes.string,
- intl: PropTypes.object.isRequired,
- hasUnread: PropTypes.bool,
- multiColumn: PropTypes.bool,
- };
-
- handlePin = () => {
- const { columnId, dispatch } = this.props;
+const DirectTimeline = ({ columnId, multiColumn }) => {
+ const columnRef = useRef();
+ const intl = useIntl();
+ const dispatch = useDispatch();
+ const pinned = !!columnId;
+ const handlePin = useCallback(() => {
if (columnId) {
dispatch(removeColumn(columnId));
} else {
dispatch(addColumn('DIRECT', {}));
}
- };
+ }, [dispatch, columnId]);
- handleMove = (dir) => {
- const { columnId, dispatch } = this.props;
+ const handleMove = useCallback((dir) => {
dispatch(moveColumn(columnId, dir));
- };
+ }, [dispatch, columnId]);
- handleHeaderClick = () => {
- this.column.scrollTop();
- };
-
- componentDidMount () {
- const { dispatch } = this.props;
+ const handleHeaderClick = useCallback(() => {
+ columnRef.current.scrollTop();
+ }, [columnRef]);
+ useEffect(() => {
dispatch(mountConversations());
dispatch(expandConversations());
- this.disconnect = dispatch(connectDirectStream());
- }
- componentWillUnmount () {
- this.props.dispatch(unmountConversations());
+ const disconnect = dispatch(connectDirectStream());
- if (this.disconnect) {
- this.disconnect();
- this.disconnect = null;
- }
- }
+ return () => {
+ dispatch(unmountConversations());
+ disconnect();
+ };
+ }, [dispatch]);
- setRef = c => {
- this.column = c;
- };
+ return (
+
+
- handleLoadMore = maxId => {
- this.props.dispatch(expandConversations({ maxId }));
- };
+ }
+ bindToDocument={!multiColumn}
+ prepend={}
+ alwaysPrepend
+ />
- render () {
- const { intl, hasUnread, columnId, multiColumn } = this.props;
- const pinned = !!columnId;
+
+ {intl.formatMessage(messages.title)}
+
+
+
+ );
+};
- return (
-
-
+DirectTimeline.propTypes = {
+ columnId: PropTypes.string,
+ multiColumn: PropTypes.bool,
+};
- }
- alwaysPrepend
- emptyMessage={
}
- />
-
-
- {intl.formatMessage(messages.title)}
-
-
-
- );
- }
-
-}
-
-export default connect()(injectIntl(DirectTimeline));
+export default DirectTimeline;
diff --git a/app/javascript/mastodon/features/status/components/action_bar.jsx b/app/javascript/mastodon/features/status/components/action_bar.jsx
index 4cb06aac2c..c243a49129 100644
--- a/app/javascript/mastodon/features/status/components/action_bar.jsx
+++ b/app/javascript/mastodon/features/status/components/action_bar.jsx
@@ -17,8 +17,10 @@ import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
import ReplyAllIcon from '@/material-icons/400-24px/reply_all.svg?react';
import StarIcon from '@/material-icons/400-24px/star-fill.svg?react';
import StarBorderIcon from '@/material-icons/400-24px/star.svg?react';
+import RepeatActiveIcon from '@/svg-icons/repeat_active.svg?react';
import RepeatDisabledIcon from '@/svg-icons/repeat_disabled.svg?react';
import RepeatPrivateIcon from '@/svg-icons/repeat_private.svg?react';
+import RepeatPrivateActiveIcon from '@/svg-icons/repeat_private_active.svg?react';
import { PERMISSION_MANAGE_USERS, PERMISSION_MANAGE_FEDERATION } from 'mastodon/permissions';
import { WithRouterPropTypes } from 'mastodon/utils/react_router';
@@ -296,7 +298,7 @@ class ActionBar extends PureComponent {
if (status.get('reblogged')) {
reblogTitle = intl.formatMessage(messages.cancel_reblog_private);
- reblogIconComponent = publicStatus ? RepeatIcon : RepeatPrivateIcon;
+ reblogIconComponent = publicStatus ? RepeatActiveIcon : RepeatPrivateActiveIcon;
} else if (publicStatus) {
reblogTitle = intl.formatMessage(messages.reblog);
reblogIconComponent = RepeatIcon;
diff --git a/app/javascript/mastodon/locales/af.json b/app/javascript/mastodon/locales/af.json
index 6c37cdf5ca..d1873d6dce 100644
--- a/app/javascript/mastodon/locales/af.json
+++ b/app/javascript/mastodon/locales/af.json
@@ -3,6 +3,7 @@
"about.contact": "Kontak:",
"about.disclaimer": "Mastodon is gratis oopbronsagteware en ’n handelsmerk van Mastodon gGmbH.",
"about.domain_blocks.no_reason_available": "Rede nie beskikbaar nie",
+ "about.domain_blocks.preamble": "Mastodon generally allows you to view content from and interact with users from any other server in the fediverse. These are the exceptions that have been made on this particular server.",
"about.domain_blocks.silenced.title": "Beperk",
"about.domain_blocks.suspended.title": "Opgeskort",
"about.not_available": "Hierdie inligting is nie op hierdie bediener beskikbaar gestel nie.",
diff --git a/app/javascript/mastodon/locales/ast.json b/app/javascript/mastodon/locales/ast.json
index 4b555c4829..1467f8891e 100644
--- a/app/javascript/mastodon/locales/ast.json
+++ b/app/javascript/mastodon/locales/ast.json
@@ -116,7 +116,6 @@
"compose_form.publish_form": "Artículu nuevu",
"compose_form.publish_loud": "¡{publish}!",
"compose_form.save_changes": "Guardar los cambeos",
- "compose_form.spoiler.unmarked": "Text is not hidden",
"confirmation_modal.cancel": "Encaboxar",
"confirmations.block.block_and_report": "Bloquiar ya informar",
"confirmations.block.confirm": "Bloquiar",
@@ -146,6 +145,7 @@
"dismissable_banner.community_timeline": "Esta seición contién los artículos públicos más actuales de los perfiles agospiaos nel dominiu {domain}.",
"dismissable_banner.dismiss": "Escartar",
"dismissable_banner.explore_tags": "Esta seición contién les etiquetes del fediversu que tán ganando popularidá güei. Les etiquetes más usaes polos perfiles apaecen no cimero.",
+ "dismissable_banner.public_timeline": "Esta seición contién los artículos más nuevos de les persones na web social que les persones de {domain} siguen.",
"embed.instructions": "Empotra esti artículu nel to sitiu web pente la copia del códigu d'abaxo.",
"embed.preview": "Va apaecer asina:",
"emoji_button.activity": "Actividá",
@@ -155,6 +155,7 @@
"emoji_button.not_found": "Nun s'atoparon fustaxes que concasen",
"emoji_button.objects": "Oxetos",
"emoji_button.people": "Persones",
+ "emoji_button.recent": "D'usu frecuente",
"emoji_button.search": "Buscar…",
"emoji_button.search_results": "Resultaos de la busca",
"emoji_button.symbols": "Símbolos",
@@ -217,7 +218,6 @@
"hashtag.column_header.tag_mode.any": "o {additional}",
"hashtag.column_header.tag_mode.none": "ensin {additional}",
"hashtag.column_settings.select.no_options_message": "Nun s'atopó nenguna suxerencia",
- "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
"hashtag.counter_by_accounts": "{count, plural, one {{counter} participante} other {{counter} participantes}}",
"hashtag.follow": "Siguir a la etiqueta",
"hashtag.unfollow": "Dexar de siguir a la etiqueta",
@@ -259,7 +259,6 @@
"keyboard_shortcuts.reply": "Responder a un artículu",
"keyboard_shortcuts.requests": "Abrir la llista de solicitúes de siguimientu",
"keyboard_shortcuts.search": "Enfocar la barra de busca",
- "keyboard_shortcuts.spoilers": "to show/hide CW field",
"keyboard_shortcuts.start": "Abrir la columna «Entamar»",
"keyboard_shortcuts.toggle_sensitivity": "Amosar/anubrir el conteníu multimedia",
"keyboard_shortcuts.toot": "Comenzar un artículu nuevu",
@@ -412,12 +411,16 @@
"search.quick_action.go_to_hashtag": "Dir a la etiqueta {x}",
"search.quick_action.status_search": "Artículos que concasen con {x}",
"search.search_or_paste": "Busca o apiega una URL",
+ "search_popout.language_code": "códigu de llingua ISO",
"search_popout.quick_actions": "Aiciones rápides",
"search_popout.recent": "Busques de recién",
+ "search_popout.specific_date": "data específica",
+ "search_popout.user": "perfil",
"search_results.accounts": "Perfiles",
"search_results.all": "Too",
"search_results.hashtags": "Etiquetes",
"search_results.nothing_found": "Nun se pudo atopar nada con esos términos de busca",
+ "search_results.see_all": "Ver too",
"search_results.statuses": "Artículos",
"search_results.title": "Busca de: {q}",
"server_banner.introduction": "{domain} ye parte de la rede social descentralizada que tien la teunoloxía de {mastodon}.",
@@ -460,6 +463,7 @@
"status.replied_to": "En rempuesta a {name}",
"status.reply": "Responder",
"status.replyAll": "Responder al filu",
+ "status.report": "Informar de @{name}",
"status.sensitive_warning": "Conteníu sensible",
"status.show_filter_reason": "Amosar de toes toes",
"status.show_less": "Amosar menos",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index 290b364a52..c763a32ba8 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -150,7 +150,7 @@
"compose_form.poll.duration": "Durada de l'enquesta",
"compose_form.poll.option_placeholder": "Opció {number}",
"compose_form.poll.remove_option": "Elimina aquesta opció",
- "compose_form.poll.switch_to_multiple": "Canvia l’enquesta per a permetre diverses opcions",
+ "compose_form.poll.switch_to_multiple": "Canvia l’enquesta per a permetre múltiples opcions",
"compose_form.poll.switch_to_single": "Canvia l’enquesta per a permetre una única opció",
"compose_form.publish": "Tut",
"compose_form.publish_form": "Nou tut",
@@ -521,7 +521,7 @@
"poll.total_people": "{count, plural, one {# persona} other {# persones}}",
"poll.total_votes": "{count, plural, one {# vot} other {# vots}}",
"poll.vote": "Vota",
- "poll.voted": "Vas votar per aquesta resposta",
+ "poll.voted": "Vau votar aquesta resposta",
"poll.votes": "{votes, plural, one {# vot} other {# vots}}",
"poll_button.add_poll": "Afegeix una enquesta",
"poll_button.remove_poll": "Elimina l'enquesta",
@@ -607,7 +607,7 @@
"search.quick_action.status_search": "Tuts coincidint amb {x}",
"search.search_or_paste": "Cerca o escriu l'URL",
"search_popout.full_text_search_disabled_message": "No disponible a {domain}.",
- "search_popout.full_text_search_logged_out_message": "Només disponible en iniciar la sessió.",
+ "search_popout.full_text_search_logged_out_message": "Només disponible amb la sessió iniciada.",
"search_popout.language_code": "Codi de llengua ISO",
"search_popout.options": "Opcions de cerca",
"search_popout.quick_actions": "Accions ràpides",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index 264781baa3..70ce6611d6 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -683,7 +683,7 @@
"status.show_more": "펼치기",
"status.show_more_all": "모두 펼치기",
"status.show_original": "원본 보기",
- "status.title.with_attachments": "{user} 님이 {attachmentCount, plural, one {첨부} other {{attachmentCount}개 첨부}}하여 게시",
+ "status.title.with_attachments": "{user} 님이 {attachmentCount, plural, one {첨부파일} other {{attachmentCount}개의 첨부파일}}과 함께 게시함",
"status.translate": "번역",
"status.translated_from_with": "{provider}에 의해 {lang}에서 번역됨",
"status.uncached_media_warning": "마리보기 허용되지 않음",
diff --git a/app/javascript/mastodon/locales/lad.json b/app/javascript/mastodon/locales/lad.json
index 2a911483de..8fde687427 100644
--- a/app/javascript/mastodon/locales/lad.json
+++ b/app/javascript/mastodon/locales/lad.json
@@ -328,6 +328,7 @@
"interaction_modal.on_another_server": "En otro sirvidor",
"interaction_modal.on_this_server": "En este sirvidor",
"interaction_modal.sign_in": "No estas konektado kon este sirvidor. Ande tyenes tu kuento?",
+ "interaction_modal.sign_in_hint": "Konsejo: Akel es el sitio adonde te enrejistrates. Si no lo akodras, bushka el mesaj de posta elektronika de bienvenida en tu kuti de arivo. Tambien puedes eskrivir tu nombre de utilizador kompleto (por enshemplo @Mastodon@mastodon.social)",
"interaction_modal.title.favourite": "Endika ke te plaze publikasyon de {name}",
"interaction_modal.title.follow": "Sige a {name}",
"interaction_modal.title.reblog": "Repartaja publikasyon de {name}",
@@ -478,6 +479,7 @@
"onboarding.actions.go_to_explore": "Va a los trendes",
"onboarding.actions.go_to_home": "Va a tu linya prinsipala",
"onboarding.compose.template": "Ke haber, #Mastodon?",
+ "onboarding.follows.empty": "Malorozamente, no se pueden amostrar rezultados en este momento. Puedes aprovar uzar la bushkeda o navigar por la pajina de eksplorasyon para topar personas a las que segir, o aprovarlo de muevo mas tadre.",
"onboarding.follows.title": "Personaliza tu linya prinsipala",
"onboarding.profile.discoverable": "Faz ke mi profil apareska en bushkedas",
"onboarding.profile.display_name": "Nombre amostrado",
@@ -497,7 +499,9 @@
"onboarding.start.title": "Lo logrates!",
"onboarding.steps.follow_people.body": "El buto de Mastodon es segir a djente interesante.",
"onboarding.steps.follow_people.title": "Personaliza tu linya prinsipala",
+ "onboarding.steps.publish_status.body": "Puedes introdusirte al mundo con teksto, fotos, videos o anketas {emoji}",
"onboarding.steps.publish_status.title": "Eskrive tu primera publikasyon",
+ "onboarding.steps.setup_profile.body": "Kompleta tu profil para aumentar tus enteraksyones.",
"onboarding.steps.setup_profile.title": "Personaliza tu profil",
"onboarding.steps.share_profile.body": "Informe a tus amigos komo toparte en Mastodon",
"onboarding.steps.share_profile.title": "Partaja tu profil de Mastodon",
diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json
index 833bfe6ace..1ecfbcaf06 100644
--- a/app/javascript/mastodon/locales/oc.json
+++ b/app/javascript/mastodon/locales/oc.json
@@ -18,6 +18,7 @@
"account.blocked": "Blocat",
"account.browse_more_on_origin_server": "Navigar sul perfil original",
"account.cancel_follow_request": "Retirar la demanda d’abonament",
+ "account.copy": "Copiar lo ligam del perfil",
"account.direct": "Mencionar @{name} en privat",
"account.disable_notifications": "Quitar de m’avisar quand @{name} publica quicòm",
"account.domain_blocked": "Domeni amagat",
@@ -28,6 +29,7 @@
"account.featured_tags.last_status_never": "Cap de publicacion",
"account.featured_tags.title": "Etiquetas en avant de {name}",
"account.follow": "Sègre",
+ "account.follow_back": "Sègre en retorn",
"account.followers": "Seguidors",
"account.followers.empty": "Degun sèc pas aqueste utilizaire pel moment.",
"account.followers_counter": "{count, plural, one {{counter} Seguidor} other {{counter} Seguidors}}",
@@ -48,6 +50,7 @@
"account.mute_notifications_short": "Amudir las notificacions",
"account.mute_short": "Amudir",
"account.muted": "Mes en silenci",
+ "account.mutual": "Mutual",
"account.no_bio": "Cap de descripcion pas fornida.",
"account.open_original_page": "Dobrir la pagina d’origina",
"account.posts": "Tuts",
@@ -172,6 +175,7 @@
"conversation.mark_as_read": "Marcar coma legida",
"conversation.open": "Veire la conversacion",
"conversation.with": "Amb {names}",
+ "copy_icon_button.copied": "Copiat al quichapapièr",
"copypaste.copied": "Copiat",
"copypaste.copy_to_clipboard": "Copiar al quichapapièr",
"directory.federated": "Del fediverse conegut",
@@ -294,6 +298,8 @@
"keyboard_shortcuts.direct": "to open direct messages column",
"keyboard_shortcuts.down": "far davalar dins la lista",
"keyboard_shortcuts.enter": "dobrir los estatuts",
+ "keyboard_shortcuts.favourite": "Marcar coma favorit",
+ "keyboard_shortcuts.favourites": "Dobrir la lista dels favorits",
"keyboard_shortcuts.federated": "dobrir lo flux public global",
"keyboard_shortcuts.heading": "Acorchis clavièr",
"keyboard_shortcuts.home": "dobrir lo flux public local",
@@ -339,6 +345,7 @@
"lists.search": "Cercar demest lo mond que seguètz",
"lists.subheading": "Vòstras listas",
"load_pending": "{count, plural, one {# nòu element} other {# nòu elements}}",
+ "loading_indicator.label": "Cargament…",
"media_gallery.toggle_visible": "Modificar la visibilitat",
"mute_modal.duration": "Durada",
"mute_modal.hide_notifications": "Rescondre las notificacions d’aquesta persona ?",
@@ -371,6 +378,7 @@
"not_signed_in_indicator.not_signed_in": "Devètz vos connectar per accedir a aquesta ressorsa.",
"notification.admin.report": "{name} senhalèt {target}",
"notification.admin.sign_up": "{name} se marquèt",
+ "notification.favourite": "{name} a mes vòstre estatut en favorit",
"notification.follow": "{name} vos sèc",
"notification.follow_request": "{name} a demandat a vos sègre",
"notification.mention": "{name} vos a mencionat",
@@ -423,6 +431,8 @@
"onboarding.compose.template": "Adiu #Mastodon !",
"onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
"onboarding.follows.title": "Popular on Mastodon",
+ "onboarding.profile.display_name": "Nom d’afichatge",
+ "onboarding.profile.note": "Biografia",
"onboarding.share.title": "Partejar vòstre perfil",
"onboarding.start.lead": "Your new Mastodon account is ready to go. Here's how you can make the most of it:",
"onboarding.start.skip": "Want to skip right ahead?",
@@ -504,6 +514,7 @@
"report_notification.categories.spam": "Messatge indesirable",
"report_notification.categories.violation": "Violacion de las règlas",
"report_notification.open": "Dobrir lo senhalament",
+ "search.no_recent_searches": "Cap de recèrcas recentas",
"search.placeholder": "Recercar",
"search.search_or_paste": "Recercar o picar una URL",
"search_popout.language_code": "Còdi ISO de lenga",
@@ -536,6 +547,7 @@
"status.copy": "Copiar lo ligam de l’estatut",
"status.delete": "Escafar",
"status.detailed_status": "Vista detalhada de la convèrsa",
+ "status.direct": "Mencionar @{name} en privat",
"status.direct_indicator": "Mencion privada",
"status.edit": "Modificar",
"status.edited": "Modificat {date}",
@@ -626,6 +638,7 @@
"upload_modal.preview_label": "Apercebut ({ratio})",
"upload_progress.label": "Mandadís…",
"upload_progress.processing": "Tractament…",
+ "username.taken": "Aqueste nom d’utilizaire es pres. Ensajatz-ne un autre",
"video.close": "Tampar la vidèo",
"video.download": "Telecargar lo fichièr",
"video.exit_fullscreen": "Sortir plen ecran",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index 482cc8ee73..b8e18e1229 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -32,6 +32,7 @@
"account.featured_tags.last_status_never": "Sem publicações",
"account.featured_tags.title": "Hashtags em destaque de {name}",
"account.follow": "Seguir",
+ "account.follow_back": "Seguir de volta",
"account.followers": "Seguidores",
"account.followers.empty": "Nada aqui.",
"account.followers_counter": "{count, plural, one {{counter} seguidor} other {{counter} seguidores}}",
@@ -52,6 +53,7 @@
"account.mute_notifications_short": "Silenciar notificações",
"account.mute_short": "Silenciar",
"account.muted": "Silenciado",
+ "account.mutual": "Mútuo",
"account.no_bio": "Nenhuma descrição fornecida.",
"account.open_original_page": "Abrir a página original",
"account.posts": "Toots",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index b108e581a4..65f27ef061 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -314,7 +314,7 @@
"home.explore_prompt.body": "ฟีดหน้าแรกของคุณจะมีการผสมผสานของโพสต์จากแฮชแท็กที่คุณได้เลือกติดตาม, ผู้คนที่คุณได้เลือกติดตาม และโพสต์ที่เขาดัน หากนั่นรู้สึกเงียบเกินไป คุณอาจต้องการ:",
"home.explore_prompt.title": "นี่คือฐานหน้าแรกของคุณภายใน Mastodon",
"home.hide_announcements": "ซ่อนประกาศ",
- "home.pending_critical_update.body": "โปรดอัปเดตเซิร์ฟเวอร์ Mastodon ของคุณโดยเร็วที่สุดเท่าที่จะทำได้!",
+ "home.pending_critical_update.body": "โปรดอัปเดตเซิร์ฟเวอร์ Mastodon ของคุณโดยเร็วที่สุดเท่าที่จะเป็นไปได้!",
"home.pending_critical_update.link": "ดูการอัปเดต",
"home.pending_critical_update.title": "มีการอัปเดตความปลอดภัยสำคัญพร้อมใช้งาน!",
"home.show_announcements": "แสดงประกาศ",
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index 9de043bb20..c623caa3fb 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -358,7 +358,7 @@
"keyboard_shortcuts.my_profile": "mở hồ sơ của bạn",
"keyboard_shortcuts.notifications": "mở thông báo",
"keyboard_shortcuts.open_media": "mở ảnh hoặc video",
- "keyboard_shortcuts.pinned": "mở những tút đã ghim",
+ "keyboard_shortcuts.pinned": "Open pinned posts list",
"keyboard_shortcuts.profile": "mở trang của người đăng tút",
"keyboard_shortcuts.reply": "trả lời",
"keyboard_shortcuts.requests": "mở danh sách yêu cầu theo dõi",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index 9983936953..cc8b583120 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -48,7 +48,7 @@
"account.locked_info": "此帳號的隱私狀態設定為鎖定。該擁有者會手動審核能跟隨此帳號的人。",
"account.media": "媒體",
"account.mention": "提及 @{name}",
- "account.moved_to": "{name} 現在的新帳號為：",
+ "account.moved_to": "{name} 目前的新帳號為：",
"account.mute": "靜音 @{name}",
"account.mute_notifications_short": "靜音推播通知",
"account.mute_short": "靜音",
@@ -59,7 +59,7 @@
"account.posts": "嘟文",
"account.posts_with_replies": "嘟文與回覆",
"account.report": "檢舉 @{name}",
- "account.requested": "正在等待核准。按一下以取消跟隨請求",
+ "account.requested": "正在等候審核。按一下以取消跟隨請求",
"account.requested_follow": "{name} 要求跟隨您",
"account.share": "分享 @{name} 的個人檔案",
"account.show_reblogs": "顯示來自 @{name} 的嘟文",
@@ -84,7 +84,7 @@
"admin.impact_report.title": "影響總結",
"alert.rate_limited.message": "請於 {retry_time, time, medium} 後重試。",
"alert.rate_limited.title": "已限速",
- "alert.unexpected.message": "發生了非預期的錯誤。",
+ "alert.unexpected.message": "發生非預期的錯誤。",
"alert.unexpected.title": "哎呀！",
"announcement.announcement": "公告",
"attachments_list.unprocessed": "（未經處理）",
@@ -241,7 +241,7 @@
"empty_column.followed_tags": "您還沒有跟隨任何主題標籤。當您跟隨主題標籤時，它們將於此顯示。",
"empty_column.hashtag": "這個主題標籤下什麼也沒有。",
"empty_column.home": "您的首頁時間軸是空的！跟隨更多人來將它填滿吧！",
- "empty_column.list": "這份列表下什麼也沒有。當此列表的成員嘟出了新的嘟文時，它們將顯示於此。",
+ "empty_column.list": "這份列表下什麼也沒有。當此列表的成員嘟出新的嘟文時，它們將顯示於此。",
"empty_column.lists": "您還沒有建立任何列表。當您建立列表時，它將於此顯示。",
"empty_column.mutes": "您尚未靜音任何使用者。",
"empty_column.notifications": "您還沒有收到任何通知，當您與別人開始互動時，它將於此顯示。",
@@ -303,8 +303,8 @@
"hashtag.counter_by_accounts": "{count, plural, one {{counter} 名} other {{counter} 名}}參與者",
"hashtag.counter_by_uses": "{count, plural, one {{counter} 則} other {{counter} 則}}嘟文",
"hashtag.counter_by_uses_today": "本日有 {count, plural, one {{counter} 則} other {{counter} 則}}嘟文",
- "hashtag.follow": "追蹤主題標籤",
- "hashtag.unfollow": "取消追蹤主題標籤",
+ "hashtag.follow": "跟隨主題標籤",
+ "hashtag.unfollow": "取消跟隨主題標籤",
"hashtags.and_other": "…及其他 {count, plural, other {# 個}}",
"home.actions.go_to_explore": "看看發生什麼新鮮事",
"home.actions.go_to_suggestions": "尋找一些人來跟隨",
diff --git a/app/javascript/mastodon/store/typed_functions.ts b/app/javascript/mastodon/store/typed_functions.ts
index 46a10b8b47..4859b82651 100644
--- a/app/javascript/mastodon/store/typed_functions.ts
+++ b/app/javascript/mastodon/store/typed_functions.ts
@@ -1,12 +1,11 @@
import { createAsyncThunk } from '@reduxjs/toolkit';
-import type { TypedUseSelectorHook } from 'react-redux';
// eslint-disable-next-line @typescript-eslint/no-restricted-imports
import { useDispatch, useSelector } from 'react-redux';
import type { AppDispatch, RootState } from './store';
-export const useAppDispatch: () => AppDispatch = useDispatch;
-export const useAppSelector: TypedUseSelectorHook
= useSelector;
+export const useAppDispatch = useDispatch.withTypes();
+export const useAppSelector = useSelector.withTypes();
export const createAppAsyncThunk = createAsyncThunk.withTypes<{
state: RootState;
diff --git a/app/javascript/styles/mailer.scss b/app/javascript/styles/mailer.scss
index bd220bb1a8..a2cbb494b4 100644
--- a/app/javascript/styles/mailer.scss
+++ b/app/javascript/styles/mailer.scss
@@ -100,9 +100,8 @@ table + p {
border-top-right-radius: 12px;
height: 140px;
vertical-align: bottom;
- background-color: #f3f2f5;
- background-position: center;
- background-size: cover;
+ background-position: center !important;
+ background-size: cover !important;
}
.email-account-banner-inner-td {
diff --git a/app/javascript/styles/mastodon/containers.scss b/app/javascript/styles/mastodon/containers.scss
index 3d646da239..b6e995787d 100644
--- a/app/javascript/styles/mastodon/containers.scss
+++ b/app/javascript/styles/mastodon/containers.scss
@@ -104,3 +104,59 @@
margin-inline-start: 10px;
}
}
+
+.redirect {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ height: 100vh;
+ font-size: 14px;
+ line-height: 18px;
+
+ &__logo {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ margin-bottom: 30px;
+
+ img {
+ height: 48px;
+ }
+ }
+
+ &__message {
+ text-align: center;
+
+ h1 {
+ font-size: 17px;
+ line-height: 22px;
+ font-weight: 700;
+ margin-bottom: 30px;
+ }
+
+ p {
+ margin-bottom: 30px;
+
+ &:last-child {
+ margin-bottom: 0;
+ }
+ }
+
+ a {
+ color: $highlight-text-color;
+ font-weight: 500;
+ text-decoration: none;
+
+ &:hover,
+ &:focus,
+ &:active {
+ text-decoration: underline;
+ }
+ }
+ }
+
+ &__link {
+ margin-top: 15px;
+ }
+}
diff --git a/app/javascript/svg-icons/repeat_active.svg b/app/javascript/svg-icons/repeat_active.svg
new file mode 100644
index 0000000000..a5bbb8fc4f
--- /dev/null
+++ b/app/javascript/svg-icons/repeat_active.svg
@@ -0,0 +1,4 @@
+
diff --git a/app/javascript/svg-icons/repeat_disabled.svg b/app/javascript/svg-icons/repeat_disabled.svg
old mode 100755
new mode 100644
diff --git a/app/javascript/svg-icons/repeat_private.svg b/app/javascript/svg-icons/repeat_private.svg
old mode 100755
new mode 100644
diff --git a/app/javascript/svg-icons/repeat_private_active.svg b/app/javascript/svg-icons/repeat_private_active.svg
new file mode 100644
index 0000000000..cf2a05c84e
--- /dev/null
+++ b/app/javascript/svg-icons/repeat_private_active.svg
@@ -0,0 +1,6 @@
+
diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb
index 13df105537..2dfea37784 100644
--- a/app/lib/activitypub/activity/create.rb
+++ b/app/lib/activitypub/activity/create.rb
@@ -108,7 +108,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
end
def process_status_params
- @status_parser = ActivityPub::Parser::StatusParser.new(@json, followers_collection: @account.followers_url)
+ @status_parser = ActivityPub::Parser::StatusParser.new(@json, followers_collection: @account.followers_url, object: @object)
attachment_ids = process_attachments.take(4).map(&:id)
@@ -321,7 +321,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
already_voted = true
with_redis_lock("vote:#{replied_to_status.poll_id}:#{@account.id}") do
- already_voted = poll.votes.where(account: @account).exists?
+ already_voted = poll.votes.exists?(account: @account)
poll.votes.create!(account: @account, choice: poll.options.index(@object['name']), uri: object_uri)
end
@@ -407,7 +407,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
return false if local_usernames.empty?
- Account.local.where(username: local_usernames).exists?
+ Account.local.exists?(username: local_usernames)
end
def tombstone_exists?
diff --git a/app/lib/activitypub/parser/status_parser.rb b/app/lib/activitypub/parser/status_parser.rb
index 510f00f075..ea9b8a473c 100644
--- a/app/lib/activitypub/parser/status_parser.rb
+++ b/app/lib/activitypub/parser/status_parser.rb
@@ -4,12 +4,13 @@ class ActivityPub::Parser::StatusParser
include JsonLdHelper
# @param [Hash] json
- # @param [Hash] magic_values
- # @option magic_values [String] :followers_collection
- def initialize(json, magic_values = {})
- @json = json
- @object = json['object'] || json
- @magic_values = magic_values
+ # @param [Hash] options
+ # @option options [String] :followers_collection
+ # @option options [Hash] :object
+ def initialize(json, **options)
+ @json = json
+ @object = options[:object] || json['object'] || json
+ @options = options
end
def uri
@@ -78,7 +79,7 @@ class ActivityPub::Parser::StatusParser
:public
elsif audience_cc.any? { |cc| ActivityPub::TagManager.instance.public_collection?(cc) }
:unlisted
- elsif audience_to.include?(@magic_values[:followers_collection])
+ elsif audience_to.include?(@options[:followers_collection])
:private
elsif direct_message == false
:limited
diff --git a/app/lib/annual_report.rb b/app/lib/annual_report.rb
new file mode 100644
index 0000000000..cf4297f2a4
--- /dev/null
+++ b/app/lib/annual_report.rb
@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+class AnnualReport
+ include DatabaseHelper
+
+ SOURCES = [
+ AnnualReport::Archetype,
+ AnnualReport::TypeDistribution,
+ AnnualReport::TopStatuses,
+ AnnualReport::MostUsedApps,
+ AnnualReport::CommonlyInteractedWithAccounts,
+ AnnualReport::TimeSeries,
+ AnnualReport::TopHashtags,
+ AnnualReport::MostRebloggedAccounts,
+ AnnualReport::Percentiles,
+ ].freeze
+
+ SCHEMA = 1
+
+ def initialize(account, year)
+ @account = account
+ @year = year
+ end
+
+ def generate
+ return if GeneratedAnnualReport.exists?(account: @account, year: @year)
+
+ GeneratedAnnualReport.create(
+ account: @account,
+ year: @year,
+ schema_version: SCHEMA,
+ data: data
+ )
+ end
+
+ private
+
+ def data
+ with_read_replica do
+ SOURCES.each_with_object({}) { |klass, hsh| hsh.merge!(klass.new(@account, @year).generate) }
+ end
+ end
+end
diff --git a/app/lib/annual_report/archetype.rb b/app/lib/annual_report/archetype.rb
new file mode 100644
index 0000000000..ea9ef366df
--- /dev/null
+++ b/app/lib/annual_report/archetype.rb
@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+class AnnualReport::Archetype < AnnualReport::Source
+ # Average number of posts (including replies and reblogs) made by
+ # each active user in a single year (2023)
+ AVERAGE_PER_YEAR = 113
+
+ def generate
+ {
+ archetype: archetype,
+ }
+ end
+
+ private
+
+ def archetype
+ if (standalone_count + replies_count + reblogs_count) < AVERAGE_PER_YEAR
+ :lurker
+ elsif reblogs_count > (standalone_count * 2)
+ :booster
+ elsif polls_count > (standalone_count * 0.1) # standalone_count includes posts with polls
+ :pollster
+ elsif replies_count > (standalone_count * 2)
+ :replier
+ else
+ :oracle
+ end
+ end
+
+ def polls_count
+ @polls_count ||= base_scope.where.not(poll_id: nil).count
+ end
+
+ def reblogs_count
+ @reblogs_count ||= base_scope.where.not(reblog_of_id: nil).count
+ end
+
+ def replies_count
+ @replies_count ||= base_scope.where.not(in_reply_to_id: nil).where.not(in_reply_to_account_id: @account.id).count
+ end
+
+ def standalone_count
+ @standalone_count ||= base_scope.without_replies.without_reblogs.count
+ end
+
+ def base_scope
+ @account.statuses.where(id: year_as_snowflake_range)
+ end
+end
diff --git a/app/lib/annual_report/commonly_interacted_with_accounts.rb b/app/lib/annual_report/commonly_interacted_with_accounts.rb
new file mode 100644
index 0000000000..af5e854c22
--- /dev/null
+++ b/app/lib/annual_report/commonly_interacted_with_accounts.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class AnnualReport::CommonlyInteractedWithAccounts < AnnualReport::Source
+ SET_SIZE = 40
+
+ def generate
+ {
+ commonly_interacted_with_accounts: commonly_interacted_with_accounts.map do |(account_id, count)|
+ {
+ account_id: account_id,
+ count: count,
+ }
+ end,
+ }
+ end
+
+ private
+
+ def commonly_interacted_with_accounts
+ @account.statuses.reorder(nil).where(id: year_as_snowflake_range).where.not(in_reply_to_account_id: @account.id).group(:in_reply_to_account_id).having('count(*) > 1').order(total: :desc).limit(SET_SIZE).pluck(Arel.sql('in_reply_to_account_id, count(*) AS total'))
+ end
+end
diff --git a/app/lib/annual_report/most_reblogged_accounts.rb b/app/lib/annual_report/most_reblogged_accounts.rb
new file mode 100644
index 0000000000..e3e8a7c90b
--- /dev/null
+++ b/app/lib/annual_report/most_reblogged_accounts.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class AnnualReport::MostRebloggedAccounts < AnnualReport::Source
+ SET_SIZE = 10
+
+ def generate
+ {
+ most_reblogged_accounts: most_reblogged_accounts.map do |(account_id, count)|
+ {
+ account_id: account_id,
+ count: count,
+ }
+ end,
+ }
+ end
+
+ private
+
+ def most_reblogged_accounts
+ @account.statuses.reorder(nil).where(id: year_as_snowflake_range).where.not(reblog_of_id: nil).joins(reblog: :account).group('accounts.id').having('count(*) > 1').order(total: :desc).limit(SET_SIZE).pluck(Arel.sql('accounts.id, count(*) as total'))
+ end
+end
diff --git a/app/lib/annual_report/most_used_apps.rb b/app/lib/annual_report/most_used_apps.rb
new file mode 100644
index 0000000000..85ff1ff86e
--- /dev/null
+++ b/app/lib/annual_report/most_used_apps.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class AnnualReport::MostUsedApps < AnnualReport::Source
+ SET_SIZE = 10
+
+ def generate
+ {
+ most_used_apps: most_used_apps.map do |(name, count)|
+ {
+ name: name,
+ count: count,
+ }
+ end,
+ }
+ end
+
+ private
+
+ def most_used_apps
+ @account.statuses.reorder(nil).where(id: year_as_snowflake_range).joins(:application).group('oauth_applications.name').order(total: :desc).limit(SET_SIZE).pluck(Arel.sql('oauth_applications.name, count(*) as total'))
+ end
+end
diff --git a/app/lib/annual_report/percentiles.rb b/app/lib/annual_report/percentiles.rb
new file mode 100644
index 0000000000..9fe4698ee5
--- /dev/null
+++ b/app/lib/annual_report/percentiles.rb
@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+class AnnualReport::Percentiles < AnnualReport::Source
+ def generate
+ {
+ percentiles: {
+ followers: (total_with_fewer_followers / (total_with_any_followers + 1.0)) * 100,
+ statuses: (total_with_fewer_statuses / (total_with_any_statuses + 1.0)) * 100,
+ },
+ }
+ end
+
+ private
+
+ def followers_gained
+ @followers_gained ||= @account.passive_relationships.where("date_part('year', follows.created_at) = ?", @year).count
+ end
+
+ def statuses_created
+ @statuses_created ||= @account.statuses.where(id: year_as_snowflake_range).count
+ end
+
+ def total_with_fewer_followers
+ @total_with_fewer_followers ||= Follow.find_by_sql([<<~SQL.squish, { year: @year, comparison: followers_gained }]).first.total
+ WITH tmp0 AS (
+ SELECT follows.target_account_id
+ FROM follows
+ INNER JOIN accounts ON accounts.id = follows.target_account_id
+ WHERE date_part('year', follows.created_at) = :year
+ AND accounts.domain IS NULL
+ GROUP BY follows.target_account_id
+ HAVING COUNT(*) < :comparison
+ )
+ SELECT count(*) AS total
+ FROM tmp0
+ SQL
+ end
+
+ def total_with_fewer_statuses
+ @total_with_fewer_statuses ||= Status.find_by_sql([<<~SQL.squish, { comparison: statuses_created, min_id: year_as_snowflake_range.first, max_id: year_as_snowflake_range.last }]).first.total
+ WITH tmp0 AS (
+ SELECT statuses.account_id
+ FROM statuses
+ INNER JOIN accounts ON accounts.id = statuses.account_id
+ WHERE statuses.id BETWEEN :min_id AND :max_id
+ AND accounts.domain IS NULL
+ GROUP BY statuses.account_id
+ HAVING count(*) < :comparison
+ )
+ SELECT count(*) AS total
+ FROM tmp0
+ SQL
+ end
+
+ def total_with_any_followers
+ @total_with_any_followers ||= Follow.where("date_part('year', follows.created_at) = ?", @year).joins(:target_account).merge(Account.local).count('distinct follows.target_account_id')
+ end
+
+ def total_with_any_statuses
+ @total_with_any_statuses ||= Status.where(id: year_as_snowflake_range).joins(:account).merge(Account.local).count('distinct statuses.account_id')
+ end
+end
diff --git a/app/lib/annual_report/source.rb b/app/lib/annual_report/source.rb
new file mode 100644
index 0000000000..1ccb622676
--- /dev/null
+++ b/app/lib/annual_report/source.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class AnnualReport::Source
+ attr_reader :account, :year
+
+ def initialize(account, year)
+ @account = account
+ @year = year
+ end
+
+ protected
+
+ def year_as_snowflake_range
+ (Mastodon::Snowflake.id_at(DateTime.new(year, 1, 1))..Mastodon::Snowflake.id_at(DateTime.new(year, 12, 31)))
+ end
+end
diff --git a/app/lib/annual_report/time_series.rb b/app/lib/annual_report/time_series.rb
new file mode 100644
index 0000000000..a144bac0d1
--- /dev/null
+++ b/app/lib/annual_report/time_series.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+class AnnualReport::TimeSeries < AnnualReport::Source
+ def generate
+ {
+ time_series: (1..12).map do |month|
+ {
+ month: month,
+ statuses: statuses_per_month[month] || 0,
+ following: following_per_month[month] || 0,
+ followers: followers_per_month[month] || 0,
+ }
+ end,
+ }
+ end
+
+ private
+
+ def statuses_per_month
+ @statuses_per_month ||= @account.statuses.reorder(nil).where(id: year_as_snowflake_range).group(:period).pluck(Arel.sql("date_part('month', created_at)::int AS period, count(*)")).to_h
+ end
+
+ def following_per_month
+ @following_per_month ||= @account.active_relationships.where("date_part('year', created_at) = ?", @year).group(:period).pluck(Arel.sql("date_part('month', created_at)::int AS period, count(*)")).to_h
+ end
+
+ def followers_per_month
+ @followers_per_month ||= @account.passive_relationships.where("date_part('year', created_at) = ?", @year).group(:period).pluck(Arel.sql("date_part('month', created_at)::int AS period, count(*)")).to_h
+ end
+end
diff --git a/app/lib/annual_report/top_hashtags.rb b/app/lib/annual_report/top_hashtags.rb
new file mode 100644
index 0000000000..488dacb1b4
--- /dev/null
+++ b/app/lib/annual_report/top_hashtags.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class AnnualReport::TopHashtags < AnnualReport::Source
+ SET_SIZE = 40
+
+ def generate
+ {
+ top_hashtags: top_hashtags.map do |(name, count)|
+ {
+ name: name,
+ count: count,
+ }
+ end,
+ }
+ end
+
+ private
+
+ def top_hashtags
+ Tag.joins(:statuses).where(statuses: { id: @account.statuses.where(id: year_as_snowflake_range).reorder(nil).select(:id) }).group(:id).having('count(*) > 1').order(total: :desc).limit(SET_SIZE).pluck(Arel.sql('COALESCE(tags.display_name, tags.name), count(*) AS total'))
+ end
+end
diff --git a/app/lib/annual_report/top_statuses.rb b/app/lib/annual_report/top_statuses.rb
new file mode 100644
index 0000000000..112e5591ce
--- /dev/null
+++ b/app/lib/annual_report/top_statuses.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class AnnualReport::TopStatuses < AnnualReport::Source
+ def generate
+ top_reblogs = base_scope.order(reblogs_count: :desc).first&.id
+ top_favourites = base_scope.where.not(id: top_reblogs).order(favourites_count: :desc).first&.id
+ top_replies = base_scope.where.not(id: [top_reblogs, top_favourites]).order(replies_count: :desc).first&.id
+
+ {
+ top_statuses: {
+ by_reblogs: top_reblogs,
+ by_favourites: top_favourites,
+ by_replies: top_replies,
+ },
+ }
+ end
+
+ def base_scope
+ @account.statuses.with_public_visibility.joins(:status_stat).where(id: year_as_snowflake_range).reorder(nil)
+ end
+end
diff --git a/app/lib/annual_report/type_distribution.rb b/app/lib/annual_report/type_distribution.rb
new file mode 100644
index 0000000000..fc12a6f1f4
--- /dev/null
+++ b/app/lib/annual_report/type_distribution.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class AnnualReport::TypeDistribution < AnnualReport::Source
+ def generate
+ {
+ type_distribution: {
+ total: base_scope.count,
+ reblogs: base_scope.where.not(reblog_of_id: nil).count,
+ replies: base_scope.where.not(in_reply_to_id: nil).where.not(in_reply_to_account_id: @account.id).count,
+ standalone: base_scope.without_replies.without_reblogs.count,
+ },
+ }
+ end
+
+ private
+
+ def base_scope
+ @account.statuses.where(id: year_as_snowflake_range)
+ end
+end
diff --git a/app/lib/delivery_failure_tracker.rb b/app/lib/delivery_failure_tracker.rb
index d938269829..e17b45d667 100644
--- a/app/lib/delivery_failure_tracker.rb
+++ b/app/lib/delivery_failure_tracker.rb
@@ -28,7 +28,7 @@ class DeliveryFailureTracker
end
def available?
- !UnavailableDomain.where(domain: @host).exists?
+ !UnavailableDomain.exists?(domain: @host)
end
def exhausted_deliveries_days
diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb
index a7b8456918..cdf4cdd228 100644
--- a/app/lib/feed_manager.rb
+++ b/app/lib/feed_manager.rb
@@ -470,8 +470,8 @@ class FeedManager
check_for_blocks = status.active_mentions.pluck(:account_id)
check_for_blocks.push(status.in_reply_to_account) if status.reply? && !status.in_reply_to_account_id.nil?
- should_filter = blocks_or_mutes?(receiver_id, check_for_blocks, :mentions) # Filter if it's from someone I blocked, in reply to someone I blocked, or mentioning someone I blocked (or muted)
- should_filter ||= status.account.silenced? && !Follow.where(account_id: receiver_id, target_account_id: status.account_id).exists? # of if the account is silenced and I'm not following them
+ should_filter = blocks_or_mutes?(receiver_id, check_for_blocks, :mentions) # Filter if it's from someone I blocked, in reply to someone I blocked, or mentioning someone I blocked (or muted)
+ should_filter ||= status.account.silenced? && !Follow.exists?(account_id: receiver_id, target_account_id: status.account_id) # Filter if the account is silenced and I'm not following them
should_filter
end
@@ -494,7 +494,7 @@ class FeedManager
if status.reply? && status.in_reply_to_account_id != status.account_id
should_filter = status.in_reply_to_account_id != list.account_id
should_filter &&= !list.show_followed?
- should_filter &&= !(list.show_list? && ListAccount.where(list_id: list.id, account_id: status.in_reply_to_account_id).exists?)
+ should_filter &&= !(list.show_list? && ListAccount.exists?(list_id: list.id, account_id: status.in_reply_to_account_id))
return !!should_filter
end
diff --git a/app/lib/permalink_redirector.rb b/app/lib/permalink_redirector.rb
index 0dd37483e2..f551f69db8 100644
--- a/app/lib/permalink_redirector.rb
+++ b/app/lib/permalink_redirector.rb
@@ -5,17 +5,46 @@ class PermalinkRedirector
def initialize(path)
@path = path
+ @object = nil
+ end
+
+ def object
+ @object ||= begin
+ if at_username_status_request? || statuses_status_request?
+ status = Status.find_by(id: second_segment)
+ status if status&.distributable? && !status&.local?
+ elsif at_username_request?
+ username, domain = first_segment.delete_prefix('@').split('@')
+ domain = nil if TagManager.instance.local_domain?(domain)
+ account = Account.find_remote(username, domain)
+ account unless account&.local?
+ elsif accounts_request? && record_integer_id_request?
+ account = Account.find_by(id: second_segment)
+ account unless account&.local?
+ end
+ end
end
def redirect_path
- if at_username_status_request? || statuses_status_request?
- find_status_url_by_id(second_segment)
- elsif at_username_request?
- find_account_url_by_name(first_segment)
- elsif accounts_request? && record_integer_id_request?
- find_account_url_by_id(second_segment)
- elsif @path.start_with?('/deck')
- @path.delete_prefix('/deck')
+ return ActivityPub::TagManager.instance.url_for(object) if object.present?
+
+ @path.delete_prefix('/deck') if @path.start_with?('/deck')
+ end
+
+ def redirect_uri
+ return ActivityPub::TagManager.instance.uri_for(object) if object.present?
+
+ @path.delete_prefix('/deck') if @path.start_with?('/deck')
+ end
+
+ def redirect_confirmation_path
+ case object.class.name
+ when 'Account'
+ redirect_account_path(object.id)
+ when 'Status'
+ redirect_status_path(object.id)
+ else
+ @path.delete_prefix('/deck') if @path.start_with?('/deck')
end
end
@@ -56,22 +85,4 @@ class PermalinkRedirector
def path_segments
@path_segments ||= @path.delete_prefix('/deck').delete_prefix('/').split('/')
end
-
- def find_status_url_by_id(id)
- status = Status.find_by(id: id)
- ActivityPub::TagManager.instance.url_for(status) if status&.distributable? && !status.account.local?
- end
-
- def find_account_url_by_id(id)
- account = Account.find_by(id: id)
- ActivityPub::TagManager.instance.url_for(account) if account.present? && !account.local?
- end
-
- def find_account_url_by_name(name)
- username, domain = name.gsub(/\A@/, '').split('@')
- domain = nil if TagManager.instance.local_domain?(domain)
- account = Account.find_remote(username, domain)
-
- ActivityPub::TagManager.instance.url_for(account) if account.present? && !account.local?
- end
end
diff --git a/app/lib/status_cache_hydrator.rb b/app/lib/status_cache_hydrator.rb
index 45b50cb379..34f6199ec0 100644
--- a/app/lib/status_cache_hydrator.rb
+++ b/app/lib/status_cache_hydrator.rb
@@ -26,11 +26,11 @@ class StatusCacheHydrator
def hydrate_non_reblog_payload(empty_payload, account_id)
empty_payload.tap do |payload|
- payload[:favourited] = Favourite.where(account_id: account_id, status_id: @status.id).exists?
- payload[:reblogged] = Status.where(account_id: account_id, reblog_of_id: @status.id).exists?
- payload[:muted] = ConversationMute.where(account_id: account_id, conversation_id: @status.conversation_id).exists?
- payload[:bookmarked] = Bookmark.where(account_id: account_id, status_id: @status.id).exists?
- payload[:pinned] = StatusPin.where(account_id: account_id, status_id: @status.id).exists? if @status.account_id == account_id
+ payload[:favourited] = Favourite.exists?(account_id: account_id, status_id: @status.id)
+ payload[:reblogged] = Status.exists?(account_id: account_id, reblog_of_id: @status.id)
+ payload[:muted] = ConversationMute.exists?(account_id: account_id, conversation_id: @status.conversation_id)
+ payload[:bookmarked] = Bookmark.exists?(account_id: account_id, status_id: @status.id)
+ payload[:pinned] = StatusPin.exists?(account_id: account_id, status_id: @status.id) if @status.account_id == account_id
payload[:filtered] = mapped_applied_custom_filter(account_id, @status)
if payload[:poll]
@@ -51,11 +51,11 @@ class StatusCacheHydrator
# used to create the status, we need to hydrate it here too
payload[:reblog][:application] = payload_reblog_application if payload[:reblog][:application].nil? && @status.reblog.account_id == account_id
- payload[:reblog][:favourited] = Favourite.where(account_id: account_id, status_id: @status.reblog_of_id).exists?
- payload[:reblog][:reblogged] = Status.where(account_id: account_id, reblog_of_id: @status.reblog_of_id).exists?
- payload[:reblog][:muted] = ConversationMute.where(account_id: account_id, conversation_id: @status.reblog.conversation_id).exists?
- payload[:reblog][:bookmarked] = Bookmark.where(account_id: account_id, status_id: @status.reblog_of_id).exists?
- payload[:reblog][:pinned] = StatusPin.where(account_id: account_id, status_id: @status.reblog_of_id).exists? if @status.reblog.account_id == account_id
+ payload[:reblog][:favourited] = Favourite.exists?(account_id: account_id, status_id: @status.reblog_of_id)
+ payload[:reblog][:reblogged] = Status.exists?(account_id: account_id, reblog_of_id: @status.reblog_of_id)
+ payload[:reblog][:muted] = ConversationMute.exists?(account_id: account_id, conversation_id: @status.reblog.conversation_id)
+ payload[:reblog][:bookmarked] = Bookmark.exists?(account_id: account_id, status_id: @status.reblog_of_id)
+ payload[:reblog][:pinned] = StatusPin.exists?(account_id: account_id, status_id: @status.reblog_of_id) if @status.reblog.account_id == account_id
payload[:reblog][:filtered] = payload[:filtered]
if payload[:reblog][:poll]
diff --git a/app/lib/suspicious_sign_in_detector.rb b/app/lib/suspicious_sign_in_detector.rb
index 1af5188c65..74f49aa558 100644
--- a/app/lib/suspicious_sign_in_detector.rb
+++ b/app/lib/suspicious_sign_in_detector.rb
@@ -19,7 +19,7 @@ class SuspiciousSignInDetector
end
def previously_seen_ip?(request)
- @user.ips.where('ip <<= ?', masked_ip(request)).exists?
+ @user.ips.exists?(['ip <<= ?', masked_ip(request)])
end
def freshly_signed_up?
diff --git a/app/lib/vacuum/media_attachments_vacuum.rb b/app/lib/vacuum/media_attachments_vacuum.rb
index ab7ea4092f..e558195290 100644
--- a/app/lib/vacuum/media_attachments_vacuum.rb
+++ b/app/lib/vacuum/media_attachments_vacuum.rb
@@ -27,11 +27,17 @@ class Vacuum::MediaAttachmentsVacuum
end
def media_attachments_past_retention_period
- MediaAttachment.remote.cached.where(MediaAttachment.arel_table[:created_at].lt(@retention_period.ago)).where(MediaAttachment.arel_table[:updated_at].lt(@retention_period.ago))
+ MediaAttachment
+ .remote
+ .cached
+ .created_before(@retention_period.ago)
+ .updated_before(@retention_period.ago)
end
def orphaned_media_attachments
- MediaAttachment.unattached.where(MediaAttachment.arel_table[:created_at].lt(TTL.ago))
+ MediaAttachment
+ .unattached
+ .created_before(TTL.ago)
end
def retention_period?
diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
index 432b851b5e..3b1a085cb8 100644
--- a/app/mailers/user_mailer.rb
+++ b/app/mailers/user_mailer.rb
@@ -191,6 +191,18 @@ class UserMailer < Devise::Mailer
end
end
+ def failed_2fa(user, remote_ip, user_agent, timestamp)
+ @resource = user
+ @remote_ip = remote_ip
+ @user_agent = user_agent
+ @detection = Browser.new(user_agent)
+ @timestamp = timestamp.to_time.utc
+
+ I18n.with_locale(locale) do
+ mail subject: default_i18n_subject
+ end
+ end
+
private
def default_devise_subject
diff --git a/app/models/account.rb b/app/models/account.rb
index 337bb4a0a3..ed8c606083 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -127,9 +127,11 @@ class Account < ApplicationRecord
scope :bots, -> { where(actor_type: %w(Application Service)) }
scope :groups, -> { where(actor_type: 'Group') }
scope :alphabetic, -> { order(domain: :asc, username: :asc) }
+ scope :matches_uri_prefix, ->(value) { where(arel_table[:uri].matches("#{sanitize_sql_like(value)}/%", false, true)).or(where(uri: value)) }
scope :matches_username, ->(value) { where('lower((username)::text) LIKE lower(?)', "#{value}%") }
scope :matches_display_name, ->(value) { where(arel_table[:display_name].matches("#{value}%")) }
scope :without_unapproved, -> { left_outer_joins(:user).merge(User.approved.confirmed).or(remote) }
+ scope :auditable, -> { where(id: Admin::ActionLog.select(:account_id).distinct) }
scope :searchable, -> { without_unapproved.without_suspended.where(moved_to_account_id: nil) }
scope :discoverable, -> { searchable.without_silenced.where(discoverable: true).joins(:account_stat) }
scope :by_recent_status, -> { includes(:account_stat).merge(AccountStat.order('last_status_at DESC NULLS LAST')).references(:account_stat) }
diff --git a/app/models/account_suggestions.rb b/app/models/account_suggestions.rb
index d62176c7ca..25c8b04d50 100644
--- a/app/models/account_suggestions.rb
+++ b/app/models/account_suggestions.rb
@@ -29,7 +29,7 @@ class AccountSuggestions
# a complicated query on this end.
account_ids = account_ids_with_sources[offset, limit]
- accounts_map = Account.where(id: account_ids.map(&:first)).includes(:account_stat).index_by(&:id)
+ accounts_map = Account.where(id: account_ids.map(&:first)).includes(:account_stat, :user).index_by(&:id)
account_ids.filter_map do |(account_id, source)|
next unless accounts_map.key?(account_id)
diff --git a/app/models/account_summary.rb b/app/models/account_summary.rb
index 0d8835b83c..2a21d09a8b 100644
--- a/app/models/account_summary.rb
+++ b/app/models/account_summary.rb
@@ -12,9 +12,11 @@
class AccountSummary < ApplicationRecord
self.primary_key = :account_id
+ has_many :follow_recommendation_suppressions, primary_key: :account_id, foreign_key: :account_id, inverse_of: false
+
scope :safe, -> { where(sensitive: false) }
scope :localized, ->(locale) { where(language: locale) }
- scope :filtered, -> { joins(arel_table.join(FollowRecommendationSuppression.arel_table, Arel::Nodes::OuterJoin).on(arel_table[:account_id].eq(FollowRecommendationSuppression.arel_table[:account_id])).join_sources).where(FollowRecommendationSuppression.arel_table[:id].eq(nil)) }
+ scope :filtered, -> { where.missing(:follow_recommendation_suppressions) }
def self.refresh
Scenic.database.refresh_materialized_view(table_name, concurrently: false, cascade: false)
diff --git a/app/models/admin/action_log_filter.rb b/app/models/admin/action_log_filter.rb
index d413cb386d..f581af74e8 100644
--- a/app/models/admin/action_log_filter.rb
+++ b/app/models/admin/action_log_filter.rb
@@ -72,7 +72,7 @@ class Admin::ActionLogFilter
end
def results
- scope = latest_action_logs.includes(:target)
+ scope = latest_action_logs.includes(:target, :account)
params.each do |key, value|
next if key.to_s == 'page'
diff --git a/app/models/custom_filter.rb b/app/models/custom_filter.rb
index 371267fc28..c8120c2395 100644
--- a/app/models/custom_filter.rb
+++ b/app/models/custom_filter.rb
@@ -68,16 +68,7 @@ class CustomFilter < ApplicationRecord
scope = CustomFilterKeyword.includes(:custom_filter).where(custom_filter: { account_id: account_id }).where(Arel.sql('expires_at IS NULL OR expires_at > NOW()'))
scope.to_a.group_by(&:custom_filter).each do |filter, keywords|
- keywords.map! do |keyword|
- if keyword.whole_word
- sb = /\A[[:word:]]/.match?(keyword.keyword) ? '\b' : ''
- eb = /[[:word:]]\z/.match?(keyword.keyword) ? '\b' : ''
-
- /(?mix:#{sb}#{Regexp.escape(keyword.keyword)}#{eb})/
- else
- /#{Regexp.escape(keyword.keyword)}/i
- end
- end
+ keywords.map!(&:to_regex)
filters_hash[filter.id] = { keywords: Regexp.union(keywords), filter: filter }
end.to_h
diff --git a/app/models/custom_filter_keyword.rb b/app/models/custom_filter_keyword.rb
index 3158b3b79a..979d0b822e 100644
--- a/app/models/custom_filter_keyword.rb
+++ b/app/models/custom_filter_keyword.rb
@@ -23,8 +23,24 @@ class CustomFilterKeyword < ApplicationRecord
before_destroy :prepare_cache_invalidation!
after_commit :invalidate_cache!
+ def to_regex
+ if whole_word?
+ /(?mix:#{to_regex_sb}#{Regexp.escape(keyword)}#{to_regex_eb})/
+ else
+ /#{Regexp.escape(keyword)}/i
+ end
+ end
+
private
+ def to_regex_sb
+ /\A[[:word:]]/.match?(keyword) ? '\b' : ''
+ end
+
+ def to_regex_eb
+ /[[:word:]]\z/.match?(keyword) ? '\b' : ''
+ end
+
def prepare_cache_invalidation!
custom_filter.prepare_cache_invalidation!
end
diff --git a/app/models/generated_annual_report.rb b/app/models/generated_annual_report.rb
new file mode 100644
index 0000000000..43c97d7108
--- /dev/null
+++ b/app/models/generated_annual_report.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: generated_annual_reports
+#
+# id :bigint(8) not null, primary key
+# account_id :bigint(8) not null
+# year :integer not null
+# data :jsonb not null
+# schema_version :integer not null
+# viewed_at :datetime
+# created_at :datetime not null
+# updated_at :datetime not null
+#
+
+class GeneratedAnnualReport < ApplicationRecord
+ belongs_to :account
+
+ scope :pending, -> { where(viewed_at: nil) }
+
+ def viewed?
+ viewed_at.present?
+ end
+
+ def view!
+ update!(viewed_at: Time.now.utc)
+ end
+
+ def account_ids
+ data['most_reblogged_accounts'].pluck('account_id') + data['commonly_interacted_with_accounts'].pluck('account_id')
+ end
+
+ def status_ids
+ data['top_statuses'].values
+ end
+end
diff --git a/app/models/instance.rb b/app/models/instance.rb
index 8f8d87c62a..0fd31c8097 100644
--- a/app/models/instance.rb
+++ b/app/models/instance.rb
@@ -13,23 +13,37 @@ class Instance < ApplicationRecord
attr_accessor :failure_days
- has_many :accounts, foreign_key: :domain, primary_key: :domain, inverse_of: false
-
with_options foreign_key: :domain, primary_key: :domain, inverse_of: false do
belongs_to :domain_block
belongs_to :domain_allow
- belongs_to :unavailable_domain # skipcq: RB-RL1031
+ belongs_to :unavailable_domain
+
+ has_many :accounts, dependent: nil
end
scope :searchable, -> { where.not(domain: DomainBlock.select(:domain)) }
scope :matches_domain, ->(value) { where(arel_table[:domain].matches("%#{value}%")) }
scope :domain_starts_with, ->(value) { where(arel_table[:domain].matches("#{sanitize_sql_like(value)}%", false, true)) }
scope :by_domain_and_subdomains, ->(domain) { where("reverse('.' || domain) LIKE reverse(?)", "%.#{domain}") }
+ scope :with_domain_follows, ->(domains) { where(domain: domains).where(domain_account_follows) }
def self.refresh
Scenic.database.refresh_materialized_view(table_name, concurrently: true, cascade: false)
end
+ def self.domain_account_follows
+ Arel.sql(
+ <<~SQL.squish
+ EXISTS (
+ SELECT 1
+ FROM follows
+ JOIN accounts ON follows.account_id = accounts.id OR follows.target_account_id = accounts.id
+ WHERE accounts.domain = instances.domain
+ )
+ SQL
+ )
+ end
+
def readonly?
true
end
diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb
index bdd40a20c2..21c1aeb52b 100644
--- a/app/models/media_attachment.rb
+++ b/app/models/media_attachment.rb
@@ -204,12 +204,14 @@ class MediaAttachment < ApplicationRecord
validates :file, presence: true, if: :local?
validates :thumbnail, absence: true, if: -> { local? && !audio_or_video? }
- scope :attached, -> { where.not(status_id: nil).or(where.not(scheduled_status_id: nil)) }
- scope :cached, -> { remote.where.not(file_file_name: nil) }
- scope :local, -> { where(remote_url: '') }
- scope :ordered, -> { order(id: :asc) }
- scope :remote, -> { where.not(remote_url: '') }
+ scope :attached, -> { where.not(status_id: nil).or(where.not(scheduled_status_id: nil)) }
+ scope :cached, -> { remote.where.not(file_file_name: nil) }
+ scope :created_before, ->(value) { where(arel_table[:created_at].lt(value)) }
+ scope :local, -> { where(remote_url: '') }
+ scope :ordered, -> { order(id: :asc) }
+ scope :remote, -> { where.not(remote_url: '') }
scope :unattached, -> { where(status_id: nil, scheduled_status_id: nil) }
+ scope :updated_before, ->(value) { where(arel_table[:updated_at].lt(value)) }
attr_accessor :skip_download
diff --git a/app/models/poll.rb b/app/models/poll.rb
index 37149c3d86..cc4184f80a 100644
--- a/app/models/poll.rb
+++ b/app/models/poll.rb
@@ -57,7 +57,7 @@ class Poll < ApplicationRecord
end
def voted?(account)
- account.id == account_id || votes.where(account: account).exists?
+ account.id == account_id || votes.exists?(account: account)
end
def own_votes(account)
diff --git a/app/models/privacy_policy.rb b/app/models/privacy_policy.rb
index 36cbf18822..c0d6e1b76d 100644
--- a/app/models/privacy_policy.rb
+++ b/app/models/privacy_policy.rb
@@ -1,66 +1,7 @@
# frozen_string_literal: true
class PrivacyPolicy < ActiveModelSerializers::Model
- DEFAULT_PRIVACY_POLICY = <<~TXT
- This privacy policy describes how %{domain} ("%{domain}", "we", "us") collects, protects and uses the personally identifiable information you may provide through the %{domain} website or its API. The policy also describes the choices available to you regarding our use of your personal information and how you can access and update this information. This policy does not apply to the practices of companies that %{domain} does not own or control, or to individuals that %{domain} does not employ or manage.
-
- # What information do we collect?
-
- - **Basic account information**: If you register on this server, you may be asked to enter a username, an e-mail address and a password. You may also enter additional profile information such as a display name and biography, and upload a profile picture and header image. The username, display name, biography, profile picture and header image are always listed publicly.
- - **Posts, following and other public information**: The list of people you follow is listed publicly, the same is true for your followers. When you submit a message, the date and time is stored as well as the application you submitted the message from. Messages may contain media attachments, such as pictures and videos. Public and unlisted posts are available publicly. When you feature a post on your profile, that is also publicly available information. Your posts are delivered to your followers, in some cases it means they are delivered to different servers and copies are stored there. When you delete posts, this is likewise delivered to your followers. The action of reblogging or favouriting another post is always public.
- - **Direct and followers-only posts**: All posts are stored and processed on the server. Followers-only posts are delivered to your followers and users who are mentioned in them, and direct posts are delivered only to users mentioned in them. In some cases it means they are delivered to different servers and copies are stored there. We make a good faith effort to limit the access to those posts only to authorized persons, but other servers may fail to do so. Therefore it's important to review servers your followers belong to. You may toggle an option to approve and reject new followers manually in the settings. **Please keep in mind that the operators of the server and any receiving server may view such messages**, and that recipients may screenshot, copy or otherwise re-share them. **Do not share any sensitive information over Mastodon.**
- - **IPs and other metadata**: When you log in, we record the IP address you log in from, as well as the name of your browser application. All the logged in sessions are available for your review and revocation in the settings. The latest IP address used is stored for up to 12 months. We also may retain server logs which include the IP address of every request to our server.
-
- # What do we use your information for?
-
- Any of the information we collect from you may be used in the following ways:
-
- - To provide the core functionality of Mastodon. You can only interact with other people's content and post your own content when you are logged in. For example, you may follow other people to view their combined posts in your own personalized home timeline.
- - To aid moderation of the community, for example comparing your IP address with other known ones to determine ban evasion or other violations.
- - The email address you provide may be used to send you information, notifications about other people interacting with your content or sending you messages, and to respond to inquiries, and/or other requests or questions.
-
- # How do we protect your information?
-
- We implement a variety of security measures to maintain the safety of your personal information when you enter, submit, or access your personal information. Among other things, your browser session, as well as the traffic between your applications and the API, are secured with SSL, and your password is hashed using a strong one-way algorithm. You may enable two-factor authentication to further secure access to your account.
-
- # What is our data retention policy?
-
- We will make a good faith effort to:
-
- - Retain server logs containing the IP address of all requests to this server, in so far as such logs are kept, no more than 90 days.
- - Retain the IP addresses associated with registered users no more than 12 months.
-
- You can request and download an archive of your content, including your posts, media attachments, profile picture, and header image.
-
- You may irreversibly delete your account at any time.
-
- # Do we use cookies?
-
- Yes. Cookies are small files that a site or its service provider transfers to your computer's hard drive through your Web browser (if you allow). These cookies enable the site to recognize your browser and, if you have a registered account, associate it with your registered account.
-
- We use cookies to understand and save your preferences for future visits.
-
- # Do we disclose any information to outside parties?
-
- We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This does not include trusted third parties who assist us in operating our site, conducting our business, or servicing you, so long as those parties agree to keep this information confidential. We may also release your information when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or others rights, property, or safety.
-
- Your public content may be downloaded by other servers in the network. Your public and followers-only posts are delivered to the servers where your followers reside, and direct messages are delivered to the servers of the recipients, in so far as those followers or recipients reside on a different server than this.
-
- When you authorize an application to use your account, depending on the scope of permissions you approve, it may access your public profile information, your following list, your followers, your lists, all your posts, and your favourites. Applications can never access your e-mail address or password.
-
- # Site usage by children
-
- If this server is in the EU or the EEA: Our site, products and services are all directed to people who are at least 16 years old. If you are under the age of 16, per the requirements of the GDPR (General Data Protection Regulation) do not use this site.
-
- If this server is in the USA: Our site, products and services are all directed to people who are at least 13 years old. If you are under the age of 13, per the requirements of COPPA (Children's Online Privacy Protection Act) do not use this site.
-
- Law requirements can be different if this server is in another jurisdiction.
-
- ___
-
- This document is CC-BY-SA. Originally adapted from the [Discourse privacy policy](https://github.com/discourse/discourse).
- TXT
-
+ DEFAULT_PRIVACY_POLICY = Rails.root.join('config', 'templates', 'privacy-policy.md').read
DEFAULT_UPDATED_AT = DateTime.new(2022, 10, 7).freeze
attributes :updated_at, :text
diff --git a/app/models/report.rb b/app/models/report.rb
index 126701b3d6..38da26d7b7 100644
--- a/app/models/report.rb
+++ b/app/models/report.rb
@@ -41,7 +41,7 @@ class Report < ApplicationRecord
scope :unresolved, -> { where(action_taken_at: nil) }
scope :resolved, -> { where.not(action_taken_at: nil) }
- scope :with_accounts, -> { includes([:account, :target_account, :action_taken_by_account, :assigned_account].index_with({ user: [:invite_request, :invite] })) }
+ scope :with_accounts, -> { includes([:account, :target_account, :action_taken_by_account, :assigned_account].index_with([:account_stat, { user: [:invite_request, :invite, :ips] }])) }
# A report is considered local if the reporter is local
delegate :local?, to: :account
diff --git a/app/models/session_activation.rb b/app/models/session_activation.rb
index 7f5f0d9a9a..c67180d3ba 100644
--- a/app/models/session_activation.rb
+++ b/app/models/session_activation.rb
@@ -41,7 +41,7 @@ class SessionActivation < ApplicationRecord
class << self
def active?(id)
- id && where(session_id: id).exists?
+ id && exists?(session_id: id)
end
def activate(**options)
diff --git a/app/models/status.rb b/app/models/status.rb
index 241c03f8c8..2d2f906f14 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -293,7 +293,7 @@ class Status < ApplicationRecord
end
def reported?
- @reported ||= Report.where(target_account: account).unresolved.where('? = ANY(status_ids)', id).exists?
+ @reported ||= Report.where(target_account: account).unresolved.exists?(['? = ANY(status_ids)', id])
end
def emojis
diff --git a/app/models/tag.rb b/app/models/tag.rb
index 46e55d74f9..f2168ae904 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -39,6 +39,8 @@ class Tag < ApplicationRecord
HASHTAG_NAME_RE = /\A(#{HASHTAG_NAME_PAT})\z/i
HASHTAG_INVALID_CHARS_RE = /[^[:alnum:]\u0E47-\u0E4E#{HASHTAG_SEPARATORS}]/
+ RECENT_STATUS_LIMIT = 1000
+
validates :name, presence: true, format: { with: HASHTAG_NAME_RE }
validates :display_name, format: { with: HASHTAG_NAME_RE }
validate :validate_name_change, if: -> { !new_record? && name_changed? }
@@ -53,7 +55,7 @@ class Tag < ApplicationRecord
scope :not_trendable, -> { where(trendable: false) }
scope :recently_used, lambda { |account|
joins(:statuses)
- .where(statuses: { id: account.statuses.select(:id).limit(1000) })
+ .where(statuses: { id: account.statuses.select(:id).limit(RECENT_STATUS_LIMIT) })
.group(:id).order(Arel.sql('count(*) desc'))
}
scope :matches_name, ->(term) { where(arel_table[:name].lower.matches(arel_table.lower("#{sanitize_sql_like(Tag.normalize(term))}%"), nil, true)) } # Search with case-sensitive to use B-tree index
diff --git a/app/policies/status_policy.rb b/app/policies/status_policy.rb
index cb45750d76..fb60ca20ce 100644
--- a/app/policies/status_policy.rb
+++ b/app/policies/status_policy.rb
@@ -58,7 +58,7 @@ class StatusPolicy < ApplicationPolicy
if record.mentions.loaded?
record.mentions.any? { |mention| mention.account_id == current_account.id }
else
- record.mentions.where(account: current_account).exists?
+ record.mentions.exists?(account: current_account)
end
end
diff --git a/app/presenters/annual_reports_presenter.rb b/app/presenters/annual_reports_presenter.rb
new file mode 100644
index 0000000000..001e1d37b0
--- /dev/null
+++ b/app/presenters/annual_reports_presenter.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+class AnnualReportsPresenter
+ alias read_attribute_for_serialization send
+
+ attr_reader :annual_reports
+
+ def initialize(annual_reports)
+ @annual_reports = annual_reports
+ end
+
+ def accounts
+ @accounts ||= Account.where(id: @annual_reports.flat_map(&:account_ids)).includes(:account_stat, :moved_to_account, user: :role)
+ end
+
+ def statuses
+ @statuses ||= Status.where(id: @annual_reports.flat_map(&:status_ids)).with_includes
+ end
+
+ def self.model_name
+ @model_name ||= ActiveModel::Name.new(self)
+ end
+end
diff --git a/app/serializers/rest/announcement_serializer.rb b/app/serializers/rest/announcement_serializer.rb
index 23b2fa514b..8cee271272 100644
--- a/app/serializers/rest/announcement_serializer.rb
+++ b/app/serializers/rest/announcement_serializer.rb
@@ -23,7 +23,7 @@ class REST::AnnouncementSerializer < ActiveModel::Serializer
end
def read
- object.announcement_mutes.where(account: current_user.account).exists?
+ object.announcement_mutes.exists?(account: current_user.account)
end
def content
diff --git a/app/serializers/rest/annual_report_serializer.rb b/app/serializers/rest/annual_report_serializer.rb
new file mode 100644
index 0000000000..1fb5ddb5c1
--- /dev/null
+++ b/app/serializers/rest/annual_report_serializer.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+class REST::AnnualReportSerializer < ActiveModel::Serializer
+ attributes :year, :data, :schema_version
+end
diff --git a/app/serializers/rest/annual_reports_serializer.rb b/app/serializers/rest/annual_reports_serializer.rb
new file mode 100644
index 0000000000..ea9572be1b
--- /dev/null
+++ b/app/serializers/rest/annual_reports_serializer.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class REST::AnnualReportsSerializer < ActiveModel::Serializer
+ has_many :annual_reports, serializer: REST::AnnualReportSerializer
+ has_many :accounts, serializer: REST::AccountSerializer
+ has_many :statuses, serializer: REST::StatusSerializer
+end
diff --git a/app/serializers/rest/tag_serializer.rb b/app/serializers/rest/tag_serializer.rb
index 7801e77d1f..017b572718 100644
--- a/app/serializers/rest/tag_serializer.rb
+++ b/app/serializers/rest/tag_serializer.rb
@@ -19,7 +19,7 @@ class REST::TagSerializer < ActiveModel::Serializer
if instance_options && instance_options[:relationships]
instance_options[:relationships].following_map[object.id] || false
else
- TagFollow.where(tag_id: object.id, account_id: current_user.account_id).exists?
+ TagFollow.exists?(tag_id: object.id, account_id: current_user.account_id)
end
end
diff --git a/app/services/activitypub/fetch_featured_collection_service.rb b/app/services/activitypub/fetch_featured_collection_service.rb
index d2bae08a0e..89c3a1b6c0 100644
--- a/app/services/activitypub/fetch_featured_collection_service.rb
+++ b/app/services/activitypub/fetch_featured_collection_service.rb
@@ -23,9 +23,9 @@ class ActivityPub::FetchFeaturedCollectionService < BaseService
case collection['type']
when 'Collection', 'CollectionPage'
- collection['items']
+ as_array(collection['items'])
when 'OrderedCollection', 'OrderedCollectionPage'
- collection['orderedItems']
+ as_array(collection['orderedItems'])
end
end
diff --git a/app/services/activitypub/fetch_remote_status_service.rb b/app/services/activitypub/fetch_remote_status_service.rb
index a491b32b26..e3a9b60b56 100644
--- a/app/services/activitypub/fetch_remote_status_service.rb
+++ b/app/services/activitypub/fetch_remote_status_service.rb
@@ -44,7 +44,7 @@ class ActivityPub::FetchRemoteStatusService < BaseService
# If we fetched a status that already exists, then we need to treat the
# activity as an update rather than create
- activity_json['type'] = 'Update' if equals_or_includes_any?(activity_json['type'], %w(Create)) && Status.where(uri: object_uri, account_id: actor.id).exists?
+ activity_json['type'] = 'Update' if equals_or_includes_any?(activity_json['type'], %w(Create)) && Status.exists?(uri: object_uri, account_id: actor.id)
with_redis do |redis|
discoveries = redis.incr("status_discovery_per_request:#{@request_id}")
diff --git a/app/services/activitypub/fetch_replies_service.rb b/app/services/activitypub/fetch_replies_service.rb
index b5c7759ec5..e2ecdef165 100644
--- a/app/services/activitypub/fetch_replies_service.rb
+++ b/app/services/activitypub/fetch_replies_service.rb
@@ -26,9 +26,9 @@ class ActivityPub::FetchRepliesService < BaseService
case collection['type']
when 'Collection', 'CollectionPage'
- collection['items']
+ as_array(collection['items'])
when 'OrderedCollection', 'OrderedCollectionPage'
- collection['orderedItems']
+ as_array(collection['orderedItems'])
end
end
@@ -37,7 +37,20 @@ class ActivityPub::FetchRepliesService < BaseService
return unless @allow_synchronous_requests
return if non_matching_uri_hosts?(@account.uri, collection_or_uri)
- fetch_resource_without_id_validation(collection_or_uri, nil, true)
+ # NOTE: For backward compatibility reasons, Mastodon signs outgoing
+ # queries incorrectly by default.
+ #
+ # While this is relevant for all URLs with query strings, this is
+ # the only code path where this happens in practice.
+ #
+ # Therefore, retry with correct signatures if this fails.
+ begin
+ fetch_resource_without_id_validation(collection_or_uri, nil, true)
+ rescue Mastodon::UnexpectedResponseError => e
+ raise unless e.response && e.response.code == 401 && Addressable::URI.parse(collection_or_uri).query.present?
+
+ fetch_resource_without_id_validation(collection_or_uri, nil, true, request_options: { with_query_string: true })
+ end
end
def filtered_replies
diff --git a/app/services/activitypub/synchronize_followers_service.rb b/app/services/activitypub/synchronize_followers_service.rb
index 7ccc917309..f51d671a00 100644
--- a/app/services/activitypub/synchronize_followers_service.rb
+++ b/app/services/activitypub/synchronize_followers_service.rb
@@ -59,9 +59,9 @@ class ActivityPub::SynchronizeFollowersService < BaseService
case collection['type']
when 'Collection', 'CollectionPage'
- collection['items']
+ as_array(collection['items'])
when 'OrderedCollection', 'OrderedCollectionPage'
- collection['orderedItems']
+ as_array(collection['orderedItems'])
end
end
diff --git a/app/services/keys/query_service.rb b/app/services/keys/query_service.rb
index 14c9d9205b..33e13293f3 100644
--- a/app/services/keys/query_service.rb
+++ b/app/services/keys/query_service.rb
@@ -69,7 +69,7 @@ class Keys::QueryService < BaseService
return if json['items'].blank?
- @devices = json['items'].map do |device|
+ @devices = as_array(json['items']).map do |device|
Device.new(device_id: device['id'], name: device['name'], identity_key: device.dig('identityKey', 'publicKeyBase64'), fingerprint_key: device.dig('fingerprintKey', 'publicKeyBase64'), claim_url: device['claim'])
end
rescue HTTP::Error, OpenSSL::SSL::SSLError, Mastodon::Error => e
diff --git a/app/services/vote_service.rb b/app/services/vote_service.rb
index 3e92a1690a..878350388b 100644
--- a/app/services/vote_service.rb
+++ b/app/services/vote_service.rb
@@ -19,7 +19,7 @@ class VoteService < BaseService
already_voted = true
with_redis_lock("vote:#{@poll.id}:#{@account.id}") do
- already_voted = @poll.votes.where(account: @account).exists?
+ already_voted = @poll.votes.exists?(account: @account)
ApplicationRecord.transaction do
@choices.each do |choice|
diff --git a/app/validators/reaction_validator.rb b/app/validators/reaction_validator.rb
index 4ed3376e8b..89d83de5a2 100644
--- a/app/validators/reaction_validator.rb
+++ b/app/validators/reaction_validator.rb
@@ -19,7 +19,7 @@ class ReactionValidator < ActiveModel::Validator
end
def new_reaction?(reaction)
- !reaction.announcement.announcement_reactions.where(name: reaction.name).exists?
+ !reaction.announcement.announcement_reactions.exists?(name: reaction.name)
end
def limit_reached?(reaction)
diff --git a/app/validators/vote_validator.rb b/app/validators/vote_validator.rb
index fa2bd223dc..e725b4c0b8 100644
--- a/app/validators/vote_validator.rb
+++ b/app/validators/vote_validator.rb
@@ -35,7 +35,7 @@ class VoteValidator < ActiveModel::Validator
if vote.persisted?
account_votes_on_same_poll(vote).where(choice: vote.choice).where.not(poll_votes: { id: vote }).exists?
else
- account_votes_on_same_poll(vote).where(choice: vote.choice).exists?
+ account_votes_on_same_poll(vote).exists?(choice: vote.choice)
end
end
diff --git a/app/views/redirects/show.html.haml b/app/views/redirects/show.html.haml
new file mode 100644
index 0000000000..0d09387a9c
--- /dev/null
+++ b/app/views/redirects/show.html.haml
@@ -0,0 +1,8 @@
+.redirect
+ .redirect__logo
+ = link_to render_logo, root_path
+
+ .redirect__message
+ %h1= t('redirects.title', instance: site_hostname)
+ %p= t('redirects.prompt')
+ %p= link_to @redirect_path, @redirect_path, rel: 'noreferrer noopener'
diff --git a/app/views/user_mailer/failed_2fa.html.haml b/app/views/user_mailer/failed_2fa.html.haml
new file mode 100644
index 0000000000..e1da35ce06
--- /dev/null
+++ b/app/views/user_mailer/failed_2fa.html.haml
@@ -0,0 +1,24 @@
+= content_for :heading do
+ = render 'application/mailer/heading', heading_title: t('user_mailer.failed_2fa.title'), heading_subtitle: t('user_mailer.failed_2fa.explanation'), heading_image_url: frontend_asset_url('images/mailer-new/heading/login.png')
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+ %tr
+ %td.email-body-padding-td
+ %table.email-inner-card-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+ %tr
+ %td.email-inner-card-td.email-prose
+ %p= t 'user_mailer.failed_2fa.details'
+ %p
+ %strong #{t('sessions.ip')}:
+ = @remote_ip
+ %br/
+ %strong #{t('sessions.browser')}:
+ %span{ title: @user_agent }
+ = t 'sessions.description',
+ browser: t("sessions.browsers.#{@detection.id}", default: @detection.id.to_s),
+ platform: t("sessions.platforms.#{@detection.platform.id}", default: @detection.platform.id.to_s)
+ %br/
+ %strong #{t('sessions.date')}:
+ = l(@timestamp.in_time_zone(@resource.time_zone.presence), format: :with_time_zone)
+ = render 'application/mailer/button', text: t('settings.account_settings'), url: edit_user_registration_url
+ %p= t 'user_mailer.failed_2fa.further_actions_html',
+ action: link_to(t('user_mailer.suspicious_sign_in.change_password'), edit_user_registration_url)
diff --git a/app/views/user_mailer/failed_2fa.text.erb b/app/views/user_mailer/failed_2fa.text.erb
new file mode 100644
index 0000000000..c1dbf7d929
--- /dev/null
+++ b/app/views/user_mailer/failed_2fa.text.erb
@@ -0,0 +1,15 @@
+<%= t 'user_mailer.failed_2fa.title' %>
+
+===
+
+<%= t 'user_mailer.failed_2fa.explanation' %>
+
+<%= t 'user_mailer.failed_2fa.details' %>
+
+<%= t('sessions.ip') %>: <%= @remote_ip %>
+<%= t('sessions.browser') %>: <%= t('sessions.description', browser: t("sessions.browsers.#{@detection.id}", default: "#{@detection.id}"), platform: t("sessions.platforms.#{@detection.platform.id}", default: "#{@detection.platform.id}")) %>
+<%= l(@timestamp.in_time_zone(@resource.time_zone.presence), format: :with_time_zone) %>
+
+<%= t 'user_mailer.failed_2fa.further_actions_html', action: t('user_mailer.suspicious_sign_in.change_password') %>
+
+=> <%= edit_user_registration_url %>
diff --git a/app/workers/generate_annual_report_worker.rb b/app/workers/generate_annual_report_worker.rb
new file mode 100644
index 0000000000..7094c1ab9c
--- /dev/null
+++ b/app/workers/generate_annual_report_worker.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class GenerateAnnualReportWorker
+ include Sidekiq::Worker
+
+ def perform(account_id, year)
+ AnnualReport.new(Account.find(account_id), year).generate
+ rescue ActiveRecord::RecordNotFound, ActiveRecord::RecordNotUnique
+ true
+ end
+end
diff --git a/app/workers/move_worker.rb b/app/workers/move_worker.rb
index 73ae268bee..a18f38556b 100644
--- a/app/workers/move_worker.rb
+++ b/app/workers/move_worker.rb
@@ -123,7 +123,7 @@ class MoveWorker
end
def add_account_note_if_needed!(account, id)
- unless AccountNote.where(account: account, target_account: @target_account).exists?
+ unless AccountNote.exists?(account: account, target_account: @target_account)
text = I18n.with_locale(account.user&.locale.presence || I18n.default_locale) do
I18n.t(id, acct: @source_account.acct)
end
diff --git a/app/workers/scheduler/indexing_scheduler.rb b/app/workers/scheduler/indexing_scheduler.rb
index 5c985e25a0..f52d0141d4 100644
--- a/app/workers/scheduler/indexing_scheduler.rb
+++ b/app/workers/scheduler/indexing_scheduler.rb
@@ -24,6 +24,8 @@ class Scheduler::IndexingScheduler
end
end
+ private
+
def indexes
[AccountsIndex, TagsIndex, PublicStatusesIndex, StatusesIndex]
end
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 3c13ada380..a855f5a16b 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -85,7 +85,7 @@ Rails.application.configure do
# If using a Heroku, Vagrant or generic remote development environment,
# use letter_opener_web, accessible at /letter_opener.
# Otherwise, use letter_opener, which launches a browser window to view sent mail.
- config.action_mailer.delivery_method = (ENV['HEROKU'] || ENV['VAGRANT'] || ENV['REMOTE_DEV']) ? :letter_opener_web : :letter_opener
+ config.action_mailer.delivery_method = ENV['HEROKU'] || ENV['VAGRANT'] || ENV['REMOTE_DEV'] ? :letter_opener_web : :letter_opener
# We provide a default secret for the development environment here.
# This value should not be used in production environments!
diff --git a/config/locales-glitch/fr-CA.yml b/config/locales-glitch/fr-CA.yml
new file mode 100644
index 0000000000..2fbf0ffd71
--- /dev/null
+++ b/config/locales-glitch/fr-CA.yml
@@ -0,0 +1 @@
+--- {}
diff --git a/config/locales-glitch/simple_form.fr-CA.yml b/config/locales-glitch/simple_form.fr-CA.yml
new file mode 100644
index 0000000000..2fbf0ffd71
--- /dev/null
+++ b/config/locales-glitch/simple_form.fr-CA.yml
@@ -0,0 +1 @@
+--- {}
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 3c8c643fe7..e6d653c674 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -1934,6 +1934,7 @@ ar:
go_to_sso_account_settings: انتقل إلى إعدادات حساب مزود الهوية الخاص بك
invalid_otp_token: رمز المصادقة بخطوتين غير صالح
otp_lost_help_html: إن فقدتَهُما ، يمكنك الاتصال بـ %{email}
+ rate_limited: عدد محاولات التحقق كثير جدًا، يرجى المحاولة مرة أخرى لاحقًا.
seamless_external_login: لقد قمت بتسجيل الدخول عبر خدمة خارجية، إنّ إعدادات الكلمة السرية و البريد الإلكتروني غير متوفرة.
signed_in_as: 'تم تسجيل دخولك بصفة:'
verification:
diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index a32413cb9a..7e5a4c8876 100644
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -909,6 +909,7 @@ ast:
users:
follow_limit_reached: Nun pues siguir a más de %{limit} persones
invalid_otp_token: El códigu de l'autenticación en dos pasos nun ye válidu
+ rate_limited: Fixéronse milenta intentos d'autenticación. Volvi tentalo dempués.
seamless_external_login: Aniciesti la sesión pente un serviciu esternu, polo que la configuración de la contraseña ya de la direición de corréu electrónicu nun tán disponibles.
signed_in_as: 'Aniciesti la sesión como:'
verification:
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 377babe22e..b9a3135448 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -1790,6 +1790,12 @@ bg:
extra: Вече е готово за теглене!
subject: Вашият архив е готов за изтегляне
title: Сваляне на архива
+ failed_2fa:
+ details: 'Ето подробности на опита за влизане:'
+ explanation: Някой се опита да влезе в акаунта ви, но предостави невалиден втори фактор за удостоверяване.
+ further_actions_html: Ако не бяхте вие, то препоръчваме да направите %{action} незабавно, тъй като може да се злепостави.
+ subject: Неуспешен втори фактор за удостоверяване
+ title: Провал на втория фактор за удостоверяване
suspicious_sign_in:
change_password: промяна на паролата ви
details: 'Ето подробности при вход:'
@@ -1843,6 +1849,7 @@ bg:
go_to_sso_account_settings: Отидете при настройките на акаунта на своя доставчик на идентичност
invalid_otp_token: Невалиден код
otp_lost_help_html: Ако загубите достъп до двете, то може да се свържете с %{email}
+ rate_limited: Премного опити за удостоверяване. Опитайте пак по-късно.
seamless_external_login: Влезли сте чрез външна услуга, така че настройките за парола и имейл не са налични.
signed_in_as: 'Влезли като:'
verification:
diff --git a/config/locales/br.yml b/config/locales/br.yml
index 7af72457d0..d20609a8ce 100644
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -443,6 +443,9 @@ br:
preferences:
other: All
posting_defaults: Arventennoù embann dre ziouer
+ redirects:
+ prompt: M'ho peus fiziañs el liamm-mañ, klikit warnañ evit kenderc'hel.
+ title: O kuitaat %{instance} emaoc'h.
relationships:
dormant: O kousket
followers: Heulier·ezed·ien
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 580c4a3ed9..58f6e26374 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -425,7 +425,7 @@ ca:
view: Veure el bloqueig del domini
email_domain_blocks:
add_new: Afegir nou
- allow_registrations_with_approval: Registre permès amb validació
+ allow_registrations_with_approval: Permet els registres amb validació
attempts_over_week:
one: "%{count} intent en la darrera setmana"
other: "%{count} intents de registre en la darrera setmana"
@@ -1046,6 +1046,7 @@ ca:
clicking_this_link: en clicar aquest enllaç
login_link: inici de sessió
proceed_to_login_html: Ara pots passar a %{login_link}.
+ redirect_to_app_html: Se us hauria d'haver redirigit a l'app %{app_name}. Si això no ha passat, intenteu %{clicking_this_link} o torneu manualment a l'app.
registration_complete: La teva inscripció a %{domain} ja és completa.
welcome_title: Hola, %{name}!
wrong_email_hint: Si aquesta adreça de correu electrònic no és correcte, pots canviar-la en els ajustos del compte.
@@ -1109,6 +1110,7 @@ ca:
functional: El teu compte està completament operatiu.
pending: La vostra sol·licitud està pendent de revisió pel nostre personal. Això pot trigar una mica. Rebreu un correu electrònic quan sigui aprovada.
redirecting_to: El teu compte és inactiu perquè actualment està redirigint a %{acct}.
+ self_destruct: Com que %{domain} tanca, només tindreu accés limitat al vostre compte.
view_strikes: Veure accions del passat contra el teu compte
too_fast: Formulari enviat massa ràpid, torna a provar-ho.
use_security_key: Usa clau de seguretat
@@ -1544,6 +1546,9 @@ ca:
errors:
limit_reached: Límit de diferents reaccions assolit
unrecognized_emoji: no és un emoji reconegut
+ redirects:
+ prompt: Si confieu en aquest enllaç, feu-hi clic per a continuar.
+ title: Esteu sortint de %{instance}.
relationships:
activity: Activitat del compte
confirm_follow_selected_followers: Segur que vols seguir els seguidors seleccionats?
@@ -1580,6 +1585,7 @@ ca:
over_total_limit: Has superat el límit de %{limit} tuts programats
too_soon: La data programada ha de ser futura
self_destruct:
+ lead_html: Lamentablement, %{domain} tanca de forma definitiva. Si hi teníeu un compte, no el podreu continuar utilitzant, però podeu demanar una còpia de les vostres dades.
title: Aquest servidor tancarà
sessions:
activity: Última activitat
@@ -1784,9 +1790,15 @@ ca:
title: Apel·lació rebutjada
backup_ready:
explanation: Heu demanat una còpia completa de les dades del vostre compte de Mastodon.
- extra: Ja us ho podeu baixar
+ extra: Ja la podeu baixar
subject: L'arxiu està preparat per a descàrrega
title: Recollida de l'arxiu
+ failed_2fa:
+ details: 'Aquests són els detalls de l''intent d''accés:'
+ explanation: Algú ha intentat accedir al vostre compte però no ha proporcionat un factor de doble autenticació correcte.
+ further_actions_html: Si no heu estat vosaltres, us recomanem que %{action} immediatament perquè pot estar compromès.
+ subject: Ha fallat el factor de doble autenticació
+ title: Ha fallat l'autenticació de doble factor
suspicious_sign_in:
change_password: canvia la teva contrasenya
details: 'Aquest són els detalls de l''inici de sessió:'
@@ -1840,6 +1852,7 @@ ca:
go_to_sso_account_settings: Ves a la configuració del compte del teu proveïdor d'identitat
invalid_otp_token: El codi de dos factors no és correcte
otp_lost_help_html: Si has perdut l'accés a tots dos pots contactar per %{email}
+ rate_limited: Excessius intents d'autenticació, torneu-hi més tard.
seamless_external_login: Has iniciat sessió via un servei extern per tant els ajustos de contrasenya i correu electrònic no estan disponibles.
signed_in_as: 'Sessió iniciada com a:'
verification:
diff --git a/config/locales/da.yml b/config/locales/da.yml
index e09a6eb2f5..57899d5f71 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -1546,6 +1546,9 @@ da:
errors:
limit_reached: Grænse for forskellige reaktioner nået
unrecognized_emoji: er ikke en genkendt emoji
+ redirects:
+ prompt: Er der tillid til dette link, så klik på det for at fortsætte.
+ title: Nu forlades %{instance}.
relationships:
activity: Kontoaktivitet
confirm_follow_selected_followers: Sikker på, at de valgte følgere skal følges?
@@ -1790,6 +1793,12 @@ da:
extra: Sikkerhedskopien kan nu downloades!
subject: Dit arkiv er klar til download
title: Arkiv download
+ failed_2fa:
+ details: 'Her er detaljerne om login-forsøget:'
+ explanation: Nogen har forsøgt at logge ind på kontoen, men har angivet en ugyldig anden godkendelsesfaktor.
+ further_actions_html: Var dette ikke dig, anbefales det straks at %{action}, da den kan være kompromitteret.
+ subject: Anden faktor godkendelsesfejl
+ title: Fejlede på anden faktor godkendelse
suspicious_sign_in:
change_password: ændrer din adgangskode
details: 'Her er nogle detaljer om login-forsøget:'
@@ -1843,6 +1852,7 @@ da:
go_to_sso_account_settings: Gå til identitetsudbyderens kontoindstillinger
invalid_otp_token: Ugyldig tofaktorkode
otp_lost_help_html: Har du mistet adgang til begge, kan du kontakte %{email}
+ rate_limited: For mange godkendelsesforsøg. Prøv igen senere.
seamless_external_login: Du er logget ind via en ekstern tjeneste, så adgangskode- og e-mailindstillinger er utilgængelige.
signed_in_as: 'Logget ind som:'
verification:
diff --git a/config/locales/de.yml b/config/locales/de.yml
index dc78b188e2..b77f415190 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -1546,6 +1546,9 @@ de:
errors:
limit_reached: Limit für verschiedene Reaktionen erreicht
unrecognized_emoji: ist ein unbekanntes Emoji
+ redirects:
+ prompt: Wenn du diesem Link vertraust, dann klicke ihn an, um fortzufahren.
+ title: Du verlässt %{instance}.
relationships:
activity: Kontoaktivität
confirm_follow_selected_followers: Möchtest du den ausgewählten Followern folgen?
@@ -1790,8 +1793,14 @@ de:
extra: Sie ist jetzt zum Herunterladen bereit!
subject: Dein persönliches Archiv kann heruntergeladen werden
title: Archiv-Download
+ failed_2fa:
+ details: 'Details zum Anmeldeversuch:'
+ explanation: Jemand hat versucht, sich bei deinem Konto anzumelden, aber die Zwei-Faktor-Authentisierung schlug fehl.
+ further_actions_html: Solltest du das nicht gewesen sein, empfehlen wir dir, sofort %{action}, da dein Konto möglicherweise kompromittiert ist.
+ subject: Zwei-Faktor-Authentisierung fehlgeschlagen
+ title: Zwei-Faktor-Authentisierung fehlgeschlagen
suspicious_sign_in:
- change_password: dein Passwort ändern
+ change_password: dein Passwort zu ändern
details: 'Hier sind die Details zu den Anmeldeversuchen:'
explanation: Wir haben eine Anmeldung zu deinem Konto von einer neuen IP-Adresse festgestellt.
further_actions_html: Wenn du das nicht warst, empfehlen wir dir schnellstmöglich, %{action} und die Zwei-Faktor-Authentisierung (2FA) für dein Konto zu aktivieren, um es abzusichern.
@@ -1843,6 +1852,7 @@ de:
go_to_sso_account_settings: Kontoeinstellungen des Identitätsanbieters aufrufen
invalid_otp_token: Ungültiger Code der Zwei-Faktor-Authentisierung (2FA)
otp_lost_help_html: Wenn du beides nicht mehr weißt, melde dich bitte bei uns unter der E-Mail-Adresse %{email}
+ rate_limited: Zu viele Authentisierungsversuche. Bitte versuche es später noch einmal.
seamless_external_login: Du bist über einen externen Dienst angemeldet, daher sind Passwort- und E-Mail-Einstellungen nicht verfügbar.
signed_in_as: 'Angemeldet als:'
verification:
diff --git a/config/locales/devise.ca.yml b/config/locales/devise.ca.yml
index 2bf741ee40..3720d3c5f7 100644
--- a/config/locales/devise.ca.yml
+++ b/config/locales/devise.ca.yml
@@ -49,19 +49,19 @@ ca:
subject: 'Mastodon: Instruccions per a reiniciar contrasenya'
title: Contrasenya restablerta
two_factor_disabled:
- explanation: Només es pot accedir amb compte de correu i contrasenya.
+ explanation: Ara es pot accedir amb només compte de correu i contrasenya.
subject: 'Mastodon: Autenticació de doble factor desactivada'
subtitle: S'ha deshabilitat l'autenticació de doble factor al vostre compte.
title: A2F desactivada
two_factor_enabled:
- explanation: Per accedir fa falta un token generat per l'aplicació TOTP aparellada.
+ explanation: Per accedir cal un token generat per l'aplicació TOTP aparellada.
subject: 'Mastodon: Autenticació de doble factor activada'
subtitle: S'ha habilitat l'autenticació de doble factor al vostre compte.
title: A2F activada
two_factor_recovery_codes_changed:
explanation: Els codis de recuperació anteriors ja no són vàlids i se n'han generat de nous.
subject: 'Mastodon: codis de recuperació de doble factor regenerats'
- subtitle: S'han invalidat els codis de recuperació anteriors i se n'ha generat de nous.
+ subtitle: S'han invalidat els codis de recuperació anteriors i se n'han generat de nous.
title: Codis de recuperació A2F canviats
unlock_instructions:
subject: 'Mastodon: Instruccions per a desblocar'
@@ -76,7 +76,7 @@ ca:
title: Una de les teves claus de seguretat ha estat esborrada
webauthn_disabled:
explanation: S'ha deshabilitat l'autenticació amb claus de seguretat al vostre compte.
- extra: Ara només podeu accedir amb el token generat amb l'aplicació TOTP aparellada.
+ extra: Ara es pot accedir amb només el token generat amb l'aplicació TOTP aparellada.
subject: 'Mastodon: S''ha desactivat l''autenticació amb claus de seguretat'
title: Claus de seguretat desactivades
webauthn_enabled:
diff --git a/config/locales/devise.fi.yml b/config/locales/devise.fi.yml
index bedf8a56f6..22fd7ff47b 100644
--- a/config/locales/devise.fi.yml
+++ b/config/locales/devise.fi.yml
@@ -47,14 +47,19 @@ fi:
subject: 'Mastodon: ohjeet salasanan vaihtoon'
title: Salasanan vaihto
two_factor_disabled:
+ explanation: Sisäänkirjautuminen on nyt mahdollista pelkällä sähköpostiosoitteella ja salasanalla.
subject: 'Mastodon: kaksivaiheinen todennus poistettu käytöstä'
+ subtitle: Kaksivaiheinen todennus on poistettu käytöstä tililtäsi.
title: 2-vaiheinen todennus pois käytöstä
two_factor_enabled:
+ explanation: Sisäänkirjautuminen edellyttää liitetyn TOTP-sovelluksen luomaa aikarajattua kertatunnuslukua.
subject: 'Mastodon: kaksivaiheinen todennus otettu käyttöön'
+ subtitle: Kaksivaiheinen todennus on otettu käyttöön tilillesi.
title: 2-vaiheinen todennus käytössä
two_factor_recovery_codes_changed:
explanation: Uudet palautuskoodit on nyt luotu ja vanhat on mitätöity.
subject: 'Mastodon: kaksivaiheisen todennuksen palautuskoodit luotiin uudelleen'
+ subtitle: Aiemmat palautuskoodit on mitätöity ja tilalle on luotu uudet.
title: 2-vaiheisen todennuksen palautuskoodit vaihdettiin
unlock_instructions:
subject: 'Mastodon: lukituksen poistamisen ohjeet'
@@ -68,9 +73,13 @@ fi:
subject: 'Mastodon: suojausavain poistettu'
title: Yksi suojausavaimistasi on poistettu
webauthn_disabled:
+ explanation: Turva-avaimin kirjautuminen on poistettu käytöstä tililtäsi.
+ extra: Sisäänkirjautuminen on nyt mahdollista pelkällä palveluun liitetyn TOTP-sovelluksen luomalla aikarajoitteisella kertatunnusluvulla.
subject: 'Mastodon: Todennus suojausavaimilla poistettu käytöstä'
title: Suojausavaimet poistettu käytöstä
webauthn_enabled:
+ explanation: Turva-avaimella kirjautuminen on otettu käyttöön tilillesi.
+ extra: Voit nyt kirjautua sisään turva-avaimellasi.
subject: 'Mastodon: Todennus suojausavaimella on otettu käyttöön'
title: Suojausavaimet käytössä
omniauth_callbacks:
diff --git a/config/locales/devise.fr-CA.yml b/config/locales/devise.fr-CA.yml
index 34104e0ac5..7f13f67828 100644
--- a/config/locales/devise.fr-CA.yml
+++ b/config/locales/devise.fr-CA.yml
@@ -73,9 +73,13 @@ fr-CA:
subject: 'Mastodon: Clé de sécurité supprimée'
title: Une de vos clés de sécurité a été supprimée
webauthn_disabled:
+ explanation: L'authentification avec les clés de sécurité a été désactivée pour votre compte.
+ extra: La connexion est maintenant possible en utilisant uniquement le jeton généré par l'application TOTP associée.
subject: 'Mastodon: Authentification avec clés de sécurité désactivée'
title: Clés de sécurité désactivées
webauthn_enabled:
+ explanation: L'authentification par clé de sécurité a été activée pour votre compte.
+ extra: Votre clé de sécurité peut maintenant être utilisée pour vous connecter.
subject: 'Mastodon: Authentification de la clé de sécurité activée'
title: Clés de sécurité activées
omniauth_callbacks:
diff --git a/config/locales/devise.fr.yml b/config/locales/devise.fr.yml
index 1fc6663bfe..8a5b8384e0 100644
--- a/config/locales/devise.fr.yml
+++ b/config/locales/devise.fr.yml
@@ -73,9 +73,13 @@ fr:
subject: 'Mastodon: Clé de sécurité supprimée'
title: Une de vos clés de sécurité a été supprimée
webauthn_disabled:
+ explanation: L'authentification avec les clés de sécurité a été désactivée pour votre compte.
+ extra: La connexion est maintenant possible en utilisant uniquement le jeton généré par l'application TOTP associée.
subject: 'Mastodon: Authentification avec clés de sécurité désactivée'
title: Clés de sécurité désactivées
webauthn_enabled:
+ explanation: L'authentification par clé de sécurité a été activée pour votre compte.
+ extra: Votre clé de sécurité peut maintenant être utilisée pour vous connecter.
subject: 'Mastodon: Authentification de la clé de sécurité activée'
title: Clés de sécurité activées
omniauth_callbacks:
diff --git a/config/locales/devise.hu.yml b/config/locales/devise.hu.yml
index 522ac66ad3..fea56ab24a 100644
--- a/config/locales/devise.hu.yml
+++ b/config/locales/devise.hu.yml
@@ -47,14 +47,19 @@ hu:
subject: 'Mastodon: Jelszóvisszaállítási utasítások'
title: Jelszó visszaállítása
two_factor_disabled:
+ explanation: A bejelentkezés most már csupán email címmel és jelszóval lehetséges.
subject: Kétlépcsős azonosítás kikapcsolva
+ subtitle: A kétlépcsős hitelesítés a fiókodhoz ki lett kapcsolva.
title: Kétlépcsős hitelesítés kikapcsolva
two_factor_enabled:
+ explanation: Egy párosított TOTP appal generált tokenre lesz szükség a bejelentkezéshez.
subject: 'Mastodon: Kétlépcsős azonosítás engedélyezve'
+ subtitle: A kétlépcsős hitelesítés a fiókodhoz aktiválva lett.
title: Kétlépcsős hitelesítés engedélyezve
two_factor_recovery_codes_changed:
explanation: A korábbi helyreállítási kódok letiltásra és újragenerálásra kerültek.
subject: 'Mastodon: Kétlépcsős helyreállítási kódok újból előállítva'
+ subtitle: A korábbi helyreállítási kódokat letiltottuk, és újakat generáltunk.
title: A kétlépcsős kódok megváltoztak
unlock_instructions:
subject: 'Mastodon: Feloldási utasítások'
@@ -68,9 +73,13 @@ hu:
subject: 'Mastodon: A biztonsági kulcs törlésre került'
title: Az egyik biztonsági kulcsodat törölték
webauthn_disabled:
+ explanation: A biztonsági kulcsokkal történő hitelesítés a fiókodhoz ki lett kapcsolva.
+ extra: A bejelentkezés most már csak TOTP app által generált tokennel lehetséges.
subject: 'Mastodon: A biztonsági kulccsal történő hitelesítés letiltásra került'
title: A biztonsági kulcsok letiltásra kerültek
webauthn_enabled:
+ explanation: A biztonsági kulcsokkal történő hitelesítés a fiókodhoz aktiválva lett.
+ extra: A biztonsági kulcsodat mostantól lehet bejelentkezésre használni.
subject: 'Mastodon: A biztonsági kulcsos hitelesítés engedélyezésre került'
title: A biztonsági kulcsok engedélyezésre kerültek
omniauth_callbacks:
diff --git a/config/locales/devise.ie.yml b/config/locales/devise.ie.yml
index 97cda4e8c6..332c9da456 100644
--- a/config/locales/devise.ie.yml
+++ b/config/locales/devise.ie.yml
@@ -52,6 +52,7 @@ ie:
subtitle: 2-factor autentication por tui conto ha esset desactivisat.
title: 2FA desvalidat
two_factor_enabled:
+ explanation: Un clave generat del acuplat TOTP-aplication nu va esser besonat por aperter session.
subject: 'Mastodon: 2-factor autentication activat'
subtitle: 2-factor autentication ha esset activisat por tui conto.
title: 2FA permisset
@@ -73,6 +74,7 @@ ie:
title: Un ex tui claves de securitá ha esset deletet
webauthn_disabled:
explanation: Autentication per clave de securitá ha esset desactivisat por tui conto.
+ extra: Aperter session es nu possibil solmen per li clave generat del acuplat TOTP-aplication.
subject: 'Mastodon: Autentication con claves de securitá desactivisat'
title: Claves de securitá desactivisat
webauthn_enabled:
diff --git a/config/locales/devise.ja.yml b/config/locales/devise.ja.yml
index 9a3ffd9c4d..44a9a31839 100644
--- a/config/locales/devise.ja.yml
+++ b/config/locales/devise.ja.yml
@@ -49,12 +49,12 @@ ja:
two_factor_disabled:
explanation: メールアドレスとパスワードのみでログイン可能になりました。
subject: 'Mastodon: 二要素認証が無効になりました'
- subtitle: 二要素認証が無効になっています。
+ subtitle: 今後、アカウントへのログインに二要素認証を要求しません。
title: 二要素認証が無効化されました
two_factor_enabled:
explanation: ログインには設定済みのTOTPアプリが生成したトークンが必要です。
subject: 'Mastodon: 二要素認証が有効になりました'
- subtitle: 二要素認証が有効になりました。
+ subtitle: 今後、アカウントへのログインに二要素認証が必要になります。
title: 二要素認証が有効化されました
two_factor_recovery_codes_changed:
explanation: 以前のリカバリーコードが無効化され、新しいコードが生成されました。
@@ -73,7 +73,7 @@ ja:
subject: 'Mastodon: セキュリティキーが削除されました'
title: セキュリティキーが削除されました
webauthn_disabled:
- explanation: セキュリティキー認証が無効になっています。
+ explanation: セキュリティキー認証が無効になりました。
extra: 設定済みのTOTPアプリが生成したトークンのみでログインできるようになりました。
subject: 'Mastodon: セキュリティキー認証が無効になりました'
title: セキュリティキーは無効になっています
diff --git a/config/locales/devise.ko.yml b/config/locales/devise.ko.yml
index 88865aec58..0c848e4bac 100644
--- a/config/locales/devise.ko.yml
+++ b/config/locales/devise.ko.yml
@@ -47,14 +47,19 @@ ko:
subject: 'Mastodon: 암호 재설정 설명'
title: 암호 재설정
two_factor_disabled:
+ explanation: 이제 이메일과 암호만 이용해서 로그인이 가능합니다.
subject: '마스토돈: 이중 인증 비활성화'
+ subtitle: 계정에 대한 2단계 인증이 비활성화되었습니다.
title: 2FA 비활성화 됨
two_factor_enabled:
+ explanation: 로그인 하기 위해서는 짝이 되는 TOTP 앱에서 생성한 토큰이 필요합니다.
subject: '마스토돈: 이중 인증 활성화'
+ subtitle: 계정에 대한 2단계 인증이 활성화되었습니다.
title: 2FA 활성화 됨
two_factor_recovery_codes_changed:
explanation: 이전 복구 코드가 무효화되고 새 코드가 생성되었습니다
subject: '마스토돈: 이중 인증 복구 코드 재생성 됨'
+ subtitle: 이전 복구 코드가 무효화되고 새 코드가 생성되었습니다.
title: 2FA 복구 코드 변경됨
unlock_instructions:
subject: '마스토돈: 잠금 해제 방법'
@@ -68,9 +73,13 @@ ko:
subject: '마스토돈: 보안 키 삭제'
title: 보안 키가 삭제되었습니다
webauthn_disabled:
+ explanation: 계정의 보안 키 인증이 비활성화되었습니다
+ extra: 이제 TOTP 앱에서 생성한 토큰을 통해서만 로그인 가능합니다.
subject: '마스토돈: 보안 키를 이용한 인증이 비활성화 됨'
title: 보안 키 비활성화 됨
webauthn_enabled:
+ explanation: 계정에 대한 보안키 인증이 활성화되었습니다.
+ extra: 로그인시 보안키가 사용됩니다.
subject: '마스토돈: 보안 키 인증 활성화 됨'
title: 보안 키 활성화 됨
omniauth_callbacks:
diff --git a/config/locales/devise.lad.yml b/config/locales/devise.lad.yml
index bec76d82f9..2b6b8aafb1 100644
--- a/config/locales/devise.lad.yml
+++ b/config/locales/devise.lad.yml
@@ -47,10 +47,14 @@ lad:
subject: 'Mastodon: Instruksyones para reinisyar kod'
title: Reinisyar kod
two_factor_disabled:
+ explanation: Agora puedes konektarte kon tu kuento uzando solo tu adreso de posta i kod.
subject: 'Mastodon: La autentifikasyon de dos pasos esta inkapasitada'
+ subtitle: La autentifikasyon en dos pasos para tu kuento tiene sido inkapasitada.
title: Autentifikasyon 2FA inkapasitada
two_factor_enabled:
+ explanation: Se rekierira un token djenerado por la aplikasyon TOTP konektada para entrar.
subject: 'Mastodon: La autentifikasyon de dos pasos esta kapasitada'
+ subtitle: La autentifikasyon de dos pasos para tu kuento tiene sido kapasitada.
title: Autentifikasyon 2FA aktivada
two_factor_recovery_codes_changed:
explanation: Los kodiches de rekuperasyon previos tienen sido invalidados i se djeneraron kodiches muevos.
@@ -69,9 +73,13 @@ lad:
subject: 'Mastodon: Yave de sigurita supremida'
title: Una de tus yaves de sigurita tiene sido supremida
webauthn_disabled:
+ explanation: La autentifikasyon kon yaves de sigurita tiene sido inkapasitada para tu kuento.
+ extra: Agora el inisyo de sesyon solo es posivle utilizando el token djeenerado por la aplikasyon TOTP konektada.
subject: 'Mastodon: autentifikasyon kon yaves de sigurita inkapasitada'
title: Yaves de sigurita inkapasitadas
webauthn_enabled:
+ explanation: La autentifikasyon kon yave de sigurita tiene sido kapasitada para tu kuento.
+ extra: Agora tu yave de sigurita puede ser utilizada para konektarte kon tu kuento.
subject: 'Mastodon: Autentifikasyon de yave de sigurita aktivada'
title: Yaves de sigurita kapasitadas
omniauth_callbacks:
diff --git a/config/locales/devise.nn.yml b/config/locales/devise.nn.yml
index acee9fdcdc..96920d42b5 100644
--- a/config/locales/devise.nn.yml
+++ b/config/locales/devise.nn.yml
@@ -47,14 +47,19 @@ nn:
subject: 'Mastodon: Instuksjonar for å endra passord'
title: Attstilling av passord
two_factor_disabled:
+ explanation: Innlogging er nå mulig med kun e-postadresse og passord.
subject: 'Mastodon: To-faktor-autentisering deaktivert'
+ subtitle: To-faktor autentisering for din konto har blitt deaktivert.
title: 2FA deaktivert
two_factor_enabled:
+ explanation: En token generert av den sammenkoblede TOTP-appen vil være påkrevd for innlogging.
subject: 'Mastodon: To-faktor-autentisering aktivert'
+ subtitle: Tofaktorautentisering er aktivert for din konto.
title: 2FA aktivert
two_factor_recovery_codes_changed:
explanation: Dei førre gjenopprettingskodane er ugyldige og nye er genererte.
subject: 'Mastodon: To-faktor-gjenopprettingskodar har vorte genererte på nytt'
+ subtitle: De forrige gjenopprettingskodene er gjort ugyldige og nye er generert.
title: 2FA-gjenopprettingskodane er endra
unlock_instructions:
subject: 'Mastodon: Instruksjonar for å opne kontoen igjen'
@@ -68,9 +73,13 @@ nn:
subject: 'Mastodon: Sikkerheitsnøkkel sletta'
title: Ein av sikkerheitsnøklane dine har blitt sletta
webauthn_disabled:
+ explanation: Autentisering med sikkerhetsnøkler er deaktivert for kontoen din.
+ extra: Innlogging er nå mulig med kun tilgangstoken generert av den sammenkoblede TOTP-appen.
subject: 'Mastodon: Autentisering med sikkerheitsnøklar vart skrudd av'
title: Sikkerheitsnøklar deaktivert
webauthn_enabled:
+ explanation: Sikkerhetsnøkkelautentisering har blitt aktivert for kontoen din.
+ extra: Sikkerhetsnøkkelen din kan nå bli brukt for innlogging.
subject: 'Mastodon: Sikkerheitsnøkkelsautentisering vart skrudd på'
title: Sikkerheitsnøklar aktivert
omniauth_callbacks:
diff --git a/config/locales/devise.no.yml b/config/locales/devise.no.yml
index 0d824da815..961778eaa5 100644
--- a/config/locales/devise.no.yml
+++ b/config/locales/devise.no.yml
@@ -47,14 +47,19 @@
subject: 'Mastodon: Hvordan nullstille passord'
title: Nullstill passord
two_factor_disabled:
+ explanation: Innlogging er nå mulig med kun e-postadresse og passord.
subject: 'Mastodon: Tofaktorautentisering deaktivert'
+ subtitle: To-faktor autentisering for din konto har blitt deaktivert.
title: 2FA deaktivert
two_factor_enabled:
+ explanation: En token generert av den sammenkoblede TOTP-appen vil være påkrevd for innlogging.
subject: 'Mastodon: Tofaktorautentisering aktivert'
+ subtitle: Tofaktorautentisering er aktivert for din konto.
title: 2FA aktivert
two_factor_recovery_codes_changed:
explanation: De forrige gjenopprettingskodene er gjort ugyldige og nye er generert.
subject: 'Mastodon: Tofaktor-gjenopprettingskoder har blitt generert på nytt'
+ subtitle: De forrige gjenopprettingskodene er gjort ugyldige og nye er generert.
title: 2FA-gjenopprettingskodene ble endret
unlock_instructions:
subject: 'Mastodon: Instruksjoner for å gjenåpne konto'
@@ -68,9 +73,13 @@
subject: 'Mastodon: Sikkerhetsnøkkel slettet'
title: En av sikkerhetsnøklene dine har blitt slettet
webauthn_disabled:
+ explanation: Autentisering med sikkerhetsnøkler er deaktivert for kontoen din.
+ extra: Innlogging er nå mulig med kun tilgangstoken generert av den sammenkoblede TOTP-appen.
subject: 'Mastodon: Autentisering med sikkerhetsnøkler ble skrudd av'
title: Sikkerhetsnøkler deaktivert
webauthn_enabled:
+ explanation: Sikkerhetsnøkkelautentisering har blitt aktivert for kontoen din.
+ extra: Sikkerhetsnøkkelen din kan nå bli brukt for innlogging.
subject: 'Mastodon: Sikkerhetsnøkkelsautentisering ble skrudd på'
title: Sikkerhetsnøkler aktivert
omniauth_callbacks:
diff --git a/config/locales/devise.ru.yml b/config/locales/devise.ru.yml
index ccbd13438d..9dd418f2cd 100644
--- a/config/locales/devise.ru.yml
+++ b/config/locales/devise.ru.yml
@@ -47,14 +47,19 @@ ru:
subject: 'Mastodon: Инструкция по сбросу пароля'
title: Сброс пароля
two_factor_disabled:
+ explanation: Вход в систему теперь возможен только с использованием адреса электронной почты и пароля.
subject: 'Mastodon: Двухфакторная авторизация отключена'
+ subtitle: Двухфакторная аутентификация для вашей учетной записи была отключена.
title: 2ФА отключена
two_factor_enabled:
+ explanation: Для входа в систему потребуется токен, сгенерированный сопряженным приложением TOTP.
subject: 'Mastodon: Настроена двухфакторная авторизация'
+ subtitle: Для вашей учетной записи была включена двухфакторная аутентификация.
title: 2ФА включена
two_factor_recovery_codes_changed:
explanation: Предыдущие резервные коды были аннулированы и созданы новые.
subject: 'Mastodon: Резервные коды двуфакторной авторизации обновлены'
+ subtitle: Предыдущие коды восстановления были аннулированы и сгенерированы новые.
title: Коды восстановления 2FA изменены
unlock_instructions:
subject: 'Mastodon: Инструкция по разблокировке'
@@ -68,9 +73,13 @@ ru:
subject: 'Мастодон: Ключ Безопасности удален'
title: Один из ваших защитных ключей был удален
webauthn_disabled:
+ explanation: Аутентификация с помощью ключей безопасности была отключена для вашей учетной записи.
+ extra: Теперь вход в систему возможен только с использованием токена, сгенерированного сопряженным приложением TOTP.
subject: 'Мастодон: Аутентификация с ключами безопасности отключена'
title: Ключи безопасности отключены
webauthn_enabled:
+ explanation: Для вашей учетной записи включена аутентификация по ключу безопасности.
+ extra: Теперь ваш ключ безопасности можно использовать для входа в систему.
subject: 'Мастодон: Включена аутентификация по ключу безопасности'
title: Ключи безопасности включены
omniauth_callbacks:
diff --git a/config/locales/devise.sl.yml b/config/locales/devise.sl.yml
index 72269e4826..2d567e63f4 100644
--- a/config/locales/devise.sl.yml
+++ b/config/locales/devise.sl.yml
@@ -47,14 +47,19 @@ sl:
subject: 'Mastodon: navodila za ponastavitev gesla'
title: Ponastavitev gesla
two_factor_disabled:
+ explanation: Prijava je sedaj mogoče le z uporabo e-poštnega naslova in gesla.
subject: 'Mastodon: dvojno preverjanje pristnosti je onemogočeno'
+ subtitle: Dvo-faktorsko preverjanje pristnosti za vaš račun je bilo onemogočeno.
title: 2FA onemogočeno
two_factor_enabled:
+ explanation: Za prijavo bo zahtevan žeton, ustvarjen s povezano aplikacijo TOTP.
subject: 'Mastodon: dvojno preverjanje pristnosti je omogočeno'
+ subtitle: Dvo-faktorsko preverjanje pristnosti za vaš račun je bilo omogočeno.
title: 2FA omogočeno
two_factor_recovery_codes_changed:
explanation: Prejšnje obnovitvene kode so postale neveljavne in ustvarjene so bile nove.
subject: 'Mastodon: varnostne obnovitvene kode za dvojno preverjanje pristnosti so ponovno izdelane'
+ subtitle: Prejšnje kode za obnovitev so bile razveljavljene, ustvarjene pa so bile nove.
title: obnovitvene kode 2FA spremenjene
unlock_instructions:
subject: 'Mastodon: navodila za odklepanje'
@@ -68,9 +73,13 @@ sl:
subject: 'Mastodon: varnostna koda izbrisana'
title: Ena od vaših varnostnih kod je bila izbrisana
webauthn_disabled:
+ explanation: Preverjanje pristnosti z varnostnimi ključi za vaš račun je bilo onemogočeno.
+ extra: Prijava je sedaj mogoče le z uporabo žetona, ustvarjenega s povezano aplikacijo TOTP.
subject: 'Mastodon: overjanje pristnosti z varnosnimi kodami je onemogočeno'
title: Varnostne kode onemogočene
webauthn_enabled:
+ explanation: Preverjanje pristnosti z varnostnimi ključi za vaš račun je bilo omogočeno.
+ extra: Za prijavo sedaj lahko uporabite svoj varnostni ključ.
subject: 'Mastodon: preverjanje pristnosti z varnostno kodo je omogočeno'
title: Varnostne kode omogočene
omniauth_callbacks:
diff --git a/config/locales/devise.sq.yml b/config/locales/devise.sq.yml
index 7cea2f8e2e..32136a0baa 100644
--- a/config/locales/devise.sq.yml
+++ b/config/locales/devise.sq.yml
@@ -47,14 +47,19 @@ sq:
subject: 'Mastodon: Udhëzime ricaktimi fjalëkalimi'
title: Ricaktim fjalëkalimi
two_factor_disabled:
+ explanation: Hyrja tanimë është e mundshme duke përdorur vetëm adresë email dhe fjalëkalim.
subject: 'Mastodon: U çaktivizua mirëfilltësimi dyfaktorësh'
+ subtitle: Mirëfilltësimi dyfaktorësh për llogarinë tuaj është çaktivizuar.
title: 2FA u çaktivizua
two_factor_enabled:
+ explanation: Për të kryer hyrjen do të kërkohet doemos një token i prodhuar nga aplikacioni TOTP i çiftuar.
subject: 'Mastodon: U aktivizua mirëfilltësimi dyfaktorësh'
+ subtitle: Për llogarinë tuaj është aktivizuar mirëfilltësmi dyfaktorësh.
title: 2FA u aktivizua
two_factor_recovery_codes_changed:
explanation: Kodet e dikurshëm të rikthimit janë bërë të pavlefshëm dhe janë prodhuar të rinj.
subject: 'Mastodon: U riprodhuan kode rikthimi dyfaktorësh'
+ subtitle: Kodet e dikurshëm të rikthimit janë bërë të pavlefshëm dhe janë prodhuar të rinj.
title: Kodet e rikthimit 2FA u ndryshuan
unlock_instructions:
subject: 'Mastodon: Udhëzime shkyçjeje'
@@ -68,9 +73,13 @@ sq:
subject: 'Mastodon: Fshirje kyçi sigurie'
title: Një nga kyçet tuaj të sigurisë është fshirë
webauthn_disabled:
+ explanation: Mirëfilltësimi me kyçe sigurie është çaktivizuar për llogarinë tuaj.
+ extra: Hyrjet tani janë të mundshme vetëm duke përdorur token-in e prodhuar nga aplikacioni TOTP i çiftuar.
subject: 'Mastodon: U çaktivizua mirëfilltësimi me kyçe sigurie'
title: U çaktivizuan kyçe sigurie
webauthn_enabled:
+ explanation: Mirëfilltësimi me kyçe sigurie është aktivizuar për këtë llogari.
+ extra: Kyçi juaj i sigurisë tanimë mund të përdoret për hyrje.
subject: 'Mastodon: U aktivizua mirëfilltësim me kyçe sigurie'
title: U aktivizuan kyçe sigurie
omniauth_callbacks:
diff --git a/config/locales/devise.sv.yml b/config/locales/devise.sv.yml
index b089f21427..6544f426bd 100644
--- a/config/locales/devise.sv.yml
+++ b/config/locales/devise.sv.yml
@@ -77,6 +77,7 @@ sv:
subject: 'Mastodon: Autentisering med säkerhetsnycklar är inaktiverat'
title: Säkerhetsnycklar inaktiverade
webauthn_enabled:
+ extra: Din säkerhetsnyckel kan nu användas för inloggning.
subject: 'Mastodon: Autentisering med säkerhetsnyckel är aktiverat'
title: Säkerhetsnycklar aktiverade
omniauth_callbacks:
diff --git a/config/locales/devise.th.yml b/config/locales/devise.th.yml
index 13fdea3fef..40baabcf75 100644
--- a/config/locales/devise.th.yml
+++ b/config/locales/devise.th.yml
@@ -47,14 +47,19 @@ th:
subject: 'Mastodon: คำแนะนำการตั้งรหัสผ่านใหม่'
title: การตั้งรหัสผ่านใหม่
two_factor_disabled:
+ explanation: ตอนนี้สามารถเข้าสู่ระบบได้โดยใช้เพียงที่อยู่อีเมลและรหัสผ่านเท่านั้น
subject: 'Mastodon: ปิดใช้งานการรับรองความถูกต้องด้วยสองปัจจัยแล้ว'
+ subtitle: ปิดใช้งานการรับรองความถูกต้องด้วยสองปัจจัยสำหรับบัญชีของคุณแล้ว
title: ปิดใช้งาน 2FA แล้ว
two_factor_enabled:
+ explanation: จะต้องใช้โทเคนที่สร้างโดยแอป TOTP ที่จับคู่สำหรับการเข้าสู่ระบบ
subject: 'Mastodon: เปิดใช้งานการรับรองความถูกต้องด้วยสองปัจจัยแล้ว'
+ subtitle: เปิดใช้งานการรับรองความถูกต้องด้วยสองปัจจัยสำหรับบัญชีของคุณแล้ว
title: เปิดใช้งาน 2FA แล้ว
two_factor_recovery_codes_changed:
- explanation: ยกเลิกรหัสกู้คืนก่อนหน้านี้และสร้างรหัสใหม่แล้ว
+ explanation: ยกเลิกรหัสกู้คืนก่อนหน้านี้และสร้างรหัสกู้คืนใหม่แล้ว
subject: 'Mastodon: สร้างรหัสกู้คืนสองปัจจัยใหม่แล้ว'
+ subtitle: ยกเลิกรหัสกู้คืนก่อนหน้านี้และสร้างรหัสกู้คืนใหม่แล้ว
title: เปลี่ยนรหัสกู้คืน 2FA แล้ว
unlock_instructions:
subject: 'Mastodon: คำแนะนำการปลดล็อค'
@@ -68,9 +73,13 @@ th:
subject: 'Mastodon: ลบกุญแจความปลอดภัยแล้ว'
title: ลบหนึ่งในกุญแจความปลอดภัยของคุณแล้ว
webauthn_disabled:
+ explanation: ปิดใช้งานการรับรองความถูกต้องด้วยกุญแจความปลอดภัยสำหรับบัญชีของคุณแล้ว
+ extra: ตอนนี้สามารถเข้าสู่ระบบได้โดยใช้เพียงโทเคนที่สร้างโดยแอป TOTP ที่จับคู่เท่านั้น
subject: 'Mastodon: ปิดใช้งานการรับรองความถูกต้องด้วยกุญแจความปลอดภัยแล้ว'
title: ปิดใช้งานกุญแจความปลอดภัยแล้ว
webauthn_enabled:
+ explanation: เปิดใช้งานการรับรองความถูกต้องด้วยกุญแจความปลอดภัยสำหรับบัญชีของคุณแล้ว
+ extra: ตอนนี้สามารถใช้กุญแจความปลอดภัยของคุณสำหรับการเข้าสู่ระบบ
subject: 'Mastodon: เปิดใช้งานการรับรองความถูกต้องด้วยกุญแจความปลอดภัยแล้ว'
title: เปิดใช้งานกุญแจความปลอดภัยแล้ว
omniauth_callbacks:
diff --git a/config/locales/devise.zh-TW.yml b/config/locales/devise.zh-TW.yml
index 762c8eba84..06438971a7 100644
--- a/config/locales/devise.zh-TW.yml
+++ b/config/locales/devise.zh-TW.yml
@@ -47,14 +47,14 @@ zh-TW:
subject: Mastodon：重設密碼指引
title: 重設密碼
two_factor_disabled:
- explanation: 現在僅可使用電子郵件地址與密碼登入。
+ explanation: 目前僅可使用電子郵件地址與密碼登入。
subject: Mastodon：已停用兩階段驗證
- subtitle: 您帳號的兩步驟驗證已停用。
+ subtitle: 您帳號之兩階段驗證已停用。
title: 已停用兩階段驗證
two_factor_enabled:
- explanation: 登入時需要配對的 TOTP 應用程式產生的權杖。
+ explanation: 登入時需要配對的 TOTP 應用程式產生之 token。
subject: Mastodon：已啟用兩階段驗證
- subtitle: 您的帳號已啟用兩步驟驗證。
+ subtitle: 您的帳號之兩階段驗證已啟用。
title: 已啟用兩階段驗證
two_factor_recovery_codes_changed:
explanation: 之前的備用驗證碼已經失效，且已產生新的。
@@ -74,12 +74,12 @@ zh-TW:
title: 您的一支安全密鑰已經被移除
webauthn_disabled:
explanation: 您的帳號已停用安全金鑰身份驗證。
- extra: 現在僅可使用配對的 TOTP 應用程式產生的權杖登入。
+ extra: 現在僅可使用配對的 TOTP 應用程式產生之 token 登入。
subject: Mastodon：安全密鑰認證方式已停用
title: 已停用安全密鑰
webauthn_enabled:
- explanation: 您的帳號已啟用安全金鑰驗證。
- extra: 您的安全金鑰現在可用於登入。
+ explanation: 您的帳號已啟用安全金鑰身分驗證。
+ extra: 您的安全金鑰現在已可用於登入。
subject: Mastodon：已啟用安全密鑰認證
title: 已啟用安全密鑰
omniauth_callbacks:
diff --git a/config/locales/doorkeeper.ia.yml b/config/locales/doorkeeper.ia.yml
index ec85df24fc..d689354f61 100644
--- a/config/locales/doorkeeper.ia.yml
+++ b/config/locales/doorkeeper.ia.yml
@@ -17,6 +17,7 @@ ia:
index:
application: Application
delete: Deler
+ empty: Tu non ha applicationes.
name: Nomine
new: Nove application
show: Monstrar
@@ -47,6 +48,7 @@ ia:
title:
accounts: Contos
admin/accounts: Gestion de contos
+ all: Accesso plen a tu conto de Mastodon
bookmarks: Marcapaginas
conversations: Conversationes
favourites: Favoritos
@@ -61,8 +63,15 @@ ia:
applications: Applicationes
oauth2_provider: Fornitor OAuth2
scopes:
+ read:favourites: vider tu favoritos
+ read:lists: vider tu listas
+ read:notifications: vider tu notificationes
+ read:statuses: vider tote le messages
write:accounts: modificar tu profilo
+ write:blocks: blocar contos e dominios
write:favourites: messages favorite
+ write:filters: crear filtros
write:lists: crear listas
+ write:media: incargar files de medios
write:notifications: rader tu notificationes
write:statuses: publicar messages
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 78820c3b59..9d739be07f 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1547,6 +1547,9 @@ en:
errors:
limit_reached: Limit of different reactions reached
unrecognized_emoji: is not a recognized emoji
+ redirects:
+ prompt: If you trust this link, click it to continue.
+ title: You are leaving %{instance}.
relationships:
activity: Account activity
confirm_follow_selected_followers: Are you sure you want to follow selected followers?
@@ -1791,6 +1794,12 @@ en:
extra: It's now ready for download!
subject: Your archive is ready for download
title: Archive takeout
+ failed_2fa:
+ details: 'Here are details of the sign-in attempt:'
+ explanation: Someone has tried to sign in to your account but provided an invalid second authentication factor.
+ further_actions_html: If this wasn't you, we recommend that you %{action} immediately as it may be compromised.
+ subject: Second factor authentication failure
+ title: Failed second factor authentication
suspicious_sign_in:
change_password: change your password
details: 'Here are details of the sign-in:'
@@ -1844,6 +1853,7 @@ en:
go_to_sso_account_settings: Go to your identity provider's account settings
invalid_otp_token: Invalid two-factor code
otp_lost_help_html: If you lost access to both, you may get in touch with %{email}
+ rate_limited: Too many authentication attempts, try again later.
seamless_external_login: You are logged in via an external service, so password and e-mail settings are not available.
signed_in_as: 'Signed in as:'
verification:
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 1bcf36700b..beb6aa6d9f 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -309,6 +309,7 @@ eo:
unpublish: Malpublikigi
unpublished_msg: Anonco sukcese malpublikigita!
updated_msg: Anonco sukcese ĝisdatigis!
+ critical_update_pending: Kritika ĝisdatigo pritraktotas
custom_emojis:
assign_category: Atribui kategorion
by_domain: Domajno
@@ -424,6 +425,7 @@ eo:
view: Vidi domajna blokado
email_domain_blocks:
add_new: Aldoni novan
+ allow_registrations_with_approval: Permesi aliĝojn kun aprobo
attempts_over_week:
one: "%{count} provo ekde lasta semajno"
other: "%{count} registroprovoj ekde lasta semajno"
@@ -770,11 +772,21 @@ eo:
approved: Bezonas aprobi por aliĝi
none: Neniu povas aliĝi
open: Iu povas aliĝi
+ security:
+ authorized_fetch: Devigi aŭtentigon de frataraj serviloj
+ title: Agordoj de la servilo
site_uploads:
delete: Forigi elŝutitan dosieron
destroyed_msg: Reteja alŝuto sukcese forigita!
software_updates:
+ critical_update: Kritika — bonvolu ĝisdatiĝi rapide
documentation_link: Lerni pli
+ release_notes: Eldono-notoj
+ title: Disponeblaj ĝisdatigoj
+ type: Tipo
+ types:
+ major: Ĉefa eldono
+ minor: Neĉefa eldono
statuses:
account: Skribanto
application: Aplikaĵo
@@ -1259,6 +1271,9 @@ eo:
overwrite: Anstataŭigi
overwrite_long: Anstataŭigi la nunajn registrojn per la novaj
preface: Vi povas importi datumojn, kiujn vi eksportis el alia servilo, kiel liston de homoj, kiujn vi sekvas aŭ blokas.
+ states:
+ finished: Finita
+ unconfirmed: Nekonfirmita
success: Viaj datumoj estis sukcese alŝutitaj kaj estos traktitaj kiel planite
titles:
following: Importado de sekvaj kontoj
@@ -1528,6 +1543,7 @@ eo:
unknown_browser: Nekonata retumilo
weibo: Weibo
current_session: Nuna seanco
+ date: Dato
description: "%{browser} en %{platform}"
explanation: Ĉi tiuj estas la retumiloj nun ensalutintaj al via Mastodon-konto.
ip: IP
@@ -1693,6 +1709,7 @@ eo:
webauthn: Sekurecaj ŝlosiloj
user_mailer:
appeal_approved:
+ action: Konto-agordoj
explanation: La apelacio de la admono kontra via konto je %{strike_date} pri sendodato %{appeal_date} aprobitas.
subject: Via apelacio de %{date} aprobitas
title: Apelacio estis aprobita
@@ -1701,6 +1718,7 @@ eo:
subject: Via apelacio de %{date} estis malaprobita
title: Apelacio estis malaprobita
backup_ready:
+ extra: Estas nun preta por elŝuto!
subject: Via arkivo estas preta por elŝutado
title: Arkiva elŝuto
suspicious_sign_in:
@@ -1756,6 +1774,7 @@ eo:
go_to_sso_account_settings: Iru al la agordoj de la konto de via identeca provizanto
invalid_otp_token: Nevalida kodo de dufaktora aŭtentigo
otp_lost_help_html: Se vi perdas aliron al ambaŭ, vi povas kontakti %{email}
+ rate_limited: Estas tro multaj aŭtentigaj provoj, reprovu poste.
seamless_external_login: Vi estas ensalutinta per ekstera servo, do pasvortaj kaj retadresaj agordoj ne estas disponeblaj.
signed_in_as: 'Salutinta kiel:'
verification:
diff --git a/config/locales/es-AR.yml b/config/locales/es-AR.yml
index 26c18b5feb..d1dbdbf0b8 100644
--- a/config/locales/es-AR.yml
+++ b/config/locales/es-AR.yml
@@ -1546,6 +1546,9 @@ es-AR:
errors:
limit_reached: Se alcanzó el límite de reacciones diferentes
unrecognized_emoji: no es un emoji conocido
+ redirects:
+ prompt: Si confiás en este enlace, dale clic o un toque para continuar.
+ title: Estás dejando %{instance}.
relationships:
activity: Actividad de la cuenta
confirm_follow_selected_followers: "¿Estás seguro que querés seguir a los seguidores seleccionados?"
@@ -1790,6 +1793,12 @@ es-AR:
extra: "¡Ya está lista para descargar!"
subject: Tu archivo historial está listo para descargar
title: Descargar archivo historial
+ failed_2fa:
+ details: 'Estos son los detalles del intento de inicio de sesión:'
+ explanation: Alguien intentó iniciar sesión en tu cuenta pero proporcionó un segundo factor de autenticación no válido.
+ further_actions_html: Si vos no fuiste, te recomendamos que %{action} inmediatamente, ya que la seguridad de tu cuenta podría estar comprometida.
+ subject: Fallo de autenticación del segundo factor
+ title: Fallo en la autenticación del segundo factor
suspicious_sign_in:
change_password: cambiés tu contraseña
details: 'Acá están los detalles del inicio de sesión:'
@@ -1843,6 +1852,7 @@ es-AR:
go_to_sso_account_settings: Andá a la configuración de cuenta de tu proveedor de identidad
invalid_otp_token: Código de dos factores no válido
otp_lost_help_html: Si perdiste al acceso a ambos, podés ponerte en contacto con %{email}
+ rate_limited: Demasiados intentos de autenticación; intentá de nuevo más tarde.
seamless_external_login: Iniciaste sesión desde un servicio externo, así que la configuración de contraseña y correo electrónico no están disponibles.
signed_in_as: 'Iniciaste sesión como:'
verification:
diff --git a/config/locales/es-MX.yml b/config/locales/es-MX.yml
index 32178d0b04..4d228e98d4 100644
--- a/config/locales/es-MX.yml
+++ b/config/locales/es-MX.yml
@@ -1546,6 +1546,9 @@ es-MX:
errors:
limit_reached: Límite de reacciones diferentes alcanzado
unrecognized_emoji: no es un emoji conocido
+ redirects:
+ prompt: Si confías en este enlace, púlsalo para continuar.
+ title: Vas a salir de %{instance}.
relationships:
activity: Actividad de la cuenta
confirm_follow_selected_followers: "¿Estás seguro de que quieres seguir a las cuentas seleccionadas?"
@@ -1790,6 +1793,12 @@ es-MX:
extra: "¡Ya está listo para descargar!"
subject: Tu archivo está preparado para descargar
title: Descargar archivo
+ failed_2fa:
+ details: 'Estos son los detalles del intento de inicio de sesión:'
+ explanation: Alguien ha intentado iniciar sesión en tu cuenta pero proporcionó un segundo factor de autenticación inválido.
+ further_actions_html: Si no fuiste tú, se recomienda %{action} inmediatamente ya que puede estar comprometido.
+ subject: Fallo de autenticación de segundo factor
+ title: Falló la autenticación de segundo factor
suspicious_sign_in:
change_password: cambies tu contraseña
details: 'Aquí están los detalles del inicio de sesión:'
@@ -1843,6 +1852,7 @@ es-MX:
go_to_sso_account_settings: Diríjete a la configuración de la cuenta de su proveedor de identidad
invalid_otp_token: Código de dos factores incorrecto
otp_lost_help_html: Si perdiste al acceso a ambos, puedes ponerte en contancto con %{email}
+ rate_limited: Demasiados intentos de autenticación, inténtalo de nuevo más tarde.
seamless_external_login: Has iniciado sesión desde un servicio externo, así que los ajustes de contraseña y correo no están disponibles.
signed_in_as: 'Sesión iniciada como:'
verification:
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 9235b985fb..08fc0988e4 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1546,6 +1546,9 @@ es:
errors:
limit_reached: Límite de reacciones diferentes alcanzado
unrecognized_emoji: no es un emoji conocido
+ redirects:
+ prompt: Si confías en este enlace, púlsalo para continuar.
+ title: Vas a salir de %{instance}.
relationships:
activity: Actividad de la cuenta
confirm_follow_selected_followers: "¿Estás seguro de que quieres seguir a las cuentas seleccionadas?"
@@ -1790,6 +1793,12 @@ es:
extra: "¡Ya está listo para descargar!"
subject: Tu archivo está preparado para descargar
title: Descargar archivo
+ failed_2fa:
+ details: 'Estos son los detalles del intento de inicio de sesión:'
+ explanation: Alguien ha intentado iniciar sesión en tu cuenta pero proporcionó un segundo factor de autenticación inválido.
+ further_actions_html: Si no fuiste tú, se recomienda %{action} inmediatamente ya que puede estar comprometida.
+ subject: Fallo de autenticación del segundo factor
+ title: Fallo en la autenticación del segundo factor
suspicious_sign_in:
change_password: cambies tu contraseña
details: 'Aquí están los detalles del inicio de sesión:'
@@ -1843,6 +1852,7 @@ es:
go_to_sso_account_settings: Diríjase a la configuración de la cuenta de su proveedor de identidad
invalid_otp_token: Código de dos factores incorrecto
otp_lost_help_html: Si perdiste al acceso a ambos, puedes ponerte en contancto con %{email}
+ rate_limited: Demasiados intentos de autenticación, inténtalo de nuevo más tarde.
seamless_external_login: Has iniciado sesión desde un servicio externo, así que los ajustes de contraseña y correo no están disponibles.
signed_in_as: 'Sesión iniciada como:'
verification:
diff --git a/config/locales/et.yml b/config/locales/et.yml
index 71f49e1abb..f82ee6cb8f 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -1792,6 +1792,12 @@ et:
extra: See on nüüd allalaadimiseks valmis!
subject: Arhiiv on allalaadimiseks valmis
title: Arhiivi väljavõte
+ failed_2fa:
+ details: 'Sisenemise üksikasjad:'
+ explanation: Keegi püüdis Su kontole siseneda, ent sisestas vale teisese autentimisfaktori.
+ further_actions_html: Kui see polnud Sina, siis soovitame viivitamata %{action}, kuna see võib olla lekkinud.
+ subject: Kaheastmelise autentimise nurjumine
+ title: Kaheastmeline autentimine nurjus
suspicious_sign_in:
change_password: muuta oma salasõna
details: 'Sisenemise üksikasjad:'
@@ -1848,6 +1854,7 @@ et:
go_to_sso_account_settings: Mine oma idenditeedipakkuja kontosätetesse
invalid_otp_token: Vale kaheastmeline võti
otp_lost_help_html: Kui kaotasid ligipääsu mõlemale, saad võtta ühendust %{email}-iga
+ rate_limited: Liiga palju autentimise katseid, proovi hiljem uuesti.
seamless_external_login: Välise teenuse kaudu sisse logides pole salasõna ja e-posti sätted saadaval.
signed_in_as: 'Sisse logitud kasutajana:'
verification:
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 4b91f7a524..44688577a9 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -1550,6 +1550,9 @@ eu:
errors:
limit_reached: Erreakzio desberdinen muga gaindituta
unrecognized_emoji: ez da emoji ezaguna
+ redirects:
+ prompt: Esteka honetan fidatzen bazara, egin klik jarraitzeko.
+ title: "%{instance} instantziatik zoaz."
relationships:
activity: Kontuaren aktibitatea
confirm_follow_selected_followers: Ziur hautatutako jarraitzaileei jarraitu nahi dituzula?
@@ -1794,6 +1797,12 @@ eu:
extra: Deskargatzeko prest!
subject: Zure artxiboa deskargatzeko prest dago
title: Artxiboa jasotzea
+ failed_2fa:
+ details: 'Hemen dituzu saio-hasieraren saiakeraren xehetasunak:'
+ explanation: Norbait zure kontuan saioa hasten saiatu da, baina bigarren autentifikazioaren faktore baliogabea eman du.
+ further_actions_html: Ez bazara zu izan, "%{action}" ekintza berehala egitea gomendatzen dugu, kontua arriskarazi daiteke eta.
+ subject: Autentifikazioaren bigarren faktoreak huts egin du
+ title: Huts egin duen autentifikazioaren bigarren faktorea
suspicious_sign_in:
change_password: aldatu pasahitza
details: 'Hemen daude saio hasieraren xehetasunak:'
@@ -1847,6 +1856,7 @@ eu:
go_to_sso_account_settings: Jo zure identitate-hornitzaileko kontuaren ezarpenetara
invalid_otp_token: Bi faktoreetako kode baliogabea
otp_lost_help_html: 'Bietara sarbidea galdu baduzu, jarri kontaktuan hemen: %{email}'
+ rate_limited: Autentifikazio saiakera gehiegi, saiatu berriro geroago.
seamless_external_login: Kanpo zerbitzu baten bidez hasi duzu saioa, beraz pasahitza eta e-mail ezarpenak ez daude eskuragarri.
signed_in_as: 'Saioa honela hasita:'
verification:
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index a719f3496f..856532f8f1 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -1546,6 +1546,9 @@ fi:
errors:
limit_reached: Erilaisten reaktioiden raja saavutettu
unrecognized_emoji: ei ole tunnistettu emoji
+ redirects:
+ prompt: Jos luotat tähän linkkiin, jatka napsauttamalla.
+ title: Olet poistumassa palvelimelta %{instance}.
relationships:
activity: Tilin aktiivisuus
confirm_follow_selected_followers: Haluatko varmasti seurata valittuja seuraajia?
@@ -1608,6 +1611,7 @@ fi:
unknown_browser: Tuntematon selain
weibo: Weibo
current_session: Nykyinen istunto
+ date: Päiväys
description: "%{browser} alustalla %{platform}"
explanation: Nämä verkkoselaimet ovat tällä hetkellä kirjautuneena Mastodon-tilillesi.
ip: IP-osoite
@@ -1774,16 +1778,27 @@ fi:
webauthn: Suojausavaimet
user_mailer:
appeal_approved:
+ action: Tilin asetukset
explanation: Valitus tiliäsi koskevasta varoituksesta %{strike_date} jonka lähetit %{appeal_date} on hyväksytty. Tilisi on jälleen hyvässä kunnossa.
subject: Valituksesi %{date} on hyväksytty
+ subtitle: Tilisi on jälleen normaalissa tilassa.
title: Valitus hyväksytty
appeal_rejected:
explanation: Valitus tiliäsi koskevasta varoituksesta %{strike_date} jonka lähetit %{appeal_date} on hylätty.
subject: Valituksesi %{date} on hylätty
+ subtitle: Vetoomuksesi on hylätty.
title: Valitus hylätty
backup_ready:
+ explanation: Olet pyytänyt täyden varmuuskopion Mastodon-tilistäsi.
+ extra: Se on nyt valmis ladattavaksi!
subject: Arkisto on valmiina ladattavaksi
title: Arkiston tallennus
+ failed_2fa:
+ details: 'Tässä on tietoja kirjautumisyrityksestä:'
+ explanation: Joku on yrittänyt kirjautua tilillesi mutta on antanut virheellisen toisen vaiheen todennustekijän.
+ further_actions_html: Jos se et ollut sinä, suosittelemme, että %{action} välittömästi, sillä se on saattanut vaarantua.
+ subject: Kaksivaiheisen todennuksen virhe
+ title: Epäonnistunut kaksivaiheinen todennus
suspicious_sign_in:
change_password: vaihda salasanasi
details: 'Tässä on tiedot kirjautumisesta:'
@@ -1837,6 +1852,7 @@ fi:
go_to_sso_account_settings: Avaa identiteettitarjoajasi tiliasetukset
invalid_otp_token: Virheellinen kaksivaiheisen todentamisen koodi
otp_lost_help_html: Jos sinulla ei ole pääsyä kumpaankaan, voit ottaa yhteyden osoitteeseen %{email}
+ rate_limited: Liian monta todennusyritystä. Yritä myöhemmin uudelleen.
seamless_external_login: Olet kirjautunut ulkoisen palvelun kautta, joten salasana- ja sähköpostiasetukset eivät ole käytettävissä.
signed_in_as: 'Kirjautunut tilillä:'
verification:
diff --git a/config/locales/fo.yml b/config/locales/fo.yml
index 03a525fa5d..10b1e76f5f 100644
--- a/config/locales/fo.yml
+++ b/config/locales/fo.yml
@@ -1546,6 +1546,9 @@ fo:
errors:
limit_reached: Mark fyri ymisk aftursvar rokkið
unrecognized_emoji: er ikki eitt kenslutekn, sum kennist aftur
+ redirects:
+ prompt: Um tú lítir á hetta leinkið, so kanst tú klikkja á tað fyri at halda fram.
+ title: Tú fer burtur úr %{instance}.
relationships:
activity: Kontuvirksemi
confirm_follow_selected_followers: Vil tú veruliga fylgja valdu fylgjarunum?
@@ -1790,6 +1793,12 @@ fo:
extra: Tað er nú klárt at taka niður!
subject: Savnið hjá tær er tøkt at taka niður
title: Tak savn niður
+ failed_2fa:
+ details: 'Her eru smálutirnir í innritanarroyndini:'
+ explanation: Onkur hevur roynt at rita inn á tína kontu, men gav eitt ógildugt seinna samgildi.
+ further_actions_html: Um hetta ikki var tú, so skjóta vit upp, at tú %{action} beinan vegin, tí tað kann vera sett í vanda.
+ subject: Seinna samgildi miseydnaðist
+ title: Miseydnað seinna samgildi
suspicious_sign_in:
change_password: broyt loyniorðið hjá tær
details: 'Her eru smálutirnir í innritanini:'
@@ -1843,6 +1852,7 @@ fo:
go_to_sso_account_settings: Far til kontustillingarnar hjá samleikaveitaranum hjá tær
invalid_otp_token: Ógyldug tvey-stigs koda
otp_lost_help_html: Hevur tú mist atgongd til bæði, so kanst tú koma í samband við %{email}
+ rate_limited: Ov nógvar samgildisroyndir, royn aftur seinni.
seamless_external_login: Tú er ritað/ur inn umvegis eina uttanhýsis tænastu, so loyniorð og teldupoststillingar eru ikki tøkar.
signed_in_as: 'Ritað/ur inn sum:'
verification:
diff --git a/config/locales/fr-CA.yml b/config/locales/fr-CA.yml
index dbdff5f52c..3676d0b7b5 100644
--- a/config/locales/fr-CA.yml
+++ b/config/locales/fr-CA.yml
@@ -1546,6 +1546,9 @@ fr-CA:
errors:
limit_reached: Limite de réactions différentes atteinte
unrecognized_emoji: n’est pas un émoji reconnu
+ redirects:
+ prompt: Si vous faites confiance à ce lien, cliquez pour continuer.
+ title: Vous quittez %{instance}.
relationships:
activity: Activité du compte
confirm_follow_selected_followers: Voulez-vous vraiment suivre les abonné⋅e⋅s sélectionné⋅e⋅s ?
@@ -1790,6 +1793,12 @@ fr-CA:
extra: Elle est maintenant prête à être téléchargée !
subject: Votre archive est prête à être téléchargée
title: Récupération de l’archive
+ failed_2fa:
+ details: 'Voici les détails de la tentative de connexion :'
+ explanation: Quelqu'un a essayé de se connecter à votre compte mais a fourni un second facteur d'authentification invalide.
+ further_actions_html: Si ce n'était pas vous, nous vous recommandons %{action} immédiatement car il pourrait être compromis.
+ subject: Échec de l'authentification à double facteur
+ title: Échec de l'authentification à double facteur
suspicious_sign_in:
change_password: changer votre mot de passe
details: 'Voici les détails de la connexion :'
@@ -1843,6 +1852,7 @@ fr-CA:
go_to_sso_account_settings: Accédez aux paramètres du compte de votre fournisseur d'identité
invalid_otp_token: Le code d’authentification à deux facteurs est invalide
otp_lost_help_html: Si vous perdez accès aux deux, vous pouvez contacter %{email}
+ rate_limited: Trop de tentatives d'authentification, réessayez plus tard.
seamless_external_login: Vous êtes connecté via un service externe, donc les paramètres concernant le mot de passe et le courriel ne sont pas disponibles.
signed_in_as: 'Connecté·e en tant que :'
verification:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index fe1a219a31..a3aaf7a26e 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -1546,6 +1546,9 @@ fr:
errors:
limit_reached: Limite de réactions différentes atteinte
unrecognized_emoji: n’est pas un émoji reconnu
+ redirects:
+ prompt: Si vous faites confiance à ce lien, cliquez pour continuer.
+ title: Vous quittez %{instance}.
relationships:
activity: Activité du compte
confirm_follow_selected_followers: Voulez-vous vraiment suivre les abonné⋅e⋅s sélectionné⋅e⋅s ?
@@ -1790,6 +1793,12 @@ fr:
extra: Elle est maintenant prête à être téléchargée !
subject: Votre archive est prête à être téléchargée
title: Récupération de l’archive
+ failed_2fa:
+ details: 'Voici les détails de la tentative de connexion :'
+ explanation: Quelqu'un a essayé de se connecter à votre compte mais a fourni un second facteur d'authentification invalide.
+ further_actions_html: Si ce n'était pas vous, nous vous recommandons %{action} immédiatement car il pourrait être compromis.
+ subject: Échec de l'authentification à double facteur
+ title: Échec de l'authentification à double facteur
suspicious_sign_in:
change_password: changer votre mot de passe
details: 'Voici les détails de la connexion :'
@@ -1843,6 +1852,7 @@ fr:
go_to_sso_account_settings: Accédez aux paramètres du compte de votre fournisseur d'identité
invalid_otp_token: Le code d’authentification à deux facteurs est invalide
otp_lost_help_html: Si vous perdez accès aux deux, vous pouvez contacter %{email}
+ rate_limited: Trop de tentatives d'authentification, réessayez plus tard.
seamless_external_login: Vous êtes connecté via un service externe, donc les paramètres concernant le mot de passe et le courriel ne sont pas disponibles.
signed_in_as: 'Connecté·e en tant que :'
verification:
diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index 1d648f4790..c59ad72725 100644
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -1790,6 +1790,12 @@ fy:
extra: It stiet no klear om download te wurden!
subject: Jo argyf stiet klear om download te wurden
title: Argyf ophelje
+ failed_2fa:
+ details: 'Hjir binne de details fan de oanmeldbesykjen:'
+ explanation: Ien hat probearre om oan te melden op jo account, mar hat in ûnjildige twaddeferifikaasjefaktor opjûn.
+ further_actions_html: As jo dit net wiene, rekommandearje wy jo oan daliks %{action}, omdat it kompromitearre wêze kin.
+ subject: Twaddefaktorautentikaasjeflater
+ title: Twastapsferifikaasje mislearre
suspicious_sign_in:
change_password: wizigje jo wachtwurd
details: 'Hjir binne de details fan oanmeldbesykjen:'
@@ -1843,6 +1849,7 @@ fy:
go_to_sso_account_settings: Gean nei de accountynstellingen fan jo identiteitsprovider
invalid_otp_token: Unjildige twa-stapstagongskoade
otp_lost_help_html: As jo tagong ta beide kwytrekke binne, nim dan kontakt op fia %{email}
+ rate_limited: Te folle autentikaasjebesykjen, probearje it letter opnij.
seamless_external_login: Jo binne oanmeld fia in eksterne tsjinst, dêrom binne wachtwurden en e-mailynstellingen net beskikber.
signed_in_as: 'Oanmeld as:'
verification:
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 1398f6ad0b..7b3fd1a6eb 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -1546,6 +1546,9 @@ gl:
errors:
limit_reached: Acadouse o límite das diferentes reaccións
unrecognized_emoji: non é unha emoticona recoñecida
+ redirects:
+ prompt: Se confías nesta ligazón, preme nela para continuar.
+ title: Vas saír de %{instance}.
relationships:
activity: Actividade da conta
confirm_follow_selected_followers: Tes a certeza de querer seguir as seguidoras seleccionadas?
@@ -1790,6 +1793,12 @@ gl:
extra: Está preparada para descargala!
subject: O teu ficheiro xa está preparado para descargar
title: Leve o ficheiro
+ failed_2fa:
+ details: 'Detalles do intento de acceso:'
+ explanation: Alguén intentou acceder á túa conta mais fíxoo cun segundo factor de autenticación non válido.
+ further_actions_html: Se non foches ti, recomendámosche %{action} inmediatamente xa que a conta podería estar en risco.
+ subject: Fallo co segundo factor de autenticación
+ title: Fallou o segundo factor de autenticación
suspicious_sign_in:
change_password: cambia o teu contrasinal
details: 'Estos son os detalles do acceso:'
@@ -1843,6 +1852,7 @@ gl:
go_to_sso_account_settings: Ir aos axustes da conta no teu provedor de identidade
invalid_otp_token: O código do segundo factor non é válido
otp_lost_help_html: Se perdes o acceso a ambos, podes contactar con %{email}
+ rate_limited: Demasiados intentos de autenticación, inténtao máis tarde.
seamless_external_login: Accedeches a través dun servizo externo, polo que os axustes de contrasinal e email non están dispoñibles.
signed_in_as: 'Rexistrada como:'
verification:
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 2969cf33e8..05b52213a7 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -1598,6 +1598,9 @@ he:
errors:
limit_reached: גבול מספר התגובות השונות הושג
unrecognized_emoji: הוא לא אמוג'י מוכר
+ redirects:
+ prompt: יש ללחוץ על הקישור, אם לדעתך ניתן לסמוך עליו.
+ title: יציאה מתוך %{instance}.
relationships:
activity: רמת פעילות
confirm_follow_selected_followers: האם את/ה בטוח/ה שברצונך לעקוב אחרי החשבונות שסומנו?
@@ -1854,6 +1857,12 @@ he:
extra: הגיבוי מוכן להורדה!
subject: הארכיון שלך מוכן להורדה
title: הוצאת ארכיון
+ failed_2fa:
+ details: 'הנה פרטי נסיון ההתחברות:'
+ explanation: פלוני אלמוני ניסה להתחבר לחשבונך אך האימות המשני נכשל.
+ further_actions_html: אם הנסיון לא היה שלך, אנו ממליצים על %{action} באופן מיידי כדי שהחשבון לא יפול קורבן.
+ subject: נכשל אימות בגורם שני
+ title: אימות בגורם שני נכשל
suspicious_sign_in:
change_password: שינוי הסיסמא שלך
details: 'הנה פרטי ההתחברות:'
@@ -1907,6 +1916,7 @@ he:
go_to_sso_account_settings: מעבר לאפיוני החשבון שלך בשרת הזהות
invalid_otp_token: קוד דו-שלבי שגוי
otp_lost_help_html: אם איבדת גישה לשניהם, ניתן ליצור קשר ב-%{email}
+ rate_limited: יותר מדי ניסיונות אימות, נסו שוב מאוחר יותר.
seamless_external_login: את.ה מחובר דרך שירות חיצוני, לכן אפשרויות הסיסמא והדוא"ל לא מאופשרות.
signed_in_as: 'מחובר בתור:'
verification:
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 536af8b6b5..8cbbb64c97 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -1546,6 +1546,8 @@ hu:
errors:
limit_reached: A különböző reakciók száma elérte a határértéket
unrecognized_emoji: nem ismert emodzsi
+ redirects:
+ prompt: Ha megbízunk ebben a hivatkozásban, kattintsunk rá a folytatáshoz.
relationships:
activity: Fiók aktivitás
confirm_follow_selected_followers: Biztos, hogy követni akarod a kiválasztott követőket?
@@ -1608,6 +1610,7 @@ hu:
unknown_browser: Ismeretlen böngésző
weibo: Weibo
current_session: Jelenlegi munkamenet
+ date: Dátum
description: "%{browser} az alábbi platformon: %{platform}"
explanation: Jelenleg az alábbi böngészőkkel vagy bejelentkezve a fiókodba.
ip: IP
@@ -1774,16 +1777,27 @@ hu:
webauthn: Biztonsági kulcsok
user_mailer:
appeal_approved:
+ action: Fiók Beállításai
explanation: A fiókod %{appeal_date}-i fellebbezése, mely a %{strike_date}-i vétségeddel kapcsolatos, jóváhagyásra került. A fiókod megint makulátlan.
subject: A %{date}-i fellebbezésedet jóváhagyták
+ subtitle: A fiókod ismét használható állapotban van.
title: Fellebbezés jóváhagyva
appeal_rejected:
explanation: A %{appeal_date}-i fellebbezésed, amely a fiókod %{strike_date}-i vétségével kapcsolatos, elutasításra került.
subject: A %{date}-i fellebbezésedet visszautasították
+ subtitle: A fellebbezésedet visszautasították.
title: Fellebbezés visszautasítva
backup_ready:
+ explanation: A Mastodon fiókod teljes biztonsági mentését kérted.
+ extra: Már letöltésre kész!
subject: Az adataidról készült archív letöltésre kész
title: Archiválás
+ failed_2fa:
+ details: 'Itt vannak a bejelentkezési kísérlet részletei:'
+ explanation: Valaki megpróbált bejelentkezni a fiókodba, de a második hitelesítési lépése érvénytelen volt.
+ further_actions_html: Ha ez nem te voltál, azt javasoljuk, hogy azonnal %{action}, mivel lehetséges, hogy az rossz kezekbe került.
+ subject: Második körös hitelesítés sikertelen
+ title: Sikertelen a második körös hitelesítés
suspicious_sign_in:
change_password: módosítsd a jelszavad
details: 'Itt vannak a bejelentkezés részletei:'
@@ -1837,6 +1851,7 @@ hu:
go_to_sso_account_settings: Ugrás az azonosítási szolgáltatód fiókbeállításaihoz
invalid_otp_token: Érvénytelen ellenőrző kód
otp_lost_help_html: Ha mindkettőt elvesztetted, kérhetsz segítséget itt %{email}
+ rate_limited: Túl sok hiteleítési kísérlet történt. Próbáld újra később.
seamless_external_login: Külső szolgáltatáson keresztül jelentkeztél be, így a jelszó és e-mail beállítások nem elérhetőek.
signed_in_as: Bejelentkezve mint
verification:
diff --git a/config/locales/ie.yml b/config/locales/ie.yml
index c8cd5d5f8d..c77a8f802d 100644
--- a/config/locales/ie.yml
+++ b/config/locales/ie.yml
@@ -1786,6 +1786,7 @@ ie:
subtitle: Tui apelle ha esset rejectet.
title: Apelle rejectet
backup_ready:
+ explanation: Tu petit un complet archive de tui conto de Mastodon.
extra: It es ja pret a descargar!
subject: Tui archive es pret por descargar
title: Descargar archive
@@ -1842,6 +1843,7 @@ ie:
go_to_sso_account_settings: Ear al parametres de conto de tui provisor de identification
invalid_otp_token: Ínvalid 2-factor code
otp_lost_help_html: Si tu perdit accesse a ambis, tu posse contacter %{email}
+ rate_limited: Tro mult de provas de autentication, ples provar denov plu tard.
seamless_external_login: Tu ha intrat per un servicie external, dunc parametres pri tui passa-parol e email-adresse ne es disponibil.
signed_in_as: 'Session apertet quam:'
verification:
diff --git a/config/locales/is.yml b/config/locales/is.yml
index 9f8d5d42dc..d374c60755 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -1550,6 +1550,9 @@ is:
errors:
limit_reached: Hámarki mismunandi viðbragða náð
unrecognized_emoji: er ekki þekkt tjáningartákn
+ redirects:
+ prompt: Ef þú treystir þessum tengli, geturðu smellt á hann til að halda áfram.
+ title: Þú ert að yfirgefa %{instance}.
relationships:
activity: Virkni aðgangs
confirm_follow_selected_followers: Ertu viss um að þú viljir fylgjast með völdum fylgjendum?
@@ -1794,6 +1797,12 @@ is:
extra: Það er núna tilbúið til niðurhals!
subject: Safnskráin þín er tilbúin til niðurhals
title: Taka út í safnskrá
+ failed_2fa:
+ details: 'Hér eru nánari upplýsingar um innskráningartilraunina:'
+ explanation: Einhver reyndi að skrá sig inn á aðganginn þinn en gaf upp ógild gögn seinna þrepi auðkenningar.
+ further_actions_html: Ef þetta varst ekki þú, þá mælum við eindregið með því að þú %{action} samstundis, þar sem það gæti verið berskjaldað.
+ subject: Bilun í seinna þrepi auðkenningar
+ title: Seinna þrep auðkenningar brást
suspicious_sign_in:
change_password: breytir lykilorðinu þínu
details: 'Hér eru nánari upplýsingar um innskráninguna:'
@@ -1847,6 +1856,7 @@ is:
go_to_sso_account_settings: Fara í stillingar aðgangsins hjá auðkennisveitunni þinni
invalid_otp_token: Ógildur tveggja-þátta kóði
otp_lost_help_html: Ef þú hefur misst aðganginn að hvoru tveggja, geturðu sett þig í samband við %{email}
+ rate_limited: Of margar tilraunir til auðkenningar, prófaðu aftur síðar.
seamless_external_login: Innskráning þín er í gegnum utanaðkomandi þjónustu, þannig að stillingar fyrir lykilorð og tölvupóst eru ekki aðgengilegar.
signed_in_as: 'Skráð inn sem:'
verification:
diff --git a/config/locales/it.yml b/config/locales/it.yml
index a17fae4804..31de2252d1 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -1548,6 +1548,9 @@ it:
errors:
limit_reached: Raggiunto il limite di reazioni diverse
unrecognized_emoji: non è un emoji riconosciuto
+ redirects:
+ prompt: Se ti fidi di questo collegamento, fai clic su di esso per continuare.
+ title: Stai lasciando %{instance}.
relationships:
activity: Attività dell'account
confirm_follow_selected_followers: Sei sicuro di voler seguire i follower selezionati?
@@ -1792,6 +1795,12 @@ it:
extra: Ora è pronto per il download!
subject: Il tuo archivio è pronto per essere scaricato
title: Esportazione archivio
+ failed_2fa:
+ details: 'Questi sono i dettagli del tentativo di accesso:'
+ explanation: Qualcuno ha tentato di accedere al tuo account ma ha fornito un secondo fattore di autenticazione non valido.
+ further_actions_html: Se non eri tu, ti consigliamo di %{action} immediatamente poiché potrebbe essere compromesso.
+ subject: Errore di autenticazione del secondo fattore
+ title: Autenticazione del secondo fattore non riuscita
suspicious_sign_in:
change_password: cambiare la tua password
details: 'Questi sono i dettagli del tentativo di accesso:'
@@ -1845,6 +1854,7 @@ it:
go_to_sso_account_settings: Vai alle impostazioni dell'account del tuo provider di identità
invalid_otp_token: Codice d'accesso non valido
otp_lost_help_html: Se perdessi l'accesso ad entrambi, puoi entrare in contatto con %{email}
+ rate_limited: Troppi tentativi di autenticazione, per favore riprova più tardi.
seamless_external_login: Hai effettuato l'accesso tramite un servizio esterno, quindi le impostazioni di password e e-mail non sono disponibili.
signed_in_as: 'Hai effettuato l''accesso come:'
verification:
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index a68426cb53..2051e30aee 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -1758,6 +1758,12 @@ ja:
extra: ダウンロードの準備ができました！
subject: アーカイブの準備ができました
title: アーカイブの取り出し
+ failed_2fa:
+ details: '試行されたログインの詳細は以下のとおりです:'
+ explanation: アカウントへのログインが試行されましたが、二要素認証で不正な回答が送信されました。
+ further_actions_html: このログインに心当たりがない場合は、ただちに%{action}してください。
+ subject: 二要素認証に失敗しました
+ title: 二要素認証に失敗した記録があります
suspicious_sign_in:
change_password: パスワードを変更
details: 'ログインの詳細は以下のとおりです:'
@@ -1813,6 +1819,7 @@ ja:
go_to_sso_account_settings: 外部サービスアカウントの設定はこちらで行ってください
invalid_otp_token: 二要素認証コードが間違っています
otp_lost_help_html: どちらも使用できない場合、%{email}に連絡を取ると解決できるかもしれません
+ rate_limited: 認証に失敗した回数が多すぎます。時間をおいてからログインしてください。
seamless_external_login: あなたは外部サービスを介してログインしているため、パスワードとメールアドレスの設定は利用できません。
signed_in_as: '下記でログイン中:'
verification:
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index b0eadc0504..9f4f1343c7 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -1522,6 +1522,9 @@ ko:
errors:
limit_reached: 리액션 갯수 제한에 도달했습니다
unrecognized_emoji: 인식 되지 않은 에모지입니다
+ redirects:
+ prompt: 이 링크를 믿을 수 있다면, 클릭해서 계속하세요.
+ title: "%{instance}를 떠나려고 합니다."
relationships:
activity: 계정 활동
confirm_follow_selected_followers: 정말로 선택된 팔로워들을 팔로우하시겠습니까?
@@ -1584,6 +1587,7 @@ ko:
unknown_browser: 알 수 없는 브라우저
weibo: 웨이보
current_session: 현재 세션
+ date: 날짜
description: "%{platform}의 %{browser}"
explanation: 내 마스토돈 계정에 로그인되어 있는 웹 브라우저 목록입니다.
ip: IP
@@ -1744,16 +1748,27 @@ ko:
webauthn: 보안 키
user_mailer:
appeal_approved:
+ action: 계정 설정
explanation: "%{strike_date}에 일어난 중재결정에 대한 소명을 %{appeal_date}에 작성했으며 승낙되었습니다. 당신의 계정은 정상적인 상태로 돌아왔습니다."
subject: 귀하가 %{date}에 작성한 소명이 승낙되었습니다
+ subtitle: 계정이 다시 정상적인 상태입니다.
title: 소명이 받아들여짐
appeal_rejected:
explanation: "%{strike_date}에 일어난 중재결정에 대한 소명을 %{appeal_date}에 작성했지만 반려되었습니다."
subject: "%{date}에 작성한 소명이 반려되었습니다."
+ subtitle: 소명이 기각되었습니다.
title: 이의 제기가 거절되었습니다
backup_ready:
+ explanation: 마스토돈 계정에 대한 전체 백업을 요청했습니다
+ extra: 다운로드 할 준비가 되었습니다!
subject: 아카이브를 다운로드할 수 있습니다
title: 아카이브 테이크아웃
+ failed_2fa:
+ details: '로그인 시도에 대한 상세 정보입니다:'
+ explanation: 누군가가 내 계정에 로그인을 시도했지만 2차인증에 올바른 값을 입력하지 못했습니다.
+ further_actions_html: 만약 당신이 한 게 아니었다면 유출의 가능성이 있으니 가능한 빨리 %{action} 하시기 바랍니다.
+ subject: 2차 인증 실패
+ title: 2차 인증에 실패했습니다
suspicious_sign_in:
change_password: 암호 변경
details: '로그인에 대한 상세 정보입니다:'
@@ -1807,6 +1822,7 @@ ko:
go_to_sso_account_settings: ID 공급자의 계정 설정으로 이동
invalid_otp_token: 2단계 인증 코드가 올바르지 않습니다
otp_lost_help_html: 만약 양쪽 모두를 잃어버렸다면 %{email}을 통해 복구할 수 있습니다
+ rate_limited: 너무 많은 인증 시도가 있었습니다, 잠시 후에 시도하세요.
seamless_external_login: 외부 서비스를 이용해 로그인했으므로 이메일과 암호는 설정할 수 없습니다.
signed_in_as: '다음과 같이 로그인 중:'
verification:
diff --git a/config/locales/lad.yml b/config/locales/lad.yml
index d1247fc781..02308cf2f0 100644
--- a/config/locales/lad.yml
+++ b/config/locales/lad.yml
@@ -384,6 +384,7 @@ lad:
cancel: Anula
confirm: Suspende
permanent_action: Si kites la suspensyon no restoraras dingunos datos ni relasyones.
+ preamble_html: Estas a punto de suspender %{domain} i sus subdomenos.
remove_all_data: Esto efasara todo el kontenido, multimedia i datos de profiles de los kuentos en este domeno de tu sirvidor.
stop_communication: Tu sirvidor deshara de komunikarse kon estos sirvidores.
title: Konfirma bloko de domeno para %{domain}
@@ -608,6 +609,7 @@ lad:
created_at: Raportado
delete_and_resolve: Efasa publikasyones
forwarded: Reembiado
+ forwarded_replies_explanation: Este raporto vyene de un utilizador remoto i es sovre kontenido remoto. Tiene sido reembiado a ti porke el kontenido raportado esta en una repuesta a uno de tus utilizadores.
forwarded_to: Reembiado a %{domain}
mark_as_resolved: Marka komo rezolvido
mark_as_sensitive: Marka komo sensivle
@@ -712,6 +714,7 @@ lad:
manage_users: Administra utilizadores
manage_users_description: Permete a los utilizadores ver los peratim de otros utilizadores i realizar aksyones de moderasyon kontra eyos
manage_webhooks: Administrar webhooks
+ manage_webhooks_description: Permite a los utilizadores konfigurar webhooks para evenimientos administrativos
view_audit_log: Mostra defter de revisyon
view_audit_log_description: Permete a los utilizadores ver una estoria de aksyones administrativas en el sirvidor
view_dashboard: Ve pano
@@ -738,6 +741,8 @@ lad:
branding:
preamble: La marka de tu sirvidor lo desferensia de otros sirvidores de la red. Esta enformasyon puede amostrarse por una varieta de entornos, komo en la enterfaz web de Mastodon, en aplikasyones nativas, en previsualizasiones de atadijos en otros sitios internetikos i en aplikasyones de mesajes, etc. Por esta razon, es mijor mantener esta enformasyon klara, breve i konsiza.
title: Marka
+ captcha_enabled:
+ title: Solisita ke los muevos utilizadores rezolven un CAPTCHA para konfirmar su konto
content_retention:
preamble: Kontrola komo el kontenido jenerado por el utilizador se magazina en Mastodon.
title: Retensyon de kontenido
@@ -765,6 +770,9 @@ lad:
approved: Se rekiere achetasion para enrejistrarse
none: Permete a los utilizadores trokar la konfigurasyon del sitio
open: Kualkiera puede enrejistrarse
+ security:
+ authorized_fetch_overridden_hint: Agora no puedes trokar esta konfigurasyon dkee esta sovreeskrita por una variable de entorno.
+ federation_authentication: Forzamyento de autentifikasyon para la federasyon
title: Konfigurasyon del sirvidor
site_uploads:
delete: Efasa dosya kargada
@@ -820,8 +828,13 @@ lad:
system_checks:
database_schema_check:
message_html: Ay migrasyones asperando de la baza de datos. Por favor, egzekutalas para asigurarte de ke la aplikasyon fonksiona komo deveria
+ elasticsearch_health_red:
+ message_html: El klaster de Elasticsearch no es sano (estado kolorado), funksyones de bushkeda no estan disponivles
+ elasticsearch_health_yellow:
+ message_html: El klaster de Elasticsearch no es sano (estado amariyo), es posivle ke keras investigar la razon
elasticsearch_preset:
action: Ve dokumentasyon
+ message_html: Tu klaster de Elasticsearch tiene mas ke un nodo, ama Mastodon no esta konfigurado para uzarlos.
elasticsearch_preset_single_node:
action: Ve dokumentasyon
elasticsearch_running_check:
@@ -1012,12 +1025,17 @@ lad:
auth:
apply_for_account: Solisita un kuento
captcha_confirmation:
+ help_html: Si tyenes problemas kon rezolver el CAPTCHA, puedes kontaktarnos en %{email} i podremos ayudarte.
+ hint_html: Una koza mas! Tenemos ke konfirmar ke eres umano (para evitar spam!). Rezolve el CAPTCHA abasho i klika "Kontinua".
title: Kontrolo de sigurita
confirmations:
+ awaiting_review: Tu adreso de posta tiene sido konfirmado! La taifa de %{domain} esta revizando tu enrejistrasyon. Risiviras un meil si acheten tu kuento!
awaiting_review_title: Estamos revizando tu enrejistramiento
clicking_this_link: klikando en este atadijo
login_link: konektate kon kuento
proceed_to_login_html: Agora puedes ir a %{login_link}.
+ redirect_to_app_html: Seras readresado a la aplikasyon %{app_name}. Si esto no afita, aprova %{clicking_this_link} o regresa manualmente a la aplikasyon.
+ registration_complete: Tu enrejistrasyon en %{domain} ya esta kompletada!
welcome_title: Bienvenido, %{name}!
wrong_email_hint: Si este adreso de posta es inkorekto, puedes trokarlo en las preferensyas del kuento.
delete_account: Efasa kuento
@@ -1054,6 +1072,7 @@ lad:
rules:
accept: Acheta
back: Atras
+ invited_by: 'Puedes adjuntarte a %{domain} grasyas a la envitasyon de:'
preamble: Estas son establesidas i aplikadas por los moderadores de %{domain}.
preamble_invited: Antes de kontinuar, por favor reviza las reglas del sirvidor establesidas por los moderatores de %{domain}.
title: Algunas reglas bazikas.
@@ -1078,6 +1097,7 @@ lad:
functional: Tu kuento esta kompletamente funksyonal.
pending: Tu solisitasyon esta asperando la revizion por muestros administradores. Esto puede tadrar algun tiempo. Arisiviras una posta elektronika si la solisitasyon sea achetada.
redirecting_to: Tu kuento se topa inaktivo porke esta siendo readresado a %{acct}.
+ self_destruct: Deke %{domain} va a serrarse, solo tendras akseso limitado a tu kuento.
view_strikes: Ve amonestamientos pasados kontra tu kuento
too_fast: Formulario enviado demaziado rapido, aprovalo de muevo.
use_security_key: Uza la yave de sigurita
@@ -1271,6 +1291,19 @@ lad:
merge_long: Manten rejistros egzistentes i adjusta muevos
overwrite: Sobreskrive
overwrite_long: Mete muevos rejistros en vez de los aktuales
+ overwrite_preambles:
+ blocking_html: Estas a punto de substituyir tu lista de blokos por asta %{total_items} kuentos de %{filename}.
+ bookmarks_html: Estas a punto de substituyir tus markadores por asta %{total_items} publikasyones ke vinyeron de %{filename}.
+ domain_blocking_html: Estas a punto de substituyir tu lista de blokos de domeno por asta %{total_items} domenos de %{filename}.
+ following_html: Estas a punto de segir asta %{total_items} kuentos de %{filename} i deshar de segir todos los otros kuentos.
+ lists_html: Estas a punto de sustituyir tus listas con el kontenido de %{filename}. Asta %{total_items} kuentos seran adjustados a muevas listas.
+ muting_html: Estas a punto de substituyir tu lista de kuentos silensyados por asta %{total_items} kuentos de %{filename}.
+ preambles:
+ blocking_html: Estas a punto de blokar asta %{total_items} kuentos de %{filename}.
+ bookmarks_html: Estas a punto de adjustar asta %{total_items} publikasyones de %{filename} a tus markadores.
+ domain_blocking_html: Estas a punto de blokar asta %{total_items} domenos de %{filename}.
+ following_html: Estas a punto de segir asta %{total_items} kuentos de %{filename}.
+ muting_html: Estas a punto de silensyar asta %{total_items} kuentos de %{filename}.
preface: Puedes importar siertos datos, komo todas las personas a las kualas estas sigiendo o blokando en tu kuento en esta instansya, dizde dosyas eksportadas de otra instansya.
recent_imports: Importasyones resyentes
states:
@@ -1474,13 +1507,18 @@ lad:
public_timelines: Linyas de tiempo publikas
privacy:
privacy: Privasita
+ reach: Alkanse
search: Bushkeda
+ title: Privasita i alkanse
privacy_policy:
title: Politika de privasita
reactions:
errors:
limit_reached: Limito de reaksyones desferentes alkansado
unrecognized_emoji: no es un emoji konesido
+ redirects:
+ prompt: Si konfiyas en este atadijo, klikalo para kontinuar.
+ title: Estas salyendo de %{instance}.
relationships:
activity: Aktivita del kuento
confirm_follow_selected_followers: Estas siguro ke keres segir a los suivantes eskojidos?
@@ -1711,6 +1749,7 @@ lad:
action: Preferensyas de kuento
explanation: La apelasyon del amonestamiento kontra tu kuento del %{strike_date} ke mandates el %{appeal_date} fue achetada. Tu kuento se topa de muevo en dobro estado.
subject: Tu apelasyon del %{date} fue achetada
+ subtitle: Tu konto de muevo tiene una reputasyon buena.
title: Apelasyon achetada
appeal_rejected:
explanation: La apelasyon del amonestamiento kontra tu kuento del %{strike_date} ke mandates el %{appeal_date} fue refuzada.
@@ -1718,8 +1757,11 @@ lad:
subtitle: Tu apelasyon fue refuzada.
title: Apelasyon refuzada
backup_ready:
+ extra: Agora esta pronto para abashar!
subject: Tu dosya esta pronta para abashar
title: Abasha dosya
+ failed_2fa:
+ details: 'Aki estan los peratim de las provas de koneksyon kon tu kuento:'
suspicious_sign_in:
change_password: troka tu kod
details: 'Aki estan los peratim de la koneksyon kon tu kuento:'
@@ -1773,6 +1815,8 @@ lad:
go_to_sso_account_settings: Va a la konfigurasyon de kuento de tu prokurador de identita
invalid_otp_token: Kodiche de dos pasos no valido
otp_lost_help_html: Si pedriste akseso a los dos, puedes kontaktarte kon %{email}
+ rate_limited: Demaziadas provas de autentifikasyon, aprova de muevo dempues.
+ seamless_external_login: Estas konektado por un servisyo eksterno i estonses la konfigurasyon de kod i konto de posta no estan disponivles.
signed_in_as: 'Konektado komo:'
verification:
here_is_how: Ansina es komo
@@ -1785,6 +1829,7 @@ lad:
success: Tu yave de sigurita fue adjustada kon sukseso.
delete: Efasa
delete_confirmation: Estas siguro ke keres efasar esta yave de sigurita?
+ description_html: Si kapasites autentifikasyon kon yave de sigurita, nesesitaras uno de tus yaves de sigurita para konektarte kon tu kuento.
destroy:
error: Uvo un problem al efasar tu yave de sigurita. Por favor aprova de muevo.
success: Tu yave de sigurita fue efasada kon sukseso.
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index f3715fd2ee..1d159bf45a 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -478,6 +478,9 @@ lt:
other: Kita
privacy:
hint_html: "Tikrink, kaip nori, kad tavo profilis ir įrašai būtų randami. Įjungus įvairias Mastodon funkcijas, jos gali padėti pasiekti platesnę auditoriją. Akimirką peržiūrėk šiuos nustatymus, kad įsitikintum, jog jie atitinka tavo naudojimo būdą."
+ redirects:
+ prompt: Jei pasitiki šia nuoroda, spustelėk ją, kad tęstum.
+ title: Palieki %{instance}
remote_follow:
missing_resource: Jūsų paskyros nukreipimo URL nerasta
scheduled_statuses:
@@ -559,6 +562,12 @@ lt:
extra: Jį jau galima atsisiųsti!
subject: Jūsų archyvas paruoštas parsisiuntimui
title: Archyvas išimtas
+ failed_2fa:
+ details: 'Štai išsami informacija apie bandymą prisijungti:'
+ explanation: Kažkas bandė prisijungti prie tavo paskyros, bet nurodė netinkamą antrąjį tapatybės nustatymo veiksnį.
+ further_actions_html: Jei tai buvo ne tu, rekomenduojame nedelsiant imtis %{action}, nes jis gali būti pažeistas.
+ subject: Antrojo veiksnio tapatybės nustatymas nesėkmingai
+ title: Nepavyko atlikti antrojo veiksnio tapatybės nustatymo
warning:
subject:
disable: Jūsų paskyra %{acct} buvo užšaldyta
@@ -584,6 +593,7 @@ lt:
go_to_sso_account_settings: Eik į savo tapatybės teikėjo paskyros nustatymus
invalid_otp_token: Netinkamas dviejų veiksnių kodas
otp_lost_help_html: Jei praradai prieigą prie abiejų, gali susisiek su %{email}
+ rate_limited: Per daug tapatybės nustatymo bandymų. Bandyk dar kartą vėliau.
seamless_external_login: Esi prisijungęs (-usi) per išorinę paslaugą, todėl slaptažodžio ir el. pašto nustatymai nepasiekiami.
signed_in_as: 'Prisijungta kaip:'
verification:
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 9235b99fed..a3657890da 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -1546,6 +1546,9 @@ nl:
errors:
limit_reached: Limiet van verschillende emoji-reacties bereikt
unrecognized_emoji: is geen bestaande emoji-reactie
+ redirects:
+ prompt: Als je deze link vertrouwt, klik er dan op om door te gaan.
+ title: Je verlaat %{instance}.
relationships:
activity: Accountactiviteit
confirm_follow_selected_followers: Weet je zeker dat je de geselecteerde volgers wilt volgen?
@@ -1790,6 +1793,12 @@ nl:
extra: Het staat nu klaar om te worden gedownload!
subject: Jouw archief staat klaar om te worden gedownload
title: Archief ophalen
+ failed_2fa:
+ details: 'Hier zijn details van de aanmeldpoging:'
+ explanation: Iemand heeft geprobeerd om in te loggen op jouw account maar heeft een ongeldige tweede verificatiefactor opgegeven.
+ further_actions_html: Als jij dit niet was, raden we je aan om onmiddellijk %{action} aangezien het in gevaar kan zijn.
+ subject: Tweede factor authenticatiefout
+ title: Tweestapsverificatie mislukt
suspicious_sign_in:
change_password: je wachtwoord te wijzigen
details: 'Hier zijn de details van inlogpoging:'
@@ -1843,6 +1852,7 @@ nl:
go_to_sso_account_settings: Ga naar de accountinstellingen van je identiteitsprovider
invalid_otp_token: Ongeldige tweestaps-toegangscode
otp_lost_help_html: Als je toegang tot beiden kwijt bent geraakt, neem dan contact op via %{email}
+ rate_limited: Te veel authenticatiepogingen, probeer het later opnieuw.
seamless_external_login: Je bent ingelogd via een externe dienst, daarom zijn wachtwoorden en e-mailinstellingen niet beschikbaar.
signed_in_as: 'Ingelogd als:'
verification:
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index 914ee7fb04..ffa5198a3a 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -1546,6 +1546,9 @@ nn:
errors:
limit_reached: Grensen for forskjellige reaksjoner nådd
unrecognized_emoji: er ikke en gjenkjent emoji
+ redirects:
+ prompt: Hvis du stoler på denne lenken, så trykk på den for å fortsette.
+ title: Du forlater %{instance}.
relationships:
activity: Kontoaktivitet
confirm_follow_selected_followers: Er du sikker på at du ynskjer å fylgja dei valde fylgjarane?
@@ -1608,6 +1611,7 @@ nn:
unknown_browser: Ukjend nettlesar
weibo: Weibo
current_session: Noverande økt
+ date: Dato
description: "%{browser} på %{platform}"
explanation: Desse nettlesarane er logga inn på Mastodon-kontoen din.
ip: IP-adresse
@@ -1774,16 +1778,27 @@ nn:
webauthn: Sikkerhetsnøkler
user_mailer:
appeal_approved:
+ action: Kontoinnstillinger
explanation: Apellen på prikken mot din kontor på %{strike_date} som du la inn på %{appeal_date} har blitt godkjend. Din konto er nok ein gong i god stand.
subject: Din klage fra %{date} er godkjent
+ subtitle: Kontoen din er tilbake i god stand.
title: Anke godkjend
appeal_rejected:
explanation: Klagen på advarselen mot din konto den %{strike_date} som du sendte inn den %{appeal_date} har blitt avvist.
subject: Din klage fra %{date} er avvist
+ subtitle: Anken din har blitt avvist.
title: Anke avvist
backup_ready:
+ explanation: Du etterspurte en fullstendig sikkerhetskopi av din Mastodon-konto.
+ extra: Den er nå klar for nedlasting!
subject: Arkivet ditt er klart til å lastes ned
title: Nedlasting av arkiv
+ failed_2fa:
+ details: 'Her er detaljane om innloggingsforsøket:'
+ explanation: Nokon har prøvd å logge inn på kontoen din, men brukte ein ugyldig andre-autentiseringsfaktor.
+ further_actions_html: Om dette ikkje var deg, rår me deg til å %{action} med éin gong, då det kan vere kompomittert.
+ subject: To-faktor-autentiseringsfeil
+ title: Mislukka to-faktor-autentisering
suspicious_sign_in:
change_password: endre passord
details: 'Her er påloggingsdetaljane:'
@@ -1837,6 +1852,7 @@ nn:
go_to_sso_account_settings: Gå til kontoinnstillingane hjå identitetsleverandøren din
invalid_otp_token: Ugyldig tostegskode
otp_lost_help_html: Hvis du mistet tilgangen til begge deler, kan du komme i kontakt med %{email}
+ rate_limited: For mange autentiseringsforsøk, prøv igjen seinare.
seamless_external_login: Du er logga inn gjennom eit eksternt reiskap, so passord og e-postinstillingar er ikkje tilgjengelege.
signed_in_as: 'Logga inn som:'
verification:
diff --git a/config/locales/no.yml b/config/locales/no.yml
index 61cc89181e..d26b20379e 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -229,7 +229,7 @@
update_status: Oppdater statusen
update_user_role: Oppdater rolle
actions:
- approve_appeal_html: "%{name} godkjente klagen på modereringa fra %{target}"
+ approve_appeal_html: "%{name} godkjente anken på moderering fra %{target}"
approve_user_html: "%{name} godkjente registrering fra %{target}"
assigned_to_self_report_html: "%{name} tildelte rapport %{target} til seg selv"
change_email_user_html: "%{name} endret e-postadressen til brukeren %{target}"
@@ -266,7 +266,7 @@
enable_user_html: "%{name} aktiverte innlogging for bruker %{target}"
memorialize_account_html: "%{name} endret %{target}s konto til en minneside"
promote_user_html: "%{name} forfremmet bruker %{target}"
- reject_appeal_html: "%{name} avviste moderasjonsavgjørelsesklagen fra %{target}"
+ reject_appeal_html: "%{name} avviste anken på moderering fra %{target}"
reject_user_html: "%{name} avslo registrering fra %{target}"
remove_avatar_user_html: "%{name} fjernet %{target} sitt profilbilde"
reopen_report_html: "%{name} gjenåpnet rapporten %{target}"
@@ -372,8 +372,8 @@
website: Nettside
disputes:
appeals:
- empty: Ingen klager funnet.
- title: Klager
+ empty: Ingen anker funnet.
+ title: Anker
domain_allows:
add_new: Hvitelist domene
created_msg: Domenet har blitt hvitelistet
@@ -692,8 +692,8 @@
invite_users_description: Lar brukere invitere nye personer til serveren
manage_announcements: Behandle Kunngjøringer
manage_announcements_description: Lar brukere endre kunngjøringer på serveren
- manage_appeals: Behandle klager
- manage_appeals_description: Lar brukere gjennomgå klager mot modereringsaktiviteter
+ manage_appeals: Behandle anker
+ manage_appeals_description: Lar brukere gjennomgå anker mot modereringsaktiviteter
manage_blocks: Behandle Blokker
manage_blocks_description: Lar brukere blokkere e-postleverandører og IP-adresser
manage_custom_emojis: Administrer egendefinerte Emojier
@@ -829,8 +829,8 @@
sensitive: "%{name} merket %{target}s konto som følsom"
silence: "%{name} begrenset %{target}s konto"
suspend: "%{name} suspenderte %{target}s konto"
- appeal_approved: Klage tatt til følge
- appeal_pending: Klage behandles
+ appeal_approved: Anket
+ appeal_pending: Anke behandles
appeal_rejected: Anke avvist
system_checks:
database_schema_check:
@@ -975,9 +975,9 @@
sensitive: å merke kontoen sin som følsom
silence: for å begrense deres konto
suspend: for å avslutte kontoen
- body: "%{target} klager på en moderasjonsbeslutning av %{action_taken_by} fra %{date}, noe som var %{type}. De skrev:"
- next_steps: Du kan godkjenne klagen for å angre på moderasjonsvedtaket eller ignorere det.
- subject: "%{username} klager på en moderasjonsbeslutning for %{instance}"
+ body: "%{target} anker en moderasjonsbeslutning av %{action_taken_by} fra %{date}, noe som var %{type}. De skrev:"
+ next_steps: Du kan godkjenne anken for å angre på moderasjonsvedtaket eller ignorere det.
+ subject: "%{username} anker en moderasjonsbeslutning for %{instance}"
new_critical_software_updates:
body: Nye kritiske versjoner av Mastodon har blitt utgitt, det kan være fordelaktig å oppdatere så snart som mulig!
subject: Kritiske Mastodon-oppdateringer er tilgjengelige for %{instance}!
@@ -1161,19 +1161,19 @@
disputes:
strikes:
action_taken: Handling utført
- appeal: Klage
- appeal_approved: Denne advarselens klage ble tatt til følge og er ikke lenger gyldig
- appeal_rejected: Klagen ble avvist
- appeal_submitted_at: Klage levert
- appealed_msg: Din klage har blitt levert. Du får beskjed om den blir godkjent.
+ appeal: Anke
+ appeal_approved: Denne advarselens anke ble tatt til følge og er ikke lenger gyldig
+ appeal_rejected: Anken ble avvist
+ appeal_submitted_at: Anke levert
+ appealed_msg: Anken din har blitt levert. Du får beskjed om den blir godkjent.
appeals:
- submit: Lever klage
- approve_appeal: Godkjenn klage
+ submit: Lever anke
+ approve_appeal: Godkjenn anke
associated_report: Tilhørende rapport
created_at: Datert
description_html: Dette er tiltakene mot din konto og advarsler som har blitt sent til deg av %{instance}-personalet.
recipient: Adressert til
- reject_appeal: Avvis klage
+ reject_appeal: Avvis anke
status: 'Innlegg #%{id}'
status_removed: Innlegg allerede fjernet fra systemet
title: "%{action} fra %{date}"
@@ -1185,9 +1185,9 @@
sensitive: Merking av konto som sensitiv
silence: Begrensning av konto
suspend: Suspensjon av konto
- your_appeal_approved: Din klage har blitt godkjent
- your_appeal_pending: Du har levert en klage
- your_appeal_rejected: Din klage har blitt avvist
+ your_appeal_approved: Anken din har blitt godkjent
+ your_appeal_pending: Du har levert en anke
+ your_appeal_rejected: Anken din har blitt avvist
domain_validator:
invalid_domain: er ikke et gyldig domenenavn
edit_profile:
@@ -1546,6 +1546,9 @@
errors:
limit_reached: Grensen for ulike reaksjoner nådd
unrecognized_emoji: er ikke en gjenkjent emoji
+ redirects:
+ prompt: Hvis du stoler på denne lenken, så trykk på den for å fortsette.
+ title: Du forlater %{instance}.
relationships:
activity: Kontoaktivitet
confirm_follow_selected_followers: Er du sikker på at du vil følge valgte følgere?
@@ -1608,6 +1611,7 @@
unknown_browser: Ukjent Nettleser
weibo: Weibo
current_session: Nåværende økt
+ date: Dato
description: "%{browser} på %{platform}"
explanation: Dette er nettlesere som er pålogget på din Mastodon-konto akkurat nå.
ip: IP-adresse
@@ -1740,7 +1744,7 @@
sensitive_content: Følsomt innhold
strikes:
errors:
- too_late: Det er for sent å klage på denne advarselen
+ too_late: Det er for sent å anke denne advarselen
tags:
does_not_match_previous_name: samsvarer ikke med det forrige navnet
themes:
@@ -1774,16 +1778,27 @@
webauthn: Sikkerhetsnøkler
user_mailer:
appeal_approved:
- explanation: Klagen på advarselen mot din konto den %{strike_date} som du sendte inn den %{appeal_date} har blitt godkjent. Din konto er nok en gang i god stand.
- subject: Din klage fra %{date} er godkjent
- title: Klage godkjent
+ action: Kontoinnstillinger
+ explanation: Anken på advarselen mot din konto den %{strike_date} som du sendte inn den %{appeal_date} har blitt godkjent. Din konto er nok en gang i god stand.
+ subject: Anken din fra %{date} er godkjent
+ subtitle: Kontoen din er tilbake i god stand.
+ title: Anke godkjent
appeal_rejected:
- explanation: Klagen på advarselen mot din konto den %{strike_date} som du sendte inn den %{appeal_date} har blitt avvist.
- subject: Din klage fra %{date} er avvist
- title: Klage avvist
+ explanation: Anken på advarselen mot din konto den %{strike_date} som du sendte inn den %{appeal_date} har blitt avvist.
+ subject: Anken din fra %{date} er avvist
+ subtitle: Anken din har blitt avvist.
+ title: Anke avvist
backup_ready:
+ explanation: Du etterspurte en fullstendig sikkerhetskopi av din Mastodon-konto.
+ extra: Den er nå klar for nedlasting!
subject: Arkivet ditt er klart til å lastes ned
title: Nedlasting av arkiv
+ failed_2fa:
+ details: 'Her er detaljer om påloggingsforsøket:'
+ explanation: Noen har prøvd å logge på kontoen din, men ga en ugyldig andre-autentiseringsfaktor.
+ further_actions_html: Hvis dette ikke var deg, anbefaler vi at du %{action} umiddelbart fordi det kan ha blitt kompromittert.
+ subject: Andre-autentiseringsfaktorfeil
+ title: Mislykket andre-autentiseringsfaktor
suspicious_sign_in:
change_password: endre passord
details: 'Her er detaljer om påloggingen:'
@@ -1792,8 +1807,8 @@
subject: Din konto ble tatt i bruk fra en ny IP-adresse
title: En ny pålogging
warning:
- appeal: Lever en klage
- appeal_description: Hvis du mener dette er feil, kan du sende inn en klage til personalet i %{instance}.
+ appeal: Lever en anke
+ appeal_description: Hvis du mener dette er feil, kan du sende inn en anke til personalet i %{instance}.
categories:
spam: Søppelpost
violation: Innholdet bryter følgende retningslinjer for fellesskapet
@@ -1837,6 +1852,7 @@
go_to_sso_account_settings: Gå til din identitetsleverandørs kontoinnstillinger
invalid_otp_token: Ugyldig to-faktorkode
otp_lost_help_html: Hvis du mistet tilgangen til begge deler, kan du komme i kontakt med %{email}
+ rate_limited: For mange autentiseringsforsøk, prøv igjen senere.
seamless_external_login: Du er logget inn via en ekstern tjeneste, så passord og e-post innstillinger er ikke tilgjengelige.
signed_in_as: 'Innlogget som:'
verification:
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 8a973b71c7..5bc78a6adf 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -1598,6 +1598,9 @@ pl:
errors:
limit_reached: Przekroczono limit różnych reakcji
unrecognized_emoji: nie jest znanym emoji
+ redirects:
+ prompt: Kliknij ten link jeżeli mu ufasz.
+ title: Opuszczasz %{instance}.
relationships:
activity: Aktywność konta
confirm_follow_selected_followers: Czy na pewno chcesz obserwować wybranych obserwujących?
@@ -1854,6 +1857,12 @@ pl:
extra: Gotowe do pobrania!
subject: Twoje archiwum jest gotowe do pobrania
title: Odbiór archiwum
+ failed_2fa:
+ details: 'Oto szczegóły próby logowania:'
+ explanation: Ktoś próbował zalogować się na twoje konto, ale nie przeszedł drugiego etapu autoryzacji.
+ further_actions_html: Jeśli to nie ty, polecamy natychmiastowo %{action}, bo może ono być narażone.
+ subject: Błąd drugiego etapu uwierzytelniania
+ title: Nieudane uwierzytelnienie w drugim etapie
suspicious_sign_in:
change_password: zmień hasło
details: 'Oto szczegóły logowania:'
@@ -1907,6 +1916,7 @@ pl:
go_to_sso_account_settings: Przejdź do ustawień konta dostawcy tożsamości
invalid_otp_token: Kod uwierzytelniający jest niepoprawny
otp_lost_help_html: Jeżeli utracisz dostęp do obu, możesz skontaktować się z %{email}
+ rate_limited: Zbyt wiele prób uwierzytelnienia. Spróbuj ponownie później.
seamless_external_login: Zalogowano z użyciem zewnętrznej usługi, więc ustawienia hasła i adresu e-mail nie są dostępne.
signed_in_as: 'Zalogowano jako:'
verification:
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 47ad0ac448..79396d627f 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -1546,6 +1546,9 @@ pt-BR:
errors:
limit_reached: Limite de reações diferentes atingido
unrecognized_emoji: não é um emoji reconhecido
+ redirects:
+ prompt: Se você confia neste link, clique nele para continuar.
+ title: Você está saindo de %{instance}.
relationships:
activity: Atividade da conta
confirm_follow_selected_followers: Tem certeza que deseja seguir os seguidores selecionados?
@@ -1789,6 +1792,12 @@ pt-BR:
extra: Agora está pronto para baixar!
subject: Seu arquivo está pronto para ser baixado
title: Baixar arquivo
+ failed_2fa:
+ details: 'Aqui estão os detalhes da tentativa de acesso:'
+ explanation: Alguém tentou entrar em sua conta, mas forneceu um segundo fator de autenticação inválido.
+ further_actions_html: Se não foi você, recomendamos que %{action} imediatamente, pois ela pode ser comprometida.
+ subject: Falha na autenticação do segundo fator
+ title: Falha na autenticação do segundo fator
suspicious_sign_in:
change_password: Altere sua senha
details: 'Aqui estão os detalhes do acesso:'
@@ -1842,6 +1851,7 @@ pt-BR:
go_to_sso_account_settings: Vá para as configurações de conta do seu provedor de identidade
invalid_otp_token: Código de dois fatores inválido
otp_lost_help_html: Se você perder o acesso à ambos, você pode entrar em contato com %{email}
+ rate_limited: Muitas tentativas de autenticação; tente novamente mais tarde.
seamless_external_login: Você entrou usando um serviço externo, então configurações de e-mail e senha não estão disponíveis.
signed_in_as: 'Entrou como:'
verification:
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index fc1e3e6367..8a20bc68a1 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -1546,6 +1546,9 @@ pt-PT:
errors:
limit_reached: Alcançado limite de reações diferentes
unrecognized_emoji: não é um emoji reconhecido
+ redirects:
+ prompt: Se confia nesta hiperligação, clique nela para continuar.
+ title: Está a deixar %{instance}.
relationships:
activity: Atividade da conta
confirm_follow_selected_followers: Tem a certeza que deseja seguir os seguidores selecionados?
@@ -1790,6 +1793,12 @@ pt-PT:
extra: Está pronta para transferir!
subject: O seu arquivo está pronto para descarregar
title: Arquivo de ficheiros
+ failed_2fa:
+ details: 'Aqui estão os detalhes da tentativa de entrada:'
+ explanation: Alguém tentou entrar em sua conta mas forneceu um segundo fator de autenticação inválido.
+ further_actions_html: Se não foi você, recomendamos que %{action} imediatamente, pois pode ter sido comprometido.
+ subject: Falha na autenticação do segundo fator
+ title: Falha na autenticação do segundo fator
suspicious_sign_in:
change_password: alterar a sua palavra-passe
details: 'Eis os pormenores do início de sessão:'
@@ -1843,6 +1852,7 @@ pt-PT:
go_to_sso_account_settings: Ir para as definições de conta do seu fornecedor de identidade
invalid_otp_token: Código de autenticação inválido
otp_lost_help_html: Se perdeu o acesso a ambos, pode entrar em contacto com %{email}
+ rate_limited: Demasiadas tentativas de autenticação, tente novamente mais tarde.
seamless_external_login: Tu estás ligado via um serviço externo. Por isso, as configurações da palavra-passe e do e-mail não estão disponíveis.
signed_in_as: 'Registado como:'
verification:
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 2644275c37..04e49e0427 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -439,6 +439,7 @@ ru:
view: Посмотреть доменные блокировки
email_domain_blocks:
add_new: Добавить новую
+ allow_registrations_with_approval: Разрешить регистрацию с одобрением
attempts_over_week:
few: "%{count} попытки за последнюю неделю"
many: "%{count} попыток за последнюю неделю"
@@ -1597,6 +1598,9 @@ ru:
errors:
limit_reached: Достигнут лимит разных реакций
unrecognized_emoji: не является распознанным эмодзи
+ redirects:
+ prompt: Если вы доверяете этой ссылке, нажмите на нее, чтобы продолжить.
+ title: Вы покидаете %{instance}.
relationships:
activity: Активность учётной записи
confirm_follow_selected_followers: Вы уверены, что хотите подписаться на выбранных подписчиков?
@@ -1659,6 +1663,7 @@ ru:
unknown_browser: Неизвестный браузер
weibo: Weibo
current_session: Текущая сессия
+ date: Дата
description: "%{browser} на %{platform}"
explanation: Здесь отображаются все браузеры, с которых выполнен вход в вашу учётную запись. Авторизованные приложения находятся в секции «Приложения».
ip: IP
@@ -1837,16 +1842,27 @@ ru:
webauthn: Ключи безопасности
user_mailer:
appeal_approved:
+ action: Настройки аккаунта
explanation: Апелляция на разблокировку против вашей учетной записи %{strike_date}, которую вы подали на %{appeal_date}, была одобрена. Ваша учетная запись снова на хорошем счету.
subject: Ваше обжалование от %{date} была одобрено
+ subtitle: Ваш аккаунт снова с хорошей репутацией.
title: Обжалование одобрено
appeal_rejected:
explanation: Апелляция на разблокировку против вашей учетной записи %{strike_date}, которую вы подали на %{appeal_date}, была одобрена. Ваша учетная запись восстановлена.
subject: Ваше обжалование от %{date} отклонено
+ subtitle: Ваша апелляция отклонена.
title: Обжалование отклонено
backup_ready:
+ explanation: Вы запросили полное резервное копирование вашей учетной записи Mastodon.
+ extra: Теперь он готов к загрузке!
subject: Ваш архив готов к загрузке
title: Архив ваших данных готов
+ failed_2fa:
+ details: 'Вот подробности попытки регистрации:'
+ explanation: Кто-то пытался войти в вашу учетную запись, но указал неверный второй фактор аутентификации.
+ further_actions_html: Если это не вы, мы рекомендуем %{action} немедленно принять меры, так как он может быть скомпрометирован.
+ subject: Сбой двухфакторной аутентификации
+ title: Сбой двухфакторной аутентификации
suspicious_sign_in:
change_password: сменить пароль
details: 'Подробности о новом входе:'
@@ -1900,6 +1916,7 @@ ru:
go_to_sso_account_settings: Перейти к настройкам сторонних аккаунтов учетной записи
invalid_otp_token: Введен неверный код двухфакторной аутентификации
otp_lost_help_html: Если Вы потеряли доступ к обоим, свяжитесь с %{email}
+ rate_limited: Слишком много попыток аутентификации, повторите попытку позже.
seamless_external_login: Вы залогинены через сторонний сервис, поэтому настройки e-mail и пароля недоступны.
signed_in_as: 'Выполнен вход под именем:'
verification:
diff --git a/config/locales/simple_form.no.yml b/config/locales/simple_form.no.yml
index ca2020e21e..7651792212 100644
--- a/config/locales/simple_form.no.yml
+++ b/config/locales/simple_form.no.yml
@@ -36,7 +36,7 @@
starts_at: Valgfritt. I tilfellet din kunngjøring er bundet til en spesifikk tidsramme
text: Du kan bruke innlegg-syntaks. Vennligst vær oppmerksom på plassen som kunngjøringen vil ta opp på brukeren sin skjerm
appeal:
- text: Du kan kun klage på en advarsel en gang
+ text: Du kan kun anke en advarsel en gang
defaults:
autofollow: Folk som lager en konto gjennom invitasjonen, vil automatisk følge deg
avatar: PNG, GIF eller JPG. Maksimalt %{size}. Vil bli nedskalert til %{dimensions}px
@@ -282,7 +282,7 @@
sign_up_requires_approval: Begrens påmeldinger
severity: Oppføring
notification_emails:
- appeal: Noen klager på en moderator sin avgjørelse
+ appeal: Noen anker en moderator sin avgjørelse
digest: Send sammendrag på e-post
favourite: Send e-post når noen setter din status som favoritt
follow: Send e-post når noen følger deg
diff --git a/config/locales/simple_form.sk.yml b/config/locales/simple_form.sk.yml
index e13a05835f..614812a3a9 100644
--- a/config/locales/simple_form.sk.yml
+++ b/config/locales/simple_form.sk.yml
@@ -60,6 +60,7 @@ sk:
fields:
name: Označenie
value: Obsah
+ unlocked: Automaticky prijímaj nových nasledovateľov
account_alias:
acct: Adresa starého účtu
account_migration:
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index fdd64b5bb7..20df763463 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -430,6 +430,7 @@ sk:
dashboard:
instance_accounts_dimension: Najsledovanejšie účty
instance_accounts_measure: uložené účty
+ instance_followers_measure: naši nasledovatelia tam
instance_follows_measure: ich sledovatelia tu
instance_languages_dimension: Najpopulárnejšie jazyky
instance_media_attachments_measure: uložené mediálne prílohy
@@ -633,6 +634,7 @@ sk:
documentation_link: Zisti viac
release_notes: Poznámky k vydaniu
title: Dostupné aktualizácie
+ type: Druh
types:
major: Hlavné vydanie
patch: Opravné vydanie - opravy a jednoducho uplatniteľné zmeny
@@ -641,6 +643,7 @@ sk:
account: Autor
application: Aplikácia
back_to_account: Späť na účet
+ back_to_report: Späť na stránku hlásenia
batch:
remove_from_report: Vymaž z hlásenia
report: Hlásenie
@@ -730,6 +733,7 @@ sk:
new_appeal:
actions:
none: varovanie
+ silence: obmedziť ich účet
new_pending_account:
body: Podrobnosti o novom účte sú uvedené nižšie. Môžeš túto registračnú požiadavku buď prijať, alebo zamietnúť.
subject: Nový účet očakáva preverenie na %{instance} (%{username})
@@ -1097,6 +1101,9 @@ sk:
errors:
limit_reached: Maximálny počet rôznorodých reakcií bol dosiahnutý
unrecognized_emoji: je neznámy smajlík
+ redirects:
+ prompt: Ak tomuto odkazu veríš, klikni naňho pre pokračovanie.
+ title: Opúšťaš %{instance}.
relationships:
activity: Aktivita účtu
confirm_follow_selected_followers: Si si istý/á, že chceš nasledovať vybraných sledujúcich?
@@ -1254,6 +1261,8 @@ sk:
extra: Teraz je pripravená na stiahnutie!
subject: Tvoj archív je pripravený na stiahnutie
title: Odber archívu
+ failed_2fa:
+ details: 'Tu sú podrobnosti o pokuse o prihlásenie:'
warning:
subject:
disable: Tvoj účet %{acct} bol zamrazený
@@ -1277,6 +1286,7 @@ sk:
follow_limit_reached: Nemôžeš následovať viac ako %{limit} ľudí
invalid_otp_token: Neplatný kód pre dvojfaktorovú autentikáciu
otp_lost_help_html: Pokiaľ si stratil/a prístup k obom, môžeš dať vedieť %{email}
+ rate_limited: Príliš veľa pokusov o overenie, skús to znova neskôr.
seamless_external_login: Si prihlásená/ý cez externú službu, takže nastavenia hesla a emailu ti niesú prístupné.
signed_in_as: 'Prihlásená/ý ako:'
verification:
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 1a0afe034f..ba707f49eb 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -1907,6 +1907,7 @@ sl:
go_to_sso_account_settings: Pojdite na nastavitve svojega računa ponudnika identitete
invalid_otp_token: Neveljavna dvofaktorska koda
otp_lost_help_html: Če ste izgubili dostop do obeh, stopite v stik z %{email}
+ rate_limited: Preveč poskusov preverjanja pristnosti, poskusite kasneje.
seamless_external_login: Prijavljeni ste prek zunanje storitve, tako da nastavitve gesla in e-pošte niso na voljo.
signed_in_as: 'Vpisani kot:'
verification:
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 1693db7f31..3dd4731209 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -1542,6 +1542,9 @@ sq:
errors:
limit_reached: U mbërrit në kufirin e reagimeve të ndryshme
unrecognized_emoji: s’është emotikon i pranuar
+ redirects:
+ prompt: Nëse e besoni këtë lidhje, klikoni që të vazhdohet.
+ title: Po e braktisni %{instance}.
relationships:
activity: Veprimtari llogarie
confirm_follow_selected_followers: Jeni i sigurt se doni të ndiqet ndjekësit e përzgjedhur?
@@ -1604,6 +1607,7 @@ sq:
unknown_browser: Shfletues i Panjohur
weibo: Weibo
current_session: Sesioni i tanishëm
+ date: Datë
description: "%{browser} në %{platform}"
explanation: Këta janë shfletuesit e përdorur tani për hyrje te llogaria juaj Mastodon.
ip: IP
@@ -1770,16 +1774,27 @@ sq:
webauthn: Kyçe sigurie
user_mailer:
appeal_approved:
+ action: Rregullime Llogarie
explanation: Apelimi i paralajmërimit kundër llogarisë tuaj më %{strike_date}, të cilin e parashtruar më %{appeal_date} është miratuar. Llogaria juaj është sërish në pozita të mira.
subject: Apelimi juaj i datës %{date} u miratua
+ subtitle: Llogaria juaj edhe një herë është e shëndetshme.
title: Apelimi u miratua
appeal_rejected:
explanation: Apelimi i paralajmërimit kundër llogarisë tuaj më %{strike_date}, të cilin e parashtruar më %{appeal_date}, u hodh poshtë.
subject: Apelimi juaj prej %{date} është hedhur poshtë
+ subtitle: Apelimi juaj është hedhur poshtë.
title: Apelimi u hodh poshtë
backup_ready:
+ explanation: Kërkuat një kopjeruajtje të plotë të llogarisë tuaj Mastodon.
+ extra: Tani është gati për shkarkim!
subject: Arkivi juaj është gati për shkarkim
title: Marrje arkivi me vete
+ failed_2fa:
+ details: 'Ja hollësitë e përpjekjes për hyrje:'
+ explanation: Dikush ka provuar të hyjë në llogarinë tuaj, por dha faktor të dytë mirëfilltësimi.
+ further_actions_html: Nëse s’qetë ju, rekomandojmë të %{action} menjëherë, ngaqë mund të jetë komprometua.
+ subject: Dështim faktori të dytë mirëfilltësimesh
+ title: Dështoi mirëfilltësimi me faktor të dytë
suspicious_sign_in:
change_password: ndryshoni fjalëkalimin tuaj
details: 'Ja hollësitë për hyrjen:'
@@ -1833,6 +1848,7 @@ sq:
go_to_sso_account_settings: Kaloni te rregullime llogarie te shërbimi juaj i identitetit
invalid_otp_token: Kod dyfaktorësh i pavlefshëm
otp_lost_help_html: Nëse humbët hyrjen te të dy, mund të lidheni me %{email}
+ rate_limited: Shumë përpjekje mirëfilltësimi, riprovoni më vonë.
seamless_external_login: Jeni futur përmes një shërbimi të jashtëm, ndaj s’ka rregullime fjalëkalimi dhe email.
signed_in_as: 'I futur si:'
verification:
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index fc1239bedf..b55b6e0d19 100644
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -1572,6 +1572,9 @@ sr-Latn:
errors:
limit_reached: Dostignuto je ograničenje različitih reakcija
unrecognized_emoji: nije prepoznat emodži
+ redirects:
+ prompt: Ako verujete ovoj vezi, kliknite na nju za nastavak.
+ title: Napuštate %{instance}.
relationships:
activity: Aktivnost naloga
confirm_follow_selected_followers: Da li ste sigurni da želite da pratite izabrane pratioce?
@@ -1822,6 +1825,12 @@ sr-Latn:
extra: Sada je spremno za preuzimanje!
subject: Vaša arhiva je spremna za preuzimanje
title: Izvoz arhive
+ failed_2fa:
+ details: 'Evo detalja o pokušaju prijavljivanja:'
+ explanation: Neko je pokušao da se prijavi na vaš nalog ali je dao nevažeći drugi faktor autentifikacije.
+ further_actions_html: Ako to niste bili vi, preporučujemo vam da odmah %{action} jer može biti ugrožena.
+ subject: Neuspeh drugog faktora autentifikacije
+ title: Nije uspeo drugi faktor autentifikacije
suspicious_sign_in:
change_password: promenite svoju lozinku
details: 'Evo detalja o prijavi:'
@@ -1875,6 +1884,7 @@ sr-Latn:
go_to_sso_account_settings: Idite na podešavanja naloga svog dobavljača identiteta
invalid_otp_token: Neispravni dvofaktorski kod
otp_lost_help_html: Ako izgubite pristup za oba, možete stupiti u kontakt sa %{email}
+ rate_limited: Previše pokušaja autentifikacije, pokušajte ponovo kasnije.
seamless_external_login: Prijavljeni ste putem spoljašnje usluge, tako da lozinka i podešavanja E-pošte nisu dostupni.
signed_in_as: 'Prijavljen/a kao:'
verification:
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 4e5e58c859..8de7c90e73 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -1572,6 +1572,9 @@ sr:
errors:
limit_reached: Достигнуто је ограничење различитих реакција
unrecognized_emoji: није препознат емоџи
+ redirects:
+ prompt: Ако верујете овој вези, кликните на њу за наставак.
+ title: Напуштате %{instance}.
relationships:
activity: Активност налога
confirm_follow_selected_followers: Да ли сте сигурни да желите да пратите изабране пратиоце?
@@ -1822,6 +1825,12 @@ sr:
extra: Сада је спремно за преузимање!
subject: Ваша архива је спремна за преузимање
title: Извоз архиве
+ failed_2fa:
+ details: 'Ево детаља о покушају пријављивања:'
+ explanation: Неко је покушао да се пријави на ваш налог али је дао неважећи други фактор аутентификације.
+ further_actions_html: Ако то нисте били ви, препоручујемо вам да одмах %{action} јер може бити угрожена.
+ subject: Неуспех другог фактора аутентификације
+ title: Није успео други фактор аутентификације
suspicious_sign_in:
change_password: промените своју лозинку
details: 'Ево детаља о пријави:'
@@ -1875,6 +1884,7 @@ sr:
go_to_sso_account_settings: Идите на подешавања налога свог добављача идентитета
invalid_otp_token: Неисправни двофакторски код
otp_lost_help_html: Ако изгубите приступ за оба, можете ступити у контакт са %{email}
+ rate_limited: Превише покушаја аутентификације, покушајте поново касније.
seamless_external_login: Пријављени сте путем спољашње услуге, тако да лозинка и подешавања Е-поште нису доступни.
signed_in_as: 'Пријављен/а као:'
verification:
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index d4657e9743..deac7cc638 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -1545,6 +1545,9 @@ sv:
errors:
limit_reached: Gränsen för unika reaktioner uppnådd
unrecognized_emoji: är inte en igenkänd emoji
+ redirects:
+ prompt: Om du litar på denna länk, klicka på den för att fortsätta.
+ title: Du lämnar %{instance}.
relationships:
activity: Kontoaktivitet
confirm_follow_selected_followers: Är du säker på att du vill följa valda följare?
@@ -1789,6 +1792,9 @@ sv:
extra: Nu redo för nedladdning!
subject: Ditt arkiv är klart för nedladdning
title: Arkivuttagning
+ failed_2fa:
+ further_actions_html: Om detta inte var du, rekommenderar vi att du %{action} omedelbart eftersom ditt konto kan ha äventyrats.
+ title: Misslyckad tvåfaktorsautentisering
suspicious_sign_in:
change_password: Ändra ditt lösenord
details: 'Här är inloggningsdetaljerna:'
@@ -1842,6 +1848,7 @@ sv:
go_to_sso_account_settings: Gå till din identitetsleverantörs kontoinställningar
invalid_otp_token: Ogiltig tvåfaktorskod
otp_lost_help_html: Om du förlorat åtkomst till båda kan du komma i kontakt med %{email}
+ rate_limited: För många autentiseringsförsök, försök igen senare.
seamless_external_login: Du är inloggad via en extern tjänst, inställningar för lösenord och e-post är därför inte tillgängliga.
signed_in_as: 'Inloggad som:'
verification:
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 7bea8f9de8..ac5cfbacf5 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -847,7 +847,7 @@ th:
message_html: ไม่มีกระบวนการ Sidekiq ที่กำลังทำงานสำหรับคิว %{value} โปรดตรวจทานการกำหนดค่า Sidekiq ของคุณ
software_version_critical_check:
action: ดูการอัปเดตที่พร้อมใช้งาน
- message_html: มีการอัปเดต Mastodon สำคัญพร้อมใช้งาน โปรดอัปเดตโดยเร็วที่สุดเท่าที่จะทำได้
+ message_html: มีการอัปเดต Mastodon สำคัญพร้อมใช้งาน โปรดอัปเดตโดยเร็วที่สุดเท่าที่จะเป็นไปได้
software_version_patch_check:
action: ดูการอัปเดตที่พร้อมใช้งาน
message_html: มีการอัปเดต Mastodon ที่แก้ไขข้อบกพร่องพร้อมใช้งาน
@@ -961,7 +961,7 @@ th:
next_steps: คุณสามารถอนุมัติการอุทธรณ์เพื่อเลิกทำการตัดสินใจในการควบคุม หรือเพิกเฉยต่อการอุทธรณ์
subject: "%{username} กำลังอุทธรณ์การตัดสินใจในการควบคุมใน %{instance}"
new_critical_software_updates:
- body: มีการปล่อยรุ่น Mastodon สำคัญใหม่ คุณอาจต้องการอัปเดตโดยเร็วที่สุดเท่าที่จะทำได้!
+ body: มีการปล่อยรุ่น Mastodon สำคัญใหม่ คุณอาจต้องการอัปเดตโดยเร็วที่สุดเท่าที่จะเป็นไปได้!
subject: การอัปเดต Mastodon สำคัญพร้อมใช้งานสำหรับ %{instance}!
new_pending_account:
body: รายละเอียดของบัญชีใหม่อยู่ด้านล่าง คุณสามารถอนุมัติหรือปฏิเสธใบสมัครนี้
@@ -1582,6 +1582,7 @@ th:
unknown_browser: เบราว์เซอร์ที่ไม่รู้จัก
weibo: Weibo
current_session: เซสชันปัจจุบัน
+ date: วันที่
description: "%{browser} ใน %{platform}"
explanation: นี่คือเว็บเบราว์เซอร์ที่เข้าสู่ระบบบัญชี Mastodon ของคุณในปัจจุบัน
ip: IP
@@ -1742,14 +1743,19 @@ th:
webauthn: กุญแจความปลอดภัย
user_mailer:
appeal_approved:
+ action: การตั้งค่าบัญชี
explanation: อนุมัติการอุทธรณ์การดำเนินการต่อบัญชีของคุณเมื่อ %{strike_date} ที่คุณได้ส่งเมื่อ %{appeal_date} แล้ว บัญชีของคุณอยู่ในสถานะที่ดีอีกครั้งหนึ่ง
subject: อนุมัติการอุทธรณ์ของคุณจาก %{date} แล้ว
+ subtitle: บัญชีของคุณอยู่ในสถานะที่ดีอีกครั้งหนึ่ง
title: อนุมัติการอุทธรณ์แล้ว
appeal_rejected:
explanation: ปฏิเสธการอุทธรณ์การดำเนินการต่อบัญชีของคุณเมื่อ %{strike_date} ที่คุณได้ส่งเมื่อ %{appeal_date} แล้ว
subject: ปฏิเสธการอุทธรณ์ของคุณจาก %{date} แล้ว
+ subtitle: ปฏิเสธการอุทธรณ์ของคุณแล้ว
title: ปฏิเสธการอุทธรณ์แล้ว
backup_ready:
+ explanation: คุณได้ขอข้อมูลสำรองแบบเต็มของบัญชี Mastodon ของคุณ
+ extra: ตอนนี้ข้อมูลสำรองพร้อมสำหรับการดาวน์โหลดแล้ว!
subject: การเก็บถาวรของคุณพร้อมสำหรับการดาวน์โหลดแล้ว
title: การส่งออกการเก็บถาวร
suspicious_sign_in:
@@ -1805,6 +1811,7 @@ th:
go_to_sso_account_settings: ไปยังการตั้งค่าบัญชีของผู้ให้บริการข้อมูลประจำตัวของคุณ
invalid_otp_token: รหัสสองปัจจัยไม่ถูกต้อง
otp_lost_help_html: หากคุณสูญเสียการเข้าถึงทั้งสองอย่าง คุณสามารถติดต่อ %{email}
+ rate_limited: มีความพยายามในการรับรองความถูกต้องมากเกินไป ลองอีกครั้งในภายหลัง
seamless_external_login: คุณได้เข้าสู่ระบบผ่านบริการภายนอก ดังนั้นจึงไม่มีการตั้งค่ารหัสผ่านและอีเมล
signed_in_as: 'ลงชื่อเข้าเป็น:'
verification:
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 99b5e782ce..b3a52715b7 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -1546,6 +1546,9 @@ tr:
errors:
limit_reached: Farklı reaksiyonların sınırına ulaşıldı
unrecognized_emoji: tanınan bir emoji değil
+ redirects:
+ prompt: Eğer bu bağlantıya güveniyorsanız, tıklayıp devam edebilirsiniz.
+ title: "%{instance} sunucusundan ayrılıyorsunuz."
relationships:
activity: Hesap etkinliği
confirm_follow_selected_followers: Seçili takipçileri takip etmek istediğinizden emin misiniz?
@@ -1790,6 +1793,12 @@ tr:
extra: Şimdi indirebilirsiniz!
subject: Arşiviniz indirilmeye hazır
title: Arşiv paketlemesi
+ failed_2fa:
+ details: 'İşte oturum açma girişiminin ayrıntıları:'
+ explanation: Birisi hesabınızda oturum açmaya çalıştı ancak hatalı bir iki aşamalı doğrulama kodu kullandı.
+ further_actions_html: Eğer bu kişi siz değilseniz, hemen %{action} yapmanızı öneriyoruz çünkü hesabınız ifşa olmuş olabilir.
+ subject: İki aşamalı doğrulama başarısızlığı
+ title: Başarısız iki aşamalı kimlik doğrulama
suspicious_sign_in:
change_password: parolanızı değiştirin
details: 'Oturum açma ayrıntıları şöyledir:'
@@ -1843,6 +1852,7 @@ tr:
go_to_sso_account_settings: Kimlik sağlayıcı hesap ayarlarına gidin
invalid_otp_token: Geçersiz iki adımlı doğrulama kodu
otp_lost_help_html: Her ikisine de erişiminizi kaybettiyseniz, %{email} ile irtibata geçebilirsiniz
+ rate_limited: Çok fazla kimlik doğrulama denemesi. Daha sonra tekrar deneyin.
seamless_external_login: Harici bir servis aracılığıyla oturum açtınız, bu nedenle parola ve e-posta ayarları mevcut değildir.
signed_in_as: 'Oturum açtı:'
verification:
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index a80fbf1404..531bdb3d59 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -1598,6 +1598,9 @@ uk:
errors:
limit_reached: Досягнуто обмеження різних реакцій
unrecognized_emoji: не є розпізнаним емоджі
+ redirects:
+ prompt: Якщо ви довіряєте цьому посиланню, натисніть, щоб продовжити.
+ title: Ви покидаєте %{instance}.
relationships:
activity: Діяльність облікового запису
confirm_follow_selected_followers: Ви справді бажаєте підписатися на обраних підписників?
@@ -1903,6 +1906,7 @@ uk:
go_to_sso_account_settings: Перейдіть до налаштувань облікового запису постачальника ідентифікації
invalid_otp_token: Введено неправильний код
otp_lost_help_html: Якщо ви втратили доступ до обох, ви можете отримати доступ з %{email}
+ rate_limited: Занадто багато спроб з'єднання. Спробуйте ще раз пізніше.
seamless_external_login: Ви увійшли за допомогою зовнішнього сервісу, тому налаштування паролю та електронної пошти недоступні.
signed_in_as: 'Ви увійшли як:'
verification:
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index dabb73a475..045a000e38 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -1520,6 +1520,9 @@ vi:
errors:
limit_reached: Bạn không nên thao tác liên tục
unrecognized_emoji: không phải là emoji
+ redirects:
+ prompt: Nếu bạn tin tưởng, hãy nhấn tiếp tục.
+ title: Bạn đang thoát khỏi %{instance}.
relationships:
activity: Tương tác
confirm_follow_selected_followers: Bạn có chắc muốn theo dõi những người đã chọn?
@@ -1758,6 +1761,12 @@ vi:
extra: Hiện nó đã sẵn sàng tải xuống!
subject: Dữ liệu cá nhân của bạn đã sẵn sàng để tải về
title: Nhận dữ liệu cá nhân
+ failed_2fa:
+ details: 'Chi tiết thông tin đăng nhập:'
+ explanation: Ai đó đã cố đăng nhập vào tài khoản của bạn nhưng cung cấp yếu tố xác thực thứ hai không hợp lệ.
+ further_actions_html: Nếu không phải bạn, hãy lập tức %{action} vì có thể có rủi ro.
+ subject: Xác minh hai bước thất bại
+ title: Xác minh hai bước thất bại
suspicious_sign_in:
change_password: đổi mật khẩu của bạn
details: 'Chi tiết thông tin đăng nhập:'
@@ -1811,6 +1820,7 @@ vi:
go_to_sso_account_settings: Thiết lập tài khoản nhà cung cấp danh tính
invalid_otp_token: Mã xác minh 2 bước không hợp lệ
otp_lost_help_html: Nếu bạn mất quyền truy cập vào cả hai, bạn có thể đăng nhập bằng %{email}
+ rate_limited: Quá nhiều lần thử, vui lòng thử lại sau.
seamless_external_login: Bạn đã đăng nhập thông qua một dịch vụ bên ngoài, vì vậy mật khẩu và email không khả dụng.
signed_in_as: 'Đăng nhập bằng:'
verification:
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 6611510b7d..d1255bfefe 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -1520,6 +1520,9 @@ zh-CN:
errors:
limit_reached: 互动种类的限制
unrecognized_emoji: 不是一个可识别的表情
+ redirects:
+ prompt: 如果您信任此链接，请单击以继续跳转。
+ title: 您正在离开 %{instance} 。
relationships:
activity: 账号活动
confirm_follow_selected_followers: 您确定想要关注所选的关注者吗？
@@ -1758,6 +1761,12 @@ zh-CN:
extra: 现在它可以下载了！
subject: 你的存档已经准备完毕
title: 存档导出
+ failed_2fa:
+ details: 以下是该次登录尝试的详情：
+ explanation: 有人试图登录到您的账户，但提供了无效的辅助认证因子。
+ further_actions_html: 如果这不是您所为，您的密码可能已经泄露，建议您立即 %{action} 。
+ subject: 辅助认证失败
+ title: 辅助认证失败
suspicious_sign_in:
change_password: 更改密码
details: 以下是该次登录的详细信息：
@@ -1811,6 +1820,7 @@ zh-CN:
go_to_sso_account_settings: 转到您的身份提供商进行账户设置
invalid_otp_token: 输入的双因素认证代码无效
otp_lost_help_html: 如果你不慎丢失了所有的代码，请联系 %{email} 寻求帮助
+ rate_limited: 验证尝试次数过多，请稍后再试。
seamless_external_login: 因为你是通过外部服务登录的，所以密码和电子邮件地址设置都不可用。
signed_in_as: 当前登录的账户：
verification:
diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index 4b682f9358..b010a75c04 100644
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -1520,6 +1520,9 @@ zh-HK:
errors:
limit_reached: 已達到可以給予反應極限
unrecognized_emoji: 不能識別這個emoji
+ redirects:
+ prompt: 如果你信任此連結，點擊它繼續。
+ title: 你即將離開 %{instance}。
relationships:
activity: 帳戶活動
confirm_follow_selected_followers: 你確定要追蹤選取的追蹤者嗎？
@@ -1758,6 +1761,12 @@ zh-HK:
extra: 現在可以下載了！
subject: 你的備份檔已可供下載
title: 檔案匯出
+ failed_2fa:
+ details: 以下是嘗試登入的細節：
+ explanation: 有人嘗試登入你的帳號，但沒有通過雙重認證。
+ further_actions_html: 如果這不是你，我們建議你立刻%{action}，因為你的帳號或已遭到侵害。
+ subject: 雙重認證失敗
+ title: 雙重認證失敗
suspicious_sign_in:
change_password: 更改你的密碼
details: 以下是登入的細節：
@@ -1811,6 +1820,7 @@ zh-HK:
go_to_sso_account_settings: 前往你身份提供者的帳號設定
invalid_otp_token: 雙重認證碼不正確
otp_lost_help_html: 如果這兩者你均無法登入，你可以聯繫 %{email}
+ rate_limited: 嘗試認證次數太多，請稍後再試。
seamless_external_login: 因為你正在使用第三方服務登入，所以不能設定密碼和電郵。
signed_in_as: 目前登入的帳戶：
verification:
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index dd17de7ef1..72e63e47d3 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -57,7 +57,7 @@ zh-TW:
destroyed_msg: 即將刪除 %{username} 的資料
disable: 停用
disable_sign_in_token_auth: 停用電子郵件 token 驗證
- disable_two_factor_authentication: 停用兩階段認證
+ disable_two_factor_authentication: 停用兩階段驗證
disabled: 已停用
display_name: 暱稱
domain: 站點
@@ -195,7 +195,7 @@ zh-TW:
destroy_status: 刪除狀態
destroy_unavailable_domain: 刪除無法存取的網域
destroy_user_role: 移除角色
- disable_2fa_user: 停用兩階段認證
+ disable_2fa_user: 停用兩階段驗證
disable_custom_emoji: 停用自訂顏文字
disable_sign_in_token_auth_user: 停用使用者電子郵件 token 驗證
disable_user: 停用帳號
@@ -254,7 +254,7 @@ zh-TW:
destroy_status_html: "%{name} 已刪除 %{target} 的嘟文"
destroy_unavailable_domain_html: "%{name} 已恢復對網域 %{target} 的發送"
destroy_user_role_html: "%{name} 已刪除 %{target} 角色"
- disable_2fa_user_html: "%{name} 已停用使用者 %{target} 的兩階段認證 (2FA) "
+ disable_2fa_user_html: "%{name} 已停用使用者 %{target} 的兩階段驗證 (2FA) "
disable_custom_emoji_html: "%{name} 已停用自訂表情符號 %{target}"
disable_sign_in_token_auth_user_html: "%{name} 已停用 %{target} 之使用者電子郵件 token 驗證"
disable_user_html: "%{name} 將使用者 %{target} 設定為禁止登入"
@@ -418,7 +418,7 @@ zh-TW:
view: 顯示已封鎖網域
email_domain_blocks:
add_new: 加入新項目
- allow_registrations_with_approval: 經允許後可註冊
+ allow_registrations_with_approval: 經審核後可註冊
attempts_over_week:
other: 上週共有 %{count} 次註冊嘗試
created_msg: 已成功將電子郵件網域加入黑名單
@@ -505,7 +505,7 @@ zh-TW:
delivery_available: 可傳送
delivery_error_days: 遞送失敗天數
delivery_error_hint: 若 %{count} 日皆無法遞送 ，則會自動標記無法遞送。
- destroyed_msg: 來自 %{domain} 的資料現在正在佇列中等待刪除。
+ destroyed_msg: 來自 %{domain} 的資料目前正在佇列中等待刪除。
empty: 找不到網域
known_accounts:
other: "%{count} 個已知帳號"
@@ -759,7 +759,7 @@ zh-TW:
title: 註冊
registrations_mode:
modes:
- approved: 註冊需要核准
+ approved: 註冊需要審核
none: 沒有人可註冊
open: 任何人皆能註冊
security:
@@ -870,7 +870,7 @@ zh-TW:
links:
allow: 允許連結
allow_provider: 允許發行者
- description_html: 這些連結是正在被您伺服器上看到該嘟文之帳號大量分享。這些連結可以幫助您的使用者探索現在世界上正在發生的事情。除非您核准該發行者，連結將不被公開展示。您也可以核准或駁回個別連結。
+ description_html: 這些連結是正在被您伺服器上看到該嘟文之帳號大量分享。這些連結可以幫助您的使用者探索目前世界上正在發生的事情。除非您核准該發行者，連結將不被公開展示。您也可以核准或駁回個別連結。
disallow: 不允許連結
disallow_provider: 不允許發行者
no_link_selected: 因未選取任何連結，所以什麼事都沒發生
@@ -1062,7 +1062,7 @@ zh-TW:
cas: CAS
saml: SAML
register: 註冊
- registration_closed: "%{instance} 現在不開放新成員"
+ registration_closed: "%{instance} 目前不開放新成員"
resend_confirmation: 重新傳送確認連結
reset_password: 重設密碼
rules:
@@ -1522,6 +1522,9 @@ zh-TW:
errors:
limit_reached: 達到可回應之上限
unrecognized_emoji: 並非一個可識別的 emoji
+ redirects:
+ prompt: 若您信任此連結，請點擊以繼續。
+ title: 您將要離開 %{instance} 。
relationships:
activity: 帳號動態
confirm_follow_selected_followers: 您確定要跟隨選取的跟隨者嗎？
@@ -1627,7 +1630,7 @@ zh-TW:
relationships: 跟隨中與跟隨者
statuses_cleanup: 自動嘟文刪除
strikes: 管理警告
- two_factor_authentication: 兩階段認證
+ two_factor_authentication: 兩階段驗證
webauthn_authentication: 安全金鑰
statuses:
attached:
@@ -1733,11 +1736,11 @@ zh-TW:
disable: 停用兩階段驗證
disabled_success: 已成功啟用兩階段驗證
edit: 編輯
- enabled: 兩階段認證已啟用
- enabled_success: 已成功啟用兩階段認證
+ enabled: 兩階段驗證已啟用
+ enabled_success: 兩階段驗證已成功啟用
generate_recovery_codes: 產生備用驗證碼
lost_recovery_codes: 讓您能於遺失手機時，使用備用驗證碼登入。若您已遺失備用驗證碼，可於此產生一批新的，舊有的備用驗證碼將會失效。
- methods: 兩步驟方式
+ methods: 兩階段驗證
otp: 驗證應用程式
recovery_codes: 備份備用驗證碼
recovery_codes_regenerated: 成功產生新的備用驗證碼
@@ -1757,9 +1760,15 @@ zh-TW:
title: 申訴被駁回
backup_ready:
explanation: 您要求完整備份您的 Mastodon 帳號。
- extra: 準備好下載了！
+ extra: 準備好可供下載了！
subject: 您的備份檔已可供下載
title: 檔案匯出
+ failed_2fa:
+ details: 以下是該登入嘗試之詳細資訊：
+ explanation: 有人嘗試登入您的帳號，但提供了無效的兩階段驗證。
+ further_actions_html: 若這並非您所為，我們建議您立刻 %{action}，因為其可能已被入侵。
+ subject: 兩階段驗證失敗
+ title: 兩階段驗證失敗
suspicious_sign_in:
change_password: 變更密碼
details: 以下是該登入之詳細資訊：
@@ -1811,8 +1820,9 @@ zh-TW:
users:
follow_limit_reached: 您無法跟隨多於 %{limit} 個人
go_to_sso_account_settings: 前往您的身分提供商 (identity provider) 之帳號設定
- invalid_otp_token: 兩階段認證碼不正確
+ invalid_otp_token: 兩階段驗證碼不正確
otp_lost_help_html: 如果您無法存取這兩者，您可以透過 %{email} 與我們聯繫
+ rate_limited: 過多次身份驗證嘗試，請稍後再試。
seamless_external_login: 由於您是由外部系統登入，所以不能設定密碼與電子郵件。
signed_in_as: 目前登入的帳號：
verification:
diff --git a/config/routes.rb b/config/routes.rb
index d4cd27a491..49116d08a2 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -163,6 +163,11 @@ Rails.application.routes.draw do
end
end
+ namespace :redirect do
+ resources :accounts, only: :show
+ resources :statuses, only: :show
+ end
+
resources :media, only: [:show] do
get :player
end
diff --git a/config/routes/api.rb b/config/routes/api.rb
index f4e4b204ad..2e79ecf46f 100644
--- a/config/routes/api.rb
+++ b/config/routes/api.rb
@@ -52,6 +52,12 @@ namespace :api, format: false do
resources :scheduled_statuses, only: [:index, :show, :update, :destroy]
resources :preferences, only: [:index]
+ resources :annual_reports, only: [:index] do
+ member do
+ post :read
+ end
+ end
+
resources :announcements, only: [:index] do
scope module: :announcements do
resources :reactions, only: [:update, :destroy]
diff --git a/config/templates/privacy-policy.md b/config/templates/privacy-policy.md
new file mode 100644
index 0000000000..9e042af80a
--- /dev/null
+++ b/config/templates/privacy-policy.md
@@ -0,0 +1,128 @@
+This privacy policy describes how %{domain}s ("%{domain}s", "we", "us")
+collects, protects and uses the personally identifiable information you may
+provide through the %{domain}s website or its API. The policy also
+describes the choices available to you regarding our use of your personal
+information and how you can access and update this information. This policy
+does not apply to the practices of companies that %{domain}s does not own
+or control, or to individuals that %{domain}s does not employ or manage.
+
+# What information do we collect?
+
+- **Basic account information**: If you register on this server, you may be
+ asked to enter a username, an e-mail address and a password. You may also
+ enter additional profile information such as a display name and biography, and
+ upload a profile picture and header image. The username, display name,
+ biography, profile picture and header image are always listed publicly.
+- **Posts, following and other public information**: The list of people you
+ follow is listed publicly, the same is true for your followers. When you
+ submit a message, the date and time is stored as well as the application you
+ submitted the message from. Messages may contain media attachments, such as
+ pictures and videos. Public and unlisted posts are available publicly. When
+ you feature a post on your profile, that is also publicly available
+ information. Your posts are delivered to your followers, in some cases it
+ means they are delivered to different servers and copies are stored there.
+ When you delete posts, this is likewise delivered to your followers. The
+ action of reblogging or favouriting another post is always public.
+- **Direct and followers-only posts**: All posts are stored and processed on the
+ server. Followers-only posts are delivered to your followers and users who are
+ mentioned in them, and direct posts are delivered only to users mentioned in
+ them. In some cases it means they are delivered to different servers and
+ copies are stored there. We make a good faith effort to limit the access to
+ those posts only to authorized persons, but other servers may fail to do so.
+ Therefore it's important to review servers your followers belong to. You may
+ toggle an option to approve and reject new followers manually in the settings.
+ **Please keep in mind that the operators of the server and any receiving
+ server may view such messages**, and that recipients may screenshot, copy or
+ otherwise re-share them. **Do not share any sensitive information over
+ Mastodon.**
+- **IPs and other metadata**: When you log in, we record the IP address you log
+ in from, as well as the name of your browser application. All the logged in
+ sessions are available for your review and revocation in the settings. The
+ latest IP address used is stored for up to 12 months. We also may retain
+ server logs which include the IP address of every request to our server.
+
+# What do we use your information for?
+
+Any of the information we collect from you may be used in the following ways:
+
+- To provide the core functionality of Mastodon. You can only interact with
+ other people's content and post your own content when you are logged in. For
+ example, you may follow other people to view their combined posts in your own
+ personalized home timeline.
+- To aid moderation of the community, for example comparing your IP address with
+ other known ones to determine ban evasion or other violations.
+- The email address you provide may be used to send you information,
+ notifications about other people interacting with your content or sending you
+ messages, and to respond to inquiries, and/or other requests or questions.
+
+# How do we protect your information?
+
+We implement a variety of security measures to maintain the safety of your
+personal information when you enter, submit, or access your personal
+information. Among other things, your browser session, as well as the traffic
+between your applications and the API, are secured with SSL, and your password
+is hashed using a strong one-way algorithm. You may enable two-factor
+authentication to further secure access to your account.
+
+# What is our data retention policy?
+
+We will make a good faith effort to:
+
+- Retain server logs containing the IP address of all requests to this server,
+ in so far as such logs are kept, no more than 90 days.
+- Retain the IP addresses associated with registered users no more than 12
+ months.
+
+You can request and download an archive of your content, including your posts,
+media attachments, profile picture, and header image.
+
+You may irreversibly delete your account at any time.
+
+# Do we use cookies?
+
+Yes. Cookies are small files that a site or its service provider transfers to
+your computer's hard drive through your Web browser (if you allow). These
+cookies enable the site to recognize your browser and, if you have a registered
+account, associate it with your registered account.
+
+We use cookies to understand and save your preferences for future visits.
+
+# Do we disclose any information to outside parties?
+
+We do not sell, trade, or otherwise transfer to outside parties your personally
+identifiable information. This does not include trusted third parties who assist
+us in operating our site, conducting our business, or servicing you, so long as
+those parties agree to keep this information confidential. We may also release
+your information when we believe release is appropriate to comply with the law,
+enforce our site policies, or protect ours or others rights, property, or
+safety.
+
+Your public content may be downloaded by other servers in the network. Your
+public and followers-only posts are delivered to the servers where your
+followers reside, and direct messages are delivered to the servers of the
+recipients, in so far as those followers or recipients reside on a different
+server than this.
+
+When you authorize an application to use your account, depending on the scope of
+permissions you approve, it may access your public profile information, your
+following list, your followers, your lists, all your posts, and your favourites.
+Applications can never access your e-mail address or password.
+
+# Site usage by children
+
+If this server is in the EU or the EEA: Our site, products and services are all
+directed to people who are at least 16 years old. If you are under the age of
+16, per the requirements of the GDPR (General Data Protection Regulation) do not
+use this site.
+
+If this server is in the USA: Our site, products and services are all directed
+to people who are at least 13 years old. If you are under the age of 13, per the
+requirements of COPPA (Children's Online Privacy Protection Act) do not use this
+site.
+
+Law requirements can be different if this server is in another jurisdiction.
+
+---
+
+This document is CC-BY-SA. Originally adapted from the [Discourse privacy
+policy](https://github.com/discourse/discourse).
diff --git a/db/migrate/20240111033014_create_generated_annual_reports.rb b/db/migrate/20240111033014_create_generated_annual_reports.rb
new file mode 100644
index 0000000000..2a755fb14e
--- /dev/null
+++ b/db/migrate/20240111033014_create_generated_annual_reports.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class CreateGeneratedAnnualReports < ActiveRecord::Migration[7.1]
+ def change
+ create_table :generated_annual_reports do |t|
+ t.belongs_to :account, null: false, foreign_key: { on_cascade: :delete }, index: false
+ t.integer :year, null: false
+ t.jsonb :data, null: false
+ t.integer :schema_version, null: false
+ t.datetime :viewed_at
+
+ t.timestamps
+ end
+
+ add_index :generated_annual_reports, [:account_id, :year], unique: true
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 6af5096452..31004198e9 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema[7.1].define(version: 2024_01_09_103012) do
+ActiveRecord::Schema[7.1].define(version: 2024_01_11_033014) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -516,6 +516,17 @@ ActiveRecord::Schema[7.1].define(version: 2024_01_09_103012) do
t.index ["target_account_id"], name: "index_follows_on_target_account_id"
end
+ create_table "generated_annual_reports", force: :cascade do |t|
+ t.bigint "account_id", null: false
+ t.integer "year", null: false
+ t.jsonb "data", null: false
+ t.integer "schema_version", null: false
+ t.datetime "viewed_at"
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ t.index ["account_id", "year"], name: "index_generated_annual_reports_on_account_id_and_year", unique: true
+ end
+
create_table "identities", force: :cascade do |t|
t.string "provider", default: "", null: false
t.string "uid", default: "", null: false
@@ -1231,6 +1242,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_01_09_103012) do
add_foreign_key "follow_requests", "accounts", name: "fk_76d644b0e7", on_delete: :cascade
add_foreign_key "follows", "accounts", column: "target_account_id", name: "fk_745ca29eac", on_delete: :cascade
add_foreign_key "follows", "accounts", name: "fk_32ed1b5560", on_delete: :cascade
+ add_foreign_key "generated_annual_reports", "accounts"
add_foreign_key "identities", "users", name: "fk_bea040f377", on_delete: :cascade
add_foreign_key "imports", "accounts", name: "fk_6db1b6e408", on_delete: :cascade
add_foreign_key "invites", "users", on_delete: :cascade
diff --git a/jsconfig.json b/jsconfig.json
index d52816a98b..7b710de83c 100644
--- a/jsconfig.json
+++ b/jsconfig.json
@@ -11,7 +11,7 @@
"noEmit": true,
"resolveJsonModule": true,
"strict": false,
- "target": "ES2022"
+ "target": "ES2022",
},
- "exclude": ["**/build/*", "**/node_modules/*", "**/public/*", "**/vendor/*"]
+ "exclude": ["**/build/*", "**/node_modules/*", "**/public/*", "**/vendor/*"],
}
diff --git a/lib/mastodon/cli/maintenance.rb b/lib/mastodon/cli/maintenance.rb
index e2ea866152..a64206065d 100644
--- a/lib/mastodon/cli/maintenance.rb
+++ b/lib/mastodon/cli/maintenance.rb
@@ -72,6 +72,10 @@ module Mastodon::CLI
local? ? username : "#{username}@#{domain}"
end
+ def db_table_exists?(table)
+ ActiveRecord::Base.connection.table_exists?(table)
+ end
+
# This is a duplicate of the Account::Merging concern because we need it
# to be independent from code version.
def merge_with!(other_account)
@@ -88,12 +92,12 @@ module Mastodon::CLI
AccountModerationNote, AccountPin, AccountStat, ListAccount,
PollVote, Mention
]
- owned_classes << AccountDeletionRequest if ActiveRecord::Base.connection.table_exists?(:account_deletion_requests)
- owned_classes << AccountNote if ActiveRecord::Base.connection.table_exists?(:account_notes)
- owned_classes << FollowRecommendationSuppression if ActiveRecord::Base.connection.table_exists?(:follow_recommendation_suppressions)
- owned_classes << AccountIdentityProof if ActiveRecord::Base.connection.table_exists?(:account_identity_proofs)
- owned_classes << Appeal if ActiveRecord::Base.connection.table_exists?(:appeals)
- owned_classes << BulkImport if ActiveRecord::Base.connection.table_exists?(:bulk_imports)
+ owned_classes << AccountDeletionRequest if db_table_exists?(:account_deletion_requests)
+ owned_classes << AccountNote if db_table_exists?(:account_notes)
+ owned_classes << FollowRecommendationSuppression if db_table_exists?(:follow_recommendation_suppressions)
+ owned_classes << AccountIdentityProof if db_table_exists?(:account_identity_proofs)
+ owned_classes << Appeal if db_table_exists?(:appeals)
+ owned_classes << BulkImport if db_table_exists?(:bulk_imports)
owned_classes.each do |klass|
klass.where(account_id: other_account.id).find_each do |record|
@@ -104,7 +108,7 @@ module Mastodon::CLI
end
target_classes = [Follow, FollowRequest, Block, Mute, AccountModerationNote, AccountPin]
- target_classes << AccountNote if ActiveRecord::Base.connection.table_exists?(:account_notes)
+ target_classes << AccountNote if db_table_exists?(:account_notes)
target_classes.each do |klass|
klass.where(target_account_id: other_account.id).find_each do |record|
@@ -114,13 +118,13 @@ module Mastodon::CLI
end
end
- if ActiveRecord::Base.connection.table_exists?(:canonical_email_blocks)
+ if db_table_exists?(:canonical_email_blocks)
CanonicalEmailBlock.where(reference_account_id: other_account.id).find_each do |record|
record.update_attribute(:reference_account_id, id)
end
end
- if ActiveRecord::Base.connection.table_exists?(:appeals)
+ if db_table_exists?(:appeals)
Appeal.where(account_warning_id: other_account.id).find_each do |record|
record.update_attribute(:account_warning_id, id)
end
@@ -234,16 +238,16 @@ module Mastodon::CLI
say 'Restoring index_accounts_on_username_and_domain_lower…'
if migrator_version < 2020_06_20_164023
- ActiveRecord::Base.connection.add_index :accounts, 'lower (username), lower(domain)', name: 'index_accounts_on_username_and_domain_lower', unique: true
+ database_connection.add_index :accounts, 'lower (username), lower(domain)', name: 'index_accounts_on_username_and_domain_lower', unique: true
else
- ActiveRecord::Base.connection.add_index :accounts, "lower (username), COALESCE(lower(domain), '')", name: 'index_accounts_on_username_and_domain_lower', unique: true
+ database_connection.add_index :accounts, "lower (username), COALESCE(lower(domain), '')", name: 'index_accounts_on_username_and_domain_lower', unique: true
end
say 'Reindexing textual indexes on accounts…'
- ActiveRecord::Base.connection.execute('REINDEX INDEX search_index;')
- ActiveRecord::Base.connection.execute('REINDEX INDEX index_accounts_on_uri;')
- ActiveRecord::Base.connection.execute('REINDEX INDEX index_accounts_on_url;')
- ActiveRecord::Base.connection.execute('REINDEX INDEX index_accounts_on_domain_and_id;') if migrator_version >= 2023_05_24_190515
+ rebuild_index(:search_index)
+ rebuild_index(:index_accounts_on_uri)
+ rebuild_index(:index_accounts_on_url)
+ rebuild_index(:index_accounts_on_domain_and_id) if migrator_version >= 2023_05_24_190515
end
def deduplicate_users!
@@ -260,22 +264,22 @@ module Mastodon::CLI
deduplicate_users_process_password_token
say 'Restoring users indexes…'
- ActiveRecord::Base.connection.add_index :users, ['confirmation_token'], name: 'index_users_on_confirmation_token', unique: true
- ActiveRecord::Base.connection.add_index :users, ['email'], name: 'index_users_on_email', unique: true
- ActiveRecord::Base.connection.add_index :users, ['remember_token'], name: 'index_users_on_remember_token', unique: true if migrator_version < 2022_01_18_183010
+ database_connection.add_index :users, ['confirmation_token'], name: 'index_users_on_confirmation_token', unique: true
+ database_connection.add_index :users, ['email'], name: 'index_users_on_email', unique: true
+ database_connection.add_index :users, ['remember_token'], name: 'index_users_on_remember_token', unique: true if migrator_version < 2022_01_18_183010
if migrator_version < 2022_03_10_060641
- ActiveRecord::Base.connection.add_index :users, ['reset_password_token'], name: 'index_users_on_reset_password_token', unique: true
+ database_connection.add_index :users, ['reset_password_token'], name: 'index_users_on_reset_password_token', unique: true
else
- ActiveRecord::Base.connection.add_index :users, ['reset_password_token'], name: 'index_users_on_reset_password_token', unique: true, where: 'reset_password_token IS NOT NULL', opclass: :text_pattern_ops
+ database_connection.add_index :users, ['reset_password_token'], name: 'index_users_on_reset_password_token', unique: true, where: 'reset_password_token IS NOT NULL', opclass: :text_pattern_ops
end
- ActiveRecord::Base.connection.execute('REINDEX INDEX index_users_on_unconfirmed_email;') if migrator_version >= 2023_07_02_151753
+ rebuild_index(:index_users_on_unconfirmed_email) if migrator_version >= 2023_07_02_151753
end
def deduplicate_users_process_email
- ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM users GROUP BY email HAVING count(*) > 1").each do |row|
- users = User.where(id: row['ids'].split(',')).order(updated_at: :desc).to_a
+ database_connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM users GROUP BY email HAVING count(*) > 1").each do |row|
+ users = User.where(id: row['ids'].split(',')).order(updated_at: :desc).includes(:account).to_a
ref_user = users.shift
say "Multiple users registered with e-mail address #{ref_user.email}.", :yellow
say "e-mail will be disabled for the following accounts: #{users.map { |user| user.account.acct }.join(', ')}", :yellow
@@ -288,8 +292,8 @@ module Mastodon::CLI
end
def deduplicate_users_process_confirmation_token
- ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM users WHERE confirmation_token IS NOT NULL GROUP BY confirmation_token HAVING count(*) > 1").each do |row|
- users = User.where(id: row['ids'].split(',')).order(created_at: :desc).to_a.drop(1)
+ database_connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM users WHERE confirmation_token IS NOT NULL GROUP BY confirmation_token HAVING count(*) > 1").each do |row|
+ users = User.where(id: row['ids'].split(',')).order(created_at: :desc).includes(:account).to_a.drop(1)
say "Unsetting confirmation token for those accounts: #{users.map { |user| user.account.acct }.join(', ')}", :yellow
users.each do |user|
@@ -300,7 +304,7 @@ module Mastodon::CLI
def deduplicate_users_process_remember_token
if migrator_version < 2022_01_18_183010
- ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM users WHERE remember_token IS NOT NULL GROUP BY remember_token HAVING count(*) > 1").each do |row|
+ database_connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM users WHERE remember_token IS NOT NULL GROUP BY remember_token HAVING count(*) > 1").each do |row|
users = User.where(id: row['ids'].split(',')).order(updated_at: :desc).to_a.drop(1)
say "Unsetting remember token for those accounts: #{users.map { |user| user.account.acct }.join(', ')}", :yellow
@@ -312,8 +316,8 @@ module Mastodon::CLI
end
def deduplicate_users_process_password_token
- ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM users WHERE reset_password_token IS NOT NULL GROUP BY reset_password_token HAVING count(*) > 1").each do |row|
- users = User.where(id: row['ids'].split(',')).order(updated_at: :desc).to_a.drop(1)
+ database_connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM users WHERE reset_password_token IS NOT NULL GROUP BY reset_password_token HAVING count(*) > 1").each do |row|
+ users = User.where(id: row['ids'].split(',')).order(updated_at: :desc).includes(:account).to_a.drop(1)
say "Unsetting password reset token for those accounts: #{users.map { |user| user.account.acct }.join(', ')}", :yellow
users.each do |user|
@@ -326,47 +330,47 @@ module Mastodon::CLI
remove_index_if_exists!(:account_domain_blocks, 'index_account_domain_blocks_on_account_id_and_domain')
say 'Removing duplicate account domain blocks…'
- ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM account_domain_blocks GROUP BY account_id, domain HAVING count(*) > 1").each do |row|
+ database_connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM account_domain_blocks GROUP BY account_id, domain HAVING count(*) > 1").each do |row|
AccountDomainBlock.where(id: row['ids'].split(',').drop(1)).delete_all
end
say 'Restoring account domain blocks indexes…'
- ActiveRecord::Base.connection.add_index :account_domain_blocks, %w(account_id domain), name: 'index_account_domain_blocks_on_account_id_and_domain', unique: true
+ database_connection.add_index :account_domain_blocks, %w(account_id domain), name: 'index_account_domain_blocks_on_account_id_and_domain', unique: true
end
def deduplicate_account_identity_proofs!
- return unless ActiveRecord::Base.connection.table_exists?(:account_identity_proofs)
+ return unless db_table_exists?(:account_identity_proofs)
remove_index_if_exists!(:account_identity_proofs, 'index_account_proofs_on_account_and_provider_and_username')
say 'Removing duplicate account identity proofs…'
- ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM account_identity_proofs GROUP BY account_id, provider, provider_username HAVING count(*) > 1").each do |row|
+ database_connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM account_identity_proofs GROUP BY account_id, provider, provider_username HAVING count(*) > 1").each do |row|
AccountIdentityProof.where(id: row['ids'].split(',')).order(id: :desc).to_a.drop(1).each(&:destroy)
end
say 'Restoring account identity proofs indexes…'
- ActiveRecord::Base.connection.add_index :account_identity_proofs, %w(account_id provider provider_username), name: 'index_account_proofs_on_account_and_provider_and_username', unique: true
+ database_connection.add_index :account_identity_proofs, %w(account_id provider provider_username), name: 'index_account_proofs_on_account_and_provider_and_username', unique: true
end
def deduplicate_announcement_reactions!
- return unless ActiveRecord::Base.connection.table_exists?(:announcement_reactions)
+ return unless db_table_exists?(:announcement_reactions)
remove_index_if_exists!(:announcement_reactions, 'index_announcement_reactions_on_account_id_and_announcement_id')
say 'Removing duplicate announcement reactions…'
- ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM announcement_reactions GROUP BY account_id, announcement_id, name HAVING count(*) > 1").each do |row|
+ database_connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM announcement_reactions GROUP BY account_id, announcement_id, name HAVING count(*) > 1").each do |row|
AnnouncementReaction.where(id: row['ids'].split(',')).order(id: :desc).to_a.drop(1).each(&:destroy)
end
say 'Restoring announcement_reactions indexes…'
- ActiveRecord::Base.connection.add_index :announcement_reactions, %w(account_id announcement_id name), name: 'index_announcement_reactions_on_account_id_and_announcement_id', unique: true
+ database_connection.add_index :announcement_reactions, %w(account_id announcement_id name), name: 'index_announcement_reactions_on_account_id_and_announcement_id', unique: true
end
def deduplicate_conversations!
remove_index_if_exists!(:conversations, 'index_conversations_on_uri')
say 'Deduplicating conversations…'
- ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM conversations WHERE uri IS NOT NULL GROUP BY uri HAVING count(*) > 1").each do |row|
+ database_connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM conversations WHERE uri IS NOT NULL GROUP BY uri HAVING count(*) > 1").each do |row|
conversations = Conversation.where(id: row['ids'].split(',')).order(id: :desc).to_a
ref_conversation = conversations.shift
@@ -379,9 +383,9 @@ module Mastodon::CLI
say 'Restoring conversations indexes…'
if migrator_version < 2022_03_07_083603
- ActiveRecord::Base.connection.add_index :conversations, ['uri'], name: 'index_conversations_on_uri', unique: true
+ database_connection.add_index :conversations, ['uri'], name: 'index_conversations_on_uri', unique: true
else
- ActiveRecord::Base.connection.add_index :conversations, ['uri'], name: 'index_conversations_on_uri', unique: true, where: 'uri IS NOT NULL', opclass: :text_pattern_ops
+ database_connection.add_index :conversations, ['uri'], name: 'index_conversations_on_uri', unique: true, where: 'uri IS NOT NULL', opclass: :text_pattern_ops
end
end
@@ -389,7 +393,7 @@ module Mastodon::CLI
remove_index_if_exists!(:custom_emojis, 'index_custom_emojis_on_shortcode_and_domain')
say 'Deduplicating custom_emojis…'
- ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM custom_emojis GROUP BY shortcode, domain HAVING count(*) > 1").each do |row|
+ database_connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM custom_emojis GROUP BY shortcode, domain HAVING count(*) > 1").each do |row|
emojis = CustomEmoji.where(id: row['ids'].split(',')).order(id: :desc).to_a
ref_emoji = emojis.shift
@@ -401,14 +405,14 @@ module Mastodon::CLI
end
say 'Restoring custom_emojis indexes…'
- ActiveRecord::Base.connection.add_index :custom_emojis, %w(shortcode domain), name: 'index_custom_emojis_on_shortcode_and_domain', unique: true
+ database_connection.add_index :custom_emojis, %w(shortcode domain), name: 'index_custom_emojis_on_shortcode_and_domain', unique: true
end
def deduplicate_custom_emoji_categories!
remove_index_if_exists!(:custom_emoji_categories, 'index_custom_emoji_categories_on_name')
say 'Deduplicating custom_emoji_categories…'
- ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM custom_emoji_categories GROUP BY name HAVING count(*) > 1").each do |row|
+ database_connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM custom_emoji_categories GROUP BY name HAVING count(*) > 1").each do |row|
categories = CustomEmojiCategory.where(id: row['ids'].split(',')).order(id: :desc).to_a
ref_category = categories.shift
@@ -420,26 +424,26 @@ module Mastodon::CLI
end
say 'Restoring custom_emoji_categories indexes…'
- ActiveRecord::Base.connection.add_index :custom_emoji_categories, ['name'], name: 'index_custom_emoji_categories_on_name', unique: true
+ database_connection.add_index :custom_emoji_categories, ['name'], name: 'index_custom_emoji_categories_on_name', unique: true
end
def deduplicate_domain_allows!
remove_index_if_exists!(:domain_allows, 'index_domain_allows_on_domain')
say 'Deduplicating domain_allows…'
- ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM domain_allows GROUP BY domain HAVING count(*) > 1").each do |row|
+ database_connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM domain_allows GROUP BY domain HAVING count(*) > 1").each do |row|
DomainAllow.where(id: row['ids'].split(',')).order(id: :desc).to_a.drop(1).each(&:destroy)
end
say 'Restoring domain_allows indexes…'
- ActiveRecord::Base.connection.add_index :domain_allows, ['domain'], name: 'index_domain_allows_on_domain', unique: true
+ database_connection.add_index :domain_allows, ['domain'], name: 'index_domain_allows_on_domain', unique: true
end
def deduplicate_domain_blocks!
remove_index_if_exists!(:domain_blocks, 'index_domain_blocks_on_domain')
say 'Deduplicating domain_blocks…'
- ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM domain_blocks GROUP BY domain HAVING count(*) > 1").each do |row|
+ database_connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM domain_blocks GROUP BY domain HAVING count(*) > 1").each do |row|
domain_blocks = DomainBlock.where(id: row['ids'].split(',')).by_severity.reverse.to_a
reject_media = domain_blocks.any?(&:reject_media?)
@@ -456,49 +460,49 @@ module Mastodon::CLI
end
say 'Restoring domain_blocks indexes…'
- ActiveRecord::Base.connection.add_index :domain_blocks, ['domain'], name: 'index_domain_blocks_on_domain', unique: true
+ database_connection.add_index :domain_blocks, ['domain'], name: 'index_domain_blocks_on_domain', unique: true
end
def deduplicate_unavailable_domains!
- return unless ActiveRecord::Base.connection.table_exists?(:unavailable_domains)
+ return unless db_table_exists?(:unavailable_domains)
remove_index_if_exists!(:unavailable_domains, 'index_unavailable_domains_on_domain')
say 'Deduplicating unavailable_domains…'
- ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM unavailable_domains GROUP BY domain HAVING count(*) > 1").each do |row|
+ database_connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM unavailable_domains GROUP BY domain HAVING count(*) > 1").each do |row|
UnavailableDomain.where(id: row['ids'].split(',')).order(id: :desc).to_a.drop(1).each(&:destroy)
end
say 'Restoring unavailable_domains indexes…'
- ActiveRecord::Base.connection.add_index :unavailable_domains, ['domain'], name: 'index_unavailable_domains_on_domain', unique: true
+ database_connection.add_index :unavailable_domains, ['domain'], name: 'index_unavailable_domains_on_domain', unique: true
end
def deduplicate_email_domain_blocks!
remove_index_if_exists!(:email_domain_blocks, 'index_email_domain_blocks_on_domain')
say 'Deduplicating email_domain_blocks…'
- ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM email_domain_blocks GROUP BY domain HAVING count(*) > 1").each do |row|
+ database_connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM email_domain_blocks GROUP BY domain HAVING count(*) > 1").each do |row|
domain_blocks = EmailDomainBlock.where(id: row['ids'].split(',')).order(EmailDomainBlock.arel_table[:parent_id].asc.nulls_first).to_a
domain_blocks.drop(1).each(&:destroy)
end
say 'Restoring email_domain_blocks indexes…'
- ActiveRecord::Base.connection.add_index :email_domain_blocks, ['domain'], name: 'index_email_domain_blocks_on_domain', unique: true
+ database_connection.add_index :email_domain_blocks, ['domain'], name: 'index_email_domain_blocks_on_domain', unique: true
end
def deduplicate_media_attachments!
remove_index_if_exists!(:media_attachments, 'index_media_attachments_on_shortcode')
say 'Deduplicating media_attachments…'
- ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM media_attachments WHERE shortcode IS NOT NULL GROUP BY shortcode HAVING count(*) > 1").each do |row|
+ database_connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM media_attachments WHERE shortcode IS NOT NULL GROUP BY shortcode HAVING count(*) > 1").each do |row|
MediaAttachment.where(id: row['ids'].split(',').drop(1)).update_all(shortcode: nil)
end
say 'Restoring media_attachments indexes…'
if migrator_version < 2022_03_10_060626
- ActiveRecord::Base.connection.add_index :media_attachments, ['shortcode'], name: 'index_media_attachments_on_shortcode', unique: true
+ database_connection.add_index :media_attachments, ['shortcode'], name: 'index_media_attachments_on_shortcode', unique: true
else
- ActiveRecord::Base.connection.add_index :media_attachments, ['shortcode'], name: 'index_media_attachments_on_shortcode', unique: true, where: 'shortcode IS NOT NULL', opclass: :text_pattern_ops
+ database_connection.add_index :media_attachments, ['shortcode'], name: 'index_media_attachments_on_shortcode', unique: true, where: 'shortcode IS NOT NULL', opclass: :text_pattern_ops
end
end
@@ -506,19 +510,19 @@ module Mastodon::CLI
remove_index_if_exists!(:preview_cards, 'index_preview_cards_on_url')
say 'Deduplicating preview_cards…'
- ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM preview_cards GROUP BY url HAVING count(*) > 1").each do |row|
+ database_connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM preview_cards GROUP BY url HAVING count(*) > 1").each do |row|
PreviewCard.where(id: row['ids'].split(',')).order(id: :desc).to_a.drop(1).each(&:destroy)
end
say 'Restoring preview_cards indexes…'
- ActiveRecord::Base.connection.add_index :preview_cards, ['url'], name: 'index_preview_cards_on_url', unique: true
+ database_connection.add_index :preview_cards, ['url'], name: 'index_preview_cards_on_url', unique: true
end
def deduplicate_statuses!
remove_index_if_exists!(:statuses, 'index_statuses_on_uri')
say 'Deduplicating statuses…'
- ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM statuses WHERE uri IS NOT NULL GROUP BY uri HAVING count(*) > 1").each do |row|
+ database_connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM statuses WHERE uri IS NOT NULL GROUP BY uri HAVING count(*) > 1").each do |row|
statuses = Status.where(id: row['ids'].split(',')).order(id: :asc).to_a
ref_status = statuses.shift
statuses.each do |status|
@@ -529,9 +533,9 @@ module Mastodon::CLI
say 'Restoring statuses indexes…'
if migrator_version < 2022_03_10_060706
- ActiveRecord::Base.connection.add_index :statuses, ['uri'], name: 'index_statuses_on_uri', unique: true
+ database_connection.add_index :statuses, ['uri'], name: 'index_statuses_on_uri', unique: true
else
- ActiveRecord::Base.connection.add_index :statuses, ['uri'], name: 'index_statuses_on_uri', unique: true, where: 'uri IS NOT NULL', opclass: :text_pattern_ops
+ database_connection.add_index :statuses, ['uri'], name: 'index_statuses_on_uri', unique: true, where: 'uri IS NOT NULL', opclass: :text_pattern_ops
end
end
@@ -540,7 +544,7 @@ module Mastodon::CLI
remove_index_if_exists!(:tags, 'index_tags_on_name_lower_btree')
say 'Deduplicating tags…'
- ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM tags GROUP BY lower((name)::text) HAVING count(*) > 1").each do |row|
+ database_connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM tags GROUP BY lower((name)::text) HAVING count(*) > 1").each do |row|
tags = Tag.where(id: row['ids'].split(',')).order(Arel.sql('(usable::int + trendable::int + listable::int) desc')).to_a
ref_tag = tags.shift
tags.each do |tag|
@@ -551,38 +555,38 @@ module Mastodon::CLI
say 'Restoring tags indexes…'
if migrator_version < 2021_04_21_121431
- ActiveRecord::Base.connection.add_index :tags, 'lower((name)::text)', name: 'index_tags_on_name_lower', unique: true
+ database_connection.add_index :tags, 'lower((name)::text)', name: 'index_tags_on_name_lower', unique: true
else
- ActiveRecord::Base.connection.execute 'CREATE UNIQUE INDEX index_tags_on_name_lower_btree ON tags (lower(name) text_pattern_ops)'
+ database_connection.execute 'CREATE UNIQUE INDEX index_tags_on_name_lower_btree ON tags (lower(name) text_pattern_ops)'
end
end
def deduplicate_webauthn_credentials!
- return unless ActiveRecord::Base.connection.table_exists?(:webauthn_credentials)
+ return unless db_table_exists?(:webauthn_credentials)
remove_index_if_exists!(:webauthn_credentials, 'index_webauthn_credentials_on_external_id')
say 'Deduplicating webauthn_credentials…'
- ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM webauthn_credentials GROUP BY external_id HAVING count(*) > 1").each do |row|
+ database_connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM webauthn_credentials GROUP BY external_id HAVING count(*) > 1").each do |row|
WebauthnCredential.where(id: row['ids'].split(',')).order(id: :desc).to_a.drop(1).each(&:destroy)
end
say 'Restoring webauthn_credentials indexes…'
- ActiveRecord::Base.connection.add_index :webauthn_credentials, ['external_id'], name: 'index_webauthn_credentials_on_external_id', unique: true
+ database_connection.add_index :webauthn_credentials, ['external_id'], name: 'index_webauthn_credentials_on_external_id', unique: true
end
def deduplicate_webhooks!
- return unless ActiveRecord::Base.connection.table_exists?(:webhooks)
+ return unless db_table_exists?(:webhooks)
remove_index_if_exists!(:webhooks, 'index_webhooks_on_url')
say 'Deduplicating webhooks…'
- ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM webhooks GROUP BY url HAVING count(*) > 1").each do |row|
+ database_connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM webhooks GROUP BY url HAVING count(*) > 1").each do |row|
Webhook.where(id: row['ids'].split(',')).order(id: :desc).drop(1).each(&:destroy)
end
say 'Restoring webhooks indexes…'
- ActiveRecord::Base.connection.add_index :webhooks, ['url'], name: 'index_webhooks_on_url', unique: true
+ database_connection.add_index :webhooks, ['url'], name: 'index_webhooks_on_url', unique: true
end
def deduplicate_software_updates!
@@ -591,7 +595,7 @@ module Mastodon::CLI
end
def deduplicate_local_accounts!(scope)
- accounts = scope.order(id: :desc).to_a
+ accounts = scope.order(id: :desc).includes(:account_stat, :user).to_a
say "Multiple local accounts were found for username '#{accounts.first.username}'.", :yellow
say 'All those accounts are distinct accounts but only the most recently-created one is fully-functional.', :yellow
@@ -672,7 +676,7 @@ module Mastodon::CLI
def merge_statuses!(main_status, duplicate_status)
owned_classes = [Favourite, Mention, Poll]
- owned_classes << Bookmark if ActiveRecord::Base.connection.table_exists?(:bookmarks)
+ owned_classes << Bookmark if db_table_exists?(:bookmarks)
owned_classes.each do |klass|
klass.where(status_id: duplicate_status.id).find_each do |record|
record.update_attribute(:status_id, main_status.id)
@@ -715,13 +719,25 @@ module Mastodon::CLI
end
def find_duplicate_accounts
- ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM accounts GROUP BY lower(username), COALESCE(lower(domain), '') HAVING count(*) > 1")
+ database_connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM accounts GROUP BY lower(username), COALESCE(lower(domain), '') HAVING count(*) > 1")
end
def remove_index_if_exists!(table, name)
- ActiveRecord::Base.connection.remove_index(table, name: name) if ActiveRecord::Base.connection.index_name_exists?(table, name)
+ database_connection.remove_index(table, name: name) if database_connection.index_name_exists?(table, name)
rescue ArgumentError, ActiveRecord::StatementInvalid
nil
end
+
+ def database_connection
+ ActiveRecord::Base.connection
+ end
+
+ def db_table_exists?(table)
+ database_connection.table_exists?(table)
+ end
+
+ def rebuild_index(name)
+ database_connection.execute("REINDEX INDEX #{name}")
+ end
end
end
diff --git a/lib/mastodon/cli/statuses.rb b/lib/mastodon/cli/statuses.rb
index 7acf3f9b77..48d76e0288 100644
--- a/lib/mastodon/cli/statuses.rb
+++ b/lib/mastodon/cli/statuses.rb
@@ -120,7 +120,7 @@ module Mastodon::CLI
say('Beginning removal of now-orphaned media attachments to free up disk space...')
- scope = MediaAttachment.unattached.where('created_at < ?', options[:days].pred.days.ago)
+ scope = MediaAttachment.unattached.created_before(options[:days].pred.days.ago)
processed = 0
removed = 0
progress = create_progress_bar(scope.count)
diff --git a/lib/paperclip/response_with_limit_adapter.rb b/lib/paperclip/response_with_limit_adapter.rb
index deb89717a4..ff7a938abb 100644
--- a/lib/paperclip/response_with_limit_adapter.rb
+++ b/lib/paperclip/response_with_limit_adapter.rb
@@ -16,7 +16,7 @@ module Paperclip
private
def cache_current_values
- @original_filename = filename_from_content_disposition.presence || filename_from_path.presence || 'data'
+ @original_filename = truncated_filename
@tempfile = copy_to_tempfile(@target)
@content_type = ContentTypeDetector.new(@tempfile.path).detect
@size = File.size(@tempfile)
@@ -43,6 +43,13 @@ module Paperclip
source.response.connection.close
end
+ def truncated_filename
+ filename = filename_from_content_disposition.presence || filename_from_path.presence || 'data'
+ extension = File.extname(filename)
+ basename = File.basename(filename, extension)
+ [basename[...20], extension[..4]].compact_blank.join
+ end
+
def filename_from_content_disposition
disposition = @target.response.headers['content-disposition']
disposition&.match(/filename="([^"]*)"/)&.captures&.first
diff --git a/lib/tasks/db.rake b/lib/tasks/db.rake
index 3bc526bd21..4208c2ae4b 100644
--- a/lib/tasks/db.rake
+++ b/lib/tasks/db.rake
@@ -16,8 +16,8 @@ namespace :db do
end
task pre_migration_check: :environment do
- version = ActiveRecord::Base.connection.select_one("SELECT current_setting('server_version_num') AS v")['v'].to_i
- abort 'This version of Mastodon requires PostgreSQL 9.5 or newer. Please update PostgreSQL before updating Mastodon' if version < 90_500
+ version = ActiveRecord::Base.connection.database_version
+ abort 'This version of Mastodon requires PostgreSQL 12.0 or newer. Please update PostgreSQL before updating Mastodon.' if version < 120_000
end
Rake::Task['db:migrate'].enhance(['db:pre_migration_check'])
diff --git a/lib/tasks/tests.rake b/lib/tasks/tests.rake
index c3a9dbfd73..885be79f41 100644
--- a/lib/tasks/tests.rake
+++ b/lib/tasks/tests.rake
@@ -2,6 +2,22 @@
namespace :tests do
namespace :migrations do
+ desc 'Prepares all migrations and test data for consistency checks'
+ task prepare_database: :environment do
+ {
+ '2' => 2017_10_10_025614,
+ '2_4' => 2018_05_14_140000,
+ '2_4_3' => 2018_07_07_154237,
+ }.each do |release, version|
+ ActiveRecord::Tasks::DatabaseTasks
+ .migration_connection
+ .migration_context
+ .migrate(version)
+ Rake::Task["tests:migrations:populate_v#{release}"]
+ .invoke
+ end
+ end
+
desc 'Check that database state is consistent with a successful migration from populated data'
task check_database: :environment do
unless Account.find_by(username: 'admin', domain: nil)&.hide_collections? == false
@@ -24,7 +40,7 @@ namespace :tests do
exit(1)
end
- if Account.where(domain: Rails.configuration.x.local_domain).exists?
+ if Account.exists?(domain: Rails.configuration.x.local_domain)
puts 'Faux remote accounts not properly cleaned up'
exit(1)
end
@@ -88,6 +104,8 @@ namespace :tests do
puts 'Locale for fr-QC users not updated to fr-CA as expected'
exit(1)
end
+
+ puts 'No errors found. Database state is consistent with a successful migration process.'
end
desc 'Populate the database with test data for 2.4.3'
diff --git a/spec/controllers/api/base_controller_spec.rb b/spec/controllers/api/base_controller_spec.rb
index db1e8777f7..f8e014be2f 100644
--- a/spec/controllers/api/base_controller_spec.rb
+++ b/spec/controllers/api/base_controller_spec.rb
@@ -12,7 +12,7 @@ describe Api::BaseController do
head 200
end
- def error
+ def failure
FakeService.new
end
end
@@ -30,7 +30,7 @@ describe Api::BaseController do
it 'does not protect from forgery' do
ActionController::Base.allow_forgery_protection = true
- post 'success'
+ post :success
expect(response).to have_http_status(200)
end
end
@@ -50,47 +50,55 @@ describe Api::BaseController do
it 'returns http forbidden for unconfirmed accounts' do
user.update(confirmed_at: nil)
- post 'success'
+ post :success
expect(response).to have_http_status(403)
end
it 'returns http forbidden for pending accounts' do
user.update(approved: false)
- post 'success'
+ post :success
expect(response).to have_http_status(403)
end
it 'returns http forbidden for disabled accounts' do
user.update(disabled: true)
- post 'success'
+ post :success
expect(response).to have_http_status(403)
end
it 'returns http forbidden for suspended accounts' do
user.account.suspend!
- post 'success'
+ post :success
expect(response).to have_http_status(403)
end
end
describe 'error handling' do
before do
- routes.draw { get 'error' => 'api/base#error' }
+ routes.draw { get 'failure' => 'api/base#failure' }
end
{
ActiveRecord::RecordInvalid => 422,
- Mastodon::ValidationError => 422,
ActiveRecord::RecordNotFound => 404,
- Mastodon::UnexpectedResponseError => 503,
+ ActiveRecord::RecordNotUnique => 422,
+ Date::Error => 422,
HTTP::Error => 503,
- OpenSSL::SSL::SSLError => 503,
+ Mastodon::InvalidParameterError => 400,
Mastodon::NotPermittedError => 403,
+ Mastodon::RaceConditionError => 503,
+ Mastodon::RateLimitExceededError => 429,
+ Mastodon::UnexpectedResponseError => 503,
+ Mastodon::ValidationError => 422,
+ OpenSSL::SSL::SSLError => 503,
+ Seahorse::Client::NetworkingError => 503,
+ Stoplight::Error::RedLight => 503,
}.each do |error, code|
it "Handles error class of #{error}" do
allow(FakeService).to receive(:new).and_raise(error)
- get 'error'
+ get :failure
+
expect(response).to have_http_status(code)
expect(FakeService).to have_received(:new)
end
diff --git a/spec/controllers/auth/sessions_controller_spec.rb b/spec/controllers/auth/sessions_controller_spec.rb
index e3f2b278bd..b663f55afa 100644
--- a/spec/controllers/auth/sessions_controller_spec.rb
+++ b/spec/controllers/auth/sessions_controller_spec.rb
@@ -262,6 +262,40 @@ RSpec.describe Auth::SessionsController do
end
end
+ context 'when repeatedly using an invalid TOTP code before using a valid code' do
+ before do
+ stub_const('Auth::SessionsController::MAX_2FA_ATTEMPTS_PER_HOUR', 2)
+
+ # Travel to the beginning of an hour to avoid crossing rate-limit buckets
+ travel_to '2023-12-20T10:00:00Z'
+ end
+
+ it 'does not log the user in' do
+ Auth::SessionsController::MAX_2FA_ATTEMPTS_PER_HOUR.times do
+ post :create, params: { user: { otp_attempt: '1234' } }, session: { attempt_user_id: user.id, attempt_user_updated_at: user.updated_at.to_s }
+ expect(controller.current_user).to be_nil
+ end
+
+ post :create, params: { user: { otp_attempt: user.current_otp } }, session: { attempt_user_id: user.id, attempt_user_updated_at: user.updated_at.to_s }
+
+ expect(controller.current_user).to be_nil
+ expect(flash[:alert]).to match I18n.t('users.rate_limited')
+ end
+
+ it 'sends a suspicious sign-in mail', :sidekiq_inline do
+ Auth::SessionsController::MAX_2FA_ATTEMPTS_PER_HOUR.times do
+ post :create, params: { user: { otp_attempt: '1234' } }, session: { attempt_user_id: user.id, attempt_user_updated_at: user.updated_at.to_s }
+ expect(controller.current_user).to be_nil
+ end
+
+ post :create, params: { user: { otp_attempt: user.current_otp } }, session: { attempt_user_id: user.id, attempt_user_updated_at: user.updated_at.to_s }
+
+ expect(UserMailer.deliveries.size).to eq(1)
+ expect(UserMailer.deliveries.first.to.first).to eq(user.email)
+ expect(UserMailer.deliveries.first.subject).to eq(I18n.t('user_mailer.failed_2fa.subject'))
+ end
+ end
+
context 'when using a valid OTP' do
before do
post :create, params: { user: { otp_attempt: user.current_otp } }, session: { attempt_user_id: user.id, attempt_user_updated_at: user.updated_at.to_s }
diff --git a/spec/features/redirections_spec.rb b/spec/features/redirections_spec.rb
new file mode 100644
index 0000000000..f73ab58470
--- /dev/null
+++ b/spec/features/redirections_spec.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'redirection confirmations' do
+ let(:account) { Fabricate(:account, domain: 'example.com', uri: 'https://example.com/users/foo', url: 'https://example.com/@foo') }
+ let(:status) { Fabricate(:status, account: account, uri: 'https://example.com/users/foo/statuses/1', url: 'https://example.com/@foo/1') }
+
+ context 'when a logged out user visits a local page for a remote account' do
+ it 'shows a confirmation page' do
+ visit "/@#{account.pretty_acct}"
+
+ # It explains about the redirect
+ expect(page).to have_content(I18n.t('redirects.title', instance: 'cb6e6126.ngrok.io'))
+
+ # It features an appropriate link
+ expect(page).to have_link(account.url, href: account.url)
+ end
+ end
+
+ context 'when a logged out user visits a local page for a remote status' do
+ it 'shows a confirmation page' do
+ visit "/@#{account.pretty_acct}/#{status.id}"
+
+ # It explains about the redirect
+ expect(page).to have_content(I18n.t('redirects.title', instance: 'cb6e6126.ngrok.io'))
+
+ # It features an appropriate link
+ expect(page).to have_link(status.url, href: status.url)
+ end
+ end
+end
diff --git a/spec/lib/activitypub/activity/create_spec.rb b/spec/lib/activitypub/activity/create_spec.rb
index 3c80ab4531..5af3615c78 100644
--- a/spec/lib/activitypub/activity/create_spec.rb
+++ b/spec/lib/activitypub/activity/create_spec.rb
@@ -939,6 +939,49 @@ RSpec.describe ActivityPub::Activity::Create do
end
end
+ context 'when object URI uses bearcaps' do
+ subject { described_class.new(json, sender) }
+
+ let(:token) { 'foo' }
+
+ let(:json) do
+ {
+ '@context': 'https://www.w3.org/ns/activitystreams',
+ id: [ActivityPub::TagManager.instance.uri_for(sender), '#foo'].join,
+ type: 'Create',
+ actor: ActivityPub::TagManager.instance.uri_for(sender),
+ object: Addressable::URI.new(scheme: 'bear', query_values: { t: token, u: object_json[:id] }).to_s,
+ }.with_indifferent_access
+ end
+
+ let(:object_json) do
+ {
+ id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
+ type: 'Note',
+ content: 'Lorem ipsum',
+ to: 'https://www.w3.org/ns/activitystreams#Public',
+ }
+ end
+
+ before do
+ stub_request(:get, object_json[:id])
+ .with(headers: { Authorization: "Bearer #{token}" })
+ .to_return(body: Oj.dump(object_json), headers: { 'Content-Type': 'application/activity+json' })
+
+ subject.perform
+ end
+
+ it 'creates status' do
+ status = sender.statuses.first
+
+ expect(status).to_not be_nil
+ expect(status).to have_attributes(
+ visibility: 'public',
+ text: 'Lorem ipsum'
+ )
+ end
+ end
+
context 'with an encrypted message' do
subject { described_class.new(json, sender, delivery: true, delivered_to_account_id: recipient.id) }
diff --git a/spec/mailers/previews/user_mailer_preview.rb b/spec/mailers/previews/user_mailer_preview.rb
index 098c9cd901..2722538e1a 100644
--- a/spec/mailers/previews/user_mailer_preview.rb
+++ b/spec/mailers/previews/user_mailer_preview.rb
@@ -93,4 +93,9 @@ class UserMailerPreview < ActionMailer::Preview
def suspicious_sign_in
UserMailer.suspicious_sign_in(User.first, '127.0.0.1', 'Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:75.0) Gecko/20100101 Firefox/75.0', Time.now.utc)
end
+
+ # Preview this email at http://localhost:3000/rails/mailers/user_mailer/failed_2fa
+ def failed_2fa
+ UserMailer.failed_2fa(User.first, '127.0.0.1', 'Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:75.0) Gecko/20100101 Firefox/75.0', Time.now.utc)
+ end
end
diff --git a/spec/mailers/user_mailer_spec.rb b/spec/mailers/user_mailer_spec.rb
index 4a43928248..404b834702 100644
--- a/spec/mailers/user_mailer_spec.rb
+++ b/spec/mailers/user_mailer_spec.rb
@@ -135,6 +135,24 @@ describe UserMailer do
'user_mailer.suspicious_sign_in.subject'
end
+ describe '#failed_2fa' do
+ let(:ip) { '192.168.0.1' }
+ let(:agent) { 'NCSA_Mosaic/2.0 (Windows 3.1)' }
+ let(:timestamp) { Time.now.utc }
+ let(:mail) { described_class.failed_2fa(receiver, ip, agent, timestamp) }
+
+ it 'renders failed 2FA notification' do
+ receiver.update!(locale: nil)
+
+ expect(mail)
+ .to be_present
+ .and(have_body_text(I18n.t('user_mailer.failed_2fa.explanation')))
+ end
+
+ include_examples 'localized subject',
+ 'user_mailer.failed_2fa.subject'
+ end
+
describe '#appeal_approved' do
let(:appeal) { Fabricate(:appeal, account: receiver.account, approved_at: Time.now.utc) }
let(:mail) { described_class.appeal_approved(receiver, appeal) }
diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index d360d934d6..7ef5ca94cc 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -835,6 +835,50 @@ RSpec.describe Account do
end
describe 'scopes' do
+ describe 'matches_uri_prefix' do
+ let!(:alice) { Fabricate :account, domain: 'host.example', uri: 'https://host.example/user/a' }
+ let!(:bob) { Fabricate :account, domain: 'top-level.example', uri: 'https://top-level.example' }
+
+ it 'returns accounts which start with the value' do
+ results = described_class.matches_uri_prefix('https://host.example')
+
+ expect(results.size)
+ .to eq(1)
+ expect(results)
+ .to include(alice)
+ .and not_include(bob)
+ end
+
+ it 'returns accounts which equal the value' do
+ results = described_class.matches_uri_prefix('https://top-level.example')
+
+ expect(results.size)
+ .to eq(1)
+ expect(results)
+ .to include(bob)
+ .and not_include(alice)
+ end
+ end
+
+ describe 'auditable' do
+ let!(:alice) { Fabricate :account }
+ let!(:bob) { Fabricate :account }
+
+ before do
+ 2.times { Fabricate :action_log, account: alice }
+ end
+
+ it 'returns distinct accounts with action log records' do
+ results = described_class.auditable
+
+ expect(results.size)
+ .to eq(1)
+ expect(results)
+ .to include(alice)
+ .and not_include(bob)
+ end
+ end
+
describe 'alphabetic' do
it 'sorts by alphabetic order of domain and username' do
matches = [
diff --git a/spec/models/account_statuses_cleanup_policy_spec.rb b/spec/models/account_statuses_cleanup_policy_spec.rb
index da2a774b2d..a08fd723a4 100644
--- a/spec/models/account_statuses_cleanup_policy_spec.rb
+++ b/spec/models/account_statuses_cleanup_policy_spec.rb
@@ -296,16 +296,11 @@ RSpec.describe AccountStatusesCleanupPolicy do
let!(:old_status) { Fabricate(:status, created_at: 1.year.ago, account: account) }
let!(:slightly_less_old_status) { Fabricate(:status, created_at: 6.months.ago, account: account) }
- it 'returns statuses including max_id' do
- expect(subject).to include(old_status.id)
- end
-
- it 'returns statuses including older than max_id' do
- expect(subject).to include(very_old_status.id)
- end
-
- it 'does not return statuses newer than max_id' do
- expect(subject).to_not include(slightly_less_old_status.id)
+ it 'returns statuses included the max_id and older than the max_id but not newer than max_id' do
+ expect(subject)
+ .to include(old_status.id)
+ .and include(very_old_status.id)
+ .and not_include(slightly_less_old_status.id)
end
end
@@ -315,16 +310,11 @@ RSpec.describe AccountStatusesCleanupPolicy do
let!(:old_status) { Fabricate(:status, created_at: 1.year.ago, account: account) }
let!(:slightly_less_old_status) { Fabricate(:status, created_at: 6.months.ago, account: account) }
- it 'returns statuses including min_id' do
- expect(subject).to include(old_status.id)
- end
-
- it 'returns statuses including newer than max_id' do
- expect(subject).to include(slightly_less_old_status.id)
- end
-
- it 'does not return statuses older than min_id' do
- expect(subject).to_not include(very_old_status.id)
+ it 'returns statuses including min_id and newer than min_id, but not older than min_id' do
+ expect(subject)
+ .to include(old_status.id)
+ .and include(slightly_less_old_status.id)
+ .and not_include(very_old_status.id)
end
end
@@ -339,12 +329,10 @@ RSpec.describe AccountStatusesCleanupPolicy do
account_statuses_cleanup_policy.min_status_age = 2.years.seconds
end
- it 'does not return unrelated old status' do
- expect(subject.pluck(:id)).to_not include(unrelated_status.id)
- end
-
- it 'returns only oldest status for deletion' do
- expect(subject.pluck(:id)).to eq [very_old_status.id]
+ it 'does not return unrelated old status and does return oldest status' do
+ expect(subject.pluck(:id))
+ .to not_include(unrelated_status.id)
+ .and eq [very_old_status.id]
end
end
@@ -358,12 +346,10 @@ RSpec.describe AccountStatusesCleanupPolicy do
account_statuses_cleanup_policy.keep_self_bookmark = false
end
- it 'does not return the old direct message for deletion' do
- expect(subject.pluck(:id)).to_not include(direct_message.id)
- end
-
- it 'returns every other old status for deletion' do
- expect(subject.pluck(:id)).to include(very_old_status.id, pinned_status.id, self_faved.id, self_bookmarked.id, status_with_poll.id, status_with_media.id, faved_primary.id, faved_secondary.id, reblogged_primary.id, reblogged_secondary.id)
+ it 'returns every old status except does not return the old direct message for deletion' do
+ expect(subject.pluck(:id))
+ .to not_include(direct_message.id)
+ .and include(very_old_status.id, pinned_status.id, self_faved.id, self_bookmarked.id, status_with_poll.id, status_with_media.id, faved_primary.id, faved_secondary.id, reblogged_primary.id, reblogged_secondary.id)
end
end
@@ -377,12 +363,10 @@ RSpec.describe AccountStatusesCleanupPolicy do
account_statuses_cleanup_policy.keep_self_bookmark = true
end
- it 'does not return the old self-bookmarked message for deletion' do
- expect(subject.pluck(:id)).to_not include(self_bookmarked.id)
- end
-
- it 'returns every other old status for deletion' do
- expect(subject.pluck(:id)).to include(direct_message.id, very_old_status.id, pinned_status.id, self_faved.id, status_with_poll.id, status_with_media.id, faved_primary.id, faved_secondary.id, reblogged_primary.id, reblogged_secondary.id)
+ it 'returns every old status but does not return the old self-bookmarked message for deletion' do
+ expect(subject.pluck(:id))
+ .to not_include(self_bookmarked.id)
+ .and include(direct_message.id, very_old_status.id, pinned_status.id, self_faved.id, status_with_poll.id, status_with_media.id, faved_primary.id, faved_secondary.id, reblogged_primary.id, reblogged_secondary.id)
end
end
@@ -396,12 +380,10 @@ RSpec.describe AccountStatusesCleanupPolicy do
account_statuses_cleanup_policy.keep_self_bookmark = false
end
- it 'does not return the old self-bookmarked message for deletion' do
- expect(subject.pluck(:id)).to_not include(self_faved.id)
- end
-
- it 'returns every other old status for deletion' do
- expect(subject.pluck(:id)).to include(direct_message.id, very_old_status.id, pinned_status.id, self_bookmarked.id, status_with_poll.id, status_with_media.id, faved_primary.id, faved_secondary.id, reblogged_primary.id, reblogged_secondary.id)
+ it 'returns every old status but does not return the old self-faved message for deletion' do
+ expect(subject.pluck(:id))
+ .to not_include(self_faved.id)
+ .and include(direct_message.id, very_old_status.id, pinned_status.id, self_bookmarked.id, status_with_poll.id, status_with_media.id, faved_primary.id, faved_secondary.id, reblogged_primary.id, reblogged_secondary.id)
end
end
@@ -415,12 +397,10 @@ RSpec.describe AccountStatusesCleanupPolicy do
account_statuses_cleanup_policy.keep_self_bookmark = false
end
- it 'does not return the old message with media for deletion' do
- expect(subject.pluck(:id)).to_not include(status_with_media.id)
- end
-
- it 'returns every other old status for deletion' do
- expect(subject.pluck(:id)).to include(direct_message.id, very_old_status.id, pinned_status.id, self_faved.id, self_bookmarked.id, status_with_poll.id, faved_primary.id, faved_secondary.id, reblogged_primary.id, reblogged_secondary.id)
+ it 'returns every old status but does not return the old message with media for deletion' do
+ expect(subject.pluck(:id))
+ .to not_include(status_with_media.id)
+ .and include(direct_message.id, very_old_status.id, pinned_status.id, self_faved.id, self_bookmarked.id, status_with_poll.id, faved_primary.id, faved_secondary.id, reblogged_primary.id, reblogged_secondary.id)
end
end
@@ -434,12 +414,10 @@ RSpec.describe AccountStatusesCleanupPolicy do
account_statuses_cleanup_policy.keep_self_bookmark = false
end
- it 'does not return the old poll message for deletion' do
- expect(subject.pluck(:id)).to_not include(status_with_poll.id)
- end
-
- it 'returns every other old status for deletion' do
- expect(subject.pluck(:id)).to include(direct_message.id, very_old_status.id, pinned_status.id, self_faved.id, self_bookmarked.id, status_with_media.id, faved_primary.id, faved_secondary.id, reblogged_primary.id, reblogged_secondary.id)
+ it 'returns every old status but does not return the old poll message for deletion' do
+ expect(subject.pluck(:id))
+ .to not_include(status_with_poll.id)
+ .and include(direct_message.id, very_old_status.id, pinned_status.id, self_faved.id, self_bookmarked.id, status_with_media.id, faved_primary.id, faved_secondary.id, reblogged_primary.id, reblogged_secondary.id)
end
end
@@ -453,12 +431,10 @@ RSpec.describe AccountStatusesCleanupPolicy do
account_statuses_cleanup_policy.keep_self_bookmark = false
end
- it 'does not return the old pinned message for deletion' do
- expect(subject.pluck(:id)).to_not include(pinned_status.id)
- end
-
- it 'returns every other old status for deletion' do
- expect(subject.pluck(:id)).to include(direct_message.id, very_old_status.id, self_faved.id, self_bookmarked.id, status_with_poll.id, status_with_media.id, faved_primary.id, faved_secondary.id, reblogged_primary.id, reblogged_secondary.id)
+ it 'returns every old status but does not return the old pinned message for deletion' do
+ expect(subject.pluck(:id))
+ .to not_include(pinned_status.id)
+ .and include(direct_message.id, very_old_status.id, self_faved.id, self_bookmarked.id, status_with_poll.id, status_with_media.id, faved_primary.id, faved_secondary.id, reblogged_primary.id, reblogged_secondary.id)
end
end
@@ -472,16 +448,11 @@ RSpec.describe AccountStatusesCleanupPolicy do
account_statuses_cleanup_policy.keep_self_bookmark = false
end
- it 'does not return the recent toot' do
- expect(subject.pluck(:id)).to_not include(recent_status.id)
- end
-
- it 'does not return the unrelated toot' do
- expect(subject.pluck(:id)).to_not include(unrelated_status.id)
- end
-
- it 'returns every other old status for deletion' do
- expect(subject.pluck(:id)).to include(direct_message.id, very_old_status.id, pinned_status.id, self_faved.id, self_bookmarked.id, status_with_poll.id, status_with_media.id, faved_primary.id, faved_secondary.id, reblogged_primary.id, reblogged_secondary.id)
+ it 'returns every old status but does not return the recent or unrelated statuses' do
+ expect(subject.pluck(:id))
+ .to not_include(recent_status.id)
+ .and not_include(unrelated_status.id)
+ .and include(direct_message.id, very_old_status.id, pinned_status.id, self_faved.id, self_bookmarked.id, status_with_poll.id, status_with_media.id, faved_primary.id, faved_secondary.id, reblogged_primary.id, reblogged_secondary.id)
end
end
@@ -495,12 +466,10 @@ RSpec.describe AccountStatusesCleanupPolicy do
account_statuses_cleanup_policy.keep_self_bookmark = true
end
- it 'does not return unrelated old status' do
- expect(subject.pluck(:id)).to_not include(unrelated_status.id)
- end
-
- it 'returns only normal statuses for deletion' do
- expect(subject.pluck(:id)).to contain_exactly(very_old_status.id, faved_primary.id, faved_secondary.id, reblogged_primary.id, reblogged_secondary.id)
+ it 'returns normal statuses and does not return unrelated old status' do
+ expect(subject.pluck(:id))
+ .to not_include(unrelated_status.id)
+ .and contain_exactly(very_old_status.id, faved_primary.id, faved_secondary.id, reblogged_primary.id, reblogged_secondary.id)
end
end
@@ -509,20 +478,12 @@ RSpec.describe AccountStatusesCleanupPolicy do
account_statuses_cleanup_policy.min_reblogs = 5
end
- it 'does not return the recent toot' do
- expect(subject.pluck(:id)).to_not include(recent_status.id)
- end
-
- it 'does not return the toot reblogged 5 times' do
- expect(subject.pluck(:id)).to_not include(reblogged_secondary.id)
- end
-
- it 'does not return the unrelated toot' do
- expect(subject.pluck(:id)).to_not include(unrelated_status.id)
- end
-
- it 'returns old statuses not reblogged as much' do
- expect(subject.pluck(:id)).to include(very_old_status.id, faved_primary.id, faved_secondary.id, reblogged_primary.id)
+ it 'returns old not-reblogged statuses but does not return the recent, 5-times reblogged, or unrelated statuses' do
+ expect(subject.pluck(:id))
+ .to not_include(recent_status.id)
+ .and not_include(reblogged_secondary.id)
+ .and not_include(unrelated_status.id)
+ .and include(very_old_status.id, faved_primary.id, faved_secondary.id, reblogged_primary.id)
end
end
@@ -531,20 +492,12 @@ RSpec.describe AccountStatusesCleanupPolicy do
account_statuses_cleanup_policy.min_favs = 5
end
- it 'does not return the recent toot' do
- expect(subject.pluck(:id)).to_not include(recent_status.id)
- end
-
- it 'does not return the toot faved 5 times' do
- expect(subject.pluck(:id)).to_not include(faved_secondary.id)
- end
-
- it 'does not return the unrelated toot' do
- expect(subject.pluck(:id)).to_not include(unrelated_status.id)
- end
-
- it 'returns old statuses not faved as much' do
- expect(subject.pluck(:id)).to include(very_old_status.id, faved_primary.id, reblogged_primary.id, reblogged_secondary.id)
+ it 'returns old not-faved statuses but does not return the recent, 5-times faved, or unrelated statuses' do
+ expect(subject.pluck(:id))
+ .to not_include(recent_status.id)
+ .and not_include(faved_secondary.id)
+ .and not_include(unrelated_status.id)
+ .and include(very_old_status.id, faved_primary.id, reblogged_primary.id, reblogged_secondary.id)
end
end
end
diff --git a/spec/models/custom_filter_keyword_spec.rb b/spec/models/custom_filter_keyword_spec.rb
new file mode 100644
index 0000000000..4e3ab060a0
--- /dev/null
+++ b/spec/models/custom_filter_keyword_spec.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe CustomFilterKeyword do
+ describe '#to_regex' do
+ context 'when whole_word is true' do
+ it 'builds a regex with boundaries and the keyword' do
+ keyword = described_class.new(whole_word: true, keyword: 'test')
+
+ expect(keyword.to_regex).to eq(/(?mix:\b#{Regexp.escape(keyword.keyword)}\b)/)
+ end
+
+ it 'builds a regex with starting boundary and the keyword when end with non-word' do
+ keyword = described_class.new(whole_word: true, keyword: 'test#')
+
+ expect(keyword.to_regex).to eq(/(?mix:\btest\#)/)
+ end
+
+ it 'builds a regex with end boundary and the keyword when start with non-word' do
+ keyword = described_class.new(whole_word: true, keyword: '#test')
+
+ expect(keyword.to_regex).to eq(/(?mix:\#test\b)/)
+ end
+ end
+
+ context 'when whole_word is false' do
+ it 'builds a regex with the keyword' do
+ keyword = described_class.new(whole_word: false, keyword: 'test')
+
+ expect(keyword.to_regex).to eq(/test/i)
+ end
+ end
+ end
+end
diff --git a/spec/models/instance_spec.rb b/spec/models/instance_spec.rb
new file mode 100644
index 0000000000..3e811d3325
--- /dev/null
+++ b/spec/models/instance_spec.rb
@@ -0,0 +1,104 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Instance do
+ describe 'Scopes' do
+ before { described_class.refresh }
+
+ describe '#searchable' do
+ let(:expected_domain) { 'host.example' }
+ let(:blocked_domain) { 'other.example' }
+
+ before do
+ Fabricate :account, domain: expected_domain
+ Fabricate :account, domain: blocked_domain
+ Fabricate :domain_block, domain: blocked_domain
+ end
+
+ it 'returns records not domain blocked' do
+ results = described_class.searchable.pluck(:domain)
+
+ expect(results)
+ .to include(expected_domain)
+ .and not_include(blocked_domain)
+ end
+ end
+
+ describe '#matches_domain' do
+ let(:host_domain) { 'host.example.com' }
+ let(:host_under_domain) { 'host_under.example.com' }
+ let(:other_domain) { 'other.example' }
+
+ before do
+ Fabricate :account, domain: host_domain
+ Fabricate :account, domain: host_under_domain
+ Fabricate :account, domain: other_domain
+ end
+
+ it 'returns matching records' do
+ expect(described_class.matches_domain('host.exa').pluck(:domain))
+ .to include(host_domain)
+ .and not_include(other_domain)
+
+ expect(described_class.matches_domain('ple.com').pluck(:domain))
+ .to include(host_domain)
+ .and not_include(other_domain)
+
+ expect(described_class.matches_domain('example').pluck(:domain))
+ .to include(host_domain)
+ .and include(other_domain)
+
+ expect(described_class.matches_domain('host_').pluck(:domain)) # Preserve SQL wildcards
+ .to include(host_domain)
+ .and include(host_under_domain)
+ .and not_include(other_domain)
+ end
+ end
+
+ describe '#by_domain_and_subdomains' do
+ let(:exact_match_domain) { 'example.com' }
+ let(:subdomain_domain) { 'foo.example.com' }
+ let(:partial_domain) { 'grexample.com' }
+
+ before do
+ Fabricate(:account, domain: exact_match_domain)
+ Fabricate(:account, domain: subdomain_domain)
+ Fabricate(:account, domain: partial_domain)
+ end
+
+ it 'returns matching instances' do
+ results = described_class.by_domain_and_subdomains('example.com').pluck(:domain)
+
+ expect(results)
+ .to include(exact_match_domain)
+ .and include(subdomain_domain)
+ .and not_include(partial_domain)
+ end
+ end
+
+ describe '#with_domain_follows' do
+ let(:example_domain) { 'example.host' }
+ let(:other_domain) { 'other.host' }
+ let(:none_domain) { 'none.host' }
+
+ before do
+ example_account = Fabricate(:account, domain: example_domain)
+ other_account = Fabricate(:account, domain: other_domain)
+ Fabricate(:account, domain: none_domain)
+
+ Fabricate :follow, account: example_account
+ Fabricate :follow, target_account: other_account
+ end
+
+ it 'returns instances with domain accounts that have follows' do
+ results = described_class.with_domain_follows(['example.host', 'other.host', 'none.host']).pluck(:domain)
+
+ expect(results)
+ .to include(example_domain)
+ .and include(other_domain)
+ .and not_include(none_domain)
+ end
+ end
+ end
+end
diff --git a/spec/models/tag_spec.rb b/spec/models/tag_spec.rb
index 6177b7a25a..69aaeed0af 100644
--- a/spec/models/tag_spec.rb
+++ b/spec/models/tag_spec.rb
@@ -100,6 +100,38 @@ RSpec.describe Tag do
end
end
+ describe '.recently_used' do
+ let(:account) { Fabricate(:account) }
+ let(:other_person_status) { Fabricate(:status) }
+ let(:out_of_range) { Fabricate(:status, account: account) }
+ let(:older_in_range) { Fabricate(:status, account: account) }
+ let(:newer_in_range) { Fabricate(:status, account: account) }
+ let(:unused_tag) { Fabricate(:tag) }
+ let(:used_tag_one) { Fabricate(:tag) }
+ let(:used_tag_two) { Fabricate(:tag) }
+ let(:used_tag_on_out_of_range) { Fabricate(:tag) }
+
+ before do
+ stub_const 'Tag::RECENT_STATUS_LIMIT', 2
+
+ other_person_status.tags << used_tag_one
+
+ out_of_range.tags << used_tag_on_out_of_range
+
+ older_in_range.tags << used_tag_one
+ older_in_range.tags << used_tag_two
+
+ newer_in_range.tags << used_tag_one
+ end
+
+ it 'returns tags used by account within last X statuses ordered most used first' do
+ results = described_class.recently_used(account)
+
+ expect(results)
+ .to eq([used_tag_one, used_tag_two])
+ end
+ end
+
describe '.find_normalized' do
it 'returns tag for a multibyte case-insensitive name' do
upcase_string = 'abcABCａｂｃＡＢＣやゆよ'
diff --git a/spec/controllers/api/v1/accounts/follower_accounts_controller_spec.rb b/spec/requests/api/v1/accounts/follower_accounts_spec.rb
similarity index 69%
rename from spec/controllers/api/v1/accounts/follower_accounts_controller_spec.rb
rename to spec/requests/api/v1/accounts/follower_accounts_spec.rb
index 510a47566b..7ff92d6a48 100644
--- a/spec/controllers/api/v1/accounts/follower_accounts_controller_spec.rb
+++ b/spec/requests/api/v1/accounts/follower_accounts_spec.rb
@@ -2,11 +2,11 @@
require 'rails_helper'
-describe Api::V1::Accounts::FollowerAccountsController do
- render_views
-
+describe 'API V1 Accounts FollowerAccounts' do
let(:user) { Fabricate(:user) }
- let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:accounts') }
+ let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+ let(:scopes) { 'read:accounts' }
+ let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
let(:account) { Fabricate(:account) }
let(:alice) { Fabricate(:account) }
let(:bob) { Fabricate(:account) }
@@ -14,12 +14,11 @@ describe Api::V1::Accounts::FollowerAccountsController do
before do
alice.follow!(account)
bob.follow!(account)
- allow(controller).to receive(:doorkeeper_token) { token }
end
- describe 'GET #index' do
+ describe 'GET /api/v1/accounts/:acount_id/followers' do
it 'returns accounts following the given account', :aggregate_failures do
- get :index, params: { account_id: account.id, limit: 2 }
+ get "/api/v1/accounts/#{account.id}/followers", params: { limit: 2 }, headers: headers
expect(response).to have_http_status(200)
expect(body_as_json.size).to eq 2
@@ -28,7 +27,7 @@ describe Api::V1::Accounts::FollowerAccountsController do
it 'does not return blocked users', :aggregate_failures do
user.account.block!(bob)
- get :index, params: { account_id: account.id, limit: 2 }
+ get "/api/v1/accounts/#{account.id}/followers", params: { limit: 2 }, headers: headers
expect(response).to have_http_status(200)
expect(body_as_json.size).to eq 1
@@ -41,7 +40,7 @@ describe Api::V1::Accounts::FollowerAccountsController do
end
it 'hides results' do
- get :index, params: { account_id: account.id, limit: 2 }
+ get "/api/v1/accounts/#{account.id}/followers", params: { limit: 2 }, headers: headers
expect(body_as_json.size).to eq 0
end
end
@@ -51,7 +50,7 @@ describe Api::V1::Accounts::FollowerAccountsController do
it 'returns all accounts, including muted accounts' do
account.mute!(bob)
- get :index, params: { account_id: account.id, limit: 2 }
+ get "/api/v1/accounts/#{account.id}/followers", params: { limit: 2 }, headers: headers
expect(body_as_json.size).to eq 2
expect([body_as_json[0][:id], body_as_json[1][:id]]).to contain_exactly(alice.id.to_s, bob.id.to_s)
diff --git a/spec/controllers/api/v1/accounts/following_accounts_controller_spec.rb b/spec/requests/api/v1/accounts/following_accounts_spec.rb
similarity index 69%
rename from spec/controllers/api/v1/accounts/following_accounts_controller_spec.rb
rename to spec/requests/api/v1/accounts/following_accounts_spec.rb
index a7d07a6bec..b343a48654 100644
--- a/spec/controllers/api/v1/accounts/following_accounts_controller_spec.rb
+++ b/spec/requests/api/v1/accounts/following_accounts_spec.rb
@@ -2,11 +2,11 @@
require 'rails_helper'
-describe Api::V1::Accounts::FollowingAccountsController do
- render_views
-
+describe 'API V1 Accounts FollowingAccounts' do
let(:user) { Fabricate(:user) }
- let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:accounts') }
+ let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+ let(:scopes) { 'read:accounts' }
+ let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
let(:account) { Fabricate(:account) }
let(:alice) { Fabricate(:account) }
let(:bob) { Fabricate(:account) }
@@ -14,12 +14,11 @@ describe Api::V1::Accounts::FollowingAccountsController do
before do
account.follow!(alice)
account.follow!(bob)
- allow(controller).to receive(:doorkeeper_token) { token }
end
- describe 'GET #index' do
+ describe 'GET /api/v1/accounts/:account_id/following' do
it 'returns accounts followed by the given account', :aggregate_failures do
- get :index, params: { account_id: account.id, limit: 2 }
+ get "/api/v1/accounts/#{account.id}/following", params: { limit: 2 }, headers: headers
expect(response).to have_http_status(200)
expect(body_as_json.size).to eq 2
@@ -28,7 +27,7 @@ describe Api::V1::Accounts::FollowingAccountsController do
it 'does not return blocked users', :aggregate_failures do
user.account.block!(bob)
- get :index, params: { account_id: account.id, limit: 2 }
+ get "/api/v1/accounts/#{account.id}/following", params: { limit: 2 }, headers: headers
expect(response).to have_http_status(200)
expect(body_as_json.size).to eq 1
@@ -41,7 +40,7 @@ describe Api::V1::Accounts::FollowingAccountsController do
end
it 'hides results' do
- get :index, params: { account_id: account.id, limit: 2 }
+ get "/api/v1/accounts/#{account.id}/following", params: { limit: 2 }, headers: headers
expect(body_as_json.size).to eq 0
end
end
@@ -51,7 +50,7 @@ describe Api::V1::Accounts::FollowingAccountsController do
it 'returns all accounts, including muted accounts' do
account.mute!(bob)
- get :index, params: { account_id: account.id, limit: 2 }
+ get "/api/v1/accounts/#{account.id}/following", params: { limit: 2 }, headers: headers
expect(body_as_json.size).to eq 2
expect([body_as_json[0][:id], body_as_json[1][:id]]).to contain_exactly(alice.id.to_s, bob.id.to_s)
diff --git a/spec/controllers/api/v1/statuses/favourited_by_accounts_controller_spec.rb b/spec/requests/api/v1/statuses/favourited_by_accounts_spec.rb
similarity index 52%
rename from spec/controllers/api/v1/statuses/favourited_by_accounts_controller_spec.rb
rename to spec/requests/api/v1/statuses/favourited_by_accounts_spec.rb
index 01816743e5..44296f4c37 100644
--- a/spec/controllers/api/v1/statuses/favourited_by_accounts_controller_spec.rb
+++ b/spec/requests/api/v1/statuses/favourited_by_accounts_spec.rb
@@ -2,21 +2,21 @@
require 'rails_helper'
-RSpec.describe Api::V1::Statuses::FavouritedByAccountsController do
- render_views
-
- let(:user) { Fabricate(:user) }
- let(:app) { Fabricate(:application, name: 'Test app', website: 'http://testapp.com') }
- let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, application: app, scopes: 'read:accounts') }
+RSpec.describe 'API V1 Statuses Favourited by Accounts' do
+ let(:user) { Fabricate(:user) }
+ let(:scopes) { 'read:accounts' }
+ # let(:app) { Fabricate(:application, name: 'Test app', website: 'http://testapp.com') }
+ let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+ let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
let(:alice) { Fabricate(:account) }
let(:bob) { Fabricate(:account) }
context 'with an oauth token' do
- before do
- allow(controller).to receive(:doorkeeper_token) { token }
+ subject do
+ get "/api/v1/statuses/#{status.id}/favourited_by", headers: headers, params: { limit: 2 }
end
- describe 'GET #index' do
+ describe 'GET /api/v1/statuses/:status_id/favourited_by' do
let(:status) { Fabricate(:status, account: user.account) }
before do
@@ -24,30 +24,38 @@ RSpec.describe Api::V1::Statuses::FavouritedByAccountsController do
Favourite.create!(account: bob, status: status)
end
- it 'returns http success' do
- get :index, params: { status_id: status.id, limit: 2 }
- expect(response).to have_http_status(200)
- expect(response.headers['Link'].links.size).to eq(2)
- end
+ it 'returns http success and accounts who favourited the status' do
+ subject
- it 'returns accounts who favorited the status' do
- get :index, params: { status_id: status.id, limit: 2 }
- expect(body_as_json.size).to eq 2
- expect([body_as_json[0][:id], body_as_json[1][:id]]).to contain_exactly(alice.id.to_s, bob.id.to_s)
+ expect(response)
+ .to have_http_status(200)
+ expect(response.headers['Link'].links.size)
+ .to eq(2)
+
+ expect(body_as_json.size)
+ .to eq(2)
+ expect(body_as_json)
+ .to contain_exactly(
+ include(id: alice.id.to_s),
+ include(id: bob.id.to_s)
+ )
end
it 'does not return blocked users' do
user.account.block!(bob)
- get :index, params: { status_id: status.id, limit: 2 }
- expect(body_as_json.size).to eq 1
- expect(body_as_json[0][:id]).to eq alice.id.to_s
+
+ subject
+
+ expect(body_as_json.size)
+ .to eq 1
+ expect(body_as_json.first[:id]).to eq(alice.id.to_s)
end
end
end
context 'without an oauth token' do
- before do
- allow(controller).to receive(:doorkeeper_token).and_return(nil)
+ subject do
+ get "/api/v1/statuses/#{status.id}/favourited_by", params: { limit: 2 }
end
context 'with a private status' do
@@ -59,7 +67,8 @@ RSpec.describe Api::V1::Statuses::FavouritedByAccountsController do
end
it 'returns http unauthorized' do
- get :index, params: { status_id: status.id }
+ subject
+
expect(response).to have_http_status(404)
end
end
@@ -74,7 +83,8 @@ RSpec.describe Api::V1::Statuses::FavouritedByAccountsController do
end
it 'returns http success' do
- get :index, params: { status_id: status.id }
+ subject
+
expect(response).to have_http_status(200)
end
end
diff --git a/spec/controllers/api/v1/statuses/reblogged_by_accounts_controller_spec.rb b/spec/requests/api/v1/statuses/reblogged_by_accounts_spec.rb
similarity index 57%
rename from spec/controllers/api/v1/statuses/reblogged_by_accounts_controller_spec.rb
rename to spec/requests/api/v1/statuses/reblogged_by_accounts_spec.rb
index 0d15cca75c..6f99ce9464 100644
--- a/spec/controllers/api/v1/statuses/reblogged_by_accounts_controller_spec.rb
+++ b/spec/requests/api/v1/statuses/reblogged_by_accounts_spec.rb
@@ -2,21 +2,20 @@
require 'rails_helper'
-RSpec.describe Api::V1::Statuses::RebloggedByAccountsController do
- render_views
-
- let(:user) { Fabricate(:user) }
- let(:app) { Fabricate(:application, name: 'Test app', website: 'http://testapp.com') }
- let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, application: app, scopes: 'read:accounts') }
+RSpec.describe 'API V1 Statuses Reblogged by Accounts' do
+ let(:user) { Fabricate(:user) }
+ let(:scopes) { 'read:accounts' }
+ let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+ let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
let(:alice) { Fabricate(:account) }
let(:bob) { Fabricate(:account) }
context 'with an oauth token' do
- before do
- allow(controller).to receive(:doorkeeper_token) { token }
+ subject do
+ get "/api/v1/statuses/#{status.id}/reblogged_by", headers: headers, params: { limit: 2 }
end
- describe 'GET #index' do
+ describe 'GET /api/v1/statuses/:status_id/reblogged_by' do
let(:status) { Fabricate(:status, account: user.account) }
before do
@@ -25,27 +24,37 @@ RSpec.describe Api::V1::Statuses::RebloggedByAccountsController do
end
it 'returns accounts who reblogged the status', :aggregate_failures do
- get :index, params: { status_id: status.id, limit: 2 }
+ subject
- expect(response).to have_http_status(200)
- expect(response.headers['Link'].links.size).to eq(2)
+ expect(response)
+ .to have_http_status(200)
+ expect(response.headers['Link'].links.size)
+ .to eq(2)
- expect(body_as_json.size).to eq 2
- expect([body_as_json[0][:id], body_as_json[1][:id]]).to contain_exactly(alice.id.to_s, bob.id.to_s)
+ expect(body_as_json.size)
+ .to eq(2)
+ expect(body_as_json)
+ .to contain_exactly(
+ include(id: alice.id.to_s),
+ include(id: bob.id.to_s)
+ )
end
it 'does not return blocked users' do
user.account.block!(bob)
- get :index, params: { status_id: status.id, limit: 2 }
- expect(body_as_json.size).to eq 1
- expect(body_as_json[0][:id]).to eq alice.id.to_s
+
+ subject
+
+ expect(body_as_json.size)
+ .to eq 1
+ expect(body_as_json.first[:id]).to eq(alice.id.to_s)
end
end
end
context 'without an oauth token' do
- before do
- allow(controller).to receive(:doorkeeper_token).and_return(nil)
+ subject do
+ get "/api/v1/statuses/#{status.id}/reblogged_by", params: { limit: 2 }
end
context 'with a private status' do
@@ -57,7 +66,8 @@ RSpec.describe Api::V1::Statuses::RebloggedByAccountsController do
end
it 'returns http unauthorized' do
- get :index, params: { status_id: status.id }
+ subject
+
expect(response).to have_http_status(404)
end
end
@@ -72,7 +82,8 @@ RSpec.describe Api::V1::Statuses::RebloggedByAccountsController do
end
it 'returns http success' do
- get :index, params: { status_id: status.id }
+ subject
+
expect(response).to have_http_status(200)
end
end
diff --git a/spec/services/activitypub/fetch_featured_collection_service_spec.rb b/spec/services/activitypub/fetch_featured_collection_service_spec.rb
index a98108cea3..b9e95b825f 100644
--- a/spec/services/activitypub/fetch_featured_collection_service_spec.rb
+++ b/spec/services/activitypub/fetch_featured_collection_service_spec.rb
@@ -31,7 +31,7 @@ RSpec.describe ActivityPub::FetchFeaturedCollectionService, type: :service do
}
end
- let(:status_json_pinned_unknown_unreachable) do
+ let(:status_json_pinned_unknown_reachable) do
{
'@context': 'https://www.w3.org/ns/activitystreams',
type: 'Note',
@@ -75,7 +75,7 @@ RSpec.describe ActivityPub::FetchFeaturedCollectionService, type: :service do
stub_request(:get, 'https://example.com/account/pinned/known').to_return(status: 200, body: Oj.dump(status_json_pinned_known))
stub_request(:get, 'https://example.com/account/pinned/unknown-inlined').to_return(status: 200, body: Oj.dump(status_json_pinned_unknown_inlined))
stub_request(:get, 'https://example.com/account/pinned/unknown-unreachable').to_return(status: 404)
- stub_request(:get, 'https://example.com/account/pinned/unknown-reachable').to_return(status: 200, body: Oj.dump(status_json_pinned_unknown_unreachable))
+ stub_request(:get, 'https://example.com/account/pinned/unknown-reachable').to_return(status: 200, body: Oj.dump(status_json_pinned_unknown_reachable))
stub_request(:get, 'https://example.com/account/collections/featured').to_return(status: 200, body: Oj.dump(featured_with_null))
subject.call(actor, note: true, hashtag: false)
@@ -115,6 +115,21 @@ RSpec.describe ActivityPub::FetchFeaturedCollectionService, type: :service do
end
it_behaves_like 'sets pinned posts'
+
+ context 'when there is a single item, with the array compacted away' do
+ let(:items) { 'https://example.com/account/pinned/unknown-reachable' }
+
+ before do
+ stub_request(:get, 'https://example.com/account/pinned/unknown-reachable').to_return(status: 200, body: Oj.dump(status_json_pinned_unknown_reachable))
+ subject.call(actor, note: true, hashtag: false)
+ end
+
+ it 'sets expected posts as pinned posts' do
+ expect(actor.pinned_statuses.pluck(:uri)).to contain_exactly(
+ 'https://example.com/account/pinned/unknown-reachable'
+ )
+ end
+ end
end
context 'when the endpoint is a paginated Collection' do
@@ -136,6 +151,21 @@ RSpec.describe ActivityPub::FetchFeaturedCollectionService, type: :service do
end
it_behaves_like 'sets pinned posts'
+
+ context 'when there is a single item, with the array compacted away' do
+ let(:items) { 'https://example.com/account/pinned/unknown-reachable' }
+
+ before do
+ stub_request(:get, 'https://example.com/account/pinned/unknown-reachable').to_return(status: 200, body: Oj.dump(status_json_pinned_unknown_reachable))
+ subject.call(actor, note: true, hashtag: false)
+ end
+
+ it 'sets expected posts as pinned posts' do
+ expect(actor.pinned_statuses.pluck(:uri)).to contain_exactly(
+ 'https://example.com/account/pinned/unknown-reachable'
+ )
+ end
+ end
end
end
end
diff --git a/spec/services/activitypub/fetch_replies_service_spec.rb b/spec/services/activitypub/fetch_replies_service_spec.rb
index d7716dd4ef..a76b996c20 100644
--- a/spec/services/activitypub/fetch_replies_service_spec.rb
+++ b/spec/services/activitypub/fetch_replies_service_spec.rb
@@ -34,6 +34,18 @@ RSpec.describe ActivityPub::FetchRepliesService, type: :service do
describe '#call' do
context 'when the payload is a Collection with inlined replies' do
+ context 'when there is a single reply, with the array compacted away' do
+ let(:items) { 'http://example.com/self-reply-1' }
+
+ it 'queues the expected worker' do
+ allow(FetchReplyWorker).to receive(:push_bulk)
+
+ subject.call(status, payload)
+
+ expect(FetchReplyWorker).to have_received(:push_bulk).with(['http://example.com/self-reply-1'])
+ end
+ end
+
context 'when passing the collection itself' do
it 'spawns workers for up to 5 replies on the same server' do
allow(FetchReplyWorker).to receive(:push_bulk)
diff --git a/spec/services/activitypub/process_collection_service_spec.rb b/spec/services/activitypub/process_collection_service_spec.rb
index f4a2b8fec6..63502c546e 100644
--- a/spec/services/activitypub/process_collection_service_spec.rb
+++ b/spec/services/activitypub/process_collection_service_spec.rb
@@ -265,7 +265,7 @@ RSpec.describe ActivityPub::ProcessCollectionService, type: :service do
anything
)
- expect(Status.where(uri: 'https://example.com/users/bob/fake-status').exists?).to be false
+ expect(Status.exists?(uri: 'https://example.com/users/bob/fake-status')).to be false
end
end
end
diff --git a/streaming/.eslintrc.js b/streaming/.eslintrc.js
index 5e2d233c68..188ebb512d 100644
--- a/streaming/.eslintrc.js
+++ b/streaming/.eslintrc.js
@@ -15,7 +15,18 @@ module.exports = defineConfig({
ecmaVersion: 2021,
},
rules: {
+ // In the streaming server we need to delete some variables to ensure
+ // garbage collection takes place on the values referenced by those objects;
+ // The alternative is to declare the variable as nullable, but then we need
+ // to assert it's in existence before every use, which becomes much harder
+ // to maintain.
+ 'no-delete-var': 'off',
+
+ // The streaming server is written in commonjs, not ESM for now:
'import/no-commonjs': 'off',
+
+ // This overrides the base configuration for this rule to pick up
+ // dependencies for the streaming server from the correct package.json file.
'import/no-extraneous-dependencies': [
'error',
{
diff --git a/streaming/index.js b/streaming/index.js
index bfd7e37d13..3e8086e5ea 100644
--- a/streaming/index.js
+++ b/streaming/index.js
@@ -10,14 +10,13 @@ const dotenv = require('dotenv');
const express = require('express');
const Redis = require('ioredis');
const { JSDOM } = require('jsdom');
-const log = require('npmlog');
const pg = require('pg');
const dbUrlToConfig = require('pg-connection-string').parse;
-const uuid = require('uuid');
const WebSocket = require('ws');
+const { logger, httpLogger, initializeLogLevel, attachWebsocketHttpLogger, createWebsocketLogger } = require('./logging');
const { setupMetrics } = require('./metrics');
-const { isTruthy } = require("./utils");
+const { isTruthy, normalizeHashtag, firstParam } = require("./utils");
const environment = process.env.NODE_ENV !== 'development' ? 'production' : 'development';
@@ -42,7 +41,20 @@ dotenv.config({
path: path.resolve(__dirname, path.join('..', dotenvFileLocal))
});
-log.level = process.env.LOG_LEVEL || 'verbose';
+initializeLogLevel(process.env, environment);
+
+/**
+ * Declares the result type for accountFromToken / accountFromRequest.
+ *
+ * Note: This is here because jsdoc doesn't like importing types that
+ * are nested in functions
+ * @typedef ResolvedAccount
+ * @property {string} accessTokenId
+ * @property {string[]} scopes
+ * @property {string} accountId
+ * @property {string[]} chosenLanguages
+ * @property {string} deviceId
+ */
/**
* @param {Object.} config
@@ -54,16 +66,21 @@ const createRedisClient = async (config) => {
// so apparently ioredis doesn't handle relative paths
let client;
if (!redisUrl) {
+ // @ts-ignore
client = new Redis(redisParams);
} else if (parsed.host === null && parsed.path[0] === '.') {
redisParams.path = parsed.path;
+ // @ts-ignore
client = new Redis(redisParams);
} else if (parsed.host === '.' || parsed.protocol === 'unix:' && parsed.host !== '') {
redisParams.path = redisUrl.host + redisUrl.path;
+ // @ts-ignore
client = new Redis(redisParams);
} else {
+ // @ts-ignore
client = new Redis(redisUrl, redisParams);;
}
+ // @ts-ignore
client.on('error', (err) => log.error('Redis Client Error!', err));
return client;
@@ -89,12 +106,12 @@ const parseJSON = (json, req) => {
*/
if (req) {
if (req.accountId) {
- log.warn(req.requestId, `Error parsing message from user ${req.accountId}: ${err}`);
+ req.log.error({ err }, `Error parsing message from user ${req.accountId}`);
} else {
- log.silly(req.requestId, `Error parsing message from ${req.remoteAddress}: ${err}`);
+ req.log.error({ err }, `Error parsing message from ${req.remoteAddress}`);
}
} else {
- log.warn(`Error parsing message from redis: ${err}`);
+ logger.error({ err }, `Error parsing message from redis`);
}
return null;
}
@@ -139,6 +156,7 @@ const pgConfigFromEnv = (env) => {
baseConfig.password = env.DB_PASS;
}
} else {
+ // @ts-ignore
baseConfig = pgConfigs[environment];
if (env.DB_SSLMODE) {
@@ -183,6 +201,7 @@ const redisConfigFromEnv = (env) => {
// redisParams.path takes precedence over host and port.
if (env.REDIS_URL && env.REDIS_URL.startsWith('unix://')) {
+ // @ts-ignore
redisParams.path = env.REDIS_URL.slice(7);
}
@@ -229,6 +248,7 @@ const startServer = async () => {
app.set('trust proxy', process.env.TRUSTED_PROXY_IP ? process.env.TRUSTED_PROXY_IP.split(/(?:\s*,\s*|\s+)/) : 'loopback,uniquelocal');
+ app.use(httpLogger);
app.use(cors());
// Handle eventsource & other http requests:
@@ -236,32 +256,37 @@ const startServer = async () => {
// Handle upgrade requests:
server.on('upgrade', async function handleUpgrade(request, socket, head) {
+ // Setup the HTTP logger, since websocket upgrades don't get the usual http
+ // logger. This decorates the `request` object.
+ attachWebsocketHttpLogger(request);
+
+ request.log.info("HTTP Upgrade Requested");
+
/** @param {Error} err */
const onSocketError = (err) => {
- log.error(`Error with websocket upgrade: ${err}`);
+ request.log.error({ error: err }, err.message);
};
socket.on('error', onSocketError);
- // Authenticate:
- try {
- await accountFromRequest(request);
- } catch (err) {
- log.error(`Error authenticating request: ${err}`);
+ /** @type {ResolvedAccount} */
+ let resolvedAccount;
+ try {
+ resolvedAccount = await accountFromRequest(request);
+ } catch (err) {
// Unfortunately for using the on('upgrade') setup, we need to manually
// write a HTTP Response to the Socket to close the connection upgrade
// attempt, so the following code is to handle all of that.
const statusCode = err.status ?? 401;
- /** @type {Record} */
+ /** @type {Record} */
const headers = {
'Connection': 'close',
'Content-Type': 'text/plain',
'Content-Length': 0,
'X-Request-Id': request.id,
- // TODO: Send the error message via header so it can be debugged in
- // developer tools
+ 'X-Error-Message': err.status ? err.toString() : 'An unexpected error occurred'
};
// Ensure the socket is closed once we've finished writing to it:
@@ -272,15 +297,28 @@ const startServer = async () => {
// Write the HTTP response manually:
socket.end(`HTTP/1.1 ${statusCode} ${http.STATUS_CODES[statusCode]}\r\n${Object.keys(headers).map((key) => `${key}: ${headers[key]}`).join('\r\n')}\r\n\r\n`);
+ // Finally, log the error:
+ request.log.error({
+ err,
+ res: {
+ statusCode,
+ headers
+ }
+ }, err.toString());
+
return;
}
+ // Remove the error handler, wss.handleUpgrade has its own:
+ socket.removeListener('error', onSocketError);
+
wss.handleUpgrade(request, socket, head, function done(ws) {
- // Remove the error handler:
- socket.removeListener('error', onSocketError);
+ request.log.info("Authenticated request & upgraded to WebSocket connection");
+
+ const wsLogger = createWebsocketLogger(request, resolvedAccount);
// Start the connection:
- wss.emit('connection', ws, request);
+ wss.emit('connection', ws, request, wsLogger);
});
});
@@ -307,9 +345,9 @@ const startServer = async () => {
// When checking metrics in the browser, the favicon is requested this
// prevents the request from falling through to the API Router, which would
// error for this endpoint:
- app.get('/favicon.ico', (req, res) => res.status(404).end());
+ app.get('/favicon.ico', (_req, res) => res.status(404).end());
- app.get('/api/v1/streaming/health', (req, res) => {
+ app.get('/api/v1/streaming/health', (_req, res) => {
res.writeHead(200, { 'Content-Type': 'text/plain' });
res.end('OK');
});
@@ -319,7 +357,7 @@ const startServer = async () => {
res.set('Content-Type', metrics.register.contentType);
res.end(await metrics.register.metrics());
} catch (ex) {
- log.error(ex);
+ req.log.error(ex);
res.status(500).end();
}
});
@@ -353,7 +391,7 @@ const startServer = async () => {
const callbacks = subs[channel];
- log.silly(`New message on channel ${redisPrefix}${channel}`);
+ logger.debug(`New message on channel ${redisPrefix}${channel}`);
if (!callbacks) {
return;
@@ -377,17 +415,16 @@ const startServer = async () => {
* @param {SubscriptionListener} callback
*/
const subscribe = (channel, callback) => {
- log.silly(`Adding listener for ${channel}`);
+ logger.debug(`Adding listener for ${channel}`);
subs[channel] = subs[channel] || [];
if (subs[channel].length === 0) {
- log.verbose(`Subscribe ${channel}`);
+ logger.debug(`Subscribe ${channel}`);
redisSubscribeClient.subscribe(channel, (err, count) => {
if (err) {
- log.error(`Error subscribing to ${channel}`);
- }
- else {
+ logger.error(`Error subscribing to ${channel}`);
+ } else if (typeof count === 'number') {
redisSubscriptions.set(count);
}
});
@@ -401,7 +438,7 @@ const startServer = async () => {
* @param {SubscriptionListener} callback
*/
const unsubscribe = (channel, callback) => {
- log.silly(`Removing listener for ${channel}`);
+ logger.debug(`Removing listener for ${channel}`);
if (!subs[channel]) {
return;
@@ -410,12 +447,11 @@ const startServer = async () => {
subs[channel] = subs[channel].filter(item => item !== callback);
if (subs[channel].length === 0) {
- log.verbose(`Unsubscribe ${channel}`);
+ logger.debug(`Unsubscribe ${channel}`);
redisSubscribeClient.unsubscribe(channel, (err, count) => {
if (err) {
- log.error(`Error unsubscribing to ${channel}`);
- }
- else {
+ logger.error(`Error unsubscribing to ${channel}`);
+ } else if (typeof count === 'number') {
redisSubscriptions.set(count);
}
});
@@ -424,45 +460,13 @@ const startServer = async () => {
};
/**
- * @param {any} req
- * @param {any} res
- * @param {function(Error=): void} next
- */
- const setRequestId = (req, res, next) => {
- req.requestId = uuid.v4();
- res.header('X-Request-Id', req.requestId);
-
- next();
- };
-
- /**
- * @param {any} req
- * @param {any} res
- * @param {function(Error=): void} next
- */
- const setRemoteAddress = (req, res, next) => {
- req.remoteAddress = req.connection.remoteAddress;
-
- next();
- };
-
- /**
- * @param {any} req
+ * @param {http.IncomingMessage & ResolvedAccount} req
* @param {string[]} necessaryScopes
* @returns {boolean}
*/
const isInScope = (req, necessaryScopes) =>
req.scopes.some(scope => necessaryScopes.includes(scope));
- /**
- * @typedef ResolvedAccount
- * @property {string} accessTokenId
- * @property {string[]} scopes
- * @property {string} accountId
- * @property {string[]} chosenLanguages
- * @property {string} deviceId
- */
-
/**
* @param {string} token
* @param {any} req
@@ -475,6 +479,7 @@ const startServer = async () => {
return;
}
+ // @ts-ignore
client.query('SELECT oauth_access_tokens.id, oauth_access_tokens.resource_owner_id, users.account_id, users.chosen_languages, oauth_access_tokens.scopes, devices.device_id FROM oauth_access_tokens INNER JOIN users ON oauth_access_tokens.resource_owner_id = users.id LEFT OUTER JOIN devices ON oauth_access_tokens.id = devices.access_token_id WHERE oauth_access_tokens.token = $1 AND oauth_access_tokens.revoked_at IS NULL LIMIT 1', [token], (err, result) => {
done();
@@ -485,6 +490,7 @@ const startServer = async () => {
if (result.rows.length === 0) {
err = new Error('Invalid access token');
+ // @ts-ignore
err.status = 401;
reject(err);
@@ -519,6 +525,7 @@ const startServer = async () => {
if (!authorization && !accessToken) {
const err = new Error('Missing access token');
+ // @ts-ignore
err.status = 401;
reject(err);
@@ -563,15 +570,16 @@ const startServer = async () => {
};
/**
- * @param {any} req
+ * @param {http.IncomingMessage & ResolvedAccount} req
+ * @param {import('pino').Logger} logger
* @param {string|undefined} channelName
* @returns {Promise.}
*/
- const checkScopes = (req, channelName) => new Promise((resolve, reject) => {
- log.silly(req.requestId, `Checking OAuth scopes for ${channelName}`);
+ const checkScopes = (req, logger, channelName) => new Promise((resolve, reject) => {
+ logger.debug(`Checking OAuth scopes for ${channelName}`);
// When accessing public channels, no scopes are needed
- if (PUBLIC_CHANNELS.includes(channelName)) {
+ if (channelName && PUBLIC_CHANNELS.includes(channelName)) {
resolve();
return;
}
@@ -598,6 +606,7 @@ const startServer = async () => {
}
const err = new Error('Access token does not cover required scopes');
+ // @ts-ignore
err.status = 401;
reject(err);
@@ -611,38 +620,40 @@ const startServer = async () => {
/**
* @param {any} req
* @param {SystemMessageHandlers} eventHandlers
- * @returns {function(object): void}
+ * @returns {SubscriptionListener}
*/
const createSystemMessageListener = (req, eventHandlers) => {
return message => {
+ if (!message?.event) {
+ return;
+ }
+
const { event } = message;
- log.silly(req.requestId, `System message for ${req.accountId}: ${event}`);
+ req.log.debug(`System message for ${req.accountId}: ${event}`);
if (event === 'kill') {
- log.verbose(req.requestId, `Closing connection for ${req.accountId} due to expired access token`);
+ req.log.debug(`Closing connection for ${req.accountId} due to expired access token`);
eventHandlers.onKill();
} else if (event === 'filters_changed') {
- log.verbose(req.requestId, `Invalidating filters cache for ${req.accountId}`);
+ req.log.debug(`Invalidating filters cache for ${req.accountId}`);
req.cachedFilters = null;
}
};
};
/**
- * @param {any} req
- * @param {any} res
+ * @param {http.IncomingMessage & ResolvedAccount} req
+ * @param {http.OutgoingMessage} res
*/
const subscribeHttpToSystemChannel = (req, res) => {
const accessTokenChannelId = `timeline:access_token:${req.accessTokenId}`;
const systemChannelId = `timeline:system:${req.accountId}`;
const listener = createSystemMessageListener(req, {
-
onKill() {
res.end();
},
-
});
res.on('close', () => {
@@ -675,13 +686,14 @@ const startServer = async () => {
// the connection, as there's nothing to stream back
if (!channelName) {
const err = new Error('Unknown channel requested');
+ // @ts-ignore
err.status = 400;
next(err);
return;
}
- accountFromRequest(req).then(() => checkScopes(req, channelName)).then(() => {
+ accountFromRequest(req).then(() => checkScopes(req, req.log, channelName)).then(() => {
subscribeHttpToSystemChannel(req, res);
}).then(() => {
next();
@@ -697,22 +709,28 @@ const startServer = async () => {
* @param {function(Error=): void} next
*/
const errorMiddleware = (err, req, res, next) => {
- log.error(req.requestId, err.toString());
+ req.log.error({ err }, err.toString());
if (res.headersSent) {
next(err);
return;
}
- res.writeHead(err.status || 500, { 'Content-Type': 'application/json' });
- res.end(JSON.stringify({ error: err.status ? err.toString() : 'An unexpected error occurred' }));
+ const hasStatusCode = Object.hasOwnProperty.call(err, 'status');
+ // @ts-ignore
+ const statusCode = hasStatusCode ? err.status : 500;
+ const errorMessage = hasStatusCode ? err.toString() : 'An unexpected error occurred';
+
+ res.writeHead(statusCode, { 'Content-Type': 'application/json' });
+ res.end(JSON.stringify({ error: errorMessage }));
};
/**
- * @param {array} arr
+ * @param {any[]} arr
* @param {number=} shift
* @returns {string}
*/
+ // @ts-ignore
const placeholders = (arr, shift = 0) => arr.map((_, i) => `$${i + 1 + shift}`).join(', ');
/**
@@ -729,6 +747,7 @@ const startServer = async () => {
return;
}
+ // @ts-ignore
client.query('SELECT id, account_id FROM lists WHERE id = $1 LIMIT 1', [listId], (err, result) => {
done();
@@ -743,8 +762,9 @@ const startServer = async () => {
});
/**
- * @param {string[]} ids
- * @param {any} req
+ * @param {string[]} channelIds
+ * @param {http.IncomingMessage & ResolvedAccount} req
+ * @param {import('pino').Logger} log
* @param {function(string, string): void} output
* @param {undefined | function(string[], SubscriptionListener): void} attachCloseHandler
* @param {'websocket' | 'eventsource'} destinationType
@@ -752,26 +772,34 @@ const startServer = async () => {
* @param {boolean=} allowLocalOnly
* @returns {SubscriptionListener}
*/
- const streamFrom = (ids, req, output, attachCloseHandler, destinationType, needsFiltering = false, allowLocalOnly = false) => {
- const accountId = req.accountId || req.remoteAddress;
-
- log.verbose(req.requestId, `Starting stream from ${ids.join(', ')} for ${accountId}`);
+ const streamFrom = (channelIds, req, log, output, attachCloseHandler, destinationType, needsFiltering = false, allowLocalOnly = false) => {
+ log.info({ channelIds }, `Starting stream`);
+ /**
+ * @param {string} event
+ * @param {object|string} payload
+ */
const transmit = (event, payload) => {
// TODO: Replace "string"-based delete payloads with object payloads:
const encodedPayload = typeof payload === 'object' ? JSON.stringify(payload) : payload;
messagesSent.labels({ type: destinationType }).inc(1);
- log.silly(req.requestId, `Transmitting for ${accountId}: ${event} ${encodedPayload}`);
+ log.debug({ event, payload }, `Transmitting ${event} to ${req.accountId}`);
+
output(event, encodedPayload);
};
// The listener used to process each message off the redis subscription,
// message here is an object with an `event` and `payload` property. Some
// events also include a queued_at value, but this is being removed shortly.
+
/** @type {SubscriptionListener} */
const listener = message => {
+ if (!message?.event || !message?.payload) {
+ return;
+ }
+
const { event, payload } = message;
// Only send local-only statuses to logged-in users
@@ -800,7 +828,7 @@ const startServer = async () => {
// Filter based on language:
if (Array.isArray(req.chosenLanguages) && payload.language !== null && req.chosenLanguages.indexOf(payload.language) === -1) {
- log.silly(req.requestId, `Message ${payload.id} filtered by language (${payload.language})`);
+ log.debug(`Message ${payload.id} filtered by language (${payload.language})`);
return;
}
@@ -811,6 +839,7 @@ const startServer = async () => {
}
// Filter based on domain blocks, blocks, mutes, or custom filters:
+ // @ts-ignore
const targetAccountIds = [payload.account.id].concat(payload.mentions.map(item => item.id));
const accountDomain = payload.account.acct.split('@')[1];
@@ -822,6 +851,7 @@ const startServer = async () => {
}
const queries = [
+ // @ts-ignore
client.query(`SELECT 1
FROM blocks
WHERE (account_id = $1 AND target_account_id IN (${placeholders(targetAccountIds, 2)}))
@@ -834,10 +864,13 @@ const startServer = async () => {
];
if (accountDomain) {
+ // @ts-ignore
queries.push(client.query('SELECT 1 FROM account_domain_blocks WHERE account_id = $1 AND domain = $2', [req.accountId, accountDomain]));
}
+ // @ts-ignore
if (!payload.filtered && !req.cachedFilters) {
+ // @ts-ignore
queries.push(client.query('SELECT filter.id AS id, filter.phrase AS title, filter.context AS context, filter.expires_at AS expires_at, filter.action AS filter_action, keyword.keyword AS keyword, keyword.whole_word AS whole_word FROM custom_filter_keywords keyword JOIN custom_filters filter ON keyword.custom_filter_id = filter.id WHERE filter.account_id = $1 AND (filter.expires_at IS NULL OR filter.expires_at > NOW())', [req.accountId]));
}
@@ -860,9 +893,11 @@ const startServer = async () => {
// Handling for constructing the custom filters and caching them on the request
// TODO: Move this logic out of the message handling lifecycle
+ // @ts-ignore
if (!req.cachedFilters) {
const filterRows = values[accountDomain ? 2 : 1].rows;
+ // @ts-ignore
req.cachedFilters = filterRows.reduce((cache, filter) => {
if (cache[filter.id]) {
cache[filter.id].keywords.push([filter.keyword, filter.whole_word]);
@@ -892,7 +927,9 @@ const startServer = async () => {
// needs to be done in a separate loop as the database returns one
// filterRow per keyword, so we need all the keywords before
// constructing the regular expression
+ // @ts-ignore
Object.keys(req.cachedFilters).forEach((key) => {
+ // @ts-ignore
req.cachedFilters[key].regexp = new RegExp(req.cachedFilters[key].keywords.map(([keyword, whole_word]) => {
let expr = keyword.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
@@ -913,13 +950,16 @@ const startServer = async () => {
// Apply cachedFilters against the payload, constructing a
// `filter_results` array of FilterResult entities
+ // @ts-ignore
if (req.cachedFilters) {
const status = payload;
// TODO: Calculate searchableContent in Ruby on Rails:
+ // @ts-ignore
const searchableContent = ([status.spoiler_text || '', status.content].concat((status.poll && status.poll.options) ? status.poll.options.map(option => option.title) : [])).concat(status.media_attachments.map(att => att.description)).join('\n\n').replace(//g, '\n').replace(/<\/p>/g, '\n\n');
const searchableTextContent = JSDOM.fragment(searchableContent).textContent;
const now = new Date();
+ // @ts-ignore
const filter_results = Object.values(req.cachedFilters).reduce((results, cachedFilter) => {
// Check the filter hasn't expired before applying:
if (cachedFilter.expires_at !== null && cachedFilter.expires_at < now) {
@@ -967,12 +1007,12 @@ const startServer = async () => {
});
};
- ids.forEach(id => {
+ channelIds.forEach(id => {
subscribe(`${redisPrefix}${id}`, listener);
});
if (typeof attachCloseHandler === 'function') {
- attachCloseHandler(ids.map(id => `${redisPrefix}${id}`), listener);
+ attachCloseHandler(channelIds.map(id => `${redisPrefix}${id}`), listener);
}
return listener;
@@ -984,8 +1024,6 @@ const startServer = async () => {
* @returns {function(string, string): void}
*/
const streamToHttp = (req, res) => {
- const accountId = req.accountId || req.remoteAddress;
-
const channelName = channelNameFromPath(req);
connectedClients.labels({ type: 'eventsource' }).inc();
@@ -1004,7 +1042,8 @@ const startServer = async () => {
const heartbeat = setInterval(() => res.write(':thump\n'), 15000);
req.on('close', () => {
- log.verbose(req.requestId, `Ending stream for ${accountId}`);
+ req.log.info({ accountId: req.accountId }, `Ending stream`);
+
// We decrement these counters here instead of in streamHttpEnd as in that
// method we don't have knowledge of the channel names
connectedClients.labels({ type: 'eventsource' }).dec();
@@ -1048,15 +1087,15 @@ const startServer = async () => {
*/
const streamToWs = (req, ws, streamName) => (event, payload) => {
if (ws.readyState !== ws.OPEN) {
- log.error(req.requestId, 'Tried writing to closed socket');
+ req.log.error('Tried writing to closed socket');
return;
}
const message = JSON.stringify({ stream: streamName, event, payload });
- ws.send(message, (/** @type {Error} */ err) => {
+ ws.send(message, (/** @type {Error|undefined} */ err) => {
if (err) {
- log.error(req.requestId, `Failed to send to websocket: ${err}`);
+ req.log.error({err}, `Failed to send to websocket`);
}
});
};
@@ -1073,20 +1112,19 @@ const startServer = async () => {
app.use(api);
- api.use(setRequestId);
- api.use(setRemoteAddress);
-
api.use(authenticationMiddleware);
api.use(errorMiddleware);
api.get('/api/v1/streaming/*', (req, res) => {
+ // @ts-ignore
channelNameToIds(req, channelNameFromPath(req), req.query).then(({ channelIds, options }) => {
const onSend = streamToHttp(req, res);
const onEnd = streamHttpEnd(req, subscriptionHeartbeat(channelIds));
- streamFrom(channelIds, req, onSend, onEnd, 'eventsource', options.needsFiltering, options.allowLocalOnly);
+ // @ts-ignore
+ streamFrom(channelIds, req, req.log, onSend, onEnd, 'eventsource', options.needsFiltering, options.allowLocalOnly);
}).catch(err => {
- log.verbose(req.requestId, 'Subscription error:', err.toString());
+ res.log.info({ err }, 'Subscription error:', err.toString());
httpNotFound(res);
});
});
@@ -1116,34 +1154,6 @@ const startServer = async () => {
return arr;
};
- /**
- * See app/lib/ascii_folder.rb for the canon definitions
- * of these constants
- */
- const NON_ASCII_CHARS = 'ÀÁÂÃÄÅàáâãäåĀāĂ㥹ÇçĆćĈĉĊċČčÐðĎďĐđÈÉÊËèéêëĒēĔĕĖėĘęĚěĜĝĞğĠġĢģĤĥĦħÌÍÎÏìíîïĨĩĪīĬĭĮįİıĴĵĶķĸĹĺĻļĽľĿŀŁłÑñŃńŅņŇňʼnŊŋÒÓÔÕÖØòóôõöøŌōŎŏŐőŔŕŖŗŘřŚśŜŝŞşŠšſŢţŤťŦŧÙÚÛÜùúûüŨũŪūŬŭŮůŰűŲųŴŵÝýÿŶŷŸŹźŻżŽž';
- const EQUIVALENT_ASCII_CHARS = 'AAAAAAaaaaaaAaAaAaCcCcCcCcCcDdDdDdEEEEeeeeEeEeEeEeEeGgGgGgGgHhHhIIIIiiiiIiIiIiIiIiJjKkkLlLlLlLlLlNnNnNnNnnNnOOOOOOooooooOoOoOoRrRrRrSsSsSsSssTtTtTtUUUUuuuuUuUuUuUuUuUuWwYyyYyYZzZzZz';
-
- /**
- * @param {string} str
- * @returns {string}
- */
- const foldToASCII = str => {
- const regex = new RegExp(NON_ASCII_CHARS.split('').join('|'), 'g');
-
- return str.replace(regex, match => {
- const index = NON_ASCII_CHARS.indexOf(match);
- return EQUIVALENT_ASCII_CHARS[index];
- });
- };
-
- /**
- * @param {string} str
- * @returns {string}
- */
- const normalizeHashtag = str => {
- return foldToASCII(str.normalize('NFKC').toLowerCase()).replace(/[^\p{L}\p{N}_\u00b7\u200c]/gu, '');
- };
-
/**
* @param {any} req
* @param {string} name
@@ -1252,6 +1262,7 @@ const startServer = async () => {
break;
case 'list':
+ // @ts-ignore
authorizeListAccess(params.list, req).then(() => {
resolve({
channelIds: [`timeline:list:${params.list}`],
@@ -1273,9 +1284,9 @@ const startServer = async () => {
* @returns {string[]}
*/
const streamNameFromChannelName = (channelName, params) => {
- if (channelName === 'list') {
+ if (channelName === 'list' && params.list) {
return [channelName, params.list];
- } else if (['hashtag', 'hashtag:local'].includes(channelName)) {
+ } else if (['hashtag', 'hashtag:local'].includes(channelName) && params.tag) {
return [channelName, params.tag];
} else {
return [channelName];
@@ -1284,8 +1295,9 @@ const startServer = async () => {
/**
* @typedef WebSocketSession
- * @property {WebSocket} websocket
- * @property {http.IncomingMessage} request
+ * @property {WebSocket & { isAlive: boolean}} websocket
+ * @property {http.IncomingMessage & ResolvedAccount} request
+ * @property {import('pino').Logger} logger
* @property {Object.} subscriptions
*/
@@ -1295,8 +1307,8 @@ const startServer = async () => {
* @param {StreamParams} params
* @returns {void}
*/
- const subscribeWebsocketToChannel = ({ socket, request, subscriptions }, channelName, params) => {
- checkScopes(request, channelName).then(() => channelNameToIds(request, channelName, params)).then(({
+ const subscribeWebsocketToChannel = ({ websocket, request, logger, subscriptions }, channelName, params) => {
+ checkScopes(request, logger, channelName).then(() => channelNameToIds(request, channelName, params)).then(({
channelIds,
options,
}) => {
@@ -1304,9 +1316,9 @@ const startServer = async () => {
return;
}
- const onSend = streamToWs(request, socket, streamNameFromChannelName(channelName, params));
+ const onSend = streamToWs(request, websocket, streamNameFromChannelName(channelName, params));
const stopHeartbeat = subscriptionHeartbeat(channelIds);
- const listener = streamFrom(channelIds, request, onSend, undefined, 'websocket', options.needsFiltering, options.allowLocalOnly);
+ const listener = streamFrom(channelIds, request, logger, onSend, undefined, 'websocket', options.needsFiltering, options.allowLocalOnly);
connectedChannels.labels({ type: 'websocket', channel: channelName }).inc();
@@ -1316,14 +1328,17 @@ const startServer = async () => {
stopHeartbeat,
};
}).catch(err => {
- log.verbose(request.requestId, 'Subscription error:', err.toString());
- socket.send(JSON.stringify({ error: err.toString() }));
+ logger.error({ err }, 'Subscription error');
+ websocket.send(JSON.stringify({ error: err.toString() }));
});
};
-
- const removeSubscription = (subscriptions, channelIds, request) => {
- log.verbose(request.requestId, `Ending stream from ${channelIds.join(', ')} for ${request.accountId}`);
+ /**
+ * @param {WebSocketSession} session
+ * @param {string[]} channelIds
+ */
+ const removeSubscription = ({ request, logger, subscriptions }, channelIds) => {
+ logger.info({ channelIds, accountId: request.accountId }, `Ending stream`);
const subscription = subscriptions[channelIds.join(';')];
@@ -1347,16 +1362,17 @@ const startServer = async () => {
* @param {StreamParams} params
* @returns {void}
*/
- const unsubscribeWebsocketFromChannel = ({ socket, request, subscriptions }, channelName, params) => {
+ const unsubscribeWebsocketFromChannel = (session, channelName, params) => {
+ const { websocket, request, logger } = session;
+
channelNameToIds(request, channelName, params).then(({ channelIds }) => {
- removeSubscription(subscriptions, channelIds, request);
+ removeSubscription(session, channelIds);
}).catch(err => {
- log.verbose(request.requestId, 'Unsubscribe error:', err);
+ logger.error({err}, 'Unsubscribe error');
// If we have a socket that is alive and open still, send the error back to the client:
- // FIXME: In other parts of the code ws === socket
- if (socket.isAlive && socket.readyState === socket.OPEN) {
- socket.send(JSON.stringify({ error: "Error unsubscribing from channel" }));
+ if (websocket.isAlive && websocket.readyState === websocket.OPEN) {
+ websocket.send(JSON.stringify({ error: "Error unsubscribing from channel" }));
}
});
};
@@ -1364,16 +1380,14 @@ const startServer = async () => {
/**
* @param {WebSocketSession} session
*/
- const subscribeWebsocketToSystemChannel = ({ socket, request, subscriptions }) => {
+ const subscribeWebsocketToSystemChannel = ({ websocket, request, subscriptions }) => {
const accessTokenChannelId = `timeline:access_token:${request.accessTokenId}`;
const systemChannelId = `timeline:system:${request.accountId}`;
const listener = createSystemMessageListener(request, {
-
onKill() {
- socket.close();
+ websocket.close();
},
-
});
subscribe(`${redisPrefix}${accessTokenChannelId}`, listener);
@@ -1396,32 +1410,17 @@ const startServer = async () => {
connectedChannels.labels({ type: 'websocket', channel: 'system' }).inc(2);
};
- /**
- * @param {string|string[]} arrayOrString
- * @returns {string}
- */
- const firstParam = arrayOrString => {
- if (Array.isArray(arrayOrString)) {
- return arrayOrString[0];
- } else {
- return arrayOrString;
- }
- };
-
/**
* @param {WebSocket & { isAlive: boolean }} ws
- * @param {http.IncomingMessage} req
+ * @param {http.IncomingMessage & ResolvedAccount} req
+ * @param {import('pino').Logger} log
*/
- function onConnection(ws, req) {
+ function onConnection(ws, req, log) {
// Note: url.parse could throw, which would terminate the connection, so we
// increment the connected clients metric straight away when we establish
// the connection, without waiting:
connectedClients.labels({ type: 'websocket' }).inc();
- // Setup request properties:
- req.requestId = uuid.v4();
- req.remoteAddress = ws._socket.remoteAddress;
-
// Setup connection keep-alive state:
ws.isAlive = true;
ws.on('pong', () => {
@@ -1432,8 +1431,9 @@ const startServer = async () => {
* @type {WebSocketSession}
*/
const session = {
- socket: ws,
+ websocket: ws,
request: req,
+ logger: log,
subscriptions: {},
};
@@ -1441,27 +1441,30 @@ const startServer = async () => {
const subscriptions = Object.keys(session.subscriptions);
subscriptions.forEach(channelIds => {
- removeSubscription(session.subscriptions, channelIds.split(';'), req);
+ removeSubscription(session, channelIds.split(';'));
});
// Decrement the metrics for connected clients:
connectedClients.labels({ type: 'websocket' }).dec();
- // ensure garbage collection:
- session.socket = null;
- session.request = null;
- session.subscriptions = {};
+ // We need to delete the session object as to ensure it correctly gets
+ // garbage collected, without doing this we could accidentally hold on to
+ // references to the websocket, the request, and the logger, causing
+ // memory leaks.
+ //
+ // @ts-ignore
+ delete session;
});
// Note: immediately after the `error` event is emitted, the `close` event
// is emitted. As such, all we need to do is log the error here.
- ws.on('error', (err) => {
- log.error('websocket', err.toString());
+ ws.on('error', (/** @type {Error} */ err) => {
+ log.error(err);
});
ws.on('message', (data, isBinary) => {
if (isBinary) {
- log.warn('websocket', 'Received binary data, closing connection');
+ log.warn('Received binary data, closing connection');
ws.close(1003, 'The mastodon streaming server does not support binary messages');
return;
}
@@ -1496,18 +1499,20 @@ const startServer = async () => {
setInterval(() => {
wss.clients.forEach(ws => {
+ // @ts-ignore
if (ws.isAlive === false) {
ws.terminate();
return;
}
+ // @ts-ignore
ws.isAlive = false;
ws.ping('', false);
});
}, 30000);
attachServerWithConfig(server, address => {
- log.warn(`Streaming API now listening on ${address}`);
+ logger.info(`Streaming API now listening on ${address}`);
});
const onExit = () => {
@@ -1515,8 +1520,10 @@ const startServer = async () => {
process.exit(0);
};
+ /** @param {Error} err */
const onError = (err) => {
- log.error(err);
+ logger.error(err);
+
server.close();
process.exit(0);
};
@@ -1540,7 +1547,7 @@ const attachServerWithConfig = (server, onSuccess) => {
}
});
} else {
- server.listen(+process.env.PORT || 4000, process.env.BIND || '127.0.0.1', () => {
+ server.listen(+(process.env.PORT || 4000), process.env.BIND || '127.0.0.1', () => {
if (onSuccess) {
onSuccess(`${server.address().address}:${server.address().port}`);
}
diff --git a/streaming/logging.js b/streaming/logging.js
new file mode 100644
index 0000000000..64ee474875
--- /dev/null
+++ b/streaming/logging.js
@@ -0,0 +1,119 @@
+const { pino } = require('pino');
+const { pinoHttp, stdSerializers: pinoHttpSerializers } = require('pino-http');
+const uuid = require('uuid');
+
+/**
+ * Generates the Request ID for logging and setting on responses
+ * @param {http.IncomingMessage} req
+ * @param {http.ServerResponse} [res]
+ * @returns {import("pino-http").ReqId}
+ */
+function generateRequestId(req, res) {
+ if (req.id) {
+ return req.id;
+ }
+
+ req.id = uuid.v4();
+
+ // Allow for usage with WebSockets:
+ if (res) {
+ res.setHeader('X-Request-Id', req.id);
+ }
+
+ return req.id;
+}
+
+/**
+ * Request log sanitizer to prevent logging access tokens in URLs
+ * @param {http.IncomingMessage} req
+ */
+function sanitizeRequestLog(req) {
+ const log = pinoHttpSerializers.req(req);
+ if (typeof log.url === 'string' && log.url.includes('access_token')) {
+ // Doorkeeper uses SecureRandom.urlsafe_base64 per RFC 6749 / RFC 6750
+ log.url = log.url.replace(/(access_token)=([a-zA-Z0-9\-_]+)/gi, '$1=[Redacted]');
+ }
+ return log;
+}
+
+const logger = pino({
+ name: "streaming",
+ // Reformat the log level to a string:
+ formatters: {
+ level: (label) => {
+ return {
+ level: label
+ };
+ },
+ },
+ redact: {
+ paths: [
+ 'req.headers["sec-websocket-key"]',
+ // Note: we currently pass the AccessToken via the websocket subprotocol
+ // field, an anti-pattern, but this ensures it doesn't end up in logs.
+ 'req.headers["sec-websocket-protocol"]',
+ 'req.headers.authorization',
+ 'req.headers.cookie',
+ 'req.query.access_token'
+ ]
+ }
+});
+
+const httpLogger = pinoHttp({
+ logger,
+ genReqId: generateRequestId,
+ serializers: {
+ req: sanitizeRequestLog
+ }
+});
+
+/**
+ * Attaches a logger to the request object received by http upgrade handlers
+ * @param {http.IncomingMessage} request
+ */
+function attachWebsocketHttpLogger(request) {
+ generateRequestId(request);
+
+ request.log = logger.child({
+ req: sanitizeRequestLog(request),
+ });
+}
+
+/**
+ * Creates a logger instance for the Websocket connection to use.
+ * @param {http.IncomingMessage} request
+ * @param {import('./index.js').ResolvedAccount} resolvedAccount
+ */
+function createWebsocketLogger(request, resolvedAccount) {
+ // ensure the request.id is always present.
+ generateRequestId(request);
+
+ return logger.child({
+ req: {
+ id: request.id
+ },
+ account: {
+ id: resolvedAccount.accountId ?? null
+ }
+ });
+}
+
+exports.logger = logger;
+exports.httpLogger = httpLogger;
+exports.attachWebsocketHttpLogger = attachWebsocketHttpLogger;
+exports.createWebsocketLogger = createWebsocketLogger;
+
+/**
+ * Initializes the log level based on the environment
+ * @param {Object} env
+ * @param {string} environment
+ */
+exports.initializeLogLevel = function initializeLogLevel(env, environment) {
+ if (env.LOG_LEVEL && Object.keys(logger.levels.values).includes(env.LOG_LEVEL)) {
+ logger.level = env.LOG_LEVEL;
+ } else if (environment === 'development') {
+ logger.level = 'debug';
+ } else {
+ logger.level = 'info';
+ }
+};
diff --git a/streaming/package.json b/streaming/package.json
index 149055ca1b..3f76e25786 100644
--- a/streaming/package.json
+++ b/streaming/package.json
@@ -20,10 +20,11 @@
"dotenv": "^16.0.3",
"express": "^4.18.2",
"ioredis": "^5.3.2",
- "jsdom": "^23.0.0",
- "npmlog": "^7.0.1",
+ "jsdom": "^24.0.0",
"pg": "^8.5.0",
"pg-connection-string": "^2.6.0",
+ "pino": "^8.17.2",
+ "pino-http": "^9.0.0",
"prom-client": "^15.0.0",
"uuid": "^9.0.0",
"ws": "^8.12.1"
@@ -31,11 +32,11 @@
"devDependencies": {
"@types/cors": "^2.8.16",
"@types/express": "^4.17.17",
- "@types/npmlog": "^7.0.0",
"@types/pg": "^8.6.6",
"@types/uuid": "^9.0.0",
"@types/ws": "^8.5.9",
"eslint-define-config": "^2.0.0",
+ "pino-pretty": "^10.3.1",
"typescript": "^5.0.4"
},
"optionalDependencies": {
diff --git a/streaming/tsconfig.json b/streaming/tsconfig.json
index f7bb711b9b..a0cf68ef90 100644
--- a/streaming/tsconfig.json
+++ b/streaming/tsconfig.json
@@ -6,7 +6,7 @@
"moduleResolution": "node",
"noUnusedParameters": false,
"tsBuildInfoFile": "../tmp/cache/streaming/tsconfig.tsbuildinfo",
- "paths": {}
+ "paths": {},
},
- "include": ["./*.js", "./.eslintrc.js"]
+ "include": ["./*.js", "./.eslintrc.js"],
}
diff --git a/streaming/utils.js b/streaming/utils.js
index ad8dd4889f..7b87a1d14c 100644
--- a/streaming/utils.js
+++ b/streaming/utils.js
@@ -20,3 +20,50 @@ const isTruthy = value =>
value && !FALSE_VALUES.includes(value);
exports.isTruthy = isTruthy;
+
+
+/**
+ * See app/lib/ascii_folder.rb for the canon definitions
+ * of these constants
+ */
+const NON_ASCII_CHARS = 'ÀÁÂÃÄÅàáâãäåĀāĂ㥹ÇçĆćĈĉĊċČčÐðĎďĐđÈÉÊËèéêëĒēĔĕĖėĘęĚěĜĝĞğĠġĢģĤĥĦħÌÍÎÏìíîïĨĩĪīĬĭĮįİıĴĵĶķĸĹĺĻļĽľĿŀŁłÑñŃńŅņŇňʼnŊŋÒÓÔÕÖØòóôõöøŌōŎŏŐőŔŕŖŗŘřŚśŜŝŞşŠšſŢţŤťŦŧÙÚÛÜùúûüŨũŪūŬŭŮůŰűŲųŴŵÝýÿŶŷŸŹźŻżŽž';
+const EQUIVALENT_ASCII_CHARS = 'AAAAAAaaaaaaAaAaAaCcCcCcCcCcDdDdDdEEEEeeeeEeEeEeEeEeGgGgGgGgHhHhIIIIiiiiIiIiIiIiIiJjKkkLlLlLlLlLlNnNnNnNnnNnOOOOOOooooooOoOoOoRrRrRrSsSsSsSssTtTtTtUUUUuuuuUuUuUuUuUuUuWwYyyYyYZzZzZz';
+
+/**
+ * @param {string} str
+ * @returns {string}
+ */
+function foldToASCII(str) {
+ const regex = new RegExp(NON_ASCII_CHARS.split('').join('|'), 'g');
+
+ return str.replace(regex, function(match) {
+ const index = NON_ASCII_CHARS.indexOf(match);
+ return EQUIVALENT_ASCII_CHARS[index];
+ });
+}
+
+exports.foldToASCII = foldToASCII;
+
+/**
+ * @param {string} str
+ * @returns {string}
+ */
+function normalizeHashtag(str) {
+ return foldToASCII(str.normalize('NFKC').toLowerCase()).replace(/[^\p{L}\p{N}_\u00b7\u200c]/gu, '');
+}
+
+exports.normalizeHashtag = normalizeHashtag;
+
+/**
+ * @param {string|string[]} arrayOrString
+ * @returns {string}
+ */
+function firstParam(arrayOrString) {
+ if (Array.isArray(arrayOrString)) {
+ return arrayOrString[0];
+ } else {
+ return arrayOrString;
+ }
+}
+
+exports.firstParam = firstParam;
diff --git a/tsconfig.json b/tsconfig.json
index 5f5db44226..1e00f24f48 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -20,14 +20,14 @@
"flavours/glitch/*": ["app/javascript/flavours/glitch/*"],
"mastodon": ["app/javascript/mastodon"],
"mastodon/*": ["app/javascript/mastodon/*"],
- "@/*": ["app/javascript/*"]
- }
+ "@/*": ["app/javascript/*"],
+ },
},
"include": [
"app/javascript/mastodon",
"app/javascript/packs",
"app/javascript/types",
"app/javascript/flavours/glitch",
- "app/javascript/core"
- ]
+ "app/javascript/core",
+ ],
}
diff --git a/yarn.lock b/yarn.lock
index ae66e6bc76..1dda1fe0ae 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -42,17 +42,6 @@ __metadata:
languageName: node
linkType: hard
-"@asamuzakjp/dom-selector@npm:^2.0.1":
- version: 2.0.1
- resolution: "@asamuzakjp/dom-selector@npm:2.0.1"
- dependencies:
- bidi-js: "npm:^1.0.3"
- css-tree: "npm:^2.3.1"
- is-potential-custom-element-name: "npm:^1.0.1"
- checksum: 51cd07fa0066b849896378af5d5839f8414dec1c0ff5d1e929542a6cbe7bd5608d9d9524d38eba7ef0caf4c970c4dfe826deac7bef2e8b9fa1a0b9e09446bb4d
- languageName: node
- linkType: hard
-
"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.22.13, @babel/code-frame@npm:^7.23.5":
version: 7.23.5
resolution: "@babel/code-frame@npm:7.23.5"
@@ -1549,7 +1538,7 @@ __metadata:
languageName: node
linkType: hard
-"@csstools/css-parser-algorithms@npm:^2.4.0":
+"@csstools/css-parser-algorithms@npm:^2.5.0":
version: 2.5.0
resolution: "@csstools/css-parser-algorithms@npm:2.5.0"
peerDependencies:
@@ -1558,14 +1547,14 @@ __metadata:
languageName: node
linkType: hard
-"@csstools/css-tokenizer@npm:^2.2.2":
+"@csstools/css-tokenizer@npm:^2.2.3":
version: 2.2.3
resolution: "@csstools/css-tokenizer@npm:2.2.3"
checksum: a2a69f0de516046f85b8f47916879780f9712bdda8166ab01dd47613515ff5a0771555c78badd220686bc1dae3cb0eea5de6896e1e326247a276cc8965520aa6
languageName: node
linkType: hard
-"@csstools/media-query-list-parser@npm:^2.1.6":
+"@csstools/media-query-list-parser@npm:^2.1.7":
version: 2.1.7
resolution: "@csstools/media-query-list-parser@npm:2.1.7"
peerDependencies:
@@ -1788,8 +1777,8 @@ __metadata:
linkType: hard
"@formatjs/cli@npm:^6.1.1":
- version: 6.2.4
- resolution: "@formatjs/cli@npm:6.2.4"
+ version: 6.2.6
+ resolution: "@formatjs/cli@npm:6.2.6"
peerDependencies:
vue: ^3.3.4
peerDependenciesMeta:
@@ -1797,7 +1786,7 @@ __metadata:
optional: true
bin:
formatjs: bin/formatjs
- checksum: 6ff9e07ae7ab23cd83be3ad7dca0dcd6529f3852a7e8d2b56121ac8410e1a072fdb3b40dd0c2d6ab4ac3158efc4047615d0f77629aec3259ba4884f4cd45073a
+ checksum: abc07d5eb4b8e206e42536b49171e22a51a5c643e70695e1b840795f5248c948f59de32bb6d8a14eb5a3dac4a01d5f95d6d53da213c97bb62c5885b41cac4cc6
languageName: node
linkType: hard
@@ -2539,7 +2528,6 @@ __metadata:
dependencies:
"@types/cors": ^2.8.16
"@types/express": ^4.17.17
- "@types/npmlog": ^7.0.0
"@types/pg": ^8.6.6
"@types/uuid": ^9.0.0
"@types/ws": ^8.5.9
@@ -2549,10 +2537,12 @@ __metadata:
eslint-define-config: ^2.0.0
express: ^4.18.2
ioredis: ^5.3.2
- jsdom: ^23.0.0
- npmlog: ^7.0.1
+ jsdom: ^24.0.0
pg: ^8.5.0
pg-connection-string: ^2.6.0
+ pino: ^8.17.2
+ pino-http: ^9.0.0
+ pino-pretty: ^10.3.1
prom-client: ^15.0.0
typescript: ^5.0.4
utf-8-validate: ^6.0.3
@@ -3341,15 +3331,6 @@ __metadata:
languageName: node
linkType: hard
-"@types/npmlog@npm:^7.0.0":
- version: 7.0.0
- resolution: "@types/npmlog@npm:7.0.0"
- dependencies:
- "@types/node": "npm:*"
- checksum: 0fbddf3b9647fcdbd47fa5851ba55d05d9a25c5a6ca0029a2a25d3a69bbe966c5dd1dfe7e4f051af6294b59d457e931e524338a20e9cfeea90fd994f5779537a
- languageName: node
- linkType: hard
-
"@types/object-assign@npm:^4.0.30":
version: 4.0.33
resolution: "@types/object-assign@npm:4.0.33"
@@ -3555,13 +3536,13 @@ __metadata:
linkType: hard
"@types/react@npm:*, @types/react@npm:16 || 17 || 18, @types/react@npm:>=16.9.11, @types/react@npm:^18.2.7":
- version: 18.2.47
- resolution: "@types/react@npm:18.2.47"
+ version: 18.2.48
+ resolution: "@types/react@npm:18.2.48"
dependencies:
"@types/prop-types": "npm:*"
"@types/scheduler": "npm:*"
csstype: "npm:^3.0.2"
- checksum: 49608f07f73374e535b21f99fee28e6cfd5801d887c6ed88c41b4dc701dbcee9f0c4d289d9af7b2b23114f76dbf203ffe2c9191bfb4958cf18dae5a25daedbd0
+ checksum: c9ca43ed2995389b7e09492c24e6f911a8439bb8276dd17cc66a2fbebbf0b42daf7b2ad177043256533607c2ca644d7d928fdfce37a67af1f8646d2bac988900
languageName: node
linkType: hard
@@ -4327,13 +4308,6 @@ __metadata:
languageName: node
linkType: hard
-"aproba@npm:^1.0.3 || ^2.0.0":
- version: 2.0.0
- resolution: "aproba@npm:2.0.0"
- checksum: 5615cadcfb45289eea63f8afd064ab656006361020e1735112e346593856f87435e02d8dcc7ff0d11928bc7d425f27bc7c2a84f6c0b35ab0ff659c814c138a24
- languageName: node
- linkType: hard
-
"are-docs-informative@npm:^0.0.2":
version: 0.0.2
resolution: "are-docs-informative@npm:0.0.2"
@@ -4341,16 +4315,6 @@ __metadata:
languageName: node
linkType: hard
-"are-we-there-yet@npm:^4.0.0":
- version: 4.0.0
- resolution: "are-we-there-yet@npm:4.0.0"
- dependencies:
- delegates: "npm:^1.0.0"
- readable-stream: "npm:^4.1.0"
- checksum: 35d6a65ce9a0c53d8d8eeef8805528c483c5c3512f2050b32c07e61becc440c4ec8178d6ee6cedc1e5a81b819eb55d9c0a9fc7d9f862cae4c7dc30ec393f0a58
- languageName: node
- linkType: hard
-
"argparse@npm:^1.0.7":
version: 1.0.10
resolution: "argparse@npm:1.0.10"
@@ -4672,6 +4636,13 @@ __metadata:
languageName: node
linkType: hard
+"atomic-sleep@npm:^1.0.0":
+ version: 1.0.0
+ resolution: "atomic-sleep@npm:1.0.0"
+ checksum: b95275afb2f80732f22f43a60178430c468906a415a7ff18bcd0feeebc8eec3930b51250aeda91a476062a90e07132b43a1794e8d8ffcf9b650e8139be75fa36
+ languageName: node
+ linkType: hard
+
"atrament@npm:0.2.4":
version: 0.2.4
resolution: "atrament@npm:0.2.4"
@@ -4712,13 +4683,13 @@ __metadata:
linkType: hard
"axios@npm:^1.4.0":
- version: 1.6.5
- resolution: "axios@npm:1.6.5"
+ version: 1.6.6
+ resolution: "axios@npm:1.6.6"
dependencies:
follow-redirects: "npm:^1.15.4"
form-data: "npm:^4.0.0"
proxy-from-env: "npm:^1.1.0"
- checksum: e28d67b2d9134cb4608c44d8068b0678cfdccc652742e619006f27264a30c7aba13b2cd19c6f1f52ae195b5232734925928fb192d5c85feea7edd2f273df206d
+ checksum: 0a299c22643992a4f00c8f143e5d41815ff3c2bd56b9b9cc9cd3b6dfe43e9beabdd305b6d0d6ef41748021498a389165d32963c556da4a48f4042b1ea95dd30e
languageName: node
linkType: hard
@@ -4976,15 +4947,6 @@ __metadata:
languageName: node
linkType: hard
-"bidi-js@npm:^1.0.3":
- version: 1.0.3
- resolution: "bidi-js@npm:1.0.3"
- dependencies:
- require-from-string: "npm:^2.0.2"
- checksum: 877c5dcfd69a35fd30fee9e49a03faf205a7a4cd04a38af7648974a659cab7b1cd51fa881d7957c07bd1fc5adf22b90a56da3617bb0885ee69d58ff41117658c
- languageName: node
- linkType: hard
-
"big-integer@npm:^1.6.44":
version: 1.6.51
resolution: "big-integer@npm:1.6.51"
@@ -5773,15 +5735,6 @@ __metadata:
languageName: node
linkType: hard
-"color-support@npm:^1.1.3":
- version: 1.1.3
- resolution: "color-support@npm:1.1.3"
- bin:
- color-support: bin.js
- checksum: 9b7356817670b9a13a26ca5af1c21615463b500783b739b7634a0c2047c16cef4b2865d7576875c31c3cddf9dd621fa19285e628f20198b233a5cfdda6d0793b
- languageName: node
- linkType: hard
-
"colord@npm:^2.9.1, colord@npm:^2.9.3":
version: 2.9.3
resolution: "colord@npm:2.9.3"
@@ -5789,7 +5742,7 @@ __metadata:
languageName: node
linkType: hard
-"colorette@npm:^2.0.20":
+"colorette@npm:^2.0.20, colorette@npm:^2.0.7":
version: 2.0.20
resolution: "colorette@npm:2.0.20"
checksum: 0c016fea2b91b733eb9f4bcdb580018f52c0bc0979443dad930e5037a968237ac53d9beb98e218d2e9235834f8eebce7f8e080422d6194e957454255bde71d3d
@@ -5921,13 +5874,6 @@ __metadata:
languageName: node
linkType: hard
-"console-control-strings@npm:^1.1.0":
- version: 1.1.0
- resolution: "console-control-strings@npm:1.1.0"
- checksum: 8755d76787f94e6cf79ce4666f0c5519906d7f5b02d4b884cf41e11dcd759ed69c57da0670afd9236d229a46e0f9cf519db0cd829c6dca820bb5a5c3def584ed
- languageName: node
- linkType: hard
-
"constants-browserify@npm:^1.0.0":
version: 1.0.0
resolution: "constants-browserify@npm:1.0.0"
@@ -6003,9 +5949,9 @@ __metadata:
linkType: hard
"core-js@npm:^3.30.2":
- version: 3.35.0
- resolution: "core-js@npm:3.35.0"
- checksum: 25c224aca3df012b98f08f13ccbd8171ef5852acd33fd5e58e106d27f5f0c97de2fdbc520f0b4364d26253caf2deb3e5d265310f57d2a66ae6cc922850e649f0
+ version: 3.35.1
+ resolution: "core-js@npm:3.35.1"
+ checksum: e246af6b634be3763ffe3ce6ac4601b4dc5b928006fb6c95e5d08ecd82a2413bf36f00ffe178b89c9a8e94000288933a78a9881b2c9498e6cf312b031013b952
languageName: node
linkType: hard
@@ -6455,6 +6401,13 @@ __metadata:
languageName: node
linkType: hard
+"dateformat@npm:^4.6.3":
+ version: 4.6.3
+ resolution: "dateformat@npm:4.6.3"
+ checksum: c3aa0617c0a5b30595122bc8d1bee6276a9221e4d392087b41cbbdf175d9662ae0e50d0d6dcdf45caeac5153c4b5b0844265f8cd2b2245451e3da19e39e3b65d
+ languageName: node
+ linkType: hard
+
"debounce@npm:^1.2.1":
version: 1.2.1
resolution: "debounce@npm:1.2.1"
@@ -6690,13 +6643,6 @@ __metadata:
languageName: node
linkType: hard
-"delegates@npm:^1.0.0":
- version: 1.0.0
- resolution: "delegates@npm:1.0.0"
- checksum: a51744d9b53c164ba9c0492471a1a2ffa0b6727451bdc89e31627fdf4adda9d51277cfcbfb20f0a6f08ccb3c436f341df3e92631a3440226d93a8971724771fd
- languageName: node
- linkType: hard
-
"denque@npm:^2.1.0":
version: 2.1.0
resolution: "denque@npm:2.1.0"
@@ -6965,9 +6911,9 @@ __metadata:
linkType: hard
"dotenv@npm:^16.0.3":
- version: 16.3.1
- resolution: "dotenv@npm:16.3.1"
- checksum: 15d75e7279018f4bafd0ee9706593dd14455ddb71b3bcba9c52574460b7ccaf67d5cf8b2c08a5af1a9da6db36c956a04a1192b101ee102a3e0cf8817bbcf3dfd
+ version: 16.4.1
+ resolution: "dotenv@npm:16.4.1"
+ checksum: a343f0a1d156deef8c60034f797969867af4dbccfacedd4ac15fad04547e7ffe0553b58fc3b27a5837950f0d977e38e9234943fbcec4aeced4e3d044309a76ab
languageName: node
linkType: hard
@@ -7969,6 +7915,13 @@ __metadata:
languageName: node
linkType: hard
+"fast-copy@npm:^3.0.0":
+ version: 3.0.1
+ resolution: "fast-copy@npm:3.0.1"
+ checksum: 5496b5cf47df29eea479deef03b6b7188626a2cbc356b3015649062846729de6f1a9f555f937e772da8feae0a1231fab13096ed32424b2d61e4d065abc9969fe
+ languageName: node
+ linkType: hard
+
"fast-deep-equal@npm:^3.1.1, fast-deep-equal@npm:^3.1.3":
version: 3.1.3
resolution: "fast-deep-equal@npm:3.1.3"
@@ -8010,6 +7963,20 @@ __metadata:
languageName: node
linkType: hard
+"fast-redact@npm:^3.1.1":
+ version: 3.3.0
+ resolution: "fast-redact@npm:3.3.0"
+ checksum: 3f7becc70a5a2662a9cbfdc52a4291594f62ae998806ee00315af307f32d9559dbf512146259a22739ee34401950ef47598c1f4777d33b0ed5027203d67f549c
+ languageName: node
+ linkType: hard
+
+"fast-safe-stringify@npm:^2.1.1":
+ version: 2.1.1
+ resolution: "fast-safe-stringify@npm:2.1.1"
+ checksum: a851cbddc451745662f8f00ddb622d6766f9bd97642dabfd9a405fb0d646d69fc0b9a1243cbf67f5f18a39f40f6fa821737651ff1bceeba06c9992ca2dc5bd3d
+ languageName: node
+ linkType: hard
+
"fastest-levenshtein@npm:^1.0.16":
version: 1.0.16
resolution: "fastest-levenshtein@npm:1.0.16"
@@ -8431,22 +8398,6 @@ __metadata:
languageName: node
linkType: hard
-"gauge@npm:^5.0.0":
- version: 5.0.1
- resolution: "gauge@npm:5.0.1"
- dependencies:
- aproba: "npm:^1.0.3 || ^2.0.0"
- color-support: "npm:^1.1.3"
- console-control-strings: "npm:^1.1.0"
- has-unicode: "npm:^2.0.1"
- signal-exit: "npm:^4.0.1"
- string-width: "npm:^4.2.3"
- strip-ansi: "npm:^6.0.1"
- wide-align: "npm:^1.1.5"
- checksum: 09b1eb8d8c850df7e4e2822feef27427afc845d4839fa13a08ddad74f882caf668dd1e77ac5e059d3e9a7b0cef59b706d28be40e1dc5fd326da32965e1f206a6
- languageName: node
- linkType: hard
-
"gensync@npm:^1.0.0-beta.2":
version: 1.0.0-beta.2
resolution: "gensync@npm:1.0.0-beta.2"
@@ -8795,13 +8746,6 @@ __metadata:
languageName: node
linkType: hard
-"has-unicode@npm:^2.0.1":
- version: 2.0.1
- resolution: "has-unicode@npm:2.0.1"
- checksum: 1eab07a7436512db0be40a710b29b5dc21fa04880b7f63c9980b706683127e3c1b57cb80ea96d47991bdae2dfe479604f6a1ba410106ee1046a41d1bd0814400
- languageName: node
- linkType: hard
-
"has-value@npm:^0.3.1":
version: 0.3.1
resolution: "has-value@npm:0.3.1"
@@ -8878,6 +8822,13 @@ __metadata:
languageName: node
linkType: hard
+"help-me@npm:^5.0.0":
+ version: 5.0.0
+ resolution: "help-me@npm:5.0.0"
+ checksum: 474436627b6c7d2f406a2768453895889eb2712c8ded4c47658d5c6dd46c2ff3f742be4e4e8dedd57b7f1ac6b28803896a2e026a32a977f507222c16f23ab2e1
+ languageName: node
+ linkType: hard
+
"history@npm:^4.10.1, history@npm:^4.9.0":
version: 4.10.1
resolution: "history@npm:4.10.1"
@@ -10594,6 +10545,13 @@ __metadata:
languageName: node
linkType: hard
+"joycon@npm:^3.1.1":
+ version: 3.1.1
+ resolution: "joycon@npm:3.1.1"
+ checksum: 8003c9c3fc79c5c7602b1c7e9f7a2df2e9916f046b0dbad862aa589be78c15734d11beb9fe846f5e06138df22cb2ad29961b6a986ba81c4920ce2b15a7f11067
+ languageName: node
+ linkType: hard
+
"jpeg-autorotate@npm:^7.1.1":
version: 7.1.1
resolution: "jpeg-autorotate@npm:7.1.1"
@@ -10692,11 +10650,10 @@ __metadata:
languageName: node
linkType: hard
-"jsdom@npm:^23.0.0":
- version: 23.2.0
- resolution: "jsdom@npm:23.2.0"
+"jsdom@npm:^24.0.0":
+ version: 24.0.0
+ resolution: "jsdom@npm:24.0.0"
dependencies:
- "@asamuzakjp/dom-selector": "npm:^2.0.1"
cssstyle: "npm:^4.0.1"
data-urls: "npm:^5.0.0"
decimal.js: "npm:^10.4.3"
@@ -10705,6 +10662,7 @@ __metadata:
http-proxy-agent: "npm:^7.0.0"
https-proxy-agent: "npm:^7.0.2"
is-potential-custom-element-name: "npm:^1.0.1"
+ nwsapi: "npm:^2.2.7"
parse5: "npm:^7.1.2"
rrweb-cssom: "npm:^0.6.0"
saxes: "npm:^6.0.0"
@@ -10722,7 +10680,7 @@ __metadata:
peerDependenciesMeta:
canvas:
optional: true
- checksum: 3ba97e6ac56c38d92d0ce2d0fac5de4042f7dec40d127872e1aa88dd379980f8ea2108a008319ceac54dc07a784078ed4b4401bf9109a76276ca2cace229c8df
+ checksum: 180cf672c1f5e4375fd831b6990c453b4c22b540619abe7a0a3ed0d18eca1171dea9f25739bc06dfea26d1c0d71c7ac26e62fc9a2d9b1657003fc8fd1bf6f9f4
languageName: node
linkType: hard
@@ -11396,10 +11354,10 @@ __metadata:
languageName: node
linkType: hard
-"meow@npm:^13.0.0":
- version: 13.0.0
- resolution: "meow@npm:13.0.0"
- checksum: 058257f6e0957f78914d3084cfcbb2cdc13c6de46375f1f28ef62d2430898f64a42d610e8de2101f559ed540381c385b62d26cd7da9e6c1515c5be79d36f57b0
+"meow@npm:^13.1.0":
+ version: 13.1.0
+ resolution: "meow@npm:13.1.0"
+ checksum: 78270d501c9f77c38c4d2b8d7a191396f4c4a9ea35710221f16cb21c30869f0c866a038b704fe0782d22ae2ca254cac159bc0c478b4c2f3dd72b26afc9ff2383
languageName: node
linkType: hard
@@ -11990,18 +11948,6 @@ __metadata:
languageName: node
linkType: hard
-"npmlog@npm:^7.0.1":
- version: 7.0.1
- resolution: "npmlog@npm:7.0.1"
- dependencies:
- are-we-there-yet: "npm:^4.0.0"
- console-control-strings: "npm:^1.1.0"
- gauge: "npm:^5.0.0"
- set-blocking: "npm:^2.0.0"
- checksum: caabeb1f557c1094ad7ed3275b968b83ccbaefc133f17366ebb9fe8eb44e1aace28c31419d6244bfc0422aede1202875d555fe6661978bf04386f6cf617f43a4
- languageName: node
- linkType: hard
-
"nth-check@npm:^1.0.2":
version: 1.0.2
resolution: "nth-check@npm:1.0.2"
@@ -12020,7 +11966,7 @@ __metadata:
languageName: node
linkType: hard
-"nwsapi@npm:^2.2.2":
+"nwsapi@npm:^2.2.2, nwsapi@npm:^2.2.7":
version: 2.2.7
resolution: "nwsapi@npm:2.2.7"
checksum: cab25f7983acec7e23490fec3ef7be608041b460504229770e3bfcf9977c41d6fe58f518994d3bd9aa3a101f501089a3d4a63536f4ff8ae4b8c4ca23bdbfda4e
@@ -12174,6 +12120,13 @@ __metadata:
languageName: node
linkType: hard
+"on-exit-leak-free@npm:^2.1.0":
+ version: 2.1.2
+ resolution: "on-exit-leak-free@npm:2.1.2"
+ checksum: 6ce7acdc7b9ceb51cf029b5239cbf41937ee4c8dcd9d4e475e1777b41702564d46caa1150a744e00da0ac6d923ab83471646a39a4470f97481cf6e2d8d253c3f
+ languageName: node
+ linkType: hard
+
"on-finished@npm:2.4.1":
version: 2.4.1
resolution: "on-finished@npm:2.4.1"
@@ -12741,6 +12694,80 @@ __metadata:
languageName: node
linkType: hard
+"pino-abstract-transport@npm:^1.0.0, pino-abstract-transport@npm:v1.1.0":
+ version: 1.1.0
+ resolution: "pino-abstract-transport@npm:1.1.0"
+ dependencies:
+ readable-stream: "npm:^4.0.0"
+ split2: "npm:^4.0.0"
+ checksum: cc84caabee5647b5753ae484d5f63a1bca0f6e1791845e2db2b6d830a561c2b5dd1177720f68d78994c8a93aecc69f2729e6ac2bc871a1bf5bb4b0ec17210668
+ languageName: node
+ linkType: hard
+
+"pino-http@npm:^9.0.0":
+ version: 9.0.0
+ resolution: "pino-http@npm:9.0.0"
+ dependencies:
+ get-caller-file: "npm:^2.0.5"
+ pino: "npm:^8.17.1"
+ pino-std-serializers: "npm:^6.2.2"
+ process-warning: "npm:^3.0.0"
+ checksum: 61be08f23f07f4429cab1b78bdc2d048b4bbbd1c2a20e87b2ae01d5b2bc7fce2d1cfe06396e2694fc321ba4aeb7426da9bc50f74af958e7adef92504dc66c7fb
+ languageName: node
+ linkType: hard
+
+"pino-pretty@npm:^10.3.1":
+ version: 10.3.1
+ resolution: "pino-pretty@npm:10.3.1"
+ dependencies:
+ colorette: "npm:^2.0.7"
+ dateformat: "npm:^4.6.3"
+ fast-copy: "npm:^3.0.0"
+ fast-safe-stringify: "npm:^2.1.1"
+ help-me: "npm:^5.0.0"
+ joycon: "npm:^3.1.1"
+ minimist: "npm:^1.2.6"
+ on-exit-leak-free: "npm:^2.1.0"
+ pino-abstract-transport: "npm:^1.0.0"
+ pump: "npm:^3.0.0"
+ readable-stream: "npm:^4.0.0"
+ secure-json-parse: "npm:^2.4.0"
+ sonic-boom: "npm:^3.0.0"
+ strip-json-comments: "npm:^3.1.1"
+ bin:
+ pino-pretty: bin.js
+ checksum: 51e2d670745a396ddfd12da9f7ea5c2e4dc93a84589ffb29f64f4118d4b83ab636ee21f4aee7a47adb04664d5d921fb33e039e0ea961bb1c1cffefa28444563c
+ languageName: node
+ linkType: hard
+
+"pino-std-serializers@npm:^6.0.0, pino-std-serializers@npm:^6.2.2":
+ version: 6.2.2
+ resolution: "pino-std-serializers@npm:6.2.2"
+ checksum: aeb0662edc46ec926de9961ed4780a4f0586bb7c37d212cd469c069639e7816887a62c5093bc93f260a4e0900322f44fc8ab1343b5a9fa2864a888acccdb22a4
+ languageName: node
+ linkType: hard
+
+"pino@npm:^8.17.1, pino@npm:^8.17.2":
+ version: 8.17.2
+ resolution: "pino@npm:8.17.2"
+ dependencies:
+ atomic-sleep: "npm:^1.0.0"
+ fast-redact: "npm:^3.1.1"
+ on-exit-leak-free: "npm:^2.1.0"
+ pino-abstract-transport: "npm:v1.1.0"
+ pino-std-serializers: "npm:^6.0.0"
+ process-warning: "npm:^3.0.0"
+ quick-format-unescaped: "npm:^4.0.3"
+ real-require: "npm:^0.2.0"
+ safe-stable-stringify: "npm:^2.3.1"
+ sonic-boom: "npm:^3.7.0"
+ thread-stream: "npm:^2.0.0"
+ bin:
+ pino: bin.js
+ checksum: fc769d3d7b1333de94d51815fbe2abc4a1cc07cb0252a399313e54e26c13da2c0a69b227c296bd95ed52660d7eaa993662a9bf270b7370d0f7553fdd38716b63
+ languageName: node
+ linkType: hard
+
"pirates@npm:^4.0.4":
version: 4.0.6
resolution: "pirates@npm:4.0.6"
@@ -13197,7 +13224,7 @@ __metadata:
languageName: node
linkType: hard
-"postcss@npm:^8.2.15, postcss@npm:^8.4.24, postcss@npm:^8.4.32":
+"postcss@npm:^8.2.15, postcss@npm:^8.4.24, postcss@npm:^8.4.33":
version: 8.4.33
resolution: "postcss@npm:8.4.33"
dependencies:
@@ -13292,11 +13319,11 @@ __metadata:
linkType: hard
"prettier@npm:^3.0.0":
- version: 3.2.2
- resolution: "prettier@npm:3.2.2"
+ version: 3.2.4
+ resolution: "prettier@npm:3.2.4"
bin:
prettier: bin/prettier.cjs
- checksum: b416e1e4b26c351403343ebe461feda631c0eee5c3cf316c711204a08f3c639f38a8f9177c75e98a690998ff82e8ddc80c6bc027fb4ef6cedb6a4db035b4fe9a
+ checksum: 6ec9385a836e0b9bac549e585101c086d1521c31d7b882d5c8bb7d7646da0693da5f31f4fff6dc080710e5e2d34c85e6fb2f8766876b3645c8be2f33b9c3d1a3
languageName: node
linkType: hard
@@ -13343,6 +13370,13 @@ __metadata:
languageName: node
linkType: hard
+"process-warning@npm:^3.0.0":
+ version: 3.0.0
+ resolution: "process-warning@npm:3.0.0"
+ checksum: 1fc2eb4524041de3c18423334cc8b4e36bec5ad5472640ca1a936122c6e01da0864c1a4025858ef89aea93eabe7e77db93ccea225b10858617821cb6a8719efe
+ languageName: node
+ linkType: hard
+
"process@npm:^0.11.10":
version: 0.11.10
resolution: "process@npm:0.11.10"
@@ -13520,6 +13554,13 @@ __metadata:
languageName: node
linkType: hard
+"quick-format-unescaped@npm:^4.0.3":
+ version: 4.0.4
+ resolution: "quick-format-unescaped@npm:4.0.4"
+ checksum: 7bc32b99354a1aa46c089d2a82b63489961002bb1d654cee3e6d2d8778197b68c2d854fd23d8422436ee1fdfd0abaddc4d4da120afe700ade68bd357815b26fd
+ languageName: node
+ linkType: hard
+
"raf@npm:^3.1.0":
version: 3.4.1
resolution: "raf@npm:3.4.1"
@@ -13762,8 +13803,8 @@ __metadata:
linkType: hard
"react-redux@npm:^9.0.4":
- version: 9.0.4
- resolution: "react-redux@npm:9.0.4"
+ version: 9.1.0
+ resolution: "react-redux@npm:9.1.0"
dependencies:
"@types/use-sync-external-store": "npm:^0.0.3"
use-sync-external-store: "npm:^1.0.0"
@@ -13779,7 +13820,7 @@ __metadata:
optional: true
redux:
optional: true
- checksum: acc69b85e003f4367e0fa9716ca441a2536aa513fcb1b9404e33188fa68938acf455806eba2ff639553fbba24c06b6e96982998178bb9a2669227e7e4bcd441e
+ checksum: 1b07714379ff0087b4fb43ffd138cc84efb7608c874d632a4e2162e1874f3e0f6b69a0a9b0f24f93cbf122c694ac9cfd315770676d4cabb167d159f1ef419560
languageName: node
linkType: hard
@@ -14015,15 +14056,16 @@ __metadata:
languageName: node
linkType: hard
-"readable-stream@npm:^4.1.0":
- version: 4.4.0
- resolution: "readable-stream@npm:4.4.0"
+"readable-stream@npm:^4.0.0":
+ version: 4.4.2
+ resolution: "readable-stream@npm:4.4.2"
dependencies:
abort-controller: "npm:^3.0.0"
buffer: "npm:^6.0.3"
events: "npm:^3.3.0"
process: "npm:^0.11.10"
- checksum: cc1630c2de134aee92646e77b1770019633000c408fd48609babf2caa53f00ca794928023aa9ad3d435a1044cec87d2ce7e2b7389dd1caf948b65c175edb7f52
+ string_decoder: "npm:^1.3.0"
+ checksum: 6f4063763dbdb52658d22d3f49ca976420e1fbe16bbd241f744383715845350b196a2f08b8d6330f8e219153dff34b140aeefd6296da828e1041a7eab1f20d5e
languageName: node
linkType: hard
@@ -14047,6 +14089,13 @@ __metadata:
languageName: node
linkType: hard
+"real-require@npm:^0.2.0":
+ version: 0.2.0
+ resolution: "real-require@npm:0.2.0"
+ checksum: fa060f19f2f447adf678d1376928c76379dce5f72bd334da301685ca6cdcb7b11356813332cc243c88470796bc2e2b1e2917fc10df9143dd93c2ea608694971d
+ languageName: node
+ linkType: hard
+
"redent@npm:^3.0.0":
version: 3.0.0
resolution: "redent@npm:3.0.0"
@@ -14592,6 +14641,13 @@ __metadata:
languageName: node
linkType: hard
+"safe-stable-stringify@npm:^2.3.1":
+ version: 2.4.3
+ resolution: "safe-stable-stringify@npm:2.4.3"
+ checksum: 3aeb64449706ee1f5ad2459fc99648b131d48e7a1fbb608d7c628020177512dc9d94108a5cb61bbc953985d313d0afea6566d243237743e02870490afef04b43
+ languageName: node
+ linkType: hard
+
"safer-buffer@npm:>= 2.1.2 < 3, safer-buffer@npm:>= 2.1.2 < 3.0.0, safer-buffer@npm:^2.1.0":
version: 2.1.2
resolution: "safer-buffer@npm:2.1.2"
@@ -14625,15 +14681,15 @@ __metadata:
linkType: hard
"sass@npm:^1.62.1":
- version: 1.69.7
- resolution: "sass@npm:1.69.7"
+ version: 1.70.0
+ resolution: "sass@npm:1.70.0"
dependencies:
chokidar: "npm:>=3.0.0 <4.0.0"
immutable: "npm:^4.0.0"
source-map-js: "npm:>=0.6.2 <2.0.0"
bin:
sass: sass.js
- checksum: c67cd32b69fb26a50e4535353e4145de8cbc8187db07c467cc335157fd56d03cae98754f86efe43b880b29f20c0a168ab972c7f74ebfe234e2bd2dfb868890cb
+ checksum: fd1b622cf9b7fa699a03ec634611997552ece45eb98ac365fef22f42bdcb8ed63b326b64173379c966830c8551ae801e44e4a00d2de16fdadda2dc8f35400bbb
languageName: node
linkType: hard
@@ -14705,6 +14761,13 @@ __metadata:
languageName: node
linkType: hard
+"secure-json-parse@npm:^2.4.0":
+ version: 2.7.0
+ resolution: "secure-json-parse@npm:2.7.0"
+ checksum: d9d7d5a01fc6db6115744ba23cf9e67ecfe8c524d771537c062ee05ad5c11b64c730bc58c7f33f60bd6877f96b86f0ceb9ea29644e4040cb757f6912d4dd6737
+ languageName: node
+ linkType: hard
+
"select-hose@npm:^2.0.0":
version: 2.0.0
resolution: "select-hose@npm:2.0.0"
@@ -15108,6 +15171,15 @@ __metadata:
languageName: node
linkType: hard
+"sonic-boom@npm:^3.0.0, sonic-boom@npm:^3.7.0":
+ version: 3.7.0
+ resolution: "sonic-boom@npm:3.7.0"
+ dependencies:
+ atomic-sleep: "npm:^1.0.0"
+ checksum: 528f0f7f7e09dcdb02ad5985039f66554266cbd8813f9920781607c9248e01f468598c1334eab2cc740c016a63c8b2a20e15c3f618cddb08ea1cfb4a390a796e
+ languageName: node
+ linkType: hard
+
"source-list-map@npm:^2.0.0":
version: 2.0.1
resolution: "source-list-map@npm:2.0.1"
@@ -15266,7 +15338,7 @@ __metadata:
languageName: node
linkType: hard
-"split2@npm:^4.1.0":
+"split2@npm:^4.0.0, split2@npm:^4.1.0":
version: 4.2.0
resolution: "split2@npm:4.2.0"
checksum: 05d54102546549fe4d2455900699056580cca006c0275c334611420f854da30ac999230857a85fdd9914dc2109ae50f80fda43d2a445f2aa86eccdc1dfce779d
@@ -15431,7 +15503,7 @@ __metadata:
languageName: node
linkType: hard
-"string-width-cjs@npm:string-width@^4.2.0, string-width@npm:^1.0.2 || 2 || 3 || 4, string-width@npm:^4.1.0, string-width@npm:^4.2.0, string-width@npm:^4.2.3":
+"string-width-cjs@npm:string-width@^4.2.0, string-width@npm:^4.1.0, string-width@npm:^4.2.0, string-width@npm:^4.2.3":
version: 4.2.3
resolution: "string-width@npm:4.2.3"
dependencies:
@@ -15524,7 +15596,7 @@ __metadata:
languageName: node
linkType: hard
-"string_decoder@npm:^1.0.0, string_decoder@npm:^1.1.1":
+"string_decoder@npm:^1.0.0, string_decoder@npm:^1.1.1, string_decoder@npm:^1.3.0":
version: 1.3.0
resolution: "string_decoder@npm:1.3.0"
dependencies:
@@ -15737,12 +15809,12 @@ __metadata:
linkType: hard
"stylelint@npm:^16.0.2":
- version: 16.1.0
- resolution: "stylelint@npm:16.1.0"
+ version: 16.2.0
+ resolution: "stylelint@npm:16.2.0"
dependencies:
- "@csstools/css-parser-algorithms": "npm:^2.4.0"
- "@csstools/css-tokenizer": "npm:^2.2.2"
- "@csstools/media-query-list-parser": "npm:^2.1.6"
+ "@csstools/css-parser-algorithms": "npm:^2.5.0"
+ "@csstools/css-tokenizer": "npm:^2.2.3"
+ "@csstools/media-query-list-parser": "npm:^2.1.7"
"@csstools/selector-specificity": "npm:^3.0.1"
balanced-match: "npm:^2.0.0"
colord: "npm:^2.9.3"
@@ -15762,14 +15834,14 @@ __metadata:
is-plain-object: "npm:^5.0.0"
known-css-properties: "npm:^0.29.0"
mathml-tag-names: "npm:^2.1.3"
- meow: "npm:^13.0.0"
+ meow: "npm:^13.1.0"
micromatch: "npm:^4.0.5"
normalize-path: "npm:^3.0.0"
picocolors: "npm:^1.0.0"
- postcss: "npm:^8.4.32"
+ postcss: "npm:^8.4.33"
postcss-resolve-nested-selector: "npm:^0.1.1"
postcss-safe-parser: "npm:^7.0.0"
- postcss-selector-parser: "npm:^6.0.13"
+ postcss-selector-parser: "npm:^6.0.15"
postcss-value-parser: "npm:^4.2.0"
resolve-from: "npm:^5.0.0"
string-width: "npm:^4.2.3"
@@ -15780,7 +15852,7 @@ __metadata:
write-file-atomic: "npm:^5.0.1"
bin:
stylelint: bin/stylelint.mjs
- checksum: ac0c5a3381c54a000d532002c2fa518aa24e8ab89f7fe638d33fd7c056eaa36e6461b86183b2168cfb3842903d4ae4fa9e002459a21e91b91a1739b74e073ee5
+ checksum: dbc9ef12d3e1027ba1daf2f0d413e16127d32ea128b47d2c273be1476b329926f4698dc390eea56beb25fc8ebd9e2a7664a868df706d4e12e94ad6a4d1697d77
languageName: node
linkType: hard
@@ -16070,6 +16142,15 @@ __metadata:
languageName: node
linkType: hard
+"thread-stream@npm:^2.0.0":
+ version: 2.4.1
+ resolution: "thread-stream@npm:2.4.1"
+ dependencies:
+ real-require: "npm:^0.2.0"
+ checksum: 8b28e11eab2f805f963e6b6b23afab5523079575c4fc79c16eb29aa1c13d7931289762ebbc1268b3373d3f35ce795bd291df8e2d51eb45779ecaaecd06873459
+ languageName: node
+ linkType: hard
+
"thunky@npm:^1.0.2":
version: 1.1.0
resolution: "thunky@npm:1.1.0"
@@ -17307,15 +17388,6 @@ __metadata:
languageName: node
linkType: hard
-"wide-align@npm:^1.1.5":
- version: 1.1.5
- resolution: "wide-align@npm:1.1.5"
- dependencies:
- string-width: "npm:^1.0.2 || 2 || 3 || 4"
- checksum: d5fc37cd561f9daee3c80e03b92ed3e84d80dde3365a8767263d03dacfc8fa06b065ffe1df00d8c2a09f731482fcacae745abfbb478d4af36d0a891fad4834d3
- languageName: node
- linkType: hard
-
"wildcard@npm:^2.0.0":
version: 2.0.1
resolution: "wildcard@npm:2.0.1"