add basic rendering for option types

.formatter.exs

@@ -1,5 +1,6 @@
 [
-  import_deps: [:mneme, :ecto, :ecto_sql, :phoenix],
+  import_deps: [:ecto, :ecto_sql, :phoenix],
+  subdirectories: ["priv/*/migrations"],
   plugins: [Phoenix.LiveView.HTMLFormatter],
   inputs: [
     "mix.exs",

.woodpecker/build-amd64.yml

@@ -1,17 +1,13 @@
-labels:
-  platform: linux/amd64
+platform: linux/amd64
 
 depends_on:
   - test
 
 variables:
   - &scw-secrets
-    SCW_ACCESS_KEY:
-      from_secret: SCW_ACCESS_KEY
-    SCW_SECRET_KEY:
-      from_secret: SCW_SECRET_KEY
-    SCW_DEFAULT_ORGANIZATION_ID:
-      from_secret: SCW_DEFAULT_ORGANIZATION_ID
+    - SCW_ACCESS_KEY
+    - SCW_SECRET_KEY
+    - SCW_DEFAULT_ORGANIZATION_ID
   - &setup-hex "mix local.hex --force && mix local.rebar --force"
   - &on-release
     when:
@@ -38,7 +34,7 @@ variables:
   - &clean "(rm -rf release || true) && (rm -rf _build || true) && (rm -rf /root/.mix)"
   - &mix-clean "mix deps.clean --all && mix clean"
 
-steps:
+pipeline:
   # Canonical amd64
   debian-bookworm:
     image: hexpm/elixir:1.15.4-erlang-26.0.2-debian-bookworm-20230612
@@ -59,7 +55,7 @@ steps:
   release-debian-bookworm:
     image: akkoma/releaser
     <<: *on-release
-    environment: *scw-secrets
+    secrets: *scw-secrets
     commands:
       - export SOURCE=akkoma-amd64.zip
       # AMD64
@@ -88,7 +84,7 @@ steps:
   release-debian-bullseye:
     image: akkoma/releaser
     <<: *on-release
-    environment: *scw-secrets
+    secrets: *scw-secrets
     commands:
       - export SOURCE=akkoma-amd64-debian-bullseye.zip
       # AMD64
@@ -114,7 +110,7 @@ steps:
   release-musl:
     image: akkoma/releaser
     <<: *on-stable
-    environment: *scw-secrets
+    secrets: *scw-secrets
     commands:
       - export SOURCE=akkoma-amd64-musl.zip
       - export DEST=scaleway:akkoma-updates/$${CI_COMMIT_TAG:-"$CI_COMMIT_BRANCH"}/akkoma-amd64-musl.zip

.woodpecker/build-arm64.yml

@@ -1,17 +1,13 @@
-labels:
-  platform: linux/arm64
+platform: linux/arm64
 
 depends_on:
   - test
 
 variables:
   - &scw-secrets
-    SCW_ACCESS_KEY:
-      from_secret: SCW_ACCESS_KEY
-    SCW_SECRET_KEY:
-      from_secret: SCW_SECRET_KEY
-    SCW_DEFAULT_ORGANIZATION_ID:
-      from_secret: SCW_DEFAULT_ORGANIZATION_ID
+    - SCW_ACCESS_KEY
+    - SCW_SECRET_KEY
+    - SCW_DEFAULT_ORGANIZATION_ID
   - &setup-hex "mix local.hex --force && mix local.rebar --force"
   - &on-release
     when:
@@ -38,7 +34,7 @@ variables:
   - &clean "(rm -rf release || true) && (rm -rf _build || true) && (rm -rf /root/.mix)"
   - &mix-clean "mix deps.clean --all && mix clean"
 
-steps:
+pipeline:
   # Canonical arm64
   debian-bookworm:
     image: hexpm/elixir:1.15.4-erlang-26.0.2-debian-bookworm-20230612
@@ -59,7 +55,7 @@ steps:
   release-debian-bookworm:
     image: akkoma/releaser:arm64
     <<: *on-release
-    environment: *scw-secrets
+    secrets: *scw-secrets
     commands:
       - export SOURCE=akkoma-arm64.zip
       - export DEST=scaleway:akkoma-updates/$${CI_COMMIT_TAG:-"$CI_COMMIT_BRANCH"}/akkoma-arm64-ubuntu-jammy.zip
@@ -86,7 +82,7 @@ steps:
   release-musl:
     image: akkoma/releaser:arm64
     <<: *on-stable
-    environment: *scw-secrets
+    secrets: *scw-secrets
     commands:
       - export SOURCE=akkoma-arm64-musl.zip
       - export DEST=scaleway:akkoma-updates/$${CI_COMMIT_TAG:-"$CI_COMMIT_BRANCH"}/akkoma-arm64-musl.zip

.woodpecker/docs.yml

@@ -1,11 +1,14 @@
-labels:
-  platform: linux/amd64
+platform: linux/amd64
 
 depends_on:
   - test
   - build-amd64
 
 variables:
+  - &scw-secrets
+    - SCW_ACCESS_KEY
+    - SCW_SECRET_KEY
+    - SCW_DEFAULT_ORGANIZATION_ID
   - &setup-hex "mix local.hex --force && mix local.rebar --force"
   - &on-release
     when:
@@ -42,17 +45,15 @@ variables:
   - &clean "(rm -rf release || true) && (rm -rf _build || true) && (rm -rf /root/.mix)"
   - &mix-clean "mix deps.clean --all && mix clean"
 
-steps:
+pipeline:
   docs:
     <<: *on-point-release
+    secrets:
+    - SCW_ACCESS_KEY
+    - SCW_SECRET_KEY
+    - SCW_DEFAULT_ORGANIZATION_ID
     environment:
       CI: "true"
-      SCW_ACCESS_KEY:
-        from_secret: SCW_ACCESS_KEY
-      SCW_SECRET_KEY:
-        from_secret: SCW_SECRET_KEY
-      SCW_DEFAULT_ORGANIZATION_ID:
-        from_secret: SCW_DEFAULT_ORGANIZATION_ID
     image: python:3.10-slim
     commands:
       - apt-get update && apt-get install -y rclone wget git zip

.woodpecker/lint.yml

@@ -1,7 +1,10 @@
-labels:
-  platform: linux/amd64
+platform: linux/amd64
 
 variables:
+  - &scw-secrets
+    - SCW_ACCESS_KEY
+    - SCW_SECRET_KEY
+    - SCW_DEFAULT_ORGANIZATION_ID
   - &setup-hex "mix local.hex --force && mix local.rebar --force"
   - &on-release
     when:
@@ -38,9 +41,9 @@ variables:
   - &clean "(rm -rf release || true) && (rm -rf _build || true) && (rm -rf /root/.mix)"
   - &mix-clean "mix deps.clean --all && mix clean"
 
-steps:
+pipeline:
   lint:
-    image: akkoma/ci-base:1.18-otp27
+    image: akkoma/ci-base:1.15-otp26
     <<: *on-pr-open
     environment:
       MIX_ENV: test

.woodpecker/test.yml

@@ -1,24 +1,31 @@
-labels:
-  platform: linux/amd64
+platform: linux/amd64
 
 depends_on:
   - lint
 
 matrix:
-  # test the lowest and highest versions
   ELIXIR_VERSION:
     - 1.14
-    - 1.18
+    - 1.15
+    - 1.16
   OTP_VERSION:
     - 25
-    - 27
+    - 26
   include:
     - ELIXIR_VERSION: 1.14
       OTP_VERSION: 25
-    - ELIXIR_VERSION: 1.18
-      OTP_VERSION: 27
+    - ELIXIR_VERSION: 1.15
+      OTP_VERSION: 25
+    - ELIXIR_VERSION: 1.15
+      OTP_VERSION: 26
+    - ELIXIR_VERSION: 1.16
+      OTP_VERSION: 26
 
 variables:
+  - &scw-secrets
+    - SCW_ACCESS_KEY
+    - SCW_SECRET_KEY
+    - SCW_DEFAULT_ORGANIZATION_ID
   - &setup-hex "mix local.hex --force && mix local.rebar --force"
   - &on-release
     when:
@@ -66,7 +73,7 @@ services:
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD: postgres
 
-steps:
+pipeline:
   test:
     image: akkoma/ci-base:${ELIXIR_VERSION}-otp${OTP_VERSION}
     <<: *on-pr-open
@@ -85,5 +92,5 @@ steps:
       - mix ecto.create
       - mix ecto.migrate
       - mkdir -p test/tmp
-      - mix test --preload-modules --exclude erratic --exclude federated --exclude mocked || mix test --failed
-      - mix test --preload-modules --only mocked || mix test --failed
+      - mix test --preload-modules --exclude erratic --exclude federated --exclude mocked
+      - mix test --preload-modules --only mocked

CHANGELOG.md

@@ -6,80 +6,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## Unreleased
 
-## 2025.03
-
-## Added
-- Oban (worker) dashboard at `/akkoma/oban`
-
-## Fixed
-- fixed some holes in SigningKey verification potentially allowing they key-user mapping to be poisoned
-- frontend ZIP files can no longer traverse to paths outside their install dir
-- fixed user updates trying but failing to renew signing key information
-- fixed signing key refresh on key rotation
-
-## Changed
-- Dropped obsolete `ap_enabled` indicator from user table and associated buggy logic
-- The remote user count in prometheus metrics is now an estimate instead of an exact number
-  since the latter proved unreasonably costly to obtain for a merely nice-to-have statistic
-- Various other tweaks improving stat query performance and avoiding unecessary work on received AP documents
-- The HTML content for new posts (both Client-to-Server as well as Server-to-Server communication) will now use a different formatting to represent MFM. See [FEP-c16b](https://codeberg.org/fediverse/fep/src/branch/main/fep/c16b/fep-c16b.md) for more details.
-- HTTP signatures now test the most likely request-target alias first cutting down on overhead
-
-## 2025.01.01
-
-Hotfix: Federation could break if a null value found its way into `should_federate?\1`
-
-## 2025.01
-
-## Added
-- New config option `:instance, :cleanup_attachments_delay`
-- It is now possible to display custom source URLs in akkoma-fe;
-  the settings are part of the frontend configuration
-
-## Fixed
-- Media proxy no longer attempts to proxy embedded images
-- Fix significant uneccessary overhead of attachment cleanup;
-  it no longer attempts to cleanup attachments of deleted remote posts
-- Fix “Delete & Redraft” often losing attachments if attachment cleanup was enabled
-- ObjectAge policy no longer lets unlisted posts slip through
-- ObjectAge policy no longer leaks belated DMs and follower-only posts
-- the NodeINfo endpoint now uses the correct content type
-
-## Changed
-- Anonymous objects now federate completely without an id
-  adopting a proposed AP spec errata and restoring federation
-  with e.g. IceShrimp.NET and fedify-based implementations
-
-## 3.13.3 
-
-## BREAKING
-- Minimum PostgreSQL version is raised to 12
-- Swagger UI moved from `/akkoma/swaggerui/` to `/pleroma/swaggerui/`
-
-## Added
-- Implement [FEP-67ff](https://codeberg.org/fediverse/fep/src/branch/main/fep/67ff/fep-67ff.md) (federation documentation)
-- Meilisearch: it is now possible to use separate keys for search and admin actions
-- New standalone `prune_orphaned_activities` mix task with configurable batch limit
-- The `prune_objects` mix task now accepts a `--limit` parameter for initial object pruning
-
-## Fixed
-- Meilisearch: order of results returned from our REST API now actually matches how Meilisearch ranks results
-- Emoji are now federated as anonymous objects, fixing issues with
-  some strict servers e.g. rejecting e.g. remote emoji reactions
-- AP objects with additional JSON-LD profiles beyond ActivityStreams can now be fetched
-- Single-selection polls no longer expose the voter_count; MastoAPI demands it be null
-  and this confused some clients leading to vote distributions >100%
-
-## Changed
-- Refactored Rich Media to cache the content in the database. Fetching operations that could block status rendering have been eliminated.
-
-## 2024.04.1 (Security)
-
-## Fixed
-- Issue allowing non-owners to use media objects in posts
-- Issue allowing use of non-media objects as attachments and crashing timeline rendering
-- Issue allowing webfinger spoofing in certain situations
-
 ## 2024.04
 
 ## Added
@@ -111,7 +37,6 @@ Hotfix: Federation could break if a null value found its way into `should_federa
 - Issue leading to Mastodon bot accounts being rejected
 - Scope misdetection of remote posts resulting from not recognising
   JSON-LD-compacted forms of public scope; affected e.g. federation with bovine
-- Ratelimits encountered when fetching objects are now respected; 429 responses will cause a backoff when we get one.
 
 ## Removed
 - ActivityPub Client-To-Server write API endpoints have been disabled;

FEDERATION.md

@@ -1,48 +0,0 @@
-# Federation
-
-## Supported federation protocols and standards
-
-- [ActivityPub](https://www.w3.org/TR/activitypub/) (Server-to-Server)
-- [WebFinger](https://webfinger.net/)
-- [Http Signatures](https://datatracker.ietf.org/doc/html/draft-cavage-http-signatures)
-- [NodeInfo](https://nodeinfo.diaspora.software/)
-
-## Supported FEPs
-
-- [FEP-67ff: FEDERATION](https://codeberg.org/fediverse/fep/src/branch/main/fep/67ff/fep-67ff.md)
-- [FEP-dc88: Formatting Mathematics](https://codeberg.org/fediverse/fep/src/branch/main/fep/dc88/fep-dc88.md)
-- [FEP-f1d5: NodeInfo in Fediverse Software](https://codeberg.org/fediverse/fep/src/branch/main/fep/f1d5/fep-f1d5.md)
-- [FEP-fffd: Proxy Objects](https://codeberg.org/fediverse/fep/src/branch/main/fep/fffd/fep-fffd.md)
-- [FEP-c16b: Formatting MFM functions](https://codeberg.org/fediverse/fep/src/branch/main/fep/c16b/fep-c16b.md)
-
-## ActivityPub
-
-Akkoma mostly follows the server-to-server parts of the ActivityPub standard,
-but implements quirks for Mastodon compatibility as well as Mastodon-specific
-and custom extensions.
-
-See our documentation and Mastodon’s federation information
-linked further below for details on these quirks and extensions.
-
-Akkoma does not perform JSON-LD processing.
-
-### Required extensions
-
-#### HTTP Signatures
-All AP S2S POST requests to Akkoma instances MUST be signed.
-Depending on instance configuration the same may be true for GET requests.
-
-### FEP-c16b: Formatting MFM functions
-
-The optional extension term `htmlMfm` is currently not used.
-
-## Nodeinfo
-
-Akkoma provides many additional entries in its nodeinfo response,
-see the documentation linked below for details.
-
-## Additional documentation
-
-- [Akkoma’s ActivityPub extensions](https://docs.akkoma.dev/develop/development/ap_extensions/)
-- [Akkoma’s nodeinfo extensions](https://docs.akkoma.dev/develop/development/nodeinfo_extensions/)
-- [Mastodon’s federation requirements](https://github.com/mastodon/mastodon/blob/main/FEDERATION.md)

README.md

@@ -54,6 +54,9 @@ If your platform is not supported, or you just want to be able to edit the sourc
 ### Docker
 Docker installation is supported via [this setup](https://docs.akkoma.dev/stable/installation/docker_en/)
 
+### Packages
+Akkoma is packaged for [YunoHost](https://yunohost.org) and can be found and installed from the [YunoHost app catalogue](https://yunohost.org/#/apps).
+
 ### Compilation Troubleshooting
 If you ever encounter compilation issues during the updating of Akkoma, you can try these commands and see if they fix things:
 

assets/css/app.css

@@ -0,0 +1,5 @@
+@import "tailwindcss/base";
+@import "tailwindcss/components";
+@import "tailwindcss/utilities";
+
+/* This file is for your main application CSS */

assets/js/app.js

@@ -0,0 +1,44 @@
+// If you want to use Phoenix channels, run `mix help phx.gen.channel`
+// to get started and then uncomment the line below.
+// import "./user_socket.js"
+
+// You can include dependencies in two ways.
+//
+// The simplest option is to put them in assets/vendor and
+// import them using relative paths:
+//
+//     import "../vendor/some-package.js"
+//
+// Alternatively, you can `npm install some-package --prefix assets` and import
+// them using a path starting with the package name:
+//
+//     import "some-package"
+//
+
+// Include phoenix_html to handle method=PUT/DELETE in forms and buttons.
+import "phoenix_html"
+// Establish Phoenix Socket and LiveView configuration.
+import {Socket} from "phoenix"
+import {LiveSocket} from "phoenix_live_view"
+import topbar from "../vendor/topbar"
+
+let csrfToken = document.querySelector("meta[name='csrf-token']").getAttribute("content")
+let liveSocket = new LiveSocket("/live", Socket, {
+  longPollFallbackMs: 2500,
+  params: {_csrf_token: csrfToken}
+})
+
+// Show progress bar on live navigation and form submits
+topbar.config({barColors: {0: "#29d"}, shadowColor: "rgba(0, 0, 0, .3)"})
+window.addEventListener("phx:page-loading-start", _info => topbar.show(300))
+window.addEventListener("phx:page-loading-stop", _info => topbar.hide())
+
+// connect if there are any LiveViews on the page
+liveSocket.connect()
+
+// expose liveSocket on window for web console debug logs and latency simulation:
+// >> liveSocket.enableDebug()
+// >> liveSocket.enableLatencySim(1000)  // enabled for duration of browser session
+// >> liveSocket.disableLatencySim()
+window.liveSocket = liveSocket
+

assets/tailwind.config.js

@@ -0,0 +1,74 @@
+// See the Tailwind configuration guide for advanced usage
+// https://tailwindcss.com/docs/configuration
+
+const plugin = require("tailwindcss/plugin")
+const fs = require("fs")
+const path = require("path")
+
+module.exports = {
+  content: [
+    "./js/**/*.js",
+    "../lib/pleroma/**/*.*ex"
+  ],
+  theme: {
+    extend: {
+      colors: {
+        brand: "#FD4F00",
+      }
+    },
+  },
+  plugins: [
+    require("@tailwindcss/forms"),
+    // Allows prefixing tailwind classes with LiveView classes to add rules
+    // only when LiveView classes are applied, for example:
+    //
+    //     <div class="phx-click-loading:animate-ping">
+    //
+    plugin(({addVariant}) => addVariant("phx-no-feedback", [".phx-no-feedback&", ".phx-no-feedback &"])),
+    plugin(({addVariant}) => addVariant("phx-click-loading", [".phx-click-loading&", ".phx-click-loading &"])),
+    plugin(({addVariant}) => addVariant("phx-submit-loading", [".phx-submit-loading&", ".phx-submit-loading &"])),
+    plugin(({addVariant}) => addVariant("phx-change-loading", [".phx-change-loading&", ".phx-change-loading &"])),
+
+    // Embeds Heroicons (https://heroicons.com) into your app.css bundle
+    // See your `CoreComponents.icon/1` for more information.
+    //
+    plugin(function({matchComponents, theme}) {
+      let iconsDir = path.join(__dirname, "../deps/heroicons/optimized")
+      let values = {}
+      let icons = [
+        ["", "/24/outline"],
+        ["-solid", "/24/solid"],
+        ["-mini", "/20/solid"],
+        ["-micro", "/16/solid"]
+      ]
+      icons.forEach(([suffix, dir]) => {
+        fs.readdirSync(path.join(iconsDir, dir)).forEach(file => {
+          let name = path.basename(file, ".svg") + suffix
+          values[name] = {name, fullPath: path.join(iconsDir, dir, file)}
+        })
+      })
+      matchComponents({
+        "hero": ({name, fullPath}) => {
+          let content = fs.readFileSync(fullPath).toString().replace(/\r?\n|\r/g, "")
+          let size = theme("spacing.6")
+          if (name.endsWith("-mini")) {
+            size = theme("spacing.5")
+          } else if (name.endsWith("-micro")) {
+            size = theme("spacing.4")
+          }
+          return {
+            [`--hero-${name}`]: `url('data:image/svg+xml;utf8,${content}')`,
+            "-webkit-mask": `var(--hero-${name})`,
+            "mask": `var(--hero-${name})`,
+            "mask-repeat": "no-repeat",
+            "background-color": "currentColor",
+            "vertical-align": "middle",
+            "display": "inline-block",
+            "width": size,
+            "height": size
+          }
+        }
+      }, {values})
+    })
+  ]
+}

assets/vendor/topbar.js

@@ -0,0 +1,165 @@
+/**
+ * @license MIT
+ * topbar 2.0.0, 2023-02-04
+ * https://buunguyen.github.io/topbar
+ * Copyright (c) 2021 Buu Nguyen
+ */
+(function (window, document) {
+  "use strict";
+
+  // https://gist.github.com/paulirish/1579671
+  (function () {
+    var lastTime = 0;
+    var vendors = ["ms", "moz", "webkit", "o"];
+    for (var x = 0; x < vendors.length && !window.requestAnimationFrame; ++x) {
+      window.requestAnimationFrame =
+        window[vendors[x] + "RequestAnimationFrame"];
+      window.cancelAnimationFrame =
+        window[vendors[x] + "CancelAnimationFrame"] ||
+        window[vendors[x] + "CancelRequestAnimationFrame"];
+    }
+    if (!window.requestAnimationFrame)
+      window.requestAnimationFrame = function (callback, element) {
+        var currTime = new Date().getTime();
+        var timeToCall = Math.max(0, 16 - (currTime - lastTime));
+        var id = window.setTimeout(function () {
+          callback(currTime + timeToCall);
+        }, timeToCall);
+        lastTime = currTime + timeToCall;
+        return id;
+      };
+    if (!window.cancelAnimationFrame)
+      window.cancelAnimationFrame = function (id) {
+        clearTimeout(id);
+      };
+  })();
+
+  var canvas,
+    currentProgress,
+    showing,
+    progressTimerId = null,
+    fadeTimerId = null,
+    delayTimerId = null,
+    addEvent = function (elem, type, handler) {
+      if (elem.addEventListener) elem.addEventListener(type, handler, false);
+      else if (elem.attachEvent) elem.attachEvent("on" + type, handler);
+      else elem["on" + type] = handler;
+    },
+    options = {
+      autoRun: true,
+      barThickness: 3,
+      barColors: {
+        0: "rgba(26,  188, 156, .9)",
+        ".25": "rgba(52,  152, 219, .9)",
+        ".50": "rgba(241, 196, 15,  .9)",
+        ".75": "rgba(230, 126, 34,  .9)",
+        "1.0": "rgba(211, 84,  0,   .9)",
+      },
+      shadowBlur: 10,
+      shadowColor: "rgba(0,   0,   0,   .6)",
+      className: null,
+    },
+    repaint = function () {
+      canvas.width = window.innerWidth;
+      canvas.height = options.barThickness * 5; // need space for shadow
+
+      var ctx = canvas.getContext("2d");
+      ctx.shadowBlur = options.shadowBlur;
+      ctx.shadowColor = options.shadowColor;
+
+      var lineGradient = ctx.createLinearGradient(0, 0, canvas.width, 0);
+      for (var stop in options.barColors)
+        lineGradient.addColorStop(stop, options.barColors[stop]);
+      ctx.lineWidth = options.barThickness;
+      ctx.beginPath();
+      ctx.moveTo(0, options.barThickness / 2);
+      ctx.lineTo(
+        Math.ceil(currentProgress * canvas.width),
+        options.barThickness / 2
+      );
+      ctx.strokeStyle = lineGradient;
+      ctx.stroke();
+    },
+    createCanvas = function () {
+      canvas = document.createElement("canvas");
+      var style = canvas.style;
+      style.position = "fixed";
+      style.top = style.left = style.right = style.margin = style.padding = 0;
+      style.zIndex = 100001;
+      style.display = "none";
+      if (options.className) canvas.classList.add(options.className);
+      document.body.appendChild(canvas);
+      addEvent(window, "resize", repaint);
+    },
+    topbar = {
+      config: function (opts) {
+        for (var key in opts)
+          if (options.hasOwnProperty(key)) options[key] = opts[key];
+      },
+      show: function (delay) {
+        if (showing) return;
+        if (delay) {
+          if (delayTimerId) return;
+          delayTimerId = setTimeout(() => topbar.show(), delay);
+        } else  {
+          showing = true;
+          if (fadeTimerId !== null) window.cancelAnimationFrame(fadeTimerId);
+          if (!canvas) createCanvas();
+          canvas.style.opacity = 1;
+          canvas.style.display = "block";
+          topbar.progress(0);
+          if (options.autoRun) {
+            (function loop() {
+              progressTimerId = window.requestAnimationFrame(loop);
+              topbar.progress(
+                "+" + 0.05 * Math.pow(1 - Math.sqrt(currentProgress), 2)
+              );
+            })();
+          }
+        }
+      },
+      progress: function (to) {
+        if (typeof to === "undefined") return currentProgress;
+        if (typeof to === "string") {
+          to =
+            (to.indexOf("+") >= 0 || to.indexOf("-") >= 0
+              ? currentProgress
+              : 0) + parseFloat(to);
+        }
+        currentProgress = to > 1 ? 1 : to;
+        repaint();
+        return currentProgress;
+      },
+      hide: function () {
+        clearTimeout(delayTimerId);
+        delayTimerId = null;
+        if (!showing) return;
+        showing = false;
+        if (progressTimerId != null) {
+          window.cancelAnimationFrame(progressTimerId);
+          progressTimerId = null;
+        }
+        (function loop() {
+          if (topbar.progress("+.1") >= 1) {
+            canvas.style.opacity -= 0.05;
+            if (canvas.style.opacity <= 0.05) {
+              canvas.style.display = "none";
+              fadeTimerId = null;
+              return;
+            }
+          }
+          fadeTimerId = window.requestAnimationFrame(loop);
+        })();
+      },
+    };
+
+  if (typeof module === "object" && typeof module.exports === "object") {
+    module.exports = topbar;
+  } else if (typeof define === "function" && define.amd) {
+    define(function () {
+      return topbar;
+    });
+  } else {
+    this.topbar = topbar;
+  }
+}.call(this, window, document));

ci/Dockerfile

@@ -1,6 +1,7 @@
-ARG TAG
-FROM docker.io/hexpm/elixir:${TAG}
-RUN apk update
-RUN apk add git gcc g++ musl-dev make cmake file-dev rclone wget zip imagemagick ffmpeg perl-image-exiftool exiftool
-RUN mkdir /src
-WORKDIR /src
+FROM elixir:1.9.4
+
+RUN apt-get update &&\
+  apt-get install -y libmagic-dev cmake libimage-exiftool-perl ffmpeg &&\
+	mix local.hex --force &&\
+	mix local.rebar --force
+

ci/build-all.sh

@@ -1,3 +0,0 @@
-./build.sh 1.14-otp25 1.14.3-erlang-25.3.2-alpine-3.18.0
-./build.sh 1.15-otp25 1.15.8-erlang-25.3.2.18-alpine-3.19.7
-./build.sh 1.18-otp27 1.18.2-erlang-27.2.4-alpine-3.19.7

ci/build.sh

@@ -1,3 +0,0 @@
-echo "Building $1 using image tag $2"
-docker build -t docker.io/akkoma/ci-base:$1 --build-arg=version=$1 --build-arg=TAG=$2 .
-docker push docker.io/akkoma/ci-base:$1

ci/build_and_push.sh

@@ -0,0 +1 @@
+docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t git.pleroma.social:5050/pleroma/pleroma/ci-base:latest --push .

config/config.exs

@@ -63,6 +63,7 @@
   uploader: Pleroma.Uploaders.Local,
   filters: [],
   link_name: false,
+  proxy_remote: false,
   filename_display_max_length: 30,
   base_url: nil,
   allowed_mime_types: ["image", "audio", "video"]
@@ -166,7 +167,10 @@
   "application/xrd+xml" => ["xrd+xml"],
   "application/jrd+json" => ["jrd+json"],
   "application/activity+json" => ["activity+json"],
-  "application/ld+json" => ["activity+json"]
+  "application/ld+json" => ["activity+json"],
+  # Can be removed when bumping MIME past 2.0.5
+  # see https://akkoma.dev/AkkomaGang/akkoma/issues/657
+  "image/apng" => ["apng"]
 }
 
 config :mime, :extensions, %{
@@ -185,10 +189,8 @@
   receive_timeout: :timer.seconds(15),
   proxy_url: nil,
   user_agent: :default,
-  pool_size: 10,
-  adapter: [],
-  # see: https://hexdocs.pm/finch/Finch.html#start_link/1
-  pool_max_idle_time: :timer.seconds(30)
+  pool_size: 50,
+  adapter: []
 
 config :pleroma, :instance,
   name: "Akkoma",
@@ -252,7 +254,6 @@
   external_user_synchronization: true,
   extended_nickname_format: true,
   cleanup_attachments: false,
-  cleanup_attachments_delay: 1800,
   multi_factor_authentication: [
     totp: [
       # digits 6 or 8
@@ -300,7 +301,6 @@
   allow_headings: false,
   allow_tables: false,
   allow_fonts: false,
-  allow_math: true,
   scrub_policy: [
     Pleroma.HTML.Scrubber.Default,
     Pleroma.HTML.Transform.MediaProxy
@@ -370,7 +370,6 @@
   note_replies_output_limit: 5,
   sign_object_fetches: true,
   authorized_fetch_mode: false,
-  min_key_refetch_interval: 86_400,
   max_collection_objects: 50
 
 config :pleroma, :streamer,
@@ -438,12 +437,8 @@
     Pleroma.Web.RichMedia.Parsers.TwitterCard,
     Pleroma.Web.RichMedia.Parsers.OEmbed
   ],
-  failure_backoff: 60_000,
-  ttl_setters: [
-    Pleroma.Web.RichMedia.Parser.TTL.AwsSignedUrl,
-    Pleroma.Web.RichMedia.Parser.TTL.Opengraph
-  ],
-  max_body: 5_000_000
+  failure_backoff: :timer.minutes(20),
+  ttl_setters: [Pleroma.Web.RichMedia.Parser.TTL.AwsSignedUrl]
 
 config :pleroma, :media_proxy,
   enabled: false,
@@ -581,9 +576,7 @@
     mute_expire: 5,
     search_indexing: 10,
     nodeinfo_fetcher: 1,
-    database_prune: 1,
-    rich_media_backfill: 2,
-    rich_media_expiration: 2
+    database_prune: 1
   ],
   plugins: [
     Oban.Plugins.Pruner,
@@ -599,8 +592,7 @@
   retries: [
     federator_incoming: 5,
     federator_outgoing: 5,
-    search_indexing: 2,
-    rich_media_backfill: 1
+    search_indexing: 2
   ],
   timeout: [
     activity_expiration: :timer.seconds(5),
@@ -622,8 +614,7 @@
     mute_expire: :timer.seconds(5),
     search_indexing: :timer.seconds(5),
     nodeinfo_fetcher: :timer.seconds(10),
-    database_prune: :timer.minutes(10),
-    rich_media_backfill: :timer.seconds(30)
+    database_prune: :timer.minutes(10)
   ]
 
 config :pleroma, Pleroma.Formatter,
@@ -822,10 +813,8 @@
 config :pleroma, configurable_from_database: false
 
 config :pleroma, Pleroma.Repo,
-  parameters: [
-    gin_fuzzy_search_limit: "500",
-    plan_cache_mode: "force_custom_plan"
-  ]
+  parameters: [gin_fuzzy_search_limit: "500"],
+  prepare: :unnamed
 
 config :pleroma, :majic_pool, size: 2
 
@@ -909,6 +898,26 @@
   command_argospm: "argospm",
   strip_html: true
 
+config :esbuild,
+  version: "0.17.11",
+  pleroma: [
+    args:
+      ~w(js/app.js --bundle --target=es2017 --outdir=../priv/static/assets --external:/fonts/* --external:/images/*),
+    cd: Path.expand("../assets", __DIR__),
+    env: %{"NODE_PATH" => Path.expand("../deps", __DIR__)}
+  ]
+
+config :tailwind,
+  version: "3.4.0",
+  pleroma: [
+    args: ~w(
+      --config=tailwind.config.js
+      --input=css/app.css
+      --output=../priv/static/assets/app.css
+    ),
+    cd: Path.expand("../assets", __DIR__)
+  ]
+
 # Import environment specific config. This must remain at the bottom
 # of this file so it overrides the configuration defined above.
 import_config "#{Mix.env()}.exs"

config/description.exs

@@ -118,6 +118,14 @@
           "font"
         ]
       },
+      %{
+        key: :proxy_remote,
+        type: :boolean,
+        description: """
+        Proxy requests to the remote uploader.\n
+        Useful if media upload endpoint is not internet accessible.
+        """
+      },
       %{
         key: :filename_display_max_length,
         type: :integer,
@@ -1184,7 +1192,7 @@
             logoMask: true,
             minimalScopesMode: false,
             noAttachmentLinks: false,
-            nsfwCensorImage: "",
+            nsfwCensorImage: "/static/img/nsfw.74818f9.png",
             postContentType: "text/plain",
             redirectRootLogin: "/main/friends",
             redirectRootNoLogin: "/main/all",
@@ -1194,9 +1202,7 @@
             showInstanceSpecificPanel: false,
             subjectLineBehavior: "email",
             theme: "pleroma-dark",
-            webPushNotifications: false,
-            backendCommitUrl: "",
-            frontendCommitUrl: ""
+            webPushNotifications: false
           }
         ],
         children: [
@@ -1287,7 +1293,7 @@
             type: {:string, :image},
             description:
               "URL of the image to use for hiding NSFW media attachments in the timeline",
-            suggestions: [""]
+            suggestions: ["/static/img/nsfw.74818f9.png"]
           },
           %{
             key: :postContentType,
@@ -1400,18 +1406,6 @@
             label: "Stop Gifs",
             type: :boolean,
             description: "Whether to pause animated images until they're hovered on"
-          },
-          %{
-            key: :backendCommitUrl,
-            label: "Backend Commit URL",
-            type: :string,
-            description: "URL prefix for backend commit hashes"
-          },
-          %{
-            key: :frontendCommitUrl,
-            label: "Frontend Commit URL",
-            type: :string,
-            description: "URL prefix for frontend commit hashes"
           }
         ]
       },
@@ -2531,6 +2525,7 @@
     group: :pleroma,
     key: :emoji,
     type: :group,
+    description: "Configuration options related to emoji",
     children: [
       %{
         key: :shortcode_globs,
@@ -2567,7 +2562,7 @@
         key: :shared_pack_cache_seconds_per_file,
         label: "Shared pack cache s/file",
         type: :integer,
-        descpiption:
+        description:
           "When an emoji pack is shared, the archive is created and cached in memory" <>
             " for this amount of seconds multiplied by the number of files.",
         suggestions: [60]
@@ -2723,8 +2718,8 @@
       %{
         key: :pool_size,
         type: :integer,
-        description: "Number of concurrent outbound HTTP requests to allow PER HOST. Default 10.",
-        suggestions: [10]
+        description: "Number of concurrent outbound HTTP requests to allow. Default 50.",
+        suggestions: [50]
       },
       %{
         key: :adapter,
@@ -2747,13 +2742,6 @@
             ]
           }
         ]
-      },
-      %{
-        key: :pool_max_idle_time,
-        type: :integer,
-        description:
-          "Number of seconds to retain an HTTP pool; pool will remain if actively in use. Default 30 seconds (in ms).",
-        suggestions: [30_000]
       }
     ]
   },

config/test.exs

@@ -51,8 +51,7 @@
   hostname: System.get_env("DB_HOST") || "localhost",
   pool: Ecto.Adapters.SQL.Sandbox,
   pool_size: 50,
-  queue_target: 5000,
-  log: false
+  queue_target: 5000
 
 config :pleroma, :dangerzone, override_repo_pool_size: true
 
@@ -64,8 +63,7 @@
 config :pleroma, :rich_media,
   enabled: false,
   ignore_hosts: [],
-  ignore_tld: ["local", "localdomain", "lan"],
-  max_body: 2_000_000
+  ignore_tld: ["local", "localdomain", "lan"]
 
 config :pleroma, :instance,
   multi_factor_authentication: [
@@ -143,8 +141,6 @@
 config :pleroma, :instances_favicons, enabled: false
 config :pleroma, :instances_nodeinfo, enabled: false
 
-config :pleroma, Pleroma.Web.RichMedia.Backfill, provider: Pleroma.Web.RichMedia.Backfill
-
 if File.exists?("./config/test.secret.exs") do
   import_config "test.secret.exs"
 else

diagnostic-tools/binary-leak-checker.sh

@@ -1,10 +0,0 @@
-if [ "$#" -ne 2 ]; then
-	echo "Usage: binary-leak-checker.sh <nodename> <erlang cookie>"
-	exit 1
-fi
-
-echo "The command you want to run is:
-:recon.bin_leak(10)
-"
-
-iex --sname debug --remsh $1 --erl "-setcookie $2" 

docker-entrypoint.sh

@@ -11,4 +11,4 @@ echo "-- Running migrations..."
 mix ecto.migrate
 
 echo "-- Starting!"
-elixir --erl "+sbwt none +sbwtdcpu none +sbwtdio none" -S mix phx.server
+mix phx.server

docs/docs/administration/CLI_tasks/database.md

@@ -50,39 +50,9 @@ This will prune remote posts older than 90 days (configurable with [`config :ple
 
 - `--keep-threads` - Don't prune posts when they are part of a thread where at least one post has seen local interaction (e.g. one of the posts is a local post, or is favourited by a local user, or has been repeated by a local user...). It also wont delete posts when at least one of the posts in that thread is kept (e.g. because one of the posts has seen recent activity).
 - `--keep-non-public` - Keep non-public posts like DM's and followers-only, even if they are remote.
-- `--limit` - limits how many remote posts get pruned. This limit does **not** apply to any of the follow up jobs. If wanting to keep the database load in check it is thus advisable to run the standalone `prune_orphaned_activities` task with a limit afterwards instead of passing `--prune-orphaned-activities` to this task.
 - `--prune-orphaned-activities` - Also prune orphaned activities afterwards. Activities are things like Like, Create, Announce, Flag (aka reports)... They can significantly help reduce the database size.
 - `--vacuum` - Run `VACUUM FULL` after the objects are pruned. This should not be used on a regular basis, but is useful if your instance has been running for a long time before pruning.
 
-## Prune orphaned activities from the database
-
-This will prune activities which are no longer referenced by anything.
-Such activities might be the result of running `prune_objects` without `--prune-orphaned-activities`.
-The same notes and warnings apply as for `prune_objects`.
-
-The task will print out how many rows were freed in total in its last
-line of output in the form `Deleted 345 rows`.  
-When running the job in limited batches this can be used to determine
-when all orphaned activities have been deleted.
-
-=== "OTP"
-
-    ```sh
-    ./bin/pleroma_ctl database prune_orphaned_activities [option ...]
-    ```
-
-=== "From Source"
-
-    ```sh
-    mix pleroma.database prune_orphaned_activities [option ...]
-    ```
-
-### Options
-
-- `--limit n` - Only delete up to `n` activities in each query making up this job, i.e. if this job runs two queries at most `2n` activities will be deleted. Running this task repeatedly in limited batches can help maintain the instance’s responsiveness while still freeing up some space.
-- `--no-singles` - Do not delete activites referencing single objects
-- `--no-arrays` - Do not delete activites referencing an array of objects
-
 ## Create a conversation for all existing DMs
 
 Can be safely re-run

docs/docs/administration/backup.md

@@ -4,12 +4,12 @@
 
 1. Stop the Akkoma service.
 2. Go to the working directory of Akkoma (default is `/opt/akkoma`)
-3. Run `sudo -Hu postgres pg_dump -d akkoma --format=custom -f </path/to/backup_location/akkoma.pgdump>`[¹] (make sure the postgres user has write access to the destination file)
-4. Copy `akkoma.pgdump`, `config/config.exs`[²], `uploads` folder, and [static directory](../configuration/static_dir.md) to your backup destination. If you have other modifications, copy those changes too.
+3. Run[¹] `sudo -Hu postgres pg_dump -d akkoma --format=custom -f </path/to/backup_location/akkoma.pgdump>` (make sure the postgres user has write access to the destination file)
+4. Copy `akkoma.pgdump`, `config/prod.secret.exs`[²], `config/setup_db.psql` (if still available) and the `uploads` folder to your backup destination. If you have other modifications, copy those changes too.
 5. Restart the Akkoma service.
 
-[¹]: We assume the database name is "akkoma". If not, you can find the correct name in your configuration files.  
-[²]: If you have a from source installation, you need `config/prod.secret.exs` instead of `config/config.exs`. The `config/config.exs` file also exists, but in case of from source installations, it only contains the default values and it is tracked by Git, so you don't need to back it up.  
+[¹]: We assume the database name is "akkoma". If not, you can find the correct name in your config files.  
+[²]: If you've installed using OTP, you need `config/config.exs` instead of `config/prod.secret.exs`.  
 
 ## Restore/Move
 
@@ -17,16 +17,19 @@
 2. Stop the Akkoma service.
 3. Go to the working directory of Akkoma (default is `/opt/akkoma`)
 4. Copy the above mentioned files back to their original position.
-5. Drop the existing database and user[¹]. `sudo -Hu postgres psql -c 'DROP DATABASE akkoma;';` `sudo -Hu postgres psql -c 'DROP USER akkoma;'`
-6. Restore the database schema and akkoma role[¹] (replace the password with the one you find in the configuration file), `sudo -Hu postgres psql -c "CREATE USER akkoma WITH ENCRYPTED PASSWORD '<database-password-wich-you-can-find-in-your-configuration-file>';"` `sudo -Hu postgres psql -c "CREATE DATABASE akkoma OWNER akkoma;"`.
+5. Drop the existing database and user if restoring in-place[¹]. `sudo -Hu postgres psql -c 'DROP DATABASE akkoma;';` `sudo -Hu postgres psql -c 'DROP USER akkoma;'`
+6. Restore the database schema and akkoma role using either of the following options
+    * You can use the original `setup_db.psql` if you have it[²]: `sudo -Hu postgres psql -f config/setup_db.psql`.
+    * Or recreate the database and user yourself (replace the password with the one you find in the config file) `sudo -Hu postgres psql -c "CREATE USER akkoma WITH ENCRYPTED PASSWORD '<database-password-wich-you-can-find-in-your-config-file>'; CREATE DATABASE akkoma OWNER akkoma;"`.
 7. Now restore the Akkoma instance's data into the empty database schema[¹]: `sudo -Hu postgres pg_restore -d akkoma -v -1 </path/to/backup_location/akkoma.pgdump>`
-8. If you installed a newer Akkoma version, you should run the database migrations `./bin/pleroma_ctl migrate`[²].
+8. If you installed a newer Akkoma version, you should run `MIX_ENV=prod mix ecto.migrate`[³]. This task performs database migrations, if there were any.
 9. Restart the Akkoma service.
 10. Run `sudo -Hu postgres vacuumdb --all --analyze-in-stages`. This will quickly generate the statistics so that postgres can properly plan queries.
-11. If setting up on a new server, configure Nginx by using the `installation/nginx/akkoma.nginx` configuration sample or reference the Akkoma installation guide which contains the Nginx configuration instructions.
+11. If setting up on a new server configure Nginx by using the `installation/akkoma.nginx` config sample or reference the Akkoma installation guide for your OS which contains the Nginx configuration instructions.
 
-[¹]: We assume the database name and user are both "akkoma". If not, you can find the correct name in your configuration files.  
-[²]: If you have a from source installation, the command is `MIX_ENV=prod mix ecto.migrate`. Note that we prefix with `MIX_ENV=prod` to use the `config/prod.secret.exs` configuration file.  
+[¹]: We assume the database name and user are both "akkoma". If not, you can find the correct name in your config files.  
+[²]: You can recreate the `config/setup_db.psql` by running the `mix pleroma.instance gen` task again. You can ignore most of the questions, but make the database user, name, and password the same as found in your backed up config file. This will also create a new `config/generated_config.exs` file which you may delete as it is not needed.  
+[³]: Prefix with `MIX_ENV=prod` to run it using the production config file.  
 
 ## Remove
 

docs/docs/configuration/cheatsheet.md

@@ -58,14 +58,11 @@ To add configuration to your config file, you can copy it from the base config.
 * `registration_reason_length`: Maximum registration reason length (default: `500`).
 * `external_user_synchronization`: Enabling following/followers counters synchronization for external users.
 * `cleanup_attachments`: Remove attachments along with statuses. Does not affect duplicate files and attachments without status. Enabling this will increase load to database when deleting statuses on larger instances.
-* `cleanup_attachments_delay`: How many seconds to wait after post deletion before attempting to deletion; useful for “delete & redraft” functionality (default: `1800`)
 * `show_reactions`: Let favourites and emoji reactions be viewed through the API (default: `true`).
 * `password_reset_token_validity`: The time after which reset tokens aren't accepted anymore, in seconds (default: one day).
 * `local_bubble`: Array of domains representing instances closely related to yours. Used to populate the `bubble` timeline. e.g `["example.com"]`, (default: `[]`)
 * `languages`: List of Language Codes used by the instance. This is used to try and set a default language from the frontend. It will try and find the first match between the languages set here and the user's browser languages. It will default to the first language in this setting if there is no match.. (default `["en"]`)
 * `export_prometheus_metrics`: Enable prometheus metrics, served at `/api/v1/akkoma/metrics`, requiring the `admin:metrics` oauth scope.
-* `privileged_staff`: Set to `true` to give moderators access to a few higher responsibility actions.
-* `federated_timeline_available`: Set to `false` to remove access to the federated timeline for all users.
 
 ## :database
 * `improved_hashtag_timeline`: Setting to force toggle / force disable improved hashtags timeline. `:enabled` forces hashtags to be fetched from `hashtags` table for hashtags timeline. `:disabled` forces object-embedded hashtags to be used (slower). Keep it `:auto` for automatic behaviour (it is auto-set to `:enabled` [unless overridden] when HashtagsTableMigrator completes).
@@ -339,7 +336,7 @@ config :pleroma, :frontends,
 
 * `:primary` - The frontend that will be served at `/`
 * `:admin` - The frontend that will be served at `/pleroma/admin`
-* `:swagger` - Config for developers to act as an API reference to be served at `/pleroma/swaggerui/` (trailing slash _needed_). Disabled by default.
+* `:swagger` - Config for developers to act as an API reference to be served at `/akkoma/swaggerui/` (trailing slash _needed_). Disabled by default.
 * `:mastodon` - The mastodon-fe configuration. This shouldn't need to be changed. This is served at `/web` when installed.
 
 ### :static\_fe
@@ -606,6 +603,7 @@ the source code is here: [kocaptcha](https://github.com/koto-bank/kocaptcha). Th
 * `link_name`: When enabled Akkoma will add a `name` parameter to the url of the upload, for example `https://instance.tld/media/corndog.png?name=corndog.png`. This is needed to provide the correct filename in Content-Disposition headers
 * `base_url`: The base URL to access a user-uploaded file; MUST be configured explicitly.
   Using a (sub)domain distinct from the instance endpoint is **strongly** recommended. A good value might be `https://media.myakkoma.instance/media/`. 
+* `proxy_remote`: If you're using a remote uploader, Akkoma will proxy media requests instead of redirecting to it.
 * `proxy_opts`: Proxy options, see `Pleroma.ReverseProxy` documentation.
 * `filename_display_max_length`: Set max length of a filename to display. 0 = no limit. Default: 30.
 

docs/docs/configuration/frontend_management.md

@@ -60,4 +60,4 @@ config :pleroma, :frontends,
 
 Then run the [pleroma.frontend cli task](../../administration/CLI_tasks/frontend) with the name of `swagger-ui` to install the distribution files.
 
-You will now be able to view documentation at `/pleroma/swaggerui`
+You will now be able to view documentation at `/akkoma/swaggerui`

docs/docs/configuration/howto_mediaproxy.md

@@ -6,17 +6,37 @@ With the `mediaproxy` function you can use nginx to cache this content, so users
 
 ## Activate it
 
+* Edit your nginx config and add the following location to your main server block:
+```
+location /proxy {
+        return 404;
+}
+```
+
 * Set up a subdomain for the proxy with its nginx config on the same machine
-* Edit the nginx config for the upload/MediaProxy subdomain to point to the subdomain that has been set up
+  *(the latter is not strictly required, but for simplicity we’ll assume so)*
+* In this subdomain’s server block add
+```
+location /proxy {
+        proxy_cache akkoma_media_cache;
+        proxy_cache_lock on;
+        proxy_pass http://localhost:4000;
+}
+```
+Also add the following on top of the configuration, outside of the `server` block:
+```
+proxy_cache_path /tmp/akkoma-media-cache levels=1:2 keys_zone=akkoma_media_cache:10m max_size=10g inactive=720m use_temp_path=off;
+```
+If you came here from one of the installation guides, take a look at the example configuration `/installation/nginx/akkoma.nginx`, where this part is already included.
+
 * Append the following to your `prod.secret.exs` or `dev.secret.exs` (depends on which mode your instance is running):
-```elixir
-# Replace media.example.td with the subdomain you set up earlier
+```
 config :pleroma, :media_proxy,
       enabled: true,
       proxy_opts: [
             redirect_on_failure: true
       ],
-      base_url: "https://media.example.tld"
+      base_url: "https://cache.akkoma.social"
 ```
 You **really** should use a subdomain to serve proxied files; while we will fix bugs resulting from this, serving arbitrary remote content on your main domain namespace is a significant attack surface.
 

docs/docs/configuration/i2p.md

@@ -130,26 +130,59 @@ config :pleroma, :http_security,
   enabled: false
 ```
 
-In the Nginx config, add the following into the `location /` block:
-```nginx
+Use this as the Nginx config:
+```
+proxy_cache_path /tmp/akkoma-media-cache levels=1:2 keys_zone=akkoma_media_cache:10m max_size=10g inactive=720m use_temp_path=off;
+# The above already exists in a clearnet instance's config.
+# If not, add it.
+
+server {
+    listen 127.0.0.1:14447;
+    server_name youri2paddress;
+
+    # Comment to enable logs
+    access_log /dev/null;
+    error_log /dev/null;
+
+    gzip_vary on;
+    gzip_proxied any;
+    gzip_comp_level 6;
+    gzip_buffers 16 8k;
+    gzip_http_version 1.1;
+    gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript application/activity+json application/atom+xml;
+
+    client_max_body_size 16m;
+
+    location / {
+
         add_header X-XSS-Protection "0";
         add_header X-Permitted-Cross-Domain-Policies none;
         add_header X-Frame-Options DENY;
         add_header X-Content-Type-Options nosniff;
         add_header Referrer-Policy same-origin;
-```
 
-Change the `listen` directive to the following:
-```nginx
-listen 127.0.0.1:14447;
-```
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+        proxy_set_header Host $http_host;
 
-Set `server_name` to your i2p address.
+        proxy_pass http://localhost:4000;
 
-Reload Nginx:
+        client_max_body_size 16m;
+    }
+
+    location /proxy {
+        proxy_cache akkoma_media_cache;
+        proxy_cache_lock on;
+        proxy_ignore_client_abort on;
+        proxy_pass http://localhost:4000;
+    }
+}
 ```
-systemctl restart i2pd.service --no-block
-systemctl reload nginx.service
+reload Nginx:
+```
+systemctl stop i2pd.service --no-block
+systemctl start i2pd.service
 ```
 *Notice:* The stop command initiates a graceful shutdown process, i2pd stops after finishing to route transit tunnels (maximum 10 minutes).
 

docs/docs/configuration/onion_federation.md

@@ -74,23 +74,56 @@ config :pleroma, :http_security,
   enabled: false
 ```
 
-In the Nginx config, add the following into the `location /` block:
-```nginx
+Use this as the Nginx config:
+```
+proxy_cache_path /tmp/akkoma-media-cache levels=1:2 keys_zone=akkoma_media_cache:10m max_size=10g inactive=720m use_temp_path=off;
+# The above already exists in a clearnet instance's config.
+# If not, add it.
+
+server {
+    listen 127.0.0.1:8099;
+    server_name youronionaddress;
+
+    # Comment to enable logs
+    access_log /dev/null;
+    error_log /dev/null;
+
+    gzip_vary on;
+    gzip_proxied any;
+    gzip_comp_level 6;
+    gzip_buffers 16 8k;
+    gzip_http_version 1.1;
+    gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript application/activity+json application/atom+xml;
+
+    client_max_body_size 16m;
+
+    location / {
+
         add_header X-XSS-Protection "0";
         add_header X-Permitted-Cross-Domain-Policies none;
         add_header X-Frame-Options DENY;
         add_header X-Content-Type-Options nosniff;
         add_header Referrer-Policy same-origin;
+
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+        proxy_set_header Host $http_host;
+
+        proxy_pass http://localhost:4000;
+
+        client_max_body_size 16m;
+    }
+
+    location /proxy {
+        proxy_cache akkoma_media_cache;
+        proxy_cache_lock on;
+        proxy_ignore_client_abort on;
+        proxy_pass http://localhost:4000;
+    }
+}
 ```
-
-Change the `listen` directive to the following:
-```nginx
-listen 127.0.0.1:8099;
-```
-
-Set the `server_name` to your onion address.
-
-Reload Nginx:
+reload Nginx:
 ```
 systemctl reload nginx
 ```

docs/docs/configuration/postgresql.md

@@ -4,10 +4,47 @@ Akkoma performance is largely dependent on performance of the underlying databas
 
 ## PGTune
 
-[PgTune](https://pgtune.leopard.in.ua) can be used to get recommended settings. Make sure to set the DB type to "Online transaction processing system" for optimal performance. Also set the number of connections to between 25 and 30. This will allow each connection to have access to more resources while still leaving some room for running maintenance tasks while the instance is still running. 
+[PgTune](https://pgtune.leopard.in.ua) can be used to get recommended settings. Be sure to set "Number of Connections" to 20, otherwise it might produce settings hurtful to database performance. It is also recommended to not use "Network Storage" option.
 
-It is also recommended to not use "Network Storage" option.
+If your server runs other services, you may want to take that into account. E.g. if you have 4G ram, but 1G of it is already used for other services, it may be better to tell PGTune you only have 3G. In the end, PGTune only provides recomended settings, you can always try to finetune further.
 
-If your server runs other services, you may want to take that into account. E.g. if you have 4G ram, but 1G of it is already used for other services, it may be better to tell PGTune you only have 3G.
+### Example configurations
 
-In the end, PGTune only provides recomended settings, you can always try to finetune further.
+Here are some configuration suggestions for PostgreSQL 10+.
+
+#### 1GB RAM, 1 CPU
+```
+shared_buffers = 256MB
+effective_cache_size = 768MB
+maintenance_work_mem = 64MB
+work_mem = 13107kB
+```
+
+#### 2GB RAM, 2 CPU
+```
+shared_buffers = 512MB
+effective_cache_size = 1536MB
+maintenance_work_mem = 128MB
+work_mem = 26214kB
+max_worker_processes = 2
+max_parallel_workers_per_gather = 1
+max_parallel_workers = 2
+```
+
+## Disable generic query plans
+
+When PostgreSQL receives a query, it decides on a strategy for searching the requested data, this is called a query plan. The query planner has two modes: generic and custom. Generic makes a plan for all queries of the same shape, ignoring the parameters, which is then cached and reused. Custom, on the contrary, generates a unique query plan based on query parameters.
+
+By default PostgreSQL has an algorithm to decide which mode is more efficient for particular query, however this algorithm has been observed to be wrong on some of the queries Akkoma sends, leading to serious performance loss. Therefore, it is recommended to disable generic mode.
+
+
+Akkoma already avoids generic query plans by default, however the method it uses is not the most efficient because it needs to be compatible with all supported PostgreSQL versions. For PostgreSQL 12 and higher additional performance can be gained by adding the following to Akkoma configuration:
+```elixir
+config :pleroma, Pleroma.Repo,
+  prepare: :named,
+  parameters: [
+    plan_cache_mode: "force_custom_plan"
+  ]
+```
+
+A more detailed explaination of the issue can be found at <https://blog.soykaf.com/post/postgresql-elixir-troubles/>.

docs/docs/configuration/search.md

@@ -33,7 +33,6 @@ indexes faster when it can process many posts in a single batch.
 > config :pleroma, Pleroma.Search.Meilisearch,
 >    url: "http://127.0.0.1:7700/",
 >    private_key: "private key",
->    search_key: "search key",
 >    initial_indexing_chunk_size: 100_000
 
 Information about setting up meilisearch can be found in the
@@ -46,7 +45,7 @@ is hardly usable on a somewhat big instance.
 ### Private key authentication (optional)
 
 To set the private key, use the `MEILI_MASTER_KEY` environment variable when starting. After setting the _master key_,
-you have to get the _private key_ and possibly _search key_, which are actually used for authentication.
+you have to get the _private key_, which is actually used for authentication.
 
 === "OTP"
     ```sh
@@ -58,11 +57,7 @@ you have to get the _private key_ and possibly _search key_, which are actually
     mix pleroma.search.meilisearch show-keys <your master key here>
     ```
 
-You will see a "Default Admin API Key", this is the key you actually put into
-your configuration file as `private_key`. You should also see a
-"Default Search API key", put this into your config as `search_key`.
-If your version of Meilisearch only showed the former,
-just leave `search_key` completely unset in Akkoma's config.
+You will see a "Default Admin API Key", this is the key you actually put into your configuration file.
 
 ### Initial indexing
 

docs/docs/configuration/storing_remote_media.md

@@ -6,7 +6,7 @@ as soon as the post is received by your instance.
 
 ## Nginx
 
-The following are excerpts from the [suggested nginx config](https://akkoma.dev/AkkomaGang/akkoma/src/branch/develop/installation/nginx/akkoma.nginx) that demonstrates the necessary config for the media proxy to work.
+The following are excerpts from the [suggested nginx config](../../../installation/nginx/akkoma.nginx) that demonstrates the necessary config for the media proxy to work.
 
 A `proxy_cache_path` must be defined, for example:
 

docs/docs/development/API/admin_api.md

@@ -1033,6 +1033,7 @@ Most of the settings will be applied in `runtime`, this means that you don't nee
   - `:pools`
 - partially settings inside these keys:
   - `:seconds_valid` in `Pleroma.Captcha`
+  - `:proxy_remote` in `Pleroma.Upload`
   - `:upload_limit` in `:instance`
 
 - Params:
@@ -1093,6 +1094,7 @@ List of settings which support only full update by subkey:
         {"tuple": [":uploader", "Pleroma.Uploaders.Local"]},
         {"tuple": [":filters", ["Pleroma.Upload.Filter.Dedupe"]]},
         {"tuple": [":link_name", true]},
+        {"tuple": [":proxy_remote", false]},
         {"tuple": [":proxy_opts", [
           {"tuple": [":redirect_on_failure", false]},
           {"tuple": [":max_body_length", 1048576]},

docs/docs/development/ap_extensions.md

@@ -4,6 +4,7 @@
 The following endpoints are additionally present into our actors.
 
 - `oauthRegistrationEndpoint` (`http://litepub.social/ns#oauthRegistrationEndpoint`)
+- `uploadMedia` (`https://www.w3.org/ns/activitystreams#uploadMedia`)
 
 ### oauthRegistrationEndpoint
 
@@ -11,279 +12,6 @@ Points to MastodonAPI `/api/v1/apps` for now.
 
 See <https://docs.joinmastodon.org/methods/apps/>
 
-## Emoji reactions
-
-Emoji reactions are implemented as a new activity type `EmojiReact`.
-A single user is allowed to react multiple times with different emoji to the
-same post. However, they may only react at most once with the same emoji.
-Repeated reaction from the same user with the same emoji are to be ignored.
-Emoji reactions are also distinct from `Like` activities and a user may both
-`Like` and react to a post.
-
-!!! note
-    Misskey also supports emoji reactions, but the implementations differs.
-    It equates likes and reactions and only allows a single reaction per post.
-
-The emoji is placed in the `content` field of the activity
-and the `object` property points to the note reacting to.
-
-Emoji can either be any Unicode emoji sequence or a custom emoji.
-The latter must place their shortcode, including enclosing colons,
-into `content` and put the emoji object inside the `tag` property.
-The `tag` property MAY be omitted for Unicode emoji.
-
-An example reaction with a Unicode emoji:
-```json
-{
-  "@context": [
-    "https://www.w3.org/ns/activitystreams",
-    "https://example.org/schemas/litepub-0.1.jsonld",
-    {
-      "@language": "und"
-    }
-  ],
-  "type": "EmojiReact",
-  "id": "https://example.org/activities/23143872a0346141",
-  "actor": "https://example.org/users/akko",
-  "nickname": "akko",
-  "to": ["https://remote.example/users/diana", "https://example.org/users/akko/followers"],
-  "cc": ["https://www.w3.org/ns/activitystreams#Public"],
-  "content": "🧡",
-  "object": "https://remote.example/objects/9f0e93499d8314a9"
-}
-```
-
-An example reaction with a custom emoji:
-```json
-{
-  "@context": [
-    "https://www.w3.org/ns/activitystreams",
-    "https://example.org/schemas/litepub-0.1.jsonld",
-    {
-      "@language": "und"
-    }
-  ],
-  "type": "EmojiReact",
-  "id": "https://example.org/activities/d75586dec0541650",
-  "actor": "https://example.org/users/akko",
-  "nickname": "akko",
-  "to": ["https://remote.example/users/diana", "https://example.org/users/akko/followers"],
-  "cc": ["https://www.w3.org/ns/activitystreams#Public"],
-  "content": ":mouse:",
-  "object": "https://remote.example/objects/9f0e93499d8314a9",
-  "tag": [{
-    "type": "Emoji",
-    "id": null,
-    "name": "mouse",
-    "icon": {
-      "type": "Image",
-      "url": "https://example.org/emoji/mouse/mouse.png"
-    }
-  }]
-}
-```
-
-!!! note
-    Although an emoji reaction can only contain a single emoji,
-    for compatibility with older versions of Pleroma and Akkoma,
-    it is recommended to wrap the emoji object in a single-element array.
-
-When reacting with a remote custom emoji do not include the remote domain in `content`’s shortcode
-*(unlike in our REST API which needs the domain)*:
-```json
-{
-  "@context": [
-    "https://www.w3.org/ns/activitystreams",
-    "https://example.org/schemas/litepub-0.1.jsonld",
-    {
-      "@language": "und"
-    }
-  ],
-  "type": "EmojiReact",
-  "id": "https://example.org/activities/7993dcae98d8d5ec",
-  "actor": "https://example.org/users/akko",
-  "nickname": "akko",
-  "to": ["https://remote.example/users/diana", "https://example.org/users/akko/followers"],
-  "cc": ["https://www.w3.org/ns/activitystreams#Public"],
-  "content": ":hug:",
-  "object": "https://remote.example/objects/9f0e93499d8314a9",
-  "tag": [{
-    "type": "Emoji",
-    "id": "https://other.example/emojis/hug",
-    "name": "hug",
-    "icon": {
-      "type": "Image",
-      "url": "https://other.example/files/b71cea432b3fad67.webp"
-    }
-  }]
-}
-```
-
-Emoji reactions can be retracted using a standard `Undo` activity:
-```json
-{
-  "@context": [
-    "https://www.w3.org/ns/activitystreams",
-    "http://example.org/schemas/litepub-0.1.jsonld",
-    {
-      "@language": "und"
-    }
-  ],
-  "type": "Undo",
-  "id": "http://example.org/activities/4685792e-efb6-4309-b508-ae4f355dd695",
-  "actor": "https://example.org/users/akko",
-  "to": ["https://remote.example/users/diana", "https://example.org/users/akko/followers"],
-  "cc": ["https://www.w3.org/ns/activitystreams#Public"],
-  "object": "https://example.org/activities/23143872a0346141"
-}
-```
-
-## User profile backgrounds
-
-Akkoma federates user profile backgrounds the same way as Sharkey.
-
-An actors ActivityPub representation contains an additional
-`backgroundUrl` property containing an `Image` object. This property
-belongs to the `"sharkey": "https://joinsharkey.org/ns#"` namespace.
-
-## Quote Posts
-
-Akkoma allows referencing a single other note as a quote,
-which will be prominently displayed in the interface.
-
-The quoted post is referenced by its ActivityPub id in the `quoteUri` property.
-
-!!! note
-    Old Misskey only understood and modern Misskey still prefers
-    the `_misskey_quote` property for this. Similar some other older
-    software used `quoteUrl` or `quoteURL`.  
-    All current implementations with quote support understand `quoteUri`.
-
-Example:
-```json
-{
-  "@context": [
-    "https://www.w3.org/ns/activitystreams",
-    "https://example.org/schemas/litepub-0.1.jsonld",
-    {
-      "@language": "und"
-    }
-  ],
-  "type": "Note",
-  "id": "https://example.org/activities/85717e587f95d5c0",
-  "actor": "https://example.org/users/akko",
-  "to": ["https://remote.example/users/diana", "https://example.org/users/akko/followers"],
-  "cc": ["https://www.w3.org/ns/activitystreams#Public"],
-  "context": "https://example.org/contexts/1",
-  "content": "Look at that!",
-  "quoteUri": "http://remote.example/status/85717e587f95d5c0",
-  "contentMap": {
-    "en": "Look at that!"
-  },
-  "source": {
-    "content": "Look at that!",
-    "mediaType": "text/plain"
-  },
-  "published": "2024-04-06T23:40:28Z",
-  "updated": "2024-04-06T23:40:28Z",
-  "attachemnt": [],
-  "tag": []
-}
-```
-
-## Threads
-
-Akkoma assigns all posts of the same thread the same `context`. This is a
-standard ActivityPub property but its meaning is left vague. Akkoma will
-always treat posts with identical `context` as part of the same thread.
-
-`context` must not be assumed to hold any meaning or be dereferencable.
-
-Incoming posts without `context` will be assigned a new context.
-
-!!! note
-    Mastodon uses the non-standard `conversation` property for the same purpose
-    *(named after an older OStatus property)*. For incoming posts without
-    `context` but with `converstions` Akkoma will use the value from
-    `conversations` to fill in `context`.
-    For outgoing posts Akkoma will duplicate the context into `conversation`.
-
-## Post Source
-
-Unlike Mastodon, Akkoma supports drafting posts in multiple source formats
-besides plaintext, like Markdown or MFM. The original input is preserved
-in the standard ActivityPub `source` property *(not supported by Mastodon)*.
-Still, `content` will always be present and contain the prerendered HTML form.
-
-Supported `mediaType` include:
-- `text/plain`
-- `text/markdown`
-- `text/bbcode`
-- `text/x.misskeymarkdown`
-
-## Post Language
-
-!!! note
-    This is also supported in and compatible with Mastodon, but since
-    joinmastodon.org doesn’t document it yet it is included here.
-    [GoToSocial](https://docs.gotosocial.org/en/latest/federation/federating_with_gotosocial/#content-contentmap-and-language)
-    has a more refined version of this which can correctly deal with multiple language entries.
-
-A post can indicate its language by including a `contentMap` object
-which contains a sub key named after the language’s ISO 639-1 code
-and it’s content identical to the post’s `content` field.
-
-Currently Akkoma, just like Mastodon, only properly supports a single language entry,
-in case of multiple entries a random language will be picked.  
-Furthermore, Akkoma currently only reads the `content` field
-and never the value from `contentMap`.
-
-## Local post scope
-
-Post using this scope will never federate to other servers
-but for the sake of completeness it is listed here.
-
-In addition to the usual scopes *(public, unlisted, followers-only, direct)*
-Akkoma supports an “unlisted” post scope. Such posts will not federate to
-other instances and only be shown to logged-in users on the same instance.
-It is included into the local timeline.  
-This may be useful to discuss or announce instance-specific policies and topics.
-
-A post is addressed to the local scope by including `<base url of instance>/#Public`
-in its `to` field. E.g. if the instance is on `https://example.org` it would use
-`https://example.org/#Public`.
-
-An implementation creating a new post MUST NOT address both the local and
-general public scope `as:Public` at the same time. A post addressing the local
-scope MUST NOT be sent to other instances or be possible to fetch by other
-instances regardless of potential other listed addressees.
-
-When receiving a remote post addressing both the public scope and what appears
-to be a local-scope identifier, the post SHOULD be treated without assigning any
-special meaning to the potential local-scope identifier.
-
-!!! note
-    Misskey-derivatives have a similar concept of non-federated posts,
-    however those are also shown publicly on the local web interface
-    and are thus visible to non-members.
-
-## List post scope
-
-Messages originally addressed to a custom list will contain
-a `listMessage` field with an unresolvable pseudo ActivityPub id.
-
-# Deprecated and Removed Extensions
-
-The following extensions were used in the past but have been dropped.
-Documentation is retained here as a reference and since old objects might
-still contains related fields.
-
-## Actor endpoints
-
-The following endpoints used to be present:
-
-- `uploadMedia` (`https://www.w3.org/ns/activitystreams#uploadMedia`)
-
 ### uploadMedia
 
 Inspired by <https://www.w3.org/wiki/SocialCG/ActivityPub/MediaUpload>, it is part of the ActivityStreams namespace because it used to be part of the ActivityPub specification and got removed from it.
@@ -292,8 +20,9 @@ Content-Type: multipart/form-data
 
 Parameters:
 - (required) `file`: The file being uploaded
-- (optional) `description`: A plain-text description of the media, for accessibility purposes.
+- (optionnal) `description`: A plain-text description of the media, for accessibility purposes.
 
 Response: HTTP 201 Created with the object into the body, no `Location` header provided as it doesn't have an `id`
 
-The object given in the response should then be inserted into an Object's `attachment` field.
+The object given in the reponse should then be inserted into an Object's `attachment` field.
+

docs/docs/development/nodeinfo_extensions.md

@@ -1,141 +0,0 @@
-# Nodeinfo Extensions
-
-Akkoma currently implements version 2.0 and 2.1 of nodeinfo spec,
-but provides the following additional fields.
-
-## metadata
-
-The spec leaves the content of `metadata` up to implementations
-and indeed Akkoma adds many fields here apart from the commonly
-found `nodeName` and `nodeDescription` fields.
-
-### accountActivationRequired
-Whether or not users need to confirm their email before completing registration.
-*(boolean)*
-
-!!! note
-    Not to be confused with account approval, where each registration needs to
-    be manually approved by an admin. Account approval has no nodeinfo entry.
-
-### features
-
-Array of strings denoting supported server features. E.g. a server supporting
-quote posts should include a `"quote_posting"` entry here.
-
-A non-exhaustive list of possible features:
-- `polls`
-- `quote_posting`
-- `editing`
-- `bubble_timeline`
-- `pleroma_emoji_reactions` *(Unicode emoji)*
-- `custom_emoji_reactions`
-- `akkoma_api`
-- `akkoma:machine_translation`
-- `mastodon_api`
-- `pleroma_api`
-
-### federatedTimelineAvailable
-Whether or not the “federated timeline”, i.e. a timeline containing posts from
-the entire known network, is made available.
-*(boolean)*
-
-### federation
-This section is optional and can contain various custom keys describing federation policies.
-The following are required to be presented:
-- `enabled` *(boolean)* whether the server federates at all
-
-A non-exhaustive list of optional keys:
-- `exclusions` *(boolean)* whether some federation policies are withheld
-- `mrf_simple` *(object)* describes how the Simple MRF policy is configured
-
-### fieldsLimits
-A JSON object documenting restriction for user account info fields.
-All properties are integers.
-
-- `maxFields` maximum number of account info fields local users can create
-- `maxRemoteFields` maximum number of account info fields remote users can have
-   before the user gets rejected or fields truncated
-- `nameLength` maximum length of a field’s name
-- `valueLength` maximum length of a field’s value
-
-### invitesEnabled
-Whether or not signing up via invite codes is possible.
-*(boolean)*
-
-### localBubbleInstances
-Array of domains (as strings) of other instances chosen
-by the admin which are shown in the bubble timeline.
-
-### mailerEnabled
-Whether or not the instance can send out emails.
-*(boolean)*
-
-### nodeDescription
-Human-friendly description of this instance
-*(string)*
-
-### nodeName
-Human-friendly name of this instance
-*(string)*
-
-### pollLimits
-JSON object containing limits for polls created by local users.
-All values are integers.
-- `max_options` maximum number of poll options
-- `max_option_chars` maximum characters per poll option
-- `min_expiration` minimum time in seconds a poll must be open for
-- `max_expiration` maximum time a poll is allowed to be open for
-
-### postFormats
-Array of strings containing media types for supported post source formats.
-A non-exhaustive list of possible values:
-- `text/plain`
-- `text/markdown`
-- `text/bbcode`
-- `text/x.misskeymarkdown`
-
-### private
-Whether or not unauthenticated API access is permitted.
-*(boolean)*
-
-### privilegedStaff
-Whether or not moderators are trusted to perform some
-additional tasks like e.g. issuing password reset emails.
-
-### publicTimelineVisibility
-JSON object containing boolean-valued keys reporting
-if a given timeline can be viewed without login.
-- `local`
-- `federated`
-- `bubble`
-
-### restrictedNicknames
-Array of strings listing nicknames forbidden to be used during signup.
-
-### skipThreadContainment
-Whether broken threads are filtered out
-*(boolean)*
-
-### staffAccounts
-Array containing ActivityPub IDs of local accounts
-with some form of elevated privilege on the instance.
-
-### suggestions
-JSON object containing info on whether the interaction-based
-Mastodon `/api/v1/suggestions` feature is enabled and optionally
-additional implementation-defined fields with more details
-on e.g. how suggested users are selected.
-
-!!! note
-    This has no relation to the newer /api/v2/suggestions API
-    which also (or exclusively) contains staff-curated entries.
-
-- `enabled` *(boolean)* whether or not user recommendations are enabled
-
-### uploadLimits
-JSON object documenting various upload-related size limits.
-All values are integers and in bytes.
-- `avatar` maximum size of uploaded user avatars
-- `banner` maximum size of uploaded user profile banners
-- `background` maximum size of uploaded user profile backgrounds
-- `general` maximum size for all other kinds of uploads

docs/docs/installation/arch_linux_en.md

@@ -10,7 +10,6 @@ This guide will assume that you have administrative rights, either as root or a
 
 * `postgresql`
 * `elixir`
-* `erlang-headless` or `erlang`
 * `git`
 * `base-devel`
 * `cmake`
@@ -36,7 +35,6 @@ sudo pacman -Syu
 
 ```shell
 sudo pacman -S git base-devel elixir cmake file
-sudo pacman -S --asdeps erlang-headless
 ```
 
 ### Install PostgreSQL

docs/docs/installation/debian_based_en.md

@@ -35,24 +35,32 @@ sudo useradd -r -s /bin/false -m -d /var/lib/akkoma -U akkoma
 
 ### Install Elixir and Erlang
 
-#### Using `apt`
 If your distribution packages a recent enough version of Elixir, you can install it directly from the distro repositories and skip to the next section of the guide:
 
 ```shell
 sudo apt install elixir erlang-dev erlang-nox
 ```
 
-#### Using `asdf`
-If your distribution does not have a recent version of Elxir in their repositories, you can use [asdf](https://asdf-vm.com/) to install a newer version of Elixir and Erlang.
+Otherwise use [asdf](https://github.com/asdf-vm/asdf) to install the latest versions of Elixir and Erlang.
 
 First, install some dependencies needed to build Elixir and Erlang:
 ```shell
 sudo apt install curl unzip build-essential autoconf m4 libncurses5-dev libssh-dev unixodbc-dev xsltproc libxml2-utils libncurses-dev
 ```
 
-Then login to the `akkoma` user.
+Then login to the `akkoma` user and install asdf:
+```shell
+git clone https://github.com/asdf-vm/asdf.git ~/.asdf --branch v0.11.3
+```
 
-Install asdf by following steps 1 to 3 on [their website](https://asdf-vm.com/guide/getting-started.html), then restart the shell to load asdf:
+Add the following lines to `~/.bashrc`:
+```shell
+. "$HOME/.asdf/asdf.sh"
+# asdf completions
+. "$HOME/.asdf/completions/asdf.bash"
+```
+
+Restart the shell:
 ```shell
 exec $SHELL
 ```
@@ -61,15 +69,15 @@ Next install Erlang:
 ```shell
 asdf plugin add erlang https://github.com/asdf-vm/asdf-erlang.git
 export KERL_CONFIGURE_OPTIONS="--disable-debug --without-javac"
-asdf install erlang 27.2.4
-asdf set erlang 27.2.4
+asdf install erlang 25.3.2.5
+asdf global erlang 25.3.2.5
 ```
 
 Now install Elixir:
 ```shell
-asdf plugin add elixir https://github.com/asdf-vm/asdf-elixir.git
-asdf install elixir 1.18.2-otp-27
-asdf set elixir 1.18.2-otp-27
+asdf plugin-add elixir https://github.com/asdf-vm/asdf-elixir.git
+asdf install elixir 1.15.4-otp-25
+asdf global elixir 1.15.4-otp-25
 ```
 
 Confirm that Elixir is installed correctly by checking the version:

docs/docs/installation/frontends.include

@@ -6,9 +6,7 @@ probably install frontends.
 These are no longer bundled with the distribution and need an extra
 command to install.
 
-You **must** run frontend management tasks as the akkoma user,
-the same way you downloaded the build or cloned the git repo before.
-But otherwise, for most installations, the following will suffice:
+For most installations, the following will suffice:
 
 === "OTP" 
     ```sh
@@ -30,3 +28,4 @@ But otherwise, for most installations, the following will suffice:
     ```
 
 For more customised installations, refer to [Frontend Management](../../configuration/frontend_management)
+

docs/docs/installation/generic_dependencies.include

@@ -1,8 +1,8 @@
 ## Required dependencies
 
-* PostgreSQL 12+
-* Elixir 1.14.1+ (currently tested up to 1.18)
-* Erlang OTP 25+ (currently tested up to OTP27)
+* PostgreSQL 9.6+
+* Elixir 1.14+ (currently tested up to 1.16)
+* Erlang OTP 25+ (currently tested up to OTP26)
 * git
 * file / libmagic
 * gcc (clang might also work)

docs/docs/installation/yunohost_en.md

@@ -0,0 +1,9 @@
+# Installing on Yunohost
+
+[YunoHost](https://yunohost.org) is a server operating system aimed at self-hosting. The YunoHost community maintains a package of Akkoma which allows you to install Akkoma on YunoHost. You can install it via the normal way through the admin web interface, or through the CLI. More information can be found at [the repo of the package](https://github.com/YunoHost-Apps/akkoma_ynh).
+
+## Questions
+
+Questions and problems related to the YunoHost parts can be done through the [YunoHost channels](https://yunohost.org/en/help).
+
+For questions about Akkoma, check out the [Akkoma community channels](../../#community-channels).

installation/akkoma.service

@@ -19,9 +19,6 @@ Environment="MIX_ENV=prod"
 ; Don't listen epmd on 0.0.0.0
 Environment="ERL_EPMD_ADDRESS=127.0.0.1"
 
-; Don't busy wait
-Environment="ERL_AFLAGS=+sbwt none +sbwtdcpu none +sbwtdio none"
-
 ; Make sure that all paths fit your installation.
 ; Path to the home directory of the user running the Akkoma service.
 Environment="HOME=/var/lib/akkoma"

installation/apache/akkoma-apache.conf

@@ -60,7 +60,7 @@ ServerTokens Prod
     Include /etc/letsencrypt/options-ssl-apache.conf
 
     # Uncomment the following to enable MediaProxy caching on disk
-    #CacheRoot /var/tmp/akkoma-media-cache/
+    #CacheRoot /tmp/akkoma-media-cache/
     #CacheDirLevels 1
     #CacheDirLength 2
     #CacheEnable disk /proxy

installation/apache/apache-cache-purge.sh.example

@@ -16,7 +16,7 @@
 SCRIPTNAME=${0##*/}
 
 # mod_disk_cache directory
-CACHE_DIRECTORY="/var/tmp/akkoma-media-cache"
+CACHE_DIRECTORY="/tmp/akkoma-media-cache"
 
 ## Removes an item via the htcacheclean utility
 ## $1 - the filename, can be a pattern .

installation/caddy/Caddyfile

@@ -12,22 +12,26 @@ example.tld  {
     output file /var/log/caddy/akkoma.log
   }
 
+  encode gzip
+
   # this is explicitly IPv4 since Pleroma.Web.Endpoint binds on IPv4 only
   # and `localhost.` resolves to [::0] on some systems: see issue #930
   reverse_proxy 127.0.0.1:4000
 
-  @mediaproxy path /media/* /proxy/*
-  handle @mediaproxy {
-    redir https://media.example.tld{uri} permanent
-  }
+  # Uncomment if using a separate media subdomain
+  #@mediaproxy path /media/* /proxy/*
+  #handle @mediaproxy {
+  #  redir https://media.example.tld{uri} permanent
+  #}
 }
 
-media.example.tld {
-  @mediaproxy path /media/* /proxy/*
-  reverse_proxy @mediaproxy 127.0.0.1:4000 {
-    transport http {
-      response_header_timeout 10s
-      read_timeout 15s
-    }
-  }
-}
+# Uncomment if using a separate media subdomain
+#media.example.tld {
+#  @mediaproxy path /media/* /proxy/*
+#  reverse_proxy @mediaproxy 127.0.0.1:4000 {
+#    transport http {
+#      response_header_timeout 10s
+#      read_timeout 15s
+#    }
+#  }
+#}

installation/init.d/akkoma

@@ -1,43 +1,23 @@
 #!/sbin/openrc-run
 supervisor=supervise-daemon
-no_new_privs="yes"
+command_user=akkoma:akkoma
+command_background=1
+# Ask process to terminate within 30 seconds, otherwise kill it
+retry="SIGTERM/30/SIGKILL/5"
 pidfile="/var/run/akkoma.pid"
+directory=/opt/akkoma
+healthcheck_delay=60
+healthcheck_timer=30
+no_new_privs="yes"
 
-# Ask process first to terminate itself within 60s, otherwise kill it
-retry="SIGTERM/60/SIGKILL/5"
+: ${akkoma_port:-4000}
 
-# if you really want to use start-stop-daemon instead,
-# also put the following in the config:
-#    command_background=1
-
-# Adjust defaults as needed in /etc/conf.d/akkoma;
-# no need to directly edit the service file
-command_user="${command_user:-akkoma:akkoma}"
-directory="${directory:-/var/lib/akkoma/akkoma}"
-akkoma_port="${akkoma_port:-4000}"
-# whether to allow connecting a remote exlixir shell to the running Akkoma instance
-akkoma_console=${akkoma_console:-NO}
-
-output_log="${output_log:-/var/log/akkoma}"
-error_log="${error_log:-/var/log/akkoma}"
-
-# 0 means unlimited restarts
-respawn_max="${respawn_max:-0}"
-respawn_delay="${respawn_delay:-5}"
-# define respawn period to only count crashes within a
-# sliding time window towards respawn_max, e.g.:
-#   respawn_period=2850
-
-healthcheck_delay="${healthcheck_delay:-60}"
-healthcheck_timer="${healthcheck_timer:-30}"
-
-MIX_ENV=prod
-ERL_EPMD_ADDRESS="${ERL_EPMD_ADDRESS:-127.0.0.1}"
-ERL_AFLAGS="${ERL_AFLAGS:-+sbwt none +sbwtdcpu none +sbwtdio none}"
-supervise_daemon_args="${supervise_daemon_args} --env MIX_ENV=${MIX_ENV}"
-supervise_daemon_args="${supervise_daemon_args} --env ERL_EPMD_ADDRESS=${ERL_EPMD_ADDRESS}"
-supervise_daemon_args="${supervise_daemon_args} --env ERL_AFLAGS='${ERL_AFLAGS}'"
+# Needs OpenRC >= 0.42
+#respawn_max=0
+#respawn_delay=5
 
+# put akkoma_console=YES in /etc/conf.d/akkoma if you want to be able to
+# connect to akkoma via an elixir console
 if yesno "${akkoma_console}"; then
 	command=elixir
 	command_args="--name akkoma@127.0.0.1 --erl '-kernel inet_dist_listen_min 9001 inet_dist_listen_max 9001 inet_dist_use_interface {127,0,0,1}' -S mix phx.server"
@@ -51,24 +31,13 @@ else
 	command_args="phx.server"
 fi
 
+export MIX_ENV=prod
+export ERL_EPMD_ADDRESS=127.0.0.1
+
 depend() {
 	need nginx postgresql
 }
 
-start_pre() {
-	# Ensure logfile ownership and perms are alright
-	checkpath --file --owner "$command_user" "$output_log" "$error_log" \
-	|| eerror "Logfile(s) not owned by $command_user, or not a file!"
-	checkpath --writable "$output_log" "$error_log" \
-	|| eerror "Logfile(s) not writable!"
-
-	# If a recompile is needed perform it with lowest prio
-	# (delaying the actual start) to avoid hogging too much
-	# CPU from other services
-	cd "$directory"
-	doas -u "${command_user%%:*}" env MIX_ENV="$MIX_ENV" nice -n 19 "$command" compile
-}
-
 healthcheck() {
 	# put akkoma_health=YES in /etc/conf.d/akkoma if you want healthchecking
 	# and make sure you have curl installed

installation/nginx/akkoma.nginx

@@ -3,7 +3,7 @@
 # See the documentation at docs.akkoma.dev for your particular distro/OS for
 # installation instructions.
 
-proxy_cache_path /var/tmp/akkoma-media-cache levels=1:2 keys_zone=akkoma_media_cache:10m max_size=1g
+proxy_cache_path /tmp/akkoma-media-cache levels=1:2 keys_zone=akkoma_media_cache:10m max_size=1g
                  inactive=720m use_temp_path=off;
 
 # this is explicitly IPv4 since Pleroma.Web.Endpoint binds on IPv4 only

installation/nginx/nginx-cache-purge.sh.example

@@ -5,7 +5,7 @@
 SCRIPTNAME=${0##*/}
 
 # NGINX cache directory
-CACHE_DIRECTORY="/var/tmp/akkoma-media-cache"
+CACHE_DIRECTORY="/tmp/akkoma-media-cache"
 
 ## Return the files where the items are cached.
 ## $1 - the filename, can be a pattern .

installation/openbsd/rc.d/akkomad

@@ -11,13 +11,11 @@
 #
 
 daemon="/usr/local/bin/elixir"
-daemon_flags="-S /usr/local/bin/mix phx.server"
+daemon_flags="--detached -S /usr/local/bin/mix phx.server"
 daemon_user="_akkoma"
-daemon_execdir="/home/_akkoma/akkoma"
 
 . /etc/rc.d/rc.subr
 
-rc_bg="YES"
 rc_reload=NO
 pexp="phx.server"
 
@@ -26,7 +24,7 @@ rc_check() {
 }
 
 rc_start() {
-	rc_exec "${daemon} ${daemon_flags}"
+	${rcexec} "cd akkoma; ${daemon} ${daemon_flags}"
 }
 
 rc_stop() {

lib/mix/pleroma.ex

@@ -16,7 +16,7 @@ defmodule Mix.Pleroma do
     :fast_html,
     :oban
   ]
-  @cachex_children ["object", "user", "scrubber", "web_resp", "http_backoff"]
+  @cachex_children ["object", "user", "scrubber", "web_resp"]
   @doc "Common functions to be reused in mix tasks"
   def start_pleroma do
     Pleroma.Config.Holder.save_default()
@@ -112,26 +112,18 @@ def shell_prompt(prompt, defval \\ nil, defname \\ nil) do
     end
   end
 
-  def shell_info(message) when is_binary(message) or is_list(message) do
+  def shell_info(message) do
     if mix_shell?(),
       do: Mix.shell().info(message),
       else: IO.puts(message)
   end
 
-  def shell_info(message) do
-    shell_info("#{inspect(message)}")
-  end
-
-  def shell_error(message) when is_binary(message) or is_list(message) do
+  def shell_error(message) do
     if mix_shell?(),
       do: Mix.shell().error(message),
       else: IO.puts(:stderr, message)
   end
 
-  def shell_error(message) do
-    shell_error("#{inspect(message)}")
-  end
-
   @doc "Performs a safe check whether `Mix.shell/0` is available (does not raise if Mix is not loaded)"
   def mix_shell?, do: :erlang.function_exported(Mix, :shell, 0)
 

lib/mix/tasks/pleroma/activity.ex

@@ -8,6 +8,7 @@ defmodule Mix.Tasks.Pleroma.Activity do
   alias Pleroma.User
   alias Pleroma.Web.CommonAPI
   alias Pleroma.Pagination
+  require Logger
   import Mix.Pleroma
   import Ecto.Query
 
@@ -16,7 +17,7 @@ def run(["get", id | _rest]) do
 
     id
     |> Activity.get_by_id()
-    |> shell_info()
+    |> IO.inspect()
   end
 
   def run(["delete_by_keyword", user, keyword | _rest]) do
@@ -34,7 +35,7 @@ def run(["delete_by_keyword", user, keyword | _rest]) do
     )
     |> Enum.map(fn x -> CommonAPI.delete(x.id, u) end)
     |> Enum.count()
-    |> shell_info()
+    |> IO.puts()
   end
 
   defp query_with(q, search_query) do

lib/mix/tasks/pleroma/database.ex

@@ -20,102 +20,6 @@ defmodule Mix.Tasks.Pleroma.Database do
   @shortdoc "A collection of database related tasks"
   @moduledoc File.read!("docs/docs/administration/CLI_tasks/database.md")
 
-  defp maybe_limit(query, limit_cnt) do
-    if is_number(limit_cnt) and limit_cnt > 0 do
-      limit(query, [], ^limit_cnt)
-    else
-      query
-    end
-  end
-
-  defp limit_statement(limit) when is_number(limit) do
-    if limit > 0 do
-      "LIMIT #{limit}"
-    else
-      ""
-    end
-  end
-
-  defp prune_orphaned_activities_singles(limit) do
-    %{:num_rows => del_single} =
-      """
-      delete from public.activities
-      where id in (
-        select a.id from public.activities a
-        left join public.objects o on a.data ->> 'object' = o.data ->> 'id'
-        left join public.activities a2 on a.data ->> 'object' = a2.data ->> 'id'
-        left join public.users u  on a.data ->> 'object' = u.ap_id
-        where not a.local
-        and jsonb_typeof(a."data" -> 'object') = 'string'
-        and o.id is null
-        and a2.id is null
-        and u.id is null
-        #{limit_statement(limit)}
-      )
-      """
-      |> Repo.query!([], timeout: :infinity)
-
-    Logger.info("Prune activity singles: deleted #{del_single} rows...")
-    del_single
-  end
-
-  defp prune_orphaned_activities_array(limit) do
-    %{:num_rows => del_array} =
-      """
-      delete from public.activities
-      where id in (
-        select a.id from public.activities a
-        join json_array_elements_text((a."data" -> 'object')::json) as j
-             on a.data->>'type' = 'Flag'
-        left join public.objects o on j.value = o.data ->> 'id'
-        left join public.activities a2 on j.value = a2.data ->> 'id'
-        left join public.users u  on j.value = u.ap_id
-        group by a.id
-        having max(o.data ->> 'id') is null
-        and max(a2.data ->> 'id') is null
-        and max(u.ap_id) is null
-        #{limit_statement(limit)}
-      )
-      """
-      |> Repo.query!([], timeout: :infinity)
-
-    Logger.info("Prune activity arrays: deleted #{del_array} rows...")
-    del_array
-  end
-
-  def prune_orphaned_activities(limit \\ 0, opts \\ []) when is_number(limit) do
-    # Activities can either refer to a single object id, and array of object ids
-    # or contain an inlined object (at least after going through our normalisation)
-    #
-    # Flag is the only type we support with an array (and always has arrays).
-    # Update the only one with inlined objects.
-    #
-    # We already regularly purge old Delete, Undo, Update and Remove and if
-    # rejected Follow requests anyway; no need to explicitly deal with those here.
-    #
-    # Since there’s an index on types and there are typically only few Flag
-    # activites, it’s _much_ faster to utilise the index. To avoid accidentally
-    # deleting useful activities should more types be added, keep typeof for singles.
-
-    # Prune activities who link to an array of objects
-    del_array =
-      if Keyword.get(opts, :arrays, true) do
-        prune_orphaned_activities_array(limit)
-      else
-        0
-      end
-
-    # Prune activities who link to a single object
-    del_single =
-      if Keyword.get(opts, :singles, true) do
-        prune_orphaned_activities_singles(limit)
-      else
-        0
-      end
-
-    del_single + del_array
-  end
-
   def run(["remove_embedded_objects" | args]) do
     {options, [], []} =
       OptionParser.parse(
@@ -158,37 +62,6 @@ def run(["update_users_following_followers_counts"]) do
     )
   end
 
-  def run(["prune_orphaned_activities" | args]) do
-    {options, [], []} =
-      OptionParser.parse(
-        args,
-        strict: [
-          limit: :integer,
-          singles: :boolean,
-          arrays: :boolean
-        ]
-      )
-
-    start_pleroma()
-
-    {limit, options} = Keyword.pop(options, :limit, 0)
-
-    log_message = "Pruning orphaned activities"
-
-    log_message =
-      if limit > 0 do
-        log_message <> ", limiting deletion to #{limit} rows"
-      else
-        log_message
-      end
-
-    Logger.info(log_message)
-
-    deleted = prune_orphaned_activities(limit, options)
-
-    Logger.info("Deleted #{deleted} rows")
-  end
-
   def run(["prune_objects" | args]) do
     {options, [], []} =
       OptionParser.parse(
@@ -197,8 +70,7 @@ def run(["prune_objects" | args]) do
           vacuum: :boolean,
           keep_threads: :boolean,
           keep_non_public: :boolean,
-          prune_orphaned_activities: :boolean,
-          limit: :integer
+          prune_orphaned_activities: :boolean
         ]
       )
 
@@ -207,8 +79,6 @@ def run(["prune_objects" | args]) do
     deadline = Pleroma.Config.get([:instance, :remote_post_retention_days])
     time_deadline = NaiveDateTime.utc_now() |> NaiveDateTime.add(-(deadline * 86_400))
 
-    limit_cnt = Keyword.get(options, :limit, 0)
-
     log_message = "Pruning objects older than #{deadline} days"
 
     log_message =
@@ -240,130 +110,129 @@ def run(["prune_objects" | args]) do
         log_message
       end
 
-    log_message =
-      if limit_cnt > 0 do
-        log_message <> ", limiting to #{limit_cnt} rows"
-      else
-        log_message
-      end
-
     Logger.info(log_message)
 
-    {del_obj, _} =
-      if Keyword.get(options, :keep_threads) do
-        # We want to delete objects from threads where
-        # 1. the newest post is still old
-        # 2. none of the activities is local
-        # 3. none of the activities is bookmarked
-        # 4. optionally none of the posts is non-public
-        deletable_context =
-          if Keyword.get(options, :keep_non_public) do
-            Pleroma.Activity
-            |> join(:left, [a], b in Pleroma.Bookmark, on: a.id == b.activity_id)
-            |> group_by([a], fragment("? ->> 'context'::text", a.data))
-            |> having(
-              [a],
-              not fragment(
-                # Posts (checked on Create Activity) is non-public
-                "bool_or((not(?->'to' \\? ? OR ?->'cc' \\? ?)) and ? ->> 'type' = 'Create')",
-                a.data,
-                ^Pleroma.Constants.as_public(),
-                a.data,
-                ^Pleroma.Constants.as_public(),
-                a.data
-              )
+    if Keyword.get(options, :keep_threads) do
+      # We want to delete objects from threads where
+      # 1. the newest post is still old
+      # 2. none of the activities is local
+      # 3. none of the activities is bookmarked
+      # 4. optionally none of the posts is non-public
+      deletable_context =
+        if Keyword.get(options, :keep_non_public) do
+          Pleroma.Activity
+          |> join(:left, [a], b in Pleroma.Bookmark, on: a.id == b.activity_id)
+          |> group_by([a], fragment("? ->> 'context'::text", a.data))
+          |> having(
+            [a],
+            not fragment(
+              # Posts (checked on Create Activity) is non-public
+              "bool_or((not(?->'to' \\? ? OR ?->'cc' \\? ?)) and ? ->> 'type' = 'Create')",
+              a.data,
+              ^Pleroma.Constants.as_public(),
+              a.data,
+              ^Pleroma.Constants.as_public(),
+              a.data
             )
-          else
-            Pleroma.Activity
-            |> join(:left, [a], b in Pleroma.Bookmark, on: a.id == b.activity_id)
-            |> group_by([a], fragment("? ->> 'context'::text", a.data))
-          end
-          |> having([a], max(a.updated_at) < ^time_deadline)
-          |> having([a], not fragment("bool_or(?)", a.local))
-          |> having([_, b], fragment("max(?::text) is null", b.id))
-          |> maybe_limit(limit_cnt)
-          |> select([a], fragment("? ->> 'context'::text", a.data))
-
-        Pleroma.Object
-        |> where([o], fragment("? ->> 'context'::text", o.data) in subquery(deletable_context))
-      else
-        deletable =
-          if Keyword.get(options, :keep_non_public) do
-            Pleroma.Object
-            |> where(
-              [o],
-              fragment(
-                "?->'to' \\? ? OR ?->'cc' \\? ?",
-                o.data,
-                ^Pleroma.Constants.as_public(),
-                o.data,
-                ^Pleroma.Constants.as_public()
-              )
-            )
-          else
-            Pleroma.Object
-          end
-          |> where([o], o.updated_at < ^time_deadline)
-          |> where(
-            [o],
-            fragment("split_part(?->>'actor', '/', 3) != ?", o.data, ^Pleroma.Web.Endpoint.host())
           )
-          |> maybe_limit(limit_cnt)
-          |> select([o], o.id)
+        else
+          Pleroma.Activity
+          |> join(:left, [a], b in Pleroma.Bookmark, on: a.id == b.activity_id)
+          |> group_by([a], fragment("? ->> 'context'::text", a.data))
+        end
+        |> having([a], max(a.updated_at) < ^time_deadline)
+        |> having([a], not fragment("bool_or(?)", a.local))
+        |> having([_, b], fragment("max(?::text) is null", b.id))
+        |> select([a], fragment("? ->> 'context'::text", a.data))
 
+      Pleroma.Object
+      |> where([o], fragment("? ->> 'context'::text", o.data) in subquery(deletable_context))
+    else
+      if Keyword.get(options, :keep_non_public) do
+        Pleroma.Object
+        |> where(
+          [o],
+          fragment(
+            "?->'to' \\? ? OR ?->'cc' \\? ?",
+            o.data,
+            ^Pleroma.Constants.as_public(),
+            o.data,
+            ^Pleroma.Constants.as_public()
+          )
+        )
+      else
         Pleroma.Object
-        |> where([o], o.id in subquery(deletable))
       end
-      |> Repo.delete_all(timeout: :infinity)
-
-    Logger.info("Deleted #{del_obj} objects...")
+      |> where([o], o.updated_at < ^time_deadline)
+      |> where(
+        [o],
+        fragment("split_part(?->>'actor', '/', 3) != ?", o.data, ^Pleroma.Web.Endpoint.host())
+      )
+    end
+    |> Repo.delete_all(timeout: :infinity)
 
     if !Keyword.get(options, :keep_threads) do
       # Without the --keep-threads option, it's possible that bookmarked
       # objects have been deleted. We remove the corresponding bookmarks.
-      %{:num_rows => del_bookmarks} =
-        """
-        delete from public.bookmarks
-        where id in (
-          select b.id from public.bookmarks b
-          left join public.activities a on b.activity_id = a.id
-          left join public.objects o on a."data" ->> 'object' = o.data ->> 'id'
-          where o.id is null
-        )
-        """
-        |> Repo.query!([], timeout: :infinity)
-
-      Logger.info("Deleted #{del_bookmarks} orphaned bookmarks...")
+      """
+      delete from public.bookmarks
+      where id in (
+        select b.id from public.bookmarks b
+        left join public.activities a on b.activity_id = a.id
+        left join public.objects o on a."data" ->> 'object' = o.data ->> 'id'
+        where o.id is null
+      )
+      """
+      |> Repo.query([], timeout: :infinity)
     end
 
     if Keyword.get(options, :prune_orphaned_activities) do
-      del_activities = prune_orphaned_activities()
-      Logger.info("Deleted #{del_activities} orphaned activities...")
+      # Prune activities who link to a single object
+      """
+      delete from public.activities
+      where id in (
+        select a.id from public.activities a
+        left join public.objects o on a.data ->> 'object' = o.data ->> 'id'
+        left join public.activities a2 on a.data ->> 'object' = a2.data ->> 'id'
+        left join public.users u  on a.data ->> 'object' = u.ap_id
+        where not a.local
+        and jsonb_typeof(a."data" -> 'object') = 'string'
+        and o.id is null
+        and a2.id is null
+        and u.id is null
+      )
+      """
+      |> Repo.query([], timeout: :infinity)
+
+      # Prune activities who link to an array of objects
+      """
+      delete from public.activities
+      where id in (
+        select a.id from public.activities a
+        join json_array_elements_text((a."data" -> 'object')::json) as j on jsonb_typeof(a."data" -> 'object') = 'array'
+        left join public.objects o on j.value = o.data ->> 'id'
+        left join public.activities a2 on j.value = a2.data ->> 'id'
+        left join public.users u  on j.value = u.ap_id
+        group by a.id
+        having max(o.data ->> 'id') is null
+        and max(a2.data ->> 'id') is null
+        and max(u.ap_id) is null
+      )
+      """
+      |> Repo.query([], timeout: :infinity)
     end
 
-    %{:num_rows => del_hashtags} =
-      """
-      DELETE FROM hashtags
-      USING hashtags AS ht
-      LEFT JOIN hashtags_objects hto
-            ON ht.id = hto.hashtag_id
-      LEFT JOIN user_follows_hashtag ufht
-            ON ht.id = ufht.hashtag_id
-      WHERE
-          hashtags.id = ht.id
-          AND hto.hashtag_id is NULL
-          AND ufht.hashtag_id is NULL
-      """
-      |> Repo.query!()
-
-    Logger.info("Deleted #{del_hashtags} no longer used hashtags...")
+    """
+    DELETE FROM hashtags AS ht
+    WHERE NOT EXISTS (
+      SELECT 1 FROM hashtags_objects hto
+      WHERE ht.id = hto.hashtag_id)
+    """
+    |> Repo.query()
 
     if Keyword.get(options, :vacuum) do
-      Logger.info("Starting vacuum...")
       Maintenance.vacuum("full")
     end
-
-    Logger.info("All done!")
   end
 
   def run(["prune_task"]) do

lib/mix/tasks/pleroma/diagnostics.ex

@@ -3,6 +3,7 @@ defmodule Mix.Tasks.Pleroma.Diagnostics do
   alias Pleroma.Repo
   alias Pleroma.User
 
+  require Logger
   require Pleroma.Constants
 
   import Mix.Pleroma
@@ -13,20 +14,13 @@ def run(["http", url]) do
     start_pleroma()
 
     Pleroma.HTTP.get(url)
-    |> shell_info()
-  end
-
-  def run(["fetch_object", url]) do
-    start_pleroma()
-
-    Pleroma.Object.Fetcher.fetch_object_from_id(url)
     |> IO.inspect()
   end
 
   def run(["home_timeline", nickname]) do
     start_pleroma()
     user = Repo.get_by!(User, nickname: nickname)
-    shell_info("Home timeline query #{user.nickname}")
+    Logger.info("Home timeline query #{user.nickname}")
 
     followed_hashtags =
       user
@@ -55,14 +49,14 @@ def run(["home_timeline", nickname]) do
       |> limit(20)
 
     Ecto.Adapters.SQL.explain(Repo, :all, query, analyze: true, timeout: :infinity)
-    |> shell_info()
+    |> IO.puts()
   end
 
   def run(["user_timeline", nickname, reading_nickname]) do
     start_pleroma()
     user = Repo.get_by!(User, nickname: nickname)
     reading_user = Repo.get_by!(User, nickname: reading_nickname)
-    shell_info("User timeline query #{user.nickname}")
+    Logger.info("User timeline query #{user.nickname}")
 
     params =
       %{limit: 20}
@@ -86,7 +80,7 @@ def run(["user_timeline", nickname, reading_nickname]) do
       |> limit(20)
 
     Ecto.Adapters.SQL.explain(Repo, :all, query, analyze: true, timeout: :infinity)
-    |> shell_info()
+    |> IO.puts()
   end
 
   def run(["notifications", nickname]) do
@@ -102,7 +96,7 @@ def run(["notifications", nickname]) do
       |> limit(20)
 
     Ecto.Adapters.SQL.explain(Repo, :all, query, analyze: true, timeout: :infinity)
-    |> shell_info()
+    |> IO.puts()
   end
 
   def run(["known_network", nickname]) do
@@ -128,6 +122,6 @@ def run(["known_network", nickname]) do
       |> limit(20)
 
     Ecto.Adapters.SQL.explain(Repo, :all, query, analyze: true, timeout: :infinity)
-    |> shell_info()
+    |> IO.puts()
   end
 end

lib/mix/tasks/pleroma/emoji.ex

@@ -27,11 +27,11 @@ def run(["ls-packs" | args]) do
       ]
 
       for {param, value} <- to_print do
-        shell_info(IO.ANSI.format([:bright, param, :normal, ": ", value]))
+        IO.puts(IO.ANSI.format([:bright, param, :normal, ": ", value]))
       end
 
       # A newline
-      shell_info("")
+      IO.puts("")
     end)
   end
 
@@ -49,7 +49,7 @@ def run(["get-packs" | args]) do
         pack = manifest[pack_name]
         src = pack["src"]
 
-        shell_info(
+        IO.puts(
           IO.ANSI.format([
             "Downloading ",
             :bright,
@@ -67,9 +67,9 @@ def run(["get-packs" | args]) do
         sha_status_text = ["SHA256 of ", :bright, pack_name, :normal, " source file is ", :bright]
 
         if archive_sha == String.upcase(pack["src_sha256"]) do
-          shell_info(IO.ANSI.format(sha_status_text ++ [:green, "OK"]))
+          IO.puts(IO.ANSI.format(sha_status_text ++ [:green, "OK"]))
         else
-          shell_info(IO.ANSI.format(sha_status_text ++ [:red, "BAD"]))
+          IO.puts(IO.ANSI.format(sha_status_text ++ [:red, "BAD"]))
 
           raise "Bad SHA256 for #{pack_name}"
         end
@@ -80,7 +80,7 @@ def run(["get-packs" | args]) do
           |> Path.dirname()
           |> Path.join(pack["files"])
 
-        shell_info(
+        IO.puts(
           IO.ANSI.format([
             "Fetching the file list for ",
             :bright,
@@ -93,9 +93,8 @@ def run(["get-packs" | args]) do
         )
 
         files = fetch_and_decode!(files_loc)
-        files_to_unzip = for({_, f} <- files, do: f)
 
-        shell_info(IO.ANSI.format(["Unpacking ", :bright, pack_name]))
+        IO.puts(IO.ANSI.format(["Unpacking ", :bright, pack_name]))
 
         pack_path =
           Path.join([
@@ -104,9 +103,19 @@ def run(["get-packs" | args]) do
             pack_name
           ])
 
-        {:ok, _} = Pleroma.SafeZip.unzip_data(binary_archive, pack_path, files_to_unzip)
+        files_to_unzip =
+          Enum.map(
+            files,
+            fn {_, f} -> to_charlist(f) end
+          )
 
-        shell_info(IO.ANSI.format(["Writing pack.json for ", :bright, pack_name]))
+        {:ok, _} =
+          :zip.unzip(binary_archive,
+            cwd: pack_path,
+            file_list: files_to_unzip
+          )
+
+        IO.puts(IO.ANSI.format(["Writing pack.json for ", :bright, pack_name]))
 
         pack_json = %{
           pack: %{
@@ -123,7 +132,7 @@ def run(["get-packs" | args]) do
         File.write!(Path.join(pack_path, "pack.json"), Jason.encode!(pack_json, pretty: true))
         Pleroma.Emoji.reload()
       else
-        shell_info(IO.ANSI.format([:bright, :red, "No pack named \"#{pack_name}\" found"]))
+        IO.puts(IO.ANSI.format([:bright, :red, "No pack named \"#{pack_name}\" found"]))
       end
     end
   end
@@ -171,14 +180,14 @@ def run(["gen-pack" | args]) do
         custom_exts
       end
 
-    shell_info("Using #{Enum.join(exts, " ")} extensions")
+    IO.puts("Using #{Enum.join(exts, " ")} extensions")
 
-    shell_info("Downloading the pack and generating SHA256")
+    IO.puts("Downloading the pack and generating SHA256")
 
     {:ok, %{body: binary_archive}} = Pleroma.HTTP.get(src)
     archive_sha = :crypto.hash(:sha256, binary_archive) |> Base.encode16()
 
-    shell_info("SHA256 is #{archive_sha}")
+    IO.puts("SHA256 is #{archive_sha}")
 
     pack_json = %{
       name => %{
@@ -193,13 +202,13 @@ def run(["gen-pack" | args]) do
 
     tmp_pack_dir = Path.join(System.tmp_dir!(), "emoji-pack-#{name}")
 
-    {:ok, _} = Pleroma.SafeZip.unzip_data(binary_archive, tmp_pack_dir)
+    {:ok, _} = :zip.unzip(binary_archive, cwd: String.to_charlist(tmp_pack_dir))
 
     emoji_map = Pleroma.Emoji.Loader.make_shortcode_to_file_map(tmp_pack_dir, exts)
 
     File.write!(files_name, Jason.encode!(emoji_map, pretty: true))
 
-    shell_info("""
+    IO.puts("""
 
     #{files_name} has been created and contains the list of all found emojis in the pack.
     Please review the files in the pack and remove those not needed.
@@ -221,11 +230,11 @@ def run(["gen-pack" | args]) do
         )
       )
 
-      shell_info("#{pack_file} has been updated with the #{name} pack")
+      IO.puts("#{pack_file} has been updated with the #{name} pack")
     else
       File.write!(pack_file, Jason.encode!(pack_json, pretty: true))
 
-      shell_info("#{pack_file} has been created with the #{name} pack")
+      IO.puts("#{pack_file} has been created with the #{name} pack")
     end
 
     Pleroma.Emoji.reload()
@@ -234,7 +243,7 @@ def run(["gen-pack" | args]) do
   def run(["reload"]) do
     start_pleroma()
     Pleroma.Emoji.reload()
-    shell_info("Emoji packs have been reloaded.")
+    IO.puts("Emoji packs have been reloaded.")
   end
 
   defp fetch_and_decode!(from) do

lib/mix/tasks/pleroma/refresh_counter_cache.ex

@@ -11,6 +11,7 @@ defmodule Mix.Tasks.Pleroma.RefreshCounterCache do
   alias Pleroma.CounterCache
   alias Pleroma.Repo
 
+  require Logger
   import Ecto.Query
 
   def run([]) do

lib/mix/tasks/pleroma/search/meilisearch.ex

@@ -48,7 +48,7 @@ def run(["index"]) do
         ]
       )
 
-    shell_info("Created indices. Starting to insert posts.")
+    IO.puts("Created indices. Starting to insert posts.")
 
     chunk_size = Pleroma.Config.get([Pleroma.Search.Meilisearch, :initial_indexing_chunk_size])
 
@@ -65,7 +65,7 @@ def run(["index"]) do
           )
 
         count = query |> Pleroma.Repo.aggregate(:count, :data)
-        shell_info("Entries to index: #{count}")
+        IO.puts("Entries to index: #{count}")
 
         Pleroma.Repo.stream(
           query,
@@ -92,10 +92,10 @@ def run(["index"]) do
 
           with {:ok, res} <- result do
             if not Map.has_key?(res, "indexUid") do
-              shell_info("\nFailed to index: #{inspect(result)}")
+              IO.puts("\nFailed to index: #{inspect(result)}")
             end
           else
-            e -> shell_error("\nFailed to index due to network error: #{inspect(e)}")
+            e -> IO.puts("\nFailed to index due to network error: #{inspect(e)}")
           end
         end)
         |> Stream.run()
@@ -126,15 +126,11 @@ def run(["show-keys", master_key]) do
     decoded = Jason.decode!(result.body)
 
     if decoded["results"] do
-      Enum.each(decoded["results"], fn
-        %{"name" => name, "key" => key} ->
-          shell_info("#{name}: #{key}")
-
-        %{"description" => desc, "key" => key} ->
-          shell_info("#{desc}: #{key}")
+      Enum.each(decoded["results"], fn %{"description" => desc, "key" => key} ->
+        IO.puts("#{desc}: #{key}")
       end)
     else
-      shell_error("Error fetching the keys, check the master key is correct: #{inspect(decoded)}")
+      IO.puts("Error fetching the keys, check the master key is correct: #{inspect(decoded)}")
     end
   end
 
@@ -142,7 +138,7 @@ def run(["stats"]) do
     start_pleroma()
 
     {:ok, result} = meili_get("/indexes/objects/stats")
-    shell_info("Number of entries: #{result["numberOfDocuments"]}")
-    shell_info("Indexing? #{result["isIndexing"]}")
+    IO.puts("Number of entries: #{result["numberOfDocuments"]}")
+    IO.puts("Indexing? #{result["isIndexing"]}")
   end
 end

lib/mix/tasks/pleroma/security.ex

@@ -38,7 +38,7 @@ def run(["spoof-uploaded"]) do
     Logger.put_process_level(self(), :notice)
     start_pleroma()
 
-    shell_info("""
+    IO.puts("""
     +------------------------+
     |  SPOOF SEARCH UPLOADS  |
     +------------------------+
@@ -55,7 +55,7 @@ def run(["spoof-inserted"]) do
     Logger.put_process_level(self(), :notice)
     start_pleroma()
 
-    shell_info("""
+    IO.puts("""
     +----------------------+
     |  SPOOF SEARCH NOTES  |
     +----------------------+
@@ -77,7 +77,7 @@ defp do_spoof_uploaded() do
           uploads_search_spoofs_local_dir(Config.get!([Pleroma.Uploaders.Local, :uploads]))
 
         _ ->
-          shell_info("""
+          IO.puts("""
           NOTE:
             Not using local uploader; thus not affected by this exploit.
             It's impossible to check for files, but in case local uploader was used before
@@ -98,13 +98,13 @@ defp do_spoof_uploaded() do
 
     orphaned_attachs = upload_search_orphaned_attachments(not_orphaned_urls)
 
-    shell_info("\nSearch concluded; here are the results:")
+    IO.puts("\nSearch concluded; here are the results:")
     pretty_print_list_with_title(emoji, "Emoji")
     pretty_print_list_with_title(files, "Uploaded Files")
     pretty_print_list_with_title(post_attachs, "(Not Deleted) Post Attachments")
     pretty_print_list_with_title(orphaned_attachs, "Orphaned Uploads")
 
-    shell_info("""
+    IO.puts("""
     In total found
       #{length(emoji)} emoji
       #{length(files)} uploads
@@ -116,7 +116,7 @@ defp do_spoof_uploaded() do
   defp uploads_search_spoofs_local_dir(dir) do
     local_dir = String.replace_suffix(dir, "/", "")
 
-    shell_info("Searching for suspicious files in #{local_dir}...")
+    IO.puts("Searching for suspicious files in #{local_dir}...")
 
     glob_ext = "{" <> Enum.join(@activity_exts, ",") <> "}"
 
@@ -128,7 +128,7 @@ defp uploads_search_spoofs_local_dir(dir) do
   end
 
   defp uploads_search_spoofs_notes() do
-    shell_info("Now querying DB for posts with spoofing attachments. This might take a while...")
+    IO.puts("Now querying DB for posts with spoofing attachments. This might take a while...")
 
     patterns = [local_id_pattern() | activity_ext_url_patterns()]
 
@@ -153,7 +153,7 @@ defp uploads_search_spoofs_notes() do
   end
 
   defp upload_search_orphaned_attachments(not_orphaned_urls) do
-    shell_info("""
+    IO.puts("""
     Now querying DB for orphaned spoofing attachment (i.e. their post was deleted,
     but if :cleanup_attachments was not enabled traces remain in the database)
     This might take a bit...
@@ -184,7 +184,7 @@ defp upload_search_orphaned_attachments(not_orphaned_urls) do
   # | S P O O F - I N S E R T E D |
   # +-----------------------------+
   defp do_spoof_inserted() do
-    shell_info("""
+    IO.puts("""
     Searching for local posts whose Create activity has no ActivityPub id...
       This is a pretty good indicator, but only for spoofs of local actors
       and only if the spoofing happened after around late 2021.
@@ -194,9 +194,9 @@ defp do_spoof_inserted() do
       search_local_notes_without_create_id()
       |> Enum.sort()
 
-    shell_info("Done.\n")
+    IO.puts("Done.\n")
 
-    shell_info("""
+    IO.puts("""
     Now trying to weed out other poorly hidden spoofs.
     This can't detect all and may have some false positives.
     """)
@@ -207,9 +207,9 @@ defp do_spoof_inserted() do
       search_sus_notes_by_id_patterns()
       |> Enum.filter(fn r -> !(r in likely_spoofed_posts_set) end)
 
-    shell_info("Done.\n")
+    IO.puts("Done.\n")
 
-    shell_info("""
+    IO.puts("""
     Finally, searching for spoofed, local user accounts.
     (It's impossible to detect spoofed remote users)
     """)
@@ -220,7 +220,7 @@ defp do_spoof_inserted() do
     pretty_print_list_with_title(idless_create, "Likely Spoofed Posts")
     pretty_print_list_with_title(spoofed_users, "Spoofed local user accounts")
 
-    shell_info("""
+    IO.puts("""
     In total found:
       #{length(spoofed_users)} bogus users
       #{length(idless_create)} likely spoofed posts
@@ -289,27 +289,27 @@ defp search_bogus_local_users() do
   defp pretty_print_list_with_title(list, title) do
     title_len = String.length(title)
     title_underline = String.duplicate("=", title_len)
-    shell_info(title)
-    shell_info(title_underline)
+    IO.puts(title)
+    IO.puts(title_underline)
     pretty_print_list(list)
   end
 
-  defp pretty_print_list([]), do: shell_info("")
+  defp pretty_print_list([]), do: IO.puts("")
 
   defp pretty_print_list([{a, o} | rest])
        when (is_binary(a) or is_number(a)) and is_binary(o) do
-    shell_info("  {#{a}, #{o}}")
+    IO.puts("  {#{a}, #{o}}")
     pretty_print_list(rest)
   end
 
   defp pretty_print_list([{u, a, o} | rest])
        when is_binary(a) and is_binary(u) and is_binary(o) do
-    shell_info("  {#{u}, #{a}, #{o}}")
+    IO.puts("  {#{u}, #{a}, #{o}}")
     pretty_print_list(rest)
   end
 
   defp pretty_print_list([e | rest]) when is_binary(e) do
-    shell_info("  #{e}")
+    IO.puts("  #{e}")
     pretty_print_list(rest)
   end
 

lib/mix/tasks/pleroma/user.ex

@@ -114,7 +114,7 @@ def run(["reset_password", nickname]) do
          {:ok, token} <- Pleroma.PasswordResetToken.create_token(user) do
       shell_info("Generated password reset token for #{user.nickname}")
 
-      shell_info("URL: #{~p[/api/v1/pleroma/password_reset/#{token.token}]}")
+      IO.puts("URL: #{~p[/api/v1/pleroma/password_reset/#{token.token}]}")
     else
       _ ->
         shell_error("No local user #{nickname}")
@@ -301,7 +301,7 @@ def run(["invite" | rest]) do
       shell_info("Generated user invite token " <> String.replace(invite.invite_type, "_", " "))
 
       url = url(~p[/registration/#{invite.token}])
-      shell_info(url)
+      IO.puts(url)
     else
       error ->
         shell_error("Could not create invite token: #{inspect(error)}")
@@ -373,7 +373,7 @@ def run(["show", nickname]) do
       nickname
       |> User.get_cached_by_nickname()
 
-    shell_info(user)
+    shell_info("#{inspect(user)}")
   end
 
   def run(["send_confirmation", nickname]) do
@@ -457,7 +457,7 @@ def run(["blocking", nickname]) do
 
     with %User{local: true} = user <- User.get_cached_by_nickname(nickname) do
       blocks = User.following_ap_ids(user)
-      shell_info(blocks)
+      IO.puts("#{inspect(blocks)}")
     end
   end
 
@@ -516,12 +516,12 @@ def run(["fix_follow_state", local_user, remote_user]) do
            {:follow_data, Pleroma.Web.ActivityPub.Utils.fetch_latest_follow(local, remote)} do
       calculated_state = User.following?(local, remote)
 
-      shell_info(
+      IO.puts(
         "Request state is #{request_state}, vs calculated state of following=#{calculated_state}"
       )
 
       if calculated_state == false && request_state == "accept" do
-        shell_info("Discrepancy found, fixing")
+        IO.puts("Discrepancy found, fixing")
         Pleroma.Web.CommonAPI.reject_follow_request(local, remote)
         shell_info("Relationship fixed")
       else
@@ -551,14 +551,14 @@ defp refetch_public_keys(query) do
     |> Stream.each(fn users ->
       users
       |> Enum.each(fn user ->
-        shell_info("Re-Resolving: #{user.ap_id}")
+        IO.puts("Re-Resolving: #{user.ap_id}")
 
         with {:ok, user} <- Pleroma.User.fetch_by_ap_id(user.ap_id),
              changeset <- Pleroma.User.update_changeset(user),
              {:ok, _user} <- Pleroma.User.update_and_set_cache(changeset) do
           :ok
         else
-          error -> shell_info("Could not resolve: #{user.ap_id}, #{inspect(error)}")
+          error -> IO.puts("Could not resolve: #{user.ap_id}, #{inspect(error)}")
         end
       end)
     end)

lib/pleroma/activity.ex

@@ -258,27 +258,6 @@ def get_create_by_object_ap_id(ap_id) when is_binary(ap_id) do
 
   def get_create_by_object_ap_id(_), do: nil
 
-  @doc """
-  Accepts a list of `ap__id`.
-  Returns a query yielding Create activities for the given objects,
-  in the same order as they were specified in the input list.
-  """
-  @spec get_presorted_create_by_object_ap_id([String.t()]) :: Ecto.Queryable.t()
-  def get_presorted_create_by_object_ap_id(ap_ids) do
-    from(
-      a in Activity,
-      join:
-        ids in fragment(
-          "SELECT * FROM UNNEST(?::text[]) WITH ORDINALITY AS ids(ap_id, ord)",
-          ^ap_ids
-        ),
-      on:
-        ids.ap_id == fragment("?->>'object'", a.data) and
-          fragment("?->>'type'", a.data) == "Create",
-      order_by: [asc: ids.ord]
-    )
-  end
-
   @doc """
   Accepts `ap_id` or list of `ap_id`.
   Returns a query.

lib/pleroma/activity/html.ex

@@ -28,7 +28,7 @@ defp get_cache_keys_for(activity_id) do
     end
   end
 
-  def add_cache_key_for(activity_id, additional_key) do
+  defp add_cache_key_for(activity_id, additional_key) do
     current = get_cache_keys_for(activity_id)
 
     unless additional_key in current do

lib/pleroma/application.ex

@@ -95,17 +95,34 @@ def start(_type, _args) do
 
     opts = [strategy: :one_for_one, name: Pleroma.Supervisor, max_restarts: max_restarts]
 
-    case Supervisor.start_link(children, opts) do
-      {:ok, data} ->
-        {:ok, data}
-
+    with {:ok, data} <- Supervisor.start_link(children, opts) do
+      set_postgres_server_version()
+      {:ok, data}
+    else
       e ->
-        Logger.critical("Failed to start!")
-        Logger.critical("#{inspect(e)}")
+        Logger.error("Failed to start!")
+        Logger.error("#{inspect(e)}")
         e
     end
   end
 
+  defp set_postgres_server_version do
+    version =
+      with %{rows: [[version]]} <- Ecto.Adapters.SQL.query!(Pleroma.Repo, "show server_version"),
+           {num, _} <- Float.parse(version) do
+        num
+      else
+        e ->
+          Logger.warning(
+            "Could not get the postgres version: #{inspect(e)}.\nSetting the default value of 9.6"
+          )
+
+          9.6
+      end
+
+    :persistent_term.put({Pleroma.Repo, :postgres_version}, version)
+  end
+
   def load_custom_modules do
     dir = Config.get([:modules, :runtime_dir])
 
@@ -162,9 +179,7 @@ defp cachex_children do
       build_cachex("translations", default_ttl: :timer.hours(24 * 30), limit: 2500),
       build_cachex("instances", default_ttl: :timer.hours(24), ttl_interval: 1000, limit: 2500),
       build_cachex("request_signatures", default_ttl: :timer.hours(24 * 30), limit: 3000),
-      build_cachex("rel_me", default_ttl: :timer.hours(24 * 30), limit: 300),
-      build_cachex("host_meta", default_ttl: :timer.minutes(120), limit: 5000),
-      build_cachex("http_backoff", default_ttl: :timer.hours(24 * 30), limit: 10000)
+      build_cachex("rel_me", default_ttl: :timer.hours(24 * 30), limit: 300)
     ]
   end
 
@@ -264,9 +279,7 @@ def limiters_setup do
   defp http_children do
     proxy_url = Config.get([:http, :proxy_url])
     proxy = Pleroma.HTTP.AdapterHelper.format_proxy(proxy_url)
-    pool_size = Config.get([:http, :pool_size], 10)
-    pool_timeout = Config.get([:http, :pool_timeout], 60_000)
-    connection_timeout = Config.get([:http, :conn_max_idle_time], 10_000)
+    pool_size = Config.get([:http, :pool_size])
 
     :public_key.cacerts_load()
 
@@ -276,8 +289,6 @@ defp http_children do
       |> Pleroma.HTTP.AdapterHelper.add_pool_size(pool_size)
       |> Pleroma.HTTP.AdapterHelper.maybe_add_proxy_pool(proxy)
       |> Pleroma.HTTP.AdapterHelper.ensure_ipv6()
-      |> Pleroma.HTTP.AdapterHelper.add_default_conn_max_idle_time(connection_timeout)
-      |> Pleroma.HTTP.AdapterHelper.add_default_pool_max_idle_time(pool_timeout)
       |> Keyword.put(:name, MyFinch)
 
     [{Finch, config}]

lib/pleroma/collections/fetcher.ex

@@ -14,7 +14,7 @@ defmodule Akkoma.Collections.Fetcher do
   @spec fetch_collection(String.t() | map()) :: {:ok, [Pleroma.Object.t()]} | {:error, any()}
   def fetch_collection(ap_id) when is_binary(ap_id) do
     with {:ok, page} <- Fetcher.fetch_and_contain_remote_object_from_id(ap_id) do
-      partial_as_success(objects_from_collection(page))
+      {:ok, objects_from_collection(page)}
     else
       e ->
         Logger.error("Could not fetch collection #{ap_id} - #{inspect(e)}")
@@ -24,12 +24,9 @@ def fetch_collection(ap_id) when is_binary(ap_id) do
 
   def fetch_collection(%{"type" => type} = page)
       when type in ["Collection", "OrderedCollection", "CollectionPage", "OrderedCollectionPage"] do
-    partial_as_success(objects_from_collection(page))
+    {:ok, objects_from_collection(page)}
   end
 
-  defp partial_as_success({:partial, items}), do: {:ok, items}
-  defp partial_as_success(res), do: res
-
   defp items_in_page(%{"type" => type, "orderedItems" => items})
        when is_list(items) and type in ["OrderedCollection", "OrderedCollectionPage"],
        do: items
@@ -56,11 +53,11 @@ defp objects_from_collection(%{"type" => type, "first" => %{"id" => id}})
     fetch_page_items(id)
   end
 
-  defp objects_from_collection(_page), do: {:ok, []}
+  defp objects_from_collection(_page), do: []
 
   defp fetch_page_items(id, items \\ []) do
     if Enum.count(items) >= Config.get([:activitypub, :max_collection_objects]) do
-      {:ok, items}
+      items
     else
       with {:ok, page} <- Fetcher.fetch_and_contain_remote_object_from_id(id) do
         objects = items_in_page(page)
@@ -68,22 +65,18 @@ defp fetch_page_items(id, items \\ []) do
         if Enum.count(objects) > 0 do
           maybe_next_page(page, items ++ objects)
         else
-          {:ok, items}
+          items
         end
       else
         {:error, :not_found} ->
-          {:ok, items}
+          items
 
         {:error, :forbidden} ->
-          {:ok, items}
+          items
 
         {:error, error} ->
           Logger.error("Could not fetch page #{id} - #{inspect(error)}")
-
-          case items do
-            [] -> {:error, error}
-            _ -> {:partial, items}
-          end
+          {:error, error}
       end
     end
   end
@@ -92,5 +85,5 @@ defp maybe_next_page(%{"next" => id}, items) when is_binary(id) do
     fetch_page_items(id, items)
   end
 
-  defp maybe_next_page(_, items), do: {:ok, items}
+  defp maybe_next_page(_, items), do: items
 end

lib/pleroma/config/transfer_task.ex

@@ -24,6 +24,7 @@ defp reboot_time_keys,
   defp reboot_time_subkeys,
     do: [
       {:pleroma, Pleroma.Captcha, [:seconds_valid]},
+      {:pleroma, Pleroma.Upload, [:proxy_remote]},
       {:pleroma, :instance, [:upload_limit]},
       {:pleroma, :http, [:pool_size]},
       {:pleroma, :http, [:proxy_url]}

lib/pleroma/constants.ex

@@ -25,7 +25,7 @@ defmodule Pleroma.Constants do
 
   const(static_only_files,
     do:
-      ~w(index.html robots.txt static static-fe finmoji emoji packs sounds images instance embed sw.js sw-pleroma.js favicon.png schemas doc)
+      ~w(index.html robots.txt static static-fe finmoji emoji packs sounds images instance embed sw.js sw-pleroma.js favicon.png schemas doc assets)
   )
 
   const(status_updatable_fields,
@@ -64,7 +64,4 @@ defmodule Pleroma.Constants do
       "Service"
     ]
   )
-
-  # Internally used as top-level types for media attachments and user images
-  const(attachment_types, do: ["Document", "Image"])
 end

lib/pleroma/emails/mailer.ex

@@ -84,14 +84,8 @@ defp default_config(Swoosh.Adapters.SMTP, conf, _) do
       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,
-      # This allows wildcard ceritifcates to be verified properly.
-      # The :https parameter simply means to use the HTTPS wildcard format
-      # (as opposed to say LDAP). SMTP servers tend to use the same type of
-      # certs as HTTPS ones so this should work for most.
-      customize_hostname_check: [
-        match_fun: :public_key.pkix_verify_hostname_match_fun(:https)
-      ],
       # the default of 10 is too restrictive
       depth: 32
     ]

lib/pleroma/emoji/pack.ex

@@ -25,7 +25,6 @@ defmodule Pleroma.Emoji.Pack do
   alias Pleroma.Emoji
   alias Pleroma.Emoji.Pack
   alias Pleroma.Utils
-  alias Pleroma.SafeZip
 
   # Invalid/Malicious names are supposed to be filtered out before path joining,
   # but there are many entrypoints to affected functions so as the code changes
@@ -96,20 +95,22 @@ def delete(name) do
     end
   end
 
-  @spec map_zip_emojis(list(String.t())) :: list(map())
-  defp map_zip_emojis(zip_files) do
-    Enum.reduce(zip_files, [], fn path, acc ->
-      with(
-        filename <- Path.basename(path),
-        shortcode <- Path.basename(filename, Path.extname(filename)),
-        # note: this only checks the shortcode, if an emoji already exists on the same path, but
-        #       with a different shortcode, the existing one will be degraded to an alias of the new
-        false <- Emoji.exist?(shortcode)
-      ) do
-        [%{path: path, filename: path, shortcode: shortcode} | acc]
-      else
-        _ -> acc
-      end
+  @spec unpack_zip_emojies(list(tuple())) :: list(map())
+  defp unpack_zip_emojies(zip_files) do
+    Enum.reduce(zip_files, [], fn
+      {_, path, s, _, _, _}, acc when elem(s, 2) == :regular ->
+        with(
+          filename <- Path.basename(path),
+          shortcode <- Path.basename(filename, Path.extname(filename)),
+          false <- Emoji.exist?(shortcode)
+        ) do
+          [%{path: path, filename: path, shortcode: shortcode} | acc]
+        else
+          _ -> acc
+        end
+
+      _, acc ->
+        acc
     end)
   end
 
@@ -117,15 +118,18 @@ defp map_zip_emojis(zip_files) do
           {:ok, t()}
           | {:error, File.posix() | atom()}
   def add_file(%Pack{} = pack, _, _, %Plug.Upload{content_type: "application/zip"} = file) do
-    with {:ok, zip_files} <- SafeZip.list_dir_file(file.path),
-         [_ | _] = emojis <- map_zip_emojis(zip_files),
+    with {:ok, zip_files} <- :zip.table(to_charlist(file.path)),
+         [_ | _] = emojies <- unpack_zip_emojies(zip_files),
          {:ok, tmp_dir} <- Utils.tmp_dir("emoji") do
       try do
         {:ok, _emoji_files} =
-          SafeZip.unzip_file(file.path, tmp_dir, Enum.map(emojis, & &1[:path]))
+          :zip.unzip(
+            to_charlist(file.path),
+            [{:file_list, Enum.map(emojies, & &1[:path])}, {:cwd, tmp_dir}]
+          )
 
         {_, updated_pack} =
-          Enum.map_reduce(emojis, pack, fn item, emoji_pack ->
+          Enum.map_reduce(emojies, pack, fn item, emoji_pack ->
             emoji_file = %Plug.Upload{
               filename: item[:filename],
               path: path_join_safe(tmp_dir, item[:path])
@@ -442,9 +446,16 @@ defp downloadable?(pack) do
   end
 
   defp create_archive_and_cache(pack, hash) do
-    pack_file_list = Enum.into(pack.files, [], fn {_, f} -> f end)
-    files = ["pack.json" | pack_file_list]
-    {:ok, {_, result}} = SafeZip.zip("#{pack.name}.zip", files, pack.path, true)
+    files = [
+      ~c"pack.json"
+      | Enum.map(pack.files, fn {_, file} ->
+          {:ok, file} = Path.safe_relative(file)
+          to_charlist(file)
+        end)
+    ]
+
+    {:ok, {_, result}} =
+      :zip.zip(~c"#{pack.name}.zip", files, [:memory, cwd: to_charlist(pack.path)])
 
     ttl_per_file = Pleroma.Config.get!([:emoji, :shared_pack_cache_seconds_per_file])
     overall_ttl = :timer.seconds(ttl_per_file * Enum.count(files))
@@ -615,10 +626,11 @@ defp copy_as(remote_pack, local_name) do
 
   defp unzip(archive, pack_info, remote_pack, local_pack) do
     with :ok <- File.mkdir_p!(local_pack.path) do
-      files = Enum.map(remote_pack["files"], fn {_, path} -> path end)
+      files = Enum.map(remote_pack["files"], fn {_, path} -> to_charlist(path) end)
       # Fallback cannot contain a pack.json file
-      files = if pack_info[:fallback], do: files, else: ["pack.json" | files]
-      SafeZip.unzip_data(archive, local_pack.path, files)
+      files = if pack_info[:fallback], do: files, else: [~c"pack.json" | files]
+
+      :zip.unzip(archive, cwd: to_charlist(local_pack.path), file_list: files)
     end
   end
 
@@ -681,14 +693,13 @@ defp update_sha_and_save_metadata(pack, data) do
   end
 
   defp validate_has_all_files(pack, zip) do
-    # Check if all files from the pack.json are in the archive
-    eset =
-      Enum.reduce(pack.files, MapSet.new(), fn
-        {_, file}, s -> MapSet.put(s, to_charlist(file))
+    with {:ok, f_list} <- :zip.unzip(zip, [:memory]) do
+      # Check if all files from the pack.json are in the archive
+      pack.files
+      |> Enum.all?(fn {_, from_manifest} ->
+        List.keyfind(f_list, to_charlist(from_manifest), 0)
       end)
-
-    if SafeZip.contains_all_data?(zip, eset),
-      do: :ok,
-      else: {:error, :incomplete}
+      |> if(do: :ok, else: {:error, :incomplete})
+    end
   end
 end

lib/pleroma/frontend.ex

@@ -70,12 +70,21 @@ defp download_or_unzip(_frontend_info, temp_dir, file) do
   end
 
   def unzip(zip, dest) do
-    File.rm_rf!(dest)
-    File.mkdir_p!(dest)
+    with {:ok, unzipped} <- :zip.unzip(zip, [:memory]) do
+      File.rm_rf!(dest)
+      File.mkdir_p!(dest)
 
-    case Pleroma.SafeZip.unzip_data(zip, dest) do
-      {:ok, _} -> :ok
-      error -> error
+      Enum.each(unzipped, fn {filename, data} ->
+        path = filename
+
+        new_file_path = Path.join(dest, path)
+
+        new_file_path
+        |> Path.dirname()
+        |> File.mkdir_p!()
+
+        File.write!(new_file_path, data)
+      end)
     end
   end
 

lib/pleroma/html.ex

@@ -6,6 +6,8 @@ defmodule Pleroma.HTML do
   # Scrubbers are compiled on boot so they can be configured in OTP releases
   #  @on_load :compile_scrubbers
 
+  @cachex Pleroma.Config.get([:cachex, :provider], Cachex)
+
   def compile_scrubbers do
     dir = Path.join(:code.priv_dir(:pleroma), "scrubbers")
 
@@ -65,9 +67,22 @@ def ensure_scrubbed_html(
     end
   end
 
-  @spec extract_first_external_url_from_object(Pleroma.Object.t()) :: String.t() | nil
-  def extract_first_external_url_from_object(%{data: %{"content" => content}})
+  def extract_first_external_url_from_object(%{data: %{"content" => content}} = object)
       when is_binary(content) do
+    unless object.data["fake"] do
+      key = "URL|#{object.id}"
+
+      @cachex.fetch!(:scrubber_cache, key, fn _key ->
+        {:commit, {:ok, extract_first_external_url(content)}}
+      end)
+    else
+      {:ok, extract_first_external_url(content)}
+    end
+  end
+
+  def extract_first_external_url_from_object(_), do: {:error, :no_content}
+
+  def extract_first_external_url(content) do
     content
     |> Floki.parse_fragment!()
     |> Floki.find("a:not(.mention,.hashtag,.attachment,[rel~=\"tag\"])")
@@ -75,6 +90,4 @@ def extract_first_external_url_from_object(%{data: %{"content" => content}})
     |> Floki.attribute("href")
     |> Enum.at(0)
   end
-
-  def extract_first_external_url_from_object(_), do: nil
 end

lib/pleroma/http.ex

@@ -74,12 +74,7 @@ def request(method, url, body, headers, options) when is_binary(url) do
     request = build_request(method, headers, options, url, body, params)
     client = Tesla.client([Tesla.Middleware.FollowRedirects, Tesla.Middleware.Telemetry])
 
-    Logger.debug("Outbound: #{method} #{url}")
     request(client, request)
-  rescue
-    e ->
-      Logger.error("Failed to fetch #{url}: #{inspect(e)}")
-      {:error, :fetch_error}
   end
 
   @spec request(Client.t(), keyword()) :: {:ok, Env.t()} | {:error, any()}

lib/pleroma/http/adapter_helper.ex

@@ -116,20 +116,6 @@ defp maybe_add_transport_opts(opts) do
     put_in(opts, [:pools, :default, :conn_opts, :transport_opts, :inet6], true)
   end
 
-  def add_default_pool_max_idle_time(opts, pool_timeout) do
-    opts
-    |> maybe_add_pools()
-    |> maybe_add_default_pool()
-    |> put_in([:pools, :default, :pool_max_idle_time], pool_timeout)
-  end
-
-  def add_default_conn_max_idle_time(opts, connection_timeout) do
-    opts
-    |> maybe_add_pools()
-    |> maybe_add_default_pool()
-    |> put_in([:pools, :default, :conn_max_idle_time], connection_timeout)
-  end
-
   @doc """
   Merge default connection & adapter options with received ones.
   """

lib/pleroma/http/backoff.ex

@@ -1,121 +0,0 @@
-defmodule Pleroma.HTTP.Backoff do
-  alias Pleroma.HTTP
-  require Logger
-
-  @cachex Pleroma.Config.get([:cachex, :provider], Cachex)
-  @backoff_cache :http_backoff_cache
-
-  # attempt to parse a timestamp from a header
-  # returns nil if it can't parse the timestamp
-  @spec timestamp_or_nil(binary) :: DateTime.t() | nil
-  defp timestamp_or_nil(header) do
-    case DateTime.from_iso8601(header) do
-      {:ok, stamp, _} ->
-        stamp
-
-      _ ->
-        nil
-    end
-  end
-
-  # attempt to parse the x-ratelimit-reset header from the headers
-  @spec x_ratelimit_reset(headers :: list) :: DateTime.t() | nil
-  defp x_ratelimit_reset(headers) do
-    with {_header, value} <- List.keyfind(headers, "x-ratelimit-reset", 0),
-         true <- is_binary(value) do
-      timestamp_or_nil(value)
-    else
-      _ ->
-        nil
-    end
-  end
-
-  # attempt to parse the Retry-After header from the headers
-  # this can be either a timestamp _or_ a number of seconds to wait!
-  # we'll return a datetime if we can parse it, or nil if we can't
-  @spec retry_after(headers :: list) :: DateTime.t() | nil
-  defp retry_after(headers) do
-    with {_header, value} <- List.keyfind(headers, "retry-after", 0),
-         true <- is_binary(value) do
-      # first, see if it's an integer
-      case Integer.parse(value) do
-        {seconds, ""} ->
-          Logger.debug("Parsed Retry-After header: #{seconds} seconds")
-          DateTime.utc_now() |> Timex.shift(seconds: seconds)
-
-        _ ->
-          # if it's not an integer, try to parse it as a timestamp
-          timestamp_or_nil(value)
-      end
-    else
-      _ ->
-        nil
-    end
-  end
-
-  # given a set of headers, will attempt to find the next backoff timestamp
-  # if it can't find one, it will default to 5 minutes from now
-  @spec next_backoff_timestamp(%{headers: list}) :: DateTime.t()
-  defp next_backoff_timestamp(%{headers: headers}) when is_list(headers) do
-    default_5_minute_backoff =
-      DateTime.utc_now()
-      |> Timex.shift(seconds: 5 * 60)
-
-    backoff =
-      [&x_ratelimit_reset/1, &retry_after/1]
-      |> Enum.map(& &1.(headers))
-      |> Enum.find(&(&1 != nil))
-
-    if is_nil(backoff) do
-      Logger.debug("No backoff headers found, defaulting to 5 minutes from now")
-      default_5_minute_backoff
-    else
-      Logger.debug("Found backoff header, will back off until: #{backoff}")
-      backoff
-    end
-  end
-
-  defp next_backoff_timestamp(_), do: DateTime.utc_now() |> Timex.shift(seconds: 5 * 60)
-
-  # utility function to check the HTTP response for potential backoff headers
-  # will check if we get a 429 or 503 response, and if we do, will back off for a bit
-  @spec check_backoff({:ok | :error, HTTP.Env.t()}, binary()) ::
-          {:ok | :error, HTTP.Env.t()} | {:error, :ratelimit}
-  defp check_backoff({:ok, env}, host) do
-    case env.status do
-      status when status in [429, 503] ->
-        Logger.error("Rate limited on #{host}! Backing off...")
-        timestamp = next_backoff_timestamp(env)
-        ttl = Timex.diff(timestamp, DateTime.utc_now(), :seconds)
-        # we will cache the host for 5 minutes
-        @cachex.put(@backoff_cache, host, true, ttl: ttl)
-        {:error, :ratelimit}
-
-      _ ->
-        {:ok, env}
-    end
-  end
-
-  defp check_backoff(env, _), do: env
-
-  @doc """
-  this acts as a single throughput for all GET requests
-  we will check if the host is in the cache, and if it is, we will automatically fail the request
-  this ensures that we don't hammer the server with requests, and instead wait for the backoff to expire
-  this is a very simple implementation, and can be improved upon!
-  """
-  @spec get(binary, list, list) :: {:ok | :error, HTTP.Env.t()} | {:error, :ratelimit}
-  def get(url, headers \\ [], options \\ []) do
-    %{host: host} = URI.parse(url)
-
-    case @cachex.get(@backoff_cache, host) do
-      {:ok, nil} ->
-        url
-        |> HTTP.get(headers, options)
-        |> check_backoff(host)
-
-      _ ->
-        {:error, :ratelimit}
-    end
-  end
-end

lib/pleroma/instances/instance.ex

@@ -158,14 +158,6 @@ def needs_update(%Instance{metadata_updated_at: metadata_updated_at}) do
     NaiveDateTime.diff(now, metadata_updated_at) > 86_400
   end
 
-  def needs_update(%URI{host: host}) do
-    with %Instance{} = instance <- Repo.get_by(Instance, %{host: host}) do
-      needs_update(instance)
-    else
-      _ -> true
-    end
-  end
-
   def local do
     %Instance{
       host: Pleroma.Web.Endpoint.host(),
@@ -188,7 +180,7 @@ def update_metadata(%URI{host: host} = uri) do
   defp do_update_metadata(%URI{host: host} = uri, existing_record) do
     if existing_record do
       if needs_update(existing_record) do
-        Logger.debug("Updating metadata for #{host}")
+        Logger.info("Updating metadata for #{host}")
         favicon = scrape_favicon(uri)
         nodeinfo = scrape_nodeinfo(uri)
 
@@ -207,7 +199,7 @@ defp do_update_metadata(%URI{host: host} = uri, existing_record) do
       favicon = scrape_favicon(uri)
       nodeinfo = scrape_nodeinfo(uri)
 
-      Logger.debug("Creating metadata for #{host}")
+      Logger.info("Creating metadata for #{host}")
 
       %Instance{}
       |> changeset(%{

lib/pleroma/keys.ex

@@ -0,0 +1,46 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Pleroma.Keys do
+  # Native generation of RSA keys is only available since OTP 20+ and in default build conditions
+  # We try at compile time to generate natively an RSA key otherwise we fallback on the old way.
+  try do
+    _ = :public_key.generate_key({:rsa, 2048, 65_537})
+
+    def generate_rsa_pem do
+      key = :public_key.generate_key({:rsa, 2048, 65_537})
+      entry = :public_key.pem_entry_encode(:RSAPrivateKey, key)
+      pem = :public_key.pem_encode([entry]) |> String.trim_trailing()
+      {:ok, pem}
+    end
+  rescue
+    _ ->
+      def generate_rsa_pem do
+        port = Port.open({:spawn, "openssl genrsa"}, [:binary])
+
+        {:ok, pem} =
+          receive do
+            {^port, {:data, pem}} -> {:ok, pem}
+          end
+
+        Port.close(port)
+
+        if Regex.match?(~r/RSA PRIVATE KEY/, pem) do
+          {:ok, pem}
+        else
+          :error
+        end
+      end
+  end
+
+  def keys_from_pem(pem) do
+    with [private_key_code] <- :public_key.pem_decode(pem),
+         private_key <- :public_key.pem_entry_decode(private_key_code),
+         {:RSAPrivateKey, _, modulus, exponent, _, _, _, _, _, _, _} <- private_key do
+      {:ok, private_key, {:RSAPublicKey, modulus, exponent}}
+    else
+      error -> {:error, error}
+    end
+  end
+end

lib/pleroma/object.ex

@@ -9,6 +9,7 @@ defmodule Pleroma.Object do
   import Ecto.Changeset
 
   alias Pleroma.Activity
+  alias Pleroma.Config
   alias Pleroma.Hashtag
   alias Pleroma.Object
   alias Pleroma.Object.Fetcher
@@ -215,11 +216,6 @@ def get_cached_by_ap_id(ap_id) do
     end
   end
 
-  # Intentionally accepts non-Object arguments!
-  @spec tombstone_object?(term()) :: boolean()
-  def tombstone_object?(%Object{data: %{"type" => "Tombstone"}}), do: true
-  def tombstone_object?(_), do: false
-
   def make_tombstone(%Object{data: %{"id" => id, "type" => type}}, deleted \\ DateTime.utc_now()) do
     %ObjectTombstone{
       id: id,
@@ -245,11 +241,23 @@ def delete(%Object{data: %{"id" => id}} = object) do
     with {:ok, _obj} = swap_object_with_tombstone(object),
          deleted_activity = Activity.delete_all_by_object_ap_id(id),
          {:ok, _} <- invalid_object_cache(object) do
-      AttachmentsCleanupWorker.enqueue_if_needed(object.data)
+      cleanup_attachments(
+        Config.get([:instance, :cleanup_attachments]),
+        %{object: object}
+      )
+
       {:ok, object, deleted_activity}
     end
   end
 
+  @spec cleanup_attachments(boolean(), %{required(:object) => map()}) ::
+          {:ok, Oban.Job.t() | nil}
+  def cleanup_attachments(true, %{object: _} = params) do
+    AttachmentsCleanupWorker.enqueue("cleanup_attachments", params)
+  end
+
+  def cleanup_attachments(_, _), do: {:ok, nil}
+
   def prune(%Object{data: %{"id" => _id}} = object) do
     with {:ok, object} <- Repo.delete(object),
          {:ok, _} <- invalid_object_cache(object) do

lib/pleroma/object/containment.ex

@@ -12,6 +12,8 @@ defmodule Pleroma.Object.Containment do
   spoofing, therefore removal of object containment functions is NOT recommended.
   """
 
+  alias Pleroma.Web.ActivityPub.Transmogrifier
+
   def get_actor(%{"actor" => actor}) when is_binary(actor) do
     actor
   end
@@ -48,39 +50,16 @@ def get_object(_) do
   defp compare_uris(%URI{host: host} = _id_uri, %URI{host: host} = _other_uri), do: :ok
   defp compare_uris(_id_uri, _other_uri), do: :error
 
-  defp uri_strip_slash(%URI{path: path} = uri) when is_binary(path),
-    do: %{uri | path: String.replace_suffix(path, "/", "")}
+  defp compare_uris_exact(uri, uri), do: :ok
 
-  defp uri_strip_slash(uri), do: uri
+  defp compare_uris_exact(%URI{} = id, %URI{} = other),
+    do: compare_uris_exact(URI.to_string(id), URI.to_string(other))
 
-  # domain names are case-insensitive per spec (other parts of URIs aren’t necessarily)
-  defp uri_normalise_host(%URI{host: host} = uri) when is_binary(host),
-    do: %{uri | host: String.downcase(host, :ascii)}
-
-  defp uri_normalise_host(uri), do: uri
-
-  defp compare_uri_identities(uri, uri), do: :ok
-
-  defp compare_uri_identities(id_uri, other_uri) when is_binary(id_uri) and is_binary(other_uri),
-    do: compare_uri_identities(URI.parse(id_uri), URI.parse(other_uri))
-
-  defp compare_uri_identities(%URI{} = id, %URI{} = other) do
-    normid =
-      %{id | fragment: nil}
-      |> uri_strip_slash()
-      |> uri_normalise_host()
-
-    normother =
-      %{other | fragment: nil}
-      |> uri_strip_slash()
-      |> uri_normalise_host()
-
-    # Conversion back to binary avoids issues from non-normalised deprecated authority field
-    if URI.to_string(normid) == URI.to_string(normother) do
-      :ok
-    else
-      :error
-    end
+  defp compare_uris_exact(id_uri, other_uri)
+       when is_binary(id_uri) and is_binary(other_uri) do
+    norm_id = String.replace_suffix(id_uri, "/", "")
+    norm_other = String.replace_suffix(other_uri, "/", "")
+    if norm_id == norm_other, do: :ok, else: :error
   end
 
   @doc """
@@ -114,13 +93,21 @@ def contain_origin(id, %{"attributedTo" => actor} = params),
   def contain_origin(_id, _data), do: :ok
 
   @doc """
-  Check whether the fetch URL (after redirects) is the
-  same location the canonical ActivityPub id points to.
+  Check whether the fetch URL (after redirects) exactly (sans tralining slash) matches either
+  the canonical ActivityPub id or the objects url field (for display URLs from *key and Mastodon)
 
   Since this is meant to be used for fetches, anonymous or transient objects are not accepted here.
   """
-  def contain_id_to_fetch(url, %{"id" => id}) when is_binary(id) do
-    compare_uri_identities(url, id)
+  def contain_id_to_fetch(url, %{"id" => id} = data) when is_binary(id) do
+    with {:id, :error} <- {:id, compare_uris_exact(id, url)},
+         # "url" can be a "Link" object and this is checked before full normalisation
+         display_url <- Transmogrifier.fix_url(data)["url"],
+         true <- display_url != nil do
+      compare_uris_exact(display_url, url)
+    else
+      {:id, :ok} -> :ok
+      _ -> :error
+    end
   end
 
   def contain_id_to_fetch(_url, _data), do: :error
@@ -157,16 +144,4 @@ def same_origin(id1, id2) do
 
     compare_uris(uri1, uri2)
   end
-
-  @doc """
-  Checks whether a key_id - owner_id pair are acceptable.
-
-  While in theory keys and actors on different domain could be verified
-  by fetching both and checking the links on both ends (if different at all),
-  this requires extra fetches and there are no known implementations with split
-  actor and key domains, thus atm this simply requires same domain.
-  """
-  def contain_key_user(key_id, user_id) do
-    same_origin(key_id, user_id)
-  end
 end

lib/pleroma/object/fetcher.ex

@@ -116,7 +116,7 @@ defp reinject_object(%Object{} = object, new_data) do
   @doc "Assumes object already is in our database and refetches from remote to update (e.g. for polls)"
   def refetch_object(%Object{data: %{"id" => id}} = object) do
     with {:local, false} <- {:local, Object.local?(object)},
-         {:ok, new_data} <- fetch_and_contain_remote_object_from_id(id, true),
+         {:ok, new_data} <- fetch_and_contain_remote_object_from_id(id),
          {:id, true} <- {:id, new_data["id"] == id},
          {:ok, object} <- reinject_object(object, new_data) do
       {:ok, object}
@@ -253,75 +253,14 @@ defp maybe_date_fetch(headers, date) do
     end
   end
 
-  @doc """
-  Fetches arbitrary remote object and performs basic safety and authenticity checks.
-  When the fetch URL is known to already be a canonical AP id, checks are stricter.
-  """
-  def fetch_and_contain_remote_object_from_id(id, is_ap_id \\ false)
+  @doc "Fetches arbitrary remote object and performs basic safety and authenticity checks"
+  def fetch_and_contain_remote_object_from_id(id)
 
-  def fetch_and_contain_remote_object_from_id(%{"id" => id}, is_ap_id),
-    do: fetch_and_contain_remote_object_from_id(id, is_ap_id)
+  def fetch_and_contain_remote_object_from_id(%{"id" => id}),
+    do: fetch_and_contain_remote_object_from_id(id)
 
-  def fetch_and_contain_remote_object_from_id(id, is_ap_id) when is_binary(id) do
-    Logger.debug("Fetching object #{id} via AP [ap_id=#{is_ap_id}]")
-
-    fetch_and_contain_remote_ap_doc(
-      id,
-      is_ap_id,
-      fn final_uri, data -> {Containment.contain_id_to_fetch(final_uri, data), data["id"]} end
-    )
-  end
-
-  def fetch_and_contain_remote_object_from_id(_id, _is_ap_id),
-    do: {:error, :invalid_id}
-
-  def fetch_and_contain_remote_key(id) do
-    Logger.debug("Fetching remote actor key #{id}")
-
-    fetch_and_contain_remote_ap_doc(
-      id,
-      # key IDs are alwas AP IDs which should resolve directly and exactly
-      true,
-      fn
-        final_uri, %{"id" => user_id, "publicKey" => %{"id" => key_id}} ->
-          # For non-fragment keys as used e.g. by GTS, the "id" won't match the fetch URI,
-          # but the key ID will. Thus do NOT strict check the top-lelve id, but byte-exact
-          # check the key ID (since for later lookups we need byte-exact matches).
-          # This relies on fetching already enforcing a domain match for toplevel id and host
-          with :ok <- Containment.contain_key_user(key_id, user_id),
-               true <- key_id == final_uri do
-            {:ok, key_id}
-          else
-            _ -> {:error, key_id}
-          end
-
-        final_uri,
-        %{"type" => "CryptographicKey", "id" => key_id, "owner" => user_id, "publicKeyPem" => _} ->
-          # XXX: refactor into separate function isntead of duplicating
-          with :ok <- Containment.contain_key_user(key_id, user_id),
-               true <- key_id == final_uri do
-            {:ok, key_id}
-          else
-            _ -> {:error, nil}
-          end
-
-        _, _ ->
-          {:error, nil}
-      end
-    )
-  end
-
-  # Fetches an AP document and performing variable security checks on it.
-  #
-  # Note that the received documents "id" matching the final host domain
-  # is always enforced before the custom ID check runs.
-  @spec fetch_and_contain_remote_ap_doc(
-          String.t(),
-          boolean(),
-          (String.t(), Map.t() -> {:ok | :error, String.t() | term()})
-        ) :: {:ok, Map.t()} | {:reject, term()} | {:error, term()}
-  defp fetch_and_contain_remote_ap_doc(id, is_ap_id, verify_id) do
-    Logger.debug("Dereferencing AP doc #{}")
+  def fetch_and_contain_remote_object_from_id(id) when is_binary(id) do
+    Logger.debug("Fetching object #{id} via AP")
 
     with {:valid_uri_scheme, true} <- {:valid_uri_scheme, String.starts_with?(id, "http")},
          %URI{} = uri <- URI.parse(id),
@@ -331,29 +270,18 @@ defp fetch_and_contain_remote_ap_doc(id, is_ap_id, verify_id) do
            {:mrf_accept_check, Pleroma.Web.ActivityPub.MRF.SimplePolicy.check_accept(uri)},
          {:local_fetch, :ok} <- {:local_fetch, Containment.contain_local_fetch(id)},
          {:ok, final_id, body} <- get_object(id),
-         # a canonical ID shouldn't be a redirect
-         true <- !is_ap_id || final_id == id,
          {:ok, data} <- safe_json_decode(body),
-         {_, :ok} <- {:containment, Containment.contain_origin(final_id, data)},
-         {_, {:ok, _}} <- {:strict_id, verify_id.(final_id, data)} do
+         {_, :ok} <- {:strict_id, Containment.contain_id_to_fetch(final_id, data)},
+         {_, :ok} <- {:containment, Containment.contain_origin(final_id, data)} do
       unless Instances.reachable?(final_id) do
         Instances.set_reachable(final_id)
       end
 
       {:ok, data}
     else
-      # E.g.  Mastodon and *key serve the AP object directly under their display URLs without
-      # redirecting to their canonical location first, thus ids will expectedly differ.
-      # Similarly keys, either use a fragment ID and are a subobjects or a distinct ID
-      # but for compatibility are still a subobject presenting their owning actors ID at the toplevel.
-      # Refetching _once_ from the listed id, should yield a strict match afterwards.
-      {:strict_id, {_error, ap_id}} = e ->
-        if !is_ap_id and is_binary(ap_id) do
-          fetch_and_contain_remote_ap_doc(ap_id, true, verify_id)
-        else
-          log_fetch_error(id, e)
-          {:error, :id_mismatch}
-        end
+      {:strict_id, _} = e ->
+        log_fetch_error(id, e)
+        {:error, :id_mismatch}
 
       {:mrf_reject_check, _} = e ->
         log_fetch_error(id, e)
@@ -373,7 +301,7 @@ defp fetch_and_contain_remote_ap_doc(id, is_ap_id, verify_id) do
 
       {:containment, reason} ->
         log_fetch_error(id, reason)
-        {:error, {:containment, reason}}
+        {:error, reason}
 
       {:error, e} ->
         {:error, e}
@@ -383,10 +311,25 @@ defp fetch_and_contain_remote_ap_doc(id, is_ap_id, verify_id) do
     end
   end
 
+  def fetch_and_contain_remote_object_from_id(_id),
+    do: {:error, :invalid_id}
+
+  defp check_crossdomain_redirect(final_host, original_url)
+
   # HOPEFULLY TEMPORARY
   # Basically none of our Tesla mocks in tests set the (supposed to
   # exist for Tesla proper) url parameter for their responses
   # causing almost every fetch in test to fail otherwise
+  if @mix_env == :test do
+    defp check_crossdomain_redirect(nil, _) do
+      {:cross_domain_redirect, false}
+    end
+  end
+
+  defp check_crossdomain_redirect(final_host, original_url) do
+    {:cross_domain_redirect, final_host != URI.parse(original_url).host}
+  end
+
   if @mix_env == :test do
     defp get_final_id(nil, initial_url), do: initial_url
     defp get_final_id("", initial_url), do: initial_url
@@ -411,7 +354,11 @@ def get_object(id) do
 
     with {:ok, %{body: body, status: code, headers: headers, url: final_url}}
          when code in 200..299 <-
-           HTTP.Backoff.get(id, headers),
+           HTTP.get(id, headers),
+         remote_host <-
+           URI.parse(final_url).host,
+         {:cross_domain_redirect, false} <-
+           check_crossdomain_redirect(remote_host, id),
          {:has_content_type, {_, content_type}} <-
            {:has_content_type, List.keyfind(headers, "content-type", 0)},
          {:parse_content_type, {:ok, "application", subtype, type_params}} <-
@@ -422,12 +369,8 @@ def get_object(id) do
         {"activity+json", _} ->
           {:ok, final_id, body}
 
-        {"ld+json", %{"profile" => profiles}} ->
-          if "https://www.w3.org/ns/activitystreams" in String.split(profiles) do
-            {:ok, final_id, body}
-          else
-            {:error, {:content_type, content_type}}
-          end
+        {"ld+json", %{"profile" => "https://www.w3.org/ns/activitystreams"}} ->
+          {:ok, final_id, body}
 
         _ ->
           {:error, {:content_type, content_type}}

lib/pleroma/safe_zip.ex

@@ -1,216 +0,0 @@
-# Akkoma: Magically expressive social media
-# Copyright © 2024 Akkoma Authors <https://akkoma.dev/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.SafeZip do
-  @moduledoc """
-  Wraps the subset of Erlang's zip module we’d like to use
-  but enforces path-traversal safety everywhere and other checks.
-
-  For convenience almost all functions accept both elixir strings and charlists,
-  but output elixir strings themselves. However, this means the input parameter type
-  can no longer be used to distinguish archive file paths from archive binary data in memory,
-  thus where needed both a _data and _file variant are provided.
-  """
-
-  @type text() :: String.t() | [char()]
-
-  defp is_safe_path?(path) do
-    # Path accepts elixir’s chardata()
-    case Path.safe_relative(path) do
-      {:ok, _} -> true
-      _ -> false
-    end
-  end
-
-  defp is_safe_type?(file_type) do
-    if file_type in [:regular, :directory] do
-      true
-    else
-      false
-    end
-  end
-
-  defp maybe_add_file(_type, _path_charlist, nil), do: nil
-
-  defp maybe_add_file(:regular, path_charlist, file_list),
-    do: [to_string(path_charlist) | file_list]
-
-  defp maybe_add_file(_type, _path_charlist, file_list), do: file_list
-
-  @spec check_safe_archive_and_maybe_list_files(binary() | [char()], [term()], boolean()) ::
-          {:ok, [String.t()]} | {:error, reason :: term()}
-  defp check_safe_archive_and_maybe_list_files(archive, opts, list) do
-    acc = if list, do: [], else: nil
-
-    with {:ok, table} <- :zip.table(archive, opts) do
-      Enum.reduce_while(table, {:ok, acc}, fn
-        # ZIP comment
-        {:zip_comment, _}, acc ->
-          {:cont, acc}
-
-        # File entry
-        {:zip_file, path, info, _comment, _offset, _comp_size}, {:ok, fl} ->
-          with {_, type} <- {:get_type, elem(info, 2)},
-               {_, true} <- {:type, is_safe_type?(type)},
-               {_, true} <- {:safe_path, is_safe_path?(path)} do
-            {:cont, {:ok, maybe_add_file(type, path, fl)}}
-          else
-            {:get_type, e} ->
-              {:halt,
-               {:error, "Couldn't determine file type of ZIP entry at #{path} (#{inspect(e)})"}}
-
-            {:type, _} ->
-              {:halt, {:error, "Potentially unsafe file type in ZIP at: #{path}"}}
-
-            {:safe_path, _} ->
-              {:halt, {:error, "Unsafe path in ZIP: #{path}"}}
-          end
-
-        # new OTP version?
-        _, _acc ->
-          {:halt, {:error, "Unknown ZIP record type"}}
-      end)
-    end
-  end
-
-  @spec check_safe_archive_and_list_files(binary() | [char()], [term()]) ::
-          {:ok, [String.t()]} | {:error, reason :: term()}
-  defp check_safe_archive_and_list_files(archive, opts \\ []) do
-    check_safe_archive_and_maybe_list_files(archive, opts, true)
-  end
-
-  @spec check_safe_archive(binary() | [char()], [term()]) :: :ok | {:error, reason :: term()}
-  defp check_safe_archive(archive, opts \\ []) do
-    case check_safe_archive_and_maybe_list_files(archive, opts, false) do
-      {:ok, _} -> :ok
-      error -> error
-    end
-  end
-
-  @spec check_safe_file_list([text()], text()) :: :ok | {:error, term()}
-  defp check_safe_file_list([], _), do: :ok
-
-  defp check_safe_file_list([path | tail], cwd) do
-    with {_, true} <- {:path, is_safe_path?(path)},
-         {_, {:ok, fstat}} <- {:stat, File.stat(Path.expand(path, cwd))},
-         {_, true} <- {:type, is_safe_type?(fstat.type)} do
-      check_safe_file_list(tail, cwd)
-    else
-      {:path, _} ->
-        {:error, "Unsafe path escaping cwd: #{path}"}
-
-      {:stat, e} ->
-        {:error, "Unable to check file type of #{path}: #{inspect(e)}"}
-
-      {:type, _} ->
-        {:error, "Unsafe type at #{path}"}
-    end
-  end
-
-  defp check_safe_file_list(_, _), do: {:error, "Malformed file_list"}
-
-  @doc """
-  Checks whether the archive data contais file entries for all paths from fset
-
-  Note this really only accepts entries corresponding to regular _files_,
-  if a path is contained as for example an directory, this does not count as a match.
-  """
-  @spec contains_all_data?(binary(), MapSet.t()) :: true | false
-  def contains_all_data?(archive_data, fset) do
-    with {:ok, table} <- :zip.table(archive_data) do
-      remaining =
-        Enum.reduce(table, fset, fn
-          {:zip_file, path, info, _comment, _offset, _comp_size}, fset ->
-            if elem(info, 2) == :regular do
-              MapSet.delete(fset, path)
-            else
-              fset
-            end
-
-          _, _ ->
-            fset
-        end)
-        |> MapSet.size()
-
-      if remaining == 0, do: true, else: false
-    else
-      _ -> false
-    end
-  end
-
-  @doc """
-  List all file entries in ZIP, or error if invalid or unsafe.
-
-  Note this really only lists regular files, no directories, ZIP comments or other types!
-  """
-  @spec list_dir_file(text()) :: {:ok, [String.t()]} | {:error, reason :: term()}
-  def list_dir_file(archive) do
-    path = to_charlist(archive)
-    check_safe_archive_and_list_files(path)
-  end
-
-  defp stringify_zip({:ok, {fname, data}}), do: {:ok, {to_string(fname), data}}
-  defp stringify_zip({:ok, fname}), do: {:ok, to_string(fname)}
-  defp stringify_zip(ret), do: ret
-
-  @spec zip(text(), text(), [text()], boolean()) ::
-          {:ok, file_name :: String.t()}
-          | {:ok, {file_name :: String.t(), file_data :: binary()}}
-          | {:error, reason :: term()}
-  def zip(name, file_list, cwd, memory \\ false) do
-    opts = [{:cwd, to_charlist(cwd)}]
-    opts = if memory, do: [:memory | opts], else: opts
-
-    with :ok <- check_safe_file_list(file_list, cwd) do
-      file_list = for f <- file_list, do: to_charlist(f)
-      name = to_charlist(name)
-      stringify_zip(:zip.zip(name, file_list, opts))
-    end
-  end
-
-  @spec unzip_file(text(), text(), [text()] | nil) ::
-          {:ok, [String.t()]}
-          | {:error, reason :: term()}
-          | {:error, {name :: text(), reason :: term()}}
-  def unzip_file(archive, target_dir, file_list \\ nil) do
-    do_unzip(to_charlist(archive), to_charlist(target_dir), file_list)
-  end
-
-  @spec unzip_data(binary(), text(), [text()] | nil) ::
-          {:ok, [String.t()]}
-          | {:error, reason :: term()}
-          | {:error, {name :: text(), reason :: term()}}
-  def unzip_data(archive, target_dir, file_list \\ nil) do
-    do_unzip(archive, to_charlist(target_dir), file_list)
-  end
-
-  defp stringify_unzip({:ok, [{_fname, _data} | _] = filebinlist}),
-    do: {:ok, Enum.map(filebinlist, fn {fname, data} -> {to_string(fname), data} end)}
-
-  defp stringify_unzip({:ok, [_fname | _] = filelist}),
-    do: {:ok, Enum.map(filelist, fn fname -> to_string(fname) end)}
-
-  defp stringify_unzip({:error, {fname, term}}), do: {:error, {to_string(fname), term}}
-  defp stringify_unzip(ret), do: ret
-
-  @spec do_unzip(binary() | [char()], text(), [text()] | nil) ::
-          {:ok, [String.t()]}
-          | {:error, reason :: term()}
-          | {:error, {name :: text(), reason :: term()}}
-  defp do_unzip(archive, target_dir, file_list) do
-    opts =
-      if file_list != nil do
-        [
-          file_list: for(f <- file_list, do: to_charlist(f)),
-          cwd: target_dir
-        ]
-      else
-        [cwd: target_dir]
-      end
-
-    with :ok <- check_safe_archive(archive) do
-      stringify_unzip(:zip.unzip(archive, opts))
-    end
-  end
-end

lib/pleroma/scheduled_activity.ex

@@ -28,7 +28,7 @@ defmodule Pleroma.ScheduledActivity do
     timestamps()
   end
 
-  defp changeset(%ScheduledActivity{} = scheduled_activity, attrs) do
+  def changeset(%ScheduledActivity{} = scheduled_activity, attrs) do
     scheduled_activity
     |> cast(attrs, [:scheduled_at, :params])
     |> validate_required([:scheduled_at, :params])
@@ -40,36 +40,26 @@ defp with_media_attachments(
          %{changes: %{params: %{"media_ids" => media_ids} = params}} = changeset
        )
        when is_list(media_ids) do
-    user = User.get_by_id(changeset.data.user_id)
+    media_attachments = Utils.attachments_from_ids(%{media_ids: media_ids})
 
-    case Utils.attachments_from_ids(user, %{media_ids: media_ids}) do
-      media_attachments when is_list(media_attachments) ->
-        params =
-          params
-          |> Map.put("media_attachments", media_attachments)
-          |> Map.put("media_ids", media_ids)
+    params =
+      params
+      |> Map.put("media_attachments", media_attachments)
+      |> Map.put("media_ids", media_ids)
 
-        put_change(changeset, :params, params)
-
-      {:error, _} = e ->
-        e
-
-      e ->
-        {:error, e}
-    end
+    put_change(changeset, :params, params)
   end
 
   defp with_media_attachments(changeset), do: changeset
 
-  defp update_changeset(%ScheduledActivity{} = scheduled_activity, attrs) do
-    # note: should this ever allow swapping media attachments, make sure ownership is checked
+  def update_changeset(%ScheduledActivity{} = scheduled_activity, attrs) do
     scheduled_activity
     |> cast(attrs, [:scheduled_at])
     |> validate_required([:scheduled_at])
     |> validate_scheduled_at()
   end
 
-  defp validate_scheduled_at(changeset) do
+  def validate_scheduled_at(changeset) do
     validate_change(changeset, :scheduled_at, fn _, scheduled_at ->
       cond do
         not far_enough?(scheduled_at) ->
@@ -87,7 +77,7 @@ defp validate_scheduled_at(changeset) do
     end)
   end
 
-  defp exceeds_daily_user_limit?(user_id, scheduled_at) do
+  def exceeds_daily_user_limit?(user_id, scheduled_at) do
     ScheduledActivity
     |> where(user_id: ^user_id)
     |> where([sa], type(sa.scheduled_at, :date) == type(^scheduled_at, :date))
@@ -96,7 +86,7 @@ defp exceeds_daily_user_limit?(user_id, scheduled_at) do
     |> Kernel.>=(Config.get([ScheduledActivity, :daily_user_limit]))
   end
 
-  defp exceeds_total_user_limit?(user_id) do
+  def exceeds_total_user_limit?(user_id) do
     ScheduledActivity
     |> where(user_id: ^user_id)
     |> select([sa], count(sa.id))
@@ -118,29 +108,20 @@ def far_enough?(scheduled_at) do
     diff > @min_offset
   end
 
-  defp new(%User{} = user, attrs) do
+  def new(%User{} = user, attrs) do
     changeset(%ScheduledActivity{user_id: user.id}, attrs)
   end
 
   @doc """
   Creates ScheduledActivity and add to queue to perform at scheduled_at date
   """
-  @spec create(User.t(), map()) :: {:ok, ScheduledActivity.t()} | {:error, any()}
+  @spec create(User.t(), map()) :: {:ok, ScheduledActivity.t()} | {:error, Ecto.Changeset.t()}
   def create(%User{} = user, attrs) do
-    case new(user, attrs) do
-      %Ecto.Changeset{} = sched_data ->
-        Multi.new()
-        |> Multi.insert(:scheduled_activity, sched_data)
-        |> maybe_add_jobs(Config.get([ScheduledActivity, :enabled]))
-        |> Repo.transaction()
-        |> transaction_response
-
-      {:error, _} = e ->
-        e
-
-      e ->
-        {:error, e}
-    end
+    Multi.new()
+    |> Multi.insert(:scheduled_activity, new(user, attrs))
+    |> maybe_add_jobs(Config.get([ScheduledActivity, :enabled]))
+    |> Repo.transaction()
+    |> transaction_response
   end
 
   defp maybe_add_jobs(multi, true) do
@@ -206,7 +187,17 @@ def for_user_query(%User{} = user) do
     |> where(user_id: ^user.id)
   end
 
-  defp job_query(scheduled_activity_id) do
+  def due_activities(offset \\ 0) do
+    naive_datetime =
+      NaiveDateTime.utc_now()
+      |> NaiveDateTime.add(offset, :millisecond)
+
+    ScheduledActivity
+    |> where([sa], sa.scheduled_at < ^naive_datetime)
+    |> Repo.all()
+  end
+
+  def job_query(scheduled_activity_id) do
     from(j in Oban.Job,
       where: j.queue == "scheduled_activities",
       where: fragment("args ->> 'activity_id' = ?::text", ^to_string(scheduled_activity_id))

lib/pleroma/search/database_search.ex

@@ -21,12 +21,19 @@ def search(user, search_query, options \\ []) do
     offset = Keyword.get(options, :offset, 0)
     author = Keyword.get(options, :author)
 
+    search_function =
+      if :persistent_term.get({Pleroma.Repo, :postgres_version}) >= 11 do
+        :websearch
+      else
+        :plain
+      end
+
     try do
       Activity
       |> Activity.with_preloaded_object()
       |> Activity.restrict_deactivated_users()
       |> restrict_public()
-      |> query_with(index_type, search_query)
+      |> query_with(index_type, search_query, search_function)
       |> maybe_restrict_local(user)
       |> maybe_restrict_author(author)
       |> maybe_restrict_blocked(user)
@@ -40,6 +47,12 @@ def search(user, search_query, options \\ []) do
     end
   end
 
+  @impl true
+  def add_to_index(_activity), do: nil
+
+  @impl true
+  def remove_from_index(_object), do: nil
+
   def maybe_restrict_author(query, %User{} = author) do
     Activity.Queries.by_author(query, author)
   end
@@ -59,7 +72,25 @@ def restrict_public(q) do
     )
   end
 
-  defp query_with(q, :gin, search_query) do
+  defp query_with(q, :gin, search_query, :plain) do
+    %{rows: [[tsc]]} =
+      Ecto.Adapters.SQL.query!(
+        Pleroma.Repo,
+        "select current_setting('default_text_search_config')::regconfig::oid;"
+      )
+
+    from([a, o] in q,
+      where:
+        fragment(
+          "to_tsvector(?::oid::regconfig, ?->>'content') @@ plainto_tsquery(?)",
+          ^tsc,
+          o.data,
+          ^search_query
+        )
+    )
+  end
+
+  defp query_with(q, :gin, search_query, :websearch) do
     %{rows: [[tsc]]} =
       Ecto.Adapters.SQL.query!(
         Pleroma.Repo,
@@ -77,7 +108,19 @@ defp query_with(q, :gin, search_query) do
     )
   end
 
-  defp query_with(q, :rum, search_query) do
+  defp query_with(q, :rum, search_query, :plain) do
+    from([a, o] in q,
+      where:
+        fragment(
+          "? @@ plainto_tsquery(?)",
+          o.fts_content,
+          ^search_query
+        ),
+      order_by: [fragment("? <=> now()::date", o.inserted_at)]
+    )
+  end
+
+  defp query_with(q, :rum, search_query, :websearch) do
     from([a, o] in q,
       where:
         fragment(
@@ -89,29 +132,21 @@ defp query_with(q, :rum, search_query) do
     )
   end
 
-  def should_restrict_local(user) do
+  def maybe_restrict_local(q, user) do
     limit = Pleroma.Config.get([:instance, :limit_to_local_content], :unauthenticated)
 
     case {limit, user} do
-      {:all, _} -> true
-      {:unauthenticated, %User{}} -> false
-      {:unauthenticated, _} -> true
-      {false, _} -> false
-    end
-  end
-
-  def maybe_restrict_local(q, user) do
-    case should_restrict_local(user) do
-      true -> restrict_local(q)
-      false -> q
+      {:all, _} -> restrict_local(q)
+      {:unauthenticated, %User{}} -> q
+      {:unauthenticated, _} -> restrict_local(q)
+      {false, _} -> q
     end
   end
 
   defp restrict_local(q), do: where(q, local: true)
 
   def maybe_fetch(activities, user, search_query) do
-    with false <- should_restrict_local(user),
-         true <- Regex.match?(~r/https?:/, search_query),
+    with true <- Regex.match?(~r/https?:/, search_query),
          {:ok, object} <- Fetcher.fetch_object_from_id(search_query),
          %Activity{} = activity <- Activity.get_create_by_object_ap_id(object.data["id"]),
          true <- Visibility.visible_for_user?(activity, user) do

lib/pleroma/search/meilisearch.ex

@@ -5,27 +5,15 @@ defmodule Pleroma.Search.Meilisearch do
   alias Pleroma.Activity
 
   import Pleroma.Search.DatabaseSearch
+  import Ecto.Query
 
   @behaviour Pleroma.Search.SearchBackend
 
-  defp meili_headers(key) do
-    key_header =
-      if is_nil(key), do: [], else: [{"Authorization", "Bearer #{key}"}]
-
-    [{"Content-Type", "application/json"} | key_header]
-  end
-
-  defp meili_headers_admin do
+  defp meili_headers do
     private_key = Pleroma.Config.get([Pleroma.Search.Meilisearch, :private_key])
-    meili_headers(private_key)
-  end
 
-  defp meili_headers_search do
-    search_key =
-      Pleroma.Config.get([Pleroma.Search.Meilisearch, :search_key]) ||
-        Pleroma.Config.get([Pleroma.Search.Meilisearch, :private_key])
-
-    meili_headers(search_key)
+    [{"Content-Type", "application/json"}] ++
+      if is_nil(private_key), do: [], else: [{"Authorization", "Bearer #{private_key}"}]
   end
 
   def meili_get(path) do
@@ -34,7 +22,7 @@ def meili_get(path) do
     result =
       Pleroma.HTTP.get(
         Path.join(endpoint, path),
-        meili_headers_admin()
+        meili_headers()
       )
 
     with {:ok, res} <- result do
@@ -42,14 +30,14 @@ def meili_get(path) do
     end
   end
 
-  defp meili_search(params) do
+  def meili_post(path, params) do
     endpoint = Pleroma.Config.get([Pleroma.Search.Meilisearch, :url])
 
     result =
       Pleroma.HTTP.post(
-        Path.join(endpoint, "/indexes/objects/search"),
+        Path.join(endpoint, path),
         Jason.encode!(params),
-        meili_headers_search()
+        meili_headers()
       )
 
     with {:ok, res} <- result do
@@ -65,7 +53,7 @@ def meili_put(path, params) do
         :put,
         Path.join(endpoint, path),
         Jason.encode!(params),
-        meili_headers_admin(),
+        meili_headers(),
         []
       )
 
@@ -82,7 +70,7 @@ def meili_delete!(path) do
         :delete,
         Path.join(endpoint, path),
         "",
-        meili_headers_admin(),
+        meili_headers(),
         []
       )
   end
@@ -93,20 +81,25 @@ def search(user, query, options \\ []) do
     author = Keyword.get(options, :author)
 
     res =
-      meili_search(%{q: query, offset: offset, limit: limit})
+      meili_post(
+        "/indexes/objects/search",
+        %{q: query, offset: offset, limit: limit}
+      )
 
     with {:ok, result} <- res do
       hits = result["hits"] |> Enum.map(& &1["ap"])
 
       try do
         hits
-        |> Activity.get_presorted_create_by_object_ap_id()
+        |> Activity.create_by_object_ap_id()
+        |> Activity.with_preloaded_object()
         |> Activity.with_preloaded_object()
         |> Activity.restrict_deactivated_users()
         |> maybe_restrict_local(user)
         |> maybe_restrict_author(author)
         |> maybe_restrict_blocked(user)
         |> maybe_fetch(user, query)
+        |> order_by([object: obj], desc: obj.data["published"])
         |> Pleroma.Repo.all()
       rescue
         _ -> maybe_fetch([], user, query)

lib/pleroma/search/search_backend.ex

@@ -14,6 +14,4 @@ defmodule Pleroma.Search.SearchBackend do
   from index.
   """
   @callback remove_from_index(object :: Pleroma.Object.t()) :: {:ok, any()} | {:error, any()}
-
-  @optional_callbacks add_to_index: 1, remove_from_index: 1
 end

lib/pleroma/signature.ex

@@ -5,52 +5,71 @@
 defmodule Pleroma.Signature do
   @behaviour HTTPSignatures.Adapter
 
+  alias Pleroma.EctoType.ActivityPub.ObjectValidators
+  alias Pleroma.Keys
   alias Pleroma.User
-  alias Pleroma.User.SigningKey
-  require Logger
+  alias Pleroma.Web.ActivityPub.ActivityPub
+
+  @known_suffixes ["/publickey", "/main-key"]
+
+  def key_id_to_actor_id(key_id) do
+    uri =
+      key_id
+      |> URI.parse()
+      |> Map.put(:fragment, nil)
+      |> Map.put(:query, nil)
+      |> remove_suffix(@known_suffixes)
+
+    maybe_ap_id = URI.to_string(uri)
+
+    case ObjectValidators.ObjectID.cast(maybe_ap_id) do
+      {:ok, ap_id} ->
+        {:ok, ap_id}
+
+      _ ->
+        case Pleroma.Web.WebFinger.finger(maybe_ap_id) do
+          {:ok, %{"ap_id" => ap_id}} -> {:ok, ap_id}
+          _ -> {:error, maybe_ap_id}
+        end
+    end
+  end
+
+  defp remove_suffix(uri, [test | rest]) do
+    if not is_nil(uri.path) and String.ends_with?(uri.path, test) do
+      Map.put(uri, :path, String.replace(uri.path, test, ""))
+    else
+      remove_suffix(uri, rest)
+    end
+  end
+
+  defp remove_suffix(uri, []), do: uri
 
   def fetch_public_key(conn) do
-    with {_, %{"keyId" => kid}} <- {:keyid, HTTPSignatures.signature_for_conn(conn)},
-         {_, {:ok, %SigningKey{} = sk}, _} <-
-           {:fetch, SigningKey.get_or_fetch_by_key_id(kid), kid},
-         {_, {:ok, decoded_key}} <- {:decode, SigningKey.public_key_decoded(sk)} do
-      {:ok, decoded_key}
+    with %{"keyId" => kid} <- HTTPSignatures.signature_for_conn(conn),
+         {:ok, actor_id} <- key_id_to_actor_id(kid),
+         {:ok, public_key} <- User.get_public_key_for_ap_id(actor_id) do
+      {:ok, public_key}
     else
-      {:fetch, error, kid} ->
-        Logger.error("Failed to acquire key from signature: #{kid} #{inspect(error)}")
-        {:error, {:fetch, error}}
-
       e ->
         {:error, e}
     end
   end
 
   def refetch_public_key(conn) do
-    with {_, %{"keyId" => kid}} <- {:keyid, HTTPSignatures.signature_for_conn(conn)},
-         {_, {:ok, %SigningKey{} = sk}, _} <- {:fetch, SigningKey.refresh_by_key_id(kid), kid},
-         {_, {:ok, decoded_key}} <- {:decode, SigningKey.public_key_decoded(sk)} do
-      {:ok, decoded_key}
+    with %{"keyId" => kid} <- HTTPSignatures.signature_for_conn(conn),
+         {:ok, actor_id} <- key_id_to_actor_id(kid),
+         {:ok, _user} <- ActivityPub.make_user_from_ap_id(actor_id),
+         {:ok, public_key} <- User.get_public_key_for_ap_id(actor_id) do
+      {:ok, public_key}
     else
-      {:fetch, {:error, :too_young}, kid} ->
-        Logger.debug("Refusing to refetch recently updated key: #{kid}")
-        {:error, {:fetch, :too_young}}
-
-      {:fetch, {:error, :unknown}, kid} ->
-        Logger.warning("Attempted to refresh unknown key; this should not happen: #{kid}")
-        {:error, {:fetch, :unknown}}
-
-      {:fetch, error, kid} ->
-        Logger.error("Failed to refresh stale key from signature: #{kid} #{inspect(error)}")
-        {:error, {:fetch, error}}
-
       e ->
         {:error, e}
     end
   end
 
-  def sign(%User{} = user, headers) do
-    with {:ok, private_key} <- SigningKey.private_key(user) do
-      HTTPSignatures.sign(private_key, SigningKey.local_key_id(user.ap_id), headers)
+  def sign(%User{keys: keys} = user, headers) do
+    with {:ok, private_key, _} <- Keys.keys_from_pem(keys) do
+      HTTPSignatures.sign(private_key, user.ap_id <> "#main-key", headers)
     end
   end
 

lib/pleroma/stats.ex

@@ -10,7 +10,6 @@ defmodule Pleroma.Stats do
   alias Pleroma.CounterCache
   alias Pleroma.Repo
   alias Pleroma.User
-  alias Pleroma.Instances.Instance
 
   @interval :timer.seconds(300)
 
@@ -40,8 +39,7 @@ def force_update do
   @spec get_stats() :: %{
           domain_count: non_neg_integer(),
           status_count: non_neg_integer(),
-          user_count: non_neg_integer(),
-          remote_user_count: non_neg_integer()
+          user_count: non_neg_integer()
         }
   def get_stats do
     %{stats: stats} = GenServer.call(__MODULE__, :get_state)
@@ -62,39 +60,41 @@ def get_peers do
           stats: %{
             domain_count: non_neg_integer(),
             status_count: non_neg_integer(),
-            user_count: non_neg_integer(),
-            remote_user_count: non_neg_integer()
+            user_count: non_neg_integer()
           }
         }
   def calculate_stat_data do
-    # instances table has an unique constraint on the host column
     peers =
       from(
-        i in Instance,
-        select: i.host
+        u in User,
+        select: fragment("distinct split_part(?, '@', 2)", u.nickname),
+        where: u.local != ^true
       )
       |> Repo.all()
+      |> Enum.filter(& &1)
 
     domain_count = Enum.count(peers)
 
     status_count = Repo.aggregate(User.Query.build(%{local: true}), :sum, :note_count)
 
-    # there are few enough local users for postgres to use an index scan
-    # (also here an exact count is a bit more important)
-    user_count =
+    users_query =
       from(u in User,
         where: u.is_active == true,
         where: u.local == true,
         where: not is_nil(u.nickname),
         where: not u.invisible
       )
-      |> Repo.aggregate(:count, :id)
 
-    # but mostly numerous remote users leading to a full a full table scan
-    # (ecto currently doesn't allow building queries without explicit table)
-    %{rows: [[remote_user_count]]} =
-      "SELECT estimate_remote_user_count();"
-      |> Pleroma.Repo.query!()
+    remote_users_query =
+      from(u in User,
+        where: u.is_active == true,
+        where: u.local == false,
+        where: not is_nil(u.nickname),
+        where: not u.invisible
+      )
+
+    user_count = Repo.aggregate(users_query, :count, :id)
+    remote_user_count = Repo.aggregate(remote_users_query, :count, :id)
 
     %{
       peers: peers,

lib/pleroma/upload.ex

@@ -13,6 +13,7 @@ defmodule Pleroma.Upload do
   * `:uploader`: override uploader
   * `:filters`: override filters
   * `:size_limit`: override size limit
+  * `:activity_type`: override activity type
 
   The `%Pleroma.Upload{}` struct: all documented fields are meant to be overwritten in filters:
 
@@ -47,6 +48,7 @@ defmodule Pleroma.Upload do
   @type option ::
           {:type, :avatar | :banner | :background}
           | {:description, String.t()}
+          | {:activity_type, String.t()}
           | {:size_limit, nil | non_neg_integer()}
           | {:uploader, module()}
           | {:filters, [module()]}
@@ -141,7 +143,7 @@ defp get_opts(opts) do
       end
 
     %{
-      activity_type: activity_type,
+      activity_type: Keyword.get(opts, :activity_type, activity_type),
       size_limit: Keyword.get(opts, :size_limit, size_limit),
       uploader: Keyword.get(opts, :uploader, Pleroma.Config.get([__MODULE__, :uploader])),
       filters:

lib/pleroma/upload/filter/exiftool/read_description.ex

@@ -33,7 +33,8 @@ defp read_when_empty(current_description, _, _) when is_binary(current_descripti
   defp read_when_empty(_, file, tag) do
     try do
       {tag_content, 0} =
-        System.cmd("exiftool", ["-b", "-s3", "-ignoreMinorErrors", "-q", "-q", tag, file],
+        System.cmd("exiftool", ["-b", "-s3", tag, file],
+          stderr_to_stdout: true,
           parallelism: true
         )
 

lib/pleroma/upload/filter/exiftool/strip_metadata.ex

@@ -18,7 +18,6 @@ defmodule Pleroma.Upload.Filter.Exiftool.StripMetadata do
 
   # Formats not compatible with exiftool at this time
   def filter(%Pleroma.Upload{content_type: "image/webp"}), do: {:ok, :noop}
-  def filter(%Pleroma.Upload{content_type: "image/bmp"}), do: {:ok, :noop}
   def filter(%Pleroma.Upload{content_type: "image/svg+xml"}), do: {:ok, :noop}
 
   def filter(%Pleroma.Upload{tempfile: file, content_type: "image" <> _}) do
@@ -38,7 +37,7 @@ def filter(%Pleroma.Upload{tempfile: file, content_type: "image" <> _}) do
     args = ["-ignoreMinorErrors", "-overwrite_original" | purge_args] ++ preserve_args ++ [file]
 
     try do
-      case System.cmd("exiftool", args, parallelism: true, stderr_to_stdout: true) do
+      case System.cmd("exiftool", args, parallelism: true) do
         {_response, 0} -> {:ok, :filtered}
         {error, 1} -> {:error, error}
       end

lib/pleroma/user.ex

@@ -25,6 +25,7 @@ defmodule Pleroma.User do
   alias Pleroma.Hashtag
   alias Pleroma.User.HashtagFollow
   alias Pleroma.HTML
+  alias Pleroma.Keys
   alias Pleroma.MFA
   alias Pleroma.Notification
   alias Pleroma.Object
@@ -42,7 +43,6 @@ defmodule Pleroma.User do
   alias Pleroma.Web.OAuth
   alias Pleroma.Web.RelMe
   alias Pleroma.Workers.BackgroundWorker
-  alias Pleroma.User.SigningKey
 
   use Pleroma.Web, :verified_routes
 
@@ -100,6 +100,8 @@ defmodule Pleroma.User do
     field(:password_hash, :string)
     field(:password, :string, virtual: true)
     field(:password_confirmation, :string, virtual: true)
+    field(:keys, :string)
+    field(:public_key, :string)
     field(:ap_id, :string)
     field(:avatar, :map, default: %{})
     field(:local, :boolean, default: true)
@@ -126,6 +128,7 @@ defmodule Pleroma.User do
     field(:domain_blocks, {:array, :string}, default: [])
     field(:is_active, :boolean, default: true)
     field(:no_rich_text, :boolean, default: false)
+    field(:ap_enabled, :boolean, default: false)
     field(:is_moderator, :boolean, default: false)
     field(:is_admin, :boolean, default: false)
     field(:show_role, :boolean, default: true)
@@ -219,12 +222,6 @@ defmodule Pleroma.User do
       on_replace: :delete
     )
 
-    # FOR THE FUTURE: We might want to make this a one-to-many relationship
-    # it's entirely possible right now, but we don't have a use case for it
-    # XXX: in the future we’d also like to parse and honour key expiration times
-    #      instead of blindly accepting any change in signing keys
-    has_one(:signing_key, SigningKey, foreign_key: :user_id, on_replace: :update)
-
     timestamps()
   end
 
@@ -443,7 +440,6 @@ defp fix_follower_address(params), do: params
   def remote_user_changeset(struct \\ %User{local: false}, params) do
     bio_limit = Config.get([:instance, :user_bio_length], 5000)
     name_limit = Config.get([:instance, :user_name_length], 100)
-    fields_limit = Config.get([:instance, :max_remote_account_fields], 0)
 
     name =
       case params[:name] do
@@ -457,12 +453,10 @@ def remote_user_changeset(struct \\ %User{local: false}, params) do
       |> Map.put_new(:last_refreshed_at, NaiveDateTime.utc_now())
       |> truncate_if_exists(:name, name_limit)
       |> truncate_if_exists(:bio, bio_limit)
-      |> Map.update(:fields, [], &Enum.take(&1, fields_limit))
       |> truncate_fields_param()
       |> fix_follower_address()
 
     struct
-    |> Repo.preload(:signing_key)
     |> cast(
       params,
       [
@@ -472,7 +466,9 @@ def remote_user_changeset(struct \\ %User{local: false}, params) do
         :inbox,
         :shared_inbox,
         :nickname,
+        :public_key,
         :avatar,
+        :ap_enabled,
         :banner,
         :background,
         :is_locked,
@@ -499,7 +495,6 @@ def remote_user_changeset(struct \\ %User{local: false}, params) do
     |> validate_required([:ap_id])
     |> validate_required([:name], trim: false)
     |> unique_constraint(:nickname)
-    |> cast_assoc(:signing_key, with: &SigningKey.remote_changeset/2, required: false)
     |> validate_format(:nickname, @email_regex)
     |> validate_length(:bio, max: bio_limit)
     |> validate_length(:name, max: name_limit)
@@ -531,6 +526,7 @@ def update_changeset(struct, params \\ %{}) do
         :name,
         :emoji,
         :avatar,
+        :public_key,
         :inbox,
         :shared_inbox,
         :is_locked,
@@ -574,7 +570,6 @@ def update_changeset(struct, params \\ %{}) do
       :pleroma_settings_store,
       &{:ok, Map.merge(struct.pleroma_settings_store, &1)}
     )
-    |> cast_assoc(:signing_key, with: &SigningKey.remote_changeset/2, requred: false)
     |> validate_fields(false, struct)
   end
 
@@ -833,10 +828,8 @@ def put_following_and_follower_and_featured_address(changeset) do
   end
 
   defp put_private_key(changeset) do
-    ap_id = get_field(changeset, :ap_id)
-
-    changeset
-    |> put_assoc(:signing_key, SigningKey.generate_local_keys(ap_id))
+    {:ok, pem} = Keys.generate_rsa_pem()
+    put_change(changeset, :keys, pem)
   end
 
   defp autofollow_users(user) do
@@ -1005,7 +998,11 @@ def maybe_direct_follow(%User{} = follower, %User{local: true} = followed) do
   end
 
   def maybe_direct_follow(%User{} = follower, %User{} = followed) do
-    {:ok, follower, followed}
+    if not ap_enabled?(followed) do
+      follow(follower, followed)
+    else
+      {:ok, follower, followed}
+    end
   end
 
   @doc "A mass follow for local users. Respects blocks in both directions but does not create activities."
@@ -1149,8 +1146,7 @@ def update_and_set_cache(%{data: %Pleroma.User{} = user} = changeset) do
     was_superuser_before_update = User.superuser?(user)
 
     with {:ok, user} <- Repo.update(changeset, stale_error_field: :id) do
-      user
-      |> set_cache()
+      set_cache(user)
     end
     |> maybe_remove_report_notifications(was_superuser_before_update)
   end
@@ -1628,12 +1624,8 @@ def blocks_user?(%User{} = user, %User{} = target) do
 
   def blocks_user?(_, _), do: false
 
-  def blocks_domain?(%User{} = user, %User{ap_id: ap_id}) do
-    blocks_domain?(user, ap_id)
-  end
-
-  def blocks_domain?(%User{} = user, url) when is_binary(url) do
-    %{host: host} = URI.parse(url)
+  def blocks_domain?(%User{} = user, %User{} = target) do
+    %{host: host} = URI.parse(target.ap_id)
     Enum.member?(user.domain_blocks, host)
     # TODO: functionality should probably be changed such that subdomains block as well,
     # but as it stands, this just hecks up the relationships endpoint
@@ -1821,6 +1813,7 @@ def purge_user_changeset(user) do
       confirmation_token: nil,
       domain_blocks: [],
       is_active: false,
+      ap_enabled: false,
       is_moderator: false,
       is_admin: false,
       mastofe_settings: nil,
@@ -2000,20 +1993,8 @@ def get_or_fetch_by_ap_id(ap_id, options \\ []) do
       {%User{} = user, _} ->
         {:ok, user}
 
-      {_, {:error, {:reject, :mrf}}} ->
-        Logger.debug("Rejected to fetch user due to MRF: #{ap_id}")
-        {:error, {:reject, :mrf}}
-
-      {_, {:error, :not_found}} ->
-        Logger.debug("User doesn't exist (anymore): #{ap_id}")
-        {:error, :not_found}
-
-      {_, {:error, e}} ->
-        Logger.error("Could not fetch user #{ap_id}, #{inspect(e)}")
-        {:error, e}
-
       e ->
-        Logger.error("Unexpected error condition while fetching user #{ap_id}, #{inspect(e)}")
+        Logger.error("Could not fetch user #{ap_id}, #{inspect(e)}")
         {:error, :not_found}
     end
   end
@@ -2066,7 +2047,30 @@ defp create_service_actor(uri, nickname) do
     |> set_cache()
   end
 
-  defdelegate public_key(user), to: SigningKey
+  def public_key(%{public_key: public_key_pem}) when is_binary(public_key_pem) do
+    key =
+      public_key_pem
+      |> :public_key.pem_decode()
+      |> hd()
+      |> :public_key.pem_entry_decode()
+
+    {:ok, key}
+  end
+
+  def public_key(_), do: {:error, "key not found"}
+
+  def get_public_key_for_ap_id(ap_id) do
+    with {:ok, %User{} = user} <- get_or_fetch_by_ap_id(ap_id),
+         {:ok, public_key} <- public_key(user) do
+      {:ok, public_key}
+    else
+      _ -> :error
+    end
+  end
+
+  def ap_enabled?(%User{local: true}), do: true
+  def ap_enabled?(%User{ap_enabled: ap_enabled}), do: ap_enabled
+  def ap_enabled?(_), do: false
 
   @doc "Gets or fetch a user by uri or nickname."
   @spec get_or_fetch(String.t()) :: {:ok, User.t()} | {:error, String.t()}
@@ -2571,10 +2575,10 @@ def add_pinned_object_id(%User{} = user, object_id) do
           [pinned_objects: "You have already pinned the maximum number of statuses"]
         end
       end)
-      |> update_and_set_cache()
     else
-      {:ok, user}
+      change(user)
     end
+    |> update_and_set_cache()
   end
 
   @spec remove_pinned_object_id(User.t(), String.t()) :: {:ok, t()} | {:error, term()}

lib/pleroma/user/backup.ex

@@ -119,7 +119,7 @@ def process(%__MODULE__{} = backup) do
     end
   end
 
-  @files ["actor.json", "outbox.json", "likes.json", "bookmarks.json"]
+  @files [~c"actor.json", ~c"outbox.json", ~c"likes.json", ~c"bookmarks.json"]
   def export(%__MODULE__{} = backup) do
     backup = Repo.preload(backup, :user)
     name = String.trim_trailing(backup.file_name, ".zip")
@@ -130,9 +130,10 @@ def export(%__MODULE__{} = backup) do
          :ok <- statuses(dir, backup.user),
          :ok <- likes(dir, backup.user),
          :ok <- bookmarks(dir, backup.user),
-         {:ok, zip_path} <- Pleroma.SafeZip.zip(dir <> ".zip", @files, dir),
+         {:ok, zip_path} <-
+           :zip.create(String.to_charlist(dir <> ".zip"), @files, cwd: String.to_charlist(dir)),
          {:ok, _} <- File.rm_rf(dir) do
-      {:ok, zip_path}
+      {:ok, to_string(zip_path)}
     end
   end
 

lib/pleroma/user/signing_key.ex

@@ -1,268 +0,0 @@
-defmodule Pleroma.User.SigningKey do
-  use Ecto.Schema
-  import Ecto.Query
-  import Ecto.Changeset
-  require Pleroma.Constants
-  alias Pleroma.User
-  alias Pleroma.Repo
-
-  require Logger
-
-  @primary_key false
-  schema "signing_keys" do
-    belongs_to(:user, Pleroma.User, type: FlakeId.Ecto.CompatType)
-    field :public_key, :string
-    field :private_key, :string
-    # This is an arbitrary field given by the remote instance
-    field :key_id, :string, primary_key: true
-    timestamps()
-  end
-
-  def load_key(%User{} = user) do
-    user
-    |> Repo.preload(:signing_key)
-  end
-
-  def key_id_of_local_user(%User{local: true} = user) do
-    case Repo.preload(user, :signing_key) do
-      %User{signing_key: %__MODULE__{key_id: key_id}} -> key_id
-      _ -> nil
-    end
-  end
-
-  @spec remote_changeset(__MODULE__, map) :: Changeset.t()
-  def remote_changeset(%__MODULE__{} = signing_key, attrs) do
-    signing_key
-    |> cast(attrs, [:public_key, :key_id])
-    |> validate_required([:public_key, :key_id])
-  end
-
-  @spec key_id_to_user_id(String.t()) :: String.t() | nil
-  @doc """
-  Given a key ID, return the user ID associated with that key.
-  Returns nil if the key ID is not found.
-  """
-  def key_id_to_user_id(key_id) do
-    from(sk in __MODULE__, where: sk.key_id == ^key_id)
-    |> select([sk], sk.user_id)
-    |> Repo.one()
-  end
-
-  @spec key_id_to_ap_id(String.t()) :: String.t() | nil
-  @doc """
-  Given a key ID, return the AP ID associated with that key.
-  Returns nil if the key ID is not found.
-  """
-  def key_id_to_ap_id(key_id) do
-    Logger.debug("Looking up key ID: #{key_id}")
-
-    from(sk in __MODULE__, where: sk.key_id == ^key_id)
-    |> join(:inner, [sk], u in User, on: sk.user_id == u.id)
-    |> select([sk, u], u.ap_id)
-    |> Repo.one()
-  end
-
-  @spec generate_rsa_pem() :: {:ok, binary()}
-  @doc """
-  Generate a new RSA private key and return it as a PEM-encoded string.
-  """
-  def generate_rsa_pem do
-    key = :public_key.generate_key({:rsa, 2048, 65_537})
-    entry = :public_key.pem_entry_encode(:RSAPrivateKey, key)
-    pem = :public_key.pem_encode([entry]) |> String.trim_trailing()
-    {:ok, pem}
-  end
-
-  @spec generate_local_keys(String.t()) :: {:ok, Changeset.t()} | {:error, String.t()}
-  @doc """
-  Generate a new RSA key pair and create a changeset for it
-  """
-  def generate_local_keys(ap_id) do
-    {:ok, private_pem} = generate_rsa_pem()
-    {:ok, local_pem} = private_pem_to_public_pem(private_pem)
-
-    %__MODULE__{}
-    |> change()
-    |> put_change(:public_key, local_pem)
-    |> put_change(:private_key, private_pem)
-    |> put_change(:key_id, local_key_id(ap_id))
-  end
-
-  @spec local_key_id(String.t()) :: String.t()
-  @doc """
-  Given an AP ID, return the key ID for the local user.
-  """
-  def local_key_id(ap_id) do
-    ap_id <> "#main-key"
-  end
-
-  @spec private_pem_to_public_pem(binary) :: {:ok, binary()} | {:error, String.t()}
-  @doc """
-  Given a private key in PEM format, return the corresponding public key in PEM format.
-  """
-  def private_pem_to_public_pem(private_pem) do
-    [private_key_code] = :public_key.pem_decode(private_pem)
-    private_key = :public_key.pem_entry_decode(private_key_code)
-    {:RSAPrivateKey, _, modulus, exponent, _, _, _, _, _, _, _} = private_key
-    public_key = {:RSAPublicKey, modulus, exponent}
-    public_key = :public_key.pem_entry_encode(:SubjectPublicKeyInfo, public_key)
-    {:ok, :public_key.pem_encode([public_key])}
-  end
-
-  @spec public_key(__MODULE__) :: {:ok, binary()} | {:error, String.t()}
-  @doc """
-  Return public key data in binary format.
-  """
-  def public_key_decoded(%__MODULE__{public_key: public_key_pem}) do
-    decoded =
-      public_key_pem
-      |> :public_key.pem_decode()
-      |> hd()
-      |> :public_key.pem_entry_decode()
-
-    {:ok, decoded}
-  end
-
-  def public_key(_), do: {:error, "key not found"}
-
-  def public_key_pem(%User{} = user) do
-    case Repo.preload(user, :signing_key) do
-      %User{signing_key: %__MODULE__{public_key: public_key_pem}} -> {:ok, public_key_pem}
-      _ -> {:error, "key not found"}
-    end
-  end
-
-  def public_key_pem(_e) do
-    {:error, "key not found"}
-  end
-
-  @spec private_key(User.t()) :: {:ok, binary()} | {:error, String.t()}
-  @doc """
-  Given a user, return the private key for that user in binary format.
-  """
-  def private_key(%User{} = user) do
-    case Repo.preload(user, :signing_key) do
-      %{signing_key: %__MODULE__{private_key: private_key_pem}} ->
-        key =
-          private_key_pem
-          |> :public_key.pem_decode()
-          |> hd()
-          |> :public_key.pem_entry_decode()
-
-        {:ok, key}
-
-      _ ->
-        {:error, "key not found"}
-    end
-  end
-
-  @spec get_or_fetch_by_key_id(String.t()) :: {:ok, __MODULE__} | {:error, String.t()}
-  @doc """
-  Given a key ID, return the signing key associated with that key.
-  Will either return the key if it exists locally, or fetch it from the remote instance.
-  """
-  def get_or_fetch_by_key_id(key_id) do
-    case Repo.get_by(__MODULE__, key_id: key_id) do
-      nil ->
-        fetch_remote_key(key_id)
-
-      key ->
-        {:ok, key}
-    end
-  end
-
-  @spec fetch_remote_key(String.t()) :: {:ok, __MODULE__} | {:error, String.t()}
-  @doc """
-  Fetch a remote key by key ID.
-  Will send a request to the remote instance to get the key ID.
-  This request should, at the very least, return a user ID and a public key object.
-  Though bear in mind that some implementations (looking at you, pleroma) may require a signature for this request.
-  This has the potential to create an infinite loop if the remote instance requires a signature to fetch the key...
-  So if we're rejected, we should probably just give up.
-  """
-  def fetch_remote_key(key_id) do
-    Logger.debug("Fetching remote key: #{key_id}")
-
-    with {:ok, resp_body} <-
-           Pleroma.Object.Fetcher.fetch_and_contain_remote_key(key_id),
-         {:ok, ap_id, public_key_pem} <- handle_signature_response(resp_body),
-         {:ok, user} <- User.get_or_fetch_by_ap_id(ap_id) do
-      Logger.debug("Fetched remote key: #{ap_id}")
-      # store the key
-      key = %{
-        user_id: user.id,
-        public_key: public_key_pem,
-        key_id: key_id
-      }
-
-      key_cs =
-        cast(%__MODULE__{}, key, [:user_id, :public_key, :key_id])
-        |> unique_constraint(:user_id)
-
-      Repo.insert(key_cs,
-        # while this should never run for local users anyway, etc make sure we really never loose privkey info!
-        on_conflict: {:replace_all_except, [:inserted_at, :private_key]},
-        # if the key owner overlaps with a distinct existing key entry, this intetionally still errros
-        conflict_target: :key_id
-      )
-    else
-      e ->
-        Logger.debug("Failed to fetch remote key: #{inspect(e)}")
-        {:error, "Could not fetch key"}
-    end
-  end
-
-  defp refresh_key(%__MODULE__{} = key) do
-    min_backoff = Pleroma.Config.get!([:activitypub, :min_key_refetch_interval])
-
-    if Timex.diff(Timex.now(), key.updated_at, :seconds) >= min_backoff do
-      fetch_remote_key(key.key_id)
-    else
-      {:error, :too_young}
-    end
-  end
-
-  def refresh_by_key_id(key_id) do
-    case Repo.get_by(__MODULE__, key_id: key_id) do
-      nil -> {:error, :unknown}
-      key -> refresh_key(key)
-    end
-  end
-
-  # Take the response from the remote instance and extract the key details
-  # will check if the key ID matches the owner of the key, if not, error
-  defp extract_key_details(%{"id" => ap_id, "publicKey" => public_key}) do
-    if ap_id !== public_key["owner"] do
-      {:error, "Key ID does not match owner"}
-    else
-      %{"publicKeyPem" => public_key_pem} = public_key
-      {:ok, ap_id, public_key_pem}
-    end
-  end
-
-  defp handle_signature_response(body) do
-    case body do
-      %{
-        "type" => "CryptographicKey",
-        "publicKeyPem" => public_key_pem,
-        "owner" => ap_id
-      } ->
-        {:ok, ap_id, public_key_pem}
-
-      # for when we get a subset of the user object
-      %{
-        "id" => _user_id,
-        "publicKey" => _public_key,
-        "type" => actor_type
-      }
-      when actor_type in Pleroma.Constants.actor_types() ->
-        extract_key_details(body)
-
-      %{"error" => error} ->
-        {:error, error}
-
-      other ->
-        {:error, "Could not process key: #{inspect(other)}"}
-    end
-  end
-end

lib/pleroma/web.ex

@@ -265,6 +265,35 @@ def verified_routes do
     end
   end
 
+  def html do
+    quote do
+      use Phoenix.Component
+
+      # Import convenience functions from controllers
+      import Phoenix.Controller,
+        only: [get_csrf_token: 0, view_module: 1, view_template: 1]
+
+      # Include general helpers for rendering HTML
+      unquote(html_helpers())
+    end
+  end
+
+  defp html_helpers do
+    quote do
+      # HTML escaping functionality
+      import Phoenix.HTML
+      # Core UI components and translation
+      import Pleroma.Web.CoreComponents
+      import Pleroma.Web.Gettext
+
+      # Shortcut for generating JS commands
+      alias Phoenix.LiveView.JS
+
+      # Routes generation with the ~p sigil
+      unquote(verified_routes())
+    end
+  end
+
   def mailer do
     quote do
       unquote(verified_routes())

lib/pleroma/web/activity_pub/activity_pub.ex

@@ -155,7 +155,9 @@ def insert(map, local \\ true, fake \\ false, bypass_actor_check \\ false) when
       # Splice in the child object if we have one.
       activity = Maps.put_if_present(activity, :object, object)
 
-      Pleroma.Web.RichMedia.Card.get_by_activity(activity)
+      ConcurrentLimiter.limit(Pleroma.Web.RichMedia.Helpers, fn ->
+        Task.start(fn -> Pleroma.Web.RichMedia.Helpers.fetch_data_for_activity(activity) end)
+      end)
 
       # Add local posts to search index
       if local, do: Pleroma.Search.add_to_index(activity)
@@ -183,7 +185,7 @@ def insert(map, local \\ true, fake \\ false, bypass_actor_check \\ false) when
           id: "pleroma:fakeid"
         }
 
-        Pleroma.Web.RichMedia.Card.get_by_activity(activity)
+        Pleroma.Web.RichMedia.Helpers.fetch_data_for_activity(activity)
         {:ok, activity}
 
       {:remote_limit_pass, _} ->
@@ -1543,30 +1545,11 @@ defp normalize_also_known_as(aka) when is_list(aka), do: aka
   defp normalize_also_known_as(aka) when is_binary(aka), do: [aka]
   defp normalize_also_known_as(nil), do: []
 
-  defp normalize_attachment(%{} = attachment), do: [attachment]
-  defp normalize_attachment(attachment) when is_list(attachment), do: attachment
-  defp normalize_attachment(_), do: []
-
-  defp maybe_make_public_key_object(data) do
-    if is_map(data["publicKey"]) && is_binary(data["publicKey"]["publicKeyPem"]) do
-      %{
-        public_key: data["publicKey"]["publicKeyPem"],
-        key_id: data["publicKey"]["id"]
-      }
-    else
-      nil
-    end
-  end
-
   defp object_to_user_data(data, additional) do
     fields =
       data
       |> Map.get("attachment", [])
-      |> normalize_attachment()
-      |> Enum.filter(fn
-        %{"type" => t} -> t == "PropertyValue"
-        _ -> false
-      end)
+      |> Enum.filter(fn %{"type" => t} -> t == "PropertyValue" end)
       |> Enum.map(fn fields -> Map.take(fields, ["name", "value"]) end)
 
     emojis =
@@ -1589,16 +1572,9 @@ defp object_to_user_data(data, additional) do
     featured_address = data["featured"]
     {:ok, pinned_objects} = fetch_and_prepare_featured_from_ap_id(featured_address)
 
-    # first, check that the owner is correct
-    signing_key =
-      if data["id"] !== data["publicKey"]["owner"] do
-        Logger.error(
-          "Owner of the public key is not the same as the actor - not saving the public key."
-        )
-
-        nil
-      else
-        maybe_make_public_key_object(data)
+    public_key =
+      if is_map(data["publicKey"]) && is_binary(data["publicKey"]["publicKeyPem"]) do
+        data["publicKey"]["publicKeyPem"]
       end
 
     shared_inbox =
@@ -1626,6 +1602,7 @@ defp object_to_user_data(data, additional) do
     %{
       ap_id: data["id"],
       uri: get_actor_url(data["url"]),
+      ap_enabled: true,
       banner: normalize_image(data["image"]),
       background: normalize_image(data["backgroundUrl"]),
       fields: fields,
@@ -1641,7 +1618,7 @@ defp object_to_user_data(data, additional) do
       bio: data["summary"] || "",
       actor_type: actor_type,
       also_known_as: also_known_as,
-      signing_key: signing_key,
+      public_key: public_key,
       inbox: data["inbox"],
       shared_inbox: shared_inbox,
       pinned_objects: pinned_objects,
@@ -1742,7 +1719,7 @@ def user_data_from_user_object(data, additional \\ []) do
     end
   end
 
-  defp fetch_and_prepare_user_from_ap_id(ap_id, additional) do
+  def fetch_and_prepare_user_from_ap_id(ap_id, additional \\ []) do
     with {:ok, data} <- Fetcher.fetch_and_contain_remote_object_from_id(ap_id),
          {:valid, {:ok, _, _}} <- {:valid, UserValidator.validate(data, [])},
          {:ok, data} <- user_data_from_user_object(data, additional) do
@@ -1750,16 +1727,19 @@ defp fetch_and_prepare_user_from_ap_id(ap_id, additional) do
     else
       # If this has been deleted, only log a debug and not an error
       {:error, {"Object has been deleted", _, _} = e} ->
-        Logger.debug("User was explicitly deleted #{ap_id}, #{inspect(e)}")
-        {:error, :not_found}
+        Logger.debug("Could not decode user at fetch #{ap_id}, #{inspect(e)}")
+        {:error, e}
 
-      {:reject, _reason} = e ->
+      {:reject, reason} = e ->
+        Logger.debug("Rejected user #{ap_id}: #{inspect(reason)}")
         {:error, e}
 
       {:valid, reason} ->
-        {:error, {:validate, reason}}
+        Logger.debug("Data is not a valid user #{ap_id}: #{inspect(reason)}")
+        {:error, "Not a user"}
 
       {:error, e} ->
+        Logger.error("Could not decode user at fetch #{ap_id}, #{inspect(e)}")
         {:error, e}
     end
   end
@@ -1797,7 +1777,7 @@ def pin_data_from_featured_collection(%{
     else
       e ->
         Logger.error("Could not decode featured collection at fetch #{first}, #{inspect(e)}")
-        %{}
+        {:ok, %{}}
     end
   end
 
@@ -1807,18 +1787,14 @@ def pin_data_from_featured_collection(
         } = collection
       )
       when type in ["OrderedCollection", "Collection"] do
-    with {:ok, objects} <- Collections.Fetcher.fetch_collection(collection) do
-      # Items can either be a map _or_ a string
-      objects
-      |> Map.new(fn
-        ap_id when is_binary(ap_id) -> {ap_id, NaiveDateTime.utc_now()}
-        %{"id" => object_ap_id} -> {object_ap_id, NaiveDateTime.utc_now()}
-      end)
-    else
-      e ->
-        Logger.warning("Failed to fetch featured collection #{collection}, #{inspect(e)}")
-        %{}
-    end
+    {:ok, objects} = Collections.Fetcher.fetch_collection(collection)
+
+    # Items can either be a map _or_ a string
+    objects
+    |> Map.new(fn
+      ap_id when is_binary(ap_id) -> {ap_id, NaiveDateTime.utc_now()}
+      %{"id" => object_ap_id} -> {object_ap_id, NaiveDateTime.utc_now()}
+    end)
   end
 
   def pin_data_from_featured_collection(obj) do
@@ -1840,44 +1816,47 @@ def fetch_and_prepare_featured_from_ap_id(ap_id) do
     end
   end
 
-  def enqueue_pin_fetches(%{pinned_objects: pins}) do
-    # enqueue a task to fetch all pinned objects
-    Enum.each(pins, fn {ap_id, _} ->
-      if is_nil(Object.get_cached_by_ap_id(ap_id)) do
-        Pleroma.Workers.RemoteFetcherWorker.enqueue("fetch_remote", %{
-          "id" => ap_id,
-          "depth" => 1
-        })
-      end
-    end)
-  end
+  def pinned_fetch_task(nil), do: nil
 
-  def enqueue_pin_fetches(_), do: nil
+  def pinned_fetch_task(%{pinned_objects: pins}) do
+    if Enum.all?(pins, fn {ap_id, _} ->
+         Object.get_cached_by_ap_id(ap_id) ||
+           match?({:ok, _object}, Fetcher.fetch_object_from_id(ap_id))
+       end) do
+      :ok
+    else
+      :error
+    end
+  end
 
   def make_user_from_ap_id(ap_id, additional \\ []) do
     user = User.get_cached_by_ap_id(ap_id)
 
-    with {:ok, data} <- fetch_and_prepare_user_from_ap_id(ap_id, additional) do
-      user =
-        if data.ap_id != ap_id do
-          User.get_cached_by_ap_id(data.ap_id)
-        else
+    if user && !User.ap_enabled?(user) do
+      Transmogrifier.upgrade_user_from_ap_id(ap_id)
+    else
+      with {:ok, data} <- fetch_and_prepare_user_from_ap_id(ap_id, additional) do
+        {:ok, _pid} = Task.start(fn -> pinned_fetch_task(data) end)
+
+        user =
+          if data.ap_id != ap_id do
+            User.get_cached_by_ap_id(data.ap_id)
+          else
+            user
+          end
+
+        if user do
           user
+          |> User.remote_user_changeset(data)
+          |> User.update_and_set_cache()
+        else
+          maybe_handle_clashing_nickname(data)
+
+          data
+          |> User.remote_user_changeset()
+          |> Repo.insert()
+          |> User.set_cache()
         end
-
-      if user do
-        user
-        |> User.remote_user_changeset(data)
-        |> User.update_and_set_cache()
-        |> tap(fn _ -> enqueue_pin_fetches(data) end)
-      else
-        maybe_handle_clashing_nickname(data)
-
-        data
-        |> User.remote_user_changeset()
-        |> Repo.insert()
-        |> User.set_cache()
-        |> tap(fn _ -> enqueue_pin_fetches(data) end)
       end
     end
   end

lib/pleroma/web/activity_pub/activity_pub_controller.ex

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

lib/pleroma/web/activity_pub/mrf.ex

@@ -233,7 +233,7 @@ def config_descriptions(policies) do
       if function_exported?(policy, :config_description, 0) do
         description =
           @default_description
-          |> Map.merge(policy.config_description())
+          |> Map.merge(policy.config_description)
           |> Map.put(:group, :pleroma)
           |> Map.put(:tab, :mrf)
           |> Map.put(:type, :group)

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

@@ -24,11 +24,7 @@ defp score_displayname("federationbot"), do: 1.0
   defp score_displayname("fedibot"), do: 1.0
   defp score_displayname(_), do: 0.0
 
-  defp determine_if_followbot(%User{
-         nickname: nickname,
-         name: displayname,
-         actor_type: actor_type
-       }) do
+  defp determine_if_followbot(%User{nickname: nickname, name: displayname, actor_type: actor_type}) do
     # nickname will be a binary string except when following a relay
     nick_score =
       if is_binary(nickname) do

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

@@ -34,34 +34,16 @@ defp check_reject(message, actions) do
     end
   end
 
-  @spec delete_and_count(list(), term()) :: {integer(), list()}
-  defp delete_and_count(list, element), do: delete_and_count(list, element, {0, [], list})
-
-  defp delete_and_count([], _element, {0, _nlist, olist}), do: {0, olist}
-  defp delete_and_count([], _element, {count, nlist, _olist}), do: {count, Enum.reverse(nlist)}
-
-  defp delete_and_count([h | r], h, {count, nlist, olist}),
-    do: delete_and_count(r, h, {count + 1, nlist, olist})
-
-  defp delete_and_count([h | r], element, {count, nlist, olist}),
-    do: delete_and_count(r, element, {count, [h | nlist], olist})
-
-  defp insert_if_needed(list, oldcount, element) do
-    if oldcount <= 0 || Enum.member?(list, element) do
-      list
-    else
-      [element | list]
-    end
-  end
-
   defp check_delist(message, actions) do
     if :delist in actions do
       with %User{} = user <- User.get_cached_by_ap_id(message["actor"]) do
-        {pubcnt, to} = delete_and_count(message["to"] || [], Pleroma.Constants.as_public())
-        {flwcnt, cc} = delete_and_count(message["cc"] || [], user.follower_address)
+        to =
+          List.delete(message["to"] || [], Pleroma.Constants.as_public()) ++
+            [user.follower_address]
 
-        cc = insert_if_needed(cc, pubcnt, Pleroma.Constants.as_public())
-        to = insert_if_needed(to, flwcnt, user.follower_address)
+        cc =
+          List.delete(message["cc"] || [], user.follower_address) ++
+            [Pleroma.Constants.as_public()]
 
         message =
           message
@@ -83,8 +65,8 @@ defp check_delist(message, actions) do
   defp check_strip_followers(message, actions) do
     if :strip_followers in actions do
       with %User{} = user <- User.get_cached_by_ap_id(message["actor"]) do
-        {_, to} = delete_and_count(message["to"] || [], user.follower_address)
-        {_, cc} = delete_and_count(message["cc"] || [], user.follower_address)
+        to = List.delete(message["to"] || [], user.follower_address)
+        cc = List.delete(message["cc"] || [], user.follower_address)
 
         message =
           message

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

@@ -108,7 +108,7 @@ defp check_ftl_removal(%{host: actor_host} = _actor_info, object) do
   end
 
   defp intersection(list1, list2) do
-    list1 -- (list1 -- list2)
+    list1 -- list1 -- list2
   end
 
   defp check_followers_only(%{host: actor_host} = _actor_info, object) do

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

@@ -101,19 +101,10 @@ defp get_extension_if_safe(response) do
     end
   end
 
-  defp get_int_header(headers, header_name, default \\ nil) do
-    with rawval when rawval != :undefined <- :proplists.get_value(header_name, headers),
-         {int, ""} <- Integer.parse(rawval) do
-      int
-    else
-      _ -> default
-    end
-  end
-
   defp is_remote_size_within_limit?(url) do
     with {:ok, %{status: status, headers: headers} = _response} when status in 200..299 <-
            Pleroma.HTTP.request(:head, url, nil, [], []) do
-      content_length = get_int_header(headers, "content-length")
+      content_length = :proplists.get_value("content-length", headers, nil)
       size_limit = Config.get([:mrf_steal_emoji, :size_limit], @size_limit)
 
       accept_unknown =
@@ -181,7 +172,7 @@ def filter(message), do: {:ok, message}
               description: <<_::272, _::_*256>>,
               key: :hosts | :rejected_shortcodes | :size_limit,
               suggestions: [any(), ...],
-              type: {:list, :string} | {:list, :string} | :integer | :boolean
+              type: {:list, :string} | {:list, :string} | :integer
             },
             ...
           ],
@@ -218,12 +209,6 @@ def config_description do
           type: :integer,
           description: "File size limit (in bytes), checked before an emoji is saved to the disk",
           suggestions: ["100000"]
-        },
-        %{
-          key: :download_unknown_size,
-          type: :boolean,
-          description: "Whether to download emoji if size can't be determined ahead of time",
-          suggestions: [false, true]
         }
       ]
     }

lib/pleroma/web/activity_pub/object_validator.ex

@@ -15,7 +15,6 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidator do
   alias Pleroma.EctoType.ActivityPub.ObjectValidators
   alias Pleroma.Object
   alias Pleroma.Object.Containment
-  alias Pleroma.Object.Fetcher
   alias Pleroma.User
   alias Pleroma.Web.ActivityPub.ObjectValidators.AcceptRejectValidator
   alias Pleroma.Web.ActivityPub.ObjectValidators.AddRemoveValidator
@@ -254,28 +253,9 @@ def fetch_actor(object) do
   end
 
   def fetch_actor_and_object(object) do
-    # Fetcher.fetch_object_from_id already first does a local db lookup
-    with {:ok, %User{}} <- fetch_actor(object),
-         {:ap_id, id} when is_binary(id) <-
-           {:ap_id, Pleroma.Web.ActivityPub.Utils.get_ap_id(object["object"])},
-         {:ok, %Object{}} <- Fetcher.fetch_object_from_id(id) do
-      :ok
-    else
-      {:ap_id, id} ->
-        {:error, {:validate, "Invalid AP id: #{inspect(id)}"}}
-
-      # if actor: late post from a previously unknown, deleted profile
-      # if object: private post we're not allowed to access
-      # (other HTTP replies might just indicate a temporary network failure though!)
-      {:error, e} when e in [:not_found, :forbidden] ->
-        {:error, :ignore}
-
-      {:error, _} = e ->
-        e
-
-      e ->
-        {:error, e}
-    end
+    fetch_actor(object)
+    Object.normalize(object["object"], fetch: true)
+    :ok
   end
 
   defp for_each_history_item(

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

@@ -9,7 +9,6 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.AddRemoveValidator do
   import Pleroma.Web.ActivityPub.ObjectValidators.CommonValidations
 
   require Pleroma.Constants
-  require Logger
 
   alias Pleroma.User
 
@@ -28,21 +27,14 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.AddRemoveValidator do
   end
 
   def cast_and_validate(data) do
-    with {_, {:ok, actor}} <- {:user, User.get_or_fetch_by_ap_id(data["actor"])},
-         {_, {:ok, actor}} <- {:feataddr, maybe_refetch_user(actor)} do
-      data
-      |> maybe_fix_data_for_mastodon(actor)
-      |> cast_data()
-      |> validate_data(actor)
-    else
-      {:feataddr, _} ->
-        {:error,
-         {:validate,
-          "Actor doesn't provide featured collection address to verify against: #{data["id"]}"}}
+    {:ok, actor} = User.get_or_fetch_by_ap_id(data["actor"])
 
-      {:user, _} ->
-        {:error, :link_resolve_failed}
-    end
+    {:ok, actor} = maybe_refetch_user(actor)
+
+    data
+    |> maybe_fix_data_for_mastodon(actor)
+    |> cast_data()
+    |> validate_data(actor)
   end
 
   defp maybe_fix_data_for_mastodon(data, actor) do
@@ -81,9 +73,6 @@ defp maybe_refetch_user(%User{featured_address: address} = user) when is_binary(
   end
 
   defp maybe_refetch_user(%User{ap_id: ap_id}) do
-    # If the user didn't expose a featured collection before,
-    # recheck now so we can verify perms for add/remove.
-    # But wait at least 5s to avoid rapid refetches in edge cases
-    User.get_or_fetch_by_ap_id(ap_id, maximum_age: 5)
+    Pleroma.Web.ActivityPub.Transmogrifier.upgrade_user_from_ap_id(ap_id)
   end
 end