diff --git a/app/javascript/mastodon/features/ui/index.jsx b/app/javascript/mastodon/features/ui/index.jsx
index f836dace7f398d..02c69cbbaffaf6 100644
--- a/app/javascript/mastodon/features/ui/index.jsx
+++ b/app/javascript/mastodon/features/ui/index.jsx
@@ -64,8 +64,8 @@ import {
About,
PrivacyPolicy,
} from './util/async-components';
+import { ColumnsContextProvider } from './util/columns_context';
import { WrappedSwitch, WrappedRoute } from './util/react_router_helpers';
-
// Dummy import, to make sure that ends up in the application bundle.
// Without this it ends up in ~8 very commonly used bundles.
import '../../components/status';
@@ -179,68 +179,70 @@ class SwitchingColumnsArea extends PureComponent {
}
return (
-
-
- {redirect}
-
- {singleColumn ? : null}
- {singleColumn && pathName.startsWith('/deck/') ? : null}
- {/* Redirect old bookmarks (without /deck) with home-like routes to the advanced interface */}
- {!singleColumn && pathName === '/getting-started' ? : null}
- {!singleColumn && pathName === '/home' ? : null}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {/* Legacy routes, cannot be easily factored with other routes because they share a param name */}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ {redirect}
+
+ {singleColumn ? : null}
+ {singleColumn && pathName.startsWith('/deck/') ? : null}
+ {/* Redirect old bookmarks (without /deck) with home-like routes to the advanced interface */}
+ {!singleColumn && pathName === '/getting-started' ? : null}
+ {!singleColumn && pathName === '/home' ? : null}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {/* Legacy routes, cannot be easily factored with other routes because they share a param name */}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
);
}
diff --git a/app/javascript/mastodon/features/ui/util/columns_context.tsx b/app/javascript/mastodon/features/ui/util/columns_context.tsx
new file mode 100644
index 00000000000000..e02918deb00d07
--- /dev/null
+++ b/app/javascript/mastodon/features/ui/util/columns_context.tsx
@@ -0,0 +1,51 @@
+import type { ReactElement } from 'react';
+import { createContext, useContext, useMemo, useState } from 'react';
+import { createPortal } from 'react-dom';
+
+export const ColumnsContext = createContext<{
+ tabsBarElement: HTMLElement | null;
+ setTabsBarElement: (element: HTMLElement) => void;
+ multiColumn: boolean;
+}>({
+ tabsBarElement: null,
+ multiColumn: false,
+ setTabsBarElement: () => undefined, // no-op
+});
+
+export function useColumnsContext() {
+ return useContext(ColumnsContext);
+}
+
+export const ButtonInTabsBar: React.FC<{
+ children: ReactElement | string | undefined;
+}> = ({ children }) => {
+ const { multiColumn, tabsBarElement } = useColumnsContext();
+
+ if (multiColumn) {
+ return children;
+ } else if (!tabsBarElement) {
+ return children;
+ } else {
+ return createPortal(children, tabsBarElement);
+ }
+};
+
+type ContextValue = React.ContextType;
+
+export const ColumnsContextProvider: React.FC<
+ React.PropsWithChildren<{ multiColumn: boolean }>
+> = ({ multiColumn, children }) => {
+ const [tabsBarElement, setTabsBarElement] =
+ useState(null);
+
+ const contextValue = useMemo(
+ () => ({ multiColumn, tabsBarElement, setTabsBarElement }),
+ [multiColumn, tabsBarElement],
+ );
+
+ return (
+
+ {children}
+
+ );
+};
diff --git a/app/javascript/mastodon/features/video/index.jsx b/app/javascript/mastodon/features/video/index.jsx
index c04d9e3d4b9085..05b1316fd06b48 100644
--- a/app/javascript/mastodon/features/video/index.jsx
+++ b/app/javascript/mastodon/features/video/index.jsx
@@ -10,11 +10,11 @@ import { is } from 'immutable';
import { ReactComponent as FullscreenIcon } from '@material-symbols/svg-600/outlined/fullscreen.svg';
import { ReactComponent as FullscreenExitIcon } from '@material-symbols/svg-600/outlined/fullscreen_exit.svg';
import { ReactComponent as PauseIcon } from '@material-symbols/svg-600/outlined/pause.svg';
-import { ReactComponent as PlayArrowIcon } from '@material-symbols/svg-600/outlined/play_arrow.svg';
+import { ReactComponent as PlayArrowIcon } from '@material-symbols/svg-600/outlined/play_arrow-fill.svg';
import { ReactComponent as RectangleIcon } from '@material-symbols/svg-600/outlined/rectangle.svg';
import { ReactComponent as VisibilityOffIcon } from '@material-symbols/svg-600/outlined/visibility_off.svg';
-import { ReactComponent as VolumeOffIcon } from '@material-symbols/svg-600/outlined/volume_off.svg';
-import { ReactComponent as VolumeUpIcon } from '@material-symbols/svg-600/outlined/volume_up.svg';
+import { ReactComponent as VolumeOffIcon } from '@material-symbols/svg-600/outlined/volume_off-fill.svg';
+import { ReactComponent as VolumeUpIcon } from '@material-symbols/svg-600/outlined/volume_up-fill.svg';
import { throttle } from 'lodash';
import { Blurhash } from 'mastodon/components/blurhash';
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index aac4256ffdbf96..c4dbbc5f0310bc 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -1,5 +1,5 @@
{
- "about.blocks": "Valvotut palvelimet",
+ "about.blocks": "Moderoidut palvelimet",
"about.contact": "Ota yhteyttä:",
"about.disclaimer": "Mastodon on vapaa avoimen lähdekoodin ohjelmisto ja Mastodon gGmbH:n tavaramerkki.",
"about.domain_blocks.no_reason_available": "Syytä ei ole ilmoitettu",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index b5d9e50f65717c..8431d12acc1d0b 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -20,7 +20,7 @@
"account.block_short": "Bloquear",
"account.blocked": "Bloqueada",
"account.browse_more_on_origin_server": "Busca máis no perfil orixinal",
- "account.cancel_follow_request": "Retirar solicitude de seguimento",
+ "account.cancel_follow_request": "Cancelar a solicitude de seguimento",
"account.direct": "Mencionar de xeito privado a @{name}",
"account.disable_notifications": "Deixar de notificarme cando @{name} publica",
"account.domain_blocked": "Dominio agochado",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index ccd783e8092208..3a78a9cd791e70 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -590,7 +590,7 @@
"search.quick_action.open_url": "마스토돈에서 URL 열기",
"search.quick_action.status_search": "{x}에 맞는 게시물",
"search.search_or_paste": "검색하거나 URL 붙여넣기",
- "search_popout.full_text_search_disabled_message": "{domain}에서는 사용할 수 없습니다.",
+ "search_popout.full_text_search_disabled_message": "{domain}에서는 이용할 수 없습니다.",
"search_popout.language_code": "ISO 언어코드",
"search_popout.options": "검색 옵션",
"search_popout.quick_actions": "빠른 작업",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index 814a14c15618f9..84ea64bb986643 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -81,7 +81,7 @@
"admin.impact_report.instance_follows": "Obserwujący, których straciliby ich użytkownicy",
"admin.impact_report.title": "Podsumowanie wpływu",
"alert.rate_limited.message": "Spróbuj ponownie po {retry_time, time, medium}.",
- "alert.rate_limited.title": "Ograniczony czasowo",
+ "alert.rate_limited.title": "Ograniczenie liczby zapytań",
"alert.unexpected.message": "Wystąpił nieoczekiwany błąd.",
"alert.unexpected.title": "Ups!",
"announcement.announcement": "Ogłoszenie",
diff --git a/app/javascript/mastodon/test_helpers.tsx b/app/javascript/mastodon/test_helpers.tsx
new file mode 100644
index 00000000000000..689589556956b4
--- /dev/null
+++ b/app/javascript/mastodon/test_helpers.tsx
@@ -0,0 +1,62 @@
+import PropTypes from 'prop-types';
+import type { PropsWithChildren } from 'react';
+import { Component } from 'react';
+
+import { IntlProvider } from 'react-intl';
+
+import { MemoryRouter } from 'react-router';
+
+// eslint-disable-next-line import/no-extraneous-dependencies
+import { render as rtlRender } from '@testing-library/react';
+
+class FakeIdentityWrapper extends Component<
+ PropsWithChildren<{ signedIn: boolean }>
+> {
+ static childContextTypes = {
+ identity: PropTypes.shape({
+ signedIn: PropTypes.bool.isRequired,
+ accountId: PropTypes.string,
+ disabledAccountId: PropTypes.string,
+ accessToken: PropTypes.string,
+ }).isRequired,
+ };
+
+ getChildContext() {
+ return {
+ identity: {
+ signedIn: this.props.signedIn,
+ accountId: '123',
+ accessToken: 'test-access-token',
+ },
+ };
+ }
+
+ render() {
+ return this.props.children;
+ }
+}
+
+function render(
+ ui: React.ReactElement,
+ { locale = 'en', signedIn = true, ...renderOptions } = {},
+) {
+ const Wrapper = (props: { children: React.ReactElement }) => {
+ return (
+
+
+
+ {props.children}
+
+
+
+ );
+ };
+ return rtlRender(ui, { wrapper: Wrapper, ...renderOptions });
+}
+
+// re-export everything
+// eslint-disable-next-line import/no-extraneous-dependencies
+export * from '@testing-library/react';
+
+// override render method
+export { render };
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 1326874daa7054..ba5897aa4d8a1e 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -3137,20 +3137,6 @@ $ui-header-height: 55px;
margin-inline-end: 5px;
}
-.column-back-button--slim {
- position: relative;
-}
-
-.column-back-button--slim-button {
- cursor: pointer;
- flex: 0 0 auto;
- font-size: 16px;
- padding: 15px;
- position: absolute;
- inset-inline-end: 0;
- top: -50px;
-}
-
.react-toggle {
display: inline-block;
position: relative;
@@ -7434,7 +7420,12 @@ noscript {
border: 1px solid lighten($ui-base-color, 12%);
border-radius: 4px;
box-sizing: content-box;
- padding: 2px;
+ padding: 5px;
+
+ .icon {
+ width: 24px;
+ height: 24px;
+ }
}
}
@@ -7517,6 +7508,11 @@ noscript {
color: lighten($ui-highlight-color, 8%);
}
+ .icon {
+ width: 18px;
+ height: 18px;
+ }
+
.verified {
border: 1px solid rgba($valid-value-color, 0.5);
margin-top: -1px;
@@ -7537,6 +7533,16 @@ noscript {
color: $valid-value-color;
}
+ dd {
+ display: flex;
+ align-items: center;
+ gap: 4px;
+
+ span {
+ display: flex;
+ }
+ }
+
a {
color: $valid-value-color;
}
diff --git a/app/lib/attachment_batch.rb b/app/lib/attachment_batch.rb
index 78bd5931603535..13a9da828f5cf2 100644
--- a/app/lib/attachment_batch.rb
+++ b/app/lib/attachment_batch.rb
@@ -75,7 +75,12 @@ def remove_files
end
when :fog
logger.debug { "Deleting #{attachment.path(style)}" }
- attachment.send(:directory).files.new(key: attachment.path(style)).destroy
+
+ begin
+ attachment.send(:directory).files.new(key: attachment.path(style)).destroy
+ rescue Fog::Storage::OpenStack::NotFound
+ # Ignore failure to delete a file that has already been deleted
+ end
when :azure
logger.debug { "Deleting #{attachment.path(style)}" }
attachment.destroy
diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
index 2889d13b536526..2af2a3a41d2cb3 100644
--- a/app/mailers/user_mailer.rb
+++ b/app/mailers/user_mailer.rb
@@ -8,13 +8,15 @@ class UserMailer < Devise::Mailer
helper :instance
helper :statuses
helper :formatting
+ helper :routing
- helper RoutingHelper
+ before_action :set_instance
+
+ default to: -> { @resource.email }
def confirmation_instructions(user, token, *, **)
@resource = user
@token = token
- @instance = Rails.configuration.x.local_domain
return unless @resource.active_for_authentication?
@@ -28,185 +30,177 @@ def confirmation_instructions(user, token, *, **)
def reset_password_instructions(user, token, *, **)
@resource = user
@token = token
- @instance = Rails.configuration.x.local_domain
return unless @resource.active_for_authentication?
I18n.with_locale(locale) do
- mail to: @resource.email, subject: I18n.t('devise.mailer.reset_password_instructions.subject')
+ mail subject: default_devise_subject
end
end
def password_change(user, *, **)
@resource = user
- @instance = Rails.configuration.x.local_domain
return unless @resource.active_for_authentication?
I18n.with_locale(locale) do
- mail to: @resource.email, subject: I18n.t('devise.mailer.password_change.subject')
+ mail subject: default_devise_subject
end
end
def email_changed(user, *, **)
@resource = user
- @instance = Rails.configuration.x.local_domain
return unless @resource.active_for_authentication?
I18n.with_locale(locale) do
- mail to: @resource.email, subject: I18n.t('devise.mailer.email_changed.subject')
+ mail subject: default_devise_subject
end
end
def two_factor_enabled(user, *, **)
@resource = user
- @instance = Rails.configuration.x.local_domain
return unless @resource.active_for_authentication?
I18n.with_locale(locale) do
- mail to: @resource.email, subject: I18n.t('devise.mailer.two_factor_enabled.subject')
+ mail subject: default_devise_subject
end
end
def two_factor_disabled(user, *, **)
@resource = user
- @instance = Rails.configuration.x.local_domain
return unless @resource.active_for_authentication?
I18n.with_locale(locale) do
- mail to: @resource.email, subject: I18n.t('devise.mailer.two_factor_disabled.subject')
+ mail subject: default_devise_subject
end
end
def two_factor_recovery_codes_changed(user, *, **)
@resource = user
- @instance = Rails.configuration.x.local_domain
return unless @resource.active_for_authentication?
I18n.with_locale(locale) do
- mail to: @resource.email, subject: I18n.t('devise.mailer.two_factor_recovery_codes_changed.subject')
+ mail subject: default_devise_subject
end
end
def webauthn_enabled(user, *, **)
@resource = user
- @instance = Rails.configuration.x.local_domain
return unless @resource.active_for_authentication?
I18n.with_locale(locale) do
- mail to: @resource.email, subject: I18n.t('devise.mailer.webauthn_enabled.subject')
+ mail subject: default_devise_subject
end
end
def webauthn_disabled(user, *, **)
@resource = user
- @instance = Rails.configuration.x.local_domain
return unless @resource.active_for_authentication?
I18n.with_locale(locale) do
- mail to: @resource.email, subject: I18n.t('devise.mailer.webauthn_disabled.subject')
+ mail subject: default_devise_subject
end
end
def webauthn_credential_added(user, webauthn_credential)
@resource = user
- @instance = Rails.configuration.x.local_domain
@webauthn_credential = webauthn_credential
return unless @resource.active_for_authentication?
I18n.with_locale(locale) do
- mail to: @resource.email, subject: I18n.t('devise.mailer.webauthn_credential.added.subject')
+ mail subject: I18n.t('devise.mailer.webauthn_credential.added.subject')
end
end
def webauthn_credential_deleted(user, webauthn_credential)
@resource = user
- @instance = Rails.configuration.x.local_domain
@webauthn_credential = webauthn_credential
return unless @resource.active_for_authentication?
I18n.with_locale(locale) do
- mail to: @resource.email, subject: I18n.t('devise.mailer.webauthn_credential.deleted.subject')
+ mail subject: I18n.t('devise.mailer.webauthn_credential.deleted.subject')
end
end
def welcome(user)
@resource = user
- @instance = Rails.configuration.x.local_domain
return unless @resource.active_for_authentication?
I18n.with_locale(locale) do
- mail to: @resource.email, subject: I18n.t('user_mailer.welcome.subject')
+ mail subject: default_i18n_subject
end
end
def backup_ready(user, backup)
@resource = user
- @instance = Rails.configuration.x.local_domain
@backup = backup
return unless @resource.active_for_authentication?
I18n.with_locale(locale) do
- mail to: @resource.email, subject: I18n.t('user_mailer.backup_ready.subject')
+ mail subject: default_i18n_subject
end
end
def warning(user, warning)
@resource = user
@warning = warning
- @instance = Rails.configuration.x.local_domain
@statuses = @warning.statuses.includes(:account, :preloadable_poll, :media_attachments, active_mentions: [:account])
I18n.with_locale(locale) do
- mail to: @resource.email, subject: I18n.t("user_mailer.warning.subject.#{@warning.action}", acct: "@#{user.account.local_username_and_domain}")
+ mail subject: I18n.t("user_mailer.warning.subject.#{@warning.action}", acct: "@#{user.account.local_username_and_domain}")
end
end
def appeal_approved(user, appeal)
@resource = user
- @instance = Rails.configuration.x.local_domain
@appeal = appeal
I18n.with_locale(locale) do
- mail to: @resource.email, subject: I18n.t('user_mailer.appeal_approved.subject', date: l(@appeal.created_at))
+ mail subject: default_i18n_subject(date: l(@appeal.created_at))
end
end
def appeal_rejected(user, appeal)
@resource = user
- @instance = Rails.configuration.x.local_domain
@appeal = appeal
I18n.with_locale(locale) do
- mail to: @resource.email, subject: I18n.t('user_mailer.appeal_rejected.subject', date: l(@appeal.created_at))
+ mail subject: default_i18n_subject(date: l(@appeal.created_at))
end
end
def suspicious_sign_in(user, remote_ip, user_agent, timestamp)
@resource = user
- @instance = Rails.configuration.x.local_domain
@remote_ip = remote_ip
@user_agent = user_agent
@detection = Browser.new(user_agent)
@timestamp = timestamp.to_time.utc
I18n.with_locale(locale) do
- mail to: @resource.email, subject: I18n.t('user_mailer.suspicious_sign_in.subject')
+ mail subject: default_i18n_subject
end
end
private
+ def default_devise_subject
+ I18n.t(:subject, scope: ['devise.mailer', action_name])
+ end
+
+ def set_instance
+ @instance = Rails.configuration.x.local_domain
+ end
+
def locale
@resource.locale.presence || I18n.default_locale
end
diff --git a/app/models/tag.rb b/app/models/tag.rb
index 413f6f5004766e..8fab98fb5c0107 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -35,7 +35,7 @@ class Tag < ApplicationRecord
HASHTAG_LAST_SEQUENCE = '([[:word:]_]*[[:alpha:]][[:word:]_]*)'
HASHTAG_NAME_PAT = "#{HASHTAG_FIRST_SEQUENCE}|#{HASHTAG_LAST_SEQUENCE}"
- HASHTAG_RE = %r{(? true })
end
follow_request
diff --git a/app/views/admin/accounts/index.html.haml b/app/views/admin/accounts/index.html.haml
index da11e4361c2d13..9cec8d6325c87a 100644
--- a/app/views/admin/accounts/index.html.haml
+++ b/app/views/admin/accounts/index.html.haml
@@ -22,9 +22,10 @@
.fields-group
- %i(username by_domain display_name email ip).each do |key|
- - unless key == :by_domain && params[:origin] != 'remote'
- .input.string.optional
- = text_field_tag key, params[key], class: 'string optional', placeholder: I18n.t("admin.accounts.#{key}")
+ - next if key == :by_domain && params[:origin] != 'remote'
+
+ .input.string.optional
+ = text_field_tag key, params[key], class: 'string optional', placeholder: I18n.t("admin.accounts.#{key}")
.actions
%button.button= t('admin.accounts.search')
diff --git a/app/views/auth/confirmations/new.html.haml b/app/views/auth/confirmations/new.html.haml
index a98257873ce520..0cb82a1f86a293 100644
--- a/app/views/auth/confirmations/new.html.haml
+++ b/app/views/auth/confirmations/new.html.haml
@@ -1,13 +1,29 @@
- content_for :page_title do
= t('auth.resend_confirmation')
-= simple_form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f|
- = render 'shared/error_messages', object: resource
+- if resource.errors.of_kind?(:email, :already_confirmed)
+ .simple_form
+ = render 'auth/shared/progress', stage: resource.approved? ? 'completed' : 'confirmed'
- .fields-group
- = f.input :email, autofocus: true, wrapper: :with_label, label: t('simple_form.labels.defaults.email'), input_html: { 'aria-label': t('simple_form.labels.defaults.email') }, readonly: current_user.present?, hint: current_user.present? && t('auth.confirmations.wrong_email_hint')
+ - if resource.approved?
+ %h1.title= t('auth.confirmations.welcome_title', name: resource.account.username)
+ %p.lead= t('auth.confirmations.registration_complete', domain: site_hostname)
+ - if resource.created_by_application && redirect_to_app?
+ - app = resource.created_by_application
+ %p.lead= t('auth.confirmations.redirect_to_app_html', app_name: app.name, clicking_this_link: link_to(t('auth.confirmations.clicking_this_link'), app.confirmation_redirect_uri))
+ - else
+ %p.lead= t('auth.confirmations.proceed_to_login_html', login_link: link_to_login(t('auth.confirmations.login_link')))
+ - else
+ %h1.title= t('auth.confirmations.awaiting_review_title')
+ %p.lead= t('auth.confirmations.awaiting_review', domain: site_hostname)
+- else
+ = simple_form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f|
+ = render 'shared/error_messages', object: resource
- .actions
- = f.button :button, t('auth.resend_confirmation'), type: :submit
+ .fields-group
+ = f.input :email, autofocus: true, wrapper: :with_label, label: t('simple_form.labels.defaults.email'), input_html: { 'aria-label': t('simple_form.labels.defaults.email') }, readonly: current_user.present?, hint: current_user.present? && t('auth.confirmations.wrong_email_hint')
+
+ .actions
+ = f.button :button, t('auth.resend_confirmation'), type: :submit
.form-footer= render 'auth/shared/links'
diff --git a/app/views/auth/shared/_progress.html.haml b/app/views/auth/shared/_progress.html.haml
index 578f62fa9c77f2..8fb33854194789 100644
--- a/app/views/auth/shared/_progress.html.haml
+++ b/app/views/auth/shared/_progress.html.haml
@@ -1,4 +1,4 @@
-- progress_index = { rules: 0, details: 1, confirm: 2 }[stage.to_sym]
+- progress_index = { rules: 0, details: 1, confirm: 2, confirmed: 3, completed: 4 }[stage.to_sym]
%ol.progress-tracker
%li{ class: progress_index.positive? ? 'completed' : 'active' }
@@ -20,6 +20,8 @@
.label= t('auth.progress.confirm')
- if approved_registrations?
%li.separator{ class: progress_index > 2 ? 'completed' : nil }
- %li
+ %li{ class: [progress_index > 3 && 'completed', progress_index == 3 && 'active'] }
.circle
+ - if progress_index > 3
+ = check_icon
.label= t('auth.progress.review')
diff --git a/app/views/settings/exports/show.html.haml b/app/views/settings/exports/show.html.haml
index d7b59af270a43b..320bb0c7cebcbb 100644
--- a/app/views/settings/exports/show.html.haml
+++ b/app/views/settings/exports/show.html.haml
@@ -24,14 +24,14 @@
%th= t('admin.accounts.followers')
%td= number_with_delimiter @export.total_followers
%td
- %tr
- %th= t('exports.blocks')
- %td= number_with_delimiter @export.total_blocks
- %td= table_link_to 'download', t('exports.csv'), settings_exports_blocks_path(format: :csv)
%tr
%th= t('exports.mutes')
%td= number_with_delimiter @export.total_mutes
%td= table_link_to 'download', t('exports.csv'), settings_exports_mutes_path(format: :csv)
+ %tr
+ %th= t('exports.blocks')
+ %td= number_with_delimiter @export.total_blocks
+ %td= table_link_to 'download', t('exports.csv'), settings_exports_blocks_path(format: :csv)
%tr
%th= t('exports.domain_blocks')
%td= number_with_delimiter @export.total_domain_blocks
diff --git a/app/workers/activitypub/delivery_worker.rb b/app/workers/activitypub/delivery_worker.rb
index 7c1c14766b70a5..376c237a98493a 100644
--- a/app/workers/activitypub/delivery_worker.rb
+++ b/app/workers/activitypub/delivery_worker.rb
@@ -23,9 +23,10 @@ class ActivityPub::DeliveryWorker
HEADERS = { 'Content-Type' => 'application/activity+json' }.freeze
def perform(json, source_account_id, inbox_url, options = {})
- return unless DeliveryFailureTracker.available?(inbox_url)
-
@options = options.with_indifferent_access
+
+ return unless @options[:bypass_availability] || DeliveryFailureTracker.available?(inbox_url)
+
@json = json
@source_account = Account.find(source_account_id)
@inbox_url = inbox_url
diff --git a/config/application.rb b/config/application.rb
index 7f7f8b5d6cc8be..ad931fd36bcce6 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -206,7 +206,7 @@ class Application < Rails::Application
# We use our own middleware for this
config.public_file_server.enabled = false
- config.middleware.use PublicFileServerMiddleware if Rails.env.development? || Rails.env.test? || ENV['RAILS_SERVE_STATIC_FILES'] == 'true'
+ config.middleware.use PublicFileServerMiddleware if Rails.env.local? || ENV['RAILS_SERVE_STATIC_FILES'] == 'true' # rubocop:disable Rails/UnknownEnv
config.middleware.use Rack::Attack
config.middleware.use Mastodon::RackMiddleware
diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml
index e5a4eb9a825b02..b76eb6992aef37 100644
--- a/config/i18n-tasks.yml
+++ b/config/i18n-tasks.yml
@@ -72,6 +72,7 @@ ignore_unused:
- 'themes.*'
- 'move_handler.carry_{mutes,blocks}_over_text'
- 'admin_mailer.*.subject'
+ - 'user_mailer.*.subject'
- 'notification_mailer.*'
- 'imports.overwrite_preambles.{following,blocking,muting,domain_blocking,bookmarks,lists}_html'
- 'imports.preambles.{following,blocking,muting,domain_blocking,bookmarks,lists}_html'
diff --git a/config/initializers/strong_migrations.rb b/config/initializers/strong_migrations.rb
index 10b3805db240ec..4dcec1c2a29b76 100644
--- a/config/initializers/strong_migrations.rb
+++ b/config/initializers/strong_migrations.rb
@@ -1,4 +1,4 @@
# frozen_string_literal: true
StrongMigrations.start_after = 2017_09_24_022025
-StrongMigrations.target_version = 10
+StrongMigrations.target_version = 12
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index 09e201f55a957d..baa6d31e3580ba 100644
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -1174,6 +1174,7 @@ cy:
functional: Mae eich cyfrif nawr yn weithredol.
pending: Mae'ch cais yn aros i gael ei adolygu gan ein staff. Gall hyn gymryd cryn amser. Byddwch yn derbyn e-bost os caiff eich cais ei gymeradwyo.
redirecting_to: Mae eich cyfrif yn anweithredol oherwydd ei fod ar hyn o bryd yn ailgyfeirio i %{acct}.
+ self_destruct: Gab fod parth %{domain} yn cau, dim ond mynediad cyfyngedig fyddwch yn ei gael i'ch cyfrif.
view_strikes: Gweld rybuddion y gorffennol yn erbyn eich cyfrif
too_fast: Cafodd y ffurflen ei chyflwyno'n rhy gyflym, ceisiwch eto.
use_security_key: Defnyddiwch allwedd diogelwch
@@ -1675,6 +1676,9 @@ cy:
over_daily_limit: Rydych wedi mynd dros y terfyn o %{limit} postiad a drefnwyd ar gyfer heddiw
over_total_limit: Rydych wedi mynd dros y terfyn o %{limit} postiad a drefnwyd
too_soon: Rhaid i'r dyddiad a drefnwyd fod yn y dyfodol
+ self_destruct:
+ lead_html: Yn anffodus mae %{domain} yn cau'n barhaol. Os oedd gennych gyfrif yno, ni fydd modd i chi barhau i'w ddefnyddio, ond mae dal modd gofyn i gael copi wrth gefn o'ch data.
+ title: Mae'r gweinydd hwn yn cau
sessions:
activity: Gweithgaredd ddiwethaf
browser: Porwr
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 9ffece04d70007..c5d63918531f84 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -1041,6 +1041,14 @@ da:
hint_html: Bare en ting mere! Vi er nødt til at bekræfte, at du er et menneske (dette er for at vi kan holde spam ude!). Løs CAPTCHA'en nedenfor og klik på "Fortsæt".
title: Sikkerhedstjek
confirmations:
+ awaiting_review: E-mailadressen er bekræftet! %{domain}-personalet gennemgår nu registreringen. En e-mail fremsendes, såfremt din konto godkendes!
+ awaiting_review_title: Registreringen er ved at blive gennemgået
+ clicking_this_link: klikke på dette link
+ login_link: log ind
+ proceed_to_login_html: Der kan nu fortsættes til %{login_link}.
+ redirect_to_app_html: En omdirigering til %{app_name}-appen burde være sket. Er det ikke tilfældet, prøv da %{clicking_this_link} eller returnér manuelt til appen.
+ registration_complete: Registreringen på %{domain} er nu fuldført!
+ welcome_title: Velkommen %{name}!
wrong_email_hint: Er denne e-mailadresse ikke korrekt, kan den ændres i kontoindstillinger.
delete_account: Slet konto
delete_account_html: Ønsker du at slette din konto, kan du gøre dette hér. Du vil blive bedt om bekræftelse.
diff --git a/config/locales/de.yml b/config/locales/de.yml
index c6b3218ee9a160..ca7659c4c9343c 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -1041,6 +1041,14 @@ de:
hint_html: Fast geschafft! Wir müssen uns vergewissern, dass du ein Mensch bist (damit wir Spam verhindern können!). Bitte löse das CAPTCHA und klicke auf „Weiter“.
title: Sicherheitsüberprüfung
confirmations:
+ awaiting_review: Deine E-Mail-Adresse wurde bestätigt und das Team von %{domain} überprüft nun deine Registrierung. Sobald es dein Konto genehmigt, wirst du eine E-Mail erhalten.
+ awaiting_review_title: Deine Registrierung wird überprüft
+ clicking_this_link: Klick auf diesen Link
+ login_link: anmelden
+ proceed_to_login_html: Du kannst dich nun %{login_link}.
+ redirect_to_app_html: Du hättest zur %{app_name}-App weitergeleitet werden sollen. Wenn das nicht geschehen ist, versuche es mit einem %{clicking_this_link} oder kehre manuell zur App zurück.
+ registration_complete: Deine Registrierung auf %{domain} ist nun abgeschlossen!
+ welcome_title: Willkommen, %{name}!
wrong_email_hint: Sollte diese E-Mail-Adresse nicht korrekt sein, kannst du sie in den Kontoeinstellungen ändern.
delete_account: Konto löschen
delete_account_html: Falls du dein Konto endgültig löschen möchtest, kannst du das hier vornehmen. Du musst dies zusätzlich bestätigen.
diff --git a/config/locales/devise.sr-Latn.yml b/config/locales/devise.sr-Latn.yml
index 6b4a5801c616e9..40f3d51c30ffb1 100644
--- a/config/locales/devise.sr-Latn.yml
+++ b/config/locales/devise.sr-Latn.yml
@@ -88,7 +88,7 @@ sr-Latn:
updated_not_active: Vaša lozinka nije uspešno promenjena.
registrations:
destroyed: Ćao! Vaš nalog je uspešno obrisan. Nadamo se da ćete se uskoro vratiti.
- signed_up: Dobrodošli! Uspešno ste se registrovali.
+ signed_up: Dobro došli! Uspešno ste se registrovali.
signed_up_but_inactive: Uspešno ste se registrovali. Nažalost ne možete se prijaviti zato što Vaš nalog još nije aktiviran.
signed_up_but_locked: Uspešno ste se registrovali. Nažalost ne možete se prijaviti zato što je Vaš nalog zaključan.
signed_up_but_pending: Na vaš imejl poslata je poruka sa vezom za potvrdu. Nakon što kliknete na vezu, pregledaćemo vašu prijavu. Bićete obavešteni ako bude odobreno.
diff --git a/config/locales/devise.sr.yml b/config/locales/devise.sr.yml
index d55cf7a268e924..f61431de607ddc 100644
--- a/config/locales/devise.sr.yml
+++ b/config/locales/devise.sr.yml
@@ -88,7 +88,7 @@ sr:
updated_not_active: Ваша лозинка није успешно промењена.
registrations:
destroyed: Ћао! Ваш налог је успешно обрисан. Надамо се да ћете се ускоро вратити.
- signed_up: Добродошли! Успешно сте се регистровали.
+ signed_up: Добро дошли! Успешно сте се регистровали.
signed_up_but_inactive: Успешно сте се регистровали. Нажалост не можете се пријавити зато што Ваш налог још није активиран.
signed_up_but_locked: Успешно сте се регистровали. Нажалост не можете се пријавити зато што је Ваш налог закључан.
signed_up_but_pending: На ваш имејл послата је порука са везом за потврду. Након што кликнете на везу, прегледаћемо вашу пријаву. Бићете обавештени ако буде одобрено.
diff --git a/config/locales/en.yml b/config/locales/en.yml
index e8e0f21e1c3db5..c298c47d3510aa 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1041,6 +1041,14 @@ en:
hint_html: Just one more thing! We need to confirm you're a human (this is so we can keep the spam out!). Solve the CAPTCHA below and click "Continue".
title: Security check
confirmations:
+ awaiting_review: Your e-mail address is confirmed! The %{domain} staff is now reviewing your registration. You will receive an e-mail if they approve your account!
+ awaiting_review_title: Your registration is being reviewed
+ clicking_this_link: clicking this link
+ login_link: log in
+ proceed_to_login_html: You can now proceed to %{login_link}.
+ redirect_to_app_html: You should have been redirected to the %{app_name} app. If that did not happen, try %{clicking_this_link} or manually return to the app.
+ registration_complete: Your registration on %{domain} is now complete!
+ welcome_title: Welcome, %{name}!
wrong_email_hint: If that e-mail address is not correct, you can change it in account settings.
delete_account: Delete account
delete_account_html: If you wish to delete your account, you can proceed here. You will be asked for confirmation.
diff --git a/config/locales/es-AR.yml b/config/locales/es-AR.yml
index fcff9469100c82..127f1262a3092d 100644
--- a/config/locales/es-AR.yml
+++ b/config/locales/es-AR.yml
@@ -1041,6 +1041,14 @@ es-AR:
hint_html: ¡Sólo una cosa más! Necesitamos confirmar que sos humano (¡esto es para que podamos mantener el spam fuera!). Resuelvé la CAPTCHA abajo y hacé clic en "Continuar".
title: Comprobación de seguridad
confirmations:
+ awaiting_review: "¡Tu dirección de correo electrónico fue confirmada! El equipo de %{domain} está revisando tu registro. ¡Recibirás un correo electrónico si aprueban tu cuenta!"
+ awaiting_review_title: Tu registro está siendo revisado
+ clicking_this_link: haciendo clic en este enlace
+ login_link: iniciar sesión
+ proceed_to_login_html: Ahora podés %{login_link}.
+ redirect_to_app_html: Deberías haber sido redirigido a la aplicación %{app_name}. Si eso no sucedió, probá %{clicking_this_link} o volvé a la aplicación manualmente.
+ registration_complete: "¡Tu registro en %{domain} fue completado!"
+ welcome_title: "¡Te damos la bienvenida, %{name}!"
wrong_email_hint: Si esa dirección de correo electrónico no es correcta, podés cambiarla en la configuración de la cuenta.
delete_account: Eliminar cuenta
delete_account_html: Si querés eliminar tu cuenta, podés seguir por acá. Se te va a pedir una confirmación.
diff --git a/config/locales/es-MX.yml b/config/locales/es-MX.yml
index e055ff4c799f63..ad2fb184ea229b 100644
--- a/config/locales/es-MX.yml
+++ b/config/locales/es-MX.yml
@@ -1041,6 +1041,14 @@ es-MX:
hint_html: ¡Una última cosita! Necesitamos confirmar que eres humano (¡así podemos evitar el spam!). Resuelve este CAPTCHA de debajo y pulsa en "Continuar".
title: Comprobación de seguridad
confirmations:
+ awaiting_review: "¡Tu dirección de correo electrónico ha sido confirmada! El personal de %{domain} está revisando tu registro. ¡Recibirás un correo electrónico si aprueban tu cuenta!"
+ awaiting_review_title: Su registro está siendo revisado
+ clicking_this_link: presionando este enlace
+ login_link: iniciar sesión
+ proceed_to_login_html: Ahora puedes proceder a %{login_link}.
+ redirect_to_app_html: Deberías haber sido redirigido a la aplicación %{app_name}. Si eso no sucedió, prueba %{clicking_this_link} o vuelve a la aplicación manualmente.
+ registration_complete: "¡Tu registro en %{domain} ha sido completado!"
+ welcome_title: "¡Bienvenido, %{name}!"
wrong_email_hint: Si esa dirección de correo electrónico no es correcta, puedes cambiarla en la configuración de la cuenta.
delete_account: Borrar cuenta
delete_account_html: Si desea eliminar su cuenta, puede proceder aquí. Será pedido de una confirmación.
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 5dce6330d6c3f7..aab31747e7655a 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1041,6 +1041,10 @@ es:
hint_html: ¡Una última cosita! Necesitamos confirmar que eres humano (¡así podemos evitar el spam!). Resuelve este CAPTCHA de debajo y pulsa en "Continuar".
title: Comprobación de seguridad
confirmations:
+ awaiting_review: "¡Tu dirección de correo electrónico ha sido confirmada! El personal de %{domain} está revisando tu registro. ¡Recibirás un correo electrónico cuando aprueben tu cuenta!"
+ awaiting_review_title: Estamos revisando tu registro
+ clicking_this_link: haciendo clic en este enlace
+ registration_complete: "¡Has completado tu registro en %{domain}!"
wrong_email_hint: Si esa dirección de correo electrónico no es correcta, puedes cambiarla en la configuración de la cuenta.
delete_account: Borrar cuenta
delete_account_html: Si desea eliminar su cuenta, puede proceder aquí. Será pedido de una confirmación.
@@ -1100,7 +1104,7 @@ es:
account_status: Estado de la cuenta
confirming: Esperando confirmación de correo electrónico.
functional: Tu cuenta está completamente operativa.
- pending: Su solicitud está pendiente de revisión por nuestros administradores. Eso puede tardar algún tiempo. Usted recibirá un correo electrónico si el solicitud sea aprobada.
+ pending: Tu solicitud está pendiente de revisión por nuestro personal. Eso puede tardar un tiempo. Recibirás un correo electrónico cuando tu solicitud sea aprobada.
redirecting_to: Tu cuenta se encuentra inactiva porque está siendo redirigida a %{acct}.
self_destruct: Como %{domain} está en proceso de cierre, solo tendrás acceso limitado a tu cuenta.
view_strikes: Ver amonestaciones pasadas contra tu cuenta
@@ -1786,7 +1790,7 @@ es:
title: Un nuevo inicio de sesión
warning:
appeal: Enviar una apelación
- appeal_description: Si crees que esto es un error, puedes enviar una apelación al equipo de %{instance}.
+ appeal_description: Si crees que esto es un error, puedes enviar una apelación al personal de %{instance}.
categories:
spam: Spam
violation: El contenido viola las siguientes directrices de la comunidad
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index c8c17b853a11ef..4b4585f690beae 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -1041,6 +1041,14 @@ fi:
hint_html: Vielä yksi juttu! Meidän on vahvistettava, että olet ihminen (tämän avulla pidämme roskapostin poissa!). Ratkaise alla oleva CAPTCHA-vahvistus ja paina "Jatka".
title: Turvatarkastus
confirmations:
+ awaiting_review: Sähköpostiosoitteesi on vahvistettu! Palvelun %{domain} ylläpito tarkistaa nyt rekisteröitymisesi. Saat sähköpostiviestin, jos tilisi hyväksytään!
+ awaiting_review_title: Rekisteröitymisesi on tarkistettavana
+ clicking_this_link: napsauttaa tätä linkkiä
+ login_link: kirjautumalla sisään
+ proceed_to_login_html: Voit nyt jatkaa %{login_link}.
+ redirect_to_app_html: Sinun olisi pitänyt ohjautua sovellukseen %{app_name}. Jos näin ei tapahtunut, kokeile %{clicking_this_link} tai palaa sovellukseen manuaalisesti.
+ registration_complete: Rekisteröitymisesi palveluun %{domain} on nyt valmis!
+ welcome_title: Tervetuloa, %{name}!
wrong_email_hint: Jos sähköpostiosoite ei ole oikein, voit muuttaa sen tilin asetuksista.
delete_account: Poista tili
delete_account_html: Jos haluat poistaa tilisi, voit edetä tästä. Sinua pyydetään vahvistamaan poisto.
@@ -1100,7 +1108,7 @@ fi:
account_status: Tilin tila
confirming: Odotetaan sähköpostivahvistuksen valmistumista.
functional: Tilisi on täysin toiminnassa.
- pending: Hakemuksesi odottaa henkilökuntamme tarkastusta. Tämä voi kestää jonkin aikaa. Saat sähköpostiviestin, jos hakemuksesi hyväksytään.
+ pending: Hakemuksesi odottaa palvelimen ylläpidon tarkastusta. Tämä voi kestää jonkin aikaa. Saat sähköpostiviestin, jos hakemuksesi hyväksytään.
redirecting_to: Tilisi ei ole aktiivinen, koska se ohjaa tällä hetkellä tilille %{acct}.
self_destruct: Koska %{domain} sulkeutuu, voit käyttää tiliäsi vain rajoitetusti.
view_strikes: Näytä tiliäsi koskevia aiempia varoituksia
@@ -1163,7 +1171,7 @@ fi:
approve_appeal: Hyväksy valitus
associated_report: Liittyvä raportti
created_at: Päivätty
- description_html: Nämä ovat tiliäsi koskevia toimia ja varoituksia, jotka instanssin %{instance} henkilökunta on lähettänyt sinulle.
+ description_html: Nämä ovat tiliäsi koskevia toimia ja varoituksia, jotka instanssin %{instance} ylläpito on lähettänyt sinulle.
recipient: Osoitettu
reject_appeal: Hylkää valitus
status: 'Julkaisu #%{id}'
@@ -1786,7 +1794,7 @@ fi:
title: Uusi kirjautuminen
warning:
appeal: Lähetä valitus
- appeal_description: Jos uskot, että tämä on virhe, voit hakea muutosta instanssin %{instance} henkilökunnalta.
+ appeal_description: Jos uskot, että tämä on virhe, voit hakea muutosta instanssin %{instance} ylläpidolta.
categories:
spam: Roskaposti
violation: Sisältö rikkoo seuraavia yhteisön sääntöjä
diff --git a/config/locales/fo.yml b/config/locales/fo.yml
index bd716fa3846fc3..8e98cc86490629 100644
--- a/config/locales/fo.yml
+++ b/config/locales/fo.yml
@@ -1041,6 +1041,14 @@ fo:
hint_html: Bara eitt afturat! Tað er neyðugt hjá okkum at vátta, at tú ert eitt menniskja (fyri at sleppa undan ruskposti!). Loys CAPTCHA niðanfyri og trýst á "Halt fram".
title: Trygdarkanning
confirmations:
+ awaiting_review: Teldupostadressan hjá góðkend! Nú kanna %{domain} ábyrgdarfólk skrásetingina hjá tær. Góðkenna tey kontu tína, so senda tey tær eitt teldubræv!
+ awaiting_review_title: Skrásetingin hjá tær verður viðgjørd
+ clicking_this_link: við at klikkja á hetta leinki
+ login_link: rita inn
+ proceed_to_login_html: Nú kanst tú fara víðari til %{login_link}.
+ redirect_to_app_html: Tú skuldi verið send/ur víðari til %{app_name} appina. Hendi tað ikki, so kanst tú royna %{clicking_this_link} ella fara manuelt aftur til appina.
+ registration_complete: Skráseting tín á %{domain} er nú avgreidd!
+ welcome_title: Vælkomin, %{name}!
wrong_email_hint: Um hesin teldupoststaðurin ikki er rættur, so kanst tú broyta hann í kontustillingunum.
delete_account: Strika kontu
delete_account_html: Ynskir tú at strika kontuna, so kanst tú halda fram her. Tú verður spurd/ur um váttan.
diff --git a/config/locales/fr-QC.yml b/config/locales/fr-QC.yml
index 15e0fa60963229..41b71f569d1e31 100644
--- a/config/locales/fr-QC.yml
+++ b/config/locales/fr-QC.yml
@@ -1041,6 +1041,14 @@ fr-QC:
hint_html: Juste une autre chose! Nous avons besoin de confirmer que vous êtes un humain (pour que nous puissions empêcher les spams!). Résolvez le CAPTCHA ci-dessous et cliquez sur "Continuer".
title: Vérification de sécurité
confirmations:
+ awaiting_review: Votre adresse e-mail est confirmée ! L’équipe de %{domain} vérifie désormais votre inscription. Vous recevrez un e-mail si votre compte est approuvé !
+ awaiting_review_title: Votre inscription est en cours de validation
+ clicking_this_link: cliquer sur ce lien
+ login_link: vous connecter
+ proceed_to_login_html: Vous pouvez désormais %{login_link}.
+ redirect_to_app_html: Vous auriez dû être redirigé vers l’application %{app_name}. Si cela ne s’est pas produit, essayez de %{clicking_this_link} ou de revenir manuellement à l’application.
+ registration_complete: Votre inscription sur %{domain} est désormais terminée !
+ welcome_title: Bienvenue, %{name} !
wrong_email_hint: Si cette adresse de courriel est incorrecte, vous pouvez la modifier dans vos paramètres de compte.
delete_account: Supprimer le compte
delete_account_html: Si vous désirez supprimer votre compte, vous pouvez cliquer ici. Il vous sera demandé de confirmer cette action.
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 1616f76726560f..79d8b92c2a3b6e 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -1041,6 +1041,14 @@ fr:
hint_html: Encore une chose ! Nous avons besoin de confirmer que vous êtes un humain (c'est pour que nous puissions empêcher les spams !). Résolvez le CAPTCHA ci-dessous et cliquez sur "Continuer".
title: Vérification de sécurité
confirmations:
+ awaiting_review: Votre adresse e-mail est confirmée ! L’équipe de %{domain} vérifie désormais votre inscription. Vous recevrez un e-mail si votre compte est approuvé !
+ awaiting_review_title: Votre inscription est en cours de validation
+ clicking_this_link: cliquer sur ce lien
+ login_link: vous connecter
+ proceed_to_login_html: Vous pouvez désormais %{login_link}.
+ redirect_to_app_html: Vous auriez dû être redirigé vers l’application %{app_name}. Si cela ne s’est pas produit, essayez de %{clicking_this_link} ou de revenir manuellement à l’application.
+ registration_complete: Votre inscription sur %{domain} est désormais terminée !
+ welcome_title: Bienvenue, %{name} !
wrong_email_hint: Si cette adresse de courriel est incorrecte, vous pouvez la modifier dans vos paramètres de compte.
delete_account: Supprimer le compte
delete_account_html: Si vous désirez supprimer votre compte, vous pouvez cliquer ici. Il vous sera demandé de confirmer cette action.
diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index a7ab89fc87c079..011899d15de056 100644
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -1041,6 +1041,14 @@ fy:
hint_html: Noch ien ding! Jo moatte befêstigje dat jo in minske binne (dit is om de spam bûten de doar te hâlden!). Los de ûndersteande CAPTCHA op en klik op ‘Trochgean’.
title: Befeiligingskontrôle
confirmations:
+ awaiting_review: Jo e-mailadres is befêstige! De %{domain}-meiwurkers binne no dwaande mei it besjen fan jo registraasje. Jo ûntfange in e-mailberjocht as de jo account goedkarre!
+ awaiting_review_title: Jo registraasje wurdt beoardield
+ clicking_this_link: klik op dizze keppeling
+ login_link: oanmelde
+ proceed_to_login_html: Jo kinne no fierder gean nei %{login_link}.
+ redirect_to_app_html: Jo soene omlaad wêze moatte nei de %{app_name} app. As dat net bard is, probearje dan %{clicking_this_link} of kear hânmjittich werom nei de app.
+ registration_complete: Jo registraasje op %{domain} is no foltôge!
+ welcome_title: Wolkom, %{name}!
wrong_email_hint: As it e-mailadres net korrekt is, kinne jo dat wizigje yn de accountynstellingen.
delete_account: Account fuortsmite
delete_account_html: Wannear’t jo jo account graach fuortsmite wolle, kinne jo dat hjir dwaan. Wy freegje jo dêr om in befêstiging.
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index f76c4dda12f1a2..525532ed98bbcc 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -1041,6 +1041,14 @@ gl:
hint_html: Unha cousa máis! Temos que confirmar que es un ser humano (para poder evitar contas de spam!). Resolve o CAPTCHA de aquí embaixo e preme en "Continuar".
title: Comprobación de seguridade
confirmations:
+ awaiting_review: O teu correo está verificado! A administración de %{domain} está revisando a túa solicitude. Recibirás outro correo se aproban a túa conta!
+ awaiting_review_title: Estamos revisando a solicitude de rexistro
+ clicking_this_link: premendo nesta ligazón
+ login_link: acceder
+ proceed_to_login_html: Xa podes %{login_link}.
+ redirect_to_app_html: Ímoste redirixir á app %{app_name}. Se iso non acontece, proba %{clicking_this_link} ou volve ti manualmente á app.
+ registration_complete: Completouse a creación da conta en %{domain}!
+ welcome_title: Benvida, %{name}!
wrong_email_hint: Se o enderezo de email non é correcto, podes cambialo nos axustes da conta.
delete_account: Eliminar conta
delete_account_html: Se queres eliminar a túa conta, podes facelo aquí. Deberás confirmar a acción.
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 33f57155f2d130..d987931f1e5d0b 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -1077,6 +1077,14 @@ he:
hint_html: עוד דבר אחד, עלינו לאשרר שאת(ה) אנושיים (לצורך סינון ספאם). נא לפתור את הקאפצ'ה להלן וללחוץ "המשך".
title: בדיקות אבטחה
confirmations:
+ awaiting_review: כתובת הדואל שלך אושרה! צוות %{domain} עכשיו יבדוק את הרשמתך. תשלח אליך הודעת דואל אם הצוות יאשר את החשבון!
+ awaiting_review_title: הרשמתך עוברת בדיקה
+ clicking_this_link: לחיצה על קישור זה
+ login_link: כניסה
+ proceed_to_login_html: ניתן להמשיך עכשיו אל %{login_link}.
+ redirect_to_app_html: כאן אמורה היתה להיות הפניה אוטמטית ליישומון %{app_name}. אם זה לא קרה, ניתן לנסות שוב על ידי %{clicking_this_link} או חזרה ידנית אל היישומון.
+ registration_complete: הרשמתך לשרת %{domain} הושלמה כעת!
+ welcome_title: ברוך/ה הבא/ה, %{name}!
wrong_email_hint: אם כתובת הדואל הזו איננה נכונה, ניתן לשנות אותה בעמוד ההגדרות.
delete_account: מחיקת חשבון
delete_account_html: אם ברצונך למחוק את החשבון, ניתן להמשיך כאן. תתבקש/י לספק אישור נוסף.
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 67f5b693ac8e1c..c01f38a9a9c758 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -1041,6 +1041,14 @@ hu:
hint_html: Még egy dolog! Meg kell győződnünk róla, hogy tényleg valós személy vagy (így távol tarthatjuk a spam-et). Oldd meg az alábbi CAPTCHA-t és kattints a "Folytatás"-ra.
title: Biztonsági ellenőrzés
confirmations:
+ awaiting_review: Az email címed megerősítésre került. %{domain} stábja jelenleg áttekinti a regisztrációdat. Ha jóváhagyásra került a fiókod, egy emailt küldenek majd!
+ awaiting_review_title: A regisztrációd áttekintés alatt áll
+ clicking_this_link: kattintás erre a hivatkozásra
+ login_link: bejelentkezés
+ proceed_to_login_html: 'Most továbbléphetsz: %{login_link}.'
+ redirect_to_app_html: Át kellett volna irányítsunk a %{app_name} alkalmazáshoz. Ha ez nem történt meg, próbálkozz a %{clicking_this_link} lehetőséggel vagy térj vissza manuálisan az alkalmazáshoz.
+ registration_complete: A regisztrációd %{domain} domainen befejeződött!
+ welcome_title: Üdvözlet, %{name}!
wrong_email_hint: Ha az emailcím nem helyes, a fiókbeállításokban megváltoztathatod.
delete_account: Felhasználói fiók törlése
delete_account_html: Felhasználói fiókod törléséhez kattints ide. A rendszer újbóli megerősítést fog kérni.
diff --git a/config/locales/is.yml b/config/locales/is.yml
index f5d89eca66c91e..e0eb955699d612 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -1045,6 +1045,14 @@ is:
Leystu Turing skynprófið og smelltu á "Áfram".
title: Öryggisathugun
confirmations:
+ awaiting_review: Tölvupóstfangið þitt er staðfest. Umsjónarfólk %{domain} er núna að yfirfara skráninguna þína. Þú munt fá tölvupóst ef þau samþykkja skráninguna þína!
+ awaiting_review_title: Verið er að yfirfara skráninguna þína
+ clicking_this_link: smella á þennan tengil
+ login_link: skrá þig inn
+ proceed_to_login_html: Þú getur núna farið í að %{login_link}.
+ redirect_to_app_html: Þér ætti að hafa verið endurbeint í %{app_name} forritið. Ef það gerðist ekki, skaltu prófa að %{clicking_this_link} eða fara aftur í forritið.
+ registration_complete: Skráning þín á %{domain} er núna tilbúin!
+ welcome_title: Velkomin/n %{name}!
wrong_email_hint: Ef það tölvupóstfang er ekki rétt geturðu breytt því í stillingum notandaaðgangsins.
delete_account: Eyða notandaaðgangi
delete_account_html: Ef þú vilt eyða notandaaðgangnum þínum, þá geturðu farið í það hér. Þú verður beðin/n um staðfestingu.
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 6e41389bc586d6..e62ea620c96c0c 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -1043,6 +1043,14 @@ it:
hint_html: Solamente un'altra cosa! Dobbiamo confermare che tu sia un essere umano (così possiamo tenere fuori lo spam!). Risolvi il CAPTCHA sottostante e fai clic su "Continua".
title: Controllo di sicurezza
confirmations:
+ awaiting_review: Il tuo indirizzo e-mail è confermato! Lo staff di %{domain} sta esaminando la tua registrazione. Riceverai una e-mail se il tuo account sarà approvato!
+ awaiting_review_title: La tua registrazione è in corso di revisione
+ clicking_this_link: cliccando su questo link
+ login_link: accedi
+ proceed_to_login_html: Ora puoi procedere con il %{login_link}.
+ redirect_to_app_html: Avresti dovuto essere reindirizzato all'app %{app_name}. Se ciò non fosse avvenuto, prova %{clicking_this_link} o torna manualmente all'app.
+ registration_complete: La tua registrazione su %{domain} è ora completata!
+ welcome_title: Benvenutə, %{name}!
wrong_email_hint: Se l'indirizzo e-mail non è corretto, puoi modificarlo nelle impostazioni dell'account.
delete_account: Elimina account
delete_account_html: Se desideri cancellare il tuo account, puoi farlo qui. Ti sarà chiesta conferma.
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 9df32b09dd15a5..0c805b9e562bec 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -1023,6 +1023,14 @@ ja:
hint_html: もう一つだけ！あなたが人間であることを確認する必要があります(スパムを防ぐためです！)。 以下のCAPTCHAを解き、「続ける」をクリックします。
title: セキュリティチェック
confirmations:
+ awaiting_review: メールアドレスは確認済みです。%{domain} のモデレーターによりアカウント登録の審査が完了すると、メールでお知らせします。
+ awaiting_review_title: 登録の審査待ちです
+ clicking_this_link: こちらのリンク
+ login_link: こちらのリンク
+ proceed_to_login_html: "%{login_link}から早速ログインしてみましょう。"
+ redirect_to_app_html: "%{app_name}に戻ります。自動で移動しない場合は%{clicking_this_link}を押すか、手動でアプリを切り替えてください。"
+ registration_complete: "%{domain} へのアカウント登録が完了しました。"
+ welcome_title: Mastodonへようこそ、%{name}さん
wrong_email_hint: メールアドレスが正しくない場合は、アカウント設定で変更できます。
delete_account: アカウントの削除
delete_account_html: アカウントを削除したい場合、こちらから手続きが行えます。削除する前に、確認画面があります。
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index eecac963e00f7a..1bcc8853e56951 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -1025,6 +1025,14 @@ ko:
hint_html: 하나만 더! 당신이 사람인지 확인이 필요합니다 (스팸 계정을 거르기 위해서 필요한 과정입니다). 아래에 있는 CAPTCHA를 풀고 "계속"을 누르세요
title: 보안 체크
confirmations:
+ awaiting_review: 이메일 주소를 확인했어요! 이제 %{domain} 스태프가 가입을 검토해요. 계정이 승인되면 이메일을 보내드려요.
+ awaiting_review_title: 가입 검토 중
+ clicking_this_link: 이 링크를 클릭
+ login_link: 로그인
+ proceed_to_login_html: "%{login_link} 할 수 있게 되었어요."
+ redirect_to_app_html: 곧 %{app_name}으로 리디렉션 되어요. 안 된다면, %{clicking_this_link}하거나 직접 앱으로 돌아가세요.
+ registration_complete: 지금 막 %{domain} 가입을 마쳤어요!
+ welcome_title: "%{name} 님 반가워요!"
wrong_email_hint: 만약 이메일 주소가 올바르지 않다면, 계정 설정에서 수정할 수 있습니다.
delete_account: 계정 삭제
delete_account_html: 계정을 삭제하고 싶은 경우, 여기서 삭제할 수 있습니다. 삭제 전 확인 화면이 표시됩니다.
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index f107cbeca18c32..d8a1c8865687e0 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -1041,6 +1041,14 @@ nl:
hint_html: Nog maar één ding! Je moet bevestigen dat je een mens bent (dit is om de spam buiten de deur te houden!). Los de onderstaande CAPTCHA op en klik op "Doorgaan".
title: Veiligheidscontrole
confirmations:
+ awaiting_review: Je e-mailadres is bevestigd! De %{domain}-medewerkers zijn nu bezig met het bekijken van jouw registratie. Je ontvangt een e-mailbericht als ze jouw account goedkeuren!
+ awaiting_review_title: Je registratie wordt beoordeeld
+ clicking_this_link: klik op deze koppeling
+ login_link: aanmelden
+ proceed_to_login_html: Je kunt nu verder gaan naar %{login_link}.
+ redirect_to_app_html: Je zou omgeleid moeten zijn naar de %{app_name} app. Als dat niet is gebeurd, probeer dan %{clicking_this_link} of keer handmatig terug naar de app.
+ registration_complete: Je registratie op %{domain} is nu voltooid!
+ welcome_title: Welkom, %{name}!
wrong_email_hint: Als dat e-mailadres niet correct is, kun je het wijzigen in je accountinstellingen.
delete_account: Account verwijderen
delete_account_html: Wanneer je jouw account graag wilt verwijderen, kun je dat hier doen. We vragen jou daar om een bevestiging.
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index da79c7555ce4f8..4e64f9cfd93572 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -1040,6 +1040,8 @@ pt-BR:
hint_html: Só mais uma coisa! Precisamos confirmar que você é um humano (isso é para que possamos evitar o spam!). Resolva o CAPTCHA abaixo e clique em "Continuar".
title: Verificação de segurança
confirmations:
+ registration_complete: Seu cadastro no %{domain} foi concluído!
+ welcome_title: Boas vindas, %{name}!
wrong_email_hint: Se esse endereço de e-mail não estiver correto, você pode alterá-lo nas configurações da conta.
delete_account: Excluir conta
delete_account_html: Se você deseja excluir sua conta, você pode fazer isso aqui. Uma confirmação será solicitada.
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index 62b497d70bf488..a40ac02f4ce0e6 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -1041,6 +1041,14 @@ pt-PT:
hint_html: Só mais uma coisa! Precisamos confirmar que você é um humano (isto para que possamos evitar spam!). Resolva o CAPTCHA abaixo e clique em "Continuar".
title: Verificação de segurança
confirmations:
+ awaiting_review: O seu endereço de correio eletrónico foi confirmado! A equipa %{domain} está agora a rever a sua inscrição. Receberá uma mensagem de correio eletrónico se aprovarem a sua conta!
+ awaiting_review_title: A sua inscrição está a ser revista
+ clicking_this_link: clicar nesta hiperligação
+ login_link: iniciar sessão
+ proceed_to_login_html: Pode agora prosseguir para %{login_link}.
+ redirect_to_app_html: Devia ter sido reencaminhado para a aplicação %{app_name}. Se isso não aconteceu, tente %{clicking_this_link} ou volte manualmente para a aplicação.
+ registration_complete: O seu registo sem %{domain} está agora concluído!
+ welcome_title: Bem-vindo(a), %{name}!
wrong_email_hint: Se esse endereço de e-mail não estiver correto, você pode alterá-lo nas configurações da conta.
delete_account: Eliminar conta
delete_account_html: Se deseja eliminar a sua conta, pode continuar aqui. Uma confirmação será solicitada.
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index f9e526c4e8edf4..945b190435b36b 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -556,6 +556,7 @@ ru:
total_reported: Жалобы на них
total_storage: Медиафайлы
totals_time_period_hint_html: Итоги, показанные ниже, включают данные за всё время.
+ unknown_instance: На данный момент нет записей об этом домене на этом сервере.
invites:
deactivate_all: Отключить все
filter:
@@ -1076,6 +1077,12 @@ ru:
hint_html: Еще одна вещь! Нам нужно подтвердить, что вы человек (так что мы можем держать спам!). Решите капчу ниже и нажмите кнопку «Продолжить».
title: Проверка безопасности
confirmations:
+ awaiting_review: Ваш адрес электронной почты подтвержден! Сотрудники %{domain} проверяют вашу регистрацию. Вы получите письмо, если они подтвердят вашу учетную запись!
+ awaiting_review_title: Ваша регистрация проверяется
+ login_link: войти
+ proceed_to_login_html: Теперь вы можете перейти к %{login_link}.
+ registration_complete: Ваша регистрация на %{domain} завершена!
+ welcome_title: Добро пожаловать, %{name}!
wrong_email_hint: Если этот адрес электронной почты неверен, вы можете изменить его в настройках аккаунта.
delete_account: Удалить учётную запись
delete_account_html: Удалить свою учётную запись можно в два счёта здесь, но прежде у вас будет спрошено подтверждение.
@@ -1137,6 +1144,7 @@ ru:
functional: Ваша учётная запись в полном порядке.
pending: Ваша заявка ожидает одобрения администраторами, это может занять немного времени. Вы получите письмо, как только заявку одобрят.
redirecting_to: Ваша учётная запись деактивированна, потому что вы настроили перенаправление на %{acct}.
+ self_destruct: Поскольку %{domain} закрывается, вы получите ограниченный доступ к вашей учетной записи.
view_strikes: Просмотр предыдущих замечаний в адрес вашей учетной записи
too_fast: Форма отправлена слишком быстро, попробуйте еще раз.
use_security_key: Использовать ключ безопасности
@@ -1622,6 +1630,8 @@ ru:
over_daily_limit: Вы превысили лимит в %{limit} запланированных постов на указанный день
over_total_limit: Вы превысили лимит на %{limit} запланированных постов
too_soon: Запланированная дата должна быть в будущем
+ self_destruct:
+ title: Этот сервер закрывается
sessions:
activity: Последняя активность
browser: Браузер
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 6e3fe0cd8987d9..f16803fb29aa64 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -125,6 +125,8 @@ sk:
removed_header_msg: Úspešne odstránený obrázok hlavičky %{username}
resend_confirmation:
already_confirmed: Tento užívateľ je už potvrdený
+ send: Odošli potvrdzovací odkaz znovu
+ success: Potvrdzovací email úspešne odoslaný!
reset: Resetuj
reset_password: Obnov heslo
resubscribe: Znovu odoberaj
@@ -1040,6 +1042,7 @@ sk:
confirm_remove_selected_followers: Si si istý/á, že chceš odstrániť vybraných sledovateľov?
confirm_remove_selected_follows: Si si istý/á, že chceš odstrániť vybraných sledovaných?
dormant: Spiace
+ follow_failure: Nemožno nasledovať niektoré z vybraných účtov.
follow_selected_followers: Následuj označených sledovatelov
followers: Následovatelia
following: Následovaní
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index 37166bc03be398..cba4354f0634ee 100644
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -1059,6 +1059,14 @@ sr-Latn:
hint_html: Samo još jedna stvar! Moramo da potvrdimo da ste ljudsko biće (ovo je da bismo sprečili neželjenu poštu!). Rešite CAPTCHA ispod i kliknite na „Nastavi”.
title: Bezbedonosna provera
confirmations:
+ awaiting_review: Vaša adresa e-pošte je potvrđena! Osoblje %{domain} sada pregleda vašu registraciju. Dobićete e-poštu ako odobre vaš nalog!
+ awaiting_review_title: Vaša registracija se pregleda
+ clicking_this_link: klikom na ovu vezu
+ login_link: prijavi se
+ proceed_to_login_html: Sada možete da pređete na %{login_link}.
+ redirect_to_app_html: Trebalo je da budete preusmereni na aplikaciju %{app_name}. Ako se to nije desilo, pokušajte sa %{clicking_this_link} ili se ručno vratite u aplikaciju.
+ registration_complete: Vaša registracija na %{domain} je sada kompletirana!
+ welcome_title: Dobro došli, %{name}!
wrong_email_hint: Ako ta imejl adresa nije ispravna, možete je promeniti u podešavanjima naloga.
delete_account: Brisanje naloga
delete_account_html: Ako želite da izbrišete vaš nalog, možete nastaviti ovde. Od vas će se tražiti potvrda.
@@ -1855,8 +1863,8 @@ sr-Latn:
final_step: 'Počnite da objavljujete! Čak i bez pratilaca, Vaše javne objave su vidljive drugim ljudima, na primer na lokalnoj vremenskoj liniji ili u heš oznakama. Možda želite da se predstavite sa heš oznakom #introductions ili #predstavljanja.'
full_handle: Vaš pun nadimak
full_handle_hint: Ovo biste rekli svojim prijateljima kako bi vam oni poslali poruku, ili zapratili sa druge instance.
- subject: Dobrodošli na Mastodon
- title: Dobrodošli, %{name}!
+ subject: Dobro došli na Mastodon
+ title: Dobro došli, %{name}!
users:
follow_limit_reached: Ne možete pratiti više od %{limit} ljudi
go_to_sso_account_settings: Idite na podešavanja naloga svog dobavljača identiteta
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index ba269488e47454..902f13ad6177ee 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -1059,6 +1059,14 @@ sr:
hint_html: Само још једна ствар! Морамо да потврдимо да сте људско биће (ово је да бисмо спречили нежељену пошту!). Решите CAPTCHA испод и кликните на „Настави”.
title: Безбедоносна провера
confirmations:
+ awaiting_review: Ваша адреса е-поште је потврђена! Особље %{domain} сада прегледа вашу регистрацију. Добићете е-пошту ако одобре ваш налог!
+ awaiting_review_title: Ваша регистрација се прегледа
+ clicking_this_link: кликом на ову везу
+ login_link: пријави се
+ proceed_to_login_html: Сада можете да пређете на %{login_link}.
+ redirect_to_app_html: Требало је да будете преусмерени на апликацију %{app_name}. Ако се то није десило, покушајте са %{clicking_this_link} или се ручно вратите у апликацију.
+ registration_complete: Ваша регистрација на %{domain} је сада комплетирана!
+ welcome_title: Добро дошли, %{name}!
wrong_email_hint: Ако та имејл адреса није исправна, можете је променити у подешавањима налога.
delete_account: Брисање налога
delete_account_html: Ако желите да избришете ваш налог, можете наставити овде. Од вас ће се тражити потврда.
@@ -1855,8 +1863,8 @@ sr:
final_step: 'Почните да објављујете! Чак и без пратилаца, Ваше јавне објаве су видљиве другим људима, на пример на локалној временској линији или у хеш ознакама. Можда желите да се представите са хеш ознаком #introductions или #представљања.'
full_handle: Ваш пун надимак
full_handle_hint: Ово бисте рекли својим пријатељима како би вам они послали поруку, или запратили са друге инстанце.
- subject: Добродошли на Mastodon
- title: Добродошли, %{name}!
+ subject: Добро дошли на Mastodon
+ title: Добро дошли, %{name}!
users:
follow_limit_reached: Не можете пратити више од %{limit} људи
go_to_sso_account_settings: Идите на подешавања налога свог добављача идентитета
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 72c5295b353be5..1d84f8a6af0b3d 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -1041,6 +1041,11 @@ sv:
hint_html: En sista sak till! Vi måste bekräfta att du är en människa (för att hålla borta skräpinlägg!). Lös CAPTCHA nedan och klicka på "Fortsätt".
title: Säkerhetskontroll
confirmations:
+ awaiting_review_title: Din registrering är under granskning
+ clicking_this_link: klicka på denna länk
+ login_link: logga in
+ registration_complete: Din registrering på %{domain} är nu slutförd!
+ welcome_title: Välkommen %{name}!
wrong_email_hint: Om e-postadressen inte är rätt, kan du ändra den i kontoinställningarna.
delete_account: Radera konto
delete_account_html: Om du vill radera ditt konto kan du fortsätta här. Du kommer att bli ombedd att bekräfta.
diff --git a/config/locales/th.yml b/config/locales/th.yml
index d8ab63730bec4a..33d8a898ede6a6 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -1023,6 +1023,14 @@ th:
hint_html: อีกเพียงหนึ่งสิ่งเพิ่มเติม! เราจำเป็นต้องยืนยันว่าคุณเป็นมนุษย์ (นี่ก็เพื่อให้เราสามารถกันสแปมออกไป!) แก้ CAPTCHA ด้านล่างและคลิก "ดำเนินการต่อ"
title: การตรวจสอบความปลอดภัย
confirmations:
+ awaiting_review: ยืนยันที่อยู่อีเมลของคุณแล้ว! ตอนนี้พนักงานของ %{domain} กำลังตรวจทานการลงทะเบียนของคุณ คุณจะได้รับอีเมลหากพนักงานอนุมัติบัญชีของคุณ!
+ awaiting_review_title: กำลังตรวจทานการลงทะเบียนของคุณ
+ clicking_this_link: คลิกลิงก์นี้
+ login_link: เข้าสู่ระบบ
+ proceed_to_login_html: ตอนนี้คุณสามารถดำเนินการต่อเพื่อ %{login_link}
+ redirect_to_app_html: คุณควรได้รับการเปลี่ยนเส้นทางไปยังแอป %{app_name} หากนั่นไม่เกิดขึ้น ลอง %{clicking_this_link} หรือกลับไปยังแอปด้วยตนเอง
+ registration_complete: ตอนนี้การลงทะเบียนของคุณใน %{domain} เสร็จสมบูรณ์แล้ว!
+ welcome_title: ยินดีต้อนรับ %{name}!
wrong_email_hint: หากที่อยู่อีเมลนั้นไม่ถูกต้อง คุณสามารถเปลี่ยนที่อยู่อีเมลได้ในการตั้งค่าบัญชี
delete_account: ลบบัญชี
delete_account_html: หากคุณต้องการลบบัญชีของคุณ คุณสามารถ ดำเนินการต่อที่นี่ คุณจะได้รับการถามเพื่อการยืนยัน
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 86d153528b9541..c9adfd91322182 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -1041,6 +1041,14 @@ tr:
hint_html: Sadece bir şey daha! Sizin bir insan olduğunuzu doğrulamamız gerekiyor (bu, spam'i dışarıda tutabilmemiz içindir!). Aşağıdaki CAPTCHA'yı çözün ve "Devam Et" düğmesini tıklayın.
title: Güvenlik denetimi
confirmations:
+ awaiting_review: E-posta adresiniz doğrulandı! %{domain} çalışanları şimdi kaydınızı inceliyorlar. Hesabınızı onayladıklarında bir e-posta alacaksınız!
+ awaiting_review_title: Kaydınız inceleniyor
+ clicking_this_link: bu bağlantıyı tıklamayı
+ login_link: oturum aç
+ proceed_to_login_html: Şimdi %{login_link} devam edebilirsiniz.
+ redirect_to_app_html: "%{app_name} uygulamasına yönlendirileceksiniz. Eğer yönlendirme olmazsa, %{clicking_this_link} veya uygulamaya geri dönmeyi deneyin."
+ registration_complete: "%{domain} sunucusunda kaydınız şimdi tamamlandı!"
+ welcome_title: Hoşgeldin %{name}!
wrong_email_hint: Eğer bu e-posta adresi doğru değilse, hesap ayarlarında değiştirebilirsiniz.
delete_account: Hesabı sil
delete_account_html: Hesabını silmek istersen, buradan devam edebilirsin. Onay istenir.
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index afa85ae67bb54a..8069c76c6d95c4 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -1077,6 +1077,14 @@ uk:
hint_html: Ще одне! Ми повинні пересвідчитись, що ви людина (щоб ми могли уникнути спаму!). Розв'яжіть CAPTCHA внизу і натисніть кнопку "Продовжити".
title: Перевірка безпеки
confirmations:
+ awaiting_review: Ваша електронна адреса підтверджена! Співробітники %{domain} тепер переглядають вашу реєстрацію. Ви отримаєте електронного листа, якщо вони затвердять ваш обліковий запис!
+ awaiting_review_title: Ваша реєстрація розглядається
+ clicking_this_link: натисніть це посилання
+ login_link: увійти
+ proceed_to_login_html: Тепер ви можете перейти до %{login_link}.
+ redirect_to_app_html: Ви мали бути перенаправлені до програми %{app_name}. Якщо цього не сталося, спробуйте %{clicking_this_link} або вручну поверніться до програми.
+ registration_complete: Ваша реєстрація на %{domain} завершена!
+ welcome_title: Ласкаво просимо, %{name}!
wrong_email_hint: Якщо ця адреса електронної пошти неправильна, можна змінити її в налаштуваннях облікового запису.
delete_account: Видалити обліковий запис
delete_account_html: Якщо ви хочете видалити свій обліковий запис, ви можете перейти сюди. Вас попросять підтвердити дію.
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 6d3beddbcf025d..7902cea4ddb740 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -1023,6 +1023,14 @@ zh-CN:
hint_html: 只剩最后一件事了！我们需要确认您是一个人类（这样我们才能阻止恶意访问！）。请输入下面的验证码，然后点击“继续”。
title: 安全检查
confirmations:
+ awaiting_review: 您的电子邮件地址已确认！%{domain} 的工作人员正在审核您的注册信息。如果他们批准了您的账户，您将收到一封邮件通知！
+ awaiting_review_title: 您的注册申请正在审核中
+ clicking_this_link: 点击此链接
+ login_link: 登录
+ proceed_to_login_html: 现在您可以继续前往 %{login_link} 。
+ redirect_to_app_html: 您应该已被重定向到 %{app_name} 应用程序。如果没有，请尝试 %{clicking_this_link} 或手动返回应用程序。
+ registration_complete: 您在 %{domain} 上的注册现已完成！
+ welcome_title: 欢迎您，%{name}！
wrong_email_hint: 如果该电子邮件地址不正确，您可以在帐户设置中进行更改。
delete_account: 删除帐户
delete_account_html: 如果你想删除你的帐户，请点击这里继续。你需要确认你的操作。
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 28507b076a2dfc..9d75f50a50560e 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -1025,6 +1025,14 @@ zh-TW:
hint_html: 僅再一步！我們必須確認您是位人類（這是防止垃圾訊息濫用）。請完成以下 CAPTCHA 挑戰並點擊「繼續」。
title: 安全性檢查
confirmations:
+ awaiting_review: 已驗證您的電子郵件！%{domain} 的管理員正在審核您的註冊申請。若您的帳號通過審核，您將收到電子郵件通知。
+ awaiting_review_title: 我們正在審核您的註冊申請
+ clicking_this_link: 點擊這個連結
+ login_link: 登入
+ proceed_to_login_html: 您現在可以前往 %{login_link}。
+ redirect_to_app_html: 您應被重新導向至 %{app_name} 應用程式。如尚未重新導向，請嘗試 %{clicking_this_link} 或手動回到應用程式。
+ registration_complete: 您於 %{domain} 之註冊申請已完成！
+ welcome_title: 歡迎，%{name}！
wrong_email_hint: 若電子郵件地址不正確，您可以於帳號設定中更改。
delete_account: 刪除帳號
delete_account_html: 如果您欲刪除您的帳號，請點擊這裡繼續。您需要再三確認您的操作。
diff --git a/config/routes.rb b/config/routes.rb
index 8c16d3c720ca81..6c8c3016288645 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -135,7 +135,7 @@
get '/@:account_username/:id/embed', to: 'statuses#embed', as: :embed_short_account_status
end
- get '/@:username_with_domain/(*any)', to: 'home#index', constraints: { username_with_domain: %r{([^/])+?} }, format: false
+ get '/@:username_with_domain/(*any)', to: 'home#index', constraints: { username_with_domain: %r{([^/])+?} }, as: :account_with_domain, format: false
get '/settings', to: redirect('/settings/profile')
draw(:settings)
diff --git a/lib/mastodon/migration_helpers.rb b/lib/mastodon/migration_helpers.rb
index a92a8767ce3957..7bc1298838490b 100644
--- a/lib/mastodon/migration_helpers.rb
+++ b/lib/mastodon/migration_helpers.rb
@@ -158,10 +158,8 @@ def remove_concurrent_index(table_name, column_name, **options)
'in the body of your migration class'
end
- if supports_drop_index_concurrently?
- options = options.merge({ algorithm: :concurrently })
- disable_statement_timeout
- end
+ options = options.merge({ algorithm: :concurrently })
+ disable_statement_timeout
remove_index(table_name, **options.merge({ column: column_name }))
end
@@ -182,28 +180,12 @@ def remove_concurrent_index_by_name(table_name, index_name, **options)
'in the body of your migration class'
end
- if supports_drop_index_concurrently?
- options = options.merge({ algorithm: :concurrently })
- disable_statement_timeout
- end
+ options = options.merge({ algorithm: :concurrently })
+ disable_statement_timeout
remove_index(table_name, **options.merge({ name: index_name }))
end
- # Only available on Postgresql >= 9.2
- def supports_drop_index_concurrently?
- version = select_one("SELECT current_setting('server_version_num') AS v")['v'].to_i
-
- version >= 90_200
- end
-
- # Only available on Postgresql >= 11
- def supports_add_column_with_default?
- version = select_one("SELECT current_setting('server_version_num') AS v")['v'].to_i
-
- version >= 110_000
- end
-
# Adds a foreign key with only minimal locking on the tables involved.
#
# This method only requires minimal locking when using PostgreSQL. When
@@ -420,42 +402,7 @@ def update_column_in_batches(table_name, column, value)
# This method can also take a block which is passed directly to the
# `update_column_in_batches` method.
def add_column_with_default(table, column, type, default:, limit: nil, allow_null: false, &block)
- if supports_add_column_with_default?
- add_column(table, column, type, default: default, limit: limit, null: allow_null)
- return
- end
-
- if transaction_open?
- raise 'add_column_with_default can not be run inside a transaction, ' \
- 'you can disable transactions by calling disable_ddl_transaction! ' \
- 'in the body of your migration class'
- end
-
- disable_statement_timeout
-
- transaction do
- if limit
- add_column(table, column, type, default: nil, limit: limit)
- else
- add_column(table, column, type, default: nil)
- end
-
- # Changing the default before the update ensures any newly inserted
- # rows already use the proper default value.
- change_column_default(table, column, default)
- end
-
- begin
- update_column_in_batches(table, column, default, &block)
-
- change_column_null(table, column, false) unless allow_null
- # We want to rescue _all_ exceptions here, even those that don't inherit
- # from StandardError.
- rescue Exception => error # rubocop: disable all
- remove_column(table, column)
-
- raise error
- end
+ add_column(table, column, type, default: default, limit: limit, null: allow_null)
end
# Renames a column without requiring downtime.
diff --git a/spec/controllers/admin/disputes/appeals_controller_spec.rb b/spec/controllers/admin/disputes/appeals_controller_spec.rb
index 3f4175a28177c9..4581d00d6f7def 100644
--- a/spec/controllers/admin/disputes/appeals_controller_spec.rb
+++ b/spec/controllers/admin/disputes/appeals_controller_spec.rb
@@ -33,8 +33,6 @@
let(:current_user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
before do
- allow(UserMailer).to receive(:appeal_approved)
- .and_return(instance_double(ActionMailer::MessageDelivery, deliver_later: nil))
post :approve, params: { id: appeal.id }
end
@@ -47,7 +45,9 @@
end
it 'notifies target account about approved appeal' do
- expect(UserMailer).to have_received(:appeal_approved).with(target_account.user, appeal)
+ expect(UserMailer.deliveries.size).to eq(1)
+ expect(UserMailer.deliveries.first.to.first).to eq(target_account.user.email)
+ expect(UserMailer.deliveries.first.subject).to eq(I18n.t('user_mailer.appeal_approved.subject', date: I18n.l(appeal.created_at)))
end
end
@@ -55,8 +55,6 @@
let(:current_user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
before do
- allow(UserMailer).to receive(:appeal_rejected)
- .and_return(instance_double(ActionMailer::MessageDelivery, deliver_later: nil))
post :reject, params: { id: appeal.id }
end
@@ -65,7 +63,9 @@
end
it 'notifies target account about rejected appeal' do
- expect(UserMailer).to have_received(:appeal_rejected).with(target_account.user, appeal)
+ expect(UserMailer.deliveries.size).to eq(1)
+ expect(UserMailer.deliveries.first.to.first).to eq(target_account.user.email)
+ expect(UserMailer.deliveries.first.subject).to eq(I18n.t('user_mailer.appeal_rejected.subject', date: I18n.l(appeal.created_at)))
end
end
end
diff --git a/spec/controllers/api/v1/accounts/featured_tags_controller_spec.rb b/spec/controllers/api/v1/accounts/featured_tags_controller_spec.rb
deleted file mode 100644
index 53ac1e2a7a23c0..00000000000000
--- a/spec/controllers/api/v1/accounts/featured_tags_controller_spec.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe Api::V1::Accounts::FeaturedTagsController do
- render_views
-
- let(:user) { Fabricate(:user) }
- let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:accounts') }
- let(:account) { Fabricate(:account) }
-
- before do
- allow(controller).to receive(:doorkeeper_token) { token }
- end
-
- describe 'GET #index' do
- it 'returns http success' do
- get :index, params: { account_id: account.id, limit: 2 }
-
- expect(response).to have_http_status(200)
- end
- end
-end
diff --git a/spec/controllers/auth/sessions_controller_spec.rb b/spec/controllers/auth/sessions_controller_spec.rb
index c727a763339af9..3ff9b150079403 100644
--- a/spec/controllers/auth/sessions_controller_spec.rb
+++ b/spec/controllers/auth/sessions_controller_spec.rb
@@ -127,8 +127,6 @@
before do
allow_any_instance_of(ActionDispatch::Request).to receive(:remote_ip).and_return(current_ip)
- allow(UserMailer).to receive(:suspicious_sign_in)
- .and_return(instance_double(ActionMailer::MessageDelivery, deliver_later!: nil))
user.update(current_sign_in_at: 1.month.ago)
post :create, params: { user: { email: user.email, password: user.password } }
end
@@ -142,7 +140,9 @@
end
it 'sends a suspicious sign-in mail' do
- expect(UserMailer).to have_received(:suspicious_sign_in).with(user, current_ip, anything, anything)
+ 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.suspicious_sign_in.subject'))
end
end
diff --git a/spec/features/captcha_spec.rb b/spec/features/captcha_spec.rb
index 6ccf066208fae5..a5c5a44aa628a1 100644
--- a/spec/features/captcha_spec.rb
+++ b/spec/features/captcha_spec.rb
@@ -30,6 +30,14 @@
click_button I18n.t('challenge.confirm')
expect(user.reload.confirmed?).to be true
expect(page).to have_current_path(/\A#{client_app.confirmation_redirect_uri}/, url: true)
+
+ # Browsers will generally reload the original page upon redirection
+ # to external handlers, so test this as well
+ visit "/auth/confirmation?confirmation_token=#{user.confirmation_token}&redirect_to_app=true"
+
+ # It presents a page with a link to the app callback
+ expect(page).to have_content(I18n.t('auth.confirmations.registration_complete', domain: 'cb6e6126.ngrok.io'))
+ expect(page).to have_link(I18n.t('auth.confirmations.clicking_this_link'), href: client_app.confirmation_redirect_uri)
end
end
end
diff --git a/spec/mailers/user_mailer_spec.rb b/spec/mailers/user_mailer_spec.rb
index 5affa66e078eab..c661f5bbda552d 100644
--- a/spec/mailers/user_mailer_spec.rb
+++ b/spec/mailers/user_mailer_spec.rb
@@ -5,7 +5,7 @@
describe UserMailer do
let(:receiver) { Fabricate(:user) }
- describe 'confirmation_instructions' do
+ describe '#confirmation_instructions' do
let(:mail) { described_class.confirmation_instructions(receiver, 'spec') }
it 'renders confirmation instructions' do
@@ -20,7 +20,7 @@
instance: Rails.configuration.x.local_domain
end
- describe 'reconfirmation_instructions' do
+ describe '#reconfirmation_instructions' do
let(:mail) { described_class.confirmation_instructions(receiver, 'spec') }
it 'renders reconfirmation instructions' do
@@ -34,7 +34,7 @@
end
end
- describe 'reset_password_instructions' do
+ describe '#reset_password_instructions' do
let(:mail) { described_class.reset_password_instructions(receiver, 'spec') }
it 'renders reset password instructions' do
@@ -47,7 +47,7 @@
'devise.mailer.reset_password_instructions.subject'
end
- describe 'password_change' do
+ describe '#password_change' do
let(:mail) { described_class.password_change(receiver) }
it 'renders password change notification' do
@@ -59,7 +59,7 @@
'devise.mailer.password_change.subject'
end
- describe 'email_changed' do
+ describe '#email_changed' do
let(:mail) { described_class.email_changed(receiver) }
it 'renders email change notification' do
@@ -71,7 +71,7 @@
'devise.mailer.email_changed.subject'
end
- describe 'warning' do
+ describe '#warning' do
let(:strike) { Fabricate(:account_warning, target_account: receiver.account, text: 'dont worry its just the testsuite', action: 'suspend') }
let(:mail) { described_class.warning(receiver, strike) }
@@ -82,7 +82,7 @@
end
end
- describe 'webauthn_credential_deleted' do
+ describe '#webauthn_credential_deleted' do
let(:credential) { Fabricate(:webauthn_credential, user_id: receiver.id) }
let(:mail) { described_class.webauthn_credential_deleted(receiver, credential) }
@@ -95,7 +95,7 @@
'devise.mailer.webauthn_credential.deleted.subject'
end
- describe 'suspicious_sign_in' do
+ describe '#suspicious_sign_in' do
let(:ip) { '192.168.0.1' }
let(:agent) { 'NCSA_Mosaic/2.0 (Windows 3.1)' }
let(:timestamp) { Time.now.utc }
@@ -110,7 +110,7 @@
'user_mailer.suspicious_sign_in.subject'
end
- describe 'appeal_approved' do
+ describe '#appeal_approved' do
let(:appeal) { Fabricate(:appeal, account: receiver.account, approved_at: Time.now.utc) }
let(:mail) { described_class.appeal_approved(receiver, appeal) }
@@ -120,7 +120,7 @@
end
end
- describe 'appeal_rejected' do
+ describe '#appeal_rejected' do
let(:appeal) { Fabricate(:appeal, account: receiver.account, rejected_at: Time.now.utc) }
let(:mail) { described_class.appeal_rejected(receiver, appeal) }
@@ -130,7 +130,7 @@
end
end
- describe 'two_factor_enabled' do
+ describe '#two_factor_enabled' do
let(:mail) { described_class.two_factor_enabled(receiver) }
it 'renders two_factor_enabled mail' do
@@ -139,7 +139,7 @@
end
end
- describe 'two_factor_disabled' do
+ describe '#two_factor_disabled' do
let(:mail) { described_class.two_factor_disabled(receiver) }
it 'renders two_factor_disabled mail' do
@@ -148,7 +148,7 @@
end
end
- describe 'webauthn_enabled' do
+ describe '#webauthn_enabled' do
let(:mail) { described_class.webauthn_enabled(receiver) }
it 'renders webauthn_enabled mail' do
@@ -157,7 +157,7 @@
end
end
- describe 'webauthn_disabled' do
+ describe '#webauthn_disabled' do
let(:mail) { described_class.webauthn_disabled(receiver) }
it 'renders webauthn_disabled mail' do
@@ -166,7 +166,7 @@
end
end
- describe 'two_factor_recovery_codes_changed' do
+ describe '#two_factor_recovery_codes_changed' do
let(:mail) { described_class.two_factor_recovery_codes_changed(receiver) }
it 'renders two_factor_recovery_codes_changed mail' do
@@ -175,7 +175,7 @@
end
end
- describe 'webauthn_credential_added' do
+ describe '#webauthn_credential_added' do
let(:credential) { Fabricate.build(:webauthn_credential) }
let(:mail) { described_class.webauthn_credential_added(receiver, credential) }
@@ -184,4 +184,23 @@
expect(mail.body.encoded).to include I18n.t('devise.mailer.webauthn_credential.added.explanation')
end
end
+
+ describe '#welcome' do
+ let(:mail) { described_class.welcome(receiver) }
+
+ it 'renders welcome mail' do
+ expect(mail.subject).to eq I18n.t('user_mailer.welcome.subject')
+ expect(mail.body.encoded).to include I18n.t('user_mailer.welcome.explanation')
+ end
+ end
+
+ describe '#backup_ready' do
+ let(:backup) { Fabricate(:backup) }
+ let(:mail) { described_class.backup_ready(receiver, backup) }
+
+ it 'renders backup_ready mail' do
+ expect(mail.subject).to eq I18n.t('user_mailer.backup_ready.subject')
+ expect(mail.body.encoded).to include I18n.t('user_mailer.backup_ready.explanation')
+ end
+ end
end
diff --git a/spec/models/tag_spec.rb b/spec/models/tag_spec.rb
index 80b9c861fcdb8a..6177b7a25a6d02 100644
--- a/spec/models/tag_spec.rb
+++ b/spec/models/tag_spec.rb
@@ -32,6 +32,10 @@
expect(subject.match('https://en.wikipedia.org/wiki/Ghostbusters_(song)#Lawsuit')).to be_nil
end
+ it 'does not match URLs with hashtag-like anchors after a numeral' do
+ expect(subject.match('https://gcc.gnu.org/bugzilla/show_bug.cgi?id=111895#c4')).to be_nil
+ end
+
it 'does not match URLs with hashtag-like anchors after an empty query parameter' do
expect(subject.match('https://en.wikipedia.org/wiki/Ghostbusters_(song)?foo=#Lawsuit')).to be_nil
end
diff --git a/spec/requests/api/v1/accounts/featured_tags_spec.rb b/spec/requests/api/v1/accounts/featured_tags_spec.rb
new file mode 100644
index 00000000000000..bae7d448b6daee
--- /dev/null
+++ b/spec/requests/api/v1/accounts/featured_tags_spec.rb
@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'account featured tags API' do
+ let(:user) { Fabricate(:user) }
+ 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) }
+
+ describe 'GET /api/v1/accounts/:id/featured_tags' do
+ subject do
+ get "/api/v1/accounts/#{account.id}/featured_tags", headers: headers
+ end
+
+ before do
+ account.featured_tags.create!(name: 'foo')
+ account.featured_tags.create!(name: 'bar')
+ end
+
+ it 'returns the expected tags', :aggregate_failures do
+ subject
+
+ expect(response).to have_http_status(200)
+ expect(body_as_json).to contain_exactly(a_hash_including({
+ name: 'bar',
+ url: "https://cb6e6126.ngrok.io/@#{account.username}/tagged/bar",
+ }), a_hash_including({
+ name: 'foo',
+ url: "https://cb6e6126.ngrok.io/@#{account.username}/tagged/foo",
+ }))
+ end
+
+ context 'when the account is remote' do
+ it 'returns the expected tags', :aggregate_failures do
+ subject
+
+ expect(response).to have_http_status(200)
+ expect(body_as_json).to contain_exactly(a_hash_including({
+ name: 'bar',
+ url: "https://cb6e6126.ngrok.io/@#{account.pretty_acct}/tagged/bar",
+ }), a_hash_including({
+ name: 'foo',
+ url: "https://cb6e6126.ngrok.io/@#{account.pretty_acct}/tagged/foo",
+ }))
+ end
+ end
+ 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 5975c81a1018ac..466da891a8bbce 100644
--- a/spec/services/activitypub/fetch_featured_collection_service_spec.rb
+++ b/spec/services/activitypub/fetch_featured_collection_service_spec.rb
@@ -42,12 +42,22 @@
}
end
+ let(:featured_with_null) do
+ {
+ '@context': 'https://www.w3.org/ns/activitystreams',
+ id: 'https://example.com/account/collections/featured',
+ totalItems: 0,
+ type: 'OrderedCollection',
+ }
+ end
+
let(:items) do
[
'https://example.com/account/pinned/known', # known
status_json_pinned_unknown_inlined, # unknown inlined
'https://example.com/account/pinned/unknown-unreachable', # unknown unreachable
'https://example.com/account/pinned/unknown-reachable', # unknown reachable
+ 'https://example.com/account/collections/featured', # featured with null
]
end
@@ -66,6 +76,7 @@
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/collections/featured').to_return(status: 200, body: Oj.dump(featured_with_null))
subject.call(actor, note: true, hashtag: false)
end
diff --git a/yarn.lock b/yarn.lock
index 1f23f26ddee4b5..6df33ec6b2d711 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1766,9 +1766,9 @@
"@jridgewell/sourcemap-codec" "^1.4.14"
"@material-symbols/svg-600@^0.13.1":
- version "0.13.1"
- resolved "https://registry.yarnpkg.com/@material-symbols/svg-600/-/svg-600-0.13.1.tgz#9f1c2a1fa4439e6cc9ad5f7a7ef64ce7691b42c8"
- integrity sha512-oI4De/ePwj1IBxtabmpqMy092Y4ius0byQo/BC3yvLY4WbtzQlIScxUY7bUx+Gqrwq03QZDYrgP/cU4a/TXqyA==
+ version "0.13.2"
+ resolved "https://registry.yarnpkg.com/@material-symbols/svg-600/-/svg-600-0.13.2.tgz#a98361ed5a100492780e3301c9d9e4d79aefe0f1"
+ integrity sha512-4n/bbh6444ZfJ72VHYrWc2f2E8PCsC6ue/ou4Q4QqQFvSRbQSZjcSXuTb0lA4xkaIf2cJf4grvF8ZsskIBLbHg==
"@nodelib/fs.scandir@2.1.5":
version "2.1.5"
@@ -10960,9 +10960,9 @@ sass-loader@^10.2.0:
semver "^7.3.2"
sass@^1.62.1:
- version "1.69.4"
- resolved "https://registry.yarnpkg.com/sass/-/sass-1.69.4.tgz#10c735f55e3ea0b7742c6efa940bce30e07fbca2"
- integrity sha512-+qEreVhqAy8o++aQfCJwp0sklr2xyEzkm9Pp/Igu9wNPoe7EZEQ8X/MBvvXggI2ql607cxKg/RKOwDj6pp2XDA==
+ version "1.69.5"
+ resolved "https://registry.yarnpkg.com/sass/-/sass-1.69.5.tgz#23e18d1c757a35f2e52cc81871060b9ad653dfde"
+ integrity sha512-qg2+UCJibLr2LCVOt3OlPhr/dqVHWOa9XtZf2OjbLs/T4VPSJ00udtgJxH3neXZm+QqX8B+3cU7RaLqp1iVfcQ==
dependencies:
chokidar ">=3.0.0 <4.0.0"
immutable "^4.0.0"