allow http AS profile in ld+json header

Update '.gitea/issue_template/feat.yml'
Update '.gitea/issue_template/bug.yml'
2022-12-12 19:06:04 +00:00 · 2022-12-12 04:26:43 +00:00 · 2022-12-12 04:26:24 +00:00 · 2022-12-12 02:34:13 +00:00 · 2022-12-11 23:50:31 +00:00 · 2022-12-11 23:33:58 +00:00
187 changed files with 8840 additions and 4716 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -1,10 +1,11 @@
 *.ex diff=elixir
 *.exs diff=elixir

-priv/static/instance/static.css diff=css
-
 # Most of js/css files included in the repo are minified bundles,
 #   and we don't want to search/diff those as text files.
 *.js binary
 *.js.map binary
 *.css binary
+
+priv/static/instance/static.css diff=css
+priv/static/static-fe/static-fe.css diff=css
--- a/.gitea/issue_template/bug.yml
+++ b/.gitea/issue_template/bug.yml
@ -0,0 +1,87 @@
+name: "Bug report"
+about: "Something isn't working as expected"
+title: "[bug] "
+labels:
+- bug
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to file this bug report! Please try to be as specific and detailed as you can, so we can track down the issue and fix it as soon as possible.
+
+        # General information
+  - type: dropdown
+    id: installation
+    attributes:
+      label: "Your setup"
+      description: "What sort of installation are you using?"
+      options:
+        - "OTP"
+        - "From source"
+        - "Docker"
+      validations:
+        required: true
+  - type: input
+    id: setup-details
+    attributes:
+      label: "Extra details"
+      description: "If installing from source or docker, please specify your distro or docker setup."
+      placeholder: "e.g. Alpine Linux edge"
+  - type: input
+    id: version
+    attributes:
+      label: "Version"
+      description: "Which version of Akkoma are you running? If running develop, specify the commit hash."
+      placeholder: "e.g. 2022.11, 4e4bd248"
+  - type: input
+    id: postgres
+    attributes:
+      label: "PostgreSQL version"
+      placeholder: "14"
+      validations:
+        required: true
+  - type: markdown
+    attributes:
+      value: "# The issue"
+  - type: textarea
+    id: attempt
+    attributes:
+      label: "What were you trying to do?"
+      validations:
+        required: true
+  - type: textarea
+    id: expectation
+    attributes:
+      label: "What did you expect to happen?"
+      validations:
+        required: true
+  - type: textarea
+    id: reality
+    attributes:
+      label: "What actually happened?"
+      validations:
+        required: true
+  - type: textarea
+    id: logs
+    attributes:
+      label: "Logs"
+      description: "Please copy and paste any relevant log output, if applicable."
+      render: shell
+  - type: dropdown
+    id: severity
+    attributes:
+      label: "Severity"
+      description: "Does this issue prevent you from using the software as normal?"
+      options:
+        - "I cannot use the software"
+        - "I cannot use it as easily as I'd like"
+        - "I can manage"
+      validations:
+        required: true
+  - type: checkboxes
+    id: searched
+    attributes:
+      label: "Have you searched for this issue?"
+      description: "Please double-check that your issue is not already being tracked on [the forums](https://meta.akkoma.dev) or [the issue tracker](https://akkoma.dev/AkkomaGang/akkoma/issues)."
+      options:
+        - label: "I have double-checked and have not found this issue mentioned anywhere."
--- a/.gitea/issue_template/feat.yml
+++ b/.gitea/issue_template/feat.yml
@ -0,0 +1,32 @@
+name: "Feature request"
+about: "I'd like something to be added to Akkoma"
+title: "[feat] "
+labels:
+- "feature request"
+
+body:
+  - type: markdown
+    attributes:
+      value: "Thanks for taking the time to request a new feature! Please be as concise and clear as you can in your proposal, so we could understand what you're going for."
+  - type: textarea
+    id: idea
+    attributes:
+      label: "The idea"
+      description: "What do you think you should be able to do in Akkoma?"
+      validations:
+        required: true
+  - type: textarea
+    id: reason
+    attributes:
+      label: "The reasoning"
+      description: "Why would this be a worthwhile feature? Does it solve any problems? Have people talked about wanting it?"
+      validations:
+        required: true
+  - type: checkboxes
+    id: searched
+    attributes:
+      label: "Have you searched for this feature request?"
+      description: "Please double-check that your issue is not already being tracked on [the forums](https://meta.akkoma.dev), [the issue tracker](https://akkoma.dev/AkkomaGang/akkoma/issues), or the one for [pleroma-fe](https://akkoma.dev/AkkomaGang/pleroma-fe/issues)."
+      options:
+        - label: "I have double-checked and have not found this feature request mentioned anywhere."
+        - label: "This feature is related to the Akkoma backend specifically, and not pleroma-fe."
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@ -53,14 +53,14 @@ services:
 pipeline:
  lint:
    <<: *on-pr-open
-    image: akkoma/ci-base:latest
+    image: akkoma/ci-base:1.14
    commands:
    - mix local.hex --force
    - mix local.rebar --force
    - mix format --check-formatted

  build:
-    image: akkoma/ci-base:latest
+    image: akkoma/ci-base:1.14
    <<: *on-pr-open
    environment:
      MIX_ENV: test
@ -75,7 +75,7 @@ pipeline:
      - mix compile

  test:
-    image: akkoma/ci-base:latest
+    image: akkoma/ci-base:1.14
    <<: *on-pr-open
    environment:
      MIX_ENV: test
@ -95,7 +95,7 @@ pipeline:

  # Canonical amd64
  ubuntu22:
-    image: hexpm/elixir:1.13.4-erlang-24.3.4.5-ubuntu-jammy-20220428
+    image: hexpm/elixir:1.14.2-erlang-25.1.2-ubuntu-jammy-20220428
    <<: *on-release
    environment:
      MIX_ENV: prod
@ -122,7 +122,7 @@ pipeline:
      - /bin/sh /entrypoint.sh

  debian-bullseye:
-    image: hexpm/elixir:1.13.4-erlang-24.3.4.5-debian-bullseye-20220801
+    image: hexpm/elixir:1.14.2-erlang-25.1.2-debian-bullseye-20221004
    <<: *on-release
    environment:
      MIX_ENV: prod
@ -151,7 +151,7 @@ pipeline:

  # Canonical amd64-musl
  musl:
-    image: hexpm/elixir:1.13.4-erlang-24.3.4.5-alpine-3.15.6
+    image: hexpm/elixir:1.14.2-erlang-25.1.2-alpine-3.16.2
    <<: *on-stable
    environment:
      MIX_ENV: prod
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -6,11 +6,39 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

 ## Unreleased

+## Removed
+- Non-finch HTTP adapters
+
+## Upgrade notes
+- Ensure `config :tesla, :adapter` is either unset, or set to `{Tesla.Adapter.Finch, name: MyFinch}` in your .exs config
+
+## 2022.12
+
 ## Added
 - Config: HTTP timeout options, :pool\_timeout and :receive\_timeout
+- Added statistic gathering about instances which do/don't have signed fetches when they request from us
+- Ability to set a default post expiry time, after which the post will be deleted. If used in concert with ActivityExpiration MRF, the expiry which comes _sooner_ will be applied.
+- Regular task to prune local transient activities
+- Task to manually run the transient prune job (pleroma.database prune\_task)
+- Ability to follow hashtags
+- Option to extend `reject` in MRF-Simple to apply to entire threads, where the originating instance is rejected
+- Extra information to failed HTTP requests

 ## Changed
 - MastoAPI: Accept BooleanLike input on `/api/v1/accounts/:id/follow` (fixes follows with mastodon.py)
+- Relays from akkoma are now off by default
+- NormalizeMarkup MRF is now on by default
+- Follow/Block/Mute imports now spin off into *n* tasks to avoid the oban timeout
+- Transient activities recieved from remote servers are no longer persisted in the database
+- Overhauled static-fe view for logged-out users
+- Blocked instances will now not be sent _any_ requests, even fetch ones that would get rejected by MRF anyhow
+
+## Removed
+- FollowBotPolicy
+- Passing of undo/block into MRF
+
+## Upgrade Notes
+- If you have an old instance, you will probably want to run `mix pleroma.database prune_task` in the foreground to catch it up with the history of your instance.

 ## 2022.11

--- a/1
+++ b/1
@ -1,6 +1,7 @@
 FROM hexpm/elixir:1.13.4-erlang-24.3.4.5-alpine-3.15.6

 ENV MIX_ENV=prod
+ENV ERL_EPMD_ADDRESS=127.0.0.1

 ARG HOME=/opt/akkoma

--- a/config/config.exs
+++ b/config/config.exs
@ -163,11 +163,6 @@
  format: "$metadata[$level] $message",
  metadata: [:request_id]

-config :quack,
-  level: :warn,
-  meta: [:all],
-  webhook_url: "https://hooks.slack.com/services/YOUR-KEY-HERE"
-
 config :mime, :types, %{
  "application/xml" => ["xml"],
  "application/xrd+xml" => ["xrd+xml"],
@ -391,7 +386,8 @@
  accept: [],
  avatar_removal: [],
  banner_removal: [],
-  reject_deletes: []
+  reject_deletes: [],
+  handle_threads: true

 config :pleroma, :mrf_keyword,
  reject: [],
@ -569,7 +565,8 @@
    new_users_digest: 1,
    mute_expire: 5,
    search_indexing: 10,
-    nodeinfo_fetcher: 1
+    nodeinfo_fetcher: 1,
+    database_prune: 1
  ],
  plugins: [
    Oban.Plugins.Pruner,
@ -577,7 +574,8 @@
  ],
  crontab: [
    {"0 0 * * 0", Pleroma.Workers.Cron.DigestEmailsWorker},
-    {"0 0 * * *", Pleroma.Workers.Cron.NewUsersDigestWorker}
+    {"0 0 * * *", Pleroma.Workers.Cron.NewUsersDigestWorker},
+    {"0 3 * * *", Pleroma.Workers.Cron.PruneDatabaseWorker}
  ]

 config :pleroma, :workers,
@ -605,7 +603,8 @@
    new_users_digest: :timer.seconds(10),
    mute_expire: :timer.seconds(5),
    search_indexing: :timer.seconds(5),
-    nodeinfo_fetcher: :timer.seconds(10)
+    nodeinfo_fetcher: :timer.seconds(10),
+    database_prune: :timer.minutes(10)
  ]

 config :pleroma, Pleroma.Formatter,
@ -651,6 +650,10 @@

 config :pleroma, Pleroma.Emails.Mailer, adapter: Swoosh.Adapters.Sendmail, enabled: false

+config :swoosh,
+  api_client: Swoosh.ApiClient.Finch,
+  finch_name: MyFinch
+
 config :pleroma, Pleroma.Emails.UserEmail,
  logo: nil,
  styling: %{
--- a/config/description.exs
+++ b/config/description.exs
@ -691,8 +691,8 @@
        key: :public,
        type: :boolean,
        description:
-          "Makes the client API in authenticated mode-only except for user-profiles." <>
-            " Useful for disabling the Local Timeline and The Whole Known Network. " <>
+          "Switching this on will allow unauthenticated users access to all public resources on your instance" <>
+            " Switching it off is useful for disabling the Local Timeline and The Whole Known Network. " <>
            " Note: when setting to `false`, please also check `:restrict_unauthenticated` setting."
      },
      %{
@ -723,7 +723,8 @@
          "text/plain",
          "text/html",
          "text/markdown",
-          "text/bbcode"
+          "text/bbcode",
+          "text/x.misskeymarkdown"
        ]
      },
      %{
@ -1117,45 +1118,6 @@
      }
    ]
  },
-  %{
-    group: :quack,
-    type: :group,
-    label: "Quack Logger",
-    description: "Quack-related settings",
-    children: [
-      %{
-        key: :level,
-        type: {:dropdown, :atom},
-        description: "Log level",
-        suggestions: [:debug, :info, :warn, :error]
-      },
-      %{
-        key: :meta,
-        type: {:list, :atom},
-        description: "Configure which metadata you want to report on",
-        suggestions: [
-          :application,
-          :module,
-          :file,
-          :function,
-          :line,
-          :pid,
-          :crash_reason,
-          :initial_call,
-          :registered_name,
-          :all,
-          :none
-        ]
-      },
-      %{
-        key: :webhook_url,
-        label: "Webhook URL",
-        type: :string,
-        description: "Configure the Slack incoming webhook",
-        suggestions: ["https://hooks.slack.com/services/YOUR-KEY-HERE"]
-      }
-    ]
-  },
  %{
    group: :pleroma,
    key: :frontend_configurations,
@ -1294,7 +1256,13 @@
            label: "Post Content Type",
            type: {:dropdown, :atom},
            description: "Default post formatting option",
-            suggestions: ["text/plain", "text/html", "text/markdown", "text/bbcode"]
+            suggestions: [
+              "text/plain",
+              "text/html",
+              "text/markdown",
+              "text/bbcode",
+              "text/x.misskeymarkdown"
+            ]
          },
          %{
            key: :redirectRootNoLogin,
@ -2998,8 +2966,7 @@
    key: :restrict_unauthenticated,
    label: "Restrict Unauthenticated",
    type: :group,
-    description:
-      "Disallow viewing timelines, user profiles and statuses for unauthenticated users.",
+    description: "Disallow unauthenticated viewing of timelines, user profiles and statuses.",
    children: [
      %{
        key: :timelines,
@ -3009,12 +2976,12 @@
          %{
            key: :local,
            type: :boolean,
-            description: "Disallow view public timeline."
+            description: "Disallow viewing the public timeline."
          },
          %{
            key: :federated,
            type: :boolean,
-            description: "Disallow view federated timeline."
+            description: "Disallow viewing the whole known network timeline."
          }
        ]
      },
@ -3026,29 +2993,29 @@
          %{
            key: :local,
            type: :boolean,
-            description: "Disallow view local user profiles."
+            description: "Disallow viewing local user profiles."
          },
          %{
            key: :remote,
            type: :boolean,
-            description: "Disallow view remote user profiles."
+            description: "Disallow viewing remote user profiles."
          }
        ]
      },
      %{
        key: :activities,
        type: :map,
-        description: "Settings for statuses.",
+        description: "Settings for posts.",
        children: [
          %{
            key: :local,
            type: :boolean,
-            description: "Disallow view local statuses."
+            description: "Disallow viewing local posts."
          },
          %{
            key: :remote,
            type: :boolean,
-            description: "Disallow view remote statuses."
+            description: "Disallow viewing remote posts."
          }
        ]
      }
--- a/docker-resources/env.example
+++ b/docker-resources/env.example
@ -1,4 +1,5 @@
 MIX_ENV=prod
+ERL_EPMD_ADDRESS=127.0.0.1
 DB_NAME=akkoma
 DB_USER=akkoma
 DB_PASS=akkoma
--- a/docs/Pipfile.lock
+++ b/docs/Pipfile.lock
@ -19,7 +19,7 @@
                "sha256:0d9c601124e5a6ba9712dbc60d9c53c21e34f5f641fe83002317394311bdce14",
                "sha256:90c1a32f1d68f940488354e36370f6cca89f0f106db09518524c88d6ed83f382"
            ],
-            "markers": "python_version >= '3.6'",
+            "markers": "python_full_version >= '3.6.0'",
            "version": "==2022.9.24"
        },
        "charset-normalizer": {
@ -27,7 +27,7 @@
                "sha256:5a3d016c7c547f69d6f81fb0db9449ce888b418b5b9952cc5e6e66843e9dd845",
                "sha256:83e9a75d1911279afd89352c68b45348559d1fc0506b054b346651b5e7fee29f"
            ],
-            "markers": "python_version >= '3.6'",
+            "markers": "python_full_version >= '3.6.0'",
            "version": "==2.1.1"
        },
        "click": {
@ -66,15 +66,16 @@
                "sha256:cbb516f16218e643d8e0a95b309f77eb118cb138d39a4f27851e6a63581db874",
                "sha256:f5da449a6e1c989a4cea2631aa8ee67caa5a2ef855d551c88f9e309f4634c621"
            ],
-            "markers": "python_version >= '3.6'",
+            "markers": "python_full_version >= '3.6.0'",
            "version": "==3.3.7"
        },
        "markdown-include": {
            "hashes": [
-                "sha256:a06183b7c7225e73112737acdc6fe0ac0686c39457234eeb5ede23881fed001d"
+                "sha256:b8f6b6f4e8b506cbe773d7e26c74a97d1354c35f3a3452d3449140a8f578d665",
+                "sha256:d12fb51500c46334a53608635035c78b7d8ad7f772566f70b8a6a9b2ef2ddbf5"
            ],
            "index": "pypi",
-            "version": "==0.7.0"
+            "version": "==0.8.0"
        },
        "markupsafe": {
            "hashes": [
@ -127,7 +128,7 @@
                "sha256:0096d52e9dad9939c3d975a774666af186eda617e6ca84df4c94dec30004f2a8",
                "sha256:70775750742b25c0d8f36c55aed03d24c3384d17c951b3175d898bd778ef0307"
            ],
-            "markers": "python_version >= '3.6'",
+            "markers": "python_full_version >= '3.6.0'",
            "version": "==1.3.4"
        },
        "mkdocs": {
@ -140,26 +141,26 @@
        },
        "mkdocs-material": {
            "hashes": [
-                "sha256:143ea55843b3747b640e1110824d91e8a4c670352380e166e64959f9abe98862",
-                "sha256:45eeabb23d2caba8fa3b85c91d9ec8e8b22add716e9bba8faf16d56af8aa5622"
+                "sha256:b0ea0513fd8cab323e8a825d6692ea07fa83e917bb5db042e523afecc7064ab7",
+                "sha256:c907b4b052240a5778074a30a78f31a1f8ff82d7012356dc26898b97559f082e"
            ],
            "index": "pypi",
-            "version": "==8.5.9"
+            "version": "==8.5.11"
        },
        "mkdocs-material-extensions": {
            "hashes": [
-                "sha256:96ca979dae66d65c2099eefe189b49d5ac62f76afb59c38e069ffc7cf3c131ec",
-                "sha256:bcc2e5fc70c0ec50e59703ee6e639d87c7e664c0c441c014ea84461a90f1e902"
+                "sha256:9c003da71e2cc2493d910237448c672e00cefc800d3d6ae93d2fc69979e3bd93",
+                "sha256:e41d9f38e4798b6617ad98ca8f7f1157b1e4385ac1459ca1e4ea219b556df945"
            ],
            "markers": "python_version >= '3.7'",
-            "version": "==1.1"
+            "version": "==1.1.1"
        },
        "packaging": {
            "hashes": [
                "sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb",
                "sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522"
            ],
-            "markers": "python_version >= '3.6'",
+            "markers": "python_full_version >= '3.6.0'",
            "version": "==21.3"
        },
        "pygments": {
@ -167,16 +168,16 @@
                "sha256:56a8508ae95f98e2b9bdf93a6be5ae3f7d8af858b43e02c5a2ff083726be40c1",
                "sha256:f643f331ab57ba3c9d89212ee4a2dabc6e94f117cf4eefde99a0574720d14c42"
            ],
-            "markers": "python_version >= '3.6'",
+            "markers": "python_full_version >= '3.6.0'",
            "version": "==2.13.0"
        },
        "pymdown-extensions": {
            "hashes": [
-                "sha256:1bd4a173095ef8c433b831af1f3cb13c10883be0c100ae613560668e594651f7",
-                "sha256:8e62688a8b1128acd42fa823f3d429d22f4284b5e6dd4d3cd56721559a5a211b"
+                "sha256:0f8fb7b74a37a61cc34e90b2c91865458b713ec774894ffad64353a5fce85cfc",
+                "sha256:ac698c15265680db5eb13cd4342abfcde2079ac01e5486028f47a1b41547b859"
            ],
            "markers": "python_version >= '3.7'",
-            "version": "==9.8"
+            "version": "==9.9"
        },
        "pyparsing": {
            "hashes": [
@ -237,7 +238,7 @@
                "sha256:e61ceaab6f49fb8bdfaa0f92c4b57bcfbea54c09277b1b4f7ac376bfb7a7c174",
                "sha256:f84fbc98b019fef2ee9a1cb3ce93e3187a6df0b2538a651bfb890254ba9f90b5"
            ],
-            "markers": "python_version >= '3.6'",
+            "markers": "python_full_version >= '3.6.0'",
            "version": "==6.0"
        },
        "pyyaml-env-tag": {
@ -245,7 +246,7 @@
                "sha256:70092675bda14fdec33b31ba77e7543de9ddc88f2e5b99160396572d11525bdb",
                "sha256:af31106dec8a4d68c60207c1886031cbf839b68aa7abccdb19868200532c2069"
            ],
-            "markers": "python_version >= '3.6'",
+            "markers": "python_full_version >= '3.6.0'",
            "version": "==0.1"
        },
        "requests": {
@ -266,42 +267,45 @@
        },
        "urllib3": {
            "hashes": [
-                "sha256:3fa96cf423e6987997fc326ae8df396db2a8b7c667747d47ddd8ecba91f4a74e",
-                "sha256:b930dd878d5a8afb066a637fbb35144fe7901e3b209d1cd4f524bd0e9deee997"
+                "sha256:47cc05d99aaa09c9e72ed5809b60e7ba354e64b59c9c173ac3018642d8bb41fc",
+                "sha256:c083dd0dce68dbfbe1129d5271cb90f9447dea7d52097c6e0126120c521ddea8"
            ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5' and python_version < '4'",
-            "version": "==1.26.12"
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'",
+            "version": "==1.26.13"
        },
        "watchdog": {
            "hashes": [
-                "sha256:083171652584e1b8829581f965b9b7723ca5f9a2cd7e20271edf264cfd7c1412",
-                "sha256:117ffc6ec261639a0209a3252546b12800670d4bf5f84fbd355957a0595fe654",
-                "sha256:186f6c55abc5e03872ae14c2f294a153ec7292f807af99f57611acc8caa75306",
-                "sha256:195fc70c6e41237362ba720e9aaf394f8178bfc7fa68207f112d108edef1af33",
-                "sha256:226b3c6c468ce72051a4c15a4cc2ef317c32590d82ba0b330403cafd98a62cfd",
-                "sha256:247dcf1df956daa24828bfea5a138d0e7a7c98b1a47cf1fa5b0c3c16241fcbb7",
-                "sha256:255bb5758f7e89b1a13c05a5bceccec2219f8995a3a4c4d6968fe1de6a3b2892",
-                "sha256:43ce20ebb36a51f21fa376f76d1d4692452b2527ccd601950d69ed36b9e21609",
-                "sha256:4f4e1c4aa54fb86316a62a87b3378c025e228178d55481d30d857c6c438897d6",
-                "sha256:5952135968519e2447a01875a6f5fc8c03190b24d14ee52b0f4b1682259520b1",
-                "sha256:64a27aed691408a6abd83394b38503e8176f69031ca25d64131d8d640a307591",
-                "sha256:6b17d302850c8d412784d9246cfe8d7e3af6bcd45f958abb2d08a6f8bedf695d",
-                "sha256:70af927aa1613ded6a68089a9262a009fbdf819f46d09c1a908d4b36e1ba2b2d",
-                "sha256:7a833211f49143c3d336729b0020ffd1274078e94b0ae42e22f596999f50279c",
-                "sha256:8250546a98388cbc00c3ee3cc5cf96799b5a595270dfcfa855491a64b86ef8c3",
-                "sha256:97f9752208f5154e9e7b76acc8c4f5a58801b338de2af14e7e181ee3b28a5d39",
-                "sha256:9f05a5f7c12452f6a27203f76779ae3f46fa30f1dd833037ea8cbc2887c60213",
-                "sha256:a735a990a1095f75ca4f36ea2ef2752c99e6ee997c46b0de507ba40a09bf7330",
-                "sha256:ad576a565260d8f99d97f2e64b0f97a48228317095908568a9d5c786c829d428",
-                "sha256:b530ae007a5f5d50b7fbba96634c7ee21abec70dc3e7f0233339c81943848dc1",
-                "sha256:bfc4d351e6348d6ec51df007432e6fe80adb53fd41183716017026af03427846",
-                "sha256:d3dda00aca282b26194bdd0adec21e4c21e916956d972369359ba63ade616153",
-                "sha256:d9820fe47c20c13e3c9dd544d3706a2a26c02b2b43c993b62fcd8011bcc0adb3",
-                "sha256:ed80a1628cee19f5cfc6bb74e173f1b4189eb532e705e2a13e3250312a62e0c9",
-                "sha256:ee3e38a6cc050a8830089f79cbec8a3878ec2fe5160cdb2dc8ccb6def8552658"
+                "sha256:1893d425ef4fb4f129ee8ef72226836619c2950dd0559bba022b0818c63a7b60",
+                "sha256:1a410dd4d0adcc86b4c71d1317ba2ea2c92babaf5b83321e4bde2514525544d5",
+                "sha256:1f2b0665c57358ce9786f06f5475bc083fea9d81ecc0efa4733fd0c320940a37",
+                "sha256:1f8eca9d294a4f194ce9df0d97d19b5598f310950d3ac3dd6e8d25ae456d4c8a",
+                "sha256:27e49268735b3c27310883012ab3bd86ea0a96dcab90fe3feb682472e30c90f3",
+                "sha256:28704c71afdb79c3f215c90231e41c52b056ea880b6be6cee035c6149d658ed1",
+                "sha256:2ac0bd7c206bb6df78ef9e8ad27cc1346f2b41b1fef610395607319cdab89bc1",
+                "sha256:2af1a29fd14fc0a87fb6ed762d3e1ae5694dcde22372eebba50e9e5be47af03c",
+                "sha256:3a048865c828389cb06c0bebf8a883cec3ae58ad3e366bcc38c61d8455a3138f",
+                "sha256:441024df19253bb108d3a8a5de7a186003d68564084576fecf7333a441271ef7",
+                "sha256:56fb3f40fc3deecf6e518303c7533f5e2a722e377b12507f6de891583f1b48aa",
+                "sha256:619d63fa5be69f89ff3a93e165e602c08ed8da402ca42b99cd59a8ec115673e1",
+                "sha256:74535e955359d79d126885e642d3683616e6d9ab3aae0e7dcccd043bd5a3ff4f",
+                "sha256:76a2743402b794629a955d96ea2e240bd0e903aa26e02e93cd2d57b33900962b",
+                "sha256:83cf8bc60d9c613b66a4c018051873d6273d9e45d040eed06d6a96241bd8ec01",
+                "sha256:920a4bda7daa47545c3201a3292e99300ba81ca26b7569575bd086c865889090",
+                "sha256:9e99c1713e4436d2563f5828c8910e5ff25abd6ce999e75f15c15d81d41980b6",
+                "sha256:a5bd9e8656d07cae89ac464ee4bcb6f1b9cecbedc3bf1334683bed3d5afd39ba",
+                "sha256:ad0150536469fa4b693531e497ffe220d5b6cd76ad2eda474a5e641ee204bbb6",
+                "sha256:af4b5c7ba60206759a1d99811b5938ca666ea9562a1052b410637bb96ff97512",
+                "sha256:c7bd98813d34bfa9b464cf8122e7d4bec0a5a427399094d2c17dd5f70d59bc61",
+                "sha256:ceaa9268d81205876bedb1069f9feab3eccddd4b90d9a45d06a0df592a04cae9",
+                "sha256:cf05e6ff677b9655c6e9511d02e9cc55e730c4e430b7a54af9c28912294605a4",
+                "sha256:d0fb5f2b513556c2abb578c1066f5f467d729f2eb689bc2db0739daf81c6bb7e",
+                "sha256:d6ae890798a3560688b441ef086bb66e87af6b400a92749a18b856a134fc0318",
+                "sha256:e5aed2a700a18c194c39c266900d41f3db0c1ebe6b8a0834b9995c835d2ca66e",
+                "sha256:e722755d995035dd32177a9c633d158f2ec604f2a358b545bba5bed53ab25bca",
+                "sha256:ed91c3ccfc23398e7aa9715abf679d5c163394b8cad994f34f156d57a7c163dc"
            ],
-            "markers": "python_version >= '3.6'",
-            "version": "==2.1.9"
+            "markers": "python_full_version >= '3.6.0'",
+            "version": "==2.2.0"
        }
    },
    "develop": {}
--- a/docs/docs/administration/CLI_tasks/database.md
+++ b/docs/docs/administration/CLI_tasks/database.md
@ -159,3 +159,23 @@ Change `default_text_search_config` for database and (if necessary) text_search_
    ```

 See [PostgreSQL documentation](https://www.postgresql.org/docs/current/textsearch-configuration.html) and `docs/configuration/howto_search_cjk.md` for more detail.
+
+## Pruning old activities
+
+Over time, transient `Delete` activities and `Tombstone` objects
+can accumulate in your database, inflating its size. This is not ideal. 
+There is a periodic task to prune these transient objects, 
+but on first run this may take a while on older instances to catch up
+to the current day.
+
+=== "OTP"
+
+    ```sh
+    ./bin/pleroma_ctl database prune_task
+    ```
+
+=== "From Source"
+
+    ```sh
+    mix pleroma.database prune_task
+    ```
--- a/docs/docs/administration/CLI_tasks/diagnostics.md
+++ b/docs/docs/administration/CLI_tasks/diagnostics.md
@ -0,0 +1,30 @@
+# Diagnostics
+
+A few tasks to help with debugging, troubleshooting, and diagnosing problems.
+
+They mostly relate to common postgres queries. 
+
+## Home timeline query plan
+
+This task will print a query plan for the home timeline of a given user.
+
+=== "OTP"
+
+    `./bin/pleroma_ctl diagnostics home_timeline <nickname>`
+
+=== "From Source"
+
+    `mix pleroma.diagnostics home_timeline <nickname>`
+
+## User timeline query plan
+
+This task will print a query plan for the user timeline of a given user,
+from the perspective of another given user.
+
+=== "OTP"
+
+    `./bin/pleroma_ctl diagnostics user_timeline <nickname> <viewing_nickname>`
+
+=== "From Source"
+    
+    `mix pleroma.diagnostics user_timeline <nickname> <viewing_nickname>`
--- a/docs/docs/administration/backup.md
+++ b/docs/docs/administration/backup.md
@ -4,38 +4,62 @@

 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_db> --format=custom -f </path/to/backup_location/akkoma.pgdump>` (make sure the postgres user has write access to the destination file)
-4. Copy `akkoma.pgdump`, `config/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.
+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 config files.  
+[²]: If you've installed using OTP, you need `config/config.exs` instead of `config/prod.secret.exs`.  
+
 ## Restore/Move

 1. Optionally reinstall Akkoma (either on the same server or on another server if you want to move servers).
 2. Stop the Akkoma service.
 3. Go to the working directory of Akkoma (default is `/opt/akkoma`)
 4. Copy the above mentioned files back to their original position.
-5. Drop the existing database and user if restoring in-place. `sudo -Hu postgres psql -c 'DROP DATABASE <akkoma_db>;';` `sudo -Hu postgres psql -c 'DROP USER <akkoma_db>;'`
-6. Restore the database schema and akkoma postgres role the with the original `setup_db.psql` if you have it: `sudo -Hu postgres psql -f config/setup_db.psql`.
-
-  Alternatively, run the `mix pleroma.instance gen` task again. You can ignore most of the questions, but make the database user, name, and password the same as found in your backup of `config/prod.secret.exs`. Then run the restoration of the akkoma role and schema with of the generated `config/setup_db.psql` as instructed above. You may delete the `config/generated_config.exs` file as it is not needed.
-
-7. Now restore the Akkoma instance's data into the empty database schema: `sudo -Hu postgres pg_restore -d <akkoma_db> -v -1 </path/to/backup_location/akkoma.pgdump>`
-8. If you installed a newer Akkoma version, you should run `mix ecto.migrate`[^1]. This task performs database migrations, if there were any.
+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 `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/akkoma.nginx` config sample or reference the Akkoma installation guide for your OS which contains the Nginx configuration instructions.

-[^1]: Prefix with `MIX_ENV=prod` to run it using the production config 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.  
+[³]: `pg_restore` will add data before adding indexes. The indexes are added in alphabetical order. There's one index, `activities_visibility_index` which may take a long time because it can't make use of an index that's only added later. You can significantly speed up restoration by skipping this index and add it afterwards. For that, you can do the following (we assume the akkoma.pgdump is in the directory you're running the commands):  
+
+```sh
+pg_restore -l akkoma.pgdump > db.list
+
+# Comment out the step for creating activities_visibility_index by adding a semi colon at the start of the line
+sed -i -E 's/(.*activities_visibility_index.*)/;\1/' db.list
+
+# We restore the database using the db.list list-file
+sudo -Hu postgres pg_restore -L db.list -d akkoma -v -1 akkoma.pgdump
+
+# You can see the sql statement with which to create the index using
+grep -Eao 'CREATE INDEX activities_visibility_index.*' akkoma.pgdump
+
+# Then create the index manually
+# Make sure that the command to create is correct! You never know it has changed since writing this guide
+sudo -Hu postgres psql -d pleroma_ynh -c "CREATE INDEX activities_visibility_index ON public.activities USING btree (public.activity_visibility(actor, recipients, data), id DESC NULLS LAST) WHERE ((data ->> 'type'::text) = 'Create'::text);"
+```
+[⁴]: Prefix with `MIX_ENV=prod` to run it using the production config file.  

 ## Remove

 1. Optionally you can remove the users of your instance. This will trigger delete requests for their accounts and posts. Note that this is 'best effort' and doesn't mean that all traces of your instance will be gone from the fediverse.
    * You can do this from the admin-FE where you can select all local users and delete the accounts using the *Moderate multiple users* dropdown.
-    * You can also list local users and delete them individualy using the CLI tasks for [Managing users](./CLI_tasks/user.md).
+    * You can also list local users and delete them individually using the CLI tasks for [Managing users](./CLI_tasks/user.md).
 2. Stop the Akkoma service `systemctl stop akkoma`
-3. Disable akkoma from systemd `systemctl disable akkoma`
+3. Disable Akkoma from systemd `systemctl disable akkoma`
 4. Remove the files and folders you created during installation (see installation guide). This includes the akkoma, nginx and systemd files and folders.
 5. Reload nginx now that the configuration is removed `systemctl reload nginx`
-6. Remove the database and database user `sudo -Hu postgres psql -c 'DROP DATABASE <akkoma_db>;';` `sudo -Hu postgres psql -c 'DROP USER <akkoma_db>;'`
+6. Remove the database and database user[¹] `sudo -Hu postgres psql -c 'DROP DATABASE akkoma;';` `sudo -Hu postgres psql -c 'DROP USER akkoma;'`
 7. Remove the system user `userdel akkoma`
 8. Remove the dependencies that you don't need anymore (see installation guide). Make sure you don't remove packages that are still needed for other software that you have running!
+
+[¹]: We assume the database name and user are both "akkoma". If not, you can find the correct name in your config files.  
--- a/docs/docs/configuration/cheatsheet.md
+++ b/docs/docs/configuration/cheatsheet.md
@ -33,7 +33,8 @@ To add configuration to your config file, you can copy it from the base config.
 * `federation_incoming_replies_max_depth`: Max. depth of reply-to activities fetching on incoming federation, to prevent out-of-memory situations while fetching very long threads. If set to `nil`, threads of any depth will be fetched. Lower this value if you experience out-of-memory crashes.
 * `federation_reachability_timeout_days`: Timeout (in days) of each external federation target being unreachable prior to pausing federating to it.
 * `allow_relay`: Permits remote instances to subscribe to all public posts of your instance. This may increase the visibility of your instance.
-* `public`: Makes the client API in authenticated mode-only except for user-profiles. Useful for disabling the Local Timeline and The Whole Known Network. Note that there is a dependent setting restricting or allowing unauthenticated access to specific resources, see `restrict_unauthenticated` for more details.
+* `public`: Allows unauthenticated access to public resources on your instance. This is essentially used as the default value for `:restrict_unauthenticated`. 
+   See `restrict_unauthenticated` for more details.
 * `quarantined_instances`: *DEPRECATED* ActivityPub instances where activities will not be sent. They can still reach there via other means, we just won't send them.
 * `allowed_post_formats`: MIME-type list of formats allowed to be posted (transformed into HTML).
 * `extended_nickname_format`: Set to `true` to use extended local nicknames format (allows underscores/dashes). This will break federation with
@ -120,6 +121,8 @@ To add configuration to your config file, you can copy it from the base config.
    * `Pleroma.Web.ActivityPub.MRF.FollowBotPolicy`: Automatically follows newly discovered users from the specified bot account. Local accounts, locked accounts, and users with "#nobot" in their bio are respected and excluded from being followed.
    * `Pleroma.Web.ActivityPub.MRF.AntiFollowbotPolicy`: Drops follow requests from followbots. Users can still allow bots to follow them by first following the bot.
    * `Pleroma.Web.ActivityPub.MRF.KeywordPolicy`: Rejects or removes from the federated timeline or replaces keywords. (See [`:mrf_keyword`](#mrf_keyword)).
+    * `Pleroma.Web.ActivityPub.MRF.NormalizeMarkup`: Pass inbound HTML through a scrubber to make sure it doesn't have anything unusual in it. On by default, cannot be turned off.
+    * `Pleroma.Web.ActivityPub.MRF.InlineQuotePolicy`: Append a link to a post that quotes another post with the link to the quoted post, to ensure that software that does not understand quotes can have full context. On by default, cannot be turned off.
 * `transparency`: Make the content of your Message Rewrite Facility settings public (via nodeinfo).
 * `transparency_exclusions`: Exclude specific instance names from MRF transparency.  The use of the exclusions feature will be disclosed in nodeinfo as a boolean value.
 * `transparency_obfuscate_domains`: Show domains with `*` in the middle, to censor them if needed. For example, `ridingho.me` will show as `rid*****.me`
@ -218,11 +221,6 @@ Notes:
 - The hashtags in the configuration do not have a leading `#`.
 - This MRF Policy is always enabled, if you want to disable it you have to set empty lists

-#### :mrf_follow_bot
-
-* `follower_nickname`: The name of the bot account to use for following newly discovered users. Using `followbot` or similar is strongly suggested.
-
-
 ### :activitypub
 * `unfollow_blocked`: Whether blocks result in people getting unfollowed
 * `outgoing_blocks`: Whether to federate blocks to other instances
@ -530,54 +528,6 @@ Available caches:
 * `user_agent`: what user agent should we use? (default: `:default`), must be string or `:default`
 * `adapter`: array of adapter options

-### :hackney_pools
-
-Advanced. Tweaks Hackney (http client) connections pools.
-
-There's three pools used:
-
-* `:federation` for the federation jobs.
-  You may want this pool max_connections to be at least equal to the number of federator jobs + retry queue jobs.
-* `:media` for rich media, media proxy
-* `:upload` for uploaded media (if using a remote uploader and `proxy_remote: true`)
-
-For each pool, the options are:
-
-* `max_connections` - how much connections a pool can hold
-* `timeout` - retention duration for connections
-
-
-### :connections_pool
-
-*For `gun` adapter*
-
-Settings for HTTP connection pool.
-
-* `:connection_acquisition_wait` - Timeout to acquire a connection from pool.The total max time is this value multiplied by the number of retries.
-* `connection_acquisition_retries` - Number of attempts to acquire the connection from the pool if it is overloaded. Each attempt is timed `:connection_acquisition_wait` apart.
-* `:max_connections` - Maximum number of connections in the pool.
-* `:connect_timeout` - Timeout to connect to the host.
-* `:reclaim_multiplier` - Multiplied by `:max_connections` this will be the maximum number of idle connections that will be reclaimed in case the pool is overloaded.
-
-### :pools
-
-*For `gun` adapter*
-
-Settings for request pools. These pools are limited on top of `:connections_pool`.
-
-There are four pools used:
-
-* `:federation` for the federation jobs. You may want this pool's max_connections to be at least equal to the number of federator jobs + retry queue jobs.
-* `:media` - for rich media, media proxy.
-* `:upload` - for proxying media when a remote uploader is used and `proxy_remote: true`.
-* `:default` - for other requests.
-
-For each pool, the options are:
-
-* `:size` - limit to how much requests can be concurrently executed.
-* `:recv_timeout` - timeout while `gun` will wait for response
-* `:max_waiting` - limit to how much requests can be waiting for others to finish, after this is reached, subsequent requests will be dropped.
-
 ## Captcha

 ### Pleroma.Captcha
@ -835,17 +785,8 @@ config :logger, :ex_syslogger,
  level: :info,
  ident: "pleroma",
  format: "$metadata[$level] $message"
-
-config :quack,
-  level: :warn,
-  meta: [:all],
-  webhook_url: "https://hooks.slack.com/services/YOUR-API-KEY-HERE"
 ```

-See the [Quack Github](https://github.com/azohra/quack) for more details
-
-
-
 ## Database options

 ### RUM indexing for full text search
@ -1092,7 +1033,7 @@ config :pleroma, :database_config_whitelist, [

 ### :restrict_unauthenticated

-Restrict access for unauthenticated users to timelines (public and federated), user profiles and statuses.
+Restrict access for unauthenticated users to timelines (public and federated), user profiles and posts.

 * `timelines`: public and federated timelines
  * `local`: public timeline
@ -1100,13 +1041,24 @@ Restrict access for unauthenticated users to timelines (public and federated), u
 * `profiles`: user profiles
  * `local`
  * `remote`
-* `activities`: statuses
+* `activities`: posts
  * `local`
  * `remote`

-Note: when `:instance, :public` is set to `false`, all `:restrict_unauthenticated` items be effectively set to `true` by default. If you'd like to allow unauthenticated access to specific API endpoints on a private instance, please explicitly set `:restrict_unauthenticated` to non-default value in `config/prod.secret.exs`.
+#### When :instance, :public is `true`

-Note: setting `restrict_unauthenticated/timelines/local` to `true` has no practical sense if `restrict_unauthenticated/timelines/federated` is set to `false` (since local public activities will still be delivered to unauthenticated users as part of federated timeline).
+When your instance is in "public" mode, all public resources (users, posts, timelines) are accessible to unauthenticated users.
+
+Turning any of the `:restrict_unauthenticated` options to `true` will restrict access to the corresponding resources.
+
+#### When :instance, :public is `false`
+
+When `:instance, :public` is set to `false`, all of the `:restrict_unauthenticated` options will effectively be set to `true` by default,
+meaning that only authenticated users will be able to access the corresponding resources.
+
+If you'd like to allow unauthenticated access to specific resources, you can turn these settings to `false`.
+
+**Note**: setting `restrict_unauthenticated/timelines/local` to `true` has no practical sense if `restrict_unauthenticated/timelines/federated` is set to `false` (since local public activities will still be delivered to unauthenticated users as part of federated timeline).

 ## Pleroma.Web.ApiSpec.CastAndValidate

--- a/docs/docs/configuration/hardening.md
+++ b/docs/docs/configuration/hardening.md
@ -55,11 +55,11 @@ An additional “Strict transport security” header will be sent with the confi

 > Recommended value: `same-origin`

-If you click on a link, your browser’s request to the other site will include from where it is coming from. The “Referrer policy” header tells the browser how and if it should send this information. (see [Referrer policy](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Referrer-Policy))
+If you click on a link, your browser’s request to the other site will include from where it is coming from. The “Referrer policy” header tells the browser how and if it should send this information. (see [Referrer policy](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Referrer-Policy)). `no-referrer` can be used if a referrer is not needed for improved privacy.

 ## systemd

-A systemd unit example is provided at `installation/pleroma.service`.
+A systemd unit example is provided at `installation/akkoma.service`.

 ### PrivateTmp

--- a/docs/docs/configuration/integrations/howto_ejabberd.md
+++ b/docs/docs/configuration/integrations/howto_ejabberd.md
--- a/docs/docs/configuration/integrations/howto_mongooseim.md
+++ b/docs/docs/configuration/integrations/howto_mongooseim.md
--- a/docs/docs/configuration/mrf.md
+++ b/docs/docs/configuration/mrf.md
@ -15,18 +15,6 @@ The MRF provides user-configurable policies. The default policy is `NoOpPolicy`,

 It is possible to use multiple, active MRF policies at the same time.

-## Quarantine Instances
-
-You have the ability to prevent from private / followers-only messages from federating with specific instances. Which means they will only get the public or unlisted messages from your instance.
-
-If, for example, you're using `MIX_ENV=prod` aka using production mode, you would open your configuration file located in `config/prod.secret.exs` and edit or add the option under your `:instance` config object. Then you would specify the instance within quotes.
-
-```elixir
-config :pleroma, :instance,
-  [...]
-  quarantined_instances: ["instance.example", "other.example"]
-```
-
 ## Using `SimplePolicy`

 `SimplePolicy` is capable of handling most common admin tasks.
@ -41,7 +29,7 @@ config :pleroma, :mrf,

 Once `SimplePolicy` is enabled, you can configure various groups in the `:mrf_simple` config object. These groups are:

-* `reject`: Servers in this group will have their messages rejected.
+* `reject`: Servers in this group will have their messages rejected. Also outbound messages will not be sent to these servers.
 * `accept`: If not empty, only messages from these instances will be accepted (whitelist federation).
 * `media_nsfw`: Servers in this group will have the #nsfw tag and sensitive setting injected into incoming messages which contain media.
 * `media_removal`: Servers in this group will have media stripped from incoming messages.
--- a/docs/docs/configuration/optimisation/optimizing_beam.md
+++ b/docs/docs/configuration/optimisation/optimizing_beam.md
--- a/docs/docs/configuration/optimisation/varnish_cache.md
+++ b/docs/docs/configuration/optimisation/varnish_cache.md
@ -0,0 +1,54 @@
+# Using a Varnish Cache
+
+Varnish is a layer that sits between your web server and your backend application -
+it does something similar to nginx caching, but tends to be optimised for speed over
+all else.
+
+To set up a varnish cache, first you'll need to install varnish. 
+
+This will vary by distribution, and since this is a rather advanced guide,
+no copy-paste instructions are provided. It's probably in your distribution's
+package manager, though. `apt-get install varnish` and so on.
+
+Once you have varnish installed, you'll need to configure it to work with akkoma.
+
+Copy the configuration file to the varnish configuration directory:
+
+    cp installation/akkoma.vcl /etc/varnish/akkoma.vcl
+
+You may want to check if varnish added a `default.vcl` file to the same directory,
+if so you can just remove it without issue.
+
+Then boot up varnish, probably `systemctl start varnish` or `service varnish start`.
+
+Now you should be able to `curl -D- localhost:6081` and see a bunch of
+akkoma javascript.
+
+Once that's out of the way, we can point our webserver at varnish. This
+
+=== "Nginx"
+
+    upstream phoenix {
+        server 127.0.0.1:6081 max_fails=5 fail_timeout=60s;
+    }
+
+
+=== "Caddy"
+
+    reverse_proxy 127.0.0.1:6081
+
+Now hopefully it all works
+
+If you get a HTTPS redirect loop, you may need to remove this part of the VCL
+
+```vcl
+if (std.port(server.ip) != 443) {
+      set req.http.X-Forwarded-Proto = "http";
+      set req.http.x-redir = "https://" + req.http.host + req.url;
+      return (synth(750, ""));
+} else {
+  set req.http.X-Forwarded-Proto = "https";
+}
+```
+
+This will allow your webserver alone to handle redirects.
--- a/docs/docs/configuration/static_dir.md
+++ b/docs/docs/configuration/static_dir.md
@ -100,3 +100,12 @@ the `frontends` directory.
 ## Styling rendered pages

 To overwrite the CSS stylesheet of the OAuth form and other static pages, you can upload your own CSS file to `instance/static/static.css`. This will completely replace the CSS used by those pages, so it might be a good idea to copy the one from `priv/static/instance/static.css` and make your changes.
+
+## Overriding pleroma-fe styles
+
+To overwrite the CSS stylesheet of pleroma-fe, you can put a file at
+`$static_dir/static/custom.css` containing your styles. These will be loaded
+with the rest of the CSS.
+
+You will probably have to put `!important` on most/all your styles to override the
+default ones, due to the specificity precedence of CSS.
--- a/docs/docs/development/API/admin_api.md
+++ b/docs/docs/development/API/admin_api.md
@ -1056,14 +1056,13 @@ Most of the settings will be applied in `runtime`, this means that you don't nee

 Example of setting without keyword in value:
 ```elixir
-config :tesla, :adapter, Tesla.Adapter.Hackney
+config :tesla, :adapter, {Tesla.Adapter.Finch, name: MyFinch}
 ```

 List of settings which support only full update by key:
 ```elixir
@full_key_update [
    {:pleroma, :ecto_repos},
-    {:quack, :meta},
    {:mime, :types},
    {:cors_plug, [:max_age, :methods, :expose, :headers]},
    {:auto_linker, :opts},
@ -1083,22 +1082,6 @@ List of settings which support only full update by subkey:
  ]
 ```

-*Settings without explicit key must be sended in separate config object params.*
-```elixir
-config :quack,
-  level: :debug,
-  meta: [:all],
-  ...
-```
-```json
-{
-  "configs": [
-    {"group": ":quack", "key": ":level", "value": ":debug"},
-    {"group": ":quack", "key": ":meta", "value": [":all"]},
-    ...
-  ]
-}
-```
 - Request:

 ```json
--- a/docs/docs/images/akko_badday.png
+++ b/docs/docs/images/akko_badday.png
--- a/docs/docs/images/favicon.ico
+++ b/docs/docs/images/favicon.ico
--- a/docs/docs/images/favicon.png
+++ b/docs/docs/images/favicon.png
--- a/docs/docs/images/logo.png
+++ b/docs/docs/images/logo.png
--- a/docs/docs/installation/docker_en.md
+++ b/docs/docs/installation/docker_en.md
@ -51,7 +51,8 @@ mkdir pgdata
 ```

 This will ask you a few questions - the defaults are fine for most things,
-the database hostname is `db`, and you will want to set the ip to `0.0.0.0`.
+the database hostname is `db`, the database password is `akkoma`
+(not auto generated), and you will want to set the ip to `0.0.0.0`.

 Now we'll want to copy over the config it just created

--- a/docs/docs/installation/gentoo_en.md
+++ b/docs/docs/installation/gentoo_en.md
@ -18,6 +18,12 @@ dev-db/postgresql uuid

 You could opt to add `USE="uuid"` to `/etc/portage/make.conf` if you'd rather set this as a global USE flags, but this flags does unrelated things in other packages, so keep that in mind if you elect to do so.

+If you are planning to use `nginx`, as this guide suggests, you should also add the following flag to the same file.
+
+```text
+www-servers/nginx NGINX_MODULES_HTTP: slice
+```
+
 Double check your compiler flags in `/etc/portage/make.conf`. If you require any special compilation flags or would like to set up remote builds, now is the time to do so. Be sure that your CFLAGS and MAKEOPTS make sense for the platform you are using. It is not recommended to use above `-O2` or risky optimization flags for a production server.

 ### Installing a cron daemon
@ -262,7 +268,7 @@ Even if you are using S3, Akkoma needs someplace to store media posted on your i

 ```shell
 akkoma$ mkdir -p ~/akkoma/uploads
- ```
+```

 #### init.d service

@ -272,7 +278,9 @@ Even if you are using S3, Akkoma needs someplace to store media posted on your i
 # cp /home/akkoma/akkoma/installation/init.d/akkoma /etc/init.d/
 ```

-* Be sure to take a look at this service file and make sure that all paths fit your installation
+* Change the `/opt/akkoma` path in this file to `/home/akkoma/akkoma`
+
+* Be sure to take a look at this service file and make sure that all other paths fit your installation

 * Enable and start `akkoma`:

--- a/docs/mkdocs.yml
+++ b/docs/mkdocs.yml
@ -1,16 +1,32 @@
 site_name: Akkoma Documentation
 theme:
-  favicon: 'images/akko_badday.png'
+  favicon: 'images/favicon.ico'
  name: 'material'
  custom_dir: 'theme'
  # Disable google fonts
  font: false
-  logo: 'images/akko_badday.png'
+  logo: 'images/logo.png'
  features:
-    - tabs
+    - navigation.tabs
+    - toc.follow
+    - navigation.instant
+    - navigation.sections
  palette:
-    primary: 'deep purple'
-    accent: 'blue grey'
+    - media: "(prefers-color-scheme: light)"
+      scheme: default
+      toggle:
+        icon: material/brightness-7
+        name: Switch to dark mode
+      primary: 'deep purple'
+      accent: 'blue grey'
+
+    - media: "(prefers-color-scheme: dark)"
+      scheme: slate
+      toggle:
+        icon: material/brightness-4
+        name: Switch to light mode
+      primary: 'deep purple'
+      accent: 'blue grey'

 extra_css:
  - css/extra.css
@ -31,7 +47,8 @@ markdown_extensions:
  - pymdownx.tasklist:
      custom_checkbox: true
  - pymdownx.superfences
-  - pymdownx.tabbed
+  - pymdownx.tabbed:
+      alternate_style: true
  - pymdownx.details
  - markdown_include.include:
      base_path: docs
--- a/installation/akkoma.service
+++ b/installation/akkoma.service
@ -4,14 +4,19 @@ After=network.target postgresql.service

 [Service]
 ExecReload=/bin/kill $MAINPID
-KillMode=process
 Restart=on-failure

+; Uncomment this if you're on Arch Linux
+; Evironment="PATH=/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl"
+
 ; Name of the user that runs the Akkoma service.
 User=akkoma
 ; Declares that Akkoma runs in production mode.
 Environment="MIX_ENV=prod"

+; Don't listen epmd on 0.0.0.0
+Environment="ERL_EPMD_ADDRESS=127.0.0.1"
+
 ; 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/akkoma.supervisord
+++ b/installation/akkoma.supervisord
@ -12,7 +12,8 @@ environment =
  HOME=/home/akkoma,
  USER=akkoma,
  PATH="/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/home/akkoma/bin:%(ENV_PATH)s",
-  PWD=/home/akkoma/akkoma
+  PWD=/home/akkoma/akkoma,
+  ERL_EPMD_ADDRESS=127.0.0.1
 stdout_logfile=/home/akkoma/logs/stdout.log
 stdout_logfile_maxbytes=50MB
 stdout_logfile_backups=10
--- a/installation/akkoma.vcl
+++ b/installation/akkoma.vcl
@ -1,4 +1,5 @@
 # Recommended varnishncsa logging format: '%h %l %u %t "%m %{X-Forwarded-Proto}i://%{Host}i%U%q %H" %s %b "%{Referer}i" "%{User-agent}i"'
+# Please use Varnish 7.0+ for proper Range Requests / Chunked encoding support
 vcl 4.1;
 import std;

@ -22,11 +23,6 @@ sub vcl_recv {
      set req.http.X-Forwarded-Proto = "https";
    }

-    # CHUNKED SUPPORT
-    if (req.http.Range ~ "bytes=") {
-      set req.http.x-range = req.http.Range;
-    }
-
    # Pipe if WebSockets request is coming through
    if (req.http.upgrade ~ "(?i)websocket") {
      return (pipe);
@ -35,9 +31,9 @@ sub vcl_recv {
    # Allow purging of the cache
    if (req.method == "PURGE") {
      if (!client.ip ~ purge) {
-        return(synth(405,"Not allowed."));
+        return (synth(405,"Not allowed."));
      }
-      return(purge);
+      return (purge);
    }
 }

@ -53,17 +49,11 @@ sub vcl_backend_response {
      return (retry);
    }

-    # CHUNKED SUPPORT
-    if (bereq.http.x-range ~ "bytes=" && beresp.status == 206) {
-      set beresp.ttl = 10m;
-      set beresp.http.CR = beresp.http.content-range;
-    }
-
    # Bypass cache for large files
    # 50000000 ~ 50MB
    if (std.integer(beresp.http.content-length, 0) > 50000000) {
       set beresp.uncacheable = true;
-       return(deliver);
+       return (deliver);
    }

    # Don't cache objects that require authentication
@ -94,7 +84,7 @@ sub vcl_synth {
    if (resp.status == 750) {
      set resp.status = 301;
      set resp.http.Location = req.http.x-redir;
-      return(deliver);
+      return (deliver);
    }
 }

@ -106,25 +96,12 @@ sub vcl_pipe {
    }
 }

-sub vcl_hash {
-    # CHUNKED SUPPORT
-    if (req.http.x-range ~ "bytes=") {
-      hash_data(req.http.x-range);
-      unset req.http.Range;
-    }
-}
-
 sub vcl_backend_fetch {
    # Be more lenient for slow servers on the fediverse
    if (bereq.url ~ "^/proxy/") {
      set bereq.first_byte_timeout = 300s;
    }

-    # CHUNKED SUPPORT
-    if (bereq.http.x-range) {
-      set bereq.http.Range = bereq.http.x-range;
-    }
-
    if (bereq.retries == 0) {
        # Clean up the X-Varnish-Backend-503 flag that is used internally
        # to mark broken backend responses that should be retried.
@ -143,14 +120,6 @@ sub vcl_backend_fetch {
    }
 }

-sub vcl_deliver {
-    # CHUNKED SUPPORT
-    if (resp.http.CR) {
-      set resp.http.Content-Range = resp.http.CR;
-      unset resp.http.CR;
-    }
-}
-
 sub vcl_backend_error {
    # Retry broken backend responses.
    set bereq.http.X-Varnish-Backend-503 = "1";
--- a/installation/download-mastofe-build.sh
+++ b/installation/download-mastofe-build.sh
@ -1,48 +0,0 @@
-#!/bin/sh
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-project_id="74"
-project_branch="rebase/glitch-soc"
-static_dir="instance/static"
-# For bundling:
-# project_branch="pleroma"
-# static_dir="priv/static"
-
-if [ ! -d "${static_dir}" ]
-then
-	echo "Error: ${static_dir} directory is missing, are you sure you are running this script at the root of pleroma’s repository?"
-	exit 1
-fi
-
-last_modified="$(curl --fail -s -I 'https://git.pleroma.social/api/v4/projects/'${project_id}'/jobs/artifacts/'${project_branch}'/download?job=build' | grep '^Last-Modified:' | cut -d: -f2-)"
-
-echo "branch:${project_branch}"
-echo "Last-Modified:${last_modified}"
-
-artifact="mastofe.zip"
-
-if [ "${last_modified}x" = "x" ]
-then
-	echo "ERROR: Couldn't get the modification date of the latest build archive, maybe it expired, exiting..."
-	exit 1
-fi
-
-if [ -e mastofe.timestamp ] && [ "$(cat mastofe.timestamp)" = "${last_modified}" ]
-then
-	echo "MastoFE is up-to-date, exiting..."
-	exit 0
-fi
-
-curl --fail -c - "https://git.pleroma.social/api/v4/projects/${project_id}/jobs/artifacts/${project_branch}/download?job=build" -o "${artifact}" || exit
-
-# TODO: Update the emoji as well
-rm -fr "${static_dir}/sw.js" "${static_dir}/packs" || exit
-unzip -q "${artifact}" || exit
-
-cp public/assets/sw.js "${static_dir}/sw.js" || exit
-cp -r public/packs "${static_dir}/packs" || exit
-
-echo "${last_modified}" > mastofe.timestamp
-rm -fr public
-rm -i "${artifact}"
--- a/installation/freebsd/rc.d/akkoma
+++ b/installation/freebsd/rc.d/akkoma
@ -18,7 +18,8 @@ load_rc_config ${name}
 : ${akkoma_user:=akkoma}
 : ${akkoma_home:=$(getent passwd ${akkoma_user} | awk -F: '{print $6}')}
 : ${akkoma_chdir:="${akkoma_home}/akkoma"}
-: ${akkoma_env:="HOME=${akkoma_home} MIX_ENV=prod"}
+: ${akkoma_env:="HOME=${akkoma_home} MIX_ENV=prod ERL_EPMD_ADDRESS=127.0.0.1"}
+

 command=/usr/local/bin/elixir
 command_args="--erl \"-detached\" -S /usr/local/bin/mix phx.server"
--- a/installation/init.d/akkoma
+++ b/installation/init.d/akkoma
@ -31,6 +31,7 @@ else
 fi

 export MIX_ENV=prod
+export ERL_EPMD_ADDRESS=127.0.0.1

 depend() {
 	need nginx postgresql
--- a/installation/netbsd/rc.d/akkoma
+++ b/installation/netbsd/rc.d/akkoma
@ -14,7 +14,7 @@ start_precmd="ulimit -n unlimited"
 pidfile="/dev/null"

 akkoma_chdir="${akkoma_home}/akkoma"
-akkoma_env="HOME=${akkoma_home} MIX_ENV=prod"
+akkoma_env="HOME=${akkoma_home} MIX_ENV=prod ERL_EPMD_ADDRESS=127.0.0.1"

 check_pidfile()
 {
--- a/lib/mix/tasks/pleroma/database.ex
+++ b/lib/mix/tasks/pleroma/database.ex
@ -110,6 +110,14 @@ def run(["prune_objects" | args]) do
    end
  end

+  def run(["prune_task"]) do
+    start_pleroma()
+
+    nil
+    |> Pleroma.Workers.Cron.PruneDatabaseWorker.perform()
+    |> IO.inspect()
+  end
+
  def run(["fix_likes_collections"]) do
    start_pleroma()

--- a/lib/mix/tasks/pleroma/diagnostics.ex
+++ b/lib/mix/tasks/pleroma/diagnostics.ex
@ -0,0 +1,84 @@
+defmodule Mix.Tasks.Pleroma.Diagnostics do
+  alias Pleroma.Repo
+  alias Pleroma.User
+
+  require Logger
+  require Pleroma.Constants
+
+  import Mix.Pleroma
+  import Ecto.Query
+  use Mix.Task
+
+  def run(["http", url]) do
+    start_pleroma()
+
+    Pleroma.HTTP.get(url)
+    |> IO.inspect()
+  end
+
+  def run(["home_timeline", nickname]) do
+    start_pleroma()
+    user = Repo.get_by!(User, nickname: nickname)
+    Logger.info("Home timeline query #{user.nickname}")
+
+    followed_hashtags =
+      user
+      |> User.followed_hashtags()
+      |> Enum.map(& &1.id)
+
+    params =
+      %{limit: 20}
+      |> Map.put(:type, ["Create", "Announce"])
+      |> Map.put(:blocking_user, user)
+      |> Map.put(:muting_user, user)
+      |> Map.put(:reply_filtering_user, user)
+      |> Map.put(:announce_filtering_user, user)
+      |> Map.put(:user, user)
+      |> Map.put(:followed_hashtags, followed_hashtags)
+      |> Map.delete(:local)
+
+    list_memberships = Pleroma.List.memberships(user)
+    recipients = [user.ap_id | User.following(user)]
+
+    query =
+      Pleroma.Web.ActivityPub.ActivityPub.fetch_activities_query(
+        recipients ++ list_memberships,
+        params
+      )
+      |> limit(20)
+
+    Ecto.Adapters.SQL.explain(Repo, :all, query, analyze: true, timeout: :infinity)
+    |> 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)
+    Logger.info("User timeline query #{user.nickname}")
+
+    params =
+      %{limit: 20}
+      |> Map.put(:type, ["Create", "Announce"])
+      |> Map.put(:user, reading_user)
+      |> Map.put(:actor_id, user.ap_id)
+      |> Map.put(:pinned_object_ids, Map.keys(user.pinned_objects))
+
+    list_memberships = Pleroma.List.memberships(user)
+
+    recipients =
+      %{
+        godmode: params[:godmode],
+        reading_user: reading_user
+      }
+      |> Pleroma.Web.ActivityPub.ActivityPub.user_activities_recipients()
+
+    query =
+      (recipients ++ list_memberships)
+      |> Pleroma.Web.ActivityPub.ActivityPub.fetch_activities_query(params)
+      |> limit(20)
+
+    Ecto.Adapters.SQL.explain(Repo, :all, query, analyze: true, timeout: :infinity)
+    |> IO.puts()
+  end
+end
--- a/lib/mix/tasks/pleroma/instance.ex
+++ b/lib/mix/tasks/pleroma/instance.ex
@ -59,7 +59,7 @@ def run(["gen" | rest]) do
          get_option(
            options,
            :domain,
-            "What domain will your instance use? (e.g pleroma.soykaf.com)"
+            "What domain will your instance use? (e.g akkoma.example.com)"
          ),
          ":"
        ) ++ [443]
--- a/lib/mix/tasks/pleroma/user.ex
+++ b/lib/mix/tasks/pleroma/user.ex
@ -113,9 +113,11 @@ def run(["reset_password", nickname]) do
         {:ok, token} <- Pleroma.PasswordResetToken.create_token(user) do
      shell_info("Generated password reset token for #{user.nickname}")

-      IO.puts("URL: #{Pleroma.Web.Router.Helpers.reset_password_url(Pleroma.Web.Endpoint,
-      :reset,
-      token.token)}")
+      IO.puts(
+        "URL: #{Pleroma.Web.Router.Helpers.reset_password_url(Pleroma.Web.Endpoint,
+        :reset,
+        token.token)}"
+      )
    else
      _ ->
        shell_error("No local user #{nickname}")
@ -469,9 +471,15 @@ def run(["blocking", nickname]) do

  def run(["timeline_query", nickname]) do
    start_pleroma()
+
    params = %{local: true}

    with %User{local: true} = user <- User.get_cached_by_nickname(nickname) do
+      followed_hashtags =
+        user
+        |> User.followed_hashtags()
+        |> Enum.map(& &1.id)
+
      params =
        params
        |> Map.put(:type, ["Create", "Announce"])
@ -482,6 +490,7 @@ def run(["timeline_query", nickname]) do
        |> Map.put(:announce_filtering_user, user)
        |> Map.put(:user, user)
        |> Map.put(:local_only, params[:local])
+        |> Map.put(:hashtags, followed_hashtags)
        |> Map.delete(:local)

      _activities =
--- a/lib/pleroma/activity.ex
+++ b/lib/pleroma/activity.ex
@ -367,6 +367,14 @@ def following_requests_for_actor(%User{ap_id: ap_id}) do
    |> Repo.all()
  end

+  def follow_activity(%User{ap_id: ap_id}, %User{ap_id: followed_ap_id}) do
+    Queries.by_type("Follow")
+    |> where([a], a.actor == ^ap_id)
+    |> where([a], fragment("?->>'object' = ?", a.data, ^followed_ap_id))
+    |> where([a], fragment("?->>'state'", a.data) in ["pending", "accept"])
+    |> Repo.one()
+  end
+
  def restrict_deactivated_users(query) do
    query
    |> join(
--- a/lib/pleroma/activity/pruner.ex
+++ b/lib/pleroma/activity/pruner.ex
@ -0,0 +1,52 @@
+defmodule Pleroma.Activity.Pruner do
+  @moduledoc """
+  Prunes activities from the database.
+  """
+  @cutoff 30
+
+  alias Pleroma.Activity
+  alias Pleroma.Repo
+  import Ecto.Query
+
+  def prune_deletes do
+    before_time = cutoff()
+
+    from(a in Activity,
+      where: fragment("?->>'type' = ?", a.data, "Delete") and a.inserted_at < ^before_time
+    )
+    |> Repo.delete_all(timeout: :infinity)
+  end
+
+  def prune_undos do
+    before_time = cutoff()
+
+    from(a in Activity,
+      where: fragment("?->>'type' = ?", a.data, "Undo") and a.inserted_at < ^before_time
+    )
+    |> Repo.delete_all(timeout: :infinity)
+  end
+
+  def prune_removes do
+    before_time = cutoff()
+
+    from(a in Activity,
+      where: fragment("?->>'type' = ?", a.data, "Remove") and a.inserted_at < ^before_time
+    )
+    |> Repo.delete_all(timeout: :infinity)
+  end
+
+  def prune_stale_follow_requests do
+    before_time = cutoff()
+
+    from(a in Activity,
+      where:
+        fragment("?->>'type' = ?", a.data, "Follow") and a.inserted_at < ^before_time and
+          fragment("?->>'state' = ?", a.data, "reject")
+    )
+    |> Repo.delete_all(timeout: :infinity)
+  end
+
+  defp cutoff do
+    DateTime.utc_now() |> Timex.shift(days: -@cutoff)
+  end
+end
--- a/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@ -157,7 +157,8 @@ defp cachex_children do
      build_cachex("failed_proxy_url", limit: 2500),
      build_cachex("banned_urls", default_ttl: :timer.hours(24 * 30), limit: 5_000),
      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("instances", default_ttl: :timer.hours(24), ttl_interval: 1000, limit: 2500),
+      build_cachex("request_signatures", default_ttl: :timer.hours(24 * 30), limit: 3000)
    ]
  end

--- a/lib/pleroma/collections/fetcher.ex
+++ b/lib/pleroma/collections/fetcher.ex
@ -68,7 +68,7 @@ defp fetch_page_items(id, items \\ []) do
          items
        end
      else
-        {:error, "Object has been deleted"} ->
+        {:error, {"Object has been deleted", _, _}} ->
          items

        {:error, error} ->
--- a/lib/pleroma/config/deprecation_warnings.ex
+++ b/lib/pleroma/config/deprecation_warnings.ex
@ -25,7 +25,7 @@ defmodule Pleroma.Config.DeprecationWarnings do
  def check_simple_policy_tuples do
    has_strings =
      Config.get([:mrf_simple])
-      |> Enum.any?(fn {_, v} -> Enum.any?(v, &is_binary/1) end)
+      |> Enum.any?(fn {_, v} -> is_list(v) and Enum.any?(v, &is_binary/1) end)

    if has_strings do
      Logger.warn("""
@ -66,6 +66,7 @@ def check_simple_policy_tuples do

      new_config =
        Config.get([:mrf_simple])
+        |> Enum.filter(fn {_k, v} -> not is_atom(v) end)
        |> Enum.map(fn {k, v} ->
          {k,
           Enum.map(v, fn
@ -180,7 +181,8 @@ def warn do
      check_uploders_s3_public_endpoint(),
      check_quarantined_instances_tuples(),
      check_transparency_exclusions_tuples(),
-      check_simple_policy_tuples()
+      check_simple_policy_tuples(),
+      check_http_adapter()
    ]
    |> Enum.reduce(:ok, fn
      :ok, :ok -> :ok
@ -209,6 +211,32 @@ def check_welcome_message_config do
    end
  end

+  def check_http_adapter do
+    http_adapter = Application.get_env(:tesla, :adapter)
+
+    case http_adapter do
+      {Tesla.Adapter.Finch, _} ->
+        :ok
+
+      Tesla.Mock ->
+        # tests do be testing
+        :ok
+
+      _anything_else ->
+        Logger.error("""
+        !!!CONFIG ERROR!!!
+        Your config is using a custom tesla adapter, this was standardised
+        to finch in 2022.06, and alternate adapters were removed in 2023.02.
+        Please ensure you either:
+        \n* do not have any custom value for `:tesla, :adapter`, or
+        \n* have `config :tesla, :adapter, {Tesla.Adapter.Finch, name: MyFinch}`
+        (your current value is #{inspect(http_adapter)})
+        """)
+
+        :error
+    end
+  end
+
  def check_old_mrf_config do
    warning_preface = """
    !!!DEPRECATION WARNING!!!
--- a/lib/pleroma/config/transfer_task.ex
+++ b/lib/pleroma/config/transfer_task.ex
@ -41,7 +41,7 @@ def load_and_update_env(deleted_settings \\ [], restart_pleroma? \\ true) do
      {logger, other} =
        (Repo.all(ConfigDB) ++ deleted_settings)
        |> Enum.map(&merge_with_default/1)
-        |> Enum.split_with(fn {group, _, _, _} -> group in [:logger, :quack] end)
+        |> Enum.split_with(fn {group, _, _, _} -> group == :logger end)

      logger
      |> Enum.sort()
@ -101,12 +101,6 @@ defp merge_with_default(%{group: group, key: key, value: value} = setting) do
    {group, key, value, merged}
  end

-  # change logger configuration in runtime, without restart
-  defp configure({:quack, key, _, merged}) do
-    Logger.configure_backend(Quack.Logger, [{key, merged}])
-    :ok = update_env(:quack, key, merged)
-  end
-
  defp configure({_, :backends, _, merged}) do
    # removing current backends
    Enum.each(Application.get_env(:logger, :backends), &Logger.remove_backend/1)
--- a/lib/pleroma/config_db.ex
+++ b/lib/pleroma/config_db.ex
@ -163,7 +163,6 @@ defp can_be_partially_updated?(%ConfigDB{} = config), do: not only_full_update?(
  defp only_full_update?(%ConfigDB{group: group, key: key}) do
    full_key_update = [
      {:pleroma, :ecto_repos},
-      {:quack, :meta},
      {:mime, :types},
      {:cors_plug, [:max_age, :methods, :expose, :headers]},
      {:swarm, :node_blacklist},
--- a/lib/pleroma/emails/mailer.ex
+++ b/lib/pleroma/emails/mailer.ex
@ -35,11 +35,6 @@ def perform(:deliver_async, email, config), do: deliver(email, config)
  def deliver(email, config \\ [])

  def deliver(email, config) do
-    # temporary hackney fix until hackney max_connections bug is fixed
-    # https://git.pleroma.social/pleroma/pleroma/-/issues/2101
-    email =
-      Swoosh.Email.put_private(email, :hackney_options, ssl_options: [versions: [:"tlsv1.2"]])
-
    case enabled?() do
      true -> Swoosh.Mailer.deliver(email, parse_config(config))
      false -> {:error, :deliveries_disabled}
--- a/lib/pleroma/frontend.ex
+++ b/lib/pleroma/frontend.ex
@ -93,7 +93,7 @@ defp download_build(frontend_info, dest) do
    url = String.replace(frontend_info["build_url"], "${ref}", frontend_info["ref"])

    with {:ok, %{status: 200, body: zip_body}} <-
-           Pleroma.HTTP.get(url, [], recv_timeout: 120_000) do
+           Pleroma.HTTP.get(url, [], receive_timeout: 120_000) do
      unzip(zip_body, dest)
    else
      {:error, e} -> {:error, e}
--- a/lib/pleroma/gun.ex
+++ b/lib/pleroma/gun.ex
@ -1,29 +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.Gun do
-  @callback open(charlist(), pos_integer(), map()) :: {:ok, pid()}
-  @callback info(pid()) :: map()
-  @callback close(pid()) :: :ok
-  @callback await_up(pid, pos_integer()) :: {:ok, atom()} | {:error, atom()}
-  @callback connect(pid(), map()) :: reference()
-  @callback await(pid(), reference()) :: {:response, :fin, 200, []}
-  @callback set_owner(pid(), pid()) :: :ok
-
-  defp api, do: Pleroma.Config.get([Pleroma.Gun], Pleroma.Gun.API)
-
-  def open(host, port, opts), do: api().open(host, port, opts)
-
-  def info(pid), do: api().info(pid)
-
-  def close(pid), do: api().close(pid)
-
-  def await_up(pid, timeout \\ 5_000), do: api().await_up(pid, timeout)
-
-  def connect(pid, opts), do: api().connect(pid, opts)
-
-  def await(pid, ref), do: api().await(pid, ref)
-
-  def set_owner(pid, owner), do: api().set_owner(pid, owner)
-end
--- a/lib/pleroma/gun/api.ex
+++ b/lib/pleroma/gun/api.ex
@ -1,46 +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.Gun.API do
-  @behaviour Pleroma.Gun
-
-  alias Pleroma.Gun
-
-  @gun_keys [
-    :connect_timeout,
-    :http_opts,
-    :http2_opts,
-    :protocols,
-    :retry,
-    :retry_timeout,
-    :trace,
-    :transport,
-    :tls_opts,
-    :tcp_opts,
-    :socks_opts,
-    :ws_opts,
-    :supervise
-  ]
-
-  @impl Gun
-  def open(host, port, opts \\ %{}), do: :gun.open(host, port, Map.take(opts, @gun_keys))
-
-  @impl Gun
-  defdelegate info(pid), to: :gun
-
-  @impl Gun
-  defdelegate close(pid), to: :gun
-
-  @impl Gun
-  defdelegate await_up(pid, timeout \\ 5_000), to: :gun
-
-  @impl Gun
-  defdelegate connect(pid, opts), to: :gun
-
-  @impl Gun
-  defdelegate await(pid, ref), to: :gun
-
-  @impl Gun
-  defdelegate set_owner(pid, owner), to: :gun
-end
--- a/lib/pleroma/gun/conn.ex
+++ b/lib/pleroma/gun/conn.ex
@ -1,131 +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.Gun.Conn do
-  alias Pleroma.Gun
-
-  require Logger
-
-  def open(%URI{} = uri, opts) do
-    pool_opts = Pleroma.Config.get([:connections_pool], [])
-
-    opts =
-      opts
-      |> Enum.into(%{})
-      |> Map.put_new(:connect_timeout, pool_opts[:connect_timeout] || 5_000)
-      |> Map.put_new(:supervise, false)
-      |> maybe_add_tls_opts(uri)
-
-    do_open(uri, opts)
-  end
-
-  defp maybe_add_tls_opts(opts, %URI{scheme: "http"}), do: opts
-
-  defp maybe_add_tls_opts(opts, %URI{scheme: "https"}) do
-    tls_opts = [
-      verify: :verify_peer,
-      cacertfile: CAStore.file_path(),
-      depth: 20,
-      reuse_sessions: false,
-      log_level: :warning,
-      customize_hostname_check: [match_fun: :public_key.pkix_verify_hostname_match_fun(:https)]
-    ]
-
-    tls_opts =
-      if Keyword.keyword?(opts[:tls_opts]) do
-        Keyword.merge(tls_opts, opts[:tls_opts])
-      else
-        tls_opts
-      end
-
-    Map.put(opts, :tls_opts, tls_opts)
-  end
-
-  defp do_open(uri, %{proxy: {proxy_host, proxy_port}} = opts) do
-    connect_opts =
-      uri
-      |> destination_opts()
-      |> add_http2_opts(uri.scheme, Map.get(opts, :tls_opts, []))
-
-    with open_opts <- Map.delete(opts, :tls_opts),
-         {:ok, conn} <- Gun.open(proxy_host, proxy_port, open_opts),
-         {:ok, protocol} <- Gun.await_up(conn, opts[:connect_timeout]),
-         stream <- Gun.connect(conn, connect_opts),
-         {:response, :fin, 200, _} <- Gun.await(conn, stream) do
-      {:ok, conn, protocol}
-    else
-      error ->
-        Logger.warn(
-          "Opening proxied connection to #{compose_uri_log(uri)} failed with error #{inspect(error)}"
-        )
-
-        error
-    end
-  end
-
-  defp do_open(uri, %{proxy: {proxy_type, proxy_host, proxy_port}} = opts) do
-    version =
-      proxy_type
-      |> to_string()
-      |> String.last()
-      |> case do
-        "4" -> 4
-        _ -> 5
-      end
-
-    socks_opts =
-      uri
-      |> destination_opts()
-      |> add_http2_opts(uri.scheme, Map.get(opts, :tls_opts, []))
-      |> Map.put(:version, version)
-
-    opts =
-      opts
-      |> Map.put(:protocols, [:socks])
-      |> Map.put(:socks_opts, socks_opts)
-
-    with {:ok, conn} <- Gun.open(proxy_host, proxy_port, opts),
-         {:ok, protocol} <- Gun.await_up(conn, opts[:connect_timeout]) do
-      {:ok, conn, protocol}
-    else
-      error ->
-        Logger.warn(
-          "Opening socks proxied connection to #{compose_uri_log(uri)} failed with error #{inspect(error)}"
-        )
-
-        error
-    end
-  end
-
-  defp do_open(%URI{host: host, port: port} = uri, opts) do
-    host = Pleroma.HTTP.AdapterHelper.parse_host(host)
-
-    with {:ok, conn} <- Gun.open(host, port, opts),
-         {:ok, protocol} <- Gun.await_up(conn, opts[:connect_timeout]) do
-      {:ok, conn, protocol}
-    else
-      error ->
-        Logger.warn(
-          "Opening connection to #{compose_uri_log(uri)} failed with error #{inspect(error)}"
-        )
-
-        error
-    end
-  end
-
-  defp destination_opts(%URI{host: host, port: port}) do
-    host = Pleroma.HTTP.AdapterHelper.parse_host(host)
-    %{host: host, port: port}
-  end
-
-  defp add_http2_opts(opts, "https", tls_opts) do
-    Map.merge(opts, %{protocols: [:http2], transport: :tls, tls_opts: tls_opts})
-  end
-
-  defp add_http2_opts(opts, _, _), do: opts
-
-  def compose_uri_log(%URI{scheme: scheme, host: host, path: path}) do
-    "#{scheme}://#{host}#{path}"
-  end
-end
--- a/lib/pleroma/gun/connection_pool.ex
+++ b/lib/pleroma/gun/connection_pool.ex
@ -1,86 +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.Gun.ConnectionPool do
-  @registry __MODULE__
-
-  alias Pleroma.Gun.ConnectionPool.WorkerSupervisor
-
-  def children do
-    [
-      {Registry, keys: :unique, name: @registry},
-      Pleroma.Gun.ConnectionPool.WorkerSupervisor
-    ]
-  end
-
-  @spec get_conn(URI.t(), keyword()) :: {:ok, pid()} | {:error, term()}
-  def get_conn(uri, opts) do
-    key = "#{uri.scheme}:#{uri.host}:#{uri.port}"
-
-    case Registry.lookup(@registry, key) do
-      # The key has already been registered, but connection is not up yet
-      [{worker_pid, nil}] ->
-        get_gun_pid_from_worker(worker_pid, true)
-
-      [{worker_pid, {gun_pid, _used_by, _crf, _last_reference}}] ->
-        GenServer.call(worker_pid, :add_client)
-        {:ok, gun_pid}
-
-      [] ->
-        # :gun.set_owner fails in :connected state for whatevever reason,
-        # so we open the connection in the process directly and send it's pid back
-        # We trust gun to handle timeouts by itself
-        case WorkerSupervisor.start_worker([key, uri, opts, self()]) do
-          {:ok, worker_pid} ->
-            get_gun_pid_from_worker(worker_pid, false)
-
-          {:error, {:already_started, worker_pid}} ->
-            get_gun_pid_from_worker(worker_pid, true)
-
-          err ->
-            err
-        end
-    end
-  end
-
-  defp get_gun_pid_from_worker(worker_pid, register) do
-    # GenServer.call will block the process for timeout length if
-    # the server crashes on startup (which will happen if gun fails to connect)
-    # so instead we use cast + monitor
-
-    ref = Process.monitor(worker_pid)
-    if register, do: GenServer.cast(worker_pid, {:add_client, self()})
-
-    receive do
-      {:conn_pid, pid} ->
-        Process.demonitor(ref)
-        {:ok, pid}
-
-      {:DOWN, ^ref, :process, ^worker_pid, reason} ->
-        case reason do
-          {:shutdown, {:error, _} = error} -> error
-          {:shutdown, error} -> {:error, error}
-          _ -> {:error, reason}
-        end
-    end
-  end
-
-  @spec release_conn(pid()) :: :ok
-  def release_conn(conn_pid) do
-    # :ets.fun2ms(fn {_, {worker_pid, {gun_pid, _, _, _}}} when gun_pid == conn_pid ->
-    #    worker_pid end)
-    query_result =
-      Registry.select(@registry, [
-        {{:_, :"$1", {:"$2", :_, :_, :_}}, [{:==, :"$2", conn_pid}], [:"$1"]}
-      ])
-
-    case query_result do
-      [worker_pid] ->
-        GenServer.call(worker_pid, :remove_client)
-
-      [] ->
-        :ok
-    end
-  end
-end
--- a/lib/pleroma/gun/connection_pool/reclaimer.ex
+++ b/lib/pleroma/gun/connection_pool/reclaimer.ex
@ -1,89 +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.Gun.ConnectionPool.Reclaimer do
-  use GenServer, restart: :temporary
-
-  defp registry, do: Pleroma.Gun.ConnectionPool
-
-  def start_monitor do
-    pid =
-      case :gen_server.start(__MODULE__, [], name: {:via, Registry, {registry(), "reclaimer"}}) do
-        {:ok, pid} ->
-          pid
-
-        {:error, {:already_registered, pid}} ->
-          pid
-      end
-
-    {pid, Process.monitor(pid)}
-  end
-
-  @impl true
-  def init(_) do
-    {:ok, nil, {:continue, :reclaim}}
-  end
-
-  @impl true
-  def handle_continue(:reclaim, _) do
-    max_connections = Pleroma.Config.get([:connections_pool, :max_connections])
-
-    reclaim_max =
-      [:connections_pool, :reclaim_multiplier]
-      |> Pleroma.Config.get()
-      |> Kernel.*(max_connections)
-      |> round
-      |> max(1)
-
-    :telemetry.execute([:pleroma, :connection_pool, :reclaim, :start], %{}, %{
-      max_connections: max_connections,
-      reclaim_max: reclaim_max
-    })
-
-    # :ets.fun2ms(
-    # fn {_, {worker_pid, {_, used_by, crf, last_reference}}} when used_by == [] ->
-    #   {worker_pid, crf, last_reference} end)
-    unused_conns =
-      Registry.select(
-        registry(),
-        [
-          {{:_, :"$1", {:_, :"$2", :"$3", :"$4"}}, [{:==, :"$2", []}], [{{:"$1", :"$3", :"$4"}}]}
-        ]
-      )
-
-    case unused_conns do
-      [] ->
-        :telemetry.execute(
-          [:pleroma, :connection_pool, :reclaim, :stop],
-          %{reclaimed_count: 0},
-          %{
-            max_connections: max_connections
-          }
-        )
-
-        {:stop, :no_unused_conns, nil}
-
-      unused_conns ->
-        reclaimed =
-          unused_conns
-          |> Enum.sort(fn {_pid1, crf1, last_reference1}, {_pid2, crf2, last_reference2} ->
-            crf1 <= crf2 and last_reference1 <= last_reference2
-          end)
-          |> Enum.take(reclaim_max)
-
-        reclaimed
-        |> Enum.each(fn {pid, _, _} ->
-          DynamicSupervisor.terminate_child(Pleroma.Gun.ConnectionPool.WorkerSupervisor, pid)
-        end)
-
-        :telemetry.execute(
-          [:pleroma, :connection_pool, :reclaim, :stop],
-          %{reclaimed_count: Enum.count(reclaimed)},
-          %{max_connections: max_connections}
-        )
-
-        {:stop, :normal, nil}
-    end
-  end
-end
--- a/lib/pleroma/gun/connection_pool/worker.ex
+++ b/lib/pleroma/gun/connection_pool/worker.ex
@ -1,153 +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.Gun.ConnectionPool.Worker do
-  alias Pleroma.Gun
-  use GenServer, restart: :temporary
-
-  defp registry, do: Pleroma.Gun.ConnectionPool
-
-  def start_link([key | _] = opts) do
-    GenServer.start_link(__MODULE__, opts, name: {:via, Registry, {registry(), key}})
-  end
-
-  @impl true
-  def init([_key, _uri, _opts, _client_pid] = opts) do
-    {:ok, nil, {:continue, {:connect, opts}}}
-  end
-
-  @impl true
-  def handle_continue({:connect, [key, uri, opts, client_pid]}, _) do
-    with {:ok, conn_pid, protocol} <- Gun.Conn.open(uri, opts),
-         Process.link(conn_pid) do
-      time = :erlang.monotonic_time(:millisecond)
-
-      {_, _} =
-        Registry.update_value(registry(), key, fn _ ->
-          {conn_pid, [client_pid], 1, time}
-        end)
-
-      send(client_pid, {:conn_pid, conn_pid})
-
-      {:noreply,
-       %{
-         key: key,
-         timer: nil,
-         client_monitors: %{client_pid => Process.monitor(client_pid)},
-         protocol: protocol
-       }, :hibernate}
-    else
-      err ->
-        {:stop, {:shutdown, err}, nil}
-    end
-  end
-
-  @impl true
-  def handle_cast({:add_client, client_pid}, state) do
-    case handle_call(:add_client, {client_pid, nil}, state) do
-      {:reply, conn_pid, state, :hibernate} ->
-        send(client_pid, {:conn_pid, conn_pid})
-        {:noreply, state, :hibernate}
-    end
-  end
-
-  @impl true
-  def handle_cast({:remove_client, client_pid}, state) do
-    case handle_call(:remove_client, {client_pid, nil}, state) do
-      {:reply, _, state, :hibernate} ->
-        {:noreply, state, :hibernate}
-    end
-  end
-
-  @impl true
-  def handle_call(:add_client, {client_pid, _}, %{key: key, protocol: protocol} = state) do
-    time = :erlang.monotonic_time(:millisecond)
-
-    {{conn_pid, used_by, _, _}, _} =
-      Registry.update_value(registry(), key, fn {conn_pid, used_by, crf, last_reference} ->
-        {conn_pid, [client_pid | used_by], crf(time - last_reference, crf), time}
-      end)
-
-    :telemetry.execute(
-      [:pleroma, :connection_pool, :client, :add],
-      %{client_pid: client_pid, clients: used_by},
-      %{key: state.key, protocol: protocol}
-    )
-
-    state =
-      if state.timer != nil do
-        Process.cancel_timer(state[:timer])
-        %{state | timer: nil}
-      else
-        state
-      end
-
-    ref = Process.monitor(client_pid)
-
-    state = put_in(state.client_monitors[client_pid], ref)
-    {:reply, conn_pid, state, :hibernate}
-  end
-
-  @impl true
-  def handle_call(:remove_client, {client_pid, _}, %{key: key} = state) do
-    {{_conn_pid, used_by, _crf, _last_reference}, _} =
-      Registry.update_value(registry(), key, fn {conn_pid, used_by, crf, last_reference} ->
-        {conn_pid, List.delete(used_by, client_pid), crf, last_reference}
-      end)
-
-    {ref, state} = pop_in(state.client_monitors[client_pid])
-
-    Process.demonitor(ref, [:flush])
-
-    timer =
-      if used_by == [] do
-        max_idle = Pleroma.Config.get([:connections_pool, :max_idle_time], 30_000)
-        Process.send_after(self(), :idle_close, max_idle)
-      else
-        nil
-      end
-
-    {:reply, :ok, %{state | timer: timer}, :hibernate}
-  end
-
-  @impl true
-  def handle_info(:idle_close, state) do
-    # Gun monitors the owner process, and will close the connection automatically
-    # when it's terminated
-    {:stop, :normal, state}
-  end
-
-  @impl true
-  def handle_info({:gun_up, _pid, _protocol}, state) do
-    {:noreply, state, :hibernate}
-  end
-
-  # Gracefully shutdown if the connection got closed without any streams left
-  @impl true
-  def handle_info({:gun_down, _pid, _protocol, _reason, []}, state) do
-    {:stop, :normal, state}
-  end
-
-  # Otherwise, wait for retry
-  @impl true
-  def handle_info({:gun_down, _pid, _protocol, _reason, _killed_streams}, state) do
-    {:noreply, state, :hibernate}
-  end
-
-  @impl true
-  def handle_info({:DOWN, _ref, :process, pid, reason}, state) do
-    :telemetry.execute(
-      [:pleroma, :connection_pool, :client, :dead],
-      %{client_pid: pid, reason: reason},
-      %{key: state.key}
-    )
-
-    handle_cast({:remove_client, pid}, state)
-  end
-
-  # LRFU policy: https://citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.55.1478
-  defp crf(time_delta, prev_crf) do
-    1 + :math.pow(0.5, 0.0001 * time_delta) * prev_crf
-  end
-end
--- a/lib/pleroma/gun/connection_pool/worker_supervisor.ex
+++ b/lib/pleroma/gun/connection_pool/worker_supervisor.ex
@ -1,49 +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.Gun.ConnectionPool.WorkerSupervisor do
-  @moduledoc "Supervisor for pool workers. Does not do anything except enforce max connection limit"
-
-  use DynamicSupervisor
-
-  def start_link(opts) do
-    DynamicSupervisor.start_link(__MODULE__, opts, name: __MODULE__)
-  end
-
-  def init(_opts) do
-    DynamicSupervisor.init(
-      strategy: :one_for_one,
-      max_children: Pleroma.Config.get([:connections_pool, :max_connections])
-    )
-  end
-
-  def start_worker(opts, retry \\ false) do
-    case DynamicSupervisor.start_child(__MODULE__, {Pleroma.Gun.ConnectionPool.Worker, opts}) do
-      {:error, :max_children} ->
-        if retry or free_pool() == :error do
-          :telemetry.execute([:pleroma, :connection_pool, :provision_failure], %{opts: opts})
-          {:error, :pool_full}
-        else
-          start_worker(opts, true)
-        end
-
-      res ->
-        res
-    end
-  end
-
-  defp free_pool do
-    wait_for_reclaimer_finish(Pleroma.Gun.ConnectionPool.Reclaimer.start_monitor())
-  end
-
-  defp wait_for_reclaimer_finish({pid, mon}) do
-    receive do
-      {:DOWN, ^mon, :process, ^pid, :no_unused_conns} ->
-        :error
-
-      {:DOWN, ^mon, :process, ^pid, :normal} ->
-        :ok
-    end
-  end
-end
--- a/lib/pleroma/hashtag.ex
+++ b/lib/pleroma/hashtag.ex
@ -10,6 +10,7 @@ defmodule Pleroma.Hashtag do

  alias Ecto.Multi
  alias Pleroma.Hashtag
+  alias Pleroma.User.HashtagFollow
  alias Pleroma.Object
  alias Pleroma.Repo

@ -27,6 +28,14 @@ def normalize_name(name) do
    |> String.trim()
  end

+  def get_by_id(id) do
+    Repo.get(Hashtag, id)
+  end
+
+  def get_by_name(name) do
+    Repo.get_by(Hashtag, name: normalize_name(name))
+  end
+
  def get_or_create_by_name(name) do
    changeset = changeset(%Hashtag{}, %{name: name})

@ -103,4 +112,22 @@ def delete_unreferenced(ids) do
      {:ok, deleted_count}
    end
  end
+
+  def get_followers(%Hashtag{id: hashtag_id}) do
+    from(hf in HashtagFollow)
+    |> where([hf], hf.hashtag_id == ^hashtag_id)
+    |> join(:inner, [hf], u in assoc(hf, :user))
+    |> select([hf, u], u.id)
+    |> Repo.all()
+  end
+
+  def get_recipients_for_activity(%Pleroma.Activity{object: %{hashtags: tags}})
+      when is_list(tags) do
+    tags
+    |> Enum.map(&get_followers/1)
+    |> List.flatten()
+    |> Enum.uniq()
+  end
+
+  def get_recipients_for_activity(_activity), do: []
 end
--- a/lib/pleroma/instances.ex
+++ b/lib/pleroma/instances.ex
@ -43,4 +43,6 @@ def host(url_or_host) when is_binary(url_or_host) do
      url_or_host
    end
  end
+
+  defdelegate set_request_signatures(url_or_host), to: Instance
 end
--- a/lib/pleroma/instances/instance.ex
+++ b/lib/pleroma/instances/instance.ex
@ -26,6 +26,7 @@ defmodule Pleroma.Instances.Instance do
    field(:favicon, :string)
    field(:metadata_updated_at, :naive_datetime)
    field(:nodeinfo, :map, default: %{})
+    field(:has_request_signatures, :boolean)

    timestamps()
  end
@ -34,7 +35,14 @@ defmodule Pleroma.Instances.Instance do

  def changeset(struct, params \\ %{}) do
    struct
-    |> cast(params, [:host, :unreachable_since, :favicon, :nodeinfo, :metadata_updated_at])
+    |> cast(params, [
+      :host,
+      :unreachable_since,
+      :favicon,
+      :nodeinfo,
+      :metadata_updated_at,
+      :has_request_signatures
+    ])
    |> validate_required([:host])
    |> unique_constraint(:host)
  end
@ -316,4 +324,24 @@ def get_cached_by_url(url_or_host) do
      end)
    end
  end
+
+  def set_request_signatures(url_or_host) when is_binary(url_or_host) do
+    host = host(url_or_host)
+    existing_record = Repo.get_by(Instance, %{host: host})
+    changes = %{has_request_signatures: true}
+
+    cond do
+      is_nil(existing_record) ->
+        %Instance{}
+        |> changeset(Map.put(changes, :host, host))
+        |> Repo.insert()
+
+      true ->
+        existing_record
+        |> changeset(changes)
+        |> Repo.update()
+    end
+  end
+
+  def set_request_signatures(_), do: {:error, :invalid_input}
 end
--- a/lib/pleroma/object/fetcher.ex
+++ b/lib/pleroma/object/fetcher.ex
@ -116,7 +116,11 @@ def refetch_object(%Object{data: %{"id" => id}} = object) do

  # Note: will create a Create activity, which we need internally at the moment.
  def fetch_object_from_id(id, options \\ []) do
-    with {_, nil} <- {:fetch_object, Object.get_cached_by_ap_id(id)},
+    with %URI{} = uri <- URI.parse(id),
+         # If we have instance restrictions, apply them here to prevent fetching from unwanted instances
+         {: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)},
@ -155,6 +159,9 @@ def fetch_object_from_id(id, options \\ []) do
      {:fetch, {:error, error}} ->
        {:error, error}

+      {:reject, reason} ->
+        {:reject, reason}
+
      e ->
        e
    end
@ -180,11 +187,11 @@ def fetch_object_from_id!(id, options \\ []) do
      {:error, %Tesla.Mock.Error{}} ->
        nil

-      {:error, "Object has been deleted"} ->
+      {:error, {"Object has been deleted", _id, _code}} ->
        nil

      {:reject, reason} ->
-        Logger.info("Rejected #{id} while fetching: #{inspect(reason)}")
+        Logger.debug("Rejected #{id} while fetching: #{inspect(reason)}")
        nil

      e ->
@ -255,7 +262,7 @@ def fetch_and_contain_remote_object_from_id(id) when is_binary(id) do
  def fetch_and_contain_remote_object_from_id(_id),
    do: {:error, "id must be a string"}

-  defp get_object(id) do
+  def get_object(id) do
    date = Pleroma.Signature.signed_date()

    headers =
@ -275,6 +282,11 @@ defp get_object(id) do
               %{"profile" => "https://www.w3.org/ns/activitystreams"}} ->
                {:ok, body}

+              # 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
@ -284,7 +296,7 @@ defp get_object(id) do
        end

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

      {:error, e} ->
        {:error, e}
--- a/lib/pleroma/object/pruner.ex
+++ b/lib/pleroma/object/pruner.ex
@ -0,0 +1,31 @@
+defmodule Pleroma.Object.Pruner do
+  @moduledoc """
+  Prunes objects from the database.
+  """
+  @cutoff 30
+
+  alias Pleroma.Object
+  alias Pleroma.Delivery
+  alias Pleroma.Repo
+  import Ecto.Query
+
+  def prune_tombstoned_deliveries do
+    from(d in Delivery)
+    |> join(:inner, [d], o in Object, on: d.object_id == o.id)
+    |> where([d, o], fragment("?->>'type' = ?", o.data, "Tombstone"))
+    |> Repo.delete_all(timeout: :infinity)
+  end
+
+  def prune_tombstones do
+    before_time = cutoff()
+
+    from(o in Object,
+      where: fragment("?->>'type' = ?", o.data, "Tombstone") and o.inserted_at < ^before_time
+    )
+    |> Repo.delete_all(timeout: :infinity, on_delete: :delete_all)
+  end
+
+  defp cutoff do
+    DateTime.utc_now() |> Timex.shift(days: -@cutoff)
+  end
+end
--- a/lib/pleroma/reverse_proxy/client/hackney.ex
+++ b/lib/pleroma/reverse_proxy/client/hackney.ex
@ -1,25 +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.ReverseProxy.Client.Hackney do
-  @behaviour Pleroma.ReverseProxy.Client
-
-  @impl true
-  def request(method, url, headers, body, opts \\ []) do
-    opts = Keyword.put(opts, :ssl_options, versions: [:"tlsv1.2", :"tlsv1.1", :tlsv1])
-    :hackney.request(method, url, headers, body, opts)
-  end
-
-  @impl true
-  def stream_body(ref) do
-    case :hackney.stream_body(ref) do
-      :done -> :done
-      {:ok, data} -> {:ok, data, ref}
-      {:error, error} -> {:error, error}
-    end
-  end
-
-  @impl true
-  def close(ref), do: :hackney.close(ref)
-end
--- a/lib/pleroma/reverse_proxy/client/tesla.ex
+++ b/lib/pleroma/reverse_proxy/client/tesla.ex
@ -5,8 +5,6 @@
 defmodule Pleroma.ReverseProxy.Client.Tesla do
  @behaviour Pleroma.ReverseProxy.Client

-  alias Pleroma.Gun.ConnectionPool
-
  @type headers() :: [{String.t(), String.t()}]
  @type status() :: pos_integer()

@ -33,8 +31,6 @@ def request(method, url, headers, body, opts \\ []) do
      if is_map(response.body) and method != :head do
        {:ok, response.status, response.headers, response.body}
      else
-        conn_pid = response.opts[:adapter][:conn]
-        ConnectionPool.release_conn(conn_pid)
        {:ok, response.status, response.headers}
      end
    else
@ -45,8 +41,7 @@ def request(method, url, headers, body, opts \\ []) do
  @impl true
  @spec stream_body(map()) ::
          {:ok, binary(), map()} | {:error, atom() | String.t()} | :done | no_return()
-  def stream_body(%{pid: pid, fin: true}) do
-    ConnectionPool.release_conn(pid)
+  def stream_body(%{pid: _pid, fin: true}) do
    :done
  end

@ -70,17 +65,12 @@ defp read_chunk!(%{pid: pid, stream: stream, opts: opts}) do

  @impl true
  @spec close(map) :: :ok | no_return()
-  def close(%{pid: pid}) do
-    ConnectionPool.release_conn(pid)
+  def close(%{pid: _pid}) do
  end

  defp check_adapter do
    adapter = Application.get_env(:tesla, :adapter)

-    unless adapter == Tesla.Adapter.Gun do
-      raise "#{adapter} doesn't support reading body in chunks"
-    end
-
    adapter
  end
 end
--- a/lib/pleroma/reverse_proxy/client/wrapper.ex
+++ b/lib/pleroma/reverse_proxy/client/wrapper.ex
@ -23,8 +23,6 @@ defp client do
    |> client()
  end

-  defp client(Tesla.Adapter.Hackney), do: Pleroma.ReverseProxy.Client.Hackney
-  defp client(Tesla.Adapter.Gun), do: Pleroma.ReverseProxy.Client.Tesla
-  defp client({Tesla.Adapter.Finch, _}), do: Pleroma.ReverseProxy.Client.Hackney
+  defp client({Tesla.Adapter.Finch, _}), do: Pleroma.ReverseProxy.Client.Tesla
  defp client(_), do: Pleroma.Config.get!(Pleroma.ReverseProxy.Client)
 end
--- a/lib/pleroma/search/elasticsearch/document_mappings/activity.ex
+++ b/lib/pleroma/search/elasticsearch/document_mappings/activity.ex
@ -30,7 +30,7 @@ def object_to_search_data(object) do
          trimmed
        end

-      if String.length(content) > 1 do
+      if String.length(content) > 1 and not is_nil(data["published"]) do
        {:ok, published, _} = DateTime.from_iso8601(data["published"])

        %{
--- a/lib/pleroma/search/meilisearch.ex
+++ b/lib/pleroma/search/meilisearch.ex
@ -128,7 +128,7 @@ def object_to_search_data(object) do
          trimmed
        end

-      if String.length(content) > 1 do
+      if String.length(content) > 1 and not is_nil(data["published"]) do
        {:ok, published, _} = DateTime.from_iso8601(data["published"])

        %{
--- a/lib/pleroma/tesla/middleware/connection_pool.ex
+++ b/lib/pleroma/tesla/middleware/connection_pool.ex
@ -1,50 +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.Tesla.Middleware.ConnectionPool do
-  @moduledoc """
-  Middleware to get/release connections from `Pleroma.Gun.ConnectionPool`
-  """
-
-  @behaviour Tesla.Middleware
-
-  alias Pleroma.Gun.ConnectionPool
-
-  @impl Tesla.Middleware
-  def call(%Tesla.Env{url: url, opts: opts} = env, next, _) do
-    uri = URI.parse(url)
-
-    # Avoid leaking connections when the middleware is called twice
-    # with body_as: :chunks. We assume only the middleware can set
-    # opts[:adapter][:conn]
-    if opts[:adapter][:conn] do
-      ConnectionPool.release_conn(opts[:adapter][:conn])
-    end
-
-    case ConnectionPool.get_conn(uri, opts[:adapter]) do
-      {:ok, conn_pid} ->
-        adapter_opts = Keyword.merge(opts[:adapter], conn: conn_pid, close_conn: false)
-        opts = Keyword.put(opts, :adapter, adapter_opts)
-        env = %{env | opts: opts}
-
-        case Tesla.run(env, next) do
-          {:ok, env} ->
-            unless opts[:adapter][:body_as] == :chunks do
-              ConnectionPool.release_conn(conn_pid)
-              {_, res} = pop_in(env.opts[:adapter][:conn])
-              {:ok, res}
-            else
-              {:ok, env}
-            end
-
-          err ->
-            ConnectionPool.release_conn(conn_pid)
-            err
-        end
-
-      err ->
-        err
-    end
-  end
-end
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@ -18,6 +18,8 @@ defmodule Pleroma.User do
  alias Pleroma.Emoji
  alias Pleroma.FollowingRelationship
  alias Pleroma.Formatter
+  alias Pleroma.Hashtag
+  alias Pleroma.User.HashtagFollow
  alias Pleroma.HTML
  alias Pleroma.Keys
  alias Pleroma.MFA
@ -151,6 +153,7 @@ defmodule Pleroma.User do
    field(:is_suggested, :boolean, default: false)
    field(:last_status_at, :naive_datetime)
    field(:language, :string)
+    field(:status_ttl_days, :integer, default: nil)

    embeds_one(
      :notification_settings,
@ -167,6 +170,12 @@ defmodule Pleroma.User do

    has_many(:frontend_profiles, Pleroma.Akkoma.FrontendSettingsProfile)

+    many_to_many(:followed_hashtags, Hashtag,
+      on_replace: :delete,
+      on_delete: :delete_all,
+      join_through: HashtagFollow
+    )
+
    for {relationship_type,
         [
           {outgoing_relation, outgoing_relation_target},
@ -516,7 +525,8 @@ def update_changeset(struct, params \\ %{}) do
        :pleroma_settings_store,
        :is_discoverable,
        :actor_type,
-        :disclose_client
+        :disclose_client,
+        :status_ttl_days
      ]
    )
    |> unique_constraint(:nickname)
@ -524,6 +534,7 @@ def update_changeset(struct, params \\ %{}) do
    |> validate_length(:bio, max: bio_limit)
    |> validate_length(:name, min: 1, max: name_limit)
    |> validate_inclusion(:actor_type, ["Person", "Service"])
+    |> validate_number(:status_ttl_days, greater_than: 0)
    |> put_fields()
    |> put_emoji()
    |> put_change_if_present(:bio, &{:ok, parse_bio(&1, struct)})
@ -1911,7 +1922,7 @@ def get_or_fetch_by_ap_id(ap_id) do
        {:ok, user}

      e ->
-        Logger.error("Could not fetch user, #{inspect(e)}")
+        Logger.error("Could not fetch user #{ap_id}, #{inspect(e)}")
        {:error, :not_found}
    end
  end
@ -2547,4 +2558,54 @@ def update_last_status_at(user) do
      _ -> {:error, user}
    end
  end
+
+  defp maybe_load_followed_hashtags(%User{followed_hashtags: follows} = user)
+       when is_list(follows),
+       do: user
+
+  defp maybe_load_followed_hashtags(%User{} = user) do
+    followed_hashtags = HashtagFollow.get_by_user(user)
+    %{user | followed_hashtags: followed_hashtags}
+  end
+
+  def followed_hashtags(%User{followed_hashtags: follows})
+      when is_list(follows),
+      do: follows
+
+  def followed_hashtags(%User{} = user) do
+    {:ok, user} =
+      user
+      |> maybe_load_followed_hashtags()
+      |> set_cache()
+
+    user.followed_hashtags
+  end
+
+  def follow_hashtag(%User{} = user, %Hashtag{} = hashtag) do
+    Logger.debug("Follow hashtag #{hashtag.name} for user #{user.nickname}")
+    user = maybe_load_followed_hashtags(user)
+
+    with {:ok, _} <- HashtagFollow.new(user, hashtag),
+         follows <- HashtagFollow.get_by_user(user),
+         %User{} = user <- user |> Map.put(:followed_hashtags, follows) do
+      user
+      |> set_cache()
+    end
+  end
+
+  def unfollow_hashtag(%User{} = user, %Hashtag{} = hashtag) do
+    Logger.debug("Unfollow hashtag #{hashtag.name} for user #{user.nickname}")
+    user = maybe_load_followed_hashtags(user)
+
+    with {:ok, _} <- HashtagFollow.delete(user, hashtag),
+         follows <- HashtagFollow.get_by_user(user),
+         %User{} = user <- user |> Map.put(:followed_hashtags, follows) do
+      user
+      |> set_cache()
+    end
+  end
+
+  def following_hashtag?(%User{} = user, %Hashtag{} = hashtag) do
+    not is_nil(HashtagFollow.get(user, hashtag))
+  end
 end
--- a/lib/pleroma/user/hashtag_follow.ex
+++ b/lib/pleroma/user/hashtag_follow.ex
@ -0,0 +1,49 @@
+defmodule Pleroma.User.HashtagFollow do
+  use Ecto.Schema
+  import Ecto.Query
+  import Ecto.Changeset
+
+  alias Pleroma.User
+  alias Pleroma.Hashtag
+  alias Pleroma.Repo
+
+  schema "user_follows_hashtag" do
+    belongs_to(:user, User, type: FlakeId.Ecto.CompatType)
+    belongs_to(:hashtag, Hashtag)
+  end
+
+  def changeset(%__MODULE__{} = user_hashtag_follow, attrs) do
+    user_hashtag_follow
+    |> cast(attrs, [:user_id, :hashtag_id])
+    |> unique_constraint(:hashtag_id,
+      name: :user_hashtag_follows_user_id_hashtag_id_index,
+      message: "already following"
+    )
+    |> validate_required([:user_id, :hashtag_id])
+  end
+
+  def new(%User{} = user, %Hashtag{} = hashtag) do
+    %__MODULE__{}
+    |> changeset(%{user_id: user.id, hashtag_id: hashtag.id})
+    |> Repo.insert(on_conflict: :nothing)
+  end
+
+  def delete(%User{} = user, %Hashtag{} = hashtag) do
+    with %__MODULE__{} = user_hashtag_follow <- get(user, hashtag) do
+      Repo.delete(user_hashtag_follow)
+    else
+      _ -> {:ok, nil}
+    end
+  end
+
+  def get(%User{} = user, %Hashtag{} = hashtag) do
+    from(hf in __MODULE__)
+    |> where([hf], hf.user_id == ^user.id and hf.hashtag_id == ^hashtag.id)
+    |> Repo.one()
+  end
+
+  def get_by_user(%User{} = user) do
+    Ecto.assoc(user, :followed_hashtags)
+    |> Repo.all()
+  end
+end
--- a/lib/pleroma/user/import.ex
+++ b/lib/pleroma/user/import.ex
@ -12,47 +12,32 @@ defmodule Pleroma.User.Import do
  require Logger

  @spec perform(atom(), User.t(), list()) :: :ok | list() | {:error, any()}
-  def perform(:mutes_import, %User{} = user, [_ | _] = identifiers) do
-    Enum.map(
-      identifiers,
-      fn identifier ->
-        with {:ok, %User{} = muted_user} <- User.get_or_fetch(identifier),
-             {:ok, _} <- User.mute(user, muted_user) do
-          muted_user
-        else
-          error -> handle_error(:mutes_import, identifier, error)
-        end
-      end
-    )
+  def perform(:mutes_import, %User{} = user, identifier) do
+    with {:ok, %User{} = muted_user} <- User.get_or_fetch(identifier),
+         {:ok, _} <- User.mute(user, muted_user) do
+      muted_user
+    else
+      error -> handle_error(:mutes_import, identifier, error)
+    end
  end

-  def perform(:blocks_import, %User{} = blocker, [_ | _] = identifiers) do
-    Enum.map(
-      identifiers,
-      fn identifier ->
-        with {:ok, %User{} = blocked} <- User.get_or_fetch(identifier),
-             {:ok, _block} <- CommonAPI.block(blocker, blocked) do
-          blocked
-        else
-          error -> handle_error(:blocks_import, identifier, error)
-        end
-      end
-    )
+  def perform(:blocks_import, %User{} = blocker, identifier) do
+    with {:ok, %User{} = blocked} <- User.get_or_fetch(identifier),
+         {:ok, _block} <- CommonAPI.block(blocker, blocked) do
+      blocked
+    else
+      error -> handle_error(:blocks_import, identifier, error)
+    end
  end

-  def perform(:follow_import, %User{} = follower, [_ | _] = identifiers) do
-    Enum.map(
-      identifiers,
-      fn identifier ->
-        with {:ok, %User{} = followed} <- User.get_or_fetch(identifier),
-             {:ok, follower, followed} <- User.maybe_direct_follow(follower, followed),
-             {:ok, _, _, _} <- CommonAPI.follow(follower, followed) do
-          followed
-        else
-          error -> handle_error(:follow_import, identifier, error)
-        end
-      end
-    )
+  def perform(:follow_import, %User{} = follower, identifier) do
+    with {:ok, %User{} = followed} <- User.get_or_fetch(identifier),
+         {:ok, follower, followed} <- User.maybe_direct_follow(follower, followed),
+         {:ok, _, _, _} <- CommonAPI.follow(follower, followed) do
+      followed
+    else
+      error -> handle_error(:follow_import, identifier, error)
+    end
  end

  def perform(_, _, _), do: :ok
@ -62,24 +47,24 @@ defp handle_error(op, user_id, error) do
    error
  end

-  def blocks_import(%User{} = blocker, [_ | _] = identifiers) do
-    BackgroundWorker.enqueue(
-      "blocks_import",
-      %{"user_id" => blocker.id, "identifiers" => identifiers}
+  defp enqueue_many(op, user, identifiers) do
+    Enum.map(
+      identifiers,
+      fn identifier ->
+        BackgroundWorker.enqueue(op, %{"user_id" => user.id, "identifier" => identifier})
+      end
    )
  end

+  def blocks_import(%User{} = blocker, [_ | _] = identifiers) do
+    enqueue_many("blocks_import", blocker, identifiers)
+  end
+
  def follow_import(%User{} = follower, [_ | _] = identifiers) do
-    BackgroundWorker.enqueue(
-      "follow_import",
-      %{"user_id" => follower.id, "identifiers" => identifiers}
-    )
+    enqueue_many("follow_import", follower, identifiers)
  end

  def mutes_import(%User{} = user, [_ | _] = identifiers) do
-    BackgroundWorker.enqueue(
-      "mutes_import",
-      %{"user_id" => user.id, "identifiers" => identifiers}
-    )
+    enqueue_many("mutes_import", user, identifiers)
  end
 end
--- a/lib/pleroma/user/search.ex
+++ b/lib/pleroma/user/search.ex
@ -62,6 +62,11 @@ defp maybe_add_uri_match(list, query) do
    end
  end

+  def sanitise_domain(domain) do
+    domain
+    |> String.replace(~r/[!-\,|@|?|<|>|[-`|{-~|\/|:|\s]+/, "")
+  end
+
  defp format_query(query_string) do
    # Strip the beginning @ off if there is a query
    query_string = String.trim_leading(query_string, "@")
@ -69,7 +74,7 @@ defp format_query(query_string) do
    with [name, domain] <- String.split(query_string, "@") do
      encoded_domain =
        domain
-        |> String.replace(~r/[!-\-|@|[-`|{-~|\/|:|\s]+/, "")
+        |> sanitise_domain()
        |> String.to_charlist()
        |> :idna.encode()
        |> to_string()
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@ -105,6 +105,23 @@ def persist(%{"type" => type} = object, meta) when type in @object_types do
    end
  end

+  @unpersisted_activity_types ~w[Undo Delete Remove Accept Reject]
+  @impl true
+  def persist(%{"type" => type} = object, [local: false] = meta)
+      when type in @unpersisted_activity_types do
+    {:ok, object, meta}
+    {recipients, _, _} = get_recipients(object)
+
+    unpersisted = %Activity{
+      data: object,
+      local: false,
+      recipients: recipients,
+      actor: object["actor"]
+    }
+
+    {:ok, unpersisted, meta}
+  end
+
  @impl true
  def persist(object, meta) do
    with local <- Keyword.fetch!(meta, :local),
@ -722,9 +739,9 @@ defp fetch_activities_for_reading_user(reading_user, params) do
    |> fetch_activities(params, :offset)
  end

-  defp user_activities_recipients(%{godmode: true}), do: []
+  def user_activities_recipients(%{godmode: true}), do: []

-  defp user_activities_recipients(%{reading_user: reading_user}) do
+  def user_activities_recipients(%{reading_user: reading_user}) do
    if not is_nil(reading_user) and reading_user.local do
      [
        Constants.as_public(),
@ -916,6 +933,31 @@ defp restrict_recipients(query, recipients, user) do
    )
  end

+  # Essentially, either look for activities addressed to `recipients`, _OR_ ones
+  # that reference a hashtag that the user follows
+  # Firstly, two fallbacks in case there's no hashtag constraint, or the user doesn't
+  # follow any
+  defp restrict_recipients_or_hashtags(query, recipients, user, nil) do
+    restrict_recipients(query, recipients, user)
+  end
+
+  defp restrict_recipients_or_hashtags(query, recipients, user, []) do
+    restrict_recipients(query, recipients, user)
+  end
+
+  defp restrict_recipients_or_hashtags(query, recipients, _user, hashtag_ids) do
+    from([activity, object] in query)
+    |> join(:left, [activity, object], hto in "hashtags_objects",
+      on: hto.object_id == object.id,
+      as: :hto
+    )
+    |> where(
+      [activity, object, hto: hto],
+      (hto.hashtag_id in ^hashtag_ids and ^Constants.as_public() in activity.recipients) or
+        fragment("? && ?", ^recipients, activity.recipients)
+    )
+  end
+
  defp restrict_local(query, %{local_only: true}) do
    from(activity in query, where: activity.local == true)
  end
@ -1363,7 +1405,7 @@ def fetch_activities_query(recipients, opts \\ %{}) do
      |> maybe_preload_report_notes(opts)
      |> maybe_set_thread_muted_field(opts)
      |> maybe_order(opts)
-      |> restrict_recipients(recipients, opts[:user])
+      |> restrict_recipients_or_hashtags(recipients, opts[:user], opts[:followed_hashtags])
      |> restrict_replies(opts)
      |> restrict_since(opts)
      |> restrict_local(opts)
@ -1669,12 +1711,12 @@ def fetch_and_prepare_user_from_ap_id(ap_id, additional \\ []) do
      {:ok, maybe_update_follow_information(data)}
    else
      # If this has been deleted, only log a debug and not an error
-      {:error, "Object has been deleted" = e} ->
+      {:error, {"Object has been deleted", _, _} = e} ->
        Logger.debug("Could not decode user at fetch #{ap_id}, #{inspect(e)}")
        {:error, e}

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

      {:error, e} ->
--- a/lib/pleroma/web/activity_pub/mrf.ex
+++ b/lib/pleroma/web/activity_pub/mrf.ex
@ -63,6 +63,12 @@ defmodule Pleroma.Web.ActivityPub.MRF do

  @required_description_keys [:key, :related_policy]

+  def filter_one(policy, %{"type" => type} = message)
+      when type in ["Undo", "Block", "Delete"] and
+             policy != Pleroma.Web.ActivityPub.MRF.SimplePolicy do
+    {:ok, message}
+  end
+
  def filter_one(policy, message) do
    should_plug_history? =
      if function_exported?(policy, :history_awareness, 0) do
@ -140,7 +146,8 @@ def get_policies do
    |> get_policies()
    |> Enum.concat([
      Pleroma.Web.ActivityPub.MRF.HashtagPolicy,
-      Pleroma.Web.ActivityPub.MRF.InlineQuotePolicy
+      Pleroma.Web.ActivityPub.MRF.InlineQuotePolicy,
+      Pleroma.Web.ActivityPub.MRF.NormalizeMarkup
    ])
    |> Enum.uniq()
  end
--- a/lib/pleroma/web/activity_pub/mrf/activity_expiration_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/activity_expiration_policy.ex
@ -3,7 +3,7 @@
 # SPDX-License-Identifier: AGPL-3.0-only

 defmodule Pleroma.Web.ActivityPub.MRF.ActivityExpirationPolicy do
-  @moduledoc "Adds expiration to all local Create activities"
+  @moduledoc "Adds expiration to all local Create/Update activities"
  @behaviour Pleroma.Web.ActivityPub.MRF.Policy

  @impl true
@ -25,8 +25,13 @@ defp local?(%{"actor" => actor}) do
    String.starts_with?(actor, Pleroma.Web.Endpoint.url())
  end

-  defp note?(activity) do
-    match?(%{"type" => "Create", "object" => %{"type" => "Note"}}, activity)
+  defp note?(%{"type" => type, "object" => %{"type" => "Note"}})
+       when type in ["Create", "Update"] do
+    true
+  end
+
+  defp note?(_) do
+    false
  end

  defp maybe_add_expiration(activity) do
--- a/lib/pleroma/web/activity_pub/mrf/anti_link_spam_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/anti_link_spam_policy.ex
@ -29,7 +29,8 @@ defp contains_links?(%{"content" => content} = _object) do
  defp contains_links?(_), do: false

  @impl true
-  def filter(%{"type" => "Create", "actor" => actor, "object" => object} = message) do
+  def filter(%{"type" => type, "actor" => actor, "object" => object} = message)
+      when type in ["Create", "Update"] do
    with {:ok, %User{local: false} = u} <- User.get_or_fetch_by_ap_id(actor),
         {:contains_links, true} <- {:contains_links, contains_links?(object)},
         {:old_user, true} <- {:old_user, old_user?(u)} do
--- a/lib/pleroma/web/activity_pub/mrf/follow_bot_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/follow_bot_policy.ex
@ -1,59 +0,0 @@
-defmodule Pleroma.Web.ActivityPub.MRF.FollowBotPolicy do
-  @behaviour Pleroma.Web.ActivityPub.MRF.Policy
-  alias Pleroma.Config
-  alias Pleroma.User
-  alias Pleroma.Web.CommonAPI
-
-  require Logger
-
-  @impl true
-  def filter(message) do
-    with follower_nickname <- Config.get([:mrf_follow_bot, :follower_nickname]),
-         %User{actor_type: "Service"} = follower <-
-           User.get_cached_by_nickname(follower_nickname),
-         %{"type" => "Create", "object" => %{"type" => "Note"}} <- message do
-      try_follow(follower, message)
-    else
-      nil ->
-        Logger.warn(
-          "#{__MODULE__} skipped because of missing `:mrf_follow_bot, :follower_nickname` configuration, the :follower_nickname
-            account does not exist, or the account is not correctly configured as a bot."
-        )
-
-        {:ok, message}
-
-      _ ->
-        {:ok, message}
-    end
-  end
-
-  defp try_follow(follower, message) do
-    to = Map.get(message, "to", [])
-    cc = Map.get(message, "cc", [])
-    actor = [message["actor"]]
-
-    Enum.concat([to, cc, actor])
-    |> List.flatten()
-    |> Enum.uniq()
-    |> User.get_all_by_ap_id()
-    |> Enum.each(fn user ->
-      with false <- user.local,
-           false <- User.following?(follower, user),
-           false <- User.locked?(user),
-           false <- (user.bio || "") |> String.downcase() |> String.contains?("nobot") do
-        Logger.debug(
-          "#{__MODULE__}: Follow request from #{follower.nickname} to #{user.nickname}"
-        )
-
-        CommonAPI.follow(follower, user)
-      end
-    end)
-
-    {:ok, message}
-  end
-
-  @impl true
-  def describe do
-    {:ok, %{}}
-  end
-end
--- a/lib/pleroma/web/activity_pub/mrf/force_bot_unlisted_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/force_bot_unlisted_policy.ex
@ -17,13 +17,14 @@ defp check_if_bot(user), do: check_by_actor_type(user) or check_by_nickname(user
  @impl true
  def filter(
        %{
-          "type" => "Create",
+          "type" => type,
          "to" => to,
          "cc" => cc,
          "actor" => actor,
          "object" => object
        } = message
-      ) do
+      )
+      when type in ["Create", "Update"] do
    user = User.get_cached_by_ap_id(actor)
    isbot = check_if_bot(user)

--- a/lib/pleroma/web/activity_pub/mrf/hellthread_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/hellthread_policy.ex
@ -73,8 +73,8 @@ defp get_recipient_count(message) do
  end

  @impl true
-  def filter(%{"type" => "Create", "object" => %{"type" => object_type}} = message)
-      when object_type in ~w{Note Article} do
+  def filter(%{"type" => type, "object" => %{"type" => object_type}} = message)
+      when type in ~w{Create Update} and object_type in ~w{Note Article} do
    reject_threshold =
      Pleroma.Config.get(
        [:mrf_hellthread, :reject_threshold],
--- a/lib/pleroma/web/activity_pub/mrf/media_proxy_warming_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/media_proxy_warming_policy.ex
@ -12,7 +12,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy do
  require Logger

  @adapter_options [
-    recv_timeout: 10_000
+    receive_timeout: 10_000
  ]

  @impl true
--- a/lib/pleroma/web/activity_pub/mrf/mention_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/mention_policy.ex
@ -8,7 +8,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.MentionPolicy do
  @behaviour Pleroma.Web.ActivityPub.MRF.Policy

  @impl true
-  def filter(%{"type" => "Create"} = message) do
+  def filter(%{"type" => type} = message) when type in ["Create", "Update"] do
    reject_actors = Pleroma.Config.get([:mrf_mention, :actors], [])
    recipients = (message["to"] || []) ++ (message["cc"] || [])

--- a/lib/pleroma/web/activity_pub/mrf/simple_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/simple_policy.ex
@ -13,20 +13,20 @@ defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicy do

  require Pleroma.Constants

-  defp check_accept(%{host: actor_host} = _actor_info, object) do
+  def check_accept(%{host: actor_host} = _actor_info) do
    accepts =
      instance_list(:accept)
      |> MRF.subdomains_regex()

    cond do
-      accepts == [] -> {:ok, object}
-      actor_host == Config.get([Pleroma.Web.Endpoint, :url, :host]) -> {:ok, object}
-      MRF.subdomain_match?(accepts, actor_host) -> {:ok, object}
+      accepts == [] -> {:ok, nil}
+      actor_host == Config.get([Pleroma.Web.Endpoint, :url, :host]) -> {:ok, nil}
+      MRF.subdomain_match?(accepts, actor_host) -> {:ok, nil}
      true -> {:reject, "[SimplePolicy] host not in accept list"}
    end
  end

-  defp check_reject(%{host: actor_host} = _actor_info, object) do
+  def check_reject(%{host: actor_host} = _actor_info) do
    rejects =
      instance_list(:reject)
      |> MRF.subdomains_regex()
@ -34,15 +34,15 @@ defp check_reject(%{host: actor_host} = _actor_info, object) do
    if MRF.subdomain_match?(rejects, actor_host) do
      {:reject, "[SimplePolicy] host in reject list"}
    else
-      {:ok, object}
+      {:ok, nil}
    end
  end

  defp check_media_removal(
         %{host: actor_host} = _actor_info,
-         %{"type" => "Create", "object" => %{"attachment" => child_attachment}} = object
+         %{"type" => type, "object" => %{"attachment" => child_attachment}} = object
       )
-       when length(child_attachment) > 0 do
+       when type in ["Create", "Update"] and length(child_attachment) > 0 do
    media_removal =
      instance_list(:media_removal)
      |> MRF.subdomains_regex()
@ -63,10 +63,11 @@ defp check_media_removal(_actor_info, object), do: {:ok, object}
  defp check_media_nsfw(
         %{host: actor_host} = _actor_info,
         %{
-           "type" => "Create",
+           "type" => type,
           "object" => %{} = _child_object
         } = object
-       ) do
+       )
+       when type in ["Create", "Update"] do
    media_nsfw =
      instance_list(:media_nsfw)
      |> MRF.subdomains_regex()
@ -177,6 +178,55 @@ defp check_banner_removal(%{host: actor_host} = _actor_info, %{"image" => _image

  defp check_banner_removal(_actor_info, object), do: {:ok, object}

+  defp extract_context_uri(%{"conversation" => "tag:" <> rest}) do
+    rest
+    |> String.split(",", parts: 2, trim: true)
+    |> hd()
+    |> case do
+      nil -> nil
+      hostname -> URI.parse("//" <> hostname)
+    end
+  end
+
+  defp extract_context_uri(%{"context" => "http" <> _ = context}), do: URI.parse(context)
+
+  defp extract_context_uri(_), do: nil
+
+  defp check_context(activity) do
+    uri = extract_context_uri(activity)
+
+    with {:uri, true} <- {:uri, Kernel.match?(%URI{}, uri)},
+         {:ok, _} <- check_accept(uri),
+         {:ok, _} <- check_reject(uri) do
+      {:ok, activity}
+    else
+      # Can't check.
+      {:uri, false} -> {:ok, activity}
+      {:reject, nil} -> {:reject, "[SimplePolicy]"}
+      {:reject, _} = e -> e
+      _ -> {:reject, "[SimplePolicy]"}
+    end
+  end
+
+  defp check_reply_to(%{"object" => %{"inReplyTo" => in_reply_to}} = activity) do
+    with {:ok, _} <- filter(in_reply_to) do
+      {:ok, activity}
+    end
+  end
+
+  defp check_reply_to(activity), do: {:ok, activity}
+
+  defp maybe_check_thread(activity) do
+    if Config.get([:mrf_simple, :handle_threads], true) do
+      with {:ok, _} <- check_context(activity),
+           {:ok, _} <- check_reply_to(activity) do
+        {:ok, activity}
+      end
+    else
+      {:ok, activity}
+    end
+  end
+
  defp check_object(%{"object" => object} = activity) do
    with {:ok, _object} <- filter(object) do
      {:ok, activity}
@ -209,13 +259,14 @@ def filter(%{"type" => "Delete", "actor" => actor} = object) do
  def filter(%{"actor" => actor} = object) do
    actor_info = URI.parse(actor)

-    with {:ok, object} <- check_accept(actor_info, object),
-         {:ok, object} <- check_reject(actor_info, object),
+    with {:ok, _} <- check_accept(actor_info),
+         {:ok, _} <- check_reject(actor_info),
         {:ok, object} <- check_media_removal(actor_info, object),
         {:ok, object} <- check_media_nsfw(actor_info, object),
         {:ok, object} <- check_ftl_removal(actor_info, object),
         {:ok, object} <- check_followers_only(actor_info, object),
         {:ok, object} <- check_report_removal(actor_info, object),
+         {:ok, object} <- maybe_check_thread(object),
         {:ok, object} <- check_object(object) do
      {:ok, object}
    else
@ -229,8 +280,8 @@ def filter(%{"id" => actor, "type" => obj_type} = object)
      when obj_type in ["Application", "Group", "Organization", "Person", "Service"] do
    actor_info = URI.parse(actor)

-    with {:ok, object} <- check_accept(actor_info, object),
-         {:ok, object} <- check_reject(actor_info, object),
+    with {:ok, _} <- check_accept(actor_info),
+         {:ok, _} <- check_reject(actor_info),
         {:ok, object} <- check_avatar_removal(actor_info, object),
         {:ok, object} <- check_banner_removal(actor_info, object) do
      {:ok, object}
@ -241,11 +292,17 @@ def filter(%{"id" => actor, "type" => obj_type} = object)
    end
  end

+  def filter(%{"id" => id} = object) do
+    with {:ok, _} <- filter(id) do
+      {:ok, object}
+    end
+  end
+
  def filter(object) when is_binary(object) do
    uri = URI.parse(object)

-    with {:ok, object} <- check_accept(uri, object),
-         {:ok, object} <- check_reject(uri, object) do
+    with {:ok, _} <- check_accept(uri),
+         {:ok, _} <- check_reject(uri) do
      {:ok, object}
    else
      {:reject, nil} -> {:reject, "[SimplePolicy]"}
@ -287,6 +344,7 @@ def describe do

    mrf_simple_excluded =
      Config.get(:mrf_simple)
+      |> Enum.filter(fn {_, v} -> is_list(v) end)
      |> Enum.map(fn {rule, instances} ->
        {rule, Enum.reject(instances, fn {host, _} -> host in exclusions end)}
      end)
@ -331,66 +389,78 @@ def config_description do
      label: "MRF Simple",
      description: "Simple ingress policies",
      children:
-        [
-          %{
-            key: :media_removal,
-            description:
-              "List of instances to strip media attachments from and the reason for doing so"
-          },
-          %{
-            key: :media_nsfw,
-            label: "Media NSFW",
-            description:
-              "List of instances to tag all media as NSFW (sensitive) from and the reason for doing so"
-          },
-          %{
-            key: :federated_timeline_removal,
-            description:
-              "List of instances to remove from the Federated (aka The Whole Known Network) Timeline and the reason for doing so"
-          },
-          %{
-            key: :reject,
-            description:
-              "List of instances to reject activities from (except deletes) and the reason for doing so"
-          },
-          %{
-            key: :accept,
-            description:
-              "List of instances to only accept activities from (except deletes) and the reason for doing so"
-          },
-          %{
-            key: :followers_only,
-            description:
-              "Force posts from the given instances to be visible by followers only and the reason for doing so"
-          },
-          %{
-            key: :report_removal,
-            description: "List of instances to reject reports from and the reason for doing so"
-          },
-          %{
-            key: :avatar_removal,
-            description: "List of instances to strip avatars from and the reason for doing so"
-          },
-          %{
-            key: :banner_removal,
-            description: "List of instances to strip banners from and the reason for doing so"
-          },
-          %{
-            key: :reject_deletes,
-            description: "List of instances to reject deletions from and the reason for doing so"
-          }
-        ]
-        |> Enum.map(fn setting ->
-          Map.merge(
-            setting,
+        ([
+           %{
+             key: :media_removal,
+             description:
+               "List of instances to strip media attachments from and the reason for doing so"
+           },
+           %{
+             key: :media_nsfw,
+             label: "Media NSFW",
+             description:
+               "List of instances to tag all media as NSFW (sensitive) from and the reason for doing so"
+           },
+           %{
+             key: :federated_timeline_removal,
+             description:
+               "List of instances to remove from the Federated (aka The Whole Known Network) Timeline and the reason for doing so"
+           },
+           %{
+             key: :reject,
+             description:
+               "List of instances to reject activities from (except deletes) and the reason for doing so"
+           },
+           %{
+             key: :accept,
+             description:
+               "List of instances to only accept activities from (except deletes) and the reason for doing so"
+           },
+           %{
+             key: :followers_only,
+             description:
+               "Force posts from the given instances to be visible by followers only and the reason for doing so"
+           },
+           %{
+             key: :report_removal,
+             description: "List of instances to reject reports from and the reason for doing so"
+           },
+           %{
+             key: :avatar_removal,
+             description: "List of instances to strip avatars from and the reason for doing so"
+           },
+           %{
+             key: :banner_removal,
+             description: "List of instances to strip banners from and the reason for doing so"
+           },
+           %{
+             key: :reject_deletes,
+             description: "List of instances to reject deletions from and the reason for doing so"
+           }
+         ]
+         |> Enum.map(fn setting ->
+           Map.merge(
+             setting,
+             %{
+               type: {:list, :tuple},
+               key_placeholder: "instance",
+               value_placeholder: "reason",
+               suggestions: [
+                 {"example.com", "Some reason"},
+                 {"*.example.com", "Another reason"}
+               ]
+             }
+           )
+         end)) ++
+          [
            %{
-              type: {:list, :tuple},
-              key_placeholder: "instance",
-              value_placeholder: "reason",
-              suggestions: [{"example.com", "Some reason"}, {"*.example.com", "Another reason"}]
+              key: :handle_threads,
+              label: "Apply to entire threads",
+              type: :boolean,
+              description:
+                "Enable to filter replies to threads based from their originating instance, using the reject and accept rules"
            }
-          )
-        end)
+          ]
    }
  end
 end
--- a/lib/pleroma/web/activity_pub/mrf/tag_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/tag_policy.ex
@ -27,22 +27,22 @@ defp get_tags(_), do: []
  defp process_tag(
         "mrf_tag:media-force-nsfw",
         %{
-           "type" => "Create",
+           "type" => type,
           "object" => %{"attachment" => child_attachment}
         } = message
       )
-       when length(child_attachment) > 0 do
+       when length(child_attachment) > 0 and type in ["Create", "Update"] do
    {:ok, Kernel.put_in(message, ["object", "sensitive"], true)}
  end

  defp process_tag(
         "mrf_tag:media-strip",
         %{
-           "type" => "Create",
+           "type" => type,
           "object" => %{"attachment" => child_attachment} = object
         } = message
       )
-       when length(child_attachment) > 0 do
+       when length(child_attachment) > 0 and type in ["Create", "Update"] do
    object = Map.delete(object, "attachment")
    message = Map.put(message, "object", object)

@ -52,13 +52,14 @@ defp process_tag(
  defp process_tag(
         "mrf_tag:force-unlisted",
         %{
-           "type" => "Create",
+           "type" => type,
           "to" => to,
           "cc" => cc,
           "actor" => actor,
           "object" => object
         } = message
-       ) do
+       )
+       when type in ["Create", "Update"] do
    user = User.get_cached_by_ap_id(actor)

    if Enum.member?(to, Pleroma.Constants.as_public()) do
@ -85,13 +86,14 @@ defp process_tag(
  defp process_tag(
         "mrf_tag:sandbox",
         %{
-           "type" => "Create",
+           "type" => type,
           "to" => to,
           "cc" => cc,
           "actor" => actor,
           "object" => object
         } = message
-       ) do
+       )
+       when type in ["Create", "Update"] do
    user = User.get_cached_by_ap_id(actor)

    if Enum.member?(to, Pleroma.Constants.as_public()) or
@ -152,7 +154,7 @@ def filter(%{"object" => target_actor, "type" => "Follow"} = message),
    do: filter_message(target_actor, message)

  @impl true
-  def filter(%{"actor" => actor, "type" => "Create"} = message),
+  def filter(%{"actor" => actor, "type" => type} = message) when type in ["Create", "Update"],
    do: filter_message(actor, message)

  @impl true
--- a/lib/pleroma/web/activity_pub/object_validators/accept_reject_validator.ex
+++ b/lib/pleroma/web/activity_pub/object_validators/accept_reject_validator.ex
@ -6,6 +6,7 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.AcceptRejectValidator do
  use Ecto.Schema

  alias Pleroma.Activity
+  alias Pleroma.User

  import Ecto.Changeset
  import Pleroma.Web.ActivityPub.ObjectValidators.CommonValidations
@ -29,7 +30,7 @@ def cast_data(data) do

  defp validate_data(cng) do
    cng
-    |> validate_required([:id, :type, :actor, :to, :cc, :object])
+    |> validate_required([:type, :actor, :to, :cc, :object])
    |> validate_inclusion(:type, ["Accept", "Reject"])
    |> validate_actor_presence()
    |> validate_object_presence(allowed_types: ["Follow"])
@ -38,6 +39,7 @@ defp validate_data(cng) do

  def cast_and_validate(data) do
    data
+    |> maybe_fetch_object()
    |> cast_data
    |> validate_data
  end
@ -53,4 +55,31 @@ def validate_accept_reject_rights(cng) do
        |> add_error(:actor, "can't accept or reject the given activity")
    end
  end
+
+  defp maybe_fetch_object(%{"object" => %{} = object} = activity) do
+    # If we don't have an ID, we may have to fetch the object
+    if Map.has_key?(object, "id") do
+      # Do nothing
+      activity
+    else
+      Map.put(activity, "object", fetch_transient_object(object))
+    end
+  end
+
+  defp maybe_fetch_object(activity), do: activity
+
+  defp fetch_transient_object(
+         %{"actor" => actor, "object" => target, "type" => "Follow"} = object
+       ) do
+    with %User{} = actor <- User.get_cached_by_ap_id(actor),
+         %User{local: true} = target <- User.get_cached_by_ap_id(target),
+         %Activity{} = activity <- Activity.follow_activity(actor, target) do
+      activity.data
+    else
+      _e ->
+        object
+    end
+  end
+
+  defp fetch_transient_object(_), do: {:error, "not a supported transient object"}
 end
--- a/lib/pleroma/web/activity_pub/side_effects.ex
+++ b/lib/pleroma/web/activity_pub/side_effects.ex
@ -288,7 +288,6 @@ def handle(%{data: %{"type" => "EmojiReact"}} = object, meta) do

  # Tasks this handles:
  # - Delete and unpins the create activity
-  # - Replace object with Tombstone
  # - Set up notification
  # - Reduce the user note count
  # - Reduce the reply count
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@ -136,7 +136,7 @@ def fix_in_reply_to(%{"inReplyTo" => in_reply_to} = object, options)
        |> Map.drop(["conversation", "inReplyToAtomUri"])
      else
        e ->
-          Logger.warn("Couldn't fetch #{inspect(in_reply_to_id)}, error: #{inspect(e)}")
+          Logger.warn("Couldn't fetch reply@#{inspect(in_reply_to_id)}, error: #{inspect(e)}")
          object
      end
    else
@ -159,7 +159,7 @@ def fix_quote_url(%{"quoteUri" => quote_url} = object, options)
        |> Map.put("quoteUri", quoted_object.data["id"])
      else
        e ->
-          Logger.warn("Couldn't fetch #{inspect(quote_url)}, error: #{inspect(e)}")
+          Logger.warn("Couldn't fetch quote@#{inspect(quote_url)}, error: #{inspect(e)}")
          object
      end
    else
@ -833,7 +833,7 @@ def maybe_fix_object_url(%{"object" => object} = data) when is_binary(object) do
      Map.put(data, "object", external_url)
    else
      {:fetch, e} ->
-        Logger.error("Couldn't fetch #{object} #{inspect(e)}")
+        Logger.error("Couldn't fetch fixed_object@#{object} #{inspect(e)}")
        data

      _ ->
--- a/lib/pleroma/web/api_spec/operations/account_operation.ex
+++ b/lib/pleroma/web/api_spec/operations/account_operation.ex
@ -700,7 +700,13 @@ defp update_credentials_request do
          description:
            "Discovery (listing, indexing) of this account by external services (search bots etc.) is allowed."
        },
-        actor_type: ActorType
+        actor_type: ActorType,
+        status_ttl_days: %Schema{
+          type: :integer,
+          nullable: true,
+          description:
+            "Number of days after which statuses will be deleted. Set to -1 to disable."
+        }
      },
      example: %{
        bot: false,
@ -720,7 +726,8 @@ defp update_credentials_request do
        allow_following_move: false,
        also_known_as: ["https://foo.bar/users/foo"],
        discoverable: false,
-        actor_type: "Person"
+        actor_type: "Person",
+        status_ttl_days: 30
      }
    }
  end
--- a/lib/pleroma/web/api_spec/operations/tag_operation.ex
+++ b/lib/pleroma/web/api_spec/operations/tag_operation.ex
@ -0,0 +1,65 @@
+defmodule Pleroma.Web.ApiSpec.TagOperation do
+  alias OpenApiSpex.Operation
+  alias OpenApiSpex.Schema
+  alias Pleroma.Web.ApiSpec.Schemas.ApiError
+  alias Pleroma.Web.ApiSpec.Schemas.Tag
+
+  def open_api_operation(action) do
+    operation = String.to_existing_atom("#{action}_operation")
+    apply(__MODULE__, operation, [])
+  end
+
+  def show_operation do
+    %Operation{
+      tags: ["Tags"],
+      summary: "Hashtag",
+      description: "View a hashtag",
+      security: [%{"oAuth" => ["read"]}],
+      parameters: [id_param()],
+      operationId: "TagController.show",
+      responses: %{
+        200 => Operation.response("Hashtag", "application/json", Tag),
+        404 => Operation.response("Not Found", "application/json", ApiError)
+      }
+    }
+  end
+
+  def follow_operation do
+    %Operation{
+      tags: ["Tags"],
+      summary: "Follow a hashtag",
+      description: "Follow a hashtag",
+      security: [%{"oAuth" => ["write:follows"]}],
+      parameters: [id_param()],
+      operationId: "TagController.follow",
+      responses: %{
+        200 => Operation.response("Hashtag", "application/json", Tag),
+        404 => Operation.response("Not Found", "application/json", ApiError)
+      }
+    }
+  end
+
+  def unfollow_operation do
+    %Operation{
+      tags: ["Tags"],
+      summary: "Unfollow a hashtag",
+      description: "Unfollow a hashtag",
+      security: [%{"oAuth" => ["write:follow"]}],
+      parameters: [id_param()],
+      operationId: "TagController.unfollow",
+      responses: %{
+        200 => Operation.response("Hashtag", "application/json", Tag),
+        404 => Operation.response("Not Found", "application/json", ApiError)
+      }
+    }
+  end
+
+  defp id_param do
+    Operation.parameter(
+      :id,
+      :path,
+      %Schema{type: :string},
+      "Name of the hashtag"
+    )
+  end
+end
--- a/lib/pleroma/web/api_spec/operations/twitter_util_operation.ex
+++ b/lib/pleroma/web/api_spec/operations/twitter_util_operation.ex
@ -81,7 +81,7 @@ def change_password_operation do
  defp change_password_request do
    %Schema{
      title: "ChangePasswordRequest",
-      description: "POST body for changing the account's passowrd",
+      description: "POST body for changing the account's password",
      type: :object,
      required: [:password, :new_password, :new_password_confirmation],
      properties: %{
--- a/lib/pleroma/web/api_spec/schemas/account.ex
+++ b/lib/pleroma/web/api_spec/schemas/account.ex
@ -109,6 +109,12 @@ defmodule Pleroma.Web.ApiSpec.Schemas.Account do
          }
        }
      },
+      akkoma: %Schema{
+        type: :object,
+        properties: %{
+          note_ttl_days: %Schema{type: :integer}
+        }
+      },
      source: %Schema{
        type: :object,
        properties: %{
--- a/lib/pleroma/web/api_spec/schemas/tag.ex
+++ b/lib/pleroma/web/api_spec/schemas/tag.ex
@ -17,11 +17,16 @@ defmodule Pleroma.Web.ApiSpec.Schemas.Tag do
        type: :string,
        format: :uri,
        description: "A link to the hashtag on the instance"
+      },
+      following: %Schema{
+        type: :boolean,
+        description: "Whether the authenticated user is following the hashtag"
      }
    },
    example: %{
      name: "cofe",
-      url: "https://lain.com/tag/cofe"
+      url: "https://lain.com/tag/cofe",
+      following: false
    }
  })
 end
--- a/lib/pleroma/web/mastodon_api/controllers/account_controller.ex
+++ b/lib/pleroma/web/mastodon_api/controllers/account_controller.ex
@ -175,6 +175,11 @@ def update_credentials(%{assigns: %{user: user}, body_params: params} = conn, _p
      value -> {:ok, value}
    end

+    status_ttl_days_value = fn
+      -1 -> {:ok, nil}
+      value -> {:ok, value}
+    end
+
    user_params =
      [
        :no_rich_text,
@ -215,6 +220,7 @@ def update_credentials(%{assigns: %{user: user}, body_params: params} = conn, _p
      # Note: param name is indeed :discoverable (not an error)
      |> Maps.put_if_present(:is_discoverable, params[:discoverable])
      |> Maps.put_if_present(:language, Pleroma.Web.Gettext.normalize_locale(params[:language]))
+      |> Maps.put_if_present(:status_ttl_days, params[:status_ttl_days], status_ttl_days_value)

    # What happens here:
    #
--- a/lib/pleroma/web/mastodon_api/controllers/status_controller.ex
+++ b/lib/pleroma/web/mastodon_api/controllers/status_controller.ex
@ -171,6 +171,16 @@ def create(%{assigns: %{user: user}, body_params: %{status: _} = params} = conn,
      Map.put(params, :in_reply_to_status_id, params[:in_reply_to_id])
      |> put_application(conn)

+    expires_in_seconds =
+      if is_nil(user.status_ttl_days),
+        do: nil,
+        else: 60 * 60 * 24 * user.status_ttl_days
+
+    params =
+      if is_nil(expires_in_seconds),
+        do: params,
+        else: Map.put(params, :expires_in, expires_in_seconds)
+
    with {:ok, activity} <- CommonAPI.post(user, params) do
      try_render(conn, "show.json",
        activity: activity,
--- a/lib/pleroma/web/mastodon_api/controllers/tag_controller.ex
+++ b/lib/pleroma/web/mastodon_api/controllers/tag_controller.ex
@ -0,0 +1,47 @@
+defmodule Pleroma.Web.MastodonAPI.TagController do
+  @moduledoc "Hashtag routes for mastodon API"
+  use Pleroma.Web, :controller
+
+  alias Pleroma.User
+  alias Pleroma.Hashtag
+
+  plug(Pleroma.Web.ApiSpec.CastAndValidate)
+  plug(Pleroma.Web.Plugs.OAuthScopesPlug, %{scopes: ["read"]} when action in [:show])
+
+  plug(
+    Pleroma.Web.Plugs.OAuthScopesPlug,
+    %{scopes: ["write:follows"]} when action in [:follow, :unfollow]
+  )
+
+  defdelegate open_api_operation(action), to: Pleroma.Web.ApiSpec.TagOperation
+
+  def show(conn, %{id: id}) do
+    with %Hashtag{} = hashtag <- Hashtag.get_by_name(id) do
+      render(conn, "show.json", tag: hashtag, for_user: conn.assigns.user)
+    else
+      _ -> conn |> render_error(:not_found, "Hashtag not found")
+    end
+  end
+
+  def follow(conn, %{id: id}) do
+    with %Hashtag{} = hashtag <- Hashtag.get_by_name(id),
+         %User{} = user <- conn.assigns.user,
+         {:ok, _} <-
+           User.follow_hashtag(user, hashtag) do
+      render(conn, "show.json", tag: hashtag, for_user: user)
+    else
+      _ -> render_error(conn, :not_found, "Hashtag not found")
+    end
+  end
+
+  def unfollow(conn, %{id: id}) do
+    with %Hashtag{} = hashtag <- Hashtag.get_by_name(id),
+         %User{} = user <- conn.assigns.user,
+         {:ok, _} <-
+           User.unfollow_hashtag(user, hashtag) do
+      render(conn, "show.json", tag: hashtag, for_user: user)
+    else
+      _ -> render_error(conn, :not_found, "Hashtag not found")
+    end
+  end
+end
--- a/lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex
+++ b/lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex
@ -41,6 +41,11 @@ defmodule Pleroma.Web.MastodonAPI.TimelineController do

  # GET /api/v1/timelines/home
  def home(%{assigns: %{user: user}} = conn, params) do
+    followed_hashtags =
+      user
+      |> User.followed_hashtags()
+      |> Enum.map(& &1.id)
+
    params =
      params
      |> Map.put(:type, ["Create", "Announce"])
@ -50,6 +55,7 @@ def home(%{assigns: %{user: user}} = conn, params) do
      |> Map.put(:announce_filtering_user, user)
      |> Map.put(:user, user)
      |> Map.put(:local_only, params[:local])
+      |> Map.put(:followed_hashtags, followed_hashtags)
      |> Map.delete(:local)

    activities =
--- a/lib/pleroma/web/mastodon_api/views/account_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/account_view.ex
@ -287,7 +287,8 @@ defp do_render("show.json", %{user: user} = opts) do
      },
      last_status_at: user.last_status_at,
      akkoma: %{
-        instance: render("instance.json", %{instance: instance})
+        instance: render("instance.json", %{instance: instance}),
+        status_ttl_days: user.status_ttl_days
      },
      # Pleroma extensions
      # Note: it's insecure to output :email but fully-qualified nickname may serve as safe stub
--- a/lib/pleroma/web/mastodon_api/views/status_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/status_view.ex
@ -65,7 +65,7 @@ defp get_replied_to_activities(activities) do
  # This should be removed in a future version of Pleroma. Pleroma-FE currently
  # depends on this field, as well.
  defp get_context_id(%{data: %{"context" => context}}) when is_binary(context) do
-    use Bitwise
+    import Bitwise

    :erlang.crc32(context)
    |> band(bnot(0x8000_0000))
--- a/lib/pleroma/web/mastodon_api/views/tag_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/tag_view.ex
@ -0,0 +1,21 @@
+defmodule Pleroma.Web.MastodonAPI.TagView do
+  use Pleroma.Web, :view
+  alias Pleroma.User
+  alias Pleroma.Web.Router.Helpers
+
+  def render("show.json", %{tag: tag, for_user: user}) do
+    following =
+      with %User{} <- user do
+        User.following_hashtag?(user, tag)
+      else
+        _ -> false
+      end
+
+    %{
+      name: tag.name,
+      url: Helpers.tag_feed_url(Pleroma.Web.Endpoint, :feed, tag.name),
+      history: [],
+      following: following
+    }
+  end
+end
--- a/lib/pleroma/web/plugs/http_signature_plug.ex
+++ b/lib/pleroma/web/plugs/http_signature_plug.ex
@ -7,8 +7,12 @@ defmodule Pleroma.Web.Plugs.HTTPSignaturePlug do
  import Phoenix.Controller, only: [get_format: 1, text: 2]
  alias Pleroma.Activity
  alias Pleroma.Web.Router
+  alias Pleroma.Signature
+  alias Pleroma.Instances
  require Logger

+  @cachex Pleroma.Config.get([:cachex, :provider], Cachex)
+
  def init(options) do
    options
  end
@ -57,6 +61,7 @@ defp assign_valid_signature_on_route_aliases(conn, [path | rest]) do

    conn
    |> assign(:valid_signature, HTTPSignatures.validate_conn(conn))
+    |> assign(:signature_actor_id, signature_host(conn))
    |> assign_valid_signature_on_route_aliases(rest)
  end

@ -78,6 +83,36 @@ defp has_signature_header?(conn) do
    conn |> get_req_header("signature") |> Enum.at(0, false)
  end

+  defp maybe_require_signature(
+         %{assigns: %{valid_signature: true, signature_actor_id: actor_id}} = conn
+       ) do
+    # inboxes implicitly need http signatures for authentication
+    # so we don't really know if the instance will have broken federation after
+    # we turn on authorized_fetch_mode.
+    #
+    # to "check" this is a signed fetch, verify if method is GET
+    if conn.method == "GET" do
+      actor_host = URI.parse(actor_id).host
+
+      case @cachex.get(:request_signatures_cache, actor_host) do
+        {:ok, nil} ->
+          Logger.debug("Successful signature from #{actor_host}")
+          Instances.set_request_signatures(actor_host)
+          @cachex.put(:request_signatures_cache, actor_host, true)
+
+        {:ok, true} ->
+          :noop
+
+        any ->
+          Logger.warn(
+            "expected request signature cache to return a boolean, instead got #{inspect(any)}"
+          )
+      end
+    end
+
+    conn
+  end
+
  defp maybe_require_signature(%{assigns: %{valid_signature: true}} = conn), do: conn

  defp maybe_require_signature(conn) do
@ -90,4 +125,14 @@ defp maybe_require_signature(conn) do
      conn
    end
  end
+
+  defp signature_host(conn) do
+    with %{"keyId" => kid} <- HTTPSignatures.signature_for_conn(conn),
+         {:ok, actor_id} <- Signature.key_id_to_actor_id(kid) do
+      actor_id
+    else
+      e ->
+        {:error, e}
+    end
+  end
 end
--- a/lib/pleroma/web/plugs/static_fe_plug.ex
+++ b/lib/pleroma/web/plugs/static_fe_plug.ex
@ -9,7 +9,7 @@ defmodule Pleroma.Web.Plugs.StaticFEPlug do
  def init(options), do: options

  def call(conn, _) do
-    if enabled?() and requires_html?(conn) do
+    if enabled?() and requires_html?(conn) and not_logged_in?(conn) do
      conn
      |> StaticFEController.call(:show)
      |> halt()
@ -23,4 +23,7 @@ defp enabled?, do: Pleroma.Config.get([:static_fe, :enabled], false)
  defp requires_html?(conn) do
    Phoenix.Controller.get_format(conn) == "html"
  end
+
+  defp not_logged_in?(%{assigns: %{user: %Pleroma.User{}}}), do: false
+  defp not_logged_in?(_), do: true
 end
--- a/lib/pleroma/web/rel_me.ex
+++ b/lib/pleroma/web/rel_me.ex
@ -5,7 +5,7 @@
 defmodule Pleroma.Web.RelMe do
  @options [
    max_body: 2_000_000,
-    recv_timeout: 2_000
+    receive_timeout: 2_000
  ]

  if Pleroma.Config.get(:env) == :test do
--- a/Show more
+++ b/Show more
Author	SHA1	Message	Date
FloatingGhost	77e9a52450	allow http AS profile in ld+json header	2022-12-12 19:06:04 +00:00
floatingghost	fd2f03f80a	Update '.gitea/issue_template/feat.yml'	2022-12-12 04:26:43 +00:00
floatingghost	df5b3a48dd	Update '.gitea/issue_template/bug.yml'	2022-12-12 04:26:24 +00:00
FloatingGhost	46c270ead8	Add `mail` to make the gmail adapter in swoosh work	2022-12-12 02:34:13 +00:00
FloatingGhost	9c71782861	Test removed HTTP adapter	2022-12-11 23:50:31 +00:00
FloatingGhost	503827a3d9	Allow mock in http adapter checking	2022-12-11 23:33:58 +00:00
FloatingGhost	f752126427	Remove quack, ensure adapter is finch	2022-12-11 23:22:35 +00:00
FloatingGhost	d81d8c9731	uppdate excoveralls	2022-12-11 22:58:26 +00:00
FloatingGhost	e6da301296	Add diagnostics http	2022-12-11 22:57:18 +00:00
FloatingGhost	9d9c26b833	Ensure Gun is Gone	2022-12-11 19:26:21 +00:00
FloatingGhost	affc910372	Remove hackney/gun in favour of finch	2022-12-11 19:19:31 +00:00
FloatingGhost	1f0ef94271	Bump versions	2022-12-10 14:50:02 +00:00
floatingghost	24fe692070	Merge pull request 'Don't listen Erlang Port Mapper Daemon (4369/tcp) on 0.0.0.0' (#358 ) from r3g_5z/akkoma:close-open-ports into develop Reviewed-on: AkkomaGang/akkoma#358	2022-12-10 14:43:03 +00:00
floatingghost	bfcc7404fe	Merge pull request 'Add dark and light theme mode to docs, detection, and button' (#360 ) from r3g_5z/akkoma:docs-dark-mode into develop Reviewed-on: AkkomaGang/akkoma#360	2022-12-10 14:41:23 +00:00
r3g_5z	fbfffccc1d	Add dark and light theme mode to docs, detection, and button my eyes hurt Signed-off-by: r3g_5z <june@girlboss.ceo>	2022-12-09 22:51:43 -05:00
r3g_5z	77174acc7b	Don't listen Erlang Port Mapper Daemon (4369/tcp) on 0.0.0.0 Signed-off-by: r3g_5z <june@girlboss.ceo>	2022-12-09 21:36:21 -05:00
floatingghost	59fde45b36	Merge pull request 'Remove unnecessary KillMode=process' (#359 ) from r3g_5z/akkoma:remove-unnecessary-killmode into develop Reviewed-on: AkkomaGang/akkoma#359	2022-12-10 00:24:28 +00:00
FloatingGhost	50ee38128b	Merge remote-tracking branch 'origin/translations' into develop	2022-12-10 00:10:24 +00:00
r3g_5z	90fce918b2	Remove unnecessary KillMode=process It's unclear why this is the default as this is highly not recommended. KillMode=process ends up leaving leftover orphaned processes that escape resource management and process lifecycles, wasting resources on servers. Signed-off-by: r3g_5z <june@girlboss.ceo>	2022-12-09 19:10:20 -05:00
FloatingGhost	68894089e8	Do not fetch anything from blocked instances	2022-12-10 00:09:45 +00:00
FloatingGhost	a1515f9a60	Add some extra info around possible nils	2022-12-09 23:45:51 +00:00
Weblate	021b0864a5	Update translation files Updated by "Squash Git commits" hook in Weblate. Translation: Pleroma fe/Akkoma Backend (Static pages) Translate-URL: http://translate.akkoma.dev/projects/akkoma/akkoma-backend-static-pages/	2022-12-09 21:12:53 +00:00
Weblate	c33f0065f2	Translated using Weblate (Indonesian) Currently translated at 21.6% (18 of 83 strings) Added translation using Weblate (Indonesian) Co-authored-by: Weblate <noreply@weblate.org> Co-authored-by: t1 <taaa@fedora.email> Translate-URL: http://translate.akkoma.dev/projects/akkoma/akkoma-backend-static-pages/id/ Translation: Pleroma fe/Akkoma Backend (Static pages)	2022-12-09 21:12:53 +00:00
floatingghost	2144ce5188	Merge pull request 'Magical patches' (#357 ) from magical-patches into develop Reviewed-on: AkkomaGang/akkoma#357	2022-12-09 21:12:49 +00:00
FloatingGhost	739ed14f54	Revert "mandate published on notes" This reverts commit `e49b583147`.	2022-12-09 20:59:26 +00:00
floatingghost	f667884962	Merge pull request 'Skip posts in indexer where publish date is nil' (#356 ) from sn0w/akkoma:feature/indexer-skip-broken-activities into develop Reviewed-on: AkkomaGang/akkoma#356 Reviewed-by: floatingghost <hannah@coffee-and-dreams.uk>	2022-12-09 20:28:48 +00:00
FloatingGhost	e49b583147	mandate published on notes fixes #356	2022-12-09 20:27:54 +00:00
FloatingGhost	f5a315f04c	Add URL and code to :not_found errors Ref #355	2022-12-09 20:13:31 +00:00
FloatingGhost	bc265bfd54	Underscore unused variable	2022-12-09 20:04:48 +00:00
FloatingGhost	dcf58a3c53	Do not pass transient undo-y activities through MRF	2022-12-09 20:01:38 +00:00
FloatingGhost	9db4c2429f	Remove FollowBotPolicy	2022-12-09 19:59:27 +00:00
FloatingGhost	6f83ae27aa	extend reject MRF to check if originating instance is blocked	2022-12-09 19:57:29 +00:00
sn0w	4c0911592b	Skip posts in indexer where publish date is nil	2022-12-09 20:56:39 +01:00
FloatingGhost	d5828f1c5e	Merge remote-tracking branch 'ilja/fix_tagpolicy_to_also_work_on_updates' into develop	2022-12-09 10:31:22 +00:00
FloatingGhost	0eaec57d3f	mix format	2022-12-09 10:24:38 +00:00
ilja	1f863f0a36	Fix MRF policies to also work with Update Objects who got updated would just pass through several of the MRF policies, undoing moderation in some situations. In the relevant cases we now check not only for Create activities, but also Update activities. I checked which ones checked explicitly on type Create using `grep '"type" => "Create"' lib/pleroma/web/activity_pub/mrf/`. The following from that list have not been changed: lib/pleroma/web/activity_pub/mrf/follow_bot_policy.ex * Not relevant for moderation * lib/pleroma/web/activity_pub/mrf/keyword_policy.ex * Already had a test for Update * lib/pleroma/web/activity_pub/mrf/object_age_policy.ex * In practice only relevant when fetching old objects (e.g. through Like or Announce). These are always wrapped in a Create. * lib/pleroma/web/activity_pub/mrf/reject_non_public.ex * We don't allow changing scope with Update, so not relevant here	2022-12-08 23:22:05 +01:00
ilja	ce517ff4e5	Fix tagpolicy to also work with Update Objects who got updated would just pass the TagPolicy, undoing the moderation that was set in place for the Actor. Now we check not only for Create activities, but also Update activities.	2022-12-08 21:53:42 +01:00
floatingghost	9addd8f414	Merge pull request 'Add YAML issue templates for bug and feat' (#353 ) from sfr/akkoma:issue-template into develop Reviewed-on: AkkomaGang/akkoma#353	2022-12-08 18:40:45 +00:00
Sol Fisher Romanoff	067bd17e1e	Add YAML issue templates for bug and feat	2022-12-08 20:16:59 +02:00
floatingghost	104d8dcc1f	Update 'ISSUE_TEMPLATE.md'	2022-12-07 22:37:23 +00:00
floatingghost	3f1c84d300	Add issue template	2022-12-07 22:27:00 +00:00
FloatingGhost	4e4bd24813	Add misskey markdown to format suggestions Fixes #345	2022-12-07 15:39:19 +00:00
FloatingGhost	cb3ccf5f47	Add check for null reply_to_user	2022-12-07 13:41:12 +00:00
FloatingGhost	1afba64464	Redirect to standard FE if logged in	2022-12-07 13:35:00 +00:00
FloatingGhost	221a95b860	Document custom.css	2022-12-07 11:45:53 +00:00
FloatingGhost	c7369d6d03	GOOGLE	2022-12-07 11:41:24 +00:00
sfr	7c4b415929	static-fe overhaul (#236 ) makes static-fe look more like pleroma-fe, with the stylesheets matching pleroma-dark and pleroma-light based on `prefers-color-scheme`. - [x] navbar - [x] about sidebar - [x] background image - [x] statuses - [x] "reply to" or "edited" tags - [x] accounts - [x] show more / show less - [x] posts / with replies / media / followers / following - [x] followers/following would require user card snippets - [x] admin/bot indicators - [x] attachments - [x] nsfw attachments - [x] fontawesome icons - [x] clean up and sort css - [x] add pleroma-light - [x] replace hardcoded strings also i forgot - [x] repeated headers how it looks + sneak peek at statuses: ![](https://akkoma.dev/attachments/c0d3a025-6987-4630-8eb9-5f4db6858359) Co-authored-by: Sol Fisher Romanoff <sol@solfisher.com> Reviewed-on: AkkomaGang/akkoma#236 Co-authored-by: sfr <sol@solfisher.com> Co-committed-by: sfr <sol@solfisher.com>	2022-12-07 11:20:53 +00:00
floatingghost	09326ffa56	Diagnostics tasks (#348 ) a bunch of ways to get query plans to help with debugging Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk> Reviewed-on: AkkomaGang/akkoma#348	2022-12-07 11:12:34 +00:00
floatingghost	4f2f2c9125	Merge pull request 'Small improvements to the Gentoo installation isntructions' (#335 ) from timorl/akkoma:i-use-gentoo-btw into develop Reviewed-on: AkkomaGang/akkoma#335	2022-12-07 11:07:06 +00:00
ilja	fdf33392b3	DOCS: backup restore improvements (#332 ) Mostly add how to speed up restoration by adding activities_visibility_index later. Also some small other improvements. This is based on what I did on a Pleroma instance. I assume the activities_visibility_index taking so long is still true for Akkoma, but can't really test because I don't have a big enough Akkoma DB yet 🙃 Co-authored-by: ilja <git@ilja.space> Reviewed-on: AkkomaGang/akkoma#332 Reviewed-by: floatingghost <hannah@coffee-and-dreams.uk> Co-authored-by: ilja <akkoma.dev@ilja.space> Co-committed-by: ilja <akkoma.dev@ilja.space>	2022-12-07 11:05:35 +00:00
FloatingGhost	b058df3faa	Allow dashes in domain name search	2022-12-06 10:57:10 +00:00
FloatingGhost	8e5a88edf7	update default favicon	2022-12-05 13:47:52 +00:00
FloatingGhost	b70a60c6c5	Doc branding	2022-12-05 13:45:36 +00:00
floatingghost	c62e1e3ad5	varnish config/docs (#342 ) Co-authored-by: Mark Felder <feld@feld.me> Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk> Reviewed-on: AkkomaGang/akkoma#342	2022-12-05 13:39:27 +00:00
floatingghost	d55de5debf	Remerge of hashtag following (#341 ) this time with less idiot Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk> Reviewed-on: AkkomaGang/akkoma#341	2022-12-05 12:58:48 +00:00
floatingghost	ec6bf8c3f7	revert `4a94c9a31e` revert Add ability to follow hashtags (#336) Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk> Reviewed-on: AkkomaGang/akkoma#336	2022-12-04 20:04:09 +00:00
floatingghost	4c3971aebd	Add changelog entry for hashtag following	2022-12-04 18:35:04 +00:00
floatingghost	4a94c9a31e	Add ability to follow hashtags (#336 ) Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk> Reviewed-on: AkkomaGang/akkoma#336	2022-12-04 17:36:59 +00:00
timorl	d923cb96b1	Small improvements to the Gentoo installation isntructions	2022-12-04 16:37:49 +01:00
floatingghost	6b882a2c0b	Purge Rejected Follow requests in daily task (#334 ) Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk> Reviewed-on: AkkomaGang/akkoma#334	2022-12-03 23:17:43 +00:00
floatingghost	0c2c057c75	Merge pull request 'Manually define PATH for Arch Linux users in systemd unit' (#333 ) from r3g_5z/akkoma:arch-perl-modules into develop Reviewed-on: AkkomaGang/akkoma#333	2022-12-03 22:24:34 +00:00
r3g_5z	04b5c711be	Manually define PATH for Arch Linux users in systemd unit Signed-off-by: r3g_5z <june@girlboss.ceo>	2022-12-03 14:17:54 -05:00
FloatingGhost	1409f91d50	Add maskable to logo	2022-12-02 12:00:56 +00:00
floatingghost	94b469cab0	Merge pull request 'Add PWA config' (#329 ) from pwa into develop Reviewed-on: AkkomaGang/akkoma#329	2022-12-02 11:13:29 +00:00
floatingghost	8d6cc6cb65	Resolve follow activity from accept/reject without ID (#328 ) Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk> Reviewed-on: AkkomaGang/akkoma#328	2022-12-02 11:12:37 +00:00
FloatingGhost	b33e548e8d	still use mask	2022-12-02 11:10:35 +00:00
FloatingGhost	bbf2e3f445	Add PWA info	2022-12-02 11:10:35 +00:00
floatingghost	db60640c5b	Fixing up deletes a bit (#327 ) Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk> Reviewed-on: AkkomaGang/akkoma#327	2022-12-01 15:00:53 +00:00
floatingghost	083368d61a	Merge pull request 'docs: Remove quarantine section' (#324 ) from norm/akkoma:remove-quarantine into develop Reviewed-on: AkkomaGang/akkoma#324	2022-12-01 12:59:50 +00:00
Norm	b188ac3f21	docs: Remove quarantine section Quarantining was deprecated back in 2022.08. Also added that SimplePolicy's `reject` also prevents outbound federation to servers listed there.	2022-11-29 18:31:24 +00:00
floatingghost	0cfd5b4e89	Add ability to set a default post expiry (#321 ) Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk> Reviewed-on: AkkomaGang/akkoma#321	2022-11-28 13:34:54 +00:00
floatingghost	2d019e14e3	Merge pull request 'Spin off imports into n oban jobs' (#319 ) from spin-off-imports into develop Reviewed-on: AkkomaGang/akkoma#319	2022-11-27 21:59:41 +00:00
FloatingGhost	ee7059c9cf	Spin off imports into n oban jobs	2022-11-27 21:45:41 +00:00
floatingghost	8d17287e2d	Merge pull request 'Delete 'installation/download-mastofe-build.sh'' (#317 ) from norm/akkoma:delete-download-mastofe-build.sh into develop Reviewed-on: AkkomaGang/akkoma#317	2022-11-27 20:56:54 +00:00
Norm	8557188ced	Delete 'installation/download-mastofe-build.sh' AFAIK, this isn't being used anymore, and it's outdated anyways.	2022-11-26 19:32:09 -05:00
FloatingGhost	a8f3cf6563	Merge branch 'normalise-markup-by-default' into develop	2022-11-26 21:16:21 +00:00
FloatingGhost	5bb95256ee	weirdly no, images should not have classes	2022-11-26 21:15:10 +00:00
floatingghost	98a21debf9	normalise markup by default (#316 ) why was this _not_ default? honestly i'm surprised pleroma hasn't exploded yet Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk> Reviewed-on: AkkomaGang/akkoma#316	2022-11-26 21:06:20 +00:00
FloatingGhost	2fd45e0cb6	document normalizemarkup and inlinequote MRFs	2022-11-26 21:05:04 +00:00
FloatingGhost	c379618b34	Add tests, changelog entry	2022-11-26 20:52:49 +00:00
FloatingGhost	075debe504	Turn on markup normalisation by default	2022-11-26 20:46:38 +00:00
floatingghost	e3085c495c	fix tests broken by relay defaults changing (#314 ) Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk> Reviewed-on: AkkomaGang/akkoma#314	2022-11-26 20:45:47 +00:00
@r3g_5z@plem.sapphic.site	565ead8397	minor-changes (#313 ) Only real change here is making MRF rejects log as debug instead of info (AkkomaGang/akkoma#234) I don't know if it's the best way to do it, but it seems it's just MRF using this and almost always this is intended. The rest are just minor docs changes and syncing the restricted nicknames stuff. I compiled and ran my changes with Docker and they all work. Co-authored-by: r3g_5z <june@terezi.dev> Reviewed-on: AkkomaGang/akkoma#313 Co-authored-by: @r3g_5z@plem.sapphic.site <june@girlboss.ceo> Co-committed-by: @r3g_5z@plem.sapphic.site <june@girlboss.ceo>	2022-11-26 19:27:58 +00:00
@luna@f.l4.pm	a90c45b7e9	Add Signed Fetch Statistics (#312 ) Close #304. Notes: - This patch was made on top of Pleroma develop, so I created a separate cachex worker for request signature actions, instead of Akkoma's instance cache. If that is a merge blocker, I can attempt to move logic around for that. - Regarding the `has_request_signatures: true -> false` state transition: I think that is a higher level thing (resetting instance state on new instance actor key) which is separate from the changes relevant to this one. Co-authored-by: Luna <git@l4.pm> Reviewed-on: AkkomaGang/akkoma#312 Co-authored-by: @luna@f.l4.pm <akkoma@l4.pm> Co-committed-by: @luna@f.l4.pm <akkoma@l4.pm>	2022-11-26 19:22:56 +00:00