Make NoEmptyPolicy work with Update

It is possible for an earlier Update to be received by us later.
For this, we now
(1) only allows Updates to poll counts if there is no updated field,
    or the updated field is the same as the last updated date or
    creation date;
(2) does not allow updating anything if the updated field
    is older than the last updated date or creation date;
(3) allows updating updatable fields otherwise (normal updates);
(4) if only the updated field is changed, it does not create
    a new history item on its own.

.woodpecker.yml

@@ -1,188 +0,0 @@
-variables:
-  - &scw-secrets
-    - SCW_ACCESS_KEY
-    - SCW_SECRET_KEY
-    - SCW_DEFAULT_ORGANIZATION_ID
-  - &setup-hex "mix local.hex --force && mix local.rebar --force"
-  - &on-release
-    when:
-      event:
-        - push
-        - tag
-      branch:
-        - develop
-        - stable
-        - refs/tags/v*
-        - refs/tags/stable-*
-  - &on-point-release
-    when:
-      event:
-        - push
-      branch:
-        - develop
-        - stable
-  - &on-pr-open
-    when:
-      event:
-        - pull_request
-
-  - &tag-build "export BUILD_TAG=$${CI_COMMIT_TAG:-\"$CI_COMMIT_BRANCH\"} && export PLEROMA_BUILD_BRANCH=$BUILD_TAG"
-
-  - &clean "(rm -rf release || true) && (rm -rf _build || true) && (rm -rf /root/.mix)"
-  - &mix-clean "mix deps.clean --all && mix clean"
-
-services:
-  postgres:
-    image: postgres:13
-    when:
-      event:
-        - pull_request
-    environment:
-      POSTGRES_DB: pleroma_test
-      POSTGRES_USER: postgres
-      POSTGRES_PASSWORD: postgres
-
-pipeline:
-  lint:
-    <<: *on-pr-open
-    image: akkoma/ci-base:latest
-    commands:
-    - mix local.hex --force
-    - mix local.rebar --force
-    - mix format --check-formatted
-
-  build:
-    image: akkoma/ci-base:latest
-    <<: *on-pr-open
-    environment:
-      MIX_ENV: test
-      POSTGRES_DB: pleroma_test
-      POSTGRES_USER: postgres
-      POSTGRES_PASSWORD: postgres
-      DB_HOST: postgres
-    commands:
-      - mix local.hex --force
-      - mix local.rebar --force
-      - mix deps.get
-      - mix compile
-
-  test:
-    image: akkoma/ci-base:latest
-    <<: *on-pr-open
-    environment:
-      MIX_ENV: test
-      POSTGRES_DB: pleroma_test
-      POSTGRES_USER: postgres
-      POSTGRES_PASSWORD: postgres
-      DB_HOST: postgres
-    commands:
-    - mix local.hex --force
-    - mix local.rebar --force
-    - mix deps.get
-    - mix compile
-    - mix ecto.drop -f -q
-    - mix ecto.create
-    - mix ecto.migrate
-    - mix test --preload-modules --exclude erratic --exclude federated --max-cases 4
-
-  # Canonical amd64
-  ubuntu22:
-    image: hexpm/elixir:1.13.4-erlang-25.0.2-ubuntu-jammy-20220428
-    <<: *on-release
-    environment:
-      MIX_ENV: prod
-      DEBIAN_FRONTEND: noninteractive
-    commands:
-      - rm config/emoji.txt
-      - apt-get update && apt-get install -y cmake libmagic-dev rclone zip imagemagick libmagic-dev git build-essential g++ wget
-      - *clean
-      - echo "import Config" > config/prod.secret.exs
-      - *setup-hex
-      - *tag-build
-      - mix deps.get --only prod
-      - mix release --path release
-      - zip akkoma-ubuntu-jammy.zip -r release
-
-  release-ubuntu22:
-    image: akkoma/releaser
-    <<: *on-release
-    secrets: *scw-secrets
-    commands:
-      - export SOURCE=akkoma-ubuntu-jammy.zip
-      - export DEST=scaleway:akkoma-updates/$${CI_COMMIT_TAG:-"$CI_COMMIT_BRANCH"}/akkoma-ubuntu-jammy.zip
-      - /bin/sh /entrypoint.sh
-
-  debian-bullseye:
-    image: elixir:1.13.4
-    <<: *on-release
-    environment:
-      MIX_ENV: prod
-      DEBIAN_FRONTEND: noninteractive
-    commands:
-      - apt-get update && apt-get install -y cmake libmagic-dev rclone zip imagemagick libmagic-dev git build-essential gcc make g++ wget
-      - *clean
-      - echo "import Config" > config/prod.secret.exs
-      - *setup-hex
-      - *tag-build
-      - *mix-clean
-      - mix deps.get --only prod
-      - mix release --path release
-      - zip akkoma-amd64.zip -r release
-
-  release-debian:
-    image: akkoma/releaser
-    <<: *on-release
-    secrets: *scw-secrets
-    commands:
-      - export SOURCE=akkoma-amd64.zip
-      - export DEST=scaleway:akkoma-updates/$${CI_COMMIT_TAG:-"$CI_COMMIT_BRANCH"}/akkoma-amd64.zip
-      - /bin/sh /entrypoint.sh
-      - export DEST=scaleway:akkoma-updates/$${CI_COMMIT_TAG:-"$CI_COMMIT_BRANCH"}/akkoma-debian-stable.zip
-      - /bin/sh /entrypoint.sh
-
-  # Canonical amd64-musl
-  musl:
-    image: elixir:1.13.4-alpine
-    <<: *on-release
-    environment:
-      MIX_ENV: prod
-    commands:
-      - apk add git gcc g++ musl-dev make cmake file-dev rclone wget zip imagemagick
-      - *clean
-      - *setup-hex
-      - *mix-clean
-      - *tag-build
-      - mix deps.get --only prod
-      - mix release --path release
-      - zip akkoma-amd64-musl.zip -r release
-
-  release-musl:
-    image: akkoma/releaser
-    <<: *on-release
-    secrets: *scw-secrets
-    commands:
-      - export SOURCE=akkoma-amd64-musl.zip
-      - export DEST=scaleway:akkoma-updates/$${CI_COMMIT_TAG:-"$CI_COMMIT_BRANCH"}/akkoma-amd64-musl.zip
-      - /bin/sh /entrypoint.sh
-
-  docs:
-    <<: *on-point-release
-    secrets:
-    - SCW_ACCESS_KEY
-    - SCW_SECRET_KEY
-    - SCW_DEFAULT_ORGANIZATION_ID
-    environment:
-      CI: "true"
-    image: python:3.10-slim
-    commands:
-      - apt-get update && apt-get install -y rclone wget git zip
-      - wget https://github.com/scaleway/scaleway-cli/releases/download/v2.5.1/scaleway-cli_2.5.1_linux_amd64
-      - mv scaleway-cli_2.5.1_linux_amd64 scaleway-cli
-      - chmod +x scaleway-cli
-      - ./scaleway-cli object config install type=rclone
-      - cd docs
-      - pip install -r requirements.txt
-      - mkdocs build
-      - zip -r docs.zip site/*
-      - cd site
-      - rclone copy . scaleway:akkoma-docs/$CI_COMMIT_BRANCH/

.woodpecker/.docs.yml

@@ -0,0 +1,27 @@
+pipeline:
+  build:
+    when:
+      event:
+        - push
+      branch:
+        - develop
+        - stable
+    secrets:
+    - SCW_ACCESS_KEY
+    - SCW_SECRET_KEY
+    - SCW_DEFAULT_ORGANIZATION_ID
+    environment:
+      CI: "true"
+    image: python:3.10-slim
+    commands:
+      - apt-get update && apt-get install -y rclone wget git zip
+      - wget https://github.com/scaleway/scaleway-cli/releases/download/v2.5.1/scaleway-cli_2.5.1_linux_amd64
+      - mv scaleway-cli_2.5.1_linux_amd64 scaleway-cli
+      - chmod +x scaleway-cli
+      - ./scaleway-cli object config install type=rclone
+      - cd docs
+      - pip install -r requirements.txt
+      - mkdocs build  
+      - zip -r docs.zip site/*
+      - cd site
+      - rclone copy . scaleway:akkoma-docs/$CI_COMMIT_BRANCH/

.woodpecker/.release.yml

@@ -0,0 +1,59 @@
+variables:
+  - &scw-secrets
+    - SCW_ACCESS_KEY
+    - SCW_SECRET_KEY
+    - SCW_DEFAULT_ORGANIZATION_ID
+  - &setup-scw-s3 "wget https://github.com/scaleway/scaleway-cli/releases/download/v2.5.1/scaleway-cli_2.5.1_linux_amd64 && mv scaleway-cli_2.5.1_linux_amd64 scaleway-cli && chmod +x scaleway-cli && ./scaleway-cli object config install type=rclone"
+
+  - &setup-hex "mix local.hex --force &&  mix local.rebar --force"
+  - &build-on
+    when:
+      event:
+      - push
+      - tag
+      branch:
+      - develop
+      - stable
+      - refs/tags/v*
+      - refs/tags/stable-*  
+  - &tag-build 'export BUILD_TAG=$${CI_COMMIT_TAG:-"$CI_COMMIT_BRANCH"} && export PLEROMA_BUILD_BRANCH=$BUILD_TAG'
+
+  - &clean "(rm -rf release || true) && (rm -rf _build || true) && (rm -rf /root/.mix) && (rm scaleway-cli || true)"
+
+
+pipeline:
+  glibc:
+    image: elixir:1.13
+    <<: *build-on
+    secrets: *scw-secrets
+    environment:
+      MIX_ENV: prod
+    commands:
+      - apt-get update && apt-get install -y cmake libmagic-dev rclone zip imagemagick libmagic-dev git
+      - *clean
+      - *setup-scw-s3
+      - echo "import Mix.Config" > config/prod.secret.exs
+      - *setup-hex
+      - *tag-build
+      - mix deps.get --only prod
+      - mix release --path release
+      - zip akkoma-amd64.zip -r release
+      - rclone copyto akkoma-amd64.zip scaleway:akkoma-updates/$BUILD_TAG/akkoma-amd64.zip
+
+  musl:
+    image: elixir:1.13-alpine
+    <<: *build-on
+    secrets: *scw-secrets
+    environment:
+      MIX_ENV: prod
+    commands:
+      - apk add git gcc g++ musl-dev make cmake file-dev rclone wget zip imagemagick
+      - *clean
+      - *setup-scw-s3
+      - *setup-hex
+      - mix deps.clean --all
+      - *tag-build
+      - mix deps.get --only prod
+      - mix release --path release
+      - zip akkoma-amd64.zip -r release
+      - rclone copyto akkoma-amd64.zip scaleway:akkoma-updates/$BUILD_TAG/akkoma-amd64-musl.zip

.woodpecker/.test.yml

@@ -0,0 +1,59 @@
+matrix:
+  ELIXIR_VERSION:
+  - 1.13
+
+pipeline:
+  lint:
+    when:
+      event:
+      - pull_request
+    image: pleromaforkci/ci-base:1.13
+    commands:
+    - mix local.hex --force
+    - mix local.rebar --force
+    - mix format --check-formatted
+
+  build:
+    image: pleromaforkci/ci-base:${ELIXIR_VERSION}
+    when:
+      event:
+      - pull_request
+    environment:
+      MIX_ENV: test
+    commands:
+    - mix local.hex --force
+    - mix local.rebar --force
+    - mix deps.get
+    - mix compile
+
+  test:
+    group: test
+    image: pleromaforkci/ci-base:${ELIXIR_VERSION}
+    when:
+      event:
+      - pull_request
+    environment:
+      MIX_ENV: test
+      POSTGRES_DB: pleroma_test
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
+      DB_HOST: postgres
+    commands:
+    - mix local.hex --force
+    - mix local.rebar --force
+    - mix deps.get
+    - mix ecto.drop -f -q
+    - mix ecto.create
+    - mix ecto.migrate
+    - mix test --preload-modules --exclude erratic --exclude federated --max-cases 4
+     
+services:
+  postgres:
+    image: postgres:13
+    when:
+      event:
+      - pull_request
+    environment:
+      POSTGRES_DB: pleroma_test
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres

CHANGELOG.md

@@ -13,10 +13,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Changed
 - quarantining is now considered absolutely; public activities are no longer
   an exception.
-- flavours:
-  - amd64 is built for debian stable. Compatible with ubuntu 20.
-  - ubuntu-jammy is built for... well, ubuntu 22 (LTS)
-  - amd64-musl is built for alpine 3.16
 
 ### Fixed
 - Updated mastoFE path, for the newer version
@@ -30,6 +26,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
   - `/api/v1/notifications/dismiss`
   - `/api/v1/search`
   - `/api/v1/statuses/{id}/card` 
+- LDAP authenticator (use the akkoma-contrib-authenticator-ldap runtime module)
 - Chats, they were half-baked. Just use PMs.
 - Prometheus, it causes massive slowdown
 

Dockerfile

@@ -1,4 +1,4 @@
-FROM elixir:1.13.4-alpine as build
+FROM hexpm/elixir:1.13.4-erlang-24.3.4.2-alpine-3.16.0 as build
 
 COPY . .
 

config/config.exs

@@ -509,6 +509,7 @@ config :pleroma, Pleroma.User,
     "~",
     "about",
     "activities",
+    "akkoma",
     "api",
     "auth",
     "check_password",
@@ -589,17 +590,6 @@ config :pleroma, Pleroma.Formatter,
   extra: true,
   validate_tld: :no_scheme
 
-config :pleroma, :ldap,
-  enabled: System.get_env("LDAP_ENABLED") == "true",
-  host: System.get_env("LDAP_HOST") || "localhost",
-  port: String.to_integer(System.get_env("LDAP_PORT") || "389"),
-  ssl: System.get_env("LDAP_SSL") == "true",
-  sslopts: [],
-  tls: System.get_env("LDAP_TLS") == "true",
-  tlsopts: [],
-  base: System.get_env("LDAP_BASE") || "dc=example,dc=com",
-  uid: System.get_env("LDAP_UID") || "cn"
-
 oauth_consumer_strategies =
   "OAUTH_CONSUMER_STRATEGIES"
   |> System.get_env()

config/description.exs

@@ -2140,104 +2140,6 @@ config :pleroma, :config_description, [
       }
     ]
   },
-  %{
-    group: :pleroma,
-    key: :ldap,
-    label: "LDAP",
-    type: :group,
-    description:
-      "Use LDAP for user authentication. When a user logs in to the Pleroma instance, the name and password" <>
-        " will be verified by trying to authenticate (bind) to a LDAP server." <>
-        " If a user exists in the LDAP directory but there is no account with the same name yet on the" <>
-        " Pleroma instance then a new Pleroma account will be created with the same name as the LDAP user name.",
-    children: [
-      %{
-        key: :enabled,
-        type: :boolean,
-        description: "Enables LDAP authentication"
-      },
-      %{
-        key: :host,
-        type: :string,
-        description: "LDAP server hostname",
-        suggestions: ["localhosts"]
-      },
-      %{
-        key: :port,
-        type: :integer,
-        description: "LDAP port, e.g. 389 or 636",
-        suggestions: [389, 636]
-      },
-      %{
-        key: :ssl,
-        label: "SSL",
-        type: :boolean,
-        description: "Enable to use SSL, usually implies the port 636"
-      },
-      %{
-        key: :sslopts,
-        label: "SSL options",
-        type: :keyword,
-        description: "Additional SSL options",
-        suggestions: [cacertfile: "path/to/file/with/PEM/cacerts", verify: :verify_peer],
-        children: [
-          %{
-            key: :cacertfile,
-            type: :string,
-            description: "Path to file with PEM encoded cacerts",
-            suggestions: ["path/to/file/with/PEM/cacerts"]
-          },
-          %{
-            key: :verify,
-            type: :atom,
-            description: "Type of cert verification",
-            suggestions: [:verify_peer]
-          }
-        ]
-      },
-      %{
-        key: :tls,
-        label: "TLS",
-        type: :boolean,
-        description: "Enable to use STARTTLS, usually implies the port 389"
-      },
-      %{
-        key: :tlsopts,
-        label: "TLS options",
-        type: :keyword,
-        description: "Additional TLS options",
-        suggestions: [cacertfile: "path/to/file/with/PEM/cacerts", verify: :verify_peer],
-        children: [
-          %{
-            key: :cacertfile,
-            type: :string,
-            description: "Path to file with PEM encoded cacerts",
-            suggestions: ["path/to/file/with/PEM/cacerts"]
-          },
-          %{
-            key: :verify,
-            type: :atom,
-            description: "Type of cert verification",
-            suggestions: [:verify_peer]
-          }
-        ]
-      },
-      %{
-        key: :base,
-        type: :string,
-        description: "LDAP base, e.g. \"dc=example,dc=com\"",
-        suggestions: ["dc=example,dc=com"]
-      },
-      %{
-        key: :uid,
-        label: "UID",
-        type: :string,
-        description:
-          "LDAP attribute name to authenticate the user, e.g. when \"cn\", the filter will be \"cn=username,base\"",
-        suggestions: ["cn"]
-      }
-    ]
-  },
   %{
     group: :pleroma,
     key: :auth,

docs/Makefile

@@ -5,5 +5,3 @@ install:
 	pipenv install
 clean:
 	rm -rf site
-serve:
-	pipenv run python3 -m http.server -d site  

docs/docs/configuration/cheatsheet.md

@@ -891,28 +891,6 @@ Authentication / authorization settings.
 ### Pleroma.Web.Auth.Authenticator
 
 * `Pleroma.Web.Auth.PleromaAuthenticator`: default database authenticator.
-* `Pleroma.Web.Auth.LDAPAuthenticator`: LDAP authentication.
-
-### :ldap
-
-Use LDAP for user authentication.  When a user logs in to the Akkoma
-instance, the name and password will be verified by trying to authenticate
-(bind) to an LDAP server.  If a user exists in the LDAP directory but there
-is no account with the same name yet on the Akkoma instance then a new
-Akkoma account will be created with the same name as the LDAP user name.
-
-* `enabled`: enables LDAP authentication
-* `host`: LDAP server hostname
-* `port`: LDAP port, e.g. 389 or 636
-* `ssl`: true to use SSL, usually implies the port 636
-* `sslopts`: additional SSL options
-* `tls`: true to start TLS, usually implies the port 389
-* `tlsopts`: additional TLS options
-* `base`: LDAP base, e.g. "dc=example,dc=com"
-* `uid`: LDAP attribute name to authenticate the user, e.g. when "cn", the filter will be "cn=username,base"
-
-Note, if your LDAP server is an Active Directory server the correct value is commonly `uid: "cn"`, but if you use an
-OpenLDAP server the value may be `uid: "uid"`.
 
 ### :oauth2 (Akkoma as OAuth 2.0 provider settings)
 

docs/docs/development/API/differences_in_mastoapi_responses.md

@@ -40,6 +40,10 @@ Has these additional fields under the `pleroma` object:
 - `parent_visible`: If the parent of this post is visible to the user or not.
 - `pinned_at`: a datetime (iso8601) when status was pinned, `null` otherwise.
 
+The `GET /api/v1/statuses/:id/source` endpoint additionally has the following attributes:
+
+- `content_type`: The content type of the status source.
+
 ## Scheduled statuses
 
 Has these additional fields in `params`:

docs/docs/installation/alpine_linux_en.md

@@ -41,12 +41,6 @@ doas apk add git build-base cmake file-dev
 doas apk add erlang elixir
 ```
 
-* Install `erlang-eldap` if you want to enable ldap authenticator
-
-```shell
-doas apk add erlang-eldap
-```
-
 ### Install PostgreSQL
 
 * Install Postgresql server:

docs/docs/installation/debian_based_jp.md

@@ -0,0 +1,188 @@
+# Akkomaの入れ方
+## 日本語訳について
+
+この記事は [Installing on Debian based distributions](Installing on Debian based distributions) の日本語訳です。何かがおかしいと思ったら、原文を見てください。
+
+## インストール
+
+このガイドはDebian Stretchを利用することを想定しています。Ubuntu 16.04や18.04でもおそらく動作します。また、ユーザはrootもしくはsudoにより管理者権限を持っていることを前提とします。もし、以下の操作をrootユーザで行う場合は、 `sudo` を無視してください。ただし、`sudo -Hu akkoma` のようにユーザを指定している場合には `su <username> -s $SHELL -c 'command'` を代わりに使ってください。
+
+### 必要なソフトウェア
+
+- PostgreSQL 9.6以上 (Ubuntu16.04では9.5しか提供されていないので，[](https://www.postgresql.org/download/linux/ubuntu/)こちらから新しいバージョンを入手してください)
+- `postgresql-contrib` 9.6以上 (同上)
+- Elixir 1.8 以上 ([Debianのリポジトリからインストールしないこと！！！ ここからインストールすること！](https://elixir-lang.org/install.html#unix-and-unix-like)。または [asdf](https://github.com/asdf-vm/asdf) をakkomaユーザーでインストールしてください)
+- `erlang-dev`
+- `erlang-nox`
+- `git`
+- `build-essential`
+- `cmake`
+- `libmagic-dev`
+
+#### このガイドで利用している追加パッケージ
+
+- `nginx` (おすすめです。他のリバースプロキシを使う場合は、参考となる設定をこのリポジトリから探してください)
+- `certbot` (または何らかのLet's Encrypt向けACMEクライアント)
+- `ImageMagick`
+- `ffmpeg`
+- `exiftool`
+
+### システムを準備する
+
+* まずシステムをアップデートしてください。
+```
+sudo apt update
+sudo apt full-upgrade
+```
+
+* 上記に挙げたパッケージをインストールしておきます。
+```
+sudo apt install git build-essential postgresql postgresql-contrib cmake ffmpeg imagemagick libmagic-dev
+```
+
+### ElixirとErlangをインストールします
+
+* Erlangのリポジトリをダウンロードおよびインストールします。
+```
+wget -P /tmp/ https://packages.erlang-solutions.com/erlang-solutions_2.0_all.deb
+sudo dpkg -i /tmp/erlang-solutions_2.0_all.deb
+```
+
+* ElixirとErlangをインストールします、
+```
+sudo apt update
+sudo apt install elixir erlang-dev erlang-nox
+```
+
+### オプションパッケージ: [`docs/installation/optional/media_graphics_packages.md`](../installation/optional/media_graphics_packages.md)
+
+```shell
+sudo apt install imagemagick ffmpeg libimage-exiftool-perl
+```
+
+### Akkoma BE (バックエンド) をインストールします
+
+*  Akkoma用に新しいユーザーを作ります。
+
+```
+sudo useradd -r -s /bin/false -m -d /var/lib/akkoma -U akkoma
+```
+
+**注意**: Akkomaユーザとして単発のコマンドを実行したい場合はは、`sudo -Hu akkoma command` を使ってください。シェルを使いたい場合は `sudo -Hu akkoma $SHELL`です。もし `sudo` を使わない場合は、rootユーザで `su -l akkoma -s $SHELL -c 'command'` とすることでコマンドを、`su -l akkoma -s $SHELL` とすることでシェルを開始できます。
+
+*  Gitリポジトリをクローンします。
+```
+sudo mkdir -p /opt/akkoma
+sudo chown -R akkoma:akkoma /opt/akkoma
+sudo -Hu akkoma git clone https://akkoma.dev/AkkomaGang/akkoma.git /opt/akkoma
+```
+
+*  新しいディレクトリに移動します。
+```
+cd /opt/akkoma
+```
+
+* Akkomaが依存するパッケージをインストールします。Hexをインストールしてもよいか聞かれたら、yesを入力してください。
+```
+sudo -Hu akkoma mix deps.get
+```
+
+* コンフィギュレーションを生成します。
+```
+sudo -Hu akkoma MIX_ENV=prod mix pleroma.instance gen
+```
+    * rebar3をインストールしてもよいか聞かれたら、yesを入力してください。
+    * このときにakkomaの一部がコンパイルされるため、この処理には時間がかかります。
+    * あなたのインスタンスについて、いくつかの質問されます。この質問により `config/generated_config.exs` という設定ファイルが生成されます。
+
+
+* コンフィギュレーションを確認して、もし問題なければ、ファイル名を変更してください。
+```
+sudo -Hu akkoma mv config/{generated_config.exs,prod.secret.exs}
+```
+
+* 先程のコマンドで、すでに `config/setup_db.psql` というファイルが作られています。このファイルをもとに、データベースを作成します。
+```
+sudo -Hu akkoma MIX_ENV=prod mix pleroma.instance gen
+```
+
+* そして、データベースのマイグレーションを実行します。
+```
+sudo -Hu akkoma MIX_ENV=prod mix ecto.migrate
+```
+
+* これでAkkomaを起動できるようになりました。
+```
+sudo -Hu akkoma MIX_ENV=prod mix phx.server
+```
+
+### インストールの最終段階
+
+あなたの新しいインスタンスを世界に向けて公開するには、nginx等のWebサーバやプロキシサーバをAkkomaの前段に使用する必要があります。また、Akkoma のためにシステムサービスファイルを作成する必要があります。
+
+#### Nginx
+
+* まだインストールしていないなら、nginxをインストールします。
+```
+sudo apt install nginx
+```
+
+* SSLをセットアップします。他の方法でもよいですが、ここではcertbotを説明します。
+certbotを使うならば、まずそれをインストールします。
+```
+sudo apt install certbot
+```
+そしてセットアップします。
+```
+sudo mkdir -p /var/lib/letsencrypt/
+sudo certbot certonly --email <your@emailaddress> -d <yourdomain> --standalone
+```
+もしうまくいかないときは、nginxが正しく動いていない可能性があります。先にnginxを設定してください。ssl "on" を "off" に変えてから再試行してください。
+
+---
+
+* nginxの設定ファイルサンプルをnginxフォルダーにコピーします。
+```
+sudo cp /opt/akkoma/installation/nginx/akkoma.nginx /etc/nginx/sites-available/akkoma.nginx
+sudo ln -s /etc/nginx/sites-available/akkoma.nginx /etc/nginx/sites-enabled/akkoma.nginx
+```
+
+* nginxを起動する前に、設定ファイルを編集してください。例えば、サーバー名、証明書のパスなどを変更する必要があります。
+* nginxを再起動します。
+```
+sudo systemctl enable --now nginx.service
+```
+
+もし証明書を更新する必要が出てきた場合には、nginxの関連するlocationブロックのコメントアウトを外し、以下のコマンドを動かします。
+
+```
+sudo certbot certonly --email <your@emailaddress> -d <yourdomain> --webroot -w /var/lib/letsencrypt/
+```
+
+#### 他のWebサーバやプロキシ
+これに関してはサンプルが `/opt/akkoma/installation/` にあるので、探してみてください。
+
+#### Systemd サービス
+
+* サービスファイルのサンプルをコピーします。
+```
+sudo cp /opt/akkoma/installation/akkoma.service /etc/systemd/system/akkoma.service
+```
+
+* サービスファイルを変更します。すべてのパスが正しいことを確認してください
+* サービスを有効化し `akkoma.service` を開始してください
+```
+sudo systemctl enable --now akkoma.service
+```
+
+#### 初期ユーザの作成
+
+新たにインスタンスを作成したら、以下のコマンドにより管理者権限を持った初期ユーザを作成できます。
+
+```
+sudo -Hu akkoma MIX_ENV=prod mix pleroma.user new <username> <your@emailaddress> --admin
+```
+
+#### その他の設定とカスタマイズ
+
+{! installation/further_reading.include !}

docs/docs/installation/fedora_based_en.md

@@ -1,197 +0,0 @@
-# Installing on Fedora
-
-## OTP releases and RedHat-distributions
-
-While the OTP releases of Akkoma work on most Linux distributions, they do not work correctly with RedHat-distributions. Therefore from-source installations are the recommended way to go when trying to install Akkoma on Fedora, Centos Stream or RedHat.
-
-However, it is possible to compile your own OTP release of Akkoma for RedHat. Keep in mind that this has a few drawbacks, and has no particular advantage over a from-source installation, since you'll need to install Erlang and Elixir anyway.
-
-This guide will cover a from-source installation. For instructions on how to build your own OTP release, please check out [the OTP for RedHat guide](./otp_redhat_en.md).
-
-## Installation
-
-This guide will assume you are on Fedora 36. This guide should also work with current releases of Centos Stream and RedHat, although it has not been tested yet. It also assumes that you have administrative rights, either as root or a user with [sudo permissions](https://docs.fedoraproject.org/en-US/quick-docs/adding_user_to_sudoers_file/). If you want to run this guide with root, ignore the `sudo` at the beginning of the lines, unless it calls a user like `sudo -Hu akkoma`; in this case, use `su <username> -s $SHELL -c 'command'` instead.
-
-{! installation/generic_dependencies.include !}
-
-### Prepare the system
-
-* First update the system, if not already done:
-
-```shell
-sudo dnf upgrade --refresh
-```
-
-* Install some of the above mentioned programs:
-
-```shell
-sudo dnf install git gcc g++ make cmake file-devel postgresql postgresql-contrib
-```
-
-### Install Elixir and Erlang
-
-* Install Elixir and Erlang:
-
-```shell
-sudo dnf install elixir erlang-os_mon erlang-eldap erlang-xmerl erlang-erl_interface erlang-syntax_tools
-```
-
-
-### Optional packages: [`docs/installation/optional/media_graphics_packages.md`](../installation/optional/media_graphics_packages.md)
-
-* Install ffmpeg (requires setting up the RPM-fusion repositories):
-
-```shell
-sudo dnf -y install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm
-sudo dnf -y install https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm
-sudo dnf install ffmpeg
-```
-
-* Install ImageMagick and ExifTool for image manipulation:
-
-```shell
-sudo dnf install Imagemagick perl-Image-ExifTool
-```
-
-
-
-### Install AkkomaBE
-
-* Add a new system user for the Akkoma service:
-
-```shell
-sudo useradd -r -s /bin/false -m -d /var/lib/akkoma -U akkoma
-```
-
-**Note**: To execute a single command as the Akkoma system user, use `sudo -Hu akkoma command`. You can also switch to a shell by using `sudo -Hu akkoma $SHELL`. If you don’t have and want `sudo` on your system, you can use `su` as root user (UID 0) for a single command by using `su -l akkoma -s $SHELL -c 'command'` and `su -l akkoma -s $SHELL` for starting a shell.
-
-* Git clone the AkkomaBE repository and make the Akkoma user the owner of the directory:
-
-```shell
-sudo mkdir -p /opt/akkoma
-sudo chown -R akkoma:akkoma /opt/akkoma
-sudo -Hu akkoma git clone https://akkoma.dev/AkkomaGang/akkoma.git /opt/akkoma
-```
-
-* Change to the new directory:
-
-```shell
-cd /opt/akkoma
-```
-
-* Install the dependencies for Akkoma and answer with `yes` if it asks you to install `Hex`:
-
-```shell
-sudo -Hu akkoma mix deps.get
-```
-
-* Generate the configuration: `sudo -Hu akkoma MIX_ENV=prod mix pleroma.instance gen`
-  * Answer with `yes` if it asks you to install `rebar3`.
-  * This may take some time, because parts of akkoma get compiled first.
-  * After that it will ask you a few questions about your instance and generates a configuration file in `config/generated_config.exs`.
-
-* Check the configuration and if all looks right, rename it, so Akkoma will load it (`prod.secret.exs` for productive instance, `dev.secret.exs` for development instances):
-
-```shell
-sudo -Hu akkoma mv config/{generated_config.exs,prod.secret.exs}
-```
-
-
-* The previous command creates also the file `config/setup_db.psql`, with which you can create the database:
-
-```shell
-sudo -Hu postgres psql -f config/setup_db.psql
-```
-
-* Now run the database migration:
-
-```shell
-sudo -Hu akkoma MIX_ENV=prod mix ecto.migrate
-```
-
-* Now you can start Akkoma already
-
-```shell
-sudo -Hu akkoma MIX_ENV=prod mix phx.server
-```
-
-### Finalize installation
-
-If you want to open your newly installed instance to the world, you should run nginx or some other webserver/proxy in front of Akkoma and you should consider to create a systemd service file for Akkoma.
-
-#### Nginx
-
-* Install nginx, if not already done:
-
-```shell
-sudo dnf install nginx
-```
-
-* Setup your SSL cert, using your method of choice or certbot. If using certbot, first install it:
-
-```shell
-sudo dnf install certbot
-```
-
-and then set it up:
-
-```shell
-sudo mkdir -p /var/lib/letsencrypt/
-sudo certbot certonly --email <your@emailaddress> -d <yourdomain> --standalone
-```
-
-If that doesn’t work, make sure, that nginx is not already running. If it still doesn’t work, try setting up nginx first (change ssl “on” to “off” and try again).
-
----
-
-* Copy the example nginx configuration and activate it:
-
-```shell
-sudo cp /opt/akkoma/installation/nginx/akkoma.nginx /etc/nginx/conf.d/akkoma.conf
-```
-
-* Before starting nginx edit the configuration and change it to your needs (e.g. change servername, change cert paths)
-* Enable and start nginx:
-
-```shell
-sudo systemctl enable --now nginx.service
-```
-
-If you need to renew the certificate in the future, uncomment the relevant location block in the nginx config and run:
-
-```shell
-sudo certbot certonly --email <your@emailaddress> -d <yourdomain> --webroot -w /var/lib/letsencrypt/
-```
-
-#### Other webserver/proxies
-
-You can find example configurations for them in `/opt/akkoma/installation/`.
-
-#### Systemd service
-
-* Copy example service file
-
-```shell
-sudo cp /opt/akkoma/installation/akkoma.service /etc/systemd/system/akkoma.service
-```
-
-* Edit the service file and make sure that all paths fit your installation
-* Enable and start `akkoma.service`:
-
-```shell
-sudo systemctl enable --now akkoma.service
-```
-
-#### Create your first user
-
-If your instance is up and running, you can create your first user with administrative rights with the following task:
-
-```shell
-sudo -Hu akkoma MIX_ENV=prod mix pleroma.user new <username> <your@emailaddress> --admin
-```
-
-#### Further reading
-
-{! installation/further_reading.include !}
-
-{! support.include !}

docs/docs/installation/migrating_to_akkoma.md

@@ -30,18 +30,22 @@ upstream git URL then just rebuild - that'll be:
 git remote set-url origin https://akkoma.dev/AkkomaGang/akkoma.git/
 git fetch origin
 git pull -r
-# or, if you're on an instance-specific branch, you may want
-# to run "git merge stable" instead (or develop if you want)
 ```
 
 Then compile, migrate and restart as usual.
 
 ## From OTP
 
-This will just be setting the update URL - find your flavour from the [mapping on the install guide](../otp_en/#detecting-flavour) first.
+**IMPORTANT: if you are using musl1.1 (void linux musl edition),
+you will need to override the FLAVOUR to amd64-musl11, 
+also pls go shout at your maintainers to actually upgrade from EOL software.**
+
+the flavour to be
+
+This will just be setting the update URL -
 
 ```bash
-export FLAVOUR=[the flavour you found above]
+export FLAVOUR=$(arch="$(uname -m)";if [ "$arch" = "x86_64" ];then arch="amd64";elif [ "$arch" = "armv7l" ];then arch="arm";elif [ "$arch" = "aarch64" ];then arch="arm64";else echo "Unsupported arch: $arch">&2;fi;if getconf GNU_LIBC_VERSION>/dev/null;then libc_postfix="";elif [ "$(ldd 2>&1|head -c 9)" = "musl libc" ];then libc_postfix="-musl";elif [ "$(find /lib/libc.musl*|wc -l)" ];then libc_postfix="-musl";else echo "Unsupported libc">&2;fi;echo "$arch$libc_postfix")
 
 ./bin/pleroma_ctl update --zip-url https://akkoma-updates.s3-website.fr-par.scw.cloud/develop/akkoma-$FLAVOUR.zip
 ./bin/pleroma_ctl migrate

docs/docs/installation/openbsd_fi.md

@@ -0,0 +1,121 @@
+# Akkoman asennus OpenBSD:llä
+
+Tarvitset:
+* Oman domainin
+* OpenBSD 6.3 -serverin
+* Auttavan ymmärryksen unix-järjestelmistä
+
+Komennot, joiden edessä on '#', tulee ajaa käyttäjänä `root`. Tämä on
+suositeltavaa tehdä komennon `doas` avulla, katso `doas (1)` ja `doas.conf (5)`.
+Tästä eteenpäin oletuksena on, että domain "esimerkki.com" osoittaa
+serverin IP-osoitteeseen.
+
+Jos asennuksen kanssa on ongelmia, IRC-kanava #pleroma Libera.chat tai
+Matrix-kanava #pleroma:libera.chat ovat hyviä paikkoja löytää apua
+(englanniksi), `/msg eal kukkuu` jos haluat välttämättä puhua härmää.
+
+Asenna tarvittava ohjelmisto:
+
+`# pkg_add git elixir gmake postgresql-server-10.3 postgresql-contrib-10.3 cmake ffmpeg ImageMagick`
+
+#### Optional software
+
+[`docs/installation/optional/media_graphics_packages.md`](../installation/optional/media_graphics_packages.md):
+  * ImageMagick
+  * ffmpeg
+  * exiftool
+
+Asenna tarvittava ohjelmisto:
+
+`# pkg_add ImageMagick ffmpeg p5-Image-ExifTool`
+
+Luo postgresql-tietokanta:
+
+`# su - _postgresql`
+
+`$ mkdir /var/postgresql/data`
+
+`$ initdb -D /var/postgresql/data -E UTF8`
+
+`$ createdb`
+
+Käynnistä tietokanta ja aseta se käynnistymään automaattisesti.
+
+`# rcctl start postgresql`
+
+`# rcctl enable postgresql`
+
+Luo käyttäjä akkomaa varten (kysyy muutaman kysymyksen):
+
+`# adduser akkoma`
+
+Vaihda akkoma-käyttäjään ja mene kotihakemistoosi:
+
+`# su - akkoma`
+
+Lataa akkoman lähdekoodi:
+
+`$ git clone https://akkoma.dev/AkkomaGang/akkoma.git`
+
+`$ cd akkoma`
+
+Asenna tarvittavat elixir-kirjastot:
+
+`$ mix deps.get`
+
+`$ mix deps.compile`
+
+Luo tarvittava konfiguraatio:
+
+`$ mix generate_config`
+
+`$ cp config/generated_config.exs config/prod.secret.exs`
+
+Aja luodut tietokantakomennot:
+
+`# su _postgres -c 'psql -f config/setup_db.psql'`
+
+`$ MIX_ENV=prod mix ecto.migrate`
+
+Käynnistä akkoma-prosessi:
+
+`$ MIX_ENV=prod mix compile`
+
+`$ MIX_ENV=prod mix phx.server`
+
+Tässä vaiheessa on hyvä tarkistaa että asetukset ovat oikein. Avaa selaimella,
+curlilla tai vastaavalla työkalulla `esimerkki.com:4000/api/v1/instance` ja katso
+että kohta "uri" on "https://esimerkki.com".
+
+Huom! Muista varmistaa että muuttuja MIX_ENV on "prod" mix-komentoja ajaessasi.
+Mix lukee oikean konfiguraatiotiedoston sen mukaisesti.
+
+Ohessa enimmäkseen toimivaksi todettu rc.d-skripti akkoman käynnistämiseen.
+Kirjoita se tiedostoon /etc/rc.d/akkoma. Tämän jälkeen aja
+`# chmod +x /etc/rc.d/akkoma`, ja voit käynnistää akkoman komennolla
+`# /etc/rc.d/akkoma start`.
+
+```
+#!/bin/ksh
+#/etc/rc.d/akkoma
+
+daemon="cd /home/akkoma/akkoma;MIX_ENV=prod /usr/local/bin/elixir"
+daemon_flags="--detached /usr/local/bin/mix phx.server"
+daemon_user="akkoma"
+rc_reload="NO"
+rc_bg="YES"
+
+pexp="beam"
+
+. /etc/rc.d/rc.subr
+
+rc_cmd $1
+```
+
+Tämän jälkeen tarvitset enää HTTP-serverin välittämään kutsut akkoma-prosessille.
+Tiedostosta `install/akkoma.nginx` löytyy esimerkkikonfiguraatio, ja TLS-sertifikaatit
+saat ilmaiseksi esimerkiksi [letsencryptiltä](https://certbot.eff.org/lets-encrypt/opbsd-nginx.html).
+Nginx asentuu yksinkertaisesti komennolla `# pkg_add nginx`.
+
+Kun olet valmis, avaa https://esimerkki.com selaimessasi. Luo käyttäjä ja seuraa kiinnostavia
+tyyppejä muilla palvelimilla!

docs/docs/installation/otp_en.md

@@ -6,7 +6,6 @@ This guide covers a installation using an OTP release. To install Akkoma from so
 
 ## Pre-requisites
 * A machine running Linux with GNU (e.g. Debian, Ubuntu) or musl (e.g. Alpine) libc and `x86_64`, `aarch64` or `armv7l` CPU, you have root access to. If you are not sure if it's compatible see [Detecting flavour section](#detecting-flavour) below
-* For installing OTP releases on RedHat-based distros like Fedora and Centos Stream, please follow [this guide](./otp_redhat_en.md) instead.
 * A (sub)domain pointed to the machine
 
 You will be running commands as root. If you aren't root already, please elevate your priviledges by executing `sudo su`/`su`.
@@ -15,19 +14,12 @@ While in theory OTP releases are possbile to install on any compatible machine,
 
 ### Detecting flavour
 
-This is a little more complex than it used to be (thanks ubuntu)
+Paste the following into the shell:
+```sh
+arch="$(uname -m)";if [ "$arch" = "x86_64" ];then arch="amd64";elif [ "$arch" = "armv7l" ];then arch="arm";elif [ "$arch" = "aarch64" ];then arch="arm64";else echo "Unsupported arch: $arch">&2;fi;if getconf GNU_LIBC_VERSION>/dev/null;then libc_postfix="";elif [ "$(ldd 2>&1|head -c 9)" = "musl libc" ];then libc_postfix="-musl";elif [ "$(find /lib/libc.musl*|wc -l)" ];then libc_postfix="-musl";else echo "Unsupported libc">&2;fi;echo "$arch$libc_postfix"
+```
 
-Use the following mapping to figure out your flavour:
-
-| distribution  | flavour      |
-| ------------- | ------------ |
-| debian stable | amd64        |
-| ubuntu focal  | amd64        |
-| ubuntu jammy  | ubuntu-jammy |
-| alpine        | amd64-musl   |
-
-Other similar distributions will _probably_ work, but if it is not listed above, there is no official
-support.
+If your platform is supported the output will contain the flavour string, you will need it later. If not, this just means that we don't build releases for your platform, you can still try installing from source.
 
 ### Installing the required packages
 

docs/docs/installation/otp_redhat_en.md

@@ -1,285 +0,0 @@
-# Installing on RedHat using OTP releases
-
-## OTP releases and Fedora/RedHat
-
-The current OTP builds available for Linux are unfortunately incompatible with RedHat Linux distributions, like Fedora and Centos Stream. This is due to RedHat maintaining patched versions of certain Erlang libraries, making them incompatible with other Linux distributions.
-
-However, you may compile your own OTP release from scratch. This is particularly useful if you wish to quickly distribute your OTP build onto multiple systems, without having to worry about compiling code on every system. However, if your goal is to simply set up a single instance for yourself, installing from-source might be a simpler option. To install from-source, please follow [this guide](./fedora_based_en.md).
-
-
-## Pre-requisites
-
-In order to compile a RedHat-compatible OTP release, you will need to run a RedHat Linux distribution. This guide will assume you run Fedora 36, though it should also work on older Fedora releases and other RedHat distributions. It also assumes that you have administrative rights and sufficient knowledge on how to perform common CLI tasks in Linux. If you want to run this guide with root, ignore the `sudo` at the beginning of the lines.
-
-Important: keep in mind that you must build your OTP release for the specific RedHat distribution you wish to use it on. A build on Fedora will only be compatible with a specific Fedora release version.
-
-
-## Building an OTP release for Fedora 36
-
-### Installing required packages
-
-* First, update your system, if not already done:
-
-```shell
-sudo dnf upgrade --refresh
-```
-
-* Then install the required packages to build your OTP release:
-
-```shell
-sudo dnf install git gcc g++ erlang elixir erlang-os_mon erlang-eldap erlang-xmerl erlang-erl_interface erlang-syntax_tools make cmake file-devel
-```
-
-
-### Preparing the project files
-
-* Git clone the AkkomaBE repository. This can be done anywhere:
-
-```shell
-cd ~
-git clone https://akkoma.dev/AkkomaGang/akkoma.git
-```
-
-* Change to the new directory:
-
-```shell
-cd ./akkoma
-```
-
-
-### Building the OTP release
-
-* Run the following commands:
-
-```shell
-export MIX_ENV=prod
-echo "import Config" > config/prod.secret.exs
-mix local.hex --force
-mix local.rebar --force
-mix deps.get --only prod
-mkdir release
-mix release --path release
-```
-
-Note that compiling the OTP release will take some time. Once it completes, you will find the OTP files in the directory `release`.
-
-If all went well, you will have built your very own Fedora-compatible OTP release! You can now pack up the files in the `release` directory and deploy them to your other Fedora servers.
-
-
-## Installing the OTP release
-
-Installing the OTP release from this point onward will be very similar to the regular OTP release. This guide assumes you will want to install your OTP package on other systems, so additional pre-requisites will be listed below.
-
-Please note that running your own OTP release has some minor caveats that you should be aware of. They will be listed below as well.
-
-
-### Installing required packages
-
-Other than things bundled in the OTP release Akkoma depends on:
-
-* curl (to download the release build)
-* ncurses (ERTS won't run without it)
-* PostgreSQL (also utilizes extensions in postgresql-contrib)
-* nginx (could be swapped with another reverse proxy but this guide covers only it)
-* certbot (for Let's Encrypt certificates, could be swapped with another ACME client, but this guide covers only it)
-* libmagic/file
-
-First, update your system, if not already done:
-
-```shell
-sudo dnf upgrade --refresh
-```
-
-Then install the required packages:
-
-```shell
-sudo dnf install curl ncurses postgresql postgresql-contrib nginx certbot file-devel
-```
-
-
-### Optional packages: [`docs/installation/optional/media_graphics_packages.md`](../installation/optional/media_graphics_packages.md)
-
-* Install ffmpeg (requires setting up the RPM-fusion repositories):
-
-```shell
-sudo dnf -y install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm
-sudo dnf -y install https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm
-sudo dnf install ffmpeg
-```
-
-* Install ImageMagick and ExifTool for image manipulation:
-
-```shell
-sudo dnf install Imagemagick perl-Image-ExifTool
-```
-
-
-### Configuring PostgreSQL
-#### (Optional) Performance configuration
-It is encouraged to check [Optimizing your PostgreSQL performance](../configuration/postgresql.md) document, for tips on PostgreSQL tuning.
-
-Restart PostgreSQL to apply configuration changes:
-
-```shell
-sudo systemctl restart postgresql
-```
-
-### Installing Akkoma
-```sh
-# Create a Akkoma user
-adduser --system --shell  /bin/false --home /opt/akkoma akkoma
-
-# Move your custom OTP release to the home directory
-sudo -Hu akkoma mv /your/custom/otp/release /opt/akkoma
-
-# Create uploads directory and set proper permissions (skip if planning to use a remote uploader)
-# Note: It does not have to be `/var/lib/akkoma/uploads`, the config generator will ask about the upload directory later
-
-sudo mkdir -p /var/lib/akkoma/uploads
-sudo chown -R akkoma /var/lib/akkoma
-
-# Create custom public files directory (custom emojis, frontend bundle overrides, robots.txt, etc.)
-# Note: It does not have to be `/var/lib/akkoma/static`, the config generator will ask about the custom public files directory later
-sudo mkdir -p /var/lib/akkoma/static
-sudo chown -R akkoma /var/lib/akkoma
-
-# Create a config directory
-sudo mkdir -p /etc/akkoma
-sudo chown -R akkoma /etc/akkoma
-
-# Run the config generator
-sudo -Hu akkoma ./bin/pleroma_ctl instance gen --output /etc/akkoma/config.exs --output-psql /tmp/setup_db.psql
-
-# Create the postgres database
-sudo -Hu postgres psql -f /tmp/setup_db.psql
-
-# Create the database schema
-sudo -Hu akkoma ./bin/pleroma_ctl migrate
-
-# Start the instance to verify that everything is working as expected
-sudo -Hu akkoma ./bin/pleroma daemon
-
-# Wait for about 20 seconds and query the instance endpoint, if it shows your uri, name and email correctly, you are configured correctly
-sleep 20 && curl http://localhost:4000/api/v1/instance
-
-# Stop the instance
-sudo -Hu akkoma ./bin/pleroma stop
-```
-
-
-### Setting up nginx and getting Let's Encrypt SSL certificaties
-
-#### Get a Let's Encrypt certificate
-
-```shell
-certbot certonly --standalone --preferred-challenges http -d yourinstance.tld
-```
-
-#### Copy Akkoma nginx configuration to the nginx folder
-
-```shell
-cp /opt/akkoma/installation/nginx/akkoma.nginx /etc/nginx/conf.d/akkoma.conf
-```
-
-#### Edit the nginx config
-```shell
-# Replace example.tld with your (sub)domain (replace $EDITOR with your editor of choice)
-sudo $EDITOR /etc/nginx/conf.d/akkoma.conf
-
-# Verify that the config is valid
-sudo nginx -t
-```
-#### Start nginx
-
-```shell
-sudo systemctl start nginx
-```
-
-At this point if you open your (sub)domain in a browser you should see a 502 error, that's because Akkoma is not started yet.
-
-
-### Setting up a system service
-
-```shell
-# Copy the service into a proper directory
-cp /opt/akkoma/installation/akkoma.service /etc/systemd/system/akkoma.service
-
-# Edit the service file and make any neccesary changes
-sudo $EDITOR /etc/systemd/system/akkoma.service
-
-# If you use SELinux, set the correct file context on the pleroma binary
-sudo semanage fcontext -a -t init_t /opt/akkoma/bin/pleroma
-sudo restorecon -v /opt/akkoma/bin/pleroma
-
-# Start akkoma and enable it on boot
-sudo systemctl start akkoma
-sudo systemctl enable akkoma
-```
-
-If everything worked, you should see a response from Akkoma-BE when visiting your domain. You may need to install frontends like Akkoma-FE and Admin-FE; refer to [this guide](../administration/CLI_tasks/frontend.md) on how to install them.
-
-If that didn't happen, try reviewing the installation steps, starting Akkoma in the foreground and seeing if there are any errrors.
-
-{! support.include !}
-
-## Post installation
-
-### Setting up auto-renew of the Let's Encrypt certificate
-
-```shell
-# Create the directory for webroot challenges
-sudo mkdir -p /var/lib/letsencrypt
-
-# Uncomment the webroot method
-sudo $EDITOR /etc/nginx/conf.d/akkoma.conf
-
-# Verify that the config is valid
-sudo nginx -t
-
-# Restart nginx
-sudo systemctl restart nginx
-
-# Ensure the webroot menthod and post hook is working
-sudo certbot renew --cert-name yourinstance.tld --webroot -w /var/lib/letsencrypt/ --dry-run --post-hook 'systemctl reload nginx'
-
-# Add it to the daily cron
-echo '#!/bin/sh
-certbot renew --cert-name yourinstance.tld --webroot -w /var/lib/letsencrypt/ --post-hook "systemctl reload nginx"
-' > /etc/cron.daily/renew-akkoma-cert
-sudo chmod +x /etc/cron.daily/renew-akkoma-cert
-
-# If everything worked the output should contain /etc/cron.daily/renew-akkoma-cert
-sudo run-parts --test /etc/cron.daily
-```
-
-
-## Create your first user and set as admin
-```shell
-cd /opt/akkoma
-sudo -Hu akkoma ./bin/pleroma_ctl user new joeuser joeuser@sld.tld --admin
-```
-This will create an account withe the username of 'joeuser' with the email address of joeuser@sld.tld, and set that user's account as an admin. This will result in a link that you can paste into the browser, which logs you in and enables you to set the password.
-
-## Further reading
-
-### Caveats of building your own OTP release
-
-There are some things to take note of when your are running your own OTP builds.
-
-#### Updating your OTP builds
-
-Using your custom OTP build, you will not be able to update the installation using the `pleroma_ctl update` command. Running this command would overwrite your install with an OTP release from the main Akkoma repository, which will break your install.
-
-Instead, you will have to rebuild your OTP release every time there are updates, then manually move it to where your Akkoma installation is running, overwriting the old OTP release files. Make sure to stop the Akkoma-BE server before overwriting any files!
-
-After that, run the `pleroma_ctl migrate` command as usual to perform database migrations.
-
-
-#### Cross-compatibility between RedHat distributions
-
-As it currently stands, your OTP build will only be compatible for the specific RedHat distribution you've built it on. Fedora builds only work on Fedora, Centos builds only on Centos, RedHat builds only on RedHat. Secondly, for Fedora, they will also be bound to the specific Fedora release. This is because different releases of Fedora may have significant changes made in some of the required packages and libraries.
-
-
-{! installation/further_reading.include !}
-
-{! support.include !}

lib/mix/tasks/pleroma/user.ex

@@ -496,12 +496,12 @@ defmodule Mix.Tasks.Pleroma.User do
            {:follow_data, Pleroma.Web.ActivityPub.Utils.fetch_latest_follow(local, remote)} do
       calculated_state = User.following?(local, remote)
 
-      IO.puts(
+      shell_info(
         "Request state is #{request_state}, vs calculated state of following=#{calculated_state}"
       )
 
       if calculated_state == false && request_state == "accept" do
-        IO.puts("Discrepancy found, fixing")
+        shell_info("Discrepancy found, fixing")
         Pleroma.Web.CommonAPI.reject_follow_request(local, remote)
         shell_info("Relationship fixed")
       else

lib/pleroma/activity/html.ex

@@ -8,6 +8,40 @@ defmodule Pleroma.Activity.HTML do
 
   @cachex Pleroma.Config.get([:cachex, :provider], Cachex)
 
+  # We store a list of cache keys related to an activity in a
+  # separate cache, scrubber_management_cache. It has the same
+  # size as scrubber_cache (see application.ex). Every time we add
+  # a cache to scrubber_cache, we update scrubber_management_cache.
+  #
+  # The most recent write of a certain key in the management cache
+  # is the same as the most recent write of any record related to that
+  # key in the main cache.
+  # Assuming LRW ( https://hexdocs.pm/cachex/Cachex.Policy.LRW.html ),
+  # this means when the management cache is evicted by cachex, all
+  # related records in the main cache will also have been evicted.
+
+  defp get_cache_keys_for(activity_id) do
+    with {:ok, list} when is_list(list) <- @cachex.get(:scrubber_management_cache, activity_id) do
+      list
+    else
+      _ -> []
+    end
+  end
+
+  defp add_cache_key_for(activity_id, additional_key) do
+    current = get_cache_keys_for(activity_id)
+
+    unless additional_key in current do
+      @cachex.put(:scrubber_management_cache, activity_id, [additional_key | current])
+    end
+  end
+
+  def invalidate_cache_for(activity_id) do
+    keys = get_cache_keys_for(activity_id)
+    Enum.map(keys, &@cachex.del(:scrubber_cache, &1))
+    @cachex.del(:scrubber_management_cache, activity_id)
+  end
+
   def get_cached_scrubbed_html_for_activity(
         content,
         scrubbers,
@@ -19,6 +53,8 @@ defmodule Pleroma.Activity.HTML do
 
     @cachex.fetch!(:scrubber_cache, key, fn _key ->
       object = Object.normalize(activity, fetch: false)
+
+      add_cache_key_for(activity.id, key)
       HTML.ensure_scrubbed_html(content, scrubbers, object.data["fake"] || false, callback)
     end)
   end

lib/pleroma/application.ex

@@ -149,6 +149,7 @@ defmodule Pleroma.Application do
       build_cachex("object", default_ttl: 25_000, ttl_interval: 1000, limit: 2500),
       build_cachex("rich_media", default_ttl: :timer.minutes(120), limit: 5000),
       build_cachex("scrubber", limit: 2500),
+      build_cachex("scrubber_management", limit: 2500),
       build_cachex("idempotency", expiration: idempotency_expiration(), limit: 2500),
       build_cachex("web_resp", limit: 2500),
       build_cachex("emoji_packs", expiration: emoji_packs_expiration(), limit: 10),

lib/pleroma/constants.ex

@@ -27,4 +27,40 @@ defmodule Pleroma.Constants do
     do:
       ~w(index.html robots.txt static static-fe finmoji emoji packs sounds images instance sw.js sw-pleroma.js favicon.png schemas doc embed.js embed.css)
   )
+
+  const(status_updatable_fields,
+    do: [
+      "source",
+      "tag",
+      "updated",
+      "emoji",
+      "content",
+      "summary",
+      "sensitive",
+      "attachment",
+      "generator"
+    ]
+  )
+
+  const(updatable_object_types,
+    do: [
+      "Note",
+      "Question",
+      "Audio",
+      "Video",
+      "Event",
+      "Article",
+      "Page"
+    ]
+  )
+
+  const(actor_types,
+    do: [
+      "Application",
+      "Group",
+      "Organization",
+      "Person",
+      "Service"
+    ]
+  )
 end

lib/pleroma/docs/translator.ex

@@ -1,10 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.Docs.Translator do
-  require Pleroma.Docs.Translator.Compiler
-  require Pleroma.Web.Gettext
-
-  @before_compile Pleroma.Docs.Translator.Compiler
-end

lib/pleroma/docs/translator/compiler.ex

@@ -1,119 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.Docs.Translator.Compiler do
-  @external_resource "config/description.exs"
-  @raw_config Pleroma.Config.Loader.read("config/description.exs")
-  @raw_descriptions @raw_config[:pleroma][:config_description]
-
-  defmacro __before_compile__(_env) do
-    strings =
-      __MODULE__.descriptions()
-      |> __MODULE__.extract_strings()
-
-    quote do
-      def placeholder do
-        unquote do
-          Enum.map(
-            strings,
-            fn {path, type, string} ->
-              ctxt = msgctxt_for(path, type)
-
-              quote do
-                Pleroma.Web.Gettext.dpgettext_noop(
-                  "config_descriptions",
-                  unquote(ctxt),
-                  unquote(string)
-                )
-              end
-            end
-          )
-        end
-      end
-    end
-  end
-
-  def descriptions do
-    Pleroma.Web.ActivityPub.MRF.config_descriptions()
-    |> Enum.reduce(@raw_descriptions, fn description, acc -> [description | acc] end)
-    |> Pleroma.Docs.Generator.convert_to_strings()
-  end
-
-  def extract_strings(descriptions) do
-    descriptions
-    |> Enum.reduce(%{strings: [], path: []}, &process_item/2)
-    |> Map.get(:strings)
-  end
-
-  defp process_item(entity, acc) do
-    current_level =
-      acc
-      |> process_desc(entity)
-      |> process_label(entity)
-
-    process_children(entity, current_level)
-  end
-
-  defp process_desc(acc, %{description: desc} = item) do
-    %{
-      strings: [{acc.path ++ [key_for(item)], "description", desc} | acc.strings],
-      path: acc.path
-    }
-  end
-
-  defp process_desc(acc, _) do
-    acc
-  end
-
-  defp process_label(acc, %{label: label} = item) do
-    %{
-      strings: [{acc.path ++ [key_for(item)], "label", label} | acc.strings],
-      path: acc.path
-    }
-  end
-
-  defp process_label(acc, _) do
-    acc
-  end
-
-  defp process_children(%{children: children} = item, acc) do
-    current_level = Map.put(acc, :path, acc.path ++ [key_for(item)])
-
-    children
-    |> Enum.reduce(current_level, &process_item/2)
-    |> Map.put(:path, acc.path)
-  end
-
-  defp process_children(_, acc) do
-    acc
-  end
-
-  def msgctxt_for(path, type) do
-    "config #{type} at #{Enum.join(path, " > ")}"
-  end
-
-  defp convert_group({_, group}) do
-    group
-  end
-
-  defp convert_group(group) do
-    group
-  end
-
-  def key_for(%{group: group, key: key}) do
-    "#{convert_group(group)}-#{key}"
-  end
-
-  def key_for(%{group: group}) do
-    convert_group(group)
-  end
-
-  def key_for(%{key: key}) do
-    key
-  end
-
-  def key_for(_) do
-    nil
-  end
-end

lib/pleroma/emoji.ex

@@ -9,7 +9,6 @@ defmodule Pleroma.Emoji do
   """
   use GenServer
 
-  alias Pleroma.Emoji.Combinations
   alias Pleroma.Emoji.Loader
 
   require Logger
@@ -125,7 +124,7 @@ defmodule Pleroma.Emoji do
     |> String.split("\n")
     |> Enum.filter(fn line ->
       line != "" and not String.starts_with?(line, "#") and
-        String.contains?(line, "fully-qualified")
+        String.contains?(line, "qualified")
     end)
     |> Enum.map(fn line ->
       line
@@ -187,17 +186,4 @@ defmodule Pleroma.Emoji do
   end
 
   def emoji_url(_), do: nil
-
-  emoji_qualification_map =
-    emojis
-    |> Enum.filter(&String.contains?(&1, "\uFE0F"))
-    |> Combinations.variate_emoji_qualification()
-
-  for {qualified, unqualified_list} <- emoji_qualification_map do
-    for unqualified <- unqualified_list do
-      def fully_qualify_emoji(unquote(unqualified)), do: unquote(qualified)
-    end
-  end
-
-  def fully_qualify_emoji(emoji), do: emoji
 end

lib/pleroma/emoji/combinations.ex

@@ -1,45 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.Emoji.Combinations do
-  # FE0F is the emoji variation sequence. It is used for fully-qualifying
-  # emoji, and that includes emoji combinations.
-  # This code generates combinations per emoji: for each FE0F, all possible
-  # combinations of the character being removed or staying will be generated.
-  # This is made as an attempt to find all partially-qualified and unqualified
-  # versions of a fully-qualified emoji.
-  # I have found *no cases* for which this would be a problem, after browsing
-  # the entire emoji list in emoji-test.txt. This is safe, and, sadly, most
-  # likely sane too.
-
-  defp qualification_combinations(codepoints) do
-    qualification_combinations([[]], codepoints)
-  end
-
-  defp qualification_combinations(acc, []), do: acc
-
-  defp qualification_combinations(acc, ["\uFE0F" | tail]) do
-    acc
-    |> Enum.flat_map(fn x -> [x, x ++ ["\uFE0F"]] end)
-    |> qualification_combinations(tail)
-  end
-
-  defp qualification_combinations(acc, [codepoint | tail]) do
-    acc
-    |> Enum.map(&Kernel.++(&1, [codepoint]))
-    |> qualification_combinations(tail)
-  end
-
-  def variate_emoji_qualification(emoji) when is_binary(emoji) do
-    emoji
-    |> String.codepoints()
-    |> qualification_combinations()
-    |> Enum.map(&List.to_string/1)
-  end
-
-  def variate_emoji_qualification(emoji) when is_list(emoji) do
-    emoji
-    |> Enum.map(fn emoji -> {emoji, variate_emoji_qualification(emoji)} end)
-  end
-end

lib/pleroma/formatter.ex

@@ -136,12 +136,7 @@ defmodule Pleroma.Formatter do
     HTML.filter_tags(text)
   end
 
-  def html_escape(text, "text/x.misskeymarkdown") do
-    text
-    |> HTML.filter_tags()
-  end
-
-  def html_escape(text, "text/plain") do
+  def html_escape(text, format) when format in ["text/plain", "text/x.misskeymarkdown"] do
     Regex.split(@link_regex, text, include_captures: true)
     |> Enum.map_every(2, fn chunk ->
       {:safe, part} = Phoenix.HTML.html_escape(chunk)

lib/pleroma/notification.ex

@@ -384,7 +384,7 @@ defmodule Pleroma.Notification do
   end
 
   def create_notifications(%Activity{data: %{"type" => type}} = activity, options)
-      when type in ["Follow", "Like", "Announce", "Move", "EmojiReact", "Flag"] do
+      when type in ["Follow", "Like", "Announce", "Move", "EmojiReact", "Flag", "Update"] do
     do_create_notifications(activity, options)
   end
 
@@ -438,6 +438,9 @@ defmodule Pleroma.Notification do
         activity
         |> type_from_activity_object()
 
+      "Update" ->
+        "update"
+
       t ->
         raise "No notification type for activity type #{t}"
     end
@@ -503,7 +506,16 @@ defmodule Pleroma.Notification do
   def get_notified_from_activity(activity, local_only \\ true)
 
   def get_notified_from_activity(%Activity{data: %{"type" => type}} = activity, local_only)
-      when type in ["Create", "Like", "Announce", "Follow", "Move", "EmojiReact", "Flag"] do
+      when type in [
+             "Create",
+             "Like",
+             "Announce",
+             "Follow",
+             "Move",
+             "EmojiReact",
+             "Flag",
+             "Update"
+           ] do
     potential_receiver_ap_ids = get_potential_receiver_ap_ids(activity)
 
     potential_receivers =
@@ -543,6 +555,21 @@ defmodule Pleroma.Notification do
     (User.all_superusers() |> Enum.map(fn user -> user.ap_id end)) -- [actor]
   end
 
+  # Update activity: notify all who repeated this
+  def get_potential_receiver_ap_ids(%{data: %{"type" => "Update", "actor" => actor}} = activity) do
+    with %Object{data: %{"id" => object_id}} <- Object.normalize(activity, fetch: false) do
+      repeaters =
+        Activity.Queries.by_type("Announce")
+        |> Activity.Queries.by_object_id(object_id)
+        |> Activity.with_joined_user_actor()
+        |> where([a, u], u.local)
+        |> select([a, u], u.ap_id)
+        |> Repo.all()
+
+      repeaters -- [actor]
+    end
+  end
+
   def get_potential_receiver_ap_ids(activity) do
     []
     |> Utils.maybe_notify_to_recipients(activity)

lib/pleroma/object/fetcher.ex

@@ -26,8 +26,42 @@ defmodule Pleroma.Object.Fetcher do
   end
 
   defp maybe_reinject_internal_fields(%{data: %{} = old_data}, new_data) do
+    has_history? = fn
+      %{"formerRepresentations" => %{"orderedItems" => list}} when is_list(list) -> true
+      _ -> false
+    end
+
     internal_fields = Map.take(old_data, Pleroma.Constants.object_internal_fields())
 
+    remote_history_exists? = has_history?.(new_data)
+
+    # If the remote history exists, we treat that as the only source of truth.
+    new_data =
+      if has_history?.(old_data) and not remote_history_exists? do
+        Map.put(new_data, "formerRepresentations", old_data["formerRepresentations"])
+      else
+        new_data
+      end
+
+    # If the remote does not have history information, we need to manage it ourselves
+    new_data =
+      if not remote_history_exists? do
+        changed? =
+          Pleroma.Constants.status_updatable_fields()
+          |> Enum.any?(fn field -> Map.get(old_data, field) != Map.get(new_data, field) end)
+
+        %{updated_object: updated_object} =
+          new_data
+          |> Object.Updater.maybe_update_history(old_data,
+            updated: changed?,
+            use_history_in_new_object?: false
+          )
+
+        updated_object
+      else
+        new_data
+      end
+
     Map.merge(new_data, internal_fields)
   end
 

lib/pleroma/object/updater.ex

@@ -0,0 +1,240 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Pleroma.Object.Updater do
+  require Pleroma.Constants
+
+  def update_content_fields(orig_object_data, updated_object) do
+    Pleroma.Constants.status_updatable_fields()
+    |> Enum.reduce(
+      %{data: orig_object_data, updated: false},
+      fn field, %{data: data, updated: updated} ->
+        updated =
+          updated or
+            (field != "updated" and
+               Map.get(updated_object, field) != Map.get(orig_object_data, field))
+
+        data =
+          if Map.has_key?(updated_object, field) do
+            Map.put(data, field, updated_object[field])
+          else
+            Map.drop(data, [field])
+          end
+
+        %{data: data, updated: updated}
+      end
+    )
+  end
+
+  def maybe_history(object) do
+    with history <- Map.get(object, "formerRepresentations"),
+         true <- is_map(history),
+         "OrderedCollection" <- Map.get(history, "type"),
+         true <- is_list(Map.get(history, "orderedItems")),
+         true <- is_integer(Map.get(history, "totalItems")) do
+      history
+    else
+      _ -> nil
+    end
+  end
+
+  def history_for(object) do
+    with history when not is_nil(history) <- maybe_history(object) do
+      history
+    else
+      _ -> history_skeleton()
+    end
+  end
+
+  defp history_skeleton do
+    %{
+      "type" => "OrderedCollection",
+      "totalItems" => 0,
+      "orderedItems" => []
+    }
+  end
+
+  def maybe_update_history(
+        updated_object,
+        orig_object_data,
+        opts
+      ) do
+    updated = opts[:updated]
+    use_history_in_new_object? = opts[:use_history_in_new_object?]
+
+    if not updated do
+      %{updated_object: updated_object, used_history_in_new_object?: false}
+    else
+      # Put edit history
+      # Note that we may have got the edit history by first fetching the object
+      {new_history, used_history_in_new_object?} =
+        with true <- use_history_in_new_object?,
+             updated_history when not is_nil(updated_history) <- maybe_history(opts[:new_data]) do
+          {updated_history, true}
+        else
+          _ ->
+            history = history_for(orig_object_data)
+
+            latest_history_item =
+              orig_object_data
+              |> Map.drop(["id", "formerRepresentations"])
+
+            updated_history =
+              history
+              |> Map.put("orderedItems", [latest_history_item | history["orderedItems"]])
+              |> Map.put("totalItems", history["totalItems"] + 1)
+
+            {updated_history, false}
+        end
+
+      updated_object =
+        updated_object
+        |> Map.put("formerRepresentations", new_history)
+
+      %{updated_object: updated_object, used_history_in_new_object?: used_history_in_new_object?}
+    end
+  end
+
+  defp maybe_update_poll(to_be_updated, updated_object) do
+    choice_key = fn data ->
+      if Map.has_key?(data, "anyOf"), do: "anyOf", else: "oneOf"
+    end
+
+    with true <- to_be_updated["type"] == "Question",
+         key <- choice_key.(updated_object),
+         true <- key == choice_key.(to_be_updated),
+         orig_choices <- to_be_updated[key] |> Enum.map(&Map.drop(&1, ["replies"])),
+         new_choices <- updated_object[key] |> Enum.map(&Map.drop(&1, ["replies"])),
+         true <- orig_choices == new_choices do
+      # Choices are the same, but counts are different
+      to_be_updated
+      |> Map.put(key, updated_object[key])
+    else
+      # Choices (or vote type) have changed, do not allow this
+      _ -> to_be_updated
+    end
+  end
+
+  # This calculates the data to be sent as the object of an Update.
+  # new_data's formerRepresentations is not considered.
+  # formerRepresentations is added to the returned data.
+  def make_update_object_data(original_data, new_data, date) do
+    %{data: updated_data, updated: updated} =
+      original_data
+      |> update_content_fields(new_data)
+
+    if not updated do
+      updated_data
+    else
+      %{updated_object: updated_data} =
+        updated_data
+        |> maybe_update_history(original_data, updated: updated, use_history_in_new_object?: false)
+
+      updated_data
+      |> Map.put("updated", date)
+    end
+  end
+
+  # This calculates the data of the new Object from an Update.
+  # new_data's formerRepresentations is considered.
+  def make_new_object_data_from_update_object(original_data, new_data) do
+    update_is_reasonable =
+      with {_, updated} when not is_nil(updated) <- {:cur_updated, new_data["updated"]},
+           {_, {:ok, updated_time, _}} <- {:cur_updated, DateTime.from_iso8601(updated)},
+           {_, last_updated} when not is_nil(last_updated) <-
+             {:last_updated, original_data["updated"] || original_data["published"]},
+           {_, {:ok, last_updated_time, _}} <-
+             {:last_updated, DateTime.from_iso8601(last_updated)},
+           :gt <- DateTime.compare(updated_time, last_updated_time) do
+        :update_everything
+      else
+        # only allow poll updates
+        {:cur_updated, _} -> :no_content_update
+        :eq -> :no_content_update
+        # allow all updates
+        {:last_updated, _} -> :update_everything
+        # allow no updates
+        _ -> false
+      end
+
+    %{
+      updated_object: updated_data,
+      used_history_in_new_object?: used_history_in_new_object?,
+      updated: updated
+    } =
+      if update_is_reasonable == :update_everything do
+        %{data: updated_data, updated: updated} =
+          original_data
+          |> update_content_fields(new_data)
+
+        updated_data
+        |> maybe_update_history(original_data,
+          updated: updated,
+          use_history_in_new_object?: true,
+          new_data: new_data
+        )
+        |> Map.put(:updated, updated)
+      else
+        %{
+          updated_object: original_data,
+          used_history_in_new_object?: false,
+          updated: false
+        }
+      end
+
+    updated_data =
+      if update_is_reasonable != false do
+        updated_data
+        |> maybe_update_poll(new_data)
+      else
+        updated_data
+      end
+
+    %{
+      updated_data: updated_data,
+      updated: updated,
+      used_history_in_new_object?: used_history_in_new_object?
+    }
+  end
+
+  def for_each_history_item(%{"orderedItems" => items} = history, _object, fun) do
+    new_items =
+      Enum.map(items, fun)
+      |> Enum.reduce_while(
+        {:ok, []},
+        fn
+          {:ok, item}, {:ok, acc} -> {:cont, {:ok, acc ++ [item]}}
+          e, _acc -> {:halt, e}
+        end
+      )
+
+    case new_items do
+      {:ok, items} -> {:ok, Map.put(history, "orderedItems", items)}
+      e -> e
+    end
+  end
+
+  def for_each_history_item(history, _, _) do
+    {:ok, history}
+  end
+
+  def do_with_history(object, fun) do
+    with history <- object["formerRepresentations"],
+         object <- Map.drop(object, ["formerRepresentations"]),
+         {_, {:ok, object}} <- {:main_body, fun.(object)},
+         {_, {:ok, history}} <- {:history_items, for_each_history_item(history, object, fun)} do
+      object =
+        if history do
+          Map.put(object, "formerRepresentations", history)
+        else
+          object
+        end
+
+      {:ok, object}
+    else
+      {:main_body, e} -> e
+      {:history_items, e} -> e
+    end
+  end
+end

lib/pleroma/reverse_proxy.ex

@@ -114,7 +114,6 @@ defmodule Pleroma.ReverseProxy do
     else
       {:ok, true} ->
         conn
-        |> put_private(:proxied_url, url)
         |> error_or_redirect(500, "Request failed", opts)
         |> halt()
 

lib/pleroma/search/elasticsearch/activity_parser.ex

@@ -37,13 +37,6 @@ defmodule Pleroma.Search.Elasticsearch.Parsers.Activity do
   end
 
   def parse(q) do
-    [
-      %{
-        exists: %{
-          field: "content"
-        }
-      }
-    ] ++
-      Enum.map(q, &to_es/1)
+    Enum.map(q, &to_es/1)
   end
 end

lib/pleroma/upload.ex

@@ -36,6 +36,7 @@ defmodule Pleroma.Upload do
   alias Ecto.UUID
   alias Pleroma.Config
   alias Pleroma.Maps
+  alias Pleroma.Web.ActivityPub.Utils
   require Logger
 
   @type source ::
@@ -88,6 +89,7 @@ defmodule Pleroma.Upload do
          {:ok, url_spec} <- Pleroma.Uploaders.Uploader.put_file(opts.uploader, upload) do
       {:ok,
        %{
+         "id" => Utils.generate_object_id(),
          "type" => opts.activity_type,
          "mediaType" => upload.content_type,
          "url" => [

lib/pleroma/user.ex

@@ -660,31 +660,6 @@ defmodule Pleroma.User do
   @spec force_password_reset(User.t()) :: {:ok, User.t()} | {:error, Ecto.Changeset.t()}
   def force_password_reset(user), do: update_password_reset_pending(user, true)
 
-  # Used to auto-register LDAP accounts which won't have a password hash stored locally
-  def register_changeset_ldap(struct, params = %{password: password})
-      when is_nil(password) do
-    params =
-      if Map.has_key?(params, :email) do
-        Map.put_new(params, :email, params[:email])
-      else
-        params
-      end
-
-    struct
-    |> cast(params, [
-      :name,
-      :nickname,
-      :email
-    ])
-    |> validate_required([:name, :nickname])
-    |> unique_constraint(:nickname)
-    |> validate_exclusion(:nickname, Config.get([User, :restricted_nicknames]))
-    |> validate_format(:nickname, local_nickname_regex())
-    |> put_ap_id()
-    |> unique_constraint(:ap_id)
-    |> put_following_and_follower_and_featured_address()
-  end
-
   def register_changeset(struct, params \\ %{}, opts \\ []) do
     bio_limit = Config.get([:instance, :user_bio_length], 5000)
     name_limit = Config.get([:instance, :user_name_length], 100)

lib/pleroma/web/activity_pub/activity_pub.ex

@@ -194,7 +194,16 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
   def notify_and_stream(activity) do
     Notification.create_notifications(activity)
 
-    conversation = create_or_bump_conversation(activity, activity.actor)
+    original_activity =
+      case activity do
+        %{data: %{"type" => "Update"}, object: %{data: %{"id" => id}}} ->
+          Activity.get_create_by_object_ap_id_with_object(id)
+
+        _ ->
+          activity
+      end
+
+    conversation = create_or_bump_conversation(original_activity, original_activity.actor)
     participations = get_participations(conversation)
     stream_out(activity)
     stream_out_participations(participations)
@@ -260,7 +269,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
 
   @impl true
   def stream_out(%Activity{data: %{"type" => data_type}} = activity)
-      when data_type in ["Create", "Announce", "Delete"] do
+      when data_type in ["Create", "Announce", "Delete", "Update"] do
     activity
     |> Topics.get_activity_topics()
     |> Streamer.stream(activity)

lib/pleroma/web/activity_pub/builder.ex

@@ -231,10 +231,16 @@ defmodule Pleroma.Web.ActivityPub.Builder do
     end
   end
 
-  # Retricted to user updates for now, always public
   @spec update(User.t(), Object.t()) :: {:ok, map(), keyword()}
   def update(actor, object) do
-    to = [Pleroma.Constants.as_public(), actor.follower_address]
+    {to, cc} =
+      if object["type"] in Pleroma.Constants.actor_types() do
+        # User updates, always public
+        {[Pleroma.Constants.as_public(), actor.follower_address], []}
+      else
+        # Status updates, follow the recipients in the object
+        {object["to"] || [], object["cc"] || []}
+      end
 
     {:ok,
      %{
@@ -242,7 +248,8 @@ defmodule Pleroma.Web.ActivityPub.Builder do
        "type" => "Update",
        "actor" => actor.ap_id,
        "object" => object,
-       "to" => to
+       "to" => to,
+       "cc" => cc
      }, []}
   end
 

lib/pleroma/web/activity_pub/mrf.ex

@@ -53,10 +53,53 @@ defmodule Pleroma.Web.ActivityPub.MRF do
 
   @required_description_keys [:key, :related_policy]
 
+  def filter_one(policy, message) do
+    should_plug_history? =
+      if function_exported?(policy, :history_awareness, 0) do
+        policy.history_awareness()
+      else
+        :manual
+      end
+      |> Kernel.==(:auto)
+
+    if not should_plug_history? do
+      policy.filter(message)
+    else
+      main_result = policy.filter(message)
+
+      with {_, {:ok, main_message}} <- {:main, main_result},
+           {_,
+            %{
+              "formerRepresentations" => %{
+                "orderedItems" => [_ | _]
+              }
+            }} = {_, object} <- {:object, message["object"]},
+           {_, {:ok, new_history}} <-
+             {:history,
+              Pleroma.Object.Updater.for_each_history_item(
+                object["formerRepresentations"],
+                object,
+                fn item ->
+                  with {:ok, filtered} <- policy.filter(Map.put(message, "object", item)) do
+                    {:ok, filtered["object"]}
+                  else
+                    e -> e
+                  end
+                end
+              )} do
+        {:ok, put_in(main_message, ["object", "formerRepresentations"], new_history)}
+      else
+        {:main, _} -> main_result
+        {:object, _} -> main_result
+        {:history, e} -> e
+      end
+    end
+  end
+
   def filter(policies, %{} = message) do
     policies
     |> Enum.reduce({:ok, message}, fn
-      policy, {:ok, message} -> policy.filter(message)
+      policy, {:ok, message} -> filter_one(policy, message)
       _, error -> error
     end)
   end

lib/pleroma/web/activity_pub/mrf/anti_link_spam_policy.ex

@@ -9,6 +9,9 @@ defmodule Pleroma.Web.ActivityPub.MRF.AntiLinkSpamPolicy do
 
   require Logger
 
+  @impl true
+  def history_awareness, do: :auto
+
   # has the user successfully posted before?
   defp old_user?(%User{} = u) do
     u.note_count > 0 || u.follower_count > 0

lib/pleroma/web/activity_pub/mrf/ensure_re_prepended.ex

@@ -10,6 +10,8 @@ defmodule Pleroma.Web.ActivityPub.MRF.EnsureRePrepended do
 
   @reply_prefix Regex.compile!("^re:[[:space:]]*", [:caseless])
 
+  def history_awareness, do: :auto
+
   def filter_by_summary(
         %{data: %{"summary" => parent_summary}} = _in_reply_to,
         %{"summary" => child_summary} = child
@@ -27,8 +29,8 @@ defmodule Pleroma.Web.ActivityPub.MRF.EnsureRePrepended do
 
   def filter_by_summary(_in_reply_to, child), do: child
 
-  def filter(%{"type" => "Create", "object" => child_object} = object)
-      when is_map(child_object) do
+  def filter(%{"type" => type, "object" => child_object} = object)
+      when type in ["Create", "Update"] and is_map(child_object) do
     child =
       child_object["inReplyTo"]
       |> Object.normalize(fetch: false)

lib/pleroma/web/activity_pub/mrf/hashtag_policy.ex

@@ -16,6 +16,9 @@ defmodule Pleroma.Web.ActivityPub.MRF.HashtagPolicy do
 
   @behaviour Pleroma.Web.ActivityPub.MRF.Policy
 
+  @impl true
+  def history_awareness, do: :manual
+
   defp check_reject(message, hashtags) do
     if Enum.any?(Config.get([:mrf_hashtag, :reject]), fn match -> match in hashtags end) do
       {:reject, "[HashtagPolicy] Matches with rejected keyword"}
@@ -47,22 +50,46 @@ defmodule Pleroma.Web.ActivityPub.MRF.HashtagPolicy do
 
   defp check_ftl_removal(message, _hashtags), do: {:ok, message}
 
-  defp check_sensitive(message, hashtags) do
-    if Enum.any?(Config.get([:mrf_hashtag, :sensitive]), fn match -> match in hashtags end) do
-      {:ok, Kernel.put_in(message, ["object", "sensitive"], true)}
-    else
-      {:ok, message}
-    end
+  defp check_sensitive(message) do
+    {:ok, new_object} =
+      Object.Updater.do_with_history(message["object"], fn object ->
+        hashtags = Object.hashtags(%Object{data: object})
+
+        if Enum.any?(Config.get([:mrf_hashtag, :sensitive]), fn match -> match in hashtags end) do
+          {:ok, Map.put(object, "sensitive", true)}
+        else
+          {:ok, object}
+        end
+      end)
+
+    {:ok, Map.put(message, "object", new_object)}
   end
 
   @impl true
-  def filter(%{"type" => "Create", "object" => object} = message) do
-    hashtags = Object.hashtags(%Object{data: object})
+  def filter(%{"type" => type, "object" => object} = message) when type in ["Create", "Update"] do
+    history_items =
+      with %{"formerRepresentations" => %{"orderedItems" => items}} <- object do
+        items
+      else
+        _ -> []
+      end
+
+    historical_hashtags =
+      Enum.reduce(history_items, [], fn item, acc ->
+        acc ++ Object.hashtags(%Object{data: item})
+      end)
+
+    hashtags = Object.hashtags(%Object{data: object}) ++ historical_hashtags
 
     if hashtags != [] do
       with {:ok, message} <- check_reject(message, hashtags),
-           {:ok, message} <- check_ftl_removal(message, hashtags),
-           {:ok, message} <- check_sensitive(message, hashtags) do
+           {:ok, message} <-
+             (if "type" == "Create" do
+                check_ftl_removal(message, hashtags)
+              else
+                {:ok, message}
+              end),
+           {:ok, message} <- check_sensitive(message) do
         {:ok, message}
       end
     else

lib/pleroma/web/activity_pub/mrf/keyword_policy.ex

@@ -27,24 +27,46 @@ defmodule Pleroma.Web.ActivityPub.MRF.KeywordPolicy do
   end
 
   defp check_reject(%{"object" => %{} = object} = message) do
-    payload = object_payload(object)
+    with {:ok, _new_object} <-
+           Pleroma.Object.Updater.do_with_history(object, fn object ->
+             payload = object_payload(object)
 
-    if Enum.any?(Pleroma.Config.get([:mrf_keyword, :reject]), fn pattern ->
-         string_matches?(payload, pattern)
-       end) do
-      {:reject, "[KeywordPolicy] Matches with rejected keyword"}
-    else
+             if Enum.any?(Pleroma.Config.get([:mrf_keyword, :reject]), fn pattern ->
+                  string_matches?(payload, pattern)
+                end) do
+               {:reject, "[KeywordPolicy] Matches with rejected keyword"}
+             else
+               {:ok, message}
+             end
+           end) do
       {:ok, message}
+    else
+      e -> e
     end
   end
 
-  defp check_ftl_removal(%{"to" => to, "object" => %{} = object} = message) do
-    payload = object_payload(object)
+  defp check_ftl_removal(%{"type" => "Create", "to" => to, "object" => %{} = object} = message) do
+    check_keyword = fn object ->
+      payload = object_payload(object)
 
-    if Pleroma.Constants.as_public() in to and
-         Enum.any?(Pleroma.Config.get([:mrf_keyword, :federated_timeline_removal]), fn pattern ->
+      if Enum.any?(Pleroma.Config.get([:mrf_keyword, :federated_timeline_removal]), fn pattern ->
            string_matches?(payload, pattern)
          end) do
+        {:should_delist, nil}
+      else
+        {:ok, %{}}
+      end
+    end
+
+    should_delist? = fn object ->
+      with {:ok, _} <- Pleroma.Object.Updater.do_with_history(object, check_keyword) do
+        false
+      else
+        _ -> true
+      end
+    end
+
+    if Pleroma.Constants.as_public() in to and should_delist?.(object) do
       to = List.delete(to, Pleroma.Constants.as_public())
       cc = [Pleroma.Constants.as_public() | message["cc"] || []]
 
@@ -59,8 +81,12 @@ defmodule Pleroma.Web.ActivityPub.MRF.KeywordPolicy do
     end
   end
 
+  defp check_ftl_removal(message) do
+    {:ok, message}
+  end
+
   defp check_replace(%{"object" => %{} = object} = message) do
-    object =
+    replace_kw = fn object ->
       ["content", "name", "summary"]
       |> Enum.filter(fn field -> Map.has_key?(object, field) && object[field] end)
       |> Enum.reduce(object, fn field, object ->
@@ -73,6 +99,10 @@ defmodule Pleroma.Web.ActivityPub.MRF.KeywordPolicy do
 
         Map.put(object, field, data)
       end)
+      |> (fn object -> {:ok, object} end).()
+    end
+
+    {:ok, object} = Pleroma.Object.Updater.do_with_history(object, replace_kw)
 
     message = Map.put(message, "object", object)
 
@@ -80,7 +110,8 @@ defmodule Pleroma.Web.ActivityPub.MRF.KeywordPolicy do
   end
 
   @impl true
-  def filter(%{"type" => "Create", "object" => %{"content" => _content}} = message) do
+  def filter(%{"type" => type, "object" => %{"content" => _content}} = message)
+      when type in ["Create", "Update"] do
     with {:ok, message} <- check_reject(message),
          {:ok, message} <- check_ftl_removal(message),
          {:ok, message} <- check_replace(message) do

lib/pleroma/web/activity_pub/mrf/media_proxy_warming_policy.ex

@@ -15,6 +15,9 @@ defmodule Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy do
     recv_timeout: 10_000
   ]
 
+  @impl true
+  def history_awareness, do: :auto
+
   defp prefetch(url) do
     # Fetching only proxiable resources
     if MediaProxy.enabled?() and MediaProxy.url_proxiable?(url) do
@@ -53,10 +56,8 @@ defmodule Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy do
   end
 
   @impl true
-  def filter(
-        %{"type" => "Create", "object" => %{"attachment" => attachments} = _object} = message
-      )
-      when is_list(attachments) and length(attachments) > 0 do
+  def filter(%{"type" => type, "object" => %{"attachment" => attachments} = _object} = message)
+      when type in ["Create", "Update"] and is_list(attachments) and length(attachments) > 0 do
     preload(message)
 
     {:ok, message}

lib/pleroma/web/activity_pub/mrf/no_empty_policy.ex

@@ -11,6 +11,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.NoEmptyPolicy do
   @impl true
   def filter(%{"actor" => actor} = object) do
     with true <- is_local?(actor),
+         true <- is_eligible_type?(object),
          true <- is_note?(object),
          false <- has_attachment?(object),
          true <- only_mentions?(object) do
@@ -32,7 +33,6 @@ defmodule Pleroma.Web.ActivityPub.MRF.NoEmptyPolicy do
   end
 
   defp has_attachment?(%{
-         "type" => "Create",
          "object" => %{"type" => "Note", "attachment" => attachments}
        })
        when length(attachments) > 0,
@@ -40,23 +40,13 @@ defmodule Pleroma.Web.ActivityPub.MRF.NoEmptyPolicy do
 
   defp has_attachment?(_), do: false
 
-  defp only_mentions?(%{"type" => "Create", "object" => %{"type" => "Note", "source" => source}})
-       when is_binary(source) do
-    non_mentions =
-      source |> String.split() |> Enum.filter(&(not String.starts_with?(&1, "@"))) |> length
+  defp only_mentions?(%{"object" => %{"type" => "Note", "source" => source}}) do
+    source =
+      case source do
+        %{"content" => text} -> text
+        _ -> source
+      end
 
-    if non_mentions > 0 do
-      false
-    else
-      true
-    end
-  end
-
-  defp only_mentions?(%{
-         "type" => "Create",
-         "object" => %{"type" => "Note", "source" => %{"content" => source}}
-       })
-       when is_binary(source) do
     non_mentions =
       source |> String.split() |> Enum.filter(&(not String.starts_with?(&1, "@"))) |> length
 
@@ -69,9 +59,12 @@ defmodule Pleroma.Web.ActivityPub.MRF.NoEmptyPolicy do
 
   defp only_mentions?(_), do: false
 
-  defp is_note?(%{"type" => "Create", "object" => %{"type" => "Note"}}), do: true
+  defp is_note?(%{"object" => %{"type" => "Note"}}), do: true
   defp is_note?(_), do: false
 
+  defp is_eligible_type?(%{"type" => type}) when type in ["Create", "Update"], do: true
+  defp is_eligible_type?(_), do: false
+
   @impl true
   def describe, do: {:ok, %{}}
 end

lib/pleroma/web/activity_pub/mrf/no_placeholder_text_policy.ex

@@ -6,14 +6,17 @@ defmodule Pleroma.Web.ActivityPub.MRF.NoPlaceholderTextPolicy do
   @moduledoc "Ensure no content placeholder is present (such as the dot from mastodon)"
   @behaviour Pleroma.Web.ActivityPub.MRF.Policy
 
+  @impl true
+  def history_awareness, do: :auto
+
   @impl true
   def filter(
         %{
-          "type" => "Create",
+          "type" => type,
           "object" => %{"content" => content, "attachment" => _} = _child_object
         } = object
       )
-      when content in [".", "<p>.</p>"] do
+      when type in ["Create", "Update"] and content in [".", "<p>.</p>"] do
     {:ok, put_in(object, ["object", "content"], "")}
   end
 

lib/pleroma/web/activity_pub/mrf/normalize_markup.ex

@@ -9,7 +9,11 @@ defmodule Pleroma.Web.ActivityPub.MRF.NormalizeMarkup do
   @behaviour Pleroma.Web.ActivityPub.MRF.Policy
 
   @impl true
-  def filter(%{"type" => "Create", "object" => child_object} = object) do
+  def history_awareness, do: :auto
+
+  @impl true
+  def filter(%{"type" => type, "object" => child_object} = object)
+      when type in ["Create", "Update"] do
     scrub_policy = Pleroma.Config.get([:mrf_normalize_markup, :scrub_policy])
 
     content =

lib/pleroma/web/activity_pub/mrf/policy.ex

@@ -12,5 +12,6 @@ defmodule Pleroma.Web.ActivityPub.MRF.Policy do
               label: String.t(),
               description: String.t()
             }
-  @optional_callbacks config_description: 0
+  @callback history_awareness() :: :auto | :manual
+  @optional_callbacks config_description: 0, history_awareness: 0
 end

lib/pleroma/web/activity_pub/object_validator.ex

@@ -86,8 +86,8 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidator do
         meta
       )
       when objtype in ~w[Question Answer Audio Video Event Article Note Page] do
-    with {:ok, object_data} <- cast_and_apply(object),
-         meta = Keyword.put(meta, :object_data, object_data |> stringify_keys),
+    with {:ok, object_data} <- cast_and_apply_and_stringify_with_history(object),
+         meta = Keyword.put(meta, :object_data, object_data),
          {:ok, create_activity} <-
            create_activity
            |> CreateGenericValidator.cast_and_validate(meta)
@@ -111,19 +111,53 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidator do
       end
 
     with {:ok, object} <-
-           object
-           |> validator.cast_and_validate()
-           |> Ecto.Changeset.apply_action(:insert) do
-      object = stringify_keys(object)
+           do_separate_with_history(object, fn object ->
+             with {:ok, object} <-
+                    object
+                    |> validator.cast_and_validate()
+                    |> Ecto.Changeset.apply_action(:insert) do
+               object = stringify_keys(object)
 
-      # Insert copy of hashtags as strings for the non-hashtag table indexing
-      tag = (object["tag"] || []) ++ Object.hashtags(%Object{data: object})
-      object = Map.put(object, "tag", tag)
+               # Insert copy of hashtags as strings for the non-hashtag table indexing
+               tag = (object["tag"] || []) ++ Object.hashtags(%Object{data: object})
+               object = Map.put(object, "tag", tag)
 
+               {:ok, object}
+             end
+           end) do
       {:ok, object, meta}
     end
   end
 
+  def validate(
+        %{"type" => "Update", "object" => %{"type" => objtype} = object} = update_activity,
+        meta
+      )
+      when objtype in ~w[Question Answer Audio Video Event Article Note Page] do
+    with {_, false} <- {:local, Access.get(meta, :local, false)},
+         {_, {:ok, object_data, _}} <- {:object_validation, validate(object, meta)},
+         meta = Keyword.put(meta, :object_data, object_data),
+         {:ok, update_activity} <-
+           update_activity
+           |> UpdateValidator.cast_and_validate()
+           |> Ecto.Changeset.apply_action(:insert) do
+      update_activity = stringify_keys(update_activity)
+      {:ok, update_activity, meta}
+    else
+      {:local, _} ->
+        with {:ok, object} <-
+               update_activity
+               |> UpdateValidator.cast_and_validate()
+               |> Ecto.Changeset.apply_action(:insert) do
+          object = stringify_keys(object)
+          {:ok, object, meta}
+        end
+
+      {:object_validation, e} ->
+        e
+    end
+  end
+
   def validate(%{"type" => type} = object, meta)
       when type in ~w[Accept Reject Follow Update Like EmojiReact Announce
       Answer] do
@@ -160,6 +194,15 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidator do
 
   def validate(o, m), do: {:error, {:validator_not_set, {o, m}}}
 
+  def cast_and_apply_and_stringify_with_history(object) do
+    do_separate_with_history(object, fn object ->
+      with {:ok, object_data} <- cast_and_apply(object),
+           object_data <- object_data |> stringify_keys() do
+        {:ok, object_data}
+      end
+    end)
+  end
+
   def cast_and_apply(%{"type" => "Question"} = object) do
     QuestionValidator.cast_and_apply(object)
   end
@@ -214,4 +257,54 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidator do
     Object.normalize(object["object"], fetch: true)
     :ok
   end
+
+  defp for_each_history_item(
+         %{"type" => "OrderedCollection", "orderedItems" => items} = history,
+         object,
+         fun
+       ) do
+    processed_items =
+      Enum.map(items, fn item ->
+        with item <- Map.put(item, "id", object["id"]),
+             {:ok, item} <- fun.(item) do
+          item
+        else
+          _ -> nil
+        end
+      end)
+
+    if Enum.all?(processed_items, &(not is_nil(&1))) do
+      {:ok, Map.put(history, "orderedItems", processed_items)}
+    else
+      {:error, :invalid_history}
+    end
+  end
+
+  defp for_each_history_item(nil, _object, _fun) do
+    {:ok, nil}
+  end
+
+  defp for_each_history_item(_, _object, _fun) do
+    {:error, :invalid_history}
+  end
+
+  # fun is (object -> {:ok, validated_object_with_string_keys})
+  defp do_separate_with_history(object, fun) do
+    with history <- object["formerRepresentations"],
+         object <- Map.drop(object, ["formerRepresentations"]),
+         {_, {:ok, object}} <- {:main_body, fun.(object)},
+         {_, {:ok, history}} <- {:history_items, for_each_history_item(history, object, fun)} do
+      object =
+        if history do
+          Map.put(object, "formerRepresentations", history)
+        else
+          object
+        end
+
+      {:ok, object}
+    else
+      {:main_body, e} -> e
+      {:history_items, e} -> e
+    end
+  end
 end

lib/pleroma/web/activity_pub/object_validators/article_note_page_validator.ex

@@ -54,7 +54,10 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.ArticleNotePageValidator do
   defp fix_url(%{"url" => url} = data) when is_map(url), do: Map.put(data, "url", url["href"])
   defp fix_url(data), do: data
 
-  defp fix_tag(%{"tag" => tag} = data) when is_list(tag), do: data
+  defp fix_tag(%{"tag" => tag} = data) when is_list(tag) do
+    Map.put(data, "tag", Enum.filter(tag, &is_map/1))
+  end
+
   defp fix_tag(%{"tag" => tag} = data) when is_map(tag), do: Map.put(data, "tag", [tag])
   defp fix_tag(data), do: Map.drop(data, ["tag"])
 
@@ -110,8 +113,7 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.ArticleNotePageValidator do
   # https://github.com/misskey-dev/misskey/pull/8787
   defp fix_misskey_content(
          %{"source" => %{"mediaType" => "text/x.misskeymarkdown", "content" => content}} = object
-       )
-       when is_binary(content) do
+       ) do
     mention_handler = fn nick, buffer, opts, acc ->
       remote_mention_resolver(object, nick, buffer, opts, acc)
     end
@@ -122,7 +124,7 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.ArticleNotePageValidator do
     Map.put(object, "content", linked)
   end
 
-  defp fix_misskey_content(%{"_misskey_content" => content} = object) when is_binary(content) do
+  defp fix_misskey_content(%{"_misskey_content" => content} = object) do
     mention_handler = fn nick, buffer, opts, acc ->
       remote_mention_resolver(object, nick, buffer, opts, acc)
     end

lib/pleroma/web/activity_pub/object_validators/attachment_validator.ex

@@ -11,6 +11,7 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.AttachmentValidator do
 
   @primary_key false
   embedded_schema do
+    field(:id, :string)
     field(:type, :string)
     field(:mediaType, :string, default: "application/octet-stream")
     field(:name, :string)
@@ -43,7 +44,7 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.AttachmentValidator do
       |> fix_url()
 
     struct
-    |> cast(data, [:type, :mediaType, :name, :blurhash])
+    |> cast(data, [:id, :type, :mediaType, :name, :blurhash])
     |> cast_embed(:url, with: &url_changeset/2, required: true)
     |> validate_inclusion(:type, ~w[Link Document Audio Image Video])
     |> validate_required([:type, :mediaType])

lib/pleroma/web/activity_pub/object_validators/common_fields.ex

@@ -33,6 +33,7 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.CommonFields do
       field(:content, :string)
 
       field(:published, ObjectValidators.DateTime)
+      field(:updated, ObjectValidators.DateTime)
       field(:emoji, ObjectValidators.Emoji, default: %{})
       embeds_many(:attachment, AttachmentValidator)
     end

lib/pleroma/web/activity_pub/object_validators/emoji_react_validator.ex

@@ -53,7 +53,6 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.EmojiReactValidator do
   defp fix(data) do
     data =
       data
-      |> fix_emoji_qualification()
       |> CommonFixes.fix_actor()
       |> CommonFixes.fix_activity_addressing()
 
@@ -78,23 +77,6 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.EmojiReactValidator do
   defp matches_shortcode?(nil), do: false
   defp matches_shortcode?(s), do: Regex.match?(@emoji_regex, s)
 
-  defp fix_emoji_qualification(%{"content" => emoji} = data) do
-    new_emoji = Pleroma.Emoji.fully_qualify_emoji(emoji)
-
-    cond do
-      Pleroma.Emoji.is_unicode_emoji?(emoji) ->
-        data
-
-      Pleroma.Emoji.is_unicode_emoji?(new_emoji) ->
-        data |> Map.put("content", new_emoji)
-
-      true ->
-        data
-    end
-  end
-
-  defp fix_emoji_qualification(data), do: data
-
   defp validate_emoji(cng) do
     content = get_field(cng, :content)
 

lib/pleroma/web/activity_pub/object_validators/update_validator.ex

@@ -51,7 +51,9 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.UpdateValidator do
     with actor = get_field(cng, :actor),
          object = get_field(cng, :object),
          {:ok, object_id} <- ObjectValidators.ObjectID.cast(object),
-         true <- actor == object_id do
+         actor_uri <- URI.parse(actor),
+         object_uri <- URI.parse(object_id),
+         true <- actor_uri.host == object_uri.host do
       cng
     else
       _e ->

lib/pleroma/web/activity_pub/side_effects.ex

@@ -23,6 +23,7 @@ defmodule Pleroma.Web.ActivityPub.SideEffects do
   alias Pleroma.Web.Streamer
   alias Pleroma.Workers.PollWorker
 
+  require Pleroma.Constants
   require Logger
 
   @logger Pleroma.Config.get([:side_effects, :logger], Logger)
@@ -150,23 +151,25 @@ defmodule Pleroma.Web.ActivityPub.SideEffects do
 
   # Tasks this handles:
   # - Update the user
+  # - Update a non-user object (Note, Question, etc.)
   #
   # For a local user, we also get a changeset with the full information, so we
   # can update non-federating, non-activitypub settings as well.
   @impl true
   def handle(%{data: %{"type" => "Update", "object" => updated_object}} = object, meta) do
-    if changeset = Keyword.get(meta, :user_update_changeset) do
-      changeset
-      |> User.update_and_set_cache()
+    updated_object_id = updated_object["id"]
+
+    with {_, true} <- {:has_id, is_binary(updated_object_id)},
+         {_, user} <- {:user, Pleroma.User.get_by_ap_id(updated_object_id)} do
+      if user do
+        handle_update_user(object, meta)
+      else
+        handle_update_object(object, meta)
+      end
     else
-      {:ok, new_user_data} = ActivityPub.user_data_from_user_object(updated_object)
-
-      User.get_by_ap_id(updated_object["id"])
-      |> User.remote_user_changeset(new_user_data)
-      |> User.update_and_set_cache()
+      _ ->
+        {:ok, object, meta}
     end
-
-    {:ok, object, meta}
   end
 
   # Tasks this handles:
@@ -395,6 +398,79 @@ defmodule Pleroma.Web.ActivityPub.SideEffects do
     {:ok, object, meta}
   end
 
+  defp handle_update_user(
+         %{data: %{"type" => "Update", "object" => updated_object}} = object,
+         meta
+       ) do
+    if changeset = Keyword.get(meta, :user_update_changeset) do
+      changeset
+      |> User.update_and_set_cache()
+    else
+      {:ok, new_user_data} = ActivityPub.user_data_from_user_object(updated_object)
+
+      User.get_by_ap_id(updated_object["id"])
+      |> User.remote_user_changeset(new_user_data)
+      |> User.update_and_set_cache()
+    end
+
+    {:ok, object, meta}
+  end
+
+  defp handle_update_object(
+         %{data: %{"type" => "Update", "object" => updated_object}} = object,
+         meta
+       ) do
+    orig_object_ap_id = updated_object["id"]
+    orig_object = Object.get_by_ap_id(orig_object_ap_id)
+    orig_object_data = orig_object.data
+
+    updated_object =
+      if meta[:local] do
+        # If this is a local Update, we don't process it by transmogrifier,
+        # so we use the embedded object as-is.
+        updated_object
+      else
+        meta[:object_data]
+      end
+
+    if orig_object_data["type"] in Pleroma.Constants.updatable_object_types() do
+      %{
+        updated_data: updated_object_data,
+        updated: updated,
+        used_history_in_new_object?: used_history_in_new_object?
+      } = Object.Updater.make_new_object_data_from_update_object(orig_object_data, updated_object)
+
+      changeset =
+        orig_object
+        |> Repo.preload(:hashtags)
+        |> Object.change(%{data: updated_object_data})
+
+      with {:ok, new_object} <- Repo.update(changeset),
+           {:ok, _} <- Object.invalid_object_cache(new_object),
+           {:ok, _} <- Object.set_cache(new_object),
+           # The metadata/utils.ex uses the object id for the cache.
+           {:ok, _} <- Pleroma.Activity.HTML.invalidate_cache_for(new_object.id) do
+        if used_history_in_new_object? do
+          with create_activity when not is_nil(create_activity) <-
+                 Pleroma.Activity.get_create_by_object_ap_id(orig_object_ap_id),
+               {:ok, _} <- Pleroma.Activity.HTML.invalidate_cache_for(create_activity.id) do
+            nil
+          else
+            _ -> nil
+          end
+        end
+
+        if updated do
+          object
+          |> Activity.normalize()
+          |> ActivityPub.notify_and_stream()
+        end
+      end
+    end
+
+    {:ok, object, meta}
+  end
+
   def handle_object_creation(%{"type" => "Question"} = object, activity, meta) do
     with {:ok, object, meta} <- Pipeline.common_pipeline(object, meta) do
       PollWorker.schedule_poll_end(activity)

lib/pleroma/web/activity_pub/transmogrifier.ex

@@ -193,7 +193,6 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
   def fix_quote_url(%{"quoteUrl" => quote_url} = object, options) do
     object
     |> Map.put("quoteUri", quote_url)
-    |> Map.delete("quoteUrl")
     |> fix_quote_url(options)
   end
 
@@ -202,14 +201,12 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
   def fix_quote_url(%{"quoteURL" => quote_url} = object, options) do
     object
     |> Map.put("quoteUri", quote_url)
-    |> Map.delete("quoteURL")
     |> fix_quote_url(options)
   end
 
   def fix_quote_url(%{"_misskey_quote" => quote_url} = object, options) do
     object
     |> Map.put("quoteUri", quote_url)
-    |> Map.delete("_misskey_quote")
     |> fix_quote_url(options)
   end
 
@@ -712,6 +709,24 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
     |> strip_internal_fields
     |> strip_internal_tags
     |> set_type
+    |> maybe_process_history
+  end
+
+  defp maybe_process_history(%{"formerRepresentations" => %{"orderedItems" => history}} = object) do
+    processed_history =
+      Enum.map(
+        history,
+        fn
+          item when is_map(item) -> prepare_object(item)
+          item -> item
+        end
+      )
+
+    put_in(object, ["formerRepresentations", "orderedItems"], processed_history)
+  end
+
+  defp maybe_process_history(object) do
+    object
   end
 
   #  @doc
@@ -736,6 +751,21 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
     {:ok, data}
   end
 
+  def prepare_outgoing(%{"type" => "Update", "object" => %{"type" => objtype} = object} = data)
+      when objtype in Pleroma.Constants.updatable_object_types() do
+    object =
+      object
+      |> prepare_object
+
+    data =
+      data
+      |> Map.put("object", object)
+      |> Map.merge(Utils.make_json_ld_header())
+      |> Map.delete("bcc")
+
+    {:ok, data}
+  end
+
   def prepare_outgoing(%{"type" => "Announce", "actor" => ap_id, "object" => object_id} = data) do
     object =
       object_id

lib/pleroma/web/admin_api/controllers/config_controller.ex

@@ -22,58 +22,10 @@ defmodule Pleroma.Web.AdminAPI.ConfigController do
 
   defdelegate open_api_operation(action), to: Pleroma.Web.ApiSpec.Admin.ConfigOperation
 
-  defp translate_descriptions(descriptions, path \\ []) do
-    Enum.map(descriptions, fn desc -> translate_item(desc, path) end)
-  end
-
-  defp translate_string(str, path, type) do
-    Gettext.dpgettext(
-      Pleroma.Web.Gettext,
-      "config_descriptions",
-      Pleroma.Docs.Translator.Compiler.msgctxt_for(path, type),
-      str
-    )
-  end
-
-  defp maybe_put_translated(item, key, path) do
-    if item[key] do
-      Map.put(
-        item,
-        key,
-        translate_string(
-          item[key],
-          path ++ [Pleroma.Docs.Translator.Compiler.key_for(item)],
-          to_string(key)
-        )
-      )
-    else
-      item
-    end
-  end
-
-  defp translate_item(item, path) do
-    item
-    |> maybe_put_translated(:label, path)
-    |> maybe_put_translated(:description, path)
-    |> translate_children(path)
-  end
-
-  defp translate_children(%{children: children} = item, path) when is_list(children) do
-    item
-    |> Map.put(
-      :children,
-      translate_descriptions(children, path ++ [Pleroma.Docs.Translator.Compiler.key_for(item)])
-    )
-  end
-
-  defp translate_children(item, _path) do
-    item
-  end
-
   def descriptions(conn, _params) do
     descriptions = Enum.filter(Pleroma.Docs.JSON.compiled_descriptions(), &whitelisted_config?/1)
 
-    json(conn, translate_descriptions(descriptions))
+    json(conn, descriptions)
   end
 
   def show(conn, %{only_db: true}) do

lib/pleroma/web/api_spec/operations/status_operation.ex

@@ -6,9 +6,13 @@ defmodule Pleroma.Web.ApiSpec.StatusOperation do
   alias OpenApiSpex.Operation
   alias OpenApiSpex.Schema
   alias Pleroma.Web.ApiSpec.AccountOperation
+  alias Pleroma.Web.ApiSpec.Schemas.Account
   alias Pleroma.Web.ApiSpec.Schemas.ApiError
+  alias Pleroma.Web.ApiSpec.Schemas.Attachment
   alias Pleroma.Web.ApiSpec.Schemas.BooleanLike
+  alias Pleroma.Web.ApiSpec.Schemas.Emoji
   alias Pleroma.Web.ApiSpec.Schemas.FlakeID
+  alias Pleroma.Web.ApiSpec.Schemas.Poll
   alias Pleroma.Web.ApiSpec.Schemas.ScheduledStatus
   alias Pleroma.Web.ApiSpec.Schemas.Status
   alias Pleroma.Web.ApiSpec.Schemas.VisibilityScope
@@ -406,6 +410,59 @@ defmodule Pleroma.Web.ApiSpec.StatusOperation do
     }
   end
 
+  def show_history_operation do
+    %Operation{
+      tags: ["Retrieve status history"],
+      summary: "Status history",
+      description: "View history of a status",
+      operationId: "StatusController.show_history",
+      security: [%{"oAuth" => ["read:statuses"]}],
+      parameters: [
+        id_param()
+      ],
+      responses: %{
+        200 => status_history_response(),
+        404 => Operation.response("Not Found", "application/json", ApiError)
+      }
+    }
+  end
+
+  def show_source_operation do
+    %Operation{
+      tags: ["Retrieve status source"],
+      summary: "Status source",
+      description: "View source of a status",
+      operationId: "StatusController.show_source",
+      security: [%{"oAuth" => ["read:statuses"]}],
+      parameters: [
+        id_param()
+      ],
+      responses: %{
+        200 => status_source_response(),
+        404 => Operation.response("Not Found", "application/json", ApiError)
+      }
+    }
+  end
+
+  def update_operation do
+    %Operation{
+      tags: ["Update status"],
+      summary: "Update status",
+      description: "Change the content of a status",
+      operationId: "StatusController.update",
+      security: [%{"oAuth" => ["write:statuses"]}],
+      parameters: [
+        id_param()
+      ],
+      requestBody: request_body("Parameters", update_request(), required: true),
+      responses: %{
+        200 => status_response(),
+        403 => Operation.response("Forbidden", "application/json", ApiError),
+        404 => Operation.response("Not Found", "application/json", ApiError)
+      }
+    }
+  end
+
   def array_of_statuses do
     %Schema{type: :array, items: Status, example: [Status.schema().example]}
   end
@@ -514,6 +571,60 @@ defmodule Pleroma.Web.ApiSpec.StatusOperation do
     }
   end
 
+  defp update_request do
+    %Schema{
+      title: "StatusUpdateRequest",
+      type: :object,
+      properties: %{
+        status: %Schema{
+          type: :string,
+          nullable: true,
+          description:
+            "Text content of the status. If `media_ids` is provided, this becomes optional. Attaching a `poll` is optional while `status` is provided."
+        },
+        media_ids: %Schema{
+          nullable: true,
+          type: :array,
+          items: %Schema{type: :string},
+          description: "Array of Attachment ids to be attached as media."
+        },
+        poll: poll_params(),
+        sensitive: %Schema{
+          allOf: [BooleanLike],
+          nullable: true,
+          description: "Mark status and attached media as sensitive?"
+        },
+        spoiler_text: %Schema{
+          type: :string,
+          nullable: true,
+          description:
+            "Text to be shown as a warning or subject before the actual content. Statuses are generally collapsed behind this field."
+        },
+        content_type: %Schema{
+          type: :string,
+          nullable: true,
+          description:
+            "The MIME type of the status, it is transformed into HTML by the backend. You can get the list of the supported MIME types with the nodeinfo endpoint."
+        },
+        to: %Schema{
+          type: :array,
+          nullable: true,
+          items: %Schema{type: :string},
+          description:
+            "A list of nicknames (like `lain@soykaf.club` or `lain` on the local server) that will be used to determine who is going to be addressed by this post. Using this will disable the implicit addressing by mentioned names in the `status` body, only the people in the `to` list will be addressed. The normal rules for for post visibility are not affected by this and will still apply"
+        }
+      },
+      example: %{
+        "status" => "What time is it?",
+        "sensitive" => "false",
+        "poll" => %{
+          "options" => ["Cofe", "Adventure"],
+          "expires_in" => 420
+        }
+      }
+    }
+  end
+
   def poll_params do
     %Schema{
       nullable: true,
@@ -556,6 +667,87 @@ defmodule Pleroma.Web.ApiSpec.StatusOperation do
     Operation.response("Status", "application/json", Status)
   end
 
+  defp status_history_response do
+    Operation.response(
+      "Status History",
+      "application/json",
+      %Schema{
+        title: "Status history",
+        description: "Response schema for history of a status",
+        type: :array,
+        items: %Schema{
+          type: :object,
+          properties: %{
+            account: %Schema{
+              allOf: [Account],
+              description: "The account that authored this status"
+            },
+            content: %Schema{
+              type: :string,
+              format: :html,
+              description: "HTML-encoded status content"
+            },
+            sensitive: %Schema{
+              type: :boolean,
+              description: "Is this status marked as sensitive content?"
+            },
+            spoiler_text: %Schema{
+              type: :string,
+              description:
+                "Subject or summary line, below which status content is collapsed until expanded"
+            },
+            created_at: %Schema{
+              type: :string,
+              format: "date-time",
+              description: "The date when this status was created"
+            },
+            media_attachments: %Schema{
+              type: :array,
+              items: Attachment,
+              description: "Media that is attached to this status"
+            },
+            emojis: %Schema{
+              type: :array,
+              items: Emoji,
+              description: "Custom emoji to be used when rendering status content"
+            },
+            poll: %Schema{
+              allOf: [Poll],
+              nullable: true,
+              description: "The poll attached to the status"
+            }
+          }
+        }
+      }
+    )
+  end
+
+  defp status_source_response do
+    Operation.response(
+      "Status Source",
+      "application/json",
+      %Schema{
+        type: :object,
+        properties: %{
+          id: FlakeID,
+          text: %Schema{
+            type: :string,
+            description: "Raw source of status content"
+          },
+          spoiler_text: %Schema{
+            type: :string,
+            description:
+              "Subject or summary line, below which status content is collapsed until expanded"
+          },
+          content_type: %Schema{
+            type: :string,
+            description: "The content type of the source"
+          }
+        }
+      }
+    )
+  end
+
   defp context do
     %Schema{
       title: "StatusContext",

lib/pleroma/web/api_spec/schemas/status.ex

@@ -73,6 +73,12 @@ defmodule Pleroma.Web.ApiSpec.Schemas.Status do
         format: "date-time",
         description: "The date when this status was created"
       },
+      edited_at: %Schema{
+        type: :string,
+        format: "date-time",
+        nullable: true,
+        description: "The date when this status was last edited"
+      },
       emojis: %Schema{
         type: :array,
         items: Emoji,

lib/pleroma/web/auth/ldap_authenticator.ex

@@ -1,129 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.Web.Auth.LDAPAuthenticator do
-  alias Pleroma.User
-
-  require Logger
-
-  import Pleroma.Web.Auth.Helpers, only: [fetch_credentials: 1, fetch_user: 1]
-
-  @behaviour Pleroma.Web.Auth.Authenticator
-  @base Pleroma.Web.Auth.PleromaAuthenticator
-
-  @connection_timeout 10_000
-  @search_timeout 10_000
-
-  defdelegate get_registration(conn), to: @base
-  defdelegate create_from_registration(conn, registration), to: @base
-  defdelegate handle_error(conn, error), to: @base
-  defdelegate auth_template, to: @base
-  defdelegate oauth_consumer_template, to: @base
-
-  def get_user(%Plug.Conn{} = conn) do
-    with {:ldap, true} <- {:ldap, Pleroma.Config.get([:ldap, :enabled])},
-         {:ok, {name, password}} <- fetch_credentials(conn),
-         %User{} = user <- ldap_user(name, password) do
-      {:ok, user}
-    else
-      {:ldap, _} ->
-        @base.get_user(conn)
-
-      error ->
-        error
-    end
-  end
-
-  defp ldap_user(name, password) do
-    ldap = Pleroma.Config.get(:ldap, [])
-    host = Keyword.get(ldap, :host, "localhost")
-    port = Keyword.get(ldap, :port, 389)
-    ssl = Keyword.get(ldap, :ssl, false)
-    sslopts = Keyword.get(ldap, :sslopts, [])
-
-    options =
-      [{:port, port}, {:ssl, ssl}, {:timeout, @connection_timeout}] ++
-        if sslopts != [], do: [{:sslopts, sslopts}], else: []
-
-    case :eldap.open([to_charlist(host)], options) do
-      {:ok, connection} ->
-        try do
-          if Keyword.get(ldap, :tls, false) do
-            :application.ensure_all_started(:ssl)
-
-            case :eldap.start_tls(
-                   connection,
-                   Keyword.get(ldap, :tlsopts, []),
-                   @connection_timeout
-                 ) do
-              :ok ->
-                :ok
-
-              error ->
-                Logger.error("Could not start TLS: #{inspect(error)}")
-            end
-          end
-
-          bind_user(connection, ldap, name, password)
-        after
-          :eldap.close(connection)
-        end
-
-      {:error, error} ->
-        Logger.error("Could not open LDAP connection: #{inspect(error)}")
-        {:error, {:ldap_connection_error, error}}
-    end
-  end
-
-  defp bind_user(connection, ldap, name, password) do
-    uid = Keyword.get(ldap, :uid, "cn")
-    base = Keyword.get(ldap, :base)
-
-    case :eldap.simple_bind(connection, "#{uid}=#{name},#{base}", password) do
-      :ok ->
-        case fetch_user(name) do
-          %User{} = user ->
-            user
-
-          _ ->
-            register_user(connection, base, uid, name)
-        end
-
-      error ->
-        error
-    end
-  end
-
-  defp register_user(connection, base, uid, name) do
-    case :eldap.search(connection, [
-           {:base, to_charlist(base)},
-           {:filter, :eldap.equalityMatch(to_charlist(uid), to_charlist(name))},
-           {:scope, :eldap.wholeSubtree()},
-           {:timeout, @search_timeout}
-         ]) do
-      {:ok, {:eldap_search_result, [{:eldap_entry, _, attributes}], _}} ->
-        params = %{
-          name: name,
-          nickname: name,
-          password: nil
-        }
-
-        params =
-          case List.keyfind(attributes, 'mail', 0) do
-            {_, [mail]} -> Map.put_new(params, :email, :erlang.list_to_binary(mail))
-            _ -> params
-          end
-
-        changeset = User.register_changeset_ldap(%User{}, params)
-
-        case User.register(changeset) do
-          {:ok, user} -> user
-          error -> error
-        end
-
-      error ->
-        error
-    end
-  end
-end

lib/pleroma/web/common_api.ex

@@ -346,6 +346,41 @@ defmodule Pleroma.Web.CommonAPI do
     end
   end
 
+  def update(user, orig_activity, changes) do
+    with orig_object <- Object.normalize(orig_activity),
+         {:ok, new_object} <- make_update_data(user, orig_object, changes),
+         {:ok, update_data, _} <- Builder.update(user, new_object),
+         {:ok, update, _} <- Pipeline.common_pipeline(update_data, local: true) do
+      {:ok, update}
+    else
+      _ -> {:error, nil}
+    end
+  end
+
+  defp make_update_data(user, orig_object, changes) do
+    kept_params = %{
+      visibility: Visibility.get_visibility(orig_object),
+      in_reply_to_id:
+        with replied_id when is_binary(replied_id) <- orig_object.data["inReplyTo"],
+             %Activity{id: activity_id} <- Activity.get_create_by_object_ap_id(replied_id) do
+          activity_id
+        else
+          _ -> nil
+        end
+    }
+
+    params = Map.merge(changes, kept_params)
+
+    with {:ok, draft} <- ActivityDraft.create(user, params) do
+      change =
+        Object.Updater.make_update_object_data(orig_object.data, draft.object, Utils.make_date())
+
+      {:ok, change}
+    else
+      _ -> {:error, nil}
+    end
+  end
+
   @spec pin(String.t(), User.t()) :: {:ok, Activity.t()} | {:error, term()}
   def pin(id, %User{} = user) do
     with %Activity{} = activity <- create_activity_by_id(id),

lib/pleroma/web/common_api/activity_draft.ex

@@ -221,7 +221,7 @@ defmodule Pleroma.Web.CommonAPI.ActivityDraft do
       |> Map.put("emoji", emoji)
       |> Map.put("source", %{
         "content" => draft.status,
-        "mediaType" => draft.params[:content_type]
+        "mediaType" => Utils.get_content_type(draft.params[:content_type])
       })
       |> Map.put("generator", draft.params[:generator])
 

lib/pleroma/web/common_api/utils.ex

@@ -37,7 +37,7 @@ defmodule Pleroma.Web.CommonAPI.Utils do
 
   def attachments_from_ids_no_descs(ids) do
     Enum.map(ids, fn media_id ->
-      case Repo.get(Object, media_id) do
+      case get_attachment(media_id) do
         %Object{data: data} -> data
         _ -> nil
       end
@@ -51,13 +51,17 @@ defmodule Pleroma.Web.CommonAPI.Utils do
     {_, descs} = Jason.decode(descs_str)
 
     Enum.map(ids, fn media_id ->
-      with %Object{data: data} <- Repo.get(Object, media_id) do
+      with %Object{data: data} <- get_attachment(media_id) do
         Map.put(data, "name", descs[media_id])
       end
     end)
     |> Enum.reject(&is_nil/1)
   end
 
+  defp get_attachment(media_id) do
+    Repo.get(Object, media_id)
+  end
+
   @spec get_to_and_cc(ActivityDraft.t()) :: {list(String.t()), list(String.t())}
 
   def get_to_and_cc(%{in_reply_to_conversation: %Participation{} = participation}) do
@@ -219,7 +223,7 @@ defmodule Pleroma.Web.CommonAPI.Utils do
     |> maybe_add_attachments(draft.attachments, attachment_links)
   end
 
-  defp get_content_type(content_type) do
+  def get_content_type(content_type) do
     if Enum.member?(Config.get([:instance, :allowed_post_formats]), content_type) do
       content_type
     else
@@ -259,7 +263,8 @@ defmodule Pleroma.Web.CommonAPI.Utils do
   @doc """
   Formatting text to plain text, BBCode, HTML, or Markdown
   """
-  def format_input(text, "text/plain", options) do
+  def format_input(text, format, options)
+      when format in ["text/plain", "text/x.misskeymarkdown"] do
     text
     |> Formatter.html_escape("text/plain")
     |> Formatter.linkify(options)
@@ -283,15 +288,6 @@ defmodule Pleroma.Web.CommonAPI.Utils do
     |> Formatter.linkify(options)
   end
 
-  def format_input(text, "text/x.misskeymarkdown", options) do
-    text
-    |> Formatter.linkify(options)
-    |> Formatter.html_escape("text/x.misskeymarkdown")
-    |> (fn {text, mentions, tags} ->
-          {String.replace(text, ~r/\r?\n/, "<br>"), mentions, tags}
-        end).()
-  end
-
   def format_input(text, "text/markdown", options) do
     text
     |> Formatter.mentions_escape(options)

lib/pleroma/web/mastodon_api/controllers/notification_controller.ex

@@ -51,6 +51,7 @@ defmodule Pleroma.Web.MastodonAPI.NotificationController do
     move
     pleroma:emoji_reaction
     poll
+    update
   }
   def index(%{assigns: %{user: user}} = conn, params) do
     params =

lib/pleroma/web/mastodon_api/controllers/status_controller.ex

@@ -37,7 +37,9 @@ defmodule Pleroma.Web.MastodonAPI.StatusController do
     when action in [
            :index,
            :show,
-           :context
+           :context,
+           :show_history,
+           :show_source
          ]
   )
 
@@ -48,7 +50,8 @@ defmodule Pleroma.Web.MastodonAPI.StatusController do
            :create,
            :delete,
            :reblog,
-           :unreblog
+           :unreblog,
+           :update
          ]
   )
 
@@ -190,6 +193,59 @@ defmodule Pleroma.Web.MastodonAPI.StatusController do
     create(%Plug.Conn{conn | body_params: params}, %{})
   end
 
+  @doc "GET /api/v1/statuses/:id/history"
+  def show_history(%{assigns: assigns} = conn, %{id: id} = params) do
+    with user = assigns[:user],
+         %Activity{} = activity <- Activity.get_by_id_with_object(id),
+         true <- Visibility.visible_for_user?(activity, user) do
+      try_render(conn, "history.json",
+        activity: activity,
+        for: user,
+        with_direct_conversation_id: true,
+        with_muted: Map.get(params, :with_muted, false)
+      )
+    else
+      _ -> {:error, :not_found}
+    end
+  end
+
+  @doc "GET /api/v1/statuses/:id/source"
+  def show_source(%{assigns: assigns} = conn, %{id: id} = _params) do
+    with user = assigns[:user],
+         %Activity{} = activity <- Activity.get_by_id_with_object(id),
+         true <- Visibility.visible_for_user?(activity, user) do
+      try_render(conn, "source.json",
+        activity: activity,
+        for: user
+      )
+    else
+      _ -> {:error, :not_found}
+    end
+  end
+
+  @doc "PUT /api/v1/statuses/:id"
+  def update(%{assigns: %{user: user}, body_params: body_params} = conn, %{id: id} = params) do
+    with {_, %Activity{}} = {_, activity} <- {:activity, Activity.get_by_id_with_object(id)},
+         {_, true} <- {:visible, Visibility.visible_for_user?(activity, user)},
+         {_, true} <- {:is_create, activity.data["type"] == "Create"},
+         actor <- Activity.user_actor(activity),
+         {_, true} <- {:own_status, actor.id == user.id},
+         changes <- body_params |> put_application(conn),
+         {_, {:ok, _update_activity}} <- {:pipeline, CommonAPI.update(user, activity, changes)},
+         {_, %Activity{}} = {_, activity} <- {:refetched, Activity.get_by_id_with_object(id)} do
+      try_render(conn, "show.json",
+        activity: activity,
+        for: user,
+        with_direct_conversation_id: true,
+        with_muted: Map.get(params, :with_muted, false)
+      )
+    else
+      {:own_status, _} -> {:error, :forbidden}
+      {:pipeline, _} -> {:error, :internal_server_error}
+      _ -> {:error, :not_found}
+    end
+  end
+
   @doc "GET /api/v1/statuses/:id"
   def show(%{assigns: %{user: user}} = conn, %{id: id} = params) do
     with %Activity{} = activity <- Activity.get_by_id_with_object(id),

lib/pleroma/web/mastodon_api/views/instance_view.ex

@@ -65,6 +65,7 @@ defmodule Pleroma.Web.MastodonAPI.InstanceView do
       "shareable_emoji_packs",
       "multifetch",
       "pleroma:api/v1/notifications:include_types_filter",
+      "editing",
       if Config.get([:media_proxy, :enabled]) do
         "media_proxy"
       end,

lib/pleroma/web/mastodon_api/views/notification_view.ex

@@ -17,7 +17,11 @@ defmodule Pleroma.Web.MastodonAPI.NotificationView do
   alias Pleroma.Web.MastodonAPI.NotificationView
   alias Pleroma.Web.MastodonAPI.StatusView
 
-  @parent_types ~w{Like Announce EmojiReact}
+  defp object_id_for(%{data: %{"object" => %{"id" => id}}}) when is_binary(id), do: id
+
+  defp object_id_for(%{data: %{"object" => id}}) when is_binary(id), do: id
+
+  @parent_types ~w{Like Announce EmojiReact Update}
 
   def render("index.json", %{notifications: notifications, for: reading_user} = opts) do
     activities = Enum.map(notifications, & &1.activity)
@@ -28,7 +32,7 @@ defmodule Pleroma.Web.MastodonAPI.NotificationView do
         %{data: %{"type" => type}} ->
           type in @parent_types
       end)
-      |> Enum.map(& &1.data["object"])
+      |> Enum.map(&object_id_for/1)
       |> Activity.create_by_object_ap_id()
       |> Activity.with_preloaded_object(:left)
       |> Pleroma.Repo.all()
@@ -76,9 +80,9 @@ defmodule Pleroma.Web.MastodonAPI.NotificationView do
 
     parent_activity_fn = fn ->
       if opts[:parent_activities] do
-        Activity.Queries.find_by_object_ap_id(opts[:parent_activities], activity.data["object"])
+        Activity.Queries.find_by_object_ap_id(opts[:parent_activities], object_id_for(activity))
       else
-        Activity.get_create_by_object_ap_id(activity.data["object"])
+        Activity.get_create_by_object_ap_id(object_id_for(activity))
       end
     end
 
@@ -107,6 +111,9 @@ defmodule Pleroma.Web.MastodonAPI.NotificationView do
       "reblog" ->
         put_status(response, parent_activity_fn.(), reading_user, status_render_opts)
 
+      "update" ->
+        put_status(response, parent_activity_fn.(), reading_user, status_render_opts)
+
       "move" ->
         put_target(response, activity, reading_user, %{})
 

lib/pleroma/web/mastodon_api/views/status_view.ex

@@ -257,10 +257,30 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
 
     created_at = Utils.to_masto_date(object.data["published"])
 
+    edited_at =
+      with %{"updated" => updated} <- object.data,
+           date <- Utils.to_masto_date(updated),
+           true <- date != "" do
+        date
+      else
+        _ ->
+          nil
+      end
+
     reply_to = get_reply_to(activity, opts)
 
     reply_to_user = reply_to && CommonAPI.get_user(reply_to.data["actor"])
 
+    history_len =
+      1 +
+        (Object.Updater.history_for(object.data)
+         |> Map.get("orderedItems")
+         |> length())
+
+    # See render("history.json", ...) for more details
+    # Here the implicit index of the current content is 0
+    chrono_order = history_len - 1
+
     content =
       object
       |> render_content()
@@ -270,14 +290,14 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
       |> Activity.HTML.get_cached_scrubbed_html_for_activity(
         User.html_filter_policy(opts[:for]),
         activity,
-        "mastoapi:content"
+        "mastoapi:content:#{chrono_order}"
       )
 
     content_plaintext =
       content
       |> Activity.HTML.get_cached_stripped_html_for_activity(
         activity,
-        "mastoapi:content"
+        "mastoapi:content:#{chrono_order}"
       )
 
     summary = object.data["summary"] || ""
@@ -345,8 +365,9 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
       reblog: nil,
       card: card,
       content: content_html,
-      text: opts[:with_source] && object.data["source"],
+      text: opts[:with_source] && get_source_text(object.data["source"]),
       created_at: created_at,
+      edited_at: edited_at,
       reblogs_count: announcement_count,
       replies_count: object.data["repliesCount"] || 0,
       favourites_count: like_count,
@@ -390,6 +411,100 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
     nil
   end
 
+  def render("history.json", %{activity: %{data: %{"object" => _object}} = activity} = opts) do
+    object = Object.normalize(activity, fetch: false)
+
+    hashtags = Object.hashtags(object)
+
+    user = CommonAPI.get_user(activity.data["actor"])
+
+    past_history =
+      Object.Updater.history_for(object.data)
+      |> Map.get("orderedItems")
+      |> Enum.map(&Map.put(&1, "id", object.data["id"]))
+      |> Enum.map(&%Object{data: &1, id: object.id})
+
+    history =
+      [object | past_history]
+      # Mastodon expects the original to be at the first
+      |> Enum.reverse()
+      |> Enum.with_index()
+      |> Enum.map(fn {object, chrono_order} ->
+        %{
+          # The history is prepended every time there is a new edit.
+          # In chrono_order, the oldest item is always at 0, and so on.
+          # The chrono_order is an invariant kept between edits.
+          chrono_order: chrono_order,
+          object: object
+        }
+      end)
+
+    individual_opts =
+      opts
+      |> Map.put(:as, :item)
+      |> Map.put(:user, user)
+      |> Map.put(:hashtags, hashtags)
+
+    render_many(history, StatusView, "history_item.json", individual_opts)
+  end
+
+  def render(
+        "history_item.json",
+        %{
+          activity: activity,
+          user: user,
+          item: %{object: object, chrono_order: chrono_order},
+          hashtags: hashtags
+        } = opts
+      ) do
+    sensitive = object.data["sensitive"] || Enum.member?(hashtags, "nsfw")
+
+    attachment_data = object.data["attachment"] || []
+    attachments = render_many(attachment_data, StatusView, "attachment.json", as: :attachment)
+
+    created_at = Utils.to_masto_date(object.data["updated"] || object.data["published"])
+
+    content =
+      object
+      |> render_content()
+
+    content_html =
+      content
+      |> Activity.HTML.get_cached_scrubbed_html_for_activity(
+        User.html_filter_policy(opts[:for]),
+        activity,
+        "mastoapi:content:#{chrono_order}"
+      )
+
+    summary = object.data["summary"] || ""
+
+    %{
+      account:
+        AccountView.render("show.json", %{
+          user: user,
+          for: opts[:for]
+        }),
+      content: content_html,
+      sensitive: sensitive,
+      spoiler_text: summary,
+      created_at: created_at,
+      media_attachments: attachments,
+      emojis: build_emojis(object.data["emoji"]),
+      poll: render(PollView, "show.json", object: object, for: opts[:for])
+    }
+  end
+
+  def render("source.json", %{activity: %{data: %{"object" => _object}} = activity} = _opts) do
+    object = Object.normalize(activity, fetch: false)
+
+    %{
+      id: activity.id,
+      text: get_source_text(Map.get(object.data, "source", "")),
+      spoiler_text: Map.get(object.data, "summary", ""),
+      content_type: get_source_content_type(object.data["source"])
+    }
+  end
+
   def render("card.json", %{rich_media: rich_media, page_url: page_url}) do
     page_url_data = URI.parse(page_url)
 
@@ -442,10 +557,19 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
         true -> "unknown"
       end
 
-    <<hash_id::signed-32, _rest::binary>> = :crypto.hash(:md5, href)
+    attachment_id =
+      with {_, ap_id} when is_binary(ap_id) <- {:ap_id, attachment["id"]},
+           {_, %Object{data: _object_data, id: object_id}} <-
+             {:object, Object.get_by_ap_id(ap_id)} do
+        to_string(object_id)
+      else
+        _ ->
+          <<hash_id::signed-32, _rest::binary>> = :crypto.hash(:md5, href)
+          to_string(attachment["id"] || hash_id)
+      end
 
     %{
-      id: to_string(attachment["id"] || hash_id),
+      id: attachment_id,
       url: href,
       remote_url: href,
       preview_url: href_preview,
@@ -623,4 +747,24 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
       render("show.json", opts)
     end
   end
+
+  defp get_source_text(%{"content" => content} = _source) do
+    content
+  end
+
+  defp get_source_text(source) when is_binary(source) do
+    source
+  end
+
+  defp get_source_text(_) do
+    ""
+  end
+
+  defp get_source_content_type(%{"mediaType" => type} = _source) do
+    type
+  end
+
+  defp get_source_content_type(_source) do
+    Utils.get_content_type(nil)
+  end
 end

lib/pleroma/web/media_proxy/media_proxy_controller.ex

@@ -54,7 +54,7 @@ defmodule Pleroma.Web.MediaProxy.MediaProxyController do
     media_proxy_url = MediaProxy.url(url)
 
     with {:ok, %{status: status} = head_response} when status in 200..299 <-
-           Pleroma.HTTP.request("HEAD", media_proxy_url, [], [], name: MyFinch) do
+           Pleroma.HTTP.request("head", media_proxy_url, [], [], name: MyFinch) do
       content_type = Tesla.get_header(head_response, "content-type")
       content_length = Tesla.get_header(head_response, "content-length")
       content_length = content_length && String.to_integer(content_length)

lib/pleroma/web/router.ex

@@ -537,6 +537,7 @@ defmodule Pleroma.Web.Router do
     get("/bookmarks", StatusController, :bookmarks)
 
     post("/statuses", StatusController, :create)
+    put("/statuses/:id", StatusController, :update)
     delete("/statuses/:id", StatusController, :delete)
     post("/statuses/:id/reblog", StatusController, :reblog)
     post("/statuses/:id/unreblog", StatusController, :unreblog)
@@ -601,6 +602,8 @@ defmodule Pleroma.Web.Router do
     get("/statuses/:id/context", StatusController, :context)
     get("/statuses/:id/favourited_by", StatusController, :favourited_by)
     get("/statuses/:id/reblogged_by", StatusController, :reblogged_by)
+    get("/statuses/:id/history", StatusController, :show_history)
+    get("/statuses/:id/source", StatusController, :show_source)
 
     get("/custom_emojis", CustomEmojiController, :index)
 

lib/pleroma/web/streamer.ex

@@ -282,6 +282,24 @@ defmodule Pleroma.Web.Streamer do
 
   defp push_to_socket(_topic, %Activity{data: %{"type" => "Delete"}}), do: :noop
 
+  defp push_to_socket(topic, %Activity{data: %{"type" => "Update"}} = item) do
+    create_activity =
+      Pleroma.Activity.get_create_by_object_ap_id(item.object.data["id"])
+      |> Map.put(:object, item.object)
+
+    anon_render = StreamerView.render("status_update.json", create_activity)
+
+    Registry.dispatch(@registry, topic, fn list ->
+      Enum.each(list, fn {pid, auth?} ->
+        if auth? do
+          send(pid, {:render_with_user, StreamerView, "status_update.json", create_activity})
+        else
+          send(pid, {:text, anon_render})
+        end
+      end)
+    end)
+  end
+
   defp push_to_socket(topic, item) do
     anon_render = StreamerView.render("update.json", item)
 

lib/pleroma/web/views/streamer_view.ex

@@ -25,6 +25,20 @@ defmodule Pleroma.Web.StreamerView do
     |> Jason.encode!()
   end
 
+  def render("status_update.json", %Activity{} = activity, %User{} = user) do
+    %{
+      event: "status.update",
+      payload:
+        Pleroma.Web.MastodonAPI.StatusView.render(
+          "show.json",
+          activity: activity,
+          for: user
+        )
+        |> Jason.encode!()
+    }
+    |> Jason.encode!()
+  end
+
   def render("notification.json", %Notification{} = notify, %User{} = user) do
     %{
       event: "notification",
@@ -51,6 +65,19 @@ defmodule Pleroma.Web.StreamerView do
     |> Jason.encode!()
   end
 
+  def render("status_update.json", %Activity{} = activity) do
+    %{
+      event: "status.update",
+      payload:
+        Pleroma.Web.MastodonAPI.StatusView.render(
+          "show.json",
+          activity: activity
+        )
+        |> Jason.encode!()
+    }
+    |> Jason.encode!()
+  end
+
   def render("follow_relationships_update.json", item) do
     %{
       event: "pleroma:follow_relationships_update",

mix.exs

@@ -9,7 +9,6 @@ defmodule Pleroma.Mixfile do
       elixirc_paths: elixirc_paths(Mix.env()),
       compilers: [:phoenix, :gettext] ++ Mix.compilers(),
       elixirc_options: [warnings_as_errors: warnings_as_errors()],
-      xref: [exclude: [:eldap]],
       start_permanent: Mix.env() == :prod,
       aliases: aliases(),
       deps: deps(),

priv/gettext/ca/LC_MESSAGES/errors.po

@@ -1,624 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-07-29 11:37+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: ca\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 3.7.1\n"
-
-## This file is a PO Template file.
-##
-## `msgid`s here are often extracted from source code.
-## Add new translations manually only if they're dynamic
-## translations that can't be statically extracted.
-##
-## Run `mix gettext.extract` to bring this file up to
-## date. Leave `msgstr`s empty as changing them here as no
-## effect: edit them in PO (`.po`) files instead.
-## From Ecto.Changeset.cast/4
-msgid "can't be blank"
-msgstr ""
-
-## From Ecto.Changeset.unique_constraint/3
-msgid "has already been taken"
-msgstr ""
-
-## From Ecto.Changeset.put_change/3
-msgid "is invalid"
-msgstr ""
-
-## From Ecto.Changeset.validate_format/3
-msgid "has invalid format"
-msgstr ""
-
-## From Ecto.Changeset.validate_subset/3
-msgid "has an invalid entry"
-msgstr ""
-
-## From Ecto.Changeset.validate_exclusion/3
-msgid "is reserved"
-msgstr ""
-
-## From Ecto.Changeset.validate_confirmation/3
-msgid "does not match confirmation"
-msgstr ""
-
-## From Ecto.Changeset.no_assoc_constraint/3
-msgid "is still associated with this entry"
-msgstr ""
-
-msgid "are still associated with this entry"
-msgstr ""
-
-## From Ecto.Changeset.validate_length/3
-msgid "should be %{count} character(s)"
-msgid_plural "should be %{count} character(s)"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "should have %{count} item(s)"
-msgid_plural "should have %{count} item(s)"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "should be at least %{count} character(s)"
-msgid_plural "should be at least %{count} character(s)"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "should have at least %{count} item(s)"
-msgid_plural "should have at least %{count} item(s)"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "should be at most %{count} character(s)"
-msgid_plural "should be at most %{count} character(s)"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "should have at most %{count} item(s)"
-msgid_plural "should have at most %{count} item(s)"
-msgstr[0] ""
-msgstr[1] ""
-
-## From Ecto.Changeset.validate_number/3
-msgid "must be less than %{number}"
-msgstr ""
-
-msgid "must be greater than %{number}"
-msgstr ""
-
-msgid "must be less than or equal to %{number}"
-msgstr ""
-
-msgid "must be greater than or equal to %{number}"
-msgstr ""
-
-msgid "must be equal to %{number}"
-msgstr ""
-
-#: lib/pleroma/web/common_api.ex:523
-#, elixir-autogen, elixir-format
-msgid "Account not found"
-msgstr ""
-
-#: lib/pleroma/web/common_api.ex:316
-#, elixir-autogen, elixir-format
-msgid "Already voted"
-msgstr ""
-
-#: lib/pleroma/web/o_auth/o_auth_controller.ex:402
-#, elixir-autogen, elixir-format
-msgid "Bad request"
-msgstr ""
-
-#: lib/pleroma/web/controller_helper.ex:97
-#: lib/pleroma/web/controller_helper.ex:103
-#, elixir-autogen, elixir-format
-msgid "Can't display this activity"
-msgstr ""
-
-#: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:325
-#, elixir-autogen, elixir-format
-msgid "Can't find user"
-msgstr ""
-
-#: lib/pleroma/web/pleroma_api/controllers/account_controller.ex:80
-#, elixir-autogen, elixir-format
-msgid "Can't get favorites"
-msgstr ""
-
-#: lib/pleroma/web/common_api/utils.ex:482
-#, elixir-autogen, elixir-format
-msgid "Cannot post an empty status without attachments"
-msgstr ""
-
-#: lib/pleroma/web/common_api/utils.ex:441
-#, elixir-autogen, elixir-format
-msgid "Comment must be up to %{max_size} characters"
-msgstr ""
-
-#: lib/pleroma/config_db.ex:200
-#, elixir-autogen, elixir-format
-msgid "Config with params %{params} not found"
-msgstr ""
-
-#: lib/pleroma/web/common_api.ex:167
-#: lib/pleroma/web/common_api.ex:171
-#, elixir-autogen, elixir-format
-msgid "Could not delete"
-msgstr ""
-
-#: lib/pleroma/web/common_api.ex:217
-#, elixir-autogen, elixir-format
-msgid "Could not favorite"
-msgstr ""
-
-#: lib/pleroma/web/common_api.ex:254
-#, elixir-autogen, elixir-format
-msgid "Could not unfavorite"
-msgstr ""
-
-#: lib/pleroma/web/common_api.ex:202
-#, elixir-autogen, elixir-format
-msgid "Could not unrepeat"
-msgstr ""
-
-#: lib/pleroma/web/common_api.ex:530
-#: lib/pleroma/web/common_api.ex:539
-#, elixir-autogen, elixir-format
-msgid "Could not update state"
-msgstr ""
-
-#: lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex:205
-#, elixir-autogen, elixir-format
-msgid "Error."
-msgstr ""
-
-#: lib/pleroma/web/twitter_api/twitter_api.ex:105
-#, elixir-autogen, elixir-format
-msgid "Invalid CAPTCHA"
-msgstr ""
-
-#: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:144
-#: lib/pleroma/web/o_auth/o_auth_controller.ex:631
-#, elixir-autogen, elixir-format
-msgid "Invalid credentials"
-msgstr ""
-
-#: lib/pleroma/web/plugs/ensure_authenticated_plug.ex:42
-#, elixir-autogen, elixir-format
-msgid "Invalid credentials."
-msgstr ""
-
-#: lib/pleroma/web/common_api.ex:337
-#, elixir-autogen, elixir-format
-msgid "Invalid indices"
-msgstr ""
-
-#: lib/pleroma/web/admin_api/controllers/fallback_controller.ex:29
-#, elixir-autogen, elixir-format
-msgid "Invalid parameters"
-msgstr ""
-
-#: lib/pleroma/web/common_api/utils.ex:349
-#, elixir-autogen, elixir-format
-msgid "Invalid password."
-msgstr ""
-
-#: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:255
-#, elixir-autogen, elixir-format
-msgid "Invalid request"
-msgstr ""
-
-#: lib/pleroma/web/twitter_api/twitter_api.ex:108
-#, elixir-autogen, elixir-format
-msgid "Kocaptcha service unavailable"
-msgstr ""
-
-#: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:140
-#, elixir-autogen, elixir-format
-msgid "Missing parameters"
-msgstr ""
-
-#: lib/pleroma/web/common_api/utils.ex:477
-#, elixir-autogen, elixir-format
-msgid "No such conversation"
-msgstr ""
-
-#: lib/pleroma/web/admin_api/controllers/admin_api_controller.ex:171
-#: lib/pleroma/web/admin_api/controllers/admin_api_controller.ex:197
-#: lib/pleroma/web/admin_api/controllers/admin_api_controller.ex:239
-#, elixir-autogen, elixir-format
-msgid "No such permission_group"
-msgstr ""
-
-#: lib/pleroma/web/activity_pub/activity_pub_controller.ex:515
-#: lib/pleroma/web/admin_api/controllers/fallback_controller.ex:11
-#: lib/pleroma/web/feed/tag_controller.ex:16
-#: lib/pleroma/web/feed/user_controller.ex:69
-#: lib/pleroma/web/o_status/o_status_controller.ex:132
-#: lib/pleroma/web/plugs/uploaded_media.ex:84
-#, elixir-autogen, elixir-format
-msgid "Not found"
-msgstr ""
-
-#: lib/pleroma/web/common_api.ex:308
-#, elixir-autogen, elixir-format
-msgid "Poll's author can't vote"
-msgstr ""
-
-#: lib/pleroma/web/mastodon_api/controllers/fallback_controller.ex:20
-#: lib/pleroma/web/mastodon_api/controllers/poll_controller.ex:39
-#: lib/pleroma/web/mastodon_api/controllers/poll_controller.ex:51
-#: lib/pleroma/web/mastodon_api/controllers/poll_controller.ex:52
-#: lib/pleroma/web/mastodon_api/controllers/status_controller.ex:326
-#: lib/pleroma/web/mastodon_api/controllers/subscription_controller.ex:71
-#, elixir-autogen, elixir-format
-msgid "Record not found"
-msgstr ""
-
-#: lib/pleroma/web/admin_api/controllers/fallback_controller.ex:35
-#: lib/pleroma/web/feed/user_controller.ex:78
-#: lib/pleroma/web/mastodon_api/controllers/fallback_controller.ex:42
-#: lib/pleroma/web/o_status/o_status_controller.ex:138
-#, elixir-autogen, elixir-format
-msgid "Something went wrong"
-msgstr ""
-
-#: lib/pleroma/web/common_api/activity_draft.ex:143
-#, elixir-autogen, elixir-format
-msgid "The message visibility must be direct"
-msgstr ""
-
-#: lib/pleroma/web/common_api/utils.ex:492
-#, elixir-autogen, elixir-format
-msgid "The status is over the character limit"
-msgstr ""
-
-#: lib/pleroma/web/plugs/ensure_public_or_authenticated_plug.ex:36
-#, elixir-autogen, elixir-format
-msgid "This resource requires authentication."
-msgstr ""
-
-#: lib/pleroma/web/plugs/rate_limiter.ex:208
-#, elixir-autogen, elixir-format
-msgid "Throttled"
-msgstr ""
-
-#: lib/pleroma/web/common_api.ex:338
-#, elixir-autogen, elixir-format
-msgid "Too many choices"
-msgstr ""
-
-#: lib/pleroma/web/admin_api/controllers/admin_api_controller.ex:268
-#, elixir-autogen, elixir-format
-msgid "You can't revoke your own admin status."
-msgstr ""
-
-#: lib/pleroma/web/o_auth/o_auth_controller.ex:243
-#: lib/pleroma/web/o_auth/o_auth_controller.ex:333
-#, elixir-autogen, elixir-format
-msgid "Your account is currently disabled"
-msgstr ""
-
-#: lib/pleroma/web/o_auth/o_auth_controller.ex:205
-#: lib/pleroma/web/o_auth/o_auth_controller.ex:356
-#, elixir-autogen, elixir-format
-msgid "Your login is missing a confirmed e-mail address"
-msgstr ""
-
-#: lib/pleroma/web/activity_pub/activity_pub_controller.ex:403
-#, elixir-autogen, elixir-format
-msgid "can't read inbox of %{nickname} as %{as_nickname}"
-msgstr ""
-
-#: lib/pleroma/web/activity_pub/activity_pub_controller.ex:502
-#, elixir-autogen, elixir-format
-msgid "can't update outbox of %{nickname} as %{as_nickname}"
-msgstr ""
-
-#: lib/pleroma/web/common_api.ex:475
-#, elixir-autogen, elixir-format
-msgid "conversation is already muted"
-msgstr ""
-
-#: lib/pleroma/web/activity_pub/activity_pub_controller.ex:521
-#, elixir-autogen, elixir-format
-msgid "error"
-msgstr ""
-
-#: lib/pleroma/web/pleroma_api/controllers/mascot_controller.ex:34
-#, elixir-autogen, elixir-format
-msgid "mascots can only be images"
-msgstr ""
-
-#: lib/pleroma/web/activity_pub/activity_pub_controller.ex:63
-#, elixir-autogen, elixir-format
-msgid "not found"
-msgstr ""
-
-#: lib/pleroma/web/o_auth/o_auth_controller.ex:437
-#, elixir-autogen, elixir-format
-msgid "Bad OAuth request."
-msgstr ""
-
-#: lib/pleroma/web/twitter_api/twitter_api.ex:114
-#, elixir-autogen, elixir-format
-msgid "CAPTCHA already used"
-msgstr ""
-
-#: lib/pleroma/web/twitter_api/twitter_api.ex:111
-#, elixir-autogen, elixir-format
-msgid "CAPTCHA expired"
-msgstr ""
-
-#: lib/pleroma/web/plugs/uploaded_media.ex:57
-#, elixir-autogen, elixir-format
-msgid "Failed"
-msgstr ""
-
-#: lib/pleroma/web/o_auth/o_auth_controller.ex:453
-#, elixir-autogen, elixir-format
-msgid "Failed to authenticate: %{message}."
-msgstr ""
-
-#: lib/pleroma/web/o_auth/o_auth_controller.ex:484
-#, elixir-autogen, elixir-format
-msgid "Failed to set up user account."
-msgstr ""
-
-#: lib/pleroma/web/plugs/o_auth_scopes_plug.ex:37
-#, elixir-autogen, elixir-format
-msgid "Insufficient permissions: %{permissions}."
-msgstr ""
-
-#: lib/pleroma/web/plugs/uploaded_media.ex:111
-#, elixir-autogen, elixir-format
-msgid "Internal Error"
-msgstr ""
-
-#: lib/pleroma/web/o_auth/fallback_controller.ex:22
-#: lib/pleroma/web/o_auth/fallback_controller.ex:29
-#, elixir-autogen, elixir-format
-msgid "Invalid Username/Password"
-msgstr ""
-
-#: lib/pleroma/web/twitter_api/twitter_api.ex:117
-#, elixir-autogen, elixir-format
-msgid "Invalid answer data"
-msgstr ""
-
-#: lib/pleroma/web/nodeinfo/nodeinfo_controller.ex:33
-#, elixir-autogen, elixir-format
-msgid "Nodeinfo schema version not handled"
-msgstr ""
-
-#: lib/pleroma/web/o_auth/o_auth_controller.ex:194
-#, elixir-autogen, elixir-format
-msgid "This action is outside the authorized scopes"
-msgstr ""
-
-#: lib/pleroma/web/o_auth/fallback_controller.ex:14
-#, elixir-autogen, elixir-format
-msgid "Unknown error, please check the details and try again."
-msgstr ""
-
-#: lib/pleroma/web/o_auth/o_auth_controller.ex:136
-#: lib/pleroma/web/o_auth/o_auth_controller.ex:180
-#, elixir-autogen, elixir-format
-msgid "Unlisted redirect_uri."
-msgstr ""
-
-#: lib/pleroma/web/o_auth/o_auth_controller.ex:433
-#, elixir-autogen, elixir-format
-msgid "Unsupported OAuth provider: %{provider}."
-msgstr ""
-
-#: lib/pleroma/uploaders/uploader.ex:74
-#, elixir-autogen, elixir-format
-msgid "Uploader callback timeout"
-msgstr ""
-
-#: lib/pleroma/web/uploader_controller.ex:23
-#, elixir-autogen, elixir-format
-msgid "bad request"
-msgstr ""
-
-#: lib/pleroma/web/twitter_api/twitter_api.ex:102
-#, elixir-autogen, elixir-format
-msgid "CAPTCHA Error"
-msgstr ""
-
-#: lib/pleroma/web/common_api.ex:266
-#, elixir-autogen, elixir-format
-msgid "Could not add reaction emoji"
-msgstr ""
-
-#: lib/pleroma/web/common_api.ex:277
-#, elixir-autogen, elixir-format
-msgid "Could not remove reaction emoji"
-msgstr ""
-
-#: lib/pleroma/web/twitter_api/twitter_api.ex:128
-#, elixir-autogen, elixir-format
-msgid "Invalid CAPTCHA (Missing parameter: %{name})"
-msgstr ""
-
-#: lib/pleroma/web/mastodon_api/controllers/list_controller.ex:96
-#, elixir-autogen, elixir-format
-msgid "List not found"
-msgstr ""
-
-#: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:151
-#, elixir-autogen, elixir-format
-msgid "Missing parameter: %{name}"
-msgstr ""
-
-#: lib/pleroma/web/o_auth/o_auth_controller.ex:232
-#: lib/pleroma/web/o_auth/o_auth_controller.ex:346
-#, elixir-autogen, elixir-format
-msgid "Password reset is required"
-msgstr ""
-
-#: lib/pleroma/tests/auth_test_controller.ex:9
-#: lib/pleroma/web/activity_pub/activity_pub_controller.ex:6
-#: lib/pleroma/web/admin_api/controllers/admin_api_controller.ex:6
-#: lib/pleroma/web/admin_api/controllers/announcement_controller.ex:6
-#: lib/pleroma/web/admin_api/controllers/chat_controller.ex:6
-#: lib/pleroma/web/admin_api/controllers/config_controller.ex:6
-#: lib/pleroma/web/admin_api/controllers/fallback_controller.ex:6
-#: lib/pleroma/web/admin_api/controllers/frontend_controller.ex:6
-#: lib/pleroma/web/admin_api/controllers/instance_controller.ex:6
-#: lib/pleroma/web/admin_api/controllers/instance_document_controller.ex:6
-#: lib/pleroma/web/admin_api/controllers/invite_controller.ex:6
-#: lib/pleroma/web/admin_api/controllers/media_proxy_cache_controller.ex:6
-#: lib/pleroma/web/admin_api/controllers/o_auth_app_controller.ex:6
-#: lib/pleroma/web/admin_api/controllers/relay_controller.ex:6
-#: lib/pleroma/web/admin_api/controllers/report_controller.ex:6
-#: lib/pleroma/web/admin_api/controllers/status_controller.ex:6
-#: lib/pleroma/web/admin_api/controllers/user_controller.ex:6
-#: lib/pleroma/web/controller_helper.ex:6
-#: lib/pleroma/web/embed_controller.ex:6
-#: lib/pleroma/web/fallback/redirect_controller.ex:6
-#: lib/pleroma/web/feed/tag_controller.ex:6
-#: lib/pleroma/web/feed/user_controller.ex:6
-#: lib/pleroma/web/mailer/subscription_controller.ex:6
-#: lib/pleroma/web/manifest_controller.ex:6
-#: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:6
-#: lib/pleroma/web/mastodon_api/controllers/announcement_controller.ex:6
-#: lib/pleroma/web/mastodon_api/controllers/app_controller.ex:11
-#: lib/pleroma/web/mastodon_api/controllers/auth_controller.ex:6
-#: lib/pleroma/web/mastodon_api/controllers/conversation_controller.ex:6
-#: lib/pleroma/web/mastodon_api/controllers/custom_emoji_controller.ex:6
-#: lib/pleroma/web/mastodon_api/controllers/directory_controller.ex:6
-#: lib/pleroma/web/mastodon_api/controllers/domain_block_controller.ex:6
-#: lib/pleroma/web/mastodon_api/controllers/fallback_controller.ex:6
-#: lib/pleroma/web/mastodon_api/controllers/filter_controller.ex:6
-#: lib/pleroma/web/mastodon_api/controllers/follow_request_controller.ex:6
-#: lib/pleroma/web/mastodon_api/controllers/instance_controller.ex:6
-#: lib/pleroma/web/mastodon_api/controllers/list_controller.ex:6
-#: lib/pleroma/web/mastodon_api/controllers/marker_controller.ex:6
-#: lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex:14
-#: lib/pleroma/web/mastodon_api/controllers/media_controller.ex:6
-#: lib/pleroma/web/mastodon_api/controllers/notification_controller.ex:6
-#: lib/pleroma/web/mastodon_api/controllers/poll_controller.ex:6
-#: lib/pleroma/web/mastodon_api/controllers/report_controller.ex:6
-#: lib/pleroma/web/mastodon_api/controllers/scheduled_activity_controller.ex:6
-#: lib/pleroma/web/mastodon_api/controllers/search_controller.ex:6
-#: lib/pleroma/web/mastodon_api/controllers/status_controller.ex:6
-#: lib/pleroma/web/mastodon_api/controllers/subscription_controller.ex:7
-#: lib/pleroma/web/mastodon_api/controllers/suggestion_controller.ex:6
-#: lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex:6
-#: lib/pleroma/web/media_proxy/media_proxy_controller.ex:6
-#: lib/pleroma/web/mongoose_im/mongoose_im_controller.ex:6
-#: lib/pleroma/web/nodeinfo/nodeinfo_controller.ex:6
-#: lib/pleroma/web/o_auth/fallback_controller.ex:6
-#: lib/pleroma/web/o_auth/mfa_controller.ex:10
-#: lib/pleroma/web/o_auth/o_auth_controller.ex:6
-#: lib/pleroma/web/o_status/o_status_controller.ex:6
-#: lib/pleroma/web/pleroma_api/controllers/account_controller.ex:6
-#: lib/pleroma/web/pleroma_api/controllers/app_controller.ex:6
-#: lib/pleroma/web/pleroma_api/controllers/backup_controller.ex:6
-#: lib/pleroma/web/pleroma_api/controllers/chat_controller.ex:5
-#: lib/pleroma/web/pleroma_api/controllers/conversation_controller.ex:6
-#: lib/pleroma/web/pleroma_api/controllers/emoji_file_controller.ex:6
-#: lib/pleroma/web/pleroma_api/controllers/emoji_pack_controller.ex:6
-#: lib/pleroma/web/pleroma_api/controllers/emoji_reaction_controller.ex:6
-#: lib/pleroma/web/pleroma_api/controllers/instances_controller.ex:6
-#: lib/pleroma/web/pleroma_api/controllers/mascot_controller.ex:6
-#: lib/pleroma/web/pleroma_api/controllers/notification_controller.ex:6
-#: lib/pleroma/web/pleroma_api/controllers/report_controller.ex:6
-#: lib/pleroma/web/pleroma_api/controllers/scrobble_controller.ex:6
-#: lib/pleroma/web/pleroma_api/controllers/two_factor_authentication_controller.ex:7
-#: lib/pleroma/web/pleroma_api/controllers/user_import_controller.ex:6
-#: lib/pleroma/web/static_fe/static_fe_controller.ex:6
-#: lib/pleroma/web/twitter_api/controller.ex:6
-#: lib/pleroma/web/twitter_api/controllers/password_controller.ex:10
-#: lib/pleroma/web/twitter_api/controllers/remote_follow_controller.ex:6
-#: lib/pleroma/web/twitter_api/controllers/util_controller.ex:6
-#: lib/pleroma/web/uploader_controller.ex:6
-#: lib/pleroma/web/web_finger/web_finger_controller.ex:6
-#, elixir-autogen, elixir-format
-msgid "Security violation: OAuth scopes check was neither handled nor explicitly skipped."
-msgstr ""
-
-#: lib/pleroma/web/plugs/ensure_authenticated_plug.ex:32
-#, elixir-autogen, elixir-format
-msgid "Two-factor authentication enabled, you must use a access token."
-msgstr ""
-
-#: lib/pleroma/web/mastodon_api/controllers/subscription_controller.ex:61
-#, elixir-autogen, elixir-format
-msgid "Web push subscription is disabled on this Pleroma instance"
-msgstr ""
-
-#: lib/pleroma/web/admin_api/controllers/admin_api_controller.ex:234
-#, elixir-autogen, elixir-format
-msgid "You can't revoke your own admin/moderator status."
-msgstr ""
-
-#: lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex:129
-#, elixir-autogen, elixir-format
-msgid "authorization required for timeline view"
-msgstr ""
-
-#: lib/pleroma/web/mastodon_api/controllers/fallback_controller.ex:24
-#, elixir-autogen, elixir-format
-msgid "Access denied"
-msgstr ""
-
-#: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:322
-#, elixir-autogen, elixir-format
-msgid "This API requires an authenticated user"
-msgstr ""
-
-#: lib/pleroma/web/plugs/ensure_staff_privileged_plug.ex:26
-#: lib/pleroma/web/plugs/user_is_admin_plug.ex:21
-#, elixir-autogen, elixir-format
-msgid "User is not an admin."
-msgstr ""
-
-#: lib/pleroma/user/backup.ex:75
-#, elixir-format
-msgid "Last export was less than a day ago"
-msgid_plural "Last export was less than %{days} days ago"
-msgstr[0] ""
-msgstr[1] ""
-
-#: lib/pleroma/user/backup.ex:93
-#, elixir-autogen, elixir-format
-msgid "Backups require enabled email"
-msgstr ""
-
-#: lib/pleroma/web/activity_pub/activity_pub_controller.ex:434
-#, elixir-autogen, elixir-format
-msgid "Character limit (%{limit} characters) exceeded, contains %{length} characters"
-msgstr ""
-
-#: lib/pleroma/user/backup.ex:98
-#, elixir-autogen, elixir-format
-msgid "Email is required"
-msgstr ""
-
-#: lib/pleroma/web/common_api/utils.ex:507
-#, elixir-autogen, elixir-format
-msgid "Too many attachments"
-msgstr ""
-
-#: lib/pleroma/web/plugs/ensure_staff_privileged_plug.ex:33
-#: lib/pleroma/web/plugs/user_is_staff_plug.ex:20
-#, elixir-autogen, elixir-format
-msgid "User is not a staff member."
-msgstr ""
-
-#: lib/pleroma/web/o_auth/o_auth_controller.ex:366
-#, elixir-autogen, elixir-format
-msgid "Your account is awaiting approval."
-msgstr ""

priv/gettext/ca/LC_MESSAGES/posix_errors.po

@@ -1,163 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-07-28 09:15+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: ca\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 3.7.1\n"
-
-## This file is a PO Template file.
-##
-## `msgid`s here are often extracted from source code.
-## Add new translations manually only if they're dynamic
-## translations that can't be statically extracted.
-##
-## Run `mix gettext.extract` to bring this file up to
-## date. Leave `msgstr`s empty as changing them here as no
-## effect: edit them in PO (`.po`) files instead.
-msgid "eperm"
-msgstr ""
-
-msgid "eacces"
-msgstr ""
-
-msgid "eagain"
-msgstr ""
-
-msgid "ebadf"
-msgstr ""
-
-msgid "ebadmsg"
-msgstr ""
-
-msgid "ebusy"
-msgstr ""
-
-msgid "edeadlk"
-msgstr ""
-
-msgid "edeadlock"
-msgstr ""
-
-msgid "edquot"
-msgstr ""
-
-msgid "eexist"
-msgstr ""
-
-msgid "efault"
-msgstr ""
-
-msgid "efbig"
-msgstr ""
-
-msgid "eftype"
-msgstr ""
-
-msgid "eintr"
-msgstr ""
-
-msgid "einval"
-msgstr ""
-
-msgid "eio"
-msgstr ""
-
-msgid "eisdir"
-msgstr ""
-
-msgid "eloop"
-msgstr ""
-
-msgid "emfile"
-msgstr ""
-
-msgid "emlink"
-msgstr ""
-
-msgid "emultihop"
-msgstr ""
-
-msgid "enametoolong"
-msgstr ""
-
-msgid "enfile"
-msgstr ""
-
-msgid "enobufs"
-msgstr ""
-
-msgid "enodev"
-msgstr ""
-
-msgid "enolck"
-msgstr ""
-
-msgid "enolink"
-msgstr ""
-
-msgid "enoent"
-msgstr ""
-
-msgid "enomem"
-msgstr ""
-
-msgid "enospc"
-msgstr ""
-
-msgid "enosr"
-msgstr ""
-
-msgid "enostr"
-msgstr ""
-
-msgid "enosys"
-msgstr ""
-
-msgid "enotblk"
-msgstr ""
-
-msgid "enotdir"
-msgstr ""
-
-msgid "enotsup"
-msgstr ""
-
-msgid "enxio"
-msgstr ""
-
-msgid "eopnotsupp"
-msgstr ""
-
-msgid "eoverflow"
-msgstr ""
-
-msgid "epipe"
-msgstr ""
-
-msgid "erange"
-msgstr ""
-
-msgid "erofs"
-msgstr ""
-
-msgid "espipe"
-msgstr ""
-
-msgid "esrch"
-msgstr ""
-
-msgid "estale"
-msgstr ""
-
-msgid "etxtbsy"
-msgstr ""
-
-msgid "exdev"
-msgstr ""

priv/gettext/ca/LC_MESSAGES/static_pages.po

@@ -1,525 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-07-28 09:15+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: ca\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 3.7.1\n"
-
-## This file is a PO Template file.
-##
-## "msgid"s here are often extracted from source code.
-## Add new translations manually only if they're dynamic
-## translations that can't be statically extracted.
-##
-## Run "mix gettext.extract" to bring this file up to
-## date. Leave "msgstr"s empty as changing them here as no
-## effect: edit them in PO (.po) files instead.
-
-#: lib/pleroma/web/templates/twitter_api/remote_follow/follow.html.eex:9
-#, elixir-autogen, elixir-format
-msgctxt "remote follow authorization button"
-msgid "Authorize"
-msgstr ""
-
-#: lib/pleroma/web/templates/twitter_api/remote_follow/follow.html.eex:2
-#, elixir-autogen, elixir-format
-msgctxt "remote follow error"
-msgid "Error fetching user"
-msgstr ""
-
-#: lib/pleroma/web/templates/twitter_api/remote_follow/follow.html.eex:4
-#, elixir-autogen, elixir-format
-msgctxt "remote follow header"
-msgid "Remote follow"
-msgstr ""
-
-#: lib/pleroma/web/templates/twitter_api/remote_follow/follow_mfa.html.eex:8
-#, elixir-autogen, elixir-format
-msgctxt "placeholder text for auth code entry"
-msgid "Authentication code"
-msgstr ""
-
-#: lib/pleroma/web/templates/twitter_api/remote_follow/follow_login.html.eex:10
-#, elixir-autogen, elixir-format
-msgctxt "placeholder text for password entry"
-msgid "Password"
-msgstr ""
-
-#: lib/pleroma/web/templates/twitter_api/remote_follow/follow_login.html.eex:8
-#, elixir-autogen, elixir-format
-msgctxt "placeholder text for username entry"
-msgid "Username"
-msgstr ""
-
-#: lib/pleroma/web/templates/twitter_api/remote_follow/follow_login.html.eex:13
-#, elixir-autogen, elixir-format
-msgctxt "remote follow authorization button for login"
-msgid "Authorize"
-msgstr ""
-
-#: lib/pleroma/web/templates/twitter_api/remote_follow/follow_mfa.html.eex:12
-#, elixir-autogen, elixir-format
-msgctxt "remote follow authorization button for mfa"
-msgid "Authorize"
-msgstr ""
-
-#: lib/pleroma/web/templates/twitter_api/remote_follow/followed.html.eex:2
-#, elixir-autogen, elixir-format
-msgctxt "remote follow error"
-msgid "Error following account"
-msgstr ""
-
-#: lib/pleroma/web/templates/twitter_api/remote_follow/follow_login.html.eex:4
-#, elixir-autogen, elixir-format
-msgctxt "remote follow header, need login"
-msgid "Log in to follow"
-msgstr ""
-
-#: lib/pleroma/web/templates/twitter_api/remote_follow/follow_mfa.html.eex:4
-#, elixir-autogen, elixir-format
-msgctxt "remote follow mfa header"
-msgid "Two-factor authentication"
-msgstr ""
-
-#: lib/pleroma/web/templates/twitter_api/remote_follow/followed.html.eex:4
-#, elixir-autogen, elixir-format
-msgctxt "remote follow success"
-msgid "Account followed!"
-msgstr ""
-
-#: lib/pleroma/web/templates/twitter_api/util/subscribe.html.eex:7
-#, elixir-autogen, elixir-format
-msgctxt "placeholder text for account id"
-msgid "Your account ID, e.g. lain@quitter.se"
-msgstr ""
-
-#: lib/pleroma/web/templates/twitter_api/util/subscribe.html.eex:8
-#, elixir-autogen, elixir-format
-msgctxt "remote follow authorization button for following with a remote account"
-msgid "Follow"
-msgstr ""
-
-#: lib/pleroma/web/templates/twitter_api/util/subscribe.html.eex:2
-#, elixir-autogen, elixir-format
-msgctxt "remote follow error"
-msgid "Error: %{error}"
-msgstr ""
-
-#: lib/pleroma/web/templates/twitter_api/util/subscribe.html.eex:4
-#, elixir-autogen, elixir-format
-msgctxt "remote follow header"
-msgid "Remotely follow %{nickname}"
-msgstr ""
-
-#: lib/pleroma/web/templates/twitter_api/password/reset.html.eex:12
-#, elixir-autogen, elixir-format
-msgctxt "password reset button"
-msgid "Reset"
-msgstr ""
-
-#: lib/pleroma/web/templates/twitter_api/password/reset_failed.html.eex:4
-#, elixir-autogen, elixir-format
-msgctxt "password reset failed homepage link"
-msgid "Homepage"
-msgstr ""
-
-#: lib/pleroma/web/templates/twitter_api/password/reset_failed.html.eex:1
-#, elixir-autogen, elixir-format
-msgctxt "password reset failed message"
-msgid "Password reset failed"
-msgstr ""
-
-#: lib/pleroma/web/templates/twitter_api/password/reset.html.eex:8
-#, elixir-autogen, elixir-format
-msgctxt "password reset form confirm password prompt"
-msgid "Confirmation"
-msgstr ""
-
-#: lib/pleroma/web/templates/twitter_api/password/reset.html.eex:4
-#, elixir-autogen, elixir-format
-msgctxt "password reset form password prompt"
-msgid "Password"
-msgstr ""
-
-#: lib/pleroma/web/templates/twitter_api/password/invalid_token.html.eex:1
-#, elixir-autogen, elixir-format
-msgctxt "password reset invalid token message"
-msgid "Invalid Token"
-msgstr ""
-
-#: lib/pleroma/web/templates/twitter_api/password/reset_success.html.eex:2
-#, elixir-autogen, elixir-format
-msgctxt "password reset successful homepage link"
-msgid "Homepage"
-msgstr ""
-
-#: lib/pleroma/web/templates/twitter_api/password/reset_success.html.eex:1
-#, elixir-autogen, elixir-format
-msgctxt "password reset successful message"
-msgid "Password changed!"
-msgstr ""
-
-#: lib/pleroma/web/templates/feed/feed/tag.atom.eex:15
-#: lib/pleroma/web/templates/feed/feed/tag.rss.eex:7
-#, elixir-autogen, elixir-format
-msgctxt "tag feed description"
-msgid "These are public toots tagged with #%{tag}. You can interact with them if you have an account anywhere in the fediverse."
-msgstr ""
-
-#: lib/pleroma/web/templates/o_auth/o_auth/oob_token_exists.html.eex:1
-#, elixir-autogen, elixir-format
-msgctxt "oauth authorization exists page title"
-msgid "Authorization exists"
-msgstr ""
-
-#: lib/pleroma/web/templates/o_auth/o_auth/show.html.eex:32
-#, elixir-autogen, elixir-format
-msgctxt "oauth authorize approve button"
-msgid "Approve"
-msgstr ""
-
-#: lib/pleroma/web/templates/o_auth/o_auth/show.html.eex:30
-#, elixir-autogen, elixir-format
-msgctxt "oauth authorize cancel button"
-msgid "Cancel"
-msgstr ""
-
-#: lib/pleroma/web/templates/o_auth/o_auth/show.html.eex:23
-#, elixir-autogen, elixir-format
-msgctxt "oauth authorize message"
-msgid "Application <strong>%{client_name}</strong> is requesting access to your account."
-msgstr ""
-
-#: lib/pleroma/web/templates/o_auth/o_auth/oob_authorization_created.html.eex:1
-#, elixir-autogen, elixir-format
-msgctxt "oauth authorized page title"
-msgid "Successfully authorized"
-msgstr ""
-
-#: lib/pleroma/web/templates/o_auth/o_auth/consumer.html.eex:1
-#, elixir-autogen, elixir-format
-msgctxt "oauth external provider page title"
-msgid "Sign in with external provider"
-msgstr ""
-
-#: lib/pleroma/web/templates/o_auth/o_auth/consumer.html.eex:13
-#, elixir-autogen, elixir-format
-msgctxt "oauth external provider sign in button"
-msgid "Sign in with %{strategy}"
-msgstr ""
-
-#: lib/pleroma/web/templates/o_auth/o_auth/show.html.eex:54
-#, elixir-autogen, elixir-format
-msgctxt "oauth login button"
-msgid "Log In"
-msgstr ""
-
-#: lib/pleroma/web/templates/o_auth/o_auth/show.html.eex:51
-#, elixir-autogen, elixir-format
-msgctxt "oauth login password prompt"
-msgid "Password"
-msgstr ""
-
-#: lib/pleroma/web/templates/o_auth/o_auth/show.html.eex:47
-#, elixir-autogen, elixir-format
-msgctxt "oauth login username prompt"
-msgid "Username"
-msgstr ""
-
-#: lib/pleroma/web/templates/o_auth/o_auth/show.html.eex:39
-#, elixir-autogen, elixir-format
-msgctxt "oauth register nickname prompt"
-msgid "Pleroma Handle"
-msgstr ""
-
-#: lib/pleroma/web/templates/o_auth/o_auth/show.html.eex:37
-#, elixir-autogen, elixir-format
-msgctxt "oauth register nickname unchangeable warning"
-msgid "Choose carefully! You won't be able to change this later. You will be able to change your display name, though."
-msgstr ""
-
-#: lib/pleroma/web/templates/o_auth/o_auth/register.html.eex:18
-#, elixir-autogen, elixir-format
-msgctxt "oauth register page email prompt"
-msgid "Email"
-msgstr ""
-
-#: lib/pleroma/web/templates/o_auth/o_auth/register.html.eex:10
-#, elixir-autogen, elixir-format
-msgctxt "oauth register page fill form prompt"
-msgid "If you'd like to register a new account, please provide the details below."
-msgstr ""
-
-#: lib/pleroma/web/templates/o_auth/o_auth/register.html.eex:35
-#, elixir-autogen, elixir-format
-msgctxt "oauth register page login button"
-msgid "Proceed as existing user"
-msgstr ""
-
-#: lib/pleroma/web/templates/o_auth/o_auth/register.html.eex:31
-#, elixir-autogen, elixir-format
-msgctxt "oauth register page login password prompt"
-msgid "Password"
-msgstr ""
-
-#: lib/pleroma/web/templates/o_auth/o_auth/register.html.eex:24
-#, elixir-autogen, elixir-format
-msgctxt "oauth register page login prompt"
-msgid "Alternatively, sign in to connect to existing account."
-msgstr ""
-
-#: lib/pleroma/web/templates/o_auth/o_auth/register.html.eex:27
-#, elixir-autogen, elixir-format
-msgctxt "oauth register page login username prompt"
-msgid "Name or email"
-msgstr ""
-
-#: lib/pleroma/web/templates/o_auth/o_auth/register.html.eex:14
-#, elixir-autogen, elixir-format
-msgctxt "oauth register page nickname prompt"
-msgid "Nickname"
-msgstr ""
-
-#: lib/pleroma/web/templates/o_auth/o_auth/register.html.eex:22
-#, elixir-autogen, elixir-format
-msgctxt "oauth register page register button"
-msgid "Proceed as new user"
-msgstr ""
-
-#: lib/pleroma/web/templates/o_auth/o_auth/register.html.eex:8
-#, elixir-autogen, elixir-format
-msgctxt "oauth register page title"
-msgid "Registration Details"
-msgstr ""
-
-#: lib/pleroma/web/templates/o_auth/o_auth/show.html.eex:36
-#, elixir-autogen, elixir-format
-msgctxt "oauth register page title"
-msgid "This is the first time you visit! Please enter your Pleroma handle."
-msgstr ""
-
-#: lib/pleroma/web/templates/o_auth/o_auth/_scopes.html.eex:2
-#, elixir-autogen, elixir-format
-msgctxt "oauth scopes message"
-msgid "The following permissions will be granted"
-msgstr ""
-
-#: lib/pleroma/web/templates/o_auth/o_auth/oob_authorization_created.html.eex:2
-#: lib/pleroma/web/templates/o_auth/o_auth/oob_token_exists.html.eex:2
-#, elixir-autogen, elixir-format
-msgctxt "oauth token code message"
-msgid "Token code is <br>%{token}"
-msgstr ""
-
-#: lib/pleroma/web/templates/o_auth/mfa/totp.html.eex:12
-#, elixir-autogen, elixir-format
-msgctxt "mfa auth code prompt"
-msgid "Authentication code"
-msgstr ""
-
-#: lib/pleroma/web/templates/o_auth/mfa/totp.html.eex:8
-#, elixir-autogen, elixir-format
-msgctxt "mfa auth page title"
-msgid "Two-factor authentication"
-msgstr ""
-
-#: lib/pleroma/web/templates/o_auth/mfa/totp.html.eex:23
-#, elixir-autogen, elixir-format
-msgctxt "mfa auth page use recovery code link"
-msgid "Enter a two-factor recovery code"
-msgstr ""
-
-#: lib/pleroma/web/templates/o_auth/mfa/totp.html.eex:20
-#, elixir-autogen, elixir-format
-msgctxt "mfa auth verify code button"
-msgid "Verify"
-msgstr ""
-
-#: lib/pleroma/web/templates/o_auth/mfa/recovery.html.eex:8
-#, elixir-autogen, elixir-format
-msgctxt "mfa recover page title"
-msgid "Two-factor recovery"
-msgstr ""
-
-#: lib/pleroma/web/templates/o_auth/mfa/recovery.html.eex:12
-#, elixir-autogen, elixir-format
-msgctxt "mfa recover recovery code prompt"
-msgid "Recovery code"
-msgstr ""
-
-#: lib/pleroma/web/templates/o_auth/mfa/recovery.html.eex:23
-#, elixir-autogen, elixir-format
-msgctxt "mfa recover use 2fa code link"
-msgid "Enter a two-factor code"
-msgstr ""
-
-#: lib/pleroma/web/templates/o_auth/mfa/recovery.html.eex:20
-#, elixir-autogen, elixir-format
-msgctxt "mfa recover verify recovery code button"
-msgid "Verify"
-msgstr ""
-
-#: lib/pleroma/web/templates/static_fe/static_fe/profile.html.eex:8
-#, elixir-autogen, elixir-format
-msgctxt "static fe profile page remote follow button"
-msgid "Remote follow"
-msgstr ""
-
-#: lib/pleroma/web/templates/email/digest.html.eex:163
-#, elixir-autogen, elixir-format
-msgctxt "digest email header line"
-msgid "Hey %{nickname}, here is what you've missed!"
-msgstr ""
-
-#: lib/pleroma/web/templates/email/digest.html.eex:544
-#, elixir-autogen, elixir-format
-msgctxt "digest email receiver address"
-msgid "The email address you are subscribed as is <a href='mailto:%{@user.email}' style='color: %{color};text-decoration: none;'>%{email}</a>. "
-msgstr ""
-
-#: lib/pleroma/web/templates/email/digest.html.eex:538
-#, elixir-autogen, elixir-format
-msgctxt "digest email sending reason"
-msgid "You have received this email because you have signed up to receive digest emails from <b>%{instance}</b> Pleroma instance."
-msgstr ""
-
-#: lib/pleroma/web/templates/email/digest.html.eex:547
-#, elixir-autogen, elixir-format
-msgctxt "digest email unsubscribe action"
-msgid "To unsubscribe, please go %{here}."
-msgstr ""
-
-#: lib/pleroma/web/templates/email/digest.html.eex:547
-#, elixir-autogen, elixir-format
-msgctxt "digest email unsubscribe action link text"
-msgid "here"
-msgstr ""
-
-#: lib/pleroma/web/templates/mailer/subscription/unsubscribe_failure.html.eex:1
-#, elixir-autogen, elixir-format
-msgctxt "mailer unsubscribe failed message"
-msgid "UNSUBSCRIBE FAILURE"
-msgstr ""
-
-#: lib/pleroma/web/templates/mailer/subscription/unsubscribe_success.html.eex:1
-#, elixir-autogen, elixir-format
-msgctxt "mailer unsubscribe successful message"
-msgid "UNSUBSCRIBE SUCCESSFUL"
-msgstr ""
-
-#: lib/pleroma/web/templates/email/digest.html.eex:385
-#, elixir-format
-msgctxt "new followers count header"
-msgid "%{count} New Follower"
-msgid_plural "%{count} New Followers"
-msgstr[0] ""
-msgstr[1] ""
-
-#: lib/pleroma/emails/user_email.ex:356
-#, elixir-autogen, elixir-format
-msgctxt "account archive email body - self-requested"
-msgid "<p>You requested a full backup of your Pleroma account. It's ready for download:</p>\n<p><a href=\"%{download_url}\">%{download_url}</a></p>\n"
-msgstr ""
-
-#: lib/pleroma/emails/user_email.ex:384
-#, elixir-autogen, elixir-format
-msgctxt "account archive email subject"
-msgid "Your account archive is ready"
-msgstr ""
-
-#: lib/pleroma/emails/user_email.ex:188
-#, elixir-autogen, elixir-format
-msgctxt "approval pending email body"
-msgid "<h3>Awaiting Approval</h3>\n<p>Your account at %{instance_name} is being reviewed by staff. You will receive another email once your account is approved.</p>\n"
-msgstr ""
-
-#: lib/pleroma/emails/user_email.ex:202
-#, elixir-autogen, elixir-format
-msgctxt "approval pending email subject"
-msgid "Your account is awaiting approval"
-msgstr ""
-
-#: lib/pleroma/emails/user_email.ex:158
-#, elixir-autogen, elixir-format
-msgctxt "confirmation email body"
-msgid "<h3>Thank you for registering on %{instance_name}</h3>\n<p>Email confirmation is required to activate the account.</p>\n<p>Please click the following link to <a href=\"%{confirmation_url}\">activate your account</a>.</p>\n"
-msgstr ""
-
-#: lib/pleroma/emails/user_email.ex:174
-#, elixir-autogen, elixir-format
-msgctxt "confirmation email subject"
-msgid "%{instance_name} account confirmation"
-msgstr ""
-
-#: lib/pleroma/emails/user_email.ex:310
-#, elixir-autogen, elixir-format
-msgctxt "digest email subject"
-msgid "Your digest from %{instance_name}"
-msgstr ""
-
-#: lib/pleroma/emails/user_email.ex:81
-#, elixir-autogen, elixir-format
-msgctxt "password reset email body"
-msgid "<h3>Reset your password at %{instance_name}</h3>\n<p>Someone has requested password change for your account at %{instance_name}.</p>\n<p>If it was you, visit the following link to proceed: <a href=\"%{password_reset_url}\">reset password</a>.</p>\n<p>If it was someone else, nothing to worry about: your data is secure and your password has not been changed.</p>\n"
-msgstr ""
-
-#: lib/pleroma/emails/user_email.ex:98
-#, elixir-autogen, elixir-format
-msgctxt "password reset email subject"
-msgid "Password reset"
-msgstr ""
-
-#: lib/pleroma/emails/user_email.ex:215
-#, elixir-autogen, elixir-format
-msgctxt "successful registration email body"
-msgid "<h3>Hello @%{nickname},</h3>\n<p>Your account at %{instance_name} has been registered successfully.</p>\n<p>No further action is required to activate your account.</p>\n"
-msgstr ""
-
-#: lib/pleroma/emails/user_email.ex:231
-#, elixir-autogen, elixir-format
-msgctxt "successful registration email subject"
-msgid "Account registered on %{instance_name}"
-msgstr ""
-
-#: lib/pleroma/emails/user_email.ex:119
-#, elixir-autogen, elixir-format
-msgctxt "user invitation email body"
-msgid "<h3>You are invited to %{instance_name}</h3>\n<p>%{inviter_name} invites you to join %{instance_name}, an instance of Pleroma federated social networking platform.</p>\n<p>Click the following link to register: <a href=\"%{registration_url}\">accept invitation</a>.</p>\n"
-msgstr ""
-
-#: lib/pleroma/emails/user_email.ex:136
-#, elixir-autogen, elixir-format
-msgctxt "user invitation email subject"
-msgid "Invitation to %{instance_name}"
-msgstr ""
-
-#: lib/pleroma/emails/user_email.ex:53
-#, elixir-autogen, elixir-format
-msgctxt "welcome email html body"
-msgid "Welcome to %{instance_name}!"
-msgstr ""
-
-#: lib/pleroma/emails/user_email.ex:41
-#, elixir-autogen, elixir-format
-msgctxt "welcome email subject"
-msgid "Welcome to %{instance_name}!"
-msgstr ""
-
-#: lib/pleroma/emails/user_email.ex:65
-#, elixir-autogen, elixir-format
-msgctxt "welcome email text body"
-msgid "Welcome to %{instance_name}!"
-msgstr ""
-
-#: lib/pleroma/emails/user_email.ex:368
-#, elixir-autogen, elixir-format
-msgctxt "account archive email body - admin requested"
-msgid "<p>Admin @%{admin_nickname} requested a full backup of your Pleroma account. It's ready for download:</p>\n<p><a href=\"%{download_url}\">%{download_url}</a></p>\n"
-msgstr ""

priv/gettext/default.pot

@@ -10,175 +10,175 @@
 msgid ""
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/api_spec/render_error.ex:122
 msgid "%{name} - %{count} is not a multiple of %{multiple}."
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/api_spec/render_error.ex:131
 msgid "%{name} - %{value} is larger than exclusive maximum %{max}."
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/api_spec/render_error.ex:140
 msgid "%{name} - %{value} is larger than inclusive maximum %{max}."
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/api_spec/render_error.ex:149
 msgid "%{name} - %{value} is smaller than exclusive minimum %{min}."
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/api_spec/render_error.ex:158
 msgid "%{name} - %{value} is smaller than inclusive minimum %{min}."
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/api_spec/render_error.ex:102
 msgid "%{name} - Array items must be unique."
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/api_spec/render_error.ex:114
 msgid "%{name} - Array length %{length} is larger than maxItems: %{}."
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/api_spec/render_error.ex:106
 msgid "%{name} - Array length %{length} is smaller than minItems: %{min}."
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/api_spec/render_error.ex:166
 msgid "%{name} - Invalid %{type}. Got: %{value}."
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/api_spec/render_error.ex:174
 msgid "%{name} - Invalid format. Expected %{format}."
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/api_spec/render_error.ex:51
 msgid "%{name} - Invalid schema.type. Got: %{type}."
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/api_spec/render_error.ex:178
 msgid "%{name} - Invalid value for enum."
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/api_spec/render_error.ex:95
 msgid "%{name} - String length is larger than maxLength: %{length}."
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/api_spec/render_error.ex:88
 msgid "%{name} - String length is smaller than minLength: %{length}."
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/api_spec/render_error.ex:63
 msgid "%{name} - null value where %{type} expected."
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/api_spec/render_error.ex:60
 msgid "%{name} - null value."
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/api_spec/render_error.ex:182
 msgid "Failed to cast to any schema in %{polymorphic_type}"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/api_spec/render_error.ex:71
 msgid "Failed to cast value as %{invalid_schema}. Value must be castable using `allOf` schemas listed."
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/api_spec/render_error.ex:84
 msgid "Failed to cast value to one of: %{failed_schemas}."
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/api_spec/render_error.ex:78
 msgid "Failed to cast value using any of: %{failed_schemas}."
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/api_spec/render_error.ex:212
 msgid "Invalid value for header: %{name}."
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/api_spec/render_error.ex:204
 msgid "Missing field: %{name}."
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/api_spec/render_error.ex:208
 msgid "Missing header: %{name}."
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/api_spec/render_error.ex:196
 msgid "No value provided for required discriminator `%{field}`."
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/api_spec/render_error.ex:216
 msgid "Object property count %{property_count} is greater than maxProperties: %{max_properties}."
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/api_spec/render_error.ex:224
 msgid "Object property count %{property_count} is less than minProperties: %{min_properties}"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/static_fe/static_fe/error.html.eex:2
 msgid "Oops"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/api_spec/render_error.ex:188
 msgid "Unexpected field: %{name}."
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/api_spec/render_error.ex:200
 msgid "Unknown schema: %{name}."
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/api_spec/render_error.ex:192
 msgid "Value used as discriminator for `%{field}` matches no schemas."
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/embed/show.html.eex:43
 #: lib/pleroma/web/templates/static_fe/static_fe/_notice.html.eex:37
 msgid "announces"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/embed/show.html.eex:44
 #: lib/pleroma/web/templates/static_fe/static_fe/_notice.html.eex:38
 msgid "likes"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/embed/show.html.eex:42
 #: lib/pleroma/web/templates/static_fe/static_fe/_notice.html.eex:36
 msgid "replies"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/embed/show.html.eex:27
 #: lib/pleroma/web/templates/static_fe/static_fe/_notice.html.eex:22
 msgid "sensitive media"

priv/gettext/errors.pot

@@ -89,483 +89,436 @@ msgstr ""
 msgid "must be equal to %{number}"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/common_api.ex:523
 msgid "Account not found"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/common_api.ex:316
 msgid "Already voted"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/o_auth/o_auth_controller.ex:402
 msgid "Bad request"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/controller_helper.ex:97
 #: lib/pleroma/web/controller_helper.ex:103
 msgid "Can't display this activity"
 msgstr ""
 
-#, elixir-autogen, elixir-format
-#: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:325
+#, elixir-format
+#: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:324
 msgid "Can't find user"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/pleroma_api/controllers/account_controller.ex:80
 msgid "Can't get favorites"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/common_api/utils.ex:482
 msgid "Cannot post an empty status without attachments"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/common_api/utils.ex:441
 msgid "Comment must be up to %{max_size} characters"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/config_db.ex:200
 msgid "Config with params %{params} not found"
 msgstr ""
 
-#, elixir-autogen, elixir-format
-#: lib/pleroma/web/common_api.ex:167
-#: lib/pleroma/web/common_api.ex:171
+#, elixir-format
+#: lib/pleroma/web/common_api.ex:167 lib/pleroma/web/common_api.ex:171
 msgid "Could not delete"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/common_api.ex:217
 msgid "Could not favorite"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/common_api.ex:254
 msgid "Could not unfavorite"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/common_api.ex:202
 msgid "Could not unrepeat"
 msgstr ""
 
-#, elixir-autogen, elixir-format
-#: lib/pleroma/web/common_api.ex:530
-#: lib/pleroma/web/common_api.ex:539
+#, elixir-format
+#: lib/pleroma/web/common_api.ex:530 lib/pleroma/web/common_api.ex:539
 msgid "Could not update state"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex:205
 msgid "Error."
 msgstr ""
 
-#, elixir-autogen, elixir-format
-#: lib/pleroma/web/twitter_api/twitter_api.ex:105
+#, elixir-format
+#: lib/pleroma/web/twitter_api/twitter_api.ex:99
 msgid "Invalid CAPTCHA"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:144
 #: lib/pleroma/web/o_auth/o_auth_controller.ex:631
 msgid "Invalid credentials"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/plugs/ensure_authenticated_plug.ex:42
 msgid "Invalid credentials."
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/common_api.ex:337
 msgid "Invalid indices"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/admin_api/controllers/fallback_controller.ex:29
 msgid "Invalid parameters"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/common_api/utils.ex:349
 msgid "Invalid password."
 msgstr ""
 
-#, elixir-autogen, elixir-format
-#: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:255
+#, elixir-format
+#: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:254
 msgid "Invalid request"
 msgstr ""
 
-#, elixir-autogen, elixir-format
-#: lib/pleroma/web/twitter_api/twitter_api.ex:108
+#, elixir-format
+#: lib/pleroma/web/twitter_api/twitter_api.ex:102
 msgid "Kocaptcha service unavailable"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:140
 msgid "Missing parameters"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/common_api/utils.ex:477
 msgid "No such conversation"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/admin_api/controllers/admin_api_controller.ex:171
-#: lib/pleroma/web/admin_api/controllers/admin_api_controller.ex:197
-#: lib/pleroma/web/admin_api/controllers/admin_api_controller.ex:239
+#: lib/pleroma/web/admin_api/controllers/admin_api_controller.ex:197 lib/pleroma/web/admin_api/controllers/admin_api_controller.ex:239
 msgid "No such permission_group"
 msgstr ""
 
-#, elixir-autogen, elixir-format
-#: lib/pleroma/web/activity_pub/activity_pub_controller.ex:515
-#: lib/pleroma/web/admin_api/controllers/fallback_controller.ex:11
-#: lib/pleroma/web/feed/tag_controller.ex:16
-#: lib/pleroma/web/feed/user_controller.ex:69
-#: lib/pleroma/web/o_status/o_status_controller.ex:132
+#, elixir-format
+#: lib/pleroma/web/activity_pub/activity_pub_controller.ex:504
+#: lib/pleroma/web/admin_api/controllers/fallback_controller.ex:11 lib/pleroma/web/feed/tag_controller.ex:16
+#: lib/pleroma/web/feed/user_controller.ex:69 lib/pleroma/web/o_status/o_status_controller.ex:132
 #: lib/pleroma/web/plugs/uploaded_media.ex:84
 msgid "Not found"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/common_api.ex:308
 msgid "Poll's author can't vote"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/mastodon_api/controllers/fallback_controller.ex:20
-#: lib/pleroma/web/mastodon_api/controllers/poll_controller.ex:39
-#: lib/pleroma/web/mastodon_api/controllers/poll_controller.ex:51
-#: lib/pleroma/web/mastodon_api/controllers/poll_controller.ex:52
-#: lib/pleroma/web/mastodon_api/controllers/status_controller.ex:326
+#: lib/pleroma/web/mastodon_api/controllers/poll_controller.ex:39 lib/pleroma/web/mastodon_api/controllers/poll_controller.ex:51
+#: lib/pleroma/web/mastodon_api/controllers/poll_controller.ex:52 lib/pleroma/web/mastodon_api/controllers/status_controller.ex:326
 #: lib/pleroma/web/mastodon_api/controllers/subscription_controller.ex:71
 msgid "Record not found"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/admin_api/controllers/fallback_controller.ex:35
-#: lib/pleroma/web/feed/user_controller.ex:78
-#: lib/pleroma/web/mastodon_api/controllers/fallback_controller.ex:42
+#: lib/pleroma/web/feed/user_controller.ex:78 lib/pleroma/web/mastodon_api/controllers/fallback_controller.ex:42
 #: lib/pleroma/web/o_status/o_status_controller.ex:138
 msgid "Something went wrong"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/common_api/activity_draft.ex:143
 msgid "The message visibility must be direct"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/common_api/utils.ex:492
 msgid "The status is over the character limit"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/plugs/ensure_public_or_authenticated_plug.ex:36
 msgid "This resource requires authentication."
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/plugs/rate_limiter.ex:208
 msgid "Throttled"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/common_api.ex:338
 msgid "Too many choices"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/admin_api/controllers/admin_api_controller.ex:268
 msgid "You can't revoke your own admin status."
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/o_auth/o_auth_controller.ex:243
 #: lib/pleroma/web/o_auth/o_auth_controller.ex:333
 msgid "Your account is currently disabled"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/o_auth/o_auth_controller.ex:205
 #: lib/pleroma/web/o_auth/o_auth_controller.ex:356
 msgid "Your login is missing a confirmed e-mail address"
 msgstr ""
 
-#, elixir-autogen, elixir-format
-#: lib/pleroma/web/activity_pub/activity_pub_controller.ex:403
+#, elixir-format
+#: lib/pleroma/web/activity_pub/activity_pub_controller.ex:392
 msgid "can't read inbox of %{nickname} as %{as_nickname}"
 msgstr ""
 
-#, elixir-autogen, elixir-format
-#: lib/pleroma/web/activity_pub/activity_pub_controller.ex:502
+#, elixir-format
+#: lib/pleroma/web/activity_pub/activity_pub_controller.ex:491
 msgid "can't update outbox of %{nickname} as %{as_nickname}"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/common_api.ex:475
 msgid "conversation is already muted"
 msgstr ""
 
-#, elixir-autogen, elixir-format
-#: lib/pleroma/web/activity_pub/activity_pub_controller.ex:521
+#, elixir-format
+#: lib/pleroma/web/activity_pub/activity_pub_controller.ex:510
 msgid "error"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/pleroma_api/controllers/mascot_controller.ex:34
 msgid "mascots can only be images"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/activity_pub/activity_pub_controller.ex:63
 msgid "not found"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/o_auth/o_auth_controller.ex:437
 msgid "Bad OAuth request."
 msgstr ""
 
-#, elixir-autogen, elixir-format
-#: lib/pleroma/web/twitter_api/twitter_api.ex:114
+#, elixir-format
+#: lib/pleroma/web/twitter_api/twitter_api.ex:108
 msgid "CAPTCHA already used"
 msgstr ""
 
-#, elixir-autogen, elixir-format
-#: lib/pleroma/web/twitter_api/twitter_api.ex:111
+#, elixir-format
+#: lib/pleroma/web/twitter_api/twitter_api.ex:105
 msgid "CAPTCHA expired"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/plugs/uploaded_media.ex:57
 msgid "Failed"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/o_auth/o_auth_controller.ex:453
 msgid "Failed to authenticate: %{message}."
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/o_auth/o_auth_controller.ex:484
 msgid "Failed to set up user account."
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/plugs/o_auth_scopes_plug.ex:37
 msgid "Insufficient permissions: %{permissions}."
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/plugs/uploaded_media.ex:111
 msgid "Internal Error"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/o_auth/fallback_controller.ex:22
 #: lib/pleroma/web/o_auth/fallback_controller.ex:29
 msgid "Invalid Username/Password"
 msgstr ""
 
-#, elixir-autogen, elixir-format
-#: lib/pleroma/web/twitter_api/twitter_api.ex:117
+#, elixir-format
+#: lib/pleroma/web/twitter_api/twitter_api.ex:111
 msgid "Invalid answer data"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/nodeinfo/nodeinfo_controller.ex:33
 msgid "Nodeinfo schema version not handled"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/o_auth/o_auth_controller.ex:194
 msgid "This action is outside the authorized scopes"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/o_auth/fallback_controller.ex:14
 msgid "Unknown error, please check the details and try again."
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/o_auth/o_auth_controller.ex:136
 #: lib/pleroma/web/o_auth/o_auth_controller.ex:180
 msgid "Unlisted redirect_uri."
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/o_auth/o_auth_controller.ex:433
 msgid "Unsupported OAuth provider: %{provider}."
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/uploaders/uploader.ex:74
 msgid "Uploader callback timeout"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/uploader_controller.ex:23
 msgid "bad request"
 msgstr ""
 
-#, elixir-autogen, elixir-format
-#: lib/pleroma/web/twitter_api/twitter_api.ex:102
+#, elixir-format
+#: lib/pleroma/web/twitter_api/twitter_api.ex:96
 msgid "CAPTCHA Error"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/common_api.ex:266
 msgid "Could not add reaction emoji"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/common_api.ex:277
 msgid "Could not remove reaction emoji"
 msgstr ""
 
-#, elixir-autogen, elixir-format
-#: lib/pleroma/web/twitter_api/twitter_api.ex:128
+#, elixir-format
+#: lib/pleroma/web/twitter_api/twitter_api.ex:122
 msgid "Invalid CAPTCHA (Missing parameter: %{name})"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/mastodon_api/controllers/list_controller.ex:96
 msgid "List not found"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:151
 msgid "Missing parameter: %{name}"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/o_auth/o_auth_controller.ex:232
 #: lib/pleroma/web/o_auth/o_auth_controller.ex:346
 msgid "Password reset is required"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/tests/auth_test_controller.ex:9
-#: lib/pleroma/web/activity_pub/activity_pub_controller.ex:6
-#: lib/pleroma/web/admin_api/controllers/admin_api_controller.ex:6
-#: lib/pleroma/web/admin_api/controllers/announcement_controller.ex:6
-#: lib/pleroma/web/admin_api/controllers/chat_controller.ex:6
-#: lib/pleroma/web/admin_api/controllers/config_controller.ex:6
-#: lib/pleroma/web/admin_api/controllers/fallback_controller.ex:6
-#: lib/pleroma/web/admin_api/controllers/frontend_controller.ex:6
-#: lib/pleroma/web/admin_api/controllers/instance_controller.ex:6
-#: lib/pleroma/web/admin_api/controllers/instance_document_controller.ex:6
-#: lib/pleroma/web/admin_api/controllers/invite_controller.ex:6
-#: lib/pleroma/web/admin_api/controllers/media_proxy_cache_controller.ex:6
-#: lib/pleroma/web/admin_api/controllers/o_auth_app_controller.ex:6
-#: lib/pleroma/web/admin_api/controllers/relay_controller.ex:6
-#: lib/pleroma/web/admin_api/controllers/report_controller.ex:6
-#: lib/pleroma/web/admin_api/controllers/status_controller.ex:6
-#: lib/pleroma/web/admin_api/controllers/user_controller.ex:6
-#: lib/pleroma/web/controller_helper.ex:6
-#: lib/pleroma/web/embed_controller.ex:6
-#: lib/pleroma/web/fallback/redirect_controller.ex:6
-#: lib/pleroma/web/feed/tag_controller.ex:6
-#: lib/pleroma/web/feed/user_controller.ex:6
-#: lib/pleroma/web/mailer/subscription_controller.ex:6
-#: lib/pleroma/web/manifest_controller.ex:6
-#: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:6
-#: lib/pleroma/web/mastodon_api/controllers/announcement_controller.ex:6
-#: lib/pleroma/web/mastodon_api/controllers/app_controller.ex:11
-#: lib/pleroma/web/mastodon_api/controllers/auth_controller.ex:6
-#: lib/pleroma/web/mastodon_api/controllers/conversation_controller.ex:6
-#: lib/pleroma/web/mastodon_api/controllers/custom_emoji_controller.ex:6
-#: lib/pleroma/web/mastodon_api/controllers/directory_controller.ex:6
-#: lib/pleroma/web/mastodon_api/controllers/domain_block_controller.ex:6
-#: lib/pleroma/web/mastodon_api/controllers/fallback_controller.ex:6
-#: lib/pleroma/web/mastodon_api/controllers/filter_controller.ex:6
-#: lib/pleroma/web/mastodon_api/controllers/follow_request_controller.ex:6
-#: lib/pleroma/web/mastodon_api/controllers/instance_controller.ex:6
-#: lib/pleroma/web/mastodon_api/controllers/list_controller.ex:6
-#: lib/pleroma/web/mastodon_api/controllers/marker_controller.ex:6
-#: lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex:14
-#: lib/pleroma/web/mastodon_api/controllers/media_controller.ex:6
-#: lib/pleroma/web/mastodon_api/controllers/notification_controller.ex:6
-#: lib/pleroma/web/mastodon_api/controllers/poll_controller.ex:6
-#: lib/pleroma/web/mastodon_api/controllers/report_controller.ex:6
-#: lib/pleroma/web/mastodon_api/controllers/scheduled_activity_controller.ex:6
-#: lib/pleroma/web/mastodon_api/controllers/search_controller.ex:6
-#: lib/pleroma/web/mastodon_api/controllers/status_controller.ex:6
-#: lib/pleroma/web/mastodon_api/controllers/subscription_controller.ex:7
-#: lib/pleroma/web/mastodon_api/controllers/suggestion_controller.ex:6
-#: lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex:6
-#: lib/pleroma/web/media_proxy/media_proxy_controller.ex:6
-#: lib/pleroma/web/mongoose_im/mongoose_im_controller.ex:6
-#: lib/pleroma/web/nodeinfo/nodeinfo_controller.ex:6
-#: lib/pleroma/web/o_auth/fallback_controller.ex:6
-#: lib/pleroma/web/o_auth/mfa_controller.ex:10
-#: lib/pleroma/web/o_auth/o_auth_controller.ex:6
-#: lib/pleroma/web/o_status/o_status_controller.ex:6
-#: lib/pleroma/web/pleroma_api/controllers/account_controller.ex:6
-#: lib/pleroma/web/pleroma_api/controllers/app_controller.ex:6
-#: lib/pleroma/web/pleroma_api/controllers/backup_controller.ex:6
-#: lib/pleroma/web/pleroma_api/controllers/chat_controller.ex:5
-#: lib/pleroma/web/pleroma_api/controllers/conversation_controller.ex:6
-#: lib/pleroma/web/pleroma_api/controllers/emoji_file_controller.ex:6
-#: lib/pleroma/web/pleroma_api/controllers/emoji_pack_controller.ex:6
-#: lib/pleroma/web/pleroma_api/controllers/emoji_reaction_controller.ex:6
-#: lib/pleroma/web/pleroma_api/controllers/instances_controller.ex:6
-#: lib/pleroma/web/pleroma_api/controllers/mascot_controller.ex:6
-#: lib/pleroma/web/pleroma_api/controllers/notification_controller.ex:6
-#: lib/pleroma/web/pleroma_api/controllers/report_controller.ex:6
+#: lib/pleroma/web/activity_pub/activity_pub_controller.ex:6 lib/pleroma/web/admin_api/controllers/admin_api_controller.ex:6
+#: lib/pleroma/web/admin_api/controllers/chat_controller.ex:6 lib/pleroma/web/admin_api/controllers/config_controller.ex:6
+#: lib/pleroma/web/admin_api/controllers/fallback_controller.ex:6 lib/pleroma/web/admin_api/controllers/frontend_controller.ex:6
+#: lib/pleroma/web/admin_api/controllers/instance_controller.ex:6 lib/pleroma/web/admin_api/controllers/instance_document_controller.ex:6
+#: lib/pleroma/web/admin_api/controllers/invite_controller.ex:6 lib/pleroma/web/admin_api/controllers/media_proxy_cache_controller.ex:6
+#: lib/pleroma/web/admin_api/controllers/o_auth_app_controller.ex:6 lib/pleroma/web/admin_api/controllers/relay_controller.ex:6
+#: lib/pleroma/web/admin_api/controllers/report_controller.ex:6 lib/pleroma/web/admin_api/controllers/status_controller.ex:6
+#: lib/pleroma/web/admin_api/controllers/user_controller.ex:6 lib/pleroma/web/controller_helper.ex:6 lib/pleroma/web/embed_controller.ex:6
+#: lib/pleroma/web/fallback/redirect_controller.ex:6 lib/pleroma/web/feed/tag_controller.ex:6
+#: lib/pleroma/web/feed/user_controller.ex:6 lib/pleroma/web/mailer/subscription_controller.ex:6
+#: lib/pleroma/web/manifest_controller.ex:6 lib/pleroma/web/mastodon_api/controllers/account_controller.ex:6
+#: lib/pleroma/web/mastodon_api/controllers/app_controller.ex:11 lib/pleroma/web/mastodon_api/controllers/auth_controller.ex:6
+#: lib/pleroma/web/mastodon_api/controllers/conversation_controller.ex:6 lib/pleroma/web/mastodon_api/controllers/custom_emoji_controller.ex:6
+#: lib/pleroma/web/mastodon_api/controllers/directory_controller.ex:6 lib/pleroma/web/mastodon_api/controllers/domain_block_controller.ex:6
+#: lib/pleroma/web/mastodon_api/controllers/fallback_controller.ex:6 lib/pleroma/web/mastodon_api/controllers/filter_controller.ex:6
+#: lib/pleroma/web/mastodon_api/controllers/follow_request_controller.ex:6 lib/pleroma/web/mastodon_api/controllers/instance_controller.ex:6
+#: lib/pleroma/web/mastodon_api/controllers/list_controller.ex:6 lib/pleroma/web/mastodon_api/controllers/marker_controller.ex:6
+#: lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex:14 lib/pleroma/web/mastodon_api/controllers/media_controller.ex:6
+#: lib/pleroma/web/mastodon_api/controllers/notification_controller.ex:6 lib/pleroma/web/mastodon_api/controllers/poll_controller.ex:6
+#: lib/pleroma/web/mastodon_api/controllers/report_controller.ex:6 lib/pleroma/web/mastodon_api/controllers/scheduled_activity_controller.ex:6
+#: lib/pleroma/web/mastodon_api/controllers/search_controller.ex:6 lib/pleroma/web/mastodon_api/controllers/status_controller.ex:6
+#: lib/pleroma/web/mastodon_api/controllers/subscription_controller.ex:7 lib/pleroma/web/mastodon_api/controllers/suggestion_controller.ex:6
+#: lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex:6 lib/pleroma/web/media_proxy/media_proxy_controller.ex:6
+#: lib/pleroma/web/mongoose_im/mongoose_im_controller.ex:6 lib/pleroma/web/nodeinfo/nodeinfo_controller.ex:6
+#: lib/pleroma/web/o_auth/fallback_controller.ex:6 lib/pleroma/web/o_auth/mfa_controller.ex:10
+#: lib/pleroma/web/o_auth/o_auth_controller.ex:6 lib/pleroma/web/o_status/o_status_controller.ex:6
+#: lib/pleroma/web/pleroma_api/controllers/account_controller.ex:6 lib/pleroma/web/pleroma_api/controllers/app_controller.ex:6
+#: lib/pleroma/web/pleroma_api/controllers/backup_controller.ex:6 lib/pleroma/web/pleroma_api/controllers/chat_controller.ex:5
+#: lib/pleroma/web/pleroma_api/controllers/conversation_controller.ex:6 lib/pleroma/web/pleroma_api/controllers/emoji_file_controller.ex:6
+#: lib/pleroma/web/pleroma_api/controllers/emoji_pack_controller.ex:6 lib/pleroma/web/pleroma_api/controllers/emoji_reaction_controller.ex:6
+#: lib/pleroma/web/pleroma_api/controllers/instances_controller.ex:6 lib/pleroma/web/pleroma_api/controllers/mascot_controller.ex:6
+#: lib/pleroma/web/pleroma_api/controllers/notification_controller.ex:6 lib/pleroma/web/pleroma_api/controllers/report_controller.ex:6
 #: lib/pleroma/web/pleroma_api/controllers/scrobble_controller.ex:6
-#: lib/pleroma/web/pleroma_api/controllers/two_factor_authentication_controller.ex:7
-#: lib/pleroma/web/pleroma_api/controllers/user_import_controller.ex:6
-#: lib/pleroma/web/static_fe/static_fe_controller.ex:6
-#: lib/pleroma/web/twitter_api/controller.ex:6
-#: lib/pleroma/web/twitter_api/controllers/password_controller.ex:10
-#: lib/pleroma/web/twitter_api/controllers/remote_follow_controller.ex:6
-#: lib/pleroma/web/twitter_api/controllers/util_controller.ex:6
-#: lib/pleroma/web/uploader_controller.ex:6
+#: lib/pleroma/web/pleroma_api/controllers/two_factor_authentication_controller.ex:7 lib/pleroma/web/pleroma_api/controllers/user_import_controller.ex:6
+#: lib/pleroma/web/static_fe/static_fe_controller.ex:6 lib/pleroma/web/twitter_api/controller.ex:6
+#: lib/pleroma/web/twitter_api/controllers/password_controller.ex:10 lib/pleroma/web/twitter_api/controllers/remote_follow_controller.ex:6
+#: lib/pleroma/web/twitter_api/controllers/util_controller.ex:6 lib/pleroma/web/uploader_controller.ex:6
 #: lib/pleroma/web/web_finger/web_finger_controller.ex:6
 msgid "Security violation: OAuth scopes check was neither handled nor explicitly skipped."
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/plugs/ensure_authenticated_plug.ex:32
 msgid "Two-factor authentication enabled, you must use a access token."
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/mastodon_api/controllers/subscription_controller.ex:61
 msgid "Web push subscription is disabled on this Pleroma instance"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/admin_api/controllers/admin_api_controller.ex:234
 msgid "You can't revoke your own admin/moderator status."
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex:129
 msgid "authorization required for timeline view"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/mastodon_api/controllers/fallback_controller.ex:24
 msgid "Access denied"
 msgstr ""
 
-#, elixir-autogen, elixir-format
-#: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:322
+#, elixir-format
+#: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:321
 msgid "This API requires an authenticated user"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/plugs/ensure_staff_privileged_plug.ex:26
 #: lib/pleroma/web/plugs/user_is_admin_plug.ex:21
 msgid "User is not an admin."
@@ -578,33 +531,33 @@ msgid_plural "Last export was less than %{days} days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/user/backup.ex:93
 msgid "Backups require enabled email"
 msgstr ""
 
-#, elixir-autogen, elixir-format
-#: lib/pleroma/web/activity_pub/activity_pub_controller.ex:434
+#, elixir-format
+#: lib/pleroma/web/activity_pub/activity_pub_controller.ex:423
 msgid "Character limit (%{limit} characters) exceeded, contains %{length} characters"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/user/backup.ex:98
 msgid "Email is required"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/common_api/utils.ex:507
 msgid "Too many attachments"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/plugs/ensure_staff_privileged_plug.ex:33
 #: lib/pleroma/web/plugs/user_is_staff_plug.ex:20
 msgid "User is not a staff member."
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/o_auth/o_auth_controller.ex:366
 msgid "Your account is awaiting approval."
 msgstr ""

priv/gettext/static_pages.pot

@@ -10,393 +10,393 @@
 msgid ""
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/twitter_api/remote_follow/follow.html.eex:9
 msgctxt "remote follow authorization button"
 msgid "Authorize"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/twitter_api/remote_follow/follow.html.eex:2
 msgctxt "remote follow error"
 msgid "Error fetching user"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/twitter_api/remote_follow/follow.html.eex:4
 msgctxt "remote follow header"
 msgid "Remote follow"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/twitter_api/remote_follow/follow_mfa.html.eex:8
 msgctxt "placeholder text for auth code entry"
 msgid "Authentication code"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/twitter_api/remote_follow/follow_login.html.eex:10
 msgctxt "placeholder text for password entry"
 msgid "Password"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/twitter_api/remote_follow/follow_login.html.eex:8
 msgctxt "placeholder text for username entry"
 msgid "Username"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/twitter_api/remote_follow/follow_login.html.eex:13
 msgctxt "remote follow authorization button for login"
 msgid "Authorize"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/twitter_api/remote_follow/follow_mfa.html.eex:12
 msgctxt "remote follow authorization button for mfa"
 msgid "Authorize"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/twitter_api/remote_follow/followed.html.eex:2
 msgctxt "remote follow error"
 msgid "Error following account"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/twitter_api/remote_follow/follow_login.html.eex:4
 msgctxt "remote follow header, need login"
 msgid "Log in to follow"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/twitter_api/remote_follow/follow_mfa.html.eex:4
 msgctxt "remote follow mfa header"
 msgid "Two-factor authentication"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/twitter_api/remote_follow/followed.html.eex:4
 msgctxt "remote follow success"
 msgid "Account followed!"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/twitter_api/util/subscribe.html.eex:7
 msgctxt "placeholder text for account id"
 msgid "Your account ID, e.g. lain@quitter.se"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/twitter_api/util/subscribe.html.eex:8
 msgctxt "remote follow authorization button for following with a remote account"
 msgid "Follow"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/twitter_api/util/subscribe.html.eex:2
 msgctxt "remote follow error"
 msgid "Error: %{error}"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/twitter_api/util/subscribe.html.eex:4
 msgctxt "remote follow header"
 msgid "Remotely follow %{nickname}"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/twitter_api/password/reset.html.eex:12
 msgctxt "password reset button"
 msgid "Reset"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/twitter_api/password/reset_failed.html.eex:4
 msgctxt "password reset failed homepage link"
 msgid "Homepage"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/twitter_api/password/reset_failed.html.eex:1
 msgctxt "password reset failed message"
 msgid "Password reset failed"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/twitter_api/password/reset.html.eex:8
 msgctxt "password reset form confirm password prompt"
 msgid "Confirmation"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/twitter_api/password/reset.html.eex:4
 msgctxt "password reset form password prompt"
 msgid "Password"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/twitter_api/password/invalid_token.html.eex:1
 msgctxt "password reset invalid token message"
 msgid "Invalid Token"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/twitter_api/password/reset_success.html.eex:2
 msgctxt "password reset successful homepage link"
 msgid "Homepage"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/twitter_api/password/reset_success.html.eex:1
 msgctxt "password reset successful message"
 msgid "Password changed!"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/feed/feed/tag.atom.eex:15
 #: lib/pleroma/web/templates/feed/feed/tag.rss.eex:7
 msgctxt "tag feed description"
 msgid "These are public toots tagged with #%{tag}. You can interact with them if you have an account anywhere in the fediverse."
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/o_auth/o_auth/oob_token_exists.html.eex:1
 msgctxt "oauth authorization exists page title"
 msgid "Authorization exists"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/o_auth/o_auth/show.html.eex:32
 msgctxt "oauth authorize approve button"
 msgid "Approve"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/o_auth/o_auth/show.html.eex:30
 msgctxt "oauth authorize cancel button"
 msgid "Cancel"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/o_auth/o_auth/show.html.eex:23
 msgctxt "oauth authorize message"
 msgid "Application <strong>%{client_name}</strong> is requesting access to your account."
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/o_auth/o_auth/oob_authorization_created.html.eex:1
 msgctxt "oauth authorized page title"
 msgid "Successfully authorized"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/o_auth/o_auth/consumer.html.eex:1
 msgctxt "oauth external provider page title"
 msgid "Sign in with external provider"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/o_auth/o_auth/consumer.html.eex:13
 msgctxt "oauth external provider sign in button"
 msgid "Sign in with %{strategy}"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/o_auth/o_auth/show.html.eex:54
 msgctxt "oauth login button"
 msgid "Log In"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/o_auth/o_auth/show.html.eex:51
 msgctxt "oauth login password prompt"
 msgid "Password"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/o_auth/o_auth/show.html.eex:47
 msgctxt "oauth login username prompt"
 msgid "Username"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/o_auth/o_auth/show.html.eex:39
 msgctxt "oauth register nickname prompt"
 msgid "Pleroma Handle"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/o_auth/o_auth/show.html.eex:37
 msgctxt "oauth register nickname unchangeable warning"
 msgid "Choose carefully! You won't be able to change this later. You will be able to change your display name, though."
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/o_auth/o_auth/register.html.eex:18
 msgctxt "oauth register page email prompt"
 msgid "Email"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/o_auth/o_auth/register.html.eex:10
 msgctxt "oauth register page fill form prompt"
 msgid "If you'd like to register a new account, please provide the details below."
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/o_auth/o_auth/register.html.eex:35
 msgctxt "oauth register page login button"
 msgid "Proceed as existing user"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/o_auth/o_auth/register.html.eex:31
 msgctxt "oauth register page login password prompt"
 msgid "Password"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/o_auth/o_auth/register.html.eex:24
 msgctxt "oauth register page login prompt"
 msgid "Alternatively, sign in to connect to existing account."
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/o_auth/o_auth/register.html.eex:27
 msgctxt "oauth register page login username prompt"
 msgid "Name or email"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/o_auth/o_auth/register.html.eex:14
 msgctxt "oauth register page nickname prompt"
 msgid "Nickname"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/o_auth/o_auth/register.html.eex:22
 msgctxt "oauth register page register button"
 msgid "Proceed as new user"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/o_auth/o_auth/register.html.eex:8
 msgctxt "oauth register page title"
 msgid "Registration Details"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/o_auth/o_auth/show.html.eex:36
 msgctxt "oauth register page title"
 msgid "This is the first time you visit! Please enter your Pleroma handle."
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/o_auth/o_auth/_scopes.html.eex:2
 msgctxt "oauth scopes message"
 msgid "The following permissions will be granted"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/o_auth/o_auth/oob_authorization_created.html.eex:2
 #: lib/pleroma/web/templates/o_auth/o_auth/oob_token_exists.html.eex:2
 msgctxt "oauth token code message"
 msgid "Token code is <br>%{token}"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/o_auth/mfa/totp.html.eex:12
 msgctxt "mfa auth code prompt"
 msgid "Authentication code"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/o_auth/mfa/totp.html.eex:8
 msgctxt "mfa auth page title"
 msgid "Two-factor authentication"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/o_auth/mfa/totp.html.eex:23
 msgctxt "mfa auth page use recovery code link"
 msgid "Enter a two-factor recovery code"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/o_auth/mfa/totp.html.eex:20
 msgctxt "mfa auth verify code button"
 msgid "Verify"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/o_auth/mfa/recovery.html.eex:8
 msgctxt "mfa recover page title"
 msgid "Two-factor recovery"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/o_auth/mfa/recovery.html.eex:12
 msgctxt "mfa recover recovery code prompt"
 msgid "Recovery code"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/o_auth/mfa/recovery.html.eex:23
 msgctxt "mfa recover use 2fa code link"
 msgid "Enter a two-factor code"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/o_auth/mfa/recovery.html.eex:20
 msgctxt "mfa recover verify recovery code button"
 msgid "Verify"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/static_fe/static_fe/profile.html.eex:8
 msgctxt "static fe profile page remote follow button"
 msgid "Remote follow"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/email/digest.html.eex:163
 msgctxt "digest email header line"
 msgid "Hey %{nickname}, here is what you've missed!"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/email/digest.html.eex:544
 msgctxt "digest email receiver address"
 msgid "The email address you are subscribed as is <a href='mailto:%{@user.email}' style='color: %{color};text-decoration: none;'>%{email}</a>. "
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/email/digest.html.eex:538
 msgctxt "digest email sending reason"
 msgid "You have received this email because you have signed up to receive digest emails from <b>%{instance}</b> Pleroma instance."
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/email/digest.html.eex:547
 msgctxt "digest email unsubscribe action"
 msgid "To unsubscribe, please go %{here}."
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/email/digest.html.eex:547
 msgctxt "digest email unsubscribe action link text"
 msgid "here"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/mailer/subscription/unsubscribe_failure.html.eex:1
 msgctxt "mailer unsubscribe failed message"
 msgid "UNSUBSCRIBE FAILURE"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/web/templates/mailer/subscription/unsubscribe_success.html.eex:1
 msgctxt "mailer unsubscribe successful message"
 msgid "UNSUBSCRIBE SUCCESSFUL"
@@ -410,103 +410,103 @@ msgid_plural "%{count} New Followers"
 msgstr[0] ""
 msgstr[1] ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/emails/user_email.ex:356
 msgctxt "account archive email body - self-requested"
 msgid "<p>You requested a full backup of your Pleroma account. It's ready for download:</p>\n<p><a href=\"%{download_url}\">%{download_url}</a></p>\n"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/emails/user_email.ex:384
 msgctxt "account archive email subject"
 msgid "Your account archive is ready"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/emails/user_email.ex:188
 msgctxt "approval pending email body"
 msgid "<h3>Awaiting Approval</h3>\n<p>Your account at %{instance_name} is being reviewed by staff. You will receive another email once your account is approved.</p>\n"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/emails/user_email.ex:202
 msgctxt "approval pending email subject"
 msgid "Your account is awaiting approval"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/emails/user_email.ex:158
 msgctxt "confirmation email body"
 msgid "<h3>Thank you for registering on %{instance_name}</h3>\n<p>Email confirmation is required to activate the account.</p>\n<p>Please click the following link to <a href=\"%{confirmation_url}\">activate your account</a>.</p>\n"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/emails/user_email.ex:174
 msgctxt "confirmation email subject"
 msgid "%{instance_name} account confirmation"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/emails/user_email.ex:310
 msgctxt "digest email subject"
 msgid "Your digest from %{instance_name}"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/emails/user_email.ex:81
 msgctxt "password reset email body"
 msgid "<h3>Reset your password at %{instance_name}</h3>\n<p>Someone has requested password change for your account at %{instance_name}.</p>\n<p>If it was you, visit the following link to proceed: <a href=\"%{password_reset_url}\">reset password</a>.</p>\n<p>If it was someone else, nothing to worry about: your data is secure and your password has not been changed.</p>\n"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/emails/user_email.ex:98
 msgctxt "password reset email subject"
 msgid "Password reset"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/emails/user_email.ex:215
 msgctxt "successful registration email body"
 msgid "<h3>Hello @%{nickname},</h3>\n<p>Your account at %{instance_name} has been registered successfully.</p>\n<p>No further action is required to activate your account.</p>\n"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/emails/user_email.ex:231
 msgctxt "successful registration email subject"
 msgid "Account registered on %{instance_name}"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/emails/user_email.ex:119
 msgctxt "user invitation email body"
 msgid "<h3>You are invited to %{instance_name}</h3>\n<p>%{inviter_name} invites you to join %{instance_name}, an instance of Pleroma federated social networking platform.</p>\n<p>Click the following link to register: <a href=\"%{registration_url}\">accept invitation</a>.</p>\n"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/emails/user_email.ex:136
 msgctxt "user invitation email subject"
 msgid "Invitation to %{instance_name}"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/emails/user_email.ex:53
 msgctxt "welcome email html body"
 msgid "Welcome to %{instance_name}!"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/emails/user_email.ex:41
 msgctxt "welcome email subject"
 msgid "Welcome to %{instance_name}!"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/emails/user_email.ex:65
 msgctxt "welcome email text body"
 msgid "Welcome to %{instance_name}!"
 msgstr ""
 
-#, elixir-autogen, elixir-format
+#, elixir-format
 #: lib/pleroma/emails/user_email.ex:368
 msgctxt "account archive email body - admin requested"
 msgid "<p>Admin @%{admin_nickname} requested a full backup of your Pleroma account. It's ready for download:</p>\n<p><a href=\"%{download_url}\">%{download_url}</a></p>\n"

priv/repo/migrations/20220605185734_add_update_to_notifications_enum.exs

@@ -0,0 +1,51 @@
+defmodule Pleroma.Repo.Migrations.AddUpdateToNotificationsEnum do
+  use Ecto.Migration
+
+  @disable_ddl_transaction true
+
+  def up do
+    """
+    alter type notification_type add value 'update'
+    """
+    |> execute()
+  end
+
+  # 20210717000000_add_poll_to_notifications_enum.exs
+  def down do
+    alter table(:notifications) do
+      modify(:type, :string)
+    end
+
+    """
+    delete from notifications where type = 'update'
+    """
+    |> execute()
+
+    """
+    drop type if exists notification_type
+    """
+    |> execute()
+
+    """
+    create type notification_type as enum (
+      'follow',
+      'follow_request',
+      'mention',
+      'move',
+      'pleroma:emoji_reaction',
+      'pleroma:chat_mention',
+      'reblog',
+      'favourite',
+      'pleroma:report',
+      'poll'
+    )
+    """
+    |> execute()
+
+    """
+    alter table notifications
+    alter column type type notification_type using (type::notification_type)
+    """
+    |> execute()
+  end
+end

priv/scrubbers/default.ex

@@ -97,8 +97,5 @@ defmodule Pleroma.HTML.Scrubber.Default do
     Meta.allow_tag_with_these_attributes(:font, ["face"])
   end
 
-  Meta.allow_tag_with_these_attributes(:center, [])
-  Meta.allow_tag_with_these_attributes(:small, [])
-
   Meta.strip_everything_not_covered()
 end

priv/static/schemas/litepub-0.1.jsonld

@@ -39,7 +39,9 @@
             "alsoKnownAs": {
                 "@id": "as:alsoKnownAs",
                 "@type": "@id"
-            }
+            },
+            "vcard": "http://www.w3.org/2006/vcard/ns#",
+            "formerRepresentations": "litepub:formerRepresentations"
         }
     ]
 }

rel/files/bin/pleroma_ctl

@@ -2,7 +2,6 @@
 # XXX: This should be removed when elixir's releases get custom command support
 
 detect_flavour() {
-    echo "Trying to autodetect flavour, you may want to override this with --flavour"
 	arch="$(uname -m)"
 	if [ "$arch" = "x86_64" ]; then
 		arch="amd64"
@@ -102,7 +101,6 @@ update() {
     echo "Restoring erlang cookie"
     echo $erlang_cookie > $RELEASE_ROOT/releases/COOKIE
 	echo "Done! Please refer to the changelog/release notes for changes and update instructions"
-    echo "You probably also want to update your frontend!"
 	set +e
 }
 

test/pleroma/docs/translator/compiler_test.exs

@@ -1,90 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.Docs.Translator.CompilerTest do
-  use ExUnit.Case, async: true
-
-  alias Pleroma.Docs.Translator.Compiler
-
-  @descriptions [
-    %{
-      key: "1",
-      label: "1",
-      description: "2",
-      children: [
-        %{
-          key: "3",
-          label: "3",
-          description: "4"
-        },
-        %{
-          key: "5",
-          label: "5",
-          description: "6"
-        }
-      ]
-    },
-    %{
-      key: "7",
-      label: "7",
-      description: "8",
-      children: [
-        %{
-          key: "9",
-          description: "9",
-          children: [
-            %{
-              key: "10",
-              description: "10",
-              children: [
-                %{key: "11", description: "11"},
-                %{description: "12"}
-              ]
-            }
-          ]
-        },
-        %{
-          label: "13"
-        }
-      ]
-    },
-    %{
-      group: "14",
-      label: "14"
-    },
-    %{
-      group: "15",
-      key: "15",
-      label: "15"
-    },
-    %{
-      group: {":subgroup", "16"},
-      label: "16"
-    }
-  ]
-
-  describe "extract_strings/1" do
-    test "it extracts all labels and descriptions" do
-      strings = Compiler.extract_strings(@descriptions)
-      assert length(strings) == 16
-
-      assert {["1"], "label", "1"} in strings
-      assert {["1"], "description", "2"} in strings
-      assert {["1", "3"], "label", "3"} in strings
-      assert {["1", "3"], "description", "4"} in strings
-      assert {["1", "5"], "label", "5"} in strings
-      assert {["1", "5"], "description", "6"} in strings
-      assert {["7"], "label", "7"} in strings
-      assert {["7"], "description", "8"} in strings
-      assert {["7", "9"], "description", "9"} in strings
-      assert {["7", "9", "10"], "description", "10"} in strings
-      assert {["7", "9", "10", "11"], "description", "11"} in strings
-      assert {["7", "9", "10", nil], "description", "12"} in strings
-      assert {["7", nil], "label", "13"} in strings
-      assert {["14"], "label", "14"} in strings
-      assert {["15-15"], "label", "15"} in strings
-      assert {["16"], "label", "16"} in strings
-    end
-  end
-end

test/pleroma/emoji_test.exs

@@ -13,8 +13,8 @@ defmodule Pleroma.EmojiTest do
 
       # Accept fully-qualified and unqualified emoji
       # See http://www.unicode.org/reports/tr51/
-      refute Emoji.is_unicode_emoji?("❤")
-      refute Emoji.is_unicode_emoji?("☂")
+      assert Emoji.is_unicode_emoji?("❤")
+      assert Emoji.is_unicode_emoji?("☂")
 
       assert Emoji.is_unicode_emoji?("🥺")
       assert Emoji.is_unicode_emoji?("🤰")

test/pleroma/notification_test.exs

@@ -127,6 +127,28 @@ defmodule Pleroma.NotificationTest do
       subscriber_notifications = Notification.for_user(subscriber)
       assert Enum.empty?(subscriber_notifications)
     end
+
+    test "it sends edited notifications to those who repeated a status" do
+      user = insert(:user)
+      repeated_user = insert(:user)
+      other_user = insert(:user)
+
+      {:ok, activity_one} =
+        CommonAPI.post(user, %{
+          status: "hey @#{other_user.nickname}!"
+        })
+
+      {:ok, _activity_two} = CommonAPI.repeat(activity_one.id, repeated_user)
+
+      {:ok, _edit_activity} =
+        CommonAPI.update(user, activity_one, %{
+          status: "hey @#{other_user.nickname}! mew mew"
+        })
+
+      assert [%{type: "reblog"}] = Notification.for_user(user)
+      assert [%{type: "update"}] = Notification.for_user(repeated_user)
+      assert [%{type: "mention"}] = Notification.for_user(other_user)
+    end
   end
 
   test "create_poll_notifications/1" do
@@ -839,6 +861,30 @@ defmodule Pleroma.NotificationTest do
       assert [other_user] == enabled_receivers
       assert [] == disabled_receivers
     end
+
+    test "it sends edited notifications to those who repeated a status" do
+      user = insert(:user)
+      repeated_user = insert(:user)
+      other_user = insert(:user)
+
+      {:ok, activity_one} =
+        CommonAPI.post(user, %{
+          status: "hey @#{other_user.nickname}!"
+        })
+
+      {:ok, _activity_two} = CommonAPI.repeat(activity_one.id, repeated_user)
+
+      {:ok, edit_activity} =
+        CommonAPI.update(user, activity_one, %{
+          status: "hey @#{other_user.nickname}! mew mew"
+        })
+
+      {enabled_receivers, _disabled_receivers} =
+        Notification.get_notified_from_activity(edit_activity)
+
+      assert repeated_user in enabled_receivers
+      assert other_user not in enabled_receivers
+    end
   end
 
   describe "notification lifecycle" do

test/pleroma/object/fetcher_test.exs

@@ -269,4 +269,271 @@ defmodule Pleroma.Object.FetcherTest do
       refute called(Pleroma.Signature.sign(:_, :_))
     end
   end
+
+  describe "refetching" do
+    setup do
+      object1 = %{
+        "id" => "https://mastodon.social/1",
+        "actor" => "https://mastodon.social/users/emelie",
+        "attributedTo" => "https://mastodon.social/users/emelie",
+        "type" => "Note",
+        "content" => "test 1",
+        "bcc" => [],
+        "bto" => [],
+        "cc" => [],
+        "to" => [],
+        "summary" => ""
+      }
+
+      object2 = %{
+        "id" => "https://mastodon.social/2",
+        "actor" => "https://mastodon.social/users/emelie",
+        "attributedTo" => "https://mastodon.social/users/emelie",
+        "type" => "Note",
+        "content" => "test 2",
+        "bcc" => [],
+        "bto" => [],
+        "cc" => [],
+        "to" => [],
+        "summary" => "",
+        "formerRepresentations" => %{
+          "type" => "OrderedCollection",
+          "orderedItems" => [
+            %{
+              "type" => "Note",
+              "content" => "orig 2",
+              "actor" => "https://mastodon.social/users/emelie",
+              "attributedTo" => "https://mastodon.social/users/emelie",
+              "bcc" => [],
+              "bto" => [],
+              "cc" => [],
+              "to" => [],
+              "summary" => ""
+            }
+          ],
+          "totalItems" => 1
+        }
+      }
+
+      mock(fn
+        %{
+          method: :get,
+          url: "https://mastodon.social/1"
+        } ->
+          %Tesla.Env{
+            status: 200,
+            headers: [{"content-type", "application/activity+json"}],
+            body: Jason.encode!(object1)
+          }
+
+        %{
+          method: :get,
+          url: "https://mastodon.social/2"
+        } ->
+          %Tesla.Env{
+            status: 200,
+            headers: [{"content-type", "application/activity+json"}],
+            body: Jason.encode!(object2)
+          }
+
+        %{
+          method: :get,
+          url: "https://mastodon.social/users/emelie/collections/featured"
+        } ->
+          %Tesla.Env{
+            status: 200,
+            headers: [{"content-type", "application/activity+json"}],
+            body:
+              Jason.encode!(%{
+                "id" => "https://mastodon.social/users/emelie/collections/featured",
+                "type" => "OrderedCollection",
+                "actor" => "https://mastodon.social/users/emelie",
+                "attributedTo" => "https://mastodon.social/users/emelie",
+                "orderedItems" => [],
+                "totalItems" => 0
+              })
+          }
+
+        env ->
+          apply(HttpRequestMock, :request, [env])
+      end)
+
+      %{object1: object1, object2: object2}
+    end
+
+    test "it keeps formerRepresentations if remote does not have this attr", %{object1: object1} do
+      full_object1 =
+        object1
+        |> Map.merge(%{
+          "formerRepresentations" => %{
+            "type" => "OrderedCollection",
+            "orderedItems" => [
+              %{
+                "type" => "Note",
+                "content" => "orig 2",
+                "actor" => "https://mastodon.social/users/emelie",
+                "attributedTo" => "https://mastodon.social/users/emelie",
+                "bcc" => [],
+                "bto" => [],
+                "cc" => [],
+                "to" => [],
+                "summary" => ""
+              }
+            ],
+            "totalItems" => 1
+          }
+        })
+
+      {:ok, o} = Object.create(full_object1)
+
+      assert {:ok, refetched} = Fetcher.refetch_object(o)
+
+      assert %{"formerRepresentations" => %{"orderedItems" => [%{"content" => "orig 2"}]}} =
+               refetched.data
+    end
+
+    test "it uses formerRepresentations from remote if possible", %{object2: object2} do
+      {:ok, o} = Object.create(object2)
+
+      assert {:ok, refetched} = Fetcher.refetch_object(o)
+
+      assert %{"formerRepresentations" => %{"orderedItems" => [%{"content" => "orig 2"}]}} =
+               refetched.data
+    end
+
+    test "it replaces formerRepresentations with the one from remote", %{object2: object2} do
+      full_object2 =
+        object2
+        |> Map.merge(%{
+          "content" => "mew mew #def",
+          "formerRepresentations" => %{
+            "type" => "OrderedCollection",
+            "orderedItems" => [
+              %{"type" => "Note", "content" => "mew mew 2"}
+            ],
+            "totalItems" => 1
+          }
+        })
+
+      {:ok, o} = Object.create(full_object2)
+
+      assert {:ok, refetched} = Fetcher.refetch_object(o)
+
+      assert %{
+               "content" => "test 2",
+               "formerRepresentations" => %{"orderedItems" => [%{"content" => "orig 2"}]}
+             } = refetched.data
+    end
+
+    test "it adds to formerRepresentations if the remote does not have one and the object has changed",
+         %{object1: object1} do
+      full_object1 =
+        object1
+        |> Map.merge(%{
+          "content" => "mew mew #def",
+          "formerRepresentations" => %{
+            "type" => "OrderedCollection",
+            "orderedItems" => [
+              %{"type" => "Note", "content" => "mew mew 1"}
+            ],
+            "totalItems" => 1
+          }
+        })
+
+      {:ok, o} = Object.create(full_object1)
+
+      assert {:ok, refetched} = Fetcher.refetch_object(o)
+
+      assert %{
+               "content" => "test 1",
+               "formerRepresentations" => %{
+                 "orderedItems" => [
+                   %{"content" => "mew mew #def"},
+                   %{"content" => "mew mew 1"}
+                 ],
+                 "totalItems" => 2
+               }
+             } = refetched.data
+    end
+  end
+
+  describe "fetch with history" do
+    setup do
+      object2 = %{
+        "id" => "https://mastodon.social/2",
+        "actor" => "https://mastodon.social/users/emelie",
+        "attributedTo" => "https://mastodon.social/users/emelie",
+        "type" => "Note",
+        "content" => "test 2",
+        "bcc" => [],
+        "bto" => [],
+        "cc" => ["https://mastodon.social/users/emelie/followers"],
+        "to" => [],
+        "summary" => "",
+        "formerRepresentations" => %{
+          "type" => "OrderedCollection",
+          "orderedItems" => [
+            %{
+              "type" => "Note",
+              "content" => "orig 2",
+              "actor" => "https://mastodon.social/users/emelie",
+              "attributedTo" => "https://mastodon.social/users/emelie",
+              "bcc" => [],
+              "bto" => [],
+              "cc" => ["https://mastodon.social/users/emelie/followers"],
+              "to" => [],
+              "summary" => ""
+            }
+          ],
+          "totalItems" => 1
+        }
+      }
+
+      mock(fn
+        %{
+          method: :get,
+          url: "https://mastodon.social/2"
+        } ->
+          %Tesla.Env{
+            status: 200,
+            headers: [{"content-type", "application/activity+json"}],
+            body: Jason.encode!(object2)
+          }
+
+        %{
+          method: :get,
+          url: "https://mastodon.social/users/emelie/collections/featured"
+        } ->
+          %Tesla.Env{
+            status: 200,
+            headers: [{"content-type", "application/activity+json"}],
+            body:
+              Jason.encode!(%{
+                "id" => "https://mastodon.social/users/emelie/collections/featured",
+                "type" => "OrderedCollection",
+                "actor" => "https://mastodon.social/users/emelie",
+                "attributedTo" => "https://mastodon.social/users/emelie",
+                "orderedItems" => [],
+                "totalItems" => 0
+              })
+          }
+
+        env ->
+          apply(HttpRequestMock, :request, [env])
+      end)
+
+      %{object2: object2}
+    end
+
+    test "it gets history", %{object2: object2} do
+      {:ok, object} = Fetcher.fetch_object_from_id(object2["id"])
+
+      assert %{
+               "formerRepresentations" => %{
+                 "type" => "OrderedCollection",
+                 "orderedItems" => [%{}]
+               }
+             } = object.data
+    end
+  end
 end

test/pleroma/object/updater_test.exs

@@ -0,0 +1,76 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Pleroma.Object.UpdaterTest do
+  use Pleroma.DataCase
+  use Oban.Testing, repo: Pleroma.Repo
+
+  import Pleroma.Factory
+
+  alias Pleroma.Object.Updater
+
+  describe "make_update_object_data/3" do
+    setup do
+      note = insert(:note)
+      %{original_data: note.data}
+    end
+
+    test "it makes an updated field", %{original_data: original_data} do
+      new_data = Map.put(original_data, "content", "new content")
+
+      date = Pleroma.Web.ActivityPub.Utils.make_date()
+      update_object_data = Updater.make_update_object_data(original_data, new_data, date)
+      assert %{"updated" => ^date} = update_object_data
+    end
+
+    test "it creates formerRepresentations", %{original_data: original_data} do
+      new_data = Map.put(original_data, "content", "new content")
+
+      date = Pleroma.Web.ActivityPub.Utils.make_date()
+      update_object_data = Updater.make_update_object_data(original_data, new_data, date)
+
+      history_item = original_data |> Map.drop(["id", "formerRepresentations"])
+
+      assert %{
+               "formerRepresentations" => %{
+                 "totalItems" => 1,
+                 "orderedItems" => [^history_item]
+               }
+             } = update_object_data
+    end
+  end
+
+  describe "make_new_object_data_from_update_object/2" do
+    test "it reuses formerRepresentations if it exists" do
+      %{data: original_data} = insert(:note)
+
+      new_data =
+        original_data
+        |> Map.put("content", "edited")
+
+      date = Pleroma.Web.ActivityPub.Utils.make_date()
+      update_object_data = Updater.make_update_object_data(original_data, new_data, date)
+
+      history = update_object_data["formerRepresentations"]["orderedItems"]
+
+      update_object_data =
+        update_object_data
+        |> put_in(
+          ["formerRepresentations", "orderedItems"],
+          history ++ [Map.put(original_data, "summary", "additional summary")]
+        )
+        |> put_in(["formerRepresentations", "totalItems"], length(history) + 1)
+
+      %{
+        updated_data: updated_data,
+        updated: updated,
+        used_history_in_new_object?: used_history_in_new_object?
+      } = Updater.make_new_object_data_from_update_object(original_data, update_object_data)
+
+      assert updated
+      assert used_history_in_new_object?
+      assert updated_data["formerRepresentations"] == update_object_data["formerRepresentations"]
+    end
+  end
+end

test/pleroma/upload_test.exs

@@ -49,20 +49,22 @@ defmodule Pleroma.UploadTest do
     test "it returns file" do
       File.cp!("test/fixtures/image.jpg", "test/fixtures/image_tmp.jpg")
 
-      assert Upload.store(@upload_file) ==
-               {:ok,
-                %{
-                  "name" => "image.jpg",
-                  "type" => "Document",
-                  "mediaType" => "image/jpeg",
-                  "url" => [
-                    %{
-                      "href" => "http://localhost:4001/media/post-process-file.jpg",
-                      "mediaType" => "image/jpeg",
-                      "type" => "Link"
-                    }
-                  ]
-                }}
+      assert {:ok, result} = Upload.store(@upload_file)
+
+      assert result ==
+               %{
+                 "id" => result["id"],
+                 "name" => "image.jpg",
+                 "type" => "Document",
+                 "mediaType" => "image/jpeg",
+                 "url" => [
+                   %{
+                     "href" => "http://localhost:4001/media/post-process-file.jpg",
+                     "mediaType" => "image/jpeg",
+                     "type" => "Link"
+                   }
+                 ]
+               }
 
       Task.await(Agent.get(TestUploaderSuccess, fn task_pid -> task_pid end))
     end

test/pleroma/web/activity_pub/mrf/anti_link_spam_policy_test.exs

@@ -7,6 +7,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.AntiLinkSpamPolicyTest do
   import Pleroma.Factory
   import ExUnit.CaptureLog
 
+  alias Pleroma.Web.ActivityPub.MRF
   alias Pleroma.Web.ActivityPub.MRF.AntiLinkSpamPolicy
 
   @linkless_message %{
@@ -49,11 +50,23 @@ defmodule Pleroma.Web.ActivityPub.MRF.AntiLinkSpamPolicyTest do
 
       assert user.note_count == 0
 
-      message =
-        @linkful_message
-        |> Map.put("actor", user.ap_id)
+      message = %{
+        "type" => "Create",
+        "actor" => user.ap_id,
+        "object" => %{
+          "formerRepresentations" => %{
+            "type" => "OrderedCollection",
+            "orderedItems" => [
+              %{
+                "content" => "<a href='https://example.com'>hi world!</a>"
+              }
+            ]
+          },
+          "content" => "mew"
+        }
+      }
 
-      {:reject, _} = AntiLinkSpamPolicy.filter(message)
+      {:reject, _} = MRF.filter_one(AntiLinkSpamPolicy, message)
     end
 
     test "it allows posts with links for local users" do
@@ -67,6 +80,18 @@ defmodule Pleroma.Web.ActivityPub.MRF.AntiLinkSpamPolicyTest do
 
       {:ok, _message} = AntiLinkSpamPolicy.filter(message)
     end
+
+    test "it disallows posts with links in history" do
+      user = insert(:user, local: false)
+
+      assert user.note_count == 0
+
+      message =
+        @linkful_message
+        |> Map.put("actor", user.ap_id)
+
+      {:reject, _} = AntiLinkSpamPolicy.filter(message)
+    end
   end
 
   describe "with old user" do

test/pleroma/web/activity_pub/mrf/ensure_re_prepended_test.exs

@@ -7,6 +7,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.EnsureRePrependedTest do
 
   alias Pleroma.Activity
   alias Pleroma.Object
+  alias Pleroma.Web.ActivityPub.MRF
   alias Pleroma.Web.ActivityPub.MRF.EnsureRePrepended
 
   describe "rewrites summary" do
@@ -35,10 +36,58 @@ defmodule Pleroma.Web.ActivityPub.MRF.EnsureRePrependedTest do
       assert {:ok, res} = EnsureRePrepended.filter(message)
       assert res["object"]["summary"] == "re: object-summary"
     end
+
+    test "it adds `re:` to history" do
+      message = %{
+        "type" => "Create",
+        "object" => %{
+          "summary" => "object-summary",
+          "inReplyTo" => %Activity{object: %Object{data: %{"summary" => "object-summary"}}},
+          "formerRepresentations" => %{
+            "orderedItems" => [
+              %{
+                "summary" => "object-summary",
+                "inReplyTo" => %Activity{object: %Object{data: %{"summary" => "object-summary"}}}
+              }
+            ]
+          }
+        }
+      }
+
+      assert {:ok, res} = MRF.filter_one(EnsureRePrepended, message)
+      assert res["object"]["summary"] == "re: object-summary"
+
+      assert Enum.at(res["object"]["formerRepresentations"]["orderedItems"], 0)["summary"] ==
+               "re: object-summary"
+    end
+
+    test "it accepts Updates" do
+      message = %{
+        "type" => "Update",
+        "object" => %{
+          "summary" => "object-summary",
+          "inReplyTo" => %Activity{object: %Object{data: %{"summary" => "object-summary"}}},
+          "formerRepresentations" => %{
+            "orderedItems" => [
+              %{
+                "summary" => "object-summary",
+                "inReplyTo" => %Activity{object: %Object{data: %{"summary" => "object-summary"}}}
+              }
+            ]
+          }
+        }
+      }
+
+      assert {:ok, res} = MRF.filter_one(EnsureRePrepended, message)
+      assert res["object"]["summary"] == "re: object-summary"
+
+      assert Enum.at(res["object"]["formerRepresentations"]["orderedItems"], 0)["summary"] ==
+               "re: object-summary"
+    end
   end
 
   describe "skip filter" do
-    test "it skip if type isn't 'Create'" do
+    test "it skip if type isn't 'Create' or 'Update'" do
       message = %{
         "type" => "Annotation",
         "object" => %{"summary" => "object-summary"}

test/pleroma/web/activity_pub/mrf/hashtag_policy_test.exs

@@ -20,6 +20,76 @@ defmodule Pleroma.Web.ActivityPub.MRF.HashtagPolicyTest do
     assert modified["object"]["sensitive"]
   end
 
+  test "it is history-aware" do
+    activity = %{
+      "type" => "Create",
+      "object" => %{
+        "content" => "hey",
+        "tag" => []
+      }
+    }
+
+    activity_data =
+      activity
+      |> put_in(
+        ["object", "formerRepresentations"],
+        %{
+          "type" => "OrderedCollection",
+          "orderedItems" => [
+            Map.put(
+              activity["object"],
+              "tag",
+              [%{"type" => "Hashtag", "name" => "#nsfw"}]
+            )
+          ]
+        }
+      )
+
+    {:ok, modified} =
+      Pleroma.Web.ActivityPub.MRF.filter_one(
+        Pleroma.Web.ActivityPub.MRF.HashtagPolicy,
+        activity_data
+      )
+
+    refute modified["object"]["sensitive"]
+    assert Enum.at(modified["object"]["formerRepresentations"]["orderedItems"], 0)["sensitive"]
+  end
+
+  test "it works with Update" do
+    activity = %{
+      "type" => "Update",
+      "object" => %{
+        "content" => "hey",
+        "tag" => []
+      }
+    }
+
+    activity_data =
+      activity
+      |> put_in(
+        ["object", "formerRepresentations"],
+        %{
+          "type" => "OrderedCollection",
+          "orderedItems" => [
+            Map.put(
+              activity["object"],
+              "tag",
+              [%{"type" => "Hashtag", "name" => "#nsfw"}]
+            )
+          ]
+        }
+      )
+
+    {:ok, modified} =
+      Pleroma.Web.ActivityPub.MRF.filter_one(
+        Pleroma.Web.ActivityPub.MRF.HashtagPolicy,
+        activity_data
+      )
+
+    refute modified["object"]["sensitive"]
+    assert Enum.at(modified["object"]["formerRepresentations"]["orderedItems"], 0)["sensitive"]
+  end
+
   test "it doesn't sets the sensitive property with irrelevant hashtags" do
     user = insert(:user)
 

test/pleroma/web/activity_pub/mrf/keyword_policy_test.exs

@@ -79,6 +79,54 @@ defmodule Pleroma.Web.ActivityPub.MRF.KeywordPolicyTest do
                    KeywordPolicy.filter(message)
                end)
     end
+
+    test "rejects if string matches in history" do
+      clear_config([:mrf_keyword, :reject], ["pun"])
+
+      message = %{
+        "type" => "Create",
+        "object" => %{
+          "content" => "just a daily reminder that compLAINer is a good",
+          "summary" => "",
+          "formerRepresentations" => %{
+            "type" => "OrderedCollection",
+            "orderedItems" => [
+              %{
+                "content" => "just a daily reminder that compLAINer is a good pun",
+                "summary" => ""
+              }
+            ]
+          }
+        }
+      }
+
+      assert {:reject, "[KeywordPolicy] Matches with rejected keyword"} =
+               KeywordPolicy.filter(message)
+    end
+
+    test "rejects Updates" do
+      clear_config([:mrf_keyword, :reject], ["pun"])
+
+      message = %{
+        "type" => "Update",
+        "object" => %{
+          "content" => "just a daily reminder that compLAINer is a good",
+          "summary" => "",
+          "formerRepresentations" => %{
+            "type" => "OrderedCollection",
+            "orderedItems" => [
+              %{
+                "content" => "just a daily reminder that compLAINer is a good pun",
+                "summary" => ""
+              }
+            ]
+          }
+        }
+      }
+
+      assert {:reject, "[KeywordPolicy] Matches with rejected keyword"} =
+               KeywordPolicy.filter(message)
+    end
   end
 
   describe "delisting from ftl based on keywords" do
@@ -157,6 +205,31 @@ defmodule Pleroma.Web.ActivityPub.MRF.KeywordPolicyTest do
                    not (["https://www.w3.org/ns/activitystreams#Public"] == result["to"])
                end)
     end
+
+    test "delists if string matches in history" do
+      clear_config([:mrf_keyword, :federated_timeline_removal], ["pun"])
+
+      message = %{
+        "to" => ["https://www.w3.org/ns/activitystreams#Public"],
+        "type" => "Create",
+        "object" => %{
+          "content" => "just a daily reminder that compLAINer is a good",
+          "summary" => "",
+          "formerRepresentations" => %{
+            "orderedItems" => [
+              %{
+                "content" => "just a daily reminder that compLAINer is a good pun",
+                "summary" => ""
+              }
+            ]
+          }
+        }
+      }
+
+      {:ok, result} = KeywordPolicy.filter(message)
+      assert ["https://www.w3.org/ns/activitystreams#Public"] == result["cc"]
+      refute ["https://www.w3.org/ns/activitystreams#Public"] == result["to"]
+    end
   end
 
   describe "replacing keywords" do
@@ -221,5 +294,63 @@ defmodule Pleroma.Web.ActivityPub.MRF.KeywordPolicyTest do
                  result == "ZFS is free software"
                end)
     end
+
+    test "replaces keyword if string matches in history" do
+      clear_config([:mrf_keyword, :replace], [{"opensource", "free software"}])
+
+      message = %{
+        "type" => "Create",
+        "to" => ["https://www.w3.org/ns/activitystreams#Public"],
+        "object" => %{
+          "content" => "ZFS is opensource",
+          "summary" => "",
+          "formerRepresentations" => %{
+            "type" => "OrderedCollection",
+            "orderedItems" => [
+              %{"content" => "ZFS is opensource mew mew", "summary" => ""}
+            ]
+          }
+        }
+      }
+
+      {:ok,
+       %{
+         "object" => %{
+           "content" => "ZFS is free software",
+           "formerRepresentations" => %{
+             "orderedItems" => [%{"content" => "ZFS is free software mew mew"}]
+           }
+         }
+       }} = KeywordPolicy.filter(message)
+    end
+
+    test "replaces keyword in Updates" do
+      clear_config([:mrf_keyword, :replace], [{"opensource", "free software"}])
+
+      message = %{
+        "type" => "Update",
+        "to" => ["https://www.w3.org/ns/activitystreams#Public"],
+        "object" => %{
+          "content" => "ZFS is opensource",
+          "summary" => "",
+          "formerRepresentations" => %{
+            "type" => "OrderedCollection",
+            "orderedItems" => [
+              %{"content" => "ZFS is opensource mew mew", "summary" => ""}
+            ]
+          }
+        }
+      }
+
+      {:ok,
+       %{
+         "object" => %{
+           "content" => "ZFS is free software",
+           "formerRepresentations" => %{
+             "orderedItems" => [%{"content" => "ZFS is free software mew mew"}]
+           }
+         }
+       }} = KeywordPolicy.filter(message)
+    end
   end
 end

test/pleroma/web/activity_pub/mrf/media_proxy_warming_policy_test.exs

@@ -7,6 +7,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicyTest do
   use Pleroma.Tests.Helpers
 
   alias Pleroma.HTTP
+  alias Pleroma.Web.ActivityPub.MRF
   alias Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy
 
   import Mock
@@ -22,6 +23,25 @@ defmodule Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicyTest do
     }
   }
 
+  @message_with_history %{
+    "type" => "Create",
+    "object" => %{
+      "type" => "Note",
+      "content" => "content",
+      "formerRepresentations" => %{
+        "orderedItems" => [
+          %{
+            "type" => "Note",
+            "content" => "content",
+            "attachment" => [
+              %{"url" => [%{"href" => "http://example.com/image.jpg"}]}
+            ]
+          }
+        ]
+      }
+    }
+  }
+
   setup do: clear_config([:media_proxy, :enabled], true)
 
   test "it prefetches media proxy URIs" do
@@ -50,4 +70,28 @@ defmodule Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicyTest do
       refute called(HTTP.get(:_, :_, :_))
     end
   end
+
+  test "history-aware" do
+    Tesla.Mock.mock(fn %{method: :get, url: "http://example.com/image.jpg"} ->
+      {:ok, %Tesla.Env{status: 200, body: ""}}
+    end)
+
+    with_mock HTTP, get: fn _, _, _ -> {:ok, []} end do
+      MRF.filter_one(MediaProxyWarmingPolicy, @message_with_history)
+
+      assert called(HTTP.get(:_, :_, :_))
+    end
+  end
+
+  test "works with Updates" do
+    Tesla.Mock.mock(fn %{method: :get, url: "http://example.com/image.jpg"} ->
+      {:ok, %Tesla.Env{status: 200, body: ""}}
+    end)
+
+    with_mock HTTP, get: fn _, _, _ -> {:ok, []} end do
+      MRF.filter_one(MediaProxyWarmingPolicy, @message_with_history |> Map.put("type", "Update"))
+
+      assert called(HTTP.get(:_, :_, :_))
+    end
+  end
 end

test/pleroma/web/activity_pub/mrf/no_empty_policy_test.exs

@@ -153,4 +153,27 @@ defmodule Pleroma.Web.ActivityPub.MRF.NoEmptyPolicyTest do
 
     assert NoEmptyPolicy.filter(message) == {:reject, "[NoEmptyPolicy]"}
   end
+
+  test "works with Update" do
+    message = %{
+      "actor" => "http://localhost:4001/users/testuser",
+      "cc" => ["http://localhost:4001/users/testuser/followers"],
+      "object" => %{
+        "actor" => "http://localhost:4001/users/testuser",
+        "attachment" => [],
+        "cc" => ["http://localhost:4001/users/testuser/followers"],
+        "source" => "",
+        "to" => [
+          "https://www.w3.org/ns/activitystreams#Public"
+        ],
+        "type" => "Note"
+      },
+      "to" => [
+        "https://www.w3.org/ns/activitystreams#Public"
+      ],
+      "type" => "Update"
+    }
+
+    assert NoEmptyPolicy.filter(message) == {:reject, "[NoEmptyPolicy]"}
+  end
 end

test/pleroma/web/activity_pub/mrf/no_placeholder_text_policy_test.exs

@@ -4,6 +4,7 @@
 
 defmodule Pleroma.Web.ActivityPub.MRF.NoPlaceholderTextPolicyTest do
   use Pleroma.DataCase, async: true
+  alias Pleroma.Web.ActivityPub.MRF
   alias Pleroma.Web.ActivityPub.MRF.NoPlaceholderTextPolicy
 
   test "it clears content object" do
@@ -20,6 +21,46 @@ defmodule Pleroma.Web.ActivityPub.MRF.NoPlaceholderTextPolicyTest do
     assert res["object"]["content"] == ""
   end
 
+  test "history-aware" do
+    message = %{
+      "type" => "Create",
+      "object" => %{
+        "content" => ".",
+        "attachment" => "image",
+        "formerRepresentations" => %{
+          "orderedItems" => [%{"content" => ".", "attachment" => "image"}]
+        }
+      }
+    }
+
+    assert {:ok, res} = MRF.filter_one(NoPlaceholderTextPolicy, message)
+
+    assert %{
+             "content" => "",
+             "formerRepresentations" => %{"orderedItems" => [%{"content" => ""}]}
+           } = res["object"]
+  end
+
+  test "works with Updates" do
+    message = %{
+      "type" => "Update",
+      "object" => %{
+        "content" => ".",
+        "attachment" => "image",
+        "formerRepresentations" => %{
+          "orderedItems" => [%{"content" => ".", "attachment" => "image"}]
+        }
+      }
+    }
+
+    assert {:ok, res} = MRF.filter_one(NoPlaceholderTextPolicy, message)
+
+    assert %{
+             "content" => "",
+             "formerRepresentations" => %{"orderedItems" => [%{"content" => ""}]}
+           } = res["object"]
+  end
+
   @messages [
     %{
       "type" => "Create",

test/pleroma/web/activity_pub/mrf/normalize_markup_test.exs

@@ -4,6 +4,7 @@
 
 defmodule Pleroma.Web.ActivityPub.MRF.NormalizeMarkupTest do
   use Pleroma.DataCase, async: true
+  alias Pleroma.Web.ActivityPub.MRF
   alias Pleroma.Web.ActivityPub.MRF.NormalizeMarkup
 
   @html_sample """
@@ -16,24 +17,58 @@ defmodule Pleroma.Web.ActivityPub.MRF.NormalizeMarkupTest do
   <script>alert('hacked')</script>
   """
 
-  test "it filter html tags" do
-    expected = """
-    <b>this is in bold</b>
-    <p>this is a paragraph</p>
-    this is a linebreak<br/>
-    this is a link with allowed &quot;rel&quot; attribute: <a href="http://example.com/" rel="tag">example.com</a>
-    this is a link with not allowed &quot;rel&quot; attribute: <a href="http://example.com/">example.com</a>
-    this is an image: <img src="http://example.com/image.jpg"/><br/>
-    alert(&#39;hacked&#39;)
-    """
+  @expected """
+  <b>this is in bold</b>
+  <p>this is a paragraph</p>
+  this is a linebreak<br/>
+  this is a link with allowed &quot;rel&quot; attribute: <a href="http://example.com/" rel="tag">example.com</a>
+  this is a link with not allowed &quot;rel&quot; attribute: <a href="http://example.com/">example.com</a>
+  this is an image: <img src="http://example.com/image.jpg"/><br/>
+  alert(&#39;hacked&#39;)
+  """
 
+  test "it filter html tags" do
     message = %{"type" => "Create", "object" => %{"content" => @html_sample}}
 
     assert {:ok, res} = NormalizeMarkup.filter(message)
-    assert res["object"]["content"] == expected
+    assert res["object"]["content"] == @expected
   end
 
-  test "it skips filter if type isn't `Create`" do
+  test "history-aware" do
+    message = %{
+      "type" => "Create",
+      "object" => %{
+        "content" => @html_sample,
+        "formerRepresentations" => %{"orderedItems" => [%{"content" => @html_sample}]}
+      }
+    }
+
+    assert {:ok, res} = MRF.filter_one(NormalizeMarkup, message)
+
+    assert %{
+             "content" => @expected,
+             "formerRepresentations" => %{"orderedItems" => [%{"content" => @expected}]}
+           } = res["object"]
+  end
+
+  test "works with Updates" do
+    message = %{
+      "type" => "Update",
+      "object" => %{
+        "content" => @html_sample,
+        "formerRepresentations" => %{"orderedItems" => [%{"content" => @html_sample}]}
+      }
+    }
+
+    assert {:ok, res} = MRF.filter_one(NormalizeMarkup, message)
+
+    assert %{
+             "content" => @expected,
+             "formerRepresentations" => %{"orderedItems" => [%{"content" => @expected}]}
+           } = res["object"]
+  end
+
+  test "it skips filter if type isn't `Create` or `Update`" do
     message = %{"type" => "Note", "object" => %{}}
 
     assert {:ok, res} = NormalizeMarkup.filter(message)

test/pleroma/web/activity_pub/object_validators/article_note_page_validator_test.exs

@@ -5,6 +5,7 @@
 defmodule Pleroma.Web.ActivityPub.ObjectValidators.ArticleNotePageValidatorTest do
   use Pleroma.DataCase, async: true
 
+  alias Pleroma.Web.ActivityPub.ObjectValidator
   alias Pleroma.Web.ActivityPub.ObjectValidators.ArticleNotePageValidator
   alias Pleroma.Web.ActivityPub.Utils
 
@@ -38,6 +39,11 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.ArticleNotePageValidatorTest
       %{valid?: true} = ArticleNotePageValidator.cast_and_validate(note)
     end
 
+    test "a note from factory validates" do
+      note = insert(:note)
+      %{valid?: true} = ArticleNotePageValidator.cast_and_validate(note.data)
+    end
+
     test "a note with a remote replies collection should validate", _ do
       insert(:user, %{ap_id: "https://bookwyrm.com/user/TestUser"})
       collection = File.read!("test/fixtures/bookwyrm-replies-collection.json")
@@ -130,21 +136,61 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.ArticleNotePageValidatorTest
         |> Jason.decode!()
 
       expected_content =
-        "<span class=\"h-card\"><a class=\"u-url mention\" data-user=\"#{local_user.id}\" href=\"#{local_user.ap_id}\" rel=\"ugc\">@<span>akkoma_user</span></a></span> linkifylink <a class=\"hashtag\" data-tag=\"dancedance\" href=\"http://localhost:4001/tag/dancedance\">#dancedance</a> $[jelly mfm goes here] <br><br>## aaa"
-
-      changes = ArticleNotePageValidator.cast_and_validate(note)
+        "<span class=\"h-card\"><a class=\"u-url mention\" data-user=\"#{local_user.id}\" href=\"#{local_user.ap_id}\" rel=\"ugc\">@<span>akkoma_user</span></a></span> linkifylink <a class=\"hashtag\" data-tag=\"dancedance\" href=\"http://localhost:4001/tag/dancedance\" rel=\"tag ugc\">#dancedance</a> $[jelly mfm goes here] <br><br>## aaa"
 
       %{
         valid?: true,
         changes: %{
+          content: ^expected_content,
           source: %{
             "content" => "@akkoma_user linkifylink #dancedance $[jelly mfm goes here] \n\n## aaa",
             "mediaType" => "text/x.misskeymarkdown"
           }
         }
-      } = changes
+      } = ArticleNotePageValidator.cast_and_validate(note)
+    end
+  end
 
-      assert changes.changes[:content] == expected_content
+  describe "Note with history" do
+    setup do
+      user = insert(:user)
+      {:ok, activity} = Pleroma.Web.CommonAPI.post(user, %{status: "mew mew :dinosaur:"})
+      {:ok, edit} = Pleroma.Web.CommonAPI.update(user, activity, %{status: "edited :blank:"})
+
+      {:ok, %{"object" => external_rep}} =
+        Pleroma.Web.ActivityPub.Transmogrifier.prepare_outgoing(edit.data)
+
+      %{external_rep: external_rep}
+    end
+
+    test "edited note", %{external_rep: external_rep} do
+      assert %{"formerRepresentations" => %{"orderedItems" => [%{"tag" => [_]}]}} = external_rep
+
+      {:ok, validate_res, []} = ObjectValidator.validate(external_rep, [])
+
+      assert %{"formerRepresentations" => %{"orderedItems" => [%{"emoji" => %{"dinosaur" => _}}]}} =
+               validate_res
+    end
+
+    test "edited note, badly-formed formerRepresentations", %{external_rep: external_rep} do
+      external_rep = Map.put(external_rep, "formerRepresentations", %{})
+
+      assert {:error, _} = ObjectValidator.validate(external_rep, [])
+    end
+
+    test "edited note, badly-formed history item", %{external_rep: external_rep} do
+      history_item =
+        Enum.at(external_rep["formerRepresentations"]["orderedItems"], 0)
+        |> Map.put("type", "Foo")
+
+      external_rep =
+        put_in(
+          external_rep,
+          ["formerRepresentations", "orderedItems"],
+          [history_item]
+        )
+
+      assert {:error, _} = ObjectValidator.validate(external_rep, [])
     end
   end
 end

test/pleroma/web/activity_pub/object_validators/update_handling_test.exs

@@ -32,7 +32,7 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.UpdateHandlingTest do
     test "returns an error if the object can't be updated by the actor", %{
       valid_update: valid_update
     } do
-      other_user = insert(:user)
+      other_user = insert(:user, local: false)
 
       update =
         valid_update
@@ -40,5 +40,129 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.UpdateHandlingTest do
 
       assert {:error, _cng} = ObjectValidator.validate(update, [])
     end
+
+    test "validates as long as the object is same-origin with the actor", %{
+      valid_update: valid_update
+    } do
+      other_user = insert(:user)
+
+      update =
+        valid_update
+        |> Map.put("actor", other_user.ap_id)
+
+      assert {:ok, _update, []} = ObjectValidator.validate(update, [])
+    end
+
+    test "validates if the object is not of an Actor type" do
+      note = insert(:note)
+      updated_note = note.data |> Map.put("content", "edited content")
+      other_user = insert(:user)
+
+      {:ok, update, _} = Builder.update(other_user, updated_note)
+
+      assert {:ok, _update, _} = ObjectValidator.validate(update, [])
+    end
+  end
+
+  describe "update note" do
+    test "converts object into Pleroma's format" do
+      mastodon_tags = [
+        %{
+          "icon" => %{
+            "mediaType" => "image/png",
+            "type" => "Image",
+            "url" => "https://somewhere.org/emoji/url/1.png"
+          },
+          "id" => "https://somewhere.org/emoji/1",
+          "name" => ":some_emoji:",
+          "type" => "Emoji",
+          "updated" => "2021-04-07T11:00:00Z"
+        }
+      ]
+
+      user = insert(:user)
+      note = insert(:note, user: user)
+
+      updated_note =
+        note.data
+        |> Map.put("content", "edited content")
+        |> Map.put("tag", mastodon_tags)
+
+      {:ok, update, _} = Builder.update(user, updated_note)
+
+      assert {:ok, _update, meta} = ObjectValidator.validate(update, [])
+
+      assert %{"emoji" => %{"some_emoji" => "https://somewhere.org/emoji/url/1.png"}} =
+               meta[:object_data]
+    end
+
+    test "returns no object_data in meta for a local Update" do
+      user = insert(:user)
+      note = insert(:note, user: user)
+
+      updated_note =
+        note.data
+        |> Map.put("content", "edited content")
+
+      {:ok, update, _} = Builder.update(user, updated_note)
+
+      assert {:ok, _update, meta} = ObjectValidator.validate(update, local: true)
+      assert is_nil(meta[:object_data])
+    end
+
+    test "returns object_data in meta for a remote Update" do
+      user = insert(:user)
+      note = insert(:note, user: user)
+
+      updated_note =
+        note.data
+        |> Map.put("content", "edited content")
+
+      {:ok, update, _} = Builder.update(user, updated_note)
+
+      assert {:ok, _update, meta} = ObjectValidator.validate(update, local: false)
+      assert meta[:object_data]
+
+      assert {:ok, _update, meta} = ObjectValidator.validate(update, [])
+      assert meta[:object_data]
+    end
+  end
+
+  describe "update with history" do
+    setup do
+      user = insert(:user)
+      {:ok, activity} = Pleroma.Web.CommonAPI.post(user, %{status: "mew mew :dinosaur:"})
+      {:ok, edit} = Pleroma.Web.CommonAPI.update(user, activity, %{status: "edited :blank:"})
+      {:ok, external_rep} = Pleroma.Web.ActivityPub.Transmogrifier.prepare_outgoing(edit.data)
+      %{external_rep: external_rep}
+    end
+
+    test "edited note", %{external_rep: external_rep} do
+      {:ok, _validate_res, meta} = ObjectValidator.validate(external_rep, [])
+
+      assert %{"formerRepresentations" => %{"orderedItems" => [%{"emoji" => %{"dinosaur" => _}}]}} =
+               meta[:object_data]
+    end
+
+    test "edited note, badly-formed formerRepresentations", %{external_rep: external_rep} do
+      external_rep = put_in(external_rep, ["object", "formerRepresentations"], %{})
+
+      assert {:error, _} = ObjectValidator.validate(external_rep, [])
+    end
+
+    test "edited note, badly-formed history item", %{external_rep: external_rep} do
+      history_item =
+        Enum.at(external_rep["object"]["formerRepresentations"]["orderedItems"], 0)
+        |> Map.put("type", "Foo")
+
+      external_rep =
+        put_in(
+          external_rep,
+          ["object", "formerRepresentations", "orderedItems"],
+          [history_item]
+        )
+
+      assert {:error, _} = ObjectValidator.validate(external_rep, [])
+    end
   end
 end

test/pleroma/web/activity_pub/side_effects_test.exs

@@ -145,6 +145,298 @@ defmodule Pleroma.Web.ActivityPub.SideEffectsTest do
     end
   end
 
+  describe "update notes" do
+    setup do
+      make_time = fn ->
+        Pleroma.Web.ActivityPub.Utils.make_date()
+      end
+
+      user = insert(:user)
+      note = insert(:note, user: user, data: %{"published" => make_time.()})
+      _note_activity = insert(:note_activity, note: note)
+
+      updated_note =
+        note.data
+        |> Map.put("summary", "edited summary")
+        |> Map.put("content", "edited content")
+        |> Map.put("updated", make_time.())
+
+      {:ok, update_data, []} = Builder.update(user, updated_note)
+      {:ok, update, _meta} = ActivityPub.persist(update_data, local: true)
+
+      %{
+        user: user,
+        note: note,
+        object_id: note.id,
+        update_data: update_data,
+        update: update,
+        updated_note: updated_note
+      }
+    end
+
+    test "it updates the note", %{
+      object_id: object_id,
+      update: update,
+      updated_note: updated_note
+    } do
+      {:ok, _, _} = SideEffects.handle(update, object_data: updated_note)
+      updated_time = updated_note["updated"]
+
+      new_note = Pleroma.Object.get_by_id(object_id)
+
+      assert %{
+               "summary" => "edited summary",
+               "content" => "edited content",
+               "updated" => ^updated_time
+             } = new_note.data
+    end
+
+    test "it rejects updates with no updated attribute in object", %{
+      object_id: object_id,
+      update: update,
+      updated_note: updated_note
+    } do
+      old_note = Pleroma.Object.get_by_id(object_id)
+      updated_note = Map.drop(updated_note, ["updated"])
+      {:ok, _, _} = SideEffects.handle(update, object_data: updated_note)
+      new_note = Pleroma.Object.get_by_id(object_id)
+      assert old_note.data == new_note.data
+    end
+
+    test "it rejects updates with updated attribute older than what we have in the original object",
+         %{
+           object_id: object_id,
+           update: update,
+           updated_note: updated_note
+         } do
+      old_note = Pleroma.Object.get_by_id(object_id)
+      {:ok, creation_time, _} = DateTime.from_iso8601(old_note.data["published"])
+
+      updated_note =
+        Map.put(updated_note, "updated", DateTime.to_iso8601(DateTime.add(creation_time, -10)))
+
+      {:ok, _, _} = SideEffects.handle(update, object_data: updated_note)
+      new_note = Pleroma.Object.get_by_id(object_id)
+      assert old_note.data == new_note.data
+    end
+
+    test "it rejects updates with updated attribute older than the last Update", %{
+      object_id: object_id,
+      update: update,
+      updated_note: updated_note
+    } do
+      old_note = Pleroma.Object.get_by_id(object_id)
+      {:ok, creation_time, _} = DateTime.from_iso8601(old_note.data["published"])
+
+      updated_note =
+        Map.put(updated_note, "updated", DateTime.to_iso8601(DateTime.add(creation_time, +10)))
+
+      {:ok, _, _} = SideEffects.handle(update, object_data: updated_note)
+
+      old_note = Pleroma.Object.get_by_id(object_id)
+      {:ok, update_time, _} = DateTime.from_iso8601(old_note.data["updated"])
+
+      updated_note =
+        Map.put(updated_note, "updated", DateTime.to_iso8601(DateTime.add(update_time, -5)))
+
+      {:ok, _, _} = SideEffects.handle(update, object_data: updated_note)
+
+      new_note = Pleroma.Object.get_by_id(object_id)
+      assert old_note.data == new_note.data
+    end
+
+    test "it updates using object_data", %{
+      object_id: object_id,
+      update: update,
+      updated_note: updated_note
+    } do
+      updated_note = Map.put(updated_note, "summary", "mew mew")
+      {:ok, _, _} = SideEffects.handle(update, object_data: updated_note)
+      new_note = Pleroma.Object.get_by_id(object_id)
+      assert %{"summary" => "mew mew", "content" => "edited content"} = new_note.data
+    end
+
+    test "it records the original note in formerRepresentations", %{
+      note: note,
+      object_id: object_id,
+      update: update,
+      updated_note: updated_note
+    } do
+      {:ok, _, _} = SideEffects.handle(update, object_data: updated_note)
+      %{data: new_note} = Pleroma.Object.get_by_id(object_id)
+      assert %{"summary" => "edited summary", "content" => "edited content"} = new_note
+
+      assert [Map.drop(note.data, ["id", "formerRepresentations"])] ==
+               new_note["formerRepresentations"]["orderedItems"]
+
+      assert new_note["formerRepresentations"]["totalItems"] == 1
+    end
+
+    test "it puts the original note at the front of formerRepresentations", %{
+      user: user,
+      note: note,
+      object_id: object_id,
+      update: update,
+      updated_note: updated_note
+    } do
+      {:ok, _, _} = SideEffects.handle(update, object_data: updated_note)
+      %{data: first_edit} = Pleroma.Object.get_by_id(object_id)
+
+      second_updated_note =
+        note.data
+        |> Map.put("summary", "edited summary 2")
+        |> Map.put("content", "edited content 2")
+        |> Map.put(
+          "updated",
+          first_edit["updated"]
+          |> DateTime.from_iso8601()
+          |> elem(1)
+          |> DateTime.add(10)
+          |> DateTime.to_iso8601()
+        )
+
+      {:ok, second_update_data, []} = Builder.update(user, second_updated_note)
+      {:ok, update, _meta} = ActivityPub.persist(second_update_data, local: true)
+      {:ok, _, _} = SideEffects.handle(update, object_data: second_updated_note)
+      %{data: new_note} = Pleroma.Object.get_by_id(object_id)
+      assert %{"summary" => "edited summary 2", "content" => "edited content 2"} = new_note
+
+      original_version = Map.drop(note.data, ["id", "formerRepresentations"])
+      first_edit = Map.drop(first_edit, ["id", "formerRepresentations"])
+
+      assert [first_edit, original_version] ==
+               new_note["formerRepresentations"]["orderedItems"]
+
+      assert new_note["formerRepresentations"]["totalItems"] == 2
+    end
+
+    test "it does not prepend to formerRepresentations if no actual changes are made", %{
+      note: note,
+      object_id: object_id,
+      update: update,
+      updated_note: updated_note
+    } do
+      {:ok, _, _} = SideEffects.handle(update, object_data: updated_note)
+      %{data: first_edit} = Pleroma.Object.get_by_id(object_id)
+
+      updated_note =
+        updated_note
+        |> Map.put(
+          "updated",
+          first_edit["updated"]
+          |> DateTime.from_iso8601()
+          |> elem(1)
+          |> DateTime.add(10)
+          |> DateTime.to_iso8601()
+        )
+
+      {:ok, _, _} = SideEffects.handle(update, object_data: updated_note)
+      %{data: new_note} = Pleroma.Object.get_by_id(object_id)
+      assert %{"summary" => "edited summary", "content" => "edited content"} = new_note
+
+      original_version = Map.drop(note.data, ["id", "formerRepresentations"])
+
+      assert [original_version] ==
+               new_note["formerRepresentations"]["orderedItems"]
+
+      assert new_note["formerRepresentations"]["totalItems"] == 1
+    end
+  end
+
+  describe "update questions" do
+    setup do
+      user = insert(:user)
+
+      question =
+        insert(:question,
+          user: user,
+          data: %{"published" => Pleroma.Web.ActivityPub.Utils.make_date()}
+        )
+
+      %{user: user, data: question.data, id: question.id}
+    end
+
+    test "allows updating choice count without generating edit history", %{
+      user: user,
+      data: data,
+      id: id
+    } do
+      new_choices =
+        data["oneOf"]
+        |> Enum.map(fn choice -> put_in(choice, ["replies", "totalItems"], 5) end)
+
+      updated_question =
+        data
+        |> Map.put("oneOf", new_choices)
+        |> Map.put("updated", Pleroma.Web.ActivityPub.Utils.make_date())
+
+      {:ok, update_data, []} = Builder.update(user, updated_question)
+      {:ok, update, _meta} = ActivityPub.persist(update_data, local: true)
+
+      {:ok, _, _} = SideEffects.handle(update, object_data: updated_question)
+
+      %{data: new_question} = Pleroma.Object.get_by_id(id)
+
+      assert [%{"replies" => %{"totalItems" => 5}}, %{"replies" => %{"totalItems" => 5}}] =
+               new_question["oneOf"]
+
+      refute Map.has_key?(new_question, "formerRepresentations")
+    end
+
+    test "allows updating choice count without updated field", %{
+      user: user,
+      data: data,
+      id: id
+    } do
+      new_choices =
+        data["oneOf"]
+        |> Enum.map(fn choice -> put_in(choice, ["replies", "totalItems"], 5) end)
+
+      updated_question =
+        data
+        |> Map.put("oneOf", new_choices)
+
+      {:ok, update_data, []} = Builder.update(user, updated_question)
+      {:ok, update, _meta} = ActivityPub.persist(update_data, local: true)
+
+      {:ok, _, _} = SideEffects.handle(update, object_data: updated_question)
+
+      %{data: new_question} = Pleroma.Object.get_by_id(id)
+
+      assert [%{"replies" => %{"totalItems" => 5}}, %{"replies" => %{"totalItems" => 5}}] =
+               new_question["oneOf"]
+
+      refute Map.has_key?(new_question, "formerRepresentations")
+    end
+
+    test "allows updating choice count with updated field same as the creation date", %{
+      user: user,
+      data: data,
+      id: id
+    } do
+      new_choices =
+        data["oneOf"]
+        |> Enum.map(fn choice -> put_in(choice, ["replies", "totalItems"], 5) end)
+
+      updated_question =
+        data
+        |> Map.put("oneOf", new_choices)
+        |> Map.put("updated", data["published"])
+
+      {:ok, update_data, []} = Builder.update(user, updated_question)
+      {:ok, update, _meta} = ActivityPub.persist(update_data, local: true)
+
+      {:ok, _, _} = SideEffects.handle(update, object_data: updated_question)
+
+      %{data: new_question} = Pleroma.Object.get_by_id(id)
+
+      assert [%{"replies" => %{"totalItems" => 5}}, %{"replies" => %{"totalItems" => 5}}] =
+               new_question["oneOf"]
+
+      refute Map.has_key?(new_question, "formerRepresentations")
+    end
+  end
+
   describe "EmojiReact objects" do
     setup do
       poster = insert(:user)