From e2f749b5b020bafb0362ce98f37396ab6045fc05 Mon Sep 17 00:00:00 2001
From: Aria <me@aria.rip>
Date: Sun, 17 Dec 2023 18:56:15 +0000
Subject: [PATCH 01/54] don't select ueberauth 0.10.6, as it is broken

see https://github.com/ueberauth/ueberauth/issues/194
---
 mix.exs  | 2 +-
 mix.lock | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mix.exs b/mix.exs
index 2789a46e7..23f1761b5 100644
--- a/mix.exs
+++ b/mix.exs
@@ -156,7 +156,7 @@ defp deps do
       {:ex_syslogger, "~> 2.0.0"},
       {:floki, "~> 0.34"},
       {:timex, "~> 3.7"},
-      {:ueberauth, "~> 0.10"},
+      {:ueberauth, "== 0.10.5"},
       {:linkify, git: "https://akkoma.dev/AkkomaGang/linkify.git"},
       {:http_signatures,
        git: "https://akkoma.dev/AkkomaGang/http_signatures.git",
diff --git a/mix.lock b/mix.lock
index 501ed8b0a..810356345 100644
--- a/mix.lock
+++ b/mix.lock
@@ -124,7 +124,7 @@
   "timex": {:hex, :timex, "3.7.11", "bb95cb4eb1d06e27346325de506bcc6c30f9c6dea40d1ebe390b262fad1862d1", [:mix], [{:combine, "~> 0.10", [hex: :combine, repo: "hexpm", optional: false]}, {:gettext, "~> 0.20", [hex: :gettext, repo: "hexpm", optional: false]}, {:tzdata, "~> 1.1", [hex: :tzdata, repo: "hexpm", optional: false]}], "hexpm", "8b9024f7efbabaf9bd7aa04f65cf8dcd7c9818ca5737677c7b76acbc6a94d1aa"},
   "trailing_format_plug": {:hex, :trailing_format_plug, "0.0.7", "64b877f912cf7273bed03379936df39894149e35137ac9509117e59866e10e45", [:mix], [{:plug, "> 0.12.0", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "bd4fde4c15f3e993a999e019d64347489b91b7a9096af68b2bdadd192afa693f"},
   "tzdata": {:hex, :tzdata, "1.1.1", "20c8043476dfda8504952d00adac41c6eda23912278add38edc140ae0c5bcc46", [:mix], [{:hackney, "~> 1.17", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm", "a69cec8352eafcd2e198dea28a34113b60fdc6cb57eb5ad65c10292a6ba89787"},
-  "ueberauth": {:hex, :ueberauth, "0.10.6", "8dbefd5aec30c5830af2b6ce6e03f62cc28ae0757f34e2986454f54b8dca3f65", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "b0ad1c7508f3cfd5c2c1c668d1a32bafd77de4c56af82c7bfd7e54ed078a7928"},
+  "ueberauth": {:hex, :ueberauth, "0.10.5", "806adb703df87e55b5615cf365e809f84c20c68aa8c08ff8a416a5a6644c4b02", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "3efd1f31d490a125c7ed453b926f7c31d78b97b8a854c755f5c40064bf3ac9e1"},
   "unicode_util_compat": {:hex, :unicode_util_compat, "0.7.0", "bc84380c9ab48177092f43ac89e4dfa2c6d62b40b8bd132b1059ecc7232f9a78", [:rebar3], [], "hexpm", "25eee6d67df61960cf6a794239566599b09e17e668d3700247bc498638152521"},
   "unsafe": {:hex, :unsafe, "1.0.2", "23c6be12f6c1605364801f4b47007c0c159497d0446ad378b5cf05f1855c0581", [:mix], [], "hexpm", "b485231683c3ab01a9cd44cb4a79f152c6f3bb87358439c6f68791b85c2df675"},
   "vex": {:hex, :vex, "0.9.1", "cb65348ebd1c4002861b65bef36e524c29d9a879c90119b2d0e674e323124277", [:mix], [], "hexpm", "a0f9f3959d127ad6a6a617c3f607ecfb1bc6f3c59f9c3614a901a46d1765bafe"},

From eb0dbf6b79f2b6055adad2f188c18f0633a50c55 Mon Sep 17 00:00:00 2001
From: Aria <me@aria.rip>
Date: Sun, 17 Dec 2023 19:27:36 +0000
Subject: [PATCH 02/54] fix oauth consumer mode

the previous code passed a state parameter to ueberauth with info
about where to go after the user logged in, etc.
since ueberauth 0.7, this parameter is ignored and oauth state is used
for actual CSRF reasons.

we now set a cookie with the state we need to keep track of, and read
it once the callback happens.
---
 lib/pleroma/web/o_auth/o_auth_controller.ex | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/lib/pleroma/web/o_auth/o_auth_controller.ex b/lib/pleroma/web/o_auth/o_auth_controller.ex
index ba33dc9e7..29cbd6aa6 100644
--- a/lib/pleroma/web/o_auth/o_auth_controller.ex
+++ b/lib/pleroma/web/o_auth/o_auth_controller.ex
@@ -443,13 +443,10 @@ def prepare_request(%Plug.Conn{} = conn, %{
       |> Map.put("scope", scope)
       |> Jason.encode!()
 
-    params =
-      auth_attrs
-      |> Map.drop(~w(scope scopes client_id redirect_uri))
-      |> Map.put("state", state)
-
     # Handing the request to Ueberauth
-    redirect(conn, to: ~p"/oauth/#{provider}?#{params}")
+    conn
+    |> put_resp_cookie("akkoma_oauth_state", state)
+    |> redirect(to: ~p"/oauth/#{provider}")
   end
 
   def request(%Plug.Conn{} = conn, params) do
@@ -468,7 +465,7 @@ def request(%Plug.Conn{} = conn, params) do
   end
 
   def callback(%Plug.Conn{assigns: %{ueberauth_failure: failure}} = conn, params) do
-    params = callback_params(params)
+    params = callback_params(conn, params)
     messages = for e <- Map.get(failure, :errors, []), do: e.message
     message = Enum.join(messages, "; ")
 
@@ -481,7 +478,7 @@ def callback(%Plug.Conn{assigns: %{ueberauth_failure: failure}} = conn, params)
   end
 
   def callback(%Plug.Conn{} = conn, params) do
-    params = callback_params(params)
+    params = callback_params(conn, params)
 
     with {:ok, registration} <- Authenticator.get_registration(conn) do
       auth_attrs = Map.take(params, ~w(client_id redirect_uri scope scopes state))
@@ -511,8 +508,9 @@ def callback(%Plug.Conn{} = conn, params) do
     end
   end
 
-  defp callback_params(%{"state" => state} = params) do
-    Map.merge(params, Jason.decode!(state))
+  defp callback_params(%Plug.Conn{} = conn, params) do
+    fetch_cookies(conn)
+    Map.merge(params, Jason.decode!(Map.get(conn.req_cookies, "akkoma_oauth_state", "{}")))
   end
 
   def registration_details(%Plug.Conn{} = conn, %{"authorization" => auth_attrs}) do

From a074be24ca8dedebd6e2e4df3d59a66104667b70 Mon Sep 17 00:00:00 2001
From: Aria <me@aria.rip>
Date: Sun, 17 Dec 2023 19:36:27 +0000
Subject: [PATCH 03/54] add bit about frontend configuration to oauth consumer
 docs

---
 docs/docs/configuration/cheatsheet.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/docs/docs/configuration/cheatsheet.md b/docs/docs/configuration/cheatsheet.md
index 73fdf9eea..2f53f0c78 100644
--- a/docs/docs/configuration/cheatsheet.md
+++ b/docs/docs/configuration/cheatsheet.md
@@ -958,6 +958,15 @@ config :ueberauth, Ueberauth,
   ]
 ```
 
+You may also need to set up your frontend to use oauth logins. For example, for `akkoma-fe`:
+
+```elixir
+config :pleroma, :frontend_configurations,
+  pleroma_fe: %{
+    loginMethod: "token"
+  }
+```
+
 ## Link parsing
 
 ### :uri_schemes

From 77000b8ffd92f18d7c901a545b48df7d5a5d41a4 Mon Sep 17 00:00:00 2001
From: Aria <me@aria.rip>
Date: Sun, 17 Dec 2023 21:47:47 +0000
Subject: [PATCH 04/54] update tests for oauth consumer

---
 lib/pleroma/web/o_auth/o_auth_controller.ex   | 23 +++++---
 .../web/o_auth/o_auth_controller_test.exs     | 55 +++++++++++++------
 2 files changed, 54 insertions(+), 24 deletions(-)

diff --git a/lib/pleroma/web/o_auth/o_auth_controller.ex b/lib/pleroma/web/o_auth/o_auth_controller.ex
index 29cbd6aa6..29aa8c10e 100644
--- a/lib/pleroma/web/o_auth/o_auth_controller.ex
+++ b/lib/pleroma/web/o_auth/o_auth_controller.ex
@@ -39,6 +39,7 @@ defmodule Pleroma.Web.OAuth.OAuthController do
   action_fallback(Pleroma.Web.OAuth.FallbackController)
 
   @oob_token_redirect_uri "urn:ietf:wg:oauth:2.0:oob"
+  @state_cookie_name "akkoma_oauth_state"
 
   # Note: this definition is only called from error-handling methods with `conn.params` as 2nd arg
   def authorize(%Plug.Conn{} = conn, %{"authorization" => _} = params) do
@@ -445,7 +446,7 @@ def prepare_request(%Plug.Conn{} = conn, %{
 
     # Handing the request to Ueberauth
     conn
-    |> put_resp_cookie("akkoma_oauth_state", state)
+    |> put_resp_cookie(@state_cookie_name, state)
     |> redirect(to: ~p"/oauth/#{provider}")
   end
 
@@ -469,12 +470,18 @@ def callback(%Plug.Conn{assigns: %{ueberauth_failure: failure}} = conn, params)
     messages = for e <- Map.get(failure, :errors, []), do: e.message
     message = Enum.join(messages, "; ")
 
-    conn
-    |> put_flash(
-      :error,
-      dgettext("errors", "Failed to authenticate: %{message}.", message: message)
-    )
-    |> redirect(external: redirect_uri(conn, params["redirect_uri"]))
+    error_message = dgettext("errors", "Failed to authenticate: %{message}.", message: message)
+
+    if params["redirect_uri"] do
+      conn
+      |> put_flash(
+        :error,
+        error_message
+      )
+      |> redirect(external: redirect_uri(conn, params["redirect_uri"]))
+    else
+      send_resp(conn, :bad_request, error_message)
+    end
   end
 
   def callback(%Plug.Conn{} = conn, params) do
@@ -510,7 +517,7 @@ def callback(%Plug.Conn{} = conn, params) do
 
   defp callback_params(%Plug.Conn{} = conn, params) do
     fetch_cookies(conn)
-    Map.merge(params, Jason.decode!(Map.get(conn.req_cookies, "akkoma_oauth_state", "{}")))
+    Map.merge(params, Jason.decode!(Map.get(conn.req_cookies, @state_cookie_name, "{}")))
   end
 
   def registration_details(%Plug.Conn{} = conn, %{"authorization" => auth_attrs}) do
diff --git a/test/pleroma/web/o_auth/o_auth_controller_test.exs b/test/pleroma/web/o_auth/o_auth_controller_test.exs
index e0ba339db..d0703f44c 100644
--- a/test/pleroma/web/o_auth/o_auth_controller_test.exs
+++ b/test/pleroma/web/o_auth/o_auth_controller_test.exs
@@ -81,9 +81,7 @@ test "GET /oauth/prepare_request encodes parameters as `state` and redirects", %
 
       assert html_response(conn, 302)
 
-      redirect_query = URI.parse(redirected_to(conn)).query
-      assert %{"state" => state_param} = URI.decode_query(redirect_query)
-      assert {:ok, state_components} = Jason.decode(state_param)
+      assert {:ok, state_components} = Jason.decode(conn.resp_cookies["akkoma_oauth_state"].value)
 
       expected_client_id = app.client_id
       expected_redirect_uri = app.redirect_uris
@@ -97,7 +95,7 @@ test "GET /oauth/prepare_request encodes parameters as `state` and redirects", %
     end
 
     test "with user-bound registration, GET /oauth/<provider>/callback redirects to `redirect_uri` with `code`",
-         %{app: app, conn: conn} do
+         %{app: app, conn: _} do
       registration = insert(:registration)
       redirect_uri = OAuthController.default_redirect_uri(app)
 
@@ -109,15 +107,17 @@ test "with user-bound registration, GET /oauth/<provider>/callback redirects to
       }
 
       conn =
-        conn
+        build_conn()
+        |> put_req_cookie("akkoma_oauth_state", Jason.encode!(state_params))
+        |> Plug.Session.call(Plug.Session.init(@session_opts))
+        |> fetch_session()
         |> assign(:ueberauth_auth, %{provider: registration.provider, uid: registration.uid})
         |> get(
           "/oauth/twitter/callback",
           %{
             "oauth_token" => "G-5a3AAAAAAAwMH9AAABaektfSM",
             "oauth_verifier" => "QZl8vUqNvXMTKpdmUnGejJxuHG75WWWs",
-            "provider" => "twitter",
-            "state" => Jason.encode!(state_params)
+            "provider" => "twitter"
           }
         )
 
@@ -162,15 +162,42 @@ test "with user-unbound registration, GET /oauth/<provider>/callback renders reg
 
     test "on authentication error, GET /oauth/<provider>/callback redirects to `redirect_uri`", %{
       app: app,
-      conn: conn
+      conn: _
     } do
       state_params = %{
         "scope" => Enum.join(app.scopes, " "),
         "client_id" => app.client_id,
-        "redirect_uri" => OAuthController.default_redirect_uri(app),
-        "state" => ""
+        "redirect_uri" => OAuthController.default_redirect_uri(app)
       }
 
+      conn =
+        build_conn()
+        |> put_req_cookie("akkoma_oauth_state", Jason.encode!(state_params))
+        |> Plug.Session.call(Plug.Session.init(@session_opts))
+        |> fetch_session()
+        |> assign(:ueberauth_failure, %{errors: [%{message: "(error description)"}]})
+        |> get(
+          "/oauth/twitter/callback",
+          %{
+            "oauth_token" => "G-5a3AAAAAAAwMH9AAABaektfSM",
+            "oauth_verifier" => "QZl8vUqNvXMTKpdmUnGejJxuHG75WWWs",
+            "provider" => "twitter",
+            "state" => ""
+          }
+        )
+
+      assert html_response(conn, 302)
+      assert redirected_to(conn) == app.redirect_uris
+
+      assert Phoenix.Flash.get(conn.assigns.flash, :error) ==
+               "Failed to authenticate: (error description)."
+    end
+
+    test "on authentication error with no prior state, GET /oauth/<provider>/callback returns 400",
+         %{
+           app: _,
+           conn: conn
+         } do
       conn =
         conn
         |> assign(:ueberauth_failure, %{errors: [%{message: "(error description)"}]})
@@ -180,15 +207,11 @@ test "on authentication error, GET /oauth/<provider>/callback redirects to `redi
             "oauth_token" => "G-5a3AAAAAAAwMH9AAABaektfSM",
             "oauth_verifier" => "QZl8vUqNvXMTKpdmUnGejJxuHG75WWWs",
             "provider" => "twitter",
-            "state" => Jason.encode!(state_params)
+            "state" => ""
           }
         )
 
-      assert html_response(conn, 302)
-      assert redirected_to(conn) == app.redirect_uris
-
-      assert Phoenix.Flash.get(conn.assigns.flash, :error) ==
-               "Failed to authenticate: (error description)."
+      assert response(conn, 400)
     end
 
     test "GET /oauth/registration_details renders registration details form", %{

From e47c50666d2dd66eb3751daca5efd069adac67f7 Mon Sep 17 00:00:00 2001
From: Oneric <oneric@oneric.stub>
Date: Sun, 28 Jan 2024 22:15:54 +0100
Subject: [PATCH 05/54] Fix obfuscation of short domains

Fixes https://akkoma.dev/AkkomaGang/akkoma/issues/645
---
 CHANGELOG.md                                     |  1 +
 .../web/activity_pub/mrf/simple_policy.ex        | 16 +++++++++++++++-
 .../web/activity_pub/mrf/simple_policy_test.exs  |  2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e2a3635f6..8a38e80ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Documentation issue in which a non-existing nginx file was referenced
 - Issue where a bad inbox URL could break federation
 - Issue where hashtag rel values would be scrubbed
+- Issue where short domains listed in `transparency_obfuscate_domains` were not actually obfuscated
 
 ## 2023.08
 
diff --git a/lib/pleroma/web/activity_pub/mrf/simple_policy.ex b/lib/pleroma/web/activity_pub/mrf/simple_policy.ex
index ba54eb674..c2e17ca9e 100644
--- a/lib/pleroma/web/activity_pub/mrf/simple_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/simple_policy.ex
@@ -314,6 +314,20 @@ def filter(object) when is_binary(object) do
   def filter(object), do: {:ok, object}
 
   defp obfuscate(string) when is_binary(string) do
+    # Want to strip at least two neighbouring chars
+    # to ensure at least one non-dot char is in the obfuscation area
+    stripped = String.length(string) - 6
+
+    {keepstart, keepend} =
+      if stripped > 1 do
+        {3, 3}
+      else
+        {
+          2 - div(1 - stripped, 2),
+          2 + div(stripped, 2)
+        }
+      end
+
     string
     |> to_charlist()
     |> Enum.with_index()
@@ -322,7 +336,7 @@ defp obfuscate(string) when is_binary(string) do
         ?.
 
       {char, index} ->
-        if 3 <= index && index < String.length(string) - 3, do: ?*, else: char
+        if keepstart <= index && index < String.length(string) - keepend, do: ?*, else: char
     end)
     |> to_string()
   end
diff --git a/test/pleroma/web/activity_pub/mrf/simple_policy_test.exs b/test/pleroma/web/activity_pub/mrf/simple_policy_test.exs
index 875cf8f43..c6600f001 100644
--- a/test/pleroma/web/activity_pub/mrf/simple_policy_test.exs
+++ b/test/pleroma/web/activity_pub/mrf/simple_policy_test.exs
@@ -283,7 +283,7 @@ test "obfuscates domains listed in :transparency_obfuscate_domains" do
 
       assert {:ok,
               %{
-                mrf_simple: %{reject: ["rem***.*****nce", "a.b"]},
+                mrf_simple: %{reject: ["rem***.*****nce", "*.b"]},
                 mrf_simple_info: %{reject: %{"rem***.*****nce" => %{}}}
               }} = SimplePolicy.describe()
     end

From 3cd882528eb816d18c7d79ea5d797dfb3599c757 Mon Sep 17 00:00:00 2001
From: Oneric <oneric@oneric.stub>
Date: Sun, 28 Jan 2024 23:12:59 +0100
Subject: [PATCH 06/54] More prominently document MRF transparency and
 obfuscation

And point to the cheat sheet for all other MRF policies
and their configuration details.
---
 docs/docs/configuration/mrf.md | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/docs/docs/configuration/mrf.md b/docs/docs/configuration/mrf.md
index a74cfa90d..170b26792 100644
--- a/docs/docs/configuration/mrf.md
+++ b/docs/docs/configuration/mrf.md
@@ -61,6 +61,32 @@ config :pleroma, :mrf_simple,
 
 The effects of MRF policies can be very drastic. It is important to use this functionality carefully. Always try to talk to an admin before writing an MRF policy concerning their instance.
 
+## Hiding or Obfuscating Policies
+
+You can opt out of publicly displaying all MRF policies or only hide or obfuscate selected domains.
+
+To just hide everything set:
+
+```elixir
+config :pleroma, :mrf,
+  ...
+  transparency: false,
+```
+
+To hide or obfuscate only select entries, use:
+
+```elixir
+config :pleroma, :mrf,
+  ...
+  transparency_obfuscate_domains: ["handholdi.ng", "badword.com"],
+  transparency_exclusions: [{"ghost.club", "even a fragment is too spoopy for humans"}]
+```
+
+## More MRF Policies
+
+See the [documentation cheatsheet](cheatsheet.md)
+for all available MRF policies and their options.
+
 ## Writing your own MRF Policy
 
 As discussed above, the MRF system is a modular system that supports pluggable policies. This means that an admin may write a custom MRF policy in Elixir or any other language that runs on the Erlang VM, by specifying the module name in the `policies` config setting.

From d7d159c49f1f2c21214d88d9caf5bbd785653d02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20=C5=9Awi=C4=85tkowski?= <katafrakt@vivaldi.net>
Date: Sat, 3 Feb 2024 14:24:03 +0100
Subject: [PATCH 07/54] Fix OpenAPI spec for preferred_frontend endpoint

The spec was copied from another endpoint, including the operation id,
leading to scrubbing the valid parameters from the request and simply
not working.
---
 .../operations/frontend_settings_operation.ex      | 14 ++++++++------
 .../frontend_settings_controller_test.exs          | 14 ++++++++++++++
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/lib/pleroma/web/api_spec/operations/frontend_settings_operation.ex b/lib/pleroma/web/api_spec/operations/frontend_settings_operation.ex
index 867a751b3..ede66709c 100644
--- a/lib/pleroma/web/api_spec/operations/frontend_settings_operation.ex
+++ b/lib/pleroma/web/api_spec/operations/frontend_settings_operation.ex
@@ -111,9 +111,9 @@ def available_frontends_operation() do
   def update_preferred_frontend_operation() do
     %Operation{
       tags: ["Frontends"],
-      summary: "Frontend Settings Profiles",
-      description: "List frontend setting profiles",
-      operationId: "AkkomaAPI.FrontendSettingsController.available_frontends",
+      summary: "Update preferred frontend setting",
+      description: "Store preferred frontend in cookies",
+      operationId: "AkkomaAPI.FrontendSettingsController.update_preferred_frontend",
       requestBody:
         request_body(
           "Frontend",
@@ -132,9 +132,11 @@ def update_preferred_frontend_operation() do
       responses: %{
         200 =>
           Operation.response("Frontends", "application/json", %Schema{
-            type: :array,
-            items: %Schema{
-              type: :string
+            type: :object,
+            properties: %{
+              frontend_name: %Schema{
+                type: :string
+              }
             }
           })
       }
diff --git a/test/pleroma/web/akkoma_api/frontend_settings_controller_test.exs b/test/pleroma/web/akkoma_api/frontend_settings_controller_test.exs
index 07e45d9b9..7b1329593 100644
--- a/test/pleroma/web/akkoma_api/frontend_settings_controller_test.exs
+++ b/test/pleroma/web/akkoma_api/frontend_settings_controller_test.exs
@@ -119,4 +119,18 @@ test "deletes a config" do
              ) == nil
     end
   end
+
+  describe "PUT /api/v1/akkoma/preferred_frontend" do
+    test "sets a cookie with selected frontend" do
+      %{conn: conn} = oauth_access(["read"])
+
+      response =
+        conn
+        |> put_req_header("content-type", "application/json")
+        |> put("/api/v1/akkoma/preferred_frontend", %{"frontend_name" => "pleroma-fe/stable"})
+
+      json_response_and_validate_schema(response, 200)
+      assert %{"preferred_frontend" => %{value: "pleroma-fe/stable"}} = response.resp_cookies
+    end
+  end
 end

From df21b6182975046b00d97b1a644ea8fe4d6a1053 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20=C5=9Awi=C4=85tkowski?= <katafrakt@vivaldi.net>
Date: Mon, 5 Feb 2024 21:42:15 +0100
Subject: [PATCH 08/54] Return last_status_at as date, not datetime

---
 lib/pleroma/web/mastodon_api/views/account_view.ex        | 5 ++++-
 test/pleroma/web/mastodon_api/views/account_view_test.exs | 5 +++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/pleroma/web/mastodon_api/views/account_view.ex b/lib/pleroma/web/mastodon_api/views/account_view.ex
index 2f543c08a..8a18d99c8 100644
--- a/lib/pleroma/web/mastodon_api/views/account_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/account_view.ex
@@ -261,6 +261,9 @@ defp do_render("show.json", %{user: user} = opts) do
         |> MediaProxy.url()
       end
 
+    last_status_at =
+      if is_nil(user.last_status_at), do: nil, else: NaiveDateTime.to_date(user.last_status_at)
+
     %{
       id: to_string(user.id),
       username: username_from_nickname(user.nickname),
@@ -289,7 +292,7 @@ defp do_render("show.json", %{user: user} = opts) do
           actor_type: user.actor_type
         }
       },
-      last_status_at: user.last_status_at,
+      last_status_at: last_status_at,
       akkoma: %{
         instance: render("instance.json", %{instance: instance}),
         status_ttl_days: user.status_ttl_days
diff --git a/test/pleroma/web/mastodon_api/views/account_view_test.exs b/test/pleroma/web/mastodon_api/views/account_view_test.exs
index 5b8aea8ac..5d069e6e1 100644
--- a/test/pleroma/web/mastodon_api/views/account_view_test.exs
+++ b/test/pleroma/web/mastodon_api/views/account_view_test.exs
@@ -40,7 +40,8 @@ test "Represent a user account" do
         emoji: %{"karjalanpiirakka" => "/file.png"},
         raw_bio: "valid html. a\nb\nc\nd\nf '&<>\"",
         also_known_as: ["https://shitposter.zone/users/shp"],
-        status_ttl_days: 5
+        status_ttl_days: 5,
+        last_status_at: ~N[2023-12-31T15:06:17]
       })
 
     insert(:instance, %{host: "example.com", nodeinfo: %{version: "2.1"}})
@@ -91,7 +92,7 @@ test "Represent a user account" do
         fields: []
       },
       fqn: "shp@shitposter.club",
-      last_status_at: nil,
+      last_status_at: ~D[2023-12-31],
       pleroma: %{
         ap_id: user.ap_id,
         also_known_as: ["https://shitposter.zone/users/shp"],

From 5f7d47dcb7ac3f5397ef5f8e6726f9f819fca84a Mon Sep 17 00:00:00 2001
From: Oneric <oneric@oneric.stub>
Date: Sun, 11 Feb 2024 01:19:03 +0100
Subject: [PATCH 09/54] Drop obolete chat/shoutbox config options

Their functions were purged in 0f132b802dde7f217ecb07767e0d34e3edb517b7
---
 config/config.exs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/config/config.exs b/config/config.exs
index 9a3cdcebf..27c314e01 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -290,7 +290,6 @@
     alwaysShowSubjectInput: true,
     background: "/images/city.jpg",
     collapseMessageWithSubject: false,
-    disableChat: false,
     greentext: false,
     hideFilteredStatuses: false,
     hideMutedPosts: false,
@@ -453,10 +452,6 @@
   image_quality: 85,
   min_content_length: 100 * 1024
 
-config :pleroma, :shout,
-  enabled: true,
-  limit: 5_000
-
 config :phoenix, :format_encoders, json: Jason, "activity+json": Jason
 
 config :phoenix, :json_library, Jason

From 8cf183cb428ee5f0e368d872ae4e6e63b6f63c12 Mon Sep 17 00:00:00 2001
From: Oneric <oneric@oneric.stub>
Date: Sun, 11 Feb 2024 02:02:24 +0100
Subject: [PATCH 10/54] Drop Chat tables

Chats were removed in 0f132b802dde7f217ecb07767e0d34e3edb517b7
---
 .../20240210000000_drop_chat_tables.exs       | 50 +++++++++++++++++++
 test/mix/tasks/pleroma/database_test.exs      |  2 -
 2 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 priv/repo/migrations/20240210000000_drop_chat_tables.exs

diff --git a/priv/repo/migrations/20240210000000_drop_chat_tables.exs b/priv/repo/migrations/20240210000000_drop_chat_tables.exs
new file mode 100644
index 000000000..f83524e4d
--- /dev/null
+++ b/priv/repo/migrations/20240210000000_drop_chat_tables.exs
@@ -0,0 +1,50 @@
+defmodule Pleroma.Repo.Migrations.DropChatTables do
+  use Ecto.Migration
+
+  def up do
+    # Automatically drops associated indices and constraints
+    drop table(:chat_message_references)
+    drop table(:chats)
+  end
+
+  def down do
+    # Ecto's default primary key is bigserial, thus configure manually
+    create table(:chats, primary_key: false) do
+      add(:id, :uuid, primary_key: true, autogenerated: true)
+
+      add(
+        :user_id,
+        references(:users, type: :uuid, on_delete: :delete_all)
+        # yes, this was nullable
+      )
+
+      add(
+        :recipient,
+        references(:users, column: :ap_id, type: :string, on_delete: :delete_all)
+        # yes, this was nullable
+      )
+
+      timestamps()
+    end
+
+    create(index(:chats, [:user_id, :recipient], unique: true))
+
+    create table(:chat_message_references, primary_key: false) do
+      add(:id, :uuid, primary_key: true, autogenerated: true)
+      add(:chat_id, references(:chats, type: :uuid, on_delete: :delete_all), null: false)
+      add(:object_id, references(:objects, on_delete: :delete_all), null: false)
+      add(:unread, :boolean, default: true, null: false)
+      timestamps()
+    end
+
+    create(index(:chat_message_references, [:chat_id, "id desc"]))
+    create(unique_index(:chat_message_references, [:object_id, :chat_id]))
+
+    create(
+      index(:chat_message_references, [:chat_id],
+        where: "unread = true",
+        name: "unread_messages_count_index"
+      )
+    )
+  end
+end
diff --git a/test/mix/tasks/pleroma/database_test.exs b/test/mix/tasks/pleroma/database_test.exs
index 40c5fd402..97fa830ff 100644
--- a/test/mix/tasks/pleroma/database_test.exs
+++ b/test/mix/tasks/pleroma/database_test.exs
@@ -371,8 +371,6 @@ test "We don't have unexpected tables which may contain objects that are referen
                ["apps"],
                ["backups"],
                ["bookmarks"],
-               ["chat_message_references"],
-               ["chats"],
                ["config"],
                ["conversation_participation_recipient_ships"],
                ["conversation_participations"],

From a6df71eebb6fcb29460b510315048cea4cb32f07 Mon Sep 17 00:00:00 2001
From: Oneric <oneric@oneric.stub>
Date: Sat, 3 Feb 2024 17:30:00 +0100
Subject: [PATCH 11/54] Don't add summary metrics to prometheus
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The exporter doesn’t support them thus we don't lose anything by this,
but it avoids a bunch of warnings each time the server starts up.
---
 lib/pleroma/web/telemetry.ex | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/lib/pleroma/web/telemetry.ex b/lib/pleroma/web/telemetry.ex
index b03850600..eecaffe88 100644
--- a/lib/pleroma/web/telemetry.ex
+++ b/lib/pleroma/web/telemetry.ex
@@ -101,6 +101,7 @@ defp distribution_metrics do
     ]
   end
 
+  # Summary metrics are currently not (yet) supported by the prometheus exporter
   defp summary_metrics do
     [
       # Phoenix Metrics
@@ -121,7 +122,12 @@ defp summary_metrics do
       summary("vm.memory.total", unit: {:byte, :kilobyte}),
       summary("vm.total_run_queue_lengths.total"),
       summary("vm.total_run_queue_lengths.cpu"),
-      summary("vm.total_run_queue_lengths.io"),
+      summary("vm.total_run_queue_lengths.io")
+    ]
+  end
+
+  defp common_metrics do
+    [
       last_value("pleroma.local_users.total"),
       last_value("pleroma.domains.total"),
       last_value("pleroma.local_statuses.total"),
@@ -129,8 +135,8 @@ defp summary_metrics do
     ]
   end
 
-  def prometheus_metrics, do: summary_metrics() ++ distribution_metrics()
-  def live_dashboard_metrics, do: summary_metrics()
+  def prometheus_metrics, do: common_metrics() ++ distribution_metrics()
+  def live_dashboard_metrics, do: common_metrics() ++ summary_metrics()
 
   defp periodic_measurements do
     [

From 18ecae61839dd3d6e4d2aaaf2d0c01bc448fcfb5 Mon Sep 17 00:00:00 2001
From: Oneric <oneric@oneric.stub>
Date: Sat, 3 Feb 2024 17:51:40 +0100
Subject: [PATCH 12/54] Use fully qualified function capture for telementry
 event

Otherwise we get warnings on startup as local captures
and anonymous functions are supposedly less performant.
---
 lib/pleroma/job_queue_monitor.ex | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/lib/pleroma/job_queue_monitor.ex b/lib/pleroma/job_queue_monitor.ex
index b5f124923..8d81ffcac 100644
--- a/lib/pleroma/job_queue_monitor.ex
+++ b/lib/pleroma/job_queue_monitor.ex
@@ -15,8 +15,19 @@ def start_link(_) do
 
   @impl true
   def init(state) do
-    :telemetry.attach("oban-monitor-failure", [:oban, :job, :exception], &handle_event/4, nil)
-    :telemetry.attach("oban-monitor-success", [:oban, :job, :stop], &handle_event/4, nil)
+    :telemetry.attach(
+      "oban-monitor-failure",
+      [:oban, :job, :exception],
+      &Pleroma.JobQueueMonitor.handle_event/4,
+      nil
+    )
+
+    :telemetry.attach(
+      "oban-monitor-success",
+      [:oban, :job, :stop],
+      &Pleroma.JobQueueMonitor.handle_event/4,
+      nil
+    )
 
     {:ok, state}
   end

From 8f8e1ff2145d4b48b6c45cf46bc8f85e6222c7c0 Mon Sep 17 00:00:00 2001
From: Oneric <oneric@oneric.stub>
Date: Thu, 8 Feb 2024 00:10:46 +0100
Subject: [PATCH 13/54] Purge unused function scrub_css

Commit e9f1897cfdb32c890e9eaf2e894128be5c7e1123 added this private
function but it never had any users resulting in warnings each startup
---
 priv/scrubbers/default.ex | 2 --
 1 file changed, 2 deletions(-)

diff --git a/priv/scrubbers/default.ex b/priv/scrubbers/default.ex
index 6a97cbfd4..74de910fd 100644
--- a/priv/scrubbers/default.ex
+++ b/priv/scrubbers/default.ex
@@ -128,6 +128,4 @@ defmodule Pleroma.HTML.Scrubber.Default do
   Meta.allow_tag_with_these_attributes(:small, [])
 
   Meta.strip_everything_not_covered()
-
-  defp scrub_css(value), do: value
 end

From 16197ff57a181c4202317519b33d19826b53fbba Mon Sep 17 00:00:00 2001
From: Oneric <oneric@oneric.stub>
Date: Sat, 3 Feb 2024 18:21:09 +0100
Subject: [PATCH 14/54] Display memory as MB in live dashboard
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

With kilobyte the resulting numbers got too large and were cut off
in the charts, making them useless. However, even an idle Akkoma
server’s memory usage is in the lower hundreths of megabytes, so
we don’t need this much precision to begin with for the dashboard.

Other metric users might prefer base units and can handle scaling in a
smarter way, so keep this configurable.
---
 lib/pleroma/web/telemetry.ex | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/pleroma/web/telemetry.ex b/lib/pleroma/web/telemetry.ex
index eecaffe88..3ea88b31d 100644
--- a/lib/pleroma/web/telemetry.ex
+++ b/lib/pleroma/web/telemetry.ex
@@ -102,7 +102,7 @@ defp distribution_metrics do
   end
 
   # Summary metrics are currently not (yet) supported by the prometheus exporter
-  defp summary_metrics do
+  defp summary_metrics(byte_unit) do
     [
       # Phoenix Metrics
       summary("phoenix.endpoint.stop.duration",
@@ -119,7 +119,7 @@ defp summary_metrics do
       summary("pleroma.repo.query.idle_time", unit: {:native, :millisecond}),
 
       # VM Metrics
-      summary("vm.memory.total", unit: {:byte, :kilobyte}),
+      summary("vm.memory.total", unit: {:byte, byte_unit}),
       summary("vm.total_run_queue_lengths.total"),
       summary("vm.total_run_queue_lengths.cpu"),
       summary("vm.total_run_queue_lengths.io")
@@ -136,7 +136,7 @@ defp common_metrics do
   end
 
   def prometheus_metrics, do: common_metrics() ++ distribution_metrics()
-  def live_dashboard_metrics, do: common_metrics() ++ summary_metrics()
+  def live_dashboard_metrics, do: common_metrics() ++ summary_metrics(:megabyte)
 
   defp periodic_measurements do
     [

From 29f564f700e4c6998f0bbb830128e9d520cd1905 Mon Sep 17 00:00:00 2001
From: Oneric <oneric@oneric.stub>
Date: Sat, 3 Feb 2024 18:28:55 +0100
Subject: [PATCH 15/54] Use fallbacks of summary metrics for prometheus

---
 lib/pleroma/web/telemetry.ex | 87 +++++++++++++++++++++++++++++++++++-
 1 file changed, 86 insertions(+), 1 deletion(-)

diff --git a/lib/pleroma/web/telemetry.ex b/lib/pleroma/web/telemetry.ex
index 3ea88b31d..269f9f238 100644
--- a/lib/pleroma/web/telemetry.ex
+++ b/lib/pleroma/web/telemetry.ex
@@ -126,6 +126,89 @@ defp summary_metrics(byte_unit) do
     ]
   end
 
+  defp sum_counter_pair(basename, opts) do
+    [
+      sum(basename <> ".psum", opts),
+      counter(basename <> ".pcount", opts)
+    ]
+  end
+
+  # Prometheus exporter doesn't support summaries, so provide fallbacks
+  defp summary_fallback_metrics(byte_unit \\ :byte) do
+    # Summary metrics are not supported by the Prometheus exporter
+    #   https://github.com/beam-telemetry/telemetry_metrics_prometheus_core/issues/11
+    # and sum metrics currently only work with integers
+    #   https://github.com/beam-telemetry/telemetry_metrics_prometheus_core/issues/35
+    #
+    # For VM metrics this is kindof ok as they appear to always be integers
+    # and we can use sum + counter to get the average between polls from their change
+    # But for repo query times we need to use a full distribution
+
+    simple_buckets = [0, 1, 2, 4, 8, 16]
+    simple_buckets_quick = for t <- simple_buckets, do: t / 100.0
+
+    # Already included in distribution metrics anyway:
+    #   phoenix.router_dispatch.stop.duration
+    #   pleroma.repo.query.total_time
+    #   pleroma.repo.query.queue_time
+    dist_metrics =
+      [
+        distribution("phoenix.endpoint.stop.duration.fdist",
+          event_name: [:phoenix, :endpoint, :stop],
+          measurement: :duration,
+          unit: {:native, :millisecond},
+          reporter_options: [
+            buckets: simple_buckets
+          ]
+        ),
+        distribution("pleroma.repo.query.decode_time.fdist",
+          event_name: [:pleroma, :repo, :query],
+          measurement: :decode_time,
+          unit: {:native, :millisecond},
+          reporter_options: [
+            buckets: simple_buckets_quick
+          ]
+        ),
+        distribution("pleroma.repo.query.query_time.fdist",
+          event_name: [:pleroma, :repo, :query],
+          measurement: :query_time,
+          unit: {:native, :millisecond},
+          reporter_options: [
+            buckets: simple_buckets
+          ]
+        ),
+        distribution("pleroma.repo.query.idle_time.fdist",
+          event_name: [:pleroma, :repo, :query],
+          measurement: :idle_time,
+          unit: {:native, :millisecond},
+          reporter_options: [
+            buckets: simple_buckets
+          ]
+        )
+      ]
+
+    vm_metrics =
+      sum_counter_pair("vm.memory.total",
+        event_name: [:vm, :memory],
+        measurement: :total,
+        unit: {:byte, byte_unit}
+      ) ++
+        sum_counter_pair("vm.total_run_queue_lengths.total",
+          event_name: [:vm, :total_run_queue_lengths],
+          measurement: :total
+        ) ++
+        sum_counter_pair("vm.total_run_queue_lengths.cpu",
+          event_name: [:vm, :total_run_queue_lengths],
+          measurement: :cpu
+        ) ++
+        sum_counter_pair("vm.total_run_queue_lengths.io.fsum",
+          event_name: [:vm, :total_run_queue_lengths],
+          measurement: :io
+        )
+
+    dist_metrics ++ vm_metrics
+  end
+
   defp common_metrics do
     [
       last_value("pleroma.local_users.total"),
@@ -135,7 +218,9 @@ defp common_metrics do
     ]
   end
 
-  def prometheus_metrics, do: common_metrics() ++ distribution_metrics()
+  def prometheus_metrics,
+    do: common_metrics() ++ distribution_metrics() ++ summary_fallback_metrics()
+
   def live_dashboard_metrics, do: common_metrics() ++ summary_metrics(:megabyte)
 
   defp periodic_measurements do

From 192480093c5b35e43fc34327a76c51b62d2ea7ec Mon Sep 17 00:00:00 2001
From: Oneric <oneric@oneric.stub>
Date: Mon, 12 Feb 2024 18:27:40 +0000
Subject: [PATCH 16/54] Provide sane defaults for SMTP
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

OTP’s default SSL/TLS settings are rather restricitive
and in particular do not use system CA certs.
In our case using system CA certs is virtually always desired
and the lack of it leads to non-obvious errors. Manually configuring
system CA certs from in-database config also isn’t straightforward.

Furthermore, gen_smtp uses a different set of connection options
for direct SSL/TLS and a later TLS upgrade providing additional
confusion and complexity in how to configure this.

Thus provide some suitable defaults for sending SMTP emails.
Everything can still be overriden by admins if necessary.

Note: defaults are not appended when validating the config
in hopes of improving the error message (as the required relay key
is already accessed to generate defaults for optional fields)

Fixes: https://akkoma.dev/AkkomaGang/akkoma/issues/660
---
 lib/pleroma/emails/mailer.ex | 55 ++++++++++++++++++++++++++++++++++--
 1 file changed, 52 insertions(+), 3 deletions(-)

diff --git a/lib/pleroma/emails/mailer.ex b/lib/pleroma/emails/mailer.ex
index d42236c5e..6a79a7694 100644
--- a/lib/pleroma/emails/mailer.ex
+++ b/lib/pleroma/emails/mailer.ex
@@ -55,12 +55,61 @@ def deliver!(email, config) do
 
   @doc false
   def validate_dependency do
-    parse_config([])
+    parse_config([], defaults: false)
     |> Keyword.get(:adapter)
     |> Swoosh.Mailer.validate_dependency()
   end
 
-  defp parse_config(config) do
-    Swoosh.Mailer.parse_config(@otp_app, __MODULE__, @mailer_config, config)
+  defp ensure_charlist(input) do
+    case input do
+      i when is_binary(i) -> String.to_charlist(input)
+      i when is_list(i) -> i
+    end
+  end
+
+  defp default_config(adapter, conf, opts)
+
+  defp default_config(_, _, defaults: false) do
+    []
+  end
+
+  defp default_config(Swoosh.Adapters.SMTP, conf, _) do
+    # gen_smtp and Erlang's tls defaults are very barebones, if nothing is set.
+    # Add sane defaults for our usecase to make config less painful for admins
+    relay = ensure_charlist(Keyword.get(conf, :relay))
+    ssl_disabled = Keyword.get(conf, :ssl) === false
+    os_cacerts = :public_key.cacerts_get()
+
+    common_tls_opts = [
+      cacerts: os_cacerts,
+      versions: [:"tlsv1.2", :"tlsv1.3"],
+      verify: :verify_peer,
+      # some versions have supposedly issues verifying wildcard certs without this
+      server_name_indication: relay,
+      # the default of 10 is too restrictive
+      depth: 32
+    ]
+
+    [
+      auth: :always,
+      no_mx_lookups: false,
+      # Direct SSL/TLS
+      # (if ssl was explicitly disabled, we must not pass TLS options to the socket)
+      ssl: true,
+      sockopts: if(ssl_disabled, do: [], else: common_tls_opts),
+      # STARTTLS upgrade (can't be set to :always when already using direct TLS)
+      tls: :if_available,
+      tls_options: common_tls_opts
+    ]
+  end
+
+  defp default_config(_, _, _), do: []
+
+  defp parse_config(config, opts \\ []) do
+    conf = Swoosh.Mailer.parse_config(@otp_app, __MODULE__, @mailer_config, config)
+    adapter = Keyword.get(conf, :adapter)
+
+    default_config(adapter, conf, opts)
+    |> Keyword.merge(conf)
   end
 end

From 13e62b4e5190f755cdf11e843216e9af47e31a4f Mon Sep 17 00:00:00 2001
From: Oneric <oneric@oneric.stub>
Date: Wed, 17 Jan 2024 19:12:49 +0000
Subject: [PATCH 17/54] Fix schema and docs for status_ttl_days and instance

Fixes misspelling and omission of and example in commit
0cfd5b4e89b02688342345755577e58eece3db0f which added the
status_ttl_property. This was the only place this commit
referred to the property as note_ttl_days.

Partially fixes the omitted schema update of the instance metadata addition
from commit b7e8ce235073ab45db24dfc6c27bc6998b43a200. A proper full schema
for nodeinfo is still missing.
---
 .../API/differences_in_mastoapi_responses.md  |  5 ++++
 lib/pleroma/web/api_spec/schemas/account.ex   | 23 ++++++++++++++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/docs/docs/development/API/differences_in_mastoapi_responses.md b/docs/docs/development/API/differences_in_mastoapi_responses.md
index 053dc9663..9c822fbfc 100644
--- a/docs/docs/development/API/differences_in_mastoapi_responses.md
+++ b/docs/docs/development/API/differences_in_mastoapi_responses.md
@@ -113,6 +113,11 @@ Has these additional fields under the `pleroma` object:
 - `notification_settings`: object, can be absent. See `/api/v1/pleroma/notification_settings` for the parameters/keys returned.
 - `favicon`: nullable URL string, Favicon image of the user's instance
 
+Has these additional fields under the `akkoma` object:
+
+- `instance`: nullable object with metadata about the user’s instance
+- `status_ttl_days`: nullable int, default time after which statuses are deleted
+
 ### Source
 
 Has these additional fields under the `pleroma` object:
diff --git a/lib/pleroma/web/api_spec/schemas/account.ex b/lib/pleroma/web/api_spec/schemas/account.ex
index 2693eaceb..2a87065a1 100644
--- a/lib/pleroma/web/api_spec/schemas/account.ex
+++ b/lib/pleroma/web/api_spec/schemas/account.ex
@@ -112,7 +112,17 @@ defmodule Pleroma.Web.ApiSpec.Schemas.Account do
       akkoma: %Schema{
         type: :object,
         properties: %{
-          note_ttl_days: %Schema{type: :integer}
+          instance: %Schema{
+            type: :object,
+            nullable: true,
+            properties: %{
+              name: %Schema{type: :string},
+              favicon: %Schema{type: :string, format: :uri, nullable: true},
+              # XXX: proper nodeinfo schema
+              nodeinfo: %Schema{type: :object, nullable: true}
+            }
+          },
+          status_ttl_days: %Schema{type: :integer, nullable: true}
         }
       },
       source: %Schema{
@@ -205,6 +215,17 @@ defmodule Pleroma.Web.ApiSpec.Schemas.Account do
           "pleroma-fe" => %{}
         }
       },
+      "akkoma" => %{
+        "instance" => %{
+          "name" => "ihatebeinga.live",
+          "favicon" => "https://ihatebeinga.live/favicon.png",
+          "nodeinfo" =>
+            %{
+              # XXX: nodeinfo schema
+            }
+        },
+        "status_ttl_days" => nil
+      },
       "source" => %{
         "fields" => [],
         "note" => "foobar",

From 376f6b15ca3537e5a24c28e2df57fee8f33cc570 Mon Sep 17 00:00:00 2001
From: Oneric <oneric@oneric.stub>
Date: Wed, 17 Jan 2024 19:13:29 +0000
Subject: [PATCH 18/54] Add ability to auto-approve followbacks

Resolves: https://akkoma.dev/AkkomaGang/akkoma/issues/148
---
 CHANGELOG.md                                  |  1 +
 .../API/differences_in_mastoapi_responses.md  |  1 +
 lib/pleroma/user.ex                           | 26 ++++++++++++----
 lib/pleroma/web/activity_pub/side_effects.ex  |  2 +-
 .../api_spec/operations/account_operation.ex  |  7 +++++
 lib/pleroma/web/api_spec/schemas/account.ex   |  6 ++--
 .../controllers/account_controller.ex         |  1 +
 .../web/mastodon_api/views/account_view.ex    |  3 +-
 .../20240213120000_add_permit_followback.exs  |  9 ++++++
 test/pleroma/web/common_api_test.exs          | 30 +++++++++++++++++++
 .../mastodon_api/views/account_view_test.exs  |  6 ++--
 11 files changed, 80 insertions(+), 12 deletions(-)
 create mode 100644 priv/repo/migrations/20240213120000_add_permit_followback.exs

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8a38e80ba..e87110526 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## Added
 - Full compatibility with Erlang OTP26
 - handling of GET /api/v1/preferences
+- ability to auto-approve follow requests from users you are already following
 
 ## Changed
 - OTP builds are now built on erlang OTP26
diff --git a/docs/docs/development/API/differences_in_mastoapi_responses.md b/docs/docs/development/API/differences_in_mastoapi_responses.md
index 9c822fbfc..196166853 100644
--- a/docs/docs/development/API/differences_in_mastoapi_responses.md
+++ b/docs/docs/development/API/differences_in_mastoapi_responses.md
@@ -117,6 +117,7 @@ Has these additional fields under the `akkoma` object:
 
 - `instance`: nullable object with metadata about the user’s instance
 - `status_ttl_days`: nullable int, default time after which statuses are deleted
+- `permit_followback`: boolean, whether follows from followed accounts are auto-approved
 
 ### Source
 
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index 1b78d0479..35f416e6c 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -160,6 +160,7 @@ defmodule Pleroma.User do
     field(:last_status_at, :naive_datetime)
     field(:language, :string)
     field(:status_ttl_days, :integer, default: nil)
+    field(:permit_followback, :boolean, default: false)
 
     field(:accepts_direct_messages_from, Ecto.Enum,
       values: [:everybody, :people_i_follow, :nobody],
@@ -544,6 +545,7 @@ def update_changeset(struct, params \\ %{}) do
         :actor_type,
         :disclose_client,
         :status_ttl_days,
+        :permit_followback,
         :accepts_direct_messages_from
       ]
     )
@@ -972,16 +974,21 @@ def needs_update?(%User{local: false} = user) do
 
   def needs_update?(_), do: true
 
+  # "Locked" (self-locked) users demand explicit authorization of follow requests
+  @spec can_direct_follow_local(User.t(), User.t()) :: true | false
+  def can_direct_follow_local(%User{} = follower, %User{local: true} = followed) do
+    !followed.is_locked || (followed.permit_followback and is_friend_of(follower, followed))
+  end
+
   @spec maybe_direct_follow(User.t(), User.t()) ::
           {:ok, User.t(), User.t()} | {:error, String.t()}
 
-  # "Locked" (self-locked) users demand explicit authorization of follow requests
-  def maybe_direct_follow(%User{} = follower, %User{local: true, is_locked: true} = followed) do
-    follow(follower, followed, :follow_pending)
-  end
-
   def maybe_direct_follow(%User{} = follower, %User{local: true} = followed) do
-    follow(follower, followed)
+    if can_direct_follow_local(follower, followed) do
+      follow(follower, followed)
+    else
+      follow(follower, followed, :follow_pending)
+    end
   end
 
   def maybe_direct_follow(%User{} = follower, %User{} = followed) do
@@ -1331,6 +1338,13 @@ def get_friends_ids(%User{} = user, page \\ nil) do
     |> Repo.all()
   end
 
+  def is_friend_of(%User{} = potential_friend, %User{local: true} = user) do
+    user
+    |> get_friends_query()
+    |> where(id: ^potential_friend.id)
+    |> Repo.exists?()
+  end
+
   def increase_note_count(%User{} = user) do
     User
     |> where(id: ^user.id)
diff --git a/lib/pleroma/web/activity_pub/side_effects.ex b/lib/pleroma/web/activity_pub/side_effects.ex
index 34617a218..963c6d8c6 100644
--- a/lib/pleroma/web/activity_pub/side_effects.ex
+++ b/lib/pleroma/web/activity_pub/side_effects.ex
@@ -109,7 +109,7 @@ def handle(
          %User{} = followed <- User.get_cached_by_ap_id(followed_user),
          {_, {:ok, _, _}, _, _} <-
            {:following, User.follow(follower, followed, :follow_pending), follower, followed} do
-      if followed.local && !followed.is_locked do
+      if followed.local && User.can_direct_follow_local(follower, followed) do
         {:ok, accept_data, _} = Builder.accept(followed, object)
         {:ok, _activity, _} = Pipeline.common_pipeline(accept_data, local: true)
       end
diff --git a/lib/pleroma/web/api_spec/operations/account_operation.ex b/lib/pleroma/web/api_spec/operations/account_operation.ex
index 9a6dfc1ff..c15a246f2 100644
--- a/lib/pleroma/web/api_spec/operations/account_operation.ex
+++ b/lib/pleroma/web/api_spec/operations/account_operation.ex
@@ -723,6 +723,12 @@ defp update_credentials_request do
           description:
             "Number of days after which statuses will be deleted. Set to -1 to disable."
         },
+        permit_followback: %Schema{
+          allOf: [BooleanLike],
+          nullable: true,
+          description:
+            "Whether follow requests from accounts the user is already following are auto-approved (when locked)."
+        },
         accepts_direct_messages_from: %Schema{
           type: :string,
           enum: [
@@ -754,6 +760,7 @@ defp update_credentials_request do
         discoverable: false,
         actor_type: "Person",
         status_ttl_days: 30,
+        permit_followback: true,
         accepts_direct_messages_from: "everybody"
       }
     }
diff --git a/lib/pleroma/web/api_spec/schemas/account.ex b/lib/pleroma/web/api_spec/schemas/account.ex
index 2a87065a1..a922f6d1b 100644
--- a/lib/pleroma/web/api_spec/schemas/account.ex
+++ b/lib/pleroma/web/api_spec/schemas/account.ex
@@ -122,7 +122,8 @@ defmodule Pleroma.Web.ApiSpec.Schemas.Account do
               nodeinfo: %Schema{type: :object, nullable: true}
             }
           },
-          status_ttl_days: %Schema{type: :integer, nullable: true}
+          status_ttl_days: %Schema{type: :integer, nullable: true},
+          permit_followback: %Schema{type: :boolean}
         }
       },
       source: %Schema{
@@ -224,7 +225,8 @@ defmodule Pleroma.Web.ApiSpec.Schemas.Account do
               # XXX: nodeinfo schema
             }
         },
-        "status_ttl_days" => nil
+        "status_ttl_days" => nil,
+        "permit_followback" => true
       },
       "source" => %{
         "fields" => [],
diff --git a/lib/pleroma/web/mastodon_api/controllers/account_controller.ex b/lib/pleroma/web/mastodon_api/controllers/account_controller.ex
index 6fc88354f..2c7d6a893 100644
--- a/lib/pleroma/web/mastodon_api/controllers/account_controller.ex
+++ b/lib/pleroma/web/mastodon_api/controllers/account_controller.ex
@@ -222,6 +222,7 @@ def update_credentials(%{assigns: %{user: user}, body_params: params} = conn, _p
       |> 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)
       |> Maps.put_if_present(:accepts_direct_messages_from, params[:accepts_direct_messages_from])
+      |> Maps.put_if_present(:permit_followback, params[:permit_followback])
 
     # What happens here:
     #
diff --git a/lib/pleroma/web/mastodon_api/views/account_view.ex b/lib/pleroma/web/mastodon_api/views/account_view.ex
index 2f543c08a..1cb025bd0 100644
--- a/lib/pleroma/web/mastodon_api/views/account_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/account_view.ex
@@ -292,7 +292,8 @@ defp do_render("show.json", %{user: user} = opts) do
       last_status_at: user.last_status_at,
       akkoma: %{
         instance: render("instance.json", %{instance: instance}),
-        status_ttl_days: user.status_ttl_days
+        status_ttl_days: user.status_ttl_days,
+        permit_followback: user.permit_followback
       },
       # Pleroma extensions
       # Note: it's insecure to output :email but fully-qualified nickname may serve as safe stub
diff --git a/priv/repo/migrations/20240213120000_add_permit_followback.exs b/priv/repo/migrations/20240213120000_add_permit_followback.exs
new file mode 100644
index 000000000..72475a58e
--- /dev/null
+++ b/priv/repo/migrations/20240213120000_add_permit_followback.exs
@@ -0,0 +1,9 @@
+defmodule Pleroma.Repo.Migrations.AddPermitFollowback do
+  use Ecto.Migration
+
+  def change do
+    alter table(:users) do
+      add(:permit_followback, :boolean, null: false, default: false)
+    end
+  end
+end
diff --git a/test/pleroma/web/common_api_test.exs b/test/pleroma/web/common_api_test.exs
index f2675ad01..379cf85b8 100644
--- a/test/pleroma/web/common_api_test.exs
+++ b/test/pleroma/web/common_api_test.exs
@@ -1061,6 +1061,36 @@ test "directly follows a non-locked local user" do
 
       assert User.following?(follower, followed)
     end
+
+    test "directly follows back a locked, but followback-allowing local user" do
+      uopen = insert(:user, is_locked: false)
+      uselective = insert(:user, is_locked: true, permit_followback: true)
+
+      assert {:ok, uselective, uopen, %{data: %{"state" => "accept"}}} =
+               CommonAPI.follow(uselective, uopen)
+
+      assert User.get_follow_state(uselective, uopen) == :follow_accept
+
+      assert {:ok, uopen, uselective, %{data: %{"state" => "accept"}}} =
+               CommonAPI.follow(uopen, uselective)
+
+      assert User.get_follow_state(uopen, uselective) == :follow_accept
+    end
+
+    test "creates a pending request for locked, non-followback local user" do
+      uopen = insert(:user, is_locked: false)
+      ulocked = insert(:user, is_locked: true, permit_followback: false)
+
+      assert {:ok, ulocked, uopen, %{data: %{"state" => "accept"}}} =
+               CommonAPI.follow(ulocked, uopen)
+
+      assert User.get_follow_state(ulocked, uopen) == :follow_accept
+
+      assert {:ok, uopen, ulocked, %{data: %{"state" => "pending"}}} =
+               CommonAPI.follow(uopen, ulocked)
+
+      assert User.get_follow_state(uopen, ulocked) == :follow_pending
+    end
   end
 
   describe "unfollow/2" do
diff --git a/test/pleroma/web/mastodon_api/views/account_view_test.exs b/test/pleroma/web/mastodon_api/views/account_view_test.exs
index 5b8aea8ac..b05759d54 100644
--- a/test/pleroma/web/mastodon_api/views/account_view_test.exs
+++ b/test/pleroma/web/mastodon_api/views/account_view_test.exs
@@ -65,7 +65,8 @@ test "Represent a user account" do
           },
           favicon: nil
         },
-        status_ttl_days: 5
+        status_ttl_days: 5,
+        permit_followback: false
       },
       avatar: "http://localhost:4001/images/avi.png",
       avatar_static: "http://localhost:4001/images/avi.png",
@@ -248,7 +249,8 @@ test "Represent a Service(bot) account" do
           favicon: "http://localhost:4001/favicon.png",
           nodeinfo: %{version: "2.0"}
         },
-        status_ttl_days: nil
+        status_ttl_days: nil,
+        permit_followback: false
       },
       pleroma: %{
         ap_id: user.ap_id,

From cb7eaccecb37e89afff3cb0f3e0eed13e44c0779 Mon Sep 17 00:00:00 2001
From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
Date: Wed, 14 Feb 2024 18:16:54 +0100
Subject: [PATCH 19/54] =?UTF-8?q?Config:=20Check=20the=20permissions=20of?=
 =?UTF-8?q?=20the=20linked=20file=20instead=20of=20the=20symlink=E2=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/pleroma/config/release_runtime_provider.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pleroma/config/release_runtime_provider.ex b/lib/pleroma/config/release_runtime_provider.ex
index a829a0206..d8818dfee 100644
--- a/lib/pleroma/config/release_runtime_provider.ex
+++ b/lib/pleroma/config/release_runtime_provider.ex
@@ -23,7 +23,7 @@ def load(config, opts) do
     with_runtime_config =
       if File.exists?(config_path) do
         # <https://git.pleroma.social/pleroma/pleroma/-/issues/3135>
-        %File.Stat{mode: mode} = File.lstat!(config_path)
+        %File.Stat{mode: mode} = File.stat!(config_path)
 
         if Bitwise.band(mode, 0o007) > 0 do
           raise "Configuration at #{config_path} has world-permissions, execute the following: chmod o= #{config_path}"

From 7493d8f49da64ae83b08b70b8ad18af62e6a65de Mon Sep 17 00:00:00 2001
From: Oneric <oneric@oneric.stub>
Date: Tue, 16 Jan 2024 22:12:52 +0100
Subject: [PATCH 20/54] Document live dashboard

---
 docs/docs/administration/monitoring.md | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/docs/docs/administration/monitoring.md b/docs/docs/administration/monitoring.md
index 9233fbe34..b7a748731 100644
--- a/docs/docs/administration/monitoring.md
+++ b/docs/docs/administration/monitoring.md
@@ -3,7 +3,7 @@
 If you run akkoma, you may be inclined to collect metrics to ensure your instance is running smoothly,
 and that there's nothing quietly failing in the background.
 
-To facilitate this, akkoma exposes prometheus metrics to be scraped.
+To facilitate this, akkoma exposes a dashboard and prometheus metrics to be scraped.
 
 ## Prometheus
 
@@ -31,3 +31,15 @@ Once you have your token of the form `Bearer $ACCESS_TOKEN`, you can use that in
   - targets:
     - example.com
 ```
+
+## Dashboard
+
+Administrators can access a live dashboard under `/phoenix/live_dashboard`
+giving an overview of uptime, software versions, database stats and more.
+
+The dashboard also includes a variation of the prometheus metrics, however
+they do not exactly match due to respective limitations of the dashboard
+and the prometheus exporter.
+Even more important, the dashboard collects metrics locally in the browser
+only while the page is open and cannot give a view on their past history.
+For proper monitoring it is recommended to set up prometheus.

From 6bb455702d90ea27fdc8802bedea299654a7be07 Mon Sep 17 00:00:00 2001
From: Oneric <oneric@oneric.stub>
Date: Sun, 28 Jan 2024 19:49:20 +0100
Subject: [PATCH 21/54] Document Akkoma API

---
 CHANGELOG.md                            |   1 +
 docs/docs/development/API/akkoma_api.md | 140 ++++++++++++++++++++++++
 2 files changed, 141 insertions(+)
 create mode 100644 docs/docs/development/API/akkoma_api.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8a38e80ba..504d70765 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## Added
 - Full compatibility with Erlang OTP26
 - handling of GET /api/v1/preferences
+- Akkoma API is now documented
 
 ## Changed
 - OTP builds are now built on erlang OTP26
diff --git a/docs/docs/development/API/akkoma_api.md b/docs/docs/development/API/akkoma_api.md
new file mode 100644
index 000000000..786445459
--- /dev/null
+++ b/docs/docs/development/API/akkoma_api.md
@@ -0,0 +1,140 @@
+# Akkoma API
+
+Request authentication (if required) and parameters work the same as for [Pleroma API](pleroma_api.md).
+
+## `/api/v1/akkoma/preferred_frontend/available`
+### Returns the available frontends which can be picked as the preferred choice
+* Method: `GET`
+* Authentication: not required
+* Params: none
+* Response: JSON
+* Example response:
+```json
+["pleroma-fe/stable"]
+```
+
+!!! note
+    There’s also a browser UI under `/akkoma/frontend`
+    for interactively querying and changing this.
+
+## `/api/v1/akkoma/preferred_frontend`
+### Configures the preferred frontend of this session
+* Method: `PUT`
+* Authentication: not required
+* Params:
+    * `frontend_name`: STRING containing one of the available frontends
+* Response: JSON
+* Example response:
+```json
+{"frontend_name":"pleroma-fe/stable"}
+```
+
+!!! note
+    There’s also a browser UI under `/akkoma/frontend`
+    for interactively querying and changing this.
+
+## `/api/v1/akkoma/metrics`
+### Provides metrics for Prometheus to scrape
+* Method: `GET`
+* Authentication: required (admin:metrics)
+* Params: none
+* Response: text
+* Example response:
+```
+# HELP pleroma_remote_users_total
+# TYPE pleroma_remote_users_total gauge
+pleroma_remote_users_total 25
+# HELP pleroma_local_statuses_total
+# TYPE pleroma_local_statuses_total gauge
+pleroma_local_statuses_total 17
+# HELP pleroma_domains_total
+# TYPE pleroma_domains_total gauge
+pleroma_domains_total 4
+# HELP pleroma_local_users_total
+# TYPE pleroma_local_users_total gauge
+pleroma_local_users_total 3
+...
+```
+
+## `/api/v1/akkoma/translation/languages`
+### Returns available source and target languages for automated text translation
+* Method: `GET`
+* Authentication: required
+* Params: none
+* Response: JSON
+* Example response:
+```json
+{
+  "source": [
+    {"code":"LV", "name":"Latvian"},
+    {"code":"ZH", "name":"Chinese (traditional)"},
+    {"code":"EN-US", "name":"English (American)"}
+  ],
+  "target": [
+    {"code":"EN-GB", "name":"English (British)"},
+    {"code":"JP", "name":"Japanese"}
+  ]
+}
+```
+
+## `/api/v1/akkoma/frontend_settings/:frontend_name`
+### Lists all configuration profiles of the selected frontend for the current user
+* Method: `GET`
+* Authentication: required
+* Params: none
+* Response: JSON
+* Example response:
+```json
+[
+  {"name":"default","version":31}
+]
+```
+
+## `/api/v1/akkoma/frontend_settings/:frontend_name/:profile_name`
+### Returns the full selected frontend settings profile of the current user
+* Method: `GET`
+* Authentication: required
+* Params: none
+* Response: JSON
+* Example response:
+```json
+{
+  "version": 31,
+  "settings": {
+    "streaming": true,
+    "conversationDisplay": "tree",
+    ...
+  }
+}
+```
+
+## `/api/v1/akkoma/frontend_settings/:frontend_name/:profile_name`
+### Updates the frontend settings profile
+* Method: `PUT`
+* Authentication: required
+* Params:
+    * `version`: INTEGER
+    * `settings`: JSON object containing the entire new settings
+* Response: JSON
+* Example response:
+```json
+{
+  "streaming": false,
+  "conversationDisplay": "tree",
+  ...
+}
+```
+
+!!! note
+    The `version` field must be increased by exactly one on each update
+
+## `/api/v1/akkoma/frontend_settings/:frontend_name/:profile_name`
+### Drops the specified frontend settings profile
+* Method: `DELETE`
+* Authentication: required
+* Params: none
+* Response: JSON
+* Example response:
+```json
+{"deleted":"ok"}
+```

From 711043f57dc4fba13cfc02a3cc9fe93a7f28a05f Mon Sep 17 00:00:00 2001
From: Oneric <oneric@oneric.stub>
Date: Thu, 15 Feb 2024 16:01:43 +0100
Subject: [PATCH 22/54] Document bubble timeline API

It was added in cb6e7359af353bb19262ac94b92b41a62819523e.
---
 docs/docs/development/API/akkoma_api.md            |  6 ++++++
 .../API/differences_in_mastoapi_responses.md       | 14 +++++++++++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/docs/docs/development/API/akkoma_api.md b/docs/docs/development/API/akkoma_api.md
index 786445459..cc3f7ddec 100644
--- a/docs/docs/development/API/akkoma_api.md
+++ b/docs/docs/development/API/akkoma_api.md
@@ -138,3 +138,9 @@ pleroma_local_users_total 3
 ```json
 {"deleted":"ok"}
 ```
+
+
+## `/api/v1/timelines/bubble`
+### Returns a timeline for the local and closely related instances
+Works like all other Mastodon-API timeline queries with the documented
+[Akkoma-specific additions and tweaks](./differences_in_mastoapi_responses.md#timelines).
diff --git a/docs/docs/development/API/differences_in_mastoapi_responses.md b/docs/docs/development/API/differences_in_mastoapi_responses.md
index 053dc9663..207ecd6e7 100644
--- a/docs/docs/development/API/differences_in_mastoapi_responses.md
+++ b/docs/docs/development/API/differences_in_mastoapi_responses.md
@@ -8,20 +8,28 @@ Akkoma uses 128-bit ids as opposed to Mastodon's 64 bits. However, just like Mas
 
 ## Timelines
 
+In addition to Mastodon’s timelines, there is also a “bubble timeline” showing
+posts from the local instance and a set of closely related instances as chosen
+by the administrator. It is available under `/api/v1/timelines/bubble`.
+
 Adding the parameter `with_muted=true` to the timeline queries will also return activities by muted (not by blocked!) users.
 
 Adding the parameter `exclude_visibilities` to the timeline queries will exclude the statuses with the given visibilities. The parameter accepts an array of visibility types (`public`, `unlisted`, `private`, `direct`), e.g., `exclude_visibilities[]=direct&exclude_visibilities[]=private`.
 
-Adding the parameter `reply_visibility` to the public and home timelines queries will filter replies. Possible values: without parameter (default) shows all replies, `following` - replies directed to you or users you follow, `self` - replies directed to you.
+Adding the parameter `reply_visibility` to the public, bubble or home timelines queries will filter replies. Possible values: without parameter (default) shows all replies, `following` - replies directed to you or users you follow, `self` - replies directed to you.
 
 Adding the parameter `instance=lain.com` to the public timeline will show only statuses originating from `lain.com` (or any remote instance).
 
-Home, public, hashtag & list timelines accept these parameters:
+All but the direct timeline accept these parameters:
 
 - `only_media`: show only statuses with media attached
-- `local`: show only local statuses
 - `remote`: show only remote statuses
 
+Home, public, hashtag & list timelines further accept:
+
+- `local`: show only local statuses
+
+
 ## Statuses
 
 - `visibility`: has additional possible values `list` and `local` (for local-only statuses)

From cda597a05cd58448df4c054d76b696f4530afd2b Mon Sep 17 00:00:00 2001
From: Oneric <oneric@oneric.stub>
Date: Thu, 15 Feb 2024 16:02:13 +0100
Subject: [PATCH 23/54] doc: fix Akkoma identification name

Akkoma stopped pretending to be Pleroma here when the mix project name
was changed in c07fcdbf2b3c28ae4d1d11df4d872f230410f2b5.
---
 .../docs/development/API/differences_in_mastoapi_responses.md | 2 +-
 lib/pleroma/web/api_spec/operations/instance_operation.ex     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/docs/development/API/differences_in_mastoapi_responses.md b/docs/docs/development/API/differences_in_mastoapi_responses.md
index 207ecd6e7..8451558ff 100644
--- a/docs/docs/development/API/differences_in_mastoapi_responses.md
+++ b/docs/docs/development/API/differences_in_mastoapi_responses.md
@@ -1,6 +1,6 @@
 # Differences in Mastodon API responses from vanilla Mastodon
 
-A Akkoma instance can be identified by "<Mastodon version> (compatible; Pleroma <version>)" present in `version` field in response from `/api/v1/instance`
+A Akkoma instance can be identified by "<Mastodon version> (compatible; Akkoma <version>)" present in `version` field in response from `/api/v1/instance`
 
 ## Flake IDs
 
diff --git a/lib/pleroma/web/api_spec/operations/instance_operation.ex b/lib/pleroma/web/api_spec/operations/instance_operation.ex
index 9384acc32..c72fee197 100644
--- a/lib/pleroma/web/api_spec/operations/instance_operation.ex
+++ b/lib/pleroma/web/api_spec/operations/instance_operation.ex
@@ -137,7 +137,7 @@ defp instance do
         "background_upload_limit" => 4_000_000,
         "background_image" => "/static/image.png",
         "banner_upload_limit" => 4_000_000,
-        "description" => "Pleroma: An efficient and flexible fediverse server",
+        "description" => "Akkoma: The cooler fediverse server",
         "email" => "lain@lain.com",
         "languages" => ["en"],
         "max_toot_chars" => 5000,
@@ -160,7 +160,7 @@ defp instance do
         "urls" => %{
           "streaming_api" => "wss://lain.com"
         },
-        "version" => "2.7.2 (compatible; Pleroma 2.0.50-536-g25eec6d7-develop)"
+        "version" => "2.7.2 (compatible; Akkoma 3.9.3-232-g6fde75e1-develop)"
       }
     }
   end

From 7622aa27ca1424c73a9cf1d24655674c0f5c4a85 Mon Sep 17 00:00:00 2001
From: Oneric <oneric@oneric.stub>
Date: Fri, 9 Feb 2024 21:03:02 +0100
Subject: [PATCH 24/54] Federate user profile background
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently our own frontend doesn’t show backgrounds of other users, this
property is already publicly readable via REST API and likely was always
intended to be shown and federated.

Recently Sharkey added support for profile backgrounds and
immediately made them federate and be displayed to others.
We use the same AP field as Sharkey here which should make
it interoperable both ways out-of-the-box.

Ref.: https://activitypub.software/TransFem-org/Sharkey/-/commit/4e6439763544f7b96009dd1411035343fb561d2a
---
 CHANGELOG.md                                          |  1 +
 lib/pleroma/user.ex                                   |  5 +++++
 lib/pleroma/web/activity_pub/activity_pub.ex          |  1 +
 lib/pleroma/web/activity_pub/views/user_view.ex       |  9 ++++++++-
 test/pleroma/web/activity_pub/side_effects_test.exs   | 11 ++++++++++-
 .../pleroma/web/activity_pub/views/user_view_test.exs |  5 ++++-
 6 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a481ee66b..acf134e06 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - OTP builds are now built on erlang OTP26
 - The base Phoenix framework is now updated to 1.7
 - An `outbox` field has been added to actor profiles to comply with AP spec
+- User profile backgrounds do now federate with other Akkoma instances and Sharkey
 
 ## Fixed
 - Documentation issue in which a non-existing nginx file was referenced
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index 35f416e6c..8449af620 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -382,6 +382,10 @@ def banner_url(user, options \\ []) do
     do_optional_url(user.banner, "#{Endpoint.url()}/images/banner.png", options)
   end
 
+  def background_url(user) do
+    do_optional_url(user.background, nil, no_default: true)
+  end
+
   defp do_optional_url(field, default, options) do
     case field do
       %{"url" => [%{"href" => href} | _]} when is_binary(href) ->
@@ -466,6 +470,7 @@ def remote_user_changeset(struct \\ %User{local: false}, params) do
         :avatar,
         :ap_enabled,
         :banner,
+        :background,
         :is_locked,
         :last_refreshed_at,
         :uri,
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index e4c626d36..4a8ce2d3d 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -1603,6 +1603,7 @@ defp object_to_user_data(data, additional) do
       uri: get_actor_url(data["url"]),
       ap_enabled: true,
       banner: normalize_image(data["image"]),
+      background: normalize_image(data["backgroundUrl"]),
       fields: fields,
       emoji: emojis,
       is_locked: is_locked,
diff --git a/lib/pleroma/web/activity_pub/views/user_view.ex b/lib/pleroma/web/activity_pub/views/user_view.ex
index d6d62a9a4..fe70022f1 100644
--- a/lib/pleroma/web/activity_pub/views/user_view.ex
+++ b/lib/pleroma/web/activity_pub/views/user_view.ex
@@ -112,6 +112,8 @@ def render("user.json", %{user: user}) do
     }
     |> Map.merge(maybe_make_image(&User.avatar_url/2, "icon", user))
     |> Map.merge(maybe_make_image(&User.banner_url/2, "image", user))
+    # Yes, the key is named ...Url eventhough it is a whole 'Image' object
+    |> Map.merge(maybe_insert_image("backgroundUrl", User.background_url(user)))
     |> Map.merge(Utils.make_json_ld_header())
   end
 
@@ -287,7 +289,12 @@ def collection(collection, iri, page, show_items \\ true, total \\ nil) do
   end
 
   defp maybe_make_image(func, key, user) do
-    if image = func.(user, no_default: true) do
+    image = func.(user, no_default: true)
+    maybe_insert_image(key, image)
+  end
+
+  defp maybe_insert_image(key, image) do
+    if image do
       %{
         key => %{
           "type" => "Image",
diff --git a/test/pleroma/web/activity_pub/side_effects_test.exs b/test/pleroma/web/activity_pub/side_effects_test.exs
index 80714b1db..28a591d3c 100644
--- a/test/pleroma/web/activity_pub/side_effects_test.exs
+++ b/test/pleroma/web/activity_pub/side_effects_test.exs
@@ -155,7 +155,13 @@ test "it blocks but does not unfollow if the relevant setting is set", %{
       user = insert(:user, local: false)
 
       {:ok, update_data, []} =
-        Builder.update(user, %{"id" => user.ap_id, "type" => "Person", "name" => "new name!"})
+        Builder.update(user, %{
+          "id" => user.ap_id,
+          "type" => "Person",
+          "name" => "new name!",
+          "icon" => %{"type" => "Image", "url" => "https://example.org/icon.png"},
+          "backgroundUrl" => %{"type" => "Image", "url" => "https://example.org/bg.jxl"}
+        })
 
       {:ok, update, _meta} = ActivityPub.persist(update_data, local: true)
 
@@ -165,7 +171,10 @@ test "it blocks but does not unfollow if the relevant setting is set", %{
     test "it updates the user", %{user: user, update: update} do
       {:ok, _, _} = SideEffects.handle(update)
       user = User.get_by_id(user.id)
+
       assert user.name == "new name!"
+      assert [%{"href" => "https://example.org/icon.png"}] = user.avatar["url"]
+      assert [%{"href" => "https://example.org/bg.jxl"}] = user.background["url"]
     end
 
     test "it uses a given changeset to update", %{user: user, update: update} do
diff --git a/test/pleroma/web/activity_pub/views/user_view_test.exs b/test/pleroma/web/activity_pub/views/user_view_test.exs
index ef1bd4fde..abe91cdea 100644
--- a/test/pleroma/web/activity_pub/views/user_view_test.exs
+++ b/test/pleroma/web/activity_pub/views/user_view_test.exs
@@ -58,16 +58,19 @@ test "Does not add an avatar image if the user hasn't set one" do
     result = UserView.render("user.json", %{user: user})
     refute result["icon"]
     refute result["image"]
+    refute result["backgroundUrl"]
 
     user =
       insert(:user,
         avatar: %{"url" => [%{"href" => "https://someurl"}]},
-        banner: %{"url" => [%{"href" => "https://somebanner"}]}
+        banner: %{"url" => [%{"href" => "https://somebanner"}]},
+        background: %{"url" => [%{"href" => "https://somebackground"}]}
       )
 
     result = UserView.render("user.json", %{user: user})
     assert result["icon"]["url"] == "https://someurl"
     assert result["image"]["url"] == "https://somebanner"
+    assert result["backgroundUrl"]["url"] == "https://somebackground"
   end
 
   test "renders an invisible user with the invisible property set to true" do

From e99e2407f3731eba2937b7a2db7b2ef462c99e3b Mon Sep 17 00:00:00 2001
From: Oneric <oneric@oneric.stub>
Date: Sat, 10 Feb 2024 17:27:11 +0100
Subject: [PATCH 25/54] Add background_removal to SimplePolicy MRF

---
 CHANGELOG.md                                  |  1 +
 docs/docs/configuration/cheatsheet.md         |  1 +
 docs/docs/configuration/mrf.md                |  1 +
 .../web/activity_pub/mrf/simple_policy.ex     | 25 ++++++++++-
 .../activity_pub/mrf/simple_policy_test.exs   | 41 +++++++++++++++++++
 5 files changed, 68 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index acf134e06..fee4d95e2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - handling of GET /api/v1/preferences
 - Akkoma API is now documented
 - ability to auto-approve follow requests from users you are already following
+- The SimplePolicy MRF can now strip user backgrounds from selected remote hosts
 
 ## Changed
 - OTP builds are now built on erlang OTP26
diff --git a/docs/docs/configuration/cheatsheet.md b/docs/docs/configuration/cheatsheet.md
index 2f53f0c78..0933b29c5 100644
--- a/docs/docs/configuration/cheatsheet.md
+++ b/docs/docs/configuration/cheatsheet.md
@@ -144,6 +144,7 @@ To add configuration to your config file, you can copy it from the base config.
 * `report_removal`: List of instances to reject reports from and the reason for doing so.
 * `avatar_removal`: List of instances to strip avatars from and the reason for doing so.
 * `banner_removal`: List of instances to strip banners from and the reason for doing so.
+* `background_removal`: List of instances to strip user backgrounds from and the reason for doing so.
 * `reject_deletes`: List of instances to reject deletions from and the reason for doing so.
 
 #### :mrf_subchain
diff --git a/docs/docs/configuration/mrf.md b/docs/docs/configuration/mrf.md
index 170b26792..0a17b3112 100644
--- a/docs/docs/configuration/mrf.md
+++ b/docs/docs/configuration/mrf.md
@@ -35,6 +35,7 @@ Once `SimplePolicy` is enabled, you can configure various groups in the `:mrf_si
 * `media_removal`: Servers in this group will have media stripped from incoming messages.
 * `avatar_removal`: Avatars from these servers will be stripped from incoming messages.
 * `banner_removal`: Banner images from these servers will be stripped from incoming messages.
+* `background_removal`: User background images from these servers will be stripped from incoming messages.
 * `report_removal`: Servers in this group will have their reports (flags) rejected.
 * `federated_timeline_removal`: Servers in this group will have their messages unlisted from the public timelines by flipping the `to` and `cc` fields.
 * `reject_deletes`: Deletion requests will be rejected from these servers.
diff --git a/lib/pleroma/web/activity_pub/mrf/simple_policy.ex b/lib/pleroma/web/activity_pub/mrf/simple_policy.ex
index c2e17ca9e..0b8b846ec 100644
--- a/lib/pleroma/web/activity_pub/mrf/simple_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/simple_policy.ex
@@ -178,6 +178,23 @@ defp check_banner_removal(%{host: actor_host} = _actor_info, %{"image" => _image
 
   defp check_banner_removal(_actor_info, object), do: {:ok, object}
 
+  defp check_background_removal(
+         %{host: actor_host} = _actor_info,
+         %{"backgroundUrl" => _bg} = object
+       ) do
+    background_removal =
+      instance_list(:background_removal)
+      |> MRF.subdomains_regex()
+
+    if MRF.subdomain_match?(background_removal, actor_host) do
+      {:ok, Map.delete(object, "backgroundUrl")}
+    else
+      {:ok, object}
+    end
+  end
+
+  defp check_background_removal(_actor_info, object), do: {:ok, object}
+
   defp extract_context_uri(%{"conversation" => "tag:" <> rest}) do
     rest
     |> String.split(",", parts: 2, trim: true)
@@ -283,7 +300,8 @@ def filter(%{"id" => actor, "type" => obj_type} = 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} <- check_banner_removal(actor_info, object),
+         {:ok, object} <- check_background_removal(actor_info, object) do
       {:ok, object}
     else
       {:reject, nil} -> {:reject, "[SimplePolicy]"}
@@ -447,6 +465,11 @@ def config_description do
              key: :banner_removal,
              description: "List of instances to strip banners from and the reason for doing so"
            },
+           %{
+             key: :background_removal,
+             description:
+               "List of instances to strip user backgrounds from and the reason for doing so"
+           },
            %{
              key: :reject_deletes,
              description: "List of instances to reject deletions from and the reason for doing so"
diff --git a/test/pleroma/web/activity_pub/mrf/simple_policy_test.exs b/test/pleroma/web/activity_pub/mrf/simple_policy_test.exs
index c6600f001..1ae42036d 100644
--- a/test/pleroma/web/activity_pub/mrf/simple_policy_test.exs
+++ b/test/pleroma/web/activity_pub/mrf/simple_policy_test.exs
@@ -19,6 +19,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicyTest do
             accept: [],
             avatar_removal: [],
             banner_removal: [],
+            background_removal: [],
             reject_deletes: []
           )
 
@@ -618,6 +619,42 @@ test "match with wildcard domain" do
     end
   end
 
+  describe "when :background_removal" do
+    test "is empty" do
+      clear_config([:mrf_simple, :background_removal], [])
+
+      remote_user = build_remote_user()
+
+      assert SimplePolicy.filter(remote_user) == {:ok, remote_user}
+    end
+
+    test "is not empty but it doesn't have a matching host" do
+      clear_config([:mrf_simple, :background_removal], [{"non.matching.remote", ""}])
+
+      remote_user = build_remote_user()
+
+      assert SimplePolicy.filter(remote_user) == {:ok, remote_user}
+    end
+
+    test "has a matching host" do
+      clear_config([:mrf_simple, :background_removal], [{"remote.instance", ""}])
+
+      remote_user = build_remote_user()
+      {:ok, filtered} = SimplePolicy.filter(remote_user)
+
+      refute filtered["backgroundUrl"]
+    end
+
+    test "match with wildcard domain" do
+      clear_config([:mrf_simple, :background_removal], [{"*.remote.instance", ""}])
+
+      remote_user = build_remote_user()
+      {:ok, filtered} = SimplePolicy.filter(remote_user)
+
+      refute filtered["backgroundUrl"]
+    end
+  end
+
   describe "when :reject_deletes is empty" do
     setup do: clear_config([:mrf_simple, :reject_deletes], [])
 
@@ -701,6 +738,10 @@ defp build_remote_user do
         "url" => "http://example.com/image.jpg",
         "type" => "Image"
       },
+      "backgroundUrl" => %{
+        "url" => "http://example.com/background.jpg",
+        "type" => "Image"
+      },
       "type" => "Person"
     }
   end

From 3b0714c4fde2785f8f38619a188b04e5528812a1 Mon Sep 17 00:00:00 2001
From: Oneric <oneric@oneric.stub>
Date: Sat, 17 Feb 2024 01:59:50 +0000
Subject: [PATCH 26/54] Fix SimplePolicy blocking account updates
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This fixes an oversight in e99e2407f3731eba2937b7a2db7b2ef462c99e3b
which added background_removal as a possible SimplePolicy setting.
However, it did _not_ add a default value to the base config and
as it turns out instance_list doesn’t handle unset options well.

In effect this caused federating instances with SimplePolicy enabled
but background_removal not explicitly configured to always trip up for
outgoing account updates in check_background_removal (and incoming
updates from Sharkey).
For added ""fun"" this error was able to block account updates made
e.g. via /api/v1/accounts/update_credentials.

Tests were unaffected since they explicitly override
all relevant config options.

Set a default to avoid all this
(note to self: don’t forget next time, baka!)
---
 config/config.exs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/config.exs b/config/config.exs
index 27c314e01..a8581cbe0 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -377,6 +377,7 @@
   accept: [],
   avatar_removal: [],
   banner_removal: [],
+  background_removal: [],
   reject_deletes: [],
   handle_threads: true
 

From 7a0e27a7467058fc67bbbbb6c3e23ab62044dd8e Mon Sep 17 00:00:00 2001
From: Erin Shepherd <erin.shepherd@e43.eu>
Date: Sat, 17 Feb 2024 13:21:56 +0100
Subject: [PATCH 27/54] Disable busy waits in the default OTP `vm.args`
 configuration.

This vastly reduces idle CPU usage, which should generally be beneficial
for most small-to-medium sized instances.

Additionally update the documentation to specify how to override the vm.args
file for OTP installs
---
 docs/docs/configuration/optimisation/optimizing_beam.md | 7 ++++++-
 rel/vm.args.eex                                         | 6 ++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/docs/docs/configuration/optimisation/optimizing_beam.md b/docs/docs/configuration/optimisation/optimizing_beam.md
index bbdc49725..747773f3e 100644
--- a/docs/docs/configuration/optimisation/optimizing_beam.md
+++ b/docs/docs/configuration/optimisation/optimizing_beam.md
@@ -25,11 +25,14 @@ Tuning the BEAM requires you provide a config file normally called [vm.args](htt
 
 `ExecStart=/usr/bin/elixir --erl '-args_file /opt/akkoma/config/vm.args' -S /usr/bin/mix phx.server`
 
+If using an OTP release, set the `RELEASE_VM_ARGS` environment variable to the path to the vm.args file.
+
 Check your OS documentation to adopt a similar strategy on other platforms.
 
 ### Virtual Machine and/or few CPU cores
 
-Disable the busy-waiting. This should generally only be done if you're on a platform that does burst scheduling, like AWS.
+Disable the busy-waiting. This should generally be done if you're on a platform that does burst scheduling, like AWS, or if you're running other
+services on the same machine.
 
 **vm.args:**
 
@@ -39,6 +42,8 @@ Disable the busy-waiting. This should generally only be done if you're on a plat
 +sbwtdio none
 ```
 
+These settings are enabled by default for OTP releases
+
 ### Dedicated Hardware
 
 Enable more busy waiting, increase the internal maximum limit of BEAM processes and ports. You can use this if you run on dedicated hardware, but it is not necessary.
diff --git a/rel/vm.args.eex b/rel/vm.args.eex
index 71e803264..6c252186e 100644
--- a/rel/vm.args.eex
+++ b/rel/vm.args.eex
@@ -9,3 +9,9 @@
 
 ## Tweak GC to run more often
 ##-env ERL_FULLSWEEP_AFTER 10
+
+## Disable busy waits; vastly reduces CPU usage while idle
+## See https://docs.akkoma.dev/stable/configuration/optimisation/optimizing_beam/#virtual-machine-andor-few-cpu-cores
++sbwt none
++sbwtdcpu none
++sbwtdio none

From 1ef8b967d2084ce31df98b7c5fa6cc8229f28c39 Mon Sep 17 00:00:00 2001
From: Oneric <oneric@oneric.stub>
Date: Sat, 10 Feb 2024 01:46:10 +0100
Subject: [PATCH 28/54] test: fix typos affecting remove factory

Apparently nothing used this factory until now
---
 test/support/factory.ex | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/support/factory.ex b/test/support/factory.ex
index 42c940c52..321caf1f4 100644
--- a/test/support/factory.ex
+++ b/test/support/factory.ex
@@ -307,7 +307,7 @@ def add_activity_factory(attrs \\ %{}) do
     featured_collection_activity(attrs, "Add")
   end
 
-  def remove_activity_factor(attrs \\ %{}) do
+  def remove_activity_factory(attrs \\ %{}) do
     featured_collection_activity(attrs, "Remove")
   end
 
@@ -328,7 +328,7 @@ defp featured_collection_activity(attrs, type) do
         "target" => user.featured_address,
         "object" => note.data["object"],
         "actor" => note.data["actor"],
-        "type" => "Add",
+        "type" => type,
         "to" => [Pleroma.Constants.as_public()],
         "cc" => [user.follower_address]
       }

From 1a7839eaf26e6fe502f778b12bab9e165108e8be Mon Sep 17 00:00:00 2001
From: Oneric <oneric@oneric.stub>
Date: Fri, 9 Feb 2024 23:26:23 +0100
Subject: [PATCH 29/54] Prune old Update activities

Once processed they serve no purpose anymore afaict.
Therefor, lets prune them like other transient activities
to not unnecessarily bloat the table.
---
 lib/pleroma/activity/pruner.ex                |  9 ++++
 .../workers/cron/database_prune_worker.ex     |  3 ++
 test/pleroma/activity/pruner_test.exs         | 38 ++++++++++++--
 test/support/factory.ex                       | 49 +++++++++++++++++++
 4 files changed, 95 insertions(+), 4 deletions(-)

diff --git a/lib/pleroma/activity/pruner.ex b/lib/pleroma/activity/pruner.ex
index 7f561ebae..54a40b534 100644
--- a/lib/pleroma/activity/pruner.ex
+++ b/lib/pleroma/activity/pruner.ex
@@ -26,6 +26,15 @@ def prune_undos do
     |> Repo.delete_all(timeout: :infinity)
   end
 
+  def prune_updates do
+    before_time = cutoff()
+
+    from(a in Activity,
+      where: fragment("?->>'type' = ?", a.data, "Update") and a.inserted_at < ^before_time
+    )
+    |> Repo.delete_all(timeout: :infinity)
+  end
+
   def prune_removes do
     before_time = cutoff()
 
diff --git a/lib/pleroma/workers/cron/database_prune_worker.ex b/lib/pleroma/workers/cron/database_prune_worker.ex
index 58995c69a..ced4b27b7 100644
--- a/lib/pleroma/workers/cron/database_prune_worker.ex
+++ b/lib/pleroma/workers/cron/database_prune_worker.ex
@@ -21,6 +21,9 @@ def perform(_job) do
     Logger.info("Pruning old undos")
     ActivityPruner.prune_undos()
 
+    Logger.info("Pruning old updates")
+    ActivityPruner.prune_updates()
+
     Logger.info("Pruning old removes")
     ActivityPruner.prune_removes()
 
diff --git a/test/pleroma/activity/pruner_test.exs b/test/pleroma/activity/pruner_test.exs
index e8d4b30aa..26db60c1c 100644
--- a/test/pleroma/activity/pruner_test.exs
+++ b/test/pleroma/activity/pruner_test.exs
@@ -6,22 +6,52 @@ defmodule Pleroma.Activity.PrunerTest do
 
   import Pleroma.Factory
 
-  describe "prune_deletes" do
-    test "it prunes old delete objects" do
+  describe "prune_transient_activities" do
+    test "it prunes old transient activities" do
       user = insert(:user)
+      old_time = DateTime.utc_now() |> DateTime.add(-31 * 24, :hour)
 
       new_delete = insert(:delete_activity, type: "Delete", user: user)
 
       old_delete =
         insert(:delete_activity,
-          type: "Delete",
           user: user,
-          inserted_at: DateTime.utc_now() |> DateTime.add(-31 * 24, :hour)
+          inserted_at: old_time
         )
 
+      new_update = insert(:update_activity, type: "Update", user: user)
+
+      old_update =
+        insert(:update_activity,
+          type: "Update",
+          user: user,
+          inserted_at: old_time
+        )
+
+      new_undo = insert(:undo_activity)
+
+      old_undo = insert(:undo_activity, inserted_at: old_time)
+
+      new_remove = insert(:remove_activity)
+
+      old_remove = insert(:remove_activity, inserted_at: old_time)
+
       Pruner.prune_deletes()
+      Pruner.prune_updates()
+      Pruner.prune_undos()
+      Pruner.prune_removes()
+
       assert Activity.get_by_id(new_delete.id)
       refute Activity.get_by_id(old_delete.id)
+
+      assert Activity.get_by_id(new_update.id)
+      refute Activity.get_by_id(old_update.id)
+
+      assert Activity.get_by_id(new_undo.id)
+      refute Activity.get_by_id(old_undo.id)
+
+      assert Activity.get_by_id(new_remove.id)
+      refute Activity.get_by_id(old_remove.id)
     end
   end
 
diff --git a/test/support/factory.ex b/test/support/factory.ex
index 321caf1f4..e21b8fc1e 100644
--- a/test/support/factory.ex
+++ b/test/support/factory.ex
@@ -9,6 +9,7 @@ defmodule Pleroma.Factory do
 
   alias Pleroma.Object
   alias Pleroma.User
+  alias Pleroma.Web.ActivityPub.UserView
 
   @rsa_keys [
               "test/fixtures/rsa_keys/key_1.pem",
@@ -554,6 +555,54 @@ def delete_activity_factory(attrs \\ %{}) do
     |> Map.merge(attrs)
   end
 
+  def undo_activity_factory(attrs \\ %{}) do
+    like_activity = attrs[:like_activity] || insert(:like_activity)
+    attrs = Map.drop(attrs, [:like_activity])
+
+    data =
+      %{
+        "id" => Pleroma.Web.ActivityPub.Utils.generate_activity_id(),
+        "type" => "Undo",
+        "actor" => like_activity.data["actor"],
+        "to" => like_activity.data["to"],
+        "object" => like_activity.data["id"],
+        "published" => DateTime.utc_now() |> DateTime.to_iso8601(),
+        "context" => like_activity.data["context"]
+      }
+
+    %Pleroma.Activity{
+      data: data,
+      actor: data["actor"],
+      recipients: data["to"]
+    }
+    |> Map.merge(attrs)
+  end
+
+  def update_activity_factory(attrs \\ %{}) do
+    user = attrs[:user] || insert(:user, nickname: "testuser")
+    attrs = Map.drop(attrs, [:user])
+
+    user_data =
+      UserView.render("user.json", %{user: user})
+      |> Map.merge(%{"name" => "new display name"})
+
+    data = %{
+      "type" => "Update",
+      "to" => [
+        user_data["followers"],
+        "https://www.w3.org/ns/activitystreams#Public"
+      ],
+      "actor" => user_data["id"],
+      "object" => user_data
+    }
+
+    %Pleroma.Activity{
+      actor: user_data["id"],
+      data: data
+    }
+    |> Map.merge(attrs)
+  end
+
   def oauth_app_factory do
     %Pleroma.Web.OAuth.App{
       client_name: sequence(:client_name, &"Some client #{&1}"),

From 12e7d0a25ce3317af2ee1b82ba1337a158798c3e Mon Sep 17 00:00:00 2001
From: rick <rick@n0id.space>
Date: Sat, 17 Feb 2024 22:25:12 +0100
Subject: [PATCH 30/54] added doc for mrf_reject_newly_created_account_notes

---
 docs/docs/configuration/cheatsheet.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/docs/docs/configuration/cheatsheet.md b/docs/docs/configuration/cheatsheet.md
index 0933b29c5..71d6dc09f 100644
--- a/docs/docs/configuration/cheatsheet.md
+++ b/docs/docs/configuration/cheatsheet.md
@@ -124,6 +124,7 @@ To add configuration to your config file, you can copy it from the base config.
     * `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.
+    * `Pleroma.Web.ActivityPub.MRF.RejectNewlyCreatedAccountNotesPolicy`: Drops posts of users which are newer than the configured time. For exmple it drops all post of users which where created one hour ago. Great to block spam accounts. (See [`:mrf_reject_newly_created_account_notes`](#:mrf_reject_newly_created_account_notes))
 * `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`
@@ -223,6 +224,18 @@ Notes:
 - The hashtags in the configuration do not have a leading `#`.
 - This MRF Policy is always enabled, if you want to disable it you have to set empty lists
 
+#### :mrf_reject_newly_created_account_notes
+This drops all posts of users which where created within the configured timeframe.
+It only drops posts. Follows, reposts and so one are not effected.
+
+* `age`: Time in seconds of which posts for newly created users are dropped.
+
+An example:
+
+```elixir
+config :pleroma, :mrf_reject_newly_created_account_notes, age: 86400
+```
+
 ### :activitypub
 * `unfollow_blocked`: Whether blocks result in people getting unfollowed
 * `outgoing_blocks`: Whether to federate blocks to other instances

From 718104117f102177727e38393ce9514797464bd3 Mon Sep 17 00:00:00 2001
From: rick <rick@n0id.space>
Date: Sat, 17 Feb 2024 22:34:55 +0100
Subject: [PATCH 31/54] fix link

---
 docs/docs/configuration/cheatsheet.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/docs/configuration/cheatsheet.md b/docs/docs/configuration/cheatsheet.md
index 71d6dc09f..2e09082fc 100644
--- a/docs/docs/configuration/cheatsheet.md
+++ b/docs/docs/configuration/cheatsheet.md
@@ -124,7 +124,7 @@ To add configuration to your config file, you can copy it from the base config.
     * `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.
-    * `Pleroma.Web.ActivityPub.MRF.RejectNewlyCreatedAccountNotesPolicy`: Drops posts of users which are newer than the configured time. For exmple it drops all post of users which where created one hour ago. Great to block spam accounts. (See [`:mrf_reject_newly_created_account_notes`](#:mrf_reject_newly_created_account_notes))
+    * `Pleroma.Web.ActivityPub.MRF.RejectNewlyCreatedAccountNotesPolicy`: Drops posts of users which are newer than the configured time. For exmple it drops all post of users which where created one hour ago. Great to block spam accounts. (See [`:mrf_reject_newly_created_account_notes`](#mrf_reject_newly_created_account_notes))
 * `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`

From db49daa4a5e69ebddf5d07c5ce2629e71fda663e Mon Sep 17 00:00:00 2001
From: rick <rick@n0id.space>
Date: Sat, 17 Feb 2024 22:57:56 +0100
Subject: [PATCH 32/54] make it clearer what it affects

---
 docs/docs/configuration/cheatsheet.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/docs/configuration/cheatsheet.md b/docs/docs/configuration/cheatsheet.md
index 2e09082fc..93fc68d6e 100644
--- a/docs/docs/configuration/cheatsheet.md
+++ b/docs/docs/configuration/cheatsheet.md
@@ -124,7 +124,7 @@ To add configuration to your config file, you can copy it from the base config.
     * `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.
-    * `Pleroma.Web.ActivityPub.MRF.RejectNewlyCreatedAccountNotesPolicy`: Drops posts of users which are newer than the configured time. For exmple it drops all post of users which where created one hour ago. Great to block spam accounts. (See [`:mrf_reject_newly_created_account_notes`](#mrf_reject_newly_created_account_notes))
+    * `Pleroma.Web.ActivityPub.MRF.RejectNewlyCreatedAccountNotesPolicy`: Drops posts of users, whose accounts are younger/newer than the configured time (in seconds). For exmple it drops all post of users which where created one hour ago. Great to block spam accounts. (See [`:mrf_reject_newly_created_account_notes`](#mrf_reject_newly_created_account_notes))
 * `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`

From b4c832471c79ee88783fcef5ebed167d018289c5 Mon Sep 17 00:00:00 2001
From: stefan230 <stefan230@mailbox.org>
Date: Sat, 17 Feb 2024 22:09:47 +0000
Subject: [PATCH 33/54] docs/docs/configuration/cheatsheet.md aktualisiert

fixed up some grammer / wording. removed a setence and made wording more in line with what I could find in Admin-FE (especially wording of "rejecting" vs. dropping)
---
 docs/docs/configuration/cheatsheet.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/docs/configuration/cheatsheet.md b/docs/docs/configuration/cheatsheet.md
index 93fc68d6e..a4132e618 100644
--- a/docs/docs/configuration/cheatsheet.md
+++ b/docs/docs/configuration/cheatsheet.md
@@ -124,7 +124,7 @@ To add configuration to your config file, you can copy it from the base config.
     * `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.
-    * `Pleroma.Web.ActivityPub.MRF.RejectNewlyCreatedAccountNotesPolicy`: Drops posts of users, whose accounts are younger/newer than the configured time (in seconds). For exmple it drops all post of users which where created one hour ago. Great to block spam accounts. (See [`:mrf_reject_newly_created_account_notes`](#mrf_reject_newly_created_account_notes))
+    * `Pleroma.Web.ActivityPub.MRF.RejectNewlyCreatedAccountNotesPolicy`: Rejects posts of users, whose accounts are more recent than the configured time (in seconds). Great to block spam accounts. (See [`:mrf_reject_newly_created_account_notes`](#mrf_reject_newly_created_account_notes))
 * `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`
@@ -225,12 +225,12 @@ Notes:
 - This MRF Policy is always enabled, if you want to disable it you have to set empty lists
 
 #### :mrf_reject_newly_created_account_notes
-This drops all posts of users which where created within the configured timeframe.
-It only drops posts. Follows, reposts and so one are not effected.
+Rejects posts of users, whose accounts are more recent than the configured time (in seconds).
+Only drops posts. Follows, reposts, etc. are not effected.
 
-* `age`: Time in seconds of which posts for newly created users are dropped.
+* `age`: Time below which to reject (in seconds)
 
-An example:
+An example: (86400 seconds = 24 hours)
 
 ```elixir
 config :pleroma, :mrf_reject_newly_created_account_notes, age: 86400

From 37e2a35b865e395ef635bfd6cfb0cb7bca985048 Mon Sep 17 00:00:00 2001
From: Oneric <oneric@oneric.stub>
Date: Fri, 16 Feb 2024 04:32:09 +0100
Subject: [PATCH 34/54] Fix Twitter metadata
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This partly reverts 1d884fd9143dc165d745bf1b5e86bcc65332d6b9
while fixing both the issue it addressed and the issue it caused.

The above commit successfully fixed OpenGraph metadata tags
which until then always showed the user bio instead of post content
by handing the activities AP ID as url to the Metadata builder
_instead_ of passing the internal ID as activity_id.
However, in doing so the commit instead inflicted this very problem
onto Twitter metadata tags which ironically are used by akkoma-fe.

This is because while the OpenGraph builder wants an URL as url,
the Twitter builder needs the internal ID to build the URL to the
embedded player for videos and has no URL property.

Thanks to twpol for tracking down this root cause in #644.

Now, once identified the problem is simple, but this simplicity
invites multiple possible solutions to bikeshed about.

 1. Just pass both properties to the builder and let them pick

 2. Drop the url parameter from the OpenGraph builder and instead
     a) build static-fe URL of the post from the ID (like Twitter)
     b) use the passed-in object’s AP ID as an URL

Approach 2a has the disadvantage of hardcoding the expected URL outside
the router, which will be problematic should it ever change.
Approach 2b is conceptually similar to how the builder works atm.
However, the og:url is supposed to be a _permanent_ ID, by changing it
we might, afaiui, technically violate OpenGraph specs(?). (Though its
real-world consequence may very well be near non-existent.)

This leaves just approach 1, which this commit implements.
Albeit it too is not without nits to pick, as it leaves the metadata
builders with an inconsistent interface.

Additionally, this will resolve the subotpimal Discord previews for
content-less image posts reported in #664.
Discord already prefers OpenGraph metadata, so it’s mostly unaffected.
However, it appears when encountering an explicitly empty OpenGraph
description and a non-empty Twitter description, it replaces just the
empty field with its Twitter counterpart, resulting in the user’s bio
slipping into the preview.
Secondly, regardless of any OpenGraph tags, Discord uses twitter:card to
decide how prominently images should be, but due to the bug the card
type was stuck as "summary", forcing images to always remain small.

Root cause identified by: twpol

Fixes: https://akkoma.dev/AkkomaGang/akkoma/issues/644
Fixes: https://akkoma.dev/AkkomaGang/akkoma/issues/664
---
 lib/pleroma/web/static_fe/static_fe_controller.ex | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/pleroma/web/static_fe/static_fe_controller.ex b/lib/pleroma/web/static_fe/static_fe_controller.ex
index f0d45293e..b1ea3178d 100644
--- a/lib/pleroma/web/static_fe/static_fe_controller.ex
+++ b/lib/pleroma/web/static_fe/static_fe_controller.ex
@@ -24,7 +24,13 @@ def show(%{assigns: %{notice_id: notice_id}} = conn, _params) do
          true <- Visibility.is_public?(activity.object),
          {_, true} <- {:visible?, Visibility.visible_for_user?(activity, _reading_user = nil)},
          %User{} = user <- User.get_by_ap_id(activity.object.data["actor"]) do
-      meta = Metadata.build_tags(%{url: activity.data["id"], object: activity.object, user: user})
+      meta =
+        Metadata.build_tags(%{
+          activity_id: notice_id,
+          url: activity.data["id"],
+          object: activity.object,
+          user: user
+        })
 
       timeline =
         activity.object.data["context"]

From 1ec6e193e693b221fffa77b623ed0e418ac08add Mon Sep 17 00:00:00 2001
From: Oneric <oneric@oneric.stub>
Date: Sun, 18 Feb 2024 22:47:02 +0100
Subject: [PATCH 35/54] doc: clarify RejectNewlyCreated uses local account
 discovery

---
 docs/docs/configuration/cheatsheet.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/docs/configuration/cheatsheet.md b/docs/docs/configuration/cheatsheet.md
index a4132e618..4d63c94a4 100644
--- a/docs/docs/configuration/cheatsheet.md
+++ b/docs/docs/configuration/cheatsheet.md
@@ -124,7 +124,7 @@ To add configuration to your config file, you can copy it from the base config.
     * `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.
-    * `Pleroma.Web.ActivityPub.MRF.RejectNewlyCreatedAccountNotesPolicy`: Rejects posts of users, whose accounts are more recent than the configured time (in seconds). Great to block spam accounts. (See [`:mrf_reject_newly_created_account_notes`](#mrf_reject_newly_created_account_notes))
+    * `Pleroma.Web.ActivityPub.MRF.RejectNewlyCreatedAccountNotesPolicy`: Rejects posts of users the server only recently learned about for a while. Great to block spam accounts. (See [`:mrf_reject_newly_created_account_notes`](#mrf_reject_newly_created_account_notes))
 * `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`
@@ -225,7 +225,8 @@ Notes:
 - This MRF Policy is always enabled, if you want to disable it you have to set empty lists
 
 #### :mrf_reject_newly_created_account_notes
-Rejects posts of users, whose accounts are more recent than the configured time (in seconds).
+After initially encountering an user, all their posts
+will be rejected for the configured time (in seconds).
 Only drops posts. Follows, reposts, etc. are not effected.
 
 * `age`: Time below which to reject (in seconds)

From 8f1776a8a7930f1e39febc862ad747d06d1d84d9 Mon Sep 17 00:00:00 2001
From: Oneric <oneric@oneric.stub>
Date: Sun, 18 Feb 2024 22:25:42 +0100
Subject: [PATCH 36/54] Purge leftovers from FollowBot MRF

It was dropped in 9db4c2429fce2d9f56cc59de64b3d6b62e1a7071
---
 config/config.exs                     | 2 --
 docs/docs/configuration/cheatsheet.md | 1 -
 2 files changed, 3 deletions(-)

diff --git a/config/config.exs b/config/config.exs
index a8581cbe0..1c531344c 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -406,8 +406,6 @@
   threshold: 604_800,
   actions: [:delist, :strip_followers]
 
-config :pleroma, :mrf_follow_bot, follower_nickname: nil
-
 config :pleroma, :mrf_reject_newly_created_account_notes, age: 86_400
 
 config :pleroma, :rich_media,
diff --git a/docs/docs/configuration/cheatsheet.md b/docs/docs/configuration/cheatsheet.md
index 4d63c94a4..afa9b2571 100644
--- a/docs/docs/configuration/cheatsheet.md
+++ b/docs/docs/configuration/cheatsheet.md
@@ -119,7 +119,6 @@ To add configuration to your config file, you can copy it from the base config.
     * `Pleroma.Web.ActivityPub.MRF.ObjectAgePolicy`: Rejects or delists posts based on their age when received. (See [`:mrf_object_age`](#mrf_object_age)).
     * `Pleroma.Web.ActivityPub.MRF.ActivityExpirationPolicy`: Sets a default expiration on all posts made by users of the local instance. Requires `Pleroma.Workers.PurgeExpiredActivity` to be enabled for processing the scheduled delections.
     * `Pleroma.Web.ActivityPub.MRF.ForceBotUnlistedPolicy`: Makes all bot posts to disappear from public timelines.
-    * `Pleroma.Web.ActivityPub.MRF.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.

From 1640d19448ead4892c8d9d2188a31f4ca9b0f1f6 Mon Sep 17 00:00:00 2001
From: Oneric <oneric@oneric.stub>
Date: Sun, 18 Feb 2024 22:52:43 +0100
Subject: [PATCH 37/54] doc/cheatsheet: move :activitypub section ahead

Else it is too easy to mistake for another MRF policy.
---
 docs/docs/configuration/cheatsheet.md | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/docs/docs/configuration/cheatsheet.md b/docs/docs/configuration/cheatsheet.md
index afa9b2571..334ad411b 100644
--- a/docs/docs/configuration/cheatsheet.md
+++ b/docs/docs/configuration/cheatsheet.md
@@ -129,6 +129,15 @@ To add configuration to your config file, you can copy it from the base config.
 * `transparency_obfuscate_domains`: Show domains with `*` in the middle, to censor them if needed. For example, `ridingho.me` will show as `rid*****.me`
 
 ## Federation
+### :activitypub
+* `unfollow_blocked`: Whether blocks result in people getting unfollowed
+* `outgoing_blocks`: Whether to federate blocks to other instances
+* `blockers_visible`: Whether a user can see the posts of users who blocked them
+* `deny_follow_blocked`: Whether to disallow following an account that has blocked the user in question
+* `sign_object_fetches`: Sign object fetches with HTTP signatures
+* `authorized_fetch_mode`: Require HTTP signatures for AP fetches
+* `max_collection_objects`: The maximum number of objects to fetch from a remote AP collection.
+
 ### MRF policies
 
 !!! note
@@ -236,15 +245,6 @@ An example: (86400 seconds = 24 hours)
 config :pleroma, :mrf_reject_newly_created_account_notes, age: 86400
 ```
 
-### :activitypub
-* `unfollow_blocked`: Whether blocks result in people getting unfollowed
-* `outgoing_blocks`: Whether to federate blocks to other instances
-* `blockers_visible`: Whether a user can see the posts of users who blocked them
-* `deny_follow_blocked`: Whether to disallow following an account that has blocked the user in question
-* `sign_object_fetches`: Sign object fetches with HTTP signatures
-* `authorized_fetch_mode`: Require HTTP signatures for AP fetches
-* `max_collection_objects`: The maximum number of objects to fetch from a remote AP collection.
-
 ## Pleroma.User
 
 * `restricted_nicknames`: List of nicknames users may not register with.

From 8e7a89605d5696754418ff857bf759f01eab3ae6 Mon Sep 17 00:00:00 2001
From: Oneric <oneric@oneric.stub>
Date: Sun, 18 Feb 2024 22:54:02 +0100
Subject: [PATCH 38/54] doc/cheatsheet: move MRF policies key to end of section

This makes it easier to spot the transparency options
---
 docs/docs/configuration/cheatsheet.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/docs/configuration/cheatsheet.md b/docs/docs/configuration/cheatsheet.md
index 334ad411b..4769cdb4f 100644
--- a/docs/docs/configuration/cheatsheet.md
+++ b/docs/docs/configuration/cheatsheet.md
@@ -104,6 +104,9 @@ To add configuration to your config file, you can copy it from the base config.
 ## Message rewrite facility
 
 ### :mrf
+* `transparency`: Make the content of your Message Rewrite Facility settings public (via nodeinfo).
+* `transparency_exclusions`: Exclude specific instance names from MRF transparency.  The use of the exclusions feature will be disclosed in nodeinfo as a boolean value.
+* `transparency_obfuscate_domains`: Show domains with `*` in the middle, to censor them if needed. For example, `ridingho.me` will show as `rid*****.me`
 * `policies`: Message Rewrite Policy, either one or a list. Here are the ones available by default:
     * `Pleroma.Web.ActivityPub.MRF.NoOpPolicy`: Doesn’t modify activities (default).
     * `Pleroma.Web.ActivityPub.MRF.DropPolicy`: Drops all activities. It generally doesn’t makes sense to use in production.
@@ -124,9 +127,6 @@ To add configuration to your config file, you can copy it from the base config.
     * `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.
     * `Pleroma.Web.ActivityPub.MRF.RejectNewlyCreatedAccountNotesPolicy`: Rejects posts of users the server only recently learned about for a while. Great to block spam accounts. (See [`:mrf_reject_newly_created_account_notes`](#mrf_reject_newly_created_account_notes))
-* `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`
 
 ## Federation
 ### :activitypub

From 7a2d68c3ab79ce352d2b719b683bbf11965539d5 Mon Sep 17 00:00:00 2001
From: Oneric <oneric@oneric.stub>
Date: Sun, 18 Feb 2024 23:12:30 +0100
Subject: [PATCH 39/54] doc/cheatsheet: add link to ActivityExpiration config
 details

---
 docs/docs/configuration/cheatsheet.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/docs/configuration/cheatsheet.md b/docs/docs/configuration/cheatsheet.md
index 4769cdb4f..1e5ce6700 100644
--- a/docs/docs/configuration/cheatsheet.md
+++ b/docs/docs/configuration/cheatsheet.md
@@ -121,6 +121,7 @@ To add configuration to your config file, you can copy it from the base config.
     * `Pleroma.Web.ActivityPub.MRF.VocabularyPolicy`: Restricts activities to a configured set of vocabulary. (See [`:mrf_vocabulary`](#mrf_vocabulary)).
     * `Pleroma.Web.ActivityPub.MRF.ObjectAgePolicy`: Rejects or delists posts based on their age when received. (See [`:mrf_object_age`](#mrf_object_age)).
     * `Pleroma.Web.ActivityPub.MRF.ActivityExpirationPolicy`: Sets a default expiration on all posts made by users of the local instance. Requires `Pleroma.Workers.PurgeExpiredActivity` to be enabled for processing the scheduled delections.
+      (See [`:mrf_activity_expiration`](#mrf_activity_expiration))
     * `Pleroma.Web.ActivityPub.MRF.ForceBotUnlistedPolicy`: Makes all bot posts to disappear from public timelines.
     * `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)).

From da4190c46ee02c0731c27b8728d211cf9757c261 Mon Sep 17 00:00:00 2001
From: Oneric <oneric@oneric.stub>
Date: Sun, 18 Feb 2024 23:02:48 +0100
Subject: [PATCH 40/54] doc/cheatsheet: split out always active MRFs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It doesn’t make sense to add/remove them from the policies list
---
 docs/docs/configuration/cheatsheet.md | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/docs/docs/configuration/cheatsheet.md b/docs/docs/configuration/cheatsheet.md
index 1e5ce6700..e535c2324 100644
--- a/docs/docs/configuration/cheatsheet.md
+++ b/docs/docs/configuration/cheatsheet.md
@@ -125,10 +125,14 @@ To add configuration to your config file, you can copy it from the base config.
     * `Pleroma.Web.ActivityPub.MRF.ForceBotUnlistedPolicy`: Makes all bot posts to disappear from public timelines.
     * `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.
     * `Pleroma.Web.ActivityPub.MRF.RejectNewlyCreatedAccountNotesPolicy`: Rejects posts of users the server only recently learned about for a while. Great to block spam accounts. (See [`:mrf_reject_newly_created_account_notes`](#mrf_reject_newly_created_account_notes))
 
+Additionally the following MRFs will *always* be aplied and cannot be disabled:
+
+* `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.
+* `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.
+
+
 ## Federation
 ### :activitypub
 * `unfollow_blocked`: Whether blocks result in people getting unfollowed

From f254e4f5307566085887b8e9de96cf0e7353744c Mon Sep 17 00:00:00 2001
From: Oneric <oneric@oneric.stub>
Date: Sun, 18 Feb 2024 23:18:50 +0100
Subject: [PATCH 41/54] doc/cheatsheet: add missing MRF config detail docs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

And remove “on by default” text from individual entries.
They are now laready in the “on by default” section.
---
 docs/docs/configuration/cheatsheet.md | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/docs/docs/configuration/cheatsheet.md b/docs/docs/configuration/cheatsheet.md
index e535c2324..ccb3dd71f 100644
--- a/docs/docs/configuration/cheatsheet.md
+++ b/docs/docs/configuration/cheatsheet.md
@@ -129,8 +129,10 @@ To add configuration to your config file, you can copy it from the base config.
 
 Additionally the following MRFs will *always* be aplied and cannot be disabled:
 
-* `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.
-* `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.
+    (See [`:mrf_inline_quote`](#mrf_inline_quote))
+* `Pleroma.Web.ActivityPub.MRF.NormalizeMarkup`: Pass inbound HTML through a scrubber to make sure it doesn't have anything unusual in it.
+    (See [`:mrf_normalize_markup`](#mrf_normalize_markup))
 
 
 ## Federation
@@ -250,6 +252,12 @@ An example: (86400 seconds = 24 hours)
 config :pleroma, :mrf_reject_newly_created_account_notes, age: 86400
 ```
 
+#### :mrf_inline_quote
+* `prefix`: what prefix to prepend to quoted URLs
+
+#### :mrf_normalize_markup
+* `scrub_policy`: the scrubbing module to use (by default a built-in HTML sanitiser)
+
 ## Pleroma.User
 
 * `restricted_nicknames`: List of nicknames users may not register with.

From 9830d54fa1a2daef19232c10448005817b3b3154 Mon Sep 17 00:00:00 2001
From: Oneric <oneric@oneric.stub>
Date: Sun, 18 Feb 2024 23:29:43 +0100
Subject: [PATCH 42/54] doc/cheatsheet: sort main MRF list alphabetically

It is too cumbersome to find a specific policy atm
or to check if all are docuemtned yet.
Trivial placeholder policies are excluded from this.
---
 docs/docs/configuration/cheatsheet.md | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/docs/docs/configuration/cheatsheet.md b/docs/docs/configuration/cheatsheet.md
index ccb3dd71f..b4399e129 100644
--- a/docs/docs/configuration/cheatsheet.md
+++ b/docs/docs/configuration/cheatsheet.md
@@ -110,22 +110,22 @@ To add configuration to your config file, you can copy it from the base config.
 * `policies`: Message Rewrite Policy, either one or a list. Here are the ones available by default:
     * `Pleroma.Web.ActivityPub.MRF.NoOpPolicy`: Doesn’t modify activities (default).
     * `Pleroma.Web.ActivityPub.MRF.DropPolicy`: Drops all activities. It generally doesn’t makes sense to use in production.
-    * `Pleroma.Web.ActivityPub.MRF.SimplePolicy`: Restrict the visibility of activities from certains instances (See [`:mrf_simple`](#mrf_simple)).
-    * `Pleroma.Web.ActivityPub.MRF.TagPolicy`: Applies policies to individual users based on tags, which can be set using pleroma-fe/admin-fe/any other app that supports Pleroma Admin API. For example it allows marking posts from individual users nsfw (sensitive).
-    * `Pleroma.Web.ActivityPub.MRF.SubchainPolicy`: Selectively runs other MRF policies when messages match (See [`:mrf_subchain`](#mrf_subchain)).
-    * `Pleroma.Web.ActivityPub.MRF.RejectNonPublic`: Drops posts with non-public visibility settings (See [`:mrf_rejectnonpublic`](#mrf_rejectnonpublic)).
-    * `Pleroma.Web.ActivityPub.MRF.EnsureRePrepended`: Rewrites posts to ensure that replies to posts with subjects do not have an identical subject and instead begin with re:.
-    * `Pleroma.Web.ActivityPub.MRF.AntiLinkSpamPolicy`: Rejects posts from likely spambots by rejecting posts from new users that contain links.
-    * `Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy`: Crawls attachments using their MediaProxy URLs so that the MediaProxy cache is primed.
-    * `Pleroma.Web.ActivityPub.MRF.MentionPolicy`: Drops posts mentioning configurable users. (See [`:mrf_mention`](#mrf_mention)).
-    * `Pleroma.Web.ActivityPub.MRF.VocabularyPolicy`: Restricts activities to a configured set of vocabulary. (See [`:mrf_vocabulary`](#mrf_vocabulary)).
-    * `Pleroma.Web.ActivityPub.MRF.ObjectAgePolicy`: Rejects or delists posts based on their age when received. (See [`:mrf_object_age`](#mrf_object_age)).
     * `Pleroma.Web.ActivityPub.MRF.ActivityExpirationPolicy`: Sets a default expiration on all posts made by users of the local instance. Requires `Pleroma.Workers.PurgeExpiredActivity` to be enabled for processing the scheduled delections.
       (See [`:mrf_activity_expiration`](#mrf_activity_expiration))
-    * `Pleroma.Web.ActivityPub.MRF.ForceBotUnlistedPolicy`: Makes all bot posts to disappear from public timelines.
     * `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.AntiLinkSpamPolicy`: Rejects posts from likely spambots by rejecting posts from new users that contain links.
+    * `Pleroma.Web.ActivityPub.MRF.EnsureRePrepended`: Rewrites posts to ensure that replies to posts with subjects do not have an identical subject and instead begin with re:.
+    * `Pleroma.Web.ActivityPub.MRF.ForceBotUnlistedPolicy`: Makes all bot posts to disappear from public timelines.
     * `Pleroma.Web.ActivityPub.MRF.KeywordPolicy`: Rejects or removes from the federated timeline or replaces keywords. (See [`:mrf_keyword`](#mrf_keyword)).
+    * `Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy`: Crawls attachments using their MediaProxy URLs so that the MediaProxy cache is primed.
+    * `Pleroma.Web.ActivityPub.MRF.MentionPolicy`: Drops posts mentioning configurable users. (See [`:mrf_mention`](#mrf_mention)).
+    * `Pleroma.Web.ActivityPub.MRF.ObjectAgePolicy`: Rejects or delists posts based on their age when received. (See [`:mrf_object_age`](#mrf_object_age)).
     * `Pleroma.Web.ActivityPub.MRF.RejectNewlyCreatedAccountNotesPolicy`: Rejects posts of users the server only recently learned about for a while. Great to block spam accounts. (See [`:mrf_reject_newly_created_account_notes`](#mrf_reject_newly_created_account_notes))
+    * `Pleroma.Web.ActivityPub.MRF.RejectNonPublic`: Drops posts with non-public visibility settings (See [`:mrf_rejectnonpublic`](#mrf_rejectnonpublic)).
+    * `Pleroma.Web.ActivityPub.MRF.SimplePolicy`: Restrict the visibility of activities from certains instances (See [`:mrf_simple`](#mrf_simple)).
+    * `Pleroma.Web.ActivityPub.MRF.SubchainPolicy`: Selectively runs other MRF policies when messages match (See [`:mrf_subchain`](#mrf_subchain)).
+    * `Pleroma.Web.ActivityPub.MRF.TagPolicy`: Applies policies to individual users based on tags, which can be set using pleroma-fe/admin-fe/any other app that supports Pleroma Admin API. For example it allows marking posts from individual users nsfw (sensitive).
+    * `Pleroma.Web.ActivityPub.MRF.VocabularyPolicy`: Restricts activities to a configured set of vocabulary. (See [`:mrf_vocabulary`](#mrf_vocabulary)).
 
 Additionally the following MRFs will *always* be aplied and cannot be disabled:
 

From 41dd37d796bc78d2d3d995d49b023d167dca81ba Mon Sep 17 00:00:00 2001
From: Oneric <oneric@oneric.stub>
Date: Mon, 19 Feb 2024 00:13:10 +0100
Subject: [PATCH 43/54] doc/cheatsheet: add missing MRFs

Or mentions of MRFs in the main list
whose options were already documented.
---
 docs/docs/configuration/cheatsheet.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/docs/docs/configuration/cheatsheet.md b/docs/docs/configuration/cheatsheet.md
index b4399e129..91a215c36 100644
--- a/docs/docs/configuration/cheatsheet.md
+++ b/docs/docs/configuration/cheatsheet.md
@@ -116,19 +116,32 @@ To add configuration to your config file, you can copy it from the base config.
     * `Pleroma.Web.ActivityPub.MRF.AntiLinkSpamPolicy`: Rejects posts from likely spambots by rejecting posts from new users that contain links.
     * `Pleroma.Web.ActivityPub.MRF.EnsureRePrepended`: Rewrites posts to ensure that replies to posts with subjects do not have an identical subject and instead begin with re:.
     * `Pleroma.Web.ActivityPub.MRF.ForceBotUnlistedPolicy`: Makes all bot posts to disappear from public timelines.
+    * `Pleroma.Web.ActivityPub.MRF.HellthreadPolicy`: Blocks messages with too many mentions.
+      (See [`mrf_hellthread`](#mrf_hellthread))
     * `Pleroma.Web.ActivityPub.MRF.KeywordPolicy`: Rejects or removes from the federated timeline or replaces keywords. (See [`:mrf_keyword`](#mrf_keyword)).
     * `Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy`: Crawls attachments using their MediaProxy URLs so that the MediaProxy cache is primed.
     * `Pleroma.Web.ActivityPub.MRF.MentionPolicy`: Drops posts mentioning configurable users. (See [`:mrf_mention`](#mrf_mention)).
+    * `Pleroma.Web.ActivityPub.MRF.NoEmptyPolicy`: Drops local activities which have no actual content.
+       (e.g. no attachments and only consists of mentions)
+    * `Pleroma.Web.ActivityPub.MRF.NoPlaceholderTextPolicy`: Strips content placeholders from posts
+      (such as the dot from mastodon)
     * `Pleroma.Web.ActivityPub.MRF.ObjectAgePolicy`: Rejects or delists posts based on their age when received. (See [`:mrf_object_age`](#mrf_object_age)).
     * `Pleroma.Web.ActivityPub.MRF.RejectNewlyCreatedAccountNotesPolicy`: Rejects posts of users the server only recently learned about for a while. Great to block spam accounts. (See [`:mrf_reject_newly_created_account_notes`](#mrf_reject_newly_created_account_notes))
     * `Pleroma.Web.ActivityPub.MRF.RejectNonPublic`: Drops posts with non-public visibility settings (See [`:mrf_rejectnonpublic`](#mrf_rejectnonpublic)).
     * `Pleroma.Web.ActivityPub.MRF.SimplePolicy`: Restrict the visibility of activities from certains instances (See [`:mrf_simple`](#mrf_simple)).
+    * `Pleroma.Web.ActivityPub.MRF.StealEmojiPolicy`: Steals all eligible emoji encountered in posts from remote instances
+      (See [`:mrf_steal_emoji`](#mrf_steal_emoji))
     * `Pleroma.Web.ActivityPub.MRF.SubchainPolicy`: Selectively runs other MRF policies when messages match (See [`:mrf_subchain`](#mrf_subchain)).
     * `Pleroma.Web.ActivityPub.MRF.TagPolicy`: Applies policies to individual users based on tags, which can be set using pleroma-fe/admin-fe/any other app that supports Pleroma Admin API. For example it allows marking posts from individual users nsfw (sensitive).
+    * `Pleroma.Web.ActivityPub.MRF.UserAllowListPolicy`: Drops all posts except from users specified in a list.
+      (See [`:mrf_user_allowlist`](#mrf_user_allowlist))
     * `Pleroma.Web.ActivityPub.MRF.VocabularyPolicy`: Restricts activities to a configured set of vocabulary. (See [`:mrf_vocabulary`](#mrf_vocabulary)).
 
 Additionally the following MRFs will *always* be aplied and cannot be disabled:
 
+* `Pleroma.Web.ActivityPub.MRF.DirectMessageDisabledPolicy`: Strips users limiting who can send them DMs from the recipients of non-eligible DMs
+* `Pleroma.Web.ActivityPub.MRF.HashtagPolicy`: Depending on a post’s hashtags it can be rejected, get its sensitive flags force-enabled or removed from the global timeline
+    (See [`:mrf_hashtag`](#mrf_hashtag))
 * `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.
     (See [`:mrf_inline_quote`](#mrf_inline_quote))
 * `Pleroma.Web.ActivityPub.MRF.NormalizeMarkup`: Pass inbound HTML through a scrubber to make sure it doesn't have anything unusual in it.

From c25cfe9b7aadb70388e0819ade3f9aa9be0f41ad Mon Sep 17 00:00:00 2001
From: rick <rick@n0id.space>
Date: Mon, 19 Feb 2024 23:25:20 +0100
Subject: [PATCH 44/54] fixed spelling

---
 docs/docs/configuration/cheatsheet.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/docs/configuration/cheatsheet.md b/docs/docs/configuration/cheatsheet.md
index 91a215c36..3c9113f88 100644
--- a/docs/docs/configuration/cheatsheet.md
+++ b/docs/docs/configuration/cheatsheet.md
@@ -255,7 +255,7 @@ Notes:
 #### :mrf_reject_newly_created_account_notes
 After initially encountering an user, all their posts
 will be rejected for the configured time (in seconds).
-Only drops posts. Follows, reposts, etc. are not effected.
+Only drops posts. Follows, reposts, etc. are not affected.
 
 * `age`: Time below which to reject (in seconds)
 

From 7d94476dd6e46071cf5b8662055a109f9ef904ef Mon Sep 17 00:00:00 2001
From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
Date: Tue, 20 Feb 2024 08:45:48 +0100
Subject: [PATCH 45/54] StealEmojiPolicy: Sanitize shortcodes

Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/3245
---
 .../activity_pub/mrf/steal_emoji_policy.ex    |  2 ++
 .../mrf/steal_emoji_policy_test.exs           | 26 +++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/lib/pleroma/web/activity_pub/mrf/steal_emoji_policy.ex b/lib/pleroma/web/activity_pub/mrf/steal_emoji_policy.ex
index 45b2d4ca7..3e1dc7d43 100644
--- a/lib/pleroma/web/activity_pub/mrf/steal_emoji_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/steal_emoji_policy.ex
@@ -34,6 +34,7 @@ defp steal_emoji({shortcode, url}, emoji_dir_path) do
           |> Path.basename()
           |> Path.extname()
 
+        shortcode = Path.basename(shortcode)
         file_path = Path.join(emoji_dir_path, shortcode <> (extension || ".png"))
 
         case File.write(file_path, response.body) do
@@ -76,6 +77,7 @@ def filter(%{"object" => %{"emoji" => foreign_emojis, "actor" => actor}} = messa
       new_emojis =
         foreign_emojis
         |> Enum.reject(fn {shortcode, _url} -> shortcode in installed_emoji end)
+        |> Enum.reject(fn {shortcode, _url} -> String.contains?(shortcode, ["/", "\\"]) end)
         |> Enum.filter(fn {shortcode, _url} ->
           reject_emoji? =
             [:mrf_steal_emoji, :rejected_shortcodes]
diff --git a/test/pleroma/web/activity_pub/mrf/steal_emoji_policy_test.exs b/test/pleroma/web/activity_pub/mrf/steal_emoji_policy_test.exs
index b0a7e8993..59baa3a43 100644
--- a/test/pleroma/web/activity_pub/mrf/steal_emoji_policy_test.exs
+++ b/test/pleroma/web/activity_pub/mrf/steal_emoji_policy_test.exs
@@ -60,6 +60,32 @@ test "Steals emoji on unknown shortcode from allowed remote host", %{
            |> File.exists?()
   end
 
+  test "rejects invalid shortcodes", %{path: path} do
+    message = %{
+      "type" => "Create",
+      "object" => %{
+        "emoji" => [{"fired/fox", "https://example.org/emoji/firedfox"}],
+        "actor" => "https://example.org/users/admin"
+      }
+    }
+
+    fullpath = Path.join(path, "fired/fox.png")
+
+    Tesla.Mock.mock(fn %{method: :get, url: "https://example.org/emoji/firedfox"} ->
+      %Tesla.Env{status: 200, body: File.read!("test/fixtures/image.jpg")}
+    end)
+
+    clear_config(:mrf_steal_emoji, hosts: ["example.org"], size_limit: 284_468)
+
+    refute "firedfox" in installed()
+    refute File.exists?(path)
+
+    assert {:ok, _message} = StealEmojiPolicy.filter(message)
+
+    refute "fired/fox" in installed()
+    refute File.exists?(fullpath)
+  end
+
   test "reject regex shortcode", %{message: message} do
     refute "firedfox" in installed()
 

From b387f4a1c1ff02573f16de0b25403cf501afc3b4 Mon Sep 17 00:00:00 2001
From: Erin Shepherd <erin.shepherd@e43.eu>
Date: Tue, 20 Feb 2024 11:31:29 +0100
Subject: [PATCH 46/54] Don't steal emoji who's shortcodes have dots or colons
 in their name

Mastodon at the very least seems to prevent the creation of emoji with
dots in their name (and refuses to accept them in federation). It feels
like being cautious in what we accept is reasonable here.

Colons are the emoji separator and so obviously should be blocked.

Perhaps instead of filtering out things like this we should just
do a regex match on `[a-zA-Z0-9_-]`? But that's plausibly a decision
for another day

    Perhaps we should also have a centralised "is this a valid emoji shortcode?"
    function
---
 lib/pleroma/web/activity_pub/mrf/steal_emoji_policy.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pleroma/web/activity_pub/mrf/steal_emoji_policy.ex b/lib/pleroma/web/activity_pub/mrf/steal_emoji_policy.ex
index 3e1dc7d43..6c43afa58 100644
--- a/lib/pleroma/web/activity_pub/mrf/steal_emoji_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/steal_emoji_policy.ex
@@ -77,7 +77,7 @@ def filter(%{"object" => %{"emoji" => foreign_emojis, "actor" => actor}} = messa
       new_emojis =
         foreign_emojis
         |> Enum.reject(fn {shortcode, _url} -> shortcode in installed_emoji end)
-        |> Enum.reject(fn {shortcode, _url} -> String.contains?(shortcode, ["/", "\\"]) end)
+        |> Enum.reject(fn {shortcode, _url} -> String.contains?(shortcode, ["/", "\\", ".", ":"]) end)
         |> Enum.filter(fn {shortcode, _url} ->
           reject_emoji? =
             [:mrf_steal_emoji, :rejected_shortcodes]

From 3111181d3c0c46c695e387d39521ccb9163c2320 Mon Sep 17 00:00:00 2001
From: FloatingGhost <hannah@coffee-and-dreams.uk>
Date: Tue, 20 Feb 2024 15:09:04 +0000
Subject: [PATCH 47/54] mix format

---
 lib/pleroma/web/activity_pub/mrf/steal_emoji_policy.ex | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/pleroma/web/activity_pub/mrf/steal_emoji_policy.ex b/lib/pleroma/web/activity_pub/mrf/steal_emoji_policy.ex
index 6c43afa58..02a107c27 100644
--- a/lib/pleroma/web/activity_pub/mrf/steal_emoji_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/steal_emoji_policy.ex
@@ -77,7 +77,9 @@ def filter(%{"object" => %{"emoji" => foreign_emojis, "actor" => actor}} = messa
       new_emojis =
         foreign_emojis
         |> Enum.reject(fn {shortcode, _url} -> shortcode in installed_emoji end)
-        |> Enum.reject(fn {shortcode, _url} -> String.contains?(shortcode, ["/", "\\", ".", ":"]) end)
+        |> Enum.reject(fn {shortcode, _url} ->
+          String.contains?(shortcode, ["/", "\\", ".", ":"])
+        end)
         |> Enum.filter(fn {shortcode, _url} ->
           reject_emoji? =
             [:mrf_steal_emoji, :rejected_shortcodes]

From c08f49d88ebbef62cdfa4bf4004eac236c0e42af Mon Sep 17 00:00:00 2001
From: Oneric <oneric@oneric.stub>
Date: Wed, 21 Feb 2024 00:33:32 +0000
Subject: [PATCH 48/54] Add tests for static-fe metadata tags

---
 .../static_fe/static_fe_controller_test.exs   | 159 +++++++++++++++++-
 1 file changed, 157 insertions(+), 2 deletions(-)

diff --git a/test/pleroma/web/static_fe/static_fe_controller_test.exs b/test/pleroma/web/static_fe/static_fe_controller_test.exs
index 935e44171..79d4d6261 100644
--- a/test/pleroma/web/static_fe/static_fe_controller_test.exs
+++ b/test/pleroma/web/static_fe/static_fe_controller_test.exs
@@ -19,9 +19,26 @@ defmodule Pleroma.Web.StaticFE.StaticFEControllerTest do
 
   setup %{conn: conn} do
     conn = put_req_header(conn, "accept", "text/html")
-    user = insert(:user)
 
-    %{conn: conn, user: user}
+    user_avatar_url = "https://example.org/akko.png"
+
+    user =
+      insert(:user,
+        local: true,
+        name: "Akko",
+        nickname: "atsuko",
+        bio: "A believing heart is my magic!",
+        raw_bio: "A believing heart is my magic!",
+        avatar: %{
+          "url" => [
+            %{
+              "href" => user_avatar_url
+            }
+          ]
+        }
+      )
+
+    %{conn: conn, user: user, user_avatar_url: user_avatar_url}
   end
 
   describe "user profile html" do
@@ -291,4 +308,142 @@ test "returns 404 for local public activity with `restrict_unauthenticated/activ
       |> html_response(404)
     end
   end
+
+  defp meta_content(metadata_tag) do
+    :proplists.get_value("content", metadata_tag)
+  end
+
+  defp meta_find_og(document, name) do
+    Floki.find(document, "head>meta[property=\"og:" <> name <> "\"]")
+  end
+
+  defp meta_find_twitter(document, name) do
+    Floki.find(document, "head>meta[name=\"twitter:" <> name <> "\"]")
+  end
+
+  # Detailed metadata tests are already done for each builder individually, so just
+  # one check per type of content should suffice to ensure we're calling the providers correctly
+  describe "metadata tags for" do
+    setup do
+      clear_config([Pleroma.Web.Metadata, :providers], [
+        Pleroma.Web.Metadata.Providers.OpenGraph,
+        Pleroma.Web.Metadata.Providers.TwitterCard
+      ])
+    end
+
+    test "user profile", %{conn: conn, user: user, user_avatar_url: user_avatar_url} do
+      conn = get(conn, "/users/#{user.nickname}")
+      html = html_response(conn, 200)
+
+      {:ok, document} = Floki.parse_document(html)
+
+      [{"meta", og_type, _}] = meta_find_og(document, "type")
+      [{"meta", og_title, _}] = meta_find_og(document, "title")
+      [{"meta", og_url, _}] = meta_find_og(document, "url")
+      [{"meta", og_desc, _}] = meta_find_og(document, "description")
+      [{"meta", og_img, _}] = meta_find_og(document, "image")
+      [{"meta", og_imgw, _}] = meta_find_og(document, "image:width")
+      [{"meta", og_imgh, _}] = meta_find_og(document, "image:height")
+
+      [{"meta", tw_card, _}] = meta_find_twitter(document, "card")
+      [{"meta", tw_title, _}] = meta_find_twitter(document, "title")
+      [{"meta", tw_desc, _}] = meta_find_twitter(document, "description")
+      [{"meta", tw_img, _}] = meta_find_twitter(document, "image")
+
+      assert meta_content(og_type) == "article"
+      assert meta_content(og_title) == Pleroma.Web.Metadata.Utils.user_name_string(user)
+      assert meta_content(og_url) == user.ap_id
+      assert meta_content(og_desc) == user.bio
+      assert meta_content(og_img) == user_avatar_url
+      assert meta_content(og_imgw) == "150"
+      assert meta_content(og_imgh) == "150"
+
+      assert meta_content(tw_card) == "summary"
+      assert meta_content(tw_title) == meta_content(og_title)
+      assert meta_content(tw_desc) == meta_content(og_desc)
+      assert meta_content(tw_img) == meta_content(og_img)
+    end
+
+    test "text-only post", %{conn: conn, user: user, user_avatar_url: user_avatar_url} do
+      post_text = "How are lessons about magic  t h i s  boring?!"
+      {:ok, activity} = CommonAPI.post(user, %{status: post_text})
+
+      conn = get(conn, "/notice/#{activity.id}")
+      html = html_response(conn, 200)
+
+      {:ok, document} = Floki.parse_document(html)
+
+      [{"meta", og_type, _}] = meta_find_og(document, "type")
+      [{"meta", og_title, _}] = meta_find_og(document, "title")
+      [{"meta", og_url, _}] = meta_find_og(document, "url")
+      [{"meta", og_desc, _}] = meta_find_og(document, "description")
+      [{"meta", og_img, _}] = meta_find_og(document, "image")
+      [{"meta", og_imgw, _}] = meta_find_og(document, "image:width")
+      [{"meta", og_imgh, _}] = meta_find_og(document, "image:height")
+
+      [{"meta", tw_card, _}] = meta_find_twitter(document, "card")
+      [{"meta", tw_title, _}] = meta_find_twitter(document, "title")
+      [{"meta", tw_desc, _}] = meta_find_twitter(document, "description")
+      [{"meta", tw_img, _}] = meta_find_twitter(document, "image")
+
+      assert meta_content(og_type) == "article"
+      assert meta_content(og_title) == Pleroma.Web.Metadata.Utils.user_name_string(user)
+      assert meta_content(og_url) == activity.data["id"]
+      assert meta_content(og_desc) == post_text
+      assert meta_content(og_img) == user_avatar_url
+      assert meta_content(og_imgw) == "150"
+      assert meta_content(og_imgh) == "150"
+
+      assert meta_content(tw_card) == "summary"
+      assert meta_content(tw_title) == meta_content(og_title)
+      assert meta_content(tw_desc) == meta_content(og_desc)
+      assert meta_content(tw_img) == meta_content(og_img)
+    end
+
+    test "post with attachments", %{conn: conn, user: user} do
+      file = %Plug.Upload{
+        content_type: "image/jpeg",
+        path: Path.absname("test/fixtures/image.jpg"),
+        filename: "an_image.jpg"
+      }
+
+      alt_text = "The rarest of all Shiny Chariot cards"
+      {:ok, upload_data} = ActivityPub.upload(file, actor: user.ap_id, description: alt_text)
+
+      %{id: media_id, data: %{"url" => [%{"href" => media_url}]}} = upload_data
+
+      post_text = "Look!"
+      {:ok, activity} = CommonAPI.post(user, %{status: post_text, media_ids: [media_id]})
+
+      conn = get(conn, "/notice/#{activity.id}")
+      html = html_response(conn, 200)
+
+      {:ok, document} = Floki.parse_document(html)
+
+      [{"meta", og_type, _}] = meta_find_og(document, "type")
+      [{"meta", og_title, _}] = meta_find_og(document, "title")
+      [{"meta", og_url, _}] = meta_find_og(document, "url")
+      [{"meta", og_desc, _}] = meta_find_og(document, "description")
+      [{"meta", og_img, _}] = meta_find_og(document, "image")
+      [{"meta", og_alt, _}] = meta_find_og(document, "image:alt")
+
+      [{"meta", tw_card, _}] = meta_find_twitter(document, "card")
+      [{"meta", tw_title, _}] = meta_find_twitter(document, "title")
+      [{"meta", tw_desc, _}] = meta_find_twitter(document, "description")
+      [{"meta", tw_player, _}] = meta_find_twitter(document, "player")
+
+      assert meta_content(og_type) == "article"
+      assert meta_content(og_title) == Pleroma.Web.Metadata.Utils.user_name_string(user)
+      assert meta_content(og_url) == activity.data["id"]
+      assert meta_content(og_desc) == post_text
+      assert meta_content(og_img) == media_url
+      assert meta_content(og_alt) == alt_text
+
+      # Audio and video attachments use "player" and have some more metadata
+      assert meta_content(tw_card) == "summary_large_image"
+      assert meta_content(tw_title) == meta_content(og_title)
+      assert meta_content(tw_desc) == meta_content(og_desc)
+      assert meta_content(tw_player) == meta_content(og_img)
+    end
+  end
 end

From 7964272c98fec4d83d8432f372b6718f850c2c8c Mon Sep 17 00:00:00 2001
From: Oneric <oneric@oneric.stub>
Date: Mon, 19 Feb 2024 17:33:14 +0100
Subject: [PATCH 49/54] Document how to avoid data loss on migration from
 Pleroma

---
 docs/docs/installation/migrating_to_akkoma.md | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/docs/docs/installation/migrating_to_akkoma.md b/docs/docs/installation/migrating_to_akkoma.md
index 9c30d9586..40eb6cac8 100644
--- a/docs/docs/installation/migrating_to_akkoma.md
+++ b/docs/docs/installation/migrating_to_akkoma.md
@@ -21,6 +21,33 @@ fork of Akkoma - luckily this isn't very hard.
 You'll need to update the backend, then possibly the frontend, depending
 on your setup.
 
+## Backup diverging features
+
+As time goes on Akkoma and Pleroma added or removed different features
+and reorganised the database in a different way. If you want to be able to
+migrate back to Pleroma without losing any affected data, you’ll want to
+make a backup before starting the migration.  
+If you're not interested in migrating back, skip this section
+*(although it might be a good idea to temporarily keep a full DB backup
+just in case something unexpected happens during migration)*
+
+As of 2024-02 you will want to keep a backup of:
+
+- the entire `chats` and `chat_message_references` tables
+
+The following columns are not deleted by a migration to Akkoma, but a migration
+back to Pleroma or future Akkoma upgrades might affect them, so perhaps back them up as well:
+
+- the `birthday` of users and their `show_birthday` setting
+- the `expires_at` key of in the `user_relationships` table
+    *(used by temporary mutes)*
+
+The way cached instance metadata is stored differs, but since those
+will be refetched and updated anyway, there’s no need for a backup.
+
+Best check all newer migrations unique to Akkoma/Pleroma
+to get an up-to-date picture of what needs to be kept.
+
 ## From Source
 
 If you're running the source Akkoma install, you'll need to set the
@@ -130,3 +157,4 @@ MIX_ENV=prod mix ecto.rollback --to 20210416051708
 ```
 
 Then switch back to Pleroma for updates (similar to how was done to migrate to Akkoma), and remove the front-ends. The front-ends are installed in the `frontends` folder in the [static directory](../configuration/static_dir.md). Once you are back to Pleroma, you will need to run the database migrations again. See the Pleroma documentation for this.
+After this use your previous backups to restore data from diverging features.

From bff2812a939c03c099117962283f28049667ac30 Mon Sep 17 00:00:00 2001
From: Oneric <oneric@oneric.stub>
Date: Mon, 19 Feb 2024 17:53:11 +0100
Subject: [PATCH 50/54] More prominently document db migrations in migrations
 from Pleroma

By now most instance will run a version past 2022-08 but the guide
only documented it for from source installs and Pleroma develop.
---
 docs/docs/installation/migrating_to_akkoma.md | 44 ++++++++++++++-----
 1 file changed, 32 insertions(+), 12 deletions(-)

diff --git a/docs/docs/installation/migrating_to_akkoma.md b/docs/docs/installation/migrating_to_akkoma.md
index 40eb6cac8..bf6eeebc7 100644
--- a/docs/docs/installation/migrating_to_akkoma.md
+++ b/docs/docs/installation/migrating_to_akkoma.md
@@ -61,16 +61,7 @@ git pull -r
 # to run "git merge stable" instead (or develop if you want)
 ```
 
-### WARNING - Migrating from Pleroma Develop
-If you are on pleroma develop, and have updated since 2022-08, you may have issues with database migrations.
-
-Please roll back the given migrations:
-
-```bash
-MIX_ENV=prod mix ecto.rollback --migrations-path priv/repo/optional_migrations/pleroma_develop_rollbacks -n5
-```
-
-Then compile, migrate and restart as usual.
+And compile as usual.
 
 ## From OTP
 
@@ -80,15 +71,44 @@ This will just be setting the update URL - find your flavour from the [mapping o
 export FLAVOUR=[the flavour you found above]
 
 ./bin/pleroma_ctl update --zip-url https://akkoma-updates.s3-website.fr-par.scw.cloud/stable/akkoma-$FLAVOUR.zip
-./bin/pleroma_ctl migrate
 ```
 
-Then restart. When updating in the future, you canjust use
+When updating in the future, you can just use
 
 ```bash
 ./bin/pleroma_ctl update --branch stable
 ```
 
+
+## Database Migrations
+### WARNING - Migrating from Pleroma past 2022-08
+If you are on Pleroma stable >= 2.5.0 or Pleroma develop, and
+have updated since 2022-08, you may have issues with database migrations.
+
+Please first roll back the given migrations:
+
+=== "OTP"
+    ```bash
+    ./bin/pleroma_ctl rollback --migrations-path priv/repo/optional_migrations/pleroma_develop_rollbacks -n5
+    ```
+=== "From Source"
+    ```bash
+    MIX_ENV=prod mix ecto.rollback --migrations-path priv/repo/optional_migrations/pleroma_develop_rollbacks -n5
+    ```
+
+### Applying Akkoma Database Migrations
+
+Just run
+
+=== "OTP"
+    ```bash
+    ./bin/pleroma_ctl migrate
+    ```
+=== "From Source"
+    ```bash
+    MIX_ENV=prod mix ecto.migrate
+    ```
+
 ## Frontend changes
 
 Akkoma comes with a few frontend changes as well as backend ones,

From caaf2deb2235d8af0b7af342621fec7cf9e02e89 Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Sun, 22 Oct 2023 11:53:48 +0000
Subject: [PATCH 51/54] Translated using Weblate (Polish)

Currently translated at 18.1% (183 of 1006 strings)

Translated using Weblate (Polish)

Currently translated at 6.6% (67 of 1006 strings)

Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: subtype <subtype@hollow.capital>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/akkoma-backend-config-descriptions/pl/
Translation: Pleroma fe/Akkoma Backend (Config Descriptions)
---
 .../pl/LC_MESSAGES/config_descriptions.po     | 779 +++++++++---------
 1 file changed, 391 insertions(+), 388 deletions(-)

diff --git a/priv/gettext/pl/LC_MESSAGES/config_descriptions.po b/priv/gettext/pl/LC_MESSAGES/config_descriptions.po
index d212a7d87..0692a61cd 100644
--- a/priv/gettext/pl/LC_MESSAGES/config_descriptions.po
+++ b/priv/gettext/pl/LC_MESSAGES/config_descriptions.po
@@ -8,50 +8,50 @@
 ### to merge POT files into PO files.
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2023-08-04 14:26+0000\n"
-"Last-Translator: Anonymous <noreply@weblate.org>\n"
+"PO-Revision-Date: 2023-10-22 11:53+0000\n"
+"Last-Translator: subtype <subtype@hollow.capital>\n"
 "Language-Team: Polish <http://translate.akkoma.dev/projects/akkoma/"
 "akkoma-backend-config-descriptions/pl/>\n"
 "Language: pl\n"
 "Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2;\n"
 "X-Generator: Weblate 4.18.2\n"
-"Content-Transfer-Encoding: 8bit\n"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :logger"
 msgid "Logger-related settings"
-msgstr "Logger-related settings"
+msgstr "Ustawienia związane z Loggerem"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :mime"
 msgid "Mime Types settings"
-msgstr "Mime Types settings"
+msgstr "Ustawienia typów Mime"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma"
 msgid "Allows setting a token that can be used to authenticate requests with admin privileges without a normal user account token. Append the `admin_token` parameter to requests to utilize it. (Please reconsider using HTTP Basic Auth or OAuth-based authentication if possible)"
 msgstr ""
-"Allows setting a token that can be used to authenticate requests with admin "
-"privileges without a normal user account token. Append the `admin_token` "
-"parameter to requests to utilize it. (Please reconsider using HTTP Basic "
-"Auth or OAuth-based authentication if possible)"
+"Pozwala na ustawienie tokenu, który może zostać użyty do uwierzytelniania "
+"zapytań z uprawnieniami administratora bez zwykłego tokenu użytkownika. "
+"Dodaj parametr `admin_token` by go użyć. (Proszę przemyśl użycie "
+"uwierzytelnienia HTTP Basic Auth lub OAuth jeśli to możliwe)"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma"
 msgid "Authenticator"
-msgstr "Authenticator"
+msgstr "Uwierzytelniacz"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :cors_plug"
 msgid "CORS plug config"
-msgstr "CORS plug config"
+msgstr "Konfiguracja wtyczki CORS"
 
 #: lib/pleroma/docs/translator.ex:5
 #, elixir-autogen, elixir-format, fuzzy
@@ -60,1158 +60,1161 @@ msgid "Logger"
 msgstr "Logger"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :mime"
 msgid "Mime Types"
-msgstr "Mime Types"
+msgstr "Typy Mime"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma"
 msgid "Pleroma Admin Token"
-msgstr "Pleroma Admin Token"
+msgstr "Token Administratora Pleromy"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma"
 msgid "Pleroma Authenticator"
-msgstr "Pleroma Authenticator"
+msgstr "Uwierzytelniacz Pleromy"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :logger-:console"
 msgid "Console logger settings"
-msgstr "Console logger settings"
+msgstr "Ustawienia logowania do konsoli"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :logger-:ex_syslogger"
 msgid "ExSyslogger-related settings"
-msgstr "ExSyslogger-related settings"
+msgstr "Ustawienia zwiazane z ExSysloggerem"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:activitypub"
 msgid "ActivityPub-related settings"
-msgstr "ActivityPub-related settings"
+msgstr "Ustawienia związane z ActivityPub"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:assets"
 msgid "This section configures assets to be used with various frontends. Currently the only option relates to mascots on the mastodon frontend"
 msgstr ""
-"This section configures assets to be used with various frontends. Currently "
-"the only option relates to mascots on the mastodon frontend"
+"Ta sekcja konfiguruje zasoby używane przez różne frontendy. Jak na razie, "
+"jedyne opcje są związane z maskotkami na frontendzie Mastodon."
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:auth"
 msgid "Authentication / authorization settings"
-msgstr "Authentication / authorization settings"
+msgstr "Ustawienia uwierzytelniania / autoryzacji."
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:email_notifications"
 msgid "Email notifications settings"
-msgstr "Email notifications settings"
+msgstr "Ustawienia powiadomień przez e-mail"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:features"
 msgid "Customizable features"
-msgstr "Customizable features"
+msgstr "Konfigurowalne funkcjonalności"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:feed"
 msgid "Configure feed rendering"
-msgstr "Configure feed rendering"
+msgstr "Konfiguruj wyświetlanie osi czasu"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:frontends"
 msgid "Installed frontends management"
-msgstr "Installed frontends management"
+msgstr "Zarządzanie zainstalowanymi frontendami"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:http"
 msgid "HTTP settings"
-msgstr "HTTP settings"
+msgstr "Ustawienia HTTP"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:http_security"
 msgid "HTTP security settings"
-msgstr "HTTP security settings"
+msgstr "Ustawienia bezpieczeństwa HTTP"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:instance"
 msgid "Instance-related settings"
-msgstr "Instance-related settings"
+msgstr "Ustawienia związane z intancją"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:instances_favicons"
 msgid "Control favicons for instances"
-msgstr "Control favicons for instances"
+msgstr "Kontrola favikonek dla instancji"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:ldap"
 msgid "Use LDAP for user authentication. When a user logs in to the Pleroma instance, the name and password will be verified by trying to authenticate (bind) to a LDAP server. If a user exists in the LDAP directory but there is no account with the same name yet on the Pleroma instance then a new Pleroma account will be created with the same name as the LDAP user name."
 msgstr ""
-"Use LDAP for user authentication. When a user logs in to the Pleroma "
-"instance, the name and password will be verified by trying to authenticate "
-"(bind) to a LDAP server. If a user exists in the LDAP directory but there is "
-"no account with the same name yet on the Pleroma instance then a new Pleroma "
-"account will be created with the same name as the LDAP user name."
+"Użyj LDAP do uwierzytelnienia użytkowników. Kiedy użytkownik zaloguje się do "
+"instancji Akkomy, nazwa i hasło zostaną zweryfikowane przez próbę "
+"uwierzytelnienia w serwerze LDAP. Jeśli użytkownik istnieje w katalogu LDAP "
+"ale nie ma jeszcze konta z tą nazwą na instancji Akkomy, wtedy nowe konto "
+"Akkomy zostanie stworzone z tą samą nazwą jak nazwa użytkownika LDAP."
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:majic_pool"
 msgid "Majic/libmagic configuration"
-msgstr "Majic/libmagic configuration"
+msgstr "Konfiguracja majic/libmagic"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:manifest"
 msgid "This section describe PWA manifest instance-specific values. Currently this option relate only for MastoFE."
 msgstr ""
-"This section describe PWA manifest instance-specific values. Currently this "
-"option relate only for MastoFE."
+"Ta sekcja opisuje właściwe dla instancji wartości manifestu PWA. Jak na "
+"razie, ta opcja jest związana tylko z MastoFE."
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:media_preview_proxy"
 msgid "Media preview proxy"
-msgstr "Media preview proxy"
+msgstr "Proxy podglądu mediów"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:media_proxy"
 msgid "Media proxy"
-msgstr "Media proxy"
+msgstr "Proxy mediów"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:modules"
 msgid "Custom Runtime Modules"
-msgstr "Custom Runtime Modules"
+msgstr "Własne moduły czasu działania"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:mrf"
 msgid "General MRF settings"
-msgstr "General MRF settings"
+msgstr "Ogólne ustawienia MRF"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:mrf_activity_expiration"
 msgid "Adds automatic expiration to all local activities"
-msgstr "Adds automatic expiration to all local activities"
+msgstr "Dodaj automatyczne wygaśnięcie do wszystkich lokalnych aktywności"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:mrf_follow_bot"
 msgid "Automatically follows newly discovered accounts."
-msgstr "Automatically follows newly discovered accounts."
+msgstr "Automatycznie śledzi nowoodnalezione konta"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:mrf_hashtag"
 msgid "Reject, TWKN-remove or Set-Sensitive messsages with specific hashtags (without the leading #)\n\nNote: This MRF Policy is always enabled, if you want to disable it you have to set empty lists.\n"
 msgstr ""
-"Reject, TWKN-remove or Set-Sensitive messsages with specific hashtags ("
-"without the leading #)\n"
+"Odrzuć, usuń z całej znanej sieci, lub ustaw jako wrażliwe wiadomości z "
+"określonymi hasztagami (bez #)\n"
 "\n"
-"Note: This MRF Policy is always enabled, if you want to disable it you have "
-"to set empty lists.\n"
+"Uwaga: ta zasada MRF jest zawsze włączona. Jeśli chcesz ją wyłączyć, zostaw "
+"listę pustą.\n"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:mrf_hellthread"
 msgid "Block messages with excessive user mentions"
-msgstr "Block messages with excessive user mentions"
+msgstr "Blokuj wiadomości ze zbyt dużą liczbą wspomnień"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:mrf_keyword"
 msgid "Reject or Word-Replace messages matching a keyword or [Regex](https://hexdocs.pm/elixir/Regex.html)."
 msgstr ""
-"Reject or Word-Replace messages matching a keyword or [Regex](https://hexdocs"
-".pm/elixir/Regex.html)."
+"Odrzuć lub zmień treść wiadomości zawierających słowo kluczowe lub "
+"pasujących do [regexa](https://hexdocs.pm/elixir/Regex.html)."
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:mrf_mention"
 msgid "Block messages which mention a specific user"
-msgstr "Block messages which mention a specific user"
+msgstr "Blokuj wiadomości wspominające o określonych użytkownikach"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:mrf_normalize_markup"
 msgid "MRF NormalizeMarkup settings. Scrub configured hypertext markup."
-msgstr "MRF NormalizeMarkup settings. Scrub configured hypertext markup."
+msgstr ""
+"Ustawienia MRF NormalizeMarkup. Wyczyść skonfigurowany markup hipertekstu."
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:mrf_object_age"
 msgid "Rejects or delists posts based on their timestamp deviance from your server's clock."
-msgstr ""
-"Rejects or delists posts based on their timestamp deviance from your "
-"server's clock."
+msgstr "Odrzuć lub usuń z osi czasu wpisy biorąc pod uwagę ich datę utworzenia."
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:mrf_rejectnonpublic"
 msgid "RejectNonPublic drops posts with non-public visibility settings."
-msgstr "RejectNonPublic drops posts with non-public visibility settings."
+msgstr "RejectNonPublic usuwa wpisy które nie są oznaczone jako publiczne."
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:mrf_simple"
 msgid "Simple ingress policies"
-msgstr "Simple ingress policies"
+msgstr "Proste zasady modyfikacji wiadomości przychodzących"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:mrf_steal_emoji"
 msgid "Steals emojis from selected instances when it sees them."
-msgstr "Steals emojis from selected instances when it sees them."
+msgstr "Kradnij emoji z określonych instancji gdy tylko je zobaczysz."
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:mrf_subchain"
 msgid "This policy processes messages through an alternate pipeline when a given message matches certain criteria. All criteria are configured as a map of regular expressions to lists of policy modules."
 msgstr ""
-"This policy processes messages through an alternate pipeline when a given "
-"message matches certain criteria. All criteria are configured as a map of "
-"regular expressions to lists of policy modules."
+"Ta taktyka przetwarza wiadomości przez alternatywny potok jeśli wiadomość "
+"pasuje do określonych kryteriów. Wszystkie kryteria są skonfigurowane jako "
+"mapa wyrażeń regularnych na listę modułów zasad."
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:mrf_vocabulary"
 msgid "Filter messages which belong to certain activity vocabularies"
-msgstr "Filter messages which belong to certain activity vocabularies"
+msgstr "Filtruj wiadomości należących do określonego słownictwa aktywności"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:oauth2"
 msgid "Configure OAuth 2 provider capabilities"
-msgstr "Configure OAuth 2 provider capabilities"
+msgstr "Konfiguruj możliwości dostawcy OAuth 2"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:populate_hashtags_table"
 msgid "`populate_hashtags_table` background migration settings"
-msgstr "`populate_hashtags_table` background migration settings"
+msgstr "Ustawienia migracji w tle:`populate_hashtags_table`"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:rate_limit"
 msgid "Rate limit settings. This is an advanced feature enabled only for :authentication by default."
 msgstr ""
-"Rate limit settings. This is an advanced feature enabled only for :"
-"authentication by default."
+"Ustawienia limitów prędkości. To jest zaawansowana funkcjonalność włączona "
+"domyślnie tylko dla :authentication."
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:rich_media"
 msgid "If enabled the instance will parse metadata from attached links to generate link previews"
 msgstr ""
-"If enabled the instance will parse metadata from attached links to generate "
-"link previews"
+"Jeżeli włączone, ta instancja będzie przetwarzać metadane z dołączonych "
+"linków by tworzyć podglądy"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:static_fe"
 msgid "Render profiles and posts using server-generated HTML that is viewable without using JavaScript"
 msgstr ""
-"Render profiles and posts using server-generated HTML that is viewable "
-"without using JavaScript"
+"Wyświetlaj profile i posty używając tworzonego na serwerze HTML który można "
+"przeglądać bez JavaScript"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:streamer"
 msgid "Settings for notifications streamer"
-msgstr "Settings for notifications streamer"
+msgstr "Ustawienia wysyłania powiadomień"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:uri_schemes"
 msgid "URI schemes related settings"
-msgstr "URI schemes related settings"
+msgstr "Ustawienia związane ze schematami URI"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:web_cache_ttl"
 msgid "The expiration time for the web responses cache. Values should be in milliseconds or `nil` to disable expiration."
 msgstr ""
-"The expiration time for the web responses cache. Values should be in "
-"milliseconds or `nil` to disable expiration."
+"Czas wygaśnięcia cache odpowiedzi sieciowych. Wartość powinna być podana w "
+"milisekundach, lub `nil` by wyłączyć."
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:welcome"
 msgid "Welcome messages settings"
-msgstr "Welcome messages settings"
+msgstr "Ustawienia wiadomości powitalnych"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:workers"
 msgid "Includes custom worker options not interpretable directly by `Oban`"
-msgstr "Includes custom worker options not interpretable directly by `Oban`"
+msgstr ""
+"Zawiera dodatkowe opcje workerów nieinterpretowalne bezpośrednio przez `Oban`"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-ConcurrentLimiter"
 msgid "Limits configuration for background tasks."
-msgstr "Limits configuration for background tasks."
+msgstr "Konfiguracja limitów dla zadań w tle."
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-Oban"
 msgid "[Oban](https://github.com/sorentwo/oban) asynchronous job processor configuration."
 msgstr ""
-"[Oban](https://github.com/sorentwo/oban) asynchronous job processor "
-"configuration."
+"Konfiguracja procesora zadań asynchronicznych [Oban](https://github.com/"
+"sorentwo/oban)."
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-Pleroma.Captcha"
 msgid "Captcha-related settings"
-msgstr "Captcha-related settings"
+msgstr "Ustawienia związane z Captcha"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-Pleroma.Captcha.Kocaptcha"
 msgid "Kocaptcha is a very simple captcha service with a single API endpoint, the source code is here: https://github.com/koto-bank/kocaptcha. The default endpoint (https://captcha.kotobank.ch) is hosted by the developer."
 msgstr ""
-"Kocaptcha is a very simple captcha service with a single API endpoint, the "
-"source code is here: https://github.com/koto-bank/kocaptcha. The default "
-"endpoint (https://captcha.kotobank.ch) is hosted by the developer."
+"Kocaptcha to bardzo prosta usługa captcha z pojedynczym endpointem API, kod "
+"źródłowy jest tu: https://github.com/koto-bank/kocaptcha. Domyślny endpoint "
+"(https://captcha.kotobank.ch) jest hostowany przez developera."
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-Pleroma.Emails.Mailer"
 msgid "Mailer-related settings"
-msgstr "Mailer-related settings"
+msgstr "Ustawienia związane z Mailerem"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-Pleroma.Emails.NewUsersDigestEmail"
 msgid "New users admin email digest"
-msgstr "New users admin email digest"
+msgstr "Administracyjne podsumowanie e-maili dla nowych użytkowników"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-Pleroma.Emails.UserEmail"
 msgid "Email template settings"
-msgstr "Email template settings"
+msgstr "Ustawienia szablonów e-maili"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-Pleroma.Formatter"
 msgid "Configuration for Pleroma's link formatter which parses mentions, hashtags, and URLs."
 msgstr ""
-"Configuration for Pleroma's link formatter which parses mentions, hashtags, "
-"and URLs."
+"Konfiguracja formattera linków Akkomy, który przetwarza wspomnienia, "
+"hasztagi, i URL."
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-Pleroma.ScheduledActivity"
 msgid "Scheduled activities settings"
-msgstr "Scheduled activities settings"
+msgstr "Ustawienia zaplanowanych aktywności"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-Pleroma.Upload"
 msgid "Upload general settings"
-msgstr "Upload general settings"
+msgstr "Ustawienia wysyłania plików"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-Pleroma.Upload.Filter.AnonymizeFilename"
 msgid "Filter replaces the filename of the upload"
-msgstr "Filter replaces the filename of the upload"
+msgstr "Filtr zmienia nazwę wysyłanego pliku"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-Pleroma.Upload.Filter.Mogrify"
 msgid "Uploads mogrify filter settings"
-msgstr "Uploads mogrify filter settings"
+msgstr "Ustawienia mogrifera wysyłanych plików"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-Pleroma.Uploaders.Local"
 msgid "Local uploader-related settings"
-msgstr "Local uploader-related settings"
+msgstr "Ustawnia związane z lokalnym wysyłaniem"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-Pleroma.Uploaders.S3"
 msgid "S3 uploader-related settings"
-msgstr "S3 uploader-related settings"
+msgstr "Ustawienia związane z wysyłaniem na S3"
 
 #: lib/pleroma/docs/translator.ex:5
 #, elixir-autogen, elixir-format, fuzzy
 msgctxt "config description at :pleroma-Pleroma.User.Backup"
 msgid "Account Backup"
-msgstr "Account Backup"
+msgstr "Kopia zapasowa konta"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-Pleroma.Web.MediaProxy.Invalidation.Http"
 msgid "HTTP invalidate settings"
-msgstr "HTTP invalidate settings"
+msgstr "Ustawienia inwalidacji HTTP"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-Pleroma.Web.MediaProxy.Invalidation.Script"
 msgid "Invalidation script settings"
-msgstr "Invalidation script settings"
+msgstr "Ustawienia skryptu inwalidacyjnego"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-Pleroma.Web.Metadata"
 msgid "Metadata-related settings"
-msgstr "Metadata-related settings"
+msgstr "Ustawienia związane z metadanymi"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-Pleroma.Web.Plugs.RemoteIp"
 msgid "`Pleroma.Web.Plugs.RemoteIp` is a shim to call [`RemoteIp`](https://git.pleroma.social/pleroma/remote_ip) but with runtime configuration.\n**If your instance is not behind at least one reverse proxy, you should not enable this plug.**\n"
 msgstr ""
-"`Pleroma.Web.Plugs.RemoteIp` is a shim to call [`RemoteIp`](https://git."
-"pleroma.social/pleroma/remote_ip) but with runtime configuration.\n"
-"**If your instance is not behind at least one reverse proxy, you should not "
-"enable this plug.**\n"
+"`Pleroma.Web.Plugs.RemoteIp` to podkładka by wywołać [`RemoteIp`](https://git"
+".pleroma.social/pleroma/remote_ip) ale z konfiguracją w czasie działania.\n"
+"**Jeśli twoja intancja nie jest przynajmniej za jednym odwrotnym proxy, nie "
+"powinnoś włączać tej wtyczki.**\n"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-Pleroma.Web.Preload"
 msgid "Preload-related settings"
-msgstr "Preload-related settings"
+msgstr "Ustawienia preloadu"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-Pleroma.Workers.PurgeExpiredActivity"
 msgid "Expired activities settings"
-msgstr "Expired activities settings"
+msgstr "Ustawienia wygasłych aktywności"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :web_push_encryption-:vapid_details"
 msgid "Web Push Notifications configuration. You can use the mix task mix web_push.gen.keypair to generate it."
 msgstr ""
-"Web Push Notifications configuration. You can use the mix task mix "
-"web_push.gen.keypair to generate it."
+"Ustawienia powiadomień Push. Możesz użyć zadania mix web_push.gen.keypair by "
+"je wygenerować."
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :ex_aws-:s3"
 msgid "S3"
 msgstr "S3"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :logger-:console"
 msgid "Console Logger"
-msgstr "Console Logger"
+msgstr "Logger konsolowy"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :logger-:ex_syslogger"
 msgid "ExSyslogger"
 msgstr "ExSyslogger"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-:activitypub"
 msgid "ActivityPub"
 msgstr "ActivityPub"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-:assets"
 msgid "Assets"
-msgstr "Assets"
+msgstr "Zasoby"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-:auth"
 msgid "Auth"
-msgstr "Auth"
+msgstr "Autoryzacja"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-:email_notifications"
 msgid "Email notifications"
-msgstr "Email notifications"
+msgstr "Powiadomienia e-mail"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-:emoji"
 msgid "Emoji"
 msgstr "Emoji"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-:features"
 msgid "Features"
-msgstr "Features"
+msgstr "Funkcjonalności"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-:feed"
 msgid "Feed"
-msgstr "Feed"
+msgstr "Oś czasu"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-:frontend_configurations"
 msgid "Frontend configurations"
-msgstr "Frontend configurations"
+msgstr "Konfiguracje frontenów"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-:frontends"
 msgid "Frontends"
-msgstr "Frontends"
+msgstr "Frontendy"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-:http"
 msgid "HTTP"
 msgstr "HTTP"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-:http_security"
 msgid "HTTP security"
-msgstr "HTTP security"
+msgstr "Bezpieczeństwo HTTP"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-:instance"
 msgid "Instance"
-msgstr "Instance"
+msgstr "Instancja"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-:instances_favicons"
 msgid "Instances favicons"
-msgstr "Instances favicons"
+msgstr "Favikonki instancji"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-:ldap"
 msgid "LDAP"
 msgstr "LDAP"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-:majic_pool"
 msgid "Majic pool"
-msgstr "Majic pool"
+msgstr "Pula Majic"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-:manifest"
 msgid "Manifest"
 msgstr "Manifest"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-:markup"
 msgid "Markup Settings"
-msgstr "Markup Settings"
+msgstr "Ustawienia Markup"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-:media_preview_proxy"
 msgid "Media preview proxy"
-msgstr "Media preview proxy"
+msgstr "Proxy podglądu mediów"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-:media_proxy"
 msgid "Media proxy"
-msgstr "Media proxy"
+msgstr "Proxy mediów"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-:modules"
 msgid "Modules"
-msgstr "Modules"
+msgstr "Moduły"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-:mrf"
 msgid "MRF"
 msgstr "MRF"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-:mrf_activity_expiration"
 msgid "MRF Activity Expiration Policy"
-msgstr "MRF Activity Expiration Policy"
+msgstr "MRF Wygaśnięcie Aktyności"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-:mrf_follow_bot"
 msgid "MRF FollowBot Policy"
-msgstr "MRF FollowBot Policy"
+msgstr "MRF Bot Śledzący"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-:mrf_hashtag"
 msgid "MRF Hashtag"
 msgstr "MRF Hashtag"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-:mrf_hellthread"
 msgid "MRF Hellthread"
 msgstr "MRF Hellthread"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-:mrf_keyword"
 msgid "MRF Keyword"
-msgstr "MRF Keyword"
+msgstr "MRF Słowa Kluczowe"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-:mrf_mention"
 msgid "MRF Mention"
-msgstr "MRF Mention"
+msgstr "MRF Wspomnienia"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-:mrf_normalize_markup"
 msgid "MRF Normalize Markup"
-msgstr "MRF Normalize Markup"
+msgstr "MRF Normalizuj Markup"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-:mrf_object_age"
 msgid "MRF Object Age"
-msgstr "MRF Object Age"
+msgstr "MRF Wiek Objektów"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-:mrf_rejectnonpublic"
 msgid "MRF Reject Non Public"
-msgstr "MRF Reject Non Public"
+msgstr "MRF Odrzuć Niepubliczne"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-:mrf_simple"
 msgid "MRF Simple"
-msgstr "MRF Simple"
+msgstr "MRF Prosty"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-:mrf_steal_emoji"
 msgid "MRF Emojis"
-msgstr "MRF Emojis"
+msgstr "MRF Emoji"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-:mrf_subchain"
 msgid "MRF Subchain"
 msgstr "MRF Subchain"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-:mrf_vocabulary"
 msgid "MRF Vocabulary"
-msgstr "MRF Vocabulary"
+msgstr "MRF Słownictwo"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-:oauth2"
 msgid "OAuth2"
 msgstr "OAuth2"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-:populate_hashtags_table"
 msgid "Populate hashtags table"
-msgstr "Populate hashtags table"
+msgstr "Wypełnij tabelę hasztagów"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-:rate_limit"
 msgid "Rate limit"
-msgstr "Rate limit"
+msgstr "Limit prędkości"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-:restrict_unauthenticated"
 msgid "Restrict Unauthenticated"
-msgstr "Restrict Unauthenticated"
+msgstr "Ogranicz nieuwieżytelnione"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-:rich_media"
 msgid "Rich media"
-msgstr "Rich media"
+msgstr "Bogate media"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-:static_fe"
 msgid "Static FE"
-msgstr "Static FE"
+msgstr "Statyczny FE"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-:streamer"
 msgid "Streamer"
 msgstr "Streamer"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-:uri_schemes"
 msgid "URI Schemes"
-msgstr "URI Schemes"
+msgstr "Schematy URI"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-:user"
 msgid "User"
-msgstr "User"
+msgstr "Użytkownik"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-:web_cache_ttl"
 msgid "Web cache TTL"
-msgstr "Web cache TTL"
+msgstr "TTL cache sieciowego"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-:welcome"
 msgid "Welcome"
-msgstr "Welcome"
+msgstr "Witaj"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-:workers"
 msgid "Workers"
-msgstr "Workers"
+msgstr "Workery"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-ConcurrentLimiter"
 msgid "ConcurrentLimiter"
 msgstr "ConcurrentLimiter"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-Oban"
 msgid "Oban"
 msgstr "Oban"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-Pleroma.Captcha"
 msgid "Pleroma.Captcha"
 msgstr "Pleroma.Captcha"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-Pleroma.Captcha.Kocaptcha"
 msgid "Pleroma.Captcha.Kocaptcha"
 msgstr "Pleroma.Captcha.Kocaptcha"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-Pleroma.Emails.Mailer"
 msgid "Pleroma.Emails.Mailer"
 msgstr "Pleroma.Emails.Mailer"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-Pleroma.Emails.NewUsersDigestEmail"
 msgid "Pleroma.Emails.NewUsersDigestEmail"
 msgstr "Pleroma.Emails.NewUsersDigestEmail"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-Pleroma.Emails.UserEmail"
 msgid "Pleroma.Emails.UserEmail"
 msgstr "Pleroma.Emails.UserEmail"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-Pleroma.Formatter"
 msgid "Linkify"
 msgstr "Linkify"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-Pleroma.ScheduledActivity"
 msgid "Pleroma.ScheduledActivity"
 msgstr "Pleroma.ScheduledActivity"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-Pleroma.Upload"
 msgid "Pleroma.Upload"
 msgstr "Pleroma.Upload"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-Pleroma.Upload.Filter.AnonymizeFilename"
 msgid "Pleroma.Upload.Filter.AnonymizeFilename"
 msgstr "Pleroma.Upload.Filter.AnonymizeFilename"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-Pleroma.Upload.Filter.Mogrify"
 msgid "Pleroma.Upload.Filter.Mogrify"
 msgstr "Pleroma.Upload.Filter.Mogrify"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-Pleroma.Uploaders.Local"
 msgid "Pleroma.Uploaders.Local"
 msgstr "Pleroma.Uploaders.Local"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-Pleroma.Uploaders.S3"
 msgid "Pleroma.Uploaders.S3"
 msgstr "Pleroma.Uploaders.S3"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-Pleroma.User"
 msgid "Pleroma.User"
 msgstr "Pleroma.User"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-Pleroma.User.Backup"
 msgid "Pleroma.User.Backup"
 msgstr "Pleroma.User.Backup"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-Pleroma.Web.ApiSpec.CastAndValidate"
 msgid "Pleroma.Web.ApiSpec.CastAndValidate"
 msgstr "Pleroma.Web.ApiSpec.CastAndValidate"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-Pleroma.Web.MediaProxy.Invalidation.Http"
 msgid "Pleroma.Web.MediaProxy.Invalidation.Http"
 msgstr "Pleroma.Web.MediaProxy.Invalidation.Http"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-Pleroma.Web.MediaProxy.Invalidation.Script"
 msgid "Pleroma.Web.MediaProxy.Invalidation.Script"
 msgstr "Pleroma.Web.MediaProxy.Invalidation.Script"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-Pleroma.Web.Metadata"
 msgid "Pleroma.Web.Metadata"
 msgstr "Pleroma.Web.Metadata"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-Pleroma.Web.Plugs.RemoteIp"
 msgid "Pleroma.Web.Plugs.RemoteIp"
 msgstr "Pleroma.Web.Plugs.RemoteIp"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-Pleroma.Web.Preload"
 msgid "Pleroma.Web.Preload"
 msgstr "Pleroma.Web.Preload"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :pleroma-Pleroma.Workers.PurgeExpiredActivity"
 msgid "Pleroma.Workers.PurgeExpiredActivity"
 msgstr "Pleroma.Workers.PurgeExpiredActivity"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config label at :web_push_encryption-:vapid_details"
 msgid "Vapid Details"
-msgstr "Vapid Details"
+msgstr "Detale Vapid"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :ex_aws-:s3 > :access_key_id"
 msgid "S3 access key ID"
-msgstr "S3 access key ID"
+msgstr "ID klucza dostępu S3"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :ex_aws-:s3 > :host"
 msgid "S3 host"
-msgstr "S3 host"
+msgstr "Host S3"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :ex_aws-:s3 > :region"
 msgid "S3 region (for AWS)"
-msgstr "S3 region (for AWS)"
+msgstr "Region S3 (dla AWS)"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :ex_aws-:s3 > :secret_access_key"
 msgid "Secret access key"
-msgstr "Secret access key"
+msgstr "Sekretny klucz dostępu"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :logger > :backends"
 msgid "Where logs will be sent, :console - send logs to stdout, { ExSyslogger, :ex_syslogger } - to syslog, Quack.Logger - to Slack."
 msgstr ""
-"Where logs will be sent, :console - send logs to stdout, { ExSyslogger, :"
-"ex_syslogger } - to syslog, Quack.Logger - to Slack."
+"Gdzie będą wysyłane logi, :console - wysyła na standardowe wyjście, { "
+"ExSyslogger, :ex_syslogger } - do sysloga, Quack.Logger - na Slack."
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :logger-:console > :format"
 msgid "Default: \"$date $time [$level] $levelpad$node $metadata $message\""
-msgstr "Default: \"$date $time [$level] $levelpad$node $metadata $message\""
+msgstr "Domyślne: \"$date $time [$level] $levelpad$node $metadata $message\""
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :logger-:console > :level"
 msgid "Log level"
-msgstr "Log level"
+msgstr "Poziom logowania"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :logger-:ex_syslogger > :format"
 msgid "Default: \"$date $time [$level] $levelpad$node $metadata $message\""
-msgstr "Default: \"$date $time [$level] $levelpad$node $metadata $message\""
+msgstr "Domyślne: \"$date $time [$level] $levelpad$node $metadata $message\""
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :logger-:ex_syslogger > :ident"
 msgid "A string that's prepended to every message, and is typically set to the app name"
 msgstr ""
-"A string that's prepended to every message, and is typically set to the app "
-"name"
+"Tekst dopisywany do początku każdej wiadomości, i zazwyczaj ustawiany na "
+"nazwę apki"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :logger-:ex_syslogger > :level"
 msgid "Log level"
-msgstr "Log level"
+msgstr "Poziom logowania"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma > :admin_token"
 msgid "Admin token"
-msgstr "Admin token"
+msgstr "Token admina"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:activitypub > :blockers_visible"
 msgid "Whether a user can see someone who has blocked them"
-msgstr "Whether a user can see someone who has blocked them"
+msgstr "Czy użytkownik może widzieć, kto go blokuje"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:activitypub > :follow_handshake_timeout"
 msgid "Following handshake timeout"
-msgstr "Following handshake timeout"
+msgstr "Limit czasu na hanshake prośby o śledzenie"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:activitypub > :note_replies_output_limit"
 msgid "The number of Note replies' URIs to be included with outgoing federation (`5` to match Mastodon hardcoded value, `0` to disable the output)"
 msgstr ""
-"The number of Note replies' URIs to be included with outgoing federation (`5`"
-" to match Mastodon hardcoded value, `0` to disable the output)"
+"Limit URI do odpowiedzi na notatkę zawartych w wychodzącej federacji (`5` by "
+"dopasować się do wartości ustawionej na sztywno w Mastodonie, `0` by "
+"wyłączyć)"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:activitypub > :outgoing_blocks"
 msgid "Whether to federate blocks to other instances"
-msgstr "Whether to federate blocks to other instances"
+msgstr "Czy informować inne instancje o blokadach"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:activitypub > :sign_object_fetches"
 msgid "Sign object fetches with HTTP signatures"
-msgstr "Sign object fetches with HTTP signatures"
+msgstr "Podpisuj zapytania o objekty podpisami HTTP"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:activitypub > :unfollow_blocked"
 msgid "Whether blocks result in people getting unfollowed"
-msgstr "Whether blocks result in people getting unfollowed"
+msgstr "Czy blokady usuwają śledzenie"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:assets > :default_mascot"
 msgid "This will be used as the default mascot on MastoFE. Default: `:pleroma_fox_tan`"
-msgstr ""
-"This will be used as the default mascot on MastoFE. Default: "
-"`:pleroma_fox_tan`"
+msgstr "Domyślna maskotka na MastoFE. Domyślna: `:pleroma_fox_tan`"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:assets > :default_user_avatar"
 msgid "URL of the default user avatar"
-msgstr "URL of the default user avatar"
+msgstr "URL domyślnego avatara nowych użytkowników"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:assets > :mascots"
 msgid "Keyword of mascots, each element must contain both an URL and a mime_type key"
 msgstr ""
-"Keyword of mascots, each element must contain both an URL and a mime_type key"
+"Słowa kluczowe maskotek, każdy element musi zawierać URL i klucz mime_type"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:auth > :auth_template"
 msgid "Authentication form template. By default it's `show.html` which corresponds to `lib/pleroma/web/templates/o_auth/o_auth/show.html.ee`."
 msgstr ""
-"Authentication form template. By default it's `show.html` which corresponds "
-"to `lib/pleroma/web/templates/o_auth/o_auth/show.html.ee`."
+"Szablon formy uwierzytelnienia. Domyślnie jest to `show.html` które "
+"odpowiada `lib/pleroma/web/templates/o_auth/o_auth/show.html.ee`."
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:auth > :enforce_oauth_admin_scope_usage"
 msgid "OAuth admin scope requirement toggle. If enabled, admin actions explicitly demand admin OAuth scope(s) presence in OAuth token (client app must support admin scopes). If disabled and token doesn't have admin scope(s), `is_admin` user flag grants access to admin-specific actions."
 msgstr ""
-"OAuth admin scope requirement toggle. If enabled, admin actions explicitly "
-"demand admin OAuth scope(s) presence in OAuth token (client app must support "
-"admin scopes). If disabled and token doesn't have admin scope(s), `is_admin` "
-"user flag grants access to admin-specific actions."
+"Zakres wymagań zakresu admina OAuth. Jeśli włączone, akcje admina wymagają "
+"obecności zakresu admina OAuth w tokenie OAuth (aplikacja kliencka musi "
+"wspierać zakresy admina). Jeśli wyłączone i token nie ma zakresów admina, "
+"flaga użytkownika`is_admin` daje dostęp do zadań administracyjnych."
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:auth > :oauth_consumer_strategies"
 msgid "The list of enabled OAuth consumer strategies. By default it's set by OAUTH_CONSUMER_STRATEGIES environment variable. Each entry in this space-delimited string should be of format \"strategy\" or \"strategy:dependency\" (e.g. twitter or keycloak:ueberauth_keycloak_strategy in case dependency is named differently than ueberauth_<strategy>)."
 msgstr ""
-"The list of enabled OAuth consumer strategies. By default it's set by "
-"OAUTH_CONSUMER_STRATEGIES environment variable. Each entry in this space-"
-"delimited string should be of format \"strategy\" or \"strategy:dependency\" "
-"(e.g. twitter or keycloak:ueberauth_keycloak_strategy in case dependency is "
-"named differently than ueberauth_<strategy>)."
+"Lista włączonych strategii konsumenckich OAuth. Domyślnie jest to ustawione "
+"przez zmienną środowiskową OAUTH_CONSUMER_STRATEGIES. Każdy fragment tego "
+"ciągu znaków oddzielonego spacjamy powinien być formatu \"strategy\" or "
+"\"strategy:dependency\" (np. twitter lub keycloak:"
+"ueberauth_keycloak_strategy jeśli zależność jest nazwana inaczej niż "
+"ueberatuh_<strategia>)."
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:auth > :oauth_consumer_template"
 msgid "OAuth consumer mode authentication form template. By default it's `consumer.html` which corresponds to `lib/pleroma/web/templates/o_auth/o_auth/consumer.html.eex`."
 msgstr ""
-"OAuth consumer mode authentication form template. By default it's `consumer."
-"html` which corresponds to `lib/pleroma/web/templates/o_auth/o_auth/consumer."
-"html.eex`."
+"Szablon formularza uwierzytelniania w trybie konsumenckim. Domyślnie jest "
+"to`consumer.html` które odpowiada`lib/pleroma/web/templates/o_auth/o_auth/"
+"consumer.html.eex`."
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:email_notifications > :digest"
 msgid "emails of \"what you've missed\" for users who have been inactive for a while"
 msgstr ""
-"emails of \"what you've missed\" for users who have been inactive for a while"
+"e-mail z \"co przegapiłoś\" dla użytkowników którzy nie logowali się przez "
+"jakiś czas"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:email_notifications > :digest > :active"
 msgid "Globally enable or disable digest emails"
-msgstr "Globally enable or disable digest emails"
+msgstr "Globalnie włącz lub wyłącz e-maile z podsumowaniem"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:email_notifications > :digest > :inactivity_threshold"
 msgid "Minimum user inactivity threshold"
-msgstr "Minimum user inactivity threshold"
+msgstr "Próg minimalnej nieaktywności użytkowników"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:email_notifications > :digest > :interval"
 msgid "Minimum interval between digest emails to one user"
-msgstr "Minimum interval between digest emails to one user"
+msgstr ""
+"Minimalny okres między e-mailami z podsumowaniami dla jednego użytkownika"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:email_notifications > :digest > :schedule"
 msgid "When to send digest email, in crontab format. \"0 0 0\" is the default, meaning \"once a week at midnight on Sunday morning\"."
 msgstr ""
-"When to send digest email, in crontab format. \"0 0 0\" is the default, "
-"meaning \"once a week at midnight on Sunday morning\"."
+"Kiedy wysyłać e-mail z podsumowaniem, w formacie crontaba. Domyślne jest \"0 "
+"0 0\", co znaczy \"raz na tydzień, o północy, w niedzielę wieczór\"."
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:emoji > :default_manifest"
 msgid "Location of the JSON-manifest. This manifest contains information about the emoji-packs you can download. Currently only one manifest can be added (no arrays)."
 msgstr ""
-"Location of the JSON-manifest. This manifest contains information about the "
-"emoji-packs you can download. Currently only one manifest can be added (no "
-"arrays)."
+"Położenie manifestu JSON. Ten manifest zawiera informacje o paczkach emoji "
+"które możesz ściągnąć. Obecnie można dodać tylko jeden manifest (bez tablic)."
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:emoji > :groups"
 msgid "Emojis are ordered in groups (tags). This is an array of key-value pairs where the key is the group name and the value is the location or array of locations. * can be used as a wildcard."
 msgstr ""
-"Emojis are ordered in groups (tags). This is an array of key-value pairs "
-"where the key is the group name and the value is the location or array of "
-"locations. * can be used as a wildcard."
+"Emoji są podzielone na grupy (tagi). Jest to tablica par klucz-wartość, "
+"gdzie klucz jest nazwą grupy, a wartość jest położeniem lub tablicą położeń. "
+"* może być użyte by dopasować dowolny ciąg znaków."
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:emoji > :pack_extensions"
 msgid "A list of file extensions for emojis, when no emoji.txt for a pack is present"
-msgstr ""
-"A list of file extensions for emojis, when no emoji.txt for a pack is present"
+msgstr "Lista rozszerzeń plików emoji, jeśli nie ma emoji.txt dla paczki"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:emoji > :shortcode_globs"
 msgid "Location of custom emoji files. * can be used as a wildcard."
-msgstr "Location of custom emoji files. * can be used as a wildcard."
+msgstr ""
+"Położenie własnych plików emoji. * może być użyte dla dopasowania dowolnego "
+"ciągu znaków."
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:features > :improved_hashtag_timeline"
 msgid "Setting to force toggle / force disable improved hashtags timeline. `:enabled` forces hashtags to be fetched from `hashtags` table for hashtags timeline. `:disabled` forces object-embedded hashtags to be used (slower). Keep it `:auto` for automatic behaviour (it is auto-set to `:enabled` [unless overridden] when HashtagsTableMigrator completes)."
 msgstr ""
-"Setting to force toggle / force disable improved hashtags timeline. "
-"`:enabled` forces hashtags to be fetched from `hashtags` table for hashtags "
-"timeline. `:disabled` forces object-embedded hashtags to be used (slower). "
-"Keep it `:auto` for automatic behaviour (it is auto-set to `:enabled` ["
-"unless overridden] when HashtagsTableMigrator completes)."
+"Ustawienie by przełączyć / wymusić wyłączenie poprawionej osi czasów "
+"hasztagów. `:enabled` wymusza by hasztagi były pobierane z tabeli `hashtags` "
+"dla osi czasu hasztagów. `:disabled` wymusza użycie hasztagów zagnieżdżonych "
+"w objektach (wolniejsze). Zostaw jako `:auto` dla zachowania automatycznego ("
+"jest automatycznie ustawione na `:enabled` [o ile nie nadpisane] kiedy "
+"zakończy pracę HashtagsTableMigrator)."
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:feed > :post_title"
 msgid "Configure title rendering"
-msgstr "Configure title rendering"
+msgstr "Konfiguruj wyświetlanie kafli"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:feed > :post_title > :max_length"
 msgid "Maximum number of characters before truncating title"
-msgstr "Maximum number of characters before truncating title"
+msgstr "Maksymalna liczba znaków przed skróceniem tytułu"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:feed > :post_title > :omission"
 msgid "Replacement which will be used after truncating string"
-msgstr "Replacement which will be used after truncating string"
+msgstr "Czego użyć po skróceniu ciągu znaków"
 
 #: lib/pleroma/docs/translator.ex:5
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgctxt "config description at :pleroma-:frontend_configurations > :pleroma_fe"
 msgid "Settings for Pleroma FE"
-msgstr "Settings for Pleroma FE"
+msgstr "Ustawienia Pleroma FE"
 
 #: lib/pleroma/docs/translator.ex:5
 #, elixir-autogen, elixir-format, fuzzy

From c6dceb1802d7dfcb25d01c5e3a6c3eddbd168290 Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Sun, 22 Oct 2023 11:53:48 +0000
Subject: [PATCH 52/54] Translated using Weblate (Polish)

Currently translated at 100.0% (47 of 47 strings)

Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: subtype <subtype@hollow.capital>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/akkoma-backend-posix-errors/pl/
Translation: Pleroma fe/Akkoma Backend (Posix Errors)
---
 priv/gettext/pl/LC_MESSAGES/posix_errors.po | 104 +++++++++++---------
 1 file changed, 56 insertions(+), 48 deletions(-)

diff --git a/priv/gettext/pl/LC_MESSAGES/posix_errors.po b/priv/gettext/pl/LC_MESSAGES/posix_errors.po
index 3fe3a2db9..442b77324 100644
--- a/priv/gettext/pl/LC_MESSAGES/posix_errors.po
+++ b/priv/gettext/pl/LC_MESSAGES/posix_errors.po
@@ -8,146 +8,154 @@
 ### to merge POT files into PO files.
 msgid ""
 msgstr ""
+"PO-Revision-Date: 2023-10-09 18:53+0000\n"
+"Last-Translator: subtype <subtype@hollow.capital>\n"
+"Language-Team: Polish <http://translate.akkoma.dev/projects/akkoma/"
+"akkoma-backend-posix-errors/pl/>\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10||n%100>=20) ? 1 : 2);\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.18.2\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 msgid "eperm"
-msgstr ""
+msgstr "Operacja niedozwolona"
 
 msgid "eacces"
-msgstr ""
+msgstr "Brak dostępu"
 
 msgid "eagain"
-msgstr ""
+msgstr "Zasoby chwilowo niedostępne"
 
 msgid "ebadf"
-msgstr ""
+msgstr "Błędny deskryptor pliku"
 
 msgid "ebadmsg"
-msgstr ""
+msgstr "Błędny komunikat"
 
 msgid "ebusy"
-msgstr ""
+msgstr "Urządzenie lub zasoby zajęte"
 
 msgid "edeadlk"
-msgstr ""
+msgstr "Uniknięto zakleszczenia zasobów"
 
 msgid "edeadlock"
-msgstr ""
+msgstr "Uniknięto zakleszczenia zasobów"
 
 msgid "edquot"
-msgstr ""
+msgstr "Przekroczony limit dyskowy"
 
 msgid "eexist"
-msgstr ""
+msgstr "Plik istnieje"
 
 msgid "efault"
-msgstr ""
+msgstr "Błędny adres"
 
 msgid "efbig"
-msgstr ""
+msgstr "Plik zbyt duży"
 
 msgid "eftype"
-msgstr ""
+msgstr "Niewłaściwy typ pliku"
 
 msgid "eintr"
-msgstr ""
+msgstr "Przerwane wywołanie systemowe"
 
 msgid "einval"
-msgstr ""
+msgstr "Zły argument"
 
 msgid "eio"
-msgstr ""
+msgstr "Błąd wejścia/wyjścia"
 
 msgid "eisdir"
-msgstr ""
+msgstr "Jest katalogiem"
 
 msgid "eloop"
-msgstr ""
+msgstr "Za duże zagnieżdżenie dowiązań symbolicznych"
 
 msgid "emfile"
-msgstr ""
+msgstr "Za dużo otwartych plików"
 
 msgid "emlink"
-msgstr ""
+msgstr "Za dużo dowiązań"
 
 msgid "emultihop"
-msgstr ""
+msgstr "Multihop attempted"
 
 msgid "enametoolong"
-msgstr ""
+msgstr "Za długa nazwa pliku"
 
 msgid "enfile"
-msgstr ""
+msgstr "Za dużo otwartych plików w systemie"
 
 msgid "enobufs"
-msgstr ""
+msgstr "Brak miejsca w buforze"
 
 msgid "enodev"
-msgstr ""
+msgstr "Nie ma takiego urządzenia"
 
 msgid "enolck"
-msgstr ""
+msgstr "Brak dostępnych blokad"
 
 msgid "enolink"
-msgstr ""
+msgstr "Połączenie zostało przerwane"
 
 msgid "enoent"
-msgstr ""
+msgstr "Nie ma takiego pliku ani katalogu"
 
 msgid "enomem"
-msgstr ""
+msgstr "Nie można przydzielić pamięci"
 
 msgid "enospc"
-msgstr ""
+msgstr "Brak miejsca na urządzeniu"
 
 msgid "enosr"
-msgstr ""
+msgstr "Brak dodatkowych strumieni"
 
 msgid "enostr"
-msgstr ""
+msgstr "Nie jest strumieniem"
 
 msgid "enosys"
-msgstr ""
+msgstr "Niezaimplementowana funkcja"
 
 msgid "enotblk"
-msgstr ""
+msgstr "Wymagane urządzenie blokowe"
 
 msgid "enotdir"
-msgstr ""
+msgstr "Nie jest katalogiem"
 
 msgid "enotsup"
-msgstr ""
+msgstr "Operacja nieobsługiwana"
 
 msgid "enxio"
-msgstr ""
+msgstr "Nie ma takiego urządzenia ani adresu"
 
 msgid "eopnotsupp"
-msgstr ""
+msgstr "Operacja na gnieździe nieobsługiwana"
 
 msgid "eoverflow"
-msgstr ""
+msgstr "Wartość za duża dla zdefiniowanego typu danych"
 
 msgid "epipe"
-msgstr ""
+msgstr "Przerwany potok"
 
 msgid "erange"
-msgstr ""
+msgstr "Za duży wynik"
 
 msgid "erofs"
-msgstr ""
+msgstr "System plików wyłącznie do odczytu"
 
 msgid "espipe"
-msgstr ""
+msgstr "Błędne przesunięcie"
 
 msgid "esrch"
-msgstr ""
+msgstr "Nie ma takiego procesu"
 
 msgid "estale"
-msgstr ""
+msgstr "Nieaktualny uchwyt pliku"
 
 msgid "etxtbsy"
-msgstr ""
+msgstr "Plik tekstowy zajęty"
 
 msgid "exdev"
-msgstr ""
+msgstr "Niepoprawne dowiązanie"

From 34ffb92db4a8cfc917ef89a829fe123e2497d461 Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Sun, 22 Oct 2023 11:53:48 +0000
Subject: [PATCH 53/54] Update translation files

Updated by "Squash Git commits" hook in Weblate.

Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/akkoma-backend-posix-errors/
Translation: Pleroma fe/Akkoma Backend (Posix Errors)
---
 priv/gettext/vi/LC_MESSAGES/errors.po | 34 +++++++++++++--------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/priv/gettext/vi/LC_MESSAGES/errors.po b/priv/gettext/vi/LC_MESSAGES/errors.po
index 445a5ae07..8aee75e9f 100644
--- a/priv/gettext/vi/LC_MESSAGES/errors.po
+++ b/priv/gettext/vi/LC_MESSAGES/errors.po
@@ -3,16 +3,16 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-09-06 11:13+0000\n"
-"PO-Revision-Date: 2021-09-07 16:42+0000\n"
-"Last-Translator: Hồ Nhất Duy <kantcer@gmail.com>\n"
-"Language-Team: Vietnamese <https://translate.pleroma.social/projects/pleroma/"
-"pleroma/vi/>\n"
+"PO-Revision-Date: 2023-09-08 05:53+0000\n"
+"Last-Translator: Nguyễn Gia Phong <cnx@loang.net>\n"
+"Language-Team: Vietnamese <http://translate.akkoma.dev/projects/akkoma/"
+"akkoma-backend-errors/vi/>\n"
 "Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.6.2\n"
+"X-Generator: Weblate 4.18.2\n"
 
 ## This file is a PO Template file.
 ##
@@ -577,37 +577,37 @@ msgstr "Người này không phải quản trị viên."
 #, elixir-format
 msgid "Last export was less than a day ago"
 msgid_plural "Last export was less than %{days} days ago"
-msgstr[0] ""
+msgstr[0] "Vừa sao lưu lần cuối %{days} ngày trước"
 
 #: lib/pleroma/web/activity_pub/activity_pub_controller.ex:399
 #, elixir-autogen, elixir-format
 msgid "Character limit (%{limit} characters) exceeded, contains %{length} characters"
-msgstr ""
+msgstr "Quá dài: %{length} kí tự (tối đa %{limit})"
 
 #: lib/pleroma/web/plugs/ensure_staff_privileged_plug.ex:33
 #: lib/pleroma/web/plugs/user_is_staff_plug.ex:20
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgid "User is not a staff member."
-msgstr "Người này không phải quản trị viên."
+msgstr "Người dùng không phải quản trị viên."
 
 #: lib/pleroma/web/o_auth/o_auth_controller.ex:391
 #, elixir-autogen, elixir-format
 msgid "Your account is awaiting approval."
-msgstr ""
+msgstr "Tài khoản của bạn đang chờ được duyệt."
 
 #: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:256
 #: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:259
 #: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:262
 #, elixir-autogen, elixir-format
 msgid "File is too large"
-msgstr ""
+msgstr "Tệp quá lớn"
 
 #: lib/pleroma/web/mastodon_api/controllers/tag_controller.ex:37
 #: lib/pleroma/web/mastodon_api/controllers/tag_controller.ex:48
 #: lib/pleroma/web/mastodon_api/controllers/tag_controller.ex:59
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgid "Hashtag not found"
-msgstr "Không tìm thấy danh sách"
+msgstr "Không tìm thấy hashtag"
 
 #: lib/pleroma/web/common_api/activity_draft.ex:144
 #, elixir-autogen, elixir-format
@@ -627,7 +627,7 @@ msgstr ""
 #: lib/pleroma/web/common_api/activity_draft.ex:126
 #, elixir-autogen, elixir-format
 msgid "You can't quote a status that doesn't exist"
-msgstr ""
+msgstr "Bạn không thể trích dẫn bàn viết không tồn tại"
 
 #: lib/pleroma/web/embed_controller.ex:35
 #, elixir-autogen, elixir-format
@@ -637,9 +637,9 @@ msgstr ""
 #: lib/pleroma/web/embed_controller.ex:38
 #, elixir-autogen, elixir-format
 msgid "Not authorized to view this post"
-msgstr ""
+msgstr "Không có quyền xem bài viết này"
 
 #: lib/pleroma/web/embed_controller.ex:32
-#, elixir-autogen, elixir-format, fuzzy
+#, elixir-autogen, elixir-format
 msgid "Post not found"
-msgstr "Không tìm thấy danh sách"
+msgstr "Không tìm thấy bài viết"

From 889b57df82b9b18e720b9254afd375bfa1c5c0ab Mon Sep 17 00:00:00 2001
From: FloatingGhost <hannah@coffee-and-dreams.uk>
Date: Sat, 24 Feb 2024 13:54:21 +0000
Subject: [PATCH 54/54] 2024.02 release

---
 CHANGELOG.md | 2 +-
 mix.exs      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fee4d95e2..9033050a1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
-## Unreleased
+## 2024.02
 
 ## Added
 - Full compatibility with Erlang OTP26
diff --git a/mix.exs b/mix.exs
index 23f1761b5..4e8b3160d 100644
--- a/mix.exs
+++ b/mix.exs
@@ -4,7 +4,7 @@ defmodule Pleroma.Mixfile do
   def project do
     [
       app: :pleroma,
-      version: version("3.10.3"),
+      version: version("3.11.0"),
       elixir: "~> 1.14",
       elixirc_paths: elixirc_paths(Mix.env()),
       compilers: Mix.compilers(),