Merge pull request #2770 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to fa8e972722
2024-07-08 22:02:56 +02:00 · 2024-07-08 22:02:56 +02:00 · 3e47d01a30
parent 69766370fd 80179d53ba
commit 3e47d01a30
105 changed files with 702 additions and 394 deletions
--- a/.github/workflows/bundler-audit.yml
+++ b/.github/workflows/bundler-audit.yml
@ -1,8 +1,10 @@
 name: Bundler Audit
 on:
+  merge_group:
  push:
-    branches-ignore:
-      - 'dependabot/**'
+    branches:
+      - 'main'
+      - 'stable-*'
    paths:
      - 'Gemfile*'
      - '.ruby-version'
--- a/.github/workflows/check-i18n.yml
+++ b/.github/workflows/check-i18n.yml
@ -2,9 +2,13 @@ name: Check i18n

 on:
  push:
-    branches: [main]
+    branches:
+      - 'main'
+      - 'stable-*'
  pull_request:
-    branches: [main]
+    branches:
+      - 'main'
+      - 'stable-*'

 env:
  RAILS_ENV: test
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@ -1,11 +1,15 @@
 name: 'CodeQL'

 on:
+  merge_group:
  push:
-    branches: ['main']
+    branches:
+      - 'main'
+      - 'stable-*'
  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: ['main']
+    branches:
+      - 'main'
+      - 'stable-*'
  schedule:
    - cron: '22 6 * * 1'

--- a/.github/workflows/crowdin-upload.yml
+++ b/.github/workflows/crowdin-upload.yml
@ -1,9 +1,11 @@
 name: Crowdin / Upload translations

 on:
+  merge_group:
  push:
    branches:
-      - main
+      - 'main'
+      - 'stable-*'
    paths:
      - crowdin-glitch.yml
      - app/javascript/flavours/glitch/locales/en.json
--- a/.github/workflows/format-check.yml
+++ b/.github/workflows/format-check.yml
@ -1,6 +1,10 @@
 name: Check formatting
 on:
+  merge_group:
  push:
+    branches:
+      - 'main'
+      - 'stable-*'
  pull_request:

 jobs:
--- a/.github/workflows/lint-css.yml
+++ b/.github/workflows/lint-css.yml
@ -1,9 +1,10 @@
 name: CSS Linting
 on:
+  merge_group:
  push:
-    branches-ignore:
-      - 'dependabot/**'
-      - 'renovate/**'
+    branches:
+      - 'main'
+      - 'stable-*'
    paths:
      - 'package.json'
      - 'yarn.lock'
--- a/.github/workflows/lint-haml.yml
+++ b/.github/workflows/lint-haml.yml
@ -1,9 +1,10 @@
 name: Haml Linting
 on:
+  merge_group:
  push:
-    branches-ignore:
-      - 'dependabot/**'
-      - 'renovate/**'
+    branches:
+      - 'main'
+      - 'stable-*'
    paths:
      - '.github/workflows/haml-lint-problem-matcher.json'
      - '.github/workflows/lint-haml.yml'
--- a/.github/workflows/lint-js.yml
+++ b/.github/workflows/lint-js.yml
@ -1,9 +1,10 @@
 name: JavaScript Linting
 on:
+  merge_group:
  push:
-    branches-ignore:
-      - 'dependabot/**'
-      - 'renovate/**'
+    branches:
+      - 'main'
+      - 'stable-*'
    paths:
      - 'package.json'
      - 'yarn.lock'
--- a/.github/workflows/lint-ruby.yml
+++ b/.github/workflows/lint-ruby.yml
@ -1,9 +1,10 @@
 name: Ruby Linting
 on:
+  merge_group:
  push:
-    branches-ignore:
-      - 'dependabot/**'
-      - 'renovate/**'
+    branches:
+      - 'main'
+      - 'stable-*'
    paths:
      - 'Gemfile*'
      - '.rubocop*.yml'
--- a/.github/workflows/test-js.yml
+++ b/.github/workflows/test-js.yml
@ -1,9 +1,10 @@
 name: JavaScript Testing
 on:
+  merge_group:
  push:
-    branches-ignore:
-      - 'dependabot/**'
-      - 'renovate/**'
+    branches:
+      - 'main'
+      - 'stable-*'
    paths:
      - 'package.json'
      - 'yarn.lock'
--- a/.github/workflows/test-migrations.yml
+++ b/.github/workflows/test-migrations.yml
@ -1,29 +1,29 @@
 name: Historical data migration test

 on:
+  merge_group:
  push:
-    branches-ignore:
-      - 'dependabot/**'
-      - 'renovate/**'
+    branches:
+      - 'main'
+      - 'stable-*'
+    paths:
+      - 'Gemfile*'
+      - '.ruby-version'
+      - '**/*.rb'
+      - '.github/workflows/test-migrations.yml'
+      - 'lib/tasks/tests.rake'
+
  pull_request:
+    paths:
+      - 'Gemfile*'
+      - '.ruby-version'
+      - '**/*.rb'
+      - '.github/workflows/test-migrations.yml'
+      - 'lib/tasks/tests.rake'

 jobs:
-  pre_job:
-    runs-on: ubuntu-latest
-
-    outputs:
-      should_skip: ${{ steps.skip_check.outputs.should_skip }}
-
-    steps:
-      - id: skip_check
-        uses: fkirc/skip-duplicate-actions@v5
-        with:
-          paths: '["Gemfile*", ".ruby-version", "**/*.rb", ".github/workflows/test-migrations.yml", "lib/tasks/tests.rake"]'
-
  test:
    runs-on: ubuntu-latest
-    needs: pre_job
-    if: needs.pre_job.outputs.should_skip != 'true'

    strategy:
      fail-fast: false
--- a/.github/workflows/test-ruby.yml
+++ b/.github/workflows/test-ruby.yml
@ -1,10 +1,11 @@
 name: Ruby Testing

 on:
+  merge_group:
  push:
-    branches-ignore:
-      - 'dependabot/**'
-      - 'renovate/**'
+    branches:
+      - 'main'
+      - 'stable-*'
  pull_request:

 env:
@ -223,7 +224,7 @@ jobs:
      - name: Load database schema
        run: './bin/rails db:create db:schema:load db:seed'

-      - run: bin/rspec --tag paperclip_processing
+      - run: bin/rspec --tag attachment_processing

      - name: Upload coverage reports to Codecov
        if: matrix.ruby-version == '.ruby-version'
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -346,7 +346,7 @@ GEM
      activesupport (>= 3.0)
      nokogiri (>= 1.6)
    io-console (0.7.2)
-    irb (1.13.2)
+    irb (1.14.0)
      rdoc (>= 4.0.0)
      reline (>= 0.4.2)
    jmespath (1.6.2)
--- a/app/javascript/flavours/glitch/actions/compose.js
+++ b/app/javascript/flavours/glitch/actions/compose.js
@ -310,7 +310,7 @@ export function doodleSet(options) {

 export function uploadCompose(files) {
  return function (dispatch, getState) {
-    const uploadLimit = 4;
+    const uploadLimit = getState().getIn(['server', 'server', 'configuration', 'statuses', 'max_media_attachments']);
    const media = getState().getIn(['compose', 'media_attachments']);
    const pending = getState().getIn(['compose', 'pending_media_attachments']);
    const progress = new Array(files.length).fill(0);
@ -330,7 +330,7 @@ export function uploadCompose(files) {
    dispatch(uploadComposeRequest());

    for (const [i, f] of Array.from(files).entries()) {
-      if (media.size + i > 3) break;
+      if (media.size + i > (uploadLimit - 1)) break;

      resizeImage(f).then(file => {
        const data = new FormData();
--- a/app/javascript/flavours/glitch/components/account.jsx
+++ b/app/javascript/flavours/glitch/components/account.jsx
@ -131,7 +131,7 @@ const Account = ({ size = 46, account, onFollow, onBlock, onMute, onMuteNotifica
  return (
    <div className={classNames('account', { 'account--minimal': minimal })}>
      <div className='account__wrapper'>
-        <Permalink key={account.get('id')} className='account__display-name' title={account.get('acct')} href={account.get('url')} to={`/@${account.get('acct')}`}>
+        <Permalink key={account.get('id')} className='account__display-name' title={account.get('acct')} href={account.get('url')} to={`/@${account.get('acct')}`} data-hover-card-account={account.get('id')}>
          <div className='account__avatar-wrapper'>
            <Avatar account={account} size={size} />
          </div>
--- a/app/javascript/flavours/glitch/components/hover_card_controller.tsx
+++ b/app/javascript/flavours/glitch/components/hover_card_controller.tsx
@ -43,6 +43,7 @@ export const HoverCardController: React.FC = () => {
  useEffect(() => {
    let isScrolling = false;
    let currentAnchor: HTMLElement | null = null;
+    let currentTitle: string | null = null;

    const open = (target: HTMLElement) => {
      target.setAttribute('aria-describedby', 'hover-card');
@ -75,6 +76,9 @@ export const HoverCardController: React.FC = () => {
        currentAnchor?.removeAttribute('aria-describedby');
        currentAnchor = target;

+        currentTitle = target.getAttribute('title');
+        target.removeAttribute('title');
+
        setEnterTimeout(() => {
          open(target);
        }, enterDelay);
@ -90,11 +94,20 @@ export const HoverCardController: React.FC = () => {
    };

    const handleMouseLeave = (e: MouseEvent) => {
+      const { target } = e;
+
      if (!currentAnchor) {
        return;
      }

-      if (e.target === currentAnchor || e.target === cardRef.current) {
+      if (
+        currentTitle &&
+        target instanceof HTMLElement &&
+        target === currentAnchor
+      )
+        target.setAttribute('title', currentTitle);
+
+      if (target === currentAnchor || target === cardRef.current) {
        cancelEnterTimeout();

        setLeaveTimeout(() => {
--- a/app/javascript/flavours/glitch/components/media_gallery.jsx
+++ b/app/javascript/flavours/glitch/components/media_gallery.jsx
@ -311,7 +311,7 @@ class MediaGallery extends PureComponent {
  render () {
    const { media, lang, intl, sensitive, letterbox, fullwidth, defaultWidth, autoplay } = this.props;
    const { visible } = this.state;
-    const size     = media.take(4).size;
+    const size     = media.size;
    const uncached = media.every(attachment => attachment.get('type') === 'unknown');

    const width = this.state.width || defaultWidth;
@ -331,7 +331,7 @@ class MediaGallery extends PureComponent {
    if (this.isStandaloneEligible()) {
      children = <Item standalone autoplay={autoplay} onClick={this.handleClick} attachment={media.get(0)} lang={lang} displayWidth={width} visible={visible} />;
    } else {
-      children = media.take(4).map((attachment, i) => <Item key={attachment.get('id')} autoplay={autoplay} onClick={this.handleClick} attachment={attachment} index={i} lang={lang} size={size} letterbox={letterbox} displayWidth={width} visible={visible || uncached} />);
+      children = media.map((attachment, i) => <Item key={attachment.get('id')} autoplay={autoplay} onClick={this.handleClick} attachment={attachment} index={i} lang={lang} size={size} letterbox={letterbox} displayWidth={width} visible={visible || uncached} />);
    }

    if (uncached) {
--- a/app/javascript/flavours/glitch/features/compose/containers/upload_button_container.js
+++ b/app/javascript/flavours/glitch/features/compose/containers/upload_button_container.js
@ -10,7 +10,7 @@ const mapStateToProps = state => {
  const readyAttachmentsSize = state.getIn(['compose', 'media_attachments']).size ?? 0;
  const pendingAttachmentsSize = state.getIn(['compose', 'pending_media_attachments']).size ?? 0;
  const attachmentsSize = readyAttachmentsSize + pendingAttachmentsSize;
-  const isOverLimit = attachmentsSize > 3;
+  const isOverLimit = attachmentsSize > state.getIn(['server', 'server', 'configuration', 'statuses', 'max_media_attachments'])-1;
  const hasVideoOrAudio = state.getIn(['compose', 'media_attachments']).some(m => ['video', 'audio'].includes(m.get('type')));

  return {
--- a/app/javascript/mastodon/actions/compose.js
+++ b/app/javascript/mastodon/actions/compose.js
@ -281,7 +281,7 @@ export function submitComposeFail(error) {

 export function uploadCompose(files) {
  return function (dispatch, getState) {
-    const uploadLimit = 4;
+    const uploadLimit = getState().getIn(['server', 'server', 'configuration', 'statuses', 'max_media_attachments']);
    const media = getState().getIn(['compose', 'media_attachments']);
    const pending = getState().getIn(['compose', 'pending_media_attachments']);
    const progress = new Array(files.length).fill(0);
@ -301,7 +301,7 @@ export function uploadCompose(files) {
    dispatch(uploadComposeRequest());

    for (const [i, file] of Array.from(files).entries()) {
-      if (media.size + i > 3) break;
+      if (media.size + i > (uploadLimit - 1)) break;

      const data = new FormData();
      data.append('file', file);
--- a/app/javascript/mastodon/components/account.jsx
+++ b/app/javascript/mastodon/components/account.jsx
@ -131,7 +131,7 @@ const Account = ({ size = 46, account, onFollow, onBlock, onMute, onMuteNotifica
  return (
    <div className={classNames('account', { 'account--minimal': minimal })}>
      <div className='account__wrapper'>
-        <Link key={account.get('id')} className='account__display-name' title={account.get('acct')} to={`/@${account.get('acct')}`}>
+        <Link key={account.get('id')} className='account__display-name' title={account.get('acct')} to={`/@${account.get('acct')}`} data-hover-card-account={account.get('id')}>
          <div className='account__avatar-wrapper'>
            <Avatar account={account} size={size} />
          </div>
--- a/app/javascript/mastodon/components/hover_card_controller.tsx
+++ b/app/javascript/mastodon/components/hover_card_controller.tsx
@ -43,6 +43,7 @@ export const HoverCardController: React.FC = () => {
  useEffect(() => {
    let isScrolling = false;
    let currentAnchor: HTMLElement | null = null;
+    let currentTitle: string | null = null;

    const open = (target: HTMLElement) => {
      target.setAttribute('aria-describedby', 'hover-card');
@ -75,6 +76,9 @@ export const HoverCardController: React.FC = () => {
        currentAnchor?.removeAttribute('aria-describedby');
        currentAnchor = target;

+        currentTitle = target.getAttribute('title');
+        target.removeAttribute('title');
+
        setEnterTimeout(() => {
          open(target);
        }, enterDelay);
@ -90,11 +94,20 @@ export const HoverCardController: React.FC = () => {
    };

    const handleMouseLeave = (e: MouseEvent) => {
+      const { target } = e;
+
      if (!currentAnchor) {
        return;
      }

-      if (e.target === currentAnchor || e.target === cardRef.current) {
+      if (
+        currentTitle &&
+        target instanceof HTMLElement &&
+        target === currentAnchor
+      )
+        target.setAttribute('title', currentTitle);
+
+      if (target === currentAnchor || target === cardRef.current) {
        cancelEnterTimeout();

        setLeaveTimeout(() => {
--- a/app/javascript/mastodon/components/media_gallery.jsx
+++ b/app/javascript/mastodon/components/media_gallery.jsx
@ -305,13 +305,13 @@ class MediaGallery extends PureComponent {
      style.aspectRatio = '3 / 2';
    }

-    const size     = media.take(4).size;
+    const size     = media.size;
    const uncached = media.every(attachment => attachment.get('type') === 'unknown');

    if (this.isFullSizeEligible()) {
      children = <Item standalone autoplay={autoplay} onClick={this.handleClick} attachment={media.get(0)} lang={lang} displayWidth={width} visible={visible} />;
    } else {
-      children = media.take(4).map((attachment, i) => <Item key={attachment.get('id')} autoplay={autoplay} onClick={this.handleClick} attachment={attachment} index={i} lang={lang} size={size} displayWidth={width} visible={visible || uncached} />);
+      children = media.map((attachment, i) => <Item key={attachment.get('id')} autoplay={autoplay} onClick={this.handleClick} attachment={attachment} index={i} lang={lang} size={size} displayWidth={width} visible={visible || uncached} />);
    }

    if (uncached) {
--- a/app/javascript/mastodon/features/compose/containers/upload_button_container.js
+++ b/app/javascript/mastodon/features/compose/containers/upload_button_container.js
@ -9,7 +9,7 @@ const mapStateToProps = state => {
  const readyAttachmentsSize = state.getIn(['compose', 'media_attachments']).size ?? 0;
  const pendingAttachmentsSize = state.getIn(['compose', 'pending_media_attachments']).size ?? 0;
  const attachmentsSize = readyAttachmentsSize + pendingAttachmentsSize;
-  const isOverLimit = attachmentsSize > 3;
+  const isOverLimit = attachmentsSize > state.getIn(['server', 'server', 'configuration', 'statuses', 'max_media_attachments'])-1;
  const hasVideoOrAudio = state.getIn(['compose', 'media_attachments']).some(m => ['video', 'audio'].includes(m.get('type')));

  return {
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@ -35,7 +35,9 @@
  "account.follow_back": "Последване взаимно",
  "account.followers": "Последователи",
  "account.followers.empty": "Още никой не следва потребителя.",
+  "account.followers_counter": "{count, plural, one {{counter} последовател} other {{counter} последователи}}",
  "account.following": "Последвано",
+  "account.following_counter": "{count, plural, one {{counter} последван} other {{counter} последвани}}",
  "account.follows.empty": "Потребителят още никого не следва.",
  "account.go_to_profile": "Към профила",
  "account.hide_reblogs": "Скриване на подсилвания от @{name}",
@ -61,6 +63,7 @@
  "account.requested_follow": "{name} поиска да ви последва",
  "account.share": "Споделяне на профила на @{name}",
  "account.show_reblogs": "Показване на подсилвания от @{name}",
+  "account.statuses_counter": "{count, plural, one {{counter} публикация} other {{counter} публикации}}",
  "account.unblock": "Отблокиране на @{name}",
  "account.unblock_domain": "Отблокиране на домейн {domain}",
  "account.unblock_short": "Отблокиране",
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@ -692,9 +692,11 @@
  "server_banner.about_active_users": "過去30日間にこのサーバーを使用している人 (月間アクティブユーザー)",
  "server_banner.active_users": "人のアクティブユーザー",
  "server_banner.administered_by": "管理者",
+  "server_banner.is_one_of_many": "{domain} は、数々の独立したMastodonサーバーのうちのひとつです。サーバーに登録してFediverseのコミュニティに加わってみませんか。",
  "server_banner.server_stats": "サーバーの情報",
  "sign_in_banner.create_account": "アカウント作成",
  "sign_in_banner.follow_anyone": "連合内の誰でもフォローして投稿を時系列で見ることができます。アルゴリズム、広告、クリックベイトはありません。",
+  "sign_in_banner.mastodon_is": "Mastodonに参加して、世界で起きていることを見つけよう。",
  "sign_in_banner.sign_in": "ログイン",
  "sign_in_banner.sso_redirect": "ログインまたは登録",
  "status.admin_account": "@{name}さんのモデレーション画面を開く",
--- a/app/javascript/mastodon/locales/kab.json
+++ b/app/javascript/mastodon/locales/kab.json
@ -1,6 +1,10 @@
 {
+  "about.blocks": "Ulac agbur",
  "about.contact": "Anermis:",
  "about.disclaimer": "Mastodon d aseɣẓan ilelli, d aseɣẓan n uɣbalu yeldin, d tnezzut n Mastodon gGmbH.",
+  "about.domain_blocks.preamble": "Maṣṭudun s umata yeḍmen-ak ad teẓreḍ agbur, ad tesdemreḍ akked yimseqdacen-nniḍen seg yal aqeddac deg fedivers. Ha-tent-an ɣur-k tsuraf i yellan deg uqeddac-agi.",
+  "about.domain_blocks.silenced.title": "Ɣur-s talast",
+  "about.domain_blocks.suspended.title": "Yeḥbes",
  "about.not_available": "Talɣut-a ur tettwabder ara deg uqeddac-a.",
  "about.powered_by": "Azeṭṭa inmetti yettwasɣelsen sɣur {mastodon}",
  "about.rules": "Ilugan n uqeddac",
@ -166,6 +170,7 @@
  "dismissable_banner.explore_tags": "D wiyi i d ihacṭagen i d-yettawin tamyigawt deg web anmetti ass-a. Ihacṭagen i sseqdacen ugar n medden, εlayit d imezwura.",
  "domain_block_modal.block": "Sewḥel aqeddac",
  "domain_block_modal.they_cant_follow": "Yiwen ur yezmir ad k·m-id-yeḍfer seg uqeddac-a.",
+  "domain_block_modal.title": "Sewḥel taɣult?",
  "domain_pill.activitypub_like_language": "ActivityPub am tutlayt yettmeslay Mastodon d izeḍwan inmettiyen nniḍen.",
  "domain_pill.server": "Aqeddac",
  "domain_pill.username": "Isem n useqdac",
@ -214,6 +219,7 @@
  "filter_modal.added.review_and_configure_title": "Iɣewwaṛen n imzizdig",
  "filter_modal.added.settings_link": "asebter n yiɣewwaṛen",
  "filter_modal.added.short_explanation": "Tasuffeɣt-a tettwarna ɣer taggayt-a n yimsizdegen: {title}.",
+  "filter_modal.added.title": "Yettwarna umsizdeg!",
  "filter_modal.select_filter.expired": "yemmut",
  "filter_modal.select_filter.prompt_new": "Taggayt tamaynutt : {name}",
  "filter_modal.select_filter.search": "Nadi neɣ snulfu-d",
@ -224,9 +230,9 @@
  "firehose.remote": "Iqeddacen nniḍen",
  "follow_request.authorize": "Ssireg",
  "follow_request.reject": "Agi",
-  "follow_suggestions.dismiss": "Ur ttɛawad ara ad t-id-sekneṭ",
+  "follow_suggestions.dismiss": "Dayen ur t-id-skan ara",
  "follow_suggestions.view_all": "Wali-ten akk",
-  "follow_suggestions.who_to_follow": "Menhu ara ḍefṛeḍ",
+  "follow_suggestions.who_to_follow": "Ad tḍefreḍ?",
  "followed_tags": "Ihacṭagen yettwaḍfaren",
  "footer.about": "Ɣef",
  "footer.directory": "Akaram n imeɣna",
@ -235,6 +241,7 @@
  "footer.keyboard_shortcuts": "Inegzumen n unasiw",
  "footer.privacy_policy": "Tasertit tabaḍnit",
  "footer.source_code": "Wali tangalt taɣbalut",
+  "footer.status": "N tsuffeɣt",
  "generic.saved": "Yettwasekles",
  "getting_started.heading": "Bdu",
  "hashtag.column_header.tag_mode.all": "d {additional}",
@ -313,11 +320,14 @@
  "lightbox.previous": "Ɣer deffir",
  "limited_account_hint.action": "Wali amaɣnu akken yebɣu yili",
  "link_preview.author": "S-ɣur {name}",
+  "link_preview.more_from_author": "Ugar sɣur {name}",
+  "link_preview.shares": "{count, plural, one {{counter} post} other {{counter} posts}}",
  "lists.account.add": "Rnu ɣer tebdart",
  "lists.account.remove": "Kkes seg tebdart",
  "lists.delete": "Kkes tabdart",
  "lists.edit": "Ẓreg tabdart",
  "lists.edit.submit": "Beddel azwel",
+  "lists.exclusive": "Ffer tisuffaɣ-a seg ugejdan",
  "lists.new.create": "Rnu tabdart",
  "lists.new.title_placeholder": "Azwel amaynut n tebdart",
  "lists.replies_policy.followed": "Kra n useqdac i yettwaḍefren",
@ -338,6 +348,7 @@
  "navigation_bar.bookmarks": "Ticraḍ",
  "navigation_bar.community_timeline": "Tasuddemt tadigant",
  "navigation_bar.compose": "Aru tajewwiqt tamaynut",
+  "navigation_bar.direct": "Tibdarin tusligin",
  "navigation_bar.discover": "Ẓer",
  "navigation_bar.domain_blocks": "Tiɣula yeffren",
  "navigation_bar.explore": "Snirem",
@ -357,9 +368,14 @@
  "navigation_bar.search": "Nadi",
  "navigation_bar.security": "Taɣellist",
  "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
+  "notification.admin.report": "Yemla-t-id {name} {target}",
+  "notification.admin.sign_up": "Ijerred {name}",
+  "notification.favourite": "{name} yesmenyaf addad-ik·im",
  "notification.follow": "iṭṭafar-ik·em-id {name}",
  "notification.follow_request": "{name} yessuter-d ad k·m-yeḍfeṛ",
  "notification.mention": "{name} yebder-ik-id",
+  "notification.moderation-warning.learn_more": "Issin ugar",
+  "notification.moderation_warning.action_suspend": "Yettwaseḥbes umiḍan-ik.",
  "notification.own_poll": "Tafrant-ik·im tfuk",
  "notification.poll": "Tfukk tefrant ideg tettekkaḍ",
  "notification.reblog": "{name} yebḍa tajewwiqt-ik i tikelt-nniḍen",
@ -370,6 +386,7 @@
  "notification_requests.notifications_from": "Ilɣa sɣur {name}",
  "notifications.clear": "Sfeḍ tilɣa",
  "notifications.clear_confirmation": "Tebɣiḍ s tidet ad tekkseḍ akk tilɣa-inek·em i lebda?",
+  "notifications.column_settings.admin.report": "Ineqqisen imaynuten:",
  "notifications.column_settings.alert": "Tilɣa n tnarit",
  "notifications.column_settings.favourite": "Imenyafen:",
  "notifications.column_settings.filter_bar.advanced": "Sken-d akk taggayin",
@ -384,6 +401,7 @@
  "notifications.column_settings.sound": "Rmed imesli",
  "notifications.column_settings.status": "Tisuffaɣ timaynutin :",
  "notifications.column_settings.unread_notifications.category": "Ilɣa ur nettwaɣra",
+  "notifications.column_settings.update": "Iẓreg:",
  "notifications.filter.all": "Akk",
  "notifications.filter.boosts": "Seǧhed",
  "notifications.filter.favourites": "Imenyafen",
@ -413,6 +431,7 @@
  "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": "Ttwassnen deg Mastodon",
  "onboarding.profile.display_name": "Isem ara d-yettwaskanen",
+  "onboarding.profile.display_name_hint": "Isem-ik·im ummid neɣ isem-ik·im n uqeṣṣer…",
  "onboarding.profile.note": "Tameddurt",
  "onboarding.profile.note_hint": "Tzemreḍ ad d-@tbedreḍ imdanen niḍen neɣ #ihacṭagen …",
  "onboarding.profile.save_and_continue": "Sekles, tkemmleḍ",
@ -441,6 +460,7 @@
  "poll.total_votes": "{count, plural, one {# n udɣaṛ} other {# n yedɣaṛen}}",
  "poll.vote": "Dɣeṛ",
  "poll.voted": "Tdeɣṛeḍ ɣef tririt-ayi",
+  "poll.votes": "{votes, plural, one {# n udɣaṛ} other {# n yedɣaṛen}}",
  "poll_button.add_poll": "Rnu asenqed",
  "poll_button.remove_poll": "Kkes asenqed",
  "privacy.change": "Seggem tabaḍnit n yizen",
@ -465,9 +485,12 @@
  "relative_time.seconds": "{number}tas",
  "relative_time.today": "assa",
  "reply_indicator.cancel": "Sefsex",
+  "reply_indicator.poll": "Afmiḍi",
  "report.block": "Sewḥel",
+  "report.categories.legal": "Azerfan",
  "report.categories.other": "Tiyyaḍ",
  "report.categories.spam": "Aspam",
+  "report.category.subtitle": "Fren amṣada akk ufrin",
  "report.category.title_account": "ameɣnu",
  "report.category.title_status": "tasuffeɣt",
  "report.close": "Immed",
@ -476,13 +499,25 @@
  "report.next": "Uḍfiṛ",
  "report.placeholder": "Iwenniten-nniḍen",
  "report.reasons.dislike": "Ur t-ḥemmleɣ ara",
+  "report.reasons.dislike_description": "D ayen akk ur bɣiɣ ara ad waliɣ",
  "report.reasons.other": "D ayen nniḍen",
+  "report.reasons.other_description": "Ugur ur yemṣada ara akk d taggayin-nniḍen",
  "report.reasons.spam": "D aspam",
+  "report.reasons.spam_description": "Yir iseɣwan, yir agman d tririyin i d-yettuɣalen",
+  "report.reasons.violation": "Truẓi n yilugan n uqeddac",
+  "report.reasons.violation_description": "Teẓriḍ y·tettruẓu kra n yilugan",
+  "report.rules.subtitle": "Fren ayen akk yemṣadan",
+  "report.rules.title": "Acu n yilugan i yettwarẓan?",
+  "report.statuses.subtitle": "Fren ayen akk yemṣadan",
+  "report.statuses.title": "Llant tsuffaɣ ara isdemren aneqqis-a?",
  "report.submit": "Azen",
  "report.target": "Mmel {target}",
+  "report.thanks.take_action_actionable": "Ideg nekkni nessenqad tuttra-inek•inem, tzemreḍ ad tḥadreḍ mgal @{name}:",
  "report.thanks.title": "Ur tebɣiḍ ara ad twaliḍ aya?",
+  "report.thanks.title_actionable": "Tanemmirt ɣef uneqqis, ad nwali deg waya.",
  "report.unfollow": "Seḥbes aḍfar n @{name}",
  "report_notification.attached_statuses": "{count, plural, one {# post} other {# posts}} attached",
+  "report_notification.categories.legal": "Azerfan",
  "report_notification.categories.other": "Ayen nniḍen",
  "report_notification.categories.spam": "Aspam",
  "report_notification.open": "Ldi aneqqis",
@ -497,6 +532,7 @@
  "search_popout.full_text_search_disabled_message": "Ur yelli ara deg {domain}.",
  "search_popout.language_code": "Tangalt ISO n tutlayt",
  "search_popout.options": "Iwellihen n unadi",
+  "search_popout.quick_actions": "Tigawin tiruradin",
  "search_popout.recent": "Inadiyen ineggura",
  "search_popout.user": "amseqdac",
  "search_results.accounts": "Imeɣna",
@ -505,7 +541,9 @@
  "search_results.see_all": "Wali-ten akk",
  "search_results.statuses": "Tisuffaɣ",
  "search_results.title": "Anadi ɣef {q}",
+  "server_banner.active_users": "iseqdacen urmiden",
  "server_banner.administered_by": "Yettwadbel sɣur :",
+  "server_banner.server_stats": "Tidaddanin n uqeddac:",
  "sign_in_banner.create_account": "Snulfu-d amiḍan",
  "sign_in_banner.sign_in": "Qqen",
  "sign_in_banner.sso_redirect": "Qqen neɣ jerred",
@ -516,13 +554,20 @@
  "status.cannot_reblog": "Tasuffeɣt-a ur tezmir ara ad tettwabḍu tikelt-nniḍen",
  "status.copy": "Nɣel assaɣ ɣer tasuffeɣt",
  "status.delete": "Kkes",
+  "status.direct": "Bder-d @{name} weḥd-s",
+  "status.direct_indicator": "Abdar uslig",
  "status.edit": "Ẓreg",
  "status.edited_x_times": "Tettwaẓreg {count, plural, one {{count} n tikkelt} other {{count} n tikkal}}",
  "status.embed": "Seddu",
+  "status.favourite": "Amenyaf",
  "status.filter": "Sizdeg tassufeɣt-a",
  "status.filtered": "Yettwasizdeg",
  "status.hide": "Ffer tasuffeɣt",
+  "status.history.created": "Yerna-t {name} {date}",
+  "status.history.edited": "Ibeddel-it {name} {date}",
  "status.load_more": "Sali ugar",
+  "status.media.open": "Sit i ulday",
+  "status.media.show": "Sit i uskan",
  "status.media_hidden": "Amidya yettwaffer",
  "status.mention": "Bder-d @{name}",
  "status.more": "Ugar",
@ -548,6 +593,7 @@
  "status.show_less_all": "Semẓi akk tisuffɣin",
  "status.show_more": "Ssken-d ugar",
  "status.show_more_all": "Ẓerr ugar lebda",
+  "status.show_original": "Sken aɣbalu",
  "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
  "status.translate": "Suqel",
  "status.translated_from_with": "Yettwasuqel seg {lang} s {provider}",
@ -582,6 +628,7 @@
  "upload_form.video_description": "Glem-d i yemdanen i yesɛan ugur deg tmesliwt neɣ deg yiẓri",
  "upload_modal.analyzing_picture": "Tasleḍt n tugna tetteddu…",
  "upload_modal.apply": "Snes",
+  "upload_modal.applying": "Asnas…",
  "upload_modal.choose_image": "Fren tugna",
  "upload_modal.description_placeholder": "Aberraɣ arurad ineggez nnig n uqjun amuṭṭis",
  "upload_modal.detect_text": "Sefru-d aḍris seg tugna",
@ -589,6 +636,7 @@
  "upload_modal.preparing_ocr": "Aheyyi n OCR…",
  "upload_modal.preview_label": "Taskant ({ratio})",
  "upload_progress.label": "Asali iteddu...",
+  "upload_progress.processing": "Asesfer…",
  "username.taken": "Yettwaṭṭef yisem-a n useqdac. Ɛreḍ wayeḍ",
  "video.close": "Mdel tabidyutt",
  "video.download": "Sidered afaylu",
--- a/app/javascript/mastodon/locales/lv.json
+++ b/app/javascript/mastodon/locales/lv.json
@ -35,6 +35,7 @@
  "account.follow_back": "Sekot atpakaļ",
  "account.followers": "Sekotāji",
  "account.followers.empty": "Šim lietotājam vēl nav sekotāju.",
+  "account.followers_counter": "{count, plural, zero {{count} sekotāju} one {{count} sekotājs} other {{count} sekotāji}}",
  "account.following": "Seko",
  "account.follows.empty": "Šis lietotājs pagaidām nevienam neseko.",
  "account.go_to_profile": "Doties uz profilu",
@ -312,9 +313,9 @@
  "home.column_settings.show_reblogs": "Rādīt pastiprinātos ierakstus",
  "home.column_settings.show_replies": "Rādīt atbildes",
  "home.hide_announcements": "Slēpt paziņojumus",
-  "home.pending_critical_update.body": "Lūdzu, pēc iespējas ātrāk atjaunini savu Mastodon serveri!",
+  "home.pending_critical_update.body": "Lūgums pēc iespējas drīzāk atjaunināt savu Mastodon serveri.",
  "home.pending_critical_update.link": "Skatīt jauninājumus",
-  "home.pending_critical_update.title": "Pieejams kritisks drošības jauninājums!",
+  "home.pending_critical_update.title": "Ir pieejams būtisks drošības atjauninājums.",
  "home.show_announcements": "Rādīt paziņojumus",
  "interaction_modal.description.favourite": "Ar Mastodon kontu tu vari pievienot šo ziņu izlasei, lai informētu autoru, ka to novērtē, un saglabātu to vēlākai lasīšanai.",
  "interaction_modal.description.follow": "Ar Mastodon kontu Tu vari sekot {name}, lai saņemtu lietotāja ierakstus savā mājas plūsmā.",
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@ -217,18 +217,18 @@
  "domain_block_modal.title": "Заблокувати домен?",
  "domain_block_modal.you_will_lose_followers": "Усіх ваших підписників з цього сервера буде вилучено.",
  "domain_block_modal.you_wont_see_posts": "Ви не бачитимете дописів і сповіщень від користувачів на цьому сервері.",
-  "domain_pill.activitypub_lets_connect": "Це дозволяє вам спілкуватися та взаємодіяти з людьми не лише на Mastodon, але й у різних соціальних додатках.",
-  "domain_pill.activitypub_like_language": "ActivityPub - це як мова, якою Мастодонт розмовляє з іншими соціальними мережами.",
+  "domain_pill.activitypub_lets_connect": "Це дозволяє вам спілкуватися та взаємодіяти з людьми не лише на Mastodon, але й у різних соціальних застосунках.",
+  "domain_pill.activitypub_like_language": "ActivityPub - це як мова, якою Mastodon розмовляє з іншими соціальними мережами.",
  "domain_pill.server": "Сервер",
  "domain_pill.their_handle": "Їхня адреса:",
-  "domain_pill.their_server": "Їхній цифровий дім, де живуть усі їхні пости.",
+  "domain_pill.their_server": "Їхній цифровий дім, де живуть усі їхні дописи.",
  "domain_pill.their_username": "Їхній унікальний ідентифікатор на їхньому сервері. Ви можете знайти користувачів з однаковими іменами на різних серверах.",
  "domain_pill.username": "Ім'я користувача",
  "domain_pill.whats_in_a_handle": "Що є в адресі?",
  "domain_pill.who_they_are": "Оскільки дескриптори вказують, хто це і де він знаходиться, ви можете взаємодіяти з людьми через соціальну мережу платформ на основі <button>ActivityPub</button>.",
  "domain_pill.who_you_are": "Оскільки ваш нікнейм вказує, хто ви та де ви, люди можуть взаємодіяти з вами через соціальну мережу платформ на основі <button>ActivityPub</button>.",
  "domain_pill.your_handle": "Ваша адреса:",
-  "domain_pill.your_server": "Ваш цифровий дім, де живуть усі ваші публікації. Не подобається цей? Перенесіть сервери в будь-який час і залучайте своїх підписників.",
+  "domain_pill.your_server": "Ваш цифровий дім, де живуть усі ваші дописи. Не подобається цей? Перенесіть сервери в будь-який час і залучайте своїх підписників.",
  "domain_pill.your_username": "Ваш унікальний ідентифікатор на цьому сервері. Ви можете знайти користувачів з однаковими іменами на різних серверах.",
  "embed.instructions": "Вбудуйте цей допис до вашого вебсайту, скопіювавши код нижче.",
  "embed.preview": "Ось який вигляд це матиме:",
@ -489,9 +489,9 @@
  "notification.reblog": "{name} поширює ваш допис",
  "notification.relationships_severance_event": "Втрачено з'єднання з {name}",
  "notification.relationships_severance_event.account_suspension": "Адміністратор з {from} призупинив {target}, що означає, що ви більше не можете отримувати оновлення від них або взаємодіяти з ними.",
-  "notification.relationships_severance_event.domain_block": "Адміністратор з {from} заблокував {target}, включаючи {followersCount} ваших підписників і {{followingCount, plural, one {# account} other {# accounts}}, на які ви підписані.",
-  "notification.relationships_severance_event.learn_more": "Дізнатися більше",
-  "notification.relationships_severance_event.user_domain_block": "Ви заблокували {target}, видаливши {followersCount} ваших підписників і {followingCount, plural, one {# account} other {# accounts}}, за якими ви стежите.",
+  "notification.relationships_severance_event.domain_block": "Адміністратор з {from} заблокував {target}, включаючи {followersCount} ваших підписників і {followingCount , plural, one {# обліковий запис} few {# облікові записи} many {# облікових записів} other {# обліковий запис}}, на які ви підписані.",
+  "notification.relationships_severance_event.learn_more": "Докладніше",
+  "notification.relationships_severance_event.user_domain_block": "Ви заблокували {target}, видаливши {followersCount} ваших підписників і {followingCount, plural, one {# обліковий запис} few {# облікові записи} many {# облікових записів} other {# обліковий запис}}, за якими ви стежите.",
  "notification.status": "{name} щойно дописує",
  "notification.update": "{name} змінює допис",
  "notification_requests.accept": "Прийняти",
--- a/app/lib/link_details_extractor.rb
+++ b/app/lib/link_details_extractor.rb
@ -62,7 +62,8 @@ class LinkDetailsExtractor
    end

    def author_name
-      author['name']
+      name = author['name']
+      name.is_a?(Array) ? name.join(', ') : name
    end

    def author_url
@ -294,7 +295,7 @@ class LinkDetailsExtractor
  def html_entities_decode(string)
    return if string.nil?

-    unicode_string = string.encode('UTF-8')
+    unicode_string = string.to_s.encode('UTF-8')
    raise EncodingError, 'cannot convert string to valid UTF-8' unless unicode_string.valid_encoding?

    html_entities.decode(unicode_string)
--- a/app/models/status.rb
+++ b/app/models/status.rb
@ -295,7 +295,7 @@ class Status < ApplicationRecord
    else
      map = media_attachments.index_by(&:id)
      ordered_media_attachment_ids.filter_map { |media_attachment_id| map[media_attachment_id] }
-    end
+    end.take(MEDIA_ATTACHMENTS_LIMIT)
  end

  def replies_count
--- a/app/models/status_edit.rb
+++ b/app/models/status_edit.rb
@ -54,12 +54,14 @@ class StatusEdit < ApplicationRecord
  def ordered_media_attachments
    return @ordered_media_attachments if defined?(@ordered_media_attachments)

-    @ordered_media_attachments = if ordered_media_attachment_ids.nil?
-                                   []
-                                 else
-                                   map = status.media_attachments.index_by(&:id)
-                                   ordered_media_attachment_ids.map.with_index { |media_attachment_id, index| PreservedMediaAttachment.new(media_attachment: map[media_attachment_id], description: media_descriptions[index]) }
-                                 end
+    @ordered_media_attachments = begin
+      if ordered_media_attachment_ids.nil?
+        []
+      else
+        map = status.media_attachments.index_by(&:id)
+        ordered_media_attachment_ids.map.with_index { |media_attachment_id, index| PreservedMediaAttachment.new(media_attachment: map[media_attachment_id], description: media_descriptions[index]) }
+      end
+    end.take(Status::MEDIA_ATTACHMENTS_LIMIT)
  end

  def proper
--- a/config/locales/activerecord.kab.yml
+++ b/config/locales/activerecord.kab.yml
@ -21,6 +21,18 @@ kab:
            username:
              invalid: ilaq ad ilin isekkilen, uṭṭunen d yijerriden n wadda kan
              reserved: yettwaṭṭef
+        admin/webhook:
+          attributes:
+            url:
+              invalid: mačči d URL ameɣtu
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: mačči d URL ameɣtu
+        import:
+          attributes:
+            data:
+              malformed: yir amsal
        status:
          attributes:
            reblog:
@ -28,4 +40,20 @@ kab:
        user:
          attributes:
            email:
+              blocked: isseqdac asaǧǧaw n yimayl ur yettusirgen ara
              unreachable: ur d-ttban ara d akken yella
+            role_id:
+              elevated: ur yezmir ara ad iεeddi tamlilt-ik tamirant
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: deg-s tisirag tiriɣelsanin i temlilt tazadurt
+              elevated: ur yezmir ara ad yesεu tirirag ur nelli ara deg temlilit-ik tamirant
+              own_role: ur yezmir ara ad yettwabeddel s temlilt-ik tamirant
+            position:
+              elevated: ur yezmir ara ad iεeddi tamlilt-ik tamirant
+              own_role: ur yezmir ara ad yettwabeddel s temlilt-ik tamirant
+        webhook:
+          attributes:
+            events:
+              invalid_permissions: ur yezmir ara ad yesεu tidyanin iwumi ur tesεiḍ ara tisirag
--- a/config/locales/devise.kab.yml
+++ b/config/locales/devise.kab.yml
@ -12,6 +12,7 @@ kab:
      last_attempt: Γur-k yiwen n uɛraḍ-nniḍen kan send ad yettucekkel umiḍan-ik.
      locked: Amiḍan-ik yettwargel.
      not_found_in_database: Tella tuccḍa deg %{authentication_keys} neγ deg wawal uffir.
+      omniauth_user_creation_failure: Tuccḍa lawan n tmerna n umiḍan i timagit-a.
      pending: Amiḍan-inek mazal-it deg ɛiwed n tmuγli.
      timeout: Tiɣimit n tuqqna tezri. Ma ulac aɣilif ɛiwed tuqqna akken ad tkemmleḍ.
      unauthenticated: Ilaq ad teqqneḍ neɣ ad tjerrḍeḍ akken ad tkemmelḍ.
@ -47,21 +48,41 @@ kab:
        subject: 'Mastodon: Iwellihen n uwennez n wawal uffir'
        title: Aɛiwed n wawal uffir
      two_factor_disabled:
+        explanation: Tuqqna tella tura s useqdec n tansa n yimayl tasuft d wawal n uεeddi.
        subject: 'Mastodon: Asesteb s snat n tarrayin yensa'
+        subtitle: Asesteb s snat tarrayin i umiḍan-ik yensan.
        title: Asesteb s snat n tarrayin insa
      two_factor_enabled:
+        explanation: Ajuṭu yettusirwen s usnas TOTP yeqqnen ilaq i wakken ad teqqneḍ.
        subject: 'Mastodon: Asesteb s snat n tarrayin yermed'
+        subtitle: Asesteb s snat tarrayin yettwarmed i umiḍan-ik.
        title: Asesteb s snat n tarrayin irmed
      two_factor_recovery_codes_changed:
        explanation: Tangalt n tuɣalin tettwaḥbes sakin nesnulfa-d yiwet d tamaynut.
        subject: 'Mastodon: Tingalin n tuɣalin n snat n tarayin ttwarnanat i tikkelt-nniḍen'
+        subtitle: Tangalt n tuɣalin tettwaḥbes sakin nesnulfa-d yiwet d tamaynut.
        title: Tangalt n tuɣalin 2FA tettwabeddel
      unlock_instructions:
        subject: 'Mastodon: iwelihhen n userreḥ'
      webauthn_credential:
        added:
+          explanation: Tasarut-a n tɣellist tettwarna ɣer umiḍan-ik·im
          subject: 'Maṣṭudun : Tasarutt tamaynutt n tɣellist'
          title: Tasarut tamaynutt n tɣellist tamaynut tettwarna
+        deleted:
+          explanation: Tasarut-a n tɣellist tettwakkes seg umiḍan-ik·im
+          subject: 'Mastodon: Tasarut n tɣellsit tettwakkes'
+          title: Yiwet seg tsura-k·m n tɣellist tettwakkes
+      webauthn_disabled:
+        explanation: Yensa usesteb s tsura n tɣellist i umiḍan-ik.
+        extra: Tzemreḍ ad tkecmeḍ tura s useqdec asuf n ujuṭu yettwasran s usnas TOPTP yeqqnen.
+        subject: 'Mastodon: Asesteb s tsura n tɣellist yensa'
+        title: Tisura n tɣellist nsant
+      webauthn_enabled:
+        explanation: Asesteb n tsarut n tɣellist tettwarmed i umiḍan-ik.
+        extra: Tasarut-ik n tɣellist tezmer tura ad tettuseqdec i unekcum.
+        subject: 'Mastodon: Asesteb n tsarut n tɣellist yermed'
+        title: Tisura n tɣellist remdent
    omniauth_callbacks:
      failure: Ur nezmir ara ad ak·akem-nsesṭeb seg %{kind} acku "%{reason}".
      success: Asesṭeb idda akken iwata seg umiḍan %{kind}.
--- a/config/locales/doorkeeper.kab.yml
+++ b/config/locales/doorkeeper.kab.yml
@ -5,6 +5,7 @@ kab:
      doorkeeper/application:
        name: Isem n usnas
        redirect_uri: URI n uwelleh
+        scopes: Tinerfadin
        website: Asmel web n usnas
    errors:
      models:
@ -39,6 +40,7 @@ kab:
        empty: Ulac ɣur-k·m isnasen.
        name: Isem
        new: Asnas amaynut
+        scopes: Tinerfadin
        show: Ẓer
        title: Isnasen-ik·im
      new:
@ -47,6 +49,8 @@ kab:
        actions: Tigawin
        application_id: ID n usnas
        callback_urls: URL n tririt n wawal
+        scopes: Tinerfadin
+        secret: Tuffirt n umsaɣ
        title: 'Asnas: %{name}'
    authorizations:
      buttons:
@ -55,6 +59,7 @@ kab:
      error:
        title: Tella-d tuccḍa
      new:
+        review_permissions: Asenqed n tsirag
        title: Tlaq tsiregt
      show:
        title: Nɣel tangalt n wurag sakkin senteḍ-itt deg usnas.
@ -64,8 +69,12 @@ kab:
      confirmations:
        revoke: Tetḥeqqeḍ?
      index:
+        authorized_at: Yettwasireg ɣef %{date}
        description_html: Ha-t-an yisnasen i izemren ad kecmen ɣer umiḍan-ik·im, s useqdec n API. Ma llan yisnasen ur teεqileḍ ara da, neɣ kra n wesnas ur iteddu ara akken ilaq, tzemreḍ ad tekkseḍ anekcum-is.
        last_used_at: Yettwaseqdec i tikkelt taneggarut ass n %{date}
+        never_used: Urǧin yettwaseqdac
+        scopes: Tisirag
+        superapp: Adigan
        title: Isnasen-ik·im yettusirgen
    errors:
      messages:
@ -82,13 +91,28 @@ kab:
        destroy:
          notice: Yettwaḥwi wesnas.
    grouped_scopes:
+      access:
+        read: Anekcum i tɣuri kan
+        read/write: Anekcum i tɣuri d tira
+        write: Anekcum i tira kan
      title:
        accounts: Imiḍanen
        admin/accounts: Tadbelt n imiḍan
+        admin/all: Akk timahilin tinebdalin
+        admin/reports: Tadbelt n yineqqisen
+        blocks: Yewḥel
+        bookmarks: Ticraḍ
+        conversations: Idiwenniyen
        crypto: Awgelhen seg yixef ɣer yixef
+        favourites: Imenyafen
        filters: Imzizdigen
+        follow: Aḍfar, asgugem akked usewḥel
+        follows: Aḍfar
        lists: Tibdarin
+        media: Imeddayen n umidya
+        mutes: Yeggugem
        notifications: Tilɣa
+        profile: Amaɣnu-k Mastodon
        push: Tilɣa yettudemmren
        reports: Ineqqisen
        search: Nadi
--- a/config/locales/doorkeeper.ko.yml
+++ b/config/locales/doorkeeper.ko.yml
@ -31,7 +31,7 @@ ko:
      form:
        error: 이런! 오류를 확인하세요
      help:
-        native_redirect_uri: "%{native_redirect_uri}에서 로컬 테스트를 할 수 있습니다."
+        native_redirect_uri: "%{native_redirect_uri}를 이용해 로컬 테스트를 할 수 있습니다"
        redirect_uri: 한 줄에 하나의 URI를 작성하세요
        scopes: 스페이스로 범위를 구분하세요. 빈 칸으로 놔두면 기본 범위를 사용합니다.
      index:
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@ -1741,7 +1741,7 @@ ko:
    contrast: 마스토돈 (고대비)
    default: 마스토돈 (어두움)
    mastodon-light: 마스토돈 (밝음)
-    system: 자동 선택 (시스템 테마 이용)
+    system: 자동 (시스템 테마 사용)
  time:
    formats:
      default: "%Y-%m-%d %H:%M"
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@ -116,6 +116,8 @@ ro:
      redownloaded_msg: S-a reîmprospătat cu succes profilul %{username} de la origine
      reject: Respinge
      rejected_msg: S-a respins cu succes cererea de înregistrare a utilizatorului %{username}
+      remote_suspension_irreversible: Datele acestui cont au fost șterse în mod ireversibil.
+      remote_suspension_reversible_hint_html: Contul a fost suspendat pe server-ul respectiv, iar datele vor fi șterse complet pe %{date}. Până atunci, server-ul remote poate restabili acest cont fără consecințe negative. Dacă dorești să elimini toate datele contului numaidecât, poți face acest lucru mai jos.
      remove_avatar: Elimină avatar
      remove_header: Elimină antet
      removed_avatar_msg: S-a îndepărtat cu succes poza de profil a utilizatorului %{username}
--- a/config/locales/simple_form.kab.yml
+++ b/config/locales/simple_form.kab.yml
@ -5,6 +5,7 @@ kab:
      account:
        display_name: Isem-ik·im ummid neɣ isem-ik·im n uqeṣṣer.
        fields: Asebter-ik·im agejdan, imqimen, leεmer, ayen tebɣiḍ.
+        note: 'Tzemreḍ ad d-@tbedreḍ imdanen niḍen neɣ #ihacṭagen.'
      account_alias:
        acct: Sekcem isem n umseqdac@domain n umiḍan s wansa itebγiḍ ad gujjeḍ
      account_migration:
@ -27,6 +28,8 @@ kab:
        name: 'Ha-t-an kra seg ihacṭagen i tesseqdaceḍ ussan-a ineggura maḍi :'
      imports:
        data: Afaylu CSV id yusan seg uqeddac-nniḍen n Maṣṭudun
+      invite_request:
+        text: Aya ad aɣ-iɛiwen ad nessenqed tuttra-k•m
      ip_block:
        comment: D afrayan. Cfu ɣef wayɣer i terniḍ alugen-a.
        severities:
@ -36,6 +39,8 @@ kab:
        fields:
          name: Tabzimt
          value: Agbur
+      account_alias:
+        acct: Tansa n umiḍan aqbur
      account_migration:
        acct: Tansa n umiḍan amaynut
      account_warning_preset:
@ -51,6 +56,7 @@ kab:
          suspend: Ḥbes di leεḍil
      announcement:
        ends_at: Tagara n tedyant
+        starts_at: Tazwara n tedyant
        text: Alɣu
      defaults:
        autofollow: Ɛreḍ-it-id ad yeḍfer amiḍan-ik·im
@ -59,18 +65,25 @@ kab:
        chosen_languages: Sizdeg tutlayin
        confirm_new_password: Sentem awal uffir amaynut
        confirm_password: Sentem awal uffir
+        context: Isatalen n umsizdeg
        current_password: Awal uffir n tura
        data: Isefka
        display_name: Isem ara d-yettwaskanen
        email: Tansa imayl
        expires_in: Ad yemmet
+        fields: Urtiyen niḍen
        header: Ixef
+        honeypot: "%{label} (ur tettaččar ara)"
+        inbox_url: URL n tbewwaḍt n urmas yettwacudden
+        irreversible: Kkes deg wadeg n tuffra
        locale: Tutlayt n wegrudem
        max_uses: Amḍan afellay n iseqdacen
        new_password: Awal uffir amaynut
        note: Tameddurt
        otp_attempt: Tangalt n snat n tarayin
        password: Awal uffir
+        phrase: Awal n tsarut neɣ tafyirt
+        setting_advanced_layout: Rmed agrudem n web leqqayen
        setting_default_language: Tutlayt n tira
        setting_default_privacy: Tabaḍnit n tira
        setting_display_media_default: Akk-a kan
@ -88,8 +101,15 @@ kab:
      featured_tag:
        name: Ahacṭag
      form_admin_settings:
+        custom_css: CSS udmawan
+        profile_directory: Rmed akaram n imaγnuten
+        site_contact_email: Imayl n unermas
+        site_short_description: Aglam n uqeddac
        site_terms: Tasertit tabaḍnit
        site_title: Isem n uqeddac
+        status_page_url: URL n uusebter n waddaden
+        theme: Asentel amezwer
+        thumbnail: Tanfult n uqeddac
      interactions:
        must_be_follower: Ssewḥel ilɣa sɣur wid akked tid ur yellin ara d imeḍfaren-ik·im
        must_be_following: Ssewḥel ilɣa sɣur wid akked tid ur tettḍafareḍ ara
@ -109,18 +129,25 @@ kab:
        follow: Yeḍfer-ik·im-id walbɛaḍ
        follow_request: Ma yella win i d-yessutren ad k·em-yeḍfer
        mention: Yuder-ik·em-id walbɛaḍ
+        pending_account: Amiḍan amaynut yesran asenqed
        reblog: Yella win yesselhan adda-dik·im
+        report: Aneqis amaynut yettwazen
      rule:
        hint: Isallen-nniḍen
        text: Alugen
      tag:
        name: Ahacṭag
      user:
+        role: Tamlilt
        time_zone: Tamnaḍt tasragant
      user_role:
        name: Isem
        permissions_as_keys: Tisirag
+      webhook:
+        events: Tidyanin turmidin
    'no': Ala
+    not_recommended: Ur yettuwelleh ara
+    overridden: Yeččur
    recommended: Yettuwelleh
    required:
      mark: "*"
--- a/config/locales/simple_form.ro.yml
+++ b/config/locales/simple_form.ro.yml
@ -2,6 +2,12 @@
 ro:
  simple_form:
    hints:
+      account:
+        discoverable: Este posibil ca postările și profilul tău să fie recomandate în diferite zone ale Mastodon, iar profilul tău ar poate fi sugerat altor utilizatori.
+        fields: Pagina ta principală, pronumele tale, vârsta, sau orice îți dorești.
+        indexable: Postările tale publice pot apărea în rezultatele căutărilor pe Mastodon. Persoanele care au interacționat cu postările tale vor putea să le caute oricând.
+        note: 'Poți @menționa alte persoane sau #hashtag-uri.'
+        unlocked: Alte persoane vă vor putea urmări fără a solicita aprobare. Debifați dacă doriți să revizuiți cererile și să alegeți dacă doriți să acceptați sau să respingeți noii urmăritori.
      account_alias:
        acct: Specificați numele de utilizator@domeniu al contului de la care doriți să treceți
      account_migration:
@ -23,12 +29,14 @@ ro:
        text: Poți folosi sintaxa de postare. Te rugăm să fii atent la spațiul pe care anunțul îl va ocupa pe ecranul utilizatorului
      defaults:
        autofollow: Persoanele care se înregistrează datorită invitației tale te vor urmări automat
+        avatar: WEBP, PNG, GIF sau JPG. Cel mult %{size}. Va fi redimensionată la %{dimensions}px
        bot: Acest cont performează în cea mai mare parte acțiuni automate și nu poate fi monitorizat
        context: Contextele în care filtrul trebuie aplicat
        current_password: În scopuri de securitate, vă rugăm să introduceţi parola contului curent
        current_username: Pentru a confirma, vă rugăm să introduceţi numele de utilizator al contului curent
        digest: Este trimis doar după o lungă perioadă de inactivitate și numai dacă primești mesaje personale în perioada de absență
        email: Vei primi un e-mail de confirmare
+        header: WEBP, PNG, GIF sau JPG. Cel mult %{size}. Va fi redimensionată la %{dimensions}px
        inbox_url: Copiază adresa URL de pe prima pagină a reului pe care vrei să îl utilizezi
        irreversible: Postările sortate vor dispărea ireversibil, chiar dacă filtrul este ulterior șters
        locale: Limba interfaței de utilizator, e-mailurile si notificările push
@ -36,17 +44,27 @@ ro:
        phrase: Vor fi potrivite indiferent de textul din casetă sau advertismentul unei postări
        scopes: La care API-uri aplicația are nevoie de acces. Dacă selectezi un scop principal nu mai e nevoie să selectezi fiecare sub-scop al acestuia.
        setting_aggregate_reblogs: Nu afișa impulsurile noi pentru postările care au fost deja recent impulsionate (afectează doar noile impulsuri primite)
+        setting_always_send_emails: În mod normal, notificările prin e-mail nu vor fi trimise când utilizați în mod activ Mastodon
        setting_default_sensitive: Fișierele media sensibile sunt ascunse implicit și pot fi dezvăluite cu un clic
        setting_display_media_default: Ascunde conținutul media marcat ca sensibil (NSFW)
        setting_display_media_hide_all: Întotdeauna ascunde tot conținutul media
        setting_display_media_show_all: Întotdeauna afișează conținutul media marcat ca sensibil
        setting_use_blurhash: Gradienții sunt bazați pe culorile vizualelor ascunse, dar ofuscă orice detalii
        setting_use_pending_items: Ascunde actualizările cronologice din spatele unui click în loc de a derula automat fluxul
+        username: Poți folosi litere, numere sau liniuțe de subliniere
        whole_word: Când fraza sau cuvântul este doar alfanumeric, acesta se aplică doar dacă există o potrivire completă
      domain_allow:
        domain: Acest domeniu va putea prelua date de pe acest server și datele primite de la el vor fi procesate și stocate
      email_domain_block:
+        domain: Acesta poate fi numele de domeniu care apare în adresa de e-mail sau în înregistrarea MX pe care o utilizează. Acestea vor fi verificate la înscriere.
        with_dns_records: Se va face o încercare de a rezolva înregistrările DNS ale domeniului dat și rezultatele vor fi de asemenea afișate pe lista neagră
+      featured_tag:
+        name: 'Iată câteva dintre hashtag-urile pe care le-ai folosit cel mai recent:'
+      filters:
+        action: Alege ce acţiune va fi efectuată atunci când o postare corespunde filtrului
+        actions:
+          hide: Ascunde complet conținutul filtrat, ca și cum nu ar exista
+          warn: Ascunde conținutul filtrat în spatele unui avertisment care menționează titlul filtrului
      form_challenge:
        current_password: Ați intrat într-o zonă securizată
      imports:
--- a/config/routes/api.rb
+++ b/config/routes/api.rb
@ -205,9 +205,11 @@ namespace :api, format: false do
        post :unmute
      end

-      resource :pin, only: :create, controller: 'accounts/pins'
-      post :unpin, to: 'accounts/pins#destroy'
-      resource :note, only: :create, controller: 'accounts/notes'
+      scope module: :accounts do
+        resource :pin, only: :create
+        post :unpin, to: 'pins#destroy'
+        resource :note, only: :create
+      end
    end

    resources :tags, only: [:show] do
@ -220,7 +222,7 @@ namespace :api, format: false do
    resources :followed_tags, only: [:index]

    resources :lists, only: [:index, :create, :show, :update, :destroy] do
-      resource :accounts, only: [:show, :create, :destroy], controller: 'lists/accounts'
+      resource :accounts, only: [:show, :create, :destroy], module: :lists
    end

    namespace :featured_tags do
@ -230,7 +232,7 @@ namespace :api, format: false do
    resources :featured_tags, only: [:index, :create, :destroy]

    resources :polls, only: [:create, :show] do
-      resources :votes, only: :create, controller: 'polls/votes'
+      resources :votes, only: :create, module: :polls
    end

    namespace :push do
@ -316,8 +318,10 @@ namespace :api, format: false do
    resources :suggestions, only: [:index]
    resource :instance, only: [:show]
    resources :filters, only: [:index, :create, :show, :update, :destroy] do
-      resources :keywords, only: [:index, :create], controller: 'filters/keywords'
-      resources :statuses, only: [:index, :create], controller: 'filters/statuses'
+      scope module: :filters do
+        resources :keywords, only: [:index, :create]
+        resources :statuses, only: [:index, :create]
+      end
    end

    namespace :filters do
--- a/spec/controllers/admin/disputes/appeals_controller_spec.rb
+++ b/spec/controllers/admin/disputes/appeals_controller_spec.rb
@ -34,7 +34,7 @@ RSpec.describe Admin::Disputes::AppealsController do

    let(:current_user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }

-    it 'redirects back to the strike page and notifies target account about approved appeal', :sidekiq_inline do
+    it 'redirects back to the strike page and notifies target account about approved appeal', :inline_jobs do
      emails = capture_emails { subject }

      expect(response)
@ -58,7 +58,7 @@ RSpec.describe Admin::Disputes::AppealsController do

    let(:current_user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }

-    it 'redirects back to the strike page and notifies target account about rejected appeal', :sidekiq_inline do
+    it 'redirects back to the strike page and notifies target account about rejected appeal', :inline_jobs do
      emails = capture_emails { subject }

      expect(response)
--- a/spec/controllers/admin/domain_blocks_controller_spec.rb
+++ b/spec/controllers/admin/domain_blocks_controller_spec.rb
@ -176,7 +176,7 @@ RSpec.describe Admin::DomainBlocksController do
    end
  end

-  describe 'PUT #update', :sidekiq_inline do
+  describe 'PUT #update', :inline_jobs do
    subject do
      post :update, params: { :id => domain_block.id, :domain_block => { domain: 'example.com', severity: new_severity }, 'confirm' => '' }
    end
--- a/spec/controllers/admin/resets_controller_spec.rb
+++ b/spec/controllers/admin/resets_controller_spec.rb
@ -13,7 +13,7 @@ describe Admin::ResetsController do
    sign_in Fabricate(:user, role: UserRole.find_by(name: 'Admin')), scope: :user
  end

-  describe 'POST #create', :sidekiq_inline do
+  describe 'POST #create', :inline_jobs do
    it 'redirects to admin accounts page' do
      emails = capture_emails { subject }

--- a/spec/controllers/auth/sessions_controller_spec.rb
+++ b/spec/controllers/auth/sessions_controller_spec.rb
@ -123,7 +123,7 @@ RSpec.describe Auth::SessionsController do
          user.update(current_sign_in_at: 1.month.ago)
        end

-        it 'logs the user in and sends suspicious email and redirects home', :sidekiq_inline do
+        it 'logs the user in and sends suspicious email and redirects home', :inline_jobs do
          emails = capture_emails { subject }

          expect(response)
@ -263,7 +263,7 @@ RSpec.describe Auth::SessionsController do
            travel_to '2023-12-20T10:00:00Z'
          end

-          it 'does not log the user in, sets a flash message, and sends a suspicious sign in email', :sidekiq_inline do
+          it 'does not log the user in, sets a flash message, and sends a suspicious sign in email', :inline_jobs do
            emails = capture_emails 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 }
--- a/spec/controllers/concerns/user_tracking_concern_spec.rb
+++ b/spec/controllers/concerns/user_tracking_concern_spec.rb
@ -75,7 +75,7 @@ describe UserTrackingConcern do
        expect(redis.ttl("account:#{user.account_id}:regeneration")).to be >= 0
      end

-      it 'regenerates feed when sign in is older than two weeks', :sidekiq_inline do
+      it 'regenerates feed when sign in is older than two weeks', :inline_jobs do
        get :show

        expect_updated_sign_in_at(user)
--- a/spec/controllers/disputes/appeals_controller_spec.rb
+++ b/spec/controllers/disputes/appeals_controller_spec.rb
@ -17,7 +17,7 @@ RSpec.describe Disputes::AppealsController do
      let(:strike) { Fabricate(:account_warning, target_account: current_user.account) }
      let(:params) { { strike_id: strike.id, appeal: { text: 'Foo' } } }

-      it 'notifies staff about new appeal and redirects back to strike page', :sidekiq_inline do
+      it 'notifies staff about new appeal and redirects back to strike page', :inline_jobs do
        emails = capture_emails { subject }

        expect(emails.size)
@ -36,7 +36,7 @@ RSpec.describe Disputes::AppealsController do
      let(:strike) { Fabricate(:account_warning, target_account: current_user.account) }
      let(:params) { { strike_id: strike.id, appeal: { text: '' } } }

-      it 'does not send email and renders strike show page', :sidekiq_inline do
+      it 'does not send email and renders strike show page', :inline_jobs do
        emails = capture_emails { subject }

        expect(emails).to be_empty
--- a/spec/controllers/settings/deletes_controller_spec.rb
+++ b/spec/controllers/settings/deletes_controller_spec.rb
@ -50,7 +50,7 @@ describe Settings::DeletesController do
          delete :destroy, params: { form_delete_confirmation: { password: 'petsmoldoggos' } }
        end

-        it 'removes user record and redirects', :aggregate_failures, :sidekiq_inline do
+        it 'removes user record and redirects', :aggregate_failures, :inline_jobs do
          expect(response).to redirect_to '/auth/sign_in'
          expect(User.find_by(id: user.id)).to be_nil
          expect(user.account.reload).to be_suspended
--- a/spec/lib/activitypub/activity/delete_spec.rb
+++ b/spec/lib/activitypub/activity/delete_spec.rb
@ -47,7 +47,7 @@ RSpec.describe ActivityPub::Activity::Delete do
        expect(Status.find_by(id: status.id)).to be_nil
      end

-      it 'sends delete activity to followers of rebloggers', :sidekiq_inline do
+      it 'sends delete activity to followers of rebloggers', :inline_jobs do
        expect(a_request(:post, 'http://example.com/inbox')).to have_been_made.once
      end

--- a/spec/lib/activitypub/activity/move_spec.rb
+++ b/spec/lib/activitypub/activity/move_spec.rb
@ -38,7 +38,7 @@ RSpec.describe ActivityPub::Activity::Move do
      subject.perform
    end

-    context 'when all conditions are met', :sidekiq_inline do
+    context 'when all conditions are met', :inline_jobs do
      it 'sets moved account on old account' do
        expect(old_account.reload.moved_to_account_id).to eq new_account.id
      end
--- a/spec/lib/link_details_extractor_spec.rb
+++ b/spec/lib/link_details_extractor_spec.rb
@ -192,6 +192,35 @@ RSpec.describe LinkDetailsExtractor do

      include_examples 'structured data'
    end
+
+    context 'with author names as array' do
+      let(:ld_json) do
+        {
+          '@context' => 'https://schema.org',
+          '@type' => 'NewsArticle',
+          'headline' => 'A lot of authors',
+          'description' => 'But we decided to cram them into one',
+          'author' => {
+            '@type' => 'Person',
+            'name' => ['Author 1', 'Author 2'],
+          },
+        }.to_json
+      end
+      let(:html) { <<~HTML }
+        <!doctype html>
+        <html>
+        <body>
+          <script type="application/ld+json">
+            #{ld_json}
+          </script>
+        </body>
+        </html>
+      HTML
+
+      it 'joins author names' do
+        expect(subject.author_name).to eq 'Author 1, Author 2'
+      end
+    end
  end

  context 'when Open Graph protocol data is present' do
--- a/spec/models/admin/account_action_spec.rb
+++ b/spec/models/admin/account_action_spec.rb
@ -69,7 +69,7 @@ RSpec.describe Admin::AccountAction do
      end
    end

-    it 'sends email to target account user', :sidekiq_inline do
+    it 'sends email to target account user', :inline_jobs do
      emails = capture_emails { subject }

      expect(emails).to contain_exactly(
--- a/spec/models/custom_emoji_spec.rb
+++ b/spec/models/custom_emoji_spec.rb
@ -2,7 +2,7 @@

 require 'rails_helper'

-RSpec.describe CustomEmoji, :paperclip_processing do
+RSpec.describe CustomEmoji, :attachment_processing do
  describe '#search' do
    subject { described_class.search(search_term) }

--- a/spec/models/media_attachment_spec.rb
+++ b/spec/models/media_attachment_spec.rb
@ -2,7 +2,7 @@

 require 'rails_helper'

-RSpec.describe MediaAttachment, :paperclip_processing do
+RSpec.describe MediaAttachment, :attachment_processing do
  describe 'local?' do
    subject { media_attachment.local? }

--- a/spec/models/status_spec.rb
+++ b/spec/models/status_spec.rb
@ -284,6 +284,41 @@ RSpec.describe Status do
    end
  end

+  describe '#ordered_media_attachments' do
+    let(:status) { Fabricate(:status) }
+
+    let(:first_attachment) { Fabricate(:media_attachment) }
+    let(:second_attachment) { Fabricate(:media_attachment) }
+    let(:last_attachment) { Fabricate(:media_attachment) }
+    let(:extra_attachment) { Fabricate(:media_attachment) }
+
+    before do
+      stub_const('Status::MEDIA_ATTACHMENTS_LIMIT', 3)
+
+      # Add attachments out of order
+      status.media_attachments << second_attachment
+      status.media_attachments << last_attachment
+      status.media_attachments << extra_attachment
+      status.media_attachments << first_attachment
+    end
+
+    context 'when ordered_media_attachment_ids is not set' do
+      it 'returns up to MEDIA_ATTACHMENTS_LIMIT attachments' do
+        expect(status.ordered_media_attachments.size).to eq Status::MEDIA_ATTACHMENTS_LIMIT
+      end
+    end
+
+    context 'when ordered_media_attachment_ids is set' do
+      before do
+        status.update!(ordered_media_attachment_ids: [first_attachment.id, second_attachment.id, last_attachment.id, extra_attachment.id])
+      end
+
+      it 'returns up to MEDIA_ATTACHMENTS_LIMIT attachments in the expected order' do
+        expect(status.ordered_media_attachments).to eq [first_attachment, second_attachment, last_attachment]
+      end
+    end
+  end
+
  describe '.mutes_map' do
    subject { described_class.mutes_map([status.conversation.id], account) }

--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@ -101,7 +101,7 @@ RSpec.describe User do
    end
  end

-  describe 'scopes', :sidekiq_inline do
+  describe 'scopes', :inline_jobs do
    describe 'recent' do
      it 'returns an array of recent users ordered by id' do
        first_user = Fabricate(:user)
@ -507,7 +507,7 @@ RSpec.describe User do
    context 'when user is new' do
      let(:confirmed_at) { nil }

-      it 'confirms user and delivers welcome email', :sidekiq_inline do
+      it 'confirms user and delivers welcome email', :inline_jobs do
        emails = capture_emails { subject }

        expect(user.confirmed_at).to be_present
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@ -120,7 +120,7 @@ RSpec.configure do |config|
  end

  config.around do |example|
-    if example.metadata[:sidekiq_inline] == true
+    if example.metadata[:inline_jobs] == true
      Sidekiq::Testing.inline!
    else
      Sidekiq::Testing.fake!
@ -137,7 +137,7 @@ RSpec.configure do |config|
  end

  config.before do |example|
-    unless example.metadata[:paperclip_processing]
+    unless example.metadata[:attachment_processing]
      allow_any_instance_of(Paperclip::Attachment).to receive(:post_process).and_return(true) # rubocop:disable RSpec/AnyInstance
    end
  end
--- a/spec/requests/api/v1/admin/account_actions_spec.rb
+++ b/spec/requests/api/v1/admin/account_actions_spec.rb
@ -10,7 +10,7 @@ RSpec.describe 'Account actions' do
  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }

  shared_examples 'a successful notification delivery' do
-    it 'notifies the user about the action taken', :sidekiq_inline do
+    it 'notifies the user about the action taken', :inline_jobs do
      emails = capture_emails { subject }

      expect(emails.size)
--- a/spec/requests/api/v1/conversations_spec.rb
+++ b/spec/requests/api/v1/conversations_spec.rb
@ -10,7 +10,7 @@ RSpec.describe 'API V1 Conversations' do

  let(:other) { Fabricate(:user) }

-  describe 'GET /api/v1/conversations', :sidekiq_inline do
+  describe 'GET /api/v1/conversations', :inline_jobs do
    before do
      user.account.follow!(other.account)
      PostStatusService.new.call(other.account, text: 'Hey @alice', visibility: 'direct')
--- a/spec/requests/api/v1/featured_tags_spec.rb
+++ b/spec/requests/api/v1/featured_tags_spec.rb
@ -147,7 +147,7 @@ RSpec.describe 'FeaturedTags' do
      expect(body).to be_empty
    end

-    it 'deletes the featured tag', :sidekiq_inline do
+    it 'deletes the featured tag', :inline_jobs do
      delete "/api/v1/featured_tags/#{id}", headers: headers

      featured_tag = FeaturedTag.find_by(id: id)
--- a/spec/requests/api/v1/media_spec.rb
+++ b/spec/requests/api/v1/media_spec.rb
@ -121,19 +121,19 @@ RSpec.describe 'Media' do
      end
    end

-    context 'with image/jpeg', :paperclip_processing do
+    context 'with image/jpeg', :attachment_processing do
      let(:params) { { file: fixture_file_upload('attachment.jpg', 'image/jpeg'), description: 'jpeg image' } }

      it_behaves_like 'a successful media upload', 'image'
    end

-    context 'with image/gif', :paperclip_processing do
+    context 'with image/gif', :attachment_processing do
      let(:params) { { file: fixture_file_upload('attachment.gif', 'image/gif') } }

      it_behaves_like 'a successful media upload', 'image'
    end

-    context 'with video/webm', :paperclip_processing do
+    context 'with video/webm', :attachment_processing do
      let(:params) { { file: fixture_file_upload('attachment.webm', 'video/webm') } }

      it_behaves_like 'a successful media upload', 'gifv'
--- a/spec/requests/api/v1/notifications/policies_spec.rb
+++ b/spec/requests/api/v1/notifications/policies_spec.rb
@ -8,7 +8,7 @@ RSpec.describe 'Policies' do
  let(:scopes)  { 'read:notifications write:notifications' }
  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }

-  describe 'GET /api/v1/notifications/policy', :sidekiq_inline do
+  describe 'GET /api/v1/notifications/policy', :inline_jobs do
    subject do
      get '/api/v1/notifications/policy', headers: headers, params: params
    end
--- a/spec/requests/api/v1/notifications/requests_spec.rb
+++ b/spec/requests/api/v1/notifications/requests_spec.rb
@ -8,7 +8,7 @@ RSpec.describe 'Requests' do
  let(:scopes)  { 'read:notifications write:notifications' }
  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }

-  describe 'GET /api/v1/notifications/requests', :sidekiq_inline do
+  describe 'GET /api/v1/notifications/requests', :inline_jobs do
    subject do
      get '/api/v1/notifications/requests', headers: headers, params: params
    end
--- a/spec/requests/api/v1/notifications_spec.rb
+++ b/spec/requests/api/v1/notifications_spec.rb
@ -8,7 +8,7 @@ RSpec.describe 'Notifications' do
  let(:scopes)  { 'read:notifications write:notifications' }
  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }

-  describe 'GET /api/v1/notifications', :sidekiq_inline do
+  describe 'GET /api/v1/notifications', :inline_jobs do
    subject do
      get '/api/v1/notifications', headers: headers, params: params
    end
--- a/spec/requests/api/v1/reports_spec.rb
+++ b/spec/requests/api/v1/reports_spec.rb
@ -33,7 +33,7 @@ RSpec.describe 'Reports' do

    it_behaves_like 'forbidden for wrong scope', 'read read:reports'

-    it 'creates a report', :aggregate_failures, :sidekiq_inline do
+    it 'creates a report', :aggregate_failures, :inline_jobs do
      emails = capture_emails { subject }

      expect(response).to have_http_status(200)
--- a/spec/requests/api/v1/statuses/favourites_spec.rb
+++ b/spec/requests/api/v1/statuses/favourites_spec.rb
@ -2,7 +2,7 @@

 require 'rails_helper'

-RSpec.describe 'Favourites', :sidekiq_inline do
+RSpec.describe 'Favourites', :inline_jobs do
  let(:user)    { Fabricate(:user) }
  let(:scopes)  { 'write:favourites' }
  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
--- a/spec/requests/api/v1/statuses/reblogs_spec.rb
+++ b/spec/requests/api/v1/statuses/reblogs_spec.rb
@ -41,7 +41,7 @@ describe 'API V1 Statuses Reblogs' do
      end
    end

-    describe 'POST /api/v1/statuses/:status_id/unreblog', :sidekiq_inline do
+    describe 'POST /api/v1/statuses/:status_id/unreblog', :inline_jobs do
      context 'with public status' do
        let(:status) { Fabricate(:status, account: user.account) }

--- a/spec/requests/api/v1/timelines/home_spec.rb
+++ b/spec/requests/api/v1/timelines/home_spec.rb
@ -2,7 +2,7 @@

 require 'rails_helper'

-describe 'Home', :sidekiq_inline do
+describe 'Home', :inline_jobs do
  let(:user)    { Fabricate(:user) }
  let(:scopes)  { 'read:statuses' }
  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
--- a/spec/requests/api/v2/media_spec.rb
+++ b/spec/requests/api/v2/media_spec.rb
@ -2,7 +2,7 @@

 require 'rails_helper'

-RSpec.describe 'Media API', :paperclip_processing do
+RSpec.describe 'Media API', :attachment_processing do
  let(:user)    { Fabricate(:user) }
  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
  let(:scopes)  { 'write' }
--- a/spec/requests/api/v2_alpha/notifications_spec.rb
+++ b/spec/requests/api/v2_alpha/notifications_spec.rb
@ -8,7 +8,7 @@ RSpec.describe 'Notifications' do
  let(:scopes)  { 'read:notifications write:notifications' }
  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }

-  describe 'GET /api/v2_alpha/notifications', :sidekiq_inline do
+  describe 'GET /api/v2_alpha/notifications', :inline_jobs do
    subject do
      get '/api/v2_alpha/notifications', headers: headers, params: params
    end
--- a/spec/search/models/concerns/account/statuses_search_spec.rb
+++ b/spec/search/models/concerns/account/statuses_search_spec.rb
@ -2,7 +2,7 @@

 require 'rails_helper'

-describe Account::StatusesSearch, :sidekiq_inline do
+describe Account::StatusesSearch, :inline_jobs do
  describe 'a non-indexable account becoming indexable' do
    let(:account) { Account.find_by(username: 'search_test_account_1') }

--- a/spec/services/activitypub/fetch_remote_status_service_spec.rb
+++ b/spec/services/activitypub/fetch_remote_status_service_spec.rb
@ -225,7 +225,7 @@ RSpec.describe ActivityPub::FetchRemoteStatusService do
    end
  end

-  context 'with statuses referencing other statuses', :sidekiq_inline do
+  context 'with statuses referencing other statuses', :inline_jobs do
    before do
      stub_const 'ActivityPub::FetchRemoteStatusService::DISCOVERIES_PER_REQUEST', 5
    end
--- a/spec/services/activitypub/process_account_service_spec.rb
+++ b/spec/services/activitypub/process_account_service_spec.rb
@ -224,7 +224,7 @@ RSpec.describe ActivityPub::ProcessAccountService do
      end
    end

-    it 'creates accounts without exceeding rate limit', :sidekiq_inline do
+    it 'creates accounts without exceeding rate limit', :inline_jobs do
      expect { subject.call('user1', 'foo.test', payload) }
        .to create_some_remote_accounts
        .and create_fewer_than_rate_limit_accounts
--- a/spec/services/appeal_service_spec.rb
+++ b/spec/services/appeal_service_spec.rb
@ -2,7 +2,7 @@

 require 'rails_helper'

-RSpec.describe AppealService, :sidekiq_inline do
+RSpec.describe AppealService, :inline_jobs do
  describe '#call' do
    let!(:admin) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }

--- a/spec/services/authorize_follow_service_spec.rb
+++ b/spec/services/authorize_follow_service_spec.rb
@ -41,7 +41,7 @@ RSpec.describe AuthorizeFollowService do
      expect(bob.following?(sender)).to be true
    end

-    it 'sends an accept activity', :sidekiq_inline do
+    it 'sends an accept activity', :inline_jobs do
      expect(a_request(:post, bob.inbox_url)).to have_been_made.once
    end
  end
--- a/spec/services/batched_remove_status_service_spec.rb
+++ b/spec/services/batched_remove_status_service_spec.rb
@ -2,7 +2,7 @@

 require 'rails_helper'

-RSpec.describe BatchedRemoveStatusService, :sidekiq_inline do
+RSpec.describe BatchedRemoveStatusService, :inline_jobs do
  subject { described_class.new }

  let!(:alice)  { Fabricate(:account) }
--- a/spec/services/block_domain_service_spec.rb
+++ b/spec/services/block_domain_service_spec.rb
@ -49,7 +49,7 @@ RSpec.describe BlockDomainService do
  end

  describe 'for a silence with reject media' do
-    it 'does not mark the domain as blocked, but silences accounts with an appropriate silencing date, clears media', :aggregate_failures, :sidekiq_inline do
+    it 'does not mark the domain as blocked, but silences accounts with an appropriate silencing date, clears media', :aggregate_failures, :inline_jobs do
      subject.call(DomainBlock.create!(domain: 'evil.org', severity: :silence, reject_media: true))

      expect(DomainBlock.blocked?('evil.org')).to be false
--- a/spec/services/block_service_spec.rb
+++ b/spec/services/block_service_spec.rb
@ -33,7 +33,7 @@ RSpec.describe BlockService do
      expect(sender.blocking?(bob)).to be true
    end

-    it 'sends a block activity', :sidekiq_inline do
+    it 'sends a block activity', :inline_jobs do
      expect(a_request(:post, 'http://example.com/inbox')).to have_been_made.once
    end
  end
--- a/spec/services/delete_account_service_spec.rb
+++ b/spec/services/delete_account_service_spec.rb
@ -62,7 +62,7 @@ RSpec.describe DeleteAccountService do
    end
  end

-  describe '#call on local account', :sidekiq_inline do
+  describe '#call on local account', :inline_jobs do
    before do
      stub_request(:post, remote_alice.inbox_url).to_return(status: 201)
      stub_request(:post, remote_bob.inbox_url).to_return(status: 201)
@ -83,7 +83,7 @@ RSpec.describe DeleteAccountService do
    end
  end

-  describe '#call on remote account', :sidekiq_inline do
+  describe '#call on remote account', :inline_jobs do
    before do
      stub_request(:post, account.inbox_url).to_return(status: 201)
    end
--- a/spec/services/fan_out_on_write_service_spec.rb
+++ b/spec/services/fan_out_on_write_service_spec.rb
@ -38,7 +38,7 @@ RSpec.describe FanOutOnWriteService do
      expect(home_feed_of(alice)).to include status.id
    end

-    it 'is added to the home feed of a follower', :sidekiq_inline do
+    it 'is added to the home feed of a follower', :inline_jobs do
      expect(home_feed_of(bob)).to include status.id
      expect(home_feed_of(tom)).to include status.id
    end
@ -62,7 +62,7 @@ RSpec.describe FanOutOnWriteService do
      expect(home_feed_of(alice)).to include status.id
    end

-    it 'is added to the home feed of the mentioned follower', :sidekiq_inline do
+    it 'is added to the home feed of the mentioned follower', :inline_jobs do
      expect(home_feed_of(bob)).to include status.id
    end

@ -83,7 +83,7 @@ RSpec.describe FanOutOnWriteService do
      expect(home_feed_of(alice)).to include status.id
    end

-    it 'is added to the home feed of a follower', :sidekiq_inline do
+    it 'is added to the home feed of a follower', :inline_jobs do
      expect(home_feed_of(bob)).to include status.id
      expect(home_feed_of(tom)).to include status.id
    end
@ -101,7 +101,7 @@ RSpec.describe FanOutOnWriteService do
      expect(home_feed_of(alice)).to include status.id
    end

-    it 'is added to the home feed of the mentioned follower', :sidekiq_inline do
+    it 'is added to the home feed of the mentioned follower', :inline_jobs do
      expect(home_feed_of(bob)).to include status.id
    end

--- a/spec/services/favourite_service_spec.rb
+++ b/spec/services/favourite_service_spec.rb
@ -33,7 +33,7 @@ RSpec.describe FavouriteService do
      expect(status.favourites.first).to_not be_nil
    end

-    it 'sends a like activity', :sidekiq_inline do
+    it 'sends a like activity', :inline_jobs do
      expect(a_request(:post, 'http://example.com/inbox')).to have_been_made.once
    end
  end
--- a/spec/services/follow_service_spec.rb
+++ b/spec/services/follow_service_spec.rb
@ -150,7 +150,7 @@ RSpec.describe FollowService do
      expect(FollowRequest.find_by(account: sender, target_account: bob)).to_not be_nil
    end

-    it 'sends a follow activity to the inbox', :sidekiq_inline do
+    it 'sends a follow activity to the inbox', :inline_jobs do
      expect(a_request(:post, 'http://example.com/inbox')).to have_been_made.once
    end
  end
--- a/spec/services/import_service_spec.rb
+++ b/spec/services/import_service_spec.rb
@ -2,7 +2,7 @@

 require 'rails_helper'

-RSpec.describe ImportService, :sidekiq_inline do
+RSpec.describe ImportService, :inline_jobs do
  include RoutingHelper

  let!(:account) { Fabricate(:account, locked: false) }
--- a/spec/services/mute_service_spec.rb
+++ b/spec/services/mute_service_spec.rb
@ -17,7 +17,7 @@ RSpec.describe MuteService do
      redis.del(home_timeline_key)
    end

-    it "clears account's statuses", :sidekiq_inline do
+    it "clears account's statuses", :inline_jobs do
      FeedManager.instance.push_to_home(account, status)
      FeedManager.instance.push_to_home(account, other_account_status)

--- a/spec/services/notify_service_spec.rb
+++ b/spec/services/notify_service_spec.rb
@ -105,7 +105,7 @@ RSpec.describe NotifyService do
    context 'when email notification is enabled' do
      let(:enabled) { true }

-      it 'sends email', :sidekiq_inline do
+      it 'sends email', :inline_jobs do
        emails = capture_emails { subject }

        expect(emails.size)
--- a/spec/services/reject_follow_service_spec.rb
+++ b/spec/services/reject_follow_service_spec.rb
@ -41,7 +41,7 @@ RSpec.describe RejectFollowService do
      expect(bob.following?(sender)).to be false
    end

-    it 'sends a reject activity', :sidekiq_inline do
+    it 'sends a reject activity', :inline_jobs do
      expect(a_request(:post, bob.inbox_url)).to have_been_made.once
    end
  end
--- a/spec/services/remove_from_followers_service_spec.rb
+++ b/spec/services/remove_from_followers_service_spec.rb
@ -33,7 +33,7 @@ RSpec.describe RemoveFromFollowersService do
      expect(bob.followed_by?(sender)).to be false
    end

-    it 'sends a reject activity', :sidekiq_inline do
+    it 'sends a reject activity', :inline_jobs do
      expect(a_request(:post, sender.inbox_url)).to have_been_made.once
    end
  end
--- a/spec/services/remove_status_service_spec.rb
+++ b/spec/services/remove_status_service_spec.rb
@ -2,7 +2,7 @@

 require 'rails_helper'

-RSpec.describe RemoveStatusService, :sidekiq_inline do
+RSpec.describe RemoveStatusService, :inline_jobs do
  subject { described_class.new }

  let!(:alice)  { Fabricate(:account) }
--- a/spec/services/report_service_spec.rb
+++ b/spec/services/report_service_spec.rb
@ -23,7 +23,7 @@ RSpec.describe ReportService do
      stub_request(:post, 'http://example.com/inbox').to_return(status: 200)
    end

-    context 'when forward is true', :sidekiq_inline do
+    context 'when forward is true', :inline_jobs do
      let(:forward) { true }

      it 'sends ActivityPub payload when forward is true' do
--- a/spec/services/resolve_account_service_spec.rb
+++ b/spec/services/resolve_account_service_spec.rb
@ -195,7 +195,7 @@ RSpec.describe ResolveAccountService do
      expect(account.uri).to eq 'https://ap.example.com/users/foo'
    end

-    it 'merges accounts', :sidekiq_inline do
+    it 'merges accounts', :inline_jobs do
      account = subject.call('foo@ap.example.com')

      expect(status.reload.account_id).to eq account.id
--- a/spec/services/suspend_account_service_spec.rb
+++ b/spec/services/suspend_account_service_spec.rb
@ -2,7 +2,7 @@

 require 'rails_helper'

-RSpec.describe SuspendAccountService, :sidekiq_inline do
+RSpec.describe SuspendAccountService, :inline_jobs do
  shared_examples 'common behavior' do
    subject { described_class.new.call(account) }

--- a/spec/services/unallow_domain_service_spec.rb
+++ b/spec/services/unallow_domain_service_spec.rb
@ -13,7 +13,7 @@ RSpec.describe UnallowDomainService do
  let!(:already_banned_account) { Fabricate(:account, username: 'badguy', domain: bad_domain, suspended: true, silenced: true) }
  let!(:domain_allow) { Fabricate(:domain_allow, domain: bad_domain) }

-  context 'with limited federation mode', :sidekiq_inline do
+  context 'with limited federation mode', :inline_jobs do
    before do
      allow(Rails.configuration.x).to receive(:limited_federation_mode).and_return(true)
    end
--- a/spec/services/unblock_service_spec.rb
+++ b/spec/services/unblock_service_spec.rb
@ -33,7 +33,7 @@ RSpec.describe UnblockService do
      expect(sender.blocking?(bob)).to be false
    end

-    it 'sends an unblock activity', :sidekiq_inline do
+    it 'sends an unblock activity', :inline_jobs do
      expect(a_request(:post, 'http://example.com/inbox')).to have_been_made.once
    end
  end
--- a/spec/services/unfollow_service_spec.rb
+++ b/spec/services/unfollow_service_spec.rb
@ -20,7 +20,7 @@ RSpec.describe UnfollowService do
    end
  end

-  describe 'remote ActivityPub', :sidekiq_inline do
+  describe 'remote ActivityPub', :inline_jobs do
    let(:bob) { Fabricate(:account, username: 'bob', protocol: :activitypub, domain: 'example.com', inbox_url: 'http://example.com/inbox') }

    before do
@ -38,7 +38,7 @@ RSpec.describe UnfollowService do
    end
  end

-  describe 'remote ActivityPub (reverse)', :sidekiq_inline do
+  describe 'remote ActivityPub (reverse)', :inline_jobs do
    let(:bob) { Fabricate(:account, username: 'bob', protocol: :activitypub, domain: 'example.com', inbox_url: 'http://example.com/inbox') }

    before do
--- a/spec/services/unsuspend_account_service_spec.rb
+++ b/spec/services/unsuspend_account_service_spec.rb
@ -45,7 +45,7 @@ RSpec.describe UnsuspendAccountService do
        remote_follower.follow!(account)
      end

-      it 'merges back into feeds of local followers and sends update', :sidekiq_inline do
+      it 'merges back into feeds of local followers and sends update', :inline_jobs do
        subject

        expect_feeds_merged
--- a/spec/services/update_account_service_spec.rb
+++ b/spec/services/update_account_service_spec.rb
@ -5,7 +5,7 @@ require 'rails_helper'
 RSpec.describe UpdateAccountService do
  subject { described_class.new }

-  describe 'switching form locked to unlocked accounts', :sidekiq_inline do
+  describe 'switching form locked to unlocked accounts', :inline_jobs do
    let(:account) { Fabricate(:account, locked: true) }
    let(:alice)   { Fabricate(:account) }
    let(:bob)     { Fabricate(:account) }
--- a/spec/support/examples/models/concerns/account_avatar.rb
+++ b/spec/support/examples/models/concerns/account_avatar.rb
@ -1,7 +1,7 @@
 # frozen_string_literal: true

 shared_examples 'AccountAvatar' do |fabricator|
-  describe 'static avatars', :paperclip_processing do
+  describe 'static avatars', :attachment_processing do
    describe 'when GIF' do
      it 'creates a png static style' do
        account = Fabricate(fabricator, avatar: attachment_fixture('avatar.gif'))
@ -17,7 +17,7 @@ shared_examples 'AccountAvatar' do |fabricator|
    end
  end

-  describe 'base64-encoded files', :paperclip_processing do
+  describe 'base64-encoded files', :attachment_processing do
    let(:base64_attachment) { "data:image/jpeg;base64,#{Base64.encode64(attachment_fixture('attachment.jpg').read)}" }
    let(:account) { Fabricate(fabricator, avatar: base64_attachment) }

--- a/spec/support/examples/models/concerns/account_header.rb
+++ b/spec/support/examples/models/concerns/account_header.rb
@ -1,7 +1,7 @@
 # frozen_string_literal: true

 shared_examples 'AccountHeader' do |fabricator|
-  describe 'base64-encoded files', :paperclip_processing do
+  describe 'base64-encoded files', :attachment_processing do
    let(:base64_attachment) { "data:image/jpeg;base64,#{Base64.encode64(attachment_fixture('attachment.jpg').read)}" }
    let(:account) { Fabricate(fabricator, header: base64_attachment) }

--- a/spec/system/admin/accounts_spec.rb
+++ b/spec/system/admin/accounts_spec.rb
@ -48,7 +48,7 @@ describe 'Admin::Accounts' do
      end
    end

-    context 'with action of `reject`', :sidekiq_inline do
+    context 'with action of `reject`', :inline_jobs do
      it 'rejects and removes the account' do
        batch_checkbox_for(unapproved_user_account).check

--- a/spec/system/new_statuses_spec.rb
+++ b/spec/system/new_statuses_spec.rb
@ -2,7 +2,7 @@

 require 'rails_helper'

-describe 'NewStatuses', :js, :sidekiq_inline, :streaming do
+describe 'NewStatuses', :inline_jobs, :js, :streaming do
  include ProfileStories

  subject { page }
--- a/spec/system/ocr_spec.rb
+++ b/spec/system/ocr_spec.rb
@ -2,7 +2,7 @@

 require 'rails_helper'

-describe 'OCR', :js, :paperclip_processing, :sidekiq_inline, :streaming do
+describe 'OCR', :attachment_processing, :inline_jobs, :js, :streaming do
  include ProfileStories

  let(:email)               { 'test@example.com' }
--- a/Show More
+++ b/Show More