1004 changed files with 13610 additions and 202686 deletions
--- a/.buildpacks
+++ b/.buildpacks
@ -0,0 +1 @@
 https://github.com/hashnuke/heroku-buildpack-elixir  
--- a/.dockerignore
+++ b/.dockerignore
@ -6,12 +6,12 @@ COPYING
 *file
 elixir_buildpack.config
 test/
 instance/
 _build
 deps
 test
 benchmarks
 docs/site
 docker-db
 uploads
 instance
 # Required to get version
 !.git
--- a/.formatter.exs
+++ b/.formatter.exs
@ -1,14 +1,3 @@
 [
-  import_deps: [:ecto, :ecto_sql, :phoenix],
+  inputs: ["mix.exs", "{config,lib,test}/**/*.{ex,exs}", "priv/repo/migrations/*.exs", "priv/repo/optional_migrations/**/*.exs", "priv/scrubbers/*.ex"]
  subdirectories: ["priv/*/migrations"],
  plugins: [Phoenix.LiveView.HTMLFormatter],
  inputs: [
    "mix.exs",
    "*.{heex,ex,exs}",
    "{config,lib,test}/**/*.{heex,ex,exs}",
    "priv/*/seeds.exs",
    "priv/repo/migrations/*.exs",
    "priv/repo/optional_migrations/**/*.exs",
    "priv/scrubbers/*.ex"
  ]
 ]
--- a/.gitattributes
+++ b/.gitattributes
@ -1,4 +1,10 @@
 *.ex diff=elixir
 *.exs diff=elixir
-*.css diff=css
+priv/static/instance/static.css diff=css
 # Most of js/css files included in the repo are minified bundles,
 #   and we don't want to search/diff those as text files.
 *.js binary
 *.js.map binary
 *.css binary
--- a/.gitea/issue_template/bug.yml
+++ b/.gitea/issue_template/bug.yml
@ -1,87 +0,0 @@
 name: "Bug report"
 about: "Something isn't working as expected"
 title: "[bug] "
 labels:
 - bug
 body:
  - type: markdown
    attributes:
      value: |
        Thanks for taking the time to file this bug report! Please try to be as specific and detailed as you can, so we can track down the issue and fix it as soon as possible.
        # General information
  - type: dropdown
    id: installation
    attributes:
      label: "Your setup"
      description: "What sort of installation are you using?"
      options:
        - "OTP"
        - "From source"
        - "Docker"
      validations:
        required: true
  - type: input
    id: setup-details
    attributes:
      label: "Extra details"
      description: "If installing from source or docker, please specify your distro or docker setup."
      placeholder: "e.g. Alpine Linux edge"
  - type: input
    id: version
    attributes:
      label: "Version"
      description: "Which version of Akkoma are you running? If running develop, specify the commit hash."
      placeholder: "e.g. 2022.11, 4e4bd248"
  - type: input
    id: postgres
    attributes:
      label: "PostgreSQL version"
      placeholder: "14"
      validations:
        required: true
  - type: markdown
    attributes:
      value: "# The issue"
  - type: textarea
    id: attempt
    attributes:
      label: "What were you trying to do?"
      validations:
        required: true
  - type: textarea
    id: expectation
    attributes:
      label: "What did you expect to happen?"
      validations:
        required: true
  - type: textarea
    id: reality
    attributes:
      label: "What actually happened?"
      validations:
        required: true
  - type: textarea
    id: logs
    attributes:
      label: "Logs"
      description: "Please copy and paste any relevant log output, if applicable."
      render: shell
  - type: dropdown
    id: severity
    attributes:
      label: "Severity"
      description: "Does this issue prevent you from using the software as normal?"
      options:
        - "I cannot use the software"
        - "I cannot use it as easily as I'd like"
        - "I can manage"
      validations:
        required: true
  - type: checkboxes
    id: searched
    attributes:
      label: "Have you searched for this issue?"
      description: "Please double-check that your issue is not already being tracked on [the forums](https://meta.akkoma.dev) or [the issue tracker](https://akkoma.dev/AkkomaGang/akkoma/issues)."
      options:
        - label: "I have double-checked and have not found this issue mentioned anywhere."
--- a/.gitea/issue_template/feat.yml
+++ b/.gitea/issue_template/feat.yml
@ -1,32 +0,0 @@
 name: "Feature request"
 about: "I'd like something to be added to Akkoma"
 title: "[feat] "
 labels:
 - "feature request"
 body:
  - type: markdown
    attributes:
      value: "Thanks for taking the time to request a new feature! Please be as concise and clear as you can in your proposal, so we could understand what you're going for."
  - type: textarea
    id: idea
    attributes:
      label: "The idea"
      description: "What do you think you should be able to do in Akkoma?"
      validations:
        required: true
  - type: textarea
    id: reason
    attributes:
      label: "The reasoning"
      description: "Why would this be a worthwhile feature? Does it solve any problems? Have people talked about wanting it?"
      validations:
        required: true
  - type: checkboxes
    id: searched
    attributes:
      label: "Have you searched for this feature request?"
      description: "Please double-check that your issue is not already being tracked on [the forums](https://meta.akkoma.dev), [the issue tracker](https://akkoma.dev/AkkomaGang/akkoma/issues), or the one for [pleroma-fe](https://akkoma.dev/AkkomaGang/pleroma-fe/issues)."
      options:
        - label: "I have double-checked and have not found this feature request mentioned anywhere."
        - label: "This feature is related to the Akkoma backend specifically, and not pleroma-fe."
--- a/.gitignore
+++ b/.gitignore
@ -1,6 +1,5 @@
 # App artifacts
 docs/site
 *.zip
 *.sw*
 secret
 /_build
@ -18,13 +17,6 @@ secret
 /instance
 /priv/ssh_keys
 vm.args
 .cache/
 .hex/
 .mix/
 .psql_history
 docker-resources/Dockerfile
 docker-resources/Caddyfile
 pgdata
 # Prevent committing custom emojis
 /priv/static/emoji/custom/*
@ -73,9 +65,3 @@ pleroma.iml
 # Generated documentation
 docs/site
 docs/venv
 # docker stuff
 docker-db
 *.iml
 docker-compose.override.yml
--- a/.gitlab/issue_templates/Bug.md
+++ b/.gitlab/issue_templates/Bug.md
@ -0,0 +1,18 @@
 <!--
 ### Precheck
 * For support use https://git.pleroma.social/pleroma/pleroma-support or [community channels](https://git.pleroma.social/pleroma/pleroma#community-channels).
 * Please do a quick search to ensure no similar bug has been reported before. If the bug has not been addressed after 2 weeks, it's fine to bump it.
 * Try to ensure that the bug is actually related to the Pleroma backend. For example, if a bug happens in Pleroma-FE but not in Mastodon-FE or mobile clients, it's likely that the bug should be filed in [Pleroma-FE](https://git.pleroma.social/pleroma/pleroma-fe/issues/new) repository.
 -->
 ### Environment
 * Installation type (OTP or From Source):
 * Pleroma version (could be found in the "Version" tab of settings in Pleroma-FE): 
 * Elixir version (`elixir -v` for from source installations, N/A for OTP):
 * Operating system:
 * PostgreSQL version (`psql -V`):
 ### Bug description
--- a/.gitlab/merge_request_templates/Release.md
+++ b/.gitlab/merge_request_templates/Release.md
@ -0,0 +1,6 @@
 ### Release checklist
 * [ ]  Bump version in `mix.exs`
 * [ ]  Compile a changelog
 * [ ]  Create an MR with an announcement to pleroma.social
 * [ ]  Tag the release
 * [ ] Merge `stable` into `develop` (in case the fixes are already in develop, use `git merge -s ours --no-commit` and manually merge the changelogs)
--- a/.woodpecker/.docs.yml
+++ b/.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/
--- a/.woodpecker/.release.yml
+++ b/.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
--- a/.woodpecker/.test.yml
+++ b/.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
--- a/.woodpecker/build-amd64.yml
+++ b/.woodpecker/build-amd64.yml
@ -1,118 +0,0 @@
 labels:
  platform: linux/amd64
 depends_on:
  - test
 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
  - &on-stable
    when:
      event:
        - push
        - tag
      branch:
        - 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"
 steps:
  # Canonical amd64
  debian-bookworm:
    image: hexpm/elixir:1.15.4-erlang-26.0.2-debian-bookworm-20230612
    <<: *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 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-amd64.zip -r release
  release-debian-bookworm:
    image: akkoma/releaser
    <<: *on-release
    secrets: *scw-secrets
    commands:
      - export SOURCE=akkoma-amd64.zip
      # AMD64
      - export DEST=scaleway:akkoma-updates/$${CI_COMMIT_TAG:-"$CI_COMMIT_BRANCH"}/akkoma-amd64.zip
      - /bin/sh /entrypoint.sh
      # Ubuntu jammy (currently compatible)
      - export DEST=scaleway:akkoma-updates/$${CI_COMMIT_TAG:-"$CI_COMMIT_BRANCH"}/akkoma-amd64-ubuntu-jammy.zip
      - /bin/sh /entrypoint.sh
  debian-bullseye:
    image: hexpm/elixir:1.15.4-erlang-26.0.2-debian-bullseye-20230612
    <<: *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 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-amd64-debian-bullseye.zip -r release
  release-debian-bullseye:
    image: akkoma/releaser
    <<: *on-release
    secrets: *scw-secrets
    commands:
      - export SOURCE=akkoma-amd64-debian-bullseye.zip
      # AMD64
      - export DEST=scaleway:akkoma-updates/$${CI_COMMIT_TAG:-"$CI_COMMIT_BRANCH"}/akkoma-amd64-debian-bullseye.zip
      - /bin/sh /entrypoint.sh
  # Canonical amd64-musl
  musl:
    image: hexpm/elixir:1.15.4-erlang-26.0.2-alpine-3.18.2
    <<: *on-stable
    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-stable
    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
--- a/.woodpecker/build-arm64.yml
+++ b/.woodpecker/build-arm64.yml
@ -1,90 +0,0 @@
 labels:
  platform: linux/aarch64
 depends_on:
  - test
 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:
        - stable
        - develop
  - &on-stable
    when:
      event:
        - push
        - tag
      branch:
        - 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"
 steps:
  # Canonical arm64
  debian-bookworm:
    image: hexpm/elixir:1.15.4-erlang-26.0.2-debian-bookworm-20230612
    <<: *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 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-arm64.zip -r release
  release-debian-bookworm:
    image: akkoma/releaser:arm64
    <<: *on-release
    secrets: *scw-secrets
    commands:
      - export SOURCE=akkoma-arm64.zip
      - export DEST=scaleway:akkoma-updates/$${CI_COMMIT_TAG:-"$CI_COMMIT_BRANCH"}/akkoma-arm64-ubuntu-jammy.zip
      - /bin/sh /entrypoint.sh
      - export DEST=scaleway:akkoma-updates/$${CI_COMMIT_TAG:-"$CI_COMMIT_BRANCH"}/akkoma-arm64.zip
      - /bin/sh /entrypoint.sh
  # Canonical arm64-musl
  musl:
    image: hexpm/elixir:1.15.4-erlang-26.0.2-alpine-3.18.2
    <<: *on-stable
    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-arm64-musl.zip -r release
  release-musl:
    image: akkoma/releaser:arm64
    <<: *on-stable
    secrets: *scw-secrets
    commands:
      - export SOURCE=akkoma-arm64-musl.zip
      - export DEST=scaleway:akkoma-updates/$${CI_COMMIT_TAG:-"$CI_COMMIT_BRANCH"}/akkoma-arm64-musl.zip
      - /bin/sh /entrypoint.sh
--- a/.woodpecker/docs.yml
+++ b/.woodpecker/docs.yml
@ -1,70 +0,0 @@
 labels:
  platform: linux/amd64
 depends_on:
  - test
  - build-amd64
 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-stable
    when:
      event:
        - push
        - tag
      branch:
        - stable
        - 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"
 steps:
  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/
--- a/.woodpecker/lint.yml
+++ b/.woodpecker/lint.yml
@ -1,56 +0,0 @@
 labels:
  platform: linux/amd64
 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-stable
    when:
      event:
        - push
        - tag
      branch:
        - stable
        - 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"
 steps:
  lint:
    image: akkoma/ci-base:1.16-otp26
    <<: *on-pr-open
    environment:
      MIX_ENV: test
    commands:
      - mix local.hex --force
      - mix local.rebar --force
      - mix deps.get
      - mix compile
      - mix format --check-formatted
--- a/.woodpecker/test.yml
+++ b/.woodpecker/test.yml
@ -1,91 +0,0 @@
 labels:
  platform: linux/amd64
 depends_on:
  - lint
 matrix:
  ELIXIR_VERSION:
    - 1.14
    - 1.15
    - 1.16
  OTP_VERSION:
    - 25
    - 26
  include:
    - ELIXIR_VERSION: 1.16
      OTP_VERSION: 26
 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-stable
    when:
      event:
        - push
        - tag
      branch:
        - stable
        - 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:15
    when:
      event:
        - pull_request
    environment:
      POSTGRES_DB: pleroma_test_${ELIXIR_VERSION}_${OTP_VERSION}
      POSTGRES_USER: postgres
      POSTGRES_PASSWORD: postgres
 steps:
  test:
    image: akkoma/ci-base:${ELIXIR_VERSION}-otp${OTP_VERSION}
    <<: *on-pr-open
    environment:
      MIX_ENV: test
      POSTGRES_DB: pleroma_test_${ELIXIR_VERSION}_${OTP_VERSION}
      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
      - mkdir -p test/tmp
      - mix test --preload-modules --exclude erratic --exclude federated --exclude mocked || mix test --failed
      - mix test --preload-modules --only mocked || mix test --failed
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -4,376 +4,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
-## 3.13.3 
+## [Unreleased]
 ## BREAKING
 - Minimum PostgreSQL version is raised to 12
 - Swagger UI moved from `/akkoma/swaggerui/` to `/pleroma/swaggerui/`
 ## Added
 - Implement [FEP-67ff](https://codeberg.org/fediverse/fep/src/branch/main/fep/67ff/fep-67ff.md) (federation documentation)
 - Meilisearch: it is now possible to use separate keys for search and admin actions
 - New standalone `prune_orphaned_activities` mix task with configurable batch limit
 - The `prune_objects` mix task now accepts a `--limit` parameter for initial object pruning
 ## Fixed
 - Meilisearch: order of results returned from our REST API now actually matches how Meilisearch ranks results
 - Emoji are now federated as anonymous objects, fixing issues with
  some strict servers e.g. rejecting e.g. remote emoji reactions
 - AP objects with additional JSON-LD profiles beyond ActivityStreams can now be fetched
 - Single-selection polls no longer expose the voter_count; MastoAPI demands it be null
  and this confused some clients leading to vote distributions >100%
 ## Changed
 - Refactored Rich Media to cache the content in the database. Fetching operations that could block status rendering have been eliminated.
 ## 2024.04.1 (Security)
 ## Fixed
 - Issue allowing non-owners to use media objects in posts
 - Issue allowing use of non-media objects as attachments and crashing timeline rendering
 - Issue allowing webfinger spoofing in certain situations
 ## 2024.04
 ## Added
 - Support for [FEP-fffd](https://codeberg.org/fediverse/fep/src/branch/main/fep/fffd/fep-fffd.md) (proxy objects)
 - Verified support for elixir 1.16
 - Uploadfilter `Pleroma.Upload.Filter.Exiftool.ReadDescription` returns description values to the FE so they can pre fill the image description field
  NOTE: this filter MUST be placed before `Exiftool.StripMetadata` to work
 ## Changed
 - Inbound pipeline error handing was modified somewhat, which should lead to less incomprehensible log spam. Hopefully.
 - Uploadfilter `Pleroma.Upload.Filter.Exiftool` was replaced by `Pleroma.Upload.Filter.Exiftool.StripMetadata`;
  the latter strips all non-essential metadata by default but can be configured.
  To regain the old behaviour of only stripping GPS data set `purge: ["gps:all"]`.
 - Uploadfilter `Pleroma.Upload.Filter.Exiftool` has been renamed to `Pleroma.Upload.Filter.Exiftool.StripMetadata`
 - MRF.InlineQuotePolicy now prefers to insert display URLs instead of ActivityPub IDs
 - Old accounts are no longer listed in WebFinger as aliases; this was breaking spec
 ## Fixed
 - Issue preventing fetching anything from IPv6-only instances
 - Issue allowing post content to leak via opengraph tags despite :estrict\_unauthenticated being set
 - Move activities no longer operate on stale user data
 - Missing definitions in our JSON-LD context
 - Issue mangling newlines in code blocks for RSS/Atom feeds
 - static\_fe squeezing non-square avatars and emoji
 - Issue leading to properly JSON-LD compacted emoji reactions being rejected
 - We now use a standard-compliant Accept header when fetching ActivityPub objects
 - /api/pleroma/notification\_settings was rejecting body parameters;
  this also broke changing this setting via akkoma-fe
 - Issue leading to Mastodon bot accounts being rejected
 - Scope misdetection of remote posts resulting from not recognising
  JSON-LD-compacted forms of public scope; affected e.g. federation with bovine
 - Ratelimits encountered when fetching objects are now respected; 429 responses will cause a backoff when we get one.
 ## Removed
 - ActivityPub Client-To-Server write API endpoints have been disabled;
  read endpoints are planned to be removed next release unless a clear need is demonstrated
 ## 2024.03
 ## Added
 - CLI tasks best-effort checking for past abuse of the recent spoofing exploit
 - new `:mrf_steal_emoji, :download_unknown_size` option; defaults to `false`
 ## Changed
 - `Pleroma.Upload, :base_url` now MUST be configured explicitly if used;
  use of the same domain as the instance is **strongly** discouraged
 - `:media_proxy, :base_url` now MUST be configured explicitly if used;
  use of the same domain as the instance is **strongly** discouraged
 - StealEmoji:
  - now uses the pack.json format;
    existing users must migrate with an out-of-band script (check release notes)
  - only steals shortcodes recognised as valid
  - URLs of stolen emoji is no longer predictable
 - The `Dedupe` upload filter is now always active;
  `AnonymizeFilenames` is again opt-in
 - received AP data is sanity checked before we attempt to parse it as a user
 - Uploads, emoji and media proxy now restrict Content-Type headers to a safe subset
 - Akkoma will no longer fetch and parse objects hosted on the same domain
 ## Fixed
 - Critical security issue allowing Akkoma to be used as a vector for
  (depending on configuration) impersonation of other users or creation
  of bogus users and posts on the upload domain
 - Critical security issue letting Akkoma fall for the above impersonation
  payloads due to lack of strict id checking
 - Critical security issue allowing domains redirect to to pose as the initial domain
  (e.g. with media proxy's fallback redirects)
 - refetched objects can no longer attribute themselves to third-party actors
  (this had no externally visible effect since actor info is read from the Create activity)
 - our litepub JSON-LD schema is now served with the correct content type
 - remote APNG attachments are now recognised as images
 ## Upgrade Notes
 - As mentioned in "Changed", `Pleroma.Upload, :base_url` **MUST** be configured. Uploads will fail without it.
  - Akkoma will refuse to start if this is not set.
 - Same with media proxy.
 ## 2024.02
 ## Added
 - Full compatibility with Erlang OTP26
 - handling of GET /api/v1/preferences
 - Akkoma API is now documented
 - ability to auto-approve follow requests from users you are already following
 - The SimplePolicy MRF can now strip user backgrounds from selected remote hosts
 ## Changed
 - OTP builds are now built on erlang OTP26
 - The base Phoenix framework is now updated to 1.7
 - An `outbox` field has been added to actor profiles to comply with AP spec
 - User profile backgrounds do now federate with other Akkoma instances and Sharkey
 ## Fixed
 - Documentation issue in which a non-existing nginx file was referenced
 - Issue where a bad inbox URL could break federation
 - Issue where hashtag rel values would be scrubbed
 - Issue where short domains listed in `transparency_obfuscate_domains` were not actually obfuscated
 ## 2023.08
 ## Added
 - Added a new configuration option to the MediaProxy feature that allows the blocking of specific domains from using the media proxy or being explicitly allowed by the Content-Security-Policy.
  - Please make sure instances you wanted to block media from are not in the MediaProxy `whitelist`, and instead use `blocklist`.
 - `OnlyMedia` Upload Filter to simplify restricting uploads to audio, image, and video types
 - ARM64 OTP builds
  - Ubuntu22 builds are available for develop and stable
  - other distributions are stable only
 - Support for Elixir 1.15
  - 1.14 is still supported
  - OTP26 is currently "unsupported". It will probably work, but due to the way
    it handles map ordering, the test suite will not pass for it as yet.
 ## Changed
 - Alpine OTP builds are now from alpine 3.18, which is OpenSSLv3 compatible.
  If you use alpine OTP builds you will have to update your local system.
 - Debian OTP builds are now from a base of bookworm, which is OpenSSLv3 compatible.
  If you use debian OTP builds you will have to update your local system to
  bookworm (currently: stable).
 - Ubuntu and debian builds are compatible again! (for now...)
 - Blocks/Mutes now return from max ID to min ID, in line with mastodon.
 - The AnonymizeFilename filter is now enabled by default.
 ## Fixed
 - Deactivated users can no longer show up in the emoji reaction list
 - Embedded posts can no longer bypass `:restrict\_unauthenticated`
 - GET/HEAD requests will now work when requesting AWS-based instances.
 ## Security
 - Add `no_new_privs` hardening to OpenRC and systemd service files
 - XML parsers cannot load any entities (thanks @Mae@is.badat.dev!)
 - Reduced permissions of config files and directories, distros requiring greater permissions like group-read need to pre-create the directories
 ## Removed
 - Builds for debian oldstable (bullseye)
  - If you are on oldstable you should NOT attempt to update OTP builds without
    first updating your machine.
 ## 2023.05
 ## Added
 - Custom options for users to accept/reject private messages
  - options: everybody, nobody, people\_i\_follow
 - MRF to reject notes from accounts newer than a given age
  - this will have the side-effect of rejecting legitimate messages if your
    post gets boosted outside of your local bubble and people your instance
    does not know about reply to it.
 ## Fixed
 - Support for `streams` public key URIs
 - Bookmarks are cleaned up on DB prune now
 ## Security
 - Fixed mediaproxy being a bit of a silly billy
 ## 2023.04
 ## Added
 - Nodeinfo keys for unauthenticated timeline visibility
 - Option to disable federated timeline
 - Option to make the bubble timeline publicly accessible
 - Ability to swap between installed standard frontends
  - *mastodon frontends are still not counted as standard frontends due to the complexity in serving them correctly*. 
 ### Upgrade Notes
 - Elixir 1.14 is now required. If your distribution does not package this, you can
  use [asdf](https://asdf-vm.com/). At time of writing, elixir 1.14.3 / erlang 25.3
  is confirmed to work.
 ## 2023.03
 ## Fixed
 - Allowed contentMap to be updated on edit
 - Filter creation now accepts expires\_at
 ### Changed
 - Restoring the database from a dump now goes much faster without need for work-arounds
 - Misskey reaction matching uses `content` parameter now
 ### Added
 - Extend the mix task `prune_objects` with option `--prune-orphaned-activities` to also prune orphaned activities, allowing to reclaim even more database space
 ### Removed
 - Possibility of using the `style` parameter on `span` elements. This will break certain MFM parameters.
 - Option for "default" image description.
 ## 2023.02
 ### Added
 - Prometheus metrics exporting from `/api/v1/akkoma/metrics`
 - Ability to alter http pool size
 - Translation of statuses via ArgosTranslate
 - Argon2 password hashing
 - Ability to "verify" links in profile fields via rel=me
 - Mix tasks to dump/load config to/from json for bulk editing
 - Followed hashtag list at /api/v1/followed\_tags, API parity with mastodon
 - Ability to set posting language in the post form, API parity with mastodon
 - Ability to match domains in MRF by a trailing wildcard
  - Currently supported formats:
    - `example.com` (implicitly matches `*.example.com`)
    - `*.example.com`
    - `example.*` (implicitly matches `*.example.*`)
 ### Removed
 - Non-finch HTTP adapters
 - Legacy redirect from /api/pleroma/admin to /api/v1/pleroma/admin
 - Legacy redirects from /api/pleroma to /api/v1/pleroma
 - :crypt dependency
 ### Changed
 - Return HTTP error 413 when uploading an avatar or banner that's above the configured upload limit instead of a 500.
 - Non-admin users now cannot register `admin` scope tokens (not security-critical, they didn't work before, but you _could_ create them)
  - Admin scopes will be dropped on create
 - Rich media will now backoff for 20 minutes after a failure
 - Quote posts are now considered as part of the same thread as the post they are quoting
 - Extend the mix task `prune_objects` with options to keep more relevant posts
 - Simplified HTTP signature processing
 - Rich media will now hard-exit after 5 seconds, to prevent timeline hangs
 - HTTP Content Security Policy is now far more strict to prevent any potential XSS/CSS leakages
 - Follow requests are now paginated, matches mastodon API spec, so use the Link header to paginate.
 ### Fixed 
 - /api/v1/accounts/lookup will now respect restrict\_unauthenticated
 - Unknown atoms in the config DB will no longer crash akkoma on boot
 ### Upgrade notes
 - Ensure `config :tesla, :adapter` is either unset, or set to `{Tesla.Adapter.Finch, name: MyFinch}` in your .exs config
 - Pleroma-FE will need to be updated to handle the new /api/v1/pleroma endpoints for  custom emoji
 ## 2022.12
 ## Added
 - Config: HTTP timeout options, :pool\_timeout and :receive\_timeout
 - Added statistic gathering about instances which do/don't have signed fetches when they request from us
 - Ability to set a default post expiry time, after which the post will be deleted. If used in concert with ActivityExpiration MRF, the expiry which comes _sooner_ will be applied.
 - Regular task to prune local transient activities
 - Task to manually run the transient prune job (pleroma.database prune\_task)
 - Ability to follow hashtags
 - Option to extend `reject` in MRF-Simple to apply to entire threads, where the originating instance is rejected
 - Extra information to failed HTTP requests
 ## Changed
 - MastoAPI: Accept BooleanLike input on `/api/v1/accounts/:id/follow` (fixes follows with mastodon.py)
 - Relays from akkoma are now off by default
 - NormalizeMarkup MRF is now on by default
 - Follow/Block/Mute imports now spin off into *n* tasks to avoid the oban timeout
 - Transient activities recieved from remote servers are no longer persisted in the database
 - Overhauled static-fe view for logged-out users
 - Blocked instances will now not be sent _any_ requests, even fetch ones that would get rejected by MRF anyhow
 ## Removed
 - FollowBotPolicy
 - Passing of undo/block into MRF
 ## Upgrade Notes
 - If you have an old instance, you will probably want to run `mix pleroma.database prune_task` in the foreground to catch it up with the history of your instance.
 ## 2022.11
 ## Added
 - Officially supported docker release
 - Ability to remove followers unilaterally without a block
 - Scraping of nodeinfo from remote instances to display instance info
 - `requested_by` in relationships when the user has requested to follow you
 ## Changed
 - Follows no longer override domain blocks, a domain block is final
 - Deletes are now the lowest priority to publish and will be handled after creates
 - Domain blocks are now subdomain-matches by default
 ## Fixed
 - Registrations via ldap are now compatible with the latest OTP24
 ## Update notes
 - If you use LDAP and run from source, please update your elixir/erlang
  to the latest. The changes in OTP24.3 are breaking.
 - You can now remove the leading `*.` from domain blocks, but you do not have to.
 ## 2022.10
 ### Added
 - Ability to sync frontend profiles between clients, with a name attached
 - Status card generation will now use the media summary if it is available
 ### Changed
 - Emoji updated to latest 15.0 draft
 - **Breaking**: `/api/v1/pleroma/backups` endpoints now requires `read:backups` scope instead of `read:accounts`
 - Verify that the signature on posts is not domain blocked, and belongs to the correct user
 ### Fixed
 - OAuthPlug no longer joins with the database every call and uses the user cache
 - Undo activities no longer try to look up by ID, and render correctly
 - prevent false-errors from meilisearch
 ## 2022.09
 ### Added
 - support for fedibird-fe, and non-breaking API parity for it to function
 - support for setting instance languages in metadata
 - support for reusing oauth tokens, and not requiring new authorizations
 - the ability to obfuscate domains in your MRF descriptions
 - automatic translation of statuses via DeepL or LibreTranslate
 - ability to edit posts
 - ability to react with remote emoji
 ### Changed
 - MFM parsing is now done on the backend by a modified version of ilja's parser -> https://akkoma.dev/AkkomaGang/mfm-parser
 - InlineQuotePolicy is now on by default
 - Enable remote users to interact with posts
 ### Fixed
 - Compatibility with latest meilisearch
 - Resolution of nested mix tasks (i.e search.meilisearch) in OTP releases
 - Elasticsearch returning likes and repeats, displaying as posts
 - Ensure key generation happens at registration-time to prevent potential race-conditions
 - Ensured websockets get closed on logout
 - Allowed GoToSocial-style `?query_string` signatures
 ### Removed
 - Non-finch HTTP adapters. `:tesla, :adapter` is now highly recommended to be set to the default.
 ## 2022.08
 ### Added
 - extended runtime module support, see config cheatsheet
 - quote posting; quotes are limited to public posts
 ### Changed
 - quarantining is now considered absolutely; public activities are no longer
  an exception.
 - also merged quarantine and mrf reject - quarantine is now deprecated
 - 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
@ -387,6 +18,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
 - Chats, they were half-baked. Just use PMs.
 - Prometheus, it causes massive slowdown
@ -530,7 +162,6 @@ you might end up in a situation where you don't have an ability to get it.
 - Attachment dimensions and blurhashes are federated when available.
 - Mastodon API: support `poll` notification.
 - Pinned posts federation
 - Possibility to discover users like `user@example.org`, while Akkoma is working on `akkoma.example.org`. Additional configuration required.
 ### Fixed
 - Don't crash so hard when email settings are invalid.
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@ -1,24 +0,0 @@
 # Akkoma Code of Conduct
 The Akkoma project aims to be **enjoyable** for anyone to participate in, regardless of their identity or level of expertise. To achieve this, the community must create an environment which is **safe** and **equitable**; the following guidelines have been created with these goals in mind.
 1. **Treat individuals with respect.** Differing experiences and viewpoints deserve to be respected, and bigotry and harassment are not tolerated under any circumstances.
    - Individuals should at all times be treated as equals, regardless of their age, gender, sexuality, race, ethnicity, _or any other characteristic_, intrinsic or otherwise.
    - Behaviour that is harmful in nature should be addressed and corrected *regardless of intent*.
    - Respect personal boundaries and ask for clarification whenever they are unclear.
    - (Obviously, hate does not count as merely a "differing viewpoint", because it is harmful in nature.)
 2. **Be understanding of differences in communication.** Not everyone is aware of unspoken social cues, and speech that is not intended to be offensive should not be treated as such simply due to an atypical manner of communication.
    - Somebody who speaks bluntly is not necessarily rude, and somebody who swears a lot is not necessarily volatile.
    - Try to confirm your interpretation of their intent rather than assuming bad faith.
    - Someone may not communicate as, or come across as a picture of "professionalism", but this should not be seen as a reason to dismiss them. This is a **casual** space, and communication styles can reflect that.
 3. **"Uncomfortable" does not mean "unsafe".** In an ideal world, the community would be safe, equitable, enjoyable, *and* comfortable for all members at all times. Unfortunately, this is not always possible in reality.
    - Safety and equity will be prioritized over comfort whenever it is necessary to do so.
    - Weaponizing one's own discomfort to deflect accountability or censor an individual (e.g. "white fragility") is a form of discriminatory conduct.
 4. **Let people grow from their mistakes.** Nobody is perfect; even the most well-meaning individual can do something hurtful. Everyone should be given a fair opportunity to explain themselves and correct their behaviour. Portraying someone as inherently malicious prevents improvement and shifts focus away from the *action* that was problematic.
    - Avoid bringing up past events that do not accurately reflect an individual's current actions or beliefs. (This is, of course, different from providing evidence of a recurring pattern of behaviour.)
 ---
 This document was adapted from one created by ~keith as part of punks default repository template, and is licensed under CC-BY-SA 4.0. The original template is here: <https://bytes.keithhacks.cyou/keith/default-template>
--- a/43
+++ b/43
@ -1,15 +1,12 @@
-Unless otherwise stated this repository is 
+Unless otherwise stated this repository is copyright © 2017-2021
-Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
+Pleroma Authors <https://pleroma.social/>, and is distributed under
-Copyright © 2022 Akkoma Authors <https://akkoma.social/>
+The GNU Affero General Public License Version 3, you should have received a
-and is distributed under The GNU Affero General Public License Version 3, you
+copy of the license file as AGPL-3.
 should have received a copy of the license file as AGPL-3.
 ---
-Files inside docs directory are
+Files inside docs directory are copyright © 2021 Pleroma Authors
-Copyright © 2021-2022 Pleroma Authors <https://pleroma.social/>
+<https://pleroma.social/>, and are distributed under the Creative Commons
 Copyright © 2022 Akkoma Authors <https://akkoma.social/>
 and are distributed under the Creative Commons
 Attribution 4.0 International license, you should have received
 a copy of the license file as CC-BY-4.0.
@ -19,7 +16,17 @@ The following files are copyright © 2019 shitposter.club, and are distributed
 under the Creative Commons Attribution-ShareAlike 4.0 International license,
 you should have received a copy of the license file as CC-BY-SA-4.0.
 priv/static/images/pleroma-fox-tan.png
 priv/static/images/pleroma-fox-tan-smol.png
 priv/static/images/pleroma-tan.png
 ---
 The following files are copyright © 2019 shitposter.club, and are distributed
 under the Creative Commons Attribution 4.0 International license, you should
 have received a copy of the license file as CC-BY-4.0.
 priv/static/images/pleroma-fox-tan-shy.png
 ---
@ -28,4 +35,22 @@ The following files are copyright © 2017-2020 Pleroma Authors
 Attribution-ShareAlike 4.0 International license, you should have received
 a copy of the license file as CC-BY-SA-4.0.
 priv/static/images/avi.png
 priv/static/images/banner.png
 priv/static/instance/thumbnail.jpeg
 ---
 All photos published on Unsplash can be used for free. You can use them for
 commercial and noncommercial purposes. You do not need to ask permission from
 or provide credit to the photographer or Unsplash, although it is appreciated
 when possible.
 More precisely, Unsplash grants you an irrevocable, nonexclusive, worldwide
 copyright license to download, copy, modify, distribute, perform, and use
 photos from Unsplash for free, including for commercial purposes, without
 permission from or attributing the photographer or Unsplash. This license
 does not include the right to compile photos from Unsplash to replicate
 a similar or competing service.
 priv/static/images/city.jpg
--- a/52
+++ b/52
@ -1,9 +1,21 @@
-FROM hexpm/elixir:1.15.4-erlang-26.0.2-alpine-3.18.2
+FROM hexpm/elixir:1.13.4-erlang-24.3.4.2-alpine-3.16.0 as build
 COPY . .
 ENV MIX_ENV=prod
 ENV ERL_EPMD_ADDRESS=127.0.0.1
-ARG HOME=/opt/akkoma
+RUN apk add git gcc g++ musl-dev make cmake file-dev &&\
 	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
 FROM alpine:3.16
 ARG BUILD_DATE
 ARG VCS_REF
 LABEL org.opencontainers.image.title="akkoma" \
    org.opencontainers.image.description="Akkoma for Docker" \
@ -14,21 +26,25 @@ LABEL org.opencontainers.image.title="akkoma" \
    org.opencontainers.image.revision=$VCS_REF \
    org.opencontainers.image.created=$BUILD_DATE
-RUN apk add git gcc g++ musl-dev make cmake file-dev exiftool ffmpeg imagemagick libmagic ncurses postgresql-client
+ARG HOME=/opt/akkoma
 ARG DATA=/var/lib/akkoma
 RUN apk update &&\
 	apk add exiftool ffmpeg imagemagick libmagic ncurses postgresql-client &&\
 	adduser --system --shell /bin/false --home ${HOME} akkoma &&\
 	mkdir -p ${DATA}/uploads &&\
 	mkdir -p ${DATA}/static &&\
 	chown -R akkoma ${DATA} &&\
 	mkdir -p /etc/akkoma &&\
 	chown -R akkoma /etc/akkoma
 USER akkoma
 COPY --from=build --chown=akkoma:0 /release ${HOME}
 COPY ./config/docker.exs /etc/akkoma/config.exs
 COPY ./docker-entrypoint.sh ${HOME}
 EXPOSE 4000
-ARG UID=1000
+ENTRYPOINT ["/opt/akkoma/docker-entrypoint.sh"]
 ARG GID=1000
 ARG UNAME=akkoma
 RUN addgroup -g $GID $UNAME
 RUN adduser -u $UID -G $UNAME -D -h $HOME $UNAME
 WORKDIR /opt/akkoma
 USER $UNAME
 RUN mix local.hex --force &&\
    mix local.rebar --force
 CMD ["/opt/akkoma/docker-entrypoint.sh"]
--- a/FEDERATION.md
+++ b/FEDERATION.md
@ -1,42 +0,0 @@
 # Federation
 ## Supported federation protocols and standards
 - [ActivityPub](https://www.w3.org/TR/activitypub/) (Server-to-Server)
 - [WebFinger](https://webfinger.net/)
 - [Http Signatures](https://datatracker.ietf.org/doc/html/draft-cavage-http-signatures)
 - [NodeInfo](https://nodeinfo.diaspora.software/)
 ## Supported FEPs
 - [FEP-67ff: FEDERATION](https://codeberg.org/fediverse/fep/src/branch/main/fep/67ff/fep-67ff.md)
 - [FEP-f1d5: NodeInfo in Fediverse Software](https://codeberg.org/fediverse/fep/src/branch/main/fep/f1d5/fep-f1d5.md)
 - [FEP-fffd: Proxy Objects](https://codeberg.org/fediverse/fep/src/branch/main/fep/fffd/fep-fffd.md)
 ## ActivityPub
 Akkoma mostly follows the server-to-server parts of the ActivityPub standard,
 but implements quirks for Mastodon compatibility as well as Mastodon-specific
 and custom extensions.
 See our documentation and Mastodon’s federation information
 linked further below for details on these quirks and extensions.
 Akkoma does not perform JSON-LD processing.
 ### Required extensions
 #### HTTP Signatures
 All AP S2S POST requests to Akkoma instances MUST be signed.
 Depending on instance configuration the same may be true for GET requests.
 ## Nodeinfo
 Akkoma provides many additional entries in its nodeinfo response,
 see the documentation linked below for details.
 ## Additional documentation
 - [Akkoma’s ActivityPub extensions](https://docs.akkoma.dev/develop/development/ap_extensions/)
 - [Akkoma’s nodeinfo extensions](https://docs.akkoma.dev/develop/development/nodeinfo_extensions/)
 - [Mastodon’s federation requirements](https://github.com/mastodon/mastodon/blob/main/FEDERATION.md)
--- a/7
+++ b/7
@ -0,0 +1,7 @@
 all:	install
 	pipenv run mkdocs build
 install:
 	pipenv install
 clean:
 	rm -rf docs
--- a/2
+++ b/2
@ -0,0 +1,2 @@
 web: mix phx.server
 release: mix ecto.migrate
--- a/README.md
+++ b/README.md
@ -2,39 +2,16 @@
 *a smallish microblogging platform, aka the cooler pleroma*
 ![English OK](https://img.shields.io/badge/English-OK-blueviolet) ![日本語OK](https://img.shields.io/badge/%E6%97%A5%E6%9C%AC%E8%AA%9E-OK-blueviolet)
 ## About 
 This is a fork of Pleroma, which is a microblogging server software that can federate (= exchange messages with) other servers that support ActivityPub. What that means is that you can host a server for yourself or your friends and stay in control of your online identity, but still exchange messages with people on larger servers. Akkoma will federate with all servers that implement ActivityPub, like Friendica, GNU Social, Hubzilla, Mastodon, Misskey, Peertube, and Pixelfed.
-Akkoma is written in Elixir and uses PostgreSQL for data storage.
+Akkoma is written in Elixir and uses PostgresSQL for data storage.
 For clients it supports the [Mastodon client API](https://docs.joinmastodon.org/api/guidelines/) with Pleroma extensions (see the API section on <https://docs.akkoma.dev/stable/>).
 - [Client Applications for Akkoma](https://docs.akkoma.dev/stable/clients/)
 ## Differences with Pleroma
 Akkoma is a faster-paced fork, it has a varied and potentially experimental feature set tailored specifically to the corner of the fediverse inhabited by the project
 creator and contributors.
 This should not be considered a one-for-one match with pleroma; it is more opinionated in many ways, and has a smaller community (which is good or
 bad depending on your view)
 For example, Akkoma has:
 - Custom Emoji reactions (compatible with misskey)
 - Misskey-flavoured markdown support
 - Elasticsearch and Meilisearch support for search
 - Mastodon frontend (Glitch-Soc and Fedibird flavours) support
 - Automatic post translation via DeepL or LibreTranslate
 - A multitude of heavy modifications to the Pleroma Frontend (Pleroma-FE)
 - The "bubble" concept, in which instance administrators can choose closely-related instances to make a "community of communities", so to say
 And takes a more opinionated stance on issues like Domain blocks, which are enforced far more on Akkoma.
 Take a look at the Changelog if you want a full list of recent changes, everything since 3.0 has been Akkoma.
 ## Installation
 ### OTP releases (Recommended)
@ -46,16 +23,15 @@ If your platform is not supported, or you just want to be able to edit the sourc
 - [Alpine Linux](https://docs.akkoma.dev/stable/installation/alpine_linux_en/)
 - [Arch Linux](https://docs.akkoma.dev/stable/installation/arch_linux_en/)
 - [Debian-based](https://docs.akkoma.dev/stable/installation/debian_based_en/)
 - [Debian-based (jp)](https://docs.akkoma.dev/stable/installation/debian_based_jp/)
 - [FreeBSD](https://docs.akkoma.dev/stable/installation/freebsd_en/)
 - [Gentoo Linux](https://docs.akkoma.dev/stable/installation/gentoo_en/)
 - [NetBSD](https://docs.akkoma.dev/stable/installation/netbsd_en/)
 - [OpenBSD](https://docs.akkoma.dev/stable/installation/openbsd_en/)
 - [OpenBSD (fi)](https://docs.akkoma.dev/stable/installation/openbsd_fi/)
 ### Docker
-Docker installation is supported via [this setup](https://docs.akkoma.dev/stable/installation/docker_en/)
+While we don’t provide docker files, other people have written very good ones. Take a look at <https://github.com/angristan/docker-pleroma> or <https://glitch.sh/sn0w/pleroma-docker>.
 ### Packages
 Akkoma is packaged for [YunoHost](https://yunohost.org) and can be found and installed from the [YunoHost app catalogue](https://yunohost.org/#/apps).
 ### Compilation Troubleshooting
 If you ever encounter compilation issues during the updating of Akkoma, you can try these commands and see if they fix things:
@ -67,4 +43,3 @@ If you ever encounter compilation issues during the updating of Akkoma, you can
 ## Documentation
 - https://docs.akkoma.dev/stable
 - https://docs.akkoma.dev/develop
--- a/SECURITY.md
+++ b/SECURITY.md
@ -1,21 +1,16 @@
-# Akkoma backend security handling
+# Pleroma backend security policy
 ## Supported versions
 Currently, Pleroma offers bugfixes and security patches only for the latest minor release.
 | Version | Support 
 |---------| --------
 | 2.2     | Bugfixes and security patches
 ## Reporting a vulnerability
-Please send an email (preferably encrypted) or
+Please use confidential issues (tick the "This issue is confidential and should only be visible to team members with at least Reporter access." box when submitting) at our [bugtracker](https://git.pleroma.social/pleroma/pleroma/-/issues/new) for reporting vulnerabilities.
 a DM via our IRC to one of the following people:
 | Forgejo nick | IRC nick      | Email         | GPG                                     |
 | ------------ | ------------- | ------------- | --------------------------------------- |
 | floatinghost | FloatingGhost | *see GPG key* | https://coffee-and-dreams.uk/pubkey.asc |
 ## Announcements
-New releases and security issues are announced at
+New releases are announced at [pleroma.social](https://pleroma.social/announcements/). All security releases are tagged with ["Security"](https://pleroma.social/announcements/tags/security/). You can be notified of them by subscribing to an Atom feed at <https://pleroma.social/announcements/tags/security/feed.xml>. 
 [meta.akkoma.dev](https://meta.akkoma.dev/c/releases) and
 [@akkoma@ihatebeinga.live](https://ihatebeinga.live/akkoma).
 Both also offer RSS feeds
 ([meta](https://meta.akkoma.dev/c/releases/7.rss),
 [fedi](https://ihatebeinga.live/users/akkoma.rss))
 so you can keep an eye on it without any accounts.
--- a/SIGNING_KEY.pub
+++ b/SIGNING_KEY.pub
@ -1,2 +0,0 @@
 untrusted comment: Akkoma Signing Key public key
 RWQRlw8Ex/uTbvo1wB1yK75tQ5nXKilB/vrKdkL41bgZHL9aKP+7fSS5
--- a/config/benchmark.exs
+++ b/config/benchmark.exs
@ -14,7 +14,7 @@
  method: Pleroma.Captcha.Mock
 # Print only warnings and errors during test
-config :logger, level: :warning
+config :logger, level: :warn
 config :pleroma, :auth, oauth_consumer_strategies: []
--- a/config/config.exs
+++ b/config/config.exs
@ -48,7 +48,6 @@
 config :pleroma, Pleroma.Repo,
  telemetry_event: [Pleroma.Repo.Instrumenter],
  queue_target: 20_000,
  migration_lock: nil
 config :pleroma, Pleroma.Captcha,
@ -61,11 +60,12 @@
 # Upload configuration
 config :pleroma, Pleroma.Upload,
  uploader: Pleroma.Uploaders.Local,
-  filters: [],
+  filters: [Pleroma.Upload.Filter.Dedupe],
  link_name: false,
  proxy_remote: false,
  filename_display_max_length: 30,
-  base_url: nil,
+  default_description: nil,
-  allowed_mime_types: ["image", "audio", "video"]
+  base_url: nil
 config :pleroma, Pleroma.Uploaders.Local, uploads: "uploads"
@ -110,6 +110,17 @@
    "xmpp"
  ]
 websocket_config = [
  path: "/websocket",
  serializer: [
    {Phoenix.Socket.V1.JSONSerializer, "~> 1.0.0"},
    {Phoenix.Socket.V2.JSONSerializer, "~> 2.0.0"}
  ],
  timeout: 60_000,
  transport_log: false,
  compress: false
 ]
 # Configures the endpoint
 config :pleroma, Pleroma.Web.Endpoint,
  url: [host: "localhost"],
@ -119,7 +130,10 @@
      {:_,
       [
         {"/api/v1/streaming", Pleroma.Web.MastodonAPI.WebsocketHandler, []},
-         {:_, Plug.Cowboy.Handler, {Pleroma.Web.Endpoint, []}}
+         {"/websocket", Phoenix.Endpoint.CowboyWebSocket,
          {Phoenix.Transports.WebSocket,
           {Pleroma.Web.Endpoint, Pleroma.Web.UserSocket, websocket_config}}},
         {:_, Phoenix.Endpoint.Cowboy2Handler, {Pleroma.Web.Endpoint, []}}
       ]}
    ]
  ],
@ -148,53 +162,29 @@
  format: "$metadata[$level] $message",
  metadata: [:request_id]
-# ———————————————————————————————————————————————————————————————
+config :quack,
-#                       W  A  R  N  I  N  G
+  level: :warn,
-# ———————————————————————————————————————————————————————————————
+  meta: [:all],
-#
+  webhook_url: "https://hooks.slack.com/services/YOUR-KEY-HERE"
-#  Whenever adding a privileged new custom type for e.g.
+
 #  ActivityPub objects, ALWAYS map their extension back
 #  to "application/octet-stream".
 #  Else files served by us can automatically end up with
 #  those privileged types causing severe security hazards.
 #  (We need those mappings so Phoenix can assoiate its format
 #   (the "extension") to incoming requests of those MIME types)
 #
 # ———————————————————————————————————————————————————————————————
 config :mime, :types, %{
  "application/xml" => ["xml"],
  "application/xrd+xml" => ["xrd+xml"],
  "application/jrd+json" => ["jrd+json"],
  "application/activity+json" => ["activity+json"],
-  "application/ld+json" => ["activity+json"],
+  "application/ld+json" => ["activity+json"]
  # Can be removed when bumping MIME past 2.0.5
  # see https://akkoma.dev/AkkomaGang/akkoma/issues/657
  "image/apng" => ["apng"]
 }
 config :mime, :extensions, %{
  "xrd+xml" => "text/plain",
  "jrd+json" => "text/plain",
  "activity+json" => "text/plain"
 }
 # ———————————————————————————————————————————————————————————————
 config :tesla, :adapter, {Tesla.Adapter.Finch, name: MyFinch}
 # Configures http settings, upstream proxy etc.
 config :pleroma, :http,
  pool_timeout: :timer.seconds(5),
  receive_timeout: :timer.seconds(15),
  proxy_url: nil,
  user_agent: :default,
-  pool_size: 10,
+  adapter: []
  adapter: [],
  # see: https://hexdocs.pm/finch/Finch.html#start_link/1
  pool_max_idle_time: :timer.seconds(30)
 config :pleroma, :instance,
-  name: "Akkoma",
+  name: "Pleroma",
  email: "example@example.com",
  notify_email: "noreply@example.com",
  description: "Akkoma: The cooler fediverse server",
@ -207,7 +197,6 @@
  avatar_upload_limit: 2_000_000,
  background_upload_limit: 4_000_000,
  banner_upload_limit: 4_000_000,
  languages: ["en"],
  poll_limits: %{
    max_options: 20,
    max_option_chars: 200,
@ -224,8 +213,9 @@
  federation_publisher_modules: [
    Pleroma.Web.ActivityPub.Publisher
  ],
-  allow_relay: false,
+  allow_relay: true,
  public: true,
  quarantined_instances: [],
  static_dir: "instance/static/",
  allowed_post_formats: [
    "text/plain",
@ -270,10 +260,7 @@
  password_reset_token_validity: 60 * 60 * 24,
  profile_directory: true,
  privileged_staff: false,
-  local_bubble: [],
+  local_bubble: []
  max_frontend_settings_json_chars: 100_000,
  export_prometheus_metrics: true,
  federated_timeline_available: true
 config :pleroma, :welcome,
  direct_message: [
@ -312,6 +299,7 @@
    alwaysShowSubjectInput: true,
    background: "/images/city.jpg",
    collapseMessageWithSubject: false,
    disableChat: false,
    greentext: false,
    hideFilteredStatuses: false,
    hideMutedPosts: false,
@ -322,19 +310,19 @@
    logo: "/static/logo.svg",
    logoMargin: ".1em",
    logoMask: true,
    minimalScopesMode: false,
    noAttachmentLinks: false,
    nsfwCensorImage: "",
    postContentType: "text/plain",
    redirectRootLogin: "/main/friends",
-    redirectRootNoLogin: "/main/public",
+    redirectRootNoLogin: "/main/all",
    scopeCopy: true,
    sidebarRight: false,
    showFeaturesPanel: true,
    showInstanceSpecificPanel: false,
    subjectLineBehavior: "email",
    theme: "pleroma-dark",
-    webPushNotifications: false,
+    webPushNotifications: false
    conversationDisplay: "linear"
  },
  masto_fe: %{
    showInstanceSpecificPanel: true
@ -365,7 +353,7 @@
 config :pleroma, :activitypub,
  unfollow_blocked: true,
-  outgoing_blocks: false,
+  outgoing_blocks: true,
  blockers_visible: true,
  follow_handshake_timeout: 500,
  note_replies_output_limit: 5,
@ -399,9 +387,7 @@
  accept: [],
  avatar_removal: [],
  banner_removal: [],
-  background_removal: [],
+  reject_deletes: []
  reject_deletes: [],
  handle_threads: true
 config :pleroma, :mrf_keyword,
  reject: [],
@ -421,14 +407,12 @@
  accept: [],
  reject: []
 config :pleroma, :mrf_inline_quote, prefix: "RE"
 # threshold of 7 days
 config :pleroma, :mrf_object_age,
  threshold: 604_800,
  actions: [:delist, :strip_followers]
-config :pleroma, :mrf_reject_newly_created_account_notes, age: 86_400
+config :pleroma, :mrf_follow_bot, follower_nickname: nil
 config :pleroma, :rich_media,
  enabled: true,
@ -439,11 +423,7 @@
    Pleroma.Web.RichMedia.Parsers.OEmbed
  ],
  failure_backoff: 60_000,
-  ttl_setters: [
+  ttl_setters: [Pleroma.Web.RichMedia.Parser.TTL.AwsSignedUrl]
    Pleroma.Web.RichMedia.Parser.TTL.AwsSignedUrl,
    Pleroma.Web.RichMedia.Parser.TTL.Opengraph
  ],
  max_body: 5_000_000
 config :pleroma, :media_proxy,
  enabled: false,
@ -457,8 +437,7 @@
    # Note: max_read_duration defaults to Pleroma.ReverseProxy.max_read_duration_default/1
    max_read_duration: 30_000
  ],
-  whitelist: [],
+  whitelist: []
  blocklist: []
 config :pleroma, Pleroma.Web.MediaProxy.Invalidation.Http,
  method: :purge,
@ -477,6 +456,10 @@
  image_quality: 85,
  min_content_length: 100 * 1024
 config :pleroma, :shout,
  enabled: true,
  limit: 5_000
 config :phoenix, :format_encoders, json: Jason, "activity+json": Jason
 config :phoenix, :json_library, Jason
@ -500,7 +483,8 @@
 config :pleroma, :http_security,
  enabled: true,
  sts: false,
-  sts_max_age: 63_072_000,
+  sts_max_age: 31_536_000,
  ct_max_age: 2_592_000,
  referrer_policy: "same-origin"
 config :cors_plug,
@ -523,6 +507,7 @@
    "~",
    "about",
    "activities",
    "akkoma",
    "api",
    "auth",
    "check_password",
@ -579,51 +564,19 @@
    attachments_cleanup: 1,
    new_users_digest: 1,
    mute_expire: 5,
-    search_indexing: 10,
+    search_indexing: 10
    nodeinfo_fetcher: 1,
    database_prune: 1,
    rich_media_backfill: 2,
    rich_media_expiration: 2
  ],
  plugins: [
    Oban.Plugins.Pruner,
    {Oban.Plugins.Reindexer, schedule: "@weekly"}
  ],
  plugins: [Oban.Plugins.Pruner],
  crontab: [
    {"0 0 * * 0", Pleroma.Workers.Cron.DigestEmailsWorker},
-    {"0 0 * * *", Pleroma.Workers.Cron.NewUsersDigestWorker},
+    {"0 0 * * *", Pleroma.Workers.Cron.NewUsersDigestWorker}
    {"0 3 * * *", Pleroma.Workers.Cron.PruneDatabaseWorker}
  ]
 config :pleroma, :workers,
  retries: [
    federator_incoming: 5,
    federator_outgoing: 5,
-    search_indexing: 2,
+    search_indexing: 2
    rich_media_backfill: 3
  ],
  timeout: [
    activity_expiration: :timer.seconds(5),
    token_expiration: :timer.seconds(5),
    filter_expiration: :timer.seconds(5),
    backup: :timer.seconds(900),
    federator_incoming: :timer.seconds(10),
    federator_outgoing: :timer.seconds(10),
    ingestion_queue: :timer.seconds(5),
    web_push: :timer.seconds(5),
    mailer: :timer.seconds(5),
    transmogrifier: :timer.seconds(5),
    scheduled_activities: :timer.seconds(5),
    poll_notifications: :timer.seconds(5),
    background: :timer.seconds(5),
    remote_fetcher: :timer.seconds(10),
    attachments_cleanup: :timer.seconds(900),
    new_users_digest: :timer.seconds(10),
    mute_expire: :timer.seconds(5),
    search_indexing: :timer.seconds(5),
    nodeinfo_fetcher: :timer.seconds(10),
    database_prune: :timer.minutes(10),
    rich_media_backfill: :timer.seconds(30)
  ]
 config :pleroma, Pleroma.Formatter,
@ -635,17 +588,6 @@
  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()
@ -669,10 +611,6 @@
 config :pleroma, Pleroma.Emails.Mailer, adapter: Swoosh.Adapters.Sendmail, enabled: false
 config :swoosh,
  api_client: Swoosh.ApiClient.Finch,
  finch_name: MyFinch
 config :pleroma, Pleroma.Emails.UserEmail,
  logo: nil,
  styling: %{
@ -762,9 +700,6 @@
  primary: %{"name" => "pleroma-fe", "ref" => "stable"},
  admin: %{"name" => "admin-fe", "ref" => "stable"},
  mastodon: %{"name" => "mastodon-fe", "ref" => "akkoma"},
  pickable: [
    "pleroma-fe/stable"
  ],
  swagger: %{
    "name" => "swagger-ui",
    "ref" => "stable",
@ -788,14 +723,6 @@
      "build_dir" => "distribution",
      "ref" => "akkoma"
    },
    "fedibird-fe" => %{
      "name" => "fedibird-fe",
      "git" => "https://akkoma.dev/AkkomaGang/fedibird-fe",
      "build_url" =>
        "https://akkoma-updates.s3-website.fr-par.scw.cloud/frontend/${ref}/fedibird-fe.zip",
      "build_dir" => "distribution",
      "ref" => "akkoma"
    },
    "admin-fe" => %{
      "name" => "admin-fe",
      "git" => "https://akkoma.dev/AkkomaGang/admin-fe",
@ -803,6 +730,14 @@
        "https://akkoma-updates.s3-website.fr-par.scw.cloud/frontend/${ref}/admin-fe.zip",
      "ref" => "stable"
    },
    "soapbox-fe" => %{
      "name" => "soapbox-fe",
      "git" => "https://gitlab.com/soapbox-pub/soapbox-fe",
      "build_url" =>
        "https://gitlab.com/soapbox-pub/soapbox-fe/-/jobs/artifacts/${ref}/download?job=build-production",
      "ref" => "v1.0.0",
      "build_dir" => "static"
    },
    # For developers - enables a swagger frontend to view the openapi spec
    "swagger-ui" => %{
      "name" => "swagger-ui",
@ -822,17 +757,15 @@
 config :pleroma, configurable_from_database: false
 config :pleroma, Pleroma.Repo,
-  parameters: [
+  parameters: [gin_fuzzy_search_limit: "500"],
-    gin_fuzzy_search_limit: "500",
+  prepare: :unnamed
    plan_cache_mode: "force_custom_plan"
  ]
 config :pleroma, :majic_pool, size: 2
 private_instance? = :if_instance_is_private
 config :pleroma, :restrict_unauthenticated,
-  timelines: %{local: private_instance?, federated: private_instance?, bubble: true},
+  timelines: %{local: private_instance?, federated: private_instance?},
  profiles: %{local: private_instance?, remote: private_instance?},
  activities: %{local: private_instance?, remote: private_instance?}
@ -841,15 +774,13 @@
 config :pleroma, :mrf,
  policies: [Pleroma.Web.ActivityPub.MRF.ObjectAgePolicy, Pleroma.Web.ActivityPub.MRF.TagPolicy],
  transparency: true,
-  transparency_exclusions: [],
+  transparency_exclusions: []
  transparency_obfuscate_domains: []
 config :ex_aws, http_client: Pleroma.HTTP.ExAws
 config :web_push_encryption, http_client: Pleroma.HTTP.WebPush
-config :pleroma, :instances_favicons, enabled: true
+config :pleroma, :instances_favicons, enabled: false
 config :pleroma, :instances_nodeinfo, enabled: true
 config :floki, :html_parser, Floki.HTMLParser.FastHtml
@ -866,8 +797,6 @@
  {Pleroma.Search, [max_running: 30, max_waiting: 50]}
 ]
 config :pleroma, Pleroma.Web.WebFinger, domain: nil, update_nickname_on_user_fetch: true
 config :pleroma, Pleroma.Search, module: Pleroma.Search.DatabaseSearch
 config :pleroma, Pleroma.Search.Meilisearch,
@ -891,24 +820,6 @@
    }
  }
 config :pleroma, :translator,
  enabled: false,
  module: Pleroma.Akkoma.Translators.DeepL
 config :pleroma, :deepl,
  # either :free or :pro
  tier: :free,
  api_key: ""
 config :pleroma, :libre_translate,
  url: "http://127.0.0.1:5000",
  api_key: nil
 config :pleroma, :argos_translate,
  command_argos_translate: "argos-translate",
  command_argospm: "argospm",
  strip_html: true
 # Import environment specific config. This must remain at the bottom
 # of this file so it overrides the configuration defined above.
 import_config "#{Mix.env()}.exs"
--- a/config/custom_emoji.txt
+++ b/config/custom_emoji.txt
@ -1,2 +0,0 @@
 hehe, /emoji/hehe.png, Akkoma
 nothehe, /emoji/nothehe.png, Akkoma
--- a/config/description.exs
+++ b/config/description.exs
@ -100,23 +100,18 @@
        label: "Base URL",
        type: :string,
        description:
-          "Base URL for the uploads. Required if you use a CDN or host attachments under a different domain - it is HIGHLY recommended that you **do not** set this to be the same as the domain akkoma is hosted on.",
+          "Base URL for the uploads. Required if you use a CDN or host attachments under a different domain.",
        suggestions: [
-          "https://media.akkoma.dev/media/"
+          "https://cdn-host.com"
        ]
      },
      %{
-        key: :allowed_mime_types,
+        key: :proxy_remote,
-        label: "Allowed MIME types",
+        type: :boolean,
-        type: {:list, :string},
+        description: """
-        description:
+        Proxy requests to the remote uploader.\n
-          "List of MIME (main) types uploads are allowed to identify themselves with. Other types may still be uploaded, but will identify as a generic binary to clients. WARNING: Loosening this over the defaults can lead to security issues. Removing types is safe, but only add to the list if you are sure you know what you are doing.",
+        Useful if media upload endpoint is not internet accessible.
-        suggestions: [
+        """
          "image",
          "audio",
          "video",
          "font"
        ]
      },
      %{
        key: :filename_display_max_length,
@ -214,26 +209,6 @@
      }
    ]
  },
  %{
    group: :pleroma,
    key: Pleroma.Upload.Filter.Exiftool.StripMetadata,
    type: :group,
    description: "Strip specified metadata from image uploads",
    children: [
      %{
        key: :purge,
        description: "Metadata fields or groups to strip",
        type: {:list, :string},
        suggestions: ["all", "CommonIFD0"]
      },
      %{
        key: :preserve,
        description: "Metadata fields or groups to preserve (takes precedence over stripping)",
        type: {:list, :string},
        suggestions: ["ColorSpaces", "Orientation"]
      }
    ]
  },
  %{
    group: :pleroma,
    key: Pleroma.Emails.Mailer,
@ -534,16 +509,6 @@
          "Pleroma"
        ]
      },
      %{
        key: :languages,
        type: {:list, :string},
        description: "Languages the instance uses",
        suggestions: [
          "en",
          "ja",
          "fr"
        ]
      },
      %{
        key: :email,
        label: "Admin Email Address",
@ -716,8 +681,8 @@
        key: :public,
        type: :boolean,
        description:
-          "Switching this on will allow unauthenticated users access to all public resources on your instance" <>
+          "Makes the client API in authenticated mode-only except for user-profiles." <>
-            " Switching it off is useful for disabling the Local Timeline and The Whole Known Network. " <>
+            " Useful for disabling the Local Timeline and The Whole Known Network. " <>
            " Note: when setting to `false`, please also check `:restrict_unauthenticated` setting."
      },
      %{
@ -726,7 +691,7 @@
        key_placeholder: "instance",
        value_placeholder: "reason",
        description:
-          "(Deprecated, will be removed in next release) List of ActivityPub instances where activities will not be sent, and the reason for doing so",
+          "List of ActivityPub instances where private (DMs, followers-only) activities will not be sent and the reason for doing so",
        suggestions: [
          {"quarantined.com", "Reason"},
          {"*.quarantined.com", "Reason"}
@ -748,8 +713,7 @@
          "text/plain",
          "text/html",
          "text/markdown",
-          "text/bbcode",
+          "text/bbcode"
          "text/x.misskeymarkdown"
        ]
      },
      %{
@ -815,7 +779,7 @@
      %{
        key: :healthcheck,
        type: :boolean,
-        description: "If enabled, system data will be shown on `/api/v1/pleroma/healthcheck`"
+        description: "If enabled, system data will be shown on `/api/pleroma/healthcheck`"
      },
      %{
        key: :remote_post_retention_days,
@ -989,17 +953,6 @@
        type: {:list, :string},
        description:
          "List of instances that make up your local bubble (closely-related instances). Used to populate the 'bubble' timeline (domain only)."
      },
      %{
        key: :export_prometheus_metrics,
        type: :boolean,
        description: "Enable prometheus metrics (at /api/v1/akkoma/metrics)"
      },
      %{
        key: :federated_timeline_available,
        type: :boolean,
        description:
          "Let people view the 'firehose' feed of all public statuses from all instances."
      }
    ]
  },
@ -1106,7 +1059,7 @@
        key: :level,
        type: {:dropdown, :atom},
        description: "Log level",
-        suggestions: [:debug, :info, :warning, :error]
+        suggestions: [:debug, :info, :warn, :error]
      },
      %{
        key: :ident,
@ -1139,7 +1092,7 @@
        key: :level,
        type: {:dropdown, :atom},
        description: "Log level",
-        suggestions: [:debug, :info, :warning, :error]
+        suggestions: [:debug, :info, :warn, :error]
      },
      %{
        key: :format,
@ -1154,6 +1107,45 @@
      }
    ]
  },
  %{
    group: :quack,
    type: :group,
    label: "Quack Logger",
    description: "Quack-related settings",
    children: [
      %{
        key: :level,
        type: {:dropdown, :atom},
        description: "Log level",
        suggestions: [:debug, :info, :warn, :error]
      },
      %{
        key: :meta,
        type: {:list, :atom},
        description: "Configure which metadata you want to report on",
        suggestions: [
          :application,
          :module,
          :file,
          :function,
          :line,
          :pid,
          :crash_reason,
          :initial_call,
          :registered_name,
          :all,
          :none
        ]
      },
      %{
        key: :webhook_url,
        label: "Webhook URL",
        type: :string,
        description: "Configure the Slack incoming webhook",
        suggestions: ["https://hooks.slack.com/services/YOUR-KEY-HERE"]
      }
    ]
  },
  %{
    group: :pleroma,
    key: :frontend_configurations,
@ -1177,6 +1169,7 @@
            hideFilteredStatuses: false,
            hideMutedPosts: false,
            hidePostStats: false,
            hideSitename: false,
            hideUserStats: false,
            loginMethod: "password",
            logo: "/static/logo.svg",
@ -1224,13 +1217,6 @@
            type: :boolean,
            description: "Enables green text on lines prefixed with the > character"
          },
          %{
            key: :conversationDisplay,
            label: "Conversation display style",
            type: :string,
            description: "How to display conversations (linear or tree)",
            suggestions: ["linear", "tree"]
          },
          %{
            key: :hideFilteredStatuses,
            label: "Hide Filtered Statuses",
@ -1249,6 +1235,12 @@
            type: :boolean,
            description: "Hide notices statistics (repeats, favorites, ...)"
          },
          %{
            key: :hideSitename,
            label: "Hide Sitename",
            type: :boolean,
            description: "Hides instance name from PleromaFE banner"
          },
          %{
            key: :hideUserStats,
            label: "Hide user stats",
@ -1279,6 +1271,14 @@
              "By default it assumes logo used will be monochrome with alpha channel to be compatible with both light and dark themes. " <>
                "If you want a colorful logo you must disable logoMask."
          },
          %{
            key: :minimalScopesMode,
            label: "Minimal scopes mode",
            type: :boolean,
            description:
              "Limit scope selection to Direct, User default, and Scope of post replying to. " <>
                "Also prevents replying to a DM with a public post from PleromaFE."
          },
          %{
            key: :nsfwCensorImage,
            label: "NSFW Censor Image",
@ -1292,13 +1292,7 @@
            label: "Post Content Type",
            type: {:dropdown, :atom},
            description: "Default post formatting option",
-            suggestions: [
+            suggestions: ["text/plain", "text/html", "text/markdown", "text/bbcode"]
              "text/plain",
              "text/html",
              "text/markdown",
              "text/bbcode",
              "text/x.misskeymarkdown"
            ]
          },
          %{
            key: :redirectRootNoLogin,
@ -1356,48 +1350,6 @@
            type: :string,
            description: "Which theme to use. Available themes are defined in styles.json",
            suggestions: ["pleroma-dark"]
          },
          %{
            key: :showPanelNavShortcuts,
            label: "Show timeline panel nav shortcuts",
            type: :boolean,
            description: "Whether to put timeline nav tabs on the top of the panel"
          },
          %{
            key: :showNavShortcuts,
            label: "Show navbar shortcuts",
            type: :boolean,
            description: "Whether to put extra navigation options on the navbar"
          },
          %{
            key: :showWiderShortcuts,
            label: "Increase navbar shortcut spacing",
            type: :boolean,
            description: "Whether to add extra space between navbar icons"
          },
          %{
            key: :hideSiteFavicon,
            label: "Hide site favicon",
            type: :boolean,
            description: "Whether to hide the instance favicon from the navbar"
          },
          %{
            key: :hideSiteName,
            label: "Hide site name",
            type: :boolean,
            description: "Whether to hide the site name from the navbar"
          },
          %{
            key: :renderMisskeyMarkdown,
            label: "Render misskey markdown",
            type: :boolean,
            description: "Whether to render Misskey-flavoured markdown"
          },
          %{
            key: :stopGifs,
            label: "Stop Gifs",
            type: :boolean,
            description: "Whether to pause animated images until they're hovered on"
          }
        ]
      },
@ -1490,14 +1442,13 @@
      %{
        key: :theme_color,
        type: :string,
-        description: "Describe the theme color of the app - this is only used for mastodon-fe",
+        description: "Describe the theme color of the app",
        suggestions: ["#282c37", "mediumpurple"]
      },
      %{
        key: :background_color,
        type: :string,
-        description:
+        description: "Describe the background color of the app",
          "Describe the background color of the app - this is only used for mastodon-fe",
        suggestions: ["#191b22", "aliceblue"]
      }
    ]
@ -1583,21 +1534,7 @@
      %{
        key: :whitelist,
        type: {:list, :string},
-        description: """
+        description: "List of hosts with scheme to bypass the MediaProxy",
        List of hosts with scheme to bypass the MediaProxy.\n
        The media will be fetched by the client, directly from the remote server.\n
        To allow this, it will Content-Security-Policy exceptions for each instance listed.\n
        This is to be used for instances you trust and do not want to cache media for.
        """,
        suggestions: ["http://example.com"]
      },
      %{
        key: :blocklist,
        type: {:list, :string},
        description: """
        List of hosts with scheme which will not go through the MediaProxy, and will not be explicitly allowed by the Content-Security-Policy.
        This is to be used for instances where you do not want their media to go through your server or to be accessed by clients.
        """,
        suggestions: ["http://example.com"]
      }
    ]
@ -1718,11 +1655,6 @@
        type: :boolean,
        description: "Sign object fetches with HTTP signatures"
      },
      %{
        key: :authorized_fetch_mode,
        type: :boolean,
        description: "Require HTTP signatures on AP fetches"
      },
      %{
        key: :note_replies_output_limit,
        type: :integer,
@ -1767,7 +1699,14 @@
        label: "STS max age",
        type: :integer,
        description: "The maximum age for the Strict-Transport-Security header if sent",
-        suggestions: [63_072_000]
+        suggestions: [31_536_000]
      },
      %{
        key: :ct_max_age,
        label: "CT max age",
        type: :integer,
        description: "The maximum age for the Expect-CT header if sent",
        suggestions: [2_592_000]
      },
      %{
        key: :referrer_policy,
@ -1883,7 +1822,7 @@
        key: :log,
        type: {:dropdown, :atom},
        description: "Logs verbose mode",
-        suggestions: [false, :error, :warning, :info, :debug]
+        suggestions: [false, :error, :warn, :info, :debug]
      },
      %{
        key: :queues,
@ -1989,32 +1928,6 @@
          federator_incoming: 5,
          federator_outgoing: 5
        ]
      },
      %{
        key: :timeout,
        type: {:keyword, :integer},
        description: "Timeout for jobs, per `Oban` queue, in ms",
        suggestions: [
          activity_expiration: :timer.seconds(5),
          token_expiration: :timer.seconds(5),
          filter_expiration: :timer.seconds(5),
          backup: :timer.seconds(900),
          federator_incoming: :timer.seconds(10),
          federator_outgoing: :timer.seconds(10),
          ingestion_queue: :timer.seconds(5),
          web_push: :timer.seconds(5),
          mailer: :timer.seconds(5),
          transmogrifier: :timer.seconds(5),
          scheduled_activities: :timer.seconds(5),
          poll_notifications: :timer.seconds(5),
          background: :timer.seconds(5),
          remote_fetcher: :timer.seconds(10),
          attachments_cleanup: :timer.seconds(900),
          new_users_digest: :timer.seconds(10),
          mute_expire: :timer.seconds(5),
          search_indexing: :timer.seconds(5),
          nodeinfo_fetcher: :timer.seconds(10)
        ]
      }
    ]
  },
@ -2222,104 +2135,6 @@
      }
    ]
  },
  %{
    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,
@ -2676,28 +2491,12 @@
    type: :group,
    description: "HTTP settings",
    children: [
      %{
        key: :pool_timeout,
        label: "HTTP Pool Request Timeout",
        type: :integer,
        description: "Timeout for initiating HTTP requests (in ms, default 5000)",
        suggestions: [5000]
      },
      %{
        key: :receive_timeout,
        label: "HTTP Receive Timeout",
        type: :integer,
        description:
          "Timeout for waiting on remote servers to respond to HTTP requests (in ms, default 15000)",
        suggestions: [15000]
      },
      %{
        key: :proxy_url,
        label: "Proxy URL",
-        type: :string,
+        type: [:string, :tuple],
-        description:
+        description: "Proxy URL",
-          "Proxy URL - of the format http://host:port. Advise setting in .exs instead of admin-fe due to this being set at boot-time.",
+        suggestions: ["localhost:9020", {:socks5, :localhost, 3090}]
        suggestions: ["http://localhost:3128"]
      },
      %{
        key: :user_agent,
@ -2706,12 +2505,6 @@
          "What user agent to use. Must be a string or an atom `:default`. Default value is `:default`.",
        suggestions: ["Pleroma", :default]
      },
      %{
        key: :pool_size,
        type: :integer,
        description: "Number of concurrent outbound HTTP requests to allow PER HOST. Default 10.",
        suggestions: [10]
      },
      %{
        key: :adapter,
        type: :keyword,
@ -2733,13 +2526,6 @@
            ]
          }
        ]
      },
      %{
        key: :pool_max_idle_time,
        type: :integer,
        description:
          "Number of seconds to retain an HTTP pool; pool will remain if actively in use. Default 30 seconds (in ms).",
        suggestions: [30_000]
      }
    ]
  },
@ -3029,7 +2815,8 @@
    key: :restrict_unauthenticated,
    label: "Restrict Unauthenticated",
    type: :group,
-    description: "Disallow unauthenticated viewing of timelines, user profiles and statuses.",
+    description:
      "Disallow viewing timelines, user profiles and statuses for unauthenticated users.",
    children: [
      %{
        key: :timelines,
@ -3039,17 +2826,12 @@
          %{
            key: :local,
            type: :boolean,
-            description: "Disallow viewing the public timeline."
+            description: "Disallow view public timeline."
          },
          %{
            key: :federated,
            type: :boolean,
-            description: "Disallow viewing the whole known network timeline."
+            description: "Disallow view federated timeline."
          },
          %{
            key: :bubble,
            type: :boolean,
            description: "Disallow viewing the bubble timeline."
          }
        ]
      },
@ -3061,29 +2843,29 @@
          %{
            key: :local,
            type: :boolean,
-            description: "Disallow viewing local user profiles."
+            description: "Disallow view local user profiles."
          },
          %{
            key: :remote,
            type: :boolean,
-            description: "Disallow viewing remote user profiles."
+            description: "Disallow view remote user profiles."
          }
        ]
      },
      %{
        key: :activities,
        type: :map,
-        description: "Settings for posts.",
+        description: "Settings for statuses.",
        children: [
          %{
            key: :local,
            type: :boolean,
-            description: "Disallow viewing local posts."
+            description: "Disallow view local statuses."
          },
          %{
            key: :remote,
            type: :boolean,
-            description: "Disallow viewing remote posts."
+            description: "Disallow view remote statuses."
          }
        ]
      }
@ -3115,19 +2897,6 @@
      }
    ]
  },
  %{
    group: :pleroma,
    key: :instances_nodeinfo,
    type: :group,
    description: "Control favicons for instances",
    children: [
      %{
        key: :enabled,
        type: :boolean,
        description: "Allow/disallow getting instance nodeinfo"
      }
    ]
  },
  %{
    group: :ex_aws,
    key: :s3,
@ -3205,12 +2974,6 @@
        description:
          "A map containing available frontends and parameters for their installation.",
        children: frontend_options
      },
      %{
        key: :pickable,
        type: {:list, :string},
        description:
          "A list containing all frontends users can pick as their preference, format is :name/:ref, e.g pleroma-fe/stable."
      }
    ]
  },
@ -3319,14 +3082,13 @@
    group: :pleroma,
    key: Pleroma.Search,
    type: :group,
    label: "Search",
    description: "General search settings.",
    children: [
      %{
        key: :module,
-        type: :module,
+        type: :keyword,
        description: "Selected search module.",
-        suggestions: {:list_behaviour_implementations, Pleroma.Search.SearchBackend}
+        suggestion: [Pleroma.Search.DatabaseSearch, Pleroma.Search.Meilisearch]
      }
    ]
  },
@ -3351,7 +3113,7 @@
      },
      %{
        key: :initial_indexing_chunk_size,
-        type: :integer,
+        type: :int,
        description:
          "Amount of posts in a batch when running the initial indexing operation. Should probably not be more than 100000" <>
            " since there's a limit on maximum insert size",
@ -3362,7 +3124,6 @@
  %{
    group: :pleroma,
    key: Pleroma.Search.Elasticsearch.Cluster,
    label: "Elasticsearch",
    type: :group,
    description: "Elasticsearch settings.",
    children: [
@ -3429,13 +3190,13 @@
              },
              %{
                key: :bulk_page_size,
-                type: :integer,
+                type: :int,
                description: "Size for bulk put requests, mostly used on building the index",
                suggestion: [5000]
              },
              %{
                key: :bulk_wait_interval,
-                type: :integer,
+                type: :int,
                description: "Time to wait between bulk put requests (in ms)",
                suggestion: [15_000]
              }
@ -3444,93 +3205,5 @@
        ]
      }
    ]
  },
  %{
    group: :pleroma,
    key: :translator,
    type: :group,
    description: "Translation Settings",
    children: [
      %{
        key: :enabled,
        type: :boolean,
        description: "Is translation enabled?",
        suggestion: [true, false]
      },
      %{
        key: :module,
        type: :module,
        description: "Translation module.",
        suggestions: {:list_behaviour_implementations, Pleroma.Akkoma.Translator}
      }
    ]
  },
  %{
    group: :pleroma,
    key: :deepl,
    label: "DeepL",
    type: :group,
    description: "DeepL Settings.",
    children: [
      %{
        key: :tier,
        type: {:dropdown, :atom},
        description: "API Tier",
        suggestions: [:free, :pro]
      },
      %{
        key: :api_key,
        type: :string,
        description: "API key for DeepL",
        suggestions: [nil]
      }
    ]
  },
  %{
    group: :pleroma,
    key: :libre_translate,
    type: :group,
    description: "LibreTranslate Settings.",
    children: [
      %{
        key: :url,
        type: :string,
        description: "URL for libretranslate",
        suggestion: [nil]
      },
      %{
        key: :api_key,
        type: :string,
        description: "API key for libretranslate",
        suggestion: [nil]
      }
    ]
  },
  %{
    group: :pleroma,
    key: :argos_translate,
    type: :group,
    description: "ArgosTranslate Settings.",
    children: [
      %{
        key: :command_argos_translate,
        type: :string,
        description:
          "command for `argos-translate`. Can be the command if it's in your PATH, or the full path to the file.",
        suggestion: ["argos-translate"]
      },
      %{
        key: :command_argospm,
        type: :string,
        description:
          "command for `argospm`. Can be the command if it's in your PATH, or the full path to the file.",
        suggestion: ["argospm"]
      },
      %{
        key: :strip_html,
        type: :boolean,
        description: "Strip html from the post before translating it."
      }
    ]
  }
 ]
--- a/config/docker.exs
+++ b/config/docker.exs
@ -24,11 +24,11 @@
 config :web_push_encryption, :vapid_details, subject: "mailto:#{System.get_env("NOTIFY_EMAIL")}"
 config :pleroma, :database, rum_enabled: false
-config :pleroma, :instance, static_dir: "/var/lib/akkoma/static"
+config :pleroma, :instance, static_dir: "/var/lib/pleroma/static"
-config :pleroma, Pleroma.Uploaders.Local, uploads: "/var/lib/akkoma/uploads"
+config :pleroma, Pleroma.Uploaders.Local, uploads: "/var/lib/pleroma/uploads"
 # We can't store the secrets in this file, since this is baked into the docker image
-if not File.exists?("/var/lib/akkoma/secret.exs") do
+if not File.exists?("/var/lib/pleroma/secret.exs") do
  secret = :crypto.strong_rand_bytes(64) |> Base.encode64() |> binary_part(0, 64)
  signing_salt = :crypto.strong_rand_bytes(8) |> Base.encode64() |> binary_part(0, 8)
  {web_push_public_key, web_push_private_key} = :crypto.generate_key(:ecdh, :prime256v1)
@ -52,16 +52,16 @@
      web_push_private_key: Base.url_encode64(web_push_private_key, padding: false)
    )
-  File.write("/var/lib/akkoma/secret.exs", secret_file)
+  File.write("/var/lib/pleroma/secret.exs", secret_file)
 end
-import_config("/var/lib/akkoma/secret.exs")
+import_config("/var/lib/pleroma/secret.exs")
 # For additional user config
-if File.exists?("/var/lib/akkoma/config.exs"),
+if File.exists?("/var/lib/pleroma/config.exs"),
-  do: import_config("/var/lib/akkoma/config.exs"),
+  do: import_config("/var/lib/pleroma/config.exs"),
  else:
-    File.write("/var/lib/akkoma/config.exs", """
+    File.write("/var/lib/pleroma/config.exs", """
    import Config
    # For additional configuration outside of environmental variables
--- a/config/dokku.exs
+++ b/config/dokku.exs
@ -0,0 +1,25 @@
 import Config
 config :pleroma, Pleroma.Web.Endpoint,
  http: [
    port: String.to_integer(System.get_env("PORT") || "4000"),
    protocol_options: [max_request_line_length: 8192, max_header_value_length: 8192]
  ],
  protocol: "http",
  secure_cookie_flag: false,
  url: [host: System.get_env("APP_HOST"), scheme: "https", port: 443],
  secret_key_base: "+S+ULgf7+N37c/lc9K66SMphnjQIRGklTu0BRr2vLm2ZzvK0Z6OH/PE77wlUNtvP"
 database_url =
  System.get_env("DATABASE_URL") ||
    raise """
    environment variable DATABASE_URL is missing.
    For example: ecto://USER:PASS@HOST/DATABASE
    """
 config :pleroma, Pleroma.Repo,
  # ssl: true,
  url: database_url,
  pool_size: String.to_integer(System.get_env("POOL_SIZE") || "10")
 config :pleroma, :instance, name: "#{System.get_env("APP_NAME")} CI Instance"
--- a/config/emoji.txt
+++ b/config/emoji.txt
@ -0,0 +1,4 @@
 firefox, /emoji/Firefox.gif, Gif,Fun
 blank, /emoji/blank.png, Fun
 dinosaur, /emoji/dino walking.gif, Gif
 100a, /emoji/100a.png, Fun
--- a/config/test.exs
+++ b/config/test.exs
@ -16,17 +16,15 @@
 # Print only warnings and errors during test
 config :logger, :console,
-  level: :warning,
+  level: :warn,
  format: "\n[$level] $message\n"
 config :pleroma, :auth, oauth_consumer_strategies: []
 config :pleroma, Pleroma.Upload,
  base_url: "http://localhost:4001/media/",
  filters: [],
-  link_name: false
+  link_name: false,
-
+  default_description: :filename
 config :pleroma, :media_proxy, base_url: "http://localhost:4001"
 config :pleroma, Pleroma.Uploaders.Local, uploads: "test/uploads"
@ -51,8 +49,7 @@
  hostname: System.get_env("DB_HOST") || "localhost",
  pool: Ecto.Adapters.SQL.Sandbox,
  pool_size: 50,
-  queue_target: 5000,
+  queue_target: 5000
  log: false
 config :pleroma, :dangerzone, override_repo_pool_size: true
@ -64,8 +61,7 @@
 config :pleroma, :rich_media,
  enabled: false,
  ignore_hosts: [],
-  ignore_tld: ["local", "localdomain", "lan"],
+  ignore_tld: ["local", "localdomain", "lan"]
  max_body: 2_000_000
 config :pleroma, :instance,
  multi_factor_authentication: [
@ -86,7 +82,10 @@
    "BLH1qVhJItRGCfxgTtONfsOKDc9VRAraXw-3NsmjMngWSh7NxOizN6bkuRA7iLTMPS82PjwJAr3UoK9EC1IFrz4",
  private_key: "_-XZ0iebPrRfZ_o0-IatTdszYa8VCH1yLN-JauK7HHA"
-config :pleroma, Oban, testing: :manual
+config :pleroma, Oban,
  queues: false,
  crontab: false,
  plugins: false
 config :pleroma, Pleroma.ScheduledActivity,
  daily_user_limit: 2,
@ -127,8 +126,6 @@
 config :pleroma, :cachex, provider: Pleroma.CachexMock
 config :pleroma, Pleroma.Web.WebFinger, update_nickname_on_user_fetch: false
 config :pleroma, :side_effects,
  ap_streamer: Pleroma.Web.ActivityPub.ActivityPubMock,
  logger: Pleroma.LoggerMock
@ -140,10 +137,6 @@
 # Reduce recompilation time
 # https://dashbit.co/blog/speeding-up-re-compilation-of-elixir-projects
 config :phoenix, :plug_init_mode, :runtime
 config :pleroma, :instances_favicons, enabled: false
 config :pleroma, :instances_nodeinfo, enabled: false
 config :pleroma, Pleroma.Web.RichMedia.Backfill, provider: Pleroma.Web.RichMedia.Backfill
 if File.exists?("./config/test.secret.exs") do
  import_config "test.secret.exs"
--- a/coveralls.json
+++ b/coveralls.json
@ -0,0 +1,7 @@
 {
  "skip_files": [
    "test/support",
    "lib/mix/tasks/pleroma/benchmark.ex",
    "lib/credo/check/consistency/file_location.ex"
  ]
 }
--- a/diagnostic-tools/binary-leak-checker.sh
+++ b/diagnostic-tools/binary-leak-checker.sh
@ -1,10 +0,0 @@
 if [ "$#" -ne 2 ]; then
 	echo "Usage: binary-leak-checker.sh <nodename> <erlang cookie>"
 	exit 1
 fi
 echo "The command you want to run is:
 :recon.bin_leak(10)
 "
 iex --sname debug --remsh $1 --erl "-setcookie $2" 
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -1,62 +0,0 @@
 version: "3.7"
 services:
  db:
    image: akkoma-db:latest
    build: ./docker-resources/database
    shm_size: 4gb
    restart: unless-stopped
    user: ${DOCKER_USER}
    environment: {
      # This might seem insecure but is usually not a problem.
      # You should leave this at the "akkoma" default.
      # The DB is only reachable by containers in the same docker network,
      # and is not exposed to the open internet.
      #
      # If you do change this, remember to update "config.exs".
      POSTGRES_DB: akkoma,
      POSTGRES_USER: akkoma,
      POSTGRES_PASSWORD: akkoma,
    }
    env_file:
      - .env 
    volumes:
      - type: bind
        source: ./pgdata
        target: /var/lib/postgresql/data
  akkoma:
    image: akkoma:latest
    build: .
    restart: unless-stopped
    env_file:
      - .env
    links:
      - db
    ports: [
      # Uncomment/Change port mappings below as needed.
      # The left side is your host machine, the right one is the akkoma container.
      # You can prefix the left side with an ip.
      # Webserver (for reverse-proxies outside of docker)
      # If you use a dockerized proxy, you can leave this commented
      # and use a container link instead.
      "127.0.0.1:4000:4000",
    ]
    volumes:
      - .:/opt/akkoma
  # Copy this into docker-compose.override.yml and uncomment there if you want to use a reverse proxy
  #proxy:
  #  image: caddy:2-alpine
  #  restart: unless-stopped
  #  links:
  #    - akkoma
  #  ports: [
  #     "443:443",
  #     "80:80"
  #  ]
  #  volumes:
  #    - ./docker-resources/Caddyfile:/etc/caddy/Caddyfile
  #    - ./caddy-data:/data
  #    - ./caddy-config:/config
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@ -8,7 +8,7 @@ while ! pg_isready -U ${DB_USER:-pleroma} -d postgres://${DB_HOST:-db}:5432/${DB
 done
 echo "-- Running migrations..."
-mix ecto.migrate
+$HOME/bin/pleroma_ctl migrate
 echo "-- Starting!"
-elixir --erl "+sbwt none +sbwtdcpu none +sbwtdio none" -S mix phx.server
+exec $HOME/bin/pleroma start
--- a/docker-resources/Caddyfile.example
+++ b/docker-resources/Caddyfile.example
@ -1,14 +0,0 @@
 # default docker Caddyfile config for Akkoma
 #
 # Simple installation instructions:
 # 1. Replace 'example.tld' with your instance's domain wherever it appears.
 example.tld  {
  log {
    output file /var/log/caddy/akkoma.log
  }
  encode gzip
  reverse_proxy akkoma:4000
 }
--- a/docker-resources/build.sh
+++ b/docker-resources/build.sh
@ -1,4 +0,0 @@
 #!/bin/sh
 docker compose build --build-arg UID=$(id -u) --build-arg GID=$(id -g) akkoma
 docker compose build --build-arg UID=$(id -u) --build-arg GID=$(id -g) db
--- a/docker-resources/database/Dockerfile
+++ b/docker-resources/database/Dockerfile
@ -1,10 +0,0 @@
 FROM postgres:14-alpine
 ARG UID=1000
 ARG GID=1000
 ARG UNAME=akkoma
 RUN addgroup -g $GID $UNAME
 RUN adduser -u $UID -G $UNAME -D -h $HOME $UNAME
 USER akkoma
--- a/docker-resources/env.example
+++ b/docker-resources/env.example
@ -1,5 +0,0 @@
 MIX_ENV=prod
 ERL_EPMD_ADDRESS=127.0.0.1
 DB_NAME=akkoma
 DB_USER=akkoma
 DB_PASS=akkoma
--- a/docker-resources/manage.sh
+++ b/docker-resources/manage.sh
@ -1,3 +0,0 @@
 #!/bin/sh
 docker compose run --rm akkoma $@
--- a/docs/Makefile
+++ b/docs/Makefile
@ -1,14 +1,7 @@
 all:	install
 	pipenv run mkdocs build
 branch := $(shell git rev-parse --abbrev-ref HEAD)
 install:
 	pipenv install
 clean:
 	rm -rf site
 serve:
 	pipenv run python3 -m http.server -d site  
 zip:
 	zip -r docs.zip site/*
 deploy:
 	cd site && rclone copy . scaleway:akkoma-docs/$(branch)
--- a/docs/Pipfile.lock
+++ b/docs/Pipfile.lock
@ -14,22 +14,6 @@
        ]
    },
    "default": {
        "certifi": {
            "hashes": [
                "sha256:0d9c601124e5a6ba9712dbc60d9c53c21e34f5f641fe83002317394311bdce14",
                "sha256:90c1a32f1d68f940488354e36370f6cca89f0f106db09518524c88d6ed83f382"
            ],
            "markers": "python_full_version >= '3.6.0'",
            "version": "==2022.9.24"
        },
        "charset-normalizer": {
            "hashes": [
                "sha256:5a3d016c7c547f69d6f81fb0db9449ce888b418b5b9952cc5e6e66843e9dd845",
                "sha256:83e9a75d1911279afd89352c68b45348559d1fc0506b054b346651b5e7fee29f"
            ],
            "markers": "python_full_version >= '3.6.0'",
            "version": "==2.1.1"
        },
        "click": {
            "hashes": [
                "sha256:7682dc8afb30297001674575ea00d1814d808d6a36af415a82bd481d37ba7b8e",
@ -45,13 +29,13 @@
            ],
            "version": "==2.1.0"
        },
-        "idna": {
+        "importlib-metadata": {
            "hashes": [
-                "sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4",
+                "sha256:637245b8bab2b6502fcbc752cc4b7a6f6243bb02b31c5c26156ad103d3d45670",
-                "sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2"
+                "sha256:7401a975809ea1fdc658c3aa4f78cc2195a0e019c5cbc4c06122884e9ae80c23"
            ],
-            "markers": "python_version >= '3.5'",
+            "markers": "python_version >= '3.7'",
-            "version": "==3.4"
+            "version": "==4.12.0"
        },
        "jinja2": {
            "hashes": [
@ -66,16 +50,15 @@
                "sha256:cbb516f16218e643d8e0a95b309f77eb118cb138d39a4f27851e6a63581db874",
                "sha256:f5da449a6e1c989a4cea2631aa8ee67caa5a2ef855d551c88f9e309f4634c621"
            ],
-            "markers": "python_full_version >= '3.6.0'",
+            "markers": "python_version >= '3.6'",
            "version": "==3.3.7"
        },
        "markdown-include": {
            "hashes": [
-                "sha256:b8f6b6f4e8b506cbe773d7e26c74a97d1354c35f3a3452d3449140a8f578d665",
+                "sha256:6f5d680e36f7780c7f0f61dca53ca581bd50d1b56137ddcd6353efafa0c3e4a2"
                "sha256:d12fb51500c46334a53608635035c78b7d8ad7f772566f70b8a6a9b2ef2ddbf5"
            ],
            "index": "pypi",
-            "version": "==0.8.0"
+            "version": "==0.6.0"
        },
        "markupsafe": {
            "hashes": [
@ -128,56 +111,56 @@
                "sha256:0096d52e9dad9939c3d975a774666af186eda617e6ca84df4c94dec30004f2a8",
                "sha256:70775750742b25c0d8f36c55aed03d24c3384d17c951b3175d898bd778ef0307"
            ],
-            "markers": "python_full_version >= '3.6.0'",
+            "markers": "python_version >= '3.6'",
            "version": "==1.3.4"
        },
        "mkdocs": {
            "hashes": [
-                "sha256:8947af423a6d0facf41ea1195b8e1e8c85ad94ac95ae307fe11232e0424b11c5",
+                "sha256:26bd2b03d739ac57a3e6eed0b7bcc86168703b719c27b99ad6ca91dc439aacde",
-                "sha256:c8856a832c1e56702577023cd64cc5f84948280c1c0fcc6af4cd39006ea6aa8c"
+                "sha256:b504405b04da38795fec9b2e5e28f6aa3a73bb0960cb6d5d27ead28952bd35ea"
            ],
-            "markers": "python_version >= '3.7'",
+            "markers": "python_version >= '3.6'",
-            "version": "==1.4.2"
+            "version": "==1.3.0"
        },
        "mkdocs-material": {
            "hashes": [
-                "sha256:b0ea0513fd8cab323e8a825d6692ea07fa83e917bb5db042e523afecc7064ab7",
+                "sha256:263f2721f3abe533b61f7c8bed435a0462620912742c919821ac2d698b4bfe67",
-                "sha256:c907b4b052240a5778074a30a78f31a1f8ff82d7012356dc26898b97559f082e"
+                "sha256:dc82b667d2a83f0de581b46a6d0949732ab77e7638b87ea35b770b33bc02e75a"
            ],
            "index": "pypi",
-            "version": "==8.5.11"
+            "version": "==8.3.9"
        },
        "mkdocs-material-extensions": {
            "hashes": [
-                "sha256:9c003da71e2cc2493d910237448c672e00cefc800d3d6ae93d2fc69979e3bd93",
+                "sha256:a82b70e533ce060b2a5d9eb2bc2e1be201cf61f901f93704b4acf6e3d5983a44",
-                "sha256:e41d9f38e4798b6617ad98ca8f7f1157b1e4385ac1459ca1e4ea219b556df945"
+                "sha256:bfd24dfdef7b41c312ede42648f9eb83476ea168ec163b613f9abd12bbfddba2"
            ],
-            "markers": "python_version >= '3.7'",
+            "markers": "python_version >= '3.6'",
-            "version": "==1.1.1"
+            "version": "==1.0.3"
        },
        "packaging": {
            "hashes": [
                "sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb",
                "sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522"
            ],
-            "markers": "python_full_version >= '3.6.0'",
+            "markers": "python_version >= '3.6'",
            "version": "==21.3"
        },
        "pygments": {
            "hashes": [
-                "sha256:56a8508ae95f98e2b9bdf93a6be5ae3f7d8af858b43e02c5a2ff083726be40c1",
+                "sha256:5eb116118f9612ff1ee89ac96437bb6b49e8f04d8a13b514ba26f620208e26eb",
-                "sha256:f643f331ab57ba3c9d89212ee4a2dabc6e94f117cf4eefde99a0574720d14c42"
+                "sha256:dc9c10fb40944260f6ed4c688ece0cd2048414940f1cea51b8b226318411c519"
            ],
-            "markers": "python_full_version >= '3.6.0'",
+            "markers": "python_version >= '3.6'",
-            "version": "==2.13.0"
+            "version": "==2.12.0"
        },
        "pymdown-extensions": {
            "hashes": [
-                "sha256:0f8fb7b74a37a61cc34e90b2c91865458b713ec774894ffad64353a5fce85cfc",
+                "sha256:3ef2d998c0d5fa7eb09291926d90d69391283561cf6306f85cd588a5eb5befa0",
-                "sha256:ac698c15265680db5eb13cd4342abfcde2079ac01e5486028f47a1b41547b859"
+                "sha256:ec141c0f4983755349f0c8710416348d1a13753976c028186ed14f190c8061c4"
            ],
            "markers": "python_version >= '3.7'",
-            "version": "==9.9"
+            "version": "==9.5"
        },
        "pyparsing": {
            "hashes": [
@ -197,7 +180,6 @@
        },
        "pyyaml": {
            "hashes": [
                "sha256:01b45c0191e6d66c470b6cf1b9531a771a83c1c4208272ead47a3ae4f2f603bf",
                "sha256:0283c35a6a9fbf047493e3a0ce8d79ef5030852c51e9d911a27badfde0605293",
                "sha256:055d937d65826939cb044fc8c9b08889e8c743fdc6a32b33e2390f66013e449b",
                "sha256:07751360502caac1c067a8132d150cf3d61339af5691fe9e87803040dbc5db57",
@ -209,36 +191,30 @@
                "sha256:277a0ef2981ca40581a47093e9e2d13b3f1fbbeffae064c1d21bfceba2030287",
                "sha256:2cd5df3de48857ed0544b34e2d40e9fac445930039f3cfe4bcc592a1f836d513",
                "sha256:40527857252b61eacd1d9af500c3337ba8deb8fc298940291486c465c8b46ec0",
                "sha256:432557aa2c09802be39460360ddffd48156e30721f5e8d917f01d31694216782",
                "sha256:473f9edb243cb1935ab5a084eb238d842fb8f404ed2193a915d1784b5a6b5fc0",
                "sha256:48c346915c114f5fdb3ead70312bd042a953a8ce5c7106d5bfb1a5254e47da92",
                "sha256:50602afada6d6cbfad699b0c7bb50d5ccffa7e46a3d738092afddc1f9758427f",
                "sha256:68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2",
                "sha256:77f396e6ef4c73fdc33a9157446466f1cff553d979bd00ecb64385760c6babdc",
                "sha256:81957921f441d50af23654aa6c5e5eaf9b06aba7f0a19c18a538dc7ef291c5a1",
                "sha256:819b3830a1543db06c4d4b865e70ded25be52a2e0631ccd2f6a47a2822f2fd7c",
                "sha256:897b80890765f037df3403d22bab41627ca8811ae55e9a722fd0392850ec4d86",
                "sha256:98c4d36e99714e55cfbaaee6dd5badbc9a1ec339ebfc3b1f52e293aee6bb71a4",
                "sha256:9df7ed3b3d2e0ecfe09e14741b857df43adb5a3ddadc919a2d94fbdf78fea53c",
                "sha256:9fa600030013c4de8165339db93d182b9431076eb98eb40ee068700c9c813e34",
                "sha256:a80a78046a72361de73f8f395f1f1e49f956c6be882eed58505a15f3e430962b",
                "sha256:afa17f5bc4d1b10afd4466fd3a44dc0e245382deca5b3c353d8b757f9e3ecb8d",
                "sha256:b3d267842bf12586ba6c734f89d1f5b871df0273157918b0ccefa29deb05c21c",
                "sha256:b5b9eccad747aabaaffbc6064800670f0c297e52c12754eb1d976c57e4f74dcb",
                "sha256:bfaef573a63ba8923503d27530362590ff4f576c626d86a9fed95822a8255fd7",
                "sha256:c5687b8d43cf58545ade1fe3e055f70eac7a5a1a0bf42824308d868289a95737",
                "sha256:cba8c411ef271aa037d7357a2bc8f9ee8b58b9965831d9e51baf703280dc73d3",
                "sha256:d15a181d1ecd0d4270dc32edb46f7cb7733c7c508857278d3d378d14d606db2d",
                "sha256:d4b0ba9512519522b118090257be113b9468d804b19d63c71dbcf4a48fa32358",
                "sha256:d4db7c7aef085872ef65a8fd7d6d09a14ae91f691dec3e87ee5ee0539d516f53",
                "sha256:d4eccecf9adf6fbcc6861a38015c2a64f38b9d94838ac1810a9023a0609e1b78",
                "sha256:d67d839ede4ed1b28a4e8909735fc992a923cdb84e618544973d7dfc71540803",
                "sha256:daf496c58a8c52083df09b80c860005194014c3698698d1a57cbcfa182142a3a",
                "sha256:dbad0e9d368bb989f4515da330b88a057617d16b6a8245084f1b05400f24609f",
                "sha256:e61ceaab6f49fb8bdfaa0f92c4b57bcfbea54c09277b1b4f7ac376bfb7a7c174",
                "sha256:f84fbc98b019fef2ee9a1cb3ce93e3187a6df0b2538a651bfb890254ba9f90b5"
            ],
-            "markers": "python_full_version >= '3.6.0'",
+            "markers": "python_version >= '3.6'",
            "version": "==6.0"
        },
        "pyyaml-env-tag": {
@ -246,17 +222,9 @@
                "sha256:70092675bda14fdec33b31ba77e7543de9ddc88f2e5b99160396572d11525bdb",
                "sha256:af31106dec8a4d68c60207c1886031cbf839b68aa7abccdb19868200532c2069"
            ],
-            "markers": "python_full_version >= '3.6.0'",
+            "markers": "python_version >= '3.6'",
            "version": "==0.1"
        },
        "requests": {
            "hashes": [
                "sha256:7c5599b102feddaa661c826c56ab4fee28bfd17f5abca1ebbe3e7f19d7c97983",
                "sha256:8fefa2a1a1365bf5520aac41836fbee479da67864514bdb821f31ce07ce65349"
            ],
            "markers": "python_version >= '3.7' and python_version < '4'",
            "version": "==2.28.1"
        },
        "six": {
            "hashes": [
                "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926",
@ -265,47 +233,44 @@
            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
            "version": "==1.16.0"
        },
        "urllib3": {
            "hashes": [
                "sha256:47cc05d99aaa09c9e72ed5809b60e7ba354e64b59c9c173ac3018642d8bb41fc",
                "sha256:c083dd0dce68dbfbe1129d5271cb90f9447dea7d52097c6e0126120c521ddea8"
            ],
            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'",
            "version": "==1.26.13"
        },
        "watchdog": {
            "hashes": [
-                "sha256:1893d425ef4fb4f129ee8ef72226836619c2950dd0559bba022b0818c63a7b60",
+                "sha256:083171652584e1b8829581f965b9b7723ca5f9a2cd7e20271edf264cfd7c1412",
-                "sha256:1a410dd4d0adcc86b4c71d1317ba2ea2c92babaf5b83321e4bde2514525544d5",
+                "sha256:117ffc6ec261639a0209a3252546b12800670d4bf5f84fbd355957a0595fe654",
-                "sha256:1f2b0665c57358ce9786f06f5475bc083fea9d81ecc0efa4733fd0c320940a37",
+                "sha256:186f6c55abc5e03872ae14c2f294a153ec7292f807af99f57611acc8caa75306",
-                "sha256:1f8eca9d294a4f194ce9df0d97d19b5598f310950d3ac3dd6e8d25ae456d4c8a",
+                "sha256:195fc70c6e41237362ba720e9aaf394f8178bfc7fa68207f112d108edef1af33",
-                "sha256:27e49268735b3c27310883012ab3bd86ea0a96dcab90fe3feb682472e30c90f3",
+                "sha256:226b3c6c468ce72051a4c15a4cc2ef317c32590d82ba0b330403cafd98a62cfd",
-                "sha256:28704c71afdb79c3f215c90231e41c52b056ea880b6be6cee035c6149d658ed1",
+                "sha256:247dcf1df956daa24828bfea5a138d0e7a7c98b1a47cf1fa5b0c3c16241fcbb7",
-                "sha256:2ac0bd7c206bb6df78ef9e8ad27cc1346f2b41b1fef610395607319cdab89bc1",
+                "sha256:255bb5758f7e89b1a13c05a5bceccec2219f8995a3a4c4d6968fe1de6a3b2892",
-                "sha256:2af1a29fd14fc0a87fb6ed762d3e1ae5694dcde22372eebba50e9e5be47af03c",
+                "sha256:43ce20ebb36a51f21fa376f76d1d4692452b2527ccd601950d69ed36b9e21609",
-                "sha256:3a048865c828389cb06c0bebf8a883cec3ae58ad3e366bcc38c61d8455a3138f",
+                "sha256:4f4e1c4aa54fb86316a62a87b3378c025e228178d55481d30d857c6c438897d6",
-                "sha256:441024df19253bb108d3a8a5de7a186003d68564084576fecf7333a441271ef7",
+                "sha256:5952135968519e2447a01875a6f5fc8c03190b24d14ee52b0f4b1682259520b1",
-                "sha256:56fb3f40fc3deecf6e518303c7533f5e2a722e377b12507f6de891583f1b48aa",
+                "sha256:64a27aed691408a6abd83394b38503e8176f69031ca25d64131d8d640a307591",
-                "sha256:619d63fa5be69f89ff3a93e165e602c08ed8da402ca42b99cd59a8ec115673e1",
+                "sha256:6b17d302850c8d412784d9246cfe8d7e3af6bcd45f958abb2d08a6f8bedf695d",
-                "sha256:74535e955359d79d126885e642d3683616e6d9ab3aae0e7dcccd043bd5a3ff4f",
+                "sha256:70af927aa1613ded6a68089a9262a009fbdf819f46d09c1a908d4b36e1ba2b2d",
-                "sha256:76a2743402b794629a955d96ea2e240bd0e903aa26e02e93cd2d57b33900962b",
+                "sha256:7a833211f49143c3d336729b0020ffd1274078e94b0ae42e22f596999f50279c",
-                "sha256:83cf8bc60d9c613b66a4c018051873d6273d9e45d040eed06d6a96241bd8ec01",
+                "sha256:8250546a98388cbc00c3ee3cc5cf96799b5a595270dfcfa855491a64b86ef8c3",
-                "sha256:920a4bda7daa47545c3201a3292e99300ba81ca26b7569575bd086c865889090",
+                "sha256:97f9752208f5154e9e7b76acc8c4f5a58801b338de2af14e7e181ee3b28a5d39",
-                "sha256:9e99c1713e4436d2563f5828c8910e5ff25abd6ce999e75f15c15d81d41980b6",
+                "sha256:9f05a5f7c12452f6a27203f76779ae3f46fa30f1dd833037ea8cbc2887c60213",
-                "sha256:a5bd9e8656d07cae89ac464ee4bcb6f1b9cecbedc3bf1334683bed3d5afd39ba",
+                "sha256:a735a990a1095f75ca4f36ea2ef2752c99e6ee997c46b0de507ba40a09bf7330",
-                "sha256:ad0150536469fa4b693531e497ffe220d5b6cd76ad2eda474a5e641ee204bbb6",
+                "sha256:ad576a565260d8f99d97f2e64b0f97a48228317095908568a9d5c786c829d428",
-                "sha256:af4b5c7ba60206759a1d99811b5938ca666ea9562a1052b410637bb96ff97512",
+                "sha256:b530ae007a5f5d50b7fbba96634c7ee21abec70dc3e7f0233339c81943848dc1",
-                "sha256:c7bd98813d34bfa9b464cf8122e7d4bec0a5a427399094d2c17dd5f70d59bc61",
+                "sha256:bfc4d351e6348d6ec51df007432e6fe80adb53fd41183716017026af03427846",
-                "sha256:ceaa9268d81205876bedb1069f9feab3eccddd4b90d9a45d06a0df592a04cae9",
+                "sha256:d3dda00aca282b26194bdd0adec21e4c21e916956d972369359ba63ade616153",
-                "sha256:cf05e6ff677b9655c6e9511d02e9cc55e730c4e430b7a54af9c28912294605a4",
+                "sha256:d9820fe47c20c13e3c9dd544d3706a2a26c02b2b43c993b62fcd8011bcc0adb3",
-                "sha256:d0fb5f2b513556c2abb578c1066f5f467d729f2eb689bc2db0739daf81c6bb7e",
+                "sha256:ed80a1628cee19f5cfc6bb74e173f1b4189eb532e705e2a13e3250312a62e0c9",
-                "sha256:d6ae890798a3560688b441ef086bb66e87af6b400a92749a18b856a134fc0318",
+                "sha256:ee3e38a6cc050a8830089f79cbec8a3878ec2fe5160cdb2dc8ccb6def8552658"
                "sha256:e5aed2a700a18c194c39c266900d41f3db0c1ebe6b8a0834b9995c835d2ca66e",
                "sha256:e722755d995035dd32177a9c633d158f2ec604f2a358b545bba5bed53ab25bca",
                "sha256:ed91c3ccfc23398e7aa9715abf679d5c163394b8cad994f34f156d57a7c163dc"
            ],
-            "markers": "python_full_version >= '3.6.0'",
+            "markers": "python_version >= '3.6'",
-            "version": "==2.2.0"
+            "version": "==2.1.9"
        },
        "zipp": {
            "hashes": [
                "sha256:56bf8aadb83c24db6c4b577e13de374ccfb67da2078beba1d037c17980bf43ad",
                "sha256:c4f6e5bbf48e74f7a38e7cc5b0480ff42b0ae5178957d564d18932525d5cf099"
            ],
            "markers": "python_version >= '3.7'",
            "version": "==3.8.0"
        }
    },
    "develop": {}
--- a/docs/README.md
+++ b/docs/README.md
@ -2,27 +2,33 @@
 You don't need to build and test the docs as long as you make sure the syntax is correct. But in case you do want to build the docs, feel free to do so.
-```sh
+You'll need to install mkdocs for which you can check the [mkdocs installation guide](https://www.mkdocs.org/#installation). Generally it's best to install it using `pip`. You'll also need to install the correct dependencies.
 # Make sure you're in the same directory as this README
 # From the root of the Akkoma repo, you'll need to do
 cd docs
-# Optionally use a virtual environment
+### Example using a Debian based distro
 python3 -m venv venv
 source venv/bin/activate
-# Install dependencies
+#### 1. Install pipenv and dependencies
 pip install -r requirements.txt
-# Run an http server who rebuilds when files change
+```shell
-# Accessable on http://127.0.0.1:8000
+pip install pipenv
-mkdocs serve
+pipenv sync
 # Build the docs
 # The static html pages will have been created in the folder "site"
 # You can serve them from a server by pointing your server software (nginx, apache...) to this location
 mkdocs build
 # To get out of the virtual environment, you do
 deactivate
 ```
 #### 2. (Optional) Activate the virtual environment
 Since dependencies are installed in a virtual environment, you can't use them directly. To use them you should either prefix the command with `pipenv run`, or activate the virtual environment for current shell by executing `pipenv shell` once.
 #### 3. Build the docs using the script
 ```shell
 [pipenv run] make all
 ```
 #### 4. Serve the files
 A folder `site` containing the static html pages will have been created. You can serve them from a server by pointing your server software (nginx, apache...) to this location. During development, you can run locally with
 ```shell
 [pipenv run] mkdocs serve
 ```
 This handles setting up an http server and rebuilding when files change. You can then access the docs on <http://127.0.0.1:8000>
--- a/docs/docs/administration/CLI_tasks/config.md
+++ b/docs/docs/administration/CLI_tasks/config.md
@ -155,51 +155,3 @@ This forcibly removes all saved values in the database.
    ```sh
    mix pleroma.config [--force] reset
    ```
 ## Dumping specific configuration values to JSON
 If you want to bulk-modify configuration values (for example, for MRF modifications),
 it may be easier to dump the values to JSON and then modify them in a text editor.
 === "OTP"
    ```sh
    ./bin/pleroma_ctl config dump_to_file group key path
    # For example, to dump the MRF simple configuration:
    ./bin/pleroma_ctl config dump_to_file pleroma mrf_simple /tmp/mrf_simple.json
    ```
 === "From Source"
    ```sh
    mix pleroma.config dump_to_file group key path 
    # For example, to dump the MRF simple configuration:
    mix pleroma.config dump_to_file pleroma mrf_simple /tmp/mrf_simple.json
    ```
 ## Loading specific configuration values from JSON
 **Note:** This will overwrite any existing value in the database, and can
 cause crashes if you do not have exactly the correct formatting.
 Once you have modified the JSON file, you can load it back into the database.
 === "OTP"
    ```sh
    ./bin/pleroma_ctl config load_from_file path
    # For example, to load the MRF simple configuration:
    ./bin/pleroma_ctl config load_from_file /tmp/mrf_simple.json
    ```
 === "From Source"
    ```sh
    mix pleroma.config load_from_file path
    # For example, to load the MRF simple configuration:
    mix pleroma.config load_from_file /tmp/mrf_simple.json
    ```
 **NOTE** an instance reboot is needed for many changes to take effect,
 you may want to visit `/api/v1/pleroma/admin/restart` on your instance
 to soft-restart the instance.
--- a/docs/docs/administration/CLI_tasks/database.md
+++ b/docs/docs/administration/CLI_tasks/database.md
@ -21,18 +21,16 @@ Replaces embedded objects with references to them in the `objects` table. Only n
    mix pleroma.database remove_embedded_objects [option ...]
    ```
 ### Options
 - `--vacuum` - run `VACUUM FULL` after the embedded objects are replaced with their references
 ## Prune old remote posts from the database
-This will prune remote posts older than 90 days (configurable with [`config :pleroma, :instance, remote_post_retention_days`](../../configuration/cheatsheet.md#instance)) from the database. Pruned posts may be refetched in some cases.
+This will prune remote posts older than 90 days (configurable with [`config :pleroma, :instance, remote_post_retention_days`](../../configuration/cheatsheet.md#instance)) from the database, they will be refetched from source when accessed.
 !!! note
    The disk space will only be reclaimed after a proper vacuum. By default Postgresql does this for you on a regular basis, but if your instance has been running for a long time and there are many rows deleted, it may be advantageous to use `VACUUM FULL` (e.g. by using the `--vacuum` option).
 !!! danger
-    You may run out of disk space during the execution of the task or vacuuming if you don't have about 1/3rds of the database size free. Vacuum causes a substantial increase in I/O traffic, and may lead to a degraded experience while it is running.
+    The disk space will only be reclaimed after `VACUUM FULL`. You may run out of disk space during the execution of the task or vacuuming if you don't have about 1/3rds of the database size free.
 === "OTP"
@ -47,41 +45,7 @@ This will prune remote posts older than 90 days (configurable with [`config :ple
    ```
 ### Options
-
+- `--vacuum` - run `VACUUM FULL` after the objects are pruned
 - `--keep-threads` - Don't prune posts when they are part of a thread where at least one post has seen local interaction (e.g. one of the posts is a local post, or is favourited by a local user, or has been repeated by a local user...). It also wont delete posts when at least one of the posts in that thread is kept (e.g. because one of the posts has seen recent activity).
 - `--keep-non-public` - Keep non-public posts like DM's and followers-only, even if they are remote.
 - `--limit` - limits how many remote posts get pruned. This limit does **not** apply to any of the follow up jobs. If wanting to keep the database load in check it is thus advisable to run the standalone `prune_orphaned_activities` task with a limit afterwards instead of passing `--prune-orphaned-activities` to this task.
 - `--prune-orphaned-activities` - Also prune orphaned activities afterwards. Activities are things like Like, Create, Announce, Flag (aka reports)... They can significantly help reduce the database size.
 - `--vacuum` - Run `VACUUM FULL` after the objects are pruned. This should not be used on a regular basis, but is useful if your instance has been running for a long time before pruning.
 ## Prune orphaned activities from the database
 This will prune activities which are no longer referenced by anything.
 Such activities might be the result of running `prune_objects` without `--prune-orphaned-activities`.
 The same notes and warnings apply as for `prune_objects`.
 The task will print out how many rows were freed in total in its last
 line of output in the form `Deleted 345 rows`.  
 When running the job in limited batches this can be used to determine
 when all orphaned activities have been deleted.
 === "OTP"
    ```sh
    ./bin/pleroma_ctl database prune_orphaned_activities [option ...]
    ```
 === "From Source"
    ```sh
    mix pleroma.database prune_orphaned_activities [option ...]
    ```
 ### Options
 - `--limit n` - Only delete up to `n` activities in each query making up this job, i.e. if this job runs two queries at most `2n` activities will be deleted. Running this task repeatedly in limited batches can help maintain the instance’s responsiveness while still freeing up some space.
 - `--no-singles` - Do not delete activites referencing single objects
 - `--no-arrays` - Do not delete activites referencing an array of objects
 ## Create a conversation for all existing DMs
@ -129,9 +93,6 @@ Can be safely re-run
 ## Vacuum the database
 !!! note
    By default Postgresql has an autovacuum deamon running. While the tasks described here can help in some cases, they shouldn't be needed on a regular basis. See [the Postgresql docs on vacuuming](https://www.postgresql.org/docs/current/sql-vacuum.html) for more information on this.
 ### Analyze
 Running an `analyze` vacuum job can improve performance by updating statistics used by the query planner. **It is safe to cancel this.**
@ -198,23 +159,3 @@ Change `default_text_search_config` for database and (if necessary) text_search_
    ```
 See [PostgreSQL documentation](https://www.postgresql.org/docs/current/textsearch-configuration.html) and `docs/configuration/howto_search_cjk.md` for more detail.
 ## Pruning old activities
 Over time, transient `Delete` activities and `Tombstone` objects
 can accumulate in your database, inflating its size. This is not ideal. 
 There is a periodic task to prune these transient objects, 
 but on first run this may take a while on older instances to catch up
 to the current day.
 === "OTP"
    ```sh
    ./bin/pleroma_ctl database prune_task
    ```
 === "From Source"
    ```sh
    mix pleroma.database prune_task
    ```
--- a/docs/docs/administration/CLI_tasks/diagnostics.md
+++ b/docs/docs/administration/CLI_tasks/diagnostics.md
@ -1,30 +0,0 @@
 # Diagnostics
 A few tasks to help with debugging, troubleshooting, and diagnosing problems.
 They mostly relate to common postgres queries. 
 ## Home timeline query plan
 This task will print a query plan for the home timeline of a given user.
 === "OTP"
    `./bin/pleroma_ctl diagnostics home_timeline <nickname>`
 === "From Source"
    `mix pleroma.diagnostics home_timeline <nickname>`
 ## User timeline query plan
 This task will print a query plan for the user timeline of a given user,
 from the perspective of another given user.
 === "OTP"
    `./bin/pleroma_ctl diagnostics user_timeline <nickname> <viewing_nickname>`
 === "From Source"
    `mix pleroma.diagnostics user_timeline <nickname> <viewing_nickname>`
--- a/docs/docs/administration/CLI_tasks/frontend.md
+++ b/docs/docs/administration/CLI_tasks/frontend.md
@ -21,28 +21,29 @@ Currently, known `<frontend>` values are:
 - [admin-fe](https://akkoma.dev/AkkomaGang/admin-fe)
 - [mastodon-fe](https://akkoma.dev/AkkomaGang/masto-fe)
 - [pleroma-fe](https://akkoma.dev/AkkomaGang/pleroma-fe)
 - [soapbox-fe](https://gitlab.com/soapbox-pub/soapbox-fe)
 You can still install frontends that are not configured, see below.
-## Example installations for a known frontend (Stable-Version)
+## Example installations for a known frontend
 For a frontend configured under the `available` key, it's enough to install it by name.
 === "OTP"
    ```sh
-    ./bin/pleroma_ctl frontend install pleroma-fe --ref stable
+    ./bin/pleroma_ctl frontend install pleroma-fe
    ```
 === "From Source"
    ```sh
-    mix pleroma.frontend install pleroma-fe --ref stable
+    mix pleroma.frontend install pleroma-fe
    ```
 This will download the latest build for the pre-configured `ref` and install it. It can then be configured as the one of the served frontends in the config file (see `primary` or `admin`).
-You can override any of the details. To install an Akkoma-FE build from a different URL, you could do this:
+You can override any of the details. To install a Pleroma-FE build from a different URL, you could do this:
 === "OTP"
--- a/docs/docs/administration/CLI_tasks/instance.md
+++ b/docs/docs/administration/CLI_tasks/instance.md
@ -37,8 +37,7 @@ If any of the options are left unspecified, you will be prompted interactively.
 - `--static-dir <path>` - the directory custom public files should be read from (custom emojis, frontend bundle overrides, robots.txt, etc.)
 - `--listen-ip <ip>` - the ip the app should listen to, defaults to 127.0.0.1
 - `--listen-port <port>` - the port the app should listen to, defaults to 4000
- `--strip-uploads-metadata <Y|N>` - use ExifTool to strip uploads of metadata when possible
+- `--strip-uploads <Y|N>` - use ExifTool to strip uploads of sensitive location data
 - `--read-uploads-description <Y|N>` - use ExifTool to read image descriptions from uploads
 - `--anonymize-uploads <Y|N>` - randomize uploaded filenames
 - `--dedupe-uploads <Y|N>` - store files based on their hash to reduce data storage requirements if duplicates are uploaded with different filenames
 - `--skip-release-env` - skip generation the release environment file
--- a/docs/docs/administration/CLI_tasks/robots_txt.md
+++ b/docs/docs/administration/CLI_tasks/robots_txt.md
@ -11,7 +11,7 @@ If you want to generate a restrictive `robots.txt`, you can run the following mi
 === "OTP"
    ```sh
-    ./bin/pleroma_ctl robotstxt disallow_all
+    ./bin/pleroma_ctl robots_txt disallow_all
    ```
 === "From Source"
--- a/docs/docs/administration/CLI_tasks/security.md
+++ b/docs/docs/administration/CLI_tasks/security.md
@ -1,56 +0,0 @@
 # Security-related tasks
 {! administration/CLI_tasks/general_cli_task_info.include !}
 !!! danger
    Many of these tasks were written in response to a patched exploit.
    It is recommended to run those very soon after installing its respective security update.
    Over time with db migrations they might become less accurate or be removed altogether.
    If you never ran an affected version, there’s no point in running them.
 ## Spoofed AcitivityPub objects exploit (2024-03, fixed in 3.11.1)
 ### Search for uploaded spoofing payloads
 Scans local uploads for spoofing payloads.
 If the instance is not using the local uploader it was not affected.
 Attachments wil be scanned anyway in case local uploader was used in the past.
 !!! note
    This cannot reliably detect payloads attached to deleted posts.
 === "OTP"
    ```sh
    ./bin/pleroma_ctl security spoof-uploaded
    ```
 === "From Source"
    ```sh
    mix pleroma.security spoof-uploaded
    ```
 ### Search for counterfeit posts in database
 Scans all notes in the database for signs of being spoofed.
 !!! note
    Spoofs targeting local accounts can be detected rather reliably
    (with some restrictions documented in the task’s logs).
    Counterfeit posts from remote users cannot. A best-effort attempt is made, but
    a thorough attacker can avoid this and it may yield a small amount of false positives.
    Should you find counterfeit posts of local users, let other admins know so they can delete the too.
 === "OTP"
    ```sh
    ./bin/pleroma_ctl security spoof-inserted
    ```
 === "From Source"
    ```sh
    mix pleroma.security spoof-inserted
    ```
--- a/docs/docs/administration/CLI_tasks/user.md
+++ b/docs/docs/administration/CLI_tasks/user.md
@ -300,28 +300,3 @@
    ```sh
    mix pleroma.user unconfirm_all
    ```
 ## Fix following state
 Sometimes the system can get into a situation where
 it think you're already following someone and won't send a request
 to the remote instance, or won't let you unfollow someone. This
 bug was fixed, but in case you encounter these weird states:
 === "OTP"
    ```sh
     ./bin/pleroma_ctl user fix_follow_state localuser remoteuser@example.com
    ```
 === "From Source"
    ```sh
    mix pleroma.user fix_follow_state localuser remoteuser@example.com
    ```
 The first argument is the local user's nickname - if you are `myuser@myinstance`, this should be `myuser`.
 The second is the remote user, consisting of both nickname AND domain.
 If you are a weird follow state situation and cannot resolve it with the above, you may need to co-operate with the remote admin to clear the state their side too - they should provide the arguments *backwards*, i.e `fix_follow_state remote local`.
--- a/docs/docs/administration/backup.md
+++ b/docs/docs/administration/backup.md
@ -4,54 +4,38 @@
 1. Stop the Akkoma service.
 2. Go to the working directory of Akkoma (default is `/opt/akkoma`)
-3. Run `sudo -Hu postgres pg_dump -d akkoma --format=custom -f </path/to/backup_location/akkoma.pgdump>`[¹] (make sure the postgres user has write access to the destination file)
+3. Run `sudo -Hu postgres pg_dump -d <akkoma_db> --format=custom -f </path/to/backup_location/akkoma.pgdump>` (make sure the postgres user has write access to the destination file)
-4. Copy `akkoma.pgdump`, `config/config.exs`[²], `uploads` folder, and [static directory](../configuration/static_dir.md) to your backup destination. If you have other modifications, copy those changes too.
+4. Copy `akkoma.pgdump`, `config/prod.secret.exs`, `config/setup_db.psql` (if still available) and the `uploads` folder to your backup destination. If you have other modifications, copy those changes too.
 5. Restart the Akkoma service.
 [¹]: We assume the database name is "akkoma". If not, you can find the correct name in your configuration files.  
 [²]: If you have a from source installation, you need `config/prod.secret.exs` instead of `config/config.exs`. The `config/config.exs` file also exists, but in case of from source installations, it only contains the default values and it is tracked by Git, so you don't need to back it up.  
 ## Restore/Move
 1. Optionally reinstall Akkoma (either on the same server or on another server if you want to move servers).
 2. Stop the Akkoma service.
 3. Go to the working directory of Akkoma (default is `/opt/akkoma`)
 4. Copy the above mentioned files back to their original position.
-5. Drop the existing database and user[¹]. `sudo -Hu postgres psql -c 'DROP DATABASE akkoma;';` `sudo -Hu postgres psql -c 'DROP USER akkoma;'`
+5. Drop the existing database and user if restoring in-place. `sudo -Hu postgres psql -c 'DROP DATABASE <akkoma_db>;';` `sudo -Hu postgres psql -c 'DROP USER <akkoma_db>;'`
-6. Restore the database schema and akkoma role[¹] (replace the password with the one you find in the configuration file), `sudo -Hu postgres psql -c "CREATE USER akkoma WITH ENCRYPTED PASSWORD '<database-password-wich-you-can-find-in-your-configuration-file>';"` `sudo -Hu postgres psql -c "CREATE DATABASE akkoma OWNER akkoma;"`.
+6. Restore the database schema and akkoma postgres role the with the original `setup_db.psql` if you have it: `sudo -Hu postgres psql -f config/setup_db.psql`.
-7. Now restore the Akkoma instance's data into the empty database schema[¹]: `sudo -Hu postgres pg_restore -d akkoma -v -1 </path/to/backup_location/akkoma.pgdump>`
+
-8. If you installed a newer Akkoma version, you should run the database migrations `./bin/pleroma_ctl migrate`[²].
+  Alternatively, run the `mix pleroma.instance gen` task again. You can ignore most of the questions, but make the database user, name, and password the same as found in your backup of `config/prod.secret.exs`. Then run the restoration of the akkoma role and schema with of the generated `config/setup_db.psql` as instructed above. You may delete the `config/generated_config.exs` file as it is not needed.
 7. Now restore the Akkoma instance's data into the empty database schema: `sudo -Hu postgres pg_restore -d <akkoma_db> -v -1 </path/to/backup_location/akkoma.pgdump>`
 8. If you installed a newer Akkoma version, you should run `mix ecto.migrate`[^1]. This task performs database migrations, if there were any.
 9. Restart the Akkoma service.
 10. Run `sudo -Hu postgres vacuumdb --all --analyze-in-stages`. This will quickly generate the statistics so that postgres can properly plan queries.
-11. If setting up on a new server, configure Nginx by using the `installation/nginx/akkoma.nginx` configuration sample or reference the Akkoma installation guide which contains the Nginx configuration instructions.
+11. If setting up on a new server configure Nginx by using the `installation/akkoma.nginx` config sample or reference the Akkoma installation guide for your OS which contains the Nginx configuration instructions.
-[¹]: We assume the database name and user are both "akkoma". If not, you can find the correct name in your configuration files.  
+[^1]: Prefix with `MIX_ENV=prod` to run it using the production config file.
 [²]: If you have a from source installation, the command is `MIX_ENV=prod mix ecto.migrate`. Note that we prefix with `MIX_ENV=prod` to use the `config/prod.secret.exs` configuration file.  
 ## Remove
 1. Optionally you can remove the users of your instance. This will trigger delete requests for their accounts and posts. Note that this is 'best effort' and doesn't mean that all traces of your instance will be gone from the fediverse.
    * You can do this from the admin-FE where you can select all local users and delete the accounts using the *Moderate multiple users* dropdown.
-    * You can also list local users and delete them individually using the CLI tasks for [Managing users](./CLI_tasks/user.md).
+    * You can also list local users and delete them individualy using the CLI tasks for [Managing users](./CLI_tasks/user.md).
 2. Stop the Akkoma service `systemctl stop akkoma`
-3. Disable Akkoma from systemd `systemctl disable akkoma`
+3. Disable akkoma from systemd `systemctl disable akkoma`
 4. Remove the files and folders you created during installation (see installation guide). This includes the akkoma, nginx and systemd files and folders.
 5. Reload nginx now that the configuration is removed `systemctl reload nginx`
-6. Remove the database and database user[¹] `sudo -Hu postgres psql -c 'DROP DATABASE akkoma;';` `sudo -Hu postgres psql -c 'DROP USER akkoma;'`
+6. Remove the database and database user `sudo -Hu postgres psql -c 'DROP DATABASE <akkoma_db>;';` `sudo -Hu postgres psql -c 'DROP USER <akkoma_db>;'`
 7. Remove the system user `userdel akkoma`
 8. Remove the dependencies that you don't need anymore (see installation guide). Make sure you don't remove packages that are still needed for other software that you have running!
 [¹]: We assume the database name and user are both "akkoma". If not, you can find the correct name in your config files.  
 ## Docker installations
 If running behind Docker, it is required to run the above commands inside of a running database container.  
 ### Example
 Running `docker compose run --rm db pg_dump <...>` will fail and return:
 ```
 pg_dump: error: connection to server on socket "/run/postgresql/.s.PGSQL.5432" failed: No such file or directory 
 Is the server running locally and accepting connections on that socket?"
 ```
 However, first starting just the database container with `docker compose up db -d`, and then running `docker compose exec db pg_dump -d akkoma --format=custom -f </your/backup/dir/akkoma.pgdump>` will successfully generate a database dump.  
 Then to make the file accessible on the host system you can run `docker compose cp db:</your/backup/dir/akkoma.pgdump> </your/target/location>` to copy if from the container.
--- a/docs/docs/administration/monitoring.md
+++ b/docs/docs/administration/monitoring.md
@ -1,45 +0,0 @@
 # Monitoring Akkoma
 If you run akkoma, you may be inclined to collect metrics to ensure your instance is running smoothly,
 and that there's nothing quietly failing in the background.
 To facilitate this, akkoma exposes a dashboard and prometheus metrics to be scraped.
 ## Prometheus
 See: [export\_prometheus\_metrics](../../configuration/cheatsheet#instance)
 To scrape prometheus metrics, we need an oauth2 token with the `admin:metrics` scope.
 consider using [constanze](https://akkoma.dev/AkkomaGang/constanze) to make this easier -
 ```bash
 constanze token --client-app --scopes "admin:metrics" --client-name "Prometheus"
 ```
 or see `scripts/create_metrics_app.sh` in the source tree for the process to get this token.
 Once you have your token of the form `Bearer $ACCESS_TOKEN`, you can use that in your prometheus config:
 ```yaml
 - job_name: akkoma
  scheme: https
  authorization:
    credentials: $ACCESS_TOKEN # this should have the bearer prefix removed
  metrics_path: /api/v1/akkoma/metrics
  static_configs:
  - targets:
    - example.com
 ```
 ## Dashboard
 Administrators can access a live dashboard under `/phoenix/live_dashboard`
 giving an overview of uptime, software versions, database stats and more.
 The dashboard also includes a variation of the prometheus metrics, however
 they do not exactly match due to respective limitations of the dashboard
 and the prometheus exporter.
 Even more important, the dashboard collects metrics locally in the browser
 only while the page is open and cannot give a view on their past history.
 For proper monitoring it is recommended to set up prometheus.
--- a/docs/docs/administration/updating.md
+++ b/docs/docs/administration/updating.md
@ -1,67 +1,27 @@
 # Updating your instance
-You should **always check the [release notes/changelog](https://akkoma.dev/AkkomaGang/akkoma/src/branch/stable/CHANGELOG.md)** in case there are config deprecations, special update steps, etc.
+You should **always check the [release notes/changelog](https://akkoma.dev/AkkomaGang/akkoma/src/branch/develop/CHANGELOG.md)** in case there are config deprecations, special update steps, etc.
 Besides that, doing the following is generally enough:
 ## Switch to the akkoma user
 ```sh
 # Using sudo
 sudo -su akkoma
 # Using doas
 doas -su akkoma
 # Using su
 su -s "$SHELL" akkoma
 ```
 ## For OTP installations
 ```sh
-# Download latest stable release
+# Download the new release
-./bin/pleroma_ctl update --branch stable
+su akkoma -s $SHELL -lc "./bin/pleroma_ctl update" 
-# Stop akkoma
+# Migrate the database, you are advised to stop the instance before doing that
-./bin/pleroma stop # or using the system service manager (e.g. systemctl stop akkoma)
+su akkoma -s $SHELL -lc "./bin/pleroma_ctl migrate"
 # Run database migrations
 ./bin/pleroma_ctl migrate
 # Start akkoma
 ./bin/pleroma daemon # or using the system service manager (e.g. systemctl start akkoma)
 # Update frontend(s). See Frontend Configuration doc for more information.
 ./bin/pleroma_ctl frontend install pleroma-fe --ref stable
 ```
 If you selected an alternate flavour on installation, 
 you _may_ need to specify `--flavour`, in the same way as 
 [when installing](../../installation/otp_en#detecting-flavour).
 ## For from source installations (using git)
 Run as the `akkoma` user:
-```sh
+1. Go to the working directory of Akkoma (default is `/opt/akkoma`)
-# fetch changes
+2. Run `git pull` [^1]. This pulls the latest changes from upstream.
-git fetch
+3. Run `mix deps.get` [^1]. This pulls in any new dependencies.
-# check out the latest tag
+4. Stop the Akkoma service.
-git checkout $(git tag -l | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)
+5. Run `mix ecto.migrate` [^1] [^2]. This task performs database migrations, if there were any.
 6. Start the Akkoma service.
-# Run with production configuration
+[^1]: Depending on which install guide you followed (for example on Debian/Ubuntu), you want to run `git` and `mix` tasks as `akkoma` user by adding `sudo -Hu akkoma` before the command.
-export MIX_ENV=prod
+[^2]: Prefix with `MIX_ENV=prod` to run it using the production config file.
 # Download and compile dependencies
 mix deps.get
 mix compile
 # Stop akkoma (replace with your system service manager's equivalent if different)
 sudo systemctl stop akkoma
 # Run database migrations
 mix ecto.migrate
 # Start akkoma (replace with your system service manager's equivalent if different)
 sudo systemctl start akkoma
 # Update Akkoma-FE frontend to latest stable. For other Frontends see Frontend Configuration doc for more information.
 mix pleroma.frontend install pleroma-fe --ref stable
 ```
--- a/docs/docs/clients.md
+++ b/docs/docs/clients.md
@ -1,19 +1,21 @@
-# Akkoma Clients
+# Pleroma Clients
-This is a list of clients that are known to work with Akkoma.
+Note: Additional clients may be working but theses are officially supporting Pleroma.
-
+Feel free to contact us to be added to this list!
 !!! warning
    **Clients listed here are not officially supported by the Akkoma project.**
    Some Akkoma features may be unsupported by these clients.
 ## Multiplatform
 ### Kaiteki
 - Homepage: <https://kaiteki.app/>
 - Source Code: <https://github.com/Kaiteki-Fedi/Kaiteki>
 - Contact: [@kaiteki@social.kaiteki.app](https://social.kaiteki.app/@kaiteki)
 - Platforms: Web, Windows, Linux, Android
 - Features: MastoAPI, Supports multiple backends
 ## Desktop
 ### Roma for Desktop
 - Homepage: <https://www.pleroma.com/#desktopApp>
 - Source Code: <https://github.com/roma-apps/roma-desktop>
 - Platforms: Windows, Mac, Linux
 - Features: MastoAPI, Streaming Ready
 ### Social
 - Source Code: <https://gitlab.gnome.org/World/Social>
 - Contact: [@brainblasted@social.libre.fi](https://social.libre.fi/users/brainblasted)
 - Platforms: Linux (GNOME)
 - Note(2019-01-28): Not at a pre-alpha stage yet
 - Features: MastoAPI
 ### Whalebird
 - Homepage: <https://whalebird.social/>
 - Source Code: <https://github.com/h3poteto/whalebird-desktop>
@ -28,19 +30,37 @@ This is a list of clients that are known to work with Akkoma.
 - Platforms: Android
 - Features: MastoAPI, ActivityPub (Client-to-Server)
 ### Amaroq
 - Homepage: <https://itunes.apple.com/us/app/amaroq-for-mastodon/id1214116200>
 - Source Code: <https://github.com/ReticentJohn/Amaroq>
 - Contact: [@eurasierboy@mastodon.social](https://mastodon.social/users/eurasierboy)
 - Platforms: iOS
 - Features: MastoAPI, No Streaming
 ### Fedilab
 - Homepage: <https://fedilab.app/>
- Source Code: <https://codeberg.org/tom79/Fedilab>
+- Source Code: <https://framagit.org/tom79/fedilab/>
- Contact: [@apps@toot.felilab.app](https://toot.fedilab.app/@apps)
+- Contact: [@fedilab@framapiaf.org](https://framapiaf.org/users/fedilab)
 - Platforms: Android
 - Features: MastoAPI, Streaming Ready, Moderation, Text Formatting
 ### Kyclos
 - Source Code: <https://git.pleroma.social/pleroma/harbour-kyclos>
 - Platforms: SailfishOS
 - Features: MastoAPI, No Streaming
 ### Husky
- Source code: <https://codeberg.org/husky/husky>
+- Source code: <https://git.mentality.rip/FWGS/Husky>
- Contact: [@captainepoch@stereophonic.space](https://stereophonic.space/captainepoch)
+- Contact: [@Husky@enigmatic.observer](https://enigmatic.observer/users/Husky)
 - Platforms: Android
 - Features: MastoAPI, No Streaming, Emoji Reactions, Text Formatting, FE Stickers
 ### Fedi
 - Homepage: <https://www.fediapp.com/>
 - Source Code: Proprietary, but gratis
 - Platforms: iOS, Android
 - Features: MastoAPI, Pleroma-specific features like Reactions
 ### Tusky
 - Homepage: <https://tuskyapp.github.io/>
 - Source Code: <https://github.com/tuskyapp/Tusky>
@ -48,18 +68,37 @@ This is a list of clients that are known to work with Akkoma.
 - Platforms: Android
 - Features: MastoAPI, No Streaming
-### Subway Tooter
+### Twidere
- Source Code: <https://github.com/tateisu/SubwayTooter/>
+- Homepage: <https://twidere.mariotaku.org/>
- Contact: [@SubwayTooter@mastodon.juggler.jp](https://mastodon.juggler.jp/@SubwayTooter)
+- Source Code: <https://github.com/TwidereProject/Twidere-Android/>
 - Contact: <me@mariotaku.org>
 - Platform: Android
 - Features: MastoAPI, No Streaming
 ### Indigenous
 - Homepage: <https://indigenous.realize.be/>
 - Source Code: <https://github.com/swentel/indigenous-android/>
 - Contact: [@swentel@realize.be](https://realize.be)
 - Platforms: Android
- Features: MastoAPI, Editing, Emoji Reactions (including custom emoji)
+- Features: MastoAPI, No Streaming
 ## Alternative Web Interfaces
-### Enafore
+### Brutaldon
- An actively developed fork of Pinafore with improved Akkoma support
+- Homepage: <https://jfm.carcosa.net/projects/software/brutaldon/>
- Homepage: <https://enafore.social/>
+- Source Code: <https://git.carcosa.net/jmcbray/brutaldon>
- Source Code: <https://github.com/enafore/enafore>
+- Contact: [@gcupc@glitch.social](https://glitch.social/users/gcupc)
- Contact: [@enfore@enafore.social](https://meta.enafore.social/@enafore)
+- Features: MastoAPI, No Streaming
 ### Halcyon
 - Source Code: <https://notabug.org/halcyon-suite/halcyon>
 - Contact: [@halcyon@social.csswg.org](https://social.csswg.org/users/halcyon)
 - Features: MastoAPI, Streaming Ready
 ### Pinafore
 - Homepage: <https://pinafore.social/>
 - Source Code: <https://github.com/nolanlawson/pinafore>
 - Contact: [@pinafore@mastodon.technology](https://mastodon.technology/users/pinafore)
 - Note: Pleroma support is a secondary goal
 - Features: MastoAPI, No Streaming
 ### Sengi
--- a/docs/docs/configuration/cheatsheet.md
+++ b/docs/docs/configuration/cheatsheet.md
@ -33,9 +33,8 @@ To add configuration to your config file, you can copy it from the base config.
 * `federation_incoming_replies_max_depth`: Max. depth of reply-to activities fetching on incoming federation, to prevent out-of-memory situations while fetching very long threads. If set to `nil`, threads of any depth will be fetched. Lower this value if you experience out-of-memory crashes.
 * `federation_reachability_timeout_days`: Timeout (in days) of each external federation target being unreachable prior to pausing federating to it.
 * `allow_relay`: Permits remote instances to subscribe to all public posts of your instance. This may increase the visibility of your instance.
-* `public`: Allows unauthenticated access to public resources on your instance. This is essentially used as the default value for `:restrict_unauthenticated`. 
+* `public`: Makes the client API in authenticated mode-only except for user-profiles. Useful for disabling the Local Timeline and The Whole Known Network. Note that there is a dependent setting restricting or allowing unauthenticated access to specific resources, see `restrict_unauthenticated` for more details.
-   See `restrict_unauthenticated` for more details.
+* `quarantined_instances`: ActivityPub instances where private (DMs, followers-only) activities will not be send.
 * `quarantined_instances`: *DEPRECATED* ActivityPub instances where activities will not be sent. They can still reach there via other means, we just won't send them.
 * `allowed_post_formats`: MIME-type list of formats allowed to be posted (transformed into HTML).
 * `extended_nickname_format`: Set to `true` to use extended local nicknames format (allows underscores/dashes). This will break federation with
    older software for theses nicknames.
@ -60,11 +59,6 @@ To add configuration to your config file, you can copy it from the base config.
 * `cleanup_attachments`: Remove attachments along with statuses. Does not affect duplicate files and attachments without status. Enabling this will increase load to database when deleting statuses on larger instances.
 * `show_reactions`: Let favourites and emoji reactions be viewed through the API (default: `true`).
 * `password_reset_token_validity`: The time after which reset tokens aren't accepted anymore, in seconds (default: one day).
 * `local_bubble`: Array of domains representing instances closely related to yours. Used to populate the `bubble` timeline. e.g `["example.com"]`, (default: `[]`)
 * `languages`: List of Language Codes used by the instance. This is used to try and set a default language from the frontend. It will try and find the first match between the languages set here and the user's browser languages. It will default to the first language in this setting if there is no match.. (default `["en"]`)
 * `export_prometheus_metrics`: Enable prometheus metrics, served at `/api/v1/akkoma/metrics`, requiring the `admin:metrics` oauth scope.
 * `privileged_staff`: Set to `true` to give moderators access to a few higher responsibility actions.
 * `federated_timeline_available`: Set to `false` to remove access to the federated timeline for all users.
 ## :database
 * `improved_hashtag_timeline`: Setting to force toggle / force disable improved hashtags timeline. `:enabled` forces hashtags to be fetched from `hashtags` table for hashtags timeline. `:disabled` forces object-embedded hashtags to be used (slower). Keep it `:auto` for automatic behaviour (it is auto-set to `:enabled` [unless overridden] when HashtagsTableMigrator completes).
@ -106,60 +100,28 @@ To add configuration to your config file, you can copy it from the base config.
 ## Message rewrite facility
 ### :mrf
 * `transparency`: Make the content of your Message Rewrite Facility settings public (via nodeinfo).
 * `transparency_exclusions`: Exclude specific instance names from MRF transparency.  The use of the exclusions feature will be disclosed in nodeinfo as a boolean value.
 * `transparency_obfuscate_domains`: Show domains with `*` in the middle, to censor them if needed. For example, `ridingho.me` will show as `rid*****.me`
 * `policies`: Message Rewrite Policy, either one or a list. Here are the ones available by default:
    * `Pleroma.Web.ActivityPub.MRF.NoOpPolicy`: Doesn’t modify activities (default).
    * `Pleroma.Web.ActivityPub.MRF.DropPolicy`: Drops all activities. It generally doesn’t makes sense to use in production.
-    * `Pleroma.Web.ActivityPub.MRF.ActivityExpirationPolicy`: Sets a default expiration on all posts made by users of the local instance. Requires `Pleroma.Workers.PurgeExpiredActivity` to be enabled for processing the scheduled delections.
+    * `Pleroma.Web.ActivityPub.MRF.SimplePolicy`: Restrict the visibility of activities from certains instances (See [`:mrf_simple`](#mrf_simple)).
-      (See [`:mrf_activity_expiration`](#mrf_activity_expiration))
+    * `Pleroma.Web.ActivityPub.MRF.TagPolicy`: Applies policies to individual users based on tags, which can be set using pleroma-fe/admin-fe/any other app that supports Pleroma Admin API. For example it allows marking posts from individual users nsfw (sensitive).
-    * `Pleroma.Web.ActivityPub.MRF.AntiFollowbotPolicy`: Drops follow requests from followbots. Users can still allow bots to follow them by first following the bot.
+    * `Pleroma.Web.ActivityPub.MRF.SubchainPolicy`: Selectively runs other MRF policies when messages match (See [`:mrf_subchain`](#mrf_subchain)).
-    * `Pleroma.Web.ActivityPub.MRF.AntiLinkSpamPolicy`: Rejects posts from likely spambots by rejecting posts from new users that contain links.
+    * `Pleroma.Web.ActivityPub.MRF.RejectNonPublic`: Drops posts with non-public visibility settings (See [`:mrf_rejectnonpublic`](#mrf_rejectnonpublic)).
    * `Pleroma.Web.ActivityPub.MRF.EnsureRePrepended`: Rewrites posts to ensure that replies to posts with subjects do not have an identical subject and instead begin with re:.
-    * `Pleroma.Web.ActivityPub.MRF.ForceBotUnlistedPolicy`: Makes all bot posts to disappear from public timelines.
+    * `Pleroma.Web.ActivityPub.MRF.AntiLinkSpamPolicy`: Rejects posts from likely spambots by rejecting posts from new users that contain links.
    * `Pleroma.Web.ActivityPub.MRF.HellthreadPolicy`: Blocks messages with too many mentions.
      (See [`mrf_hellthread`](#mrf_hellthread))
    * `Pleroma.Web.ActivityPub.MRF.KeywordPolicy`: Rejects or removes from the federated timeline or replaces keywords. (See [`:mrf_keyword`](#mrf_keyword)).
    * `Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy`: Crawls attachments using their MediaProxy URLs so that the MediaProxy cache is primed.
    * `Pleroma.Web.ActivityPub.MRF.MentionPolicy`: Drops posts mentioning configurable users. (See [`:mrf_mention`](#mrf_mention)).
    * `Pleroma.Web.ActivityPub.MRF.NoEmptyPolicy`: Drops local activities which have no actual content.
       (e.g. no attachments and only consists of mentions)
    * `Pleroma.Web.ActivityPub.MRF.NoPlaceholderTextPolicy`: Strips content placeholders from posts
      (such as the dot from mastodon)
    * `Pleroma.Web.ActivityPub.MRF.ObjectAgePolicy`: Rejects or delists posts based on their age when received. (See [`:mrf_object_age`](#mrf_object_age)).
    * `Pleroma.Web.ActivityPub.MRF.RejectNewlyCreatedAccountNotesPolicy`: Rejects posts of users the server only recently learned about for a while. Great to block spam accounts. (See [`:mrf_reject_newly_created_account_notes`](#mrf_reject_newly_created_account_notes))
    * `Pleroma.Web.ActivityPub.MRF.RejectNonPublic`: Drops posts with non-public visibility settings (See [`:mrf_rejectnonpublic`](#mrf_rejectnonpublic)).
    * `Pleroma.Web.ActivityPub.MRF.SimplePolicy`: Restrict the visibility of activities from certains instances (See [`:mrf_simple`](#mrf_simple)).
    * `Pleroma.Web.ActivityPub.MRF.StealEmojiPolicy`: Steals all eligible emoji encountered in posts from remote instances
      (See [`:mrf_steal_emoji`](#mrf_steal_emoji))
    * `Pleroma.Web.ActivityPub.MRF.SubchainPolicy`: Selectively runs other MRF policies when messages match (See [`:mrf_subchain`](#mrf_subchain)).
    * `Pleroma.Web.ActivityPub.MRF.TagPolicy`: Applies policies to individual users based on tags, which can be set using pleroma-fe/admin-fe/any other app that supports Pleroma Admin API. For example it allows marking posts from individual users nsfw (sensitive).
    * `Pleroma.Web.ActivityPub.MRF.UserAllowListPolicy`: Drops all posts except from users specified in a list.
      (See [`:mrf_user_allowlist`](#mrf_user_allowlist))
    * `Pleroma.Web.ActivityPub.MRF.VocabularyPolicy`: Restricts activities to a configured set of vocabulary. (See [`:mrf_vocabulary`](#mrf_vocabulary)).
-
+    * `Pleroma.Web.ActivityPub.MRF.ObjectAgePolicy`: Rejects or delists posts based on their age when received. (See [`:mrf_object_age`](#mrf_object_age)).
-Additionally the following MRFs will *always* be aplied and cannot be disabled:
+    * `Pleroma.Web.ActivityPub.MRF.ActivityExpirationPolicy`: Sets a default expiration on all posts made by users of the local instance. Requires `Pleroma.Workers.PurgeExpiredActivity` to be enabled for processing the scheduled delections.
-
+    * `Pleroma.Web.ActivityPub.MRF.ForceBotUnlistedPolicy`: Makes all bot posts to disappear from public timelines.
-* `Pleroma.Web.ActivityPub.MRF.DirectMessageDisabledPolicy`: Strips users limiting who can send them DMs from the recipients of non-eligible DMs
+    * `Pleroma.Web.ActivityPub.MRF.FollowBotPolicy`: Automatically follows newly discovered users from the specified bot account. Local accounts, locked accounts, and users with "#nobot" in their bio are respected and excluded from being followed.
-* `Pleroma.Web.ActivityPub.MRF.HashtagPolicy`: Depending on a post’s hashtags it can be rejected, get its sensitive flags force-enabled or removed from the global timeline
+    * `Pleroma.Web.ActivityPub.MRF.AntiFollowbotPolicy`: Drops follow requests from followbots. Users can still allow bots to follow them by first following the bot.
-    (See [`:mrf_hashtag`](#mrf_hashtag))
+    * `Pleroma.Web.ActivityPub.MRF.KeywordPolicy`: Rejects or removes from the federated timeline or replaces keywords. (See [`:mrf_keyword`](#mrf_keyword)).
-* `Pleroma.Web.ActivityPub.MRF.InlineQuotePolicy`: Append a link to a post that quotes another post with the link to the quoted post, to ensure that software that does not understand quotes can have full context.
+* `transparency`: Make the content of your Message Rewrite Facility settings public (via nodeinfo).
-    (See [`:mrf_inline_quote`](#mrf_inline_quote))
+* `transparency_exclusions`: Exclude specific instance names from MRF transparency.  The use of the exclusions feature will be disclosed in nodeinfo as a boolean value.
 * `Pleroma.Web.ActivityPub.MRF.NormalizeMarkup`: Pass inbound HTML through a scrubber to make sure it doesn't have anything unusual in it.
    (See [`:mrf_normalize_markup`](#mrf_normalize_markup))
 ## Federation
 ### :activitypub
 * `unfollow_blocked`: Whether blocks result in people getting unfollowed
 * `outgoing_blocks`: Whether to federate blocks to other instances
 * `blockers_visible`: Whether a user can see the posts of users who blocked them
 * `deny_follow_blocked`: Whether to disallow following an account that has blocked the user in question
 * `sign_object_fetches`: Sign object fetches with HTTP signatures
 * `authorized_fetch_mode`: Require HTTP signatures for AP fetches
 * `max_collection_objects`: The maximum number of objects to fetch from a remote AP collection.
 ### MRF policies
 !!! note
@ -169,13 +131,12 @@ Additionally the following MRFs will *always* be aplied and cannot be disabled:
 * `media_removal`: List of instances to strip media attachments from and the reason for doing so.
 * `media_nsfw`: List of instances to tag all media as NSFW (sensitive) from and the reason for doing so.
 * `federated_timeline_removal`: List of instances to remove from the Federated Timeline (aka The Whole Known Network) and the reason for doing so.
-* `reject`: List of instances to reject activities (except deletes) from and the reason for doing so. Additionally prevents activities from being sent to that instance.
+* `reject`: List of instances to reject activities (except deletes) from and the reason for doing so.
 * `accept`: List of instances to only accept activities (except deletes) from and the reason for doing so.
 * `followers_only`: Force posts from the given instances to be visible by followers only and the reason for doing so.
 * `report_removal`: List of instances to reject reports from and the reason for doing so.
 * `avatar_removal`: List of instances to strip avatars from and the reason for doing so.
 * `banner_removal`: List of instances to strip banners from and the reason for doing so.
 * `background_removal`: List of instances to strip user backgrounds from and the reason for doing so.
 * `reject_deletes`: List of instances to reject deletions from and the reason for doing so.
 #### :mrf_subchain
@ -238,9 +199,7 @@ config :pleroma, :mrf_user_allowlist, %{
 #### :mrf_steal_emoji
 * `hosts`: List of hosts to steal emojis from
 * `rejected_shortcodes`: Regex-list of shortcodes to reject
-* `size_limit`: File size limit (in bytes), checked before download if possible (and remote server honest),
+* `size_limit`: File size limit (in bytes), checked before an emoji is saved to the disk
   otherwise or again checked before saving emoji to the disk
 * `download_unknown_size`: whether to download an emoji when the remote server doesn’t report its size in advance
 #### :mrf_activity_expiration
@ -256,24 +215,19 @@ Notes:
 - The hashtags in the configuration do not have a leading `#`.
 - This MRF Policy is always enabled, if you want to disable it you have to set empty lists
-#### :mrf_reject_newly_created_account_notes
+#### :mrf_follow_bot
 After initially encountering an user, all their posts
 will be rejected for the configured time (in seconds).
 Only drops posts. Follows, reposts, etc. are not affected.
-* `age`: Time below which to reject (in seconds)
+* `follower_nickname`: The name of the bot account to use for following newly discovered users. Using `followbot` or similar is strongly suggested.
 An example: (86400 seconds = 24 hours)
-```elixir
+### :activitypub
-config :pleroma, :mrf_reject_newly_created_account_notes, age: 86400
+* `unfollow_blocked`: Whether blocks result in people getting unfollowed
-```
+* `outgoing_blocks`: Whether to federate blocks to other instances
-
+* `blockers_visible`: Whether a user can see the posts of users who blocked them
-#### :mrf_inline_quote
+* `deny_follow_blocked`: Whether to disallow following an account that has blocked the user in question
-* `prefix`: what prefix to prepend to quoted URLs
+* `sign_object_fetches`: Sign object fetches with HTTP signatures
-
+* `authorized_fetch_mode`: Require HTTP signatures for AP fetches
-#### :mrf_normalize_markup
+* `max_collection_objects`: The maximum number of objects to fetch from a remote AP collection.
 * `scrub_policy`: the scrubbing module to use (by default a built-in HTML sanitiser)
 ## Pleroma.User
@ -290,11 +244,11 @@ config :pleroma, :mrf_reject_newly_created_account_notes, age: 86400
 ### :frontend_configurations
-This can be used to configure a keyword list that keeps the configuration data for any kind of frontend. By default, settings for `pleroma_fe` and `masto_fe` are configured. You can find the documentation for `pleroma_fe` configuration into [Akkoma-FE configuration and customization for instance administrators](https://docs-fe.akkoma.dev/stable/CONFIGURATION/#options).
+This can be used to configure a keyword list that keeps the configuration data for any kind of frontend. By default, settings for `pleroma_fe` and `masto_fe` are configured. You can find the documentation for `pleroma_fe` configuration into [Pleroma-FE configuration and customization for instance administrators](https://docs-fe.akkoma.dev/stable/CONFIGURATION/#options).
 Frontends can access these settings at `/api/v1/pleroma/frontend_configurations`
-To add your own configuration for Akkoma-FE, use it like this:
+To add your own configuration for Pleroma-FE, use it like this:
 ```elixir
 config :pleroma, :frontend_configurations,
@ -329,19 +283,14 @@ config :pleroma, :frontends,
    "name" => "swagger-ui",
    "ref" => "stable",
    "enabled" => true
  },
  mastodon: %{
    "name" => "mastodon-fe",
    "ref" => "akkoma"
  } 
 ```
 * `:primary` - The frontend that will be served at `/`
 * `:admin` - The frontend that will be served at `/pleroma/admin`
-* `:swagger` - Config for developers to act as an API reference to be served at `/pleroma/swaggerui/` (trailing slash _needed_). Disabled by default.
+* `:swagger` - Config for developers to act as an API reference to be served at `/akkoma/swaggerui/` (trailing slash _needed_). Disabled by default.
 * `:mastodon` - The mastodon-fe configuration. This shouldn't need to be changed. This is served at `/web` when installed.
-### :static\_fe
+### :static_fe
 Render profiles and posts using server-generated HTML that is viewable without using JavaScript.
@ -400,8 +349,7 @@ This section describe PWA manifest instance-specific values. Currently this opti
 ## :media_proxy
 * `enabled`: Enables proxying of remote media to the instance’s proxy
-* `base_url`: The base URL to access a user-uploaded file.
+* `base_url`: The base URL to access a user-uploaded file. Useful when you want to proxy the media files via another host/CDN fronts.
  Using a (sub)domain distinct from the instance endpoint is **strongly** recommended.
 * `proxy_opts`: All options defined in `Pleroma.ReverseProxy` documentation, defaults to `[max_body_length: (25*1_048_576)]`.
 * `whitelist`: List of hosts with scheme to bypass the mediaproxy (e.g. `https://example.com`)
 * `invalidation`: options for remove media from cache after delete object:
@ -497,6 +445,7 @@ This will make Akkoma listen on `127.0.0.1` port `8080` and generate urls starti
 * ``enabled``: Whether the managed content security policy is enabled.
 * ``sts``: Whether to additionally send a `Strict-Transport-Security` header.
 * ``sts_max_age``: The maximum age for the `Strict-Transport-Security` header if sent.
 * ``ct_max_age``: The maximum age for the `Expect-CT` header if sent.
 * ``referrer_policy``: The referrer policy to use, either `"same-origin"` or `"no-referrer"`.
 * ``report_uri``: Adds the specified url to `report-uri` and `report-to` group in CSP header.
@ -567,13 +516,59 @@ Available caches:
 ### :http
-* `receive_timeout`: the amount of time, in ms, to wait for a remote server to respond to a request. (default: `15000`)
+* `proxy_url`: an upstream proxy to fetch posts and/or media with, (default: `nil`)
 * `pool_timeout`: the amount of time, in ms, to wait to check out an HTTP connection from the pool. This likely does not need changing unless your instance is _very_ busy with outbound requests. (default `5000`)
 * `proxy_url`: an upstream proxy to fetch posts and/or media with, (default: `nil`); for example `http://127.0.0.1:3192`. Does not support SOCKS5 proxy, only http(s).
 * `send_user_agent`: should we include a user agent with HTTP requests? (default: `true`)
 * `user_agent`: what user agent should we use? (default: `:default`), must be string or `:default`
 * `adapter`: array of adapter options
 ### :hackney_pools
 Advanced. Tweaks Hackney (http client) connections pools.
 There's three pools used:
 * `:federation` for the federation jobs.
  You may want this pool max_connections to be at least equal to the number of federator jobs + retry queue jobs.
 * `:media` for rich media, media proxy
 * `:upload` for uploaded media (if using a remote uploader and `proxy_remote: true`)
 For each pool, the options are:
 * `max_connections` - how much connections a pool can hold
 * `timeout` - retention duration for connections
 ### :connections_pool
 *For `gun` adapter*
 Settings for HTTP connection pool.
 * `:connection_acquisition_wait` - Timeout to acquire a connection from pool.The total max time is this value multiplied by the number of retries.
 * `connection_acquisition_retries` - Number of attempts to acquire the connection from the pool if it is overloaded. Each attempt is timed `:connection_acquisition_wait` apart.
 * `:max_connections` - Maximum number of connections in the pool.
 * `:connect_timeout` - Timeout to connect to the host.
 * `:reclaim_multiplier` - Multiplied by `:max_connections` this will be the maximum number of idle connections that will be reclaimed in case the pool is overloaded.
 ### :pools
 *For `gun` adapter*
 Settings for request pools. These pools are limited on top of `:connections_pool`.
 There are four pools used:
 * `:federation` for the federation jobs. You may want this pool's max_connections to be at least equal to the number of federator jobs + retry queue jobs.
 * `:media` - for rich media, media proxy.
 * `:upload` - for proxying media when a remote uploader is used and `proxy_remote: true`.
 * `:default` - for other requests.
 For each pool, the options are:
 * `:size` - limit to how much requests can be concurrently executed.
 * `:recv_timeout` - timeout while `gun` will wait for response
 * `:max_waiting` - limit to how much requests can be waiting for others to finish, after this is reached, subsequent requests will be dropped.
 ## Captcha
 ### Pleroma.Captcha
@ -602,11 +597,12 @@ the source code is here: [kocaptcha](https://github.com/koto-bank/kocaptcha). Th
 * `uploader`: Which one of the [uploaders](#uploaders) to use.
 * `filters`: List of [upload filters](#upload-filters) to use.
-* `link_name`: When enabled Akkoma will add a `name` parameter to the url of the upload, for example `https://instance.tld/media/corndog.png?name=corndog.png`. This is needed to provide the correct filename in Content-Disposition headers
+* `link_name`: When enabled Akkoma will add a `name` parameter to the url of the upload, for example `https://instance.tld/media/corndog.png?name=corndog.png`. This is needed to provide the correct filename in Content-Disposition headers when using filters like `Pleroma.Upload.Filter.Dedupe`
-* `base_url`: The base URL to access a user-uploaded file; MUST be configured explicitly.
+* `base_url`: The base URL to access a user-uploaded file. Useful when you want to host the media files via another domain or are using a 3rd party S3 provider.
-  Using a (sub)domain distinct from the instance endpoint is **strongly** recommended. A good value might be `https://media.myakkoma.instance/media/`. 
+* `proxy_remote`: If you're using a remote uploader, Akkoma will proxy media requests instead of redirecting to it.
 * `proxy_opts`: Proxy options, see `Pleroma.ReverseProxy` documentation.
 * `filename_display_max_length`: Set max length of a filename to display. 0 = no limit. Default: 30.
 * `default_description`: Sets which default description an image has if none is set explicitly. Options: nil (default) - Don't set a default, :filename - use the filename of the file, a string (e.g. "attachment") - Use this string
 !!! warning
    `strip_exif` has been replaced by `Pleroma.Upload.Filter.Mogrify`.
@ -643,35 +639,20 @@ config :ex_aws, :s3,
 ### Upload filters
 #### Pleroma.Upload.Filter.Dedupe
 **Always** active; cannot be turned off.
 Renames files to their hash and prevents duplicate files filling up the disk.
 No specific configuration.
 #### Pleroma.Upload.Filter.AnonymizeFilename
-This filter replaces the declared filename (not the path) of an upload.
+This filter replaces the filename (not the path) of an upload. For complete obfuscation, add
 `Pleroma.Upload.Filter.Dedupe` before AnonymizeFilename.
 * `text`: Text to replace filenames in links. If empty, `{random}.extension` will be used. You can get the original filename extension by using `{extension}`, for example `custom-file-name.{extension}`.
-#### Pleroma.Upload.Filter.Exiftool.StripMetadata
+#### Pleroma.Upload.Filter.Dedupe
 This filter strips metadata with Exiftool leaving color profiles and orientation intact.
 * `purge`: List of Exiftool tag names or tag group names to purge
 * `preserve`: List of Exiftool tag names or tag group names to preserve even if they occur in the purge list
 #### Pleroma.Upload.Filter.Exiftool.ReadDescription
 This filter reads the ImageDescription and iptc:Caption-Abstract fields with Exiftool so clients can prefill the media description field.
 No specific configuration.
-#### Pleroma.Upload.Filter.OnlyMedia
+#### Pleroma.Upload.Filter.Exiftool
-This filter rejects uploads that are not identified with Content-Type matching audio/\*, image/\*, or video/\*
+This filter only strips the GPS and location metadata with Exiftool leaving color profiles and attributes intact.
 No specific configuration.
@ -845,8 +826,17 @@ config :logger, :ex_syslogger,
  level: :info,
  ident: "pleroma",
  format: "$metadata[$level] $message"
 config :quack,
  level: :warn,
  meta: [:all],
  webhook_url: "https://hooks.slack.com/services/YOUR-API-KEY-HERE"
 ```
 See the [Quack Github](https://github.com/azohra/quack) for more details
 ## Database options
 ### RUM indexing for full text search
@ -901,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)
@ -1012,15 +980,6 @@ config :ueberauth, Ueberauth,
  ]
 ```
 You may also need to set up your frontend to use oauth logins. For example, for `akkoma-fe`:
 ```elixir
 config :pleroma, :frontend_configurations,
  pleroma_fe: %{
    loginMethod: "token"
  }
 ```
 ## Link parsing
 ### :uri_schemes
@ -1053,22 +1012,7 @@ config :pleroma, Pleroma.Formatter,
 ## Custom Runtime Modules (`:modules`)
-* `runtime_dir`: A path to custom Elixir modules, such as MRF policies or
+* `runtime_dir`: A path to custom Elixir modules (such as MRF policies).
 custom authenticators. These modules will be loaded on boot, and can be
 contained in subdirectories. It is advised to use version-controlled
 subdirectories to make management of them a bit easier. Note that only
 files with the extension `.ex` will be loaded.
 ```elixir
 config :pleroma, :modules, runtime_dir: "instance/modules"
 ```
 ### Adding a module
 ```bash
 cd instance/modules/
 git clone <MY MODULE>
 ```
 ## :configurable_from_database
@ -1102,7 +1046,7 @@ config :pleroma, :database_config_whitelist, [
 ### :restrict_unauthenticated
-Restrict access for unauthenticated users to timelines (public and federated), user profiles and posts.
+Restrict access for unauthenticated users to timelines (public and federated), user profiles and statuses.
 * `timelines`: public and federated timelines
  * `local`: public timeline
@ -1110,24 +1054,13 @@ Restrict access for unauthenticated users to timelines (public and federated), u
 * `profiles`: user profiles
  * `local`
  * `remote`
-* `activities`: posts
+* `activities`: statuses
  * `local`
  * `remote`
-#### When :instance, :public is `true`
+Note: when `:instance, :public` is set to `false`, all `:restrict_unauthenticated` items be effectively set to `true` by default. If you'd like to allow unauthenticated access to specific API endpoints on a private instance, please explicitly set `:restrict_unauthenticated` to non-default value in `config/prod.secret.exs`.
-When your instance is in "public" mode, all public resources (users, posts, timelines) are accessible to unauthenticated users.
+Note: setting `restrict_unauthenticated/timelines/local` to `true` has no practical sense if `restrict_unauthenticated/timelines/federated` is set to `false` (since local public activities will still be delivered to unauthenticated users as part of federated timeline).
 Turning any of the `:restrict_unauthenticated` options to `true` will restrict access to the corresponding resources.
 #### When :instance, :public is `false`
 When `:instance, :public` is set to `false`, all of the `:restrict_unauthenticated` options will effectively be set to `true` by default,
 meaning that only authenticated users will be able to access the corresponding resources.
 If you'd like to allow unauthenticated access to specific resources, you can turn these settings to `false`.
 **Note**: setting `restrict_unauthenticated/timelines/local` to `true` has no practical sense if `restrict_unauthenticated/timelines/federated` is set to `false` (since local public activities will still be delivered to unauthenticated users as part of federated timeline).
 ## Pleroma.Web.ApiSpec.CastAndValidate
@ -1183,34 +1116,3 @@ Each job has these settings:
 * `:max_running` - max concurrently runnings jobs
 * `:max_waiting` - max waiting jobs
 ### Translation Settings
 Settings to automatically translate statuses for end users. Currently supported
 translation services are DeepL and LibreTranslate. The supported command line tool is [Argos Translate](https://github.com/argosopentech/argos-translate).
 Translations are available at `/api/v1/statuses/:id/translations/:language`, where
 `language` is the target language code (e.g `en`)
 ### `:translator`
 - `:enabled` - enables translation
 - `:module` - Sets module to be used
  - Either `Pleroma.Akkoma.Translators.DeepL`, `Pleroma.Akkoma.Translators.LibreTranslate`, or `Pleroma.Akkoma.Translators.ArgosTranslate`
 ### `:deepl`
 - `:api_key` - API key for DeepL
 - `:tier` - API tier
  - either `:free` or `:pro`
 ### `:libre_translate`
 - `:url` - URL of LibreTranslate instance
 - `:api_key` - API key for LibreTranslate
 ### `:argos_translate`
 - `:command_argos_translate` - command for `argos-translate`. Can be the command if it's in your PATH, or the full path to the file  (default: `argos-translate`).
 - `:command_argospm` - command for `argospm`. Can be the command if it's in your PATH, or the full path to the file (default: `argospm`).
 - `:strip_html` - Strip html from the post before translating it (default: `true`).
--- a/docs/docs/configuration/custom_emoji.md
+++ b/docs/docs/configuration/custom_emoji.md
@ -67,29 +67,3 @@ Priority of tags assigns in emoji.txt and custom.txt:
 Priority for globs:
 `special group setting in config.exs > default setting in config.exs`
 ## Stealing emoji
 Managing your emoji can be hard work, and you just want to have the cool emoji your friends use? As usual, crime comes to the rescue!
 You can use the `Pleroma.Web.ActivityPub.MRF.StealEmojiPolicy` [Message Rewrite Facility](../configuration/cheatsheet.md#mrf) to automatically add to your instance emoji that messages from specific servers contain. Note that this happens on message processing, so the emoji will be added only after your instance receives some interaction containing emoji _after_ configuring this.
 To activate this you have to [configure](../configuration/cheatsheet.md#mrf_steal_emoji) it in your configuration file. For example if you wanted to steal any emoji that is not related to cinnamon and not larger than about 10K from `coolemoji.space` and `spiceenthusiasts.biz`, you would add the following:
 ```elixir
 config :pleroma, :mrf,
  policies: [
    Pleroma.Web.ActivityPub.MRF.StealEmojiPolicy
  ]
 config :pleroma, :mrf_steal_emoji,
  hosts: [
    "coolemoji.space",
    "spiceenthusiasts.biz"
  ],
  rejected_shortcodes: [
    ".*cinnamon.*"
  ],
  size_limit: 10000
 ```
 Note that this may not obey emoji licensing restrictions. It's extremely unlikely that anyone will care, but keep this in mind for when Nintendo starts their own instance.
--- a/docs/docs/configuration/frontend_management.md
+++ b/docs/docs/configuration/frontend_management.md
@ -19,29 +19,19 @@ config :pleroma, :frontends,
  admin: %{
    "name" => "admin-fe",
    "ref" => "stable"
  },
  mastodon: %{
    "name" => "mastodon-fe",
    "ref" => "akkoma"
  }
 ```
-This would serve the frontend from the folder at `$instance_static/frontends/pleroma/stable`. You have to copy the frontend into this folder yourself. You can choose the name and ref any way you like, but they will be used by mix tasks to automate installation in the future, the name referring to the project and the ref referring to a commit.
+This would serve the frontend from the the folder at `$instance_static/frontends/pleroma/stable`. You have to copy the frontend into this folder yourself. You can choose the name and ref any way you like, but they will be used by mix tasks to automate installation in the future, the name referring to the project and the ref referring to a commit.
 Refer to [the frontend CLI task](../../administration/CLI_tasks/frontend) for how to install the frontend's files
 If you wish masto-fe to also be enabled, you will also need to run the install task for `mastodon-fe`. Not doing this will lead to the frontend not working.
 If you choose not to install a frontend for whatever reason, it is recommended that you enable [`:static_fe`](#static_fe) to allow remote users to click "view remote source". Don't bother with this if you've got no unauthenticated access though.
 You can also replace the default "no frontend" page by placing an `index.html` file under your `instance/static/` directory.
 ## Mastodon-FE
 Akkoma supports both [glitchsoc](https://github.com/glitch-soc/mastodon)'s more "vanilla" mastodon frontend,
 as well as [fedibird](https://github.com/fedibird/mastodon)'s extended frontend which has near-feature-parity with akkoma (with quoting and reactions).
 To enable either one, you must run the `frontend.install` task for either `mastodon-fe` or `fedibird-fe` (both `--ref akkoma`), then make sure
 `:pleroma, :frontends, :mastodon` references the one you want.
 ## Swagger (openAPI) documentation viewer
 If you're a developer and you'd like a human-readable rendering of the
@ -60,4 +50,4 @@ config :pleroma, :frontends,
 Then run the [pleroma.frontend cli task](../../administration/CLI_tasks/frontend) with the name of `swagger-ui` to install the distribution files.
-You will now be able to view documentation at `/pleroma/swaggerui`
+You will now be able to view documentation at `/akkoma/swaggerui`
--- a/docs/docs/configuration/hardening.md
+++ b/docs/docs/configuration/hardening.md
@ -17,33 +17,24 @@ This sets the Akkoma application server to only listen to the localhost interfac
 This sets the `secure` flag on Akkoma’s session cookie. This makes sure, that the cookie is only accepted over encrypted HTTPs connections. This implicitly renames the cookie from `pleroma_key` to `__Host-pleroma-key` which enforces some restrictions. (see [cookie prefixes](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie#Cookie_prefixes))
 ### `Pleroma.Upload, :uploader, :base_url`
 > Recommended value: *anything on a different domain than the instance endpoint; e.g. https://media.myinstance.net/*
 Uploads are user controlled and (unless you’re running a true single-user
 instance) should therefore not be considered trusted. But the domain is used
 as a pivilege boundary e.g. by HTTP content security policy and ActivityPub.
 Having uploads on the same domain enabled several past vulnerabilities
 able to be exploited by malicious users.
 ### `:http_security`
 > Recommended value: `true`
 This will send additional HTTP security headers to the clients, including:
-* `X-XSS-Protection: "0"`
+* `X-XSS-Protection: "1; mode=block"`
 * `X-Permitted-Cross-Domain-Policies: "none"`
 * `X-Frame-Options: "DENY"`
 * `X-Content-Type-Options: "nosniff"`
 * `X-Download-Options: "noopen"`
 A content security policy (CSP) will also be set:
 ```csp
 content-security-policy:
  default-src 'none';
-  base-uri 'none';
+  base-uri 'self';
  frame-ancestors 'none';
  img-src 'self' data: blob: https:;
  media-src 'self' https:;
@ -61,15 +52,19 @@ content-security-policy:
 An additional “Strict transport security” header will be sent with the configured `sts_max_age` parameter. This tells the browser, that the domain should only be accessed over a secure HTTPs connection.
 #### `ct_max_age`
 An additional “Expect-CT” header will be sent with the configured `ct_max_age` parameter. This enforces the use of TLS certificates that are published in the certificate transparency log. (see [Expect-CT](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Expect-CT))
 #### `referrer_policy`
 > Recommended value: `same-origin`
-If you click on a link, your browser’s request to the other site will include from where it is coming from. The “Referrer policy” header tells the browser how and if it should send this information. (see [Referrer policy](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Referrer-Policy)). `no-referrer` can be used if a referrer is not needed for improved privacy.
+If you click on a link, your browser’s request to the other site will include from where it is coming from. The “Referrer policy” header tells the browser how and if it should send this information. (see [Referrer policy](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Referrer-Policy))
 ## systemd
-A systemd unit example is provided at `installation/akkoma.service`.
+A systemd unit example is provided at `installation/pleroma.service`.
 ### PrivateTmp
--- a/docs/docs/configuration/how_to_serve_another_domain_for_webfinger.md
+++ b/docs/docs/configuration/how_to_serve_another_domain_for_webfinger.md
@ -1,62 +0,0 @@
 # How to use a different domain name for Akkoma and the users it serves
 Akkoma users are primarily identified by a `user@example.org` handle, and you might want this identifier to be the same as your email or jabber account, for instance.
 However, in this case, you are almost certainly serving some web content on `https://example.org` already, and you might want to use another domain (say `akkoma.example.org`) for Akkoma itself.
 Akkoma supports that, but it might be tricky to set up, and any error might prevent you from federating with other instances.
 *If you are already running Akkoma on `example.org`, it is no longer possible to move it to `akkoma.example.org`.*
 ## Account identifiers
 It is important to understand that for federation purposes, a user in Akkoma has two unique identifiers associated:
 - A webfinger `acct:` URI, used for discovery and as a verifiable global name for the user across Akkoma instances. In our example, our account's acct: URI is `acct:user@example.org`
 - An author/actor URI, used in every other aspect of federation. This is the way in which users are identified in ActivityPub, the underlying protocol used for federation with other Akkoma instances.
 In our case, it is `https://akkoma.example.org/users/user`.
 Both account identifiers are unique and required for Akkoma. An important risk if you set up your Akkoma instance incorrectly is to create two users (with different acct: URIs) with conflicting author/actor URIs.
 ## WebFinger
 As said earlier, each Akkoma user has an `acct`: URI, which is used for discovery and authentication. When you add @user@example.org, a webfinger query is performed. This is done in two steps:
 1. Querying `https://example.org/.well-known/host-meta` (where the domain of the URL matches the domain part of the `acct`: URI) to get information on how to perform the query.
 This file will indeed contain a URL template of the form `https://example.org/.well-known/webfinger?resource={uri}` that will be used in the second step.
 2. Fill the returned template with the `acct`: URI to be queried and perform the query: `https://example.org/.well-known/webfinger?resource=acct:user@example.org`
 ## Configuring your Akkoma instance
 **_DO NOT ATTEMPT TO CONFIGURE YOUR INSTANCE THIS WAY IF YOU DID NOT UNDERSTAND THE ABOVE_**
 ### Configuring Akkoma
 Akkoma has a two configuration settings to enable using different domains for your users and Akkoma itself. `host` in `Pleroma.Web.Endpoint` and `domain` in `Pleroma.Web.WebFinger`. When the latter is not set, it defaults to the value of `host`.
 *Be extra careful when configuring your Akkoma instance, as changing `host` may cause remote instances to register different accounts with the same author/actor URI, which will result in federation issues!*
 ```elixir
 config :pleroma, Pleroma.Web.Endpoint,
  url: [host: "pleroma.example.org"]
 config :pleroma, Pleroma.Web.WebFinger, domain: "example.org"
 ```
 - `domain` - is the domain for which your Akkoma instance has authority, it's the domain used in `acct:` URI. In our example, `domain` would be set to `example.org`.
 - `host` - is the domain used for any URL generated for your instance, including the author/actor URL's. In our case, that would be `akkoma.example.org`.
 ### Configuring WebFinger domain
 Now, you have Akkoma running at `https://akkoma.example.org` as well as a website at `https://example.org`. If you recall how webfinger queries work, the first step is to query `https://example.org/.well-known/host-meta`, which will contain an URL template.
 Therefore, the easiest way to configure `example.org` is to redirect `/.well-known/host-meta` to `akkoma.example.org`.
 With nginx, it would be as simple as adding:
 ```nginx
 location = /.well-known/host-meta {
       return 301 https://akkoma.example.org$request_uri;
 }
 ```
 in example.org's server block.
--- a/docs/docs/configuration/integrations/howto_ejabberd.md
+++ b/docs/docs/configuration/integrations/howto_ejabberd.md
--- a/docs/docs/configuration/howto_mediaproxy.md
+++ b/docs/docs/configuration/howto_mediaproxy.md
@ -6,18 +6,29 @@ With the `mediaproxy` function you can use nginx to cache this content, so users
 ## Activate it
-* Set up a subdomain for the proxy with its nginx config on the same machine
+* Edit your nginx config and add the following location: 
-* Edit the nginx config for the upload/MediaProxy subdomain to point to the subdomain that has been set up
+```
 location /proxy {
        proxy_cache akkoma_media_cache;
        proxy_cache_lock on;
        proxy_pass http://localhost:4000;
 }
 ```
 Also add the following on top of the configuration, outside of the `server` block:
 ```
 proxy_cache_path /tmp/akkoma-media-cache levels=1:2 keys_zone=akkoma_media_cache:10m max_size=10g inactive=720m use_temp_path=off;
 ```
 If you came here from one of the installation guides, take a look at the example configuration `/installation/nginx/akkoma.nginx`, where this part is already included.
 * Append the following to your `prod.secret.exs` or `dev.secret.exs` (depends on which mode your instance is running):
-```elixir
+```
 # Replace media.example.td with the subdomain you set up earlier
 config :pleroma, :media_proxy,
      enabled: true,
      proxy_opts: [
            redirect_on_failure: true
-      ],
+      ]
-      base_url: "https://media.example.tld"
+      #base_url: "https://cache.akkoma.social"
 ```
-You **really** should use a subdomain to serve proxied files; while we will fix bugs resulting from this, serving arbitrary remote content on your main domain namespace is a significant attack surface.
+If you want to use a subdomain to serve the files, uncomment `base_url`, change the url and add a comma after `true` in the previous line.
 * Restart nginx and Akkoma
--- a/docs/docs/configuration/integrations/howto_mongooseim.md
+++ b/docs/docs/configuration/integrations/howto_mongooseim.md
--- a/docs/docs/configuration/howto_theming_your_instance.md
+++ b/docs/docs/configuration/howto_theming_your_instance.md
@ -6,7 +6,7 @@ To add a custom theme to your instance, you'll first need to get a custom theme,
 ### Create your own theme
-* You can create your own theme using the Akkoma FE by going to settings (gear on the top right) and choose the Theme tab. Here you have the options to create a personal theme.
+* You can create your own theme using the Pleroma FE by going to settings (gear on the top right) and choose the Theme tab. Here you have the options to create a personal theme.
 * To download your theme, you can do Save preset
 * If you want to upload a theme to customise it further, you can upload it using Load preset
@ -21,7 +21,7 @@ This will only save the theme for you personally. To make it available to the wh
 ### Upload the theme to the server
-Themes can be found in the [static directory](static_dir.md). Create `STATIC-DIR/static/themes/` if needed and copy your theme there. Next you need to add an entry for your theme to `STATIC-DIR/static/styles.json`. If you use a from source installation, you'll first need to copy the file from `STATIC-DIR/frontends/pleroma-fe/REF/static/styles.json` (where `REF` is `stable` or `develop` depending on which ref you decided to install).
+Themes can be found in the [static directory](static_dir.md). Create `STATIC-DIR/static/themes/` if needed and copy your theme there. Next you need to add an entry for your theme to `STATIC-DIR/static/styles.json`. If you use a from source installation, you'll first need to copy the file from `priv/static/static/styles.json`.
 Example of `styles.json` where we add our own `my-awesome-theme.json`
 ```json
@ -60,7 +60,7 @@ Example of `my-awesome-theme.json` where we add the name "My Awesome Theme"
 ### Set as default theme
-Now we can set the new theme as default in the [Pleroma FE configuration](https://docs-fe.akkoma.dev/stable/CONFIGURATION/).
+Now we can set the new theme as default in the [Pleroma FE configuration](https://docs-fe.akkoma.dev/stable/CONFIGURATION).
 Example of adding the new theme in the back-end config files
 ```elixir
@ -71,3 +71,4 @@ config :pleroma, :frontend_configurations,
 ```
 If you added it in the back-end configuration file, you'll need to restart your instance for the changes to take effect. If you don't see the changes, it's probably because the browser has cached the previous theme. In that case you'll want to clear browser caches. Alternatively you can use a private/incognito window just to see the changes.
--- a/docs/docs/configuration/i2p.md
+++ b/docs/docs/configuration/i2p.md
@ -130,26 +130,60 @@ config :pleroma, :http_security,
  enabled: false
 ```
-In the Nginx config, add the following into the `location /` block:
+Use this as the Nginx config:
-```nginx
+```
-        add_header X-XSS-Protection "0";
+proxy_cache_path /tmp/akkoma-media-cache levels=1:2 keys_zone=akkoma_media_cache:10m max_size=10g inactive=720m use_temp_path=off;
 # The above already exists in a clearnet instance's config.
 # If not, add it.
 server {
    listen 127.0.0.1:14447;
    server_name youri2paddress;
    # Comment to enable logs
    access_log /dev/null;
    error_log /dev/null;
    gzip_vary on;
    gzip_proxied any;
    gzip_comp_level 6;
    gzip_buffers 16 8k;
    gzip_http_version 1.1;
    gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript application/activity+json application/atom+xml;
    client_max_body_size 16m;
    location / {
        add_header X-XSS-Protection "1; mode=block";
        add_header X-Permitted-Cross-Domain-Policies none;
        add_header X-Frame-Options DENY;
        add_header X-Content-Type-Options nosniff;
        add_header Referrer-Policy same-origin;
-```
+        add_header X-Download-Options noopen;
-Change the `listen` directive to the following:
+        proxy_http_version 1.1;
-```nginx
+        proxy_set_header Upgrade $http_upgrade;
-listen 127.0.0.1:14447;
+        proxy_set_header Connection "upgrade";
-```
+        proxy_set_header Host $http_host;
-Set `server_name` to your i2p address.
+        proxy_pass http://localhost:4000;
-Reload Nginx:
+        client_max_body_size 16m;
    }
    location /proxy {
        proxy_cache akkoma_media_cache;
        proxy_cache_lock on;
        proxy_ignore_client_abort on;
        proxy_pass http://localhost:4000;
    }
 }
 ```
-systemctl restart i2pd.service --no-block
+reload Nginx:
-systemctl reload nginx.service
+```
 systemctl stop i2pd.service --no-block
 systemctl start i2pd.service
 ```
 *Notice:* The stop command initiates a graceful shutdown process, i2pd stops after finishing to route transit tunnels (maximum 10 minutes).
--- a/docs/docs/configuration/mrf.md
+++ b/docs/docs/configuration/mrf.md
@ -15,6 +15,18 @@ The MRF provides user-configurable policies. The default policy is `NoOpPolicy`,
 It is possible to use multiple, active MRF policies at the same time.
 ## Quarantine Instances
 You have the ability to prevent from private / followers-only messages from federating with specific instances. Which means they will only get the public or unlisted messages from your instance.
 If, for example, you're using `MIX_ENV=prod` aka using production mode, you would open your configuration file located in `config/prod.secret.exs` and edit or add the option under your `:instance` config object. Then you would specify the instance within quotes.
 ```elixir
 config :pleroma, :instance,
  [...]
  quarantined_instances: ["instance.example", "other.example"]
 ```
 ## Using `SimplePolicy`
 `SimplePolicy` is capable of handling most common admin tasks.
@ -29,13 +41,12 @@ config :pleroma, :mrf,
 Once `SimplePolicy` is enabled, you can configure various groups in the `:mrf_simple` config object. These groups are:
-* `reject`: Servers in this group will have their messages rejected. Also outbound messages will not be sent to these servers.
+* `reject`: Servers in this group will have their messages rejected.
 * `accept`: If not empty, only messages from these instances will be accepted (whitelist federation).
 * `media_nsfw`: Servers in this group will have the #nsfw tag and sensitive setting injected into incoming messages which contain media.
 * `media_removal`: Servers in this group will have media stripped from incoming messages.
 * `avatar_removal`: Avatars from these servers will be stripped from incoming messages.
 * `banner_removal`: Banner images from these servers will be stripped from incoming messages.
 * `background_removal`: User background images from these servers will be stripped from incoming messages.
 * `report_removal`: Servers in this group will have their reports (flags) rejected.
 * `federated_timeline_removal`: Servers in this group will have their messages unlisted from the public timelines by flipping the `to` and `cc` fields.
 * `reject_deletes`: Deletion requests will be rejected from these servers.
@ -62,32 +73,6 @@ config :pleroma, :mrf_simple,
 The effects of MRF policies can be very drastic. It is important to use this functionality carefully. Always try to talk to an admin before writing an MRF policy concerning their instance.
 ## Hiding or Obfuscating Policies
 You can opt out of publicly displaying all MRF policies or only hide or obfuscate selected domains.
 To just hide everything set:
 ```elixir
 config :pleroma, :mrf,
  ...
  transparency: false,
 ```
 To hide or obfuscate only select entries, use:
 ```elixir
 config :pleroma, :mrf,
  ...
  transparency_obfuscate_domains: ["handholdi.ng", "badword.com"],
  transparency_exclusions: [{"ghost.club", "even a fragment is too spoopy for humans"}]
 ```
 ## More MRF Policies
 See the [documentation cheatsheet](cheatsheet.md)
 for all available MRF policies and their options.
 ## Writing your own MRF Policy
 As discussed above, the MRF system is a modular system that supports pluggable policies. This means that an admin may write a custom MRF policy in Elixir or any other language that runs on the Erlang VM, by specifying the module name in the `policies` config setting.
--- a/docs/docs/configuration/onion_federation.md
+++ b/docs/docs/configuration/onion_federation.md
@ -14,12 +14,11 @@ apt -yq install tor
 **WARNING:** Onion instances not using a Tor version supporting V3 addresses will not be able to federate with you. 
-Create the hidden service for your Akkoma instance in `/etc/tor/torrc`, with an HTTP tunnel:
+Create the hidden service for your Akkoma instance in `/etc/tor/torrc`:
 ```
 HiddenServiceDir /var/lib/tor/akkoma_hidden_service/
 HiddenServicePort 80 127.0.0.1:8099
 HiddenServiceVersion 3  # Remove if Tor version is below 0.3 ( tor --version )
 HTTPTunnelPort 9080
 ```
 Restart Tor to generate an adress:
 ```
@ -36,7 +35,7 @@ Next, edit your Akkoma config.
 If running in prod, navigate to your Akkoma directory, edit `config/prod.secret.exs`
 and append this line:
 ```
-config :pleroma, :http, proxy_url: "http://localhost:9080"
+config :pleroma, :http, proxy_url: {:socks5, :localhost, 9050}
 ```
 In your Akkoma directory, assuming you're running prod,
 run the following:
@ -74,23 +73,57 @@ config :pleroma, :http_security,
  enabled: false
 ```
-In the Nginx config, add the following into the `location /` block:
+Use this as the Nginx config:
-```nginx
+```
-        add_header X-XSS-Protection "0";
+proxy_cache_path /tmp/akkoma-media-cache levels=1:2 keys_zone=akkoma_media_cache:10m max_size=10g inactive=720m use_temp_path=off;
 # The above already exists in a clearnet instance's config.
 # If not, add it.
 server {
    listen 127.0.0.1:8099;
    server_name youronionaddress;
    # Comment to enable logs
    access_log /dev/null;
    error_log /dev/null;
    gzip_vary on;
    gzip_proxied any;
    gzip_comp_level 6;
    gzip_buffers 16 8k;
    gzip_http_version 1.1;
    gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript application/activity+json application/atom+xml;
    client_max_body_size 16m;
    location / {
        add_header X-XSS-Protection "1; mode=block";
        add_header X-Permitted-Cross-Domain-Policies none;
        add_header X-Frame-Options DENY;
        add_header X-Content-Type-Options nosniff;
        add_header Referrer-Policy same-origin;
        add_header X-Download-Options noopen;
        proxy_http_version 1.1;
        proxy_set_header Upgrade $http_upgrade;
        proxy_set_header Connection "upgrade";
        proxy_set_header Host $http_host;
        proxy_pass http://localhost:4000;
        client_max_body_size 16m;
    }
    location /proxy {
        proxy_cache akkoma_media_cache;
        proxy_cache_lock on;
        proxy_ignore_client_abort on;
        proxy_pass http://localhost:4000;
    }
 }
 ```
-
+reload Nginx:
 Change the `listen` directive to the following:
 ```nginx
 listen 127.0.0.1:8099;
 ```
 Set the `server_name` to your onion address.
 Reload Nginx:
 ```
 systemctl reload nginx
 ```
--- a/docs/docs/configuration/optimisation/varnish_cache.md
+++ b/docs/docs/configuration/optimisation/varnish_cache.md
@ -1,54 +0,0 @@
 # Using a Varnish Cache
 Varnish is a layer that sits between your web server and your backend application -
 it does something similar to nginx caching, but tends to be optimised for speed over
 all else.
 To set up a varnish cache, first you'll need to install varnish. 
 This will vary by distribution, and since this is a rather advanced guide,
 no copy-paste instructions are provided. It's probably in your distribution's
 package manager, though. `apt-get install varnish` and so on.
 Once you have varnish installed, you'll need to configure it to work with akkoma.
 Copy the configuration file to the varnish configuration directory:
    cp installation/akkoma.vcl /etc/varnish/akkoma.vcl
 You may want to check if varnish added a `default.vcl` file to the same directory,
 if so you can just remove it without issue.
 Then boot up varnish, probably `systemctl start varnish` or `service varnish start`.
 Now you should be able to `curl -D- localhost:6081` and see a bunch of
 akkoma javascript.
 Once that's out of the way, we can point our webserver at varnish. This
 === "Nginx"
    upstream phoenix {
        server 127.0.0.1:6081 max_fails=5 fail_timeout=60s;
    }
 === "Caddy"
    reverse_proxy 127.0.0.1:6081
 Now hopefully it all works
 If you get a HTTPS redirect loop, you may need to remove this part of the VCL
 ```vcl
 if (std.port(server.ip) != 443) {
      set req.http.X-Forwarded-Proto = "http";
      set req.http.x-redir = "https://" + req.http.host + req.url;
      return (synth(750, ""));
 } else {
  set req.http.X-Forwarded-Proto = "https";
 }
 ```
 This will allow your webserver alone to handle redirects.
--- a/docs/docs/configuration/optimisation/optimizing_beam.md
+++ b/docs/docs/configuration/optimisation/optimizing_beam.md
@ -25,14 +25,11 @@ Tuning the BEAM requires you provide a config file normally called [vm.args](htt
 `ExecStart=/usr/bin/elixir --erl '-args_file /opt/akkoma/config/vm.args' -S /usr/bin/mix phx.server`
 If using an OTP release, set the `RELEASE_VM_ARGS` environment variable to the path to the vm.args file.
 Check your OS documentation to adopt a similar strategy on other platforms.
 ### Virtual Machine and/or few CPU cores
-Disable the busy-waiting. This should generally be done if you're on a platform that does burst scheduling, like AWS, or if you're running other
+Disable the busy-waiting. This should generally only be done if you're on a platform that does burst scheduling, like AWS.
 services on the same machine.
 **vm.args:**
@ -42,8 +39,6 @@ services on the same machine.
 +sbwtdio none
 ```
 These settings are enabled by default for OTP releases
 ### Dedicated Hardware
 Enable more busy waiting, increase the internal maximum limit of BEAM processes and ports. You can use this if you run on dedicated hardware, but it is not necessary.
--- a/docs/docs/configuration/postgresql.md
+++ b/docs/docs/configuration/postgresql.md
@ -4,10 +4,45 @@ Akkoma performance is largely dependent on performance of the underlying databas
 ## PGTune
-[PgTune](https://pgtune.leopard.in.ua) can be used to get recommended settings. Make sure to set the DB type to "Online transaction processing system" for optimal performance. Also set the number of connections to between 25 and 30. This will allow each connection to have access to more resources while still leaving some room for running maintenance tasks while the instance is still running. 
+[PgTune](https://pgtune.leopard.in.ua) can be used to get recommended settings. Be sure to set "Number of Connections" to 20, otherwise it might produce settings hurtful to database performance. It is also recommended to not use "Network Storage" option.
-It is also recommended to not use "Network Storage" option.
+## Disable generic query plans
-If your server runs other services, you may want to take that into account. E.g. if you have 4G ram, but 1G of it is already used for other services, it may be better to tell PGTune you only have 3G.
+When PostgreSQL receives a query, it decides on a strategy for searching the requested data, this is called a query plan. The query planner has two modes: generic and custom. Generic makes a plan for all queries of the same shape, ignoring the parameters, which is then cached and reused. Custom, on the contrary, generates a unique query plan based on query parameters.
-In the end, PGTune only provides recomended settings, you can always try to finetune further.
+By default PostgreSQL has an algorithm to decide which mode is more efficient for particular query, however this algorithm has been observed to be wrong on some of the queries Akkoma sends, leading to serious performance loss. Therefore, it is recommended to disable generic mode.
 Akkoma already avoids generic query plans by default, however the method it uses is not the most efficient because it needs to be compatible with all supported PostgreSQL versions. For PostgreSQL 12 and higher additional performance can be gained by adding the following to Akkoma configuration:
 ```elixir
 config :pleroma, Pleroma.Repo,
  prepare: :named,
  parameters: [
    plan_cache_mode: "force_custom_plan"
  ]
 ```
 A more detailed explaination of the issue can be found at <https://blog.soykaf.com/post/postgresql-elixir-troubles/>.
 ## Example configurations
 Here are some configuration suggestions for PostgreSQL 10+.
 ### 1GB RAM, 1 CPU
 ```
 shared_buffers = 256MB
 effective_cache_size = 768MB
 maintenance_work_mem = 64MB
 work_mem = 13107kB
 ```
 ### 2GB RAM, 2 CPU
 ```
 shared_buffers = 512MB
 effective_cache_size = 1536MB
 maintenance_work_mem = 128MB
 work_mem = 26214kB
 max_worker_processes = 2
 max_parallel_workers_per_gather = 1
 max_parallel_workers = 2
 ```
--- a/docs/docs/configuration/search.md
+++ b/docs/docs/configuration/search.md
@ -33,7 +33,6 @@ indexes faster when it can process many posts in a single batch.
 > config :pleroma, Pleroma.Search.Meilisearch,
 >    url: "http://127.0.0.1:7700/",
 >    private_key: "private key",
 >    search_key: "search key",
 >    initial_indexing_chunk_size: 100_000
 Information about setting up meilisearch can be found in the
@ -46,7 +45,7 @@ is hardly usable on a somewhat big instance.
 ### Private key authentication (optional)
 To set the private key, use the `MEILI_MASTER_KEY` environment variable when starting. After setting the _master key_,
-you have to get the _private key_ and possibly _search key_, which are actually used for authentication.
+you have to get the _private key_, which is actually used for authentication.
 === "OTP"
    ```sh
@ -58,11 +57,7 @@ you have to get the _private key_ and possibly _search key_, which are actually
    mix pleroma.search.meilisearch show-keys <your master key here>
    ```
-You will see a "Default Admin API Key", this is the key you actually put into
+You will see a "Default Admin API Key", this is the key you actually put into your configuration file.
 your configuration file as `private_key`. You should also see a
 "Default Search API key", put this into your config as `search_key`.
 If your version of Meilisearch only showed the former,
 just leave `search_key` completely unset in Akkoma's config.
 ### Initial indexing
@ -146,7 +141,8 @@ You then need to set the URL and authentication credentials if relevant.
 ### Initial indexing
-After setting up the configuration, you'll want to index all of your already existsing posts. You'll only have to do it one time, but it might take a while, depending on the amount of posts your instance has seen. 
+After setting up the configuration, you'll want to index all of your already existsing posts. Only public posts are indexed.  You'll only
 have to do it one time, but it might take a while, depending on the amount of posts your instance has seen. 
 The sequence of actions is as follows:
--- a/docs/docs/configuration/static_dir.md
+++ b/docs/docs/configuration/static_dir.md
@ -89,23 +89,7 @@ config :pleroma, :frontend_configurations,
 Terms of Service will be shown to all users on the registration page. It's the best place where to write down the rules for your instance. You can modify the rules by adding and changing `$static_dir/static/terms-of-service.html`.
 ## Favicon
 The favicon will display on the frontend, and in the browser tab. 
 Place a PNG file at `$static_dir/favicon.png` to change the favicon. Not that this
 is _one level above_ where the logo is placed, it should be on the same level as
 the `frontends` directory.
 ## Styling rendered pages
 To overwrite the CSS stylesheet of the OAuth form and other static pages, you can upload your own CSS file to `instance/static/static.css`. This will completely replace the CSS used by those pages, so it might be a good idea to copy the one from `priv/static/instance/static.css` and make your changes.
 ## Overriding pleroma-fe styles
 To overwrite the CSS stylesheet of pleroma-fe, you can put a file at
 `$static_dir/static/custom.css` containing your styles. These will be loaded
 with the rest of the CSS.
 You will probably have to put `!important` on most/all your styles to override the
 default ones, due to the specificity precedence of CSS.
--- a/docs/docs/configuration/storing_remote_media.md
+++ b/docs/docs/configuration/storing_remote_media.md
@ -6,46 +6,33 @@ as soon as the post is received by your instance.
 ## Nginx
 The following are excerpts from the [suggested nginx config](https://akkoma.dev/AkkomaGang/akkoma/src/branch/develop/installation/nginx/akkoma.nginx) that demonstrates the necessary config for the media proxy to work.
 A `proxy_cache_path` must be defined, for example:
 ```
-proxy_cache_path /long/term/storage/path/akkoma-media-cache levels=1:2
+    proxy_cache_path /long/term/storage/path/akkoma-media-cache levels=1:2
        keys_zone=akkoma_media_cache:10m inactive=1y use_temp_path=off;
 ```
 The `proxy_cache_path` must then be configured for use with media proxy paths:
 ```
    location ~ ^/(media|proxy) {
        proxy_cache        akkoma_media_cache;
        slice              1m;
        proxy_cache_key    $host$uri$is_args$args$slice_range;
        proxy_set_header   Range $slice_range;
-        proxy_cache_valid  200 206 301 304 1h;
+        proxy_http_version 1.1;
-        proxy_cache_lock   on;
+        proxy_cache_valid  206 301 302 304 1h;
        proxy_cache_valid  200 1y;
        proxy_cache_use_stale error timeout invalid_header updating;
        proxy_ignore_client_abort on;
        proxy_buffering    on;
        chunked_transfer_encoding on;
-        proxy_pass         http://phoenix;
+        proxy_ignore_headers Cache-Control Expires;
        proxy_hide_header  Cache-Control Expires;
        proxy_pass         http://127.0.0.1:4000;
    }
 }
 ```
 Ensure that `proxy_http_version 1.1;` is set for the above `location` block. In the suggested config, this is already the case.
 ## Akkoma
-### File-based Configuration
+Add to your `prod.secret.exs`:
 If you're using static file configuration, add the `MediaProxyWarmingPolicy` to your MRF policies. For example:
 ```
 config :pleroma, :mrf,
  policies: [Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy]
 ```
 ### Database Configuration
 In the admin interface, add `MediaProxyWarmingPolicy` to the `Policies` option under `Settings` → `MRF`.
--- a/docs/docs/development/API/admin_api.md
+++ b/docs/docs/development/API/admin_api.md
@ -2,7 +2,7 @@
 Authentication is required and the user must be an admin.
-Backwards-compatibility for admin API endpoints without version prefixes (`/api/pleroma/admin/*`) has been removed as of Akkoma 3.6.0. Please use `/api/v1/pleroma/admin/*` instead.
+The `/api/v1/pleroma/admin/*` path is backwards compatible with `/api/pleroma/admin/*` (`/api/pleroma/admin/*` will be deprecated in the future).
 ## `GET /api/v1/pleroma/admin/users`
@ -1033,6 +1033,7 @@ Most of the settings will be applied in `runtime`, this means that you don't nee
  - `:pools`
 - partially settings inside these keys:
  - `:seconds_valid` in `Pleroma.Captcha`
  - `:proxy_remote` in `Pleroma.Upload`
  - `:upload_limit` in `:instance`
 - Params:
@ -1055,13 +1056,14 @@ Most of the settings will be applied in `runtime`, this means that you don't nee
 Example of setting without keyword in value:
 ```elixir
-config :tesla, :adapter, {Tesla.Adapter.Finch, name: MyFinch}
+config :tesla, :adapter, Tesla.Adapter.Hackney
 ```
 List of settings which support only full update by key:
 ```elixir
@full_key_update [
    {:pleroma, :ecto_repos},
    {:quack, :meta},
    {:mime, :types},
    {:cors_plug, [:max_age, :methods, :expose, :headers]},
    {:auto_linker, :opts},
@ -1081,6 +1083,22 @@ List of settings which support only full update by subkey:
  ]
 ```
 *Settings without explicit key must be sended in separate config object params.*
 ```elixir
 config :quack,
  level: :debug,
  meta: [:all],
  ...
 ```
 ```json
 {
  "configs": [
    {"group": ":quack", "key": ":level", "value": ":debug"},
    {"group": ":quack", "key": ":meta", "value": [":all"]},
    ...
  ]
 }
 ```
 - Request:
 ```json
@ -1093,6 +1111,7 @@ List of settings which support only full update by subkey:
        {"tuple": [":uploader", "Pleroma.Uploaders.Local"]},
        {"tuple": [":filters", ["Pleroma.Upload.Filter.Dedupe"]]},
        {"tuple": [":link_name", true]},
        {"tuple": [":proxy_remote", false]},
        {"tuple": [":proxy_opts", [
          {"tuple": [":redirect_on_failure", false]},
          {"tuple": [":max_body_length", 1048576]},
--- a/docs/docs/development/API/akkoma_api.md
+++ b/docs/docs/development/API/akkoma_api.md
@ -1,146 +0,0 @@
 # Akkoma API
 Request authentication (if required) and parameters work the same as for [Pleroma API](pleroma_api.md).
 ## `/api/v1/akkoma/preferred_frontend/available`
 ### Returns the available frontends which can be picked as the preferred choice
 * Method: `GET`
 * Authentication: not required
 * Params: none
 * Response: JSON
 * Example response:
 ```json
 ["pleroma-fe/stable"]
 ```
 !!! note
    There’s also a browser UI under `/akkoma/frontend`
    for interactively querying and changing this.
 ## `/api/v1/akkoma/preferred_frontend`
 ### Configures the preferred frontend of this session
 * Method: `PUT`
 * Authentication: not required
 * Params:
    * `frontend_name`: STRING containing one of the available frontends
 * Response: JSON
 * Example response:
 ```json
 {"frontend_name":"pleroma-fe/stable"}
 ```
 !!! note
    There’s also a browser UI under `/akkoma/frontend`
    for interactively querying and changing this.
 ## `/api/v1/akkoma/metrics`
 ### Provides metrics for Prometheus to scrape
 * Method: `GET`
 * Authentication: required (admin:metrics)
 * Params: none
 * Response: text
 * Example response:
 ```
 # HELP pleroma_remote_users_total
 # TYPE pleroma_remote_users_total gauge
 pleroma_remote_users_total 25
 # HELP pleroma_local_statuses_total
 # TYPE pleroma_local_statuses_total gauge
 pleroma_local_statuses_total 17
 # HELP pleroma_domains_total
 # TYPE pleroma_domains_total gauge
 pleroma_domains_total 4
 # HELP pleroma_local_users_total
 # TYPE pleroma_local_users_total gauge
 pleroma_local_users_total 3
 ...
 ```
 ## `/api/v1/akkoma/translation/languages`
 ### Returns available source and target languages for automated text translation
 * Method: `GET`
 * Authentication: required
 * Params: none
 * Response: JSON
 * Example response:
 ```json
 {
  "source": [
    {"code":"LV", "name":"Latvian"},
    {"code":"ZH", "name":"Chinese (traditional)"},
    {"code":"EN-US", "name":"English (American)"}
  ],
  "target": [
    {"code":"EN-GB", "name":"English (British)"},
    {"code":"JP", "name":"Japanese"}
  ]
 }
 ```
 ## `/api/v1/akkoma/frontend_settings/:frontend_name`
 ### Lists all configuration profiles of the selected frontend for the current user
 * Method: `GET`
 * Authentication: required
 * Params: none
 * Response: JSON
 * Example response:
 ```json
 [
  {"name":"default","version":31}
 ]
 ```
 ## `/api/v1/akkoma/frontend_settings/:frontend_name/:profile_name`
 ### Returns the full selected frontend settings profile of the current user
 * Method: `GET`
 * Authentication: required
 * Params: none
 * Response: JSON
 * Example response:
 ```json
 {
  "version": 31,
  "settings": {
    "streaming": true,
    "conversationDisplay": "tree",
    ...
  }
 }
 ```
 ## `/api/v1/akkoma/frontend_settings/:frontend_name/:profile_name`
 ### Updates the frontend settings profile
 * Method: `PUT`
 * Authentication: required
 * Params:
    * `version`: INTEGER
    * `settings`: JSON object containing the entire new settings
 * Response: JSON
 * Example response:
 ```json
 {
  "streaming": false,
  "conversationDisplay": "tree",
  ...
 }
 ```
 !!! note
    The `version` field must be increased by exactly one on each update
 ## `/api/v1/akkoma/frontend_settings/:frontend_name/:profile_name`
 ### Drops the specified frontend settings profile
 * Method: `DELETE`
 * Authentication: required
 * Params: none
 * Response: JSON
 * Example response:
 ```json
 {"deleted":"ok"}
 ```
 ## `/api/v1/timelines/bubble`
 ### Returns a timeline for the local and closely related instances
 Works like all other Mastodon-API timeline queries with the documented
 [Akkoma-specific additions and tweaks](./differences_in_mastoapi_responses.md#timelines).
--- a/docs/docs/development/API/differences_in_mastoapi_responses.md
+++ b/docs/docs/development/API/differences_in_mastoapi_responses.md
@ -1,6 +1,6 @@
 # Differences in Mastodon API responses from vanilla Mastodon
-A Akkoma instance can be identified by "<Mastodon version> (compatible; Akkoma <version>)" present in `version` field in response from `/api/v1/instance`
+A Akkoma instance can be identified by "<Mastodon version> (compatible; Pleroma <version>)" present in `version` field in response from `/api/v1/instance`
 ## Flake IDs
@ -8,32 +8,23 @@ Akkoma uses 128-bit ids as opposed to Mastodon's 64 bits. However, just like Mas
 ## Timelines
 In addition to Mastodon’s timelines, there is also a “bubble timeline” showing
 posts from the local instance and a set of closely related instances as chosen
 by the administrator. It is available under `/api/v1/timelines/bubble`.
 Adding the parameter `with_muted=true` to the timeline queries will also return activities by muted (not by blocked!) users.
 Adding the parameter `exclude_visibilities` to the timeline queries will exclude the statuses with the given visibilities. The parameter accepts an array of visibility types (`public`, `unlisted`, `private`, `direct`), e.g., `exclude_visibilities[]=direct&exclude_visibilities[]=private`.
-Adding the parameter `reply_visibility` to the public, bubble or home timelines queries will filter replies. Possible values: without parameter (default) shows all replies, `following` - replies directed to you or users you follow, `self` - replies directed to you.
+Adding the parameter `reply_visibility` to the public and home timelines queries will filter replies. Possible values: without parameter (default) shows all replies, `following` - replies directed to you or users you follow, `self` - replies directed to you.
 Adding the parameter `instance=lain.com` to the public timeline will show only statuses originating from `lain.com` (or any remote instance).
-All but the direct timeline accept these parameters:
+Home, public, hashtag & list timelines accept these parameters:
 - `only_media`: show only statuses with media attached
 - `remote`: show only remote statuses
 Home, public, hashtag & list timelines further accept:
 - `local`: show only local statuses
-
+- `remote`: show only remote statuses
 ## Statuses
 - `visibility`: has additional possible values `list` and `local` (for local-only statuses)
 - `emoji_reactions`: additional field since Akkoma 3.2.0; identical to `pleroma/emoji_reactions`
 Has these additional fields under the `pleroma` object:
@ -45,16 +36,10 @@ Has these additional fields under the `pleroma` object:
 - `spoiler_text`: a map consisting of alternate representations of the `spoiler_text` property with the key being its mimetype. Currently, the only alternate representation supported is `text/plain`
 - `expires_at`: a datetime (iso8601) that states when the post will expire (be deleted automatically), or empty if the post won't expire
 - `thread_muted`: true if the thread the post belongs to is muted
- `emoji_reactions`: A list with emoji / reaction maps. The format is `{name: "☕", count: 2, me: true, account_ids: ["UserID1", "UserID2"]}`.
+- `emoji_reactions`: A list with emoji / reaction maps. The format is `{name: "☕", count: 1, me: true}`. Contains no information about the reacting users, for that use the `/statuses/:id/reactions` endpoint.
  The `account_ids` property was added in Akkoma 3.2.0.
  Further info about all reacting users at once, can be found using the `/statuses/:id/reactions` endpoint.
 - `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`:
@ -121,12 +106,6 @@ Has these additional fields under the `pleroma` object:
 - `notification_settings`: object, can be absent. See `/api/v1/pleroma/notification_settings` for the parameters/keys returned.
 - `favicon`: nullable URL string, Favicon image of the user's instance
 Has these additional fields under the `akkoma` object:
 - `instance`: nullable object with metadata about the user’s instance
 - `status_ttl_days`: nullable int, default time after which statuses are deleted
 - `permit_followback`: boolean, whether follows from followed accounts are auto-approved
 ### Source
 Has these additional fields under the `pleroma` object:
@ -212,7 +191,7 @@ Additional parameters can be added to the JSON body/Form data:
 - `preview`: boolean, if set to `true` the post won't be actually posted, but the status entity would still be rendered back. This could be useful for previewing rich text/custom emoji, for example.
 - `content_type`: string, contain 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`: A list of nicknames (like `admin@otp.akkoma.dev` or `admin` 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 post visibility are not affected by this and will still apply.
+- `to`: 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 post visibility are not affected by this and will still apply.
 - `visibility`: string, besides standard MastoAPI values (`direct`, `private`, `unlisted`, `local` or `public`) it can be used to address a List by setting it to `list:LIST_ID`.
 - `expires_in`: The number of seconds the posted activity should expire in. When a posted activity expires it will be deleted from the server, and a delete request for it will be federated. This needs to be longer than an hour.
 - `in_reply_to_conversation_id`: Will reply to a given conversation, addressing only the people who are part of the recipient set of that conversation. Sets the visibility to `direct`.
@ -231,11 +210,6 @@ Returns: array of Status.
 The maximum number of statuses is limited to 100 per request.
 ## PUT `/api/v1/statuses/:id/emoji_reactions/:emoji`
 This endpoint is an extension of the Fedibird Mastodon fork.
 It behaves identical to PUT `/api/v1/pleroma/statuses/:id/reactions/:emoji`.
 ## PATCH `/api/v1/accounts/update_credentials`
 Additional parameters can be added to the JSON body/Form data:
--- a/docs/docs/development/API/prometheus.md
+++ b/docs/docs/development/API/prometheus.md
@ -5,16 +5,27 @@ Akkoma includes support for exporting metrics via the [prometheus_ex](https://gi
 Config example:
 ```
-config :pleroma, :instance,
+config :prometheus, Pleroma.Web.Endpoint.MetricsExporter,
-  export_prometheus_metrics: true
+  enabled: true,
  auth: {:basic, "myusername", "mypassword"},
  ip_whitelist: ["127.0.0.1"],
  path: "/api/pleroma/app_metrics",
  format: :text
 ```
-## `/api/v1/akkoma/metrics`
+* `enabled` (Akkoma extension) enables the endpoint
 * `ip_whitelist` (Akkoma extension) could be used to restrict access only to specified IPs
 * `auth` sets the authentication (`false` for no auth; configurable to HTTP Basic Auth, see [prometheus-plugs](https://github.com/deadtrickster/prometheus-plugs#exporting) documentation)
 * `format` sets the output format (`:text` or `:protobuf`)
 * `path` sets the path to app metrics page 
 ## `/api/pleroma/app_metrics`
 ### Exports Prometheus application metrics
 * Method: `GET`
-* Authentication: required
+* Authentication: not required by default (see configuration options above)
 * Params: none
 * Response: text
@ -26,8 +37,8 @@ The following is a config example to use with [Grafana](https://grafana.com)
 ```
  - job_name: 'beam'
-    metrics_path: /api/v1/akkoma/metrics
+    metrics_path: /api/pleroma/app_metrics
    scheme: https
    static_configs:
-    - targets: ['otp.akkoma.dev']
+    - targets: ['pleroma.soykaf.com']
 ```
--- a/docs/docs/development/ap_extensions.md
+++ b/docs/docs/development/ap_extensions.md
@ -4,6 +4,7 @@
 The following endpoints are additionally present into our actors.
 - `oauthRegistrationEndpoint` (`http://litepub.social/ns#oauthRegistrationEndpoint`)
 - `uploadMedia` (`https://www.w3.org/ns/activitystreams#uploadMedia`)
 ### oauthRegistrationEndpoint
@ -11,279 +12,6 @@ Points to MastodonAPI `/api/v1/apps` for now.
 See <https://docs.joinmastodon.org/methods/apps/>
 ## Emoji reactions
 Emoji reactions are implemented as a new activity type `EmojiReact`.
 A single user is allowed to react multiple times with different emoji to the
 same post. However, they may only react at most once with the same emoji.
 Repeated reaction from the same user with the same emoji are to be ignored.
 Emoji reactions are also distinct from `Like` activities and a user may both
 `Like` and react to a post.
 !!! note
    Misskey also supports emoji reactions, but the implementations differs.
    It equates likes and reactions and only allows a single reaction per post.
 The emoji is placed in the `content` field of the activity
 and the `object` property points to the note reacting to.
 Emoji can either be any Unicode emoji sequence or a custom emoji.
 The latter must place their shortcode, including enclosing colons,
 into `content` and put the emoji object inside the `tag` property.
 The `tag` property MAY be omitted for Unicode emoji.
 An example reaction with a Unicode emoji:
 ```json
 {
  "@context": [
    "https://www.w3.org/ns/activitystreams",
    "https://example.org/schemas/litepub-0.1.jsonld",
    {
      "@language": "und"
    }
  ],
  "type": "EmojiReact",
  "id": "https://example.org/activities/23143872a0346141",
  "actor": "https://example.org/users/akko",
  "nickname": "akko",
  "to": ["https://remote.example/users/diana", "https://example.org/users/akko/followers"],
  "cc": ["https://www.w3.org/ns/activitystreams#Public"],
  "content": "🧡",
  "object": "https://remote.example/objects/9f0e93499d8314a9"
 }
 ```
 An example reaction with a custom emoji:
 ```json
 {
  "@context": [
    "https://www.w3.org/ns/activitystreams",
    "https://example.org/schemas/litepub-0.1.jsonld",
    {
      "@language": "und"
    }
  ],
  "type": "EmojiReact",
  "id": "https://example.org/activities/d75586dec0541650",
  "actor": "https://example.org/users/akko",
  "nickname": "akko",
  "to": ["https://remote.example/users/diana", "https://example.org/users/akko/followers"],
  "cc": ["https://www.w3.org/ns/activitystreams#Public"],
  "content": ":mouse:",
  "object": "https://remote.example/objects/9f0e93499d8314a9",
  "tag": [{
    "type": "Emoji",
    "id": null,
    "name": "mouse",
    "icon": {
      "type": "Image",
      "url": "https://example.org/emoji/mouse/mouse.png"
    }
  }]
 }
 ```
 !!! note
    Although an emoji reaction can only contain a single emoji,
    for compatibility with older versions of Pleroma and Akkoma,
    it is recommended to wrap the emoji object in a single-element array.
 When reacting with a remote custom emoji do not include the remote domain in `content`’s shortcode
 *(unlike in our REST API which needs the domain)*:
 ```json
 {
  "@context": [
    "https://www.w3.org/ns/activitystreams",
    "https://example.org/schemas/litepub-0.1.jsonld",
    {
      "@language": "und"
    }
  ],
  "type": "EmojiReact",
  "id": "https://example.org/activities/7993dcae98d8d5ec",
  "actor": "https://example.org/users/akko",
  "nickname": "akko",
  "to": ["https://remote.example/users/diana", "https://example.org/users/akko/followers"],
  "cc": ["https://www.w3.org/ns/activitystreams#Public"],
  "content": ":hug:",
  "object": "https://remote.example/objects/9f0e93499d8314a9",
  "tag": [{
    "type": "Emoji",
    "id": "https://other.example/emojis/hug",
    "name": "hug",
    "icon": {
      "type": "Image",
      "url": "https://other.example/files/b71cea432b3fad67.webp"
    }
  }]
 }
 ```
 Emoji reactions can be retracted using a standard `Undo` activity:
 ```json
 {
  "@context": [
    "https://www.w3.org/ns/activitystreams",
    "http://example.org/schemas/litepub-0.1.jsonld",
    {
      "@language": "und"
    }
  ],
  "type": "Undo",
  "id": "http://example.org/activities/4685792e-efb6-4309-b508-ae4f355dd695",
  "actor": "https://example.org/users/akko",
  "to": ["https://remote.example/users/diana", "https://example.org/users/akko/followers"],
  "cc": ["https://www.w3.org/ns/activitystreams#Public"],
  "object": "https://example.org/activities/23143872a0346141"
 }
 ```
 ## User profile backgrounds
 Akkoma federates user profile backgrounds the same way as Sharkey.
 An actors ActivityPub representation contains an additional
 `backgroundUrl` property containing an `Image` object. This property
 belongs to the `"sharkey": "https://joinsharkey.org/ns#"` namespace.
 ## Quote Posts
 Akkoma allows referencing a single other note as a quote,
 which will be prominently displayed in the interface.
 The quoted post is referenced by its ActivityPub id in the `quoteUri` property.
 !!! note
    Old Misskey only understood and modern Misskey still prefers
    the `_misskey_quote` property for this. Similar some other older
    software used `quoteUrl` or `quoteURL`.  
    All current implementations with quote support understand `quoteUri`.
 Example:
 ```json
 {
  "@context": [
    "https://www.w3.org/ns/activitystreams",
    "https://example.org/schemas/litepub-0.1.jsonld",
    {
      "@language": "und"
    }
  ],
  "type": "Note",
  "id": "https://example.org/activities/85717e587f95d5c0",
  "actor": "https://example.org/users/akko",
  "to": ["https://remote.example/users/diana", "https://example.org/users/akko/followers"],
  "cc": ["https://www.w3.org/ns/activitystreams#Public"],
  "context": "https://example.org/contexts/1",
  "content": "Look at that!",
  "quoteUri": "http://remote.example/status/85717e587f95d5c0",
  "contentMap": {
    "en": "Look at that!"
  },
  "source": {
    "content": "Look at that!",
    "mediaType": "text/plain"
  },
  "published": "2024-04-06T23:40:28Z",
  "updated": "2024-04-06T23:40:28Z",
  "attachemnt": [],
  "tag": []
 }
 ```
 ## Threads
 Akkoma assigns all posts of the same thread the same `context`. This is a
 standard ActivityPub property but its meaning is left vague. Akkoma will
 always treat posts with identical `context` as part of the same thread.
 `context` must not be assumed to hold any meaning or be dereferencable.
 Incoming posts without `context` will be assigned a new context.
 !!! note
    Mastodon uses the non-standard `conversation` property for the same purpose
    *(named after an older OStatus property)*. For incoming posts without
    `context` but with `converstions` Akkoma will use the value from
    `conversations` to fill in `context`.
    For outgoing posts Akkoma will duplicate the context into `conversation`.
 ## Post Source
 Unlike Mastodon, Akkoma supports drafting posts in multiple source formats
 besides plaintext, like Markdown or MFM. The original input is preserved
 in the standard ActivityPub `source` property *(not supported by Mastodon)*.
 Still, `content` will always be present and contain the prerendered HTML form.
 Supported `mediaType` include:
 - `text/plain`
 - `text/markdown`
 - `text/bbcode`
 - `text/x.misskeymarkdown`
 ## Post Language
 !!! note
    This is also supported in and compatible with Mastodon, but since
    joinmastodon.org doesn’t document it yet it is included here.
    [GoToSocial](https://docs.gotosocial.org/en/latest/federation/federating_with_gotosocial/#content-contentmap-and-language)
    has a more refined version of this which can correctly deal with multiple language entries.
 A post can indicate its language by including a `contentMap` object
 which contains a sub key named after the language’s ISO 639-1 code
 and it’s content identical to the post’s `content` field.
 Currently Akkoma, just like Mastodon, only properly supports a single language entry,
 in case of multiple entries a random language will be picked.  
 Furthermore, Akkoma currently only reads the `content` field
 and never the value from `contentMap`.
 ## Local post scope
 Post using this scope will never federate to other servers
 but for the sake of completeness it is listed here.
 In addition to the usual scopes *(public, unlisted, followers-only, direct)*
 Akkoma supports an “unlisted” post scope. Such posts will not federate to
 other instances and only be shown to logged-in users on the same instance.
 It is included into the local timeline.  
 This may be useful to discuss or announce instance-specific policies and topics.
 A post is addressed to the local scope by including `<base url of instance>/#Public`
 in its `to` field. E.g. if the instance is on `https://example.org` it would use
 `https://example.org/#Public`.
 An implementation creating a new post MUST NOT address both the local and
 general public scope `as:Public` at the same time. A post addressing the local
 scope MUST NOT be sent to other instances or be possible to fetch by other
 instances regardless of potential other listed addressees.
 When receiving a remote post addressing both the public scope and what appears
 to be a local-scope identifier, the post SHOULD be treated without assigning any
 special meaning to the potential local-scope identifier.
 !!! note
    Misskey-derivatives have a similar concept of non-federated posts,
    however those are also shown publicly on the local web interface
    and are thus visible to non-members.
 ## List post scope
 Messages originally addressed to a custom list will contain
 a `listMessage` field with an unresolvable pseudo ActivityPub id.
 # Deprecated and Removed Extensions
 The following extensions were used in the past but have been dropped.
 Documentation is retained here as a reference and since old objects might
 still contains related fields.
 ## Actor endpoints
 The following endpoints used to be present:
 - `uploadMedia` (`https://www.w3.org/ns/activitystreams#uploadMedia`)
 ### uploadMedia
 Inspired by <https://www.w3.org/wiki/SocialCG/ActivityPub/MediaUpload>, it is part of the ActivityStreams namespace because it used to be part of the ActivityPub specification and got removed from it.
@ -292,8 +20,9 @@ Content-Type: multipart/form-data
 Parameters:
 - (required) `file`: The file being uploaded
- (optional) `description`: A plain-text description of the media, for accessibility purposes.
+- (optionnal) `description`: A plain-text description of the media, for accessibility purposes.
 Response: HTTP 201 Created with the object into the body, no `Location` header provided as it doesn't have an `id`
-The object given in the response should then be inserted into an Object's `attachment` field.
+The object given in the reponse should then be inserted into an Object's `attachment` field.
--- a/docs/docs/development/index.md
+++ b/docs/docs/development/index.md
@ -1,48 +1 @@
-# Contributing to Akkoma
+This section contains notes and guidelines for developers.
 You wish to add a new feature in Akkoma, but don't know how to proceed? This guide takes you through the various steps of the development and contribution process.
 If you're looking for stuff to implement or fix, check the [bug-tracker](https://akkoma.dev/AkkomaGang/akkoma/issues) or [forum](https://meta.akkoma.dev/c/requests/5).
 Come say hi to us in the [#akkoma-dev chat room](./../#irc)!
 ## Akkoma Clients
 Akkoma is the back-end. Clients have their own repositories and often separate projects. You can check what clients work with Akkoma [on the clients page](../clients/). If you maintain a working client not listed yet, feel free to make a PR [to these docs](./#docs)!
 For resources on APIs and such, check the sidebar of this page.
 ## Docs
 The docs are written in Markdown, including certain extensions, and can be found [in the docs folder of the Akkoma repo](https://akkoma.dev/AkkomaGang/akkoma/src/branch/develop/docs/). The content itself is stored in the `docs` subdirectory.
 ## Technology
 Akkoma is written in [Elixir](https://elixir-lang.org/) and uses [Postgresql](https://www.postgresql.org/) for database. We use [Git](https://git-scm.com/) for collaboration and tracking code changes. Furthermore it can typically run on [Unix and Unix-like OS'es](https://en.wikipedia.org/wiki/Unix-like). For development, you should use an OS which [can run Akkoma](../installation/debian_based_en/).
 It's good to have at least some basic understanding of at least Git and Elixir. If this is completely new for you, there's some [videos explaining Git](https://git-scm.com/doc) and Codeberg has a nice article explaining the typical [pull requests Git flow](https://docs.codeberg.org/collaborating/pull-requests-and-git-flow/). For Elixir, you can follow Elixir's own [Getting Started guide](https://elixir-lang.org/getting-started/introduction.html).
 ## Setting up a development environment
 The best way to start is getting the software to run from source so you can start poking on it. Check out the [guides for setting up an Akkoma instance for development](setting_up_akkoma_dev/#setting-up-a-akkoma-development-environment).
 ## General overview
 ### Modules
 Akkoma has several modules. There are modules for [uploading](https://akkoma.dev/AkkomaGang/akkoma/src/branch/develop/lib/pleroma/uploaders), [upload filters](https://akkoma.dev/AkkomaGang/akkoma/src/branch/develop/lib/pleroma/upload/filter), [translators](https://akkoma.dev/AkkomaGang/akkoma/src/branch/develop/lib/pleroma/akkoma/translators)... The most famous ones are without a doubt the [MRF policies](https://akkoma.dev/AkkomaGang/akkoma/src/branch/develop/lib/pleroma/web/activity_pub/mrf). Modules are often self contained and a good way to start with development because you don't have to think about much more than just the module itself. We even have an example on [writing your own MRF policy](/configuration/mrf/#writing-your-own-mrf-policy)!
 Another easy entry point is the [mix tasks](https://akkoma.dev/AkkomaGang/akkoma/src/branch/develop/lib/mix/tasks/pleroma). They too are often self contained and don't need you to go through much of the code.
 ### Activity Streams/Activity Pub
 Akkoma uses Activity Streams for both federation, as well as internal representation. It may be interesting to at least go over the specifications of [Activity Pub](https://www.w3.org/TR/activitypub/), [Activity Streams 2.0](https://www.w3.org/TR/activitystreams-core/), and [Activity Streams Vocabulary](https://www.w3.org/TR/activitystreams-vocabulary/). Note that these are not enough to have a full grasp of how everything works, but should at least give you the basics to understand how messages are passed between and inside Akkoma instances.
 ## Don't forget
 When you make changes, you're expected to create [a Pull Request](https://akkoma.dev/AkkomaGang/akkoma/pulls). You don't have to wait until you finish to create the PR, but please do prefix the title of the PR with "WIP: " for as long as you're still working on it. The sooner you create your PR, the sooner people know what you are working on and the sooner you can get feedback and, if needed, help. You can then simply keep working on it until you are finished.
 When doing changes, don't forget to add it to the relevant parts of the [CHANGELOG.md](https://akkoma.dev/AkkomaGang/akkoma/src/branch/develop/CHANGELOG.md).
 You're expected to write [tests](https://elixirschool.com/en/lessons/testing/basics). While code is generally stored in the `lib` directory, tests are stored in the `test` directory using a similar folder structure. Feel free to peak at other tests to see how they are done. Obviously tests are expected to pass and properly test the functionality you added. If you feel really confident, you could even try to [write a test first and then write the code needed to make it pass](https://en.wikipedia.org/wiki/Test-driven_development)!
 Code is formatted using the default formatter that comes with Elixir. You can format a file with e.g. `mix format /path/to/file.ex`. To check if everything is properly formatted, you can run `mix format --check-formatted`.
--- a/docs/docs/development/nodeinfo_extensions.md
+++ b/docs/docs/development/nodeinfo_extensions.md
@ -1,141 +0,0 @@
 # Nodeinfo Extensions
 Akkoma currently implements version 2.0 and 2.1 of nodeinfo spec,
 but provides the following additional fields.
 ## metadata
 The spec leaves the content of `metadata` up to implementations
 and indeed Akkoma adds many fields here apart from the commonly
 found `nodeName` and `nodeDescription` fields.
 ### accountActivationRequired
 Whether or not users need to confirm their email before completing registration.
 *(boolean)*
 !!! note
    Not to be confused with account approval, where each registration needs to
    be manually approved by an admin. Account approval has no nodeinfo entry.
 ### features
 Array of strings denoting supported server features. E.g. a server supporting
 quote posts should include a `"quote_posting"` entry here.
 A non-exhaustive list of possible features:
 - `polls`
 - `quote_posting`
 - `editing`
 - `bubble_timeline`
 - `pleroma_emoji_reactions` *(Unicode emoji)*
 - `custom_emoji_reactions`
 - `akkoma_api`
 - `akkoma:machine_translation`
 - `mastodon_api`
 - `pleroma_api`
 ### federatedTimelineAvailable
 Whether or not the “federated timeline”, i.e. a timeline containing posts from
 the entire known network, is made available.
 *(boolean)*
 ### federation
 This section is optional and can contain various custom keys describing federation policies.
 The following are required to be presented:
 - `enabled` *(boolean)* whether the server federates at all
 A non-exhaustive list of optional keys:
 - `exclusions` *(boolean)* whether some federation policies are withheld
 - `mrf_simple` *(object)* describes how the Simple MRF policy is configured
 ### fieldsLimits
 A JSON object documenting restriction for user account info fields.
 All properties are integers.
 - `maxFields` maximum number of account info fields local users can create
 - `maxRemoteFields` maximum number of account info fields remote users can have
   before the user gets rejected or fields truncated
 - `nameLength` maximum length of a field’s name
 - `valueLength` maximum length of a field’s value
 ### invitesEnabled
 Whether or not signing up via invite codes is possible.
 *(boolean)*
 ### localBubbleInstances
 Array of domains (as strings) of other instances chosen
 by the admin which are shown in the bubble timeline.
 ### mailerEnabled
 Whether or not the instance can send out emails.
 *(boolean)*
 ### nodeDescription
 Human-friendly description of this instance
 *(string)*
 ### nodeName
 Human-friendly name of this instance
 *(string)*
 ### pollLimits
 JSON object containing limits for polls created by local users.
 All values are integers.
 - `max_options` maximum number of poll options
 - `max_option_chars` maximum characters per poll option
 - `min_expiration` minimum time in seconds a poll must be open for
 - `max_expiration` maximum time a poll is allowed to be open for
 ### postFormats
 Array of strings containing media types for supported post source formats.
 A non-exhaustive list of possible values:
 - `text/plain`
 - `text/markdown`
 - `text/bbcode`
 - `text/x.misskeymarkdown`
 ### private
 Whether or not unauthenticated API access is permitted.
 *(boolean)*
 ### privilegedStaff
 Whether or not moderators are trusted to perform some
 additional tasks like e.g. issuing password reset emails.
 ### publicTimelineVisibility
 JSON object containing boolean-valued keys reporting
 if a given timeline can be viewed without login.
 - `local`
 - `federated`
 - `bubble`
 ### restrictedNicknames
 Array of strings listing nicknames forbidden to be used during signup.
 ### skipThreadContainment
 Whether broken threads are filtered out
 *(boolean)*
 ### staffAccounts
 Array containing ActivityPub IDs of local accounts
 with some form of elevated privilege on the instance.
 ### suggestions
 JSON object containing info on whether the interaction-based
 Mastodon `/api/v1/suggestions` feature is enabled and optionally
 additional implementation-defined fields with more details
 on e.g. how suggested users are selected.
 !!! note
    This has no relation to the newer /api/v2/suggestions API
    which also (or exclusively) contains staff-curated entries.
 - `enabled` *(boolean)* whether or not user recommendations are enabled
 ### uploadLimits
 JSON object documenting various upload-related size limits.
 All values are integers and in bytes.
 - `avatar` maximum size of uploaded user avatars
 - `banner` maximum size of uploaded user profile banners
 - `background` maximum size of uploaded user profile backgrounds
 - `general` maximum size for all other kinds of uploads
--- a/docs/docs/development/setting_up_akkoma_dev.md
+++ b/docs/docs/development/setting_up_akkoma_dev.md
@ -5,36 +5,21 @@ Akkoma requires some adjustments from the defaults for running the instance loca
 ## Installing
 1. Install Akkoma as explained in [the docs](../installation/debian_based_en.md), with some exceptions:
    * No need to create a dedicated akkoma user, it's easier to just use your own user
    * You can use your own fork of the repository and add akkoma as a remote `git remote add akkoma 'https://akkoma.dev/AkkomaGang/akkoma.git'`
    * You can skip systemd and nginx and all that stuff
    * No need to create a dedicated akkoma user, it's easier to just use your own user
    * For the DB you can still choose a dedicated user, the mix tasks set it up for you so it's no extra work for you
    * For domain you can use `localhost`
    * For the DB you can still choose a dedicated user. The mix tasks sets it up, so it's no extra work for you
    * instead of creating a `prod.secret.exs`, create `dev.secret.exs`
    * No need to prefix with `MIX_ENV=prod`. We're using dev and that's the default MIX_ENV
    * You can skip nginx and systemd
    * For front-end, you'll probably want to install and use the develop branch instead of the stable branch. There's no guarantee that the stable branch of the FE will always work on the develop branch of the BE.
 2. Change the dev.secret.exs
    * Change the FE settings to use the installed branch (see also [Frontend Management](/configuration/frontend_management/))
    * Change the scheme in `config :pleroma, Pleroma.Web.Endpoint` to http (see examples below)
    * If you want to change other settings, you can do that too
-3. You can now start the server with `mix phx.server`. Once it's build and started, you can access the instance on `http://<host>:<port>` (e.g.http://localhost:4000 ) and should be able to do everything locally you normally can.
+3. You can now start the server `mix phx.server`. Once it's build and started, you can access the instance on `http://<host>:<port>` (e.g.http://localhost:4000 ) and should be able to do everything locally you normaly can.
 Example on how to install pleroma-fe and admin-fe using it's develop branch
 ```sh
 mix pleroma.frontend install pleroma-fe --ref develop
 mix pleroma.frontend install admin-fe --ref develop
 ```
 Example config to use the pleroma-fe and admin-fe installed from the develop branch
 ```elixir
 config :pleroma, :frontends,
  primary: %{"name" => "pleroma-fe", "ref" => "develop"},
  admin: %{"name" => "admin-fe", "ref" => "develop"}
 ```
 Example config to change the scheme to http. Change the port if you want to run on another port.
 ```elixir
-config :pleroma, Pleroma.Web.Endpoint,
+  config :pleroma, Pleroma.Web.Endpoint,
   url: [host: "localhost", scheme: "http", port: 4000],
 ```
@ -109,4 +94,4 @@ Update Akkoma as explained in [the docs](../administration/updating.md). Just ma
 ## Working on multiple branches
-If you develop on a separate branch, it's possible you did migrations that aren't merged into another branch you're working on. In that case, it's probably best to set up multiple Akkoma instances each with their own database. If you finished with a branch and want to switch back to develop to start a new branch from there, you can drop the database and recreate the database (e.g. by using `config/setup_db.psql`). The commands to drop and recreate the database can be found in [the docs](../administration/backup.md).
+If you develop on a separate branch, it's possible you did migrations that aren't merged into another branch you're working on. If you have multiple things you're working on, it's probably best to set up multiple Akkoma instances each with their own database. If you finished with a branch and want to switch back to develop to start a new branch from there, you can drop the database and recreate the database (e.g. by using `config/setup_db.psql`). The commands to drop and recreate the database can be found in [the docs](../administration/backup.md).
--- a/docs/docs/css/fonts/Tiresias_Infofont.ttf
+++ b/docs/docs/css/fonts/Tiresias_Infofont.ttf
--- a/docs/docs/css/fonts/Tiresias_PCfont.ttf
+++ b/docs/docs/css/fonts/Tiresias_PCfont.ttf
--- a/docs/docs/images/akko_badday.png
+++ b/docs/docs/images/akko_badday.png
--- a/docs/docs/images/favicon.ico
+++ b/docs/docs/images/favicon.ico
--- a/docs/docs/images/favicon.png
+++ b/docs/docs/images/favicon.png
--- a/docs/docs/images/logo.png
+++ b/docs/docs/images/logo.png
--- a/docs/docs/index.md
+++ b/docs/docs/index.md
@ -3,41 +3,26 @@
 # Introduction to Akkoma
 ## What is Akkoma?
 Akkoma is a federated social networking platform, compatible with Mastodon and other ActivityPub implementations. It is free software licensed under the AGPLv3.
-It actually consists of two components: a backend, named simply Akkoma, and a user-facing frontend, named Akkoma-FE. It also includes the Mastodon frontend, if that's your thing.
+It actually consists of two components: a backend, named simply Akkoma, and a user-facing frontend, named Pleroma-FE. It also includes the Mastodon frontend, if that's your thing.
 It's part of what we call the fediverse, a federated network of instances which speak common protocols and can communicate with each other.
 One account on an instance is enough to talk to the entire fediverse!
 ## Community Channels
 ### IRC
 For support or general questions, pop over to #akkoma and #akkoma-dev at [irc.akkoma.dev](https://irc.akkoma.dev) (port 6697, SSL)
 ### Discourse
 For more general meta-discussion, for example discussion of potential future features, head on over to [meta.akkoma.dev](https://meta.akkoma.dev)
 ### Dev diaries and release notifications
 will be posted via [@akkoma@ihba](https://ihatebeinga.live/users/akkoma)
 ## How can I use it?
-Akkoma instances are already widely deployed, a list can be found at <https://the-federation.info/akkoma> and <https://akkoma.fediverse.observer/list>.
+Akkoma instances are already widely deployed, a list can be found at <https://the-federation.info/pleroma> and <https://fediverse.network/pleroma>.
 If you don't feel like joining an existing instance, but instead prefer to deploy your own instance, that's easy too!
 Installation instructions can be found in the installation section of these docs.
 ## I got an account, now what?
-Great! Now you can explore the fediverse! Open the login page for your Akkoma instance (e.g. <https://otp.akkoma.dev>) and login with your username and password. (If you don't have an account yet, click on Register)
+Great! Now you can explore the fediverse! Open the login page for your Akkoma instance (e.g. <https://pleroma.soykaf.com>) and login with your username and password. (If you don't have an account yet, click on Register)
-### Akkoma-FE
+### Pleroma-FE
-The default front-end used by Akkoma is Akkoma-FE. You can find more information on what it is and how to use it in the [Introduction to Akkoma-FE](https://docs-fe.akkoma.dev/stable/).
+The default front-end used by Akkoma is Pleroma-FE. You can find more information on what it is and how to use it in the [Introduction to Pleroma-FE](https://docs-fe.akkoma.dev/stable/).
 ### Mastodon interface
-If the Akkoma-FE interface isn't your thing, or you're just trying something new but you want to keep using the familiar Mastodon interface, we got that too!
+If the Pleroma-FE interface isn't your thing, or you're just trying something new but you want to keep using the familiar Mastodon interface, we got that too!
-Just add a "/web" after your instance url (e.g. <https://otp.akkoma.dev/web>) and you'll end on the Mastodon web interface, but with a Akkoma backend! MAGIC!
+Just add a "/web" after your instance url (e.g. <https://pleroma.soykaf.com/web>) and you'll end on the Mastodon web interface, but with a Akkoma backend! MAGIC!
 The Mastodon interface is from the Glitch-soc fork. For more information on the Mastodon interface you can check the [Mastodon](https://docs.joinmastodon.org/) and [Glitch-soc](https://glitch-soc.github.io/docs/) documentation.
 Remember, what you see is only the frontend part of Mastodon, the backend is still Akkoma.
--- a/docs/docs/installation/alpine_linux_en.md
+++ b/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:
@ -84,12 +78,12 @@ doas adduser -S -s /bin/false -h /opt/akkoma -H -G akkoma akkoma
 **Note**: To execute a single command as the Akkoma system user, use `doas -u akkoma command`. You can also switch to a shell by using `doas -su akkoma`. If you don’t have and want `doas` 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 from stable-branch and make the Akkoma user the owner of the directory:
+* Git clone the AkkomaBE repository and make the Akkoma user the owner of the directory:
 ```shell
 doas mkdir -p /opt/akkoma
 doas chown -R akkoma:akkoma /opt/akkoma
-doas -u akkoma git clone https://akkoma.dev/AkkomaGang/akkoma.git -b stable /opt/akkoma
+doas -u akkoma git clone https://akkoma.dev/AkkomaGang/akkoma.git /opt/akkoma
 ```
 * Change to the new directory:
@ -109,7 +103,7 @@ doas -u akkoma mix deps.get
  * 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 instances):
+* 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
 doas -u akkoma mv config/{generated_config.exs,prod.secret.exs}
@ -145,13 +139,47 @@ If you want to open your newly installed instance to the world, you should run n
 doas apk add nginx
 ```
 * Setup your SSL cert, using your method of choice or certbot. If using certbot, first install it:
 ```shell
 doas apk add certbot
 ```
 and then set it up:
 ```shell
 doas mkdir -p /var/lib/letsencrypt/
 doas 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 to the nginx folder
 ```shell
 doas 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. You must change change `server_name`. You can use `nano` (install with `apk add nano` if missing).
+* Before starting nginx edit the configuration and change it to your needs. You must change change `server_name` and the paths to the certificates. You can use `nano` (install with `apk add nano` if missing).
 ```
 server {
    server_name    your.domain;
    listen         80;
    ...
 }
 server {
    server_name your.domain;
    listen 443 ssl http2;
    ...
    ssl_trusted_certificate   /etc/letsencrypt/live/your.domain/chain.pem;
    ssl_certificate           /etc/letsencrypt/live/your.domain/fullchain.pem;
    ssl_certificate_key       /etc/letsencrypt/live/your.domain/privkey.pem;
    ...
 }
 ```
 * Enable and start nginx:
 ```shell
@ -159,37 +187,10 @@ doas rc-update add nginx
 doas rc-service nginx start
 ```
-* Setup your SSL cert, using your method of choice or certbot. If using certbot, first install it:
+If you need to renew the certificate in the future, uncomment the relevant location block in the nginx config and run:
 ```shell
-doas apk add certbot certbot-nginx
+doas certbot certonly --email <your@emailaddress> -d <yourdomain> --webroot -w /var/lib/letsencrypt/
 ```
 and then set it up:
 ```shell
 doas mkdir -p /var/lib/letsencrypt/
 doas certbot --email <your@emailaddress> -d <yourdomain> -d <media_domain> --nginx
 ```
 If that doesn't work the first time, add `--dry-run` to further attempts to avoid being ratelimited as you identify the issue, and do not remove it until the dry run succeeds. A common source of problems are nginx config syntax errors; this can be checked for by running `nginx -t`.
 To automatically renew, set up a cron job like so:
 ```shell
 # Enable the crond service
 doas rc-update add crond
 doas rc-service crond start
 # Test that renewals work
 doas certbot renew --cert-name yourinstance.tld --nginx --dry-run
 # Add the renewal task to cron
 echo '#!/bin/sh
 certbot renew --cert-name yourinstance.tld --nginx
 ' | doas tee /etc/periodic/daily/renew-akkoma-cert
 doas chmod +x /etc/periodic/daily/renew-akkoma-cert
 ```
 #### OpenRC service
@ -214,8 +215,6 @@ If your instance is up and running, you can create your first user with administ
 doas -u akkoma env MIX_ENV=prod mix pleroma.user new <username> <your@emailaddress> --admin
 ```
 {! installation/frontends.include !}
 #### Further reading
 {! installation/further_reading.include !}
--- a/docs/docs/installation/arch_linux_en.md
+++ b/docs/docs/installation/arch_linux_en.md
@ -75,12 +75,12 @@ 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 from stable-branch and make the Akkoma user the owner of the directory:
+* 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 -b stable /opt/akkoma
+sudo -Hu akkoma git clone https://akkoma.dev/AkkomaGang/akkoma.git /opt/akkoma
 ```
 * Change to the new directory:
@ -100,7 +100,7 @@ sudo -Hu akkoma mix deps.get
  * 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 instances):
+* 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}
@ -136,17 +136,16 @@ If you want to open your newly installed instance to the world, you should run n
 sudo pacman -S nginx
 ```
-* Copy the example nginx configuration:
+* Create directories for available and enabled sites:
 ```shell
-sudo cp /opt/akkoma/installation/nginx/akkoma.nginx /etc/nginx/conf.d/akkoma.conf
+sudo mkdir -p /etc/nginx/sites-{available,enabled}
 ```
-* Before starting nginx edit the configuration and change it to your needs (e.g. change servername, change cert paths)
+* Append the following line at the end of the `http` block in `/etc/nginx/nginx.conf`:
 * Enable and start nginx:
-```shell
+```Nginx
-sudo systemctl enable --now nginx.service
+include sites-enabled/*;
 ```
 * Setup your SSL cert, using your method of choice or certbot. If using certbot, first install it:
@ -159,18 +158,32 @@ and then set it up:
 ```shell
 sudo mkdir -p /var/lib/letsencrypt/
-sudo certbot --email <your@emailaddress> -d <yourdomain> -d <media_domain> --nginx
+sudo certbot certonly --email <your@emailaddress> -d <yourdomain> --standalone
 ```
-If that doesn't work the first time, add `--dry-run` to further attempts to avoid being ratelimited as you identify the issue, and do not remove it until the dry run succeeds. A common source of problems are nginx config syntax errors; this can be checked for by running `nginx -t`.
+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).
-To make sure renewals work, enable the appropriate systemd timer:
+---
 * Copy the example nginx configuration and activate it:
 ```shell
-sudo systemctl enable --now certbot-renew.timer
+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
 ```
-Certificate renewal should be handled automatically by Certbot from now on.
+* 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
@ -199,8 +212,6 @@ If your instance is up and running, you can create your first user with administ
 sudo -Hu akkoma MIX_ENV=prod mix pleroma.user new <username> <your@emailaddress> --admin
 ```
 {! installation/frontends.include !}
 #### Further reading
 {! installation/further_reading.include !}
--- a/docs/docs/installation/debian_based_en.md
+++ b/docs/docs/installation/debian_based_en.md
@ -4,7 +4,7 @@
 ## Installation
-This guide will assume you are on Debian 12 (“bookworm”) or later. This guide should also work with Ubuntu 22.04 (“Jammy Jellyfish”) and later. It also assumes that you have administrative rights, either as root or a user with [sudo permissions](https://www.digitalocean.com/community/tutorials/how-to-add-delete-and-grant-sudo-privileges-to-users-on-a-debian-vps). 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.
+This guide will assume you are on Debian 11 (“bullseye”) or later. This guide should also work with Ubuntu 18.04 (“Bionic Beaver”) and later. It also assumes that you have administrative rights, either as root or a user with [sudo permissions](https://www.digitalocean.com/community/tutorials/how-to-add-delete-and-grant-sudo-privileges-to-users-on-a-debian-vps). 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 !}
@ -23,67 +23,15 @@ sudo apt full-upgrade
 sudo apt install git build-essential postgresql postgresql-contrib cmake libmagic-dev
 ```
 ### Create the akkoma user
 * 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.
 ### Install Elixir and Erlang
-If your distribution packages a recent enough version of Elixir, you can install it directly from the distro repositories and skip to the next section of the guide:
+* Install Elixir and Erlang (you might need to use backports or [asdf](https://github.com/asdf-vm/asdf) on old systems):
 ```shell
 sudo apt update
 sudo apt install elixir erlang-dev erlang-nox
 ```
 Otherwise use [asdf](https://github.com/asdf-vm/asdf) to install the latest versions of Elixir and Erlang.
 First, install some dependencies needed to build Elixir and Erlang:
 ```shell
 sudo apt install curl unzip build-essential autoconf m4 libncurses5-dev libssh-dev unixodbc-dev xsltproc libxml2-utils libncurses-dev
 ```
 Then login to the `akkoma` user and install asdf:
 ```shell
 git clone https://github.com/asdf-vm/asdf.git ~/.asdf --branch v0.11.3
 ```
 Add the following lines to `~/.bashrc`:
 ```shell
 . "$HOME/.asdf/asdf.sh"
 # asdf completions
 . "$HOME/.asdf/completions/asdf.bash"
 ```
 Restart the shell:
 ```shell
 exec $SHELL
 ```
 Next install Erlang:
 ```shell
 asdf plugin add erlang https://github.com/asdf-vm/asdf-erlang.git
 export KERL_CONFIGURE_OPTIONS="--disable-debug --without-javac"
 asdf install erlang 25.3.2.5
 asdf global erlang 25.3.2.5
 ```
 Now install Elixir:
 ```shell
 asdf plugin-add elixir https://github.com/asdf-vm/asdf-elixir.git
 asdf install elixir 1.15.4-otp-25
 asdf global elixir 1.15.4-otp-25
 ```
 Confirm that Elixir is installed correctly by checking the version:
 ```shell
 elixir --version
 ```
 ### Optional packages: [`docs/installation/optional/media_graphics_packages.md`](../installation/optional/media_graphics_packages.md)
@ -93,12 +41,20 @@ sudo apt install imagemagick ffmpeg libimage-exiftool-perl
 ### Install AkkomaBE
-* Log into the `akkoma` user and clone the AkkomaBE repository from the stable branch and make the Akkoma user the owner of the directory:
+* 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 -b stable /opt/akkoma
+sudo -Hu akkoma git clone https://akkoma.dev/AkkomaGang/akkoma.git /opt/akkoma
 ```
 * Change to the new directory:
@ -118,7 +74,7 @@ sudo -Hu akkoma mix deps.get
  * 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 instances):
+* 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}
@ -155,6 +111,23 @@ If you want to open your newly installed instance to the world, you should run n
 sudo apt install nginx
 ```
 * Setup your SSL cert, using your method of choice or certbot. If using certbot, first install it:
 ```shell
 sudo apt 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
@ -169,23 +142,12 @@ sudo ln -s /etc/nginx/sites-available/akkoma.nginx /etc/nginx/sites-enabled/akko
 sudo systemctl enable --now nginx.service
 ```
-* Setup your SSL cert, using your method of choice or certbot. If using certbot, first install it:
+If you need to renew the certificate in the future, uncomment the relevant location block in the nginx config and run:
 ```shell
-sudo apt install certbot python3-certbot-nginx
+sudo certbot certonly --email <your@emailaddress> -d <yourdomain> --webroot -w /var/lib/letsencrypt/
 ```
 and then set it up:
 ```shell
 sudo mkdir -p /var/lib/letsencrypt/
 sudo certbot --email <your@emailaddress> -d <yourdomain> -d <media_domain> --nginx
 ```
 If that doesn't work the first time, add `--dry-run` to further attempts to avoid being ratelimited as you identify the issue, and do not remove it until the dry run succeeds. A common source of problems are nginx config syntax errors; this can be checked for by running `nginx -t`.
 Certificate renewal should be handled automatically by Certbot from now on.
 #### Other webserver/proxies
 You can find example configurations for them in `/opt/akkoma/installation/`.
@ -213,8 +175,6 @@ If your instance is up and running, you can create your first user with administ
 sudo -Hu akkoma MIX_ENV=prod mix pleroma.user new <username> <your@emailaddress> --admin
 ```
 {! installation/frontends.include !}
 #### Further reading
 {! installation/further_reading.include !}
--- a/docs/docs/installation/debian_based_jp.md
+++ b/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 !}
--- a/docs/docs/installation/docker_en.md
+++ b/docs/docs/installation/docker_en.md
@ -1,187 +0,0 @@
 # Installing in Docker
 ## Installation
 This guide will show you how to get akkoma working in a docker container,
 if you want isolation, or if you run a distribution not supported by the OTP
 releases.
 If you want to migrate from or OTP to docker, check out [the migration guide](./migrating_to_docker_en.md).
 ### Prepare the system
 * Install docker and docker compose
  * [Docker](https://docs.docker.com/engine/install/) 
  * [Docker-compose](https://docs.docker.com/compose/install/)
  * This will usually just be a repository installation and a package manager invocation.
 * Clone the akkoma repository
  * `git clone https://akkoma.dev/AkkomaGang/akkoma.git -b stable`
  * `cd akkoma`
 ### Set up basic configuration
 ```bash
 cp docker-resources/env.example .env
 echo "DOCKER_USER=$(id -u):$(id -g)" >> .env
 ```
 This probably won't need to be changed, it's only there to set basic environment
 variables for the docker compose file.
 ### Building the container
 The container provided is a thin wrapper around akkoma's dependencies, 
 it does not contain the code itself. This is to allow for easy updates
 and debugging if required.
 ```bash
 ./docker-resources/build.sh
 ```
 This will generate a container called `akkoma` which we can use
 in our compose environment.
 ### Generating your instance
 ```bash
 mkdir pgdata
 ./docker-resources/manage.sh mix deps.get
 ./docker-resources/manage.sh mix compile
 ./docker-resources/manage.sh mix pleroma.instance gen
 ```
 This will ask you a few questions - the defaults are fine for most things,
 the database hostname is `db`, the database password is `akkoma`
 (not auto generated), and you will want to set the ip to `0.0.0.0`.
 Now we'll want to copy over the config it just created
 ```bash
 cp config/generated_config.exs config/prod.secret.exs
 ```
 ### Setting up the database 
 We need to run a few commands on the database container, this isn't too bad
 ```bash
 docker compose run --rm --user akkoma -d db 
 # Note down the name it gives here, it will be something like akkoma_db_run
 docker compose run --rm akkoma psql -h db -U akkoma -f config/setup_db.psql
 docker stop akkoma_db_run # Replace with the name you noted down
 ```
 Now we can actually run our migrations
 ```bash
 ./docker-resources/manage.sh mix ecto.migrate
 # this will recompile your files at the same time, since we changed the config
 ```
 ### Start the server
 We're going to run it in the foreground on the first run, just to make sure
 everything start up.
 ```bash
 docker compose up
 ```
 If everything went well, you should be able to access your instance at http://localhost:4000
 You can `ctrl-c` out of the docker compose now to shutdown the server.
 ### Running in the background
 ```bash
 docker compose up -d
 ```
 ### 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
 ./docker-resources/manage.sh mix pleroma.user new MY_USERNAME MY_EMAIL@SOMEWHERE --admin
 ```
 And follow the prompts 
 ### Reverse proxies
 This is a tad more complex in docker than on the host itself. It
 You've got two options. 
 #### Running caddy in a container
 This is by far the easiest option. It'll handle HTTPS and all that for you. 
 ```bash
 mkdir caddy-data
 mkdir caddy-config
 cp docker-resources/Caddyfile.example docker-resources/Caddyfile
 ```
 Then edit the TLD in your caddyfile to the domain you're serving on.
 Copy the commented out `caddy` section in `docker-compose.yml` into a new file called `docker-compose.override.yml` like so:
 ```yaml
 version: "3.7"
 services:
  proxy:
    image: caddy:2-alpine
    restart: unless-stopped
    links:
      - akkoma
    ports: [
       "443:443",
       "80:80"
    ]
    volumes:
      - ./docker-resources/Caddyfile:/etc/caddy/Caddyfile
      - ./caddy-data:/data
      - ./caddy-config:/config
 ```
 then run `docker compose up -d` again.
 #### Running a reverse proxy on the host
 If you want, you can also run the reverse proxy on the host. This is a bit more complex, but it's also more flexible.
 Follow the guides for source install for your distribution of choice, or adapt
 as needed. Your standard setup can be found in the [Debian Guide](../debian_based_en/#nginx)
 ### You're done!
 All that's left is to set up your frontends. 
 The standard from-source commands will apply to you, just make sure you
 prefix them with `./docker-resources/manage.sh`!
 {! installation/frontends.include !}
 ### Updating Docker Installs
 ```bash
 git pull
 ./docker-resources/build.sh
 ./docker-resources/manage.sh mix deps.get
 ./docker-resources/manage.sh mix compile
 ./docker-resources/manage.sh mix ecto.migrate
 docker compose restart akkoma db
 ```
 ### Modifying the Docker services
 If you want to modify the services defined in the docker compose file, you can
 create a new file called `docker-compose.override.yml`. There you can add any
 overrides or additional services without worrying about git conflicts when a
 new release comes out.
 #### Further reading
 {! installation/further_reading.include !}
 {! support.include !}
--- a/docs/docs/installation/fedora_based_en.md
+++ b/docs/docs/installation/fedora_based_en.md
@ -1,201 +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-server postgresql-contrib
 ```
 * Enable and initialize Postgres:
 ```shell
 sudo postgresql-setup --initdb --unit postgresql
 # Allow password auth for postgres
 sudo sed -E -i 's|(host +all +all +127.0.0.1/32 +)ident|\1md5|' /var/lib/pgsql/data/pg_hba.conf
 sudo systemctl enable --now postgresql.service
 ```
 ### 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 from stable-branch 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 -b stable /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 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
 ```
 * 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
 ```
 * Setup your SSL cert, using your method of choice or certbot. If using certbot, first install it:
 ```shell
 sudo dnf install certbot python3-certbot-nginx
 ```
 and then set it up:
 ```shell
 sudo certbot --email <your@emailaddress> -d <yourdomain> -d <media_domain> --nginx
 ```
 If that doesn't work the first time, add `--dry-run` to further attempts to avoid being ratelimited as you identify the issue, and do not remove it until the dry run succeeds. A common source of problems are nginx config syntax errors; this can be checked for by running `nginx -t`.
 Certificate renewal should be handled automatically by Certbot from now on.
 #### 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
 ```
 {! installation/frontends.include !}
 #### Further reading
 {! installation/further_reading.include !}
 {! support.include !}
--- a/docs/docs/installation/freebsd_en.md
+++ b/docs/docs/installation/freebsd_en.md
@ -206,9 +206,6 @@ If your instance is up and running, you can create your first user with administ
 ```shell
 sudo -Hu akkoma MIX_ENV=prod mix pleroma.user new <username> <your@emailaddress> --admin
 ```
 {! installation/frontends.include !}
 ## Conclusion
 Restart nginx with `# service nginx restart` and you should be up and running.
--- a/docs/docs/installation/frontends.include
+++ b/docs/docs/installation/frontends.include
@ -1,32 +0,0 @@
 #### Installing Frontends
 Once your backend server is functional, you'll also want to
 probably install frontends.
 These are no longer bundled with the distribution and need an extra
 command to install.
 You **must** run frontend management tasks as the akkoma user,
 the same way you downloaded the build or cloned the git repo before.
 But otherwise, for most installations, the following will suffice:
 === "OTP" 
    ```sh
    ./bin/pleroma_ctl frontend install pleroma-fe --ref stable
    # and also, if desired
    ./bin/pleroma_ctl frontend install admin-fe --ref stable
    ```
 === "From Source"
    ```sh
    mix pleroma.frontend install pleroma-fe --ref stable
    mix pleroma.frontend install admin-fe --ref stable
    ```
 === "Docker"
    ```sh
    ./docker-resources/manage.sh mix pleroma.frontend install pleroma-fe --ref stable
    ./docker-resources/manage.sh mix pleroma.frontend install admin-fe --ref stable
    ```
 For more customised installations, refer to [Frontend Management](../../configuration/frontend_management)
--- a/Show more
+++ b/Show more
		`@ -0,0 +1 @@`
							`https://github.com/hashnuke/heroku-buildpack-elixir`
		`@ -0,0 +1,2 @@`
							`web: mix phx.server`
							`release: mix ecto.migrate`
		`@ -1,2 +0,0 @@`
			`untrusted comment: Akkoma Signing Key public key`
			`RWQRlw8Ex/uTbvo1wB1yK75tQ5nXKilB/vrKdkL41bgZHL9aKP+7fSS5`
		`@ -1,2 +0,0 @@`
			`hehe, /emoji/hehe.png, Akkoma`
			`nothehe, /emoji/nothehe.png, Akkoma`
		`@ -1,3 +0,0 @@`
			`#!/bin/sh`

			`docker compose run --rm akkoma $@`