Merge branch 'refs/heads/glitch-soc' into develop

.devcontainer/Dockerfile

@@ -1,20 +1,15 @@
 # For details, see https://github.com/devcontainers/images/tree/main/src/ruby
-FROM mcr.microsoft.com/devcontainers/ruby:1-3.2-bullseye
+FROM mcr.microsoft.com/devcontainers/ruby:1-3.3-bookworm
 
-# Install Rails
-# RUN gem install rails webdrivers
+# Install node version from .nvmrc
+WORKDIR /app
+COPY .nvmrc .
+RUN /bin/bash --login -i -c "nvm install"
 
-ARG NODE_VERSION="20"
-RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"
+# Install additional OS packages
+RUN apt-get update && \
+    export DEBIAN_FRONTEND=noninteractive && \
+    apt-get -y install --no-install-recommends libicu-dev libidn11-dev ffmpeg imagemagick libvips42 libpam-dev
 
-# [Optional] Uncomment this section to install additional OS packages.
-RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
-    && apt-get -y install --no-install-recommends libicu-dev libidn11-dev ffmpeg imagemagick libpam-dev
-
-# [Optional] Uncomment this line to install additional gems.
-RUN gem install foreman
-
-# [Optional] Uncomment this line to install global node packages.
-RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && corepack enable" 2>&1
-
-COPY welcome-message.txt /usr/local/etc/vscode-dev-containers/first-run-notice.txt
+# Move welcome message to where VS Code expects it
+COPY .devcontainer/welcome-message.txt /usr/local/etc/vscode-dev-containers/first-run-notice.txt

.devcontainer/codespaces/devcontainer.json

@@ -1,6 +1,6 @@
 {
   "name": "Mastodon on GitHub Codespaces",
-  "dockerComposeFile": "../docker-compose.yml",
+  "dockerComposeFile": "../compose.yaml",
   "service": "app",
   "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
 
@@ -23,6 +23,8 @@
     }
   },
 
+  "remoteUser": "root",
+
   "otherPortsAttributes": {
     "onAutoForward": "silent"
   },
@@ -37,7 +39,7 @@
   },
 
   "onCreateCommand": "git config --global --add safe.directory ${containerWorkspaceFolder}",
-  "postCreateCommand": ".devcontainer/post-create.sh",
+  "postCreateCommand": "bin/setup",
   "waitFor": "postCreateCommand",
 
   "customizations": {

.devcontainer/compose.yaml

@@ -1,13 +1,11 @@
-version: '3'
-
 services:
   app:
     working_dir: /workspaces/mastodon/
     build:
-      context: .
-      dockerfile: Dockerfile
+      context: ..
+      dockerfile: .devcontainer/Dockerfile
     volumes:
-      - ../..:/workspaces:cached
+      - ..:/workspaces/mastodon:cached
     environment:
       RAILS_ENV: development
       NODE_ENV: development

.devcontainer/devcontainer.json

@@ -1,6 +1,6 @@
 {
   "name": "Mastodon on local machine",
-  "dockerComposeFile": "docker-compose.yml",
+  "dockerComposeFile": "compose.yaml",
   "service": "app",
   "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
 
@@ -23,12 +23,14 @@
     }
   },
 
+  "remoteUser": "root",
+
   "otherPortsAttributes": {
     "onAutoForward": "silent"
   },
 
   "onCreateCommand": "git config --global --add safe.directory ${containerWorkspaceFolder}",
-  "postCreateCommand": ".devcontainer/post-create.sh",
+  "postCreateCommand": "bin/setup",
   "waitFor": "postCreateCommand",
 
   "customizations": {

.devcontainer/post-create.sh

@@ -1,27 +0,0 @@
-#!/bin/bash
-
-set -e # Fail the whole script on first error
-
-# Fetch Ruby gem dependencies
-bundle config path 'vendor/bundle'
-bundle config with 'development test'
-bundle install
-
-# Make Gemfile.lock pristine again
-git checkout -- Gemfile.lock
-
-# Fetch Javascript dependencies
-corepack prepare
-yarn install --immutable
-
-# [re]create, migrate, and seed the test database
-RAILS_ENV=test ./bin/rails db:setup
-
-# [re]create, migrate, and seed the development database
-RAILS_ENV=development ./bin/rails db:setup
-
-# Precompile assets for development
-RAILS_ENV=development ./bin/rails assets:precompile
-
-# Precompile assets for test
-RAILS_ENV=test ./bin/rails assets:precompile

.devcontainer/welcome-message.txt

@@ -1,8 +1,7 @@
-👋 Welcome to "Mastodon" in GitHub Codespaces!
+👋 Welcome to your Mastodon Dev Container!
 
 🛠️ Your environment is fully setup with all the required software.
 
-🔍 To explore VS Code to its fullest, search using the Command Palette (Cmd/Ctrl + Shift + P or F1).
-
-📝 Edit away, run your app as usual, and we'll automatically make it available for you to access.
+💥 Run `bin/dev` to start the application processes.
 
+🥼 Run `RAILS_ENV=test bin/rails assets:precompile && RAILS_ENV=test bin/rspec` to run the test suite.

.github/actions/setup-ruby/action.yml

@@ -14,7 +14,7 @@ runs:
       shell: bash
       run: |
         sudo apt-get update
-        sudo apt-get install -y libicu-dev libidn11-dev ${{ inputs.additional-system-dependencies }}
+        sudo apt-get install -y libicu-dev libidn11-dev libvips42 ${{ inputs.additional-system-dependencies }}
 
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1

.github/codecov.yml

@@ -3,9 +3,9 @@ coverage:
   status:
     project:
       default:
-        # Github status check is not blocking
+        # GitHub status check is not blocking
         informational: true
     patch:
       default:
-        # Github status check is not blocking
+        # GitHub status check is not blocking
         informational: true

.github/renovate.json5

@@ -2,6 +2,7 @@
   $schema: 'https://docs.renovatebot.com/renovate-schema.json',
   extends: [
     'config:recommended',
+    'customManagers:dockerfileVersions',
     ':labels(dependencies)',
     ':prConcurrentLimitNone', // Remove limit for open PRs at any time.
     ':prHourlyLimit2', // Rate limit PR creation to a maximum of two per hour.
@@ -59,7 +60,7 @@
       dependencyDashboardApproval: true,
     },
     {
-      // Update Github Actions and Docker images weekly
+      // Update GitHub Actions and Docker images weekly
       matchManagers: ['github-actions', 'dockerfile', 'docker-compose'],
       extends: ['schedule:weekly'],
     },

.github/workflows/build-container-image.yml

@@ -68,7 +68,7 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Log in to the Github Container registry
+      - name: Log in to the GitHub Container registry
         if: contains(inputs.push_to_images, 'ghcr.io')
         uses: docker/login-action@v3
         with:

.github/workflows/crowdin-download.yml

@@ -59,13 +59,13 @@ jobs:
           title: 'New Crowdin Translations (automated)'
           author: 'GitHub Actions <noreply@github.com>'
           body: |
-            New Crowdin translations, automated with Github Actions
+            New Crowdin translations, automated with GitHub Actions
 
             See `.github/workflows/crowdin-download.yml`
 
             This PR will be updated every day with new translations.
 
-            Due to a limitation in Github Actions, checks are not running on this PR without manual action.
+            Due to a limitation in GitHub Actions, checks are not running on this PR without manual action.
             If you want to run the checks, then close and re-open it.
           branch: i18n/crowdin/translations
           base: main

.github/workflows/crowdin-upload.yml

@@ -5,13 +5,13 @@ on:
     branches:
       - main
     paths:
-      - crowdin.yml
-      - app/javascript/mastodon/locales/en.json
-      - config/locales/en.yml
-      - config/locales/simple_form.en.yml
-      - config/locales/activerecord.en.yml
-      - config/locales/devise.en.yml
-      - config/locales/doorkeeper.en.yml
+      - crowdin-glitch.yml
+      - app/javascript/flavours/glitch/locales/en.json
+      - config/locales-glitch/en.yml
+      - config/locales-glitch/simple_form.en.yml
+      - config/locales-glitch/activerecord.en.yml
+      - config/locales-glitch/devise.en.yml
+      - config/locales-glitch/doorkeeper.en.yml
       - .github/workflows/crowdin-upload.yml
 
 jobs:

.github/workflows/test-ruby.yml

@@ -133,7 +133,7 @@ jobs:
         uses: ./.github/actions/setup-ruby
         with:
           ruby-version: ${{ matrix.ruby-version}}
-          additional-system-dependencies: ffmpeg imagemagick libpam-dev
+          additional-system-dependencies: ffmpeg libpam-dev
 
       - name: Load database schema
         run: './bin/rails db:create db:schema:load db:seed'
@@ -148,6 +148,93 @@ jobs:
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
+  test-libvips:
+    name: Libvips tests
+    runs-on: ubuntu-24.04
+
+    needs:
+      - build
+
+    services:
+      postgres:
+        image: postgres:14-alpine
+        env:
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_USER: postgres
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 5432:5432
+
+      redis:
+        image: redis:7-alpine
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 6379:6379
+
+    env:
+      DB_HOST: localhost
+      DB_USER: postgres
+      DB_PASS: postgres
+      DISABLE_SIMPLECOV: ${{ matrix.ruby-version != '.ruby-version' }}
+      RAILS_ENV: test
+      ALLOW_NOPAM: true
+      PAM_ENABLED: true
+      PAM_DEFAULT_SERVICE: pam_test
+      PAM_CONTROLLED_SERVICE: pam_test_controlled
+      OIDC_ENABLED: true
+      OIDC_SCOPE: read
+      SAML_ENABLED: true
+      CAS_ENABLED: true
+      BUNDLE_WITH: 'pam_authentication test'
+      GITHUB_RSPEC: ${{ matrix.ruby-version == '.ruby-version' && github.event.pull_request && 'true' }}
+      MASTODON_USE_LIBVIPS: true
+
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby-version:
+          - '3.1'
+          - '3.2'
+          - '.ruby-version'
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/download-artifact@v4
+        with:
+          path: './'
+          name: ${{ github.sha }}
+
+      - name: Expand archived asset artifacts
+        run: |
+          tar xvzf artifacts.tar.gz
+
+      - name: Set up Ruby environment
+        uses: ./.github/actions/setup-ruby
+        with:
+          ruby-version: ${{ matrix.ruby-version}}
+          additional-system-dependencies: ffmpeg libpam-dev libyaml-dev
+
+      - name: Load database schema
+        run: './bin/rails db:create db:schema:load db:seed'
+
+      - run: bin/rspec --tag paperclip_processing
+
+      - name: Upload coverage reports to Codecov
+        if: matrix.ruby-version == '.ruby-version'
+        uses: codecov/codecov-action@v4
+        with:
+          files: coverage/lcov/mastodon.lcov
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+
   test-e2e:
     name: End to End testing
     runs-on: ubuntu-latest
@@ -209,7 +296,7 @@ jobs:
         uses: ./.github/actions/setup-ruby
         with:
           ruby-version: ${{ matrix.ruby-version}}
-          additional-system-dependencies: ffmpeg imagemagick
+          additional-system-dependencies: ffmpeg
 
       - name: Set up Javascript environment
         uses: ./.github/actions/setup-javascript
@@ -329,7 +416,7 @@ jobs:
         uses: ./.github/actions/setup-ruby
         with:
           ruby-version: ${{ matrix.ruby-version}}
-          additional-system-dependencies: ffmpeg imagemagick
+          additional-system-dependencies: ffmpeg
 
       - name: Set up Javascript environment
         uses: ./.github/actions/setup-javascript

.nanoignore

@@ -1,19 +0,0 @@
-.DS_Store
-.git/
-.gitignore
-
-.bundle/
-.cache/
-config/deploy/*
-coverage
-docs/
-.env
-log/*.log
-neo4j/
-node_modules/
-public/assets/
-public/system/
-spec/
-tmp/
-.vagrant/
-vendor/bundle/

.nvmrc

@@ -1 +1 @@
-20.13
+20.14

.ruby-version

@@ -1 +1 @@
-3.3.1
+3.3.2

Dockerfile

@@ -1,5 +1,8 @@
 # syntax=docker/dockerfile:1.7
 
+# This file is designed for production server deployment, not local development work
+# For a containerized local dev environment, see: https://github.com/mastodon/mastodon/blob/main/README.md#docker
+
 # Please see https://docs.docker.com/engine/reference/builder for information about
 # the extended buildx capabilities used in this file.
 # Make sure multiarch TARGETPLATFORM is available for interpolation
@@ -7,22 +10,24 @@
 ARG TARGETPLATFORM=${TARGETPLATFORM}
 ARG BUILDPLATFORM=${BUILDPLATFORM}
 
-# Ruby image to use for base image, change with [--build-arg RUBY_VERSION="3.3.1"]
-ARG RUBY_VERSION="3.3.1"
+# Ruby image to use for base image, change with [--build-arg RUBY_VERSION="3.3.x"]
+# renovate: datasource=docker depName=docker.io/ruby
+ARG RUBY_VERSION="3.3.2"
 # # Node version to use in base image, change with [--build-arg NODE_MAJOR_VERSION="20"]
+# renovate: datasource=node-version depName=node
 ARG NODE_MAJOR_VERSION="20"
 # Debian image to use for base image, change with [--build-arg DEBIAN_VERSION="bookworm"]
 ARG DEBIAN_VERSION="bookworm"
 # Node image to use for base image based on combined variables (ex: 20-bookworm-slim)
 FROM docker.io/node:${NODE_MAJOR_VERSION}-${DEBIAN_VERSION}-slim as node
-# Ruby image to use for base image based on combined variables (ex: 3.3.1-slim-bookworm)
+# Ruby image to use for base image based on combined variables (ex: 3.3.x-slim-bookworm)
 FROM docker.io/ruby:${RUBY_VERSION}-slim-${DEBIAN_VERSION} as ruby
 
 # Resulting version string is vX.X.X-MASTODON_VERSION_PRERELEASE+MASTODON_VERSION_METADATA
 # Example: v4.2.0-nightly.2023.11.09+something
 # Overwrite existence of 'alpha.0' in version.rb [--build-arg MASTODON_VERSION_PRERELEASE="nightly.2023.11.09"]
 ARG MASTODON_VERSION_PRERELEASE=""
-# Append build metadata or fork information to version.rb [--build-arg MASTODON_VERSION_METADATA="something"]
+# Append build metadata or fork information to version.rb [--build-arg MASTODON_VERSION_METADATA="pr-12345"]
 ARG MASTODON_VERSION_METADATA=""
 
 # Allow Ruby on Rails to serve static files
@@ -43,6 +48,8 @@ ENV \
 # Apply Mastodon version information
   MASTODON_VERSION_PRERELEASE="${MASTODON_VERSION_PRERELEASE}" \
   MASTODON_VERSION_METADATA="${MASTODON_VERSION_METADATA}" \
+# Enable libvips
+  MASTODON_USE_LIBVIPS=true \
 # Apply Mastodon static files and YJIT options
   RAILS_SERVE_STATIC_FILES=${RAILS_SERVE_STATIC_FILES} \
   RUBY_YJIT_ENABLE=${RUBY_YJIT_ENABLE} \
@@ -97,7 +104,7 @@ RUN \
     curl \
     ffmpeg \
     file \
-    imagemagick \
+    libvips42 \
     libjemalloc2 \
     patchelf \
     procps \

Gemfile

@@ -23,6 +23,7 @@ gem 'fog-core', '<= 2.4.0'
 gem 'fog-openstack', '~> 1.0', require: false
 gem 'kt-paperclip', '~> 7.2'
 gem 'md-paperclip-azure', '~> 2.2', require: false
+gem 'ruby-vips', '~> 2.2', require: false
 
 gem 'active_model_serializers', '~> 0.10'
 gem 'addressable', '~> 2.8'
@@ -56,7 +57,7 @@ gem 'hiredis', '~> 0.6'
 gem 'htmlentities', '~> 4.3'
 gem 'http', '~> 5.2.0'
 gem 'http_accept_language', '~> 2.1'
-gem 'httplog', '~> 1.6.2'
+gem 'httplog', '~> 1.7.0'
 gem 'i18n'
 gem 'idn-ruby', require: 'idn'
 gem 'inline_svg'
@@ -106,7 +107,7 @@ gem 'private_address_check', '~> 0.5'
 gem 'opentelemetry-api', '~> 1.2.5'
 
 group :opentelemetry do
-  gem 'opentelemetry-exporter-otlp', '~> 0.26.3', require: false
+  gem 'opentelemetry-exporter-otlp', '~> 0.27.0', require: false
   gem 'opentelemetry-instrumentation-active_job', '~> 0.7.1', require: false
   gem 'opentelemetry-instrumentation-active_model_serializers', '~> 0.20.1', require: false
   gem 'opentelemetry-instrumentation-concurrent_ruby', '~> 0.21.2', require: false

Gemfile.lock

@@ -17,35 +17,35 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.1.3.3)
-      actionpack (= 7.1.3.3)
-      activesupport (= 7.1.3.3)
+    actioncable (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.1.3.3)
-      actionpack (= 7.1.3.3)
-      activejob (= 7.1.3.3)
-      activerecord (= 7.1.3.3)
-      activestorage (= 7.1.3.3)
-      activesupport (= 7.1.3.3)
+    actionmailbox (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activejob (= 7.1.3.4)
+      activerecord (= 7.1.3.4)
+      activestorage (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.1.3.3)
-      actionpack (= 7.1.3.3)
-      actionview (= 7.1.3.3)
-      activejob (= 7.1.3.3)
-      activesupport (= 7.1.3.3)
+    actionmailer (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      actionview (= 7.1.3.4)
+      activejob (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.2)
-    actionpack (7.1.3.3)
-      actionview (= 7.1.3.3)
-      activesupport (= 7.1.3.3)
+    actionpack (7.1.3.4)
+      actionview (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       nokogiri (>= 1.8.5)
       racc
       rack (>= 2.2.4)
@@ -53,15 +53,15 @@ GEM
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    actiontext (7.1.3.3)
-      actionpack (= 7.1.3.3)
-      activerecord (= 7.1.3.3)
-      activestorage (= 7.1.3.3)
-      activesupport (= 7.1.3.3)
+    actiontext (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activerecord (= 7.1.3.4)
+      activestorage (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.1.3.3)
-      activesupport (= 7.1.3.3)
+    actionview (7.1.3.4)
+      activesupport (= 7.1.3.4)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
@@ -71,22 +71,22 @@ GEM
       activemodel (>= 4.1)
       case_transform (>= 0.2)
       jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
-    activejob (7.1.3.3)
-      activesupport (= 7.1.3.3)
+    activejob (7.1.3.4)
+      activesupport (= 7.1.3.4)
       globalid (>= 0.3.6)
-    activemodel (7.1.3.3)
-      activesupport (= 7.1.3.3)
-    activerecord (7.1.3.3)
-      activemodel (= 7.1.3.3)
-      activesupport (= 7.1.3.3)
+    activemodel (7.1.3.4)
+      activesupport (= 7.1.3.4)
+    activerecord (7.1.3.4)
+      activemodel (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       timeout (>= 0.4.0)
-    activestorage (7.1.3.3)
-      actionpack (= 7.1.3.3)
-      activejob (= 7.1.3.3)
-      activerecord (= 7.1.3.3)
-      activesupport (= 7.1.3.3)
+    activestorage (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activejob (= 7.1.3.4)
+      activerecord (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       marcel (~> 1.0)
-    activesupport (7.1.3.3)
+    activesupport (7.1.3.4)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -107,17 +107,17 @@ GEM
     attr_required (1.0.2)
     awrence (1.2.1)
     aws-eventstream (1.3.0)
-    aws-partitions (1.929.0)
-    aws-sdk-core (3.196.1)
+    aws-partitions (1.940.0)
+    aws-sdk-core (3.197.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.81.0)
-      aws-sdk-core (~> 3, >= 3.193.0)
+    aws-sdk-kms (1.83.0)
+      aws-sdk-core (~> 3, >= 3.197.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.151.0)
-      aws-sdk-core (~> 3, >= 3.194.0)
+    aws-sdk-s3 (1.152.0)
+      aws-sdk-core (~> 3, >= 3.197.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.8)
     aws-sigv4 (1.8.0)
@@ -174,7 +174,7 @@ GEM
     climate_control (1.2.0)
     cocoon (1.2.15)
     color_diff (0.1)
-    concurrent-ruby (1.2.3)
+    concurrent-ruby (1.3.3)
     connection_pool (2.4.1)
     cose (1.3.0)
       cbor (~> 0.5.9)
@@ -327,7 +327,7 @@ GEM
     http-form_data (2.3.0)
     http_accept_language (2.1.1)
     httpclient (2.8.3)
-    httplog (1.6.3)
+    httplog (1.7.0)
       rack (>= 2.0)
       rainbow (>= 2.0.0)
     i18n (1.14.5)
@@ -430,7 +430,7 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2024.0507)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.6)
+    mini_portile2 (2.8.7)
     minitest (5.23.1)
     msgpack (1.7.2)
     multi_json (1.15.0)
@@ -440,7 +440,7 @@ GEM
       uri
     net-http-persistent (4.0.2)
       connection_pool (~> 2.2)
-    net-imap (0.4.11)
+    net-imap (0.4.12)
       date
       net-protocol
     net-ldap (0.19.0)
@@ -459,7 +459,7 @@ GEM
       concurrent-ruby (~> 1.0, >= 1.0.2)
       sidekiq (>= 3.5)
       statsd-ruby (~> 1.4, >= 1.4.0)
-    oj (3.16.3)
+    oj (3.16.4)
       bigdecimal (>= 3.0)
     omniauth (2.1.2)
       hashie (>= 3.4.6)
@@ -495,7 +495,7 @@ GEM
     opentelemetry-api (1.2.5)
     opentelemetry-common (0.20.1)
       opentelemetry-api (~> 1.0)
-    opentelemetry-exporter-otlp (0.26.3)
+    opentelemetry-exporter-otlp (0.27.0)
       google-protobuf (~> 3.14)
       googleapis-common-protos-types (~> 1.3)
       opentelemetry-api (~> 1.1)
@@ -584,15 +584,15 @@ GEM
       opentelemetry-api (~> 1.0)
     orm_adapter (0.5.0)
     ox (2.14.18)
-    parallel (1.24.0)
-    parser (3.3.1.0)
+    parallel (1.25.1)
+    parser (3.3.2.0)
       ast (~> 2.4.1)
       racc
     parslet (2.0.0)
     pastel (0.8.0)
       tty-color (~> 0.5)
     pg (1.5.6)
-    pghero (3.4.1)
+    pghero (3.5.0)
       activerecord (>= 6)
     premailer (1.23.0)
       addressable
@@ -603,7 +603,7 @@ GEM
       net-smtp
       premailer (~> 1.7, >= 1.7.9)
     private_address_check (0.5.0)
-    propshaft (0.8.0)
+    propshaft (0.9.0)
       actionpack (>= 7.0.0)
       activesupport (>= 7.0.0)
       rack
@@ -640,20 +640,20 @@ GEM
     rackup (1.0.0)
       rack (< 3)
       webrick
-    rails (7.1.3.3)
-      actioncable (= 7.1.3.3)
-      actionmailbox (= 7.1.3.3)
-      actionmailer (= 7.1.3.3)
-      actionpack (= 7.1.3.3)
-      actiontext (= 7.1.3.3)
-      actionview (= 7.1.3.3)
-      activejob (= 7.1.3.3)
-      activemodel (= 7.1.3.3)
-      activerecord (= 7.1.3.3)
-      activestorage (= 7.1.3.3)
-      activesupport (= 7.1.3.3)
+    rails (7.1.3.4)
+      actioncable (= 7.1.3.4)
+      actionmailbox (= 7.1.3.4)
+      actionmailer (= 7.1.3.4)
+      actionpack (= 7.1.3.4)
+      actiontext (= 7.1.3.4)
+      actionview (= 7.1.3.4)
+      activejob (= 7.1.3.4)
+      activemodel (= 7.1.3.4)
+      activerecord (= 7.1.3.4)
+      activestorage (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       bundler (>= 1.15.0)
-      railties (= 7.1.3.3)
+      railties (= 7.1.3.4)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
@@ -668,9 +668,9 @@ GEM
     rails-i18n (7.0.9)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
-    railties (7.1.3.3)
-      actionpack (= 7.1.3.3)
-      activesupport (= 7.1.3.3)
+    railties (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       irb
       rackup (>= 1.0.0)
       rake (>= 12.2)
@@ -692,7 +692,7 @@ GEM
     redlock (1.3.2)
       redis (>= 3.0.0, < 6.0)
     regexp_parser (2.9.2)
-    reline (0.5.7)
+    reline (0.5.8)
       io-console (~> 0.5)
     request_store (1.6.0)
       rack (>= 1.4)
@@ -732,7 +732,7 @@ GEM
       rspec-mocks (~> 3.0)
       sidekiq (>= 5, < 8)
     rspec-support (3.13.1)
-    rubocop (1.64.0)
+    rubocop (1.64.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -745,7 +745,7 @@ GEM
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.31.3)
       parser (>= 3.3.1.0)
-    rubocop-capybara (2.20.0)
+    rubocop-capybara (2.21.0)
       rubocop (~> 1.41)
     rubocop-factory_bot (2.25.1)
       rubocop (~> 1.41)
@@ -757,7 +757,7 @@ GEM
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rspec (2.29.2)
+    rubocop-rspec (2.31.0)
       rubocop (~> 1.40)
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)
@@ -769,6 +769,8 @@ GEM
     ruby-saml (1.16.0)
       nokogiri (>= 1.13.10)
       rexml
+    ruby-vips (2.2.1)
+      ffi (~> 1.12)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
     rufus-scheduler (3.9.1)
@@ -901,7 +903,7 @@ GEM
     xorcist (1.1.3)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.14)
+    zeitwerk (2.6.15)
 
 PLATFORMS
   ruby
@@ -951,7 +953,7 @@ DEPENDENCIES
   htmlentities (~> 4.3)
   http (~> 5.2.0)
   http_accept_language (~> 2.1)
-  httplog (~> 1.6.2)
+  httplog (~> 1.7.0)
   i18n
   i18n-tasks (~> 1.0)
   idn-ruby
@@ -982,7 +984,7 @@ DEPENDENCIES
   omniauth-saml (~> 2.0)
   omniauth_openid_connect (~> 0.6.1)
   opentelemetry-api (~> 1.2.5)
-  opentelemetry-exporter-otlp (~> 0.26.3)
+  opentelemetry-exporter-otlp (~> 0.27.0)
   opentelemetry-instrumentation-active_job (~> 0.7.1)
   opentelemetry-instrumentation-active_model_serializers (~> 0.20.1)
   opentelemetry-instrumentation-concurrent_ruby (~> 0.21.2)
@@ -1029,6 +1031,7 @@ DEPENDENCIES
   rubocop-rspec
   ruby-prof
   ruby-progressbar (~> 1.13)
+  ruby-vips (~> 2.2)
   rubyzip (~> 2.3)
   sanitize (~> 6.0)
   scenic (~> 1.7)
@@ -1056,7 +1059,7 @@ DEPENDENCIES
   xorcist (~> 1.1)
 
 RUBY VERSION
-   ruby 3.3.1p55
+   ruby 3.3.2p78
 
 BUNDLED WITH
-   2.5.9
+   2.5.11

SECURITY.md

@@ -2,7 +2,7 @@
 
 If you believe you've identified a security vulnerability in Mastodon (a bug that allows something to happen that shouldn't be possible), you can either:
 
-- open a [Github security issue on the Mastodon project](https://github.com/mastodon/mastodon/security/advisories/new)
+- open a [GitHub security issue on the Mastodon project](https://github.com/mastodon/mastodon/security/advisories/new)
 - reach us at <security@joinmastodon.org>
 
 You should _not_ report such issues on public GitHub issues or in other public spaces to give us time to publish a fix for the issue without exposing Mastodon's users to increased risk.

Vagrantfile

@@ -151,6 +151,12 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     vb.customize ["modifyvm", :id, "--nictype2", "virtio"]
   end
 
+  config.vm.provider :libvirt do |libvirt|
+    libvirt.cpus = 3
+    libvirt.memory = 8192
+  end
+
+
   # This uses the vagrant-hostsupdater plugin, and lets you
   # access the development site at http://mastodon.local.
   # If you change it, also change it in .env.vagrant before provisioning

app/controllers/api/v1/accounts/credentials_controller.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Api::V1::Accounts::CredentialsController < Api::BaseController
-  before_action -> { doorkeeper_authorize! :read, :'read:accounts', :'read:me' }, except: [:update]
+  before_action -> { doorkeeper_authorize! :profile, :read, :'read:accounts' }, except: [:update]
   before_action -> { doorkeeper_authorize! :write, :'write:accounts' }, only: [:update]
   before_action :require_user!
 

app/controllers/api/v1/accounts/follower_accounts_controller.rb

@@ -60,8 +60,4 @@ class Api::V1::Accounts::FollowerAccountsController < Api::BaseController
   def records_continue?
     @accounts.size == limit_param(DEFAULT_ACCOUNTS_LIMIT)
   end
-
-  def pagination_params(core_params)
-    params.slice(:limit).permit(:limit).merge(core_params)
-  end
 end

app/controllers/api/v1/accounts/following_accounts_controller.rb

@@ -60,8 +60,4 @@ class Api::V1::Accounts::FollowingAccountsController < Api::BaseController
   def records_continue?
     @accounts.size == limit_param(DEFAULT_ACCOUNTS_LIMIT)
   end
-
-  def pagination_params(core_params)
-    params.slice(:limit).permit(:limit).merge(core_params)
-  end
 end

app/controllers/api/v1/admin/canonical_email_blocks_controller.rb

@@ -16,8 +16,6 @@ class Api::V1::Admin::CanonicalEmailBlocksController < Api::BaseController
   after_action :verify_authorized
   after_action :insert_pagination_headers, only: :index
 
-  PAGINATION_PARAMS = %i(limit).freeze
-
   def index
     authorize :canonical_email_block, :index?
     render json: @canonical_email_blocks, each_serializer: REST::Admin::CanonicalEmailBlockSerializer
@@ -80,8 +78,4 @@ class Api::V1::Admin::CanonicalEmailBlocksController < Api::BaseController
   def records_continue?
     @canonical_email_blocks.size == limit_param(LIMIT)
   end
-
-  def pagination_params(core_params)
-    params.slice(*PAGINATION_PARAMS).permit(*PAGINATION_PARAMS).merge(core_params)
-  end
 end

app/controllers/api/v1/admin/domain_allows_controller.rb

@@ -14,8 +14,6 @@ class Api::V1::Admin::DomainAllowsController < Api::BaseController
   after_action :verify_authorized
   after_action :insert_pagination_headers, only: :index
 
-  PAGINATION_PARAMS = %i(limit).freeze
-
   def index
     authorize :domain_allow, :index?
     render json: @domain_allows, each_serializer: REST::Admin::DomainAllowSerializer
@@ -77,10 +75,6 @@ class Api::V1::Admin::DomainAllowsController < Api::BaseController
     @domain_allows.size == limit_param(LIMIT)
   end
 
-  def pagination_params(core_params)
-    params.slice(*PAGINATION_PARAMS).permit(*PAGINATION_PARAMS).merge(core_params)
-  end
-
   def resource_params
     params.permit(:domain)
   end

app/controllers/api/v1/admin/domain_blocks_controller.rb

@@ -14,8 +14,6 @@ class Api::V1::Admin::DomainBlocksController < Api::BaseController
   after_action :verify_authorized
   after_action :insert_pagination_headers, only: :index
 
-  PAGINATION_PARAMS = %i(limit).freeze
-
   def index
     authorize :domain_block, :index?
     render json: @domain_blocks, each_serializer: REST::Admin::DomainBlockSerializer
@@ -93,10 +91,6 @@ class Api::V1::Admin::DomainBlocksController < Api::BaseController
     @domain_blocks.size == limit_param(LIMIT)
   end
 
-  def pagination_params(core_params)
-    params.slice(*PAGINATION_PARAMS).permit(*PAGINATION_PARAMS).merge(core_params)
-  end
-
   def resource_params
     params.permit(:domain, :severity, :reject_media, :reject_reports, :private_comment, :public_comment, :obfuscate)
   end

app/controllers/api/v1/admin/email_domain_blocks_controller.rb

@@ -14,10 +14,6 @@ class Api::V1::Admin::EmailDomainBlocksController < Api::BaseController
   after_action :verify_authorized
   after_action :insert_pagination_headers, only: :index
 
-  PAGINATION_PARAMS = %i(
-    limit
-  ).freeze
-
   def index
     authorize :email_domain_block, :index?
     render json: @email_domain_blocks, each_serializer: REST::Admin::EmailDomainBlockSerializer
@@ -73,8 +69,4 @@ class Api::V1::Admin::EmailDomainBlocksController < Api::BaseController
   def records_continue?
     @email_domain_blocks.size == limit_param(LIMIT)
   end
-
-  def pagination_params(core_params)
-    params.slice(*PAGINATION_PARAMS).permit(*PAGINATION_PARAMS).merge(core_params)
-  end
 end

app/controllers/api/v1/admin/ip_blocks_controller.rb

@@ -14,10 +14,6 @@ class Api::V1::Admin::IpBlocksController < Api::BaseController
   after_action :verify_authorized
   after_action :insert_pagination_headers, only: :index
 
-  PAGINATION_PARAMS = %i(
-    limit
-  ).freeze
-
   def index
     authorize :ip_block, :index?
     render json: @ip_blocks, each_serializer: REST::Admin::IpBlockSerializer
@@ -78,8 +74,4 @@ class Api::V1::Admin::IpBlocksController < Api::BaseController
   def records_continue?
     @ip_blocks.size == limit_param(LIMIT)
   end
-
-  def pagination_params(core_params)
-    params.slice(*PAGINATION_PARAMS).permit(*PAGINATION_PARAMS).merge(core_params)
-  end
 end

app/controllers/api/v1/admin/tags_controller.rb

@@ -12,7 +12,6 @@ class Api::V1::Admin::TagsController < Api::BaseController
   after_action :verify_authorized
 
   LIMIT = 100
-  PAGINATION_PARAMS = %i(limit).freeze
 
   def index
     authorize :tag, :index?
@@ -59,8 +58,4 @@ class Api::V1::Admin::TagsController < Api::BaseController
   def records_continue?
     @tags.size == limit_param(LIMIT)
   end
-
-  def pagination_params(core_params)
-    params.slice(*PAGINATION_PARAMS).permit(*PAGINATION_PARAMS).merge(core_params)
-  end
 end

app/controllers/api/v1/admin/trends/links/preview_card_providers_controller.rb

@@ -12,8 +12,6 @@ class Api::V1::Admin::Trends::Links::PreviewCardProvidersController < Api::BaseC
   after_action :verify_authorized
   after_action :insert_pagination_headers, only: :index
 
-  PAGINATION_PARAMS = %i(limit).freeze
-
   def index
     authorize :preview_card_provider, :index?
 
@@ -57,8 +55,4 @@ class Api::V1::Admin::Trends::Links::PreviewCardProvidersController < Api::BaseC
   def records_continue?
     @providers.size == limit_param(LIMIT)
   end
-
-  def pagination_params(core_params)
-    params.slice(*PAGINATION_PARAMS).permit(*PAGINATION_PARAMS).merge(core_params)
-  end
 end

app/controllers/api/v1/blocks_controller.rb

@@ -43,8 +43,4 @@ class Api::V1::BlocksController < Api::BaseController
   def records_continue?
     paginated_blocks.size == limit_param(DEFAULT_ACCOUNTS_LIMIT)
   end
-
-  def pagination_params(core_params)
-    params.slice(:limit).permit(:limit).merge(core_params)
-  end
 end

app/controllers/api/v1/bookmarks_controller.rb

@@ -46,8 +46,4 @@ class Api::V1::BookmarksController < Api::BaseController
   def records_continue?
     results.size == limit_param(DEFAULT_STATUSES_LIMIT)
   end
-
-  def pagination_params(core_params)
-    params.slice(:limit).permit(:limit).merge(core_params)
-  end
 end

app/controllers/api/v1/conversations_controller.rb

@@ -72,8 +72,4 @@ class Api::V1::ConversationsController < Api::BaseController
   def records_continue?
     @conversations.size == limit_param(LIMIT)
   end
-
-  def pagination_params(core_params)
-    params.slice(:limit).permit(:limit).merge(core_params)
-  end
 end

app/controllers/api/v1/crypto/encrypted_messages_controller.rb

@@ -44,8 +44,4 @@ class Api::V1::Crypto::EncryptedMessagesController < Api::BaseController
   def records_continue?
     @encrypted_messages.size == limit_param(LIMIT)
   end
-
-  def pagination_params(core_params)
-    params.slice(:limit).permit(:limit).merge(core_params)
-  end
 end

app/controllers/api/v1/domain_blocks_controller.rb

@@ -54,10 +54,6 @@ class Api::V1::DomainBlocksController < Api::BaseController
     @blocks.size == limit_param(BLOCK_LIMIT)
   end
 
-  def pagination_params(core_params)
-    params.slice(:limit).permit(:limit).merge(core_params)
-  end
-
   def domain_block_params
     params.permit(:domain)
   end

app/controllers/api/v1/endorsements_controller.rb

@@ -48,10 +48,6 @@ class Api::V1::EndorsementsController < Api::BaseController
     @accounts.size == limit_param(DEFAULT_ACCOUNTS_LIMIT)
   end
 
-  def pagination_params(core_params)
-    params.slice(:limit).permit(:limit).merge(core_params)
-  end
-
   def unlimited?
     params[:limit] == '0'
   end

app/controllers/api/v1/favourites_controller.rb

@@ -46,8 +46,4 @@ class Api::V1::FavouritesController < Api::BaseController
   def records_continue?
     results.size == limit_param(DEFAULT_STATUSES_LIMIT)
   end
-
-  def pagination_params(core_params)
-    params.slice(:limit).permit(:limit).merge(core_params)
-  end
 end

app/controllers/api/v1/follow_requests_controller.rb

@@ -67,8 +67,4 @@ class Api::V1::FollowRequestsController < Api::BaseController
   def records_continue?
     @accounts.size == limit_param(DEFAULT_ACCOUNTS_LIMIT)
   end
-
-  def pagination_params(core_params)
-    params.slice(:limit).permit(:limit).merge(core_params)
-  end
 end

app/controllers/api/v1/followed_tags_controller.rb

@@ -37,8 +37,4 @@ class Api::V1::FollowedTagsController < Api::BaseController
   def records_continue?
     @results.size == limit_param(TAGS_LIMIT)
   end
-
-  def pagination_params(core_params)
-    params.slice(:limit).permit(:limit).merge(core_params)
-  end
 end

app/controllers/api/v1/instances/extended_descriptions_controller.rb

@@ -5,7 +5,7 @@ class Api::V1::Instances::ExtendedDescriptionsController < Api::V1::Instances::B
 
   before_action :set_extended_description
 
-  # Override `current_user` to avoid reading session cookies unless in whitelist mode
+  # Override `current_user` to avoid reading session cookies unless in limited federation mode
   def current_user
     super if limited_federation_mode?
   end

app/controllers/api/v1/instances/peers_controller.rb

@@ -5,7 +5,7 @@ class Api::V1::Instances::PeersController < Api::V1::Instances::BaseController
 
   skip_around_action :set_locale
 
-  # Override `current_user` to avoid reading session cookies unless in whitelist mode
+  # Override `current_user` to avoid reading session cookies unless in limited federation mode
   def current_user
     super if limited_federation_mode?
   end

app/controllers/api/v1/instances/rules_controller.rb

@@ -5,7 +5,7 @@ class Api::V1::Instances::RulesController < Api::V1::Instances::BaseController
 
   before_action :set_rules
 
-  # Override `current_user` to avoid reading session cookies unless in whitelist mode
+  # Override `current_user` to avoid reading session cookies unless in limited federation mode
   def current_user
     super if limited_federation_mode?
   end

app/controllers/api/v1/instances_controller.rb

@@ -6,7 +6,7 @@ class Api::V1::InstancesController < Api::BaseController
 
   vary_by ''
 
-  # Override `current_user` to avoid reading session cookies unless in whitelist mode
+  # Override `current_user` to avoid reading session cookies unless in limited federation mode
   def current_user
     super if limited_federation_mode?
   end

app/controllers/api/v1/lists/accounts_controller.rb

@@ -75,10 +75,6 @@ class Api::V1::Lists::AccountsController < Api::BaseController
     @accounts.size == limit_param(DEFAULT_ACCOUNTS_LIMIT)
   end
 
-  def pagination_params(core_params)
-    params.slice(:limit).permit(:limit).merge(core_params)
-  end
-
   def unlimited?
     params[:limit] == '0'
   end

app/controllers/api/v1/mutes_controller.rb

@@ -43,8 +43,4 @@ class Api::V1::MutesController < Api::BaseController
   def records_continue?
     paginated_mutes.size == limit_param(DEFAULT_ACCOUNTS_LIMIT)
   end
-
-  def pagination_params(core_params)
-    params.slice(:limit).permit(:limit).merge(core_params)
-  end
 end

app/controllers/api/v1/scheduled_statuses_controller.rb

@@ -43,10 +43,6 @@ class Api::V1::ScheduledStatusesController < Api::BaseController
     params.permit(:scheduled_at)
   end
 
-  def pagination_params(core_params)
-    params.slice(:limit).permit(:limit).merge(core_params)
-  end
-
   def next_path
     api_v1_scheduled_statuses_url pagination_params(max_id: pagination_max_id) if records_continue?
   end

app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb

@@ -53,8 +53,4 @@ class Api::V1::Statuses::FavouritedByAccountsController < Api::V1::Statuses::Bas
   def records_continue?
     @accounts.size == limit_param(DEFAULT_ACCOUNTS_LIMIT)
   end
-
-  def pagination_params(core_params)
-    params.slice(:limit).permit(:limit).merge(core_params)
-  end
 end

app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb

@@ -49,8 +49,4 @@ class Api::V1::Statuses::RebloggedByAccountsController < Api::V1::Statuses::Base
   def records_continue?
     @accounts.size == limit_param(DEFAULT_ACCOUNTS_LIMIT)
   end
-
-  def pagination_params(core_params)
-    params.slice(:limit).permit(:limit).merge(core_params)
-  end
 end

app/controllers/api/v1/statuses_controller.rb

@@ -191,8 +191,4 @@ class Api::V1::StatusesController < Api::BaseController
   def serialized_accounts(accounts)
     ActiveModel::Serializer::CollectionSerializer.new(accounts, serializer: REST::AccountSerializer)
   end
-
-  def pagination_params(core_params)
-    params.slice(:limit).permit(:limit).merge(core_params)
-  end
 end

app/controllers/api/v1/timelines/link_controller.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+class Api::V1::Timelines::LinkController < Api::V1::Timelines::BaseController
+  before_action -> { doorkeeper_authorize! :read, :'read:statuses' }, only: :show, if: :require_auth?
+  before_action :set_preview_card
+  before_action :set_statuses
+
+  PERMITTED_PARAMS = %i(
+    url
+    limit
+  ).freeze
+
+  def show
+    cache_if_unauthenticated!
+    render json: @statuses, each_serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id)
+  end
+
+  private
+
+  def require_auth?
+    !Setting.timeline_preview
+  end
+
+  def set_preview_card
+    @preview_card = PreviewCard.joins(:trend).merge(PreviewCardTrend.allowed).find_by!(url: params[:url])
+  end
+
+  def set_statuses
+    @statuses = @preview_card.nil? ? [] : preload_collection(link_timeline_statuses, Status)
+  end
+
+  def link_timeline_statuses
+    link_feed.get(
+      limit_param(DEFAULT_STATUSES_LIMIT),
+      params[:max_id],
+      params[:since_id],
+      params[:min_id]
+    )
+  end
+
+  def link_feed
+    LinkFeed.new(@preview_card, current_account)
+  end
+
+  def next_path
+    api_v1_timelines_link_url next_path_params
+  end
+
+  def prev_path
+    api_v1_timelines_link_url prev_path_params
+  end
+end

app/controllers/api/v1/trends/links_controller.rb

@@ -34,10 +34,6 @@ class Api::V1::Trends::LinksController < Api::BaseController
     scope
   end
 
-  def pagination_params(core_params)
-    params.slice(:limit).permit(:limit).merge(core_params)
-  end
-
   def next_path
     api_v1_trends_links_url pagination_params(offset: offset_param + limit_param(DEFAULT_LINKS_LIMIT)) if records_continue?
   end

app/controllers/api/v1/trends/statuses_controller.rb

@@ -33,10 +33,6 @@ class Api::V1::Trends::StatusesController < Api::BaseController
     scope
   end
 
-  def pagination_params(core_params)
-    params.slice(:limit).permit(:limit).merge(core_params)
-  end
-
   def next_path
     api_v1_trends_statuses_url pagination_params(offset: offset_param + limit_param(DEFAULT_STATUSES_LIMIT)) if records_continue?
   end

app/controllers/api/v1/trends/tags_controller.rb

@@ -30,10 +30,6 @@ class Api::V1::Trends::TagsController < Api::BaseController
     Trends.tags.query.allowed
   end
 
-  def pagination_params(core_params)
-    params.slice(:limit).permit(:limit).merge(core_params)
-  end
-
   def next_path
     api_v1_trends_tags_url pagination_params(offset: offset_param + limit_param(DEFAULT_TAGS_LIMIT)) if records_continue?
   end

app/controllers/api/v2_alpha/notifications_controller.rb

@@ -0,0 +1,91 @@
+# frozen_string_literal: true
+
+class Api::V2Alpha::NotificationsController < Api::BaseController
+  before_action -> { doorkeeper_authorize! :read, :'read:notifications' }, except: [:clear, :dismiss]
+  before_action -> { doorkeeper_authorize! :write, :'write:notifications' }, only: [:clear, :dismiss]
+  before_action :require_user!
+  after_action :insert_pagination_headers, only: :index
+
+  DEFAULT_NOTIFICATIONS_LIMIT = 40
+
+  def index
+    with_read_replica do
+      @notifications = load_notifications
+      @group_metadata = load_group_metadata
+      @relationships = StatusRelationshipsPresenter.new(target_statuses_from_notifications, current_user&.account_id)
+    end
+
+    render json: @notifications.map { |notification| NotificationGroup.from_notification(notification) }, each_serializer: REST::NotificationGroupSerializer, relationships: @relationships, group_metadata: @group_metadata
+  end
+
+  def show
+    @notification = current_account.notifications.without_suspended.find_by!(group_key: params[:id])
+    render json: NotificationGroup.from_notification(@notification), serializer: REST::NotificationGroupSerializer
+  end
+
+  def clear
+    current_account.notifications.delete_all
+    render_empty
+  end
+
+  def dismiss
+    current_account.notifications.where(group_key: params[:id]).destroy_all
+    render_empty
+  end
+
+  private
+
+  def load_notifications
+    notifications = browserable_account_notifications.includes(from_account: [:account_stat, :user]).to_a_grouped_paginated_by_id(
+      limit_param(DEFAULT_NOTIFICATIONS_LIMIT),
+      params_slice(:max_id, :since_id, :min_id)
+    )
+
+    Notification.preload_cache_collection_target_statuses(notifications) do |target_statuses|
+      preload_collection(target_statuses, Status)
+    end
+  end
+
+  def load_group_metadata
+    return {} if @notifications.empty?
+
+    browserable_account_notifications
+      .where(group_key: @notifications.filter_map(&:group_key))
+      .where(id: (@notifications.last.id)..(@notifications.first.id))
+      .group(:group_key)
+      .pluck(:group_key, 'min(notifications.id) as min_id', 'max(notifications.id) as max_id', 'max(notifications.created_at) as latest_notification_at')
+      .to_h { |group_key, min_id, max_id, latest_notification_at| [group_key, { min_id: min_id, max_id: max_id, latest_notification_at: latest_notification_at }] }
+  end
+
+  def browserable_account_notifications
+    current_account.notifications.without_suspended.browserable(
+      types: Array(browserable_params[:types]),
+      exclude_types: Array(browserable_params[:exclude_types]),
+      include_filtered: truthy_param?(:include_filtered)
+    )
+  end
+
+  def target_statuses_from_notifications
+    @notifications.filter_map(&:target_status)
+  end
+
+  def next_path
+    api_v2_alpha_notifications_url pagination_params(max_id: pagination_max_id) unless @notifications.empty?
+  end
+
+  def prev_path
+    api_v2_alpha_notifications_url pagination_params(min_id: pagination_since_id) unless @notifications.empty?
+  end
+
+  def pagination_collection
+    @notifications
+  end
+
+  def browserable_params
+    params.permit(:include_filtered, types: [], exclude_types: [])
+  end
+
+  def pagination_params(core_params)
+    params.slice(:limit, :types, :exclude_types, :include_filtered).permit(:limit, :include_filtered, types: [], exclude_types: []).merge(core_params)
+  end
+end

app/controllers/concerns/api/pagination.rb

@@ -3,6 +3,8 @@
 module Api::Pagination
   extend ActiveSupport::Concern
 
+  PAGINATION_PARAMS = %i(limit).freeze
+
   protected
 
   def pagination_max_id
@@ -24,6 +26,13 @@ module Api::Pagination
     render json: { error: 'Pagination values for `offset` and `limit` must be positive' }, status: 400 if pagination_options_invalid?
   end
 
+  def pagination_params(core_params)
+    params
+      .slice(*PAGINATION_PARAMS)
+      .permit(*PAGINATION_PARAMS)
+      .merge(core_params)
+  end
+
   private
 
   def insert_pagination_headers

app/controllers/settings/applications_controller.rb

@@ -13,7 +13,7 @@ class Settings::ApplicationsController < Settings::BaseController
   def new
     @application = Doorkeeper::Application.new(
       redirect_uri: Doorkeeper.configuration.native_redirect_uri,
-      scopes: 'read:me'
+      scopes: 'profile'
     )
   end
 

app/javascript/flavours/glitch/locales/fr-CA.json

@@ -14,9 +14,15 @@
   "column_subheading.lists": "Listes",
   "column_subheading.navigation": "Navigation",
   "community.column_settings.allow_local_only": "Afficher seulement les posts locaux",
+  "compose.attach.doodle": "Dessinez quelque chose",
+  "compose.change_federation": "Changer les paramètres de fédération",
+  "compose.content-type.change": "Changer les options de mise en forme avancée",
   "compose.content-type.html": "HTML",
+  "compose.content-type.html_meta": "Formatez vos messages en HTML",
   "compose.content-type.markdown": "Markdown",
+  "compose.content-type.markdown_meta": "Formatez vos messages en Markdown",
   "compose.content-type.plain": "Text brut",
+  "compose.content-type.plain_meta": "Écrire sans formatage avancé",
   "compose.disable_threaded_mode": "Désactiver le mode thread",
   "compose.enable_threaded_mode": "Activer le mode thread",
   "confirmation_modal.do_not_ask_again": "Ne plus demander confirmation",
@@ -32,6 +38,10 @@
   "direct.group_by_conversations": "Grouper par conversation",
   "endorsed_accounts_editor.endorsed_accounts": "Comptes mis en avant",
   "favourite_modal.combo": "Vous pouvez appuyer sur {combo} pour passer ceci la prochaine fois",
+  "federation.federated.long": "Permettre à ce post d’atteindre d'autres serveurs",
+  "federation.federated.short": "Fédéré",
+  "federation.local_only.long": "Empêcher ce post d’atteindre d'autres serveurs",
+  "federation.local_only.short": "Local uniquement",
   "firehose.column_settings.allow_local_only": "Afficher les messages locaux dans \"Tous\"",
   "home.column_settings.advanced": "Avancé",
   "home.column_settings.filter_regex": "Filtrer par expression régulière",
@@ -114,6 +124,7 @@
   "settings.shared_settings_link": "préférences de l'utilisateur",
   "settings.show_action_bar": "Afficher les boutons d'action dans les posts repliés",
   "settings.show_content_type_choice": "Afficher le choix du type de contenu lors de la création des posts",
+  "settings.show_published_toast": "Afficher une notification quand un post est envoyé/sauvegardé",
   "settings.show_reply_counter": "Afficher une estimation du nombre de réponses",
   "settings.side_arm": "Bouton secondaire de publication :",
   "settings.side_arm.none": "Aucun",

app/javascript/flavours/glitch/locales/fr.json

@@ -14,9 +14,15 @@
   "column_subheading.lists": "Listes",
   "column_subheading.navigation": "Navigation",
   "community.column_settings.allow_local_only": "Afficher seulement les posts locaux",
+  "compose.attach.doodle": "Dessinez quelque chose",
+  "compose.change_federation": "Changer les paramètres de fédération",
+  "compose.content-type.change": "Changer les options de mise en forme avancée",
   "compose.content-type.html": "HTML",
+  "compose.content-type.html_meta": "Formatez vos messages en HTML",
   "compose.content-type.markdown": "Markdown",
+  "compose.content-type.markdown_meta": "Formatez vos messages en Markdown",
   "compose.content-type.plain": "Text brut",
+  "compose.content-type.plain_meta": "Écrire sans formatage avancé",
   "compose.disable_threaded_mode": "Désactiver le mode thread",
   "compose.enable_threaded_mode": "Activer le mode thread",
   "confirmation_modal.do_not_ask_again": "Ne plus demander confirmation",
@@ -32,6 +38,10 @@
   "direct.group_by_conversations": "Grouper par conversation",
   "endorsed_accounts_editor.endorsed_accounts": "Comptes mis en avant",
   "favourite_modal.combo": "Vous pouvez appuyer sur {combo} pour passer ceci la prochaine fois",
+  "federation.federated.long": "Permettre à ce post d’atteindre d'autres serveurs",
+  "federation.federated.short": "Fédéré",
+  "federation.local_only.long": "Empêcher ce post d’atteindre d'autres serveurs",
+  "federation.local_only.short": "Local uniquement",
   "firehose.column_settings.allow_local_only": "Afficher les messages locaux dans \"Tous\"",
   "home.column_settings.advanced": "Avancé",
   "home.column_settings.filter_regex": "Filtrer par expression régulière",
@@ -65,9 +75,9 @@
   "settings.close": "Fermer",
   "settings.collapsed_statuses": "Posts repliés",
   "settings.compose_box_opts": "Zone de rédaction",
-  "settings.confirm_before_clearing_draft": "Afficher une fenêtre de confirmation avant d'écraser le message en cours de rédaction",
-  "settings.confirm_boost_missing_media_description": "Afficher une fenêtre de confirmation avant de partager des posts manquant de description des médias",
-  "settings.confirm_missing_media_description": "Afficher une fenêtre de confirmation avant de publier des posts manquant de description de média",
+  "settings.confirm_before_clearing_draft": "Demander confirmation avant d’effacer le message en cours de rédaction",
+  "settings.confirm_boost_missing_media_description": "Demander confirmation avant de partager des posts sans description des médias",
+  "settings.confirm_missing_media_description": "Demander confirmation avant de publier des posts sans description des médias",
   "settings.content_warnings": "Content warnings",
   "settings.content_warnings.regexp": "Expression rationnelle",
   "settings.content_warnings_filter": "Avertissement de contenu à ne pas automatiquement déplier :",
@@ -114,6 +124,7 @@
   "settings.shared_settings_link": "préférences de l'utilisateur",
   "settings.show_action_bar": "Afficher les boutons d'action dans les posts repliés",
   "settings.show_content_type_choice": "Afficher le choix du type de contenu lors de la création des posts",
+  "settings.show_published_toast": "Afficher une notification quand un post est envoyé/sauvegardé",
   "settings.show_reply_counter": "Afficher une estimation du nombre de réponses",
   "settings.side_arm": "Bouton secondaire de publication :",
   "settings.side_arm.none": "Aucun",

app/javascript/flavours/glitch/locales/pt-PT.json

@@ -7,6 +7,32 @@
   "boost_modal.missing_description": "Este post contém alguns media sem descrição",
   "column.favourited_by": "Adicionado aos favoritos de",
   "column.heading": "Diversos",
+  "moved_to_warning": "Esta conta mudou-se para {moved_to_link} e, portanto, pode não aceitar novos seguidores.",
+  "navigation_bar.featured_users": "Utilizadores em destaque",
+  "notification.markForDeletion": "Marcada para eliminação",
+  "notification_purge.btn_all": "Seleccionar tudo",
+  "notification_purge.btn_apply": "Limpar Selecionadas",
+  "notification_purge.btn_none": "Desselecionar tudo",
+  "notification_purge.start": "Entrar em modo de limpeza de notificações",
+  "notifications.column_settings.filter_bar.show_bar": "Mostrar barra de filtros",
+  "notifications.marked_clear": "Limpar as notificações selecionadas",
+  "notifications.marked_clear_confirmation": "Tem a certeza que deseja limpar todas as notificações selecionadas permanentemente?",
+  "settings.always_show_spoilers_field": "Mostrar sempre o campo Aviso de Conteúdo",
+  "settings.auto_collapse": "Colapso automático",
+  "settings.auto_collapse_height": "Altura (em pixels) a partir do qual um toot é considerado longo",
+  "settings.auto_collapse_media": "Toots com conteúdo multimédia",
   "settings.content_warnings": "Content warnings",
-  "settings.preferences": "Preferences"
+  "settings.layout_opts": "Disposição do conteúdo",
+  "settings.media": "Conteúdo multimédia",
+  "settings.media_fullwidth": "Pré-visualização a todo o comprimento",
+  "settings.media_reveal_behind_cw": "Mostrar sempre conteúdos com aviso",
+  "settings.notifications.favicon_badge": "Mostrar número de notificações no distintivo da página",
+  "settings.notifications.tab_badge": "Mostrar número de notificações não lidas",
+  "settings.notifications.tab_badge.hint": "Mostra um distintivo com o número de notificações não lidas quando a coluna de notificações não está aberta",
+  "settings.notifications_opts": "Opções de notificação",
+  "settings.pop_in_left": "Esquerda",
+  "settings.pop_in_right": "Direita",
+  "settings.preferences": "Preferences",
+  "settings.prepend_cw_re": "Iniciar respostas a toots com aviso de conteúdo com \"re:\"",
+  "settings.preselect_on_reply": "Pré-seleccionar nomes de utilizador nas respostas"
 }

app/javascript/flavours/glitch/styles/mastodon-light/diff.scss

@@ -513,13 +513,6 @@ html {
   }
 }
 
-.status.collapsed .status__content::after {
-  background: linear-gradient(
-    rgba(darken($ui-base-color, 13%), 0),
-    rgba(darken($ui-base-color, 13%), 1)
-  );
-}
-
 .drawer__inner__mastodon {
   background: $white
     url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 234.80078 31.757813" width="234.80078" height="31.757812"><path d="M19.599609 0c-1.05 0-2.10039.375-2.90039 1.125L0 16.925781v14.832031h234.80078V17.025391l-16.5-15.900391c-1.6-1.5-4.20078-1.5-5.80078 0l-13.80078 13.099609c-1.6 1.5-4.19883 1.5-5.79883 0L179.09961 1.125c-1.6-1.5-4.19883-1.5-5.79883 0L159.5 14.224609c-1.6 1.5-4.20078 1.5-5.80078 0L139.90039 1.125c-1.6-1.5-4.20078-1.5-5.80078 0l-13.79883 13.099609c-1.6 1.5-4.20078 1.5-5.80078 0L100.69922 1.125c-1.600001-1.5-4.198829-1.5-5.798829 0l-13.59961 13.099609c-1.6 1.5-4.200781 1.5-5.800781 0L61.699219 1.125c-1.6-1.5-4.198828-1.5-5.798828 0L42.099609 14.224609c-1.6 1.5-4.198828 1.5-5.798828 0L22.5 1.125C21.7.375 20.649609 0 19.599609 0z" fill="#{hex-color($ui-base-color)}"/></svg>')

app/javascript/mastodon/features/account_timeline/index.jsx

@@ -199,6 +199,7 @@ class AccountTimeline extends ImmutablePureComponent {
           emptyMessage={emptyMessage}
           bindToDocument={!multiColumn}
           timelineId='account'
+          withCounters
         />
       </Column>
     );

app/javascript/mastodon/locales/bg.json

@@ -414,6 +414,7 @@
   "limited_account_hint.action": "Показване на профила въпреки това",
   "limited_account_hint.title": "Този профил е бил скрит от модераторите на {domain}.",
   "link_preview.author": "От {name}",
+  "link_preview.more_from_author": "Още от {name}",
   "lists.account.add": "Добавяне към списък",
   "lists.account.remove": "Премахване от списъка",
   "lists.delete": "Изтриване на списъка",

app/javascript/mastodon/locales/da.json

@@ -221,6 +221,8 @@
   "domain_pill.activitypub_like_language": "ActivityPub er \"sproget\", Mastodon taler med andre sociale netværk.",
   "domain_pill.server": "Server",
   "domain_pill.their_handle": "Vedkommendes handle:",
+  "domain_pill.their_server": "Det digitale hjem, hvor alle indlæggene findes.",
+  "domain_pill.their_username": "Entydig identifikator på denne server. Det er muligt at finde brugere med samme brugernavn på forskellige servere.",
   "domain_pill.username": "Brugernavn",
   "domain_pill.whats_in_a_handle": "Hvad er der i et handle (@brugernavn)?",
   "domain_pill.who_they_are": "Da et handle fortæller, hvem nogen er, og hvor de er, kan man interagere med folk på tværs af det sociale net af <button>ActivityPub-drevne platforme</button>.",
@@ -412,6 +414,7 @@
   "limited_account_hint.action": "Vis profil alligevel",
   "limited_account_hint.title": "Denne profil er blevet skjult af {domain}-moderatorerne.",
   "link_preview.author": "Af {name}",
+  "link_preview.more_from_author": "Mere fra {name}",
   "lists.account.add": "Føj til liste",
   "lists.account.remove": "Fjern fra liste",
   "lists.delete": "Slet liste",

app/javascript/mastodon/locales/de.json

@@ -414,6 +414,7 @@
   "limited_account_hint.action": "Profil trotzdem anzeigen",
   "limited_account_hint.title": "Dieses Profil wurde von den Moderator*innen von {domain} ausgeblendet.",
   "link_preview.author": "Von {name}",
+  "link_preview.more_from_author": "Mehr von {name}",
   "lists.account.add": "Zur Liste hinzufügen",
   "lists.account.remove": "Von der Liste entfernen",
   "lists.delete": "Liste löschen",

app/javascript/mastodon/locales/eo.json

@@ -498,7 +498,14 @@
   "poll_button.add_poll": "Aldoni balotenketon",
   "poll_button.remove_poll": "Forigi balotenketon",
   "privacy.change": "Agordi mesaĝan privatecon",
+  "privacy.direct.long": "Ĉiuj menciitaj en la afiŝo",
+  "privacy.direct.short": "Specifaj homoj",
+  "privacy.private.long": "Nur viaj sekvantoj",
+  "privacy.private.short": "Sekvantoj",
+  "privacy.public.long": "Ĉiujn ajn ĉe kaj ekster Mastodon",
   "privacy.public.short": "Publika",
+  "privacy.unlisted.long": "Malpli algoritmaj fanfaroj",
+  "privacy.unlisted.short": "Diskrete publika",
   "privacy_policy.last_updated": "Laste ĝisdatigita en {date}",
   "privacy_policy.title": "Politiko de privateco",
   "recommended": "Rekomendita",

app/javascript/mastodon/locales/es-MX.json

@@ -414,6 +414,7 @@
   "limited_account_hint.action": "Mostrar perfil de todos modos",
   "limited_account_hint.title": "Este perfil ha sido ocultado por los moderadores de {domain}.",
   "link_preview.author": "Por {name}",
+  "link_preview.more_from_author": "Más de {name}",
   "lists.account.add": "Añadir a lista",
   "lists.account.remove": "Quitar de lista",
   "lists.delete": "Borrar lista",

app/javascript/mastodon/locales/es.json

@@ -414,6 +414,7 @@
   "limited_account_hint.action": "Mostrar perfil de todos modos",
   "limited_account_hint.title": "Este perfil ha sido ocultado por los moderadores de {domain}.",
   "link_preview.author": "Por {name}",
+  "link_preview.more_from_author": "Más de {name}",
   "lists.account.add": "Añadir a lista",
   "lists.account.remove": "Quitar de lista",
   "lists.delete": "Borrar lista",

app/javascript/mastodon/locales/fo.json

@@ -414,6 +414,7 @@
   "limited_account_hint.action": "Vís vangamynd kortini",
   "limited_account_hint.title": "Hesin vangin er fjaldur av kjakleiðarunum á {domain}.",
   "link_preview.author": "Av {name}",
+  "link_preview.more_from_author": "Meira frá {name}",
   "lists.account.add": "Legg afturat lista",
   "lists.account.remove": "Tak av lista",
   "lists.delete": "Strika lista",

app/javascript/mastodon/locales/fr-CA.json

@@ -156,7 +156,7 @@
   "compose_form.poll.duration": "Durée du sondage",
   "compose_form.poll.multiple": "Choix multiple",
   "compose_form.poll.option_placeholder": "Option {number}",
-  "compose_form.poll.single": "Choisissez-en un",
+  "compose_form.poll.single": "Choix unique",
   "compose_form.poll.switch_to_multiple": "Changer le sondage pour autoriser plusieurs choix",
   "compose_form.poll.switch_to_single": "Changer le sondage pour n'autoriser qu'un seul choix",
   "compose_form.poll.type": "Style",
@@ -585,9 +585,9 @@
   "privacy.private.short": "Abonnés",
   "privacy.public.long": "Tout le monde sur et en dehors de Mastodon",
   "privacy.public.short": "Public",
-  "privacy.unlisted.additional": "Cette option se comporte exactement comme l'option publique, sauf que le message n'apparaîtra pas dans les flux en direct, les hashtags, l'exploration ou la recherche Mastodon, même si vous avez opté pour l'option publique pour l'ensemble de votre compte.",
+  "privacy.unlisted.additional": "Se comporte exactement comme « public », sauf que le message n'apparaîtra pas dans les flux en direct, les hashtags, explorer ou la recherche Mastodon, même si vous les avez activé au niveau de votre compte.",
   "privacy.unlisted.long": "Moins de fanfares algorithmiques",
-  "privacy.unlisted.short": "Public calme",
+  "privacy.unlisted.short": "Public discret",
   "privacy_policy.last_updated": "Dernière mise à jour {date}",
   "privacy_policy.title": "Politique de confidentialité",
   "recommended": "Recommandé",

app/javascript/mastodon/locales/fr.json

@@ -156,7 +156,7 @@
   "compose_form.poll.duration": "Durée du sondage",
   "compose_form.poll.multiple": "Choix multiple",
   "compose_form.poll.option_placeholder": "Option {number}",
-  "compose_form.poll.single": "Choisissez-en un",
+  "compose_form.poll.single": "Choix unique",
   "compose_form.poll.switch_to_multiple": "Changer le sondage pour autoriser plusieurs choix",
   "compose_form.poll.switch_to_single": "Modifier le sondage pour autoriser qu'un seul choix",
   "compose_form.poll.type": "Style",
@@ -585,9 +585,9 @@
   "privacy.private.short": "Abonnés",
   "privacy.public.long": "Tout le monde sur et en dehors de Mastodon",
   "privacy.public.short": "Public",
-  "privacy.unlisted.additional": "Cette option se comporte exactement comme l'option publique, sauf que le message n'apparaîtra pas dans les flux en direct, les hashtags, l'exploration ou la recherche Mastodon, même si vous avez opté pour l'option publique pour l'ensemble de votre compte.",
+  "privacy.unlisted.additional": "Se comporte exactement comme « public », sauf que le message n'apparaîtra pas dans les flux en direct, les hashtags, explorer ou la recherche Mastodon, même si vous les avez activé au niveau de votre compte.",
   "privacy.unlisted.long": "Moins de fanfares algorithmiques",
-  "privacy.unlisted.short": "Public calme",
+  "privacy.unlisted.short": "Public discret",
   "privacy_policy.last_updated": "Dernière mise à jour {date}",
   "privacy_policy.title": "Politique de confidentialité",
   "recommended": "Recommandé",

app/javascript/mastodon/locales/fy.json

@@ -89,9 +89,12 @@
   "announcement.announcement": "Oankundiging",
   "attachments_list.unprocessed": "(net ferwurke)",
   "audio.hide": "Audio ferstopje",
+  "block_modal.remote_users_caveat": "Wy freegje de server {domain} om jo beslút te respektearjen. It neilibben hjirfan is echter net garandearre, omdat guon servers blokkaden oars ynterpretearje kinne. Iepenbiere berjochten binne mooglik noch hieltyd sichtber foar net-oanmelde brûkers.",
   "block_modal.show_less": "Minder toane",
   "block_modal.show_more": "Mear toane",
   "block_modal.they_cant_mention": "Sy kinne jo net fermelde of folgje.",
+  "block_modal.they_cant_see_posts": "De persoan kin jo berjochten net sjen en jo ek net harren berjochten.",
+  "block_modal.they_will_know": "De persoan kin sjen dat dy blokkearre wurdt.",
   "block_modal.title": "Brûker blokkearje?",
   "block_modal.you_wont_see_mentions": "Jo sjogge gjin berjochten mear dy’t dizze account fermelde.",
   "boost_modal.combo": "Jo kinne op {combo} drukke om dit de folgjende kear oer te slaan",
@@ -214,11 +217,15 @@
   "domain_block_modal.title": "Domein blokkearje?",
   "domain_block_modal.you_will_lose_followers": "Al jo folgers fan dizze server wurde ûntfolge.",
   "domain_block_modal.you_wont_see_posts": "Jo sjogge gjin berjochten of meldingen mear fan brûkers op dizze server.",
+  "domain_pill.activitypub_lets_connect": "It soarget derfoar dat jo net allinnich mar ferbine en kommunisearje kinne mei minsken op Mastodon, mar ek mei oare sosjale apps.",
+  "domain_pill.activitypub_like_language": "ActivityPub is de taal dy’t Mastodon mei oare sosjale netwurken sprekt.",
   "domain_pill.server": "Server",
   "domain_pill.their_handle": "Harren fediverse-adres:",
   "domain_pill.their_server": "Harren digitale thús, wer’t al harren berjochten binne.",
+  "domain_pill.their_username": "Harren unike identifikaasje-adres op harren server. It is mooglik dat der brûkers mei deselde brûkersnamme op ferskate servers te finen binne.",
   "domain_pill.username": "Brûkersnamme",
   "domain_pill.whats_in_a_handle": "Wat is in fediverse-adres?",
+  "domain_pill.who_they_are": "Omdat jo oan in fediverse-adres sjen kinne hoe’t ien hjit en op hokker server dy sit, kinne jo mei minsken op it troch <button>ActivityPub oandreaune</button> sosjale web (fediverse) kommunisearje.",
   "domain_pill.your_handle": "Jo fediverse-adres:",
   "embed.instructions": "Embed this status on your website by copying the code below.",
   "embed.preview": "Sa komt it der út te sjen:",

app/javascript/mastodon/locales/he.json

@@ -414,6 +414,7 @@
   "limited_account_hint.action": "הצג חשבון בכל זאת",
   "limited_account_hint.title": "פרופיל המשתמש הזה הוסתר על ידי המנחים של {domain}.",
   "link_preview.author": "מאת {name}",
+  "link_preview.more_from_author": "עוד מאת {name}",
   "lists.account.add": "הוסף לרשימה",
   "lists.account.remove": "הסר מרשימה",
   "lists.delete": "מחיקת רשימה",

app/javascript/mastodon/locales/hu.json

@@ -414,6 +414,7 @@
   "limited_account_hint.action": "Profil megjelenítése mindenképpen",
   "limited_account_hint.title": "Ezt a profilt {domain} moderátorai elrejtették.",
   "link_preview.author": "{name} szerint",
+  "link_preview.more_from_author": "Több tőle: {name}",
   "lists.account.add": "Hozzáadás a listához",
   "lists.account.remove": "Eltávolítás a listából",
   "lists.delete": "Lista törlése",

app/javascript/mastodon/locales/ia.json

@@ -19,7 +19,7 @@
   "account.block_domain": "Blocar dominio {domain}",
   "account.block_short": "Blocar",
   "account.blocked": "Blocate",
-  "account.browse_more_on_origin_server": "Percurrer plus sur le profilo original",
+  "account.browse_more_on_origin_server": "Explorar plus sur le profilo original",
   "account.cancel_follow_request": "Cancellar sequimento",
   "account.copy": "Copiar ligamine a profilo",
   "account.direct": "Mentionar privatemente @{name}",
@@ -58,7 +58,7 @@
   "account.open_original_page": "Aperir le pagina original",
   "account.posts": "Messages",
   "account.posts_with_replies": "Messages e responsas",
-  "account.report": "Signalar @{name}",
+  "account.report": "Reportar @{name}",
   "account.requested": "Attendente le approbation. Clicca pro cancellar le requesta de sequer",
   "account.requested_follow": "{name} ha requestate de sequer te",
   "account.share": "Compartir profilo de @{name}",
@@ -111,7 +111,7 @@
   "bundle_modal_error.message": "Un error ha occurrite durante le cargamento de iste componente.",
   "bundle_modal_error.retry": "Tentar novemente",
   "closed_registrations.other_server_instructions": "Perque Mastodon es decentralisate, tu pote crear un conto sur un altere servitor e totevia interager con iste servitor.",
-  "closed_registrations_modal.description": "Crear un conto in {domain} actualmente non es possibile, ma considera que non es necessari haber un conto specificamente sur {domain} pro usar Mastodon.",
+  "closed_registrations_modal.description": "Crear un conto sur {domain} non es actualmente possibile, ma considera que non es necessari haber un conto specificamente sur {domain} pro usar Mastodon.",
   "closed_registrations_modal.find_another_server": "Cercar un altere servitor",
   "closed_registrations_modal.preamble": "Mastodon es decentralisate, dunque, non importa ubi tu crea tu conto, tu pote sequer e communicar con omne persona sur iste servitor. Tu pote mesmo hospitar tu proprie servitor!",
   "closed_registrations_modal.title": "Crear un conto sur Mastodon",
@@ -215,8 +215,8 @@
   "domain_block_modal.they_cant_follow": "Necuno de iste servitor pote sequer te.",
   "domain_block_modal.they_wont_know": "Ille non sapera que ille ha essite blocate.",
   "domain_block_modal.title": "Blocar dominio?",
-  "domain_block_modal.you_will_lose_followers": "Omne sequitores ab iste servitor essera removite.",
-  "domain_block_modal.you_wont_see_posts": "Tu non videra messages e notificationes ab usatores sur iste servitor.",
+  "domain_block_modal.you_will_lose_followers": "Tote tu sequitores de iste servitor essera removite.",
+  "domain_block_modal.you_wont_see_posts": "Tu non videra messages e notificationes de usatores sur iste servitor.",
   "domain_pill.activitypub_lets_connect": "Illo te permitte connecter e interager con personas non solmente sur Mastodon, ma tamben sur altere applicationes social.",
   "domain_pill.activitypub_like_language": "ActivityPub es como le linguage commun que Mastodon parla con altere retes social.",
   "domain_pill.server": "Servitor",
@@ -274,7 +274,7 @@
   "error.unexpected_crash.next_steps": "Tenta refrescar le pagina. Si isto non remedia le problema, es possibile que tu pote totevia usar Mastodon per medio de un altere navigator o application native.",
   "error.unexpected_crash.next_steps_addons": "Tenta disactivar istes e refrescar le pagina. Si isto non remedia le problema, es possibile que tu pote totevia usar Mastodon per medio de un altere navigator o application native.",
   "errors.unexpected_crash.copy_stacktrace": "Copiar le traciamento del pila al area de transferentia",
-  "errors.unexpected_crash.report_issue": "Signalar un defecto",
+  "errors.unexpected_crash.report_issue": "Reportar problema",
   "explore.search_results": "Resultatos de recerca",
   "explore.suggested_follows": "Personas",
   "explore.title": "Explorar",
@@ -389,7 +389,7 @@
   "keyboard_shortcuts.hotkey": "Clave accelerator",
   "keyboard_shortcuts.legend": "Monstrar iste legenda",
   "keyboard_shortcuts.local": "Aperir le chronologia local",
-  "keyboard_shortcuts.mention": "Mentionar le author",
+  "keyboard_shortcuts.mention": "Mentionar le autor",
   "keyboard_shortcuts.muted": "Aperir lista de usatores silentiate",
   "keyboard_shortcuts.my_profile": "Aperir tu profilo",
   "keyboard_shortcuts.notifications": "Aperir columna de notificationes",
@@ -414,6 +414,7 @@
   "limited_account_hint.action": "Monstrar profilo in omne caso",
   "limited_account_hint.title": "Iste profilo ha essite celate per le moderatores de {domain}.",
   "link_preview.author": "Per {name}",
+  "link_preview.more_from_author": "Plus de {name}",
   "lists.account.add": "Adder al lista",
   "lists.account.remove": "Remover del lista",
   "lists.delete": "Deler lista",
@@ -467,14 +468,14 @@
   "navigation_bar.search": "Cercar",
   "navigation_bar.security": "Securitate",
   "not_signed_in_indicator.not_signed_in": "Es necessari aperir session pro acceder a iste ressource.",
-  "notification.admin.report": "{name} ha signalate {target}",
+  "notification.admin.report": "{name} ha reportate {target}",
   "notification.admin.sign_up": "{name} se ha inscribite",
   "notification.favourite": "{name} ha marcate tu message como favorite",
   "notification.follow": "{name} te ha sequite",
   "notification.follow_request": "{name} ha requestate de sequer te",
   "notification.mention": "{name} te ha mentionate",
   "notification.moderation-warning.learn_more": "Apprender plus",
-  "notification.moderation_warning": "Tu ha recepite un aviso de moderation",
+  "notification.moderation_warning": "Tu ha recipite un advertimento de moderation",
   "notification.moderation_warning.action_delete_statuses": "Alcunes de tu messages ha essite removite.",
   "notification.moderation_warning.action_disable": "Tu conto ha essite disactivate.",
   "notification.moderation_warning.action_mark_statuses_as_sensitive": "Alcunes de tu messages ha essite marcate como sensibile.",
@@ -493,12 +494,12 @@
   "notification.status": "{name} ha justo ora publicate",
   "notification.update": "{name} ha modificate un message",
   "notification_requests.accept": "Acceptar",
-  "notification_requests.dismiss": "Dimitter",
+  "notification_requests.dismiss": "Clauder",
   "notification_requests.notifications_from": "Notificationes de {name}",
   "notification_requests.title": "Notificationes filtrate",
   "notifications.clear": "Rader notificationes",
   "notifications.clear_confirmation": "Es tu secur que tu vole rader permanentemente tote tu notificationes?",
-  "notifications.column_settings.admin.report": "Nove signalationes:",
+  "notifications.column_settings.admin.report": "Nove reportos:",
   "notifications.column_settings.admin.sign_up": "Nove inscriptiones:",
   "notifications.column_settings.alert": "Notificationes de scriptorio",
   "notifications.column_settings.favourite": "Favorites:",
@@ -621,7 +622,7 @@
   "relative_time.today": "hodie",
   "reply_indicator.attachments": "{count, plural, one {# annexo} other {# annexos}}",
   "reply_indicator.cancel": "Cancellar",
-  "reply_indicator.poll": "Inquesta",
+  "reply_indicator.poll": "Sondage",
   "report.block": "Blocar",
   "report.block_explanation": "Tu non videra le messages de iste persona. Ille non potera vider tu messages o sequer te. Ille potera saper de esser blocate.",
   "report.categories.legal": "Juridic",
@@ -635,7 +636,7 @@
   "report.close": "Facite",
   "report.comment.title": "Ha il altere cosas que nos deberea saper?",
   "report.forward": "Reinviar a {target}",
-  "report.forward_hint": "Le conto es de un altere servitor. Inviar un copia anonymisate del signalation a illo tamben?",
+  "report.forward_hint": "Le conto es de un altere servitor. Inviar un copia anonymisate del reporto a illo tamben?",
   "report.mute": "Silentiar",
   "report.mute_explanation": "Tu non videra le messages de iste persona. Ille pote totevia sequer te e vider tu messages e non sapera de esser silentiate.",
   "report.next": "Sequente",
@@ -655,11 +656,11 @@
   "report.statuses.subtitle": "Selige tote le responsas appropriate",
   "report.statuses.title": "Existe alcun messages que appoia iste reporto?",
   "report.submit": "Submitter",
-  "report.target": "Signalamento de {target}",
+  "report.target": "Reportage de {target}",
   "report.thanks.take_action": "Ecce tu optiones pro controlar lo que tu vide sur Mastodon:",
   "report.thanks.take_action_actionable": "Durante que nos revide isto, tu pote prender mesuras contra @{name}:",
   "report.thanks.title": "Non vole vider isto?",
-  "report.thanks.title_actionable": "Gratias pro signalar, nos investigara isto.",
+  "report.thanks.title_actionable": "Gratias pro reportar, nos investigara isto.",
   "report.unfollow": "Cessar de sequer @{name}",
   "report.unfollow_explanation": "Tu seque iste conto. Pro non plus vider su messages in tu fluxo de initio, cessa de sequer lo.",
   "report_notification.attached_statuses": "{count, plural, one {{count} message} other {{count} messages}} annexate",
@@ -677,7 +678,7 @@
   "search.quick_action.status_search": "Messages correspondente a {x}",
   "search.search_or_paste": "Cerca o colla un URL",
   "search_popout.full_text_search_disabled_message": "Non disponibile sur {domain}.",
-  "search_popout.full_text_search_logged_out_message": "Solmente disponibile al initiar le session.",
+  "search_popout.full_text_search_logged_out_message": "Solmente disponibile post aperir session.",
   "search_popout.language_code": "Codice de lingua ISO",
   "search_popout.options": "Optiones de recerca",
   "search_popout.quick_actions": "Actiones rapide",
@@ -746,7 +747,7 @@
   "status.replied_to": "Respondite a {name}",
   "status.reply": "Responder",
   "status.replyAll": "Responder al discussion",
-  "status.report": "Signalar @{name}",
+  "status.report": "Reportar @{name}",
   "status.sensitive_warning": "Contento sensibile",
   "status.share": "Compartir",
   "status.show_filter_reason": "Monstrar in omne caso",
@@ -757,7 +758,7 @@
   "status.show_original": "Monstrar original",
   "status.title.with_attachments": "{user} ha publicate {attachmentCount, plural, one {un annexo} other {{attachmentCount} annexos}}",
   "status.translate": "Traducer",
-  "status.translated_from_with": "Traducite ab {lang} usante {provider}",
+  "status.translated_from_with": "Traducite de {lang} usante {provider}",
   "status.uncached_media_warning": "Previsualisation non disponibile",
   "status.unmute_conversation": "Non plus silentiar conversation",
   "status.unpin": "Disfixar del profilo",
@@ -796,7 +797,7 @@
   "upload_modal.choose_image": "Seliger un imagine",
   "upload_modal.description_placeholder": "Cinque expertos del zoo jam bibeva whisky frigide",
   "upload_modal.detect_text": "Deteger texto de un imagine",
-  "upload_modal.edit_media": "Modificar le medio",
+  "upload_modal.edit_media": "Modificar multimedia",
   "upload_modal.hint": "Clicca o trahe le circulo sur le previsualisation pro eliger le puncto focal que essera sempre visibile sur tote le miniaturas.",
   "upload_modal.preparing_ocr": "Preparation del OCR…",
   "upload_modal.preview_label": "Previsualisation ({ratio})",

app/javascript/mastodon/locales/id.json

@@ -299,6 +299,11 @@
   "follow_suggestions.dismiss": "Jangan tampilkan lagi",
   "follow_suggestions.hints.featured": "Profil ini telah dipilih sendiri oleh tim {domain}.",
   "follow_suggestions.hints.friends_of_friends": "Profil ini populer di kalangan orang yang anda ikuti.",
+  "follow_suggestions.personalized_suggestion": "Saran yang dipersonalisasi",
+  "follow_suggestions.popular_suggestion": "Saran populer",
+  "follow_suggestions.popular_suggestion_longer": "Populer di {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Serupa dengan profil yang baru Anda ikuti",
+  "follow_suggestions.view_all": "Lihat semua",
   "followed_tags": "Tagar yang diikuti",
   "footer.about": "Tentang",
   "footer.directory": "Direktori profil",
@@ -324,6 +329,7 @@
   "home.column_settings.show_reblogs": "Tampilkan boost",
   "home.column_settings.show_replies": "Tampilkan balasan",
   "home.hide_announcements": "Sembunyikan pengumuman",
+  "home.pending_critical_update.link": "Lihat pembaruan",
   "home.show_announcements": "Tampilkan pengumuman",
   "interaction_modal.description.follow": "Dengan sebuah akun di Mastodon, Anda bisa mengikuti {name} untuk menerima kirimannya di beranda Anda.",
   "interaction_modal.description.reblog": "Dengan sebuah akun di Mastodon, Anda bisa mem-boost kiriman ini untuk membagikannya ke pengikut Anda sendiri.",
@@ -375,6 +381,7 @@
   "lightbox.previous": "Sebelumnya",
   "limited_account_hint.action": "Tetap tampilkan profil",
   "limited_account_hint.title": "Profil ini telah disembunyikan oleh moderator {domain}.",
+  "link_preview.author": "Oleh {name}",
   "lists.account.add": "Tambah ke daftar",
   "lists.account.remove": "Hapus dari daftar",
   "lists.delete": "Hapus daftar",
@@ -389,8 +396,11 @@
   "lists.search": "Cari di antara orang yang Anda ikuti",
   "lists.subheading": "Daftar Anda",
   "load_pending": "{count, plural, other {# item baru}}",
+  "loading_indicator.label": "Memuat…",
   "media_gallery.toggle_visible": "Tampil/Sembunyikan",
   "moved_to_account_banner.text": "Akun {disabledAccount} Anda kini dinonaktifkan karena Anda pindah ke {movedToAccount}.",
+  "mute_modal.hide_options": "Sembunyikan opsi",
+  "mute_modal.title": "Bisukan pengguna?",
   "navigation_bar.about": "Tentang",
   "navigation_bar.blocks": "Pengguna diblokir",
   "navigation_bar.bookmarks": "Markah",

app/javascript/mastodon/locales/is.json

@@ -414,6 +414,7 @@
   "limited_account_hint.action": "Birta notandasniðið samt",
   "limited_account_hint.title": "Þetta notandasnið hefur verið falið af umsjónarmönnum {domain}.",
   "link_preview.author": "Eftir {name}",
+  "link_preview.more_from_author": "Meira frá {name}",
   "lists.account.add": "Bæta á lista",
   "lists.account.remove": "Fjarlægja af lista",
   "lists.delete": "Eyða lista",

app/javascript/mastodon/locales/ko.json

@@ -414,7 +414,7 @@
   "limited_account_hint.action": "그래도 프로필 보기",
   "limited_account_hint.title": "이 프로필은 {domain}의 중재자에 의해 숨겨진 상태입니다.",
   "link_preview.author": "{name}",
-  "link_preview.more_from_author": "{name} 더 둘러보기",
+  "link_preview.more_from_author": "{name} 프로필 보기",
   "lists.account.add": "리스트에 추가",
   "lists.account.remove": "리스트에서 제거",
   "lists.delete": "리스트 삭제",

app/javascript/mastodon/locales/la.json

@@ -1,7 +1,9 @@
 {
   "about.contact": "Ratio:",
   "about.domain_blocks.no_reason_available": "Ratio abdere est",
+  "about.domain_blocks.silenced.explanation": "Tua profilia atque tuum contentum ab hac serve praecipue non videbis, nisi explōrēs expresse aut subsequeris et optēs.",
   "account.account_note_header": "Annotatio",
+  "account.add_or_remove_from_list": "Adde aut ēripe ex tabellīs",
   "account.badges.bot": "Robotum",
   "account.badges.group": "Congregatio",
   "account.block": "Impedire @{name}",
@@ -11,11 +13,21 @@
   "account.domain_blocked": "Dominium impeditum",
   "account.edit_profile": "Recolere notionem",
   "account.featured_tags.last_status_never": "Nulla contributa",
+  "account.featured_tags.title": "Hashtag notātī {name}",
+  "account.followers_counter": "{count, plural, one {{counter} Sectator} other {{counter} Sectatores}}",
+  "account.following_counter": "{count, plural, one {{counter} Sequens} other {{counter} Sequentes}}",
+  "account.moved_to": "{name} significavit eum suam rationem novam nunc esse:",
   "account.muted": "Confutatus",
+  "account.requested_follow": "{name} postulavit ut te sequeretur",
+  "account.statuses_counter": "{count, plural, one {{counter} Nuntius} other {{counter} Nuntii}}",
   "account.unblock_short": "Solvere impedimentum",
   "account_note.placeholder": "Click to add a note",
   "admin.dashboard.retention.average": "Mediocritas",
+  "admin.impact_report.instance_accounts": "Rationes perfiles hoc deleret",
+  "alert.unexpected.message": "Error inopinatus occurrit.",
   "announcement.announcement": "Proclamatio",
+  "attachments_list.unprocessed": "(immūtātus)",
+  "block_modal.you_wont_see_mentions": "Nuntios quibus eos commemorant non videbis.",
   "bundle_column_error.error.title": "Eheu!",
   "bundle_column_error.retry": "Retemptare",
   "bundle_column_error.routing.title": "CCCCIIII",
@@ -32,30 +44,60 @@
   "compose_form.direct_message_warning_learn_more": "Discere plura",
   "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
+  "compose_form.lock_disclaimer": "Tua ratio non est {clausa}. Quisquis te sequi potest ut visum accipiat nuntios tuos tantum pro sectatoribus.",
   "compose_form.lock_disclaimer.lock": "clausum",
   "compose_form.placeholder": "What is on your mind?",
   "compose_form.publish_form": "Barrire",
   "compose_form.spoiler.marked": "Text is hidden behind warning",
-  "compose_form.spoiler.unmarked": "Text is not hidden",
+  "compose_form.spoiler.unmarked": "Adde praeconium contentūs",
   "confirmations.block.confirm": "Impedire",
   "confirmations.delete.confirm": "Oblitterare",
   "confirmations.delete.message": "Are you sure you want to delete this status?",
   "confirmations.delete_list.confirm": "Oblitterare",
+  "confirmations.discard_edit_media.message": "Habēs mutationēs in descriptionem vel prōspectum medii quae nōn sunt servātae; eas dēmittam?",
   "confirmations.mute.confirm": "Confutare",
   "confirmations.reply.confirm": "Respondere",
+  "disabled_account_banner.account_settings": "Praeferentiae ratiōnis",
+  "disabled_account_banner.text": "Ratio tua {disabledAccount} debilitata est.",
   "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
   "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
+  "domain_block_modal.you_will_lose_followers": "Omnes sectatores tuī ex hoc servō removēbuntur.",
+  "domain_block_modal.you_wont_see_posts": "Nuntios aut notificātiōnēs ab usoribus in hōc servō nōn vidēbis.",
+  "domain_pill.activitypub_like_language": "ActivityPub est velut lingua quam Mastodon cum aliīs sociālibus rētibus loquitur.",
+  "domain_pill.your_handle": "Tuus nominulus:",
+  "domain_pill.your_server": "Tua domus digitalis, ubi omnia tua nuntia habitant. Hanc non amas? Servēs trānsferāre potes quōcumque tempore et sectātōrēs tuōs simul addūcere.",
+  "domain_pill.your_username": "Tuō singulāre id indicium in hōc servō est. Est possibile invenīre usōrēs cum eōdem nōmine in servīs aliīs.",
   "embed.instructions": "Embed this status on your website by copying the code below.",
+  "emoji_button.activity": "Actiō",
   "emoji_button.food": "Cibus et potus",
   "emoji_button.people": "Homines",
   "emoji_button.search": "Quaerere...",
+  "empty_column.account_suspended": "Rātiō suspēnsa",
   "empty_column.account_timeline": "Hic nulla contributa!",
   "empty_column.account_unavailable": "Notio non impetrabilis",
-  "empty_column.home": "Your home timeline is empty! Follow more people to fill it up. {suggestions}",
+  "empty_column.blocks": "Nondum quemquam usorem obsēcāvisti.",
+  "empty_column.direct": "Nōn habēs adhūc ullo mentionēs prīvātās. Cum ūnam mīseris aut accipis, hīc apparēbit.",
+  "empty_column.followed_tags": "Nōn adhūc aliquem hastāginem secūtus es. Cum id fēceris, hic ostendētur.",
+  "empty_column.home": "Tua linea temporum domesticus vacua est! Sequere plures personas ut eam compleas.",
   "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.",
+  "empty_column.lists": "Nōn adhūc habēs ullo tabellās. Cum creās, hīc apparēbunt.",
+  "empty_column.mutes": "Nondum quemquam usorem tacuisti.",
+  "empty_column.notification_requests": "Omnia clara sunt! Nihil hic est. Cum novās notificātiōnēs accipīs, hic secundum tua praecepta apparebunt.",
+  "empty_column.notifications": "Nōn adhūc habēs ullo notificātiōnēs. Cum aliī tē interagunt, hīc videbis.",
   "explore.trending_statuses": "Contributa",
+  "filtered_notifications_banner.mentions": "{count, plural, one {mentiō} other {mentiōnēs}}",
+  "firehose.all": "Omnis",
+  "footer.about": "De",
   "generic.saved": "Servavit",
+  "hashtag.column_settings.tag_mode.all": "Haec omnia",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.counter_by_accounts": "{count, plural, one {{counter} particeps} other {{counter} participēs}}",
+  "hashtag.counter_by_uses": "{count, plural, one {{counter} nuntius} other {{counter} nuntii}}",
+  "hashtag.counter_by_uses_today": "{count, plural, one {{counter} nuntius} other {{counter} nuntii}} hodie",
+  "hashtags.and_other": "…et {count, plural, other {# plus}}",
+  "intervals.full.days": "{number, plural, one {# die} other {# dies}}",
+  "intervals.full.hours": "{number, plural, one {# hora} other {# horae}}",
+  "intervals.full.minutes": "{number, plural, one {# minutum} other {# minuta}}",
   "keyboard_shortcuts.back": "Re navigare",
   "keyboard_shortcuts.blocked": "Aperire listam usorum obstructorum",
   "keyboard_shortcuts.boost": "Inlustrare publicatio",
@@ -89,17 +131,47 @@
   "keyboard_shortcuts.up": "to move up in the list",
   "lightbox.close": "Claudere",
   "lightbox.next": "Secundum",
+  "lists.account.add": "Adde ad tabellās",
+  "lists.new.create": "Addere tabella",
+  "load_pending": "{count, plural, one {# novum item} other {# nova itema}}",
+  "media_gallery.toggle_visible": "{number, plural, one {Cēla imaginem} other {Cēla imagines}}",
+  "moved_to_account_banner.text": "Tua ratione {disabledAccount} interdum reposita est, quod ad {movedToAccount} migrāvisti.",
+  "mute_modal.you_wont_see_mentions": "Non videbis nuntios quī eōs commemorant.",
+  "navigation_bar.about": "De",
   "navigation_bar.domain_blocks": "Hidden domains",
-  "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
-  "notification.reblog": "{name} boosted your status",
+  "not_signed_in_indicator.not_signed_in": "Ad hunc locum pervenire oportet ut inīre facias.",
+  "notification.admin.report": "{name} nuntiavit {target}",
+  "notification.admin.sign_up": "{name} subscripsit",
+  "notification.favourite": "{name} nuntium tuum favit",
+  "notification.follow": "{name} te secutus est",
+  "notification.follow_request": "{name} postulavit ut te sequeretur",
+  "notification.mention": "{name} memoravi",
+  "notification.moderation_warning": "Accepistī monitionem moderationis.",
+  "notification.moderation_warning.action_disable": "Ratio tua debilitata est.",
+  "notification.moderation_warning.action_none": "Tua ratiō monitum moderātiōnis accēpit.",
+  "notification.moderation_warning.action_sensitive": "Tua nuntia hinc sensibiliter notabuntur.",
+  "notification.moderation_warning.action_silence": "Ratio tua est limitata.",
+  "notification.moderation_warning.action_suspend": "Ratio tua suspensus est.",
+  "notification.own_poll": "Suffragium tuum terminatum est.",
+  "notification.poll": "Electione in quam suffragium dedisti finita est.",
+  "notification.reblog": "{name} tuum nuntium amplificavit.",
+  "notification.relationships_severance_event.account_suspension": "Admin ab {from} {target} suspendit, quod significat nōn iam posse tē novitātēs ab eīs accipere aut cum eīs interagere.",
+  "notification.relationships_severance_event.domain_block": "Admin ab {from} {target} obsēcāvit, includēns {followersCount} ex tuīs sectātōribus et {followingCount, plural, one {# ratione} other {# rationibus}} quās sequeris.",
+  "notification.relationships_severance_event.user_domain_block": "Bloqueāstī {target}, removēns {followersCount} ex sectātōribus tuīs et {followingCount, plural, one {# rationem} other {# rationēs}} quōs sequeris.",
+  "notification.status": "{name} nuper publicavit",
+  "notification.update": "{name} nuntium correxit",
+  "notification_requests.accept": "Accipe",
   "notifications.filter.all": "Omnia",
   "notifications.filter.polls": "Eventus electionis",
+  "notifications.group": "Notificātiōnēs",
   "onboarding.actions.go_to_explore": "See what's trending",
   "onboarding.actions.go_to_home": "Go to your home feed",
-  "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.lead": "Tua domus feed est principalis via Mastodon experīrī. Quō plūrēs persōnas sequeris, eō actīvior et interessantior erit. Ad tē incipiendum, ecce quaedam suāsiones:",
   "onboarding.follows.title": "Popular on Mastodon",
-  "onboarding.start.lead": "Your new Mastodon account is ready to go. Here's how you can make the most of it:",
+  "onboarding.profile.display_name_hint": "Tuum nomen completum aut tuum nomen ludens...",
+  "onboarding.start.lead": "Nunc pars es Mastodonis, singularis, socialis medii platformae decentralis ubi—non algorismus—tuam ipsius experientiam curas. Incipiāmus in nova hac socialis regione:",
   "onboarding.start.skip": "Want to skip right ahead?",
+  "onboarding.start.title": "Perfecisti eam!",
   "onboarding.steps.follow_people.body": "You curate your own feed. Lets fill it with interesting people.",
   "onboarding.steps.follow_people.title": "Follow {count, plural, one {one person} other {# people}}",
   "onboarding.steps.publish_status.body": "Say hello to the world.",
@@ -107,29 +179,48 @@
   "onboarding.steps.setup_profile.title": "Customize your profile",
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
   "onboarding.steps.share_profile.title": "Share your profile",
+  "onboarding.tips.2fa": "<strong>Scisne?</strong>  Tūam ratiōnem sēcūrāre potes duōrum elementōrum authentīcātiōnem in ratiōnis tuī praeferentiīs statuendō. Cum ūllā app TOTP ex tuā ēlēctiōne operātur, numerus tēlephōnicus necessārius nōn est!",
+  "onboarding.tips.accounts_from_other_servers": "<strong>Scisne?</strong> Quoniam Mastodon dēcentrālis est, nōnnulla profīlia quae invenīs in servīs aliīs quam tuōrum erunt hospitāta. Tamen cum eīs sine impedīmentō interāgere potes! Servus eōrum in alterā parte nōminis eōrum est!",
+  "onboarding.tips.migration": "<strong>Scisne?</strong> Sī sentīs {domain} tibi in futūrō nōn esse optimam servī ēlēctiōnem, ad alium servum Mastodon sine amittendō sectātōribus tuīs migrāre potes. Etiam tuum servum hospitārī potes!",
+  "onboarding.tips.verification": "<strong>Scisne?</strong>  Tūam ratiōnem verificāre potes iungendō nexum ad prōfīlium Mastodon tuum in propriā pāginā interrētiā et addendō pāginam ad prōfīlium tuum. Nullae pecūniae aut documenta necessāria sunt!",
   "poll.closed": "Clausum",
+  "poll.total_people": "{count, plural, one {# persona} other {# personae}}",
+  "poll.total_votes": "{count, plural, one {# suffragium} other {# suffragia}}",
   "poll.vote": "Eligere",
   "poll.voted": "Elegisti hoc responsum",
+  "poll.votes": "{votes, plural, one {# sufragium} other {# sufragia}}",
   "poll_button.add_poll": "Addere electionem",
   "poll_button.remove_poll": "Auferre electionem",
   "privacy.change": "Adjust status privacy",
   "privacy.public.short": "Coram publico",
+  "regeneration_indicator.sublabel": "Tua domus feed praeparātur!",
+  "relative_time.full.days": "{number, plural, one {# ante die} other {# ante dies}}",
+  "relative_time.full.hours": "{number, plural, one {# ante horam} other {# ante horas}}",
   "relative_time.full.just_now": "nunc",
+  "relative_time.full.minutes": "{number, plural, one {# ante minutum} other {# ante minuta}}",
+  "relative_time.full.seconds": "{number, plural, one {# ante secundum} other {# ante secunda}}",
   "relative_time.just_now": "nunc",
   "relative_time.today": "hodie",
+  "reply_indicator.attachments": "{count, plural, one {# annexus} other {# annexūs}}",
   "report.block": "Impedimentum",
+  "report.block_explanation": "Non videbis eorum nuntios. Non poterunt vidēre tuōs nuntios aut tē sequī. Intelligere poterunt sē obstrūctōs esse.",
   "report.categories.other": "Altera",
   "report.category.title_account": "notio",
   "report.category.title_status": "contributum",
   "report.close": "Confectum",
   "report.mute": "Confutare",
+  "report.mute_explanation": "Non videbis eōrum nuntiōs. Possunt adhuc tē sequī et tuōs nuntiōs vidēre, nec sciēbunt sē tacitōs esse.",
   "report.next": "Secundum",
-  "report.placeholder": "Type or paste additional comments",
+  "report.placeholder": "Commentāriī adiūnctī",
   "report.submit": "Mittere",
   "report.target": "Report {target}",
-  "report_notification.attached_statuses": "{count, plural, one {# post} other {# posts}} attached",
+  "report_notification.attached_statuses": "{count, plural, one {{count} nuntius} other {{count} nuntii}} attachiatus",
   "report_notification.categories.other": "Altera",
   "search.placeholder": "Quaerere",
+  "search_results.all": "Omnis",
+  "server_banner.active_users": "Usūrāriī āctīvī",
+  "server_banner.administered_by": "Administratur:",
+  "server_banner.introduction": "{domain} pars est de rete sociali decentralizato a {mastodon} propulsato.",
   "server_banner.learn_more": "Discere plura",
   "sign_in_banner.sign_in": "Sign in",
   "status.admin_status": "Open this status in the moderation interface",
@@ -139,13 +230,29 @@
   "status.delete": "Oblitterare",
   "status.edit": "Recolere",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
+  "status.favourites": "{count, plural, one {favoritum} other {favorita}}",
+  "status.history.created": "{name} creatum {date}",
+  "status.history.edited": "{name} correxit {date}",
   "status.open": "Expand this status",
-  "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
+  "status.reblogged_by": "{name} adiuvavit",
+  "status.reblogs": "{count, plural, one {auctus} other {auctūs}}",
+  "status.title.with_attachments": "{user} publicavit {attachmentCount, plural, one {unum annexum} other {{attachmentCount} annexa}}",
   "tabs_bar.home": "Domi",
+  "time_remaining.days": "{number, plural, one {# die} other {# dies}} restant",
+  "time_remaining.hours": "{number, plural, one {# hora} other {# horae}} restant",
+  "time_remaining.minutes": "{number, plural, one {# minutum} other {# minuta}} restant",
+  "time_remaining.seconds": "{number, plural, one {# secundum} other {# secunda}} restant",
+  "timeline_hint.remote_resource_not_displayed": "{resource} ab aliīs servīs nōn ostenduntur.",
   "timeline_hint.resources.statuses": "Contributa pristina",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} persōna} other {{counter} persōnae}} in {days, plural, one {diē prīdiē} other {diēbus praeteritīs {days}}}",
+  "ui.beforeunload": "Si Mastodon discesseris, tua epitome peribit.",
+  "units.short.billion": "{count} millia milionum",
+  "units.short.million": "{count} milionum",
+  "units.short.thousand": "{count} millia",
+  "upload_button.label": "Imaginēs, vīdeō aut fīle audītūs adde",
   "upload_form.audio_description": "Describe for people who are hard of hearing",
   "upload_form.edit": "Recolere",
+  "upload_modal.description_placeholder": "A velox brunneis vulpes salit super piger canis",
   "upload_progress.label": "Uploading…",
   "video.mute": "Confutare soni"
 }

app/javascript/mastodon/locales/lad.json

@@ -398,6 +398,7 @@
   "limited_account_hint.action": "Amostra el profil entanto",
   "limited_account_hint.title": "Este profil fue eskondido por los moderadores de {domain}.",
   "link_preview.author": "Publikasyon de {name}",
+  "link_preview.more_from_author": "Mas de {name}",
   "lists.account.add": "Adjusta a lista",
   "lists.account.remove": "Kita de lista",
   "lists.delete": "Efasa lista",

app/javascript/mastodon/locales/lt.json

@@ -217,7 +217,7 @@
   "domain_block_modal.title": "Blokuoti domeną?",
   "domain_block_modal.you_will_lose_followers": "Visi tavo sekėjai iš šio serverio bus pašalinti.",
   "domain_block_modal.you_wont_see_posts": "Nematysi naudotojų įrašų ar pranešimų šiame serveryje.",
-  "domain_pill.activitypub_lets_connect": "Tai leidžia tau sąveikauti su žmonėmis ne tik Mastodon, bet ir įvairiose socialinėse programėlėse.",
+  "domain_pill.activitypub_lets_connect": "Tai leidžia tau prisijungti ir bendrauti su žmonėmis ne tik Mastodon, bet ir įvairiose socialinėse programėlėse.",
   "domain_pill.activitypub_like_language": "ActivityPub – tai tarsi kalba, kuria Mastodon kalba su kitais socialiniais tinklais.",
   "domain_pill.server": "Serveris",
   "domain_pill.their_handle": "Jų socialinis medijos vardas:",
@@ -414,6 +414,7 @@
   "limited_account_hint.action": "Vis tiek rodyti profilį",
   "limited_account_hint.title": "Šį profilį paslėpė {domain} prižiūrėtojai.",
   "link_preview.author": "Sukūrė {name}",
+  "link_preview.more_from_author": "Daugiau iš {name}",
   "lists.account.add": "Pridėti į sąrašą",
   "lists.account.remove": "Pašalinti iš sąrašo",
   "lists.delete": "Ištrinti sąrašą",
@@ -432,7 +433,15 @@
   "loading_indicator.label": "Kraunama…",
   "media_gallery.toggle_visible": "{number, plural, one {Slėpti vaizdą} few {Slėpti vaizdus} many {Slėpti vaizdo} other {Slėpti vaizdų}}",
   "moved_to_account_banner.text": "Tavo paskyra {disabledAccount} šiuo metu išjungta, nes persikėlei į {movedToAccount}.",
+  "mute_modal.hide_from_notifications": "Slėpti nuo pranešimų",
+  "mute_modal.hide_options": "Slėpti parinktis",
+  "mute_modal.indefinite": "Kol atšauksiu jų nutildymą",
   "mute_modal.show_options": "Rodyti parinktis",
+  "mute_modal.they_can_mention_and_follow": "Jie gali tave paminėti ir sekti, bet tu jų nematysi.",
+  "mute_modal.they_wont_know": "Jie nežinos, kad buvo nutildyti.",
+  "mute_modal.title": "Nutildyti naudotoją?",
+  "mute_modal.you_wont_see_mentions": "Nematysi įrašus, kuriuose jie paminimi.",
+  "mute_modal.you_wont_see_posts": "Jie vis tiek gali matyti tavo įrašus, bet tu nematysi jų.",
   "navigation_bar.about": "Apie",
   "navigation_bar.advanced_interface": "Atidaryti išplėstinę žiniatinklio sąsają",
   "navigation_bar.blocks": "Užblokuoti naudotojai",
@@ -477,6 +486,7 @@
   "notification.own_poll": "Tavo apklausa baigėsi",
   "notification.poll": "Apklausa, kurioje balsavai, pasibaigė",
   "notification.reblog": "{name} pakėlė tavo įrašą",
+  "notification.relationships_severance_event": "Prarasti sąryšiai su {name}",
   "notification.relationships_severance_event.learn_more": "Sužinoti daugiau",
   "notification.relationships_severance_event.user_domain_block": "Tu užblokavai {target}. Pašalinama {followersCount} savo sekėjų ir {followingCount, plural, one {# paskyrą} few {# paskyrai} many {# paskyros} other {# paskyrų}}, kurios seki.",
   "notification.status": "{name} ką tik paskelbė",
@@ -561,7 +571,7 @@
   "onboarding.steps.setup_profile.title": "Suasmenink savo profilį",
   "onboarding.steps.share_profile.body": "Leisk draugams sužinoti, kaip tave rasti Mastodon.",
   "onboarding.steps.share_profile.title": "Bendrink savo Mastodon profilį",
-  "onboarding.tips.2fa": "<strong>Ar žinojai?</strong> Savo paskyrą gali apsaugoti nustatęs (-usi) dviejų veiksnių tapatybės nustatymą paskyros nustatymuose. Jis veikia su bet kuria pasirinkta TOTP programėle, telefono numeris nebūtinas.",
+  "onboarding.tips.2fa": "<strong>Ar žinojai?</strong> Savo paskyrą gali apsaugoti nustatant dviejų veiksnių tapatybės nustatymą paskyros nustatymuose. Jis veikia su bet kuria pasirinkta TOTP programėle, telefono numeris nebūtinas.",
   "onboarding.tips.accounts_from_other_servers": "<strong>Ar žinojai?</strong> Kadangi Mastodon decentralizuotas, kai kurie profiliai, su kuriais susidursi, bus talpinami ne tavo, o kituose serveriuose. Ir vis tiek galėsi su jais sklandžiai bendrauti! Jų serveris yra antroje naudotojo vardo pusėje.",
   "onboarding.tips.migration": "<strong>Ar žinojai?</strong> Jei manai, kad {domain} serveris ateityje tau netiks, gali persikelti į kitą Mastodon serverį neprarandant savo sekėjų. Gali net talpinti savo paties serverį.",
   "onboarding.tips.verification": "<strong>Ar žinojai?</strong> Savo paskyrą gali patvirtinti pateikęs (-usi) nuorodą į Mastodon profilį savo interneto svetainėje ir pridėjęs (-usi) svetainę prie savo profilio. Nereikia jokių mokesčių ar dokumentų.",
@@ -632,7 +642,7 @@
   "report.reasons.legal_description": "Manai, kad tai pažeidžia tavo arba serverio šalies įstatymus",
   "report.reasons.other": "Tai kažkas kita",
   "report.reasons.other_description": "Problema netinka kitoms kategorijoms",
-  "report.reasons.spam": "Tai šlamštas",
+  "report.reasons.spam": "Tai – šlamštas",
   "report.reasons.spam_description": "Kenkėjiškos nuorodos, netikras įsitraukimas arba pasikartojantys atsakymai",
   "report.reasons.violation": "Tai pažeidžia serverio taisykles",
   "report.reasons.violation_description": "Žinai, kad tai pažeidžia konkrečias taisykles",

app/javascript/mastodon/locales/lv.json

@@ -92,6 +92,8 @@
   "block_modal.remote_users_caveat": "Mēs vaicāsim serverim {domain} ņemt vērā Tavu lēmumu. Tomēr atbilstība nav nodrošināta, jo atsevišķi serveri var apstrādāt bloķēšanu citādi. Publiski ieraksti joprojām var būt redzami lietotājiem, kuri nav pieteikušies.",
   "block_modal.show_less": "Rādīt mazāk",
   "block_modal.show_more": "Parādīt mazāk",
+  "block_modal.they_cant_mention": "Nevar Tevi pieminēt vai sekot Tev.",
+  "block_modal.they_cant_see_posts": "Nevar redzēt Tavus ierakstus, un Tu neredzēsi lietotāja.",
   "boost_modal.combo": "Nospied {combo}, lai nākamreiz šo izlaistu",
   "bundle_column_error.copy_stacktrace": "Kopēt kļūdu ziņojumu",
   "bundle_column_error.error.body": "Pieprasīto lapu nevarēja atveidot. Tas varētu būt saistīts ar kļūdu mūsu kodā, vai tā ir pārlūkprogrammas saderības problēma.",
@@ -173,7 +175,7 @@
   "confirmations.discard_edit_media.message": "Ir nesaglabātas izmaiņas informācijas nesēja aprakstā vai priekšskatījumā. Vēlies tās atmest tik un tā?",
   "confirmations.domain_block.message": "Vai tu tiešām vēlies bloķēt visu domēnu {domain}? Parasti pietiek, ja nobloķē vai apklusini kādu. Tu neredzēsi saturu vai paziņojumus no šī domēna nevienā laika līnijā. Tavi sekotāji no šī domēna tiks noņemti.",
   "confirmations.edit.confirm": "Labot",
-  "confirmations.edit.message": "Rediģējot, tiks pārrakstīts ziņojums, kuru tu šobrīd raksti. Vai tiešām vēlies turpināt?",
+  "confirmations.edit.message": "Labošana pārrakstīs ziņojumu, kas šobrīd tiek sastādīts. Vai tiešām turpināt?",
   "confirmations.logout.confirm": "Iziet",
   "confirmations.logout.message": "Vai tiešām vēlies izrakstīties?",
   "confirmations.mute.confirm": "Apklusināt",
@@ -377,6 +379,7 @@
   "limited_account_hint.action": "Tik un tā rādīt profilu",
   "limited_account_hint.title": "{domain} moderatori ir paslēpuši šo profilu.",
   "link_preview.author": "Pēc {name}",
+  "link_preview.more_from_author": "Vairāk no {name}",
   "lists.account.add": "Pievienot sarakstam",
   "lists.account.remove": "Noņemt no saraksta",
   "lists.delete": "Izdzēst sarakstu",
@@ -444,16 +447,19 @@
   "notification.relationships_severance_event": "Zaudēti savienojumi ar {name}",
   "notification.relationships_severance_event.learn_more": "Uzzināt vairāk",
   "notification.status": "{name} tikko publicēja",
-  "notification.update": "{name} rediģēja ierakstu",
+  "notification.update": "{name} laboja ierakstu",
   "notification_requests.accept": "Pieņemt",
   "notification_requests.dismiss": "Noraidīt",
   "notification_requests.notifications_from": "Paziņojumi no {name}",
+  "notification_requests.title": "Atlasītie paziņojumi",
   "notifications.clear": "Notīrīt paziņojumus",
   "notifications.clear_confirmation": "Vai tiešām vēlies neatgriezeniski notīrīt visus savus paziņojumus?",
   "notifications.column_settings.admin.report": "Jauni ziņojumi:",
   "notifications.column_settings.admin.sign_up": "Jaunas pierakstīšanās:",
   "notifications.column_settings.alert": "Darbvirsmas paziņojumi",
   "notifications.column_settings.favourite": "Izlase:",
+  "notifications.column_settings.filter_bar.advanced": "Attēlot visas kategorijas",
+  "notifications.column_settings.filter_bar.category": "Atrās atlasīšanas josla",
   "notifications.column_settings.follow": "Jauni sekotāji:",
   "notifications.column_settings.follow_request": "Jauni sekošanas pieprasījumi:",
   "notifications.column_settings.mention": "Pieminēšanas:",
@@ -481,7 +487,9 @@
   "notifications.permission_required": "Darbvirsmas paziņojumi nav pieejami, jo nav piešķirta nepieciešamā atļauja.",
   "notifications.policy.filter_new_accounts_title": "Jauni konti",
   "notifications.policy.filter_not_followers_title": "Cilvēki, kuri Tev neseko",
+  "notifications.policy.filter_not_following_hint": "Līdz tos pašrocīgi apstiprināsi",
   "notifications.policy.filter_not_following_title": "Cilvēki, kuriem Tu neseko",
+  "notifications.policy.title": "Atlasīt paziņojumus no…",
   "notifications_permission_banner.enable": "Iespējot darbvirsmas paziņojumus",
   "notifications_permission_banner.how_to_control": "Lai saņemtu paziņojumus, kad Mastodon nav atvērts, iespējo darbvirsmas paziņojumus. Vari precīzi kontrolēt, kāda veida mijiedarbības rada darbvirsmas paziņojumus, izmantojot augstāk redzamo pogu {icon}, kad tie būs iespējoti.",
   "notifications_permission_banner.title": "Nekad nepalaid neko garām",
@@ -539,7 +547,9 @@
   "privacy.direct.short": "Noteikti cilvēki",
   "privacy.private.long": "Tikai Tavi sekotāji",
   "privacy.private.short": "Sekotāji",
+  "privacy.public.long": "Jebkurš Mastodon un ārpus tā",
   "privacy.public.short": "Publiska",
+  "privacy.unlisted.long": "Mazāk algoritmisku fanfaru",
   "privacy_policy.last_updated": "Pēdējo reizi atjaunināta {date}",
   "privacy_policy.title": "Privātuma politika",
   "recommended": "Ieteicams",
@@ -557,6 +567,7 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "šodien",
+  "reply_indicator.attachments": "{count, plural, zero{# pielikumu} one {# pielikums} other {# pielikumi}}",
   "reply_indicator.cancel": "Atcelt",
   "reply_indicator.poll": "Aptauja",
   "report.block": "Bloķēt",
@@ -630,7 +641,7 @@
   "search_results.title": "Meklēt {q}",
   "server_banner.about_active_users": "Cilvēki, kas izmantojuši šo serveri pēdējo 30 dienu laikā (aktīvie lietotāji mēnesī)",
   "server_banner.active_users": "aktīvi lietotāji",
-  "server_banner.administered_by": "Administrē:",
+  "server_banner.administered_by": "Pārvalda:",
   "server_banner.introduction": "{domain} ir daļa no decentralizētā sociālā tīkla, ko nodrošina {mastodon}.",
   "server_banner.learn_more": "Uzzināt vairāk",
   "server_banner.server_stats": "Servera statistika:",
@@ -652,9 +663,10 @@
   "status.direct_indicator": "Pieminēts privāti",
   "status.edit": "Labot",
   "status.edited": "Pēdējoreiz labots {date}",
-  "status.edited_x_times": "Labots {count, plural, one {{count} reizi} other {{count} reizes}}",
+  "status.edited_x_times": "Labots {count, plural, zero {{count} reižu} one {{count} reizi} other {{count} reizes}}",
   "status.embed": "Iegult",
   "status.favourite": "Izlasē",
+  "status.favourites": "{count, plural, zero {izlasēs} one {izlasē} other {izlasēs}}",
   "status.filter": "Filtrē šo ziņu",
   "status.filtered": "Filtrēts",
   "status.hide": "Slēpt ierakstu",
@@ -675,6 +687,7 @@
   "status.reblog": "Pastiprināt",
   "status.reblog_private": "Pastiprināt, nemainot redzamību",
   "status.reblogged_by": "{name} pastiprināja",
+  "status.reblogs": "{count, plural, zero {pastiprinājumu} one {pastiprinājums} other {pastiprinājumi}}",
   "status.reblogs.empty": "Neviens šo ierakstu vēl nav pastiprinājis. Kad būs, tie parādīsies šeit.",
   "status.redraft": "Dzēst un pārrakstīt",
   "status.remove_bookmark": "Noņemt grāmatzīmi",

app/javascript/mastodon/locales/mr.json

@@ -17,9 +17,12 @@
   "account.badges.group": "गट",
   "account.block": "@{name} यांना ब्लॉक करा",
   "account.block_domain": "{domain} पासून सर्व लपवा",
+  "account.block_short": "अवरोध",
   "account.blocked": "ब्लॉक केले आहे",
   "account.browse_more_on_origin_server": "मूळ प्रोफाइलवर अधिक ब्राउझ करा",
   "account.cancel_follow_request": "फॉलो विनंती मागे घ्या",
+  "account.copy": "दुवा कॉपी करा",
+  "account.direct": "खाजगीरित्या उल्लेखीत @{name}",
   "account.disable_notifications": "जेव्हा @{name} पोस्ट करतात तेव्हा मला सूचित करणे थांबवा",
   "account.domain_blocked": "Domain hidden",
   "account.edit_profile": "प्रोफाइल एडिट करा",
@@ -29,6 +32,7 @@
   "account.featured_tags.last_status_never": "पोस्ट नाहीत",
   "account.featured_tags.title": "{name} चे वैशिष्ट्यीकृत हॅशटॅग",
   "account.follow": "अनुयायी व्हा",
+  "account.follow_back": "आपणही अनुसरण करा",
   "account.followers": "अनुयायी",
   "account.followers.empty": "ह्या वापरकर्त्याचा आतापर्यंत कोणी अनुयायी नाही.",
   "account.followers_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
@@ -45,6 +49,7 @@
   "account.mention": "@{name} चा उल्लेख करा",
   "account.moved_to": "{name} ने सूचित केले आहे की त्यांचे नवीन खाते आता आहे:",
   "account.mute": "@{name} ला मूक कारा",
+  "account.mute_short": "नि:शब्द",
   "account.muted": "मौन",
   "account.open_original_page": "मूळ पृष्ठ उघडा",
   "account.posts": "Toots",

app/javascript/mastodon/locales/nl.json

@@ -414,6 +414,7 @@
   "limited_account_hint.action": "Alsnog het profiel tonen",
   "limited_account_hint.title": "Dit profiel is door de moderatoren van {domain} verborgen.",
   "link_preview.author": "Door {name}",
+  "link_preview.more_from_author": "Meer van {name}",
   "lists.account.add": "Aan lijst toevoegen",
   "lists.account.remove": "Uit lijst verwijderen",
   "lists.delete": "Lijst verwijderen",

app/javascript/mastodon/locales/sk.json

@@ -391,6 +391,7 @@
   "limited_account_hint.action": "Aj tak zobraziť profil",
   "limited_account_hint.title": "Tento profil bol skrytý správcami servera {domain}.",
   "link_preview.author": "Autor: {name}",
+  "link_preview.more_from_author": "Viac od {name}",
   "lists.account.add": "Pridať do zoznamu",
   "lists.account.remove": "Odstrániť zo zoznamu",
   "lists.delete": "Vymazať zoznam",
@@ -411,6 +412,7 @@
   "moved_to_account_banner.text": "Váš účet {disabledAccount} je momentálne deaktivovaný, pretože ste sa presunuli na {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Ukryť z upozornení",
   "mute_modal.hide_options": "Skryť možnosti",
+  "mute_modal.indefinite": "Pokiaľ ich neodtíšim",
   "mute_modal.show_options": "Zobraziť možnosti",
   "mute_modal.title": "Stíšiť užívateľa?",
   "navigation_bar.about": "O tomto serveri",

app/javascript/mastodon/locales/sq.json

@@ -414,6 +414,7 @@
   "limited_account_hint.action": "Shfaqe profilin sido qoftë",
   "limited_account_hint.title": "Ky profil është fshehur nga moderatorët e {domain}.",
   "link_preview.author": "Nga {name}",
+  "link_preview.more_from_author": "Më tepër nga {name}",
   "lists.account.add": "Shto në listë",
   "lists.account.remove": "Hiqe nga lista",
   "lists.delete": "Fshije listën",

app/javascript/mastodon/locales/sr-Latn.json

@@ -414,6 +414,7 @@
   "limited_account_hint.action": "Ipak prikaži profil",
   "limited_account_hint.title": "Ovaj profil su sakrili moderatori {domain}.",
   "link_preview.author": "Po {name}",
+  "link_preview.more_from_author": "Više od {name}",
   "lists.account.add": "Dodaj na listu",
   "lists.account.remove": "Ukloni sa liste",
   "lists.delete": "Izbriši listu",

app/javascript/mastodon/locales/sr.json

@@ -414,6 +414,7 @@
   "limited_account_hint.action": "Ипак прикажи профил",
   "limited_account_hint.title": "Овај профил су сакрили модератори {domain}.",
   "link_preview.author": "По {name}",
+  "link_preview.more_from_author": "Више од {name}",
   "lists.account.add": "Додај на листу",
   "lists.account.remove": "Уклони са листе",
   "lists.delete": "Избриши листу",

app/javascript/mastodon/locales/sv.json

@@ -414,6 +414,7 @@
   "limited_account_hint.action": "Visa profil ändå",
   "limited_account_hint.title": "Denna profil har dolts av {domain}s moderatorer.",
   "link_preview.author": "Av {name}",
+  "link_preview.more_from_author": "Mer från {name}",
   "lists.account.add": "Lägg till i lista",
   "lists.account.remove": "Ta bort från lista",
   "lists.delete": "Radera lista",

app/javascript/mastodon/locales/th.json

@@ -414,6 +414,7 @@
   "limited_account_hint.action": "แสดงโปรไฟล์ต่อไป",
   "limited_account_hint.title": "มีการซ่อนโปรไฟล์นี้โดยผู้กลั่นกรองของ {domain}",
   "link_preview.author": "โดย {name}",
+  "link_preview.more_from_author": "เพิ่มเติมจาก {name}",
   "lists.account.add": "เพิ่มไปยังรายการ",
   "lists.account.remove": "เอาออกจากรายการ",
   "lists.delete": "ลบรายการ",

app/javascript/mastodon/locales/tr.json

@@ -414,6 +414,7 @@
   "limited_account_hint.action": "Yine de profili göster",
   "limited_account_hint.title": "Bu profil {domain} moderatörleri tarafından gizlendi.",
   "link_preview.author": "Yazar: {name}",
+  "link_preview.more_from_author": "{name} kişisinden daha fazlası",
   "lists.account.add": "Listeye ekle",
   "lists.account.remove": "Listeden kaldır",
   "lists.delete": "Listeyi sil",

app/javascript/mastodon/locales/uk.json

@@ -414,6 +414,7 @@
   "limited_account_hint.action": "Усе одно показати профіль",
   "limited_account_hint.title": "Цей профіль сховали модератори {domain}.",
   "link_preview.author": "Від {name}",
+  "link_preview.more_from_author": "Більше від {name}",
   "lists.account.add": "Додати до списку",
   "lists.account.remove": "Вилучити зі списку",
   "lists.delete": "Видалити список",

app/lib/activitypub/activity/flag.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class ActivityPub::Activity::Flag < ActivityPub::Activity
+  COMMENT_SIZE_LIMIT = 5000
+
   def perform
     return if skip_reports?
 
@@ -38,6 +40,6 @@ class ActivityPub::Activity::Flag < ActivityPub::Activity
   end
 
   def report_comment
-    (@json['content'] || '')[0...5000]
+    (@json['content'] || '')[0...COMMENT_SIZE_LIMIT]
   end
 end

app/lib/admin/metrics/dimension/software_versions_dimension.rb

@@ -10,7 +10,7 @@ class Admin::Metrics::Dimension::SoftwareVersionsDimension < Admin::Metrics::Dim
   protected
 
   def perform_query
-    [mastodon_version, ruby_version, postgresql_version, redis_version, elasticsearch_version].compact
+    [mastodon_version, ruby_version, postgresql_version, redis_version, elasticsearch_version, libvips_version].compact
   end
 
   def mastodon_version
@@ -71,6 +71,17 @@ class Admin::Metrics::Dimension::SoftwareVersionsDimension < Admin::Metrics::Dim
     nil
   end
 
+  def libvips_version
+    return unless Rails.configuration.x.use_vips
+
+    {
+      key: 'libvips',
+      human_key: 'libvips',
+      value: Vips.version_string,
+      human_value: Vips.version_string,
+    }
+  end
+
   def redis_info
     @redis_info ||= if redis.is_a?(Redis::Namespace)
                       redis.redis.info

app/lib/scope_transformer.rb

@@ -11,6 +11,9 @@ class ScopeTransformer < Parslet::Transform
       @namespace = scope[:namespace]&.to_s
       @access    = scope[:access] ? [scope[:access].to_s] : DEFAULT_ACCESS.dup
       @term      = scope[:term]&.to_s || DEFAULT_TERM
+
+      # # override for profile scope which is read only
+      @access = %w(read) if @term == 'profile'
     end
 
     def key

app/lib/video_metadata_extractor.rb

@@ -41,8 +41,8 @@ class VideoMetadataExtractor
         @colorspace  = video_stream[:pix_fmt]
         @width       = video_stream[:width]
         @height      = video_stream[:height]
-        @frame_rate  = video_stream[:avg_frame_rate] == '0/0' ? nil : Rational(video_stream[:avg_frame_rate])
-        @r_frame_rate = video_stream[:r_frame_rate] == '0/0' ? nil : Rational(video_stream[:r_frame_rate])
+        @frame_rate  = parse_framerate(video_stream[:avg_frame_rate])
+        @r_frame_rate = parse_framerate(video_stream[:r_frame_rate])
         # For some video streams the frame_rate reported by `ffprobe` will be 0/0, but for these streams we
         # should use `r_frame_rate` instead. Video screencast generated by Gnome Screencast have this issue.
         @frame_rate ||= @r_frame_rate
@@ -55,4 +55,10 @@ class VideoMetadataExtractor
 
     @invalid = true if @metadata.key?(:error)
   end
+
+  def parse_framerate(raw)
+    Rational(raw)
+  rescue ZeroDivisionError
+    nil
+  end
 end

app/models/appeal.rb

@@ -18,6 +18,8 @@
 class Appeal < ApplicationRecord
   MAX_STRIKE_AGE = 20.days
 
+  TEXT_LENGTH_LIMIT = 2_000
+
   belongs_to :account
   belongs_to :strike, class_name: 'AccountWarning', foreign_key: 'account_warning_id', inverse_of: :appeal
 
@@ -26,7 +28,7 @@ class Appeal < ApplicationRecord
     belongs_to :rejected_by_account
   end
 
-  validates :text, presence: true, length: { maximum: 2_000 }
+  validates :text, presence: true, length: { maximum: TEXT_LENGTH_LIMIT }
   validates :account_warning_id, uniqueness: true
 
   validate :validate_time_frame, on: :create

app/models/concerns/attachmentable.rb

@@ -69,7 +69,7 @@ module Attachmentable
     original_extension       = Paperclip::Interpolations.extension(attachment, :original)
     proper_extension         = extensions_for_mime_type.first.to_s
     extension                = extensions_for_mime_type.include?(original_extension) ? original_extension : proper_extension
-    extension                = 'jpeg' if extension == 'jpe'
+    extension                = 'jpeg' if ['jpe', 'jfif'].include?(extension)
 
     extension
   end

app/models/custom_emoji.rb

@@ -40,7 +40,7 @@ class CustomEmoji < ApplicationRecord
 
   has_one :local_counterpart, -> { where(domain: nil) }, class_name: 'CustomEmoji', primary_key: :shortcode, foreign_key: :shortcode, inverse_of: false, dependent: nil
 
-  has_attached_file :image, styles: { static: { format: 'png', convert_options: '-coalesce +profile "!icc,*" +set date:modify +set date:create +set date:timestamp' } }, validate_media_type: false
+  has_attached_file :image, styles: { static: { format: 'png', convert_options: '-coalesce +profile "!icc,*" +set date:modify +set date:create +set date:timestamp', file_geometry_parser: FastGeometryParser } }, validate_media_type: false, processors: [:lazy_thumbnail]
 
   normalizes :domain, with: ->(domain) { domain.downcase }
 

app/models/link_feed.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+class LinkFeed < PublicFeed
+  # @param [PreviewCard] preview_card
+  # @param [Account] account
+  # @param [Hash] options
+  def initialize(preview_card, account, options = {})
+    @preview_card = preview_card
+    super(account, options)
+  end
+
+  # @param [Integer] limit
+  # @param [Integer] max_id
+  # @param [Integer] since_id
+  # @param [Integer] min_id
+  # @return [Array<Status>]
+  def get(limit, max_id = nil, since_id = nil, min_id = nil)
+    scope = public_scope
+
+    scope.merge!(discoverable)
+    scope.merge!(attached_to_preview_card)
+
+    scope.to_a_paginated_by_id(limit, max_id: max_id, since_id: since_id, min_id: min_id)
+  end
+
+  private
+
+  def attached_to_preview_card
+    Status.joins(:preview_cards_status).where(preview_cards_status: { preview_card_id: @preview_card.id })
+  end
+
+  def discoverable
+    Account.discoverable
+  end
+end