Do not use session for oauth tokens

.dockerignore

@@ -6,12 +6,12 @@ COPYING
 *file
 elixir_buildpack.config
 test/
+instance/
+_build
+deps
 test
 benchmarks
 docs/site
-docker-db
-uploads
-instance
 
 # Required to get version
 !.git

.gitattributes

@@ -1,11 +1,10 @@
 *.ex diff=elixir
 *.exs diff=elixir
 
+priv/static/instance/static.css diff=css
+
 # Most of js/css files included in the repo are minified bundles,
 #   and we don't want to search/diff those as text files.
 *.js binary
 *.js.map binary
 *.css binary
-
-priv/static/instance/static.css diff=css
-priv/static/static-fe/static-fe.css diff=css

.gitea/issue_template/bug.yml

@@ -1,85 +0,0 @@
-name: "Bug report"
-about: "Something isn't working as expected"
-title: "[bug] "
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for taking the time to file this bug report! Please try to be as specific and detailed as you can, so we can track down the issue and fix it as soon as possible.
-
-        # General information
-  - type: dropdown
-    id: installation
-    attributes:
-      label: "Your setup"
-      description: "What sort of installation are you using?"
-      options:
-        - "OTP"
-        - "From source"
-        - "Docker"
-      validations:
-        required: true
-  - type: input
-    id: setup-details
-    attributes:
-      label: "Extra details"
-      description: "If installing from source or docker, please specify your distro or docker setup."
-      placeholder: "e.g. Alpine Linux edge"
-  - type: input
-    id: version
-    attributes:
-      label: "Version"
-      description: "Which version of Akkoma are you running? If running develop, specify the commit hash."
-      placeholder: "e.g. 2022.11, 4e4bd248"
-  - type: input
-    id: postgres
-    attributes:
-      label: "PostgreSQL version"
-      placeholder: "14"
-      validations:
-        required: true
-  - type: markdown
-    attributes:
-      value: "# The issue"
-  - type: textarea
-    id: attempt
-    attributes:
-      label: "What were you trying to do?"
-      validations:
-        required: true
-  - type: textarea
-    id: expectation
-    attributes:
-      label: "What did you expect to happen?"
-      validations:
-        required: true
-  - type: textarea
-    id: reality
-    attributes:
-      label: "What actually happened?"
-      validations:
-        required: true
-  - type: textarea
-    id: logs
-    attributes:
-      label: "Logs"
-      description: "Please copy and paste any relevant log output, if applicable."
-      render: shell
-  - type: dropdown
-    id: severity
-    attributes:
-      label: "Severity"
-      description: "Does this issue prevent you from using the software as normal?"
-      options:
-        - "I cannot use the software"
-        - "I cannot use it as easily as I'd like"
-        - "I can manage"
-      validations:
-        required: true
-  - type: checkboxes
-    id: searched
-    attributes:
-      label: "Have you searched for this issue?"
-      description: "Please double-check that your issue is not already being tracked on [the forums](https://meta.akkoma.dev) or [the issue tracker](https://akkoma.dev/AkkomaGang/akkoma/issues)."
-      options:
-        - label: "I have double-checked and have not found this issue mentioned anywhere."

.gitea/issue_template/feat.yml

@@ -1,29 +0,0 @@
-name: "Feature request"
-about: "I'd like something to be added to Akkoma"
-title: "[feat] "
-body:
-  - type: markdown
-    attributes:
-      value: "Thanks for taking the time to request a new feature! Please be as concise and clear as you can in your proposal, so we could understand what you're going for."
-  - type: textarea
-    id: idea
-    attributes:
-      label: "The idea"
-      description: "What do you think you should be able to do in Akkoma?"
-      validations:
-        required: true
-  - type: textarea
-    id: reason
-    attributes:
-      label: "The reasoning"
-      description: "Why would this be a worthwhile feature? Does it solve any problems? Have people talked about wanting it?"
-      validations:
-        required: true
-  - type: checkboxes
-    id: searched
-    attributes:
-      label: "Have you searched for this feature request?"
-      description: "Please double-check that your issue is not already being tracked on [the forums](https://meta.akkoma.dev), [the issue tracker](https://akkoma.dev/AkkomaGang/akkoma/issues), or the one for [pleroma-fe](https://akkoma.dev/AkkomaGang/pleroma-fe/issues)."
-      options:
-        - label: "I have double-checked and have not found this feature request mentioned anywhere."
-        - label: "This feature is related to the Akkoma backend specifically, and not pleroma-fe."

.gitignore

@@ -1,6 +1,5 @@
 # App artifacts
 docs/site
-*.zip
 *.sw*
 secret
 /_build
@@ -18,13 +17,6 @@ secret
 /instance
 /priv/ssh_keys
 vm.args
-.cache/
-.hex/
-.mix/
-.psql_history
-docker-resources/Dockerfile
-docker-resources/Caddyfile
-pgdata
 
 # Prevent committing custom emojis
 /priv/static/emoji/custom/*
@@ -73,6 +65,3 @@ pleroma.iml
 
 # Generated documentation
 docs/site
-
-# docker stuff
-docker-db

.gitlab/issue_templates/Bug.md

@@ -0,0 +1,18 @@
+<!--
+### Precheck
+
+* For support use https://git.pleroma.social/pleroma/pleroma-support or [community channels](https://git.pleroma.social/pleroma/pleroma#community-channels).
+* Please do a quick search to ensure no similar bug has been reported before. If the bug has not been addressed after 2 weeks, it's fine to bump it.
+* Try to ensure that the bug is actually related to the Pleroma backend. For example, if a bug happens in Pleroma-FE but not in Mastodon-FE or mobile clients, it's likely that the bug should be filed in [Pleroma-FE](https://git.pleroma.social/pleroma/pleroma-fe/issues/new) repository.
+-->
+
+### Environment
+
+* Installation type (OTP or From Source):
+* Pleroma version (could be found in the "Version" tab of settings in Pleroma-FE): 
+* Elixir version (`elixir -v` for from source installations, N/A for OTP):
+* Operating system:
+* PostgreSQL version (`psql -V`):
+
+
+### Bug description

.gitlab/merge_request_templates/Release.md

@@ -0,0 +1,6 @@
+### Release checklist
+* [ ]  Bump version in `mix.exs`
+* [ ]  Compile a changelog
+* [ ]  Create an MR with an announcement to pleroma.social
+* [ ]  Tag the release
+* [ ] Merge `stable` into `develop` (in case the fixes are already in develop, use `git merge -s ours --no-commit` and manually merge the changelogs)

.woodpecker.yml

@@ -14,14 +14,6 @@ variables:
         - stable
         - refs/tags/v*
         - refs/tags/stable-*
-  - &on-stable
-    when:
-      event:
-        - push
-        - tag
-      branch:
-        - stable
-        - refs/tags/stable-*
   - &on-point-release
     when:
       event:
@@ -53,14 +45,14 @@ services:
 pipeline:
   lint:
     <<: *on-pr-open
-    image: akkoma/ci-base:1.14
+    image: akkoma/ci-base:latest
     commands:
     - mix local.hex --force
     - mix local.rebar --force
     - mix format --check-formatted
 
   build:
-    image: akkoma/ci-base:1.14
+    image: akkoma/ci-base:latest
     <<: *on-pr-open
     environment:
       MIX_ENV: test
@@ -75,7 +67,7 @@ pipeline:
       - mix compile
 
   test:
-    image: akkoma/ci-base:1.14
+    image: akkoma/ci-base:latest
     <<: *on-pr-open
     environment:
       MIX_ENV: test
@@ -95,7 +87,7 @@ pipeline:
 
   # Canonical amd64
   ubuntu22:
-    image: hexpm/elixir:1.14.2-erlang-25.1.2-ubuntu-jammy-20220428
+    image: hexpm/elixir:1.13.4-erlang-25.0.2-ubuntu-jammy-20220428
     <<: *on-release
     environment:
       MIX_ENV: prod
@@ -118,11 +110,9 @@ pipeline:
       - export SOURCE=akkoma-ubuntu-jammy.zip
       - export DEST=scaleway:akkoma-updates/$${CI_COMMIT_TAG:-"$CI_COMMIT_BRANCH"}/akkoma-ubuntu-jammy.zip
       - /bin/sh /entrypoint.sh
-      - export DEST=scaleway:akkoma-updates/$${CI_COMMIT_TAG:-"$CI_COMMIT_BRANCH"}/akkoma-amd64-ubuntu-jammy.zip
-      - /bin/sh /entrypoint.sh
 
   debian-bullseye:
-    image: hexpm/elixir:1.14.2-erlang-25.1.2-debian-bullseye-20221004
+    image: elixir:1.13.4
     <<: *on-release
     environment:
       MIX_ENV: prod
@@ -151,8 +141,8 @@ pipeline:
 
   # Canonical amd64-musl
   musl:
-    image: hexpm/elixir:1.14.2-erlang-25.1.2-alpine-3.16.2
-    <<: *on-stable
+    image: elixir:1.13.4-alpine
+    <<: *on-release
     environment:
       MIX_ENV: prod
     commands:
@@ -167,7 +157,7 @@ pipeline:
 
   release-musl:
     image: akkoma/releaser
-    <<: *on-stable
+    <<: *on-release
     secrets: *scw-secrets
     commands:
       - export SOURCE=akkoma-amd64-musl.zip

CHANGELOG.md

@@ -4,87 +4,18 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
-## Unreleased
-
-## Added
-- Config: HTTP timeout options, :pool\_timeout and :receive\_timeout
-- Added statistic gathering about instances which do/don't have signed fetches when they request from us
-- Ability to set a default post expiry time, after which the post will be deleted. If used in concert with ActivityExpiration MRF, the expiry which comes _sooner_ will be applied.
-- Regular task to prune local transient activities
-- Task to manually run the transient prune job (pleroma.database prune\_task)
-- Ability to follow hashtags
-
-## Changed
-- MastoAPI: Accept BooleanLike input on `/api/v1/accounts/:id/follow` (fixes follows with mastodon.py)
-- Relays from akkoma are now off by default
-- NormalizeMarkup MRF is now on by default
-- Follow/Block/Mute imports now spin off into *n* tasks to avoid the oban timeout
-- Transient activities recieved from remote servers are no longer persisted in the database
-- Overhauled static-fe view for logged-out users
-
-## Upgrade Notes
-- If you have an old instance, you will probably want to run `mix pleroma.database prune_task` in the foreground to catch it up with the history of your instance.
-
-## 2022.11
-
-## Added
-- Officially supported docker release
-- Ability to remove followers unilaterally without a block
-- Scraping of nodeinfo from remote instances to display instance info
-- `requested_by` in relationships when the user has requested to follow you
-
-## Changed
-- Follows no longer override domain blocks, a domain block is final
-- Deletes are now the lowest priority to publish and will be handled after creates
-- Domain blocks are now subdomain-matches by default
-
-## Fixed
-- Registrations via ldap are now compatible with the latest OTP24
-
-## Update notes
-- If you use LDAP and run from source, please update your elixir/erlang
-  to the latest. The changes in OTP24.3 are breaking.
-- You can now remove the leading `*.` from domain blocks, but you do not have to.
-
-## 2022.10
-
-### Added
-- Ability to sync frontend profiles between clients, with a name attached
-- Status card generation will now use the media summary if it is available
-
-### Changed
-- Emoji updated to latest 15.0 draft
-- **Breaking**: `/api/v1/pleroma/backups` endpoints now requires `read:backups` scope instead of `read:accounts`
-- Verify that the signature on posts is not domain blocked, and belongs to the correct user
-
-### Fixed
-- OAuthPlug no longer joins with the database every call and uses the user cache
-- Undo activities no longer try to look up by ID, and render correctly
-- prevent false-errors from meilisearch
-
-## 2022.09
+## [Unreleased]
 
 ### Added
 - support for fedibird-fe, and non-breaking API parity for it to function
-- support for setting instance languages in metadata
-- support for reusing oauth tokens, and not requiring new authorizations
-- the ability to obfuscate domains in your MRF descriptions
-- automatic translation of statuses via DeepL or LibreTranslate
-- ability to edit posts
-- ability to react with remote emoji
 
 ### Changed
 - MFM parsing is now done on the backend by a modified version of ilja's parser -> https://akkoma.dev/AkkomaGang/mfm-parser
-- InlineQuotePolicy is now on by default
-- Enable remote users to interact with posts
 
 ### Fixed
 - Compatibility with latest meilisearch
 - Resolution of nested mix tasks (i.e search.meilisearch) in OTP releases
 - Elasticsearch returning likes and repeats, displaying as posts
-- Ensure key generation happens at registration-time to prevent potential race-conditions
-- Ensured websockets get closed on logout
-- Allowed GoToSocial-style `?query_string` signatures
 
 ### Removed
 - Non-finch HTTP adapters. `:tesla, :adapter` is now highly recommended to be set to the default.

COPYING

@@ -1,15 +1,12 @@
-Unless otherwise stated this repository is 
-Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
-Copyright © 2022 Akkoma Authors <https://akkoma.social/>
-and is distributed under The GNU Affero General Public License Version 3, you
-should have received a copy of the license file as AGPL-3.
+Unless otherwise stated this repository is copyright © 2017-2021
+Pleroma Authors <https://pleroma.social/>, and is distributed under
+The GNU Affero General Public License Version 3, you should have received a
+copy of the license file as AGPL-3.
 
 ---
 
-Files inside docs directory are
-Copyright © 2021-2022 Pleroma Authors <https://pleroma.social/>
-Copyright © 2022 Akkoma Authors <https://akkoma.social/>
-and are distributed under the Creative Commons
+Files inside docs directory are copyright © 2021 Pleroma Authors
+<https://pleroma.social/>, and are distributed under the Creative Commons
 Attribution 4.0 International license, you should have received
 a copy of the license file as CC-BY-4.0.
 
@@ -19,7 +16,17 @@ The following files are copyright © 2019 shitposter.club, and are distributed
 under the Creative Commons Attribution-ShareAlike 4.0 International license,
 you should have received a copy of the license file as CC-BY-SA-4.0.
 
+priv/static/images/pleroma-fox-tan.png
 priv/static/images/pleroma-fox-tan-smol.png
+priv/static/images/pleroma-tan.png
+
+---
+
+The following files are copyright © 2019 shitposter.club, and are distributed
+under the Creative Commons Attribution 4.0 International license, you should
+have received a copy of the license file as CC-BY-4.0.
+
+priv/static/images/pleroma-fox-tan-shy.png
 
 ---
 
@@ -28,4 +35,22 @@ The following files are copyright © 2017-2020 Pleroma Authors
 Attribution-ShareAlike 4.0 International license, you should have received
 a copy of the license file as CC-BY-SA-4.0.
 
+priv/static/images/avi.png
+priv/static/images/banner.png
 priv/static/instance/thumbnail.jpeg
+
+---
+
+All photos published on Unsplash can be used for free. You can use them for
+commercial and noncommercial purposes. You do not need to ask permission from
+or provide credit to the photographer or Unsplash, although it is appreciated
+when possible.
+
+More precisely, Unsplash grants you an irrevocable, nonexclusive, worldwide
+copyright license to download, copy, modify, distribute, perform, and use
+photos from Unsplash for free, including for commercial purposes, without
+permission from or attributing the photographer or Unsplash. This license
+does not include the right to compile photos from Unsplash to replicate
+a similar or competing service.
+
+priv/static/images/city.jpg

Dockerfile

@@ -1,8 +1,21 @@
-FROM hexpm/elixir:1.13.4-erlang-24.3.4.5-alpine-3.15.6
+FROM elixir:1.13.4-alpine as build
+
+COPY . .
 
 ENV MIX_ENV=prod
 
-ARG HOME=/opt/akkoma
+RUN apk add git gcc g++ musl-dev make cmake file-dev &&\
+	echo "import Config" > config/prod.secret.exs &&\
+	mix local.hex --force &&\
+	mix local.rebar --force &&\
+	mix deps.get --only prod &&\
+	mkdir release &&\
+	mix release --path release
+
+FROM alpine:3.16
+
+ARG BUILD_DATE
+ARG VCS_REF
 
 LABEL org.opencontainers.image.title="akkoma" \
     org.opencontainers.image.description="Akkoma for Docker" \
@@ -13,21 +26,25 @@ LABEL org.opencontainers.image.title="akkoma" \
     org.opencontainers.image.revision=$VCS_REF \
     org.opencontainers.image.created=$BUILD_DATE
 
-RUN apk add git gcc g++ musl-dev make cmake file-dev exiftool ffmpeg imagemagick libmagic ncurses postgresql-client
+ARG HOME=/opt/akkoma
+ARG DATA=/var/lib/akkoma
+
+RUN apk update &&\
+	apk add exiftool ffmpeg imagemagick libmagic ncurses postgresql-client &&\
+	adduser --system --shell /bin/false --home ${HOME} akkoma &&\
+	mkdir -p ${DATA}/uploads &&\
+	mkdir -p ${DATA}/static &&\
+	chown -R akkoma ${DATA} &&\
+	mkdir -p /etc/akkoma &&\
+	chown -R akkoma /etc/akkoma
+
+USER akkoma
+
+COPY --from=build --chown=akkoma:0 /release ${HOME}
+
+COPY ./config/docker.exs /etc/akkoma/config.exs
+COPY ./docker-entrypoint.sh ${HOME}
 
 EXPOSE 4000
 
-ARG UID=1000
-ARG GID=1000
-ARG UNAME=akkoma
-
-RUN addgroup -g $GID $UNAME
-RUN adduser -u $UID -G $UNAME -D -h $HOME $UNAME
-
-WORKDIR /opt/akkoma
-
-USER $UNAME
-RUN mix local.hex --force &&\
-    mix local.rebar --force
-
-CMD ["/opt/akkoma/docker-entrypoint.sh"]
+ENTRYPOINT ["/opt/akkoma/docker-entrypoint.sh"]

README.md

@@ -2,39 +2,16 @@
 
 *a smallish microblogging platform, aka the cooler pleroma*
 
-![English OK](https://img.shields.io/badge/English-OK-blueviolet) ![日本語OK](https://img.shields.io/badge/%E6%97%A5%E6%9C%AC%E8%AA%9E-OK-blueviolet)
-
 ## About 
 
 This is a fork of Pleroma, which is a microblogging server software that can federate (= exchange messages with) other servers that support ActivityPub. What that means is that you can host a server for yourself or your friends and stay in control of your online identity, but still exchange messages with people on larger servers. Akkoma will federate with all servers that implement ActivityPub, like Friendica, GNU Social, Hubzilla, Mastodon, Misskey, Peertube, and Pixelfed.
 
-Akkoma is written in Elixir and uses PostgreSQL for data storage.
+Akkoma is written in Elixir and uses PostgresSQL for data storage.
 
 For clients it supports the [Mastodon client API](https://docs.joinmastodon.org/api/guidelines/) with Pleroma extensions (see the API section on <https://docs.akkoma.dev/stable/>).
 
 - [Client Applications for Akkoma](https://docs.akkoma.dev/stable/clients/)
 
-## Differences with Pleroma
-
-Akkoma is a faster-paced fork, it has a varied and potentially experimental feature set tailored specifically to the corner of the fediverse inhabited by the project
-creator and contributors.
-
-This should not be considered a one-for-one match with pleroma; it is more opinionated in many ways, and has a smaller community (which is good or
-bad depending on your view)
-
-For example, Akkoma has:
-- Custom Emoji reactions (compatible with misskey)
-- Misskey-flavoured markdown support
-- Elasticsearch and Meilisearch support for search
-- Mastodon frontend (Glitch-Soc and Fedibird flavours) support
-- Automatic post translation via DeepL or LibreTranslate
-- A multitude of heavy modifications to the Pleroma Frontend (Pleroma-FE)
-- The "bubble" concept, in which instance administrators can choose closely-related instances to make a "community of communities", so to say
-
-And takes a more opinionated stance on issues like Domain blocks, which are enforced far more on Akkoma.
-
-Take a look at the Changelog if you want a full list of recent changes, everything since 3.0 has been Akkoma.
-
 ## Installation
 
 ### OTP releases (Recommended)
@@ -46,13 +23,15 @@ If your platform is not supported, or you just want to be able to edit the sourc
 - [Alpine Linux](https://docs.akkoma.dev/stable/installation/alpine_linux_en/)
 - [Arch Linux](https://docs.akkoma.dev/stable/installation/arch_linux_en/)
 - [Debian-based](https://docs.akkoma.dev/stable/installation/debian_based_en/)
+- [Debian-based (jp)](https://docs.akkoma.dev/stable/installation/debian_based_jp/)
 - [FreeBSD](https://docs.akkoma.dev/stable/installation/freebsd_en/)
 - [Gentoo Linux](https://docs.akkoma.dev/stable/installation/gentoo_en/)
 - [NetBSD](https://docs.akkoma.dev/stable/installation/netbsd_en/)
 - [OpenBSD](https://docs.akkoma.dev/stable/installation/openbsd_en/)
+- [OpenBSD (fi)](https://docs.akkoma.dev/stable/installation/openbsd_fi/)
 
 ### Docker
-Docker installation is supported via [this setup](https://docs.akkoma.dev/stable/installation/docker_en/)
+While we don’t provide docker files, other people have written very good ones. Take a look at <https://github.com/angristan/docker-pleroma> or <https://glitch.sh/sn0w/pleroma-docker>.
 
 ### Compilation Troubleshooting
 If you ever encounter compilation issues during the updating of Akkoma, you can try these commands and see if they fix things:
@@ -64,4 +43,3 @@ If you ever encounter compilation issues during the updating of Akkoma, you can
 
 ## Documentation
 - https://docs.akkoma.dev/stable
-- https://docs.akkoma.dev/develop

SIGNING_KEY.pub

@@ -1,2 +0,0 @@
-untrusted comment: Akkoma Signing Key public key
-RWQRlw8Ex/uTbvo1wB1yK75tQ5nXKilB/vrKdkL41bgZHL9aKP+7fSS5

config/config.exs

@@ -48,7 +48,6 @@
 
 config :pleroma, Pleroma.Repo,
   telemetry_event: [Pleroma.Repo.Instrumenter],
-  queue_target: 20_000,
   migration_lock: nil
 
 config :pleroma, Pleroma.Captcha,
@@ -180,14 +179,12 @@
 
 # Configures http settings, upstream proxy etc.
 config :pleroma, :http,
-  pool_timeout: :timer.seconds(5),
-  receive_timeout: :timer.seconds(15),
   proxy_url: nil,
   user_agent: :default,
   adapter: []
 
 config :pleroma, :instance,
-  name: "Akkoma",
+  name: "Pleroma",
   email: "example@example.com",
   notify_email: "noreply@example.com",
   description: "Akkoma: The cooler fediverse server",
@@ -200,7 +197,6 @@
   avatar_upload_limit: 2_000_000,
   background_upload_limit: 4_000_000,
   banner_upload_limit: 4_000_000,
-  languages: ["en"],
   poll_limits: %{
     max_options: 20,
     max_option_chars: 200,
@@ -217,7 +213,7 @@
   federation_publisher_modules: [
     Pleroma.Web.ActivityPub.Publisher
   ],
-  allow_relay: false,
+  allow_relay: true,
   public: true,
   static_dir: "instance/static/",
   allowed_post_formats: [
@@ -263,8 +259,7 @@
   password_reset_token_validity: 60 * 60 * 24,
   profile_directory: true,
   privileged_staff: false,
-  local_bubble: [],
-  max_frontend_settings_json_chars: 100_000
+  local_bubble: []
 
 config :pleroma, :welcome,
   direct_message: [
@@ -314,19 +309,19 @@
     logo: "/static/logo.svg",
     logoMargin: ".1em",
     logoMask: true,
+    minimalScopesMode: false,
     noAttachmentLinks: false,
     nsfwCensorImage: "",
     postContentType: "text/plain",
     redirectRootLogin: "/main/friends",
-    redirectRootNoLogin: "/main/public",
+    redirectRootNoLogin: "/main/all",
     scopeCopy: true,
     sidebarRight: false,
     showFeaturesPanel: true,
     showInstanceSpecificPanel: false,
     subjectLineBehavior: "email",
     theme: "pleroma-dark",
-    webPushNotifications: false,
-    conversationDisplay: "linear"
+    webPushNotifications: false
   },
   masto_fe: %{
     showInstanceSpecificPanel: true
@@ -489,7 +484,8 @@
 config :pleroma, :http_security,
   enabled: true,
   sts: false,
-  sts_max_age: 63_072_000,
+  sts_max_age: 31_536_000,
+  ct_max_age: 2_592_000,
   referrer_policy: "same-origin"
 
 config :cors_plug,
@@ -568,18 +564,12 @@
     attachments_cleanup: 1,
     new_users_digest: 1,
     mute_expire: 5,
-    search_indexing: 10,
-    nodeinfo_fetcher: 1,
-    database_prune: 1
-  ],
-  plugins: [
-    Oban.Plugins.Pruner,
-    {Oban.Plugins.Reindexer, schedule: "@weekly"}
+    search_indexing: 10
   ],
+  plugins: [Oban.Plugins.Pruner],
   crontab: [
     {"0 0 * * 0", Pleroma.Workers.Cron.DigestEmailsWorker},
-    {"0 0 * * *", Pleroma.Workers.Cron.NewUsersDigestWorker},
-    {"0 3 * * *", Pleroma.Workers.Cron.PruneDatabaseWorker}
+    {"0 0 * * *", Pleroma.Workers.Cron.NewUsersDigestWorker}
   ]
 
 config :pleroma, :workers,
@@ -587,28 +577,6 @@
     federator_incoming: 5,
     federator_outgoing: 5,
     search_indexing: 2
-  ],
-  timeout: [
-    activity_expiration: :timer.seconds(5),
-    token_expiration: :timer.seconds(5),
-    filter_expiration: :timer.seconds(5),
-    backup: :timer.seconds(900),
-    federator_incoming: :timer.seconds(10),
-    federator_outgoing: :timer.seconds(10),
-    ingestion_queue: :timer.seconds(5),
-    web_push: :timer.seconds(5),
-    mailer: :timer.seconds(5),
-    transmogrifier: :timer.seconds(5),
-    scheduled_activities: :timer.seconds(5),
-    poll_notifications: :timer.seconds(5),
-    background: :timer.seconds(5),
-    remote_fetcher: :timer.seconds(10),
-    attachments_cleanup: :timer.seconds(900),
-    new_users_digest: :timer.seconds(10),
-    mute_expire: :timer.seconds(5),
-    search_indexing: :timer.seconds(5),
-    nodeinfo_fetcher: :timer.seconds(10),
-    database_prune: :timer.minutes(10)
   ]
 
 config :pleroma, Pleroma.Formatter,
@@ -783,9 +751,9 @@
     },
     "soapbox-fe" => %{
       "name" => "soapbox-fe",
-      "git" => "https://gitlab.com/soapbox-pub/soapbox",
+      "git" => "https://gitlab.com/soapbox-pub/soapbox-fe",
       "build_url" =>
-        "https://gitlab.com/soapbox-pub/soapbox/-/jobs/artifacts/${ref}/download?job=build-production",
+        "https://gitlab.com/soapbox-pub/soapbox-fe/-/jobs/artifacts/${ref}/download?job=build-production",
       "ref" => "v2.0.0",
       "build_dir" => "static"
     },
@@ -825,15 +793,13 @@
 config :pleroma, :mrf,
   policies: [Pleroma.Web.ActivityPub.MRF.ObjectAgePolicy, Pleroma.Web.ActivityPub.MRF.TagPolicy],
   transparency: true,
-  transparency_exclusions: [],
-  transparency_obfuscate_domains: []
+  transparency_exclusions: []
 
 config :ex_aws, http_client: Pleroma.HTTP.ExAws
 
 config :web_push_encryption, http_client: Pleroma.HTTP.WebPush
 
-config :pleroma, :instances_favicons, enabled: true
-config :pleroma, :instances_nodeinfo, enabled: true
+config :pleroma, :instances_favicons, enabled: false
 
 config :floki, :html_parser, Floki.HTMLParser.FastHtml
 
@@ -875,19 +841,6 @@
     }
   }
 
-config :pleroma, :translator,
-  enabled: false,
-  module: Pleroma.Akkoma.Translators.DeepL
-
-config :pleroma, :deepl,
-  # either :free or :pro
-  tier: :free,
-  api_key: ""
-
-config :pleroma, :libre_translate,
-  url: "http://127.0.0.1:5000",
-  api_key: nil
-
 # 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

@@ -509,16 +509,6 @@
           "Pleroma"
         ]
       },
-      %{
-        key: :languages,
-        type: {:list, :string},
-        description: "Languages the instance uses",
-        suggestions: [
-          "en",
-          "ja",
-          "fr"
-        ]
-      },
       %{
         key: :email,
         label: "Admin Email Address",
@@ -691,8 +681,8 @@
         key: :public,
         type: :boolean,
         description:
-          "Switching this on will allow unauthenticated users access to all public resources on your instance" <>
-            " Switching it off is useful for disabling the Local Timeline and The Whole Known Network. " <>
+          "Makes the client API in authenticated mode-only except for user-profiles." <>
+            " Useful for disabling the Local Timeline and The Whole Known Network. " <>
             " Note: when setting to `false`, please also check `:restrict_unauthenticated` setting."
       },
       %{
@@ -723,8 +713,7 @@
           "text/plain",
           "text/html",
           "text/markdown",
-          "text/bbcode",
-          "text/x.misskeymarkdown"
+          "text/bbcode"
         ]
       },
       %{
@@ -1227,13 +1216,6 @@
             type: :boolean,
             description: "Enables green text on lines prefixed with the > character"
           },
-          %{
-            key: :conversationDisplay,
-            label: "Conversation display style",
-            type: :string,
-            description: "How to display conversations (linear or tree)",
-            suggestions: ["linear", "tree"]
-          },
           %{
             key: :hideFilteredStatuses,
             label: "Hide Filtered Statuses",
@@ -1282,6 +1264,14 @@
               "By default it assumes logo used will be monochrome with alpha channel to be compatible with both light and dark themes. " <>
                 "If you want a colorful logo you must disable logoMask."
           },
+          %{
+            key: :minimalScopesMode,
+            label: "Minimal scopes mode",
+            type: :boolean,
+            description:
+              "Limit scope selection to Direct, User default, and Scope of post replying to. " <>
+                "Also prevents replying to a DM with a public post from PleromaFE."
+          },
           %{
             key: :nsfwCensorImage,
             label: "NSFW Censor Image",
@@ -1295,13 +1285,7 @@
             label: "Post Content Type",
             type: {:dropdown, :atom},
             description: "Default post formatting option",
-            suggestions: [
-              "text/plain",
-              "text/html",
-              "text/markdown",
-              "text/bbcode",
-              "text/x.misskeymarkdown"
-            ]
+            suggestions: ["text/plain", "text/html", "text/markdown", "text/bbcode"]
           },
           %{
             key: :redirectRootNoLogin,
@@ -1395,12 +1379,6 @@
             label: "Render misskey markdown",
             type: :boolean,
             description: "Whether to render Misskey-flavoured markdown"
-          },
-          %{
-            key: :stopGifs,
-            label: "Stop Gifs",
-            type: :boolean,
-            description: "Whether to pause animated images until they're hovered on"
           }
         ]
       },
@@ -1756,7 +1734,14 @@
         label: "STS max age",
         type: :integer,
         description: "The maximum age for the Strict-Transport-Security header if sent",
-        suggestions: [63_072_000]
+        suggestions: [31_536_000]
+      },
+      %{
+        key: :ct_max_age,
+        label: "CT max age",
+        type: :integer,
+        description: "The maximum age for the Expect-CT header if sent",
+        suggestions: [2_592_000]
       },
       %{
         key: :referrer_policy,
@@ -1978,32 +1963,6 @@
           federator_incoming: 5,
           federator_outgoing: 5
         ]
-      },
-      %{
-        key: :timeout,
-        type: {:keyword, :integer},
-        description: "Timeout for jobs, per `Oban` queue, in ms",
-        suggestions: [
-          activity_expiration: :timer.seconds(5),
-          token_expiration: :timer.seconds(5),
-          filter_expiration: :timer.seconds(5),
-          backup: :timer.seconds(900),
-          federator_incoming: :timer.seconds(10),
-          federator_outgoing: :timer.seconds(10),
-          ingestion_queue: :timer.seconds(5),
-          web_push: :timer.seconds(5),
-          mailer: :timer.seconds(5),
-          transmogrifier: :timer.seconds(5),
-          scheduled_activities: :timer.seconds(5),
-          poll_notifications: :timer.seconds(5),
-          background: :timer.seconds(5),
-          remote_fetcher: :timer.seconds(10),
-          attachments_cleanup: :timer.seconds(900),
-          new_users_digest: :timer.seconds(10),
-          mute_expire: :timer.seconds(5),
-          search_indexing: :timer.seconds(5),
-          nodeinfo_fetcher: :timer.seconds(10)
-        ]
       }
     ]
   },
@@ -2665,21 +2624,6 @@
     type: :group,
     description: "HTTP settings",
     children: [
-      %{
-        key: :pool_timeout,
-        label: "HTTP Pool Request Timeout",
-        type: :integer,
-        description: "Timeout for initiating HTTP requests (in ms, default 5000)",
-        suggestions: [5000]
-      },
-      %{
-        key: :receive_timeout,
-        label: "HTTP Receive Timeout",
-        type: :integer,
-        description:
-          "Timeout for waiting on remote servers to respond to HTTP requests (in ms, default 15000)",
-        suggestions: [15000]
-      },
       %{
         key: :proxy_url,
         label: "Proxy URL",
@@ -3005,7 +2949,8 @@
     key: :restrict_unauthenticated,
     label: "Restrict Unauthenticated",
     type: :group,
-    description: "Disallow unauthenticated viewing of timelines, user profiles and statuses.",
+    description:
+      "Disallow viewing timelines, user profiles and statuses for unauthenticated users.",
     children: [
       %{
         key: :timelines,
@@ -3015,12 +2960,12 @@
           %{
             key: :local,
             type: :boolean,
-            description: "Disallow viewing the public timeline."
+            description: "Disallow view public timeline."
           },
           %{
             key: :federated,
             type: :boolean,
-            description: "Disallow viewing the whole known network timeline."
+            description: "Disallow view federated timeline."
           }
         ]
       },
@@ -3032,29 +2977,29 @@
           %{
             key: :local,
             type: :boolean,
-            description: "Disallow viewing local user profiles."
+            description: "Disallow view local user profiles."
           },
           %{
             key: :remote,
             type: :boolean,
-            description: "Disallow viewing remote user profiles."
+            description: "Disallow view remote user profiles."
           }
         ]
       },
       %{
         key: :activities,
         type: :map,
-        description: "Settings for posts.",
+        description: "Settings for statuses.",
         children: [
           %{
             key: :local,
             type: :boolean,
-            description: "Disallow viewing local posts."
+            description: "Disallow view local statuses."
           },
           %{
             key: :remote,
             type: :boolean,
-            description: "Disallow viewing remote posts."
+            description: "Disallow view remote statuses."
           }
         ]
       }
@@ -3086,19 +3031,6 @@
       }
     ]
   },
-  %{
-    group: :pleroma,
-    key: :instances_nodeinfo,
-    type: :group,
-    description: "Control favicons for instances",
-    children: [
-      %{
-        key: :enabled,
-        type: :boolean,
-        description: "Allow/disallow getting instance nodeinfo"
-      }
-    ]
-  },
   %{
     group: :ex_aws,
     key: :s3,
@@ -3284,14 +3216,13 @@
     group: :pleroma,
     key: Pleroma.Search,
     type: :group,
-    label: "Search",
     description: "General search settings.",
     children: [
       %{
         key: :module,
-        type: :module,
+        type: :keyword,
         description: "Selected search module.",
-        suggestions: {:list_behaviour_implementations, Pleroma.Search.SearchBackend}
+        suggestion: [Pleroma.Search.DatabaseSearch, Pleroma.Search.Meilisearch]
       }
     ]
   },
@@ -3316,7 +3247,7 @@
       },
       %{
         key: :initial_indexing_chunk_size,
-        type: :integer,
+        type: :int,
         description:
           "Amount of posts in a batch when running the initial indexing operation. Should probably not be more than 100000" <>
             " since there's a limit on maximum insert size",
@@ -3327,7 +3258,6 @@
   %{
     group: :pleroma,
     key: Pleroma.Search.Elasticsearch.Cluster,
-    label: "Elasticsearch",
     type: :group,
     description: "Elasticsearch settings.",
     children: [
@@ -3394,13 +3324,13 @@
               },
               %{
                 key: :bulk_page_size,
-                type: :integer,
+                type: :int,
                 description: "Size for bulk put requests, mostly used on building the index",
                 suggestion: [5000]
               },
               %{
                 key: :bulk_wait_interval,
-                type: :integer,
+                type: :int,
                 description: "Time to wait between bulk put requests (in ms)",
                 suggestion: [15_000]
               }
@@ -3409,66 +3339,5 @@
         ]
       }
     ]
-  },
-  %{
-    group: :pleroma,
-    key: :translator,
-    type: :group,
-    description: "Translation Settings",
-    children: [
-      %{
-        key: :enabled,
-        type: :boolean,
-        description: "Is translation enabled?",
-        suggestion: [true, false]
-      },
-      %{
-        key: :module,
-        type: :module,
-        description: "Translation module.",
-        suggestions: {:list_behaviour_implementations, Pleroma.Akkoma.Translator}
-      }
-    ]
-  },
-  %{
-    group: :pleroma,
-    key: :deepl,
-    label: "DeepL",
-    type: :group,
-    description: "DeepL Settings.",
-    children: [
-      %{
-        key: :tier,
-        type: {:dropdown, :atom},
-        description: "API Tier",
-        suggestions: [:free, :pro]
-      },
-      %{
-        key: :api_key,
-        type: :string,
-        description: "API key for DeepL",
-        suggestions: [nil]
-      }
-    ]
-  },
-  %{
-    group: :pleroma,
-    key: :libre_translate,
-    type: :group,
-    description: "LibreTranslate Settings.",
-    children: [
-      %{
-        key: :url,
-        type: :string,
-        description: "URL for libretranslate",
-        suggestion: [nil]
-      },
-      %{
-        key: :api_key,
-        type: :string,
-        description: "API key for libretranslate",
-        suggestion: [nil]
-      }
-    ]
   }
 ]

config/docker.exs

@@ -24,11 +24,11 @@
 config :web_push_encryption, :vapid_details, subject: "mailto:#{System.get_env("NOTIFY_EMAIL")}"
 
 config :pleroma, :database, rum_enabled: false
-config :pleroma, :instance, static_dir: "/var/lib/akkoma/static"
-config :pleroma, Pleroma.Uploaders.Local, uploads: "/var/lib/akkoma/uploads"
+config :pleroma, :instance, static_dir: "/var/lib/pleroma/static"
+config :pleroma, Pleroma.Uploaders.Local, uploads: "/var/lib/pleroma/uploads"
 
 # We can't store the secrets in this file, since this is baked into the docker image
-if not File.exists?("/var/lib/akkoma/secret.exs") do
+if not File.exists?("/var/lib/pleroma/secret.exs") do
   secret = :crypto.strong_rand_bytes(64) |> Base.encode64() |> binary_part(0, 64)
   signing_salt = :crypto.strong_rand_bytes(8) |> Base.encode64() |> binary_part(0, 8)
   {web_push_public_key, web_push_private_key} = :crypto.generate_key(:ecdh, :prime256v1)
@@ -52,16 +52,16 @@
       web_push_private_key: Base.url_encode64(web_push_private_key, padding: false)
     )
 
-  File.write("/var/lib/akkoma/secret.exs", secret_file)
+  File.write("/var/lib/pleroma/secret.exs", secret_file)
 end
 
-import_config("/var/lib/akkoma/secret.exs")
+import_config("/var/lib/pleroma/secret.exs")
 
 # For additional user config
-if File.exists?("/var/lib/akkoma/config.exs"),
-  do: import_config("/var/lib/akkoma/config.exs"),
+if File.exists?("/var/lib/pleroma/config.exs"),
+  do: import_config("/var/lib/pleroma/config.exs"),
   else:
-    File.write("/var/lib/akkoma/config.exs", """
+    File.write("/var/lib/pleroma/config.exs", """
     import Config
 
     # For additional configuration outside of environmental variables

config/test.exs

@@ -139,8 +139,6 @@
 # Reduce recompilation time
 # https://dashbit.co/blog/speeding-up-re-compilation-of-elixir-projects
 config :phoenix, :plug_init_mode, :runtime
-config :pleroma, :instances_favicons, enabled: false
-config :pleroma, :instances_nodeinfo, enabled: false
 
 if File.exists?("./config/test.secret.exs") do
   import_config "test.secret.exs"

docker-compose.yml

@@ -1,61 +0,0 @@
-version: "3.7"
-
-services:
-  db:
-    image: akkoma-db:latest
-    build: ./docker-resources/database
-    restart: unless-stopped
-    user: ${DOCKER_USER}
-    environment: {
-      # This might seem insecure but is usually not a problem.
-      # You should leave this at the "akkoma" default.
-      # The DB is only reachable by containers in the same docker network,
-      # and is not exposed to the open internet.
-      #
-      # If you do change this, remember to update "config.exs".
-      POSTGRES_DB: akkoma,
-      POSTGRES_USER: akkoma,
-      POSTGRES_PASSWORD: akkoma,
-    }
-    env_file:
-      - .env 
-    volumes:
-      - type: bind
-        source: ./pgdata
-        target: /var/lib/postgresql/data
-
-  akkoma:
-    image: akkoma:latest
-    build: .
-    restart: unless-stopped
-    env_file:
-      - .env
-    links:
-      - db
-    ports: [
-      # Uncomment/Change port mappings below as needed.
-      # The left side is your host machine, the right one is the akkoma container.
-      # You can prefix the left side with an ip.
-
-      # Webserver (for reverse-proxies outside of docker)
-      # If you use a dockerized proxy, you can leave this commented
-      # and use a container link instead.
-      "127.0.0.1:4000:4000",
-    ]
-    volumes:
-      - .:/opt/akkoma
-
-  # Uncomment the following if you want to use a reverse proxy
-  #proxy:
-  #  image: caddy:2-alpine
-  #  restart: unless-stopped
-  #  links:
-  #    - akkoma
-  #  ports: [
-  #     "443:443",
-  #     "80:80"
-  #  ]
-  #  volumes:
-  #    - ./docker-resources/Caddyfile:/etc/caddy/Caddyfile
-  #    - ./caddy-data:/data
-  #    - ./caddy-config:/config

docker-entrypoint.sh

@@ -8,7 +8,7 @@ while ! pg_isready -U ${DB_USER:-pleroma} -d postgres://${DB_HOST:-db}:5432/${DB
 done
 
 echo "-- Running migrations..."
-mix ecto.migrate
+$HOME/bin/pleroma_ctl migrate
 
 echo "-- Starting!"
-mix phx.server
+exec $HOME/bin/pleroma start

docker-resources/Caddyfile.example

@@ -1,14 +0,0 @@
-# default docker Caddyfile config for Akkoma
-#
-# Simple installation instructions:
-# 1. Replace 'example.tld' with your instance's domain wherever it appears.
-
-example.tld  {
-  log {
-    output file /var/log/caddy/akkoma.log
-  }
-
-  encode gzip
-
-  reverse_proxy akkoma:4000
-}

docker-resources/build.sh

@@ -1,4 +0,0 @@
-#!/bin/sh
-
-docker-compose build --build-arg UID=$(id -u) --build-arg GID=$(id -g) akkoma
-docker-compose build --build-arg UID=$(id -u) --build-arg GID=$(id -g) db

docker-resources/database/Dockerfile

@@ -1,10 +0,0 @@
-FROM postgres:14-alpine
-
-ARG UID=1000
-ARG GID=1000
-ARG UNAME=akkoma
-
-RUN addgroup -g $GID $UNAME
-RUN adduser -u $UID -G $UNAME -D -h $HOME $UNAME
-
-USER akkoma

docker-resources/env.example

@@ -1,4 +0,0 @@
-MIX_ENV=prod
-DB_NAME=akkoma
-DB_USER=akkoma
-DB_PASS=akkoma

docker-resources/manage.sh

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-docker-compose run --rm akkoma $@

docs/Makefile

@@ -1,14 +1,9 @@
 all:	install
 	pipenv run mkdocs build
 
-branch := $(shell git rev-parse --abbrev-ref HEAD)
 install:
 	pipenv install
 clean:
 	rm -rf site
 serve:
 	pipenv run python3 -m http.server -d site  
-zip:
-	zip -r docs.zip site/*
-deploy:
-	cd site && rclone copy . scaleway:akkoma-docs/$(branch)

docs/Pipfile.lock

@@ -14,22 +14,6 @@
         ]
     },
     "default": {
-        "certifi": {
-            "hashes": [
-                "sha256:0d9c601124e5a6ba9712dbc60d9c53c21e34f5f641fe83002317394311bdce14",
-                "sha256:90c1a32f1d68f940488354e36370f6cca89f0f106db09518524c88d6ed83f382"
-            ],
-            "markers": "python_full_version >= '3.6.0'",
-            "version": "==2022.9.24"
-        },
-        "charset-normalizer": {
-            "hashes": [
-                "sha256:5a3d016c7c547f69d6f81fb0db9449ce888b418b5b9952cc5e6e66843e9dd845",
-                "sha256:83e9a75d1911279afd89352c68b45348559d1fc0506b054b346651b5e7fee29f"
-            ],
-            "markers": "python_full_version >= '3.6.0'",
-            "version": "==2.1.1"
-        },
         "click": {
             "hashes": [
                 "sha256:7682dc8afb30297001674575ea00d1814d808d6a36af415a82bd481d37ba7b8e",
@@ -45,13 +29,13 @@
             ],
             "version": "==2.1.0"
         },
-        "idna": {
+        "importlib-metadata": {
             "hashes": [
-                "sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4",
-                "sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2"
+                "sha256:637245b8bab2b6502fcbc752cc4b7a6f6243bb02b31c5c26156ad103d3d45670",
+                "sha256:7401a975809ea1fdc658c3aa4f78cc2195a0e019c5cbc4c06122884e9ae80c23"
             ],
-            "markers": "python_version >= '3.5'",
-            "version": "==3.4"
+            "markers": "python_version >= '3.7'",
+            "version": "==4.12.0"
         },
         "jinja2": {
             "hashes": [
@@ -66,16 +50,15 @@
                 "sha256:cbb516f16218e643d8e0a95b309f77eb118cb138d39a4f27851e6a63581db874",
                 "sha256:f5da449a6e1c989a4cea2631aa8ee67caa5a2ef855d551c88f9e309f4634c621"
             ],
-            "markers": "python_full_version >= '3.6.0'",
+            "markers": "python_version >= '3.6'",
             "version": "==3.3.7"
         },
         "markdown-include": {
             "hashes": [
-                "sha256:b8f6b6f4e8b506cbe773d7e26c74a97d1354c35f3a3452d3449140a8f578d665",
-                "sha256:d12fb51500c46334a53608635035c78b7d8ad7f772566f70b8a6a9b2ef2ddbf5"
+                "sha256:6f5d680e36f7780c7f0f61dca53ca581bd50d1b56137ddcd6353efafa0c3e4a2"
             ],
             "index": "pypi",
-            "version": "==0.8.0"
+            "version": "==0.6.0"
         },
         "markupsafe": {
             "hashes": [
@@ -128,56 +111,56 @@
                 "sha256:0096d52e9dad9939c3d975a774666af186eda617e6ca84df4c94dec30004f2a8",
                 "sha256:70775750742b25c0d8f36c55aed03d24c3384d17c951b3175d898bd778ef0307"
             ],
-            "markers": "python_full_version >= '3.6.0'",
+            "markers": "python_version >= '3.6'",
             "version": "==1.3.4"
         },
         "mkdocs": {
             "hashes": [
-                "sha256:8947af423a6d0facf41ea1195b8e1e8c85ad94ac95ae307fe11232e0424b11c5",
-                "sha256:c8856a832c1e56702577023cd64cc5f84948280c1c0fcc6af4cd39006ea6aa8c"
+                "sha256:26bd2b03d739ac57a3e6eed0b7bcc86168703b719c27b99ad6ca91dc439aacde",
+                "sha256:b504405b04da38795fec9b2e5e28f6aa3a73bb0960cb6d5d27ead28952bd35ea"
             ],
-            "markers": "python_version >= '3.7'",
-            "version": "==1.4.2"
+            "markers": "python_version >= '3.6'",
+            "version": "==1.3.0"
         },
         "mkdocs-material": {
             "hashes": [
-                "sha256:b0ea0513fd8cab323e8a825d6692ea07fa83e917bb5db042e523afecc7064ab7",
-                "sha256:c907b4b052240a5778074a30a78f31a1f8ff82d7012356dc26898b97559f082e"
+                "sha256:263f2721f3abe533b61f7c8bed435a0462620912742c919821ac2d698b4bfe67",
+                "sha256:dc82b667d2a83f0de581b46a6d0949732ab77e7638b87ea35b770b33bc02e75a"
             ],
             "index": "pypi",
-            "version": "==8.5.11"
+            "version": "==8.3.9"
         },
         "mkdocs-material-extensions": {
             "hashes": [
-                "sha256:9c003da71e2cc2493d910237448c672e00cefc800d3d6ae93d2fc69979e3bd93",
-                "sha256:e41d9f38e4798b6617ad98ca8f7f1157b1e4385ac1459ca1e4ea219b556df945"
+                "sha256:a82b70e533ce060b2a5d9eb2bc2e1be201cf61f901f93704b4acf6e3d5983a44",
+                "sha256:bfd24dfdef7b41c312ede42648f9eb83476ea168ec163b613f9abd12bbfddba2"
             ],
-            "markers": "python_version >= '3.7'",
-            "version": "==1.1.1"
+            "markers": "python_version >= '3.6'",
+            "version": "==1.0.3"
         },
         "packaging": {
             "hashes": [
                 "sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb",
                 "sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522"
             ],
-            "markers": "python_full_version >= '3.6.0'",
+            "markers": "python_version >= '3.6'",
             "version": "==21.3"
         },
         "pygments": {
             "hashes": [
-                "sha256:56a8508ae95f98e2b9bdf93a6be5ae3f7d8af858b43e02c5a2ff083726be40c1",
-                "sha256:f643f331ab57ba3c9d89212ee4a2dabc6e94f117cf4eefde99a0574720d14c42"
+                "sha256:5eb116118f9612ff1ee89ac96437bb6b49e8f04d8a13b514ba26f620208e26eb",
+                "sha256:dc9c10fb40944260f6ed4c688ece0cd2048414940f1cea51b8b226318411c519"
             ],
-            "markers": "python_full_version >= '3.6.0'",
-            "version": "==2.13.0"
+            "markers": "python_version >= '3.6'",
+            "version": "==2.12.0"
         },
         "pymdown-extensions": {
             "hashes": [
-                "sha256:0f8fb7b74a37a61cc34e90b2c91865458b713ec774894ffad64353a5fce85cfc",
-                "sha256:ac698c15265680db5eb13cd4342abfcde2079ac01e5486028f47a1b41547b859"
+                "sha256:3ef2d998c0d5fa7eb09291926d90d69391283561cf6306f85cd588a5eb5befa0",
+                "sha256:ec141c0f4983755349f0c8710416348d1a13753976c028186ed14f190c8061c4"
             ],
             "markers": "python_version >= '3.7'",
-            "version": "==9.9"
+            "version": "==9.5"
         },
         "pyparsing": {
             "hashes": [
@@ -197,7 +180,6 @@
         },
         "pyyaml": {
             "hashes": [
-                "sha256:01b45c0191e6d66c470b6cf1b9531a771a83c1c4208272ead47a3ae4f2f603bf",
                 "sha256:0283c35a6a9fbf047493e3a0ce8d79ef5030852c51e9d911a27badfde0605293",
                 "sha256:055d937d65826939cb044fc8c9b08889e8c743fdc6a32b33e2390f66013e449b",
                 "sha256:07751360502caac1c067a8132d150cf3d61339af5691fe9e87803040dbc5db57",
@@ -209,36 +191,30 @@
                 "sha256:277a0ef2981ca40581a47093e9e2d13b3f1fbbeffae064c1d21bfceba2030287",
                 "sha256:2cd5df3de48857ed0544b34e2d40e9fac445930039f3cfe4bcc592a1f836d513",
                 "sha256:40527857252b61eacd1d9af500c3337ba8deb8fc298940291486c465c8b46ec0",
-                "sha256:432557aa2c09802be39460360ddffd48156e30721f5e8d917f01d31694216782",
                 "sha256:473f9edb243cb1935ab5a084eb238d842fb8f404ed2193a915d1784b5a6b5fc0",
                 "sha256:48c346915c114f5fdb3ead70312bd042a953a8ce5c7106d5bfb1a5254e47da92",
                 "sha256:50602afada6d6cbfad699b0c7bb50d5ccffa7e46a3d738092afddc1f9758427f",
                 "sha256:68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2",
                 "sha256:77f396e6ef4c73fdc33a9157446466f1cff553d979bd00ecb64385760c6babdc",
-                "sha256:81957921f441d50af23654aa6c5e5eaf9b06aba7f0a19c18a538dc7ef291c5a1",
                 "sha256:819b3830a1543db06c4d4b865e70ded25be52a2e0631ccd2f6a47a2822f2fd7c",
                 "sha256:897b80890765f037df3403d22bab41627ca8811ae55e9a722fd0392850ec4d86",
                 "sha256:98c4d36e99714e55cfbaaee6dd5badbc9a1ec339ebfc3b1f52e293aee6bb71a4",
                 "sha256:9df7ed3b3d2e0ecfe09e14741b857df43adb5a3ddadc919a2d94fbdf78fea53c",
                 "sha256:9fa600030013c4de8165339db93d182b9431076eb98eb40ee068700c9c813e34",
                 "sha256:a80a78046a72361de73f8f395f1f1e49f956c6be882eed58505a15f3e430962b",
-                "sha256:afa17f5bc4d1b10afd4466fd3a44dc0e245382deca5b3c353d8b757f9e3ecb8d",
                 "sha256:b3d267842bf12586ba6c734f89d1f5b871df0273157918b0ccefa29deb05c21c",
                 "sha256:b5b9eccad747aabaaffbc6064800670f0c297e52c12754eb1d976c57e4f74dcb",
-                "sha256:bfaef573a63ba8923503d27530362590ff4f576c626d86a9fed95822a8255fd7",
                 "sha256:c5687b8d43cf58545ade1fe3e055f70eac7a5a1a0bf42824308d868289a95737",
                 "sha256:cba8c411ef271aa037d7357a2bc8f9ee8b58b9965831d9e51baf703280dc73d3",
                 "sha256:d15a181d1ecd0d4270dc32edb46f7cb7733c7c508857278d3d378d14d606db2d",
-                "sha256:d4b0ba9512519522b118090257be113b9468d804b19d63c71dbcf4a48fa32358",
                 "sha256:d4db7c7aef085872ef65a8fd7d6d09a14ae91f691dec3e87ee5ee0539d516f53",
                 "sha256:d4eccecf9adf6fbcc6861a38015c2a64f38b9d94838ac1810a9023a0609e1b78",
                 "sha256:d67d839ede4ed1b28a4e8909735fc992a923cdb84e618544973d7dfc71540803",
                 "sha256:daf496c58a8c52083df09b80c860005194014c3698698d1a57cbcfa182142a3a",
-                "sha256:dbad0e9d368bb989f4515da330b88a057617d16b6a8245084f1b05400f24609f",
                 "sha256:e61ceaab6f49fb8bdfaa0f92c4b57bcfbea54c09277b1b4f7ac376bfb7a7c174",
                 "sha256:f84fbc98b019fef2ee9a1cb3ce93e3187a6df0b2538a651bfb890254ba9f90b5"
             ],
-            "markers": "python_full_version >= '3.6.0'",
+            "markers": "python_version >= '3.6'",
             "version": "==6.0"
         },
         "pyyaml-env-tag": {
@@ -246,17 +222,9 @@
                 "sha256:70092675bda14fdec33b31ba77e7543de9ddc88f2e5b99160396572d11525bdb",
                 "sha256:af31106dec8a4d68c60207c1886031cbf839b68aa7abccdb19868200532c2069"
             ],
-            "markers": "python_full_version >= '3.6.0'",
+            "markers": "python_version >= '3.6'",
             "version": "==0.1"
         },
-        "requests": {
-            "hashes": [
-                "sha256:7c5599b102feddaa661c826c56ab4fee28bfd17f5abca1ebbe3e7f19d7c97983",
-                "sha256:8fefa2a1a1365bf5520aac41836fbee479da67864514bdb821f31ce07ce65349"
-            ],
-            "markers": "python_version >= '3.7' and python_version < '4'",
-            "version": "==2.28.1"
-        },
         "six": {
             "hashes": [
                 "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926",
@@ -265,47 +233,44 @@
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
             "version": "==1.16.0"
         },
-        "urllib3": {
-            "hashes": [
-                "sha256:47cc05d99aaa09c9e72ed5809b60e7ba354e64b59c9c173ac3018642d8bb41fc",
-                "sha256:c083dd0dce68dbfbe1129d5271cb90f9447dea7d52097c6e0126120c521ddea8"
-            ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'",
-            "version": "==1.26.13"
-        },
         "watchdog": {
             "hashes": [
-                "sha256:1893d425ef4fb4f129ee8ef72226836619c2950dd0559bba022b0818c63a7b60",
-                "sha256:1a410dd4d0adcc86b4c71d1317ba2ea2c92babaf5b83321e4bde2514525544d5",
-                "sha256:1f2b0665c57358ce9786f06f5475bc083fea9d81ecc0efa4733fd0c320940a37",
-                "sha256:1f8eca9d294a4f194ce9df0d97d19b5598f310950d3ac3dd6e8d25ae456d4c8a",
-                "sha256:27e49268735b3c27310883012ab3bd86ea0a96dcab90fe3feb682472e30c90f3",
-                "sha256:28704c71afdb79c3f215c90231e41c52b056ea880b6be6cee035c6149d658ed1",
-                "sha256:2ac0bd7c206bb6df78ef9e8ad27cc1346f2b41b1fef610395607319cdab89bc1",
-                "sha256:2af1a29fd14fc0a87fb6ed762d3e1ae5694dcde22372eebba50e9e5be47af03c",
-                "sha256:3a048865c828389cb06c0bebf8a883cec3ae58ad3e366bcc38c61d8455a3138f",
-                "sha256:441024df19253bb108d3a8a5de7a186003d68564084576fecf7333a441271ef7",
-                "sha256:56fb3f40fc3deecf6e518303c7533f5e2a722e377b12507f6de891583f1b48aa",
-                "sha256:619d63fa5be69f89ff3a93e165e602c08ed8da402ca42b99cd59a8ec115673e1",
-                "sha256:74535e955359d79d126885e642d3683616e6d9ab3aae0e7dcccd043bd5a3ff4f",
-                "sha256:76a2743402b794629a955d96ea2e240bd0e903aa26e02e93cd2d57b33900962b",
-                "sha256:83cf8bc60d9c613b66a4c018051873d6273d9e45d040eed06d6a96241bd8ec01",
-                "sha256:920a4bda7daa47545c3201a3292e99300ba81ca26b7569575bd086c865889090",
-                "sha256:9e99c1713e4436d2563f5828c8910e5ff25abd6ce999e75f15c15d81d41980b6",
-                "sha256:a5bd9e8656d07cae89ac464ee4bcb6f1b9cecbedc3bf1334683bed3d5afd39ba",
-                "sha256:ad0150536469fa4b693531e497ffe220d5b6cd76ad2eda474a5e641ee204bbb6",
-                "sha256:af4b5c7ba60206759a1d99811b5938ca666ea9562a1052b410637bb96ff97512",
-                "sha256:c7bd98813d34bfa9b464cf8122e7d4bec0a5a427399094d2c17dd5f70d59bc61",
-                "sha256:ceaa9268d81205876bedb1069f9feab3eccddd4b90d9a45d06a0df592a04cae9",
-                "sha256:cf05e6ff677b9655c6e9511d02e9cc55e730c4e430b7a54af9c28912294605a4",
-                "sha256:d0fb5f2b513556c2abb578c1066f5f467d729f2eb689bc2db0739daf81c6bb7e",
-                "sha256:d6ae890798a3560688b441ef086bb66e87af6b400a92749a18b856a134fc0318",
-                "sha256:e5aed2a700a18c194c39c266900d41f3db0c1ebe6b8a0834b9995c835d2ca66e",
-                "sha256:e722755d995035dd32177a9c633d158f2ec604f2a358b545bba5bed53ab25bca",
-                "sha256:ed91c3ccfc23398e7aa9715abf679d5c163394b8cad994f34f156d57a7c163dc"
+                "sha256:083171652584e1b8829581f965b9b7723ca5f9a2cd7e20271edf264cfd7c1412",
+                "sha256:117ffc6ec261639a0209a3252546b12800670d4bf5f84fbd355957a0595fe654",
+                "sha256:186f6c55abc5e03872ae14c2f294a153ec7292f807af99f57611acc8caa75306",
+                "sha256:195fc70c6e41237362ba720e9aaf394f8178bfc7fa68207f112d108edef1af33",
+                "sha256:226b3c6c468ce72051a4c15a4cc2ef317c32590d82ba0b330403cafd98a62cfd",
+                "sha256:247dcf1df956daa24828bfea5a138d0e7a7c98b1a47cf1fa5b0c3c16241fcbb7",
+                "sha256:255bb5758f7e89b1a13c05a5bceccec2219f8995a3a4c4d6968fe1de6a3b2892",
+                "sha256:43ce20ebb36a51f21fa376f76d1d4692452b2527ccd601950d69ed36b9e21609",
+                "sha256:4f4e1c4aa54fb86316a62a87b3378c025e228178d55481d30d857c6c438897d6",
+                "sha256:5952135968519e2447a01875a6f5fc8c03190b24d14ee52b0f4b1682259520b1",
+                "sha256:64a27aed691408a6abd83394b38503e8176f69031ca25d64131d8d640a307591",
+                "sha256:6b17d302850c8d412784d9246cfe8d7e3af6bcd45f958abb2d08a6f8bedf695d",
+                "sha256:70af927aa1613ded6a68089a9262a009fbdf819f46d09c1a908d4b36e1ba2b2d",
+                "sha256:7a833211f49143c3d336729b0020ffd1274078e94b0ae42e22f596999f50279c",
+                "sha256:8250546a98388cbc00c3ee3cc5cf96799b5a595270dfcfa855491a64b86ef8c3",
+                "sha256:97f9752208f5154e9e7b76acc8c4f5a58801b338de2af14e7e181ee3b28a5d39",
+                "sha256:9f05a5f7c12452f6a27203f76779ae3f46fa30f1dd833037ea8cbc2887c60213",
+                "sha256:a735a990a1095f75ca4f36ea2ef2752c99e6ee997c46b0de507ba40a09bf7330",
+                "sha256:ad576a565260d8f99d97f2e64b0f97a48228317095908568a9d5c786c829d428",
+                "sha256:b530ae007a5f5d50b7fbba96634c7ee21abec70dc3e7f0233339c81943848dc1",
+                "sha256:bfc4d351e6348d6ec51df007432e6fe80adb53fd41183716017026af03427846",
+                "sha256:d3dda00aca282b26194bdd0adec21e4c21e916956d972369359ba63ade616153",
+                "sha256:d9820fe47c20c13e3c9dd544d3706a2a26c02b2b43c993b62fcd8011bcc0adb3",
+                "sha256:ed80a1628cee19f5cfc6bb74e173f1b4189eb532e705e2a13e3250312a62e0c9",
+                "sha256:ee3e38a6cc050a8830089f79cbec8a3878ec2fe5160cdb2dc8ccb6def8552658"
             ],
-            "markers": "python_full_version >= '3.6.0'",
-            "version": "==2.2.0"
+            "markers": "python_version >= '3.6'",
+            "version": "==2.1.9"
+        },
+        "zipp": {
+            "hashes": [
+                "sha256:56bf8aadb83c24db6c4b577e13de374ccfb67da2078beba1d037c17980bf43ad",
+                "sha256:c4f6e5bbf48e74f7a38e7cc5b0480ff42b0ae5178957d564d18932525d5cf099"
+            ],
+            "markers": "python_version >= '3.7'",
+            "version": "==3.8.0"
         }
     },
     "develop": {}

docs/docs/administration/CLI_tasks/database.md

@@ -159,23 +159,3 @@ Change `default_text_search_config` for database and (if necessary) text_search_
     ```
 
 See [PostgreSQL documentation](https://www.postgresql.org/docs/current/textsearch-configuration.html) and `docs/configuration/howto_search_cjk.md` for more detail.
-
-## Pruning old activities
-
-Over time, transient `Delete` activities and `Tombstone` objects
-can accumulate in your database, inflating its size. This is not ideal. 
-There is a periodic task to prune these transient objects, 
-but on first run this may take a while on older instances to catch up
-to the current day.
-
-=== "OTP"
-
-    ```sh
-    ./bin/pleroma_ctl database prune_task
-    ```
-
-=== "From Source"
-
-    ```sh
-    mix pleroma.database prune_task
-    ```

docs/docs/administration/CLI_tasks/diagnostics.md

@@ -1,30 +0,0 @@
-# Diagnostics
-
-A few tasks to help with debugging, troubleshooting, and diagnosing problems.
-
-They mostly relate to common postgres queries. 
-
-## Home timeline query plan
-
-This task will print a query plan for the home timeline of a given user.
-
-=== "OTP"
-
-    `./bin/pleroma_ctl diagnostics home_timeline <nickname>`
-
-=== "From Source"
-
-    `mix pleroma.diagnostics home_timeline <nickname>`
-
-## User timeline query plan
-
-This task will print a query plan for the user timeline of a given user,
-from the perspective of another given user.
-
-=== "OTP"
-
-    `./bin/pleroma_ctl diagnostics user_timeline <nickname> <viewing_nickname>`
-
-=== "From Source"
-    
-    `mix pleroma.diagnostics user_timeline <nickname> <viewing_nickname>`

docs/docs/administration/backup.md

@@ -4,62 +4,38 @@
 
 1. Stop the Akkoma service.
 2. Go to the working directory of Akkoma (default is `/opt/akkoma`)
-3. Run[¹] `sudo -Hu postgres pg_dump -d akkoma --format=custom -f </path/to/backup_location/akkoma.pgdump>` (make sure the postgres user has write access to the destination file)
-4. Copy `akkoma.pgdump`, `config/prod.secret.exs`[²], `config/setup_db.psql` (if still available) and the `uploads` folder to your backup destination. If you have other modifications, copy those changes too.
+3. Run `sudo -Hu postgres pg_dump -d <akkoma_db> --format=custom -f </path/to/backup_location/akkoma.pgdump>` (make sure the postgres user has write access to the destination file)
+4. Copy `akkoma.pgdump`, `config/prod.secret.exs`, `config/setup_db.psql` (if still available) and the `uploads` folder to your backup destination. If you have other modifications, copy those changes too.
 5. Restart the Akkoma service.
 
-[¹]: We assume the database name is "akkoma". If not, you can find the correct name in your config files.  
-[²]: If you've installed using OTP, you need `config/config.exs` instead of `config/prod.secret.exs`.  
-
 ## Restore/Move
 
 1. Optionally reinstall Akkoma (either on the same server or on another server if you want to move servers).
 2. Stop the Akkoma service.
 3. Go to the working directory of Akkoma (default is `/opt/akkoma`)
 4. Copy the above mentioned files back to their original position.
-5. Drop the existing database and user if restoring in-place[¹]. `sudo -Hu postgres psql -c 'DROP DATABASE akkoma;';` `sudo -Hu postgres psql -c 'DROP USER akkoma;'`
-6. Restore the database schema and akkoma role using either of the following options
-    * You can use the original `setup_db.psql` if you have it[²]: `sudo -Hu postgres psql -f config/setup_db.psql`.
-    * Or recreate the database and user yourself (replace the password with the one you find in the config file) `sudo -Hu postgres psql -c "CREATE USER akkoma WITH ENCRYPTED PASSWORD '<database-password-wich-you-can-find-in-your-config-file>'; CREATE DATABASE akkoma OWNER akkoma;"`.
-7. Now restore the Akkoma instance's data into the empty database schema[¹][³]: `sudo -Hu postgres pg_restore -d akkoma -v -1 </path/to/backup_location/akkoma.pgdump>`
-8. If you installed a newer Akkoma version, you should run `MIX_ENV=prod mix ecto.migrate`[⁴]. This task performs database migrations, if there were any.
+5. Drop the existing database and user if restoring in-place. `sudo -Hu postgres psql -c 'DROP DATABASE <akkoma_db>;';` `sudo -Hu postgres psql -c 'DROP USER <akkoma_db>;'`
+6. Restore the database schema and akkoma postgres role the with the original `setup_db.psql` if you have it: `sudo -Hu postgres psql -f config/setup_db.psql`.
+
+  Alternatively, run the `mix pleroma.instance gen` task again. You can ignore most of the questions, but make the database user, name, and password the same as found in your backup of `config/prod.secret.exs`. Then run the restoration of the akkoma role and schema with of the generated `config/setup_db.psql` as instructed above. You may delete the `config/generated_config.exs` file as it is not needed.
+
+7. Now restore the Akkoma instance's data into the empty database schema: `sudo -Hu postgres pg_restore -d <akkoma_db> -v -1 </path/to/backup_location/akkoma.pgdump>`
+8. If you installed a newer Akkoma version, you should run `mix ecto.migrate`[^1]. This task performs database migrations, if there were any.
 9. Restart the Akkoma service.
 10. Run `sudo -Hu postgres vacuumdb --all --analyze-in-stages`. This will quickly generate the statistics so that postgres can properly plan queries.
 11. If setting up on a new server configure Nginx by using the `installation/akkoma.nginx` config sample or reference the Akkoma installation guide for your OS which contains the Nginx configuration instructions.
 
-[¹]: We assume the database name and user are both "akkoma". If not, you can find the correct name in your config files.  
-[²]: You can recreate the `config/setup_db.psql` by running the `mix pleroma.instance gen` task again. You can ignore most of the questions, but make the database user, name, and password the same as found in your backed up config file. This will also create a new `config/generated_config.exs` file which you may delete as it is not needed.  
-[³]: `pg_restore` will add data before adding indexes. The indexes are added in alphabetical order. There's one index, `activities_visibility_index` which may take a long time because it can't make use of an index that's only added later. You can significantly speed up restoration by skipping this index and add it afterwards. For that, you can do the following (we assume the akkoma.pgdump is in the directory you're running the commands):  
-
-```sh
-pg_restore -l akkoma.pgdump > db.list
-
-# Comment out the step for creating activities_visibility_index by adding a semi colon at the start of the line
-sed -i -E 's/(.*activities_visibility_index.*)/;\1/' db.list
-
-# We restore the database using the db.list list-file
-sudo -Hu postgres pg_restore -L db.list -d akkoma -v -1 akkoma.pgdump
-
-# You can see the sql statement with which to create the index using
-grep -Eao 'CREATE INDEX activities_visibility_index.*' akkoma.pgdump
-
-# Then create the index manually
-# Make sure that the command to create is correct! You never know it has changed since writing this guide
-sudo -Hu postgres psql -d pleroma_ynh -c "CREATE INDEX activities_visibility_index ON public.activities USING btree (public.activity_visibility(actor, recipients, data), id DESC NULLS LAST) WHERE ((data ->> 'type'::text) = 'Create'::text);"
-```
-[⁴]: Prefix with `MIX_ENV=prod` to run it using the production config file.  
+[^1]: Prefix with `MIX_ENV=prod` to run it using the production config file.
 
 ## Remove
 
 1. Optionally you can remove the users of your instance. This will trigger delete requests for their accounts and posts. Note that this is 'best effort' and doesn't mean that all traces of your instance will be gone from the fediverse.
     * You can do this from the admin-FE where you can select all local users and delete the accounts using the *Moderate multiple users* dropdown.
-    * You can also list local users and delete them individually using the CLI tasks for [Managing users](./CLI_tasks/user.md).
+    * You can also list local users and delete them individualy using the CLI tasks for [Managing users](./CLI_tasks/user.md).
 2. Stop the Akkoma service `systemctl stop akkoma`
-3. Disable Akkoma from systemd `systemctl disable akkoma`
+3. Disable akkoma from systemd `systemctl disable akkoma`
 4. Remove the files and folders you created during installation (see installation guide). This includes the akkoma, nginx and systemd files and folders.
 5. Reload nginx now that the configuration is removed `systemctl reload nginx`
-6. Remove the database and database user[¹] `sudo -Hu postgres psql -c 'DROP DATABASE akkoma;';` `sudo -Hu postgres psql -c 'DROP USER akkoma;'`
+6. Remove the database and database user `sudo -Hu postgres psql -c 'DROP DATABASE <akkoma_db>;';` `sudo -Hu postgres psql -c 'DROP USER <akkoma_db>;'`
 7. Remove the system user `userdel akkoma`
 8. Remove the dependencies that you don't need anymore (see installation guide). Make sure you don't remove packages that are still needed for other software that you have running!
-
-[¹]: We assume the database name and user are both "akkoma". If not, you can find the correct name in your config files.  

docs/docs/administration/updating.md

@@ -14,10 +14,6 @@ su akkoma -s $SHELL -lc "./bin/pleroma_ctl update"
 su akkoma -s $SHELL -lc "./bin/pleroma_ctl migrate"
 ```
 
-If you selected an alternate flavour on installation, 
-you _may_ need to specify `--flavour`, in the same way as 
-[when installing](../../installation/otp_en#detecting-flavour).
-
 ## For from source installations (using git)
 
 1. Go to the working directory of Akkoma (default is `/opt/akkoma`)

docs/docs/clients.md

@@ -1,8 +1,21 @@
-# Akkoma Clients
-Note: Additional clients may work, but these are known to work with Akkoma.
-Apps listed here might not support all of Akkoma's features.
+# Pleroma Clients
+Note: Additional clients may be working but theses are officially supporting Pleroma.
+Feel free to contact us to be added to this list!
 
 ## Desktop
+### Roma for Desktop
+- Homepage: <https://www.pleroma.com/#desktopApp>
+- Source Code: <https://github.com/roma-apps/roma-desktop>
+- Platforms: Windows, Mac, Linux
+- Features: MastoAPI, Streaming Ready
+
+### Social
+- Source Code: <https://gitlab.gnome.org/World/Social>
+- Contact: [@brainblasted@social.libre.fi](https://social.libre.fi/users/brainblasted)
+- Platforms: Linux (GNOME)
+- Note(2019-01-28): Not at a pre-alpha stage yet
+- Features: MastoAPI
+
 ### Whalebird
 - Homepage: <https://whalebird.social/>
 - Source Code: <https://github.com/h3poteto/whalebird-desktop>
@@ -17,16 +30,28 @@ Apps listed here might not support all of Akkoma's features.
 - Platforms: Android
 - Features: MastoAPI, ActivityPub (Client-to-Server)
 
+### Amaroq
+- Homepage: <https://itunes.apple.com/us/app/amaroq-for-mastodon/id1214116200>
+- Source Code: <https://github.com/ReticentJohn/Amaroq>
+- Contact: [@eurasierboy@mastodon.social](https://mastodon.social/users/eurasierboy)
+- Platforms: iOS
+- Features: MastoAPI, No Streaming
+
 ### Fedilab
 - Homepage: <https://fedilab.app/>
-- Source Code: <https://codeberg.org/tom79/Fedilab>
-- Contact: [@apps@toot.felilab.app](https://toot.fedilab.app/@apps)
+- Source Code: <https://framagit.org/tom79/fedilab/>
+- Contact: [@fedilab@framapiaf.org](https://framapiaf.org/users/fedilab)
 - Platforms: Android
 - Features: MastoAPI, Streaming Ready, Moderation, Text Formatting
 
+### Kyclos
+- Source Code: <https://git.pleroma.social/pleroma/harbour-kyclos>
+- Platforms: SailfishOS
+- Features: MastoAPI, No Streaming
+
 ### Husky
-- Source code: <https://git.sr.ht/~captainepoch/husky>
-- Contact: [@captainepoch@stereophonic.space](https://stereophonic.space/captainepoch)
+- Source code: <https://git.mentality.rip/FWGS/Husky>
+- Contact: [@Husky@enigmatic.observer](https://enigmatic.observer/users/Husky)
 - Platforms: Android
 - Features: MastoAPI, No Streaming, Emoji Reactions, Text Formatting, FE Stickers
 
@@ -43,7 +68,32 @@ Apps listed here might not support all of Akkoma's features.
 - Platforms: Android
 - Features: MastoAPI, No Streaming
 
+### Twidere
+- Homepage: <https://twidere.mariotaku.org/>
+- Source Code: <https://github.com/TwidereProject/Twidere-Android/>
+- Contact: <me@mariotaku.org>
+- Platform: Android
+- Features: MastoAPI, No Streaming
+
+### Indigenous
+- Homepage: <https://indigenous.realize.be/>
+- Source Code: <https://github.com/swentel/indigenous-android/>
+- Contact: [@swentel@realize.be](https://realize.be)
+- Platforms: Android
+- Features: MastoAPI, No Streaming
+
 ## Alternative Web Interfaces
+### Brutaldon
+- Homepage: <https://jfm.carcosa.net/projects/software/brutaldon/>
+- Source Code: <https://git.carcosa.net/jmcbray/brutaldon>
+- Contact: [@gcupc@glitch.social](https://glitch.social/users/gcupc)
+- Features: MastoAPI, No Streaming
+
+### Halcyon
+- Source Code: <https://notabug.org/halcyon-suite/halcyon>
+- Contact: [@halcyon@social.csswg.org](https://social.csswg.org/users/halcyon)
+- Features: MastoAPI, Streaming Ready
+
 ### Pinafore
 - Homepage: <https://pinafore.social/>
 - Source Code: <https://github.com/nolanlawson/pinafore>

docs/docs/configuration/cheatsheet.md

@@ -33,8 +33,7 @@ To add configuration to your config file, you can copy it from the base config.
 * `federation_incoming_replies_max_depth`: Max. depth of reply-to activities fetching on incoming federation, to prevent out-of-memory situations while fetching very long threads. If set to `nil`, threads of any depth will be fetched. Lower this value if you experience out-of-memory crashes.
 * `federation_reachability_timeout_days`: Timeout (in days) of each external federation target being unreachable prior to pausing federating to it.
 * `allow_relay`: Permits remote instances to subscribe to all public posts of your instance. This may increase the visibility of your instance.
-* `public`: Allows unauthenticated access to public resources on your instance. This is essentially used as the default value for `:restrict_unauthenticated`. 
-   See `restrict_unauthenticated` for more details.
+* `public`: Makes the client API in authenticated mode-only except for user-profiles. Useful for disabling the Local Timeline and The Whole Known Network. Note that there is a dependent setting restricting or allowing unauthenticated access to specific resources, see `restrict_unauthenticated` for more details.
 * `quarantined_instances`: *DEPRECATED* ActivityPub instances where activities will not be sent. They can still reach there via other means, we just won't send them.
 * `allowed_post_formats`: MIME-type list of formats allowed to be posted (transformed into HTML).
 * `extended_nickname_format`: Set to `true` to use extended local nicknames format (allows underscores/dashes). This will break federation with
@@ -60,8 +59,6 @@ To add configuration to your config file, you can copy it from the base config.
 * `cleanup_attachments`: Remove attachments along with statuses. Does not affect duplicate files and attachments without status. Enabling this will increase load to database when deleting statuses on larger instances.
 * `show_reactions`: Let favourites and emoji reactions be viewed through the API (default: `true`).
 * `password_reset_token_validity`: The time after which reset tokens aren't accepted anymore, in seconds (default: one day).
-* `local_bubble`: Array of domains representing instances closely related to yours. Used to populate the `bubble` timeline. e.g `["example.com"]`, (default: `[]`)
-* `languages`: List of Language Codes used by the instance. This is used to try and set a default language from the frontend. It will try and find the first match between the languages set here and the user's browser languages. It will default to the first language in this setting if there is no match.. (default `["en"]`)
 
 ## :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).
@@ -121,11 +118,8 @@ To add configuration to your config file, you can copy it from the base config.
     * `Pleroma.Web.ActivityPub.MRF.FollowBotPolicy`: Automatically follows newly discovered users from the specified bot account. Local accounts, locked accounts, and users with "#nobot" in their bio are respected and excluded from being followed.
     * `Pleroma.Web.ActivityPub.MRF.AntiFollowbotPolicy`: Drops follow requests from followbots. Users can still allow bots to follow them by first following the bot.
     * `Pleroma.Web.ActivityPub.MRF.KeywordPolicy`: Rejects or removes from the federated timeline or replaces keywords. (See [`:mrf_keyword`](#mrf_keyword)).
-    * `Pleroma.Web.ActivityPub.MRF.NormalizeMarkup`: Pass inbound HTML through a scrubber to make sure it doesn't have anything unusual in it. On by default, cannot be turned off.
-    * `Pleroma.Web.ActivityPub.MRF.InlineQuotePolicy`: Append a link to a post that quotes another post with the link to the quoted post, to ensure that software that does not understand quotes can have full context. On by default, cannot be turned off.
 * `transparency`: Make the content of your Message Rewrite Facility settings public (via nodeinfo).
 * `transparency_exclusions`: Exclude specific instance names from MRF transparency.  The use of the exclusions feature will be disclosed in nodeinfo as a boolean value.
-* `transparency_obfuscate_domains`: Show domains with `*` in the middle, to censor them if needed. For example, `ridingho.me` will show as `rid*****.me`
 
 ## Federation
 ### MRF policies
@@ -456,6 +450,7 @@ This will make Akkoma listen on `127.0.0.1` port `8080` and generate urls starti
 * ``enabled``: Whether the managed content security policy is enabled.
 * ``sts``: Whether to additionally send a `Strict-Transport-Security` header.
 * ``sts_max_age``: The maximum age for the `Strict-Transport-Security` header if sent.
+* ``ct_max_age``: The maximum age for the `Expect-CT` header if sent.
 * ``referrer_policy``: The referrer policy to use, either `"same-origin"` or `"no-referrer"`.
 * ``report_uri``: Adds the specified url to `report-uri` and `report-to` group in CSP header.
 
@@ -526,8 +521,6 @@ Available caches:
 
 ### :http
 
-* `receive_timeout`: the amount of time, in ms, to wait for a remote server to respond to a request. (default: `15000`)
-* `pool_timeout`: the amount of time, in ms, to wait to check out an HTTP connection from the pool. This likely does not need changing unless your instance is _very_ busy with outbound requests. (default `5000`)
 * `proxy_url`: an upstream proxy to fetch posts and/or media with, (default: `nil`); for example `http://127.0.0.1:3192`. Does not support SOCKS5 proxy, only http(s).
 * `send_user_agent`: should we include a user agent with HTTP requests? (default: `true`)
 * `user_agent`: what user agent should we use? (default: `:default`), must be string or `:default`
@@ -1095,7 +1088,7 @@ config :pleroma, :database_config_whitelist, [
 
 ### :restrict_unauthenticated
 
-Restrict access for unauthenticated users to timelines (public and federated), user profiles and posts.
+Restrict access for unauthenticated users to timelines (public and federated), user profiles and statuses.
 
 * `timelines`: public and federated timelines
   * `local`: public timeline
@@ -1103,24 +1096,13 @@ Restrict access for unauthenticated users to timelines (public and federated), u
 * `profiles`: user profiles
   * `local`
   * `remote`
-* `activities`: posts
+* `activities`: statuses
   * `local`
   * `remote`
 
-#### When :instance, :public is `true`
+Note: when `:instance, :public` is set to `false`, all `:restrict_unauthenticated` items be effectively set to `true` by default. If you'd like to allow unauthenticated access to specific API endpoints on a private instance, please explicitly set `:restrict_unauthenticated` to non-default value in `config/prod.secret.exs`.
 
-When your instance is in "public" mode, all public resources (users, posts, timelines) are accessible to unauthenticated users.
-
-Turning any of the `:restrict_unauthenticated` options to `true` will restrict access to the corresponding resources.
-
-#### When :instance, :public is `false`
-
-When `:instance, :public` is set to `false`, all of the `:restrict_unauthenticated` options will effectively be set to `true` by default,
-meaning that only authenticated users will be able to access the corresponding resources.
-
-If you'd like to allow unauthenticated access to specific resources, you can turn these settings to `false`.
-
-**Note**: setting `restrict_unauthenticated/timelines/local` to `true` has no practical sense if `restrict_unauthenticated/timelines/federated` is set to `false` (since local public activities will still be delivered to unauthenticated users as part of federated timeline).
+Note: setting `restrict_unauthenticated/timelines/local` to `true` has no practical sense if `restrict_unauthenticated/timelines/federated` is set to `false` (since local public activities will still be delivered to unauthenticated users as part of federated timeline).
 
 ## Pleroma.Web.ApiSpec.CastAndValidate
 
@@ -1176,28 +1158,3 @@ Each job has these settings:
 
 * `:max_running` - max concurrently runnings jobs
 * `:max_waiting` - max waiting jobs
-
-### Translation Settings
-
-Settings to automatically translate statuses for end users. Currently supported
-translation services are DeepL and LibreTranslate.
-
-Translations are available at `/api/v1/statuses/:id/translations/:language`, where
-`language` is the target language code (e.g `en`)
-
-### `:translator`
-
-- `:enabled` - enables translation
-- `:module` - Sets module to be used
-  - Either `Pleroma.Akkoma.Translators.DeepL` or `Pleroma.Akkoma.Translators.LibreTranslate`
-
-### `:deepl`
-
-- `:api_key` - API key for DeepL
-- `:tier` - API tier
-  - either `:free` or `:pro`
-
-### `:libre_translate`
-
-- `:url` - URL of LibreTranslate instance
-- `:api_key` - API key for LibreTranslate

docs/docs/configuration/hardening.md

@@ -23,17 +23,18 @@ This sets the `secure` flag on Akkoma’s session cookie. This makes sure, that
 
 This will send additional HTTP security headers to the clients, including:
 
-* `X-XSS-Protection: "0"`
+* `X-XSS-Protection: "1; mode=block"`
 * `X-Permitted-Cross-Domain-Policies: "none"`
 * `X-Frame-Options: "DENY"`
 * `X-Content-Type-Options: "nosniff"`
+* `X-Download-Options: "noopen"`
 
 A content security policy (CSP) will also be set:
 
 ```csp
 content-security-policy:
   default-src 'none';
-  base-uri 'none';
+  base-uri 'self';
   frame-ancestors 'none';
   img-src 'self' data: blob: https:;
   media-src 'self' https:;
@@ -51,15 +52,19 @@ content-security-policy:
 
 An additional “Strict transport security” header will be sent with the configured `sts_max_age` parameter. This tells the browser, that the domain should only be accessed over a secure HTTPs connection.
 
+#### `ct_max_age`
+
+An additional “Expect-CT” header will be sent with the configured `ct_max_age` parameter. This enforces the use of TLS certificates that are published in the certificate transparency log. (see [Expect-CT](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Expect-CT))
+
 #### `referrer_policy`
 
 > Recommended value: `same-origin`
 
-If you click on a link, your browser’s request to the other site will include from where it is coming from. The “Referrer policy” header tells the browser how and if it should send this information. (see [Referrer policy](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Referrer-Policy)). `no-referrer` can be used if a referrer is not needed for improved privacy.
+If you click on a link, your browser’s request to the other site will include from where it is coming from. The “Referrer policy” header tells the browser how and if it should send this information. (see [Referrer policy](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Referrer-Policy))
 
 ## systemd
 
-A systemd unit example is provided at `installation/akkoma.service`.
+A systemd unit example is provided at `installation/pleroma.service`.
 
 ### PrivateTmp
 

docs/docs/configuration/howto_theming_your_instance.md

@@ -21,7 +21,7 @@ This will only save the theme for you personally. To make it available to the wh
 
 ### Upload the theme to the server
 
-Themes can be found in the [static directory](static_dir.md). Create `STATIC-DIR/static/themes/` if needed and copy your theme there. Next you need to add an entry for your theme to `STATIC-DIR/static/styles.json`. If you use a from source installation, you'll first need to copy the file from `STATIC-DIR/frontends/pleroma-fe/REF/static/styles.json` (where `REF` is `stable` or `develop` depending on which ref you decided to install).
+Themes can be found in the [static directory](static_dir.md). Create `STATIC-DIR/static/themes/` if needed and copy your theme there. Next you need to add an entry for your theme to `STATIC-DIR/static/styles.json`. If you use a from source installation, you'll first need to copy the file from `priv/static/static/styles.json`.
 
 Example of `styles.json` where we add our own `my-awesome-theme.json`
 ```json
@@ -70,4 +70,5 @@ config :pleroma, :frontend_configurations,
   }
 ```
 
-If you added it in the back-end configuration file, you'll need to restart your instance for the changes to take effect. If you don't see the changes, it's probably because the browser has cached the previous theme. In that case you'll want to clear browser caches. Alternatively you can use a private/incognito window just to see the changes.
+If you added it in the back-end configuration file, you'll need to restart your instance for the changes to take effect. If you don't see the changes, it's probably because the browser has cached the previous theme. In that case you'll want to clear browser caches. Alternatively you can use a private/incognito window just to see the changes.
+

docs/docs/configuration/i2p.md

@@ -155,11 +155,12 @@ server {
 
     location / {
 
-        add_header X-XSS-Protection "0";
+        add_header X-XSS-Protection "1; mode=block";
         add_header X-Permitted-Cross-Domain-Policies none;
         add_header X-Frame-Options DENY;
         add_header X-Content-Type-Options nosniff;
         add_header Referrer-Policy same-origin;
+        add_header X-Download-Options noopen;
 
         proxy_http_version 1.1;
         proxy_set_header Upgrade $http_upgrade;

docs/docs/configuration/mrf.md

@@ -15,6 +15,18 @@ The MRF provides user-configurable policies. The default policy is `NoOpPolicy`,
 
 It is possible to use multiple, active MRF policies at the same time.
 
+## Quarantine Instances
+
+You have the ability to prevent from private / followers-only messages from federating with specific instances. Which means they will only get the public or unlisted messages from your instance.
+
+If, for example, you're using `MIX_ENV=prod` aka using production mode, you would open your configuration file located in `config/prod.secret.exs` and edit or add the option under your `:instance` config object. Then you would specify the instance within quotes.
+
+```elixir
+config :pleroma, :instance,
+  [...]
+  quarantined_instances: ["instance.example", "other.example"]
+```
+
 ## Using `SimplePolicy`
 
 `SimplePolicy` is capable of handling most common admin tasks.
@@ -29,7 +41,7 @@ config :pleroma, :mrf,
 
 Once `SimplePolicy` is enabled, you can configure various groups in the `:mrf_simple` config object. These groups are:
 
-* `reject`: Servers in this group will have their messages rejected. Also outbound messages will not be sent to these servers.
+* `reject`: Servers in this group will have their messages rejected.
 * `accept`: If not empty, only messages from these instances will be accepted (whitelist federation).
 * `media_nsfw`: Servers in this group will have the #nsfw tag and sensitive setting injected into incoming messages which contain media.
 * `media_removal`: Servers in this group will have media stripped from incoming messages.

docs/docs/configuration/onion_federation.md

@@ -14,12 +14,11 @@ apt -yq install tor
 
 **WARNING:** Onion instances not using a Tor version supporting V3 addresses will not be able to federate with you. 
 
-Create the hidden service for your Akkoma instance in `/etc/tor/torrc`, with an HTTP tunnel:
+Create the hidden service for your Akkoma instance in `/etc/tor/torrc`:
 ```
 HiddenServiceDir /var/lib/tor/akkoma_hidden_service/
 HiddenServicePort 80 127.0.0.1:8099
 HiddenServiceVersion 3  # Remove if Tor version is below 0.3 ( tor --version )
-HTTPTunnelPort 9080
 ```
 Restart Tor to generate an adress:
 ```
@@ -36,7 +35,7 @@ Next, edit your Akkoma config.
 If running in prod, navigate to your Akkoma directory, edit `config/prod.secret.exs`
 and append this line:
 ```
-config :pleroma, :http, proxy_url: "http://localhost:9080"
+config :pleroma, :http, proxy_url: {:socks5, :localhost, 9050}
 ```
 In your Akkoma directory, assuming you're running prod,
 run the following:
@@ -99,11 +98,12 @@ server {
 
     location / {
 
-        add_header X-XSS-Protection "0";
+        add_header X-XSS-Protection "1; mode=block";
         add_header X-Permitted-Cross-Domain-Policies none;
         add_header X-Frame-Options DENY;
         add_header X-Content-Type-Options nosniff;
         add_header Referrer-Policy same-origin;
+        add_header X-Download-Options noopen;
 
         proxy_http_version 1.1;
         proxy_set_header Upgrade $http_upgrade;

docs/docs/configuration/optimisation/varnish_cache.md

@@ -1,54 +0,0 @@
-# Using a Varnish Cache
-
-Varnish is a layer that sits between your web server and your backend application -
-it does something similar to nginx caching, but tends to be optimised for speed over
-all else.
-
-To set up a varnish cache, first you'll need to install varnish. 
-
-This will vary by distribution, and since this is a rather advanced guide,
-no copy-paste instructions are provided. It's probably in your distribution's
-package manager, though. `apt-get install varnish` and so on.
-
-Once you have varnish installed, you'll need to configure it to work with akkoma.
-
-Copy the configuration file to the varnish configuration directory:
-
-    cp installation/akkoma.vcl /etc/varnish/akkoma.vcl
-
-You may want to check if varnish added a `default.vcl` file to the same directory,
-if so you can just remove it without issue.
-
-Then boot up varnish, probably `systemctl start varnish` or `service varnish start`.
-
-Now you should be able to `curl -D- localhost:6081` and see a bunch of
-akkoma javascript.
-
-Once that's out of the way, we can point our webserver at varnish. This
-
-=== "Nginx"
-
-    upstream phoenix {
-        server 127.0.0.1:6081 max_fails=5 fail_timeout=60s;
-    }
-
-
-=== "Caddy"
-
-    reverse_proxy 127.0.0.1:6081
-
-Now hopefully it all works
-
-If you get a HTTPS redirect loop, you may need to remove this part of the VCL
-
-```vcl
-if (std.port(server.ip) != 443) {
-      set req.http.X-Forwarded-Proto = "http";
-      set req.http.x-redir = "https://" + req.http.host + req.url;
-      return (synth(750, ""));
-} else {
-  set req.http.X-Forwarded-Proto = "https";
-}
-```
-
-This will allow your webserver alone to handle redirects.

docs/docs/configuration/search.md

@@ -141,7 +141,8 @@ You then need to set the URL and authentication credentials if relevant.
 
 ### Initial indexing
 
-After setting up the configuration, you'll want to index all of your already existsing posts. You'll only have to do it one time, but it might take a while, depending on the amount of posts your instance has seen. 
+After setting up the configuration, you'll want to index all of your already existsing posts. Only public posts are indexed.  You'll only
+have to do it one time, but it might take a while, depending on the amount of posts your instance has seen. 
 
 The sequence of actions is as follows:
 

docs/docs/configuration/static_dir.md

@@ -89,23 +89,7 @@ config :pleroma, :frontend_configurations,
 
 Terms of Service will be shown to all users on the registration page. It's the best place where to write down the rules for your instance. You can modify the rules by adding and changing `$static_dir/static/terms-of-service.html`.
 
-## Favicon
-
-The favicon will display on the frontend, and in the browser tab. 
-
-Place a PNG file at `$static_dir/favicon.png` to change the favicon. Not that this
-is _one level above_ where the logo is placed, it should be on the same level as
-the `frontends` directory.
  	
 ## Styling rendered pages
 
 To overwrite the CSS stylesheet of the OAuth form and other static pages, you can upload your own CSS file to `instance/static/static.css`. This will completely replace the CSS used by those pages, so it might be a good idea to copy the one from `priv/static/instance/static.css` and make your changes.
-
-## Overriding pleroma-fe styles
-
-To overwrite the CSS stylesheet of pleroma-fe, you can put a file at
-`$static_dir/static/custom.css` containing your styles. These will be loaded
-with the rest of the CSS.
-
-You will probably have to put `!important` on most/all your styles to override the
-default ones, due to the specificity precedence of CSS.

docs/docs/development/API/differences_in_mastoapi_responses.md

@@ -40,10 +40,6 @@ Has these additional fields under the `pleroma` object:
 - `parent_visible`: If the parent of this post is visible to the user or not.
 - `pinned_at`: a datetime (iso8601) when status was pinned, `null` otherwise.
 
-The `GET /api/v1/statuses/:id/source` endpoint additionally has the following attributes:
-
-- `content_type`: The content type of the status source.
-
 ## Scheduled statuses
 
 Has these additional fields in `params`:
@@ -195,7 +191,7 @@ Additional parameters can be added to the JSON body/Form data:
 
 - `preview`: boolean, if set to `true` the post won't be actually posted, but the status entity would still be rendered back. This could be useful for previewing rich text/custom emoji, for example.
 - `content_type`: string, contain the MIME type of the status, it is transformed into HTML by the backend. You can get the list of the supported MIME types with the nodeinfo endpoint.
-- `to`: A list of nicknames (like `admin@otp.akkoma.dev` or `admin` on the local server) that will be used to determine who is going to be addressed by this post. Using this will disable the implicit addressing by mentioned names in the `status` body, only the people in the `to` list will be addressed. The normal rules for post visibility are not affected by this and will still apply.
+- `to`: A list of nicknames (like `lain@soykaf.club` or `lain` on the local server) that will be used to determine who is going to be addressed by this post. Using this will disable the implicit addressing by mentioned names in the `status` body, only the people in the `to` list will be addressed. The normal rules for post visibility are not affected by this and will still apply.
 - `visibility`: string, besides standard MastoAPI values (`direct`, `private`, `unlisted`, `local` or `public`) it can be used to address a List by setting it to `list:LIST_ID`.
 - `expires_in`: The number of seconds the posted activity should expire in. When a posted activity expires it will be deleted from the server, and a delete request for it will be federated. This needs to be longer than an hour.
 - `in_reply_to_conversation_id`: Will reply to a given conversation, addressing only the people who are part of the recipient set of that conversation. Sets the visibility to `direct`.

docs/docs/development/API/prometheus.md

@@ -40,5 +40,5 @@ The following is a config example to use with [Grafana](https://grafana.com)
     metrics_path: /api/pleroma/app_metrics
     scheme: https
     static_configs:
-    - targets: ['otp.akkoma.dev']
+    - targets: ['pleroma.soykaf.com']
 ```

docs/docs/index.md

@@ -7,37 +7,22 @@ It actually consists of two components: a backend, named simply Akkoma, and a us
 It's part of what we call the fediverse, a federated network of instances which speak common protocols and can communicate with each other.
 One account on an instance is enough to talk to the entire fediverse!
 
-## Community Channels
-
-### IRC
-
-For support or general questions, pop over to #akkoma and #akkoma-dev at [irc.akkoma.dev](https://irc.akkoma.dev) (port 6697, SSL)
-
-### Discourse
-
-For more general meta-discussion, for example discussion of potential future features, head on over to [meta.akkoma.dev](https://meta.akkoma.dev)
-
-### Dev diaries and release notifications
-
-will be posted via [@akkoma@ihba](https://ihatebeinga.live/users/akkoma)
-
 ## How can I use it?
 
-Akkoma instances are already widely deployed, a list can be found at <https://the-federation.info/akkoma> and <https://akkoma.fediverse.observer/list>.
+Akkoma instances are already widely deployed, a list can be found at <https://the-federation.info/pleroma> and <https://fediverse.network/pleroma>.
 
 If you don't feel like joining an existing instance, but instead prefer to deploy your own instance, that's easy too!
 Installation instructions can be found in the installation section of these docs.
 
 ## I got an account, now what?
-Great! Now you can explore the fediverse! Open the login page for your Akkoma instance (e.g. <https://otp.akkoma.dev>) and login with your username and password. (If you don't have an account yet, click on Register)
+Great! Now you can explore the fediverse! Open the login page for your Akkoma instance (e.g. <https://pleroma.soykaf.com>) and login with your username and password. (If you don't have an account yet, click on Register)
 
 ### Pleroma-FE
 The default front-end used by Akkoma is Pleroma-FE. You can find more information on what it is and how to use it in the [Introduction to Pleroma-FE](https://docs-fe.akkoma.dev/stable/).
 
 ### Mastodon interface
 If the Pleroma-FE interface isn't your thing, or you're just trying something new but you want to keep using the familiar Mastodon interface, we got that too!
-Just add a "/web" after your instance url (e.g. <https://otp.akkoma.dev/web>) and you'll end on the Mastodon web interface, but with a Akkoma backend! MAGIC!
+Just add a "/web" after your instance url (e.g. <https://pleroma.soykaf.com/web>) and you'll end on the Mastodon web interface, but with a Akkoma backend! MAGIC!
 The Mastodon interface is from the Glitch-soc fork. For more information on the Mastodon interface you can check the [Mastodon](https://docs.joinmastodon.org/) and [Glitch-soc](https://glitch-soc.github.io/docs/) documentation.
 
 Remember, what you see is only the frontend part of Mastodon, the backend is still Akkoma.
-

docs/docs/installation/alpine_linux_en.md

@@ -221,8 +221,6 @@ If your instance is up and running, you can create your first user with administ
 doas -u akkoma env MIX_ENV=prod mix pleroma.user new <username> <your@emailaddress> --admin
 ```
 
-{! installation/frontends.include !}
-
 #### Further reading
 
 {! installation/further_reading.include !}

docs/docs/installation/arch_linux_en.md

@@ -212,8 +212,6 @@ If your instance is up and running, you can create your first user with administ
 sudo -Hu akkoma MIX_ENV=prod mix pleroma.user new <username> <your@emailaddress> --admin
 ```
 
-{! installation/frontends.include !}
-
 #### Further reading
 
 {! installation/further_reading.include !}

docs/docs/installation/debian_based_en.md

@@ -175,8 +175,6 @@ If your instance is up and running, you can create your first user with administ
 sudo -Hu akkoma MIX_ENV=prod mix pleroma.user new <username> <your@emailaddress> --admin
 ```
 
-{! installation/frontends.include !}
-
 #### Further reading
 
 {! installation/further_reading.include !}

docs/docs/installation/docker_en.md

@@ -1,162 +0,0 @@
-# Installing in Docker
-
-## Installation
-
-This guide will show you how to get akkoma working in a docker container,
-if you want isolation, or if you run a distribution not supported by the OTP
-releases.
-
-If you want to migrate from or OTP to docker, check out [the migration guide](./migrating_to_docker_en.md).
-
-### Prepare the system
-
-* Install docker and docker-compose
-  * [Docker](https://docs.docker.com/engine/install/) 
-  * [Docker-compose](https://docs.docker.com/compose/install/)
-  * This will usually just be a repository installation and a package manager invocation.
-* Clone the akkoma repository
-  * `git clone https://akkoma.dev/AkkomaGang/akkoma.git -b stable`
-  * `cd akkoma`
-
-### Set up basic configuration
-
-```bash
-cp docker-resources/env.example .env
-echo "DOCKER_USER=$(id -u):$(id -g)" >> .env
-```
-
-This probably won't need to be changed, it's only there to set basic environment
-variables for the docker-compose file.
-
-### Building the container
-
-The container provided is a thin wrapper around akkoma's dependencies, 
-it does not contain the code itself. This is to allow for easy updates
-and debugging if required.
-
-```bash
-./docker-resources/build.sh
-```
-
-This will generate a container called `akkoma` which we can use
-in our compose environment.
-
-### Generating your instance
-
-```bash
-mkdir pgdata
-./docker-resources/manage.sh mix deps.get
-./docker-resources/manage.sh mix compile
-./docker-resources/manage.sh mix pleroma.instance gen
-```
-
-This will ask you a few questions - the defaults are fine for most things,
-the database hostname is `db`, the database password is `akkoma`
-(not auto generated), and you will want to set the ip to `0.0.0.0`.
-
-Now we'll want to copy over the config it just created
-
-```bash
-cp config/generated_config.exs config/prod.secret.exs
-```
-
-### Setting up the database 
-
-We need to run a few commands on the database container, this isn't too bad
-
-```bash
-docker-compose run --rm --user akkoma -d db 
-# Note down the name it gives here, it will be something like akkoma_db_run
-docker-compose run --rm akkoma psql -h db -U akkoma -f config/setup_db.psql
-docker stop akkoma_db_run # Replace with the name you noted down
-```
-
-Now we can actually run our migrations
-
-```bash
-./docker-resources/manage.sh mix ecto.migrate
-# this will recompile your files at the same time, since we changed the config
-```
-
-### Start the server
-
-We're going to run it in the foreground on the first run, just to make sure
-everything start up.
-
-```bash
-docker-compose up
-```
-
-If everything went well, you should be able to access your instance at http://localhost:4000
-
-You can `ctrl-c` out of the docker-compose now to shutdown the server.
-
-### Running in the background
-
-```bash
-docker-compose up -d
-```
-
-### Create your first user
-
-If your instance is up and running, you can create your first user with administrative rights with the following task:
-
-```shell
-./docker-resources/manage.sh mix pleroma.user new MY_USERNAME MY_EMAIL@SOMEWHERE --admin
-```
-
-And follow the prompts 
-
-### Reverse proxies
-
-This is a tad more complex in docker than on the host itself. It
-
-You've got two options. 
-
-#### Running caddy in a container
-
-This is by far the easiest option. It'll handle HTTPS and all that for you. 
-
-```bash
-mkdir caddy-data
-mkdir caddy-config
-cp docker-resources/Caddyfile.example docker-resources/Caddyfile
-```
-
-Then edit the TLD in your caddyfile to the domain you're serving on.
-
-Uncomment the `caddy` section in the docker-compose file,
-then run `docker-compose up -d` again.
-
-#### Running a reverse proxy on the host
-
-If you want, you can also run the reverse proxy on the host. This is a bit more complex, but it's also more flexible.
-
-Follow the guides for source install for your distribution of choice, or adapt
-as needed. Your standard setup can be found in the [Debian Guide](../debian_based_en/#nginx)
-
-### You're done!
-
-All that's left is to set up your frontends. 
-
-The standard from-source commands will apply to you, just make sure you
-prefix them with `./docker-resources/manage.sh`!
-
-{! installation/frontends.include !}
-
-### Updating Docker Installs
-
-```bash
-git pull
-./docker-resources/build.sh
-./docker-resources/manage.sh mix deps.get
-./docker-resources/manage.sh mix compile
-./docker-resources/manage.sh mix ecto.migrate
-docker-compose restart akkoma db
-```
-
-#### Further reading
-
-{! installation/further_reading.include !}
-
-{! support.include !}

docs/docs/installation/fedora_based_en.md

@@ -199,8 +199,6 @@ If your instance is up and running, you can create your first user with administ
 sudo -Hu akkoma MIX_ENV=prod mix pleroma.user new <username> <your@emailaddress> --admin
 ```
 
-{! installation/frontends.include !}
-
 #### Further reading
 
 {! installation/further_reading.include !}

docs/docs/installation/freebsd_en.md

@@ -206,9 +206,6 @@ If your instance is up and running, you can create your first user with administ
 ```shell
 sudo -Hu akkoma MIX_ENV=prod mix pleroma.user new <username> <your@emailaddress> --admin
 ```
-
-{! installation/frontends.include !}
-
 ## Conclusion
 
 Restart nginx with `# service nginx restart` and you should be up and running.

docs/docs/installation/frontends.include

@@ -1,31 +0,0 @@
-#### Installing Frontends
-
-Once your backend server is functional, you'll also want to
-probably install frontends.
-
-These are no longer bundled with the distribution and need an extra
-command to install.
-
-For most installations, the following will suffice:
-
-=== "OTP" 
-    ```sh
-    ./bin/pleroma_ctl frontend install pleroma-fe --ref stable
-    # and also, if desired
-    ./bin/pleroma_ctl frontend install admin-fe --ref stable
-    ```
-
-=== "From Source"
-    ```sh
-    mix pleroma.frontend install pleroma-fe --ref stable
-    mix pleroma.frontend install admin-fe --ref stable
-    ```
-
-=== "Docker"
-    ```sh
-    ./docker-resources/manage.sh mix pleroma.frontend install pleroma-fe --ref stable
-    ./docker-resources/manage.sh mix pleroma.frontend install admin-fe --ref stable
-    ```
-
-For more customised installations, refer to [Frontend Management](../../configuration/frontend_management)
-

docs/docs/installation/gentoo_en.md

@@ -18,12 +18,6 @@ dev-db/postgresql uuid
 
 You could opt to add `USE="uuid"` to `/etc/portage/make.conf` if you'd rather set this as a global USE flags, but this flags does unrelated things in other packages, so keep that in mind if you elect to do so.
 
-If you are planning to use `nginx`, as this guide suggests, you should also add the following flag to the same file.
-
-```text
-www-servers/nginx NGINX_MODULES_HTTP: slice
-```
-
 Double check your compiler flags in `/etc/portage/make.conf`. If you require any special compilation flags or would like to set up remote builds, now is the time to do so. Be sure that your CFLAGS and MAKEOPTS make sense for the platform you are using. It is not recommended to use above `-O2` or risky optimization flags for a production server.
 
 ### Installing a cron daemon
@@ -268,7 +262,7 @@ Even if you are using S3, Akkoma needs someplace to store media posted on your i
 
 ```shell
  akkoma$ mkdir -p ~/akkoma/uploads
-```
+ ```
 
 #### init.d service
 
@@ -278,9 +272,7 @@ Even if you are using S3, Akkoma needs someplace to store media posted on your i
  # cp /home/akkoma/akkoma/installation/init.d/akkoma /etc/init.d/
 ```
 
-* Change the `/opt/akkoma` path in this file to `/home/akkoma/akkoma`
-
-* Be sure to take a look at this service file and make sure that all other paths fit your installation
+* Be sure to take a look at this service file and make sure that all paths fit your installation
 
 * Enable and start `akkoma`:
 
@@ -301,8 +293,6 @@ akkoma$ MIX_ENV=prod mix pleroma.user new <username> <your@emailaddress> --admin
 
 If you opted to allow sudo for the `akkoma` user but would like to remove the ability for greater security, now might be a good time to edit `/etc/sudoers` and/or change the groups the `akkoma` user belongs to. Be sure to restart the akkoma service afterwards to ensure it picks up on the changes.
 
-{! installation/frontends.include !}
-
 #### Further reading
 
 {! installation/further_reading.include !}

docs/docs/installation/migrating_from_source_otp_en.md

@@ -87,7 +87,7 @@ export FLAVOUR="amd64-musl"
 # Clone the release build into a temporary directory and unpack it
 # Replace `stable` with `unstable` if you want to run the unstable branch
 su akkoma -s $SHELL -lc "
-curl 'https://akkoma-updates.s3-website.fr-par.scw.cloud/stable/akkoma-$FLAVOUR.zip' -o /tmp/akkoma.zip
+curl 'https://akkoma-updates.s3-website.fr-par.scw.cloud/develop/akkoma-$FLAVOUR.zip' -o /tmp/akkoma.zip
 unzip /tmp/akkoma.zip -d /tmp/
 "
 

docs/docs/installation/migrating_to_akkoma.md

@@ -1,5 +1,7 @@
 # Migrating to Akkoma
 
+**Akkoma does not currently have a stable release, until 3.0, all builds should be considered "develop"**
+
 ## Why should you migrate?
 
 aside from actually responsive maintainer(s)? let's lookie here, we've got:
@@ -9,8 +11,6 @@ aside from actually responsive maintainer(s)? let's lookie here, we've got:
 - elasticsearch support (because pleroma search is GARBAGE)
 - latest develop pleroma-fe additions
 - local-only posting
-- automatic post translation
-- the mastodon frontend back in all its glory
 - probably more, this is like 3.5 years of IHBA additions finally compiled
 
 ## Actually migrating
@@ -34,15 +34,6 @@ git pull -r
 # to run "git merge stable" instead (or develop if you want)
 ```
 
-### WARNING - Migrating from Pleroma Develop
-If you are on pleroma develop, and have updated since 2022-08, you may have issues with database migrations.
-
-Please roll back the given migrations:
-
-```bash
-MIX_ENV=prod mix ecto.rollback --migrations-path priv/repo/optional_migrations/pleroma_develop_rollbacks -n3
-```
-
 Then compile, migrate and restart as usual.
 
 ## From OTP
@@ -52,14 +43,14 @@ This will just be setting the update URL - find your flavour from the [mapping o
 ```bash
 export FLAVOUR=[the flavour you found above]
 
-./bin/pleroma_ctl update --zip-url https://akkoma-updates.s3-website.fr-par.scw.cloud/stable/akkoma-$FLAVOUR.zip
+./bin/pleroma_ctl update --zip-url https://akkoma-updates.s3-website.fr-par.scw.cloud/develop/akkoma-$FLAVOUR.zip
 ./bin/pleroma_ctl migrate
 ```
 
 Then restart. When updating in the future, you canjust use
 
 ```bash
-./bin/pleroma_ctl update --branch stable
+./bin/pleroma_ctl update --branch develop
 ```
 
 ## Frontend changes
@@ -71,18 +62,17 @@ your upgrade path here depends on your setup
 
 You'll need to run a couple of commands,
 
-=== "OTP"
-    ```sh
-    ./bin/pleroma_ctl frontend install pleroma-fe --ref stable
-    # and also, if desired
-    ./bin/pleroma_ctl frontend install admin-fe --ref stable
-    ```
+```bash
+# From source
+mix pleroma.frontend install pleroma-fe
+# you'll probably want this too
+mix pleroma.frontend install admin-fe
 
-=== "From Source"
-    ```sh
-    mix pleroma.frontend install pleroma-fe --ref stable
-    mix pleroma.frontend install admin-fe --ref stable
-    ```
+# OTP
+./bin/pleroma_ctl frontend install pleroma-fe
+# you'll probably want this too
+./bin/pleroma_ctl frontend install admin-fe
+```
 
 ### I've run the mix task to install a frontend
 
@@ -95,26 +85,3 @@ Your situation will likely be unique - you'll need the changes in the
 [forked pleroma-fe repository](https://akkoma.dev/AkkomaGang/pleroma-fe),
 and either merge or cherry-pick from there depending on how you've got
 things.
-
-## Common issues
-
-### The frontend doesn't show after installing it
-
-This may occur if you are using database configuration.
-
-Sometimes the config in your database will cause akkoma to still report
-that there's no frontend, even when you've run the install.
-
-To fix this, run:
-
-=== "OTP"
-    ```sh
-    ./bin/pleroma_ctl config delete pleroma frontends
-    ```
-
-=== "From Source"
-    ```sh
-    mix pleroma.config delete pleroma frontends
-    ```
-
-which will remove the config from the database. Things should work now.

docs/docs/installation/migrating_to_docker_en.md

@@ -1,158 +0,0 @@
-# Migrating to a Docker Installation
-
-If you for any reason wish to migrate a source or OTP install to a docker one,
-this guide is for you. 
-
-You have a few options - your major one will be whether you want to keep your
-reverse-proxy setup from before.
-
-You probably should, in the first instance. 
-
-### Prepare the system
-
-* Install docker and docker-compose
-    * [Docker](https://docs.docker.com/engine/install/)
-    * [Docker-compose](https://docs.docker.com/compose/install/)
-    * This will usually just be a repository installation and a package manager invocation.
-
-=== "Source"
-```bash
-git pull
-```
-
-=== "OTP"
-Clone the akkoma repository
-
-```bash
-git clone https://akkoma.dev/AkkomaGang/akkoma.git -b stable
-cd akkoma
-```
-
-### Back up your old database
-
-Change the database name as needed
-
-```bash
-pg_dump -d akkoma_prod --format c > akkoma_backup.sql
-```
-
-### Getting your static files in the right place
-
-This will vary by every installation. Copy your `instance` directory to `instance/` in
-the akkoma source directory - this is where the docker container will look for it.
-
-For *most* from-source installs it'll already be there.
-
-And the same with `uploads`, make sure your uploads (if you have them on disk) are
-located at `uploads/` in the akkoma source directory.
-
-If you have them on a different disk, you will need to mount that disk into the docker-compose file,
-with an entry that looks like this:
-
-```yaml
-akkoma:
-  volumes:
-  - .:/opt/akkoma # This should already be there
-  - type: bind
-    source: /path/to/your/uploads
-    target: /opt/akkoma/uploads
-```
-
-### Set up basic configuration
-
-```bash
-cp docker-resources/env.example .env
-echo "DOCKER_USER=$(id -u):$(id -g)" >> .env
-```
-
-This probably won't need to be changed, it's only there to set basic environment
-variables for the docker-compose file.
-
-=== "From source"
-
-You probably won't need to change your config. Provided your `config/prod.secret.exs` file
-is still there, you're all good.
-
-=== "OTP"
-```bash
-cp /etc/akkoma/config.exs config/prod.secret.exs
-```
-
-**BOTH**
-
-Set the following config in `config/prod.secret.exs`:
-```elixir
-config :pleroma, Pleroma.Web.Endpoint,
-   ...,
-   http: [ip: {0, 0, 0, 0}, port: 4000]
-
-config :pleroma, Pleroma.Repo,
-  ...,
-  username: "akkoma",
-  password: "akkoma",
-  database: "akkoma",
-  hostname: "db"
-```
-
-### Building the container
-
-The container provided is a thin wrapper around akkoma's dependencies,
-it does not contain the code itself. This is to allow for easy updates
-and debugging if required.
-
-```bash
-./docker-resources/build.sh
-```
-
-This will generate a container called `akkoma` which we can use
-in our compose environment.
-
-### Setting up the docker resources
-
-```bash
-# These won't exist if you're migrating from OTP
-rm -rf deps
-rm -rf _build
-```
-
-```bash
-mkdir pgdata
-./docker-resources/manage.sh mix deps.get
-./docker-resources/manage.sh mix compile
-```
-
-### Setting up the database
-
-Now we can import our database to the container.
-
-```bash
-docker-compose run --rm --user akkoma -d db 
-docker-compose run --rm akkoma pg_restore -v -U akkoma -j $(grep -c ^processor /proc/cpuinfo) -d akkoma -h db akkoma_backup.sql
-```
-
-### Reverse proxies
-
-If you're just reusing your old proxy, you may have to uncomment the line in
-the docker-compose file under `ports`. You'll find it.
-
-Otherwise, you can use the same setup as the [docker installation guide](./docker_en.md#reverse-proxies).
-
-### Let's go
-
-```bash
-docker-compose up -d
-```
-
-You should now be at the same point as you were before, but with a docker install.
-
-{! installation/frontends.include !}
-
-See the [docker installation guide](./docker_en.md) for more information on how to
-update.
-
-#### Further reading
-
-{! installation/further_reading.include !}
-
-{! support.include !}
-

docs/docs/installation/netbsd_en.md

@@ -202,8 +202,6 @@ incorrect timestamps. You should have ntpd running.
 
 * <https://catgirl.science>
 
-{! installation/frontends.include !}
-
 #### Further reading
 
 {! installation/further_reading.include !}

docs/docs/installation/openbsd_en.md

@@ -12,11 +12,9 @@ For any additional information regarding commands and configuration files mentio
 To install them, run the following command (with doas or as root):
 
 ```
-pkg_add elixir gmake git postgresql-server postgresql-contrib cmake ffmpeg ImageMagick erlang-wx-25
+pkg_add elixir gmake git postgresql-server postgresql-contrib cmake ffmpeg ImageMagick
 ```
 
-(Note that the erlang version may change, it was 25 at the time of writing)
-
 Akkoma requires a reverse proxy, OpenBSD has relayd in base (and is used in this guide) and packages/ports are available for nginx (www/nginx) and apache (www/apache-httpd). Independently of the reverse proxy, [acme-client(1)](https://man.openbsd.org/acme-client) can be used to get a certificate from Let's Encrypt.
 
 #### Optional software
@@ -162,14 +160,15 @@ http protocol plerup { # Protocol for upstream akkoma server
 	match request header append "X-Forwarded-For" value "$REMOTE_ADDR" # This two header and the next one are not strictly required by akkoma but adding them won't hurt
 	match request header append "X-Forwarded-By" value "$SERVER_ADDR:$SERVER_PORT"
 
-	match response header append "X-XSS-Protection" value "0"
+	match response header append "X-XSS-Protection" value "1; mode=block"
 	match response header append "X-Permitted-Cross-Domain-Policies" value "none"
 	match response header append "X-Frame-Options" value "DENY"
 	match response header append "X-Content-Type-Options" value "nosniff"
 	match response header append "Referrer-Policy" value "same-origin"
-	match response header append "Content-Security-Policy" value "default-src 'none'; base-uri 'none'; form-action 'self'; img-src 'self' data: https:; media-src 'self' https:; style-src 'self' 'unsafe-inline'; font-src 'self'; script-src 'self'; connect-src 'self' wss://CHANGEME.tld; upgrade-insecure-requests;" # Modify "CHANGEME.tld" and set your instance's domain here
+	match response header append "X-Download-Options" value "noopen"
+	match response header append "Content-Security-Policy" value "default-src 'none'; base-uri 'self'; form-action 'self'; img-src 'self' data: https:; media-src 'self' https:; style-src 'self' 'unsafe-inline'; font-src 'self'; script-src 'self'; connect-src 'self' wss://CHANGEME.tld; upgrade-insecure-requests;" # Modify "CHANGEME.tld" and set your instance's domain here
 	match request header append "Connection" value "upgrade"
-	#match response header append "Strict-Transport-Security" value "max-age=63072000; includeSubDomains; preload" # Uncomment this only after you get HTTPS working.
+	#match response header append "Strict-Transport-Security" value "max-age=31536000; includeSubDomains" # Uncomment this only after you get HTTPS working.
 
 	# If you do not want remote frontends to be able to access your Akkoma backend server, comment these lines
 	match response header append "Access-Control-Allow-Origin" value "*"
@@ -251,8 +250,6 @@ If your instance is up and running, you can create your first user with administ
 LC_ALL=en_US.UTF-8 MIX_ENV=prod mix pleroma.user new <username> <your@emailaddress> --admin
 ```
 
-{! installation/frontends.include !}
-
 #### Further reading
 
 {! installation/further_reading.include !}

docs/docs/installation/otp_en.md

@@ -19,12 +19,12 @@ This is a little more complex than it used to be (thanks ubuntu)
 
 Use the following mapping to figure out your flavour:
 
-| distribution  | flavour            | available branches  |
-| ------------- | ------------------ | ------------------- |
-| debian stable | amd64              | develop, stable     |
-| ubuntu focal  | amd64              | develop, stable     |
-| ubuntu jammy  | amd64-ubuntu-jammy | develop, stable     |
-| alpine        | amd64-musl         | stable              |
+| distribution  | flavour      |
+| ------------- | ------------ |
+| debian stable | amd64        |
+| ubuntu focal  | amd64        |
+| ubuntu jammy  | ubuntu-jammy |
+| alpine        | amd64-musl   |
 
 Other similar distributions will _probably_ work, but if it is not listed above, there is no official
 support.
@@ -123,7 +123,7 @@ export FLAVOUR="amd64-musl"
 
 # Clone the release build into a temporary directory and unpack it
 su akkoma -s $SHELL -lc "
-curl 'https://akkoma-updates.s3-website.fr-par.scw.cloud/stable/akkoma-$FLAVOUR.zip' -o /tmp/akkoma.zip
+curl 'https://akkoma-updates.s3-website.fr-par.scw.cloud/develop/akkoma-$FLAVOUR.zip' -o /tmp/akkoma.zip
 unzip /tmp/akkoma.zip -d /tmp/
 "
 
@@ -306,8 +306,6 @@ su akkoma -s $SHELL -lc "./bin/pleroma_ctl user new joeuser joeuser@sld.tld --ad
 ```
 This will create an account withe the username of 'joeuser' with the email address of joeuser@sld.tld, and set that user's account as an admin. This will result in a link that you can paste into the browser, which logs you in and enables you to set the password.
 
-{! installation/frontends.include !}
-
 ## Further reading
 
 {! installation/further_reading.include !}

docs/docs/installation/otp_redhat_en.md

@@ -279,7 +279,6 @@ After that, run the `pleroma_ctl migrate` command as usual to perform database m
 
 As it currently stands, your OTP build will only be compatible for the specific RedHat distribution you've built it on. Fedora builds only work on Fedora, Centos builds only on Centos, RedHat builds only on RedHat. Secondly, for Fedora, they will also be bound to the specific Fedora release. This is because different releases of Fedora may have significant changes made in some of the required packages and libraries.
 
-{! installation/frontends.include !}
 
 {! installation/further_reading.include !}
 

docs/docs/installation/verifying_otp_releases.md

@@ -1,66 +0,0 @@
-# Verifying OTP release integrity
-
-All stable OTP releases are cryptographically signed, to allow
-you to verify the integrity if you choose to.
-
-Releases are signed with [Signify](https://man.openbsd.org/signify.1),
-with [the public key in the main repository](https://akkoma.dev/AkkomaGang/akkoma/src/branch/stable/SIGNING_KEY.pub)
-
-Release URLs will always be of the form
-
-```
-https://akkoma-updates.s3-website.fr-par.scw.cloud/{branch}/akkoma-{flavour}.zip
-```
-
-Where branch is usually `stable` or `develop`, and `flavour` is
-the one [that you detect on install](../otp_en/#detecting-flavour).
-
-So, for an AMD64 stable install, your update URL will be
-
-```
-https://akkoma-updates.s3-website.fr-par.scw.cloud/stable/akkoma-amd64.zip
-```
-
-To verify the integrity of this file, we have two helper files
-
-```
-# Checksums
-https://akkoma-updates.s3-website.fr-par.scw.cloud/{branch}/akkoma-{flavour}.zip.sha256
-
-# Signify signature of the hashes
-https://akkoma-updates.s3-website.fr-par.scw.cloud/{branch}/akkoma-{flavour}.zip.sha256.sig
-```
-
-Thus, to upgrade manually, with integrity checking, consider the following script:
-
-```bash
-#!/bin/bash
-set -eo pipefail
-
-export FLAVOUR=amd64
-export BRANCH=stable
-
-# Fetch signing key
-curl --silent https://akkoma.dev/AkkomaGang/akkoma/raw/branch/$BRANCH/SIGNING_KEY.pub -o AKKOMA_SIGNING_KEY.pub
-
-# Download zip file and sig files
-wget -q https://akkoma-updates.s3-website.fr-par.scw.cloud/$BRANCH/akkoma-$FLAVOUR{.zip,.zip.sha256,.zip.sha256.sig}
-
-# Verify zip file's sha256 integrity
-sha256sum --check akkoma-$FLAVOUR.zip.sha256
-
-# Verify hash file's integrity
-# Signify might be under the `signify` command, depending on your distribution
-signify-openbsd -V -p AKKOMA_SIGNING_KEY.pub -m akkoma-$FLAVOUR.zip.sha256
-
-# We're good, use that URL
-echo "Update URL contents verified"
-echo "use"
-echo "./bin/pleroma_ctl update --zip-url https://akkoma-updates.s3-website.fr-par.scw.cloud/$BRANCH/akkoma-$FLAVOUR"
-echo "to update your instance"
-
-# Clean up
-rm akkoma-$FLAVOUR.zip
-rm akkoma-$FLAVOUR.zip.sha256
-rm akkoma-$FLAVOUR.zip.sha256.sig
-```

docs/mkdocs.yml

@@ -1,16 +1,13 @@
 site_name: Akkoma Documentation
 theme:
-  favicon: 'images/favicon.ico'
+  favicon: 'images/akko_badday.png'
   name: 'material'
   custom_dir: 'theme'
   # Disable google fonts
   font: false
-  logo: 'images/logo.png'
+  logo: 'images/akko_badday.png'
   features:
-    - navigation.tabs
-    - toc.follow
-    - navigation.instant
-    - navigation.sections
+    - tabs
   palette:
     primary: 'deep purple'
     accent: 'blue grey'
@@ -34,8 +31,7 @@ markdown_extensions:
   - pymdownx.tasklist:
       custom_checkbox: true
   - pymdownx.superfences
-  - pymdownx.tabbed:
-      alternate_style: true
+  - pymdownx.tabbed
   - pymdownx.details
   - markdown_include.include:
       base_path: docs

docs/requirements.txt

@@ -1,26 +1,22 @@
-certifi==2022.9.24
-charset-normalizer==2.1.1
 click==8.1.3
 ghp-import==2.1.0
-idna==3.4
 importlib-metadata==4.12.0
 Jinja2==3.1.2
 Markdown==3.3.7
-markdown-include==0.7.0
+markdown-include==0.6.0
 MarkupSafe==2.1.1
 mergedeep==1.3.4
-mkdocs==1.4.2
-mkdocs-material==8.5.9
-mkdocs-material-extensions==1.1
+mkdocs==1.3.0
+mkdocs-bootswatch==1.1
+mkdocs-material==8.1.8
+mkdocs-material-extensions==1.0.3
 packaging==21.3
-Pygments==2.13.0
-pymdown-extensions==9.8
+Pygments==2.11.2
+pymdown-extensions==9.1
 pyparsing==3.0.9
 python-dateutil==2.8.2
 PyYAML==6.0
 pyyaml_env_tag==0.1
-requests==2.28.1
 six==1.16.0
-urllib3==1.26.12
 watchdog==2.1.9
 zipp==3.8.0

installation/akkoma.service

@@ -7,9 +7,6 @@ ExecReload=/bin/kill $MAINPID
 KillMode=process
 Restart=on-failure
 
-; Uncomment this if you're on Arch Linux
-; Evironment="PATH=/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl"
-
 ; Name of the user that runs the Akkoma service.
 User=akkoma
 ; Declares that Akkoma runs in production mode.

installation/akkoma.vcl

@@ -1,5 +1,4 @@
 # Recommended varnishncsa logging format: '%h %l %u %t "%m %{X-Forwarded-Proto}i://%{Host}i%U%q %H" %s %b "%{Referer}i" "%{User-agent}i"'
-# Please use Varnish 7.0+ for proper Range Requests / Chunked encoding support
 vcl 4.1;
 import std;
 
@@ -23,6 +22,11 @@ sub vcl_recv {
       set req.http.X-Forwarded-Proto = "https";
     }
 
+    # CHUNKED SUPPORT
+    if (req.http.Range ~ "bytes=") {
+      set req.http.x-range = req.http.Range;
+    }
+
     # Pipe if WebSockets request is coming through
     if (req.http.upgrade ~ "(?i)websocket") {
       return (pipe);
@@ -31,9 +35,9 @@ sub vcl_recv {
     # Allow purging of the cache
     if (req.method == "PURGE") {
       if (!client.ip ~ purge) {
-        return (synth(405,"Not allowed."));
+        return(synth(405,"Not allowed."));
       }
-      return (purge);
+      return(purge);
     }
 }
 
@@ -49,11 +53,17 @@ sub vcl_backend_response {
       return (retry);
     }
 
+    # CHUNKED SUPPORT
+    if (bereq.http.x-range ~ "bytes=" && beresp.status == 206) {
+      set beresp.ttl = 10m;
+      set beresp.http.CR = beresp.http.content-range;
+    }
+
     # Bypass cache for large files
     # 50000000 ~ 50MB
     if (std.integer(beresp.http.content-length, 0) > 50000000) {
        set beresp.uncacheable = true;
-       return (deliver);
+       return(deliver);
     }
 
     # Don't cache objects that require authentication
@@ -84,7 +94,7 @@ sub vcl_synth {
     if (resp.status == 750) {
       set resp.status = 301;
       set resp.http.Location = req.http.x-redir;
-      return (deliver);
+      return(deliver);
     }
 }
 
@@ -96,12 +106,25 @@ sub vcl_pipe {
     }
 }
 
+sub vcl_hash {
+    # CHUNKED SUPPORT
+    if (req.http.x-range ~ "bytes=") {
+      hash_data(req.http.x-range);
+      unset req.http.Range;
+    }
+}
+
 sub vcl_backend_fetch {
     # Be more lenient for slow servers on the fediverse
     if (bereq.url ~ "^/proxy/") {
       set bereq.first_byte_timeout = 300s;
     }
 
+    # CHUNKED SUPPORT
+    if (bereq.http.x-range) {
+      set bereq.http.Range = bereq.http.x-range;
+    }
+
     if (bereq.retries == 0) {
         # Clean up the X-Varnish-Backend-503 flag that is used internally
         # to mark broken backend responses that should be retried.
@@ -120,6 +143,14 @@ sub vcl_backend_fetch {
     }
 }
 
+sub vcl_deliver {
+    # CHUNKED SUPPORT
+    if (resp.http.CR) {
+      set resp.http.Content-Range = resp.http.CR;
+      unset resp.http.CR;
+    }
+}
+
 sub vcl_backend_error {
     # Retry broken backend responses.
     set bereq.http.X-Varnish-Backend-503 = "1";

installation/download-mastofe-build.sh

@@ -0,0 +1,48 @@
+#!/bin/sh
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+project_id="74"
+project_branch="rebase/glitch-soc"
+static_dir="instance/static"
+# For bundling:
+# project_branch="pleroma"
+# static_dir="priv/static"
+
+if [ ! -d "${static_dir}" ]
+then
+	echo "Error: ${static_dir} directory is missing, are you sure you are running this script at the root of pleroma’s repository?"
+	exit 1
+fi
+
+last_modified="$(curl --fail -s -I 'https://git.pleroma.social/api/v4/projects/'${project_id}'/jobs/artifacts/'${project_branch}'/download?job=build' | grep '^Last-Modified:' | cut -d: -f2-)"
+
+echo "branch:${project_branch}"
+echo "Last-Modified:${last_modified}"
+
+artifact="mastofe.zip"
+
+if [ "${last_modified}x" = "x" ]
+then
+	echo "ERROR: Couldn't get the modification date of the latest build archive, maybe it expired, exiting..."
+	exit 1
+fi
+
+if [ -e mastofe.timestamp ] && [ "$(cat mastofe.timestamp)" = "${last_modified}" ]
+then
+	echo "MastoFE is up-to-date, exiting..."
+	exit 0
+fi
+
+curl --fail -c - "https://git.pleroma.social/api/v4/projects/${project_id}/jobs/artifacts/${project_branch}/download?job=build" -o "${artifact}" || exit
+
+# TODO: Update the emoji as well
+rm -fr "${static_dir}/sw.js" "${static_dir}/packs" || exit
+unzip -q "${artifact}" || exit
+
+cp public/assets/sw.js "${static_dir}/sw.js" || exit
+cp -r public/packs "${static_dir}/packs" || exit
+
+echo "${last_modified}" > mastofe.timestamp
+rm -fr public
+rm -i "${artifact}"

lib/mix/pleroma.ex

@@ -23,15 +23,7 @@ def start_pleroma do
     Pleroma.Config.Oban.warn()
     Pleroma.Application.limiters_setup()
     Application.put_env(:phoenix, :serve_endpoints, false, persistent: true)
-
-    proxy_url = Pleroma.Config.get([:http, :proxy_url])
-    proxy = Pleroma.HTTP.AdapterHelper.format_proxy(proxy_url)
-
-    finch_config =
-      [:http, :adapter]
-      |> Pleroma.Config.get([])
-      |> Pleroma.HTTP.AdapterHelper.maybe_add_proxy_pool(proxy)
-      |> Keyword.put(:name, MyFinch)
+    Finch.start_link(name: MyFinch)
 
     unless System.get_env("DEBUG") do
       Logger.remove_backend(:console)
@@ -53,7 +45,6 @@ def start_pleroma do
         Pleroma.Emoji,
         {Pleroma.Config.TransferTask, false},
         Pleroma.Web.Endpoint,
-        {Finch, finch_config},
         {Oban, oban_config},
         {Majic.Pool,
          [name: Pleroma.MajicPool, pool_size: Pleroma.Config.get([:majic_pool, :size], 2)]}

lib/mix/tasks/pleroma/database.ex

@@ -110,14 +110,6 @@ def run(["prune_objects" | args]) do
     end
   end
 
-  def run(["prune_task"]) do
-    start_pleroma()
-
-    nil
-    |> Pleroma.Workers.Cron.PruneDatabaseWorker.perform()
-    |> IO.inspect()
-  end
-
   def run(["fix_likes_collections"]) do
     start_pleroma()
 

lib/mix/tasks/pleroma/diagnostics.ex

@@ -1,77 +0,0 @@
-defmodule Mix.Tasks.Pleroma.Diagnostics do
-  alias Pleroma.Repo
-  alias Pleroma.User
-
-  require Logger
-  require Pleroma.Constants
-
-  import Mix.Pleroma
-  import Ecto.Query
-  use Mix.Task
-
-  def run(["home_timeline", nickname]) do
-    start_pleroma()
-    user = Repo.get_by!(User, nickname: nickname)
-    Logger.info("Home timeline query #{user.nickname}")
-
-    followed_hashtags =
-      user
-      |> User.followed_hashtags()
-      |> Enum.map(& &1.id)
-
-    params =
-      %{limit: 20}
-      |> Map.put(:type, ["Create", "Announce"])
-      |> Map.put(:blocking_user, user)
-      |> Map.put(:muting_user, user)
-      |> Map.put(:reply_filtering_user, user)
-      |> Map.put(:announce_filtering_user, user)
-      |> Map.put(:user, user)
-      |> Map.put(:followed_hashtags, followed_hashtags)
-      |> Map.delete(:local)
-
-    list_memberships = Pleroma.List.memberships(user)
-    recipients = [user.ap_id | User.following(user)]
-
-    query =
-      Pleroma.Web.ActivityPub.ActivityPub.fetch_activities_query(
-        recipients ++ list_memberships,
-        params
-      )
-      |> limit(20)
-
-    Ecto.Adapters.SQL.explain(Repo, :all, query, analyze: true, timeout: :infinity)
-    |> IO.puts()
-  end
-
-  def run(["user_timeline", nickname, reading_nickname]) do
-    start_pleroma()
-    user = Repo.get_by!(User, nickname: nickname)
-    reading_user = Repo.get_by!(User, nickname: reading_nickname)
-    Logger.info("User timeline query #{user.nickname}")
-
-    params =
-      %{limit: 20}
-      |> Map.put(:type, ["Create", "Announce"])
-      |> Map.put(:user, reading_user)
-      |> Map.put(:actor_id, user.ap_id)
-      |> Map.put(:pinned_object_ids, Map.keys(user.pinned_objects))
-
-    list_memberships = Pleroma.List.memberships(user)
-
-    recipients =
-      %{
-        godmode: params[:godmode],
-        reading_user: reading_user
-      }
-      |> Pleroma.Web.ActivityPub.ActivityPub.user_activities_recipients()
-
-    query =
-      (recipients ++ list_memberships)
-      |> Pleroma.Web.ActivityPub.ActivityPub.fetch_activities_query(params)
-      |> limit(20)
-
-    Ecto.Adapters.SQL.explain(Repo, :all, query, analyze: true, timeout: :infinity)
-    |> IO.puts()
-  end
-end

lib/mix/tasks/pleroma/instance.ex

@@ -59,7 +59,7 @@ def run(["gen" | rest]) do
           get_option(
             options,
             :domain,
-            "What domain will your instance use? (e.g akkoma.example.com)"
+            "What domain will your instance use? (e.g pleroma.soykaf.com)"
           ),
           ":"
         ) ++ [443]

lib/mix/tasks/pleroma/user.ex

@@ -113,11 +113,9 @@ def run(["reset_password", nickname]) do
          {:ok, token} <- Pleroma.PasswordResetToken.create_token(user) do
       shell_info("Generated password reset token for #{user.nickname}")
 
-      IO.puts(
-        "URL: #{Pleroma.Web.Router.Helpers.reset_password_url(Pleroma.Web.Endpoint,
-        :reset,
-        token.token)}"
-      )
+      IO.puts("URL: #{Pleroma.Web.Router.Helpers.reset_password_url(Pleroma.Web.Endpoint,
+      :reset,
+      token.token)}")
     else
       _ ->
         shell_error("No local user #{nickname}")
@@ -260,25 +258,6 @@ def run(["untag", nickname | tags]) do
     end
   end
 
-  def run(["refetch_public_keys"]) do
-    start_pleroma()
-
-    Pleroma.User.Query.build(%{
-      external: true,
-      is_active: true
-    })
-    |> refetch_public_keys()
-  end
-
-  def run(["refetch_public_keys" | rest]) do
-    start_pleroma()
-
-    Pleroma.User.Query.build(%{
-      ap_id: rest
-    })
-    |> refetch_public_keys()
-  end
-
   def run(["invite" | rest]) do
     {options, [], []} =
       OptionParser.parse(rest,
@@ -471,15 +450,9 @@ def run(["blocking", nickname]) do
 
   def run(["timeline_query", nickname]) do
     start_pleroma()
-
     params = %{local: true}
 
     with %User{local: true} = user <- User.get_cached_by_nickname(nickname) do
-      followed_hashtags =
-        user
-        |> User.followed_hashtags()
-        |> Enum.map(& &1.id)
-
       params =
         params
         |> Map.put(:type, ["Create", "Announce"])
@@ -490,7 +463,6 @@ def run(["timeline_query", nickname]) do
         |> Map.put(:announce_filtering_user, user)
         |> Map.put(:user, user)
         |> Map.put(:local_only, params[:local])
-        |> Map.put(:hashtags, followed_hashtags)
         |> Map.delete(:local)
 
       _activities =
@@ -547,32 +519,6 @@ def run(["fix_follow_state", local_user, remote_user]) do
     end
   end
 
-  def run(["convert_id", id]) do
-    {:ok, uuid} = FlakeId.Ecto.Type.dump(id)
-    {:ok, raw_id} = Ecto.UUID.load(uuid)
-    shell_info(raw_id)
-  end
-
-  defp refetch_public_keys(query) do
-    query
-    |> Pleroma.Repo.chunk_stream(50, :batches)
-    |> Stream.each(fn users ->
-      users
-      |> Enum.each(fn user ->
-        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 -> IO.puts("Could not resolve: #{user.ap_id}, #{inspect(error)}")
-        end
-      end)
-    end)
-    |> Stream.run()
-  end
-
   defp set_moderator(user, value) do
     {:ok, user} =
       user

lib/pleroma/activity.ex

@@ -367,24 +367,10 @@ def following_requests_for_actor(%User{ap_id: ap_id}) do
     |> Repo.all()
   end
 
-  def follow_activity(%User{ap_id: ap_id}, %User{ap_id: followed_ap_id}) do
-    Queries.by_type("Follow")
-    |> where([a], a.actor == ^ap_id)
-    |> where([a], fragment("?->>'object' = ?", a.data, ^followed_ap_id))
-    |> where([a], fragment("?->>'state'", a.data) in ["pending", "accept"])
-    |> Repo.one()
-  end
-
   def restrict_deactivated_users(query) do
-    query
-    |> join(
-      :inner_lateral,
-      [activity],
-      active in fragment(
-        "SELECT is_active from users WHERE ap_id = ? AND is_active = TRUE",
-        activity.actor
-      )
-    )
+    deactivated_users_query = from(u in User.Query.build(%{deactivated: true}), select: u.ap_id)
+
+    from(activity in query, where: activity.actor not in subquery(deactivated_users_query))
   end
 
   defdelegate search(user, query, options \\ []), to: Pleroma.Search.DatabaseSearch

lib/pleroma/activity/html.ex

@@ -8,40 +8,6 @@ defmodule Pleroma.Activity.HTML do
 
   @cachex Pleroma.Config.get([:cachex, :provider], Cachex)
 
-  # We store a list of cache keys related to an activity in a
-  # separate cache, scrubber_management_cache. It has the same
-  # size as scrubber_cache (see application.ex). Every time we add
-  # a cache to scrubber_cache, we update scrubber_management_cache.
-  #
-  # The most recent write of a certain key in the management cache
-  # is the same as the most recent write of any record related to that
-  # key in the main cache.
-  # Assuming LRW ( https://hexdocs.pm/cachex/Cachex.Policy.LRW.html ),
-  # this means when the management cache is evicted by cachex, all
-  # related records in the main cache will also have been evicted.
-
-  defp get_cache_keys_for(activity_id) do
-    with {:ok, list} when is_list(list) <- @cachex.get(:scrubber_management_cache, activity_id) do
-      list
-    else
-      _ -> []
-    end
-  end
-
-  defp add_cache_key_for(activity_id, additional_key) do
-    current = get_cache_keys_for(activity_id)
-
-    unless additional_key in current do
-      @cachex.put(:scrubber_management_cache, activity_id, [additional_key | current])
-    end
-  end
-
-  def invalidate_cache_for(activity_id) do
-    keys = get_cache_keys_for(activity_id)
-    Enum.map(keys, &@cachex.del(:scrubber_cache, &1))
-    @cachex.del(:scrubber_management_cache, activity_id)
-  end
-
   def get_cached_scrubbed_html_for_activity(
         content,
         scrubbers,
@@ -53,8 +19,6 @@ def get_cached_scrubbed_html_for_activity(
 
     @cachex.fetch!(:scrubber_cache, key, fn _key ->
       object = Object.normalize(activity, fetch: false)
-
-      add_cache_key_for(activity.id, key)
       HTML.ensure_scrubbed_html(content, scrubbers, object.data["fake"] || false, callback)
     end)
   end

lib/pleroma/activity/pruner.ex

@@ -1,52 +0,0 @@
-defmodule Pleroma.Activity.Pruner do
-  @moduledoc """
-  Prunes activities from the database.
-  """
-  @cutoff 30
-
-  alias Pleroma.Activity
-  alias Pleroma.Repo
-  import Ecto.Query
-
-  def prune_deletes do
-    before_time = cutoff()
-
-    from(a in Activity,
-      where: fragment("?->>'type' = ?", a.data, "Delete") and a.inserted_at < ^before_time
-    )
-    |> Repo.delete_all(timeout: :infinity)
-  end
-
-  def prune_undos do
-    before_time = cutoff()
-
-    from(a in Activity,
-      where: fragment("?->>'type' = ?", a.data, "Undo") and a.inserted_at < ^before_time
-    )
-    |> Repo.delete_all(timeout: :infinity)
-  end
-
-  def prune_removes do
-    before_time = cutoff()
-
-    from(a in Activity,
-      where: fragment("?->>'type' = ?", a.data, "Remove") and a.inserted_at < ^before_time
-    )
-    |> Repo.delete_all(timeout: :infinity)
-  end
-
-  def prune_stale_follow_requests do
-    before_time = cutoff()
-
-    from(a in Activity,
-      where:
-        fragment("?->>'type' = ?", a.data, "Follow") and a.inserted_at < ^before_time and
-          fragment("?->>'state' = ?", a.data, "reject")
-    )
-    |> Repo.delete_all(timeout: :infinity)
-  end
-
-  defp cutoff do
-    DateTime.utc_now() |> Timex.shift(days: -@cutoff)
-  end
-end

lib/pleroma/akkoma/frontend_setting_profile.ex

@@ -1,100 +0,0 @@
-defmodule Pleroma.Akkoma.FrontendSettingsProfile do
-  use Ecto.Schema
-
-  import Ecto.Changeset
-  import Ecto.Query
-  alias Pleroma.Repo
-  alias Pleroma.Config
-  alias Pleroma.User
-
-  @primary_key false
-  schema "user_frontend_setting_profiles" do
-    belongs_to(:user, Pleroma.User, primary_key: true, type: FlakeId.Ecto.CompatType)
-    field(:frontend_name, :string, primary_key: true)
-    field(:profile_name, :string, primary_key: true)
-    field(:settings, :map)
-    field(:version, :integer)
-    timestamps()
-  end
-
-  def changeset(%__MODULE__{} = struct, attrs) do
-    struct
-    |> cast(attrs, [:user_id, :frontend_name, :profile_name, :settings, :version])
-    |> validate_required([:user_id, :frontend_name, :profile_name, :settings, :version])
-    |> validate_length(:frontend_name, min: 1, max: 255)
-    |> validate_length(:profile_name, min: 1, max: 255)
-    |> validate_version(struct)
-    |> validate_number(:version, greater_than: 0)
-    |> validate_settings_length(Config.get([:instance, :max_frontend_settings_json_chars]))
-  end
-
-  def create_or_update(%User{} = user, frontend_name, profile_name, settings, version) do
-    struct =
-      case get_by_user_and_frontend_name_and_profile_name(user, frontend_name, profile_name) do
-        nil ->
-          %__MODULE__{}
-
-        %__MODULE__{} = profile ->
-          profile
-      end
-
-    struct
-    |> changeset(%{
-      user_id: user.id,
-      frontend_name: frontend_name,
-      profile_name: profile_name,
-      settings: settings,
-      version: version
-    })
-    |> Repo.insert_or_update()
-  end
-
-  def get_all_by_user_and_frontend_name(%User{id: user_id}, frontend_name) do
-    Repo.all(
-      from(p in __MODULE__, where: p.user_id == ^user_id and p.frontend_name == ^frontend_name)
-    )
-  end
-
-  def get_by_user_and_frontend_name_and_profile_name(
-        %User{id: user_id},
-        frontend_name,
-        profile_name
-      ) do
-    Repo.one(
-      from(p in __MODULE__,
-        where:
-          p.user_id == ^user_id and p.frontend_name == ^frontend_name and
-            p.profile_name == ^profile_name
-      )
-    )
-  end
-
-  def delete_profile(profile) do
-    Repo.delete(profile)
-  end
-
-  defp validate_settings_length(
-         %Ecto.Changeset{changes: %{settings: settings}} = changeset,
-         max_length
-       ) do
-    settings_json = Jason.encode!(settings)
-
-    if String.length(settings_json) > max_length do
-      add_error(changeset, :settings, "is too long")
-    else
-      changeset
-    end
-  end
-
-  defp validate_version(changeset, %{version: nil}), do: changeset
-
-  defp validate_version(%Ecto.Changeset{changes: %{version: version}} = changeset, %{
-         version: prev_version
-       }) do
-    if version != prev_version + 1 do
-      add_error(changeset, :version, "must be incremented by 1")
-    else
-      changeset
-    end
-  end
-end

lib/pleroma/akkoma/translators/deepl.ex

@@ -1,100 +0,0 @@
-defmodule Pleroma.Akkoma.Translators.DeepL do
-  @behaviour Pleroma.Akkoma.Translator
-
-  alias Pleroma.HTTP
-  alias Pleroma.Config
-  require Logger
-
-  defp base_url(:free) do
-    "https://api-free.deepl.com/v2/"
-  end
-
-  defp base_url(:pro) do
-    "https://api.deepl.com/v2/"
-  end
-
-  defp api_key do
-    Config.get([:deepl, :api_key])
-  end
-
-  defp tier do
-    Config.get([:deepl, :tier])
-  end
-
-  @impl Pleroma.Akkoma.Translator
-  def languages do
-    with {:ok, %{status: 200} = source_response} <- do_languages("source"),
-         {:ok, %{status: 200} = dest_response} <- do_languages("target"),
-         {:ok, source_body} <- Jason.decode(source_response.body),
-         {:ok, dest_body} <- Jason.decode(dest_response.body) do
-      source_resp =
-        Enum.map(source_body, fn %{"language" => code, "name" => name} ->
-          %{code: code, name: name}
-        end)
-
-      dest_resp =
-        Enum.map(dest_body, fn %{"language" => code, "name" => name} ->
-          %{code: code, name: name}
-        end)
-
-      {:ok, source_resp, dest_resp}
-    else
-      {:ok, %{status: status} = response} ->
-        Logger.warning("DeepL: Request rejected: #{inspect(response)}")
-        {:error, "DeepL request failed (code #{status})"}
-
-      {:error, reason} ->
-        {:error, reason}
-    end
-  end
-
-  @impl Pleroma.Akkoma.Translator
-  def translate(string, from_language, to_language) do
-    with {:ok, %{status: 200} = response} <-
-           do_request(api_key(), tier(), string, from_language, to_language),
-         {:ok, body} <- Jason.decode(response.body) do
-      %{"translations" => [%{"text" => translated, "detected_source_language" => detected}]} =
-        body
-
-      {:ok, detected, translated}
-    else
-      {:ok, %{status: status} = response} ->
-        Logger.warning("DeepL: Request rejected: #{inspect(response)}")
-        {:error, "DeepL request failed (code #{status})"}
-
-      {:error, reason} ->
-        {:error, reason}
-    end
-  end
-
-  defp do_request(api_key, tier, string, from_language, to_language) do
-    HTTP.post(
-      base_url(tier) <> "translate",
-      URI.encode_query(
-        %{
-          text: string,
-          target_lang: to_language,
-          tag_handling: "html"
-        }
-        |> maybe_add_source(from_language),
-        :rfc3986
-      ),
-      [
-        {"authorization", "DeepL-Auth-Key #{api_key}"},
-        {"content-type", "application/x-www-form-urlencoded"}
-      ]
-    )
-  end
-
-  defp maybe_add_source(opts, nil), do: opts
-  defp maybe_add_source(opts, lang), do: Map.put(opts, :source_lang, lang)
-
-  defp do_languages(type) do
-    HTTP.get(
-      base_url(tier()) <> "languages?type=#{type}",
-      [
-        {"authorization", "DeepL-Auth-Key #{api_key()}"}
-      ]
-    )
-  end
-end

lib/pleroma/akkoma/translators/libre_translate.ex

@@ -1,82 +0,0 @@
-defmodule Pleroma.Akkoma.Translators.LibreTranslate do
-  @behaviour Pleroma.Akkoma.Translator
-
-  alias Pleroma.Config
-  alias Pleroma.HTTP
-  require Logger
-
-  defp api_key do
-    Config.get([:libre_translate, :api_key])
-  end
-
-  defp url do
-    Config.get([:libre_translate, :url])
-  end
-
-  @impl Pleroma.Akkoma.Translator
-  def languages do
-    with {:ok, %{status: 200} = response} <- do_languages(),
-         {:ok, body} <- Jason.decode(response.body) do
-      resp = Enum.map(body, fn %{"code" => code, "name" => name} -> %{code: code, name: name} end)
-      # No separate source/dest
-      {:ok, resp, resp}
-    else
-      {:ok, %{status: status} = response} ->
-        Logger.warning("LibreTranslate: Request rejected: #{inspect(response)}")
-        {:error, "LibreTranslate request failed (code #{status})"}
-
-      {:error, reason} ->
-        {:error, reason}
-    end
-  end
-
-  @impl Pleroma.Akkoma.Translator
-  def translate(string, from_language, to_language) do
-    with {:ok, %{status: 200} = response} <- do_request(string, from_language, to_language),
-         {:ok, body} <- Jason.decode(response.body) do
-      %{"translatedText" => translated} = body
-
-      detected =
-        if Map.has_key?(body, "detectedLanguage") do
-          get_in(body, ["detectedLanguage", "language"])
-        else
-          from_language
-        end
-
-      {:ok, detected, translated}
-    else
-      {:ok, %{status: status} = response} ->
-        Logger.warning("libre_translate: request failed, #{inspect(response)}")
-        {:error, "libre_translate: request failed (code #{status})"}
-
-      {:error, reason} ->
-        {:error, reason}
-    end
-  end
-
-  defp do_request(string, from_language, to_language) do
-    url = URI.parse(url())
-    url = %{url | path: "/translate"}
-
-    HTTP.post(
-      to_string(url),
-      Jason.encode!(%{
-        q: string,
-        source: if(is_nil(from_language), do: "auto", else: from_language),
-        target: to_language,
-        format: "html",
-        api_key: api_key()
-      }),
-      [
-        {"content-type", "application/json"}
-      ]
-    )
-  end
-
-  defp do_languages() do
-    url = URI.parse(url())
-    url = %{url | path: "/languages"}
-
-    HTTP.get(to_string(url))
-  end
-end

lib/pleroma/akkoma/translators/translator.ex

@@ -1,8 +0,0 @@
-defmodule Pleroma.Akkoma.Translator do
-  @callback translate(String.t(), String.t() | nil, String.t()) ::
-              {:ok, String.t(), String.t()} | {:error, any()}
-  @callback languages() ::
-              {:ok, [%{name: String.t(), code: String.t()}],
-               [%{name: String.t(), code: String.t()}]}
-              | {:error, any()}
-end

lib/pleroma/application.ex

@@ -63,8 +63,7 @@ def start(_type, _args) do
         Pleroma.Repo,
         Config.TransferTask,
         Pleroma.Emoji,
-        Pleroma.Web.Plugs.RateLimiter.Supervisor,
-        {Task.Supervisor, name: Pleroma.TaskSupervisor}
+        Pleroma.Web.Plugs.RateLimiter.Supervisor
       ] ++
         cachex_children() ++
         http_children() ++
@@ -150,15 +149,11 @@ defp cachex_children do
       build_cachex("object", default_ttl: 25_000, ttl_interval: 1000, limit: 2500),
       build_cachex("rich_media", default_ttl: :timer.minutes(120), limit: 5000),
       build_cachex("scrubber", limit: 2500),
-      build_cachex("scrubber_management", limit: 2500),
       build_cachex("idempotency", expiration: idempotency_expiration(), limit: 2500),
       build_cachex("web_resp", limit: 2500),
       build_cachex("emoji_packs", expiration: emoji_packs_expiration(), limit: 10),
       build_cachex("failed_proxy_url", limit: 2500),
-      build_cachex("banned_urls", default_ttl: :timer.hours(24 * 30), limit: 5_000),
-      build_cachex("translations", default_ttl: :timer.hours(24 * 30), limit: 2500),
-      build_cachex("instances", default_ttl: :timer.hours(24), ttl_interval: 1000, limit: 2500),
-      build_cachex("request_signatures", default_ttl: :timer.hours(24 * 30), limit: 3000)
+      build_cachex("banned_urls", default_ttl: :timer.hours(24 * 30), limit: 5_000)
     ]
   end
 

lib/pleroma/collections/fetcher.ex

@@ -11,7 +11,10 @@ defmodule Akkoma.Collections.Fetcher do
   alias Pleroma.Config
   require Logger
 
-  @spec fetch_collection(String.t() | map()) :: {:ok, [Pleroma.Object.t()]} | {:error, any()}
+  def fetch_collection_by_ap_id(ap_id) when is_binary(ap_id) do
+    fetch_collection(ap_id)
+  end
+
   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
       {:ok, objects_from_collection(page)}
@@ -23,7 +26,7 @@ def fetch_collection(ap_id) when is_binary(ap_id) do
   end
 
   def fetch_collection(%{"type" => type} = page)
-      when type in ["Collection", "OrderedCollection", "CollectionPage", "OrderedCollectionPage"] do
+      when type in ["Collection", "OrderedCollection"] do
     {:ok, objects_from_collection(page)}
   end
 
@@ -35,13 +38,12 @@ defp items_in_page(%{"type" => type, "items" => items})
        when is_list(items) and type in ["Collection", "CollectionPage"],
        do: items
 
-  defp objects_from_collection(%{"type" => type, "orderedItems" => items} = page)
-       when is_list(items) and type in ["OrderedCollection", "OrderedCollectionPage"],
-       do: maybe_next_page(page, items)
+  defp objects_from_collection(%{"type" => "OrderedCollection", "orderedItems" => items})
+       when is_list(items),
+       do: items
 
-  defp objects_from_collection(%{"type" => type, "items" => items} = page)
-       when is_list(items) and type in ["Collection", "CollectionPage"],
-       do: maybe_next_page(page, items)
+  defp objects_from_collection(%{"type" => "Collection", "items" => items}) when is_list(items),
+    do: items
 
   defp objects_from_collection(%{"type" => type, "first" => first})
        when is_binary(first) and type in ["Collection", "OrderedCollection"] do
@@ -53,27 +55,17 @@ defp objects_from_collection(%{"type" => type, "first" => %{"id" => id}})
     fetch_page_items(id)
   end
 
-  defp objects_from_collection(_page), do: []
-
   defp fetch_page_items(id, items \\ []) do
     if Enum.count(items) >= Config.get([:activitypub, :max_collection_objects]) do
       items
     else
-      with {:ok, page} <- Fetcher.fetch_and_contain_remote_object_from_id(id) do
-        objects = items_in_page(page)
+      {:ok, page} = Fetcher.fetch_and_contain_remote_object_from_id(id)
+      objects = items_in_page(page)
 
-        if Enum.count(objects) > 0 do
-          maybe_next_page(page, items ++ objects)
-        else
-          items
-        end
+      if Enum.count(objects) > 0 do
+        maybe_next_page(page, items ++ objects)
       else
-        {:error, "Object has been deleted"} ->
-          items
-
-        {:error, error} ->
-          Logger.error("Could not fetch page #{id} - #{inspect(error)}")
-          {:error, error}
+        items
       end
     end
   end

lib/pleroma/config/transfer_task.ex

@@ -38,6 +38,7 @@ def start_link(restart_pleroma? \\ true) do
   def load_and_update_env(deleted_settings \\ [], restart_pleroma? \\ true) do
     with {_, true} <- {:configurable, Config.get(:configurable_from_database)} do
       # We need to restart applications for loaded settings take effect
+
       {logger, other} =
         (Repo.all(ConfigDB) ++ deleted_settings)
         |> Enum.map(&merge_with_default/1)
@@ -84,12 +85,7 @@ defp maybe_set_pleroma_last(apps) do
   end
 
   defp merge_with_default(%{group: group, key: key, value: value} = setting) do
-    default =
-      if group == :pleroma do
-        Config.get([key], Config.Holder.default_config(group, key))
-      else
-        Config.Holder.default_config(group, key)
-      end
+    default = Config.Holder.default_config(group, key)
 
     merged =
       cond do

lib/pleroma/constants.ex

@@ -27,40 +27,4 @@ defmodule Pleroma.Constants do
     do:
       ~w(index.html robots.txt static static-fe finmoji emoji packs sounds images instance sw.js sw-pleroma.js favicon.png schemas doc embed.js embed.css)
   )
-
-  const(status_updatable_fields,
-    do: [
-      "source",
-      "tag",
-      "updated",
-      "emoji",
-      "content",
-      "summary",
-      "sensitive",
-      "attachment",
-      "generator"
-    ]
-  )
-
-  const(updatable_object_types,
-    do: [
-      "Note",
-      "Question",
-      "Audio",
-      "Video",
-      "Event",
-      "Article",
-      "Page"
-    ]
-  )
-
-  const(actor_types,
-    do: [
-      "Application",
-      "Group",
-      "Organization",
-      "Person",
-      "Service"
-    ]
-  )
 end

lib/pleroma/emoji-test.txt

@@ -1,13 +1,13 @@
 # emoji-test.txt
-# Date: 2022-08-12, 20:24:39 GMT
-# © 2022 Unicode®, Inc.
+# Date: 2021-08-26, 17:22:23 GMT
+# © 2021 Unicode®, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
-# For terms of use, see https://www.unicode.org/terms_of_use.html
+# For terms of use, see http://www.unicode.org/terms_of_use.html
 #
 # Emoji Keyboard/Display Test Data for UTS #51
-# Version: 15.0
+# Version: 14.0
 #
-# For documentation and usage, see https://www.unicode.org/reports/tr51
+# For documentation and usage, see http://www.unicode.org/reports/tr51
 #
 # This file provides data for testing which emoji forms should be in keyboards and which should also be displayed/processed.
 # Format: code points; status # emoji name
@@ -92,7 +92,6 @@
 1F62C                                                  ; fully-qualified     # 😬 E1.0 grimacing face
 1F62E 200D 1F4A8                                       ; fully-qualified     # 😮‍💨 E13.1 face exhaling
 1F925                                                  ; fully-qualified     # 🤥 E3.0 lying face
-1FAE8                                                  ; fully-qualified     # 🫨 E15.0 shaking face
 
 # subgroup: face-sleepy
 1F60C                                                  ; fully-qualified     # 😌 E0.6 relieved face
@@ -156,7 +155,7 @@
 
 # subgroup: face-negative
 1F624                                                  ; fully-qualified     # 😤 E0.6 face with steam from nose
-1F621                                                  ; fully-qualified     # 😡 E0.6 enraged face
+1F621                                                  ; fully-qualified     # 😡 E0.6 pouting face
 1F620                                                  ; fully-qualified     # 😠 E0.6 angry face
 1F92C                                                  ; fully-qualified     # 🤬 E5.0 face with symbols on mouth
 1F608                                                  ; fully-qualified     # 😈 E1.0 smiling face with horns
@@ -191,7 +190,8 @@
 1F649                                                  ; fully-qualified     # 🙉 E0.6 hear-no-evil monkey
 1F64A                                                  ; fully-qualified     # 🙊 E0.6 speak-no-evil monkey
 
-# subgroup: heart
+# subgroup: emotion
+1F48B                                                  ; fully-qualified     # 💋 E0.6 kiss mark
 1F48C                                                  ; fully-qualified     # 💌 E0.6 love letter
 1F498                                                  ; fully-qualified     # 💘 E0.6 heart with arrow
 1F49D                                                  ; fully-qualified     # 💝 E0.6 heart with ribbon
@@ -210,20 +210,14 @@
 2764 200D 1FA79                                        ; unqualified         # ❤‍🩹 E13.1 mending heart
 2764 FE0F                                              ; fully-qualified     # ❤️ E0.6 red heart
 2764                                                   ; unqualified         # ❤ E0.6 red heart
-1FA77                                                  ; fully-qualified     # 🩷 E15.0 pink heart
 1F9E1                                                  ; fully-qualified     # 🧡 E5.0 orange heart
 1F49B                                                  ; fully-qualified     # 💛 E0.6 yellow heart
 1F49A                                                  ; fully-qualified     # 💚 E0.6 green heart
 1F499                                                  ; fully-qualified     # 💙 E0.6 blue heart
-1FA75                                                  ; fully-qualified     # 🩵 E15.0 light blue heart
 1F49C                                                  ; fully-qualified     # 💜 E0.6 purple heart
 1F90E                                                  ; fully-qualified     # 🤎 E12.0 brown heart
 1F5A4                                                  ; fully-qualified     # 🖤 E3.0 black heart
-1FA76                                                  ; fully-qualified     # 🩶 E15.0 grey heart
 1F90D                                                  ; fully-qualified     # 🤍 E12.0 white heart
-
-# subgroup: emotion
-1F48B                                                  ; fully-qualified     # 💋 E0.6 kiss mark
 1F4AF                                                  ; fully-qualified     # 💯 E0.6 hundred points
 1F4A2                                                  ; fully-qualified     # 💢 E0.6 anger symbol
 1F4A5                                                  ; fully-qualified     # 💥 E0.6 collision
@@ -232,20 +226,21 @@
 1F4A8                                                  ; fully-qualified     # 💨 E0.6 dashing away
 1F573 FE0F                                             ; fully-qualified     # 🕳️ E0.7 hole
 1F573                                                  ; unqualified         # 🕳 E0.7 hole
+1F4A3                                                  ; fully-qualified     # 💣 E0.6 bomb
 1F4AC                                                  ; fully-qualified     # 💬 E0.6 speech balloon
 1F441 FE0F 200D 1F5E8 FE0F                             ; fully-qualified     # 👁️‍🗨️ E2.0 eye in speech bubble
 1F441 200D 1F5E8 FE0F                                  ; unqualified         # 👁‍🗨️ E2.0 eye in speech bubble
-1F441 FE0F 200D 1F5E8                                  ; minimally-qualified # 👁️‍🗨 E2.0 eye in speech bubble
+1F441 FE0F 200D 1F5E8                                  ; unqualified         # 👁️‍🗨 E2.0 eye in speech bubble
 1F441 200D 1F5E8                                       ; unqualified         # 👁‍🗨 E2.0 eye in speech bubble
 1F5E8 FE0F                                             ; fully-qualified     # 🗨️ E2.0 left speech bubble
 1F5E8                                                  ; unqualified         # 🗨 E2.0 left speech bubble
 1F5EF FE0F                                             ; fully-qualified     # 🗯️ E0.7 right anger bubble
 1F5EF                                                  ; unqualified         # 🗯 E0.7 right anger bubble
 1F4AD                                                  ; fully-qualified     # 💭 E1.0 thought balloon
-1F4A4                                                  ; fully-qualified     # 💤 E0.6 ZZZ
+1F4A4                                                  ; fully-qualified     # 💤 E0.6 zzz
 
-# Smileys & Emotion subtotal:		180
-# Smileys & Emotion subtotal:		180	w/o modifiers
+# Smileys & Emotion subtotal:		177
+# Smileys & Emotion subtotal:		177	w/o modifiers
 
 # group: People & Body
 
@@ -305,18 +300,6 @@
 1FAF4 1F3FD                                            ; fully-qualified     # 🫴🏽 E14.0 palm up hand: medium skin tone
 1FAF4 1F3FE                                            ; fully-qualified     # 🫴🏾 E14.0 palm up hand: medium-dark skin tone
 1FAF4 1F3FF                                            ; fully-qualified     # 🫴🏿 E14.0 palm up hand: dark skin tone
-1FAF7                                                  ; fully-qualified     # 🫷 E15.0 leftwards pushing hand
-1FAF7 1F3FB                                            ; fully-qualified     # 🫷🏻 E15.0 leftwards pushing hand: light skin tone
-1FAF7 1F3FC                                            ; fully-qualified     # 🫷🏼 E15.0 leftwards pushing hand: medium-light skin tone
-1FAF7 1F3FD                                            ; fully-qualified     # 🫷🏽 E15.0 leftwards pushing hand: medium skin tone
-1FAF7 1F3FE                                            ; fully-qualified     # 🫷🏾 E15.0 leftwards pushing hand: medium-dark skin tone
-1FAF7 1F3FF                                            ; fully-qualified     # 🫷🏿 E15.0 leftwards pushing hand: dark skin tone
-1FAF8                                                  ; fully-qualified     # 🫸 E15.0 rightwards pushing hand
-1FAF8 1F3FB                                            ; fully-qualified     # 🫸🏻 E15.0 rightwards pushing hand: light skin tone
-1FAF8 1F3FC                                            ; fully-qualified     # 🫸🏼 E15.0 rightwards pushing hand: medium-light skin tone
-1FAF8 1F3FD                                            ; fully-qualified     # 🫸🏽 E15.0 rightwards pushing hand: medium skin tone
-1FAF8 1F3FE                                            ; fully-qualified     # 🫸🏾 E15.0 rightwards pushing hand: medium-dark skin tone
-1FAF8 1F3FF                                            ; fully-qualified     # 🫸🏿 E15.0 rightwards pushing hand: dark skin tone
 
 # subgroup: hand-fingers-partial
 1F44C                                                  ; fully-qualified     # 👌 E0.6 OK hand
@@ -490,11 +473,11 @@
 1F932 1F3FE                                            ; fully-qualified     # 🤲🏾 E5.0 palms up together: medium-dark skin tone
 1F932 1F3FF                                            ; fully-qualified     # 🤲🏿 E5.0 palms up together: dark skin tone
 1F91D                                                  ; fully-qualified     # 🤝 E3.0 handshake
-1F91D 1F3FB                                            ; fully-qualified     # 🤝🏻 E14.0 handshake: light skin tone
-1F91D 1F3FC                                            ; fully-qualified     # 🤝🏼 E14.0 handshake: medium-light skin tone
-1F91D 1F3FD                                            ; fully-qualified     # 🤝🏽 E14.0 handshake: medium skin tone
-1F91D 1F3FE                                            ; fully-qualified     # 🤝🏾 E14.0 handshake: medium-dark skin tone
-1F91D 1F3FF                                            ; fully-qualified     # 🤝🏿 E14.0 handshake: dark skin tone
+1F91D 1F3FB                                            ; fully-qualified     # 🤝🏻 E3.0 handshake: light skin tone
+1F91D 1F3FC                                            ; fully-qualified     # 🤝🏼 E3.0 handshake: medium-light skin tone
+1F91D 1F3FD                                            ; fully-qualified     # 🤝🏽 E3.0 handshake: medium skin tone
+1F91D 1F3FE                                            ; fully-qualified     # 🤝🏾 E3.0 handshake: medium-dark skin tone
+1F91D 1F3FF                                            ; fully-qualified     # 🤝🏿 E3.0 handshake: dark skin tone
 1FAF1 1F3FB 200D 1FAF2 1F3FC                           ; fully-qualified     # 🫱🏻‍🫲🏼 E14.0 handshake: light skin tone, medium-light skin tone
 1FAF1 1F3FB 200D 1FAF2 1F3FD                           ; fully-qualified     # 🫱🏻‍🫲🏽 E14.0 handshake: light skin tone, medium skin tone
 1FAF1 1F3FB 200D 1FAF2 1F3FE                           ; fully-qualified     # 🫱🏻‍🫲🏾 E14.0 handshake: light skin tone, medium-dark skin tone
@@ -1472,7 +1455,7 @@
 1F575 1F3FF                                            ; fully-qualified     # 🕵🏿 E2.0 detective: dark skin tone
 1F575 FE0F 200D 2642 FE0F                              ; fully-qualified     # 🕵️‍♂️ E4.0 man detective
 1F575 200D 2642 FE0F                                   ; unqualified         # 🕵‍♂️ E4.0 man detective
-1F575 FE0F 200D 2642                                   ; minimally-qualified # 🕵️‍♂ E4.0 man detective
+1F575 FE0F 200D 2642                                   ; unqualified         # 🕵️‍♂ E4.0 man detective
 1F575 200D 2642                                        ; unqualified         # 🕵‍♂ E4.0 man detective
 1F575 1F3FB 200D 2642 FE0F                             ; fully-qualified     # 🕵🏻‍♂️ E4.0 man detective: light skin tone
 1F575 1F3FB 200D 2642                                  ; minimally-qualified # 🕵🏻‍♂ E4.0 man detective: light skin tone
@@ -1486,7 +1469,7 @@
 1F575 1F3FF 200D 2642                                  ; minimally-qualified # 🕵🏿‍♂ E4.0 man detective: dark skin tone
 1F575 FE0F 200D 2640 FE0F                              ; fully-qualified     # 🕵️‍♀️ E4.0 woman detective
 1F575 200D 2640 FE0F                                   ; unqualified         # 🕵‍♀️ E4.0 woman detective
-1F575 FE0F 200D 2640                                   ; minimally-qualified # 🕵️‍♀ E4.0 woman detective
+1F575 FE0F 200D 2640                                   ; unqualified         # 🕵️‍♀ E4.0 woman detective
 1F575 200D 2640                                        ; unqualified         # 🕵‍♀ E4.0 woman detective
 1F575 1F3FB 200D 2640 FE0F                             ; fully-qualified     # 🕵🏻‍♀️ E4.0 woman detective: light skin tone
 1F575 1F3FB 200D 2640                                  ; minimally-qualified # 🕵🏻‍♀ E4.0 woman detective: light skin tone
@@ -2319,7 +2302,7 @@
 1F3CC 1F3FF                                            ; fully-qualified     # 🏌🏿 E4.0 person golfing: dark skin tone
 1F3CC FE0F 200D 2642 FE0F                              ; fully-qualified     # 🏌️‍♂️ E4.0 man golfing
 1F3CC 200D 2642 FE0F                                   ; unqualified         # 🏌‍♂️ E4.0 man golfing
-1F3CC FE0F 200D 2642                                   ; minimally-qualified # 🏌️‍♂ E4.0 man golfing
+1F3CC FE0F 200D 2642                                   ; unqualified         # 🏌️‍♂ E4.0 man golfing
 1F3CC 200D 2642                                        ; unqualified         # 🏌‍♂ E4.0 man golfing
 1F3CC 1F3FB 200D 2642 FE0F                             ; fully-qualified     # 🏌🏻‍♂️ E4.0 man golfing: light skin tone
 1F3CC 1F3FB 200D 2642                                  ; minimally-qualified # 🏌🏻‍♂ E4.0 man golfing: light skin tone
@@ -2333,7 +2316,7 @@
 1F3CC 1F3FF 200D 2642                                  ; minimally-qualified # 🏌🏿‍♂ E4.0 man golfing: dark skin tone
 1F3CC FE0F 200D 2640 FE0F                              ; fully-qualified     # 🏌️‍♀️ E4.0 woman golfing
 1F3CC 200D 2640 FE0F                                   ; unqualified         # 🏌‍♀️ E4.0 woman golfing
-1F3CC FE0F 200D 2640                                   ; minimally-qualified # 🏌️‍♀ E4.0 woman golfing
+1F3CC FE0F 200D 2640                                   ; unqualified         # 🏌️‍♀ E4.0 woman golfing
 1F3CC 200D 2640                                        ; unqualified         # 🏌‍♀ E4.0 woman golfing
 1F3CC 1F3FB 200D 2640 FE0F                             ; fully-qualified     # 🏌🏻‍♀️ E4.0 woman golfing: light skin tone
 1F3CC 1F3FB 200D 2640                                  ; minimally-qualified # 🏌🏻‍♀ E4.0 woman golfing: light skin tone
@@ -2444,7 +2427,7 @@
 26F9 1F3FF                                             ; fully-qualified     # ⛹🏿 E2.0 person bouncing ball: dark skin tone
 26F9 FE0F 200D 2642 FE0F                               ; fully-qualified     # ⛹️‍♂️ E4.0 man bouncing ball
 26F9 200D 2642 FE0F                                    ; unqualified         # ⛹‍♂️ E4.0 man bouncing ball
-26F9 FE0F 200D 2642                                    ; minimally-qualified # ⛹️‍♂ E4.0 man bouncing ball
+26F9 FE0F 200D 2642                                    ; unqualified         # ⛹️‍♂ E4.0 man bouncing ball
 26F9 200D 2642                                         ; unqualified         # ⛹‍♂ E4.0 man bouncing ball
 26F9 1F3FB 200D 2642 FE0F                              ; fully-qualified     # ⛹🏻‍♂️ E4.0 man bouncing ball: light skin tone
 26F9 1F3FB 200D 2642                                   ; minimally-qualified # ⛹🏻‍♂ E4.0 man bouncing ball: light skin tone
@@ -2458,7 +2441,7 @@
 26F9 1F3FF 200D 2642                                   ; minimally-qualified # ⛹🏿‍♂ E4.0 man bouncing ball: dark skin tone
 26F9 FE0F 200D 2640 FE0F                               ; fully-qualified     # ⛹️‍♀️ E4.0 woman bouncing ball
 26F9 200D 2640 FE0F                                    ; unqualified         # ⛹‍♀️ E4.0 woman bouncing ball
-26F9 FE0F 200D 2640                                    ; minimally-qualified # ⛹️‍♀ E4.0 woman bouncing ball
+26F9 FE0F 200D 2640                                    ; unqualified         # ⛹️‍♀ E4.0 woman bouncing ball
 26F9 200D 2640                                         ; unqualified         # ⛹‍♀ E4.0 woman bouncing ball
 26F9 1F3FB 200D 2640 FE0F                              ; fully-qualified     # ⛹🏻‍♀️ E4.0 woman bouncing ball: light skin tone
 26F9 1F3FB 200D 2640                                   ; minimally-qualified # ⛹🏻‍♀ E4.0 woman bouncing ball: light skin tone
@@ -2479,7 +2462,7 @@
 1F3CB 1F3FF                                            ; fully-qualified     # 🏋🏿 E2.0 person lifting weights: dark skin tone
 1F3CB FE0F 200D 2642 FE0F                              ; fully-qualified     # 🏋️‍♂️ E4.0 man lifting weights
 1F3CB 200D 2642 FE0F                                   ; unqualified         # 🏋‍♂️ E4.0 man lifting weights
-1F3CB FE0F 200D 2642                                   ; minimally-qualified # 🏋️‍♂ E4.0 man lifting weights
+1F3CB FE0F 200D 2642                                   ; unqualified         # 🏋️‍♂ E4.0 man lifting weights
 1F3CB 200D 2642                                        ; unqualified         # 🏋‍♂ E4.0 man lifting weights
 1F3CB 1F3FB 200D 2642 FE0F                             ; fully-qualified     # 🏋🏻‍♂️ E4.0 man lifting weights: light skin tone
 1F3CB 1F3FB 200D 2642                                  ; minimally-qualified # 🏋🏻‍♂ E4.0 man lifting weights: light skin tone
@@ -2493,7 +2476,7 @@
 1F3CB 1F3FF 200D 2642                                  ; minimally-qualified # 🏋🏿‍♂ E4.0 man lifting weights: dark skin tone
 1F3CB FE0F 200D 2640 FE0F                              ; fully-qualified     # 🏋️‍♀️ E4.0 woman lifting weights
 1F3CB 200D 2640 FE0F                                   ; unqualified         # 🏋‍♀️ E4.0 woman lifting weights
-1F3CB FE0F 200D 2640                                   ; minimally-qualified # 🏋️‍♀ E4.0 woman lifting weights
+1F3CB FE0F 200D 2640                                   ; unqualified         # 🏋️‍♀ E4.0 woman lifting weights
 1F3CB 200D 2640                                        ; unqualified         # 🏋‍♀ E4.0 woman lifting weights
 1F3CB 1F3FB 200D 2640 FE0F                             ; fully-qualified     # 🏋🏻‍♀️ E4.0 woman lifting weights: light skin tone
 1F3CB 1F3FB 200D 2640                                  ; minimally-qualified # 🏋🏻‍♀ E4.0 woman lifting weights: light skin tone
@@ -3279,8 +3262,8 @@
 1FAC2                                                  ; fully-qualified     # 🫂 E13.0 people hugging
 1F463                                                  ; fully-qualified     # 👣 E0.6 footprints
 
-# People & Body subtotal:		2998
-# People & Body subtotal:		508	w/o modifiers
+# People & Body subtotal:		2986
+# People & Body subtotal:		506	w/o modifiers
 
 # group: Component
 
@@ -3323,8 +3306,6 @@
 1F405                                                  ; fully-qualified     # 🐅 E1.0 tiger
 1F406                                                  ; fully-qualified     # 🐆 E1.0 leopard
 1F434                                                  ; fully-qualified     # 🐴 E0.6 horse face
-1FACE                                                  ; fully-qualified     # 🫎 E15.0 moose
-1FACF                                                  ; fully-qualified     # 🫏 E15.0 donkey
 1F40E                                                  ; fully-qualified     # 🐎 E0.6 horse
 1F984                                                  ; fully-qualified     # 🦄 E1.0 unicorn
 1F993                                                  ; fully-qualified     # 🦓 E5.0 zebra
@@ -3392,9 +3373,6 @@
 1F9A9                                                  ; fully-qualified     # 🦩 E12.0 flamingo
 1F99A                                                  ; fully-qualified     # 🦚 E11.0 peacock
 1F99C                                                  ; fully-qualified     # 🦜 E11.0 parrot
-1FABD                                                  ; fully-qualified     # 🪽 E15.0 wing
-1F426 200D 2B1B                                        ; fully-qualified     # 🐦‍⬛ E15.0 black bird
-1FABF                                                  ; fully-qualified     # 🪿 E15.0 goose
 
 # subgroup: animal-amphibian
 1F438                                                  ; fully-qualified     # 🐸 E0.6 frog
@@ -3421,7 +3399,6 @@
 1F419                                                  ; fully-qualified     # 🐙 E0.6 octopus
 1F41A                                                  ; fully-qualified     # 🐚 E0.6 spiral shell
 1FAB8                                                  ; fully-qualified     # 🪸 E14.0 coral
-1FABC                                                  ; fully-qualified     # 🪼 E15.0 jellyfish
 
 # subgroup: animal-bug
 1F40C                                                  ; fully-qualified     # 🐌 E0.6 snail
@@ -3456,7 +3433,6 @@
 1F33B                                                  ; fully-qualified     # 🌻 E0.6 sunflower
 1F33C                                                  ; fully-qualified     # 🌼 E0.6 blossom
 1F337                                                  ; fully-qualified     # 🌷 E0.6 tulip
-1FABB                                                  ; fully-qualified     # 🪻 E15.0 hyacinth
 
 # subgroup: plant-other
 1F331                                                  ; fully-qualified     # 🌱 E0.6 seedling
@@ -3475,10 +3451,9 @@
 1F343                                                  ; fully-qualified     # 🍃 E0.6 leaf fluttering in wind
 1FAB9                                                  ; fully-qualified     # 🪹 E14.0 empty nest
 1FABA                                                  ; fully-qualified     # 🪺 E14.0 nest with eggs
-1F344                                                  ; fully-qualified     # 🍄 E0.6 mushroom
 
-# Animals & Nature subtotal:		159
-# Animals & Nature subtotal:		159	w/o modifiers
+# Animals & Nature subtotal:		151
+# Animals & Nature subtotal:		151	w/o modifiers
 
 # group: Food & Drink
 
@@ -3517,11 +3492,10 @@
 1F966                                                  ; fully-qualified     # 🥦 E5.0 broccoli
 1F9C4                                                  ; fully-qualified     # 🧄 E12.0 garlic
 1F9C5                                                  ; fully-qualified     # 🧅 E12.0 onion
+1F344                                                  ; fully-qualified     # 🍄 E0.6 mushroom
 1F95C                                                  ; fully-qualified     # 🥜 E3.0 peanuts
 1FAD8                                                  ; fully-qualified     # 🫘 E14.0 beans
 1F330                                                  ; fully-qualified     # 🌰 E0.6 chestnut
-1FADA                                                  ; fully-qualified     # 🫚 E15.0 ginger root
-1FADB                                                  ; fully-qualified     # 🫛 E15.0 pea pod
 
 # subgroup: food-prepared
 1F35E                                                  ; fully-qualified     # 🍞 E0.6 bread
@@ -3633,8 +3607,8 @@
 1FAD9                                                  ; fully-qualified     # 🫙 E14.0 jar
 1F3FA                                                  ; fully-qualified     # 🏺 E1.0 amphora
 
-# Food & Drink subtotal:		135
-# Food & Drink subtotal:		135	w/o modifiers
+# Food & Drink subtotal:		134
+# Food & Drink subtotal:		134	w/o modifiers
 
 # group: Travel & Places
 
@@ -4000,10 +3974,11 @@
 1F3AF                                                  ; fully-qualified     # 🎯 E0.6 bullseye
 1FA80                                                  ; fully-qualified     # 🪀 E12.0 yo-yo
 1FA81                                                  ; fully-qualified     # 🪁 E12.0 kite
-1F52B                                                  ; fully-qualified     # 🔫 E0.6 water pistol
 1F3B1                                                  ; fully-qualified     # 🎱 E0.6 pool 8 ball
 1F52E                                                  ; fully-qualified     # 🔮 E0.6 crystal ball
 1FA84                                                  ; fully-qualified     # 🪄 E13.0 magic wand
+1F9FF                                                  ; fully-qualified     # 🧿 E11.0 nazar amulet
+1FAAC                                                  ; fully-qualified     # 🪬 E14.0 hamsa
 1F3AE                                                  ; fully-qualified     # 🎮 E0.6 video game
 1F579 FE0F                                             ; fully-qualified     # 🕹️ E0.7 joystick
 1F579                                                  ; unqualified         # 🕹 E0.7 joystick
@@ -4038,8 +4013,8 @@
 1F9F6                                                  ; fully-qualified     # 🧶 E11.0 yarn
 1FAA2                                                  ; fully-qualified     # 🪢 E13.0 knot
 
-# Activities subtotal:		96
-# Activities subtotal:		96	w/o modifiers
+# Activities subtotal:		97
+# Activities subtotal:		97	w/o modifiers
 
 # group: Objects
 
@@ -4065,7 +4040,6 @@
 1FA73                                                  ; fully-qualified     # 🩳 E12.0 shorts
 1F459                                                  ; fully-qualified     # 👙 E0.6 bikini
 1F45A                                                  ; fully-qualified     # 👚 E0.6 woman’s clothes
-1FAAD                                                  ; fully-qualified     # 🪭 E15.0 folding hand fan
 1F45B                                                  ; fully-qualified     # 👛 E0.6 purse
 1F45C                                                  ; fully-qualified     # 👜 E0.6 handbag
 1F45D                                                  ; fully-qualified     # 👝 E0.6 clutch bag
@@ -4081,7 +4055,6 @@
 1F461                                                  ; fully-qualified     # 👡 E0.6 woman’s sandal
 1FA70                                                  ; fully-qualified     # 🩰 E12.0 ballet shoes
 1F462                                                  ; fully-qualified     # 👢 E0.6 woman’s boot
-1FAAE                                                  ; fully-qualified     # 🪮 E15.0 hair pick
 1F451                                                  ; fully-qualified     # 👑 E0.6 crown
 1F452                                                  ; fully-qualified     # 👒 E0.6 woman’s hat
 1F3A9                                                  ; fully-qualified     # 🎩 E0.6 top hat
@@ -4130,8 +4103,6 @@
 1FA95                                                  ; fully-qualified     # 🪕 E12.0 banjo
 1F941                                                  ; fully-qualified     # 🥁 E3.0 drum
 1FA98                                                  ; fully-qualified     # 🪘 E13.0 long drum
-1FA87                                                  ; fully-qualified     # 🪇 E15.0 maracas
-1FA88                                                  ; fully-qualified     # 🪈 E15.0 flute
 
 # subgroup: phone
 1F4F1                                                  ; fully-qualified     # 📱 E0.6 mobile phone
@@ -4304,7 +4275,7 @@
 1F5E1                                                  ; unqualified         # 🗡 E0.7 dagger
 2694 FE0F                                              ; fully-qualified     # ⚔️ E1.0 crossed swords
 2694                                                   ; unqualified         # ⚔ E1.0 crossed swords
-1F4A3                                                  ; fully-qualified     # 💣 E0.6 bomb
+1F52B                                                  ; fully-qualified     # 🔫 E0.6 water pistol
 1FA83                                                  ; fully-qualified     # 🪃 E13.0 boomerang
 1F3F9                                                  ; fully-qualified     # 🏹 E1.0 bow and arrow
 1F6E1 FE0F                                             ; fully-qualified     # 🛡️ E0.7 shield
@@ -4383,14 +4354,12 @@
 1FAA6                                                  ; fully-qualified     # 🪦 E13.0 headstone
 26B1 FE0F                                              ; fully-qualified     # ⚱️ E1.0 funeral urn
 26B1                                                   ; unqualified         # ⚱ E1.0 funeral urn
-1F9FF                                                  ; fully-qualified     # 🧿 E11.0 nazar amulet
-1FAAC                                                  ; fully-qualified     # 🪬 E14.0 hamsa
 1F5FF                                                  ; fully-qualified     # 🗿 E0.6 moai
 1FAA7                                                  ; fully-qualified     # 🪧 E13.0 placard
 1FAAA                                                  ; fully-qualified     # 🪪 E14.0 identification card
 
-# Objects subtotal:		310
-# Objects subtotal:		310	w/o modifiers
+# Objects subtotal:		304
+# Objects subtotal:		304	w/o modifiers
 
 # group: Symbols
 
@@ -4486,7 +4455,6 @@
 262E                                                   ; unqualified         # ☮ E1.0 peace symbol
 1F54E                                                  ; fully-qualified     # 🕎 E1.0 menorah
 1F52F                                                  ; fully-qualified     # 🔯 E0.6 dotted six-pointed star
-1FAAF                                                  ; fully-qualified     # 🪯 E15.0 khanda
 
 # subgroup: zodiac
 2648                                                   ; fully-qualified     # ♈ E0.6 Aries
@@ -4535,7 +4503,6 @@
 1F505                                                  ; fully-qualified     # 🔅 E1.0 dim button
 1F506                                                  ; fully-qualified     # 🔆 E1.0 bright button
 1F4F6                                                  ; fully-qualified     # 📶 E0.6 antenna bars
-1F6DC                                                  ; fully-qualified     # 🛜 E15.0 wireless
 1F4F3                                                  ; fully-qualified     # 📳 E0.6 vibration mode
 1F4F4                                                  ; fully-qualified     # 📴 E0.6 mobile phone off
 
@@ -4726,8 +4693,8 @@
 1F533                                                  ; fully-qualified     # 🔳 E0.6 white square button
 1F532                                                  ; fully-qualified     # 🔲 E0.6 black square button
 
-# Symbols subtotal:		304
-# Symbols subtotal:		304	w/o modifiers
+# Symbols subtotal:		302
+# Symbols subtotal:		302	w/o modifiers
 
 # group: Flags
 
@@ -4742,7 +4709,7 @@
 1F3F3 200D 1F308                                       ; unqualified         # 🏳‍🌈 E4.0 rainbow flag
 1F3F3 FE0F 200D 26A7 FE0F                              ; fully-qualified     # 🏳️‍⚧️ E13.0 transgender flag
 1F3F3 200D 26A7 FE0F                                   ; unqualified         # 🏳‍⚧️ E13.0 transgender flag
-1F3F3 FE0F 200D 26A7                                   ; minimally-qualified # 🏳️‍⚧ E13.0 transgender flag
+1F3F3 FE0F 200D 26A7                                   ; unqualified         # 🏳️‍⚧ E13.0 transgender flag
 1F3F3 200D 26A7                                        ; unqualified         # 🏳‍⚧ E13.0 transgender flag
 1F3F4 200D 2620 FE0F                                   ; fully-qualified     # 🏴‍☠️ E11.0 pirate flag
 1F3F4 200D 2620                                        ; minimally-qualified # 🏴‍☠ E11.0 pirate flag
@@ -5016,9 +4983,9 @@
 # Flags subtotal:		275	w/o modifiers
 
 # Status Counts
-# fully-qualified : 3655
-# minimally-qualified : 827
-# unqualified : 242
+# fully-qualified : 3624
+# minimally-qualified : 817
+# unqualified : 252
 # component : 9
 
 #EOF

lib/pleroma/emoji.ex

@@ -188,11 +188,6 @@ def emoji_url(%{"type" => "EmojiReact", "content" => emoji, "tag" => tags}) do
 
   def emoji_url(_), do: nil
 
-  def emoji_name_with_instance(name, url) do
-    url = url |> URI.parse() |> Map.get(:host)
-    "#{name}@#{url}"
-  end
-
   emoji_qualification_map =
     emojis
     |> Enum.filter(&String.contains?(&1, "\uFE0F"))

lib/pleroma/following_relationship.ex

@@ -240,6 +240,30 @@ def find(following_relationships, follower, following) do
     end)
   end
 
+  @doc """
+  For a query with joined activity,
+  keeps rows where activity's actor is followed by user -or- is NOT domain-blocked by user.
+  """
+  def keep_following_or_not_domain_blocked(query, user) do
+    where(
+      query,
+      [_, activity],
+      fragment(
+        # "(actor's domain NOT in domain_blocks) OR (actor IS in followed AP IDs)"
+        """
+        NOT (substring(? from '.*://([^/]*)') = ANY(?)) OR
+          ? = ANY(SELECT ap_id FROM users AS u INNER JOIN following_relationships AS fr
+            ON u.id = fr.following_id WHERE fr.follower_id = ? AND fr.state = ?)
+        """,
+        activity.actor,
+        ^user.domain_blocks,
+        activity.actor,
+        ^User.binary_id(user.id),
+        ^accept_state_code()
+      )
+    )
+  end
+
   defp validate_not_self_relationship(%Changeset{} = changeset) do
     changeset
     |> validate_follower_id_following_id_inequality()

lib/pleroma/hashtag.ex

@@ -10,7 +10,6 @@ defmodule Pleroma.Hashtag do
 
   alias Ecto.Multi
   alias Pleroma.Hashtag
-  alias Pleroma.User.HashtagFollow
   alias Pleroma.Object
   alias Pleroma.Repo
 
@@ -28,14 +27,6 @@ def normalize_name(name) do
     |> String.trim()
   end
 
-  def get_by_id(id) do
-    Repo.get(Hashtag, id)
-  end
-
-  def get_by_name(name) do
-    Repo.get_by(Hashtag, name: normalize_name(name))
-  end
-
   def get_or_create_by_name(name) do
     changeset = changeset(%Hashtag{}, %{name: name})
 
@@ -112,22 +103,4 @@ def delete_unreferenced(ids) do
       {:ok, deleted_count}
     end
   end
-
-  def get_followers(%Hashtag{id: hashtag_id}) do
-    from(hf in HashtagFollow)
-    |> where([hf], hf.hashtag_id == ^hashtag_id)
-    |> join(:inner, [hf], u in assoc(hf, :user))
-    |> select([hf, u], u.id)
-    |> Repo.all()
-  end
-
-  def get_recipients_for_activity(%Pleroma.Activity{object: %{hashtags: tags}})
-      when is_list(tags) do
-    tags
-    |> Enum.map(&get_followers/1)
-    |> List.flatten()
-    |> Enum.uniq()
-  end
-
-  def get_recipients_for_activity(_activity), do: []
 end

lib/pleroma/helpers/auth_helper.ex

@@ -9,7 +9,6 @@ defmodule Pleroma.Helpers.AuthHelper do
   import Plug.Conn
 
   @oauth_token_session_key :oauth_token
-  @oauth_user_session_key :oauth_user
 
   @doc """
   Skips OAuth permissions (scopes) checks, assigns nil `:token`.
@@ -44,16 +43,4 @@ def put_session_token(%Conn{} = conn, token) when is_binary(token) do
   def delete_session_token(%Conn{} = conn) do
     delete_session(conn, @oauth_token_session_key)
   end
-
-  def put_session_user(%Conn{} = conn, user) do
-    put_session(conn, @oauth_user_session_key, user)
-  end
-
-  def delete_session_user(%Conn{} = conn) do
-    delete_session(conn, @oauth_user_session_key)
-  end
-
-  def get_session_user(%Conn{} = conn) do
-    get_session(conn, @oauth_user_session_key)
-  end
 end

lib/pleroma/http/adapter_helper.ex

@@ -99,7 +99,6 @@ defp proxy_type(_), do: {:error, :unknown}
           | {:error, atom()}
           | nil
   def parse_proxy(nil), do: nil
-  def parse_proxy(""), do: nil
 
   def parse_proxy(proxy) when is_binary(proxy) do
     with %URI{} = uri <- URI.parse(proxy),

lib/pleroma/http/adapter_helper/default.ex

@@ -10,13 +10,7 @@ defmodule Pleroma.HTTP.AdapterHelper.Default do
   @spec options(keyword(), URI.t()) :: keyword()
   def options(opts, _uri) do
     proxy = Pleroma.Config.get([:http, :proxy_url])
-    pool_timeout = Pleroma.Config.get([:http, :pool_timeout], 5000)
-    receive_timeout = Pleroma.Config.get([:http, :receive_timeout], 15_000)
-
-    opts
-    |> AdapterHelper.maybe_add_proxy(AdapterHelper.format_proxy(proxy))
-    |> Keyword.put(:pool_timeout, pool_timeout)
-    |> Keyword.put(:receive_timeout, receive_timeout)
+    AdapterHelper.maybe_add_proxy(opts, AdapterHelper.format_proxy(proxy))
   end
 
   @spec get_conn(URI.t(), keyword()) :: {:ok, keyword()}

lib/pleroma/instances.ex

@@ -43,6 +43,4 @@ def host(url_or_host) when is_binary(url_or_host) do
       url_or_host
     end
   end
-
-  defdelegate set_request_signatures(url_or_host), to: Instance
 end

lib/pleroma/instances/instance.ex

@@ -5,8 +5,6 @@
 defmodule Pleroma.Instances.Instance do
   @moduledoc "Instance."
 
-  @cachex Pleroma.Config.get([:cachex, :provider], Cachex)
-
   alias Pleroma.Instances
   alias Pleroma.Instances.Instance
   alias Pleroma.Repo
@@ -24,9 +22,7 @@ defmodule Pleroma.Instances.Instance do
     field(:host, :string)
     field(:unreachable_since, :naive_datetime_usec)
     field(:favicon, :string)
-    field(:metadata_updated_at, :naive_datetime)
-    field(:nodeinfo, :map, default: %{})
-    field(:has_request_signatures, :boolean)
+    field(:favicon_updated_at, :naive_datetime)
 
     timestamps()
   end
@@ -35,14 +31,7 @@ defmodule Pleroma.Instances.Instance do
 
   def changeset(struct, params \\ %{}) do
     struct
-    |> cast(params, [
-      :host,
-      :unreachable_since,
-      :favicon,
-      :nodeinfo,
-      :metadata_updated_at,
-      :has_request_signatures
-    ])
+    |> cast(params, [:host, :unreachable_since, :favicon, :favicon_updated_at])
     |> validate_required([:host])
     |> unique_constraint(:host)
   end
@@ -149,138 +138,63 @@ defp parse_datetime(datetime) when is_binary(datetime) do
 
   defp parse_datetime(datetime), do: datetime
 
-  def needs_update(nil), do: true
-
-  def needs_update(%Instance{metadata_updated_at: nil}), do: true
-
-  def needs_update(%Instance{metadata_updated_at: metadata_updated_at}) do
+  def get_or_update_favicon(%URI{host: host} = instance_uri) do
+    existing_record = Repo.get_by(Instance, %{host: host})
     now = NaiveDateTime.utc_now()
-    NaiveDateTime.diff(now, metadata_updated_at) > 86_400
-  end
 
-  def local do
-    %Instance{
-      host: Pleroma.Web.Endpoint.host(),
-      favicon: Pleroma.Web.Endpoint.url() <> "/favicon.png",
-      nodeinfo: Pleroma.Web.Nodeinfo.NodeinfoController.raw_nodeinfo()
-    }
-  end
-
-  def update_metadata(%URI{host: host} = uri) do
-    Logger.debug("Checking metadata for #{host}")
-    existing_record = Repo.get_by(Instance, %{host: host})
-
-    if reachable?(host) do
-      do_update_metadata(uri, existing_record)
-    else
-      {:discard, :unreachable}
-    end
-  end
-
-  defp do_update_metadata(%URI{host: host} = uri, existing_record) do
-    if existing_record do
-      if needs_update(existing_record) do
-        Logger.info("Updating metadata for #{host}")
-        favicon = scrape_favicon(uri)
-        nodeinfo = scrape_nodeinfo(uri)
-
-        existing_record
-        |> changeset(%{
-          host: host,
-          favicon: favicon,
-          nodeinfo: nodeinfo,
-          metadata_updated_at: NaiveDateTime.utc_now()
-        })
-        |> Repo.update()
-      else
-        {:discard, "Does not require update"}
-      end
-    else
-      favicon = scrape_favicon(uri)
-      nodeinfo = scrape_nodeinfo(uri)
-
-      Logger.info("Creating metadata for #{host}")
-
-      %Instance{}
-      |> changeset(%{
-        host: host,
-        favicon: favicon,
-        nodeinfo: nodeinfo,
-        metadata_updated_at: NaiveDateTime.utc_now()
-      })
-      |> Repo.insert()
-    end
-  end
-
-  def get_favicon(%URI{host: host}) do
-    existing_record = Repo.get_by(Instance, %{host: host})
-
-    if existing_record do
+    if existing_record && existing_record.favicon_updated_at &&
+         NaiveDateTime.diff(now, existing_record.favicon_updated_at) < 86_400 do
       existing_record.favicon
     else
+      favicon = scrape_favicon(instance_uri)
+
+      if existing_record do
+        existing_record
+        |> changeset(%{favicon: favicon, favicon_updated_at: now})
+        |> Repo.update()
+      else
+        %Instance{}
+        |> changeset(%{host: host, favicon: favicon, favicon_updated_at: now})
+        |> Repo.insert()
+      end
+
+      favicon
+    end
+  rescue
+    e ->
+      Logger.warn("Instance.get_or_update_favicon(\"#{host}\") error: #{inspect(e)}")
       nil
-    end
-  end
-
-  defp scrape_nodeinfo(%URI{} = instance_uri) do
-    with true <- Pleroma.Config.get([:instances_nodeinfo, :enabled]),
-         {_, true} <- {:reachable, reachable?(instance_uri.host)},
-         {:ok, %Tesla.Env{status: 200, body: body}} <-
-           Tesla.get(
-             "https://#{instance_uri.host}/.well-known/nodeinfo",
-             headers: [{"Accept", "application/json"}]
-           ),
-         {:ok, json} <- Jason.decode(body),
-         {:ok, %{"links" => links}} <- {:ok, json},
-         {:ok, %{"href" => href}} <-
-           {:ok,
-            Enum.find(links, &(&1["rel"] == "http://nodeinfo.diaspora.software/ns/schema/2.0"))},
-         {:ok, %Tesla.Env{body: data}} <-
-           Pleroma.HTTP.get(href, [{"accept", "application/json"}], []),
-         {:length, true} <- {:length, String.length(data) < 50_000},
-         {:ok, nodeinfo} <- Jason.decode(data) do
-      nodeinfo
-    else
-      {:reachable, false} ->
-        Logger.debug(
-          "Instance.scrape_nodeinfo(\"#{to_string(instance_uri)}\") ignored unreachable host"
-        )
-
-        nil
-
-      {:length, false} ->
-        Logger.debug(
-          "Instance.scrape_nodeinfo(\"#{to_string(instance_uri)}\") ignored too long body"
-        )
-
-        nil
-
-      _ ->
-        nil
-    end
   end
 
   defp scrape_favicon(%URI{} = instance_uri) do
-    with true <- Pleroma.Config.get([:instances_favicons, :enabled]),
-         {_, true} <- {:reachable, reachable?(instance_uri.host)},
-         {:ok, %Tesla.Env{body: html}} <-
-           Pleroma.HTTP.get(to_string(instance_uri), [{"accept", "text/html"}], []),
-         {_, [favicon_rel | _]} when is_binary(favicon_rel) <-
-           {:parse, html |> Floki.parse_document!() |> Floki.attribute("link[rel=icon]", "href")},
-         {_, favicon} when is_binary(favicon) <-
-           {:merge, URI.merge(instance_uri, favicon_rel) |> to_string()},
-         {:length, true} <- {:length, String.length(favicon) < 255} do
-      favicon
-    else
-      {:reachable, false} ->
-        Logger.debug(
-          "Instance.scrape_favicon(\"#{to_string(instance_uri)}\") ignored unreachable host"
+    try do
+      with {_, true} <- {:reachable, reachable?(instance_uri.host)},
+           {:ok, %Tesla.Env{body: html}} <-
+             Pleroma.HTTP.get(to_string(instance_uri), [{"accept", "text/html"}], []),
+           {_, [favicon_rel | _]} when is_binary(favicon_rel) <-
+             {:parse,
+              html |> Floki.parse_document!() |> Floki.attribute("link[rel=icon]", "href")},
+           {_, favicon} when is_binary(favicon) <-
+             {:merge, URI.merge(instance_uri, favicon_rel) |> to_string()} do
+        favicon
+      else
+        {:reachable, false} ->
+          Logger.debug(
+            "Instance.scrape_favicon(\"#{to_string(instance_uri)}\") ignored unreachable host"
+          )
+
+          nil
+
+        _ ->
+          nil
+      end
+    rescue
+      e ->
+        Logger.warn(
+          "Instance.scrape_favicon(\"#{to_string(instance_uri)}\") error: #{inspect(e)}"
         )
 
         nil
-
-      _ ->
-        nil
     end
   end
 
@@ -303,45 +217,4 @@ def perform(:delete_instance, host) when is_binary(host) do
     end)
     |> Stream.run()
   end
-
-  def get_by_url(url_or_host) do
-    url = host(url_or_host)
-    Repo.get_by(Instance, host: url)
-  end
-
-  def get_cached_by_url(url_or_host) do
-    url = host(url_or_host)
-
-    if url == Pleroma.Web.Endpoint.host() do
-      {:ok, local()}
-    else
-      @cachex.fetch!(:instances_cache, "instances:#{url}", fn _ ->
-        with %Instance{} = instance <- get_by_url(url) do
-          {:commit, {:ok, instance}}
-        else
-          _ -> {:ignore, nil}
-        end
-      end)
-    end
-  end
-
-  def set_request_signatures(url_or_host) when is_binary(url_or_host) do
-    host = host(url_or_host)
-    existing_record = Repo.get_by(Instance, %{host: host})
-    changes = %{has_request_signatures: true}
-
-    cond do
-      is_nil(existing_record) ->
-        %Instance{}
-        |> changeset(Map.put(changes, :host, host))
-        |> Repo.insert()
-
-      true ->
-        existing_record
-        |> changeset(changes)
-        |> Repo.update()
-    end
-  end
-
-  def set_request_signatures(_), do: {:error, :invalid_input}
 end

lib/pleroma/notification.ex

@@ -138,24 +138,7 @@ defp exclude_blocked(query, user, opts) do
 
     query
     |> where([n, a], a.actor not in ^blocked_ap_ids)
-    |> restrict_domain_blocked(user)
-  end
-
-  defp restrict_domain_blocked(query, user) do
-    where(
-      query,
-      [_, activity],
-      fragment(
-        # "(actor's domain NOT in domain_blocks)"
-        """
-        NOT (
-          substring(? from '.*://([^/]*)') = ANY(?)
-        )
-        """,
-        activity.actor,
-        ^user.domain_blocks
-      )
-    )
+    |> FollowingRelationship.keep_following_or_not_domain_blocked(user)
   end
 
   defp exclude_blockers(query, user) do
@@ -401,7 +384,7 @@ def create_notifications(%Activity{data: %{"to" => _, "type" => "Create"}} = act
   end
 
   def create_notifications(%Activity{data: %{"type" => type}} = activity, options)
-      when type in ["Follow", "Like", "Announce", "Move", "EmojiReact", "Flag", "Update"] do
+      when type in ["Follow", "Like", "Announce", "Move", "EmojiReact", "Flag"] do
     do_create_notifications(activity, options)
   end
 
@@ -455,9 +438,6 @@ defp type_from_activity(%{data: %{"type" => type}} = activity) do
         activity
         |> type_from_activity_object()
 
-      "Update" ->
-        "update"
-
       t ->
         raise "No notification type for activity type #{t}"
     end
@@ -523,16 +503,7 @@ def create_poll_notifications(%Activity{} = activity) do
   def get_notified_from_activity(activity, local_only \\ true)
 
   def get_notified_from_activity(%Activity{data: %{"type" => type}} = activity, local_only)
-      when type in [
-             "Create",
-             "Like",
-             "Announce",
-             "Follow",
-             "Move",
-             "EmojiReact",
-             "Flag",
-             "Update"
-           ] do
+      when type in ["Create", "Like", "Announce", "Follow", "Move", "EmojiReact", "Flag"] do
     potential_receiver_ap_ids = get_potential_receiver_ap_ids(activity)
 
     potential_receivers =
@@ -572,21 +543,6 @@ def get_potential_receiver_ap_ids(%{data: %{"type" => "Flag", "actor" => actor}}
     (User.all_superusers() |> Enum.map(fn user -> user.ap_id end)) -- [actor]
   end
 
-  # Update activity: notify all who repeated this
-  def get_potential_receiver_ap_ids(%{data: %{"type" => "Update", "actor" => actor}} = activity) do
-    with %Object{data: %{"id" => object_id}} <- Object.normalize(activity, fetch: false) do
-      repeaters =
-        Activity.Queries.by_type("Announce")
-        |> Activity.Queries.by_object_id(object_id)
-        |> Activity.with_joined_user_actor()
-        |> where([a, u], u.local)
-        |> select([a, u], u.ap_id)
-        |> Repo.all()
-
-      repeaters -- [actor]
-    end
-  end
-
   def get_potential_receiver_ap_ids(activity) do
     []
     |> Utils.maybe_notify_to_recipients(activity)

lib/pleroma/object.ex

@@ -145,7 +145,7 @@ defp warn_on_no_object_preloaded(ap_id) do
     Logger.debug("Backtrace: #{inspect(Process.info(:erlang.self(), :current_stacktrace))}")
   end
 
-  def normalize(_, options \\ [fetch: false, id_only: false])
+  def normalize(_, options \\ [fetch: false])
 
   # If we pass an Activity to Object.normalize(), we can try to use the preloaded object.
   # Use this whenever possible, especially when walking graphs in an O(N) loop!
@@ -173,15 +173,10 @@ def normalize(%Activity{data: %{"object" => ap_id}}, options) do
   def normalize(%{"id" => ap_id}, options), do: normalize(ap_id, options)
 
   def normalize(ap_id, options) when is_binary(ap_id) do
-    cond do
-      Keyword.get(options, :id_only) ->
-        ap_id
-
-      Keyword.get(options, :fetch) ->
-        Fetcher.fetch_object_from_id!(ap_id, options)
-
-      true ->
-        get_cached_by_ap_id(ap_id)
+    if Keyword.get(options, :fetch) do
+      Fetcher.fetch_object_from_id!(ap_id, options)
+    else
+      get_cached_by_ap_id(ap_id)
     end
   end
 

lib/pleroma/object/fetcher.ex

@@ -4,7 +4,6 @@
 
 defmodule Pleroma.Object.Fetcher do
   alias Pleroma.HTTP
-  alias Pleroma.Instances
   alias Pleroma.Maps
   alias Pleroma.Object
   alias Pleroma.Object.Containment
@@ -27,42 +26,8 @@ defp touch_changeset(changeset) do
   end
 
   defp maybe_reinject_internal_fields(%{data: %{} = old_data}, new_data) do
-    has_history? = fn
-      %{"formerRepresentations" => %{"orderedItems" => list}} when is_list(list) -> true
-      _ -> false
-    end
-
     internal_fields = Map.take(old_data, Pleroma.Constants.object_internal_fields())
 
-    remote_history_exists? = has_history?.(new_data)
-
-    # If the remote history exists, we treat that as the only source of truth.
-    new_data =
-      if has_history?.(old_data) and not remote_history_exists? do
-        Map.put(new_data, "formerRepresentations", old_data["formerRepresentations"])
-      else
-        new_data
-      end
-
-    # If the remote does not have history information, we need to manage it ourselves
-    new_data =
-      if not remote_history_exists? do
-        changed? =
-          Pleroma.Constants.status_updatable_fields()
-          |> Enum.any?(fn field -> Map.get(old_data, field) != Map.get(new_data, field) end)
-
-        %{updated_object: updated_object} =
-          new_data
-          |> Object.Updater.maybe_update_history(old_data,
-            updated: changed?,
-            use_history_in_new_object?: false
-          )
-
-        updated_object
-      else
-        new_data
-      end
-
     Map.merge(new_data, internal_fields)
   end
 
@@ -184,7 +149,7 @@ def fetch_object_from_id!(id, options \\ []) do
         nil
 
       {:reject, reason} ->
-        Logger.debug("Rejected #{id} while fetching: #{inspect(reason)}")
+        Logger.info("Rejected #{id} while fetching: #{inspect(reason)}")
         nil
 
       e ->
@@ -235,10 +200,6 @@ def fetch_and_contain_remote_object_from_id(id) when is_binary(id) do
          {:ok, body} <- get_object(id),
          {:ok, data} <- safe_json_decode(body),
          :ok <- Containment.contain_origin_from_id(id, data) do
-      unless Instances.reachable?(id) do
-        Instances.set_reachable(id)
-      end
-
       {:ok, data}
     else
       {:scheme, _} ->

lib/pleroma/object/pruner.ex

@@ -1,31 +0,0 @@
-defmodule Pleroma.Object.Pruner do
-  @moduledoc """
-  Prunes objects from the database.
-  """
-  @cutoff 30
-
-  alias Pleroma.Object
-  alias Pleroma.Delivery
-  alias Pleroma.Repo
-  import Ecto.Query
-
-  def prune_tombstoned_deliveries do
-    from(d in Delivery)
-    |> join(:inner, [d], o in Object, on: d.object_id == o.id)
-    |> where([d, o], fragment("?->>'type' = ?", o.data, "Tombstone"))
-    |> Repo.delete_all(timeout: :infinity)
-  end
-
-  def prune_tombstones do
-    before_time = cutoff()
-
-    from(o in Object,
-      where: fragment("?->>'type' = ?", o.data, "Tombstone") and o.inserted_at < ^before_time
-    )
-    |> Repo.delete_all(timeout: :infinity, on_delete: :delete_all)
-  end
-
-  defp cutoff do
-    DateTime.utc_now() |> Timex.shift(days: -@cutoff)
-  end
-end