Properly enable gzip compression in nginx config

Given that there's already a bunch of other gzip options set in the nginx config, it's likely someone forgot to actually add the setting to turn gzip on, so let's fix that.
2024-03-14 00:06:59 -04:00
317 changed files with 22820 additions and 46703 deletions
--- a/.buildpacks
+++ b/.buildpacks
@ -0,0 +1 @@
+https://github.com/hashnuke/heroku-buildpack-elixir  
--- a/.gitignore
+++ b/.gitignore
@ -78,4 +78,3 @@ docs/venv
 # docker stuff
 docker-db
 *.iml
-docker-compose.override.yml
--- a/.woodpecker/build-amd64.yml
+++ b/.woodpecker/build-amd64.yml
@ -1,5 +1,4 @@
-labels:
-  platform: linux/amd64
+platform: linux/amd64

 depends_on:
  - test
@ -35,7 +34,7 @@ variables:
  - &clean "(rm -rf release || true) && (rm -rf _build || true) && (rm -rf /root/.mix)"
  - &mix-clean "mix deps.clean --all && mix clean"

-steps:
+pipeline:
  # Canonical amd64
  debian-bookworm:
    image: hexpm/elixir:1.15.4-erlang-26.0.2-debian-bookworm-20230612
--- a/.woodpecker/build-arm64.yml
+++ b/.woodpecker/build-arm64.yml
@ -1,5 +1,4 @@
-labels:
-  platform: linux/aarch64
+platform: linux/arm64

 depends_on:
  - test
@ -35,7 +34,7 @@ variables:
  - &clean "(rm -rf release || true) && (rm -rf _build || true) && (rm -rf /root/.mix)"
  - &mix-clean "mix deps.clean --all && mix clean"

-steps:
+pipeline:
  # Canonical arm64
  debian-bookworm:
    image: hexpm/elixir:1.15.4-erlang-26.0.2-debian-bookworm-20230612
--- a/.woodpecker/docs.yml
+++ b/.woodpecker/docs.yml
@ -1,5 +1,4 @@
-labels:
-  platform: linux/amd64
+platform: linux/amd64

 depends_on:
  - test
@ -46,7 +45,7 @@ variables:
  - &clean "(rm -rf release || true) && (rm -rf _build || true) && (rm -rf /root/.mix)"
  - &mix-clean "mix deps.clean --all && mix clean"

-steps:
+pipeline:
  docs:
    <<: *on-point-release
    secrets:
--- a/.woodpecker/lint.yml
+++ b/.woodpecker/lint.yml
@ -1,5 +1,4 @@
-labels:
-  platform: linux/amd64
+platform: linux/amd64

 variables:
  - &scw-secrets
@ -42,9 +41,9 @@ variables:
  - &clean "(rm -rf release || true) && (rm -rf _build || true) && (rm -rf /root/.mix)"
  - &mix-clean "mix deps.clean --all && mix clean"

-steps:
+pipeline:
  lint:
-    image: akkoma/ci-base:1.16-otp26
+    image: akkoma/ci-base:1.15-otp26
    <<: *on-pr-open
    environment:
      MIX_ENV: test
--- a/.woodpecker/test.yml
+++ b/.woodpecker/test.yml
@ -1,5 +1,4 @@
-labels:
-  platform: linux/amd64
+platform: linux/amd64

 depends_on:
  - lint
@ -8,12 +7,15 @@ matrix:
  ELIXIR_VERSION:
    - 1.14
    - 1.15
-    - 1.16
  OTP_VERSION:
    - 25
    - 26
  include:
-    - ELIXIR_VERSION: 1.16
+    - ELIXIR_VERSION: 1.14
+      OTP_VERSION: 25
+    - ELIXIR_VERSION: 1.15
+      OTP_VERSION: 25
+    - ELIXIR_VERSION: 1.15
      OTP_VERSION: 26

 variables:
@ -68,7 +70,7 @@ services:
      POSTGRES_USER: postgres
      POSTGRES_PASSWORD: postgres

-steps:
+pipeline:
  test:
    image: akkoma/ci-base:${ELIXIR_VERSION}-otp${OTP_VERSION}
    <<: *on-pr-open
@ -87,5 +89,5 @@ steps:
      - 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
+      - mix test --preload-modules --exclude erratic --exclude federated --exclude mocked
+      - mix test --preload-modules --only mocked
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -4,114 +4,6 @@ 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 
-
-## 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
--- 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/2
+++ b/2
@ -0,0 +1,2 @@
+web: mix phx.server
+release: mix ecto.migrate
--- 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
-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 |
-
+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.
 ## Announcements

-New releases and security issues are announced at
-[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.
+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>. 
--- a/config/config.exs
+++ b/config/config.exs
@ -61,11 +61,11 @@
 # 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,
-  allowed_mime_types: ["image", "audio", "video"]
+  base_url: nil

 config :pleroma, Pleroma.Uploaders.Local, uploads: "uploads"

@ -148,38 +148,18 @@
  format: "$metadata[$level] $message",
  metadata: [:request_id]

-# ———————————————————————————————————————————————————————————————
-#                       W  A  R  N  I  N  G
-# ———————————————————————————————————————————————————————————————
-#
-#  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"],
-  # Can be removed when bumping MIME past 2.0.5
-  # see https://akkoma.dev/AkkomaGang/akkoma/issues/657
-  "image/apng" => ["apng"]
+  "application/ld+json" => ["activity+json"]
 }

 config :mime, :extensions, %{
-  "xrd+xml" => "text/plain",
-  "jrd+json" => "text/plain",
-  "activity+json" => "text/plain"
+  "activity+json" => "application/activity+json"
 }

-# ———————————————————————————————————————————————————————————————
-
 config :tesla, :adapter, {Tesla.Adapter.Finch, name: MyFinch}

 # Configures http settings, upstream proxy etc.
@ -188,10 +168,8 @@
  receive_timeout: :timer.seconds(15),
  proxy_url: nil,
  user_agent: :default,
-  pool_size: 10,
-  adapter: [],
-  # see: https://hexdocs.pm/finch/Finch.html#start_link/1
-  pool_max_idle_time: :timer.seconds(30)
+  pool_size: 50,
+  adapter: []

 config :pleroma, :instance,
  name: "Akkoma",
@ -438,12 +416,8 @@
    Pleroma.Web.RichMedia.Parsers.TwitterCard,
    Pleroma.Web.RichMedia.Parsers.OEmbed
  ],
-  failure_backoff: 60_000,
-  ttl_setters: [
-    Pleroma.Web.RichMedia.Parser.TTL.AwsSignedUrl,
-    Pleroma.Web.RichMedia.Parser.TTL.Opengraph
-  ],
-  max_body: 5_000_000
+  failure_backoff: :timer.minutes(20),
+  ttl_setters: [Pleroma.Web.RichMedia.Parser.TTL.AwsSignedUrl]

 config :pleroma, :media_proxy,
  enabled: false,
@ -581,9 +555,7 @@
    mute_expire: 5,
    search_indexing: 10,
    nodeinfo_fetcher: 1,
-    database_prune: 1,
-    rich_media_backfill: 2,
-    rich_media_expiration: 2
+    database_prune: 1
  ],
  plugins: [
    Oban.Plugins.Pruner,
@ -599,8 +571,7 @@
  retries: [
    federator_incoming: 5,
    federator_outgoing: 5,
-    search_indexing: 2,
-    rich_media_backfill: 3
+    search_indexing: 2
  ],
  timeout: [
    activity_expiration: :timer.seconds(5),
@ -622,8 +593,7 @@
    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)
+    database_prune: :timer.minutes(10)
  ]

 config :pleroma, Pleroma.Formatter,
@ -822,10 +792,8 @@
 config :pleroma, configurable_from_database: false

 config :pleroma, Pleroma.Repo,
-  parameters: [
-    gin_fuzzy_search_limit: "500",
-    plan_cache_mode: "force_custom_plan"
-  ]
+  parameters: [gin_fuzzy_search_limit: "500"],
+  prepare: :unnamed

 config :pleroma, :majic_pool, size: 2

--- 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,
-        label: "Allowed MIME types",
-        type: {:list, :string},
-        description:
-          "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.",
-        suggestions: [
-          "image",
-          "audio",
-          "video",
-          "font"
-        ]
+        key: :proxy_remote,
+        type: :boolean,
+        description: """
+        Proxy requests to the remote uploader.\n
+        Useful if media upload endpoint is not internet accessible.
+        """
      },
      %{
        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,
@ -2709,8 +2684,8 @@
      %{
        key: :pool_size,
        type: :integer,
-        description: "Number of concurrent outbound HTTP requests to allow PER HOST. Default 10.",
-        suggestions: [10]
+        description: "Number of concurrent outbound HTTP requests to allow. Default 50.",
+        suggestions: [50]
      },
      %{
        key: :adapter,
@ -2733,13 +2708,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]
      }
    ]
  },
--- 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/test.exs
+++ b/config/test.exs
@ -22,12 +22,9 @@
 config :pleroma, :auth, oauth_consumer_strategies: []

 config :pleroma, Pleroma.Upload,
-  base_url: "http://localhost:4001/media/",
  filters: [],
  link_name: false

-config :pleroma, :media_proxy, base_url: "http://localhost:4001"
-
 config :pleroma, Pleroma.Uploaders.Local, uploads: "test/uploads"

 config :pleroma, Pleroma.Emails.Mailer, adapter: Swoosh.Adapters.Test, enabled: true
@ -51,8 +48,7 @@
  hostname: System.get_env("DB_HOST") || "localhost",
  pool: Ecto.Adapters.SQL.Sandbox,
  pool_size: 50,
-  queue_target: 5000,
-  log: false
+  queue_target: 5000

 config :pleroma, :dangerzone, override_repo_pool_size: true

@ -64,8 +60,7 @@
 config :pleroma, :rich_media,
  enabled: false,
  ignore_hosts: [],
-  ignore_tld: ["local", "localdomain", "lan"],
-  max_body: 2_000_000
+  ignore_tld: ["local", "localdomain", "lan"]

 config :pleroma, :instance,
  multi_factor_authentication: [
@ -143,8 +138,6 @@
 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"
 else
--- 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
@ -46,7 +46,7 @@ services:
    volumes:
      - .:/opt/akkoma

-  # Copy this into docker-compose.override.yml and uncomment there if you want to use a reverse proxy
+  # Uncomment the following if you want to use a reverse proxy
  #proxy:
  #  image: caddy:2-alpine
  #  restart: unless-stopped
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@ -11,4 +11,4 @@ echo "-- Running migrations..."
 mix ecto.migrate

 echo "-- Starting!"
-elixir --erl "+sbwt none +sbwtdcpu none +sbwtdio none" -S mix phx.server
+mix phx.server
--- a/docs/docs/administration/CLI_tasks/database.md
+++ b/docs/docs/administration/CLI_tasks/database.md
@ -50,39 +50,9 @@ This will prune remote posts older than 90 days (configurable with [`config :ple

 - `--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

 Can be safely re-run
--- 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
- `--read-uploads-description <Y|N>` - use ExifTool to read image descriptions from uploads
+- `--strip-uploads <Y|N>` - use ExifTool to strip uploads of sensitive location data
 - `--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/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/backup.md
+++ b/docs/docs/administration/backup.md
@ -4,12 +4,12 @@

 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)
-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.
+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)
+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.  
+[¹]: We assume the database name is "akkoma". If not, you can find the correct name in your config files.  
+[²]: If you've installed using OTP, you need `config/config.exs` instead of `config/prod.secret.exs`.  

 ## Restore/Move

@ -17,16 +17,19 @@
 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;'`
-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;"`.
+5. Drop the existing database and user if restoring in-place[¹]. `sudo -Hu postgres psql -c 'DROP DATABASE akkoma;';` `sudo -Hu postgres psql -c 'DROP USER akkoma;'`
+6. Restore the database schema and akkoma role using either of the following options
+    * You can use the original `setup_db.psql` if you have it[²]: `sudo -Hu postgres psql -f config/setup_db.psql`.
+    * Or recreate the database and user yourself (replace the password with the one you find in the config file) `sudo -Hu postgres psql -c "CREATE USER akkoma WITH ENCRYPTED PASSWORD '<database-password-wich-you-can-find-in-your-config-file>'; CREATE DATABASE akkoma OWNER akkoma;"`.
 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`[²].
+8. If you installed a newer Akkoma version, you should run `MIX_ENV=prod mix ecto.migrate`[³]. 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.  
-[²]: 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.  
+[¹]: We assume the database name and user are both "akkoma". If not, you can find the correct name in your config files.  
+[²]: You can recreate the `config/setup_db.psql` by running 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 backed up config file. This will also create a new `config/generated_config.exs` file which you may delete as it is not needed.  
+[³]: Prefix with `MIX_ENV=prod` to run it using the production config file.  

 ## Remove

--- a/docs/docs/clients.md
+++ b/docs/docs/clients.md
@ -1,15 +1,12 @@
 # Akkoma Clients
-This is a list of clients that are known to work with Akkoma.
-
-!!! warning
-    **Clients listed here are not officially supported by the Akkoma project.**
-    Some Akkoma features may be unsupported by these clients.
+Note: Additional clients may work, but these are known to work with Akkoma.
+Apps listed here might not support all of Akkoma's features.

 ## Multiplatform
 ### Kaiteki
 - Homepage: <https://kaiteki.app/>
 - Source Code: <https://github.com/Kaiteki-Fedi/Kaiteki>
- Contact: [@kaiteki@social.kaiteki.app](https://social.kaiteki.app/@kaiteki)
+- Contact: [@kaiteki@fedi.software](https://fedi.software/@Kaiteki)
 - Platforms: Web, Windows, Linux, Android
 - Features: MastoAPI, Supports multiple backends

@ -41,6 +38,12 @@ This is a list of clients that are known to work with Akkoma.
 - 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 +51,12 @@ This is a list of clients that are known to work with Akkoma.
 - Platforms: Android
 - Features: MastoAPI, No Streaming

-### Subway Tooter
- Source Code: <https://github.com/tateisu/SubwayTooter/>
- Contact: [@SubwayTooter@mastodon.juggler.jp](https://mastodon.juggler.jp/@SubwayTooter)
- Platforms: Android
- Features: MastoAPI, Editing, Emoji Reactions (including custom emoji)
-
 ## Alternative Web Interfaces
-### Enafore
- An actively developed fork of Pinafore with improved Akkoma support
- Homepage: <https://enafore.social/>
- Source Code: <https://github.com/enafore/enafore>
- Contact: [@enfore@enafore.social](https://meta.enafore.social/@enafore)
+### Pinafore
+- Note: Pinafore is unmaintained (See [the author's original article](https://nolanlawson.com/2023/01/09/retiring-pinafore/) for details)
+- Homepage: <https://pinafore.social/>
+- Source Code: <https://github.com/nolanlawson/pinafore>
+- Contact: [@pinafore@mastodon.technology](https://mastodon.technology/users/pinafore)
 - Features: MastoAPI, No Streaming

 ### Sengi
--- a/docs/docs/configuration/cheatsheet.md
+++ b/docs/docs/configuration/cheatsheet.md
@ -63,8 +63,6 @@ To add configuration to your config file, you can copy it from the base config.
 * `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).
@ -238,9 +236,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),
-   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
+* `size_limit`: File size limit (in bytes), checked before an emoji is saved to the disk

 #### :mrf_activity_expiration

@ -338,7 +334,7 @@ config :pleroma, :frontends,

 * `: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
@ -400,8 +396,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.
-  Using a (sub)domain distinct from the instance endpoint is **strongly** recommended.
+* `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.
 * `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:
@ -602,9 +597,9 @@ 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
-* `base_url`: The base URL to access a user-uploaded file; MUST be configured explicitly.
-  Using a (sub)domain distinct from the instance endpoint is **strongly** recommended. A good value might be `https://media.myakkoma.instance/media/`. 
+* `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. Useful when you want to host the media files via another domain or are using a 3rd party S3 provider.
+* `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.

@ -643,29 +638,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.
+No specific configuration.

-* `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

-
-#### 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.
+This filter only strips the GPS and location metadata with Exiftool leaving color profiles and attributes intact.

 No specific configuration.

--- a/docs/docs/configuration/frontend_management.md
+++ b/docs/docs/configuration/frontend_management.md
@ -60,4 +60,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,16 +17,6 @@ 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`
--- 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 the nginx config for the upload/MediaProxy subdomain to point to the subdomain that has been set up
+* Edit your nginx config and add the following location: 
+```
+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/i2p.md
+++ b/docs/docs/configuration/i2p.md
@ -130,26 +130,59 @@ config :pleroma, :http_security,
  enabled: false
 ```

-In the Nginx config, add the following into the `location /` block:
-```nginx
+Use this as the Nginx config:
+```
+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 "0";
        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;
-```

-Change the `listen` directive to the following:
-```nginx
-listen 127.0.0.1:14447;
-```
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        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
-systemctl reload nginx.service
+reload Nginx:
+```
+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/onion_federation.md
+++ b/docs/docs/configuration/onion_federation.md
@ -74,23 +74,56 @@ config :pleroma, :http_security,
  enabled: false
 ```

-In the Nginx config, add the following into the `location /` block:
-```nginx
+Use this as the Nginx config:
+```
+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 "0";
        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;
+
+        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;
+    }
+}
 ```
-
-Change the `listen` directive to the following:
-```nginx
-listen 127.0.0.1:8099;
-```
-
-Set the `server_name` to your onion address.
-
-Reload Nginx:
+reload Nginx:
 ```
 systemctl reload nginx
 ```
--- a/docs/docs/configuration/postgresql.md
+++ b/docs/docs/configuration/postgresql.md
@ -4,10 +4,47 @@ 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.
+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. In the end, PGTune only provides recomended settings, you can always try to finetune further.

-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.
+### Example configurations

-In the end, PGTune only provides recomended settings, you can always try to finetune further.
+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
+```
+
+## Disable generic query plans
+
+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.
+
+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/>.
--- 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
-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.
+You will see a "Default Admin API Key", this is the key you actually put into your configuration file.

 ### Initial indexing

--- a/docs/docs/configuration/storing_remote_media.md
+++ b/docs/docs/configuration/storing_remote_media.md
@ -6,7 +6,7 @@ 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.
+The following are excerpts from the [suggested nginx config](../../../installation/nginx/akkoma.nginx) that demonstrates the necessary config for the media proxy to work.

 A `proxy_cache_path` must be defined, for example:

--- a/docs/docs/development/API/admin_api.md
+++ b/docs/docs/development/API/admin_api.md
@ -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:
@ -1093,6 +1094,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/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/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/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/installation/alpine_linux_en.md
+++ b/docs/docs/installation/alpine_linux_en.md
@ -145,13 +145,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 +193,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
-```
-
-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
-
+doas certbot certonly --email <your@emailaddress> -d <yourdomain> --webroot -w /var/lib/letsencrypt/
 ```

 #### OpenRC service
--- a/docs/docs/installation/arch_linux_en.md
+++ b/docs/docs/installation/arch_linux_en.md
@ -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)
-* Enable and start nginx:
+* Append the following line at the end of the `http` block in `/etc/nginx/nginx.conf`:

-```shell
-sudo systemctl enable --now nginx.service
+```Nginx
+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

--- a/docs/docs/installation/debian_based_en.md
+++ b/docs/docs/installation/debian_based_en.md
@ -155,6 +155,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 +186,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/`.
--- a/docs/docs/installation/docker_en.md
+++ b/docs/docs/installation/docker_en.md
@ -125,26 +125,7 @@ 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
-```
-
+Uncomment the `caddy` section in the docker compose file,
 then run `docker compose up -d` again.

 #### Running a reverse proxy on the host
@ -174,12 +155,6 @@ git pull
 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 !}
--- a/docs/docs/installation/fedora_based_en.md
+++ b/docs/docs/installation/fedora_based_en.md
@ -135,6 +135,23 @@ If you want to open your newly installed instance to the world, you should run n
 sudo dnf install nginx
 ```

+* Setup your SSL cert, using your method of choice or certbot. If using certbot, first install it:
+
+```shell
+sudo dnf install certbot
+```
+
+and then set it up:
+
+```shell
+sudo mkdir -p /var/lib/letsencrypt/
+sudo certbot certonly --email <your@emailaddress> -d <yourdomain> --standalone
+```
+
+If that doesn’t work, make sure, that nginx is not already running. If it still doesn’t work, try setting up nginx first (change ssl “on” to “off” and try again).
+
+---
+
 * Copy the example nginx configuration and activate it:

 ```shell
@ -148,23 +165,12 @@ sudo cp /opt/akkoma/installation/nginx/akkoma.nginx /etc/nginx/conf.d/akkoma.con
 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 dnf 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 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/`.
--- a/docs/docs/installation/frontends.include
+++ b/docs/docs/installation/frontends.include
@ -6,9 +6,7 @@ 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:
+For most installations, the following will suffice:

 === "OTP" 
    ```sh
@ -30,3 +28,4 @@ But otherwise, for most installations, the following will suffice:
    ```

 For more customised installations, refer to [Frontend Management](../../configuration/frontend_management)
+
--- a/docs/docs/installation/generic_dependencies.include
+++ b/docs/docs/installation/generic_dependencies.include
@ -1,8 +1,8 @@
 ## Required dependencies

-* PostgreSQL 12+
-* Elixir 1.14+ (currently tested up to 1.16)
-* Erlang OTP 25+ (currently tested up to OTP26)
+* PostgreSQL 9.6+
+* Elixir 1.14+
+* Erlang OTP 25+
 * git
 * file / libmagic
 * gcc (clang might also work)
--- a/docs/docs/installation/gentoo_en.md
+++ b/docs/docs/installation/gentoo_en.md
@ -201,6 +201,25 @@ Assuming you want to open your newly installed federated social network to, well
 include sites-enabled/*;
 ```

+* Setup your SSL cert, using your method of choice or certbot. If using certbot, install it if you haven't already:
+
+```shell
+ # emerge --ask app-crypt/certbot app-crypt/certbot-nginx
+```
+
+and then set it up:
+
+```shell
+ # mkdir -p /var/lib/letsencrypt/
+ # 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. 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). Often the answer to issues with certbot is to use the `--nginx` flag once you have nginx up and running.
+
+If you are using any additional subdomains, such as for a media proxy, you can re-run the same command with the subdomain in question. When it comes time to renew later, you will not need to run multiple times for each domain, one renew will handle it.
+
+---
+
 * Copy the example nginx configuration and activate it:

 ```shell
@ -218,24 +237,9 @@ Pay special attention to the line that begins with `ssl_ecdh_curve`. It is stong

 ```shell
 # rc-update add nginx default
- # rc-service nginx start
+ # /etc/init.d/nginx start
 ```

-* Setup your SSL cert, using your method of choice or certbot. If using certbot, install it if you haven't already:
-
-```shell
- # emerge --ask app-crypt/certbot app-crypt/certbot-nginx
-```
-
-and then set it up:
-
-```shell
- # mkdir -p /var/lib/letsencrypt/
- # 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`.
-
 If you are using certbot, it is HIGHLY recommend you set up a cron job that renews your certificate, and that you install the suggested `certbot-nginx` plugin. If you don't do these things, you only have yourself to blame when your instance breaks suddenly because you forgot about it.

 First, ensure that the command you will be installing into your crontab works.
--- a/docs/docs/installation/optional/media_graphics_packages.md
+++ b/docs/docs/installation/optional/media_graphics_packages.md
@ -14,7 +14,7 @@ Note: the packages are not required with the current default settings of Akkoma.
 `ImageMagick` is a set of tools to create, edit, compose, or convert bitmap images.

 It is required for the following Akkoma features:
-  * `Pleroma.Upload.Filters.Mogrify`, `Pleroma.Upload.Filters.Mogrifun` upload filters (related config: `Pleroma.Upload/filters` in `config/config.exs`)
+  * `Pleroma.Upload.Filters.Mogrify`, `Pleroma.Upload.Filters.Mogrifun` upload filters (related config: `Plaroma.Upload/filters` in `config/config.exs`)
  * Media preview proxy for still images (related config: `media_preview_proxy/enabled` in `config/config.exs`)
  
 ## `ffmpeg`
@ -29,5 +29,4 @@ It is required for the following Akkoma features:
 `exiftool` is media files metadata reader/writer.

 It is required for the following Akkoma features:
-  * `Pleroma.Upload.Filters.Exiftool.StripMetadata` upload filter (related config: `Pleroma.Upload/filters` in `config/config.exs`)
-  * `Pleroma.Upload.Filters.Exiftool.ReadDescription` upload filter (related config: `Pleroma.Upload/filters` in `config/config.exs`)
+  * `Pleroma.Upload.Filters.Exiftool` upload filter (related config: `Plaroma.Upload/filters` in `config/config.exs`)
--- a/docs/docs/installation/otp_en.md
+++ b/docs/docs/installation/otp_en.md
@ -9,7 +9,7 @@ This guide covers a installation using an OTP release. To install Akkoma from so
 * For installing OTP releases on RedHat-based distros like Fedora and Centos Stream, please follow [this guide](./otp_redhat_en.md) instead.
 * A (sub)domain pointed to the machine

-You will be running commands as root. If you aren't root already, please elevate your priviledges by executing `sudo -i`/`su`.
+You will be running commands as root. If you aren't root already, please elevate your priviledges by executing `sudo su`/`su`.

 While in theory OTP releases are possbile to install on any compatible machine, for the sake of simplicity this guide focuses only on Debian/Ubuntu and Alpine.

@ -176,6 +176,11 @@ su akkoma -s $SHELL -lc "./bin/pleroma stop"

 ### Setting up nginx and getting Let's Encrypt SSL certificaties

+#### Get a Let's Encrypt certificate
+```sh
+certbot certonly --standalone --preferred-challenges http -d yourinstance.tld
+```
+
 #### Copy Akkoma nginx configuration to the nginx folder

 The location of nginx configs is dependent on the distro
@ -204,14 +209,6 @@ $EDITOR path-to-nginx-config
 # Verify that the config is valid
 nginx -t
 ```
-
-#### Get a Let's Encrypt certificate
-```sh
-certbot --nginx -d yourinstance.tld -d media.yourinstance.tld
-```
-
-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`.
-
 #### Start nginx

 === "Alpine"
@ -255,19 +252,32 @@ If everything worked, you should see Akkoma-FE when visiting your domain. If tha
 ## Post installation

 ### Setting up auto-renew of the Let's Encrypt certificate
+```sh
+# Create the directory for webroot challenges
+mkdir -p /var/lib/letsencrypt
+
+# Uncomment the webroot method
+$EDITOR path-to-nginx-config
+
+# Verify that the config is valid
+nginx -t
+```

 === "Alpine"
    ```
+    # Restart nginx
+    rc-service nginx restart
+
    # Start the cron daemon and make it start on boot
    rc-service crond start
    rc-update add crond

    # Ensure the webroot menthod and post hook is working
-    certbot renew --cert-name yourinstance.tld --nginx --dry-run
+    certbot renew --cert-name yourinstance.tld --webroot -w /var/lib/letsencrypt/ --dry-run --post-hook 'rc-service nginx reload'

    # Add it to the daily cron
    echo '#!/bin/sh
-    certbot renew --cert-name yourinstance.tld --nginx
+    certbot renew --cert-name yourinstance.tld --webroot -w /var/lib/letsencrypt/ --post-hook "rc-service nginx reload"
    ' > /etc/periodic/daily/renew-akkoma-cert
    chmod +x /etc/periodic/daily/renew-akkoma-cert

@ -276,7 +286,22 @@ If everything worked, you should see Akkoma-FE when visiting your domain. If tha
    ```

 === "Debian/Ubuntu"
-    This should be automatically enabled with the `certbot-renew.timer` systemd unit.
+    ```
+    # Restart nginx
+    systemctl restart nginx
+
+    # Ensure the webroot menthod and post hook is working
+    certbot renew --cert-name yourinstance.tld --webroot -w /var/lib/letsencrypt/ --dry-run --post-hook 'systemctl reload nginx'
+
+    # Add it to the daily cron
+    echo '#!/bin/sh
+    certbot renew --cert-name yourinstance.tld --webroot -w /var/lib/letsencrypt/ --post-hook "systemctl reload nginx"
+    ' > /etc/cron.daily/renew-akkoma-cert
+    chmod +x /etc/cron.daily/renew-akkoma-cert
+
+    # If everything worked the output should contain /etc/cron.daily/renew-akkoma-cert
+    run-parts --test /etc/cron.daily
+    ```

 ## Create your first user and set as admin
 ```sh
--- a/docs/docs/installation/otp_redhat_en.md
+++ b/docs/docs/installation/otp_redhat_en.md
@ -82,7 +82,6 @@ Other than things bundled in the OTP release Akkoma depends on:
 * PostgreSQL (also utilizes extensions in postgresql-contrib)
 * nginx (could be swapped with another reverse proxy but this guide covers only it)
 * certbot (for Let's Encrypt certificates, could be swapped with another ACME client, but this guide covers only it)
-    * If you are using certbot, also install the `python3-certbot-nginx` package for the nginx plugin
 * libmagic/file

 First, update your system, if not already done:
@ -170,6 +169,12 @@ sudo -Hu akkoma ./bin/pleroma stop

 ### Setting up nginx and getting Let's Encrypt SSL certificaties

+#### Get a Let's Encrypt certificate
+
+```shell
+certbot certonly --standalone --preferred-challenges http -d yourinstance.tld
+```
+
 #### Copy Akkoma nginx configuration to the nginx folder

 ```shell
@ -190,15 +195,8 @@ sudo nginx -t
 sudo systemctl start nginx
 ```

-#### Get a Let's Encrypt certificate
+At this point if you open your (sub)domain in a browser you should see a 502 error, that's because Akkoma is not started yet.

-```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`.
-
-If you're successful with obtaining the certificates, opening your (sub)domain in a browser will result in a 502 error, since Akkoma hasn't been started yet.

 ### Setting up a system service

@ -241,11 +239,19 @@ sudo nginx -t
 # Restart nginx
 sudo systemctl restart nginx

-# Test that renewals work properly
-sudo certbot renew --cert-name yourinstance.tld --nginx --dry-run
+# Ensure the webroot menthod and post hook is working
+sudo certbot renew --cert-name yourinstance.tld --webroot -w /var/lib/letsencrypt/ --dry-run --post-hook 'systemctl reload nginx'
+
+# Add it to the daily cron
+echo '#!/bin/sh
+certbot renew --cert-name yourinstance.tld --webroot -w /var/lib/letsencrypt/ --post-hook "systemctl reload nginx"
+' > /etc/cron.daily/renew-akkoma-cert
+sudo chmod +x /etc/cron.daily/renew-akkoma-cert
+
+# If everything worked the output should contain /etc/cron.daily/renew-akkoma-cert
+sudo run-parts --test /etc/cron.daily
 ```

-Assuming the commands were run successfully, certbot should be able to renew your certificates automatically via the `certbot-renew.timer` systemd unit.

 ## Create your first user and set as admin
 ```shell
--- a/elixir_buildpack.config
+++ b/elixir_buildpack.config
@ -0,0 +1,2 @@
+elixir_version=1.14.3
+erlang_version=25.3
--- a/installation/akkoma.service
+++ b/installation/akkoma.service
@ -19,9 +19,6 @@ Environment="MIX_ENV=prod"
 ; Don't listen epmd on 0.0.0.0
 Environment="ERL_EPMD_ADDRESS=127.0.0.1"

-; Don't busy wait
-Environment="ERL_AFLAGS=+sbwt none +sbwtdcpu none +sbwtdio none"
-
 ; Make sure that all paths fit your installation.
 ; Path to the home directory of the user running the Akkoma service.
 Environment="HOME=/var/lib/akkoma"
--- a/installation/apache/akkoma-apache.conf
+++ b/installation/apache/akkoma-apache.conf
@ -60,7 +60,7 @@ ServerTokens Prod
    Include /etc/letsencrypt/options-ssl-apache.conf

    # Uncomment the following to enable MediaProxy caching on disk
-    #CacheRoot /var/tmp/akkoma-media-cache/
+    #CacheRoot /tmp/akkoma-media-cache/
    #CacheDirLevels 1
    #CacheDirLength 2
    #CacheEnable disk /proxy
--- a/installation/apache/apache-cache-purge.sh.example
+++ b/installation/apache/apache-cache-purge.sh.example
@ -16,7 +16,7 @@
 SCRIPTNAME=${0##*/}

 # mod_disk_cache directory
-CACHE_DIRECTORY="/var/tmp/akkoma-media-cache"
+CACHE_DIRECTORY="/tmp/akkoma-media-cache"

 ## Removes an item via the htcacheclean utility
 ## $1 - the filename, can be a pattern .
--- a/installation/caddy/Caddyfile
+++ b/installation/caddy/Caddyfile
@ -12,22 +12,26 @@ example.tld  {
    output file /var/log/caddy/akkoma.log
  }

+  encode gzip
+
  # this is explicitly IPv4 since Pleroma.Web.Endpoint binds on IPv4 only
  # and `localhost.` resolves to [::0] on some systems: see issue #930
  reverse_proxy 127.0.0.1:4000

-  @mediaproxy path /media/* /proxy/*
-  handle @mediaproxy {
-    redir https://media.example.tld{uri} permanent
-  }
+  # Uncomment if using a separate media subdomain
+  #@mediaproxy path /media/* /proxy/*
+  #handle @mediaproxy {
+  #  redir https://media.example.tld{uri} permanent
+  #}
 }

-media.example.tld {
-  @mediaproxy path /media/* /proxy/*
-  reverse_proxy @mediaproxy 127.0.0.1:4000 {
-    transport http {
-      response_header_timeout 10s
-      read_timeout 15s
-    }
-  }
-}
+# Uncomment if using a separate media subdomain
+#media.example.tld {
+#  @mediaproxy path /media/* /proxy/*
+#  reverse_proxy @mediaproxy 127.0.0.1:4000 {
+#    transport http {
+#      response_header_timeout 10s
+#      read_timeout 15s
+#    }
+#  }
+#}
--- a/installation/init.d/akkoma
+++ b/installation/init.d/akkoma
@ -1,43 +1,23 @@
 #!/sbin/openrc-run
 supervisor=supervise-daemon
-no_new_privs="yes"
+command_user=akkoma:akkoma
+command_background=1
+# Ask process to terminate within 30 seconds, otherwise kill it
+retry="SIGTERM/30/SIGKILL/5"
 pidfile="/var/run/akkoma.pid"
+directory=/opt/akkoma
+healthcheck_delay=60
+healthcheck_timer=30
+no_new_privs="yes"

-# Ask process first to terminate itself within 60s, otherwise kill it
-retry="SIGTERM/60/SIGKILL/5"
+: ${akkoma_port:-4000}

-# if you really want to use start-stop-daemon instead,
-# also put the following in the config:
-#    command_background=1
-
-# Adjust defaults as needed in /etc/conf.d/akkoma;
-# no need to directly edit the service file
-command_user="${command_user:-akkoma:akkoma}"
-directory="${directory:-/var/lib/akkoma/akkoma}"
-akkoma_port="${akkoma_port:-4000}"
-# whether to allow connecting a remote exlixir shell to the running Akkoma instance
-akkoma_console=${akkoma_console:-NO}
-
-output_log="${output_log:-/var/log/akkoma}"
-error_log="${error_log:-/var/log/akkoma}"
-
-# 0 means unlimited restarts
-respawn_max="${respawn_max:-0}"
-respawn_delay="${respawn_delay:-5}"
-# define respawn period to only count crashes within a
-# sliding time window towards respawn_max, e.g.:
-#   respawn_period=2850
-
-healthcheck_delay="${healthcheck_delay:-60}"
-healthcheck_timer="${healthcheck_timer:-30}"
-
-MIX_ENV=prod
-ERL_EPMD_ADDRESS="${ERL_EPMD_ADDRESS:-127.0.0.1}"
-ERL_AFLAGS="${ERL_AFLAGS:-+sbwt none +sbwtdcpu none +sbwtdio none}"
-supervise_daemon_args="${supervise_daemon_args} --env MIX_ENV=${MIX_ENV}"
-supervise_daemon_args="${supervise_daemon_args} --env ERL_EPMD_ADDRESS=${ERL_EPMD_ADDRESS}"
-supervise_daemon_args="${supervise_daemon_args} --env ERL_AFLAGS='${ERL_AFLAGS}'"
+# Needs OpenRC >= 0.42
+#respawn_max=0
+#respawn_delay=5

+# put akkoma_console=YES in /etc/conf.d/akkoma if you want to be able to
+# connect to akkoma via an elixir console
 if yesno "${akkoma_console}"; then
 	command=elixir
 	command_args="--name akkoma@127.0.0.1 --erl '-kernel inet_dist_listen_min 9001 inet_dist_listen_max 9001 inet_dist_use_interface {127,0,0,1}' -S mix phx.server"
@ -51,24 +31,13 @@ else
 	command_args="phx.server"
 fi

+export MIX_ENV=prod
+export ERL_EPMD_ADDRESS=127.0.0.1
+
 depend() {
 	need nginx postgresql
 }

-start_pre() {
-	# Ensure logfile ownership and perms are alright
-	checkpath --file --owner "$command_user" "$output_log" "$error_log" \
-	|| eerror "Logfile(s) not owned by $command_user, or not a file!"
-	checkpath --writable "$output_log" "$error_log" \
-	|| eerror "Logfile(s) not writable!"
-
-	# If a recompile is needed perform it with lowest prio
-	# (delaying the actual start) to avoid hogging too much
-	# CPU from other services
-	cd "$directory"
-	doas -u "${command_user%%:*}" env MIX_ENV="$MIX_ENV" nice -n 19 "$command" compile
-}
-
 healthcheck() {
 	# put akkoma_health=YES in /etc/conf.d/akkoma if you want healthchecking
 	# and make sure you have curl installed
--- a/installation/nginx/akkoma.nginx
+++ b/installation/nginx/akkoma.nginx
@ -1,9 +1,12 @@
 # default nginx site config for Akkoma
 #
-# See the documentation at docs.akkoma.dev for your particular distro/OS for
-# installation instructions.
+# Simple installation instructions:
+# 1. Install your TLS certificate, possibly using Let's Encrypt.
+# 2. Replace 'example.tld' with your instance's domain wherever it appears.
+# 3. Copy this file to /etc/nginx/sites-available/ and then add a symlink to it
+#    in /etc/nginx/sites-enabled/ and run 'nginx -s reload' or restart nginx.

-proxy_cache_path /var/tmp/akkoma-media-cache levels=1:2 keys_zone=akkoma_media_cache:10m max_size=1g
+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;

 # this is explicitly IPv4 since Pleroma.Web.Endpoint binds on IPv4 only
@ -12,19 +15,25 @@ upstream phoenix {
    server 127.0.0.1:4000 max_fails=5 fail_timeout=60s;
 }

-# If you are setting up TLS certificates without certbot, uncomment the
-# following to enable HTTP -> HTTPS redirects. Certbot users don't need to do
-# this as it will automatically do this for you.
-# server {
-#     server_name    example.tld media.example.tld;
-#
-#     listen         80;
-#     listen         [::]:80;
-#
-#     location / {
-#         return         301 https://$server_name$request_uri;
-#     }
-# }
+server {
+    server_name    example.tld;
+
+    listen         80;
+    listen         [::]:80;
+
+    # Uncomment this if you need to use the 'webroot' method with certbot. Make sure
+    # that the directory exists and that it is accessible by the webserver. If you followed
+    # the guide, you already ran 'mkdir -p /var/lib/letsencrypt' to create the folder.
+    # You may need to load this file with the ssl server block commented out, run certbot
+    # to get the certificate, and then uncomment it.
+    #
+    # location ~ /\.well-known/acme-challenge {
+    #     root /var/lib/letsencrypt/;
+    # }
+    location / {
+      return         301 https://$server_name$request_uri;
+    }
+}

 # Enable SSL session caching for improved performance
 ssl_session_cache shared:ssl_session_cache:10m;
@ -32,30 +41,24 @@ ssl_session_cache shared:ssl_session_cache:10m;
 server {
    server_name example.tld;

-    # Once certbot is set up, this will automatically be updated to listen to
-    # port 443 with TLS alongside a redirect from plaintext HTTP.
-    listen 80;
-    listen [::]:80;
+    listen 443 ssl http2;
+    listen [::]:443 ssl http2;
+    ssl_session_timeout 1d;
+    ssl_session_cache shared:MozSSL:10m;  # about 40000 sessions
+    ssl_session_tickets off;

-    # If you are not using Certbot, comment out the above and uncomment/edit the following
-#     listen 443 ssl http2;
-#     listen [::]:443 ssl http2;
-#     ssl_session_timeout 1d;
-#     ssl_session_cache shared:MozSSL:10m;  # about 40000 sessions
-#     ssl_session_tickets off;
-#
-#     ssl_trusted_certificate   /etc/letsencrypt/live/example.tld/chain.pem;
-#     ssl_certificate           /etc/letsencrypt/live/example.tld/fullchain.pem;
-#     ssl_certificate_key       /etc/letsencrypt/live/example.tld/privkey.pem;
-#
-#     ssl_protocols TLSv1.2 TLSv1.3;
-#     ssl_ciphers "ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4";
-#     ssl_prefer_server_ciphers off;
-#     ssl_ecdh_curve X25519:prime256v1:secp384r1:secp521r1;
-#     ssl_stapling on;
-#     ssl_stapling_verify on;
+    ssl_trusted_certificate   /etc/letsencrypt/live/example.tld/chain.pem;
+    ssl_certificate           /etc/letsencrypt/live/example.tld/fullchain.pem;
+    ssl_certificate_key       /etc/letsencrypt/live/example.tld/privkey.pem;

+    ssl_protocols TLSv1.2 TLSv1.3;
+    ssl_ciphers "ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4";
+    ssl_prefer_server_ciphers off;
+    ssl_ecdh_curve X25519:prime256v1:secp384r1:secp521r1;
+    ssl_stapling on;
+    ssl_stapling_verify on;

+    gzip on;
    gzip_vary on;
    gzip_proxied any;
    gzip_comp_level 6;
@ -73,43 +76,9 @@ server {
    proxy_set_header Host $http_host;
    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;

-    location ~ ^/(media|proxy) {
-        return 404;
-    }
-
    location / {
        proxy_pass http://phoenix;
    }
-}
-
-# Upload and MediaProxy Subdomain
-# (see main domain setup for more details)
-server {
-    server_name media.example.tld;
-
-    # Same as above, will be updated to HTTPS once certbot is set up.
-    listen 80;
-    listen [::]:80;
-
-    # If you are not using certbot, comment the above and copy all the ssl
-    # stuff from above into here.
-
-    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;
-
-    # the nginx default is 1m, not enough for large media uploads
-    client_max_body_size 16m;
-    ignore_invalid_headers off;
-
-    proxy_http_version 1.1;
-    proxy_set_header Upgrade $http_upgrade;
-    proxy_set_header Connection "upgrade";
-    proxy_set_header Host $http_host;
-    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;

    location ~ ^/(media|proxy) {
        proxy_cache        akkoma_media_cache;
@ -123,8 +92,4 @@ server {
        chunked_transfer_encoding on;
        proxy_pass         http://phoenix;
    }
-
-    location / {
-        return 404;
-    }
 }
--- a/installation/nginx/nginx-cache-purge.sh.example
+++ b/installation/nginx/nginx-cache-purge.sh.example
@ -5,7 +5,7 @@
 SCRIPTNAME=${0##*/}

 # NGINX cache directory
-CACHE_DIRECTORY="/var/tmp/akkoma-media-cache"
+CACHE_DIRECTORY="/tmp/akkoma-media-cache"

 ## Return the files where the items are cached.
 ## $1 - the filename, can be a pattern .
--- a/lib/mix/pleroma.ex
+++ b/lib/mix/pleroma.ex
@ -16,7 +16,7 @@ defmodule Mix.Pleroma do
    :fast_html,
    :oban
  ]
-  @cachex_children ["object", "user", "scrubber", "web_resp", "http_backoff"]
+  @cachex_children ["object", "user", "scrubber", "web_resp"]
  @doc "Common functions to be reused in mix tasks"
  def start_pleroma do
    Pleroma.Config.Holder.save_default()
@ -112,26 +112,18 @@ def shell_prompt(prompt, defval \\ nil, defname \\ nil) do
    end
  end

-  def shell_info(message) when is_binary(message) or is_list(message) do
+  def shell_info(message) do
    if mix_shell?(),
      do: Mix.shell().info(message),
      else: IO.puts(message)
  end

-  def shell_info(message) do
-    shell_info("#{inspect(message)}")
-  end
-
-  def shell_error(message) when is_binary(message) or is_list(message) do
+  def shell_error(message) do
    if mix_shell?(),
      do: Mix.shell().error(message),
      else: IO.puts(:stderr, message)
  end

-  def shell_error(message) do
-    shell_error("#{inspect(message)}")
-  end
-
  @doc "Performs a safe check whether `Mix.shell/0` is available (does not raise if Mix is not loaded)"
  def mix_shell?, do: :erlang.function_exported(Mix, :shell, 0)

--- a/lib/mix/tasks/pleroma/activity.ex
+++ b/lib/mix/tasks/pleroma/activity.ex
@ -8,6 +8,7 @@ defmodule Mix.Tasks.Pleroma.Activity do
  alias Pleroma.User
  alias Pleroma.Web.CommonAPI
  alias Pleroma.Pagination
+  require Logger
  import Mix.Pleroma
  import Ecto.Query

@ -16,7 +17,7 @@ def run(["get", id | _rest]) do

    id
    |> Activity.get_by_id()
-    |> shell_info()
+    |> IO.inspect()
  end

  def run(["delete_by_keyword", user, keyword | _rest]) do
@ -34,7 +35,7 @@ def run(["delete_by_keyword", user, keyword | _rest]) do
    )
    |> Enum.map(fn x -> CommonAPI.delete(x.id, u) end)
    |> Enum.count()
-    |> shell_info()
+    |> IO.puts()
  end

  defp query_with(q, search_query) do
--- a/lib/mix/tasks/pleroma/database.ex
+++ b/lib/mix/tasks/pleroma/database.ex
@ -20,102 +20,6 @@ defmodule Mix.Tasks.Pleroma.Database do
  @shortdoc "A collection of database related tasks"
  @moduledoc File.read!("docs/docs/administration/CLI_tasks/database.md")

-  defp maybe_limit(query, limit_cnt) do
-    if is_number(limit_cnt) and limit_cnt > 0 do
-      limit(query, [], ^limit_cnt)
-    else
-      query
-    end
-  end
-
-  defp limit_statement(limit) when is_number(limit) do
-    if limit > 0 do
-      "LIMIT #{limit}"
-    else
-      ""
-    end
-  end
-
-  defp prune_orphaned_activities_singles(limit) do
-    %{:num_rows => del_single} =
-      """
-      delete from public.activities
-      where id in (
-        select a.id from public.activities a
-        left join public.objects o on a.data ->> 'object' = o.data ->> 'id'
-        left join public.activities a2 on a.data ->> 'object' = a2.data ->> 'id'
-        left join public.users u  on a.data ->> 'object' = u.ap_id
-        where not a.local
-        and jsonb_typeof(a."data" -> 'object') = 'string'
-        and o.id is null
-        and a2.id is null
-        and u.id is null
-        #{limit_statement(limit)}
-      )
-      """
-      |> Repo.query!([], timeout: :infinity)
-
-    Logger.info("Prune activity singles: deleted #{del_single} rows...")
-    del_single
-  end
-
-  defp prune_orphaned_activities_array(limit) do
-    %{:num_rows => del_array} =
-      """
-      delete from public.activities
-      where id in (
-        select a.id from public.activities a
-        join json_array_elements_text((a."data" -> 'object')::json) as j
-             on a.data->>'type' = 'Flag'
-        left join public.objects o on j.value = o.data ->> 'id'
-        left join public.activities a2 on j.value = a2.data ->> 'id'
-        left join public.users u  on j.value = u.ap_id
-        group by a.id
-        having max(o.data ->> 'id') is null
-        and max(a2.data ->> 'id') is null
-        and max(u.ap_id) is null
-        #{limit_statement(limit)}
-      )
-      """
-      |> Repo.query!([], timeout: :infinity)
-
-    Logger.info("Prune activity arrays: deleted #{del_array} rows...")
-    del_array
-  end
-
-  def prune_orphaned_activities(limit \\ 0, opts \\ []) when is_number(limit) do
-    # Activities can either refer to a single object id, and array of object ids
-    # or contain an inlined object (at least after going through our normalisation)
-    #
-    # Flag is the only type we support with an array (and always has arrays).
-    # Update the only one with inlined objects.
-    #
-    # We already regularly purge old Delete, Undo, Update and Remove and if
-    # rejected Follow requests anyway; no need to explicitly deal with those here.
-    #
-    # Since there’s an index on types and there are typically only few Flag
-    # activites, it’s _much_ faster to utilise the index. To avoid accidentally
-    # deleting useful activities should more types be added, keep typeof for singles.
-
-    # Prune activities who link to an array of objects
-    del_array =
-      if Keyword.get(opts, :arrays, true) do
-        prune_orphaned_activities_array(limit)
-      else
-        0
-      end
-
-    # Prune activities who link to a single object
-    del_single =
-      if Keyword.get(opts, :singles, true) do
-        prune_orphaned_activities_singles(limit)
-      else
-        0
-      end
-
-    del_single + del_array
-  end
-
  def run(["remove_embedded_objects" | args]) do
    {options, [], []} =
      OptionParser.parse(
@ -158,37 +62,6 @@ def run(["update_users_following_followers_counts"]) do
    )
  end

-  def run(["prune_orphaned_activities" | args]) do
-    {options, [], []} =
-      OptionParser.parse(
-        args,
-        strict: [
-          limit: :integer,
-          singles: :boolean,
-          arrays: :boolean
-        ]
-      )
-
-    start_pleroma()
-
-    {limit, options} = Keyword.pop(options, :limit, 0)
-
-    log_message = "Pruning orphaned activities"
-
-    log_message =
-      if limit > 0 do
-        log_message <> ", limiting deletion to #{limit} rows"
-      else
-        log_message
-      end
-
-    Logger.info(log_message)
-
-    deleted = prune_orphaned_activities(limit, options)
-
-    Logger.info("Deleted #{deleted} rows")
-  end
-
  def run(["prune_objects" | args]) do
    {options, [], []} =
      OptionParser.parse(
@ -197,8 +70,7 @@ def run(["prune_objects" | args]) do
          vacuum: :boolean,
          keep_threads: :boolean,
          keep_non_public: :boolean,
-          prune_orphaned_activities: :boolean,
-          limit: :integer
+          prune_orphaned_activities: :boolean
        ]
      )

@ -207,8 +79,6 @@ def run(["prune_objects" | args]) do
    deadline = Pleroma.Config.get([:instance, :remote_post_retention_days])
    time_deadline = NaiveDateTime.utc_now() |> NaiveDateTime.add(-(deadline * 86_400))

-    limit_cnt = Keyword.get(options, :limit, 0)
-
    log_message = "Pruning objects older than #{deadline} days"

    log_message =
@ -240,16 +110,8 @@ def run(["prune_objects" | args]) do
        log_message
      end

-    log_message =
-      if limit_cnt > 0 do
-        log_message <> ", limiting to #{limit_cnt} rows"
-      else
-        log_message
-      end
-
    Logger.info(log_message)

-    {del_obj, _} =
    if Keyword.get(options, :keep_threads) do
      # We want to delete objects from threads where
      # 1. the newest post is still old
@ -281,13 +143,11 @@ def run(["prune_objects" | args]) do
        |> having([a], max(a.updated_at) < ^time_deadline)
        |> having([a], not fragment("bool_or(?)", a.local))
        |> having([_, b], fragment("max(?::text) is null", b.id))
-          |> maybe_limit(limit_cnt)
        |> select([a], fragment("? ->> 'context'::text", a.data))

      Pleroma.Object
      |> where([o], fragment("? ->> 'context'::text", o.data) in subquery(deletable_context))
    else
-        deletable =
      if Keyword.get(options, :keep_non_public) do
        Pleroma.Object
        |> where(
@ -308,20 +168,12 @@ def run(["prune_objects" | args]) do
        [o],
        fragment("split_part(?->>'actor', '/', 3) != ?", o.data, ^Pleroma.Web.Endpoint.host())
      )
-          |> maybe_limit(limit_cnt)
-          |> select([o], o.id)
-
-        Pleroma.Object
-        |> where([o], o.id in subquery(deletable))
    end
    |> Repo.delete_all(timeout: :infinity)

-    Logger.info("Deleted #{del_obj} objects...")
-
    if !Keyword.get(options, :keep_threads) do
      # Without the --keep-threads option, it's possible that bookmarked
      # objects have been deleted. We remove the corresponding bookmarks.
-      %{:num_rows => del_bookmarks} =
      """
      delete from public.bookmarks
      where id in (
@ -331,33 +183,56 @@ def run(["prune_objects" | args]) do
        where o.id is null
      )
      """
-        |> Repo.query!([], timeout: :infinity)
-
-      Logger.info("Deleted #{del_bookmarks} orphaned bookmarks...")
+      |> Repo.query([], timeout: :infinity)
    end

    if Keyword.get(options, :prune_orphaned_activities) do
-      del_activities = prune_orphaned_activities()
-      Logger.info("Deleted #{del_activities} orphaned activities...")
+      # Prune activities who link to a single object
+      """
+      delete from public.activities
+      where id in (
+        select a.id from public.activities a
+        left join public.objects o on a.data ->> 'object' = o.data ->> 'id'
+        left join public.activities a2 on a.data ->> 'object' = a2.data ->> 'id'
+        left join public.users u  on a.data ->> 'object' = u.ap_id
+        where not a.local
+        and jsonb_typeof(a."data" -> 'object') = 'string'
+        and o.id is null
+        and a2.id is null
+        and u.id is null
+      )
+      """
+      |> Repo.query([], timeout: :infinity)
+
+      # Prune activities who link to an array of objects
+      """
+      delete from public.activities
+      where id in (
+        select a.id from public.activities a
+        join json_array_elements_text((a."data" -> 'object')::json) as j on jsonb_typeof(a."data" -> 'object') = 'array'
+        left join public.objects o on j.value = o.data ->> 'id'
+        left join public.activities a2 on j.value = a2.data ->> 'id'
+        left join public.users u  on j.value = u.ap_id
+        group by a.id
+        having max(o.data ->> 'id') is null
+        and max(a2.data ->> 'id') is null
+        and max(u.ap_id) is null
+      )
+      """
+      |> Repo.query([], timeout: :infinity)
    end

-    %{:num_rows => del_hashtags} =
    """
    DELETE FROM hashtags AS ht
    WHERE NOT EXISTS (
      SELECT 1 FROM hashtags_objects hto
      WHERE ht.id = hto.hashtag_id)
    """
-      |> Repo.query!()
-
-    Logger.info("Deleted #{del_hashtags} no longer used hashtags...")
+    |> Repo.query()

    if Keyword.get(options, :vacuum) do
-      Logger.info("Starting vacuum...")
      Maintenance.vacuum("full")
    end
-
-    Logger.info("All done!")
  end

  def run(["prune_task"]) do
--- a/lib/mix/tasks/pleroma/diagnostics.ex
+++ b/lib/mix/tasks/pleroma/diagnostics.ex
@ -3,6 +3,7 @@ defmodule Mix.Tasks.Pleroma.Diagnostics do
  alias Pleroma.Repo
  alias Pleroma.User

+  require Logger
  require Pleroma.Constants

  import Mix.Pleroma
@ -13,20 +14,13 @@ def run(["http", url]) do
    start_pleroma()

    Pleroma.HTTP.get(url)
-    |> shell_info()
-  end
-
-  def run(["fetch_object", url]) do
-    start_pleroma()
-
-    Pleroma.Object.Fetcher.fetch_object_from_id(url)
    |> IO.inspect()
  end

  def run(["home_timeline", nickname]) do
    start_pleroma()
    user = Repo.get_by!(User, nickname: nickname)
-    shell_info("Home timeline query #{user.nickname}")
+    Logger.info("Home timeline query #{user.nickname}")

    followed_hashtags =
      user
@ -55,14 +49,14 @@ def run(["home_timeline", nickname]) do
      |> limit(20)

    Ecto.Adapters.SQL.explain(Repo, :all, query, analyze: true, timeout: :infinity)
-    |> shell_info()
+    |> IO.puts()
  end

  def run(["user_timeline", nickname, reading_nickname]) do
    start_pleroma()
    user = Repo.get_by!(User, nickname: nickname)
    reading_user = Repo.get_by!(User, nickname: reading_nickname)
-    shell_info("User timeline query #{user.nickname}")
+    Logger.info("User timeline query #{user.nickname}")

    params =
      %{limit: 20}
@ -86,7 +80,7 @@ def run(["user_timeline", nickname, reading_nickname]) do
      |> limit(20)

    Ecto.Adapters.SQL.explain(Repo, :all, query, analyze: true, timeout: :infinity)
-    |> shell_info()
+    |> IO.puts()
  end

  def run(["notifications", nickname]) do
@ -102,7 +96,7 @@ def run(["notifications", nickname]) do
      |> limit(20)

    Ecto.Adapters.SQL.explain(Repo, :all, query, analyze: true, timeout: :infinity)
-    |> shell_info()
+    |> IO.puts()
  end

  def run(["known_network", nickname]) do
@ -128,6 +122,6 @@ def run(["known_network", nickname]) do
      |> limit(20)

    Ecto.Adapters.SQL.explain(Repo, :all, query, analyze: true, timeout: :infinity)
-    |> shell_info()
+    |> IO.puts()
  end
 end
--- a/lib/mix/tasks/pleroma/emoji.ex
+++ b/lib/mix/tasks/pleroma/emoji.ex
@ -27,11 +27,11 @@ def run(["ls-packs" | args]) do
      ]

      for {param, value} <- to_print do
-        shell_info(IO.ANSI.format([:bright, param, :normal, ": ", value]))
+        IO.puts(IO.ANSI.format([:bright, param, :normal, ": ", value]))
      end

      # A newline
-      shell_info("")
+      IO.puts("")
    end)
  end

@ -49,7 +49,7 @@ def run(["get-packs" | args]) do
        pack = manifest[pack_name]
        src = pack["src"]

-        shell_info(
+        IO.puts(
          IO.ANSI.format([
            "Downloading ",
            :bright,
@ -67,9 +67,9 @@ def run(["get-packs" | args]) do
        sha_status_text = ["SHA256 of ", :bright, pack_name, :normal, " source file is ", :bright]

        if archive_sha == String.upcase(pack["src_sha256"]) do
-          shell_info(IO.ANSI.format(sha_status_text ++ [:green, "OK"]))
+          IO.puts(IO.ANSI.format(sha_status_text ++ [:green, "OK"]))
        else
-          shell_info(IO.ANSI.format(sha_status_text ++ [:red, "BAD"]))
+          IO.puts(IO.ANSI.format(sha_status_text ++ [:red, "BAD"]))

          raise "Bad SHA256 for #{pack_name}"
        end
@ -80,7 +80,7 @@ def run(["get-packs" | args]) do
          |> Path.dirname()
          |> Path.join(pack["files"])

-        shell_info(
+        IO.puts(
          IO.ANSI.format([
            "Fetching the file list for ",
            :bright,
@ -94,7 +94,7 @@ def run(["get-packs" | args]) do

        files = fetch_and_decode!(files_loc)

-        shell_info(IO.ANSI.format(["Unpacking ", :bright, pack_name]))
+        IO.puts(IO.ANSI.format(["Unpacking ", :bright, pack_name]))

        pack_path =
          Path.join([
@ -111,11 +111,11 @@ def run(["get-packs" | args]) do

        {:ok, _} =
          :zip.unzip(binary_archive,
-            cwd: to_charlist(pack_path),
+            cwd: pack_path,
            file_list: files_to_unzip
          )

-        shell_info(IO.ANSI.format(["Writing pack.json for ", :bright, pack_name]))
+        IO.puts(IO.ANSI.format(["Writing pack.json for ", :bright, pack_name]))

        pack_json = %{
          pack: %{
@ -132,7 +132,7 @@ def run(["get-packs" | args]) do
        File.write!(Path.join(pack_path, "pack.json"), Jason.encode!(pack_json, pretty: true))
        Pleroma.Emoji.reload()
      else
-        shell_info(IO.ANSI.format([:bright, :red, "No pack named \"#{pack_name}\" found"]))
+        IO.puts(IO.ANSI.format([:bright, :red, "No pack named \"#{pack_name}\" found"]))
      end
    end
  end
@ -180,14 +180,14 @@ def run(["gen-pack" | args]) do
        custom_exts
      end

-    shell_info("Using #{Enum.join(exts, " ")} extensions")
+    IO.puts("Using #{Enum.join(exts, " ")} extensions")

-    shell_info("Downloading the pack and generating SHA256")
+    IO.puts("Downloading the pack and generating SHA256")

    {:ok, %{body: binary_archive}} = Pleroma.HTTP.get(src)
    archive_sha = :crypto.hash(:sha256, binary_archive) |> Base.encode16()

-    shell_info("SHA256 is #{archive_sha}")
+    IO.puts("SHA256 is #{archive_sha}")

    pack_json = %{
      name => %{
@ -208,7 +208,7 @@ def run(["gen-pack" | args]) do

    File.write!(files_name, Jason.encode!(emoji_map, pretty: true))

-    shell_info("""
+    IO.puts("""

    #{files_name} has been created and contains the list of all found emojis in the pack.
    Please review the files in the pack and remove those not needed.
@ -230,11 +230,11 @@ def run(["gen-pack" | args]) do
        )
      )

-      shell_info("#{pack_file} has been updated with the #{name} pack")
+      IO.puts("#{pack_file} has been updated with the #{name} pack")
    else
      File.write!(pack_file, Jason.encode!(pack_json, pretty: true))

-      shell_info("#{pack_file} has been created with the #{name} pack")
+      IO.puts("#{pack_file} has been created with the #{name} pack")
    end

    Pleroma.Emoji.reload()
@ -243,7 +243,7 @@ def run(["gen-pack" | args]) do
  def run(["reload"]) do
    start_pleroma()
    Pleroma.Emoji.reload()
-    shell_info("Emoji packs have been reloaded.")
+    IO.puts("Emoji packs have been reloaded.")
  end

  defp fetch_and_decode!(from) do
--- a/lib/mix/tasks/pleroma/instance.ex
+++ b/lib/mix/tasks/pleroma/instance.ex
@ -20,7 +20,6 @@ def run(["gen" | rest]) do
          output: :string,
          output_psql: :string,
          domain: :string,
-          media_url: :string,
          instance_name: :string,
          admin_email: :string,
          notify_email: :string,
@ -35,9 +34,9 @@ def run(["gen" | rest]) do
          static_dir: :string,
          listen_ip: :string,
          listen_port: :string,
-          strip_uploads_metadata: :string,
-          read_uploads_description: :string,
-          anonymize_uploads: :string
+          strip_uploads: :string,
+          anonymize_uploads: :string,
+          dedupe_uploads: :string
        ],
        aliases: [
          o: :output,
@ -65,14 +64,6 @@ def run(["gen" | rest]) do
          ":"
        ) ++ [443]

-      media_url =
-        get_option(
-          options,
-          :media_url,
-          "What base url will uploads use? (e.g https://media.example.com/media)\n" <>
-            "  Generally this should NOT use the same domain as the instance       "
-        )
-
      name =
        get_option(
          options,
@ -170,38 +161,21 @@ def run(["gen" | rest]) do
        )
        |> Path.expand()

-      {strip_uploads_metadata_message, strip_uploads_metadata_default} =
+      {strip_uploads_message, strip_uploads_default} =
        if Pleroma.Utils.command_available?("exiftool") do
-          {"Do you want to strip metadata from uploaded images? This requires exiftool, it was detected as installed. (y/n)",
+          {"Do you want to strip location (GPS) data from uploaded images? This requires exiftool, it was detected as installed. (y/n)",
           "y"}
        else
-          {"Do you want to strip metadata from uploaded images? This requires exiftool, it was detected as not installed, please install it if you answer yes. (y/n)",
+          {"Do you want to strip location (GPS) data from uploaded images? This requires exiftool, it was detected as not installed, please install it if you answer yes. (y/n)",
           "n"}
        end

-      strip_uploads_metadata =
+      strip_uploads =
        get_option(
          options,
-          :strip_uploads_metadata,
-          strip_uploads_metadata_message,
-          strip_uploads_metadata_default
-        ) === "y"
-
-      {read_uploads_description_message, read_uploads_description_default} =
-        if Pleroma.Utils.command_available?("exiftool") do
-          {"Do you want to read data from uploaded files so clients can use it to prefill fields like image description? This requires exiftool, it was detected as installed. (y/n)",
-           "y"}
-        else
-          {"Do you want to read data from uploaded files so clients can use it to prefill fields like image description? This requires exiftool, it was detected as not installed, please install it if you answer yes. (y/n)",
-           "n"}
-        end
-
-      read_uploads_description =
-        get_option(
-          options,
-          :read_uploads_description,
-          read_uploads_description_message,
-          read_uploads_description_default
+          :strip_uploads,
+          strip_uploads_message,
+          strip_uploads_default
        ) === "y"

      anonymize_uploads =
@ -212,6 +186,14 @@ def run(["gen" | rest]) do
          "n"
        ) === "y"

+      dedupe_uploads =
+        get_option(
+          options,
+          :dedupe_uploads,
+          "Do you want to deduplicate uploaded files? (y/n)",
+          "n"
+        ) === "y"
+
      Config.put([:instance, :static_dir], static_dir)

      secret = :crypto.strong_rand_bytes(64) |> Base.encode64() |> binary_part(0, 64)
@ -225,7 +207,6 @@ def run(["gen" | rest]) do
        EEx.eval_file(
          template_dir <> "/sample_config.eex",
          domain: domain,
-          media_url: media_url,
          port: port,
          email: email,
          notify_email: notify_email,
@ -248,9 +229,9 @@ def run(["gen" | rest]) do
          listen_port: listen_port,
          upload_filters:
            upload_filters(%{
-              strip_metadata: strip_uploads_metadata,
-              read_description: read_uploads_description,
-              anonymize: anonymize_uploads
+              strip: strip_uploads,
+              anonymize: anonymize_uploads,
+              dedupe: dedupe_uploads
            })
        )

@ -324,20 +305,11 @@ defp write_robots_txt(static_dir, indexable, template_dir) do
  end

  defp upload_filters(filters) when is_map(filters) do
-    enabled_filters = []
-
    enabled_filters =
-      if filters.read_description do
-        enabled_filters ++ [Pleroma.Upload.Filter.Exiftool.ReadDescription]
+      if filters.strip do
+        [Pleroma.Upload.Filter.Exiftool]
      else
-        enabled_filters
-      end
-
-    enabled_filters =
-      if filters.strip_metadata do
-        enabled_filters ++ [Pleroma.Upload.Filter.Exiftool.StripMetadata]
-      else
-        enabled_filters
+        []
      end

    enabled_filters =
@ -347,6 +319,13 @@ defp upload_filters(filters) when is_map(filters) do
        enabled_filters
      end

+    enabled_filters =
+      if filters.dedupe do
+        enabled_filters ++ [Pleroma.Upload.Filter.Dedupe]
+      else
+        enabled_filters
+      end
+
    enabled_filters
  end
 end
--- a/lib/mix/tasks/pleroma/refresh_counter_cache.ex
+++ b/lib/mix/tasks/pleroma/refresh_counter_cache.ex
@ -11,6 +11,7 @@ defmodule Mix.Tasks.Pleroma.RefreshCounterCache do
  alias Pleroma.CounterCache
  alias Pleroma.Repo

+  require Logger
  import Ecto.Query

  def run([]) do
--- a/lib/mix/tasks/pleroma/search/meilisearch.ex
+++ b/lib/mix/tasks/pleroma/search/meilisearch.ex
@ -48,7 +48,7 @@ def run(["index"]) do
        ]
      )

-    shell_info("Created indices. Starting to insert posts.")
+    IO.puts("Created indices. Starting to insert posts.")

    chunk_size = Pleroma.Config.get([Pleroma.Search.Meilisearch, :initial_indexing_chunk_size])

@ -65,7 +65,7 @@ def run(["index"]) do
          )

        count = query |> Pleroma.Repo.aggregate(:count, :data)
-        shell_info("Entries to index: #{count}")
+        IO.puts("Entries to index: #{count}")

        Pleroma.Repo.stream(
          query,
@ -92,10 +92,10 @@ def run(["index"]) do

          with {:ok, res} <- result do
            if not Map.has_key?(res, "indexUid") do
-              shell_info("\nFailed to index: #{inspect(result)}")
+              IO.puts("\nFailed to index: #{inspect(result)}")
            end
          else
-            e -> shell_error("\nFailed to index due to network error: #{inspect(e)}")
+            e -> IO.puts("\nFailed to index due to network error: #{inspect(e)}")
          end
        end)
        |> Stream.run()
@ -126,15 +126,11 @@ def run(["show-keys", master_key]) do
    decoded = Jason.decode!(result.body)

    if decoded["results"] do
-      Enum.each(decoded["results"], fn
-        %{"name" => name, "key" => key} ->
-          shell_info("#{name}: #{key}")
-
-        %{"description" => desc, "key" => key} ->
-          shell_info("#{desc}: #{key}")
+      Enum.each(decoded["results"], fn %{"description" => desc, "key" => key} ->
+        IO.puts("#{desc}: #{key}")
      end)
    else
-      shell_error("Error fetching the keys, check the master key is correct: #{inspect(decoded)}")
+      IO.puts("Error fetching the keys, check the master key is correct: #{inspect(decoded)}")
    end
  end

@ -142,7 +138,7 @@ def run(["stats"]) do
    start_pleroma()

    {:ok, result} = meili_get("/indexes/objects/stats")
-    shell_info("Number of entries: #{result["numberOfDocuments"]}")
-    shell_info("Indexing? #{result["isIndexing"]}")
+    IO.puts("Number of entries: #{result["numberOfDocuments"]}")
+    IO.puts("Indexing? #{result["isIndexing"]}")
  end
 end
--- a/lib/mix/tasks/pleroma/security.ex
+++ b/lib/mix/tasks/pleroma/security.ex
@ -1,330 +0,0 @@
-# Akkoma: Magically expressive social media
-# Copyright © 2024 Akkoma Authors <https://akkoma.dev/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Mix.Tasks.Pleroma.Security do
-  use Mix.Task
-  import Ecto.Query
-  import Mix.Pleroma
-
-  alias Pleroma.Config
-
-  require Logger
-
-  @shortdoc """
-  Security-related tasks, like e.g. checking for signs past exploits were abused.
-  """
-
-  # Constants etc
-  defp local_id_prefix(), do: Pleroma.Web.Endpoint.url() <> "/"
-
-  defp local_id_pattern(), do: local_id_prefix() <> "%"
-
-  @activity_exts ["activity+json", "activity%2Bjson"]
-
-  defp activity_ext_url_patterns() do
-    for e <- @activity_exts do
-      for suf <- ["", "?%"] do
-        # Escape literal % for use in SQL patterns
-        ee = String.replace(e, "%", "\\%")
-        "%.#{ee}#{suf}"
-      end
-    end
-    |> List.flatten()
-  end
-
-  # Search for malicious uploads exploiting the lack of Content-Type sanitisation from before 2024-03
-  def run(["spoof-uploaded"]) do
-    Logger.put_process_level(self(), :notice)
-    start_pleroma()
-
-    shell_info("""
-    +------------------------+
-    |  SPOOF SEARCH UPLOADS  |
-    +------------------------+
-    Checking if any uploads are using privileged types.
-    NOTE if attachment deletion is enabled, payloads used
-         in the past may no longer exist.
-    """)
-
-    do_spoof_uploaded()
-  end
-
-  # Fuzzy search for potentially counterfeit activities in the database resulting from the same exploit
-  def run(["spoof-inserted"]) do
-    Logger.put_process_level(self(), :notice)
-    start_pleroma()
-
-    shell_info("""
-    +----------------------+
-    |  SPOOF SEARCH NOTES  |
-    +----------------------+
-    Starting fuzzy search for counterfeit activities.
-    NOTE this can not guarantee detecting all counterfeits
-         and may yield a small percentage of false positives.
-    """)
-
-    do_spoof_inserted()
-  end
-
-  # +-----------------------------+
-  # | S P O O F - U P L O A D E D |
-  # +-----------------------------+
-  defp do_spoof_uploaded() do
-    files =
-      case Config.get!([Pleroma.Upload, :uploader]) do
-        Pleroma.Uploaders.Local ->
-          uploads_search_spoofs_local_dir(Config.get!([Pleroma.Uploaders.Local, :uploads]))
-
-        _ ->
-          shell_info("""
-          NOTE:
-            Not using local uploader; thus not affected by this exploit.
-            It's impossible to check for files, but in case local uploader was used before
-            or to check if anyone futilely attempted a spoof, notes will still be scanned.
-          """)
-
-          []
-      end
-
-    emoji = uploads_search_spoofs_local_dir(Config.get!([:instance, :static_dir]))
-
-    post_attachs = uploads_search_spoofs_notes()
-
-    not_orphaned_urls =
-      post_attachs
-      |> Enum.map(fn {_u, _a, url} -> url end)
-      |> MapSet.new()
-
-    orphaned_attachs = upload_search_orphaned_attachments(not_orphaned_urls)
-
-    shell_info("\nSearch concluded; here are the results:")
-    pretty_print_list_with_title(emoji, "Emoji")
-    pretty_print_list_with_title(files, "Uploaded Files")
-    pretty_print_list_with_title(post_attachs, "(Not Deleted) Post Attachments")
-    pretty_print_list_with_title(orphaned_attachs, "Orphaned Uploads")
-
-    shell_info("""
-    In total found
-      #{length(emoji)} emoji
-      #{length(files)} uploads
-      #{length(post_attachs)} not deleted posts
-      #{length(orphaned_attachs)} orphaned attachments
-    """)
-  end
-
-  defp uploads_search_spoofs_local_dir(dir) do
-    local_dir = String.replace_suffix(dir, "/", "")
-
-    shell_info("Searching for suspicious files in #{local_dir}...")
-
-    glob_ext = "{" <> Enum.join(@activity_exts, ",") <> "}"
-
-    Path.wildcard(local_dir <> "/**/*." <> glob_ext, match_dot: true)
-    |> Enum.map(fn path ->
-      String.replace_prefix(path, local_dir <> "/", "")
-    end)
-    |> Enum.sort()
-  end
-
-  defp uploads_search_spoofs_notes() do
-    shell_info("Now querying DB for posts with spoofing attachments. This might take a while...")
-
-    patterns = [local_id_pattern() | activity_ext_url_patterns()]
-
-    # if jsonb_array_elemsts in FROM can be used with normal Ecto functions, idk how
-    """
-    SELECT DISTINCT a.data->>'actor', a.id, url->>'href'
-    FROM public.objects AS o JOIN public.activities AS a
-         ON o.data->>'id' = a.data->>'object',
-       jsonb_array_elements(o.data->'attachment') AS attachs,
-       jsonb_array_elements(attachs->'url') AS url
-    WHERE o.data->>'type' = 'Note' AND
-          o.data->>'id' LIKE $1::text AND (
-            url->>'href' LIKE $2::text OR
-            url->>'href' LIKE $3::text OR
-            url->>'href' LIKE $4::text OR
-            url->>'href' LIKE $5::text
-          )
-    ORDER BY a.data->>'actor', a.id, url->>'href';
-    """
-    |> Pleroma.Repo.query!(patterns, timeout: :infinity)
-    |> map_raw_id_apid_tuple()
-  end
-
-  defp upload_search_orphaned_attachments(not_orphaned_urls) do
-    shell_info("""
-    Now querying DB for orphaned spoofing attachment (i.e. their post was deleted,
-    but if :cleanup_attachments was not enabled traces remain in the database)
-    This might take a bit...
-    """)
-
-    patterns = activity_ext_url_patterns()
-
-    """
-    SELECT DISTINCT attach.id, url->>'href'
-    FROM public.objects AS attach,
-         jsonb_array_elements(attach.data->'url') AS url
-    WHERE (attach.data->>'type' = 'Image' OR
-           attach.data->>'type' = 'Document')
-          AND (
-            url->>'href' LIKE $1::text OR
-            url->>'href' LIKE $2::text OR
-            url->>'href' LIKE $3::text OR
-            url->>'href' LIKE $4::text
-          )
-    ORDER BY attach.id, url->>'href';
-    """
-    |> Pleroma.Repo.query!(patterns, timeout: :infinity)
-    |> then(fn res -> Enum.map(res.rows, fn [id, url] -> {id, url} end) end)
-    |> Enum.filter(fn {_, url} -> !(url in not_orphaned_urls) end)
-  end
-
-  # +-----------------------------+
-  # | S P O O F - I N S E R T E D |
-  # +-----------------------------+
-  defp do_spoof_inserted() do
-    shell_info("""
-    Searching for local posts whose Create activity has no ActivityPub id...
-      This is a pretty good indicator, but only for spoofs of local actors
-      and only if the spoofing happened after around late 2021.
-    """)
-
-    idless_create =
-      search_local_notes_without_create_id()
-      |> Enum.sort()
-
-    shell_info("Done.\n")
-
-    shell_info("""
-    Now trying to weed out other poorly hidden spoofs.
-    This can't detect all and may have some false positives.
-    """)
-
-    likely_spoofed_posts_set = MapSet.new(idless_create)
-
-    sus_pattern_posts =
-      search_sus_notes_by_id_patterns()
-      |> Enum.filter(fn r -> !(r in likely_spoofed_posts_set) end)
-
-    shell_info("Done.\n")
-
-    shell_info("""
-    Finally, searching for spoofed, local user accounts.
-    (It's impossible to detect spoofed remote users)
-    """)
-
-    spoofed_users = search_bogus_local_users()
-
-    pretty_print_list_with_title(sus_pattern_posts, "Maybe Spoofed Posts")
-    pretty_print_list_with_title(idless_create, "Likely Spoofed Posts")
-    pretty_print_list_with_title(spoofed_users, "Spoofed local user accounts")
-
-    shell_info("""
-    In total found:
-      #{length(spoofed_users)} bogus users
-      #{length(idless_create)} likely spoofed posts
-      #{length(sus_pattern_posts)} maybe spoofed posts
-    """)
-  end
-
-  defp search_local_notes_without_create_id() do
-    Pleroma.Object
-    |> where([o], fragment("?->>'id' LIKE ?", o.data, ^local_id_pattern()))
-    |> join(:inner, [o], a in Pleroma.Activity,
-      on: fragment("?->>'object' = ?->>'id'", a.data, o.data)
-    )
-    |> where([o, a], fragment("NOT (? \\? 'id') OR ?->>'id' IS NULL", a.data, a.data))
-    |> select([o, a], {a.id, fragment("?->>'id'", o.data)})
-    |> order_by([o, a], a.id)
-    |> Pleroma.Repo.all(timeout: :infinity)
-  end
-
-  defp search_sus_notes_by_id_patterns() do
-    [ep1, ep2, ep3, ep4] = activity_ext_url_patterns()
-
-    Pleroma.Object
-    |> where(
-      [o],
-      # for local objects we know exactly how a genuine id looks like
-      # (though a thorough attacker can emulate this)
-      # for remote posts, use some best-effort patterns
-      fragment(
-        """
-         (?->>'id' LIKE ? AND ?->>'id' NOT SIMILAR TO
-          ? || 'objects/[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}')
-        """,
-        o.data,
-        ^local_id_pattern(),
-        o.data,
-        ^local_id_prefix()
-      ) or
-        fragment("?->>'id' LIKE ?", o.data, "%/emoji/%") or
-        fragment("?->>'id' LIKE ?", o.data, "%/media/%") or
-        fragment("?->>'id' LIKE ?", o.data, "%/proxy/%") or
-        fragment("?->>'id' LIKE ?", o.data, ^ep1) or
-        fragment("?->>'id' LIKE ?", o.data, ^ep2) or
-        fragment("?->>'id' LIKE ?", o.data, ^ep3) or
-        fragment("?->>'id' LIKE ?", o.data, ^ep4)
-    )
-    |> join(:inner, [o], a in Pleroma.Activity,
-      on: fragment("?->>'object' = ?->>'id'", a.data, o.data)
-    )
-    |> select([o, a], {a.id, fragment("?->>'id'", o.data)})
-    |> order_by([o, a], a.id)
-    |> Pleroma.Repo.all(timeout: :infinity)
-  end
-
-  defp search_bogus_local_users() do
-    Pleroma.User.Query.build(%{})
-    |> where([u], u.local == false and like(u.ap_id, ^local_id_pattern()))
-    |> order_by([u], u.ap_id)
-    |> select([u], u.ap_id)
-    |> Pleroma.Repo.all(timeout: :infinity)
-  end
-
-  # +-----------------------------------+
-  # | module-specific utility functions |
-  # +-----------------------------------+
-  defp pretty_print_list_with_title(list, title) do
-    title_len = String.length(title)
-    title_underline = String.duplicate("=", title_len)
-    shell_info(title)
-    shell_info(title_underline)
-    pretty_print_list(list)
-  end
-
-  defp pretty_print_list([]), do: shell_info("")
-
-  defp pretty_print_list([{a, o} | rest])
-       when (is_binary(a) or is_number(a)) and is_binary(o) do
-    shell_info("  {#{a}, #{o}}")
-    pretty_print_list(rest)
-  end
-
-  defp pretty_print_list([{u, a, o} | rest])
-       when is_binary(a) and is_binary(u) and is_binary(o) do
-    shell_info("  {#{u}, #{a}, #{o}}")
-    pretty_print_list(rest)
-  end
-
-  defp pretty_print_list([e | rest]) when is_binary(e) do
-    shell_info("  #{e}")
-    pretty_print_list(rest)
-  end
-
-  defp pretty_print_list([e | rest]), do: pretty_print_list([inspect(e) | rest])
-
-  defp map_raw_id_apid_tuple(res) do
-    user_prefix = local_id_prefix() <> "users/"
-
-    Enum.map(res.rows, fn
-      [uid, aid, oid] ->
-        {
-          String.replace_prefix(uid, user_prefix, ""),
-          FlakeId.to_string(aid),
-          oid
-        }
-    end)
-  end
-end
--- a/lib/mix/tasks/pleroma/user.ex
+++ b/lib/mix/tasks/pleroma/user.ex
@ -114,7 +114,7 @@ def run(["reset_password", nickname]) do
         {:ok, token} <- Pleroma.PasswordResetToken.create_token(user) do
      shell_info("Generated password reset token for #{user.nickname}")

-      shell_info("URL: #{~p[/api/v1/pleroma/password_reset/#{token.token}]}")
+      IO.puts("URL: #{~p[/api/v1/pleroma/password_reset/#{token.token}]}")
    else
      _ ->
        shell_error("No local user #{nickname}")
@ -301,7 +301,7 @@ def run(["invite" | rest]) do
      shell_info("Generated user invite token " <> String.replace(invite.invite_type, "_", " "))

      url = url(~p[/registration/#{invite.token}])
-      shell_info(url)
+      IO.puts(url)
    else
      error ->
        shell_error("Could not create invite token: #{inspect(error)}")
@ -373,7 +373,7 @@ def run(["show", nickname]) do
      nickname
      |> User.get_cached_by_nickname()

-    shell_info(user)
+    shell_info("#{inspect(user)}")
  end

  def run(["send_confirmation", nickname]) do
@ -457,7 +457,7 @@ def run(["blocking", nickname]) do

    with %User{local: true} = user <- User.get_cached_by_nickname(nickname) do
      blocks = User.following_ap_ids(user)
-      shell_info(blocks)
+      IO.puts("#{inspect(blocks)}")
    end
  end

@ -516,12 +516,12 @@ def run(["fix_follow_state", local_user, remote_user]) do
           {:follow_data, Pleroma.Web.ActivityPub.Utils.fetch_latest_follow(local, remote)} do
      calculated_state = User.following?(local, remote)

-      shell_info(
+      IO.puts(
        "Request state is #{request_state}, vs calculated state of following=#{calculated_state}"
      )

      if calculated_state == false && request_state == "accept" do
-        shell_info("Discrepancy found, fixing")
+        IO.puts("Discrepancy found, fixing")
        Pleroma.Web.CommonAPI.reject_follow_request(local, remote)
        shell_info("Relationship fixed")
      else
@ -551,14 +551,14 @@ defp refetch_public_keys(query) do
    |> Stream.each(fn users ->
      users
      |> Enum.each(fn user ->
-        shell_info("Re-Resolving: #{user.ap_id}")
+        IO.puts("Re-Resolving: #{user.ap_id}")

        with {:ok, user} <- Pleroma.User.fetch_by_ap_id(user.ap_id),
             changeset <- Pleroma.User.update_changeset(user),
             {:ok, _user} <- Pleroma.User.update_and_set_cache(changeset) do
          :ok
        else
-          error -> shell_info("Could not resolve: #{user.ap_id}, #{inspect(error)}")
+          error -> IO.puts("Could not resolve: #{user.ap_id}, #{inspect(error)}")
        end
      end)
    end)
--- a/lib/pleroma/activity.ex
+++ b/lib/pleroma/activity.ex
@ -258,27 +258,6 @@ def get_create_by_object_ap_id(ap_id) when is_binary(ap_id) do

  def get_create_by_object_ap_id(_), do: nil

-  @doc """
-  Accepts a list of `ap__id`.
-  Returns a query yielding Create activities for the given objects,
-  in the same order as they were specified in the input list.
-  """
-  @spec get_presorted_create_by_object_ap_id([String.t()]) :: Ecto.Queryable.t()
-  def get_presorted_create_by_object_ap_id(ap_ids) do
-    from(
-      a in Activity,
-      join:
-        ids in fragment(
-          "SELECT * FROM UNNEST(?::text[]) WITH ORDINALITY AS ids(ap_id, ord)",
-          ^ap_ids
-        ),
-      on:
-        ids.ap_id == fragment("?->>'object'", a.data) and
-          fragment("?->>'type'", a.data) == "Create",
-      order_by: [asc: ids.ord]
-    )
-  end
-
  @doc """
  Accepts `ap_id` or list of `ap_id`.
  Returns a query.
--- a/lib/pleroma/activity/html.ex
+++ b/lib/pleroma/activity/html.ex
@ -28,7 +28,7 @@ defp get_cache_keys_for(activity_id) do
    end
  end

-  def add_cache_key_for(activity_id, additional_key) do
+  defp add_cache_key_for(activity_id, additional_key) do
    current = get_cache_keys_for(activity_id)

    unless additional_key in current do
--- a/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@ -95,17 +95,34 @@ def start(_type, _args) do

    opts = [strategy: :one_for_one, name: Pleroma.Supervisor, max_restarts: max_restarts]

-    case Supervisor.start_link(children, opts) do
-      {:ok, data} ->
+    with {:ok, data} <- Supervisor.start_link(children, opts) do
+      set_postgres_server_version()
      {:ok, data}
-
+    else
      e ->
-        Logger.critical("Failed to start!")
-        Logger.critical("#{inspect(e)}")
+        Logger.error("Failed to start!")
+        Logger.error("#{inspect(e)}")
        e
    end
  end

+  defp set_postgres_server_version do
+    version =
+      with %{rows: [[version]]} <- Ecto.Adapters.SQL.query!(Pleroma.Repo, "show server_version"),
+           {num, _} <- Float.parse(version) do
+        num
+      else
+        e ->
+          Logger.warning(
+            "Could not get the postgres version: #{inspect(e)}.\nSetting the default value of 9.6"
+          )
+
+          9.6
+      end
+
+    :persistent_term.put({Pleroma.Repo, :postgres_version}, version)
+  end
+
  def load_custom_modules do
    dir = Config.get([:modules, :runtime_dir])

@ -162,9 +179,7 @@ defp cachex_children do
      build_cachex("translations", default_ttl: :timer.hours(24 * 30), limit: 2500),
      build_cachex("instances", default_ttl: :timer.hours(24), ttl_interval: 1000, limit: 2500),
      build_cachex("request_signatures", default_ttl: :timer.hours(24 * 30), limit: 3000),
-      build_cachex("rel_me", default_ttl: :timer.hours(24 * 30), limit: 300),
-      build_cachex("host_meta", default_ttl: :timer.minutes(120), limit: 5000),
-      build_cachex("http_backoff", default_ttl: :timer.hours(24 * 30), limit: 10000)
+      build_cachex("rel_me", default_ttl: :timer.hours(24 * 30), limit: 300)
    ]
  end

@ -264,9 +279,7 @@ def limiters_setup do
  defp http_children do
    proxy_url = Config.get([:http, :proxy_url])
    proxy = Pleroma.HTTP.AdapterHelper.format_proxy(proxy_url)
-    pool_size = Config.get([:http, :pool_size], 10)
-    pool_timeout = Config.get([:http, :pool_timeout], 60_000)
-    connection_timeout = Config.get([:http, :conn_max_idle_time], 10_000)
+    pool_size = Config.get([:http, :pool_size])

    :public_key.cacerts_load()

@ -275,9 +288,6 @@ defp http_children do
      |> Config.get([])
      |> Pleroma.HTTP.AdapterHelper.add_pool_size(pool_size)
      |> Pleroma.HTTP.AdapterHelper.maybe_add_proxy_pool(proxy)
-      |> Pleroma.HTTP.AdapterHelper.ensure_ipv6()
-      |> Pleroma.HTTP.AdapterHelper.add_default_conn_max_idle_time(connection_timeout)
-      |> Pleroma.HTTP.AdapterHelper.add_default_pool_max_idle_time(pool_timeout)
      |> Keyword.put(:name, MyFinch)

    [{Finch, config}]
--- a/lib/pleroma/application_requirements.ex
+++ b/lib/pleroma/application_requirements.ex
@ -164,8 +164,7 @@ defp do_check_rum!(setting, migrate) do

  defp check_system_commands!(:ok) do
    filter_commands_statuses = [
-      check_filter(Pleroma.Upload.Filter.Exiftool.StripMetadata, "exiftool"),
-      check_filter(Pleroma.Upload.Filter.Exiftool.ReadDescription, "exiftool"),
+      check_filter(Pleroma.Upload.Filter.Exiftool, "exiftool"),
      check_filter(Pleroma.Upload.Filter.Mogrify, "mogrify"),
      check_filter(Pleroma.Upload.Filter.Mogrifun, "mogrify"),
      check_filter(Pleroma.Upload.Filter.AnalyzeMetadata, "mogrify"),
--- a/lib/pleroma/collections/fetcher.ex
+++ b/lib/pleroma/collections/fetcher.ex
@ -68,10 +68,7 @@ defp fetch_page_items(id, items \\ []) do
          items
        end
      else
-        {:error, :not_found} ->
-          items
-
-        {:error, :forbidden} ->
+        {:error, {"Object has been deleted", _, _}} ->
          items

        {:error, error} ->
--- a/lib/pleroma/config/deprecation_warnings.ex
+++ b/lib/pleroma/config/deprecation_warnings.ex
@ -22,43 +22,6 @@ defmodule Pleroma.Config.DeprecationWarnings do
     "\n* `config :pleroma, :instance, :quarantined_instances` is now covered by `:pleroma, :mrf_simple, :reject`"}
  ]

-  def check_exiftool_filter do
-    filters = Config.get([Pleroma.Upload]) |> Keyword.get(:filters, [])
-
-    if Pleroma.Upload.Filter.Exiftool in filters do
-      Logger.warning("""
-      !!!DEPRECATION WARNING!!!
-      Your config is using Exiftool as a filter instead of Exiftool.StripMetadata. This should work for now, but you are advised to change to the new configuration to prevent possible issues later:
-
-      ```
-      config :pleroma, Pleroma.Upload,
-        filters: [Pleroma.Upload.Filter.Exiftool]
-      ```
-
-      Is now
-
-
-      ```
-      config :pleroma, Pleroma.Upload,
-        filters: [Pleroma.Upload.Filter.Exiftool.StripMetadata]
-      ```
-      """)
-
-      new_config =
-        filters
-        |> Enum.map(fn
-          Pleroma.Upload.Filter.Exiftool -> Pleroma.Upload.Filter.Exiftool.StripMetadata
-          filter -> filter
-        end)
-
-      Config.put([Pleroma.Upload, :filters], new_config)
-
-      :error
-    else
-      :ok
-    end
-  end
-
  def check_simple_policy_tuples do
    has_strings =
      Config.get([:mrf_simple])
@ -219,10 +182,7 @@ def warn do
      check_quarantined_instances_tuples(),
      check_transparency_exclusions_tuples(),
      check_simple_policy_tuples(),
-      check_http_adapter(),
-      check_uploader_base_url_set(),
-      check_uploader_base_url_is_not_base_domain(),
-      check_exiftool_filter()
+      check_http_adapter()
    ]
    |> Enum.reduce(:ok, fn
      :ok, :ok -> :ok
@ -377,54 +337,4 @@ def check_uploders_s3_public_endpoint do
      :ok
    end
  end
-
-  def check_uploader_base_url_set() do
-    uses_local_uploader? = Config.get([Pleroma.Upload, :uploader]) == Pleroma.Uploaders.Local
-    base_url = Pleroma.Config.get([Pleroma.Upload, :base_url])
-
-    if base_url || !uses_local_uploader? do
-      :ok
-    else
-      Logger.error("""
-      !!!WARNING!!!
-      Your config does not specify a base_url for uploads!
-      Please make the following change:\n
-      \n* `config :pleroma, Pleroma.Upload, base_url: "https://example.com/media/`
-      \n
-      \nPlease note that it is HEAVILY recommended to use a subdomain to host user-uploaded media!
-      """)
-
-      # This is a hard exit - the uploader will not work without a base_url
-      raise ArgumentError, message: "No base_url set for uploads - please set one in your config!"
-    end
-  end
-
-  def check_uploader_base_url_is_not_base_domain() do
-    uses_local_uploader? = Config.get([Pleroma.Upload, :uploader]) == Pleroma.Uploaders.Local
-
-    uploader_host =
-      [Pleroma.Upload, :base_url]
-      |> Pleroma.Config.get()
-      |> URI.parse()
-      |> Map.get(:host)
-
-    akkoma_host =
-      [Pleroma.Web.Endpoint, :url]
-      |> Pleroma.Config.get()
-      |> Keyword.get(:host)
-
-    if uploader_host == akkoma_host && uses_local_uploader? do
-      Logger.error("""
-      !!!WARNING!!!
-      Your Akkoma Host and your Upload base_url's host are the same!
-      This can potentially be insecure!
-
-      It is HIGHLY recommended that you migrate your media uploads
-      to a subdomain at your earliest convenience
-      """)
-    end
-
-    # This isn't actually an error condition, just a warning
-    :ok
-  end
 end
--- a/lib/pleroma/config/transfer_task.ex
+++ b/lib/pleroma/config/transfer_task.ex
@ -24,6 +24,7 @@ defp reboot_time_keys,
  defp reboot_time_subkeys,
    do: [
      {:pleroma, Pleroma.Captcha, [:seconds_valid]},
+      {:pleroma, Pleroma.Upload, [:proxy_remote]},
      {:pleroma, :instance, [:upload_limit]},
      {:pleroma, :http, [:pool_size]},
      {:pleroma, :http, [:proxy_url]}
--- a/lib/pleroma/constants.ex
+++ b/lib/pleroma/constants.ex
@ -64,7 +64,4 @@ defmodule Pleroma.Constants do
      "Service"
    ]
  )
-
-  # Internally used as top-level types for media attachments and user images
-  const(attachment_types, do: ["Document", "Image"])
 end
--- a/lib/pleroma/emoji/pack.ex
+++ b/lib/pleroma/emoji/pack.ex
@ -26,37 +26,12 @@ defmodule Pleroma.Emoji.Pack do
  alias Pleroma.Emoji.Pack
  alias Pleroma.Utils

-  # Invalid/Malicious names are supposed to be filtered out before path joining,
-  # but there are many entrypoints to affected functions so as the code changes
-  # we might accidentally let an unsanitised name slip through.
-  # To make sure, use the below which crash the process otherwise.
-
-  # ALWAYS use this when constructing paths from external name!
-  # (name meaning it must be only a single path component)
-  defp path_join_name_safe(dir, name) do
-    if to_string(name) != Path.basename(name) or name in ["..", ".", ""] do
-      raise "Invalid or malicious pack name: #{name}"
-    else
-      Path.join(dir, name)
-    end
-  end
-
-  # ALWAYS use this to join external paths
-  # (which are allowed to have several components)
-  defp path_join_safe(dir, path) do
-    {:ok, safe_path} = Path.safe_relative(path)
-    Path.join(dir, safe_path)
-  end
-
  @spec create(String.t()) :: {:ok, t()} | {:error, File.posix()} | {:error, :empty_values}
  def create(name) do
    with :ok <- validate_not_empty([name]),
-         dir <- path_join_name_safe(emoji_path(), name),
+         dir <- Path.join(emoji_path(), name),
         :ok <- File.mkdir(dir) do
-      save_pack(%__MODULE__{
-        path: dir,
-        pack_file: Path.join(dir, "pack.json")
-      })
+      save_pack(%__MODULE__{pack_file: Path.join(dir, "pack.json")})
    end
  end

@ -90,7 +65,7 @@ def show(opts) do
          {:ok, [binary()]} | {:error, File.posix(), binary()} | {:error, :empty_values}
  def delete(name) do
    with :ok <- validate_not_empty([name]),
-         pack_path <- path_join_name_safe(emoji_path(), name) do
+         pack_path <- Path.join(emoji_path(), name) do
      File.rm_rf(pack_path)
    end
  end
@ -114,7 +89,7 @@ defp unpack_zip_emojies(zip_files) do
    end)
  end

-  @spec add_file(t(), String.t(), Path.t(), Plug.Upload.t() | binary()) ::
+  @spec add_file(t(), String.t(), Path.t(), Plug.Upload.t()) ::
          {:ok, t()}
          | {:error, File.posix() | atom()}
  def add_file(%Pack{} = pack, _, _, %Plug.Upload{content_type: "application/zip"} = file) do
@ -125,14 +100,14 @@ def add_file(%Pack{} = pack, _, _, %Plug.Upload{content_type: "application/zip"}
        {:ok, _emoji_files} =
          :zip.unzip(
            to_charlist(file.path),
-            [{:file_list, Enum.map(emojies, & &1[:path])}, {:cwd, to_charlist(tmp_dir)}]
+            [{:file_list, Enum.map(emojies, & &1[:path])}, {:cwd, tmp_dir}]
          )

        {_, updated_pack} =
          Enum.map_reduce(emojies, pack, fn item, emoji_pack ->
            emoji_file = %Plug.Upload{
              filename: item[:filename],
-              path: path_join_safe(tmp_dir, item[:path])
+              path: Path.join(tmp_dir, item[:path])
            }

            {:ok, updated_pack} =
@ -162,14 +137,6 @@ def add_file(%Pack{} = pack, _, _, %Plug.Upload{content_type: "application/zip"}
  end

  def add_file(%Pack{} = pack, shortcode, filename, %Plug.Upload{} = file) do
-    try_add_file(pack, shortcode, filename, file)
-  end
-
-  def add_file(%Pack{} = pack, shortcode, filename, filedata) when is_binary(filedata) do
-    try_add_file(pack, shortcode, filename, filedata)
-  end
-
-  defp try_add_file(%Pack{} = pack, shortcode, filename, file) do
    with :ok <- validate_not_empty([shortcode, filename]),
         :ok <- validate_emoji_not_exists(shortcode),
         {:ok, updated_pack} <- do_add_file(pack, shortcode, filename, file) do
@ -222,7 +189,6 @@ def import_from_filesystem do
         {:ok, results} <- File.ls(emoji_path) do
      names =
        results
-        # items come from File.ls, thus safe
        |> Enum.map(&Path.join(emoji_path, &1))
        |> Enum.reject(fn path ->
          File.dir?(path) and File.exists?(Path.join(path, "pack.json"))
@ -321,8 +287,8 @@ def update_metadata(name, data) do

  @spec load_pack(String.t()) :: {:ok, t()} | {:error, :file.posix()}
  def load_pack(name) do
-    pack_dir = path_join_name_safe(emoji_path(), name)
-    pack_file = Path.join(pack_dir, "pack.json")
+    name = Path.basename(name)
+    pack_file = Path.join([emoji_path(), name, "pack.json"])

    with {:ok, _} <- File.stat(pack_file),
         {:ok, pack_data} <- File.read(pack_file) do
@ -446,13 +412,7 @@ defp downloadable?(pack) do
  end

  defp create_archive_and_cache(pack, hash) do
-    files = [
-      ~c"pack.json"
-      | Enum.map(pack.files, fn {_, file} ->
-          {:ok, file} = Path.safe_relative(file)
-          to_charlist(file)
-        end)
-    ]
+    files = [~c"pack.json" | Enum.map(pack.files, fn {_, file} -> to_charlist(file) end)]

    {:ok, {_, result}} =
      :zip.zip(~c"#{pack.name}.zip", files, [:memory, cwd: to_charlist(pack.path)])
@ -514,7 +474,7 @@ defp validate_not_empty(list) do
  end

  defp save_file(%Plug.Upload{path: upload_path}, pack, filename) do
-    file_path = path_join_safe(pack.path, filename)
+    file_path = Path.join(pack.path, filename)
    create_subdirs(file_path)

    with {:ok, _} <- File.copy(upload_path, file_path) do
@ -522,12 +482,6 @@ defp save_file(%Plug.Upload{path: upload_path}, pack, filename) do
    end
  end

-  defp save_file(file_data, pack, filename) when is_binary(file_data) do
-    file_path = path_join_safe(pack.path, filename)
-    create_subdirs(file_path)
-    File.write(file_path, file_data, [:binary])
-  end
-
  defp put_emoji(pack, shortcode, filename) do
    files = Map.put(pack.files, shortcode, filename)
    %{pack | files: files, files_count: length(Map.keys(files))}
@ -539,8 +493,8 @@ defp delete_emoji(pack, shortcode) do
  end

  defp rename_file(pack, filename, new_filename) do
-    old_path = path_join_safe(pack.path, filename)
-    new_path = path_join_safe(pack.path, new_filename)
+    old_path = Path.join(pack.path, filename)
+    new_path = Path.join(pack.path, new_filename)
    create_subdirs(new_path)

    with :ok <- File.rename(old_path, new_path) do
@ -558,7 +512,7 @@ defp create_subdirs(file_path) do

  defp remove_file(pack, shortcode) do
    with {:ok, filename} <- get_filename(pack, shortcode),
-         emoji <- path_join_safe(pack.path, filename),
+         emoji <- Path.join(pack.path, filename),
         :ok <- File.rm(emoji) do
      remove_dir_if_empty(emoji, filename)
    end
@ -576,7 +530,7 @@ defp remove_dir_if_empty(emoji, filename) do

  defp get_filename(pack, shortcode) do
    with %{^shortcode => filename} when is_binary(filename) <- pack.files,
-         file_path <- path_join_safe(pack.path, filename),
+         file_path <- Path.join(pack.path, filename),
         {:ok, _} <- File.stat(file_path) do
      {:ok, filename}
    else
@ -614,7 +568,7 @@ defp validate_downloadable(pack) do
  end

  defp copy_as(remote_pack, local_name) do
-    path = path_join_name_safe(emoji_path(), local_name)
+    path = Path.join(emoji_path(), local_name)

    %__MODULE__{
      name: local_name,
--- a/lib/pleroma/frontend.ex
+++ b/lib/pleroma/frontend.ex
@ -79,10 +79,6 @@ def unzip(zip, dest) do

        new_file_path = Path.join(dest, path)

-        new_file_path
-        |> Path.dirname()
-        |> File.rm()
-
        new_file_path
        |> Path.dirname()
        |> File.mkdir_p!()
--- a/lib/pleroma/html.ex
+++ b/lib/pleroma/html.ex
@ -6,6 +6,8 @@ defmodule Pleroma.HTML do
  # Scrubbers are compiled on boot so they can be configured in OTP releases
  #  @on_load :compile_scrubbers

+  @cachex Pleroma.Config.get([:cachex, :provider], Cachex)
+
  def compile_scrubbers do
    dir = Path.join(:code.priv_dir(:pleroma), "scrubbers")

@ -65,9 +67,22 @@ def ensure_scrubbed_html(
    end
  end

-  @spec extract_first_external_url_from_object(Pleroma.Object.t()) :: String.t() | nil
-  def extract_first_external_url_from_object(%{data: %{"content" => content}})
+  def extract_first_external_url_from_object(%{data: %{"content" => content}} = object)
      when is_binary(content) do
+    unless object.data["fake"] do
+      key = "URL|#{object.id}"
+
+      @cachex.fetch!(:scrubber_cache, key, fn _key ->
+        {:commit, {:ok, extract_first_external_url(content)}}
+      end)
+    else
+      {:ok, extract_first_external_url(content)}
+    end
+  end
+
+  def extract_first_external_url_from_object(_), do: {:error, :no_content}
+
+  def extract_first_external_url(content) do
    content
    |> Floki.parse_fragment!()
    |> Floki.find("a:not(.mention,.hashtag,.attachment,[rel~=\"tag\"])")
@ -75,6 +90,4 @@ def extract_first_external_url_from_object(%{data: %{"content" => content}})
    |> Floki.attribute("href")
    |> Enum.at(0)
  end
-
-  def extract_first_external_url_from_object(_), do: nil
 end
--- a/lib/pleroma/http.ex
+++ b/lib/pleroma/http.ex
@ -74,12 +74,7 @@ def request(method, url, body, headers, options) when is_binary(url) do
    request = build_request(method, headers, options, url, body, params)
    client = Tesla.client([Tesla.Middleware.FollowRedirects, Tesla.Middleware.Telemetry])

-    Logger.debug("Outbound: #{method} #{url}")
    request(client, request)
-  rescue
-    e ->
-      Logger.error("Failed to fetch #{url}: #{inspect(e)}")
-      {:error, :fetch_error}
  end

  @spec request(Client.t(), keyword()) :: {:ok, Env.t()} | {:error, any()}
--- a/lib/pleroma/http/adapter_helper.ex
+++ b/lib/pleroma/http/adapter_helper.ex
@ -65,15 +65,6 @@ def add_pool_size(opts, pool_size) do
    |> put_in([:pools, :default, :size], pool_size)
  end

-  def ensure_ipv6(opts) do
-    # Default transport opts already enable IPv6, so just ensure they're loaded
-    opts
-    |> maybe_add_pools()
-    |> maybe_add_default_pool()
-    |> maybe_add_conn_opts()
-    |> maybe_add_transport_opts()
-  end
-
  defp maybe_add_pools(opts) do
    if Keyword.has_key?(opts, :pools) do
      opts
@ -105,29 +96,11 @@ defp maybe_add_conn_opts(opts) do
  defp maybe_add_transport_opts(opts) do
    transport_opts = get_in(opts, [:pools, :default, :conn_opts, :transport_opts])

-    opts =
    unless is_nil(transport_opts) do
      opts
    else
      put_in(opts, [:pools, :default, :conn_opts, :transport_opts], [])
    end
-
-    # IPv6 is disabled and IPv4 enabled by default; ensure we can use both
-    put_in(opts, [:pools, :default, :conn_opts, :transport_opts, :inet6], true)
-  end
-
-  def add_default_pool_max_idle_time(opts, pool_timeout) do
-    opts
-    |> maybe_add_pools()
-    |> maybe_add_default_pool()
-    |> put_in([:pools, :default, :pool_max_idle_time], pool_timeout)
-  end
-
-  def add_default_conn_max_idle_time(opts, connection_timeout) do
-    opts
-    |> maybe_add_pools()
-    |> maybe_add_default_pool()
-    |> put_in([:pools, :default, :conn_max_idle_time], connection_timeout)
  end

  @doc """
--- a/lib/pleroma/http/backoff.ex
+++ b/lib/pleroma/http/backoff.ex
@ -1,121 +0,0 @@
-defmodule Pleroma.HTTP.Backoff do
-  alias Pleroma.HTTP
-  require Logger
-
-  @cachex Pleroma.Config.get([:cachex, :provider], Cachex)
-  @backoff_cache :http_backoff_cache
-
-  # attempt to parse a timestamp from a header
-  # returns nil if it can't parse the timestamp
-  @spec timestamp_or_nil(binary) :: DateTime.t() | nil
-  defp timestamp_or_nil(header) do
-    case DateTime.from_iso8601(header) do
-      {:ok, stamp, _} ->
-        stamp
-
-      _ ->
-        nil
-    end
-  end
-
-  # attempt to parse the x-ratelimit-reset header from the headers
-  @spec x_ratelimit_reset(headers :: list) :: DateTime.t() | nil
-  defp x_ratelimit_reset(headers) do
-    with {_header, value} <- List.keyfind(headers, "x-ratelimit-reset", 0),
-         true <- is_binary(value) do
-      timestamp_or_nil(value)
-    else
-      _ ->
-        nil
-    end
-  end
-
-  # attempt to parse the Retry-After header from the headers
-  # this can be either a timestamp _or_ a number of seconds to wait!
-  # we'll return a datetime if we can parse it, or nil if we can't
-  @spec retry_after(headers :: list) :: DateTime.t() | nil
-  defp retry_after(headers) do
-    with {_header, value} <- List.keyfind(headers, "retry-after", 0),
-         true <- is_binary(value) do
-      # first, see if it's an integer
-      case Integer.parse(value) do
-        {seconds, ""} ->
-          Logger.debug("Parsed Retry-After header: #{seconds} seconds")
-          DateTime.utc_now() |> Timex.shift(seconds: seconds)
-
-        _ ->
-          # if it's not an integer, try to parse it as a timestamp
-          timestamp_or_nil(value)
-      end
-    else
-      _ ->
-        nil
-    end
-  end
-
-  # given a set of headers, will attempt to find the next backoff timestamp
-  # if it can't find one, it will default to 5 minutes from now
-  @spec next_backoff_timestamp(%{headers: list}) :: DateTime.t()
-  defp next_backoff_timestamp(%{headers: headers}) when is_list(headers) do
-    default_5_minute_backoff =
-      DateTime.utc_now()
-      |> Timex.shift(seconds: 5 * 60)
-
-    backoff =
-      [&x_ratelimit_reset/1, &retry_after/1]
-      |> Enum.map(& &1.(headers))
-      |> Enum.find(&(&1 != nil))
-
-    if is_nil(backoff) do
-      Logger.debug("No backoff headers found, defaulting to 5 minutes from now")
-      default_5_minute_backoff
-    else
-      Logger.debug("Found backoff header, will back off until: #{backoff}")
-      backoff
-    end
-  end
-
-  defp next_backoff_timestamp(_), do: DateTime.utc_now() |> Timex.shift(seconds: 5 * 60)
-
-  # utility function to check the HTTP response for potential backoff headers
-  # will check if we get a 429 or 503 response, and if we do, will back off for a bit
-  @spec check_backoff({:ok | :error, HTTP.Env.t()}, binary()) ::
-          {:ok | :error, HTTP.Env.t()} | {:error, :ratelimit}
-  defp check_backoff({:ok, env}, host) do
-    case env.status do
-      status when status in [429, 503] ->
-        Logger.error("Rate limited on #{host}! Backing off...")
-        timestamp = next_backoff_timestamp(env)
-        ttl = Timex.diff(timestamp, DateTime.utc_now(), :seconds)
-        # we will cache the host for 5 minutes
-        @cachex.put(@backoff_cache, host, true, ttl: ttl)
-        {:error, :ratelimit}
-
-      _ ->
-        {:ok, env}
-    end
-  end
-
-  defp check_backoff(env, _), do: env
-
-  @doc """
-  this acts as a single throughput for all GET requests
-  we will check if the host is in the cache, and if it is, we will automatically fail the request
-  this ensures that we don't hammer the server with requests, and instead wait for the backoff to expire
-  this is a very simple implementation, and can be improved upon!
-  """
-  @spec get(binary, list, list) :: {:ok | :error, HTTP.Env.t()} | {:error, :ratelimit}
-  def get(url, headers \\ [], options \\ []) do
-    %{host: host} = URI.parse(url)
-
-    case @cachex.get(@backoff_cache, host) do
-      {:ok, nil} ->
-        url
-        |> HTTP.get(headers, options)
-        |> check_backoff(host)
-
-      _ ->
-        {:error, :ratelimit}
-    end
-  end
-end
--- a/lib/pleroma/keys.ex
+++ b/lib/pleroma/keys.ex
@ -0,0 +1,46 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Pleroma.Keys do
+  # Native generation of RSA keys is only available since OTP 20+ and in default build conditions
+  # We try at compile time to generate natively an RSA key otherwise we fallback on the old way.
+  try do
+    _ = :public_key.generate_key({:rsa, 2048, 65_537})
+
+    def generate_rsa_pem do
+      key = :public_key.generate_key({:rsa, 2048, 65_537})
+      entry = :public_key.pem_entry_encode(:RSAPrivateKey, key)
+      pem = :public_key.pem_encode([entry]) |> String.trim_trailing()
+      {:ok, pem}
+    end
+  rescue
+    _ ->
+      def generate_rsa_pem do
+        port = Port.open({:spawn, "openssl genrsa"}, [:binary])
+
+        {:ok, pem} =
+          receive do
+            {^port, {:data, pem}} -> {:ok, pem}
+          end
+
+        Port.close(port)
+
+        if Regex.match?(~r/RSA PRIVATE KEY/, pem) do
+          {:ok, pem}
+        else
+          :error
+        end
+      end
+  end
+
+  def keys_from_pem(pem) do
+    with [private_key_code] <- :public_key.pem_decode(pem),
+         private_key <- :public_key.pem_entry_decode(private_key_code),
+         {:RSAPrivateKey, _, modulus, exponent, _, _, _, _, _, _, _} <- private_key do
+      {:ok, private_key, {:RSAPublicKey, modulus, exponent}}
+    else
+      error -> {:error, error}
+    end
+  end
+end
--- a/lib/pleroma/object.ex
+++ b/lib/pleroma/object.ex
@ -178,10 +178,7 @@ def normalize(ap_id, options) when is_binary(ap_id) do
        ap_id

      Keyword.get(options, :fetch) ->
-        case Fetcher.fetch_object_from_id(ap_id, options) do
-          {:ok, object} -> object
-          _ -> nil
-        end
+        Fetcher.fetch_object_from_id!(ap_id, options)

      true ->
        get_cached_by_ap_id(ap_id)
--- a/lib/pleroma/object/containment.ex
+++ b/lib/pleroma/object/containment.ex
@ -11,7 +11,6 @@ defmodule Pleroma.Object.Containment do
  Object containment is an important step in validating remote objects to prevent
  spoofing, therefore removal of object containment functions is NOT recommended.
  """
-
  def get_actor(%{"actor" => actor}) when is_binary(actor) do
    actor
  end
@ -48,54 +47,6 @@ def get_object(_) do
  defp compare_uris(%URI{host: host} = _id_uri, %URI{host: host} = _other_uri), do: :ok
  defp compare_uris(_id_uri, _other_uri), do: :error

-  defp uri_strip_slash(%URI{path: path} = uri) when is_binary(path),
-    do: %{uri | path: String.replace_suffix(path, "/", "")}
-
-  defp uri_strip_slash(uri), do: uri
-
-  # domain names are case-insensitive per spec (other parts of URIs aren’t necessarily)
-  defp uri_normalise_host(%URI{host: host} = uri) when is_binary(host),
-    do: %{uri | host: String.downcase(host, :ascii)}
-
-  defp uri_normalise_host(uri), do: uri
-
-  defp compare_uri_identities(uri, uri), do: :ok
-
-  defp compare_uri_identities(id_uri, other_uri) when is_binary(id_uri) and is_binary(other_uri),
-    do: compare_uri_identities(URI.parse(id_uri), URI.parse(other_uri))
-
-  defp compare_uri_identities(%URI{} = id, %URI{} = other) do
-    normid =
-      %{id | fragment: nil}
-      |> uri_strip_slash()
-      |> uri_normalise_host()
-
-    normother =
-      %{other | fragment: nil}
-      |> uri_strip_slash()
-      |> uri_normalise_host()
-
-    # Conversion back to binary avoids issues from non-normalised deprecated authority field
-    if URI.to_string(normid) == URI.to_string(normother) do
-      :ok
-    else
-      :error
-    end
-  end
-
-  @doc """
-  Checks whether an URL to fetch from is from the local server.
-
-  We never want to fetch from ourselves; if it’s not in the database
-  it can’t be authentic and must be a counterfeit.
-  """
-  def contain_local_fetch(id) do
-    case compare_uris(URI.parse(id), Pleroma.Web.Endpoint.struct_url()) do
-      :ok -> :error
-      _ -> :ok
-    end
-  end
-
  @doc """
  Checks that an imported AP object's actor matches the host it came from.
  """
@ -111,23 +62,8 @@ def contain_origin(id, %{"actor" => _actor} = params) do
  def contain_origin(id, %{"attributedTo" => actor} = params),
    do: contain_origin(id, Map.put(params, "actor", actor))

-  def contain_origin(_id, _data), do: :ok
+  def contain_origin(_id, _data), do: :error

-  @doc """
-  Check whether the fetch URL (after redirects) is the
-  same location the canonical ActivityPub id points to.
-
-  Since this is meant to be used for fetches, anonymous or transient objects are not accepted here.
-  """
-  def contain_id_to_fetch(url, %{"id" => id}) when is_binary(id) do
-    compare_uri_identities(url, id)
-  end
-
-  def contain_id_to_fetch(_url, _data), do: :error
-
-  @doc """
-  Check whether the object id is from the same host as another id
-  """
  def contain_origin_from_id(id, %{"id" => other_id} = _params) when is_binary(other_id) do
    id_uri = URI.parse(id)
    other_uri = URI.parse(other_id)
@ -149,12 +85,4 @@ def contain_child(%{"object" => %{"id" => id, "attributedTo" => _} = object}),
    do: contain_origin(id, object)

  def contain_child(_), do: :ok
-
-  @doc "Checks whether two URIs belong to the same domain"
-  def same_origin(id1, id2) do
-    uri1 = URI.parse(id1)
-    uri2 = URI.parse(id2)
-
-    compare_uris(uri1, uri2)
-  end
 end
--- a/lib/pleroma/object/fetcher.ex
+++ b/lib/pleroma/object/fetcher.ex
@ -18,16 +18,6 @@ defmodule Pleroma.Object.Fetcher do
  require Logger
  require Pleroma.Constants

-  @moduledoc """
-  This module deals with correctly fetching Acitivity Pub objects in a safe way.
-
-  The core function is `fetch_and_contain_remote_object_from_id/1` which performs
-  the actual fetch and common safety and authenticity checks. Other `fetch_*`
-  function use the former and perform some additional tasks
-  """
-
-  @mix_env Mix.env()
-
  defp touch_changeset(changeset) do
    updated_at =
      NaiveDateTime.utc_now()
@ -113,78 +103,54 @@ defp reinject_object(%Object{} = object, new_data) do
    end
  end

-  @doc "Assumes object already is in our database and refetches from remote to update (e.g. for polls)"
  def refetch_object(%Object{data: %{"id" => id}} = object) do
    with {:local, false} <- {:local, Object.local?(object)},
-         {:ok, new_data} <- fetch_and_contain_remote_object_from_id(id, true),
-         {:id, true} <- {:id, new_data["id"] == id},
+         {:ok, new_data} <- fetch_and_contain_remote_object_from_id(id),
         {:ok, object} <- reinject_object(object, new_data) do
      {:ok, object}
    else
      {:local, true} -> {:ok, object}
-      {:id, false} -> {:error, :id_mismatch}
      e -> {:error, e}
    end
  end

-  @doc """
-    Fetches a new object and puts it through the processing pipeline for inbound objects
-
-    Note: will also insert a fake Create activity, since atm we internally
-    need everything to be traced back to a Create activity.
-  """
+  # Note: will create a Create activity, which we need internally at the moment.
  def fetch_object_from_id(id, options \\ []) do
    with %URI{} = uri <- URI.parse(id),
         # let's check the URI is even vaguely valid first
-         {:valid_uri_scheme, true} <-
-           {:valid_uri_scheme, uri.scheme == "http" or uri.scheme == "https"},
+         {:scheme, true} <- {:scheme, uri.scheme == "http" or uri.scheme == "https"},
         # If we have instance restrictions, apply them here to prevent fetching from unwanted instances
-         {:mrf_reject_check, {:ok, nil}} <-
-           {:mrf_reject_check, Pleroma.Web.ActivityPub.MRF.SimplePolicy.check_reject(uri)},
-         {:mrf_accept_check, {:ok, _}} <-
-           {:mrf_accept_check, Pleroma.Web.ActivityPub.MRF.SimplePolicy.check_accept(uri)},
+         {:ok, nil} <- Pleroma.Web.ActivityPub.MRF.SimplePolicy.check_reject(uri),
+         {:ok, _} <- Pleroma.Web.ActivityPub.MRF.SimplePolicy.check_accept(uri),
         {_, nil} <- {:fetch_object, Object.get_cached_by_ap_id(id)},
         {_, true} <- {:allowed_depth, Federator.allowed_thread_distance?(options[:depth])},
         {_, {:ok, data}} <- {:fetch, fetch_and_contain_remote_object_from_id(id)},
         {_, nil} <- {:normalize, Object.normalize(data, fetch: false)},
         params <- prepare_activity_params(data),
+         {_, :ok} <- {:containment, Containment.contain_origin(id, params)},
         {_, {:ok, activity}} <-
           {:transmogrifier, Transmogrifier.handle_incoming(params, options)},
         {_, _data, %Object{} = object} <-
           {:object, data, Object.normalize(activity, fetch: false)} do
      {:ok, object}
    else
-      {:allowed_depth, false} = e ->
-        log_fetch_error(id, e)
-        {:error, :allowed_depth}
+      {:allowed_depth, false} ->
+        {:error, "Max thread distance exceeded."}

-      {:valid_uri_scheme, _} = e ->
-        log_fetch_error(id, e)
-        {:error, :invalid_uri_scheme}
+      {:scheme, false} ->
+        {:error, "URI Scheme Invalid"}

-      {:mrf_reject_check, _} = e ->
-        log_fetch_error(id, e)
-        {:reject, :mrf}
+      {:containment, _} ->
+        {:error, "Object containment failed."}

-      {:mrf_accept_check, _} = e ->
-        log_fetch_error(id, e)
-        {:reject, :mrf}
+      {:transmogrifier, {:error, {:reject, e}}} ->
+        {:reject, e}

-      {:containment, reason} = e ->
-        log_fetch_error(id, e)
-        {:error, reason}
+      {:transmogrifier, {:reject, e}} ->
+        {:reject, e}

-      {:transmogrifier, {:error, {:reject, reason}}} = e ->
-        log_fetch_error(id, e)
-        {:reject, reason}
-
-      {:transmogrifier, {:reject, reason}} = e ->
-        log_fetch_error(id, e)
-        {:reject, reason}
-
-      {:transmogrifier, reason} = e ->
-        log_fetch_error(id, e)
-        {:error, reason}
+      {:transmogrifier, _} = e ->
+        {:error, e}

      {:object, data, nil} ->
        reinject_object(%Object{}, data)
@ -195,21 +161,17 @@ def fetch_object_from_id(id, options \\ []) do
      {:fetch_object, %Object{} = object} ->
        {:ok, object}

-      {:fetch, {:error, reason}} = e ->
-        log_fetch_error(id, e)
-        {:error, reason}
+      {:fetch, {:error, error}} ->
+        {:error, error}
+
+      {:reject, reason} ->
+        {:reject, reason}

      e ->
-        log_fetch_error(id, e)
-        {:error, e}
+        e
    end
  end

-  defp log_fetch_error(id, error) do
-    Logger.metadata(object: id)
-    Logger.error("Object rejected while fetching #{id} #{inspect(error)}")
-  end
-
  defp prepare_activity_params(data) do
    %{
      "type" => "Create",
@ -223,6 +185,26 @@ defp prepare_activity_params(data) do
    |> Maps.put_if_present("bcc", data["bcc"])
  end

+  def fetch_object_from_id!(id, options \\ []) do
+    with {:ok, object} <- fetch_object_from_id(id, options) do
+      object
+    else
+      {:error, %Tesla.Mock.Error{}} ->
+        nil
+
+      {:error, {"Object has been deleted", _id, _code}} ->
+        nil
+
+      {:reject, reason} ->
+        Logger.debug("Rejected #{id} while fetching: #{inspect(reason)}")
+        nil
+
+      e ->
+        Logger.error("Error while fetching #{id}: #{inspect(e)}")
+        nil
+    end
+  end
+
  defp make_signature(id, date) do
    uri = URI.parse(id)

@ -253,71 +235,26 @@ defp maybe_date_fetch(headers, date) do
    end
  end

-  @doc """
-  Fetches arbitrary remote object and performs basic safety and authenticity checks.
-  When the fetch URL is known to already be a canonical AP id, checks are stricter.
-  """
-  def fetch_and_contain_remote_object_from_id(id, is_ap_id \\ false)
+  def fetch_and_contain_remote_object_from_id(id)

-  def fetch_and_contain_remote_object_from_id(%{"id" => id}, is_ap_id),
-    do: fetch_and_contain_remote_object_from_id(id, is_ap_id)
+  def fetch_and_contain_remote_object_from_id(%{"id" => id}),
+    do: fetch_and_contain_remote_object_from_id(id)

-  def fetch_and_contain_remote_object_from_id(id, is_ap_id) when is_binary(id) do
-    Logger.debug("Fetching object #{id} via AP [ap_id=#{is_ap_id}]")
+  def fetch_and_contain_remote_object_from_id(id) when is_binary(id) do
+    Logger.debug("Fetching object #{id} via AP")

-    with {:valid_uri_scheme, true} <- {:valid_uri_scheme, String.starts_with?(id, "http")},
-         %URI{} = uri <- URI.parse(id),
-         {:mrf_reject_check, {:ok, nil}} <-
-           {:mrf_reject_check, Pleroma.Web.ActivityPub.MRF.SimplePolicy.check_reject(uri)},
-         {:mrf_accept_check, {:ok, _}} <-
-           {:mrf_accept_check, Pleroma.Web.ActivityPub.MRF.SimplePolicy.check_accept(uri)},
-         {:local_fetch, :ok} <- {:local_fetch, Containment.contain_local_fetch(id)},
-         {:ok, final_id, body} <- get_object(id),
-         # a canonical ID shouldn't be a redirect
-         true <- !is_ap_id || final_id == id,
+    with {:scheme, true} <- {:scheme, String.starts_with?(id, "http")},
+         {:ok, body} <- get_object(id),
         {:ok, data} <- safe_json_decode(body),
-         {_, :ok} <- {:containment, Containment.contain_origin(final_id, data)},
-         {_, _, :ok} <- {:strict_id, data["id"], Containment.contain_id_to_fetch(final_id, data)} do
-      unless Instances.reachable?(final_id) do
-        Instances.set_reachable(final_id)
+         :ok <- Containment.contain_origin_from_id(id, data) do
+      unless Instances.reachable?(id) do
+        Instances.set_reachable(id)
      end

      {:ok, data}
    else
-      # E.g.  Mastodon and *key serve the AP object directly under their display URLs without
-      # redirecting to their canonical location first, thus ids will expectedly differ.
-      # Similarly keys, either use a fragment ID and are a subobjects or a distinct ID
-      # but for compatibility are still a subobject presenting their owning actors ID at the toplevel.
-      # Refetching _once_ from the listed id, should yield a strict match afterwards.
-      {:strict_id, ap_id, _} = e ->
-        case is_ap_id do
-          false ->
-            fetch_and_contain_remote_object_from_id(ap_id, true)
-
-          true ->
-            log_fetch_error(id, e)
-            {:error, :id_mismatch}
-        end
-
-      {:mrf_reject_check, _} = e ->
-        log_fetch_error(id, e)
-        {:reject, :mrf}
-
-      {:mrf_accept_check, _} = e ->
-        log_fetch_error(id, e)
-        {:reject, :mrf}
-
-      {:valid_uri_scheme, _} = e ->
-        log_fetch_error(id, e)
-        {:error, :invalid_uri_scheme}
-
-      {:local_fetch, _} = e ->
-        log_fetch_error(id, e)
-        {:error, :local_resource}
-
-      {:containment, reason} ->
-        log_fetch_error(id, reason)
-        {:error, {:containment, reason}}
+      {:scheme, _} ->
+        {:error, "Unsupported URI scheme"}

      {:error, e} ->
        {:error, e}
@ -327,74 +264,48 @@ def fetch_and_contain_remote_object_from_id(id, is_ap_id) when is_binary(id) do
    end
  end

-  def fetch_and_contain_remote_object_from_id(_id, _is_ap_id),
-    do: {:error, :invalid_id}
+  def fetch_and_contain_remote_object_from_id(_id),
+    do: {:error, "id must be a string"}

-  # HOPEFULLY TEMPORARY
-  # Basically none of our Tesla mocks in tests set the (supposed to
-  # exist for Tesla proper) url parameter for their responses
-  # causing almost every fetch in test to fail otherwise
-  if @mix_env == :test do
-    defp get_final_id(nil, initial_url), do: initial_url
-    defp get_final_id("", initial_url), do: initial_url
-  end
-
-  defp get_final_id(final_url, _intial_url) do
-    final_url
-  end
-
-  @doc "Do NOT use; only public for use in tests"
  def get_object(id) do
    date = Pleroma.Signature.signed_date()

    headers =
-      [
-        # The first is required by spec, the second provided as a fallback for buggy implementations
-        {"accept", "application/ld+json; profile=\"https://www.w3.org/ns/activitystreams\""},
-        {"accept", "application/activity+json"}
-      ]
+      [{"accept", "application/activity+json"}]
      |> maybe_date_fetch(date)
      |> sign_fetch(id, date)

-    with {:ok, %{body: body, status: code, headers: headers, url: final_url}}
-         when code in 200..299 <-
-           HTTP.Backoff.get(id, headers),
-         {:has_content_type, {_, content_type}} <-
-           {:has_content_type, List.keyfind(headers, "content-type", 0)},
-         {:parse_content_type, {:ok, "application", subtype, type_params}} <-
-           {:parse_content_type, Plug.Conn.Utils.media_type(content_type)} do
-      final_id = get_final_id(final_url, id)
+    case HTTP.get(id, headers) do
+      {:ok, %{body: body, status: code, headers: headers}} when code in 200..299 ->
+        case List.keyfind(headers, "content-type", 0) do
+          {_, content_type} ->
+            case Plug.Conn.Utils.media_type(content_type) do
+              {:ok, "application", "activity+json", _} ->
+                {:ok, body}

-      case {subtype, type_params} do
-        {"activity+json", _} ->
-          {:ok, final_id, body}
+              {:ok, "application", "ld+json",
+               %{"profile" => "https://www.w3.org/ns/activitystreams"}} ->
+                {:ok, body}

-        {"ld+json", %{"profile" => profiles}} ->
-          if "https://www.w3.org/ns/activitystreams" in String.split(profiles) do
-            {:ok, final_id, body}
-          else
-            {:error, {:content_type, content_type}}
-          end
+              # pixelfed sometimes (and only sometimes) responds with http instead of https
+              {:ok, "application", "ld+json",
+               %{"profile" => "http://www.w3.org/ns/activitystreams"}} ->
+                {:ok, body}

              _ ->
                {:error, {:content_type, content_type}}
            end
-    else
-      {:ok, %{status: code}} when code in [401, 403] ->
-        {:error, :forbidden}
+
+          _ ->
+            {:error, {:content_type, nil}}
+        end

      {:ok, %{status: code}} when code in [404, 410] ->
-        {:error, :not_found}
+        {:error, {"Object has been deleted", id, code}}

      {:error, e} ->
        {:error, e}

-      {:has_content_type, _} ->
-        {:error, {:content_type, nil}}
-
-      {:parse_content_type, e} ->
-        {:error, {:content_type, e}}
-
      e ->
        {:error, e}
    end
--- a/lib/pleroma/reverse_proxy.ex
+++ b/lib/pleroma/reverse_proxy.ex
@ -17,8 +17,6 @@ defmodule Pleroma.ReverseProxy do
  @failed_request_ttl :timer.seconds(60)
  @methods ~w(GET HEAD)

-  @allowed_mime_types Pleroma.Config.get([Pleroma.Upload, :allowed_mime_types], [])
-
  @cachex Pleroma.Config.get([:cachex, :provider], Cachex)

  def max_read_duration_default, do: @max_read_duration
@ -255,7 +253,6 @@ defp build_resp_headers(headers, opts) do
    headers
    |> Enum.filter(fn {k, _} -> k in @keep_resp_headers end)
    |> build_resp_cache_headers(opts)
-    |> sanitise_content_type()
    |> build_resp_content_disposition_header(opts)
    |> build_csp_headers()
    |> Keyword.merge(Keyword.get(opts, :resp_headers, []))
@ -285,21 +282,6 @@ defp build_resp_cache_headers(headers, _opts) do
    end
  end

-  defp sanitise_content_type(headers) do
-    original_ct = get_content_type(headers)
-
-    safe_ct =
-      Pleroma.Web.Plugs.Utils.get_safe_mime_type(
-        %{allowed_mime_types: @allowed_mime_types},
-        original_ct
-      )
-
-    [
-      {"content-type", safe_ct}
-      | Enum.filter(headers, fn {k, _v} -> k != "content-type" end)
-    ]
-  end
-
  defp build_resp_content_disposition_header(headers, opts) do
    opt = Keyword.get(opts, :inline_content_types, @inline_content_types)

--- a/lib/pleroma/scheduled_activity.ex
+++ b/lib/pleroma/scheduled_activity.ex
@ -28,7 +28,7 @@ defmodule Pleroma.ScheduledActivity do
    timestamps()
  end

-  defp changeset(%ScheduledActivity{} = scheduled_activity, attrs) do
+  def changeset(%ScheduledActivity{} = scheduled_activity, attrs) do
    scheduled_activity
    |> cast(attrs, [:scheduled_at, :params])
    |> validate_required([:scheduled_at, :params])
@ -40,36 +40,26 @@ defp with_media_attachments(
         %{changes: %{params: %{"media_ids" => media_ids} = params}} = changeset
       )
       when is_list(media_ids) do
-    user = User.get_by_id(changeset.data.user_id)
+    media_attachments = Utils.attachments_from_ids(%{media_ids: media_ids})

-    case Utils.attachments_from_ids(user, %{media_ids: media_ids}) do
-      media_attachments when is_list(media_attachments) ->
    params =
      params
      |> Map.put("media_attachments", media_attachments)
      |> Map.put("media_ids", media_ids)

    put_change(changeset, :params, params)
-
-      {:error, _} = e ->
-        e
-
-      e ->
-        {:error, e}
-    end
  end

  defp with_media_attachments(changeset), do: changeset

-  defp update_changeset(%ScheduledActivity{} = scheduled_activity, attrs) do
-    # note: should this ever allow swapping media attachments, make sure ownership is checked
+  def update_changeset(%ScheduledActivity{} = scheduled_activity, attrs) do
    scheduled_activity
    |> cast(attrs, [:scheduled_at])
    |> validate_required([:scheduled_at])
    |> validate_scheduled_at()
  end

-  defp validate_scheduled_at(changeset) do
+  def validate_scheduled_at(changeset) do
    validate_change(changeset, :scheduled_at, fn _, scheduled_at ->
      cond do
        not far_enough?(scheduled_at) ->
@ -87,7 +77,7 @@ defp validate_scheduled_at(changeset) do
    end)
  end

-  defp exceeds_daily_user_limit?(user_id, scheduled_at) do
+  def exceeds_daily_user_limit?(user_id, scheduled_at) do
    ScheduledActivity
    |> where(user_id: ^user_id)
    |> where([sa], type(sa.scheduled_at, :date) == type(^scheduled_at, :date))
@ -96,7 +86,7 @@ defp exceeds_daily_user_limit?(user_id, scheduled_at) do
    |> Kernel.>=(Config.get([ScheduledActivity, :daily_user_limit]))
  end

-  defp exceeds_total_user_limit?(user_id) do
+  def exceeds_total_user_limit?(user_id) do
    ScheduledActivity
    |> where(user_id: ^user_id)
    |> select([sa], count(sa.id))
@ -118,29 +108,20 @@ def far_enough?(scheduled_at) do
    diff > @min_offset
  end

-  defp new(%User{} = user, attrs) do
+  def new(%User{} = user, attrs) do
    changeset(%ScheduledActivity{user_id: user.id}, attrs)
  end

  @doc """
  Creates ScheduledActivity and add to queue to perform at scheduled_at date
  """
-  @spec create(User.t(), map()) :: {:ok, ScheduledActivity.t()} | {:error, any()}
+  @spec create(User.t(), map()) :: {:ok, ScheduledActivity.t()} | {:error, Ecto.Changeset.t()}
  def create(%User{} = user, attrs) do
-    case new(user, attrs) do
-      %Ecto.Changeset{} = sched_data ->
    Multi.new()
-        |> Multi.insert(:scheduled_activity, sched_data)
+    |> Multi.insert(:scheduled_activity, new(user, attrs))
    |> maybe_add_jobs(Config.get([ScheduledActivity, :enabled]))
    |> Repo.transaction()
    |> transaction_response
-
-      {:error, _} = e ->
-        e
-
-      e ->
-        {:error, e}
-    end
  end

  defp maybe_add_jobs(multi, true) do
@ -206,7 +187,17 @@ def for_user_query(%User{} = user) do
    |> where(user_id: ^user.id)
  end

-  defp job_query(scheduled_activity_id) do
+  def due_activities(offset \\ 0) do
+    naive_datetime =
+      NaiveDateTime.utc_now()
+      |> NaiveDateTime.add(offset, :millisecond)
+
+    ScheduledActivity
+    |> where([sa], sa.scheduled_at < ^naive_datetime)
+    |> Repo.all()
+  end
+
+  def job_query(scheduled_activity_id) do
    from(j in Oban.Job,
      where: j.queue == "scheduled_activities",
      where: fragment("args ->> 'activity_id' = ?::text", ^to_string(scheduled_activity_id))
--- a/lib/pleroma/search/database_search.ex
+++ b/lib/pleroma/search/database_search.ex
@ -21,12 +21,19 @@ def search(user, search_query, options \\ []) do
    offset = Keyword.get(options, :offset, 0)
    author = Keyword.get(options, :author)

+    search_function =
+      if :persistent_term.get({Pleroma.Repo, :postgres_version}) >= 11 do
+        :websearch
+      else
+        :plain
+      end
+
    try do
      Activity
      |> Activity.with_preloaded_object()
      |> Activity.restrict_deactivated_users()
      |> restrict_public()
-      |> query_with(index_type, search_query)
+      |> query_with(index_type, search_query, search_function)
      |> maybe_restrict_local(user)
      |> maybe_restrict_author(author)
      |> maybe_restrict_blocked(user)
@ -65,7 +72,25 @@ def restrict_public(q) do
    )
  end

-  defp query_with(q, :gin, search_query) do
+  defp query_with(q, :gin, search_query, :plain) do
+    %{rows: [[tsc]]} =
+      Ecto.Adapters.SQL.query!(
+        Pleroma.Repo,
+        "select current_setting('default_text_search_config')::regconfig::oid;"
+      )
+
+    from([a, o] in q,
+      where:
+        fragment(
+          "to_tsvector(?::oid::regconfig, ?->>'content') @@ plainto_tsquery(?)",
+          ^tsc,
+          o.data,
+          ^search_query
+        )
+    )
+  end
+
+  defp query_with(q, :gin, search_query, :websearch) do
    %{rows: [[tsc]]} =
      Ecto.Adapters.SQL.query!(
        Pleroma.Repo,
@ -83,7 +108,19 @@ defp query_with(q, :gin, search_query) do
    )
  end

-  defp query_with(q, :rum, search_query) do
+  defp query_with(q, :rum, search_query, :plain) do
+    from([a, o] in q,
+      where:
+        fragment(
+          "? @@ plainto_tsquery(?)",
+          o.fts_content,
+          ^search_query
+        ),
+      order_by: [fragment("? <=> now()::date", o.inserted_at)]
+    )
+  end
+
+  defp query_with(q, :rum, search_query, :websearch) do
    from([a, o] in q,
      where:
        fragment(
--- a/lib/pleroma/search/meilisearch.ex
+++ b/lib/pleroma/search/meilisearch.ex
@ -5,27 +5,15 @@ defmodule Pleroma.Search.Meilisearch do
  alias Pleroma.Activity

  import Pleroma.Search.DatabaseSearch
+  import Ecto.Query

  @behaviour Pleroma.Search.SearchBackend

-  defp meili_headers(key) do
-    key_header =
-      if is_nil(key), do: [], else: [{"Authorization", "Bearer #{key}"}]
-
-    [{"Content-Type", "application/json"} | key_header]
-  end
-
-  defp meili_headers_admin do
+  defp meili_headers do
    private_key = Pleroma.Config.get([Pleroma.Search.Meilisearch, :private_key])
-    meili_headers(private_key)
-  end

-  defp meili_headers_search do
-    search_key =
-      Pleroma.Config.get([Pleroma.Search.Meilisearch, :search_key]) ||
-        Pleroma.Config.get([Pleroma.Search.Meilisearch, :private_key])
-
-    meili_headers(search_key)
+    [{"Content-Type", "application/json"}] ++
+      if is_nil(private_key), do: [], else: [{"Authorization", "Bearer #{private_key}"}]
  end

  def meili_get(path) do
@ -34,7 +22,7 @@ def meili_get(path) do
    result =
      Pleroma.HTTP.get(
        Path.join(endpoint, path),
-        meili_headers_admin()
+        meili_headers()
      )

    with {:ok, res} <- result do
@ -42,14 +30,14 @@ def meili_get(path) do
    end
  end

-  defp meili_search(params) do
+  def meili_post(path, params) do
    endpoint = Pleroma.Config.get([Pleroma.Search.Meilisearch, :url])

    result =
      Pleroma.HTTP.post(
-        Path.join(endpoint, "/indexes/objects/search"),
+        Path.join(endpoint, path),
        Jason.encode!(params),
-        meili_headers_search()
+        meili_headers()
      )

    with {:ok, res} <- result do
@ -65,7 +53,7 @@ def meili_put(path, params) do
        :put,
        Path.join(endpoint, path),
        Jason.encode!(params),
-        meili_headers_admin(),
+        meili_headers(),
        []
      )

@ -82,7 +70,7 @@ def meili_delete!(path) do
        :delete,
        Path.join(endpoint, path),
        "",
-        meili_headers_admin(),
+        meili_headers(),
        []
      )
  end
@ -93,20 +81,25 @@ def search(user, query, options \\ []) do
    author = Keyword.get(options, :author)

    res =
-      meili_search(%{q: query, offset: offset, limit: limit})
+      meili_post(
+        "/indexes/objects/search",
+        %{q: query, offset: offset, limit: limit}
+      )

    with {:ok, result} <- res do
      hits = result["hits"] |> Enum.map(& &1["ap"])

      try do
        hits
-        |> Activity.get_presorted_create_by_object_ap_id()
+        |> Activity.create_by_object_ap_id()
+        |> Activity.with_preloaded_object()
        |> Activity.with_preloaded_object()
        |> Activity.restrict_deactivated_users()
        |> maybe_restrict_local(user)
        |> maybe_restrict_author(author)
        |> maybe_restrict_blocked(user)
        |> maybe_fetch(user, query)
+        |> order_by([object: obj], desc: obj.data["published"])
        |> Pleroma.Repo.all()
      rescue
        _ -> maybe_fetch([], user, query)
--- a/lib/pleroma/signature.ex
+++ b/lib/pleroma/signature.ex
@ -5,25 +5,47 @@
 defmodule Pleroma.Signature do
  @behaviour HTTPSignatures.Adapter

+  alias Pleroma.EctoType.ActivityPub.ObjectValidators
+  alias Pleroma.Keys
  alias Pleroma.User
-  alias Pleroma.User.SigningKey
-  require Logger
+  alias Pleroma.Web.ActivityPub.ActivityPub
+
+  @known_suffixes ["/publickey", "/main-key"]

  def key_id_to_actor_id(key_id) do
-    case SigningKey.key_id_to_ap_id(key_id) do
-      nil ->
-        # hm, we SHOULD have gotten this in the pipeline before we hit here!
-        Logger.error("Could not figure out who owns the key #{key_id}")
-        {:error, :key_owner_not_found}
+    uri =
+      key_id
+      |> URI.parse()
+      |> Map.put(:fragment, nil)
+      |> Map.put(:query, nil)
+      |> remove_suffix(@known_suffixes)

-      key ->
-        {:ok, key}
+    maybe_ap_id = URI.to_string(uri)
+
+    case ObjectValidators.ObjectID.cast(maybe_ap_id) do
+      {:ok, ap_id} ->
+        {:ok, ap_id}
+
+      _ ->
+        case Pleroma.Web.WebFinger.finger(maybe_ap_id) do
+          {:ok, %{"ap_id" => ap_id}} -> {:ok, ap_id}
+          _ -> {:error, maybe_ap_id}
        end
    end
+  end
+
+  defp remove_suffix(uri, [test | rest]) do
+    if not is_nil(uri.path) and String.ends_with?(uri.path, test) do
+      Map.put(uri, :path, String.replace(uri.path, test, ""))
+    else
+      remove_suffix(uri, rest)
+    end
+  end
+
+  defp remove_suffix(uri, []), do: uri

  def fetch_public_key(conn) do
    with %{"keyId" => kid} <- HTTPSignatures.signature_for_conn(conn),
-         {:ok, %SigningKey{}} <- SigningKey.get_or_fetch_by_key_id(kid),
         {:ok, actor_id} <- key_id_to_actor_id(kid),
         {:ok, public_key} <- User.get_public_key_for_ap_id(actor_id) do
      {:ok, public_key}
@ -35,8 +57,8 @@ def fetch_public_key(conn) do

  def refetch_public_key(conn) do
    with %{"keyId" => kid} <- HTTPSignatures.signature_for_conn(conn),
-         {:ok, %SigningKey{}} <- SigningKey.get_or_fetch_by_key_id(kid),
         {:ok, actor_id} <- key_id_to_actor_id(kid),
+         {:ok, _user} <- ActivityPub.make_user_from_ap_id(actor_id),
         {:ok, public_key} <- User.get_public_key_for_ap_id(actor_id) do
      {:ok, public_key}
    else
@ -45,9 +67,9 @@ def refetch_public_key(conn) do
    end
  end

-  def sign(%User{} = user, headers) do
-    with {:ok, private_key} <- SigningKey.private_key(user) do
-      HTTPSignatures.sign(private_key, SigningKey.local_key_id(user.ap_id), headers)
+  def sign(%User{keys: keys} = user, headers) do
+    with {:ok, private_key, _} <- Keys.keys_from_pem(keys) do
+      HTTPSignatures.sign(private_key, user.ap_id <> "#main-key", headers)
    end
  end

--- a/lib/pleroma/upload.ex
+++ b/lib/pleroma/upload.ex
@ -13,6 +13,7 @@ defmodule Pleroma.Upload do
  * `:uploader`: override uploader
  * `:filters`: override filters
  * `:size_limit`: override size limit
+  * `:activity_type`: override activity type

  The `%Pleroma.Upload{}` struct: all documented fields are meant to be overwritten in filters:

@ -47,6 +48,7 @@ defmodule Pleroma.Upload do
  @type option ::
          {:type, :avatar | :banner | :background}
          | {:description, String.t()}
+          | {:activity_type, String.t()}
          | {:size_limit, nil | non_neg_integer()}
          | {:uploader, module()}
          | {:filters, [module()]}
@ -59,23 +61,12 @@ defmodule Pleroma.Upload do
          width: integer(),
          height: integer(),
          blurhash: String.t(),
-          description: String.t(),
          path: String.t()
        }

-  @always_enabled_filters [Pleroma.Upload.Filter.Dedupe]
+  @always_enabled_filters [Pleroma.Upload.Filter.AnonymizeFilename]

-  defstruct [
-    :id,
-    :name,
-    :tempfile,
-    :content_type,
-    :width,
-    :height,
-    :blurhash,
-    :description,
-    :path
-  ]
+  defstruct [:id, :name, :tempfile, :content_type, :width, :height, :blurhash, :path]

  @spec store(source, options :: [option()]) :: {:ok, Map.t()} | {:error, any()}
  @doc "Store a file. If using a `Plug.Upload{}` as the source, be sure to use `Majic.Plug` to ensure its content_type and filename is correct."
@ -85,7 +76,7 @@ def store(upload, opts \\ []) do
    with {:ok, upload} <- prepare_upload(upload, opts),
         upload = %__MODULE__{upload | path: upload.path || "#{upload.id}/#{upload.name}"},
         {:ok, upload} <- Pleroma.Upload.Filter.filter(opts.filters, upload),
-         description = Map.get(upload, :description) || "",
+         description = Map.get(opts, :description) || "",
         {_, true} <-
           {:description_limit,
            String.length(description) <= Pleroma.Config.get([:instance, :description_limit])},
@ -141,7 +132,7 @@ defp get_opts(opts) do
      end

    %{
-      activity_type: activity_type,
+      activity_type: Keyword.get(opts, :activity_type, activity_type),
      size_limit: Keyword.get(opts, :size_limit, size_limit),
      uploader: Keyword.get(opts, :uploader, Pleroma.Config.get([__MODULE__, :uploader])),
      filters:
@ -161,8 +152,7 @@ defp prepare_upload(%Plug.Upload{} = file, opts) do
         id: UUID.generate(),
         name: file.filename,
         tempfile: file.path,
-         content_type: file.content_type,
-         description: opts.description
+         content_type: file.content_type
       }}
    end
  end
@ -182,8 +172,7 @@ defp prepare_upload(%{img: "data:image/" <> image_data}, opts) do
         id: UUID.generate(),
         name: hash <> "." <> ext,
         tempfile: tmp_path,
-         content_type: content_type,
-         description: opts.description
+         content_type: content_type
       }}
    end
  end
@ -246,7 +235,7 @@ def base_url do

    case uploader do
      Pleroma.Uploaders.Local ->
-        upload_base_url
+        upload_base_url || Pleroma.Web.Endpoint.url() <> "/media/"

      Pleroma.Uploaders.S3 ->
        bucket = Config.get([Pleroma.Uploaders.S3, :bucket])
@ -272,7 +261,7 @@ def base_url do
        end

      _ ->
-        public_endpoint || upload_base_url
+        public_endpoint || upload_base_url || Pleroma.Web.Endpoint.url() <> "/media/"
    end
  end
 end
--- a/lib/pleroma/upload/filter/exiftool.ex
+++ b/lib/pleroma/upload/filter/exiftool.ex
@ -0,0 +1,33 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Pleroma.Upload.Filter.Exiftool do
+  @moduledoc """
+  Strips GPS related EXIF tags and overwrites the file in place.
+  Also strips or replaces filesystem metadata e.g., timestamps.
+  """
+  @behaviour Pleroma.Upload.Filter
+
+  @spec filter(Pleroma.Upload.t()) :: {:ok, :noop} | {:ok, :filtered} | {:error, String.t()}
+
+  # Formats not compatible with exiftool at this time
+  def filter(%Pleroma.Upload{content_type: "image/heic"}), do: {:ok, :noop}
+  def filter(%Pleroma.Upload{content_type: "image/webp"}), do: {:ok, :noop}
+  def filter(%Pleroma.Upload{content_type: "image/svg+xml"}), do: {:ok, :noop}
+  def filter(%Pleroma.Upload{content_type: "image/jxl"}), do: {:ok, :noop}
+
+  def filter(%Pleroma.Upload{tempfile: file, content_type: "image" <> _}) do
+    try do
+      case System.cmd("exiftool", ["-overwrite_original", "-gps:all=", file], parallelism: true) do
+        {_response, 0} -> {:ok, :filtered}
+        {error, 1} -> {:error, error}
+      end
+    rescue
+      e in ErlangError ->
+        {:error, "#{__MODULE__}: #{inspect(e)}"}
+    end
+  end
+
+  def filter(_), do: {:ok, :noop}
+end
--- a/lib/pleroma/upload/filter/exiftool/read_description.ex
+++ b/lib/pleroma/upload/filter/exiftool/read_description.ex
@ -1,51 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.Upload.Filter.Exiftool.ReadDescription do
-  @moduledoc """
-  Gets a valid description from the related EXIF tags and provides them in the response if no description is provided yet.
-  It will first check ImageDescription, when that doesn't probide a valid description, it will check iptc:Caption-Abstract.
-  A valid description means the fields are filled in and not too long (see `:instance, :description_limit`).
-  """
-  @behaviour Pleroma.Upload.Filter
-
-  @spec filter(Pleroma.Upload.t()) :: {:ok, any()} | {:error, String.t()}
-
-  def filter(%Pleroma.Upload{description: description})
-      when is_binary(description),
-      do: {:ok, :noop}
-
-  def filter(%Pleroma.Upload{tempfile: file} = upload),
-    do: {:ok, :filtered, upload |> Map.put(:description, read_description_from_exif_data(file))}
-
-  def filter(_, _), do: {:ok, :noop}
-
-  defp read_description_from_exif_data(file) do
-    nil
-    |> read_when_empty(file, "-ImageDescription")
-    |> read_when_empty(file, "-iptc:Caption-Abstract")
-  end
-
-  defp read_when_empty(current_description, _, _) when is_binary(current_description),
-    do: current_description
-
-  defp read_when_empty(_, file, tag) do
-    try do
-      {tag_content, 0} =
-        System.cmd("exiftool", ["-b", "-s3", "-ignoreMinorErrors", "-q", "-q", tag, file],
-          parallelism: true
-        )
-
-      tag_content = String.trim(tag_content)
-
-      if tag_content != "" and
-           String.length(tag_content) <=
-             Pleroma.Config.get([:instance, :description_limit]),
-         do: tag_content,
-         else: nil
-    rescue
-      _ in ErlangError -> nil
-    end
-  end
-end
--- a/lib/pleroma/upload/filter/exiftool/strip_metadata.ex
+++ b/lib/pleroma/upload/filter/exiftool/strip_metadata.ex
@ -1,52 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.Upload.Filter.Exiftool.StripMetadata do
-  @moduledoc """
-  Tries to strip all image metadata but colorspace and orientation overwriting the file in place.
-  Also strips or replaces filesystem metadata e.g., timestamps.
-  """
-  @behaviour Pleroma.Upload.Filter
-
-  alias Pleroma.Config
-
-  @purge_default ["all", "CommonIFD0"]
-  @preserve_default ["ColorSpaceTags", "Orientation"]
-
-  @spec filter(Pleroma.Upload.t()) :: {:ok, :noop} | {:ok, :filtered} | {:error, String.t()}
-
-  # Formats not compatible with exiftool at this time
-  def filter(%Pleroma.Upload{content_type: "image/webp"}), do: {:ok, :noop}
-  def filter(%Pleroma.Upload{content_type: "image/bmp"}), do: {:ok, :noop}
-  def filter(%Pleroma.Upload{content_type: "image/svg+xml"}), do: {:ok, :noop}
-
-  def filter(%Pleroma.Upload{tempfile: file, content_type: "image" <> _}) do
-    purge_args =
-      Config.get([__MODULE__, :purge], @purge_default)
-      |> Enum.map(fn mgroup -> "-" <> mgroup <> "=" end)
-
-    preserve_args =
-      Config.get([__MODULE__, :preserve], @preserve_default)
-      |> Enum.map(fn mgroup -> "-" <> mgroup end)
-      |> then(fn
-        # If -TagsFromFile is not followed by tag selectors, it will copy most available tags
-        [] -> []
-        args -> ["-TagsFromFile", "@" | args]
-      end)
-
-    args = ["-ignoreMinorErrors", "-overwrite_original" | purge_args] ++ preserve_args ++ [file]
-
-    try do
-      case System.cmd("exiftool", args, parallelism: true) do
-        {_response, 0} -> {:ok, :filtered}
-        {error, 1} -> {:error, error}
-      end
-    rescue
-      e in ErlangError ->
-        {:error, "#{__MODULE__}: #{inspect(e)}"}
-    end
-  end
-
-  def filter(_), do: {:ok, :noop}
-end
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@ -25,6 +25,7 @@ defmodule Pleroma.User do
  alias Pleroma.Hashtag
  alias Pleroma.User.HashtagFollow
  alias Pleroma.HTML
+  alias Pleroma.Keys
  alias Pleroma.MFA
  alias Pleroma.Notification
  alias Pleroma.Object
@ -42,7 +43,6 @@ defmodule Pleroma.User do
  alias Pleroma.Web.OAuth
  alias Pleroma.Web.RelMe
  alias Pleroma.Workers.BackgroundWorker
-  alias Pleroma.User.SigningKey

  use Pleroma.Web, :verified_routes

@ -101,6 +101,7 @@ defmodule Pleroma.User do
    field(:password, :string, virtual: true)
    field(:password_confirmation, :string, virtual: true)
    field(:keys, :string)
+    field(:public_key, :string)
    field(:ap_id, :string)
    field(:avatar, :map, default: %{})
    field(:local, :boolean, default: true)
@ -221,10 +222,6 @@ defmodule Pleroma.User do
      on_replace: :delete
    )

-    # FOR THE FUTURE: We might want to make this a one-to-many relationship
-    # it's entirely possible right now, but we don't have a use case for it
-    has_one(:signing_key, SigningKey, foreign_key: :user_id)
-
    timestamps()
  end

@ -443,7 +440,6 @@ defp fix_follower_address(params), do: params
  def remote_user_changeset(struct \\ %User{local: false}, params) do
    bio_limit = Config.get([:instance, :user_bio_length], 5000)
    name_limit = Config.get([:instance, :user_name_length], 100)
-    fields_limit = Config.get([:instance, :max_remote_account_fields], 0)

    name =
      case params[:name] do
@ -457,12 +453,10 @@ def remote_user_changeset(struct \\ %User{local: false}, params) do
      |> Map.put_new(:last_refreshed_at, NaiveDateTime.utc_now())
      |> truncate_if_exists(:name, name_limit)
      |> truncate_if_exists(:bio, bio_limit)
-      |> Map.update(:fields, [], &Enum.take(&1, fields_limit))
      |> truncate_fields_param()
      |> fix_follower_address()

    struct
-    |> Repo.preload(:signing_key)
    |> cast(
      params,
      [
@ -472,6 +466,7 @@ def remote_user_changeset(struct \\ %User{local: false}, params) do
        :inbox,
        :shared_inbox,
        :nickname,
+        :public_key,
        :avatar,
        :ap_enabled,
        :banner,
@ -500,7 +495,6 @@ def remote_user_changeset(struct \\ %User{local: false}, params) do
    |> validate_required([:ap_id])
    |> validate_required([:name], trim: false)
    |> unique_constraint(:nickname)
-    |> cast_assoc(:signing_key, with: &SigningKey.remote_changeset/2, required: false)
    |> validate_format(:nickname, @email_regex)
    |> validate_length(:bio, max: bio_limit)
    |> validate_length(:name, max: name_limit)
@ -532,6 +526,7 @@ def update_changeset(struct, params \\ %{}) do
        :name,
        :emoji,
        :avatar,
+        :public_key,
        :inbox,
        :shared_inbox,
        :is_locked,
@ -575,7 +570,6 @@ def update_changeset(struct, params \\ %{}) do
      :pleroma_settings_store,
      &{:ok, Map.merge(struct.pleroma_settings_store, &1)}
    )
-    |> cast_assoc(:signing_key, with: &SigningKey.remote_changeset/2, requred: false)
    |> validate_fields(false, struct)
  end

@ -834,10 +828,8 @@ def put_following_and_follower_and_featured_address(changeset) do
  end

  defp put_private_key(changeset) do
-    ap_id = get_field(changeset, :ap_id)
-
-    changeset
-    |> put_assoc(:signing_key, SigningKey.generate_local_keys(ap_id))
+    {:ok, pem} = Keys.generate_rsa_pem()
+    put_change(changeset, :keys, pem)
  end

  defp autofollow_users(user) do
@ -977,16 +969,15 @@ defp maybe_send_registration_email(%User{email: email} = user) when is_binary(em

  defp maybe_send_registration_email(_), do: {:ok, :noop}

-  def needs_update?(user, options \\ [])
-  def needs_update?(%User{local: true}, _options), do: false
-  def needs_update?(%User{local: false, last_refreshed_at: nil}, _options), do: true
+  def needs_update?(%User{local: true}), do: false

-  def needs_update?(%User{local: false} = user, options) do
-    NaiveDateTime.diff(NaiveDateTime.utc_now(), user.last_refreshed_at) >=
-      Keyword.get(options, :maximum_age, 86_400)
+  def needs_update?(%User{local: false, last_refreshed_at: nil}), do: true
+
+  def needs_update?(%User{local: false} = user) do
+    NaiveDateTime.diff(NaiveDateTime.utc_now(), user.last_refreshed_at) >= 86_400
  end

-  def needs_update?(_, _options), do: true
+  def needs_update?(_), do: true

  # "Locked" (self-locked) users demand explicit authorization of follow requests
  @spec can_direct_follow_local(User.t(), User.t()) :: true | false
@ -1154,8 +1145,7 @@ def update_and_set_cache(%{data: %Pleroma.User{} = user} = changeset) do
    was_superuser_before_update = User.superuser?(user)

    with {:ok, user} <- Repo.update(changeset, stale_error_field: :id) do
-      user
-      |> set_cache()
+      set_cache(user)
    end
    |> maybe_remove_report_notifications(was_superuser_before_update)
  end
@ -1633,12 +1623,8 @@ def blocks_user?(%User{} = user, %User{} = target) do

  def blocks_user?(_, _), do: false

-  def blocks_domain?(%User{} = user, %User{ap_id: ap_id}) do
-    blocks_domain?(user, ap_id)
-  end
-
-  def blocks_domain?(%User{} = user, url) when is_binary(url) do
-    %{host: host} = URI.parse(url)
+  def blocks_domain?(%User{} = user, %User{} = target) do
+    %{host: host} = URI.parse(target.ap_id)
    Enum.member?(user.domain_blocks, host)
    # TODO: functionality should probably be changed such that subdomains block as well,
    # but as it stands, this just hecks up the relationships endpoint
@ -1994,10 +1980,10 @@ def html_filter_policy(_), do: Config.get([:markup, :scrub_policy])

  def fetch_by_ap_id(ap_id), do: ActivityPub.make_user_from_ap_id(ap_id)

-  def get_or_fetch_by_ap_id(ap_id, options \\ []) do
+  def get_or_fetch_by_ap_id(ap_id) do
    cached_user = get_cached_by_ap_id(ap_id)

-    maybe_fetched_user = needs_update?(cached_user, options) && fetch_by_ap_id(ap_id)
+    maybe_fetched_user = needs_update?(cached_user) && fetch_by_ap_id(ap_id)

    case {cached_user, maybe_fetched_user} do
      {_, {:ok, %User{} = user}} ->
@ -2060,16 +2046,24 @@ defp create_service_actor(uri, nickname) do
    |> set_cache()
  end

-  defdelegate public_key(user), to: SigningKey
+  def public_key(%{public_key: public_key_pem}) when is_binary(public_key_pem) do
+    key =
+      public_key_pem
+      |> :public_key.pem_decode()
+      |> hd()
+      |> :public_key.pem_entry_decode()
+
+    {:ok, key}
+  end
+
+  def public_key(_), do: {:error, "key not found"}

  def get_public_key_for_ap_id(ap_id) do
    with {:ok, %User{} = user} <- get_or_fetch_by_ap_id(ap_id),
-         {:ok, public_key} <- SigningKey.public_key(user) do
+         {:ok, public_key} <- public_key(user) do
      {:ok, public_key}
    else
-      e ->
-        Logger.error("Could not get public key for #{ap_id}.\n#{inspect(e)}")
-        {:error, e}
+      _ -> :error
    end
  end

--- a/lib/pleroma/user/signing_key.ex
+++ b/lib/pleroma/user/signing_key.ex
@ -1,255 +0,0 @@
-defmodule Pleroma.User.SigningKey do
-  use Ecto.Schema
-  import Ecto.Query
-  import Ecto.Changeset
-  require Pleroma.Constants
-  alias Pleroma.User
-  alias Pleroma.Repo
-
-  require Logger
-
-  @primary_key false
-  schema "signing_keys" do
-    belongs_to(:user, Pleroma.User, type: FlakeId.Ecto.CompatType)
-    field :public_key, :string
-    field :private_key, :string
-    # This is an arbitrary field given by the remote instance
-    field :key_id, :string, primary_key: true
-    timestamps()
-  end
-
-  def load_key(%User{} = user) do
-    user
-    |> Repo.preload(:signing_key)
-  end
-
-  def key_id_of_local_user(%User{local: true} = user) do
-    case Repo.preload(user, :signing_key) do
-      %User{signing_key: %__MODULE__{key_id: key_id}} -> key_id
-      _ -> nil
-    end
-  end
-
-  @spec remote_changeset(__MODULE__, map) :: Changeset.t()
-  def remote_changeset(%__MODULE__{} = signing_key, attrs) do
-    signing_key
-    |> cast(attrs, [:public_key, :key_id])
-    |> validate_required([:public_key, :key_id])
-  end
-
-  @spec key_id_to_user_id(String.t()) :: String.t() | nil
-  @doc """
-  Given a key ID, return the user ID associated with that key.
-  Returns nil if the key ID is not found.
-  """
-  def key_id_to_user_id(key_id) do
-    from(sk in __MODULE__, where: sk.key_id == ^key_id)
-    |> select([sk], sk.user_id)
-    |> Repo.one()
-  end
-
-  @spec key_id_to_ap_id(String.t()) :: String.t() | nil
-  @doc """
-  Given a key ID, return the AP ID associated with that key.
-  Returns nil if the key ID is not found.
-  """
-  def key_id_to_ap_id(key_id) do
-    Logger.debug("Looking up key ID: #{key_id}")
-
-    result =
-      from(sk in __MODULE__, where: sk.key_id == ^key_id)
-      |> join(:inner, [sk], u in User, on: sk.user_id == u.id)
-      |> select([sk, u], %{user: u})
-      |> Repo.one()
-
-    case result do
-      %{user: %User{ap_id: ap_id}} -> ap_id
-      _ -> nil
-    end
-  end
-
-  @spec generate_rsa_pem() :: {:ok, binary()}
-  @doc """
-  Generate a new RSA private key and return it as a PEM-encoded string.
-  """
-  def generate_rsa_pem do
-    key = :public_key.generate_key({:rsa, 2048, 65_537})
-    entry = :public_key.pem_entry_encode(:RSAPrivateKey, key)
-    pem = :public_key.pem_encode([entry]) |> String.trim_trailing()
-    {:ok, pem}
-  end
-
-  @spec generate_local_keys(String.t()) :: {:ok, Changeset.t()} | {:error, String.t()}
-  @doc """
-  Generate a new RSA key pair and create a changeset for it
-  """
-  def generate_local_keys(ap_id) do
-    {:ok, private_pem} = generate_rsa_pem()
-    {:ok, local_pem} = private_pem_to_public_pem(private_pem)
-
-    %__MODULE__{}
-    |> change()
-    |> put_change(:public_key, local_pem)
-    |> put_change(:private_key, private_pem)
-    |> put_change(:key_id, local_key_id(ap_id))
-  end
-
-  @spec local_key_id(String.t()) :: String.t()
-  @doc """
-  Given an AP ID, return the key ID for the local user.
-  """
-  def local_key_id(ap_id) do
-    ap_id <> "#main-key"
-  end
-
-  @spec private_pem_to_public_pem(binary) :: {:ok, binary()} | {:error, String.t()}
-  @doc """
-  Given a private key in PEM format, return the corresponding public key in PEM format.
-  """
-  def private_pem_to_public_pem(private_pem) do
-    [private_key_code] = :public_key.pem_decode(private_pem)
-    private_key = :public_key.pem_entry_decode(private_key_code)
-    {:RSAPrivateKey, _, modulus, exponent, _, _, _, _, _, _, _} = private_key
-    public_key = {:RSAPublicKey, modulus, exponent}
-    public_key = :public_key.pem_entry_encode(:SubjectPublicKeyInfo, public_key)
-    {:ok, :public_key.pem_encode([public_key])}
-  end
-
-  @spec public_key(User.t()) :: {:ok, binary()} | {:error, String.t()}
-  @doc """
-  Given a user, return the public key for that user in binary format.
-  """
-  def public_key(%User{} = user) do
-    case Repo.preload(user, :signing_key) do
-      %User{signing_key: %__MODULE__{public_key: public_key_pem}} ->
-        key =
-          public_key_pem
-          |> :public_key.pem_decode()
-          |> hd()
-          |> :public_key.pem_entry_decode()
-
-        {:ok, key}
-
-      _ ->
-        {:error, "key not found"}
-    end
-  end
-
-  def public_key(_), do: {:error, "key not found"}
-
-  def public_key_pem(%User{} = user) do
-    case Repo.preload(user, :signing_key) do
-      %User{signing_key: %__MODULE__{public_key: public_key_pem}} -> {:ok, public_key_pem}
-      _ -> {:error, "key not found"}
-    end
-  end
-
-  def public_key_pem(_e) do
-    {:error, "key not found"}
-  end
-
-  @spec private_key(User.t()) :: {:ok, binary()} | {:error, String.t()}
-  @doc """
-  Given a user, return the private key for that user in binary format.
-  """
-  def private_key(%User{} = user) do
-    case Repo.preload(user, :signing_key) do
-      %{signing_key: %__MODULE__{private_key: private_key_pem}} ->
-        key =
-          private_key_pem
-          |> :public_key.pem_decode()
-          |> hd()
-          |> :public_key.pem_entry_decode()
-
-        {:ok, key}
-
-      _ ->
-        {:error, "key not found"}
-    end
-  end
-
-  @spec get_or_fetch_by_key_id(String.t()) :: {:ok, __MODULE__} | {:error, String.t()}
-  @doc """
-  Given a key ID, return the signing key associated with that key.
-  Will either return the key if it exists locally, or fetch it from the remote instance.
-  """
-  def get_or_fetch_by_key_id(key_id) do
-    case key_id_to_user_id(key_id) do
-      nil ->
-        fetch_remote_key(key_id)
-
-      user_id ->
-        {:ok, Repo.get_by(__MODULE__, user_id: user_id)}
-    end
-  end
-
-  @spec fetch_remote_key(String.t()) :: {:ok, __MODULE__} | {:error, String.t()}
-  @doc """
-  Fetch a remote key by key ID.
-  Will send a request to the remote instance to get the key ID.
-  This request should, at the very least, return a user ID and a public key object.
-  Though bear in mind that some implementations (looking at you, pleroma) may require a signature for this request.
-  This has the potential to create an infinite loop if the remote instance requires a signature to fetch the key...
-  So if we're rejected, we should probably just give up.
-  """
-  def fetch_remote_key(key_id) do
-    Logger.debug("Fetching remote key: #{key_id}")
-
-    with {:ok, _body} = resp <-
-           Pleroma.Object.Fetcher.fetch_and_contain_remote_object_from_id(key_id),
-         {:ok, ap_id, public_key_pem} <- handle_signature_response(resp) do
-      Logger.debug("Fetched remote key: #{ap_id}")
-      # fetch the user
-      {:ok, user} = User.get_or_fetch_by_ap_id(ap_id)
-      # store the key
-      key = %__MODULE__{
-        user_id: user.id,
-        public_key: public_key_pem,
-        key_id: key_id
-      }
-
-      Repo.insert(key, on_conflict: :replace_all, conflict_target: :key_id)
-    else
-      e ->
-        Logger.debug("Failed to fetch remote key: #{inspect(e)}")
-        {:error, "Could not fetch key"}
-    end
-  end
-
-  # Take the response from the remote instance and extract the key details
-  # will check if the key ID matches the owner of the key, if not, error
-  defp extract_key_details(%{"id" => ap_id, "publicKey" => public_key}) do
-    if ap_id !== public_key["owner"] do
-      {:error, "Key ID does not match owner"}
-    else
-      %{"publicKeyPem" => public_key_pem} = public_key
-      {:ok, ap_id, public_key_pem}
-    end
-  end
-
-  defp handle_signature_response({:ok, body}) do
-    case body do
-      %{
-        "type" => "CryptographicKey",
-        "publicKeyPem" => public_key_pem,
-        "owner" => ap_id
-      } ->
-        {:ok, ap_id, public_key_pem}
-
-      # for when we get a subset of the user object
-      %{
-        "id" => _user_id,
-        "publicKey" => _public_key,
-        "type" => actor_type
-      }
-      when actor_type in Pleroma.Constants.actor_types() ->
-        extract_key_details(body)
-
-      %{"error" => error} ->
-        {:error, error}
-    end
-  end
-
-  defp handle_signature_response({:error, e}), do: {:error, e}
-  defp handle_signature_response(other), do: {:error, "Could not fetch key: #{inspect(other)}"}
-end
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@ -22,7 +22,6 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
  alias Pleroma.Upload
  alias Pleroma.User
  alias Pleroma.Web.ActivityPub.MRF
-  alias Pleroma.Web.ActivityPub.ObjectValidators.UserValidator
  alias Pleroma.Web.ActivityPub.Transmogrifier
  alias Pleroma.Web.Streamer
  alias Pleroma.Web.WebFinger
@ -155,7 +154,9 @@ def insert(map, local \\ true, fake \\ false, bypass_actor_check \\ false) when
      # Splice in the child object if we have one.
      activity = Maps.put_if_present(activity, :object, object)

-      Pleroma.Web.RichMedia.Card.get_by_activity(activity)
+      ConcurrentLimiter.limit(Pleroma.Web.RichMedia.Helpers, fn ->
+        Task.start(fn -> Pleroma.Web.RichMedia.Helpers.fetch_data_for_activity(activity) end)
+      end)

      # Add local posts to search index
      if local, do: Pleroma.Search.add_to_index(activity)
@ -183,7 +184,7 @@ def insert(map, local \\ true, fake \\ false, bypass_actor_check \\ false) when
          id: "pleroma:fakeid"
        }

-        Pleroma.Web.RichMedia.Card.get_by_activity(activity)
+        Pleroma.Web.RichMedia.Helpers.fetch_data_for_activity(activity)
        {:ok, activity}

      {:remote_limit_pass, _} ->
@ -1543,30 +1544,11 @@ defp normalize_also_known_as(aka) when is_list(aka), do: aka
  defp normalize_also_known_as(aka) when is_binary(aka), do: [aka]
  defp normalize_also_known_as(nil), do: []

-  defp normalize_attachment(%{} = attachment), do: [attachment]
-  defp normalize_attachment(attachment) when is_list(attachment), do: attachment
-  defp normalize_attachment(_), do: []
-
-  defp maybe_make_public_key_object(data) do
-    if is_map(data["publicKey"]) && is_binary(data["publicKey"]["publicKeyPem"]) do
-      %{
-        public_key: data["publicKey"]["publicKeyPem"],
-        key_id: data["publicKey"]["id"]
-      }
-    else
-      nil
-    end
-  end
-
  defp object_to_user_data(data, additional) do
    fields =
      data
      |> Map.get("attachment", [])
-      |> normalize_attachment()
-      |> Enum.filter(fn
-        %{"type" => t} -> t == "PropertyValue"
-        _ -> false
-      end)
+      |> Enum.filter(fn %{"type" => t} -> t == "PropertyValue" end)
      |> Enum.map(fn fields -> Map.take(fields, ["name", "value"]) end)

    emojis =
@ -1589,16 +1571,9 @@ defp object_to_user_data(data, additional) do
    featured_address = data["featured"]
    {:ok, pinned_objects} = fetch_and_prepare_featured_from_ap_id(featured_address)

-    # first, check that the owner is correct
-    signing_key =
-      if data["id"] !== data["publicKey"]["owner"] do
-        Logger.error(
-          "Owner of the public key is not the same as the actor - not saving the public key."
-        )
-
-        nil
-      else
-        maybe_make_public_key_object(data)
+    public_key =
+      if is_map(data["publicKey"]) && is_binary(data["publicKey"]["publicKeyPem"]) do
+        data["publicKey"]["publicKeyPem"]
      end

    shared_inbox =
@ -1642,7 +1617,7 @@ defp object_to_user_data(data, additional) do
      bio: data["summary"] || "",
      actor_type: actor_type,
      also_known_as: also_known_as,
-      signing_key: signing_key,
+      public_key: public_key,
      inbox: data["inbox"],
      shared_inbox: shared_inbox,
      pinned_objects: pinned_objects,
@ -1729,7 +1704,9 @@ defp collection_private(%{"first" => first}) do
           Fetcher.fetch_and_contain_remote_object_from_id(first) do
      {:ok, false}
    else
-      {:error, _} -> {:ok, true}
+      {:error, {:ok, %{status: code}}} when code in [401, 403] -> {:ok, true}
+      {:error, _} = e -> e
+      e -> {:error, e}
    end
  end

@ -1745,7 +1722,6 @@ def user_data_from_user_object(data, additional \\ []) do

  def fetch_and_prepare_user_from_ap_id(ap_id, additional \\ []) do
    with {:ok, data} <- Fetcher.fetch_and_contain_remote_object_from_id(ap_id),
-         {:valid, {:ok, _, _}} <- {:valid, UserValidator.validate(data, [])},
         {:ok, data} <- user_data_from_user_object(data, additional) do
      {:ok, maybe_update_follow_information(data)}
    else
@ -1754,14 +1730,10 @@ def fetch_and_prepare_user_from_ap_id(ap_id, additional \\ []) do
        Logger.debug("Could not decode user at fetch #{ap_id}, #{inspect(e)}")
        {:error, e}

-      {:reject, reason} = e ->
+      {:error, {:reject, reason} = e} ->
        Logger.debug("Rejected user #{ap_id}: #{inspect(reason)}")
        {:error, e}

-      {:valid, reason} ->
-        Logger.debug("Data is not a valid user #{ap_id}: #{inspect(reason)}")
-        {:error, "Not a user"}
-
      {:error, e} ->
        Logger.error("Could not decode user at fetch #{ap_id}, #{inspect(e)}")
        {:error, e}
@ -1840,19 +1812,18 @@ def fetch_and_prepare_featured_from_ap_id(ap_id) do
    end
  end

-  def enqueue_pin_fetches(%{pinned_objects: pins}) do
-    # enqueue a task to fetch all pinned objects
-    Enum.each(pins, fn {ap_id, _} ->
-      if is_nil(Object.get_cached_by_ap_id(ap_id)) do
-        Pleroma.Workers.RemoteFetcherWorker.enqueue("fetch_remote", %{
-          "id" => ap_id,
-          "depth" => 1
-        })
-      end
-    end)
-  end
+  def pinned_fetch_task(nil), do: nil

-  def enqueue_pin_fetches(_), do: nil
+  def pinned_fetch_task(%{pinned_objects: pins}) do
+    if Enum.all?(pins, fn {ap_id, _} ->
+         Object.get_cached_by_ap_id(ap_id) ||
+           match?({:ok, _object}, Fetcher.fetch_object_from_id(ap_id))
+       end) do
+      :ok
+    else
+      :error
+    end
+  end

  def make_user_from_ap_id(ap_id, additional \\ []) do
    user = User.get_cached_by_ap_id(ap_id)
@ -1861,18 +1832,12 @@ def make_user_from_ap_id(ap_id, additional \\ []) do
      Transmogrifier.upgrade_user_from_ap_id(ap_id)
    else
      with {:ok, data} <- fetch_and_prepare_user_from_ap_id(ap_id, additional) do
-        user =
-          if data.ap_id != ap_id do
-            User.get_cached_by_ap_id(data.ap_id)
-          else
-            user
-          end
+        {:ok, _pid} = Task.start(fn -> pinned_fetch_task(data) end)

        if user do
          user
          |> User.remote_user_changeset(data)
          |> User.update_and_set_cache()
-          |> tap(fn _ -> enqueue_pin_fetches(data) end)
        else
          maybe_handle_clashing_nickname(data)

@ -1880,7 +1845,6 @@ def make_user_from_ap_id(ap_id, additional \\ []) do
          |> User.remote_user_changeset()
          |> Repo.insert()
          |> User.set_cache()
-          |> tap(fn _ -> enqueue_pin_fetches(data) end)
        end
      end
    end
--- a/lib/pleroma/web/activity_pub/activity_pub_controller.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
@ -12,7 +12,9 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
  alias Pleroma.Web.ActivityPub.ActivityPub
  alias Pleroma.Web.ActivityPub.InternalFetchActor
  alias Pleroma.Web.ActivityPub.ObjectView
+  alias Pleroma.Web.ActivityPub.Pipeline
  alias Pleroma.Web.ActivityPub.Relay
+  alias Pleroma.Web.ActivityPub.Transmogrifier
  alias Pleroma.Web.ActivityPub.UserView
  alias Pleroma.Web.ActivityPub.Utils
  alias Pleroma.Web.ActivityPub.Visibility
@ -38,9 +40,11 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
  # Note: :following and :followers must be served even without authentication (as via :api)
  plug(
    EnsureAuthenticatedPlug
-    when action in [:read_inbox]
+    when action in [:read_inbox, :update_outbox, :whoami, :upload_media]
  )

+  plug(Majic.Plug, [pool: Pleroma.MajicPool] when action in [:upload_media])
+
  plug(
    Pleroma.Web.Plugs.Cache,
    [query_params: false, tracking_fun: &__MODULE__.track_object_fetch/2]
@ -60,26 +64,7 @@ defp relay_active?(conn, _) do
    end
  end

-  @doc """
-  Render the user's AP data
-  WARNING: we cannot actually check if the request has a fragment! so let's play defensively
-  - IF we have a valid signature, serve full user
-  - IF we do not, and authorized_fetch_mode is enabled, serve the key only
-  - OTHERWISE, serve the full actor (since we don't need to worry about the signature)
-  """
-  def user(%{assigns: %{valid_signature: true}} = conn, params) do
-    render_full_user(conn, params)
-  end
-
-  def user(conn, params) do
-    if Pleroma.Config.get([:activitypub, :authorized_fetch_mode], false) do
-      render_key_only_user(conn, params)
-    else
-      render_full_user(conn, params)
-    end
-  end
-
-  defp render_full_user(conn, %{"nickname" => nickname}) do
+  def user(conn, %{"nickname" => nickname}) do
    with %User{local: true} = user <- User.get_cached_by_nickname(nickname) do
      conn
      |> put_resp_content_type("application/activity+json")
@ -91,18 +76,6 @@ defp render_full_user(conn, %{"nickname" => nickname}) do
    end
  end

-  def render_key_only_user(conn, %{"nickname" => nickname}) do
-    with %User{local: true} = user <- User.get_cached_by_nickname(nickname) do
-      conn
-      |> put_resp_content_type("application/activity+json")
-      |> put_view(UserView)
-      |> render("keys.json", %{user: user})
-    else
-      nil -> {:error, :not_found}
-      %{local: false} -> {:error, :not_found}
-    end
-  end
-
  def object(%{assigns: assigns} = conn, _) do
    with ap_id <- Endpoint.url() <> conn.request_path,
         %Object{} = object <- Object.get_cached_by_ap_id(ap_id),
@ -187,9 +160,7 @@ def maybe_skip_cache(conn, user) do
    end
  end

-  @doc """
-  GET /relay/following
-  """
+  # GET /relay/following
  def relay_following(conn, _params) do
    with %{halted: false} = conn <- FederatingPlug.call(conn, []) do
      conn
@ -226,9 +197,7 @@ def following(%{assigns: %{user: for_user}} = conn, %{"nickname" => nickname}) d
    end
  end

-  @doc """
-  GET /relay/followers
-  """
+  # GET /relay/followers
  def relay_followers(conn, _params) do
    with %{halted: false} = conn <- FederatingPlug.call(conn, []) do
      conn
@ -348,6 +317,14 @@ def internal_fetch(conn, _params) do
    |> represent_service_actor(conn)
  end

+  @doc "Returns the authenticated user's ActivityPub User object or a 404 Not Found if non-authenticated"
+  def whoami(%{assigns: %{user: %User{} = user}} = conn, _params) do
+    conn
+    |> put_resp_content_type("application/activity+json")
+    |> put_view(UserView)
+    |> render("user.json", %{user: user})
+  end
+
  def read_inbox(
        %{assigns: %{user: %User{nickname: nickname} = user}} = conn,
        %{"nickname" => nickname, "page" => page?} = params
@ -398,6 +375,105 @@ def read_inbox(%{assigns: %{user: %User{nickname: as_nickname}}} = conn, %{
    |> json(err)
  end

+  defp fix_user_message(%User{ap_id: actor}, %{"type" => "Create", "object" => object} = activity)
+       when is_map(object) do
+    length =
+      [object["content"], object["summary"], object["name"]]
+      |> Enum.filter(&is_binary(&1))
+      |> Enum.join("")
+      |> String.length()
+
+    limit = Pleroma.Config.get([:instance, :limit])
+
+    if length < limit do
+      object =
+        object
+        |> Transmogrifier.strip_internal_fields()
+        |> Map.put("attributedTo", actor)
+        |> Map.put("actor", actor)
+        |> Map.put("id", Utils.generate_object_id())
+
+      {:ok, Map.put(activity, "object", object)}
+    else
+      {:error,
+       dgettext(
+         "errors",
+         "Character limit (%{limit} characters) exceeded, contains %{length} characters",
+         limit: limit,
+         length: length
+       )}
+    end
+  end
+
+  defp fix_user_message(
+         %User{ap_id: actor} = user,
+         %{"type" => "Delete", "object" => object} = activity
+       ) do
+    with {_, %Object{data: object_data}} <- {:normalize, Object.normalize(object, fetch: false)},
+         {_, true} <- {:permission, user.is_moderator || actor == object_data["actor"]} do
+      {:ok, activity}
+    else
+      {:normalize, _} ->
+        {:error, "No such object found"}
+
+      {:permission, _} ->
+        {:forbidden, "You can't delete this object"}
+    end
+  end
+
+  defp fix_user_message(%User{}, activity) do
+    {:ok, activity}
+  end
+
+  def update_outbox(
+        %{assigns: %{user: %User{nickname: nickname, ap_id: actor} = user}} = conn,
+        %{"nickname" => nickname} = params
+      ) do
+    params =
+      params
+      |> Map.drop(["nickname"])
+      |> Map.put("id", Utils.generate_activity_id())
+      |> Map.put("actor", actor)
+
+    with {:ok, params} <- fix_user_message(user, params),
+         {:ok, activity, _} <- Pipeline.common_pipeline(params, local: true),
+         %Activity{data: activity_data} <- Activity.normalize(activity) do
+      conn
+      |> put_status(:created)
+      |> put_resp_header("location", activity_data["id"])
+      |> json(activity_data)
+    else
+      {:forbidden, message} ->
+        conn
+        |> put_status(:forbidden)
+        |> json(message)
+
+      {:error, message} ->
+        conn
+        |> put_status(:bad_request)
+        |> json(message)
+
+      e ->
+        Logger.warning(fn -> "AP C2S: #{inspect(e)}" end)
+
+        conn
+        |> put_status(:bad_request)
+        |> json("Bad Request")
+    end
+  end
+
+  def update_outbox(%{assigns: %{user: %User{} = user}} = conn, %{"nickname" => nickname}) do
+    err =
+      dgettext("errors", "can't update outbox of %{nickname} as %{as_nickname}",
+        nickname: nickname,
+        as_nickname: user.nickname
+      )
+
+    conn
+    |> put_status(:forbidden)
+    |> json(err)
+  end
+
  defp errors(conn, {:error, :not_found}) do
    conn
    |> put_status(:not_found)
@ -419,6 +495,21 @@ defp set_requester_reachable(%Plug.Conn{} = conn, _) do
    conn
  end

+  def upload_media(%{assigns: %{user: %User{} = user}} = conn, %{"file" => file} = data) do
+    with {:ok, object} <-
+           ActivityPub.upload(
+             file,
+             actor: User.ap_id(user),
+             description: Map.get(data, "description")
+           ) do
+      Logger.debug(inspect(object))
+
+      conn
+      |> put_status(:created)
+      |> json(object.data)
+    end
+  end
+
  def pinned(conn, %{"nickname" => nickname}) do
    with %User{} = user <- User.get_cached_by_nickname(nickname) do
      conn
--- a/lib/pleroma/web/activity_pub/mrf.ex
+++ b/lib/pleroma/web/activity_pub/mrf.ex
@ -233,7 +233,7 @@ def config_descriptions(policies) do
      if function_exported?(policy, :config_description, 0) do
        description =
          @default_description
-          |> Map.merge(policy.config_description())
+          |> Map.merge(policy.config_description)
          |> Map.put(:group, :pleroma)
          |> Map.put(:tab, :mrf)
          |> Map.put(:type, :group)
--- a/lib/pleroma/web/activity_pub/mrf/inline_quote_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/inline_quote_policy.ex
@ -6,29 +6,14 @@ defmodule Pleroma.Web.ActivityPub.MRF.InlineQuotePolicy do
  @moduledoc "Force a quote line into the message content."
  @behaviour Pleroma.Web.ActivityPub.MRF.Policy

-  alias Pleroma.Object
-
  defp build_inline_quote(prefix, url) do
    "<span class=\"quote-inline\"><br/><br/>#{prefix}: <a href=\"#{url}\">#{url}</a></span>"
  end

-  defp resolve_urls(quote_url) do
-    # Fetching here can cause infinite recursion as we run this logic on inbound objects too
-    # This is probably not a problem - its an exceptional corner case for a local user to quote
-    # a post which doesn't exist
-    with %Object{} = obj <- Object.normalize(quote_url, fetch: false) do
-      id = obj.data["id"]
-      url = Map.get(obj.data, "url", id)
-      {id, url, [id, url, quote_url]}
-    else
-      _ -> {quote_url, quote_url, [quote_url]}
-    end
-  end
-
-  defp has_inline_quote?(content, urls) do
+  defp has_inline_quote?(content, quote_url) do
    cond do
      # Does the quote URL exist in the content?
-      Enum.any?(urls, fn url -> content =~ url end) -> true
+      content =~ quote_url -> true
      # Does the content already have a .quote-inline span?
      content =~ "<span class=\"quote-inline\">" -> true
      # No inline quote found
@ -37,22 +22,18 @@ defp has_inline_quote?(content, urls) do
  end

  defp filter_object(%{"quoteUri" => quote_url} = object) do
-    {id, preferred_url, all_urls} = resolve_urls(quote_url)
-    object = Map.put(object, "quoteUri", id)
-
    content = object["content"] || ""

-    if has_inline_quote?(content, all_urls) do
+    if has_inline_quote?(content, quote_url) do
      object
    else
      prefix = Pleroma.Config.get([:mrf_inline_quote, :prefix])

      content =
        if String.ends_with?(content, "</p>") do
-          String.trim_trailing(content, "</p>") <>
-            build_inline_quote(prefix, preferred_url) <> "</p>"
+          String.trim_trailing(content, "</p>") <> build_inline_quote(prefix, quote_url) <> "</p>"
        else
-          content <> build_inline_quote(prefix, preferred_url)
+          content <> build_inline_quote(prefix, quote_url)
        end

      Map.put(object, "content", content)
--- a/Show more
+++ b/Show more
				`@ -0,0 +1 @@`
				`https://github.com/hashnuke/heroku-buildpack-elixir`