.dialyzer_ignore.exs

@@ -1,9 +0,0 @@
-[
-{"lib/cachex.ex", "Unknown type: Spec.cache/0."},
-{"lib/pleroma/web/plugs/rate_limiter.ex", "The pattern can never match the type {:commit, _} | {:ignore, _}."},
-{"lib/pleroma/web/plugs/rate_limiter.ex", "Function get_scale/2 will never be called."},
-{"lib/pleroma/web/plugs/rate_limiter.ex", "Function initialize_buckets!/1 will never be called."},
-{"lib/pleroma/workers/receiver_worker.ex", :call},
-{"lib/pleroma/workers/receiver_worker.ex", :pattern_match},
-{"lib/pleroma/workers/receiver_worker.ex", :pattern_match_cov},
-]

.gitignore

@@ -6,7 +6,7 @@
 /test/instance
 /test/uploads
 /.elixir_ls
-/test/fixtures/DSCN0010_tmp*
+/test/fixtures/DSCN0010_tmp.jpg
 /test/fixtures/test_tmp.txt
 /test/fixtures/image_tmp.jpg
 /test/tmp/
@@ -57,12 +57,5 @@ pleroma.iml
 .tool-versions
 
 # Editor temp files
-*~
-*#
-*.swp
-
-archive-*
-.gitlab-ci-local
-
-# Test files should be named *.exs
-test/pleroma/**/*.ex
+/*~
+/*#

.gitlab-ci.yml

@@ -1,15 +1,12 @@
-image: git.pleroma.social:5050/pleroma/pleroma/ci-base:elixir-1.14.5-otp-25
+image: git.pleroma.social:5050/pleroma/pleroma/ci-base
 
 variables: &global_variables
-  # Only used for the release
-  ELIXIR_VER: 1.17.3
   POSTGRES_DB: pleroma_test
   POSTGRES_USER: postgres
   POSTGRES_PASSWORD: postgres
   DB_HOST: postgres
-  DB_PORT: "5432"
+  DB_PORT: 5432
   MIX_ENV: test
-  GIT_STRATEGY: fetch
 
 workflow:
   rules:
@@ -19,16 +16,17 @@ workflow:
     - if: $CI_COMMIT_BRANCH
 
 cache: &global_cache_policy
-  key: $CI_JOB_IMAGE-$CI_COMMIT_SHORT_SHA
+  key:
+    files:
+      - mix.lock
   paths:
     - deps
     - _build
 
 stages:
-  - build
-  - lint
-  - test
   - check-changelog
+  - build
+  - test
   - benchmark
   - deploy
   - release
@@ -71,7 +69,7 @@ check-changelog:
   tags:
     - amd64
 
-build-1.14.5-otp-25:
+build:
   extends:
   - .build_changes_policy
   - .using-ci-base
@@ -79,19 +77,10 @@ build-1.14.5-otp-25:
   script:
   - mix compile --force
 
-build-1.17.1-otp-26:
-  extends:
-  - .build_changes_policy
-  - .using-ci-base
-  stage: build
-  image: git.pleroma.social:5050/pleroma/pleroma/ci-base:elixir-1.17.1-otp-26
-  script:
-  - mix compile --force
-
 spec-build:
   extends:
   - .using-ci-base
-  stage: build
+  stage: test
   rules:
     - changes:
         - ".gitlab-ci.yml"
@@ -111,7 +100,7 @@ benchmark:
   variables:
     MIX_ENV: benchmark
   services:
-  - name: postgres:11.22-alpine
+  - name: postgres:9.6-alpine
     alias: postgres
     command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
   script:
@@ -119,7 +108,7 @@ benchmark:
     - mix ecto.migrate
     - mix pleroma.load_testing
 
-unit-testing-1.14.5-otp-25:
+unit-testing:
   extends:
   - .build_changes_policy
   - .using-ci-base
@@ -127,14 +116,15 @@ unit-testing-1.14.5-otp-25:
   cache: &testing_cache_policy
     <<: *global_cache_policy
     policy: pull
-  services: &testing_services
+
+  services:
   - name: postgres:13-alpine
     alias: postgres
     command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
-  script: &testing_script
+  script:
     - mix ecto.create
     - mix ecto.migrate
-    - mix pleroma.test_runner --cover --preload-modules
+    - mix test --cover --preload-modules
   coverage: '/^Line total: ([^ ]*%)$/'
   artifacts:
     reports:
@@ -142,20 +132,65 @@ unit-testing-1.14.5-otp-25:
         coverage_format: cobertura
         path: coverage.xml
 
-unit-testing-1.17.1-otp-26:
+unit-testing-erratic:
   extends:
   - .build_changes_policy
   - .using-ci-base
   stage: test
-  image: git.pleroma.social:5050/pleroma/pleroma/ci-base:elixir-1.17.1-otp-26
-  cache: *testing_cache_policy
-  services: *testing_services
-  script: *testing_script
+  retry: 2
+  allow_failure: true
+  cache: &testing_cache_policy
+    <<: *global_cache_policy
+    policy: pull
 
-formatting-1.15:
+  services:
+  - name: postgres:13-alpine
+    alias: postgres
+    command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
+  script:
+    - mix ecto.create
+    - mix ecto.migrate
+    - mix test --only=erratic
+
+# Removed to fix CI issue. In this early state it wasn't adding much value anyway.
+# TODO Fix and reinstate federated testing
+# federated-testing:
+#   stage: test
+#   cache: *testing_cache_policy
+#   services:
+#   - name: minibikini/postgres-with-rum:12
+#     alias: postgres
+#     command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
+#   script:
+#     - mix deps.get
+#     - mix ecto.create
+#     - mix ecto.migrate
+#     - epmd -daemon
+#     - mix test --trace --only federated
+
+unit-testing-rum:
+  extends:
+  - .build_changes_policy
+  - .using-ci-base
+  stage: test
+  cache: *testing_cache_policy
+  services:
+  - name: minibikini/postgres-with-rum:12
+    alias: postgres
+    command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
+  variables:
+    <<: *global_variables
+    RUM_ENABLED: "true"
+  script:
+    - mix ecto.create
+    - mix ecto.migrate
+    - "mix ecto.migrate --migrations-path priv/repo/optional_migrations/rum_indexing/"
+    - mix test --preload-modules
+
+lint:
   extends: .build_changes_policy
-  image: &formatting_elixir elixir:1.15-alpine
-  stage: lint
+  image: &current_elixir elixir:1.12-alpine
+  stage: test
   cache: *testing_cache_policy
   before_script: &current_bfr_script
     - apk update
@@ -166,38 +201,25 @@ formatting-1.15:
   script:
     - mix format --check-formatted
 
-cycles-1.15:
+analysis:
+  extends:
+  - .build_changes_policy
+  - .using-ci-base
+  stage: test
+  cache: *testing_cache_policy
+  script:
+    - mix credo --strict --only=warnings,todo,fixme,consistency,readability
+
+cycles:
   extends: .build_changes_policy
-  image: *formatting_elixir
-  stage: lint
+  image: *current_elixir
+  stage: test
   cache: {}
   before_script: *current_bfr_script
   script:
     - mix compile
     - mix xref graph --format cycles --label compile | awk '{print $0} END{exit ($0 != "No cycles found")}'
 
-analysis:
-  extends:
-  - .build_changes_policy
-  - .using-ci-base
-  stage: lint
-  cache: *testing_cache_policy
-  script:
-    - mix credo --strict --only=warnings,todo,fixme,consistency,readability
-
-dialyzer:
-  extends:
-  - .build_changes_policy
-  - .using-ci-base
-  stage: lint
-  allow_failure: true
-  when: manual 
-  cache: *testing_cache_policy
-  tags:
-    - feld
-  script:
-    - mix dialyzer
-
 docs-deploy:
   stage: deploy
   cache: *testing_cache_policy
@@ -272,8 +294,7 @@ stop_review_app:
 
 amd64:
   stage: release
-  image: 
-    name: hexpm/elixir-amd64:1.17.3-erlang-26.2.5.6-ubuntu-focal-20241011
+  image: elixir:1.11.4
   only: &release-only
   - stable@pleroma/pleroma
   - develop@pleroma/pleroma
@@ -297,10 +318,8 @@ amd64:
           - deps
   variables: &release-variables
     MIX_ENV: prod
-    VIX_COMPILATION_MODE: PLATFORM_PROVIDED_LIBVIPS
-    DEBIAN_FRONTEND: noninteractive
   before_script: &before-release
-  - apt-get update && apt-get install -y cmake libmagic-dev libvips-dev erlang-dev git
+  - apt-get update && apt-get install -y cmake libmagic-dev
   - echo "import Config" > config/prod.secret.exs
   - mix local.hex --force
   - mix local.rebar --force
@@ -315,14 +334,13 @@ amd64-musl:
   stage: release
   artifacts: *release-artifacts
   only: *release-only
-  image: 
-    name: hexpm/elixir-amd64:1.17.3-erlang-26.2.5.6-alpine-3.17.9
+  image: elixir:1.11.4-alpine
   tags:
     - amd64
   cache: *release-cache
   variables: *release-variables
   before_script: &before-release-musl
-  - apk add git build-base cmake file-dev openssl vips-dev
+  - apk add git build-base cmake file-dev openssl
   - echo "import Config" > config/prod.secret.exs
   - mix local.hex --force
   - mix local.rebar --force
@@ -330,12 +348,11 @@ amd64-musl:
 
 arm:
   stage: release
-  allow_failure: true
   artifacts: *release-artifacts
   only: *release-only
   tags:
     - arm32-specified
-  image: arm32v7/elixir:$ELIXIR_VER
+  image: arm32v7/elixir:1.11.4
   cache: *release-cache
   variables: *release-variables
   before_script: *before-release
@@ -347,7 +364,7 @@ arm-musl:
   only: *release-only
   tags:
     - arm32-specified
-  image: arm32v7/elixir:$ELIXIR_VER-alpine
+  image: arm32v7/elixir:1.11.4-alpine
   cache: *release-cache
   variables: *release-variables
   before_script: *before-release-musl
@@ -359,8 +376,7 @@ arm64:
   only: *release-only
   tags:
     - arm
-  image: 
-    name: hexpm/elixir-arm64:1.17.3-erlang-26.2.5.6-ubuntu-focal-20241011
+  image: arm64v8/elixir:1.11.4
   cache: *release-cache
   variables: *release-variables
   before_script: *before-release
@@ -372,8 +388,7 @@ arm64-musl:
   only: *release-only
   tags:
     - arm
-  image: 
-    name: hexpm/elixir-arm64:1.17.3-erlang-26.2.5.6-alpine-3.17.9
+  image: arm64v8/elixir:1.11.4-alpine
   cache: *release-cache
   variables: *release-variables
   before_script: *before-release-musl

.gitlab/merge_request_templates/Default.md

@@ -3,7 +3,7 @@
 
   `<code>` can be anything, but we recommend using a more or less unique identifier to avoid collisions, such as the branch name.
 
-  `<type>` can be `add`, `change`, `remove`, `fix`, `security` or `skip`. `skip` is only used if there is no user-visible change in the MR (for example, only editing comments in the code). Otherwise, choose a type that corresponds to your change.
+  `<type>` can be `add`, `remove`, `fix`, `security` or `skip`. `skip` is only used if there is no user-visible change in the MR (for example, only editing comments in the code). Otherwise, choose a type that corresponds to your change.
 
   In the file, write the changelog entry. For example, if an MR adds group functionality, we can create a file named `group.add` and write `Add group functionality` in it.
 

.rgignore

@@ -1 +0,0 @@
-priv/static

CHANGELOG.md

@@ -4,279 +4,6 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
-## 2.9.1
-
-### Security
-- Fix authorization checks for C2S Update activities to prevent unauthorized modifications of other users' content.
-- Fix content-type spoofing vulnerability that could allow users to upload ActivityPub objects as attachments
-- Reject cross-domain redirects when fetching ActivityPub objects to prevent bypassing domain-based security controls.
-- Limit emoji shortcodes to alphanumeric, dash, or underscore characters to prevent potential abuse.
-- Block attempts to fetch activities from the local instance to prevent spoofing.
-- Sanitize Content-Type headers in media proxy to prevent serving malicious ActivityPub content through proxied media.
-- Validate Content-Type headers when fetching remote ActivityPub objects to prevent spoofing attacks.
-
-### Changed
-- Include `pl-fe` in available frontends
-
-### Fixed
-- Remove trailing ` from end of line 75 which caused issues copy-pasting
-
-## 2.9.0
-
-### Security
-- Require HTTP signatures (if enabled) for routes used by both C2S and S2S AP API
-- Fix several spoofing vectors
-
-### Changed
-- Performance: Use 301 (permanent) redirect instead of 302 (temporary) when redirecting small images in media proxy. This allows browsers to cache the redirect response. 
-
-### Added
-- Include "published" in actor view
-- Link to exported outbox/followers/following collections in backup actor.json
-- Hashtag following
-- Allow to specify post language
-
-### Fixed
-- Verify a local Update sent through AP C2S so users can only update their own objects
-- Fix Mastodon incoming edits with inlined "likes"
-- Allow incoming "Listen" activities
-- Fix missing check for domain presence in rich media ignore_host configuration
-- Fix Rich Media parsing of TwitterCards/OpenGraph to adhere to the spec and always choose the first image if multiple are provided.
-- Fix OpenGraph/TwitterCard meta tag ordering for posts with multiple attachments
-- Fix blurhash generation crashes
-
-### Removed
-- Retire MRFs DNSRBL, FODirectReply, and QuietReply
-
-## 2.8.0
-
-### Changed
-- Metadata: Do not include .atom feed links for remote accounts
-- Bumped `fast_html` to v2.3.0, which notably allows to use system-installed lexbor with passing `WITH_SYSTEM_LEXBOR=1` environment variable at build-time
-- Dedupe upload filter now uses a three-level sharding directory structure
-- Deprecate `/api/v1/pleroma/accounts/:id/subscribe`/`unsubscribe`
-- Restrict incoming activities from unknown actors to a subset that does not imply a previous relationship and early rejection of unrecognized activity types.
-- Elixir 1.14 and Erlang/OTP 23 is now the minimum supported release
-- Support `id` param in `GET /api/v1/statuses`
-- LDAP authentication has been refactored to operate as a GenServer process which will maintain an active connection to the LDAP server.
-- Fix 'Setting a marker should mark notifications as read'
-- Adjust more Oban workers to enforce unique job constraints.
-- Oban updated to 2.18.3
-- Publisher behavior improvement when snoozing Oban jobs due to Gun connection pool contention.
-- Poll results refreshing is handled asynchronously and will not attempt to keep fetching updates to a closed poll.
-- Tuning for release builds to lower CPU usage.
-- Rich Media preview fetching will skip making an HTTP HEAD request to check a URL for allowed content type and length if the Tesla adapter is Gun or Finch
-- Fix nonexisting user will not generate metadata for search engine opt-out
-- Update Oban to 2.18
-- Worker configuration is no longer available. This only affects custom max_retries values for a couple Oban queues.
-
-### Added
-- Add metadata provider for ActivityPub alternate links
-- Added support for argon2 passwords and their conversion for migration from Akkoma fork to upstream.
-- Respect :restrict_unauthenticated for hashtag rss/atom feeds
-- LDAP configuration now permits overriding the CA root certificate file for TLS validation.
-- LDAP now supports users changing their passwords
-- Include list id in StatusView
-- Added MRF.FODirectReply which changes replies to followers-only posts to be direct.
-- Add `id_filter` to MRF to filter URLs and their domain prior to fetching
-- Added MRF.QuietReply which prevents replies to public posts from being published to the timelines
-- Add `group_key` to notifications
-- Allow providing avatar/header descriptions
-- Added RemoteReportPolicy from Rebased for handling bogus federated reports
-- scrubbers/default: Allow "mention hashtag" classes used by Mastodon
-- Added dependencies for Swoosh's Mua mail adapter
-- Include session scopes in TokenView
-
-### Fixed
-- Verify a local Update sent through AP C2S so users can only update their own objects
-- Fixed malformed follow requests that cause them to appear stuck pending due to the recipient being unable to process them.
-- Fix incoming Block activities being rejected
-- STARTTLS certificate and hostname verification for LDAP authentication
-- LDAPS connections (implicit TLS) are now supported.
-- Fix /api/v2/media returning the wrong status code (202) for media processed synchronously
-- Miscellaneous fixes for Meilisearch support
-- Fix pleroma_ctl mix task calls sometimes not being found
-- Add a rate limiter to the OAuth App creation endpoint and ensure registered apps are assigned to users.
-- ReceiverWorker will cancel processing jobs instead of retrying if the user cannot be fetched due to 403, 404, or 410 errors or if the account is disabled locally.
-- Address case where instance reachability status couldn't be updated
-- Remote Fetcher Worker recognizes more permanent failure errors
-- StreamerView: Do not leak follows count if hidden
-- Imports of blocks, mutes, and follows would retry repeatedly due to incorrect error handling and all work executed in a single job
-- Make vapid_config return empty array, fixing preloading for instances without push notifications configured
-
-### Removed
-- Remove stub for /api/v1/accounts/:id/identity_proofs (deprecated by Mastodon 3.5.0)
-
-## 2.7.1
-
-### Changed
-- Accept `application/activity+json` for requests to `/.well-known/nodeinfo`
-
-### Fixed
-- Truncate remote user fields, avoids them getting rejected
-- Improve the `FollowValidator` to successfully incoming activities with an errant `cc` field.
-- Resolved edge case where the API can report you are following a user but the relationship is not fully established.
-- The Swoosh email adapter for Mailgun was missing a new dependency on `:multipart`
-- Fix Mastodon WebSocket authentication
-
-## 2.7.0
-
-### Security
-- HTTP Security: By default, don't allow unsafe-eval. The setting needs to be changed to allow Flash emulation.
-- Fix webfinger spoofing.
-- Use proper workers for fetching pins instead of an ad-hoc task, fixing a potential fetch loop
-
-### Changed
-- Update to Phoenix 1.7
-- Elixir Logger configuration is now longer permitted through AdminFE and ConfigDB
-- Refactor the user backups code and improve test coverage
-- Invalid activities delivered to the inbox will be rejected with a 400 Bad Request
-- Support Bandit as an alternative to Cowboy for the HTTP server. 
-- Update Bandit to 1.5.2
-- Replace eblurhash with rinpatch_blurhash. This also removes a dependency on ImageMagick.
-- Elixir 1.13 is the minimum required version.
-- Document maximum supported version of Erlang & Elixir
-- Update and extend NetBSD installation docs
-- Make `/api/v1/pleroma/federation_status` publicly available
-- Increase outgoing federation parallelism
-- Change Hackney connection pool timeouts to align with the values Gun uses
-- Transmogrifier: handle non-validate errors on incoming Delete activities
-- Remote object fetch failures will prevent the object fetch job from retrying if the object request returns 401, 403, 404, 410, or exceeds the maximum thread depth.
-- - Change AccountView `last_status_at` from a datetime to a date (as done in Mastodon 3.1.0)
-- Improve error logging when LDAP authentication fails.
-- Publisher jobs will not retry if the error received is a 400
-- PollWorker jobs will not retry if the activity no longer exists.
-- Improved detecting unrecoverable errors for incoming federation jobs
-- Changed some jobs to return :cancel on unrecoverable errors that should not be retried
-- Discard Remote Fetcher jobs which errored due to an MRF rejection.
-- Oban queues have refactored to simplify the queue design
-- Ensure all Oban jobs have timeouts defined
-- Optimistic Inbox reduces the processing overhead of incoming activities without instantly verifiable signatures.
-- HTTP connection pool adjustments
-- Disable jit by default for PostgreSQL
-- Update the documentation for configuring Prometheus metrics.
-- Change the prometheus library to PromEx.
-- Publisher jobs now store the the activity id instead of inserting duplicate JSON data in the Oban queue for each delivery.
-- Activity publishing failures will prevent the job from retrying if the publishing request returns a 403 or 410
-- Publisher errors will now emit logs indicating the inbox that was not available for delivery.
-- Reduce the reachability timestamp update to a single upsert query
-- A 422 error is returned when attempting to reply to a deleted status
-- Rich Media backfilling is now an Oban job
-- Refactored Rich Media to cache the content in the database. Fetching operations that could block status rendering have been eliminated.
-- Set default values on validators for transient objects (attachment, poll options)
-- User profile refreshes are now asynchronous
-- Change mediaproxy previews to use vips to generate thumbnails instead of ImageMagick
-- Render nice web push notifications for polls
-- Refactor the Mastodon /api/v1/streaming websocket handler to use Phoenix.Socket.Transport
-
-### Added
-- Uploader: Add support for uploading attachments using IPFS
-- Add NSFW-detecting MRF
-- Add DNSRBL MRF
-- Add options to the mix prune_objects task
-- Add Anti-mention Spam MRF backported from Rebased
-- HTTPSignaturePlug: Add :authorized_fetch_mode_exceptions configuration
-- Support /authorize-interaction route used by Mastodon
-- Add an option to reject certain domains when authorized fetch is enabled.
-- Include following/followers in backups
-- Allow to group bookmarks in folders
-- Include image description in status media cards
-- Implement `/api/v1/accounts/familiar_followers`
-- Add support for configuring favicon, embed favicon and PWA manifest in server-generated meta
-- Implement FEP-2c59, add "webfinger" to user actor
-- Framegrabs with ffmpeg will execute with a 5 second timeout and cache the URLs of failures with a TTL of 15 minutes to prevent excessive retries.
-- Added a Mix task "pleroma.config fix_mrf_policies" which will remove erroneous MRF policies from ConfigDB.
-- Add ForceMention MRF
-- [docs] add frontends management documentation
-- Implement group actors
-- Add contact account to InstanceView
-- Add instance rules
-- Implement /api/v2/instance route
-- Verify profile link ownership with rel="me"
-- Logger metadata is now attached to some logs to help with troubleshooting and analysis
-- Add new parameters to /api/v2/instance: configuration[accounts][max_pinned_statuses] and configuration[statuses][characters_reserved_per_url]
-- Add meilisearch, make search engines pluggable
-- Add missing indexes on foreign key relationships
-- Startup detection for configured MRF modules that are missing or incorrectly defined
-- Permit passing --chunk and --step values to the Pleroma.Search.Indexer Mix task
-- Deleting, Unfavoriting, Unrepeating, or Unreacting will cancel undelivered publishing jobs for the original activity.
-- Oban jobs can now be viewed in the Live Dashboard
-- Add media proxy to opengraph rich media cards
-- Support for Erlang OTP 26
-- Prioritize mentioned recipients (i.e., those that are not just followers) when federating.
-- PromEx documentation
-- Expose nonAnonymous field from Smithereen polls
-- Add Qdrant/OpenAI embedding search
-- Adds the capability to add a URL to a scrobble (optional field)
-- scrubbers/default: Add more formatting elements from HTML4 / GoToSocial (acronym, bdo, big, cite, dfn, ins, kbd, q, samp, s, tt, var, wbr)
-- Monitoring of search backend health to control the processing of jobs in the search indexing Oban queue
-- Display reposted replies with exclude_replies: true
-- Add "status" notification type
-- Support honk-style attachment summaries as alt-text.
-
-### Fixed
-- Fix Emoji object IDs not always being valid
-- Remove checking ImageMagick's commands for Pleroma.Upload.Filter.AnalyzeMetadata
-- Ensure that StripLocation actually removes everything resembling GPS data from PNGs
-- Fix authentication check on account rendering when bio is defined
-- ap userview: add outbox field.
-- Fix #strip_report_status_data
-- Fix federation with Convergence AP Bridge
-- ChatMessage: Tolerate attachment field set to an empty array
-- Config: Check the permissions of the linked file instead of the symlink
-- MediaProxy was setting the content-length header which is not permitted by RFC9112§6.2 when we are chunking the reply as it conflicts with the existence of the transfer-encoding header.
-- Restore Cowboy's ability to stream MediaProxy responses without Chunked encoding.
-- Fix the processing of email digest jobs.
-- Client application data was always missing from the status
-- Elixir 1.15 compatibility
-- When downloading remote emojis packs, account for pagination
-- Make remote emoji packs API use specifically the V1 URL. Akkoma does not understand it without V1, and it works either way with normal pleroma, so no reason to not do this
-- Following HTTP Redirects when the HTTP Adapter is Finch
-- Video framegrabs were not working correctly after the change to use Exile to execute ffmpeg
-- Deactivated groups would still try to repeat a post.
-- Fix logic error in Gun connection pooling which prevented retries even when the worker was launched with retry = true
-- Connection pool errors when publishing an activity is a soft-error that will be retried shortly.
-- Gun Connection Pool was not retrying to acquire a connection if the pool was full and stale connections were reclaimed
-- TwitterAPI: Return proper error when healthcheck is disabled
-- Handle cases when users.inbox is nil.
-- Fix LDAP support
-- Use correct domain for fqn and InstanceView
-- The query for marking notifications as read has been simplified
-- Mastodon API /api/v1/directory: Fix listing directory contents when not authenticated
-- Ensure MediaProxy HTTP requests obey all the defined connection settings
-- Fix a memory leak caused by Websocket connections that would not enter a state where a full garbage collection run could be triggered.
-- Fix OpenGraph and Twitter metadata providers when parsing objects with no content or summary fields.
-- MRF: Log sensible error for subdomains_regex
-- MRF.StealEmojiPolicy: Properly add fallback extension to filenames missing one
-- Federated timeline removal of hashtags via MRF HashtagPolicy
-- Support objects with a null contentMap (firefish)
-- Fix notifications query which was not using the index properly
-- Notifications: improve performance by filtering on users table instead of activities table
-- Prevent Rich Media backfill jobs from retrying in cases where it is likely they will fail again.
-- Oban Jobs for refreshing users were not respecting the uniqueness setting
-- Fix Optimistic Inbox for failed signatures
-- MediaProxy Preview failures prevented when encountering certain video files
-- pleroma_ctl: Use realpath(1) instead of readlink(1)
-- ReceiverWorker: Make sure non-{:ok, _} is returned as {:error, …}
-- Harden Rich Media parsing against very slow or malicious URLs
-- Rich Media Preview cache eviction when the activity is updated.
-- Parsing of RichMedia TTLs for Amazon URLs when query parameters are nil
-- End of poll notifications were not streamed over websockets or web push
-- Fix eblurhash and elixir-captcha not using system cflags
-- Video thumbnails were not being generated due to a negative cache lookup logic error
-- Fix web push notifications not successfully delivering
-- Web Push notifications are no longer generated for muted/blocked threads and users.
-- Fix validate_webfinger when running a different domain for Webfinger
-
-### Removed
-- Mastodon API: Remove deprecated GET /api/v1/statuses/:id/card endpoint https://github.com/mastodon/mastodon/pull/11213
-- Removed support for multiple federator modules as we only support ActivityPub
-
-## 2.6.2
-
-### Security
-- MRF StealEmojiPolicy: Sanitize shortcodes (thanks to Hazel K for the report
-
 ## 2.6.1
 ### Changed
 - - Document maximum supported version of Erlang & Elixir
@@ -335,7 +62,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## 2.5.4
 
 ## Security
-- Fix XML External Entity (XXE) loading vulnerability allowing to fetch arbitrary files from the server's filesystem
+- Fix XML External Entity (XXE) loading vulnerability allowing to fetch arbitary files from the server's filesystem
 
 ## 2.5.3
 
@@ -351,7 +78,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## 2.5.4
 
 ## Security
-- Fix XML External Entity (XXE) loading vulnerability allowing to fetch arbitrary files from the server's filesystem
+- Fix XML External Entity (XXE) loading vulnerability allowing to fetch arbitary files from the server's filesystem
 
 ## 2.5.3
 
@@ -391,7 +118,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Fix `block_from_stranger` setting
 - Fix rel="me"
 - Docker images will now run properly
-- Fix improper content being cached in report content
+- Fix inproper content being cached in report content
 - Notification filter on object content will not operate on the ones that inherently have no content
 - ZWNJ and double dots in links are parsed properly for Plain-text posts
 - OTP releases will work on systems with a newer libcrypt
@@ -1057,7 +784,7 @@ switched to a new configuration mechanism, however it was not officially removed
 - Rate limiter crashes when there is no explicitly specified ip in the config
 - 500 errors when no `Accept` header is present if Static-FE is enabled
 - Instance panel not being updated immediately due to wrong `Cache-Control` headers
-- Statuses posted with BBCode/Markdown having unnecessary newlines in Pleroma-FE
+- Statuses posted with BBCode/Markdown having unncessary newlines in Pleroma-FE
 - OTP: Fix some settings not being migrated to in-database config properly
 - No `Cache-Control` headers on attachment/media proxy requests
 - Character limit enforcement being off by 1
@@ -1377,10 +1104,10 @@ curl -Lo ./bin/pleroma_ctl 'https://git.pleroma.social/pleroma/pleroma/raw/devel
 - Reverse Proxy limiting `max_body_length` was incorrectly defined and only checked `Content-Length` headers which may not be sufficient in some circumstances
 
 ### Added
-- Expiring/ephemeral activities. All activities can have expires_at value set, which controls when they should be deleted automatically.
+- Expiring/ephemeral activites. All activities can have expires_at value set, which controls when they should be deleted automatically.
 - Mastodon API: in post_status, the expires_in parameter lets you set the number of seconds until an activity expires. It must be at least one hour.
 - Mastodon API: all status JSON responses contain a `pleroma.expires_at` item which states when an activity will expire. The value is only shown to the user who created the activity. To everyone else it's empty.
-- Configuration: `ActivityExpiration.enabled` controls whether expired activities will get deleted at the appropriate time. Enabled by default.
+- Configuration: `ActivityExpiration.enabled` controls whether expired activites will get deleted at the appropriate time. Enabled by default.
 - Conversations: Add Pleroma-specific conversation endpoints and status posting extensions. Run the `bump_all_conversations` task again to create the necessary data.
 - MRF: Support for priming the mediaproxy cache (`Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy`)
 - MRF: Support for excluding specific domains from Transparency.

Dockerfile

@@ -1,17 +1,15 @@
-# https://hub.docker.com/r/hexpm/elixir/tags
 ARG ELIXIR_IMG=hexpm/elixir
-ARG ELIXIR_VER=1.14.5
-ARG ERLANG_VER=25.3.2.14
-ARG ALPINE_VER=3.17.9
+ARG ELIXIR_VER=1.11.4
+ARG ERLANG_VER=24.2.1
+ARG ALPINE_VER=3.17.0
 
 FROM ${ELIXIR_IMG}:${ELIXIR_VER}-erlang-${ERLANG_VER}-alpine-${ALPINE_VER} as build
 
 COPY . .
 
 ENV MIX_ENV=prod
-ENV VIX_COMPILATION_MODE=PLATFORM_PROVIDED_LIBVIPS
 
-RUN apk add git gcc g++ musl-dev make cmake file-dev vips-dev &&\
+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 &&\
@@ -39,7 +37,7 @@ ARG HOME=/opt/pleroma
 ARG DATA=/var/lib/pleroma
 
 RUN apk update &&\
-	apk add exiftool ffmpeg vips libmagic ncurses postgresql-client &&\
+	apk add exiftool ffmpeg imagemagick libmagic ncurses postgresql-client &&\
 	adduser --system --shell /bin/false --home ${HOME} pleroma &&\
 	mkdir -p ${DATA}/uploads &&\
 	mkdir -p ${DATA}/static &&\

changelog.d/activity_type_index.change

@@ -1 +0,0 @@
-Add new activity actor/type index. Greatly speeds up retrieval of rare types (like "Listen")

changelog.d/emoji_likes.add

@@ -1 +0,0 @@
-Support Mitra-style emoji likes.

changelog.d/freebsd-rc.fix

@@ -1 +0,0 @@
-Set PATH in the FreeBSD rc script to avoid failures starting the service

changelog.d/gin-search.fix

@@ -1 +0,0 @@
-Improved performance of status search queries using the default GIN index

changelog.d/language-detection.add

@@ -1 +0,0 @@
-Implement language detection with fastText

changelog.d/releases.fix

@@ -1 +0,0 @@
-Fix release builds

changelog.d/siteinfo-baseurls.add

@@ -1 +0,0 @@
-Add `base_urls` to the /api/v1/instance pleroma metadata which provides information about the base URLs for media_proxy and uploads when configured

changelog.d/translate-posts.add

@@ -1 +0,0 @@
-Support translation providers (DeepL, LibreTranslate)

changelog.d/truncate-rich-media.change

@@ -1 +0,0 @@
-Truncate the length of Rich Media title and description fields

ci/Dockerfile

@@ -1,4 +1,4 @@
-FROM elixir:1.14.5-otp-25
+FROM elixir:1.11.4
 
 # Single RUN statement, otherwise intermediate images are created
 # https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#run

ci/build_and_push.sh

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

ci/elixir-1.14.5-otp-25/build_and_push.sh

@@ -1 +0,0 @@
-docker buildx build --platform linux/amd64,linux/arm64 -t git.pleroma.social:5050/pleroma/pleroma/ci-base:elixir-1.14.5-otp-25 --push .

ci/elixir-1.15.8-otp-26/Dockerfile

@@ -1,8 +0,0 @@
-FROM elixir:1.15.8-otp-26
-
-# Single RUN statement, otherwise intermediate images are created
-# https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#run
-RUN apt-get update &&\
-	apt-get install -y libmagic-dev cmake libimage-exiftool-perl ffmpeg &&\
-	mix local.hex --force &&\
-	mix local.rebar --force

ci/elixir-1.15.8-otp-26/build_and_push.sh

@@ -1 +0,0 @@
-docker buildx build --platform linux/amd64,linux/arm64 -t git.pleroma.social:5050/pleroma/pleroma/ci-base:elixir-1.15.8-otp-26 --push .

ci/elixir-1.16.3-otp-26/Dockerfile

@@ -1,8 +0,0 @@
-FROM elixir:1.16.3-otp-26
-
-# Single RUN statement, otherwise intermediate images are created
-# https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#run
-RUN apt-get update &&\
-	apt-get install -y libmagic-dev cmake libimage-exiftool-perl ffmpeg &&\
-	mix local.hex --force &&\
-	mix local.rebar --force

ci/elixir-1.16.3-otp-26/build_and_push.sh

@@ -1 +0,0 @@
-docker buildx build --platform linux/amd64,linux/arm64 -t git.pleroma.social:5050/pleroma/pleroma/ci-base:elixir-1.16.3-otp-26 --push .

ci/elixir-1.17.1-otp-26/Dockerfile

@@ -1,8 +0,0 @@
-FROM elixir:1.17.1-otp-26
-
-# Single RUN statement, otherwise intermediate images are created
-# https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#run
-RUN apt-get update &&\
-	apt-get install -y libmagic-dev cmake libimage-exiftool-perl ffmpeg &&\
-	mix local.hex --force &&\
-	mix local.rebar --force

ci/elixir-1.17.1-otp-26/build_and_push.sh

@@ -1 +0,0 @@
-docker buildx build --platform linux/amd64,linux/arm64 -t git.pleroma.social:5050/pleroma/pleroma/ci-base:elixir-1.17.1-otp-26 --push .

ci/postgres-with-rum-13/Dockerfile

@@ -1,3 +0,0 @@
-FROM postgres:13-bullseye
-
-RUN apt-get update && apt-get install -y postgresql-13-rum/bullseye-pgdg

ci/postgres-with-rum-13/build_and_push.sh

@@ -1 +0,0 @@
-docker buildx build --platform linux/amd64,linux/arm64 -t git.pleroma.social:5050/pleroma/pleroma/postgres-with-rum-13:latest --push .

config/benchmark.exs

@@ -14,7 +14,7 @@ config :pleroma, Pleroma.Captcha,
   method: Pleroma.Captcha.Mock
 
 # Print only warnings and errors during test
-config :logger, level: :warning
+config :logger, level: :warn
 
 config :pleroma, :auth, oauth_consumer_strategies: []
 
@@ -79,10 +79,6 @@ IO.puts("RUM enabled: #{rum_enabled}")
 
 config :pleroma, Pleroma.ReverseProxy.Client, Pleroma.ReverseProxy.ClientMock
 
-config :pleroma, Pleroma.Application,
-  background_migrators: false,
-  streamer_registry: false
-
 if File.exists?("./config/benchmark.secret.exs") do
   import_config "benchmark.secret.exs"
 else

config/config.exs

@@ -48,7 +48,7 @@ config :pleroma, ecto_repos: [Pleroma.Repo]
 
 config :pleroma, Pleroma.Repo,
   telemetry_event: [Pleroma.Repo.Instrumenter],
-  migration_lock: :pg_advisory_lock
+  migration_lock: nil
 
 config :pleroma, Pleroma.Captcha,
   enabled: true,
@@ -65,8 +65,7 @@ config :pleroma, Pleroma.Upload,
   proxy_remote: false,
   filename_display_max_length: 30,
   default_description: nil,
-  base_url: nil,
-  allowed_mime_types: ["image", "audio", "video"]
+  base_url: nil
 
 config :pleroma, Pleroma.Uploaders.Local, uploads: "uploads"
 
@@ -83,10 +82,6 @@ config :ex_aws, :s3,
   # region: "us-east-1", # may be required for Amazon AWS
   scheme: "https://"
 
-config :pleroma, Pleroma.Uploaders.IPFS,
-  post_gateway_url: "http://localhost:5001",
-  get_gateway_url: "http://localhost:8080"
-
 config :pleroma, :emoji,
   shortcode_globs: ["/emoji/custom/**/*.png"],
   pack_extensions: [".png", ".gif"],
@@ -115,11 +110,32 @@ config :pleroma, :uri_schemes,
     "xmpp"
   ]
 
+websocket_config = [
+  path: "/websocket",
+  serializer: [
+    {Phoenix.Socket.V1.JSONSerializer, "~> 1.0.0"},
+    {Phoenix.Socket.V2.JSONSerializer, "~> 2.0.0"}
+  ],
+  timeout: 60_000,
+  transport_log: false,
+  compress: false
+]
+
 # Configures the endpoint
 config :pleroma, Pleroma.Web.Endpoint,
   url: [host: "localhost"],
   http: [
-    ip: {127, 0, 0, 1}
+    ip: {127, 0, 0, 1},
+    dispatch: [
+      {:_,
+       [
+         {"/api/v1/streaming", Pleroma.Web.MastodonAPI.WebsocketHandler, []},
+         {"/websocket", Phoenix.Endpoint.CowboyWebSocket,
+          {Phoenix.Transports.WebSocket,
+           {Pleroma.Web.Endpoint, Pleroma.Web.UserSocket, websocket_config}}},
+         {:_, Phoenix.Endpoint.Cowboy2Handler, {Pleroma.Web.Endpoint, []}}
+       ]}
+    ]
   ],
   protocol: "https",
   secret_key_base: "aK4Abxf29xU9TTDKre9coZPUgevcVCFQJe/5xP/7Lt4BEif6idBIbjupVbOrbKxl",
@@ -133,28 +149,23 @@ config :pleroma, Pleroma.Web.Endpoint,
   ]
 
 # Configures Elixir's Logger
-config :logger, backends: [:console]
-
 config :logger, :console,
   level: :debug,
   format: "\n$time $metadata[$level] $message\n",
-  metadata: [:actor, :path, :type, :user]
+  metadata: [:request_id]
 
 config :logger, :ex_syslogger,
   level: :debug,
   ident: "pleroma",
   format: "$metadata[$level] $message",
-  metadata: [:actor, :path, :type, :user]
+  metadata: [:request_id]
 
 config :mime, :types, %{
   "application/xml" => ["xml"],
   "application/xrd+xml" => ["xrd+xml"],
   "application/jrd+json" => ["jrd+json"],
   "application/activity+json" => ["activity+json"],
-  "application/ld+json" => ["activity+json"],
-  # Can be removed when bumping MIME past 2.0.5
-  # see https://akkoma.dev/AkkomaGang/akkoma/issues/657
-  "image/apng" => ["apng"]
+  "application/ld+json" => ["activity+json"]
 }
 
 config :tesla, adapter: Tesla.Adapter.Hackney
@@ -174,7 +185,6 @@ config :pleroma, :instance,
   short_description: "",
   background_image: "/images/city.jpg",
   instance_thumbnail: "/instance/thumbnail.jpeg",
-  favicon: "/favicon.png",
   limit: 5_000,
   description_limit: 5_000,
   remote_limit: 100_000,
@@ -195,10 +205,12 @@ config :pleroma, :instance,
   federating: true,
   federation_incoming_replies_max_depth: 100,
   federation_reachability_timeout_days: 7,
+  federation_publisher_modules: [
+    Pleroma.Web.ActivityPub.Publisher
+  ],
   allow_relay: true,
   public: true,
   quarantined_instances: [],
-  rejected_instances: [],
   static_dir: "instance/static/",
   allowed_post_formats: [
     "text/plain",
@@ -348,8 +360,6 @@ config :pleroma, :manifest,
   icons: [
     %{
       src: "/static/logo.svg",
-      sizes: "512x512",
-      purpose: "any",
       type: "image/svg+xml"
     }
   ],
@@ -363,8 +373,7 @@ config :pleroma, :activitypub,
   follow_handshake_timeout: 500,
   note_replies_output_limit: 5,
   sign_object_fetches: true,
-  authorized_fetch_mode: false,
-  client_api_enabled: false
+  authorized_fetch_mode: false
 
 config :pleroma, :streamer,
   workers: 3,
@@ -423,28 +432,10 @@ config :pleroma, :mrf_object_age,
   threshold: 604_800,
   actions: [:delist, :strip_followers]
 
-config :pleroma, :mrf_nsfw_api,
-  url: "http://127.0.0.1:5000/",
-  threshold: 0.7,
-  mark_sensitive: true,
-  unlist: false,
-  reject: false
-
 config :pleroma, :mrf_follow_bot, follower_nickname: nil
 
 config :pleroma, :mrf_inline_quote, template: "<bdi>RT:</bdi> {url}"
 
-config :pleroma, :mrf_remote_report,
-  reject_all: false,
-  reject_anonymous: true,
-  reject_empty_message: true
-
-config :pleroma, :mrf_force_mention,
-  mention_parent: true,
-  mention_quoted: true
-
-config :pleroma, :mrf_antimentionspam, user_age_limit: 30_000
-
 config :pleroma, :rich_media,
   enabled: true,
   ignore_hosts: [],
@@ -453,12 +444,8 @@ config :pleroma, :rich_media,
     Pleroma.Web.RichMedia.Parsers.TwitterCard,
     Pleroma.Web.RichMedia.Parsers.OEmbed
   ],
-  timeout: 5_000,
-  ttl_setters: [
-    Pleroma.Web.RichMedia.Parser.TTL.AwsSignedUrl,
-    Pleroma.Web.RichMedia.Parser.TTL.Opengraph
-  ],
-  max_body: 5_000_000
+  failure_backoff: 60_000,
+  ttl_setters: [Pleroma.Web.RichMedia.Parser.TTL.AwsSignedUrl]
 
 config :pleroma, :media_proxy,
   enabled: false,
@@ -527,8 +514,7 @@ config :pleroma, :http_security,
   sts: false,
   sts_max_age: 31_536_000,
   ct_max_age: 2_592_000,
-  referrer_policy: "same-origin",
-  allow_unsafe_eval: false
+  referrer_policy: "same-origin"
 
 config :cors_plug,
   max_age: 86_400,
@@ -585,25 +571,38 @@ config :pleroma, Pleroma.User,
   ],
   email_blacklist: []
 
-# The Pruner :max_age must be longer than Worker :unique
-# value or it cannot enforce uniqueness.
 config :pleroma, Oban,
   repo: Pleroma.Repo,
   log: false,
   queues: [
     activity_expiration: 10,
+    token_expiration: 5,
+    filter_expiration: 1,
+    backup: 1,
     federator_incoming: 5,
-    federator_outgoing: 25,
+    federator_outgoing: 5,
+    ingestion_queue: 50,
     web_push: 50,
-    background: 20,
-    search_indexing: [limit: 10, paused: true],
-    slow: 5
+    mailer: 10,
+    transmogrifier: 20,
+    scheduled_activities: 10,
+    poll_notifications: 10,
+    background: 5,
+    remote_fetcher: 2,
+    attachments_cleanup: 1,
+    new_users_digest: 1,
+    mute_expire: 5
   ],
-  plugins: [{Oban.Plugins.Pruner, max_age: 900}],
+  plugins: [Oban.Plugins.Pruner],
   crontab: [
     {"0 0 * * 0", Pleroma.Workers.Cron.DigestEmailsWorker},
-    {"0 0 * * *", Pleroma.Workers.Cron.NewUsersDigestWorker},
-    {"*/10 * * * *", Pleroma.Workers.Cron.AppCleanupWorker}
+    {"0 0 * * *", Pleroma.Workers.Cron.NewUsersDigestWorker}
+  ]
+
+config :pleroma, :workers,
+  retries: [
+    federator_incoming: 5,
+    federator_outgoing: 5
   ]
 
 config :pleroma, Pleroma.Formatter,
@@ -617,17 +616,14 @@ config :pleroma, Pleroma.Formatter,
 
 config :pleroma, :ldap,
   enabled: System.get_env("LDAP_ENABLED") == "true",
-  host: System.get_env("LDAP_HOST", "localhost"),
-  port: String.to_integer(System.get_env("LDAP_PORT", "389")),
+  host: System.get_env("LDAP_HOST") || "localhost",
+  port: String.to_integer(System.get_env("LDAP_PORT") || "389"),
   ssl: System.get_env("LDAP_SSL") == "true",
   sslopts: [],
   tls: System.get_env("LDAP_TLS") == "true",
   tlsopts: [],
-  base: System.get_env("LDAP_BASE", "dc=example,dc=com"),
-  uid: System.get_env("LDAP_UID", "cn"),
-  # defaults to CAStore's Mozilla roots
-  cacertfile: System.get_env("LDAP_CACERTFILE", nil),
-  mail: System.get_env("LDAP_MAIL", "mail")
+  base: System.get_env("LDAP_BASE") || "dc=example,dc=com",
+  uid: System.get_env("LDAP_UID") || "cn"
 
 oauth_consumer_strategies =
   System.get_env("OAUTH_CONSUMER_STRATEGIES")
@@ -664,26 +660,12 @@ config :pleroma, Pleroma.Emails.UserEmail,
 
 config :pleroma, Pleroma.Emails.NewUsersDigestEmail, enabled: false
 
-config :pleroma, Pleroma.PromEx,
-  disabled: false,
-  manual_metrics_start_delay: :no_delay,
-  drop_metrics_groups: [],
-  grafana: [
-    host: System.get_env("GRAFANA_HOST", "http://localhost:3000"),
-    auth_token: System.get_env("GRAFANA_TOKEN"),
-    upload_dashboards_on_start: false,
-    folder_name: "BEAM",
-    annotate_app_lifecycle: true
-  ],
-  metrics_server: [
-    port: 4021,
-    path: "/metrics",
-    protocol: :http,
-    pool_size: 5,
-    cowboy_opts: [],
-    auth_strategy: :none
-  ],
-  datasource: "Prometheus"
+config :prometheus, Pleroma.Web.Endpoint.MetricsExporter,
+  enabled: false,
+  auth: false,
+  ip_whitelist: [],
+  path: "/api/pleroma/app_metrics",
+  format: :text
 
 config :pleroma, Pleroma.ScheduledActivity,
   daily_user_limit: 25,
@@ -720,7 +702,6 @@ config :pleroma, :rate_limit,
   timeline: {500, 3},
   search: [{1000, 10}, {1000, 30}],
   app_account_creation: {1_800_000, 25},
-  oauth_app_creation: {900_000, 5},
   relations_actions: {10_000, 10},
   relation_id_action: {60_000, 2},
   statuses_actions: {10_000, 15},
@@ -807,13 +788,6 @@ config :pleroma, :frontends,
         "https://lily-is.land/infra/glitch-lily/-/jobs/artifacts/${ref}/download?job=build",
       "ref" => "servant",
       "build_dir" => "public"
-    },
-    "pl-fe" => %{
-      "name" => "pl-fe",
-      "git" => "https://github.com/mkljczk/pl-fe",
-      "build_url" => "https://pl.mkljczk.pl/pl-fe.zip",
-      "ref" => "develop",
-      "build_dir" => "."
     }
   }
 
@@ -826,7 +800,7 @@ config :pleroma, :modules, runtime_dir: "instance/modules"
 config :pleroma, configurable_from_database: false
 
 config :pleroma, Pleroma.Repo,
-  parameters: [gin_fuzzy_search_limit: "500", jit: "off"],
+  parameters: [gin_fuzzy_search_limit: "500"],
   prepare: :unnamed
 
 config :pleroma, :connections_pool,
@@ -840,27 +814,22 @@ config :pleroma, :connections_pool,
 
 config :pleroma, :pools,
   federation: [
-    size: 75,
-    max_waiting: 20,
+    size: 50,
+    max_waiting: 10,
     recv_timeout: 10_000
   ],
   media: [
-    size: 75,
-    max_waiting: 20,
-    recv_timeout: 15_000
-  ],
-  rich_media: [
-    size: 25,
+    size: 50,
     max_waiting: 20,
     recv_timeout: 15_000
   ],
   upload: [
     size: 25,
-    max_waiting: 20,
+    max_waiting: 5,
     recv_timeout: 15_000
   ],
   default: [
-    size: 50,
+    size: 10,
     max_waiting: 2,
     recv_timeout: 5_000
   ]
@@ -868,19 +837,15 @@ config :pleroma, :pools,
 config :pleroma, :hackney_pools,
   federation: [
     max_connections: 50,
-    timeout: 10_000
+    timeout: 150_000
   ],
   media: [
     max_connections: 50,
-    timeout: 15_000
-  ],
-  rich_media: [
-    max_connections: 50,
-    timeout: 15_000
+    timeout: 150_000
   ],
   upload: [
     max_connections: 25,
-    timeout: 15_000
+    timeout: 300_000
   ]
 
 config :pleroma, :majic_pool, size: 2
@@ -919,44 +884,16 @@ config :pleroma, Pleroma.User.Backup,
   purge_after_days: 30,
   limit_days: 7,
   dir: nil,
-  process_chunk_size: 100,
-  timeout: :timer.minutes(30)
+  process_wait_time: 30_000,
+  process_chunk_size: 100
 
 config :pleroma, ConcurrentLimiter, [
-  {Pleroma.Search, [max_running: 30, max_waiting: 50]}
+  {Pleroma.Web.RichMedia.Helpers, [max_running: 5, max_waiting: 5]},
+  {Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy, [max_running: 5, max_waiting: 5]}
 ]
 
 config :pleroma, Pleroma.Web.WebFinger, domain: nil, update_nickname_on_user_fetch: true
 
-config :pleroma, Pleroma.Search, module: Pleroma.Search.DatabaseSearch
-
-config :pleroma, Pleroma.Search.Meilisearch,
-  url: "http://127.0.0.1:7700/",
-  private_key: nil,
-  initial_indexing_chunk_size: 100_000
-
-config :pleroma, Pleroma.Application,
-  background_migrators: true,
-  internal_fetch: true,
-  load_custom_modules: true,
-  max_restarts: 3,
-  streamer_registry: true
-
-config :pleroma, Pleroma.Uploaders.Uploader, timeout: 30_000
-
-config :pleroma, Pleroma.Search.QdrantSearch,
-  qdrant_url: "http://127.0.0.1:6333/",
-  qdrant_api_key: "",
-  openai_url: "http://127.0.0.1:11345",
-  # The healthcheck url has to be set to nil when used with the real openai
-  # API, as it doesn't have a healthcheck endpoint.
-  openai_healthcheck_url: "http://127.0.0.1:11345/health",
-  openai_model: "snowflake/snowflake-arctic-embed-xs",
-  openai_api_key: "",
-  qdrant_index_configuration: %{
-    vectors: %{size: 384, distance: "Cosine"}
-  }
-
 # 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

@@ -117,19 +117,6 @@ config :pleroma, :config_description, [
         key: :filename_display_max_length,
         type: :integer,
         description: "Set max length of a filename to display. 0 = no limit. Default: 30"
-      },
-      %{
-        key: :allowed_mime_types,
-        label: "Allowed MIME types",
-        type: {:list, :string},
-        description:
-          "List of MIME (main) types uploads are allowed to identify themselves with. Other types may still be uploaded, but will identify as a generic binary to clients. WARNING: Loosening this over the defaults can lead to security issues. Removing types is safe, but only add to the list if you are sure you know what you are doing.",
-        suggestions: [
-          "image",
-          "audio",
-          "video",
-          "font"
-        ]
       }
     ]
   },
@@ -149,31 +136,6 @@ config :pleroma, :config_description, [
       }
     ]
   },
-  %{
-    group: :pleroma,
-    key: Pleroma.Uploaders.IPFS,
-    type: :group,
-    description: "IPFS uploader-related settings",
-    children: [
-      %{
-        key: :get_gateway_url,
-        type: :string,
-        description: "GET Gateway URL",
-        suggestions: [
-          "https://ipfs.mydomain.com/{CID}",
-          "https://{CID}.ipfs.mydomain.com/"
-        ]
-      },
-      %{
-        key: :post_gateway_url,
-        type: :string,
-        description: "POST Gateway URL",
-        suggestions: [
-          "http://localhost:5001/"
-        ]
-      }
-    ]
-  },
   %{
     group: :pleroma,
     key: Pleroma.Uploaders.S3,
@@ -604,20 +566,6 @@ config :pleroma, :config_description, [
           "Cool instance"
         ]
       },
-      %{
-        key: :status_page,
-        type: :string,
-        description: "A page where people can see the status of the server during an outage",
-        suggestions: [
-          "https://status.pleroma.example.org"
-        ]
-      },
-      %{
-        key: :contact_username,
-        type: :string,
-        description: "Instance owner username",
-        suggestions: ["admin"]
-      },
       %{
         key: :limit,
         type: :integer,
@@ -787,18 +735,6 @@ config :pleroma, :config_description, [
           {"*.quarantined.com", "Reason"}
         ]
       },
-      %{
-        key: :rejected_instances,
-        type: {:list, :tuple},
-        key_placeholder: "instance",
-        value_placeholder: "reason",
-        description:
-          "List of ActivityPub instances to reject requests from if authorized_fetch_mode is enabled",
-        suggestions: [
-          {"rejected.com", "Reason"},
-          {"*.rejected.com", "Reason"}
-        ]
-      },
       %{
         key: :static_dir,
         type: :string,
@@ -1051,12 +987,6 @@ config :pleroma, :config_description, [
           "The instance thumbnail can be any image that represents your instance and is used by some apps or services when they display information about your instance.",
         suggestions: ["/instance/thumbnail.jpeg"]
       },
-      %{
-        key: :favicon,
-        type: {:string, :image},
-        description: "Favicon of the instance",
-        suggestions: ["/favicon.png"]
-      },
       %{
         key: :show_reactions,
         type: :boolean,
@@ -1241,6 +1171,79 @@ config :pleroma, :config_description, [
       }
     ]
   },
+  %{
+    group: :logger,
+    type: :group,
+    description: "Logger-related settings",
+    children: [
+      %{
+        key: :backends,
+        type: [:atom, :tuple, :module],
+        description:
+          "Where logs will be sent, :console - send logs to stdout, { ExSyslogger, :ex_syslogger } - to syslog, Quack.Logger - to Slack.",
+        suggestions: [:console, {ExSyslogger, :ex_syslogger}, Quack.Logger]
+      }
+    ]
+  },
+  %{
+    group: :logger,
+    type: :group,
+    key: :ex_syslogger,
+    label: "ExSyslogger",
+    description: "ExSyslogger-related settings",
+    children: [
+      %{
+        key: :level,
+        type: {:dropdown, :atom},
+        description: "Log level",
+        suggestions: [:debug, :info, :warn, :error]
+      },
+      %{
+        key: :ident,
+        type: :string,
+        description:
+          "A string that's prepended to every message, and is typically set to the app name",
+        suggestions: ["pleroma"]
+      },
+      %{
+        key: :format,
+        type: :string,
+        description: "Default: \"$date $time [$level] $levelpad$node $metadata $message\"",
+        suggestions: ["$metadata[$level] $message"]
+      },
+      %{
+        key: :metadata,
+        type: {:list, :atom},
+        suggestions: [:request_id]
+      }
+    ]
+  },
+  %{
+    group: :logger,
+    type: :group,
+    key: :console,
+    label: "Console Logger",
+    description: "Console logger settings",
+    children: [
+      %{
+        key: :level,
+        type: {:dropdown, :atom},
+        description: "Log level",
+        suggestions: [:debug, :info, :warn, :error]
+      },
+      %{
+        key: :format,
+        type: :string,
+        description: "Default: \"$date $time [$level] $levelpad$node $metadata $message\"",
+        suggestions: ["$metadata[$level] $message"]
+      },
+      %{
+        key: :metadata,
+        type: {:list, :atom},
+        suggestions: [:request_id]
+      }
+    ]
+  },
   %{
     group: :pleroma,
     key: :frontend_configurations,
@@ -1435,7 +1438,7 @@ config :pleroma, :config_description, [
             label: "Subject line behavior",
             type: :string,
             description: "Allows changing the default behaviour of subject lines in replies.
-          `email`: copy and prepend re:, as in email,
+          `email`: copy and preprend re:, as in email,
           `masto`: copy verbatim, as in Mastodon,
           `noop`: don't copy the subject.",
             suggestions: ["email", "masto", "noop"]
@@ -1768,12 +1771,6 @@ config :pleroma, :config_description, [
         type: :boolean,
         description: "Require HTTP signatures for AP fetches"
       },
-      %{
-        key: :authorized_fetch_mode_exceptions,
-        type: {:list, :string},
-        description:
-          "List of IPs (CIDR format accepted) to exempt from HTTP Signatures requirement (for example to allow debugging, you shouldn't otherwise need this)"
-      },
       %{
         key: :note_replies_output_limit,
         type: :integer,
@@ -1785,11 +1782,6 @@ config :pleroma, :config_description, [
         type: :integer,
         description: "Following handshake timeout",
         suggestions: [500]
-      },
-      %{
-        key: :client_api_enabled,
-        type: :boolean,
-        description: "Allow client to server ActivityPub interactions"
       }
     ]
   },
@@ -1939,7 +1931,7 @@ config :pleroma, :config_description, [
         key: :log,
         type: {:dropdown, :atom},
         description: "Logs verbose mode",
-        suggestions: [false, :error, :warning, :info, :debug]
+        suggestions: [false, :error, :warn, :info, :debug]
       },
       %{
         key: :queues,
@@ -2031,6 +2023,23 @@ config :pleroma, :config_description, [
       }
     ]
   },
+  %{
+    group: :pleroma,
+    key: :workers,
+    type: :group,
+    description: "Includes custom worker options not interpretable directly by `Oban`",
+    children: [
+      %{
+        key: :retries,
+        type: {:keyword, :integer},
+        description: "Max retry attempts for failed jobs, per `Oban` queue",
+        suggestions: [
+          federator_incoming: 5,
+          federator_outgoing: 5
+        ]
+      }
+    ]
+  },
   %{
     group: :pleroma,
     key: Pleroma.Web.Metadata,
@@ -2102,11 +2111,11 @@ config :pleroma, :config_description, [
         ]
       },
       %{
-        key: :timeout,
+        key: :failure_backoff,
         type: :integer,
         description:
-          "Amount of milliseconds after which the HTTP request is forcibly terminated.",
-        suggestions: [5_000]
+          "Amount of milliseconds after request failure, during which the request will not be retried.",
+        suggestions: [60_000]
       }
     ]
   },
@@ -2259,8 +2268,14 @@ config :pleroma, :config_description, [
         label: "SSL options",
         type: :keyword,
         description: "Additional SSL options",
-        suggestions: [verify: :verify_peer],
+        suggestions: [cacertfile: "path/to/file/with/PEM/cacerts", verify: :verify_peer],
         children: [
+          %{
+            key: :cacertfile,
+            type: :string,
+            description: "Path to file with PEM encoded cacerts",
+            suggestions: ["path/to/file/with/PEM/cacerts"]
+          },
           %{
             key: :verify,
             type: :atom,
@@ -2280,8 +2295,14 @@ config :pleroma, :config_description, [
         label: "TLS options",
         type: :keyword,
         description: "Additional TLS options",
-        suggestions: [verify: :verify_peer],
+        suggestions: [cacertfile: "path/to/file/with/PEM/cacerts", verify: :verify_peer],
         children: [
+          %{
+            key: :cacertfile,
+            type: :string,
+            description: "Path to file with PEM encoded cacerts",
+            suggestions: ["path/to/file/with/PEM/cacerts"]
+          },
           %{
             key: :verify,
             type: :atom,
@@ -2298,25 +2319,11 @@ config :pleroma, :config_description, [
       },
       %{
         key: :uid,
-        label: "UID Attribute",
+        label: "UID",
         type: :string,
         description:
           "LDAP attribute name to authenticate the user, e.g. when \"cn\", the filter will be \"cn=username,base\"",
         suggestions: ["cn"]
-      },
-      %{
-        key: :cacertfile,
-        label: "CACertfile",
-        type: :string,
-        description: "Path to CA certificate file"
-      },
-      %{
-        key: :mail,
-        label: "Mail Attribute",
-        type: :string,
-        description:
-          "LDAP attribute name to use as the email address when automatically registering the user on first login",
-        suggestions: ["mail"]
       }
     ]
   },
@@ -3083,7 +3090,7 @@ config :pleroma, :config_description, [
               key: :max_waiting,
               type: :integer,
               description:
-                "Maximum number of requests waiting for other requests to finish. After this number is reached, the pool will start returning errors when a new request is made",
+                "Maximum number of requests waiting for other requests to finish. After this number is reached, the pool will start returning errrors when a new request is made",
               suggestions: [10]
             },
             %{
@@ -3320,7 +3327,8 @@ config :pleroma, :config_description, [
         suggestions: [
           Pleroma.Web.Preload.Providers.Instance,
           Pleroma.Web.Preload.Providers.User,
-          Pleroma.Web.Preload.Providers.Timelines
+          Pleroma.Web.Preload.Providers.Timelines,
+          Pleroma.Web.Preload.Providers.StatusNet
         ]
       }
     ]
@@ -3348,7 +3356,7 @@ config :pleroma, :config_description, [
       %{
         key: :purge_after_days,
         type: :integer,
-        description: "Remove backup archives after N days",
+        description: "Remove backup achives after N days",
         suggestions: [30]
       },
       %{
@@ -3357,19 +3365,20 @@ config :pleroma, :config_description, [
         description: "Limit user to export not more often than once per N days",
         suggestions: [7]
       },
+      %{
+        key: :process_wait_time,
+        type: :integer,
+        label: "Process Wait Time",
+        description:
+          "The amount of time to wait for backup to report progress, in milliseconds. If no progress is received from the backup job for that much time, terminate it and deem it failed.",
+        suggestions: [30_000]
+      },
       %{
         key: :process_chunk_size,
         type: :integer,
         label: "Process Chunk Size",
         description: "The number of activities to fetch in the backup job for each chunk.",
         suggestions: [100]
-      },
-      %{
-        key: :timeout,
-        type: :integer,
-        label: "Timeout",
-        description: "The amount of time to wait for backup to complete in seconds.",
-        suggestions: [1_800]
       }
     ]
   },
@@ -3457,114 +3466,5 @@ config :pleroma, :config_description, [
         ]
       }
     ]
-  },
-  %{
-    group: :pleroma,
-    key: Pleroma.Search,
-    type: :group,
-    description: "General search settings.",
-    children: [
-      %{
-        key: :module,
-        type: :keyword,
-        description: "Selected search module.",
-        suggestion: [Pleroma.Search.DatabaseSearch, Pleroma.Search.Meilisearch]
-      }
-    ]
-  },
-  %{
-    group: :pleroma,
-    key: Pleroma.Search.Meilisearch,
-    type: :group,
-    description: "Meilisearch settings.",
-    children: [
-      %{
-        key: :url,
-        type: :string,
-        description: "Meilisearch URL.",
-        suggestion: ["http://127.0.0.1:7700/"]
-      },
-      %{
-        key: :private_key,
-        type: :string,
-        description:
-          "Private key for meilisearch authentication, or `nil` to disable private key authentication.",
-        suggestion: [nil]
-      },
-      %{
-        key: :initial_indexing_chunk_size,
-        type: :integer,
-        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",
-        suggestion: [100_000]
-      }
-    ]
-  },
-  %{
-    group: :pleroma,
-    key: Pleroma.Language.LanguageDetector,
-    type: :group,
-    description: "Language detection providers",
-    children: [
-      %{
-        key: :provider,
-        type: :module,
-        suggestions: [
-          Pleroma.Language.LanguageDetector.Fasttext
-        ]
-      },
-      %{
-        group: {:subgroup, Pleroma.Language.LanguageDetector.Fasttext},
-        key: :model,
-        label: "fastText language detection model",
-        type: :string,
-        suggestions: ["/usr/share/fasttext/lid.176.bin"]
-      }
-    ]
-  },
-  %{
-    group: :pleroma,
-    key: Pleroma.Language.Translation,
-    type: :group,
-    description: "Translation providers",
-    children: [
-      %{
-        key: :provider,
-        type: :module,
-        suggestions: [
-          Pleroma.Language.Translation.Deepl,
-          Pleroma.Language.Translation.Libretranslate
-        ]
-      },
-      %{
-        group: {:subgroup, Pleroma.Language.Translation.Deepl},
-        key: :base_url,
-        label: "DeepL base URL",
-        type: :string,
-        suggestions: ["https://api-free.deepl.com", "https://api.deepl.com"]
-      },
-      %{
-        group: {:subgroup, Pleroma.Language.Translation.Deepl},
-        key: :api_key,
-        label: "DeepL API Key",
-        type: :string,
-        suggestions: ["YOUR_API_KEY"]
-      },
-      %{
-        group: {:subgroup, Pleroma.Language.Translation.Libretranslate},
-        key: :base_url,
-        label: "LibreTranslate instance URL",
-        type: :string,
-        suggestions: ["https://libretranslate.com"]
-      },
-      %{
-        group: {:subgroup, Pleroma.Language.Translation.Libretranslate},
-        key: :api_key,
-        label: "LibreTranslate API Key",
-        type: :string,
-        suggestions: ["YOUR_API_KEY"]
-      }
-    ]
   }
 ]

config/dev.exs

@@ -8,7 +8,8 @@ import Config
 # with brunch.io to recompile .js and .css sources.
 config :pleroma, Pleroma.Web.Endpoint,
   http: [
-    port: 4000
+    port: 4000,
+    protocol_options: [max_request_line_length: 8192, max_header_value_length: 8192]
   ],
   protocol: "http",
   debug_errors: true,
@@ -35,8 +36,8 @@ config :pleroma, Pleroma.Emails.Mailer, adapter: Swoosh.Adapters.Local
 # configured to run both http and https servers on
 # different ports.
 
-# Do not include timestamps in development logs
-config :logger, Logger.Backends.Console, format: "$metadata[$level] $message\n"
+# Do not include metadata nor timestamps in development logs
+config :logger, :console, format: "[$level] $message\n"
 
 # Set a higher stacktrace during development. Avoid configuring such
 # in production as building large stacktraces may be expensive.

config/prod.exs

@@ -20,7 +20,6 @@ config :pleroma, Pleroma.Web.Endpoint,
 config :phoenix, serve_endpoints: true
 
 # Do not print debug messages in production
-config :logger, Logger.Backends.Console, level: :info
 config :logger, :console, level: :info
 config :logger, :ex_syslogger, level: :info
 

config/test.exs

@@ -16,7 +16,7 @@ config :pleroma, Pleroma.Captcha,
 
 # Print only warnings and errors during test
 config :logger, :console,
-  level: :warning,
+  level: :warn,
   format: "\n[$level] $message\n"
 
 config :pleroma, :auth, oauth_consumer_strategies: []
@@ -38,10 +38,7 @@ config :pleroma, :instance,
   external_user_synchronization: false,
   static_dir: "test/instance_static/"
 
-config :pleroma, :activitypub,
-  sign_object_fetches: false,
-  follow_handshake_timeout: 0,
-  client_api_enabled: true
+config :pleroma, :activitypub, sign_object_fetches: false, follow_handshake_timeout: 0
 
 # Configure your database
 config :pleroma, Pleroma.Repo,
@@ -52,8 +49,7 @@ config :pleroma, Pleroma.Repo,
   hostname: System.get_env("DB_HOST") || "localhost",
   port: System.get_env("DB_PORT") || "5432",
   pool: Ecto.Adapters.SQL.Sandbox,
-  pool_size: System.schedulers_online() * 2,
-  log: false
+  pool_size: 50
 
 config :pleroma, :dangerzone, override_repo_pool_size: true
 
@@ -65,8 +61,7 @@ config :tesla, adapter: Tesla.Mock
 config :pleroma, :rich_media,
   enabled: false,
   ignore_hosts: [],
-  ignore_tld: ["local", "localdomain", "lan"],
-  max_body: 2_000_000
+  ignore_tld: ["local", "localdomain", "lan"]
 
 config :pleroma, :instance,
   multi_factor_authentication: [
@@ -138,69 +133,10 @@ config :pleroma, :side_effects,
   ap_streamer: Pleroma.Web.ActivityPub.ActivityPubMock,
   logger: Pleroma.LoggerMock
 
-config :pleroma, Pleroma.Search, module: Pleroma.Search.DatabaseSearch
-
-config :pleroma, Pleroma.Search.Meilisearch, url: "http://127.0.0.1:7700/", private_key: nil
-
 # Reduce recompilation time
 # https://dashbit.co/blog/speeding-up-re-compilation-of-elixir-projects
 config :phoenix, :plug_init_mode, :runtime
 
-config :pleroma, :config_impl, Pleroma.UnstubbedConfigMock
-config :pleroma, :datetime_impl, Pleroma.DateTimeMock
-
-config :pleroma, Pleroma.PromEx, disabled: true
-
-# Mox definitions. Only read during compile time.
-config :pleroma, Pleroma.User.Backup, config_impl: Pleroma.UnstubbedConfigMock
-config :pleroma, Pleroma.Uploaders.S3, ex_aws_impl: Pleroma.Uploaders.S3.ExAwsMock
-config :pleroma, Pleroma.Uploaders.S3, config_impl: Pleroma.UnstubbedConfigMock
-config :pleroma, Pleroma.Upload, config_impl: Pleroma.UnstubbedConfigMock
-config :pleroma, Pleroma.Language.LanguageDetector, config_impl: Pleroma.StaticStubbedConfigMock
-config :pleroma, Pleroma.ScheduledActivity, config_impl: Pleroma.UnstubbedConfigMock
-config :pleroma, Pleroma.Web.RichMedia.Helpers, config_impl: Pleroma.StaticStubbedConfigMock
-config :pleroma, Pleroma.Uploaders.IPFS, config_impl: Pleroma.UnstubbedConfigMock
-config :pleroma, Pleroma.Web.Plugs.HTTPSecurityPlug, config_impl: Pleroma.StaticStubbedConfigMock
-config :pleroma, Pleroma.Web.Plugs.HTTPSignaturePlug, config_impl: Pleroma.StaticStubbedConfigMock
-
-config :pleroma, Pleroma.Upload.Filter.AnonymizeFilename,
-  config_impl: Pleroma.StaticStubbedConfigMock
-
-config :pleroma, Pleroma.Upload.Filter.Mogrify, config_impl: Pleroma.StaticStubbedConfigMock
-config :pleroma, Pleroma.Upload.Filter.Mogrify, mogrify_impl: Pleroma.MogrifyMock
-
-config :pleroma, Pleroma.Signature, http_signatures_impl: Pleroma.StubbedHTTPSignaturesMock
-
-peer_module =
-  if String.to_integer(System.otp_release()) >= 25 do
-    :peer
-  else
-    :slave
-  end
-
-config :pleroma, Pleroma.Cluster, peer_module: peer_module
-
-config :pleroma, Pleroma.Application,
-  background_migrators: false,
-  internal_fetch: false,
-  load_custom_modules: false,
-  max_restarts: 100,
-  streamer_registry: false,
-  test_http_pools: true
-
-config :pleroma, Pleroma.Web.Streaming, sync_streaming: true
-
-config :pleroma, Pleroma.Uploaders.Uploader, timeout: 1_000
-
-config :pleroma, Pleroma.Emoji.Loader, test_emoji: true
-
-config :pleroma, Pleroma.Web.RichMedia.Backfill,
-  stream_out: Pleroma.Web.ActivityPub.ActivityPubMock
-
-config :pleroma, Pleroma.Web.Plugs.HTTPSecurityPlug, enable: false
-
-config :pleroma, Pleroma.User.Backup, tempdir: "test/tmp"
-
 if File.exists?("./config/test.secret.exs") do
   import_config "test.secret.exs"
 else

docs/administration/CLI_tasks/config.md

@@ -1,4 +1,4 @@
-# Transferring the config to/from the database
+# Transfering the config to/from the database
 
 {! backend/administration/CLI_tasks/general_cli_task_info.include !}
 
@@ -34,7 +34,7 @@
 
 Options:
 
-- `<path>` - where to save migrated config. E.g. `--path=/tmp`. If file saved into non-standard folder, you must manually copy file into directory where Pleroma can read it. For OTP install path will be `PLEROMA_CONFIG_PATH` or `/etc/pleroma`. For installation from source - `config` directory in the pleroma folder.
+- `<path>` - where to save migrated config. E.g. `--path=/tmp`. If file saved into non standart folder, you must manually copy file into directory where Pleroma can read it. For OTP install path will be `PLEROMA_CONFIG_PATH` or `/etc/pleroma`. For installation from source - `config` directory in the pleroma folder.
 - `<env>` - environment, for which is migrated config. By default is `prod`.
 - To delete transferred settings from database optional flag `-d` can be used
 
@@ -154,19 +154,4 @@ This forcibly removes all saved values in the database.
 
     ```sh
     mix pleroma.config [--force] reset
-
     ```
-
-## Remove invalid MRF modules from the database
-
-This forcibly removes any enabled MRF that does not exist and will fix the ability of the instance to start.
-
-=== "OTP"
-    ```sh
-    ./bin/pleroma_ctl config fix_mrf_policies
-    ```
-
-=== "From Source"
-    ```sh
-    mix pleroma.config fix_mrf_policies
-    ```

docs/administration/CLI_tasks/database.md

@@ -21,18 +21,16 @@ Replaces embedded objects with references to them in the `objects` table. Only n
     mix pleroma.database remove_embedded_objects [option ...]
     ```
 
+
 ### Options
 - `--vacuum` - run `VACUUM FULL` after the embedded objects are replaced with their references
 
 ## Prune old remote posts from the database
 
-This will prune remote posts older than 90 days (configurable with [`config :pleroma, :instance, remote_post_retention_days`](../../configuration/cheatsheet.md#instance)) from the database. Pruned posts may be refetched in some cases.
-
-!!! note
-    The disk space will only be reclaimed after a proper vacuum. By default Postgresql does this for you on a regular basis, but if your instance has been running for a long time and there are many rows deleted, it may be advantageous to use `VACUUM FULL` (e.g. by using the `--vacuum` option).
+This will prune remote posts older than 90 days (configurable with [`config :pleroma, :instance, remote_post_retention_days`](../../configuration/cheatsheet.md#instance)) from the database, they will be refetched from source when accessed.
 
 !!! danger
-    You may run out of disk space during the execution of the task or vacuuming if you don't have about 1/3rds of the database size free. Vacuum causes a substantial increase in I/O traffic, and may lead to a degraded experience while it is running.
+    The disk space will only be reclaimed after `VACUUM FULL`. You may run out of disk space during the execution of the task or vacuuming if you don't have about 1/3rds of the database size free.
 
 === "OTP"
 
@@ -47,11 +45,7 @@ This will prune remote posts older than 90 days (configurable with [`config :ple
     ```
 
 ### Options
-
-- `--keep-threads` - Don't prune posts when they are part of a thread where at least one post has seen local interaction (e.g. one of the posts is a local post, or is favourited by a local user, or has been repeated by a local user...). It also won't delete posts when at least one of the posts in that thread is kept (e.g. because one of the posts has seen recent activity).
-- `--keep-non-public` - Keep non-public posts like DM's and followers-only, even if they are remote.
-- `--prune-orphaned-activities` - Also prune orphaned activities afterwards. Activities are things like Like, Create, Announce, Flag (aka reports). They can significantly help reduce the database size.  Note: this can take a very long time.
-- `--vacuum` - Run `VACUUM FULL` after the objects are pruned. This should not be used on a regular basis, but is useful if your instance has been running for a long time before pruning.
+- `--vacuum` - run `VACUUM FULL` after the objects are pruned
 
 ## Create a conversation for all existing DMs
 
@@ -99,9 +93,6 @@ Can be safely re-run
 
 ## Vacuum the database
 
-!!! note
-    By default Postgresql has an autovacuum deamon running. While the tasks described here can help in some cases, they shouldn't be needed on a regular basis. See [the Postgresql docs on vacuuming](https://www.postgresql.org/docs/current/sql-vacuum.html) for more information on this.
-
 ### Analyze
 
 Running an `analyze` vacuum job can improve performance by updating statistics used by the query planner. **It is safe to cancel this.**

docs/administration/backup.md

@@ -31,7 +31,7 @@
 
 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 Pleroma service `systemctl stop pleroma`
 3. Disable pleroma from systemd `systemctl disable pleroma`
 4. Remove the files and folders you created during installation (see installation guide). This includes the pleroma, nginx and systemd files and folders.

docs/configuration/cheatsheet.md

@@ -41,7 +41,6 @@ To add configuration to your config file, you can copy it from the base config.
 * `allow_relay`: Permits remote instances to subscribe to all public posts of your instance. This may increase the visibility of your instance.
 * `public`: Makes the client API in authenticated mode-only except for user-profiles. Useful for disabling the Local Timeline and The Whole Known Network. Note that there is a dependent setting restricting or allowing unauthenticated access to specific resources, see `restrict_unauthenticated` for more details.
 * `quarantined_instances`: ActivityPub instances where private (DMs, followers-only) activities will not be send.
-* `rejected_instances`: ActivityPub instances to reject requests from if authorized_fetch_mode is enabled.
 * `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
     older software for theses nicknames.
@@ -98,7 +97,7 @@ To add configuration to your config file, you can copy it from the base config.
 * `moderator_privileges`: A list of privileges a moderator has (e.g. delete messages, manage reports...)
     * Possible values are the same as for `admin_privileges`
 
-## :features
+## :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).
 
 ## Background migrations
@@ -155,15 +154,14 @@ To add configuration to your config file, you can copy it from the base config.
     * `Pleroma.Web.ActivityPub.MRF.MentionPolicy`: Drops posts mentioning configurable users. (See [`:mrf_mention`](#mrf_mention)).
     * `Pleroma.Web.ActivityPub.MRF.VocabularyPolicy`: Restricts activities to a configured set of vocabulary. (See [`:mrf_vocabulary`](#mrf_vocabulary)).
     * `Pleroma.Web.ActivityPub.MRF.ObjectAgePolicy`: Rejects or delists posts based on their age when received. (See [`:mrf_object_age`](#mrf_object_age)).
-    * `Pleroma.Web.ActivityPub.MRF.ActivityExpirationPolicy`: Sets a default expiration on all posts made by users of the local instance. Requires `Pleroma.Workers.PurgeExpiredActivity` to be enabled for processing the scheduled deletions.
+    * `Pleroma.Web.ActivityPub.MRF.ActivityExpirationPolicy`: Sets a default expiration on all posts made by users of the local instance. Requires `Pleroma.Workers.PurgeExpiredActivity` to be enabled for processing the scheduled delections.
     * `Pleroma.Web.ActivityPub.MRF.ForceBotUnlistedPolicy`: Makes all bot posts to disappear from public timelines.
     * `Pleroma.Web.ActivityPub.MRF.FollowBotPolicy`: Automatically follows newly discovered users from the specified bot account. Local accounts, locked accounts, and users with "#nobot" in their bio are respected and excluded from being followed.
     * `Pleroma.Web.ActivityPub.MRF.AntiFollowbotPolicy`: Drops follow requests from followbots. Users can still allow bots to follow them by first following the bot.
     * `Pleroma.Web.ActivityPub.MRF.KeywordPolicy`: Rejects or removes from the federated timeline or replaces keywords. (See [`:mrf_keyword`](#mrf_keyword)).
     * `Pleroma.Web.ActivityPub.MRF.ForceMentionsInContent`: Forces every mentioned user to be reflected in the post content.
     * `Pleroma.Web.ActivityPub.MRF.InlineQuotePolicy`: Forces quote post URLs to be reflected in the message content inline.
-    * `Pleroma.Web.ActivityPub.MRF.QuoteToLinkTagPolicy`: Force a Link tag for posts quoting another post. (may break outgoing federation of quote posts with older Pleroma versions).
-    * `Pleroma.Web.ActivityPub.MRF.ForceMention`: Forces posts to include a mention of the author of parent post or the author of quoted post.
+    * `Pleroma.Web.ActivityPub.MRF.QuoteToLinkTagPolicy`: Force a Link tag for posts quoting another post. (may break outgoing federation of quote posts with older Pleroma versions)
 * `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.
 
@@ -274,10 +272,6 @@ Notes:
 #### :mrf_inline_quote
 * `template`: The template to append to the post. `{url}` will be replaced with the actual link to the quoted post. Default: `<bdi>RT:</bdi> {url}`
 
-#### :mrf_force_mention
-* `mention_parent`: Whether to append mention of parent post author
-* `mention_quoted`: Whether to append mention of parent quoted author
-
 ### :activitypub
 * `unfollow_blocked`: Whether blocks result in people getting unfollowed
 * `outgoing_blocks`: Whether to federate blocks to other instances
@@ -285,7 +279,6 @@ Notes:
 * `deny_follow_blocked`: Whether to disallow following an account that has blocked the user in question
 * `sign_object_fetches`: Sign object fetches with HTTP signatures
 * `authorized_fetch_mode`: Require HTTP signatures for AP fetches
-* `authorized_fetch_mode_exceptions`: List of IPs (CIDR format accepted) to exempt from HTTP Signatures requirement (for example to allow debugging, you shouldn't otherwise need this)
 
 ## Pleroma.User
 
@@ -436,7 +429,7 @@ config :pleroma, Pleroma.Web.MediaProxy.Invalidation.Http,
 * `ignore_hosts`: list of hosts which will be ignored by the metadata parser. For example `["accounts.google.com", "xss.website"]`, defaults to `[]`.
 * `ignore_tld`: list TLDs (top-level domains) which will ignore for parse metadata. default is ["local", "localdomain", "lan"].
 * `parsers`: list of Rich Media parsers.
-* `timeout`: Amount of milliseconds after which the HTTP request is forcibly terminated.
+* `failure_backoff`: Amount of milliseconds after request failure, during which the request will not be retried.
 
 ## HTTP server
 
@@ -474,7 +467,6 @@ This will make Pleroma listen on `127.0.0.1` port `8080` and generate urls start
 * ``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.
-* `allow_unsafe_eval`: Adds `wasm-unsafe-eval` to the CSP header. Needed for some non-essential frontend features like Flash emulation.
 
 ### Pleroma.Web.Plugs.RemoteIp
 
@@ -514,7 +506,7 @@ config :pleroma, :rate_limit,
 Means that:
 
 1. In 60 seconds, 15 authentication attempts can be performed from the same IP address.
-2. In 1 second, 10 search requests can be performed from the same IP address by unauthenticated users, while authenticated users can perform 30 search requests per second.
+2. In 1 second, 10 search requests can be performed from the same IP adress by unauthenticated users, while authenticated users can perform 30 search requests per second.
 
 Supported rate limiters:
 
@@ -664,19 +656,6 @@ config :ex_aws, :s3,
   host: "s3.eu-central-1.amazonaws.com"
 ```
 
-#### Pleroma.Uploaders.IPFS
-
-* `post_gateway_url`: URL with port of POST Gateway (unauthenticated)
-* `get_gateway_url`: URL of public GET Gateway
-
-Example:
-
-```elixir
-config :pleroma, Pleroma.Uploaders.IPFS,
-  post_gateway_url: "http://localhost:5001",
-  get_gateway_url: "http://{CID}.ipfs.mydomain.com"
-```
-
 ### Upload filters
 
 #### Pleroma.Upload.Filter.AnonymizeFilename
@@ -742,21 +721,6 @@ config :pleroma, Pleroma.Emails.Mailer,
   auth: :always
 ```
 
-An example for Mua adapter:
-
-```elixir
-config :pleroma, Pleroma.Emails.Mailer,
-  enabled: true,
-  adapter: Swoosh.Adapters.Mua,
-  relay: "mail.example.com",
-  port: 465,
-  auth: [
-    username: "YOUR_USERNAME@domain.tld",
-    password: "YOUR_SMTP_PASSWORD"
-  ],
-  protocol: :ssl
-```
-
 ### :email_notifications
 
 Email notifications settings.
@@ -868,7 +832,7 @@ config :logger,
   backends: [{ExSyslogger, :ex_syslogger}]
 
 config :logger, :ex_syslogger,
-  level: :warning
+  level: :warn
 ```
 
 Another example, keeping console output and adding the pid to syslog output:
@@ -877,7 +841,7 @@ config :logger,
   backends: [:console, {ExSyslogger, :ex_syslogger}]
 
 config :logger, :ex_syslogger,
-  level: :warning,
+  level: :warn,
   option: [:pid, :ndelay]
 ```
 
@@ -983,13 +947,12 @@ Pleroma account will be created with the same name as the LDAP user name.
 * `enabled`: enables LDAP authentication
 * `host`: LDAP server hostname
 * `port`: LDAP port, e.g. 389 or 636
-* `ssl`: true to use implicit SSL/TLS, usually port 636
+* `ssl`: true to use SSL, usually implies the port 636
 * `sslopts`: additional SSL options
-* `tls`: true to use explicit TLS (STARTTLS), usually port 389
+* `tls`: true to start TLS, usually implies the port 389
 * `tlsopts`: additional TLS options
 * `base`: LDAP base, e.g. "dc=example,dc=com"
 * `uid`: LDAP attribute name to authenticate the user, e.g. when "cn", the filter will be "cn=username,base"
-* `cacertfile`: Path to alternate CA root certificates file
 
 Note, if your LDAP server is an Active Directory server the correct value is commonly `uid: "cn"`, but if you use an
 OpenLDAP server the value may be `uid: "uid"`.
@@ -1118,7 +1081,7 @@ config :pleroma, Pleroma.Formatter,
 
 ## :configurable_from_database
 
-Boolean, enables/disables in-database configuration. Read [Transferring the config to/from the database](../administration/CLI_tasks/config.md) for more information.
+Boolean, enables/disables in-database configuration. Read [Transfering the config to/from the database](../administration/CLI_tasks/config.md) for more information.
 
 ## :database_config_whitelist
 
@@ -1179,7 +1142,7 @@ Control favicons for instances.
 !!! note
     Requires enabled email
 
-* `:purge_after_days` an integer, remove backup achieves after N days.
+* `:purge_after_days` an integer, remove backup achives after N days.
 * `:limit_days` an integer, limit user to export not more often than once per N days.
 * `:dir` a string with a path to backup temporary directory or `nil` to let Pleroma choose temporary directory in the following order:
     1. the directory named by the TMPDIR environment variable
@@ -1187,7 +1150,6 @@ Control favicons for instances.
     3. the directory named by the TMP environment variable
     4. C:\TMP on Windows or /tmp on Unix-like operating systems
     5. as a last resort, the current working directory
-* `:timeout` an integer representing seconds
 
 ## Frontend management
 

docs/configuration/custom_emoji.md

@@ -29,7 +29,7 @@ foo, /emoji/custom/foo.png
 
 The files should be PNG (APNG is okay with `.png` for `image/png` Content-type) and under 50kb for compatibility with mastodon.
 
-Default file extensions and locations for emojis are set in `config.exs`. To use different locations or file-extensions, add the `shortcode_globs` to your secrets file (`prod.secret.exs` or `dev.secret.exs`) and edit it. Note that not all fediverse-software will show emojis with other file extensions:
+Default file extentions and locations for emojis are set in `config.exs`. To use different locations or file-extentions, add the `shortcode_globs` to your secrets file (`prod.secret.exs` or `dev.secret.exs`) and edit it. Note that not all fediverse-software will show emojis with other file extentions:
 ```elixir
 config :pleroma, :emoji, shortcode_globs: ["/emoji/custom/**/*.png", "/emoji/custom/**/*.gif"]
 ```

docs/configuration/i2p.md

@@ -1,4 +1,4 @@
-# I2P Federation and Accessibility
+# I2P Federation and Accessability
 
 This guide is going to focus on the Pleroma federation aspect. The actual installation is neatly explained in the official documentation, and more likely to remain up-to-date.
 It might be added to this guide if there will be a need for that.

docs/configuration/onion_federation.md

@@ -29,7 +29,7 @@ HiddenServiceDir /var/lib/tor/pleroma_hidden_service/
 HiddenServicePort 80 127.0.0.1:8099
 HiddenServiceVersion 3  # Remove if Tor version is below 0.3 ( tor --version )
 ```
-Restart Tor to generate an address:
+Restart Tor to generate an adress:
 ```
 systemctl restart tor@default.service
 ```

docs/configuration/optimizing_beam.md

@@ -1,6 +1,6 @@
 # Optimizing the BEAM
 
-Pleroma is built upon the Erlang/OTP VM known as BEAM. The BEAM VM is highly optimized for latency, but this has drawbacks in environments without dedicated hardware. One of the tricks used by the BEAM VM is [busy waiting](https://en.wikipedia.org/wiki/Busy_waiting). This allows the application to pretend to be busy working so the OS kernel does not pause the application process and switch to another process waiting for the CPU to execute its workload. It does this by spinning for a period of time which inflates the apparent CPU usage of the application so it is immediately ready to execute another task. This can be observed with utilities like **top(1)** which will show consistently high CPU usage for the process. Switching between processes is a rather expensive operation and also clears CPU caches further affecting latency and performance. The goal of busy waiting is to avoid this penalty.
+Pleroma is built upon the Erlang/OTP VM known as BEAM. The BEAM VM is highly optimized for latency, but this has drawbacks in environments without dedicated hardware. One of the tricks used by the BEAM VM is [busy waiting](https://en.wikipedia.org/wiki/Busy_waiting). This allows the application to pretend to be busy working so the OS kernel does not pause the application process and switch to another process waiting for the CPU to execute its workload. It does this by spinning for a period of time which inflates the apparent CPU usage of the application so it is immediately ready to execute another task. This can be observed with utilities like **top(1)** which will show consistently high CPU usage for the process. Switching between procesess is a rather expensive operation and also clears CPU caches further affecting latency and performance. The goal of busy waiting is to avoid this penalty.
 
 This strategy is very successful in making a performant and responsive application, but is not desirable on Virtual Machines or hardware with few CPU cores. Pleroma instances are often deployed on the same server as the required PostgreSQL database which can lead to situations where the Pleroma application is holding the CPU in a busy-wait loop and as a result the database cannot process requests in a timely manner. The fewer CPUs available, the more this problem is exacerbated. The latency is further amplified by the OS being installed on a Virtual Machine as the Hypervisor uses CPU time-slicing to pause the entire OS and switch between other tasks.
 

docs/configuration/postgresql.md

@@ -22,7 +22,7 @@ config :pleroma, Pleroma.Repo,
   ]
 ```
 
-A more detailed explanation of the issue can be found at <https://blog.soykaf.com/post/postgresql-elixir-troubles/>.
+A more detailed explaination of the issue can be found at <https://blog.soykaf.com/post/postgresql-elixir-troubles/>.
 
 ## Example configurations
 

docs/configuration/search.md

@@ -1,147 +0,0 @@
-# Configuring search
-
-{! backend/administration/CLI_tasks/general_cli_task_info.include !}
-
-## Built-in search
-
-To use built-in search that has no external dependencies, set the search module to `Pleroma.Activity`:
-
-> config :pleroma, Pleroma.Search, module: Pleroma.Search.DatabaseSearch
-
-While it has no external dependencies, it has problems with performance and relevancy.
-
-## QdrantSearch
-
-This uses the vector search engine [Qdrant](https://qdrant.tech) to search the posts in a vector space. This needs a way to generate embeddings and uses the [OpenAI API](https://platform.openai.com/docs/guides/embeddings/what-are-embeddings). This is implemented by several project besides OpenAI itself, including the python-based fastembed-server found in `supplemental/search/fastembed-api`.
-
-The default settings will support a setup where both the fastembed server and Qdrant run on the same system as pleroma. To use it, set the search provider and run the fastembed server, see the README in `supplemental/search/fastembed-api`:
-
-> config :pleroma, Pleroma.Search, module: Pleroma.Search.QdrantSearch
-
-Then, start the Qdrant server, see [here](https://qdrant.tech/documentation/quick-start/) for instructions.
-
-You will also need to create the Qdrant index once by running `mix pleroma.search.indexer create_index`. Running `mix pleroma.search.indexer index` will retroactively index the last 100_000 activities.
-
-### Indexing and model options
-
-To see the available configuration options, check out the QdrantSearch section in `config/config.exs`.
-
-The default indexing option work for the default model (`snowflake-arctic-embed-xs`). To optimize for a low memory footprint, adjust the index configuration as described in the [Qdrant docs](https://qdrant.tech/documentation/guides/optimize/). See also [this blog post](https://qdrant.tech/articles/memory-consumption/) that goes into detail.
-
-Different embedding models will need different vector size settings. You can see a list of the models supported by the fastembed server [here](https://qdrant.github.io/fastembed/examples/Supported_Models), including their vector dimensions. These vector dimensions need to be set in the `qdrant_index_configuration`. 
-
-E.g, If you want to use `sentence-transformers/all-MiniLM-L6-v2` as a model, you will not need to adjust things, because it and `snowflake-arctic-embed-xs` are both 384 dimensional models. If you want to use `snowflake/snowflake-arctic-embed-l`, you will need to adjust the `size` parameter in the `qdrant_index_configuration` to 1024, as it has a dimension of 1024.
-
-When using a different model, you will need do drop the index and recreate it (`mix pleroma.search.indexer drop_index` and `mix pleroma.search.indexer create_index`), as the different embeddings are not compatible with each other.
-
-## Meilisearch
-
-Note that it's quite a bit more memory hungry than PostgreSQL (around 4-5G for ~1.2 million
-posts while idle and up to 7G while indexing initially). The disk usage for this additional index is also
-around 4 gigabytes. Like [RUM](./cheatsheet.md#rum-indexing-for-full-text-search) indexes, it offers considerably
-higher performance and ordering by timestamp in a reasonable amount of time.
-Additionally, the search results seem to be more accurate.
-
-Due to high memory usage, it may be best to set it up on a different machine, if running pleroma on a low-resource
-computer, and use private key authentication to secure the remote search instance.
-
-To use [meilisearch](https://www.meilisearch.com/), set the search module to `Pleroma.Search.Meilisearch`:
-
-> config :pleroma, Pleroma.Search, module: Pleroma.Search.Meilisearch
-
-You then need to set the address of the meilisearch instance, and optionally the private key for authentication. You might
-also want to change the `initial_indexing_chunk_size` to be smaller if you're server is not very powerful, but not higher than `100_000`,
-because meilisearch will refuse to process it if it's too big. However, in general you want this to be as big as possible, because meilisearch
-indexes faster when it can process many posts in a single batch.
-
-> config :pleroma, Pleroma.Search.Meilisearch,
->    url: "http://127.0.0.1:7700/",
->    private_key: "private key",
->    initial_indexing_chunk_size: 100_000
-
-Information about setting up meilisearch can be found in the
-[official documentation](https://docs.meilisearch.com/learn/getting_started/installation.html).
-You probably want to start it with `MEILI_NO_ANALYTICS=true` environment variable to disable analytics.
-At least version 0.25.0 is required, but you are strongly advised to use at least 0.26.0, as it introduces
-the `--enable-auto-batching` option which drastically improves performance. Without this option, the search
-is hardly usable on a somewhat big instance.
-
-### Private key authentication (optional)
-
-To set the private key, use the `MEILI_MASTER_KEY` environment variable when starting. After setting the _master key_,
-you have to get the _private key_, which is actually used for authentication.
-
-=== "OTP"
-    ```sh
-    ./bin/pleroma_ctl search.meilisearch show-keys <your master key here>
-    ```
-
-=== "From Source"
-    ```sh
-    mix pleroma.search.meilisearch show-keys <your master key here>
-    ```
-
-You will see a "Default Admin API Key", this is the key you actually put into your configuration file.
-
-### Initial indexing
-
-After setting up the configuration, you'll want to index all of your already existing 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. This is also a fairly RAM
-consuming process for `meilisearch`, and it will take a lot of RAM when running if you have a lot of posts (seems to be around 5G for ~1.2
-million posts while idle and up to 7G while indexing initially, but your experience may be different).
-
-The sequence of actions is as follows:
-
-1. First, change the configuration to use `Pleroma.Search.Meilisearch` as the search backend
-2. Restart your instance, at this point it can be used while the search indexing is running, though search won't return anything
-3. Start the initial indexing process (as described below with `index`),
-   and wait until the task says it sent everything from the database to index
-4. Wait until everything is actually indexed (by checking with `stats` as described below),
-   at this point you don't have to do anything, just wait a while.
-
-To start the initial indexing, run the `index` command:
-
-=== "OTP"
-    ```sh
-    ./bin/pleroma_ctl search.meilisearch index
-    ```
-
-=== "From Source"
-    ```sh
-    mix pleroma.search.meilisearch index
-    ```
-
-This will show you the total amount of posts to index, and then show you the amount of posts indexed currently, until the numbers eventually
-become the same. The posts are indexed in big batches and meilisearch will take some time to actually index them, even after you have
-inserted all the posts into it. Depending on the amount of posts, this may be as long as several hours. To get information about the status
-of indexing and how many posts have actually been indexed, use the `stats` command:
-
-=== "OTP"
-    ```sh
-    ./bin/pleroma_ctl search.meilisearch stats
-    ```
-
-=== "From Source"
-    ```sh
-    mix pleroma.search.meilisearch stats
-    ```
-
-### Clearing the index
-
-In case you need to clear the index (for example, to re-index from scratch, if that needs to happen for some reason), you can
-use the `clear` command:
-
-=== "OTP"
-    ```sh
-    ./bin/pleroma_ctl search.meilisearch clear
-    ```
-
-=== "From Source"
-    ```sh
-    mix pleroma.search.meilisearch clear
-    ```
-
-This will clear **all** the posts from the search index. Note, that deleted posts are also removed from index by the instance itself, so
-there is no need to actually clear the whole index, unless you want **all** of it gone. That said, the index does not hold any information
-that cannot be re-created from the database, it should also generally be a lot smaller than the size of your database. Still, the size
-depends on the amount of text in posts.

docs/development/API/admin_api.md

@@ -303,7 +303,7 @@ Removes the user(s) from follower recommendations.
 
 ## `GET /api/v1/pleroma/admin/users/:nickname_or_id`
 
-### Retrieve the details of a user
+### Retrive the details of a user
 
 - Params:
   - `nickname` or `id`
@@ -313,7 +313,7 @@ Removes the user(s) from follower recommendations.
 
 ## `GET /api/v1/pleroma/admin/users/:nickname_or_id/statuses`
 
-### Retrieve user's latest statuses
+### Retrive user's latest statuses
 
 - Params:
   - `nickname` or `id`
@@ -337,7 +337,7 @@ Removes the user(s) from follower recommendations.
 
 ## `GET /api/v1/pleroma/admin/instances/:instance/statuses`
 
-### Retrieve instance's latest statuses
+### Retrive instance's latest statuses
 
 - Params:
   - `instance`: instance name
@@ -377,7 +377,7 @@ It may take some time.
 
 ## `GET /api/v1/pleroma/admin/statuses`
 
-### Retrieves all latest statuses
+### Retrives all latest statuses
 
 - Params:
   - *optional* `page_size`: number of statuses to return (default is `20`)
@@ -433,7 +433,7 @@ Response:
 * On success: URL of the unfollowed relay
 
 ```json
-"https://example.com/relay"
+{"https://example.com/relay"}
 ```
 
 ## `POST /api/v1/pleroma/admin/users/invite_token`
@@ -541,7 +541,7 @@ Response:
 
 ## `PATCH /api/v1/pleroma/admin/users/force_password_reset`
 
-### Force password reset for a user with a given nickname
+### Force passord reset for a user with a given nickname
 
 - Params:
   - `nicknames`
@@ -1193,23 +1193,20 @@ Loads json generated from `config/descriptions.exs`.
 - Response:
 
 ```json
-{
-  "items": [
-    {
-      "id": 1234,
-      "data": {
-        "actor": {
-          "id": 1,
-          "nickname": "lain"
-        },
-        "action": "relay_follow"
+[
+  {
+    "id": 1234,
+    "data": {
+      "actor": {
+        "id": 1,
+        "nickname": "lain"
       },
-      "time": 1502812026, // timestamp
-      "message": "[2017-08-15 15:47:06] @nick0 followed relay: https://example.org/relay" // log message
-    }
-  ],
-  "total": 1
-}
+      "action": "relay_follow"
+    },
+    "time": 1502812026, // timestamp
+    "message": "[2017-08-15 15:47:06] @nick0 followed relay: https://example.org/relay" // log message
+  }
+]
 ```
 
 ## `POST /api/v1/pleroma/admin/reload_emoji`
@@ -1754,53 +1751,3 @@ Note that this differs from the Mastodon API variant: Mastodon API only returns
 ```json
 {}
 ```
-
-
-## `GET /api/v1/pleroma/admin/rules`
-
-### List rules
-
-- Response: JSON, list of rules
-
-```json
-[
-  {
-    "id": "1",
-    "priority": 1,
-    "text": "There are no rules",
-    "hint": null
-  }
-]
-```
-
-## `POST /api/v1/pleroma/admin/rules`
-
-### Create a rule
-
-- Params:
-  - `text`: string, required, rule content
-  - `hint`: string, optional, rule description
-  - `priority`: integer, optional, rule ordering priority
-
-- Response: JSON, a single rule
-
-## `PATCH /api/v1/pleroma/admin/rules/:id`
-
-### Update a rule
-
-- Params:
-  - `text`: string, optional, rule content
-  - `hint`: string, optional, rule description
-  - `priority`: integer, optional, rule ordering priority
-
-- Response: JSON, a single rule
-
-## `DELETE /api/v1/pleroma/admin/rules/:id`
-
-### Delete a rule
-
-- Response: JSON, empty object
-
-```json
-{}
-```

docs/development/API/differences_in_mastoapi_responses.md

@@ -1,6 +1,6 @@
 # Differences in Mastodon API responses from vanilla Mastodon
 
-A Pleroma instance can be identified by "<Mastodon version> (compatible; Pleroma <version>)" present in `version` field in response from `/api/v1/instance` and `/api/v2/instance`
+A Pleroma instance can be identified by "<Mastodon version> (compatible; Pleroma <version>)" present in `version` field in response from `/api/v1/instance`
 
 ## Flake IDs
 
@@ -39,10 +39,6 @@ Has these additional fields under the `pleroma` object:
 - `emoji_reactions`: A list with emoji / reaction maps. The format is `{name: "☕", count: 1, me: true}`. Contains no information about the reacting users, for that use the `/statuses/:id/reactions` endpoint.
 - `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.
-- `quotes_count`: the count of status quotes.
-- `non_anonymous`: true if the source post specifies the poll results are not anonymous. Currently only implemented by Smithereen.
-- `bookmark_folder`: the ID of the folder bookmark is stored within (if any).
-- `list_id`: the ID of the list the post is addressed to (if any, only returned to author).
 
 The `GET /api/v1/statuses/:id/source` endpoint additionally has the following attributes:
 
@@ -68,12 +64,6 @@ Some apps operate under the assumption that no more than 4 attachments can be re
 
 Pleroma does not process remote images and therefore cannot include fields such as `meta` and `blurhash`. It does not support focal points or aspect ratios. The frontend is expected to handle it.
 
-## Bookmarks
-
-The `GET /api/v1/bookmarks` endpoint accepts optional parameter `folder_id` for bookmark folder ID.
-
-The `POST /api/v1/statuses/:id/bookmark` endpoint accepts optional parameter `folder_id` for bookmark folder ID.
-
 ## Accounts
 
 The `id` parameter can also be the `nickname` of the user. This only works in these endpoints, not the deeper nested ones for following etc.
@@ -104,7 +94,7 @@ Has these additional fields under the `pleroma` object:
 - `background_image`: nullable URL string, background image of the user
 - `tags`: Lists an array of tags for the user
 - `relationship` (object): Includes fields as documented for Mastodon API https://docs.joinmastodon.org/entities/relationship/
-- `is_moderator`: boolean, nullable, true if user is a moderator
+- `is_moderator`: boolean, nullable,  true if user is a moderator
 - `is_admin`: boolean, nullable, true if user is an admin
 - `confirmation_pending`: boolean, true if a new user account is waiting on email confirmation to be activated
 - `hide_favorites`: boolean, true when the user has hiding favorites enabled
@@ -121,8 +111,6 @@ Has these additional fields under the `pleroma` object:
 - `notification_settings`: object, can be absent. See `/api/v1/pleroma/notification_settings` for the parameters/keys returned.
 - `accepts_chat_messages`: boolean, but can be null if we don't have that information about a user
 - `favicon`: nullable URL string, Favicon image of the user's instance
-- `avatar_description`: string, image description for user avatar, defaults to empty string
-- `header_description`: string, image description for user banner, defaults to empty string
 
 ### Source
 
@@ -258,8 +246,6 @@ Additional parameters can be added to the JSON body/Form data:
 - `actor_type` - the type of this account.
 - `accepts_chat_messages` - if false, this account will reject all chat messages.
 - `language` - user's preferred language for receiving emails (digest, confirmation, etc.)
-- `avatar_description` - image description for user avatar
-- `header_description` - image description for user banner
 
 All images (avatar, banner and background) can be reset to the default by sending an empty string ("") instead of a file.
 
@@ -318,27 +304,19 @@ Has these additional parameters (which are the same as in Pleroma-API):
 `GET /api/v1/instance` has additional fields
 
 - `max_toot_chars`: The maximum characters per post
-- `max_media_attachments`: Maximum number of post media attachments
 - `chat_limit`: The maximum characters per chat message
 - `description_limit`: The maximum characters per image description
 - `poll_limits`: The limits of polls
-- `shout_limit`: The maximum characters per Shoutbox message
 - `upload_limit`: The maximum upload file size
 - `avatar_upload_limit`: The same for avatars
 - `background_upload_limit`: The same for backgrounds
 - `banner_upload_limit`: The same for banners
 - `background_image`: A background image that frontends can use
-- `pleroma.metadata.account_activation_required`: Whether users are required to confirm their emails before signing in
-- `pleroma.metadata.birthday_required`: Whether users are required to provide their birth day when signing in
-- `pleroma.metadata.birthday_min_age`: The minimum user age (in days)
 - `pleroma.metadata.features`: A list of supported features
 - `pleroma.metadata.federation`: The federation restrictions of this instance
 - `pleroma.metadata.fields_limits`: A list of values detailing the length and count limitation for various instance-configurable fields.
 - `pleroma.metadata.post_formats`: A list of the allowed post format types
-- `pleroma.stats.mau`: Monthly active user count
-- `pleroma.vapid_public_key`: The public key needed for push messages
-
-In, `GET /api/v2/instance` Pleroma-specific fields are all moved into `pleroma` object. `max_toot_chars`, `poll_limits` and `upload_limit` are replaced with their MastoAPI counterparts.
+- `vapid_public_key`: The public key needed for push messages
 
 ## Push Subscription
 
@@ -515,6 +493,12 @@ Pleroma is generally compatible with the Mastodon 2.7.2 API, but some newer feat
 
 - `GET /api/v1/trends`: Returns an empty array, `[]`
 
+### Identity proofs
+
+*Added in Mastodon 2.8.0*
+
+- `GET /api/v1/identity_proofs`: Returns an empty array, `[]`
+
 ### Featured tags
 
 *Added in Mastodon 3.0.0*

docs/development/API/pleroma_api.md

@@ -129,7 +129,7 @@ The `/api/v1/pleroma/*` path is backwards compatible with `/api/pleroma/*` (`/ap
 * method: `GET`
 * Authentication: required
 * OAuth scope: `write:security`
-* Response: JSON. Returns `{"codes": codes}` when successful, otherwise HTTP 422 `{"error": "[error message]"}`
+* Response: JSON. Returns `{"codes": codes}`when successful, otherwise HTTP 422 `{"error": "[error message]"}`
 
 ## `/api/v1/pleroma/admin/`
 See [Admin-API](admin_api.md)
@@ -145,9 +145,6 @@ See [Admin-API](admin_api.md)
 
 ## `/api/v1/pleroma/accounts/:id/subscribe`
 ### Subscribe to receive notifications for all statuses posted by a user
-
-Deprecated. `notify` parameter in `POST /api/v1/accounts/:id/follow` should be used instead.
-
 * Method `POST`
 * Authentication: required
 * Params:
@@ -174,9 +171,6 @@ Deprecated. `notify` parameter in `POST /api/v1/accounts/:id/follow` should be u
 
 ## `/api/v1/pleroma/accounts/:id/unsubscribe`
 ### Unsubscribe to stop receiving notifications from user statuses
-
-Deprecated. `notify` parameter in `POST /api/v1/accounts/:id/follow` should be used instead.
-
 * Method `POST`
 * Authentication: required
 * Params:
@@ -257,15 +251,6 @@ Deprecated. `notify` parameter in `POST /api/v1/accounts/:id/follow` should be u
 ]
 ```
 
-
-## `/api/v1/pleroma/accounts/:id/endorsements`
-### Returns users endorsed by a user
-* Method `GET`
-* Authentication: not required
-* Params:
-    * `id`: the id of the account for whom to return results
-* Response: JSON, returns a list of Mastodon Account entities
-
 ## `/api/v1/pleroma/accounts/update_*`
 ### Set and clear account avatar, banner, and background
 
@@ -281,58 +266,6 @@ Deprecated. `notify` parameter in `POST /api/v1/accounts/:id/follow` should be u
 * Authentication: not required
 * Response: 204 No Content
 
-## `/api/v1/pleroma/statuses/:id/quotes`
-### Gets quotes for a given status
-* Method `GET`
-* Authentication: not required
-* Params:
-    * `id`: the id of the status
-* Response: JSON, returns a list of Mastodon Status entities
-
-## `GET /api/v1/pleroma/bookmark_folders`
-### Gets user bookmark folders
-* Authentication: required
-
-* Response: JSON. Returns a list of bookmark folders.
-* Example response:
-```json
-[
-    {
-        "id": "9umDrYheeY451cQnEe",
-        "name": "Read later",
-        "emoji": "🕓",
-        "emoji_url": null
-    }
-]
-```
-
-## `POST /api/v1/pleroma/bookmark_folders`
-### Creates a bookmark folder
-* Authentication: required
-
-* Params:
-    * `name`: folder name
-    * `emoji`: folder emoji (optional)
-* Response: JSON. Returns a single bookmark folder.
-
-## `PATCH /api/v1/pleroma/bookmark_folders/:id`
-### Updates a bookmark folder
-* Authentication: required
-
-* Params:
-    * `id`: folder id
-    * `name`: folder name (optional)
-    * `emoji`: folder emoji (optional)
-* Response: JSON. Returns a single bookmark folder.
-
-## `DELETE /api/v1/pleroma/bookmark_folders/:id`
-### Deletes a bookmark folder
-* Authentication: required
-
-* Params:
-    * `id`: folder id
-* Response: JSON. Returns a single bookmark folder.
-
 ## `/api/v1/pleroma/mascot`
 ### Gets user mascot image
 * Method `GET`
@@ -439,15 +372,6 @@ Deprecated. `notify` parameter in `POST /api/v1/accounts/:id/follow` should be u
     * `alias`: the nickname of the alias to delete, e.g. `foo@example.org`.
 * Response: JSON. Returns `{"status": "success"}` if the change was successful, `{"error": "[error message]"}` otherwise
 
-## `/api/v1/pleroma/remote_interaction`
-## Interact with profile or status from remote account
-* Metod `POST`
-* Authentication: not required
-* Params:
-    * `ap_id`: Profile or status ActivityPub ID
-    * `profile`: Remote profile webfinger
-* Response: JSON. Returns `{"url": "[redirect url]"}` on success, `{"error": "[error message]"}` otherwise
-
 # Pleroma Conversations
 
 Pleroma Conversations have the same general structure that Mastodon Conversations have. The behavior differs in the following ways when using these endpoints:
@@ -458,7 +382,7 @@ Pleroma Conversations have the same general structure that Mastodon Conversation
 
 Conversations have the additional field `recipients` under the `pleroma` key. This holds a list of all the accounts that will receive a message in this conversation.
 
-The status posting endpoint takes an additional parameter, `in_reply_to_conversation_id`, which, when set, will set the visibility to direct and address only the people who are the recipients of that Conversation.
+The status posting endpoint takes an additional parameter, `in_reply_to_conversation_id`, which, when set, will set the visiblity to direct and address only the people who are the recipients of that Conversation.
 
 ⚠ Conversation IDs can be found in direct messages with the `pleroma.direct_conversation_id` key, do not confuse it with `pleroma.conversation_id`.
 

docs/development/API/prometheus.md

@@ -1,47 +1,44 @@
-# Prometheus / OpenTelemetry Metrics
+# Prometheus Metrics
 
-Pleroma includes support for exporting metrics via the [prom_ex](https://github.com/akoutmos/prom_ex) library.
-The metrics are exposed by a dedicated webserver/port to improve privacy and security.
+Pleroma includes support for exporting metrics via the [prometheus_ex](https://github.com/deadtrickster/prometheus.ex) library.
 
 Config example:
 
 ```
-config :pleroma, Pleroma.PromEx,
-  disabled: false,
-  manual_metrics_start_delay: :no_delay,
-  drop_metrics_groups: [],
-  grafana: [
-    host: System.get_env("GRAFANA_HOST", "http://localhost:3000"),
-    auth_token: System.get_env("GRAFANA_TOKEN"),
-    upload_dashboards_on_start: false,
-    folder_name: "BEAM",
-    annotate_app_lifecycle: true
-  ],
-  metrics_server: [
-    port: 4021,
-    path: "/metrics",
-    protocol: :http,
-    pool_size: 5,
-    cowboy_opts: [],
-    auth_strategy: :none
-  ],
-  datasource: "Prometheus"
-
+config :prometheus, Pleroma.Web.Endpoint.MetricsExporter,
+  enabled: true,
+  auth: {:basic, "myusername", "mypassword"},
+  ip_whitelist: ["127.0.0.1"],
+  path: "/api/pleroma/app_metrics",
+  format: :text
 ```
 
-PromEx supports the ability to automatically publish dashboards to your Grafana server as well as register Annotations. If you do not wish to configure this capability you must generate the dashboard JSON files and import them directly. You can find the mix commands in the upstream [documentation](https://hexdocs.pm/prom_ex/Mix.Tasks.PromEx.Dashboard.Export.html). You can find the list of modules enabled in Pleroma for which you should generate dashboards for by examining the contents of the `lib/pleroma/prom_ex.ex` module.
+* `enabled` (Pleroma extension) enables the endpoint
+* `ip_whitelist` (Pleroma extension) could be used to restrict access only to specified IPs
+* `auth` sets the authentication (`false` for no auth; configurable to HTTP Basic Auth, see [prometheus-plugs](https://github.com/deadtrickster/prometheus-plugs#exporting) documentation)
+* `format` sets the output format (`:text` or `:protobuf`)
+* `path` sets the path to app metrics page 
 
-## prometheus.yml
 
-The following is a bare minimum config example to use with [Prometheus](https://prometheus.io) or Prometheus-compatible software like [VictoriaMetrics](https://victoriametrics.com).
+## `/api/pleroma/app_metrics`
+
+### Exports Prometheus application metrics
+
+* Method: `GET`
+* Authentication: not required by default (see configuration options above)
+* Params: none
+* Response: text
+
+## Grafana
+
+### Config example
+
+The following is a config example to use with [Grafana](https://grafana.com)
 
 ```
-global:
-  scrape_interval: 15s
-
-scrape_configs:
-  - job_name: 'pleroma'
-    scheme: http
+  - job_name: 'beam'
+    metrics_path: /api/pleroma/app_metrics
+    scheme: https
     static_configs:
-    - targets: ['pleroma.soykaf.com:4021']
+    - targets: ['pleroma.soykaf.com']
 ```

docs/development/ap_extensions.md

@@ -20,16 +20,16 @@ Content-Type: multipart/form-data
 
 Parameters:
 - (required) `file`: The file being uploaded
-- (optional) `description`: A plain-text description of the media, for accessibility purposes.
+- (optionnal) `description`: A plain-text description of the media, for accessibility purposes.
 
 Response: HTTP 201 Created with the object into the body, no `Location` header provided as it doesn't have an `id`
 
-The object given in the response should then be inserted into an Object's `attachment` field.
+The object given in the reponse should then be inserted into an Object's `attachment` field.
 
 ## ChatMessages
 
 `ChatMessage`s are the messages sent in 1-on-1 chats. They are similar to
-`Note`s, but the addressing is done by having a single AP actor in the `to`
+`Note`s, but the addresing is done by having a single AP actor in the `to`
 field. Addressing multiple actors is not allowed. These messages are always
 private, there is no public version of them. They are created with a `Create`
 activity.

docs/development/index.md

@@ -1,7 +1 @@
 This section contains notes and guidelines for developers.
-
-- [Setting up a Pleroma development environment](setting_up_pleroma_dev.md)
-- [Setting up a Gitlab Runner](setting_up_a_gitlab_runner.md)
-- [Authentication & Authorization](authentication_authorization.md)
-- [ActivityPub Extensions](ap_extensions.md)
-- [Mox Testing Guide](mox_testing.md)

docs/development/mox_testing.md

@@ -1,485 +0,0 @@
-# Using Mox for Testing in Pleroma
-
-## Introduction
-
-This guide explains how to use [Mox](https://hexdocs.pm/mox/Mox.html) for testing in Pleroma and how to migrate existing tests from Mock/meck to Mox. Mox is a library for defining concurrent mocks in Elixir that offers several key advantages:
-
-- **Async-safe testing**: Mox supports concurrent testing with `async: true`
-- **Explicit contract through behaviors**: Enforces implementation of behavior callbacks
-- **No module redefinition**: Avoids runtime issues caused by redefining modules
-- **Expectations scoped to the current process**: Prevents test state from leaking between tests
-
-## Why Migrate from Mock/meck to Mox?
-
-### Problems with Mock/meck
-
-1. **Not async-safe**: Tests using Mock/meck cannot safely run with `async: true`, which slows down the test suite
-2. **Global state**: Mocked functions are global, leading to potential cross-test contamination
-3. **No explicit contract**: No guarantee that mocked functions match the actual implementation
-4. **Module redefinition**: Can lead to hard-to-debug runtime issues
-
-### Benefits of Mox
-
-1. **Async-safe testing**: Tests can run concurrently with `async: true`, significantly speeding up the test suite
-2. **Process isolation**: Expectations are set per process, preventing leakage between tests
-3. **Explicit contracts via behaviors**: Ensures mocks implement all required functions
-4. **Compile-time checks**: Prevents mocking non-existent functions
-5. **No module redefinition**: Mocks are defined at compile time, not runtime
-
-## Existing Mox Setup in Pleroma
-
-Pleroma already has a basic Mox setup in the `Pleroma.DataCase` module, which handles some common mocking scenarios automatically. Here's what's included:
-
-### Default Mox Configuration
-
-The `setup` function in `DataCase` does the following:
-
-1. Sets up Mox for either async or non-async tests
-2. Verifies all mock expectations on test exit
-3. Stubs common dependencies with their real implementations
-
-```elixir
-# From test/support/data_case.ex
-setup tags do
-  setup_multi_process_mode(tags)
-  setup_streamer(tags)
-  stub_pipeline()
-
-  Mox.verify_on_exit!()
-
-  :ok
-end
-```
-
-### Async vs. Non-Async Test Setup
-
-Pleroma configures Mox differently depending on whether your test is async or not:
-
-```elixir
-def setup_multi_process_mode(tags) do
-  :ok = Ecto.Adapters.SQL.Sandbox.checkout(Pleroma.Repo)
-
-  if tags[:async] do
-    # For async tests, use process-specific mocks and stub CachexMock with NullCache
-    Mox.stub_with(Pleroma.CachexMock, Pleroma.NullCache)
-    Mox.set_mox_private()
-  else
-    # For non-async tests, use global mocks and stub CachexMock with CachexProxy
-    Ecto.Adapters.SQL.Sandbox.mode(Pleroma.Repo, {:shared, self()})
-
-    Mox.set_mox_global()
-    Mox.stub_with(Pleroma.CachexMock, Pleroma.CachexProxy)
-    clear_cachex()
-  end
-
-  :ok
-end
-```
-
-### Default Pipeline Stubs
-
-Pleroma automatically stubs several core components with their real implementations:
-
-```elixir
-def stub_pipeline do
-  Mox.stub_with(Pleroma.Web.ActivityPub.SideEffectsMock, Pleroma.Web.ActivityPub.SideEffects)
-  Mox.stub_with(Pleroma.Web.ActivityPub.ObjectValidatorMock, Pleroma.Web.ActivityPub.ObjectValidator)
-  Mox.stub_with(Pleroma.Web.ActivityPub.MRFMock, Pleroma.Web.ActivityPub.MRF)
-  Mox.stub_with(Pleroma.Web.ActivityPub.ActivityPubMock, Pleroma.Web.ActivityPub.ActivityPub)
-  Mox.stub_with(Pleroma.Web.FederatorMock, Pleroma.Web.Federator)
-  Mox.stub_with(Pleroma.ConfigMock, Pleroma.Config)
-  Mox.stub_with(Pleroma.StaticStubbedConfigMock, Pleroma.Test.StaticConfig)
-  Mox.stub_with(Pleroma.StubbedHTTPSignaturesMock, Pleroma.Test.HTTPSignaturesProxy)
-end
-```
-
-This means that by default, these mocks will behave like their real implementations unless you explicitly override them with expectations in your tests.
-
-### Understanding Config Mock Types
-
-Pleroma has three different Config mock implementations, each with a specific purpose and different characteristics regarding async test safety:
-
-#### 1. ConfigMock
-
-- Defined in `test/support/mocks.ex` as `Mox.defmock(Pleroma.ConfigMock, for: Pleroma.Config.Getting)`
-- It's stubbed with the real `Pleroma.Config` by default in `DataCase`: `Mox.stub_with(Pleroma.ConfigMock, Pleroma.Config)`
-- This means it falls back to the normal configuration behavior unless explicitly overridden
-- Used for general mocking of configuration in tests where you want most config to behave normally
-- ⚠️ **NOT ASYNC-SAFE**: Since it's stubbed with the real `Pleroma.Config`, it modifies global application state
-- Can not be used in tests with `async: true`
-
-#### 2. StaticStubbedConfigMock
-
-- Defined in `test/support/mocks.ex` as `Mox.defmock(Pleroma.StaticStubbedConfigMock, for: Pleroma.Config.Getting)`
-- It's stubbed with `Pleroma.Test.StaticConfig` (defined in `test/test_helper.exs`)
-- `Pleroma.Test.StaticConfig` creates a completely static configuration snapshot at the start of the test run:
-  ```elixir
-  defmodule Pleroma.Test.StaticConfig do
-    @moduledoc """
-    This module provides a Config that is completely static, built at startup time from the environment. 
-    It's safe to use in testing as it will not modify any state.
-    """
-
-    @behaviour Pleroma.Config.Getting
-    @config Application.get_all_env(:pleroma)
-
-    def get(path, default \\ nil) do
-      get_in(@config, path) || default
-    end
-  end
-  ```
-- Configuration is frozen at startup time and doesn't change during the test run
-- ✅ **ASYNC-SAFE**: Never modifies global state since it uses a frozen snapshot of the configuration
-
-#### 3. UnstubbedConfigMock
-
-- Defined in `test/support/mocks.ex` as `Mox.defmock(Pleroma.UnstubbedConfigMock, for: Pleroma.Config.Getting)`
-- Unlike the other two mocks, it's not automatically stubbed with any implementation in `DataCase`
-- Starts completely "unstubbed" and requires tests to explicitly set expectations or stub it
-- The most commonly used configuration mock in the test suite
-- Often aliased as `ConfigMock` in individual test files: `alias Pleroma.UnstubbedConfigMock, as: ConfigMock`
-- Set as the default config implementation in `config/test.exs`: `config :pleroma, :config_impl, Pleroma.UnstubbedConfigMock`
-- Offers maximum flexibility for tests that need precise control over configuration values
-- ✅ **ASYNC-SAFE**: Safe if used with `expect()` to set up test-specific expectations (since expectations are process-scoped)
-
-#### Configuring Components to Use Specific Mocks
-
-In `config/test.exs`, different components can be configured to use different configuration mocks:
-
-```elixir
-# Components using UnstubbedConfigMock
-config :pleroma, Pleroma.Upload, config_impl: Pleroma.UnstubbedConfigMock
-config :pleroma, Pleroma.User.Backup, config_impl: Pleroma.UnstubbedConfigMock
-config :pleroma, Pleroma.Uploaders.S3, config_impl: Pleroma.UnstubbedConfigMock
-
-# Components using StaticStubbedConfigMock (async-safe)
-config :pleroma, Pleroma.Language.LanguageDetector, config_impl: Pleroma.StaticStubbedConfigMock
-config :pleroma, Pleroma.Web.RichMedia.Helpers, config_impl: Pleroma.StaticStubbedConfigMock
-config :pleroma, Pleroma.Web.Plugs.HTTPSecurityPlug, config_impl: Pleroma.StaticStubbedConfigMock
-```
-
-This allows different parts of the application to use the most appropriate configuration mocking strategy based on their specific needs.
-
-#### When to Use Each Config Mock Type
-
-- **ConfigMock**: ⚠️ For non-async tests only, when you want most configuration to behave normally with occasional overrides
-- **StaticStubbedConfigMock**: ✅ For async tests where modifying global state would be problematic and a static configuration is sufficient
-- **UnstubbedConfigMock**: ⚠️ Use carefully in async tests; set specific expectations rather than stubbing with implementations that modify global state
-
-#### Summary of Async Safety
-
-| Mock Type | Async-Safe? | Best Use Case |
-|-----------|-------------|--------------|
-| ConfigMock | ❌ No | Non-async tests that need minimal configuration overrides |
-| StaticStubbedConfigMock | ✅ Yes | Async tests that need configuration values without modification |
-| UnstubbedConfigMock | ⚠️ Depends | Any test with careful usage; set expectations rather than stubbing |
-
-## Configuration in Async Tests
-
-### Understanding `clear_config` Limitations
-
-The `clear_config` helper is commonly used in Pleroma tests to modify configuration for specific tests. However, it's important to understand that **`clear_config` is not async-safe** and should not be used in tests with `async: true`.
-
-Here's why:
-
-```elixir
-# Implementation of clear_config in test/support/helpers.ex
-defmacro clear_config(config_path, temp_setting) do
-  quote do
-    clear_config(unquote(config_path)) do
-      Config.put(unquote(config_path), unquote(temp_setting))
-    end
-  end
-end
-
-defmacro clear_config(config_path, do: yield) do
-  quote do
-    initial_setting = Config.fetch(unquote(config_path))
-
-    unquote(yield)
-
-    on_exit(fn ->
-      case initial_setting do
-        :error ->
-          Config.delete(unquote(config_path))
-
-        {:ok, value} ->
-          Config.put(unquote(config_path), value)
-      end
-    end)
-
-    :ok
-  end
-end
-```
-
-The issue is that `clear_config`:
-1. Modifies the global application environment
-2. Uses `on_exit` to restore the original value after the test
-3. Can lead to race conditions when multiple async tests modify the same configuration
-
-### Async-Safe Configuration Approaches
-
-When writing async tests with Mox, use these approaches instead of `clear_config`:
-
-1. **Dependency Injection with Module Attributes**:
-   ```elixir
-   # In your module
-   @config_impl Application.compile_env(:pleroma, [__MODULE__, :config_impl], Pleroma.Config)
-   
-   def some_function do
-     value = @config_impl.get([:some, :config])
-     # ...
-   end
-   ```
-
-2. **Mock the Config Module**:
-   ```elixir
-   # In your test
-   Pleroma.ConfigMock
-   |> expect(:get, fn [:some, :config] -> "test_value" end)
-   ```
-
-3. **Use Test-Specific Implementations**:
-   ```elixir
-   # Define a test-specific implementation
-   defmodule TestConfig do
-     def get([:some, :config]), do: "test_value"
-     def get(_), do: nil
-   end
-   
-   # In your test
-   Mox.stub_with(Pleroma.ConfigMock, TestConfig)
-   ```
-
-4. **Pass Configuration as Arguments**:
-   ```elixir
-   # Refactor functions to accept configuration as arguments
-   def some_function(config \\ nil) do
-     config = config || Pleroma.Config.get([:some, :config])
-     # ...
-   end
-   
-   # In your test
-   some_function("test_value")
-   ```
-
-By using these approaches, you can safely run tests with `async: true` without worrying about configuration conflicts.
-
-## Setting Up Mox in Pleroma
-
-### Step 1: Define a Behavior
-
-Start by defining a behavior for the module you want to mock. This specifies the contract that both the real implementation and mocks must follow.
-
-```elixir
-# In your implementation module (e.g., lib/pleroma/uploaders/s3.ex)
-defmodule Pleroma.Uploaders.S3.ExAwsAPI do
-  @callback request(op :: ExAws.Operation.t()) :: {:ok, ExAws.Operation.t()} | {:error, term()}
-end
-```
-
-### Step 2: Make Your Implementation Configurable
-
-Modify your module to use a configurable implementation. This allows for dependency injection and easier testing.
-
-```elixir
-# In your implementation module
-@ex_aws_impl Application.compile_env(:pleroma, [__MODULE__, :ex_aws_impl], ExAws)
-@config_impl Application.compile_env(:pleroma, [__MODULE__, :config_impl], Pleroma.Config)
-
-def put_file(%Pleroma.Upload{} = upload) do
-  # Use @ex_aws_impl instead of ExAws directly
-  case @ex_aws_impl.request(op) do
-    {:ok, _} ->
-      {:ok, {:file, s3_name}}
-
-    error ->
-      Logger.error("#{__MODULE__}: #{inspect(error)}")
-      error
-  end
-end
-```
-
-### Step 3: Define the Mock in test/support/mocks.ex
-
-Add your mock definition in the central mocks file:
-
-```elixir
-# In test/support/mocks.ex
-Mox.defmock(Pleroma.Uploaders.S3.ExAwsMock, for: Pleroma.Uploaders.S3.ExAwsAPI)
-```
-
-### Step 4: Configure the Mock in Test Environment
-
-In your test configuration (e.g., `config/test.exs`), specify which mock implementation to use:
-
-```elixir
-config :pleroma, Pleroma.Uploaders.S3, ex_aws_impl: Pleroma.Uploaders.S3.ExAwsMock
-config :pleroma, Pleroma.Uploaders.S3, config_impl: Pleroma.UnstubbedConfigMock
-```
-
-## Writing Tests with Mox
-
-### Setting Up Your Test
-
-```elixir
-defmodule Pleroma.Uploaders.S3Test do
-  use Pleroma.DataCase, async: true  # Note: async: true is now possible!
-
-  alias Pleroma.Uploaders.S3
-  alias Pleroma.Uploaders.S3.ExAwsMock
-  alias Pleroma.UnstubbedConfigMock, as: ConfigMock
-
-  import Mox  # Import Mox functions
-  
-  # Note: verify_on_exit! is already called in DataCase setup
-  # so you don't need to add it explicitly in your test module
-end
-```
-
-### Setting Expectations with Mox
-
-Mox uses an explicit expectation system. Here's how to use it:
-
-```elixir
-# Basic expectation for a function call
-ExAwsMock
-|> expect(:request, fn _req -> {:ok, %{status_code: 200}} end)
-
-# Expectation for multiple calls with same response
-ExAwsMock
-|> expect(:request, 3, fn _req -> {:ok, %{status_code: 200}} end)
-
-# Expectation with specific arguments
-ExAwsMock
-|> expect(:request, fn %{bucket: "test_bucket"} -> {:ok, %{status_code: 200}} end)
-
-# Complex configuration mocking
-ConfigMock
-|> expect(:get, fn key ->
-  [
-    {Pleroma.Upload, [uploader: Pleroma.Uploaders.S3, base_url: "https://s3.amazonaws.com"]},
-    {Pleroma.Uploaders.S3, [bucket: "test_bucket"]}
-  ]
-  |> get_in(key)
-end)
-```
-
-### Understanding Mox Modes in Pleroma
-
-Pleroma's DataCase automatically configures Mox differently based on whether your test is async or not:
-
-1. **Async tests** (`async: true`):
-   - Uses `Mox.set_mox_private()` - expectations are scoped to the current process
-   - Stubs `Pleroma.CachexMock` with `Pleroma.NullCache`
-   - Each test process has its own isolated mock expectations
-
-2. **Non-async tests** (`async: false`):
-   - Uses `Mox.set_mox_global()` - expectations are shared across processes
-   - Stubs `Pleroma.CachexMock` with `Pleroma.CachexProxy`
-   - Mock expectations can be set in one process and called from another
-
-Choose the appropriate mode based on your test requirements. For most tests, async mode is preferred for better performance.
-
-## Migrating from Mock/meck to Mox
-
-Here's a step-by-step guide for migrating existing tests from Mock/meck to Mox:
-
-### 1. Identify the Module to Mock
-
-Look for `with_mock` or `test_with_mock` calls in your tests:
-
-```elixir
-# Old approach with Mock
-with_mock ExAws, request: fn _ -> {:ok, :ok} end do
-  assert S3.put_file(file_upload) == {:ok, {:file, "test_folder/image-tet.jpg"}}
-end
-```
-
-### 2. Define a Behavior for the Module
-
-Create a behavior that defines the functions you want to mock:
-
-```elixir
-defmodule Pleroma.Uploaders.S3.ExAwsAPI do
-  @callback request(op :: ExAws.Operation.t()) :: {:ok, ExAws.Operation.t()} | {:error, term()}
-end
-```
-
-### 3. Update Your Implementation to Use a Configurable Dependency
-
-```elixir
-# Old
-def put_file(%Pleroma.Upload{} = upload) do
-  case ExAws.request(op) do
-    # ...
-  end
-end
-
-# New
-@ex_aws_impl Application.compile_env(:pleroma, [__MODULE__, :ex_aws_impl], ExAws)
-
-def put_file(%Pleroma.Upload{} = upload) do
-  case @ex_aws_impl.request(op) do
-    # ...
-  end
-end
-```
-
-### 4. Define the Mock in mocks.ex
-
-```elixir
-Mox.defmock(Pleroma.Uploaders.S3.ExAwsMock, for: Pleroma.Uploaders.S3.ExAwsAPI)
-```
-
-### 5. Configure the Test Environment
-
-```elixir
-config :pleroma, Pleroma.Uploaders.S3, ex_aws_impl: Pleroma.Uploaders.S3.ExAwsMock
-```
-
-### 6. Update Your Tests to Use Mox
-
-```elixir
-# Old (with Mock)
-test_with_mock "save file", ExAws, request: fn _ -> {:ok, :ok} end do
-  assert S3.put_file(file_upload) == {:ok, {:file, "test_folder/image-tet.jpg"}}
-  assert_called(ExAws.request(:_))
-end
-
-# New (with Mox)
-test "save file" do
-  ExAwsMock
-  |> expect(:request, fn _req -> {:ok, %{status_code: 200}} end)
-
-  assert S3.put_file(file_upload) == {:ok, {:file, "test_folder/image-tet.jpg"}}
-end
-```
-
-### 7. Enable Async Testing
-
-Now you can safely enable `async: true` in your test module:
-
-```elixir
-use Pleroma.DataCase, async: true
-```
-
-## Best Practices
-
-1. **Always define behaviors**: They serve as contracts and documentation
-2. **Keep mocks in a central location**: Use test/support/mocks.ex for all mock definitions
-3. **Use verify_on_exit!**: This is already set up in DataCase, ensuring all expected calls were made
-4. **Use specific expectations**: Be as specific as possible with your expectations
-5. **Enable async: true**: Take advantage of Mox's concurrent testing capability
-6. **Don't over-mock**: Only mock external dependencies that are difficult to test directly
-7. **Leverage existing stubs**: Use the default stubs provided by DataCase when possible
-8. **Avoid clear_config in async tests**: Use dependency injection and mocking instead
-
-## Example: Complete Migration
-
-For a complete example of migrating a test from Mock/meck to Mox, you can refer to commit `90a47ca050c5839e8b4dc3bac315dc436d49152d` in the Pleroma repository, which shows how the S3 uploader tests were migrated.
-
-## Conclusion
-
-Migrating tests from Mock/meck to Mox provides significant benefits for the Pleroma test suite, including faster test execution through async testing, better isolation between tests, and more robust mocking through explicit contracts. By following this guide, you can successfully migrate existing tests and write new tests using Mox. 

docs/development/setting_up_pleroma_dev.md

@@ -15,7 +15,7 @@ Pleroma requires some adjustments from the defaults for running the instance loc
 2. Change the dev.secret.exs
     * Change the scheme in `config :pleroma, Pleroma.Web.Endpoint` to http (see examples below)
     * If you want to change other settings, you can do that too
-3. You can now start the server `mix phx.server`. Once it's build and started, you can access the instance on `http://<host>:<port>` (e.g.http://localhost:4000 ) and should be able to do everything locally you normally can.
+3. You can now start the server `mix phx.server`. Once it's build and started, you can access the instance on `http://<host>:<port>` (e.g.http://localhost:4000 ) and should be able to do everything locally you normaly can.
 
 Example config to change the scheme to http. Change the port if you want to run on another port.
 ```elixir
@@ -38,7 +38,7 @@ config :logger, :console,
 
 ## Testing
 
-1. Create a `config/test.secret.exs` file with the content as shown below
+1. Create a `test.secret.exs` file with the content as shown below
 2. Create the database user and test database.
     1. You can use the `config/setup_db.psql` as a template. Copy the file if you want and change the database name, user and password to the values for the test-database (e.g. 'pleroma_local_test' for database and user). Then run this file like you did during installation.
     2. The tests will try to create the Database, so we'll have to allow our test-database user to create databases, `sudo -Hu postgres psql -c "ALTER USER pleroma_local_test WITH CREATEDB;"`

docs/installation/debian_based_en.md

@@ -69,18 +69,12 @@ cd /opt/pleroma
 sudo -Hu pleroma mix deps.get
 ```
 
-* Generate the configuration: 
-
-```shell
-sudo -Hu pleroma MIX_ENV=prod mix pleroma.instance gen
-```
-
-* During this process:
+* Generate the configuration: `sudo -Hu pleroma MIX_ENV=prod mix pleroma.instance gen`
   * Answer with `yes` if it asks you to install `rebar3`.
   * This may take some time, because parts of pleroma get compiled first.
   * After that it will ask you a few questions about your instance and generates a configuration file in `config/generated_config.exs`.
 
-* Check the configuration and if all looks right, rename it, so Pleroma will load it (`prod.secret.exs` for production instances, `dev.secret.exs` for development instances):
+* Check the configuration and if all looks right, rename it, so Pleroma will load it (`prod.secret.exs` for productive instance, `dev.secret.exs` for development instances):
 
 ```shell
 sudo -Hu pleroma mv config/{generated_config.exs,prod.secret.exs}

docs/installation/debian_based_jp.md

@@ -12,9 +12,9 @@ Note: This article is potentially outdated because at this time we may not have
 
 ### 必要なソフトウェア
 
-- PostgreSQL 11.0以上 (Ubuntu16.04では9.5しか提供されていないので，[](https://www.postgresql.org/download/linux/ubuntu/)こちらから新しいバージョンを入手してください)
-- `postgresql-contrib` 11.0以上 (同上)
-- Elixir 1.14 以上 ([Debianのリポジトリからインストールしないこと！！！ ここからインストールすること！](https://elixir-lang.org/install.html#unix-and-unix-like)。または [asdf](https://github.com/asdf-vm/asdf) をpleromaユーザーでインストールしてください)
+- PostgreSQL 9.6以上 (Ubuntu16.04では9.5しか提供されていないので，[](https://www.postgresql.org/download/linux/ubuntu/)こちらから新しいバージョンを入手してください)
+- `postgresql-contrib` 9.6以上 (同上)
+- Elixir 1.8 以上 ([Debianのリポジトリからインストールしないこと！！！ ここからインストールすること！](https://elixir-lang.org/install.html#unix-and-unix-like)。または [asdf](https://github.com/asdf-vm/asdf) をpleromaユーザーでインストールしてください)
 - `erlang-dev`
 - `erlang-nox`
 - `git`

docs/installation/freebsd_en.md

@@ -9,7 +9,7 @@ This document was written for FreeBSD 12.1, but should be work on future release
 This assumes the target system has `pkg(8)`.
 
 ```
-# pkg install elixir postgresql12-server postgresql12-client postgresql12-contrib git-lite sudo nginx gmake acme.sh cmake vips
+# pkg install elixir postgresql12-server postgresql12-client postgresql12-contrib git-lite sudo nginx gmake acme.sh cmake
 ```
 
 Copy the rc.d scripts to the right directory:
@@ -31,7 +31,7 @@ Setup the required services to automatically start at boot, using `sysrc(8)`.
 ### Install media / graphics packages (optional, see [`docs/installation/optional/media_graphics_packages.md`](../installation/optional/media_graphics_packages.md))
 
 ```shell
-# pkg install imagemagick ffmpeg p5-Image-ExifTool vips
+# pkg install imagemagick ffmpeg p5-Image-ExifTool
 ```
 
 ## Configuring Pleroma
@@ -41,7 +41,6 @@ Create a user for Pleroma:
 ```
 # pw add user pleroma -m
 # echo 'export LC_ALL="en_US.UTF-8"' >> /home/pleroma/.profile
-# echo 'export VIX_COMPILATION_MODE=PLATFORM_PROVIDED_LIBVIPS' >> /home/pleroma/.profile
 # su -l pleroma
 ```
 

docs/installation/generic_dependencies.include

@@ -1,8 +1,8 @@
 ## Required dependencies
 
-* PostgreSQL >=11.0
-* Elixir >=1.14.0 <1.17
-* Erlang OTP >=23.0.0 (supported: <27)
+* PostgreSQL >=9.6
+* Elixir >=1.11.0 <1.15
+* Erlang OTP >=22.2.0 <26
 * git
 * file / libmagic
 * gcc or clang

docs/installation/gentoo_en.md

@@ -59,7 +59,7 @@ Gentoo quite pointedly does not come with a cron daemon installed, and as such i
 
 If you would not like to install the optional packages, remove them from this line.
 
-If you're running this from a low-powered virtual machine, it should work though it will take some time. There were no issues on a VPS with a single core and 1GB of RAM; if you are using an even more limited device and run into issues, you can try creating a swapfile or use a more powerful machine running Gentoo to [cross build](https://wiki.gentoo.org/wiki/Cross_build_environment). If you have a wait ahead of you, now would be a good time to take a break, stretch a bit, refresh your beverage of choice and/or get a snack, and reply to Arch users' posts with "I use Gentoo btw" as we do.
+If you're running this from a low-powered virtual machine, it should work though it will take some time. There were no issues on a VPS with a single core and 1GB of RAM; if you are using an even more limited device and run into issues, you can try creating a swapfile or use a more powerful machine running Gentoo to [cross build](https://wiki.gentoo.org/wiki/Cross_build_environment). If you have a wait ahead of you, now would be a good time to take a break, strech a bit, refresh your beverage of choice and/or get a snack, and reply to Arch users' posts with "I use Gentoo btw" as we do.
 
 ### Install PostgreSQL
 
@@ -104,7 +104,7 @@ Not only does this make it much easier to deploy changes you make, as you can co
 
 * Add a new system user for the Pleroma service and set up default directories:
 
-Remove `,wheel` if you do not want this user to be able to use `sudo`, however note that being able to `sudo` as the `pleroma` user will make finishing the installation and common maintenance tasks somewhat easier:
+Remove `,wheel` if you do not want this user to be able to use `sudo`, however note that being able to `sudo` as the `pleroma` user will make finishing the insallation and common maintenence tasks somewhat easier:
 
 ```shell
  # useradd -m -G users,wheel -s /bin/bash pleroma

docs/installation/gentoo_otp_en.md

@@ -49,7 +49,7 @@ Gentoo quite pointedly does not come with a cron daemon installed, and as such i
 
 If you would not like to install the optional packages, remove them from this line.
 
-If you're running this from a low-powered virtual machine, it should work though it will take some time. There were no issues on a VPS with a single core and 1GB of RAM; if you are using an even more limited device and run into issues, you can try creating a swapfile or use a more powerful machine running Gentoo to [cross build](https://wiki.gentoo.org/wiki/Cross_build_environment). If you have a wait ahead of you, now would be a good time to take a break, stretch a bit, refresh your beverage of choice and/or get a snack, and reply to Arch users' posts with "I use Gentoo btw" as we do.
+If you're running this from a low-powered virtual machine, it should work though it will take some time. There were no issues on a VPS with a single core and 1GB of RAM; if you are using an even more limited device and run into issues, you can try creating a swapfile or use a more powerful machine running Gentoo to [cross build](https://wiki.gentoo.org/wiki/Cross_build_environment). If you have a wait ahead of you, now would be a good time to take a break, strech a bit, refresh your beverage of choice and/or get a snack, and reply to Arch users' posts with "I use Gentoo btw" as we do.
 
 ### Setup PostgreSQL
 

docs/installation/netbsd_en.md

@@ -2,41 +2,14 @@
 
 {! backend/installation/generic_dependencies.include !}
 
-# Installation options
-
-Currently there are two options available for NetBSD: manual installation (from source) or using experimental package from [pkgsrc-wip](https://github.com/NetBSD/pkgsrc-wip/tree/master/pleroma).
-
-WIP package can be installed via pkgsrc and can be crosscompiled for easier binary distribution. Source installation most probably will be restricted to a single machine.
-
-## pkgsrc installation
-
-WIP package creates Mix.Release (similar to how Docker images are built) but doesn't bundle Erlang runtime, listing it as a dependency instead. This allows for easier and more modular installations, especially on weaker machines. Currently this method also does not support all features of `pleroma_ctl` command (like changing installation type or managing frontends) as NetBSD is not yet a supported binary flavour of Pleroma's CI.
-
-In any case, you can install it the same way as any other `pkgsrc-wip` package:
-
-```
-cd /usr/pkgsrc
-git clone --depth 1 git://wip.pkgsrc.org/pkgsrc-wip.git wip
-cp -rf wip/pleroma www
-cp -rf wip/libvips graphics
-cd /usr/pkgsrc/www/pleroma
-bmake && bmake install
-```
-
-Use `bmake package` to create a binary package. This can come especially handy if you're targeting embedded or low-power systems and are crosscompiling on a more powerful machine.
-
-> Note: Elixir has [endianness bug](https://github.com/elixir-lang/elixir/issues/2785) which requires it to be compiled on a machine with the same endianness. In other words, package crosscompiled on amd64 (little endian) won't work on powerpc or sparc machines (big endian). While _in theory™_ nothing catastrophic should happen, one can see that for example regexes won't work properly. Some distributions just strip this warning away, so it doesn't bother the users... anyway, you've been warned.
-
-## Source installation
+## Installing software used in this guide
 
 pkgin should have been installed by the NetBSD installer if you selected
-the right options. If it isn't installed, install it using `pkg_add`.
+the right options. If it isn't installed, install it using pkg_add.
 
 Note that `postgresql11-contrib` is needed for the Postgres extensions
 Pleroma uses.
 
-> Note: you can use modern versions of PostgreSQL. In this case, just use `postgresql16-contrib` and so on.
-
 The `mksh` shell is needed to run the Elixir `mix` script.
 
 `# pkgin install acmesh elixir git-base git-docs mksh nginx postgresql11-server postgresql11-client postgresql11-contrib sudo ffmpeg4 ImageMagick`
@@ -56,6 +29,29 @@ shells/mksh
 www/nginx
 ```
 
+Copy the rc.d scripts to the right directory:
+
+```
+# cp /usr/pkg/share/examples/rc.d/nginx /usr/pkg/share/examples/rc.d/pgsql /etc/rc.d
+```
+
+Add nginx and Postgres to `/etc/rc.conf`:
+
+```
+nginx=YES
+pgsql=YES
+```
+
+## Configuring postgres
+
+First, run `# /etc/rc.d/pgsql start`. Then, `$ sudo -Hu pgsql -g pgsql createdb`.
+
+### Install media / graphics packages (optional, see [`docs/installation/optional/media_graphics_packages.md`](../installation/optional/media_graphics_packages.md))
+
+`# pkgin install ImageMagick ffmpeg4 p5-Image-ExifTool`
+
+## Configuring Pleroma
+
 Create a user for Pleroma:
 
 ```
@@ -72,98 +68,41 @@ $ cd /home/pleroma
 $ git clone -b stable https://git.pleroma.social/pleroma/pleroma.git
 ```
 
-Get deps and compile:
+Configure Pleroma. Note that you need a domain name at this point:
 
 ```
 $ cd /home/pleroma/pleroma
-$ export MIX_ENV=prod
 $ mix deps.get
-$ mix compile
+$ MIX_ENV=prod mix pleroma.instance gen # You will be asked a few questions here.
 ```
 
-## Install media / graphics packages (optional, see [`docs/installation/optional/media_graphics_packages.md`](../installation/optional/media_graphics_packages.md))
-
-`# pkgin install ImageMagick ffmpeg4 p5-Image-ExifTool`
-
-or via pkgsrc:
-
-```
-graphics/p5-Image-ExifTool
-graphics/ImageMagick
-multimedia/ffmpeg4
-```
-
-# Configuration
-
-## Understanding $PREFIX
-
-From now on, you may encounter `$PREFIX` variable in the paths. This variable indicates your current local pkgsrc prefix. Usually it's `/usr/pkg` unless you configured it otherwise. Translating to pkgsrc's lingo, it's called `LOCALBASE`, which essentially means the same this. You may want to set it up for your local shell session (this uses `mksh` which should already be installed as one of the required dependencies):
-
-```
-$ export PREFIX=$(pkg_info -Q LOCALBASE mksh)
-$ echo $PREFIX
-/usr/pkg
-```
-
-## Setting up your instance
-
-Now, you need to configure your instance. During this initial configuration, you will be asked some questions about your server. You will need a domain name at this point; it doesn't have to be deployed, but changing it later will be very cumbersome.
-
-If you've installed via pkgsrc, `pleroma_ctl` should already be in your `PATH`; if you've installed from source, it's located at `/home/pleroma/pleroma/release/bin/pleroma_ctl`.
-
-```
-$ su -l pleroma
-$ pleroma_ctl instance gen --output $PREFIX/etc/pleroma/config.exs --output-psql /tmp/setup_db.psql
-```
-
-During installation, you will be asked about static and upload directories. Don't forget to create them and update permissions:
-
-```
-mkdir -p /var/lib/pleroma/uploads
-chown -R pleroma:pleroma /var/lib/pleroma
-```
-
-## Setting up the database
-
-First, run `# /etc/rc.d/pgsql start`. Then, `$ sudo -Hu pgsql -g pgsql createdb`.
-
-We can now initialize the database. You'll need to edit generated SQL file from the previous step. It's located at `/tmp/setup_db.psql`.
-
-Edit this file, and *change the password* to a password of your choice. Make sure it is secure, since
+Since Postgres is configured, we can now initialize the database. There should
+now be a file in `config/setup_db.psql` that makes this easier. Edit it, and
+*change the password* to a password of your choice. Make sure it is secure, since
 it'll be protecting your database. Now initialize the database:
 
 ```
-$ sudo -Hu pgsql -g pgsql psql -f /tmp/setup_db.psql
+$ sudo -Hu pgsql -g pgsql psql -f config/setup_db.psql
 ```
 
 Postgres allows connections from all users without a password by default. To
-fix this, edit `$PREFIX/pgsql/data/pg_hba.conf`. Change every `trust` to
+fix this, edit `/usr/pkg/pgsql/data/pg_hba.conf`. Change every `trust` to
 `password`.
 
 Once this is done, restart Postgres with `# /etc/rc.d/pgsql restart`.
 
 Run the database migrations.
-
-### pkgsrc installation
-
-```
-pleroma_ctl migrate
-```
-
-### Source installation
-
 You will need to do this whenever you update with `git pull`:
 
 ```
-$ cd /home/pleroma/pleroma
 $ MIX_ENV=prod mix ecto.migrate
 ```
 
 ## Configuring nginx
 
 Install the example configuration file
-(`$PREFIX/share/examples/pleroma/pleroma.nginx` or `/home/pleroma/pleroma/installation/pleroma.nginx`) to
-`$PREFIX/etc/nginx.conf`.
+`/home/pleroma/pleroma/installation/pleroma.nginx` to
+`/usr/pkg/etc/nginx.conf`.
 
 Note that it will need to be wrapped in a `http {}` block. You should add
 settings for the nginx daemon outside of the http block, for example:
@@ -237,45 +176,27 @@ Let's add auto-renewal to `/etc/daily.local`
     --stateless
 ```
 
-## Autostart
+## Creating a startup script for Pleroma
 
-For properly functioning instance, you will need pleroma (backend service), nginx (reverse proxy) and postgresql (database) services running. There's no requirement for them to reside on the same machine, but you have to provide autostart for each of them.
+Copy the startup script to the correct location and make sure it's executable:
 
-### nginx
-```
-# cp $PREFIX/share/examples/rc.d/nginx /etc/rc.d
-# echo "nginx=YES" >> /etc/rc.conf
-```
-
-### postgresql
-
-```
-# cp $PREFIX/share/examples/rc.d/pgsql /etc/rc.d
-# echo "pgsql=YES" >> /etc/rc.conf
-```
-
-### pleroma
-
-First, copy the script (pkgsrc variant)
-```
-# cp $PREFIX/share/examples/pleroma/pleroma.rc /etc/rc.d/pleroma
-```
-
-or source variant
 ```
 # cp /home/pleroma/pleroma/installation/netbsd/rc.d/pleroma /etc/rc.d/pleroma
 # chmod +x /etc/rc.d/pleroma
 ```
 
-Then, add the following to `/etc/rc.conf`:
+Add the following to `/etc/rc.conf`:
 
 ```
 pleroma=YES
+pleroma_home="/home/pleroma"
+pleroma_user="pleroma"
 ```
 
+Run `# /etc/rc.d/pleroma start` to start Pleroma.
+
 ## Conclusion
 
-Run `# /etc/rc.d/pleroma start` to start Pleroma.
 Restart nginx with `# /etc/rc.d/nginx restart` and you should be up and running.
 
 Make sure your time is in sync, or other instances will receive your posts with

docs/installation/openbsd_en.md

@@ -12,7 +12,7 @@ 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 libvips
+pkg_add elixir gmake git postgresql-server postgresql-contrib cmake ffmpeg ImageMagick
 ```
 
 Pleroma 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.
@@ -62,7 +62,7 @@ rcctl start postgresql
 To check that it started properly and didn't fail right after starting, you can run `ps aux | grep postgres`, there should be multiple lines of output.
 
 #### httpd
-httpd will have three functions:
+httpd will have three fuctions:
 
   * redirect requests trying to reach the instance over http to the https URL
   * serve a robots.txt file
@@ -225,7 +225,7 @@ pass in quick on $if inet6 proto icmp6 to ($if) icmp6-type { echoreq unreach par
 pass in quick on $if proto tcp to ($if) port { http https } # relayd/httpd
 pass in quick on $if proto tcp from $authorized_ssh_clients to ($if) port ssh
 ```
-Replace *<network interface\>* by your server's network interface name (which you can get with ifconfig). Consider replacing the content of the authorized\_ssh\_clients macro by, for example, your home IP address, to avoid SSH connection attempts from bots.
+Replace *<network interface\>* by your server's network interface name (which you can get with ifconfig). Consider replacing the content of the authorized\_ssh\_clients macro by, for exemple, your home IP address, to avoid SSH connection attempts from bots.
 
 Check pf's configuration by running `pfctl -nf /etc/pf.conf`, load it with `pfctl -f /etc/pf.conf` and enable pf at boot with `rcctl enable pf`.
 

docs/installation/openbsd_fi.md

@@ -18,7 +18,7 @@ Matrix-kanava #pleroma:libera.chat ovat hyviä paikkoja löytää apua
 
 Asenna tarvittava ohjelmisto:
 
-`# pkg_add git elixir gmake postgresql-server-10.3 postgresql-contrib-10.3 cmake ffmpeg ImageMagick libvips`
+`# pkg_add git elixir gmake postgresql-server-10.3 postgresql-contrib-10.3 cmake ffmpeg ImageMagick`
 
 #### Optional software
 

docs/installation/otp_en.md

@@ -238,7 +238,7 @@ At this point if you open your (sub)domain in a browser you should see a 502 err
     systemctl enable pleroma
     ```
 
-If everything worked, you should see Pleroma-FE when visiting your domain. If that didn't happen, try reviewing the installation steps, starting Pleroma in the foreground and seeing if there are any errors.
+If everything worked, you should see Pleroma-FE when visiting your domain. If that didn't happen, try reviewing the installation steps, starting Pleroma in the foreground and seeing if there are any errrors.
 
 Questions about the installation or didn’t it work as it should be, ask in [#pleroma:libera.chat](https://matrix.to/#/#pleroma:libera.chat) via Matrix or **#pleroma** on **libera.chat** via IRC, you can also [file an issue on our Gitlab](https://git.pleroma.social/pleroma/pleroma-support/issues/new).
 

installation/freebsd/rc.d/pleroma

@@ -24,6 +24,4 @@ command=/usr/local/bin/elixir
 command_args="--erl \"-detached\" -S /usr/local/bin/mix phx.server"
 procname="*beam.smp"
 
-PATH="${PATH}:/usr/local/sbin:/usr/local/bin"
-
 run_rc_command "$1"

installation/netbsd/rc.d/pleroma

@@ -1,14 +1,11 @@
 #!/bin/sh
 # PROVIDE: pleroma
-# REQUIRE: DAEMON pgsql nginx
+# REQUIRE: DAEMON pgsql
 
 if [ -f /etc/rc.subr ]; then
 	. /etc/rc.subr
 fi
 
-pleroma_home="/home/pleroma"
-pleroma_user="pleroma"
-
 name="pleroma"
 rcvar=${name}
 command="/usr/pkg/bin/elixir"
@@ -22,10 +19,10 @@ pleroma_env="HOME=${pleroma_home} MIX_ENV=prod"
 check_pidfile()
 {
 	pid=$(pgrep -U "${pleroma_user}" /bin/beam.smp$)
-	printf '%s' "${pid}"
+	echo -n "${pid}"
 }
 
-if [ -f /etc/rc.subr ] && [ -d /etc/rc.d ] && [ -f /etc/rc.d/DAEMON ]; then
+if [ -f /etc/rc.subr -a -d /etc/rc.d -a -f /etc/rc.d/DAEMON ]; then
 	# newer NetBSD
 	load_rc_config ${name}
 	run_rc_command "$1"
@@ -42,7 +39,7 @@ else
 		stop)
 			echo "Stopping ${name}."
 			check_pidfile
-			! [ -n "${pid}" ] && kill "${pid}"
+			! [ -n ${pid} ] && kill ${pid}
 			;;
 
 		restart)

installation/nsfw-api.service

@@ -1,15 +0,0 @@
-[Unit]
-Description=NSFW API
-After=docker.service
-Requires=docker.service
-
-[Service]
-TimeoutStartSec=0
-Restart=always
-ExecStartPre=-/usr/bin/docker stop %n
-ExecStartPre=-/usr/bin/docker rm %n
-ExecStartPre=/usr/bin/docker pull eugencepoi/nsfw_api:latest
-ExecStart=/usr/bin/docker run --rm -p 127.0.0.1:5000:5000/tcp --env PORT=5000 --name %n eugencepoi/nsfw_api:latest
-
-[Install]
-WantedBy=multi-user.target

installation/openldap/pw_self_service.ldif

@@ -1,7 +0,0 @@
-dn: olcDatabase={1}mdb,cn=config
-changetype: modify
-add: olcAccess
-olcAccess: {1}to attrs=userPassword
-  by self write
-  by anonymous auth
-  by * none

installation/pleroma-mongooseim.cfg

@@ -204,7 +204,7 @@
       ]}
   ]},
 
-  %% Following HTTP API is deprecated, the new one above should be used instead
+  %% Following HTTP API is deprected, the new one abouve should be used instead
 
   { {5288, "127.0.0.1"} , ejabberd_cowboy, [
       {num_acceptors, 10},
@@ -824,7 +824,7 @@
 
     %% Enable archivization for private messages (default)
 %   {pm, [
-      %% Top-level options can be overridden here if needed, for example:
+      %% Top-level options can be overriden here if needed, for example:
 %     {async_writer, false}
 %   ]},
 
@@ -834,7 +834,7 @@
     %%
 %   {muc, [
 %     {host, "muc.@HOST@"}
-      %% As with pm, top-level options can be overridden for MUC archive
+      %% As with pm, top-level options can be overriden for MUC archive
 %   ]},
 %
     %% Do not use a <stanza-id/> element (by default stanzaid is used)

lib/mix/pleroma.ex

@@ -14,8 +14,7 @@ defmodule Mix.Pleroma do
     :swoosh,
     :timex,
     :fast_html,
-    :oban,
-    :logger_backends
+    :oban
   ]
   @cachex_children ["object", "user", "scrubber", "web_resp"]
   @doc "Common functions to be reused in mix tasks"

lib/mix/tasks/pleroma/benchmark.ex

@@ -3,20 +3,8 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Mix.Tasks.Pleroma.Benchmark do
-  @shortdoc "Benchmarks"
-  @moduledoc """
-  Benchmark tasks available:
-  
-  adapters 
-  render_timeline
-  search
-  tag
-
-  MIX_ENV=benchmark mix pleroma.benchmark adapters
-  """
-
-  use Mix.Task
   import Mix.Pleroma
+  use Mix.Task
 
   def run(["search"]) do
     start_pleroma()
@@ -75,7 +63,7 @@ defmodule Mix.Tasks.Pleroma.Benchmark do
 
     Benchee.run(
       %{
-        "Standard rendering" => fn activities ->
+        "Standart rendering" => fn activities ->
           Pleroma.Web.MastodonAPI.StatusView.render("index.json", %{
             activities: activities,
             for: user,

lib/mix/tasks/pleroma/config.ex

@@ -205,35 +205,6 @@ defmodule Mix.Tasks.Pleroma.Config do
     end
   end
 
-  # Removes any policies that are not a real module
-  # as they will prevent the server from starting
-  def run(["fix_mrf_policies"]) do
-    check_configdb(fn ->
-      start_pleroma()
-
-      group = :pleroma
-      key = :mrf
-
-      %{value: value} =
-        group
-        |> ConfigDB.get_by_group_and_key(key)
-
-      policies =
-        Keyword.get(value, :policies, [])
-        |> Enum.filter(&is_atom(&1))
-        |> Enum.filter(fn mrf ->
-          case Code.ensure_compiled(mrf) do
-            {:module, _} -> true
-            {:error, _} -> false
-          end
-        end)
-
-      value = Keyword.put(value, :policies, policies)
-
-      ConfigDB.update_or_create(%{group: group, key: key, value: value})
-    end)
-  end
-
   @spec migrate_to_db(Path.t() | nil) :: any()
   def migrate_to_db(file_path \\ nil) do
     with :ok <- Pleroma.Config.DeprecationWarnings.warn() do

lib/mix/tasks/pleroma/database.ex

@@ -67,168 +67,43 @@ defmodule Mix.Tasks.Pleroma.Database do
       OptionParser.parse(
         args,
         strict: [
-          vacuum: :boolean,
-          keep_threads: :boolean,
-          keep_non_public: :boolean,
-          prune_orphaned_activities: :boolean
+          vacuum: :boolean
         ]
       )
 
     start_pleroma()
 
     deadline = Pleroma.Config.get([:instance, :remote_post_retention_days])
-    time_deadline = NaiveDateTime.utc_now() |> NaiveDateTime.add(-(deadline * 86_400))
 
-    log_message = "Pruning objects older than #{deadline} days"
+    Logger.info("Pruning objects older than #{deadline} days")
 
-    log_message =
-      if Keyword.get(options, :keep_non_public) do
-        log_message <> ", keeping non public posts"
-      else
-        log_message
-      end
+    time_deadline =
+      NaiveDateTime.utc_now()
+      |> NaiveDateTime.add(-(deadline * 86_400))
 
-    log_message =
-      if Keyword.get(options, :keep_threads) do
-        log_message <> ", keeping threads intact"
-      else
-        log_message
-      end
-
-    log_message =
-      if Keyword.get(options, :prune_orphaned_activities) do
-        log_message <> ", pruning orphaned activities"
-      else
-        log_message
-      end
-
-    log_message =
-      if Keyword.get(options, :vacuum) do
-        log_message <>
-          ", doing a full vacuum (you shouldn't do this as a recurring maintanance task)"
-      else
-        log_message
-      end
-
-    Logger.info(log_message)
-
-    if Keyword.get(options, :keep_threads) do
-      # We want to delete objects from threads where
-      # 1. the newest post is still old
-      # 2. none of the activities is local
-      # 3. none of the activities is bookmarked
-      # 4. optionally none of the posts is non-public
-      deletable_context =
-        if Keyword.get(options, :keep_non_public) do
-          Pleroma.Activity
-          |> join(:left, [a], b in Pleroma.Bookmark, on: a.id == b.activity_id)
-          |> group_by([a], fragment("? ->> 'context'::text", a.data))
-          |> having(
-            [a],
-            not fragment(
-              # Posts (checked on Create Activity) is non-public
-              "bool_or((not(?->'to' \\? ? OR ?->'cc' \\? ?)) and ? ->> 'type' = 'Create')",
-              a.data,
-              ^Pleroma.Constants.as_public(),
-              a.data,
-              ^Pleroma.Constants.as_public(),
-              a.data
-            )
-          )
-        else
-          Pleroma.Activity
-          |> join(:left, [a], b in Pleroma.Bookmark, on: a.id == b.activity_id)
-          |> group_by([a], fragment("? ->> 'context'::text", a.data))
-        end
-        |> having([a], max(a.updated_at) < ^time_deadline)
-        |> having([a], not fragment("bool_or(?)", a.local))
-        |> having([_, b], fragment("max(?::text) is null", b.id))
-        |> select([a], fragment("? ->> 'context'::text", a.data))
-
-      Pleroma.Object
-      |> where([o], fragment("? ->> 'context'::text", o.data) in subquery(deletable_context))
-    else
-      if Keyword.get(options, :keep_non_public) do
-        Pleroma.Object
-        |> where(
-          [o],
-          fragment(
-            "?->'to' \\? ? OR ?->'cc' \\? ?",
-            o.data,
-            ^Pleroma.Constants.as_public(),
-            o.data,
-            ^Pleroma.Constants.as_public()
-          )
-        )
-      else
-        Pleroma.Object
-      end
-      |> where([o], o.updated_at < ^time_deadline)
-      |> where(
-        [o],
+    from(o in Object,
+      where:
+        fragment(
+          "?->'to' \\? ? OR ?->'cc' \\? ?",
+          o.data,
+          ^Pleroma.Constants.as_public(),
+          o.data,
+          ^Pleroma.Constants.as_public()
+        ),
+      where: o.inserted_at < ^time_deadline,
+      where:
         fragment("split_part(?->>'actor', '/', 3) != ?", o.data, ^Pleroma.Web.Endpoint.host())
-      )
-    end
+    )
     |> Repo.delete_all(timeout: :infinity)
 
-    if !Keyword.get(options, :keep_threads) do
-      # Without the --keep-threads option, it's possible that bookmarked
-      # objects have been deleted. We remove the corresponding bookmarks.
-      """
-      delete from public.bookmarks
-      where id in (
-        select b.id from public.bookmarks b
-        left join public.activities a on b.activity_id = a.id
-        left join public.objects o on a."data" ->> 'object' = o.data ->> 'id'
-        where o.id is null
-      )
-      """
-      |> Repo.query([], timeout: :infinity)
-    end
-
-    if Keyword.get(options, :prune_orphaned_activities) do
-      # Prune activities who link to a single object
-      """
-      delete from public.activities
-      where id in (
-        select a.id from public.activities a
-        left join public.objects o on a.data ->> 'object' = o.data ->> 'id'
-        left join public.activities a2 on a.data ->> 'object' = a2.data ->> 'id'
-        left join public.users u  on a.data ->> 'object' = u.ap_id
-        where not a.local
-        and jsonb_typeof(a."data" -> 'object') = 'string'
-        and o.id is null
-        and a2.id is null
-        and u.id is null
-      )
-      """
-      |> Repo.query([], timeout: :infinity)
-
-      # Prune activities who link to an array of objects
-      """
-      delete from public.activities
-      where id in (
-        select a.id from public.activities a
-        join json_array_elements_text((a."data" -> 'object')::json) as j on jsonb_typeof(a."data" -> 'object') = 'array'
-        left join public.objects o on j.value = o.data ->> 'id'
-        left join public.activities a2 on j.value = a2.data ->> 'id'
-        left join public.users u  on j.value = u.ap_id
-        group by a.id
-        having max(o.data ->> 'id') is null
-        and max(a2.data ->> 'id') is null
-        and max(u.ap_id) is null
-      )
-      """
-      |> Repo.query([], timeout: :infinity)
-    end
-
-    """
+    prune_hashtags_query = """
     DELETE FROM hashtags AS ht
     WHERE NOT EXISTS (
       SELECT 1 FROM hashtags_objects hto
       WHERE ht.id = hto.hashtag_id)
     """
-    |> Repo.query()
+
+    Repo.query(prune_hashtags_query)
 
     if Keyword.get(options, :vacuum) do
       Maintenance.vacuum("full")
@@ -295,12 +170,10 @@ defmodule Mix.Tasks.Pleroma.Database do
           |> DateTime.from_naive!("Etc/UTC")
           |> Timex.shift(days: days)
 
-        Pleroma.Workers.PurgeExpiredActivity.enqueue(
-          %{
-            activity_id: activity.id
-          },
-          scheduled_at: expires_at
-        )
+        Pleroma.Workers.PurgeExpiredActivity.enqueue(%{
+          activity_id: activity.id,
+          expires_at: expires_at
+        })
       end)
     end)
     |> Stream.run()
@@ -320,7 +193,7 @@ defmodule Mix.Tasks.Pleroma.Database do
         "ALTER DATABASE #{db} SET default_text_search_config = '#{tsconfig}';"
       )
 
-    # non-exist config will not raise exception but only give >0 messages
+    # non-exist config will not raise excpetion but only give >0 messages
     if length(msg) > 0 do
       shell_info("Error: #{inspect(msg, pretty: true)}")
     else
@@ -353,7 +226,7 @@ defmodule Mix.Tasks.Pleroma.Database do
         )
       end
 
-      shell_info(~c"Done.")
+      shell_info('Done.')
     end
   end
 

lib/mix/tasks/pleroma/digest.ex

@@ -30,7 +30,7 @@ defmodule Mix.Tasks.Pleroma.Digest do
       shell_info("Digest email have been sent to #{nickname} (#{user.email})")
     else
       _ ->
-        shell_info("Couldn't find any mentions for #{nickname} since #{last_digest_emailed_at}")
+        shell_info("Cound't find any mentions for #{nickname} since #{last_digest_emailed_at}")
     end
   end
 end

lib/mix/tasks/pleroma/ecto/rollback.ex

@@ -61,7 +61,7 @@ defmodule Mix.Tasks.Pleroma.Ecto.Rollback do
     Logger.configure(level: :info)
 
     if opts[:env] == "test" do
-      Logger.info("Rollback successfully")
+      Logger.info("Rollback succesfully")
     else
       {:ok, _, _} =
         Ecto.Migrator.with_repo(Pleroma.Repo, &Ecto.Migrator.run(&1, path, :down, opts))

lib/mix/tasks/pleroma/emoji.ex

@@ -93,7 +93,6 @@ defmodule Mix.Tasks.Pleroma.Emoji do
         )
 
         files = fetch_and_decode!(files_loc)
-        files_to_unzip = for({_, f} <- files, do: f)
 
         IO.puts(IO.ANSI.format(["Unpacking ", :bright, pack_name]))
 
@@ -104,7 +103,17 @@ defmodule Mix.Tasks.Pleroma.Emoji do
             pack_name
           ])
 
-        {:ok, _} = Pleroma.SafeZip.unzip_data(binary_archive, pack_path, files_to_unzip)
+        files_to_unzip =
+          Enum.map(
+            files,
+            fn {_, f} -> to_charlist(f) end
+          )
+
+        {:ok, _} =
+          :zip.unzip(binary_archive,
+            cwd: pack_path,
+            file_list: files_to_unzip
+          )
 
         IO.puts(IO.ANSI.format(["Writing pack.json for ", :bright, pack_name]))
 
@@ -192,7 +201,7 @@ defmodule Mix.Tasks.Pleroma.Emoji do
 
     tmp_pack_dir = Path.join(System.tmp_dir!(), "emoji-pack-#{name}")
 
-    {:ok, _} = Pleroma.SafeZip.unzip_data(binary_archive, tmp_pack_dir)
+    {:ok, _} = :zip.unzip(binary_archive, cwd: String.to_charlist(tmp_pack_dir))
 
     emoji_map = Pleroma.Emoji.Loader.make_shortcode_to_file_map(tmp_pack_dir, exts)
 

lib/mix/tasks/pleroma/instance.ex

@@ -292,7 +292,7 @@ defmodule Mix.Tasks.Pleroma.Instance do
 
       if db_configurable? do
         shell_info(
-          " Please transfer your config to the database after running database migrations. Refer to \"Transferring the config to/from the database\" section of the docs for more information."
+          " Please transfer your config to the database after running database migrations. Refer to \"Transfering the config to/from the database\" section of the docs for more information."
         )
       end
     else
@@ -352,4 +352,6 @@ defmodule Mix.Tasks.Pleroma.Instance do
 
     enabled_filters
   end
+
+  defp upload_filters(_), do: []
 end

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

@@ -1,83 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Mix.Tasks.Pleroma.Search.Indexer do
-  import Mix.Pleroma
-  import Ecto.Query
-
-  alias Pleroma.Workers.SearchIndexingWorker
-
-  def run(["create_index"]) do
-    start_pleroma()
-
-    with :ok <- Pleroma.Config.get([Pleroma.Search, :module]).create_index() do
-      IO.puts("Index created")
-    else
-      e -> IO.puts("Could not create index: #{inspect(e)}")
-    end
-  end
-
-  def run(["drop_index"]) do
-    start_pleroma()
-
-    with :ok <- Pleroma.Config.get([Pleroma.Search, :module]).drop_index() do
-      IO.puts("Index dropped")
-    else
-      e -> IO.puts("Could not drop index: #{inspect(e)}")
-    end
-  end
-
-  def run(["index" | options]) do
-    {options, [], []} =
-      OptionParser.parse(
-        options,
-        strict: [
-          chunk: :integer,
-          limit: :integer,
-          step: :integer
-        ]
-      )
-
-    start_pleroma()
-
-    chunk_size = Keyword.get(options, :chunk, 100)
-    limit = Keyword.get(options, :limit, 100_000)
-    per_step = Keyword.get(options, :step, 1000)
-
-    chunks = max(div(limit, per_step), 1)
-
-    1..chunks
-    |> Enum.each(fn step ->
-      q =
-        from(a in Pleroma.Activity,
-          limit: ^per_step,
-          offset: ^per_step * (^step - 1),
-          select: [:id],
-          order_by: [desc: :id]
-        )
-
-      {:ok, ids} =
-        Pleroma.Repo.transaction(fn ->
-          Pleroma.Repo.stream(q, timeout: :infinity)
-          |> Enum.map(fn a ->
-            a.id
-          end)
-        end)
-
-      IO.puts("Got #{length(ids)} activities, adding to indexer")
-
-      ids
-      |> Enum.chunk_every(chunk_size)
-      |> Enum.each(fn chunk ->
-        IO.puts("Adding #{length(chunk)} activities to indexing queue")
-
-        chunk
-        |> Enum.map(fn id ->
-          SearchIndexingWorker.new(%{"op" => "add_to_index", "activity" => id})
-        end)
-        |> Oban.insert_all()
-      end)
-    end)
-  end
-end

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

@@ -1,145 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Mix.Tasks.Pleroma.Search.Meilisearch do
-  require Pleroma.Constants
-
-  import Mix.Pleroma
-  import Ecto.Query
-
-  import Pleroma.Search.Meilisearch,
-    only: [meili_put: 2, meili_get: 1, meili_delete: 1]
-
-  def run(["index"]) do
-    start_pleroma()
-    Pleroma.HTML.compile_scrubbers()
-
-    meili_version =
-      (
-        {:ok, result} = meili_get("/version")
-
-        result["pkgVersion"]
-      )
-
-    # The ranking rule syntax was changed but nothing about that is mentioned in the changelog
-    if not Version.match?(meili_version, ">= 0.25.0") do
-      raise "Meilisearch <0.24.0 not supported"
-    end
-
-    {:ok, _} =
-      meili_put(
-        "/indexes/objects/settings/ranking-rules",
-        [
-          "published:desc",
-          "words",
-          "exactness",
-          "proximity",
-          "typo",
-          "attribute",
-          "sort"
-        ]
-      )
-
-    {:ok, _} =
-      meili_put(
-        "/indexes/objects/settings/searchable-attributes",
-        [
-          "content"
-        ]
-      )
-
-    IO.puts("Created indices. Starting to insert posts.")
-
-    chunk_size = Pleroma.Config.get([Pleroma.Search.Meilisearch, :initial_indexing_chunk_size])
-
-    Pleroma.Repo.transaction(
-      fn ->
-        query =
-          from(Pleroma.Object,
-            # Only index public and unlisted posts which are notes and have some text
-            where:
-              fragment("data->>'type' = 'Note'") and
-                (fragment("data->'to' \\? ?", ^Pleroma.Constants.as_public()) or
-                   fragment("data->'cc' \\? ?", ^Pleroma.Constants.as_public())),
-            order_by: [desc: fragment("data->'published'")]
-          )
-
-        count = query |> Pleroma.Repo.aggregate(:count, :data)
-        IO.puts("Entries to index: #{count}")
-
-        Pleroma.Repo.stream(
-          query,
-          timeout: :infinity
-        )
-        |> Stream.map(&Pleroma.Search.Meilisearch.object_to_search_data/1)
-        |> Stream.filter(fn o -> not is_nil(o) end)
-        |> Stream.chunk_every(chunk_size)
-        |> Stream.transform(0, fn objects, acc ->
-          new_acc = acc + Enum.count(objects)
-
-          # Reset to the beginning of the line and rewrite it
-          IO.write("\r")
-          IO.write("Indexed #{new_acc} entries")
-
-          {[objects], new_acc}
-        end)
-        |> Stream.each(fn objects ->
-          result =
-            meili_put(
-              "/indexes/objects/documents",
-              objects
-            )
-
-          with {:ok, res} <- result do
-            if not Map.has_key?(res, "uid") do
-              IO.puts("\nFailed to index: #{inspect(result)}")
-            end
-          else
-            e -> IO.puts("\nFailed to index due to network error: #{inspect(e)}")
-          end
-        end)
-        |> Stream.run()
-      end,
-      timeout: :infinity
-    )
-
-    IO.write("\n")
-  end
-
-  def run(["clear"]) do
-    start_pleroma()
-
-    meili_delete("/indexes/objects/documents")
-  end
-
-  def run(["show-keys", master_key]) do
-    start_pleroma()
-
-    endpoint = Pleroma.Config.get([Pleroma.Search.Meilisearch, :url])
-
-    {:ok, result} =
-      Pleroma.HTTP.get(
-        Path.join(endpoint, "/keys"),
-        [{"Authorization", "Bearer #{master_key}"}]
-      )
-
-    decoded = Jason.decode!(result.body)
-
-    if decoded["results"] do
-      Enum.each(decoded["results"], fn %{"description" => desc, "key" => key} ->
-        IO.puts("#{desc}: #{key}")
-      end)
-    else
-      IO.puts("Error fetching the keys, check the master key is correct: #{inspect(decoded)}")
-    end
-  end
-
-  def run(["stats"]) do
-    start_pleroma()
-
-    {:ok, result} = meili_get("/indexes/objects/stats")
-    IO.puts("Number of entries: #{result["numberOfDocuments"]}")
-    IO.puts("Indexing? #{result["isIndexing"]}")
-  end
-end

lib/mix/tasks/pleroma/test_runner.ex

@@ -1,25 +0,0 @@
-defmodule Mix.Tasks.Pleroma.TestRunner do
-  @shortdoc "Retries tests once if they fail"
-
-  use Mix.Task
-
-  def run(args \\ []) do
-    case System.cmd("mix", ["test"] ++ args, into: IO.stream(:stdio, :line)) do
-      {_, 0} ->
-        :ok
-
-      _ ->
-        retry(args)
-    end
-  end
-
-  def retry(args) do
-    case System.cmd("mix", ["test", "--failed"] ++ args, into: IO.stream(:stdio, :line)) do
-      {_, 0} ->
-        :ok
-
-      _ ->
-        exit(1)
-    end
-  end
-end

lib/phoenix/transports/web_socket/raw.ex

@@ -0,0 +1,94 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Phoenix.Transports.WebSocket.Raw do
+  import Plug.Conn,
+    only: [
+      fetch_query_params: 1,
+      send_resp: 3
+    ]
+
+  alias Phoenix.Socket.Transport
+
+  def default_config do
+    [
+      timeout: 60_000,
+      transport_log: false,
+      cowboy: Phoenix.Endpoint.CowboyWebSocket
+    ]
+  end
+
+  def init(%Plug.Conn{method: "GET"} = conn, {endpoint, handler, transport}) do
+    {_, opts} = handler.__transport__(transport)
+
+    conn =
+      conn
+      |> fetch_query_params
+      |> Transport.transport_log(opts[:transport_log])
+      |> Transport.force_ssl(handler, endpoint, opts)
+      |> Transport.check_origin(handler, endpoint, opts)
+
+    case conn do
+      %{halted: false} = conn ->
+        case handler.connect(%{
+               endpoint: endpoint,
+               transport: transport,
+               options: [serializer: nil],
+               params: conn.params
+             }) do
+          {:ok, socket} ->
+            {:ok, conn, {__MODULE__, {socket, opts}}}
+
+          :error ->
+            send_resp(conn, :forbidden, "")
+            {:error, conn}
+        end
+
+      _ ->
+        {:error, conn}
+    end
+  end
+
+  def init(conn, _) do
+    send_resp(conn, :bad_request, "")
+    {:error, conn}
+  end
+
+  def ws_init({socket, config}) do
+    Process.flag(:trap_exit, true)
+    {:ok, %{socket: socket}, config[:timeout]}
+  end
+
+  def ws_handle(op, data, state) do
+    state.socket.handler
+    |> apply(:handle, [op, data, state])
+    |> case do
+      {op, data} ->
+        {:reply, {op, data}, state}
+
+      {op, data, state} ->
+        {:reply, {op, data}, state}
+
+      %{} = state ->
+        {:ok, state}
+
+      _ ->
+        {:ok, state}
+    end
+  end
+
+  def ws_info({_, _} = tuple, state) do
+    {:reply, tuple, state}
+  end
+
+  def ws_info(_tuple, state), do: {:ok, state}
+
+  def ws_close(state) do
+    ws_handle(:closed, :normal, state)
+  end
+
+  def ws_terminate(reason, state) do
+    ws_handle(:closed, reason, state)
+  end
+end

lib/pleroma/activity.ex

@@ -368,7 +368,7 @@ defmodule Pleroma.Activity do
     )
   end
 
-  defdelegate search(user, query, options \\ []), to: Pleroma.Search.DatabaseSearch
+  defdelegate search(user, query, options \\ []), to: Pleroma.Activity.Search
 
   def direct_conversation_id(activity, for_user) do
     alias Pleroma.Conversation.Participation

lib/pleroma/activity/html.ex

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

lib/pleroma/activity/queries.ex

@@ -9,7 +9,7 @@ defmodule Pleroma.Activity.Queries do
 
   import Ecto.Query, only: [from: 2, where: 3]
 
-  @type query :: Ecto.Queryable.t() | Pleroma.Activity.t()
+  @type query :: Ecto.Queryable.t() | Activity.t()
 
   alias Pleroma.Activity
   alias Pleroma.User

lib/pleroma/activity/search.ex

@@ -1,10 +1,9 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
-defmodule Pleroma.Search.DatabaseSearch do
+defmodule Pleroma.Activity.Search do
   alias Pleroma.Activity
-  alias Pleroma.Config
   alias Pleroma.Object.Fetcher
   alias Pleroma.Pagination
   alias Pleroma.User
@@ -14,21 +13,25 @@ defmodule Pleroma.Search.DatabaseSearch do
 
   import Ecto.Query
 
-  @behaviour Pleroma.Search.SearchBackend
-
-  @impl true
   def search(user, search_query, options \\ []) do
-    index_type = if Config.get([:database, :rum_enabled]), do: :rum, else: :gin
+    index_type = if Pleroma.Config.get([:database, :rum_enabled]), do: :rum, else: :gin
     limit = Enum.min([Keyword.get(options, :limit), 40])
     offset = Keyword.get(options, :offset, 0)
     author = Keyword.get(options, :author)
 
+    search_function =
+      if :persistent_term.get({Pleroma.Repo, :postgres_version}) >= 11 do
+        :websearch
+      else
+        :plain
+      end
+
     try do
       Activity
       |> Activity.with_preloaded_object()
       |> Activity.restrict_deactivated_users()
       |> restrict_public(user)
-      |> query_with(index_type, search_query)
+      |> query_with(index_type, search_query, search_function)
       |> maybe_restrict_local(user)
       |> maybe_restrict_author(author)
       |> maybe_restrict_blocked(user)
@@ -42,21 +45,6 @@ defmodule Pleroma.Search.DatabaseSearch do
     end
   end
 
-  @impl true
-  def add_to_index(_activity), do: :ok
-
-  @impl true
-  def remove_from_index(_object), do: :ok
-
-  @impl true
-  def create_index, do: :ok
-
-  @impl true
-  def drop_index, do: :ok
-
-  @impl true
-  def healthcheck_endpoints, do: nil
-
   def maybe_restrict_author(query, %User{} = author) do
     Activity.Queries.by_author(query, author)
   end
@@ -88,7 +76,25 @@ defmodule Pleroma.Search.DatabaseSearch do
     )
   end
 
-  defp query_with(q, :gin, search_query) do
+  defp query_with(q, :gin, search_query, :plain) do
+    %{rows: [[tsc]]} =
+      Ecto.Adapters.SQL.query!(
+        Pleroma.Repo,
+        "select current_setting('default_text_search_config')::regconfig::oid;"
+      )
+
+    from([a, o] in q,
+      where:
+        fragment(
+          "to_tsvector(?::oid::regconfig, ?->>'content') @@ plainto_tsquery(?)",
+          ^tsc,
+          o.data,
+          ^search_query
+        )
+    )
+  end
+
+  defp query_with(q, :gin, search_query, :websearch) do
     %{rows: [[tsc]]} =
       Ecto.Adapters.SQL.query!(
         Pleroma.Repo,
@@ -102,12 +108,23 @@ defmodule Pleroma.Search.DatabaseSearch do
           ^tsc,
           o.data,
           ^search_query
-        ),
-      order_by: [desc: :inserted_at]
+        )
     )
   end
 
-  defp query_with(q, :rum, search_query) do
+  defp query_with(q, :rum, search_query, :plain) do
+    from([a, o] in q,
+      where:
+        fragment(
+          "? @@ plainto_tsquery(?)",
+          o.fts_content,
+          ^search_query
+        ),
+      order_by: [fragment("? <=> now()::date", o.inserted_at)]
+    )
+  end
+
+  defp query_with(q, :rum, search_query, :websearch) do
     from([a, o] in q,
       where:
         fragment(
@@ -119,8 +136,8 @@ defmodule Pleroma.Search.DatabaseSearch do
     )
   end
 
-  def maybe_restrict_local(q, user) do
-    limit = Config.get([:instance, :limit_to_local_content], :unauthenticated)
+  defp maybe_restrict_local(q, user) do
+    limit = Pleroma.Config.get([:instance, :limit_to_local_content], :unauthenticated)
 
     case {limit, user} do
       {:all, _} -> restrict_local(q)
@@ -132,7 +149,7 @@ defmodule Pleroma.Search.DatabaseSearch do
 
   defp restrict_local(q), do: where(q, local: true)
 
-  def maybe_fetch(activities, user, search_query) do
+  defp maybe_fetch(activities, user, search_query) do
     with true <- Regex.match?(~r/https?:/, search_query),
          {:ok, object} <- Fetcher.fetch_object_from_id(search_query),
          %Activity{} = activity <- Activity.get_create_by_object_ap_id(object.data["id"]),

lib/pleroma/announcement.ex

@@ -23,21 +23,19 @@ defmodule Pleroma.Announcement do
     timestamps(type: :utc_datetime)
   end
 
-  @doc "Generates changeset for %Pleroma.Announcement{}"
-  @spec changeset(%__MODULE__{}, map()) :: %Ecto.Changeset{}
-  def changeset(announcement \\ %__MODULE__{}, params \\ %{data: %{}}) do
-    announcement
-    |> cast(validate_params(announcement, params), [:data, :starts_at, :ends_at, :rendered])
+  def change(struct, params \\ %{}) do
+    struct
+    |> cast(validate_params(struct, params), [:data, :starts_at, :ends_at, :rendered])
     |> validate_required([:data])
   end
 
-  defp validate_params(announcement, params) do
+  defp validate_params(struct, params) do
     base_data =
       %{
         "content" => "",
         "all_day" => false
       }
-      |> Map.merge((announcement && announcement.data) || %{})
+      |> Map.merge((struct && struct.data) || %{})
 
     merged_data =
       Map.merge(base_data, params.data)
@@ -63,13 +61,13 @@ defmodule Pleroma.Announcement do
   end
 
   def add(params) do
-    changeset = changeset(%__MODULE__{}, params)
+    changeset = change(%__MODULE__{}, params)
 
     Repo.insert(changeset)
   end
 
   def update(announcement, params) do
-    changeset = changeset(announcement, params)
+    changeset = change(announcement, params)
 
     Repo.update(changeset)
   end

lib/pleroma/application.ex

@@ -14,6 +14,7 @@ defmodule Pleroma.Application do
   @name Mix.Project.config()[:name]
   @version Mix.Project.config()[:version]
   @repository Mix.Project.config()[:source_url]
+  @mix_env Mix.env()
 
   def name, do: @name
   def version, do: @version
@@ -51,15 +52,9 @@ defmodule Pleroma.Application do
     Pleroma.HTML.compile_scrubbers()
     Pleroma.Config.Oban.warn()
     Config.DeprecationWarnings.warn()
-
-    if Config.get([Pleroma.Web.Plugs.HTTPSecurityPlug, :enable], true) do
-      Pleroma.Web.Plugs.HTTPSecurityPlug.warn_if_disabled()
-    end
-
-    if Config.get(:env) != :test do
-      Pleroma.ApplicationRequirements.verify!()
-    end
-
+    Pleroma.Web.Plugs.HTTPSecurityPlug.warn_if_disabled()
+    Pleroma.ApplicationRequirements.verify!()
+    setup_instrumenters()
     load_custom_modules()
     Pleroma.Docs.JSON.compile()
     limiters_setup()
@@ -96,8 +91,6 @@ defmodule Pleroma.Application do
     # Define workers and child supervisors to be supervised
     children =
       [
-        Pleroma.PromEx,
-        Pleroma.LDAP,
         Pleroma.Repo,
         Config.TransferTask,
         Pleroma.Emoji,
@@ -105,7 +98,7 @@ defmodule Pleroma.Application do
         {Task.Supervisor, name: Pleroma.TaskSupervisor}
       ] ++
         cachex_children() ++
-        http_children(adapter) ++
+        http_children(adapter, @mix_env) ++
         [
           Pleroma.Stats,
           Pleroma.JobQueueMonitor,
@@ -113,22 +106,46 @@ defmodule Pleroma.Application do
           {Oban, Config.get(Oban)},
           Pleroma.Web.Endpoint
         ] ++
-        task_children() ++
-        streamer_registry() ++
-        background_migrators() ++
+        task_children(@mix_env) ++
+        dont_run_in_test(@mix_env) ++
         shout_child(shout_enabled?()) ++
-        [Pleroma.Gopher.Server] ++
-        [Pleroma.Search.Healthcheck]
+        [Pleroma.Gopher.Server]
 
     # See http://elixir-lang.org/docs/stable/elixir/Supervisor.html
     # for other strategies and supported options
     # If we have a lot of caches, default max_restarts can cause test
     # resets to fail.
     # Go for the default 3 unless we're in test
-    max_restarts = Application.get_env(:pleroma, __MODULE__)[:max_restarts]
+    max_restarts =
+      if @mix_env == :test do
+        100
+      else
+        3
+      end
 
     opts = [strategy: :one_for_one, name: Pleroma.Supervisor, max_restarts: max_restarts]
-    Supervisor.start_link(children, opts)
+    result = Supervisor.start_link(children, opts)
+
+    set_postgres_server_version()
+
+    result
+  end
+
+  defp set_postgres_server_version do
+    version =
+      with %{rows: [[version]]} <- Ecto.Adapters.SQL.query!(Pleroma.Repo, "show server_version"),
+           {num, _} <- Float.parse(version) do
+        num
+      else
+        e ->
+          Logger.warn(
+            "Could not get the postgres version: #{inspect(e)}.\nSetting the default value of 9.6"
+          )
+
+          9.6
+      end
+
+    :persistent_term.put({Pleroma.Repo, :postgres_version}, version)
   end
 
   def load_custom_modules do
@@ -142,7 +159,7 @@ defmodule Pleroma.Application do
           raise "Invalid custom modules"
 
         {:ok, modules, _warnings} ->
-          if Application.get_env(:pleroma, __MODULE__)[:load_custom_modules] do
+          if @mix_env != :test do
             Enum.each(modules, fn mod ->
               Logger.info("Custom module loaded: #{inspect(mod)}")
             end)
@@ -153,6 +170,29 @@ defmodule Pleroma.Application do
     end
   end
 
+  defp setup_instrumenters do
+    require Prometheus.Registry
+
+    if Application.get_env(:prometheus, Pleroma.Repo.Instrumenter) do
+      :ok =
+        :telemetry.attach(
+          "prometheus-ecto",
+          [:pleroma, :repo, :query],
+          &Pleroma.Repo.Instrumenter.handle_event/4,
+          %{}
+        )
+
+      Pleroma.Repo.Instrumenter.setup()
+    end
+
+    Pleroma.Web.Endpoint.MetricsExporter.setup()
+    Pleroma.Web.Endpoint.PipelineInstrumenter.setup()
+
+    # Note: disabled until prometheus-phx is integrated into prometheus-phoenix:
+    # Pleroma.Web.Endpoint.Instrumenter.setup()
+    PrometheusPhx.setup()
+  end
+
   defp cachex_children do
     [
       build_cachex("used_captcha", ttl_interval: seconds_valid_interval()),
@@ -165,15 +205,12 @@ defmodule Pleroma.Application do
       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("failed_media_helper_url", default_ttl: :timer.minutes(15), limit: 2_500),
       build_cachex("banned_urls", default_ttl: :timer.hours(24 * 30), limit: 5_000),
       build_cachex("chat_message_id_idempotency_key",
         expiration: chat_message_id_idempotency_key_expiration(),
         limit: 500_000
       ),
-      build_cachex("rel_me", limit: 2500),
-      build_cachex("host_meta", default_ttl: :timer.minutes(120), limit: 5_000),
-      build_cachex("translations", default_ttl: :timer.hours(24), limit: 5_000)
+      build_cachex("rel_me", limit: 2500)
     ]
   end
 
@@ -199,30 +236,24 @@ defmodule Pleroma.Application do
 
   defp shout_enabled?, do: Config.get([:shout, :enabled])
 
-  defp streamer_registry do
-    if Application.get_env(:pleroma, __MODULE__)[:streamer_registry] do
-      [
-        {Registry,
-         [
-           name: Pleroma.Web.Streamer.registry(),
-           keys: :duplicate,
-           partitions: System.schedulers_online()
-         ]}
-      ]
-    else
-      []
-    end
+  defp dont_run_in_test(env) when env in [:test, :benchmark], do: []
+
+  defp dont_run_in_test(_) do
+    [
+      {Registry,
+       [
+         name: Pleroma.Web.Streamer.registry(),
+         keys: :duplicate,
+         partitions: System.schedulers_online()
+       ]}
+    ] ++ background_migrators()
   end
 
   defp background_migrators do
-    if Application.get_env(:pleroma, __MODULE__)[:background_migrators] do
-      [
-        Pleroma.Migrators.HashtagsTableMigrator,
-        Pleroma.Migrators.ContextObjectsDeletionMigrator
-      ]
-    else
-      []
-    end
+    [
+      Pleroma.Migrators.HashtagsTableMigrator,
+      Pleroma.Migrators.ContextObjectsDeletionMigrator
+    ]
   end
 
   defp shout_child(true) do
@@ -234,43 +265,37 @@ defmodule Pleroma.Application do
 
   defp shout_child(_), do: []
 
-  defp task_children do
-    children = [
+  defp task_children(:test) do
+    [
       %{
         id: :web_push_init,
         start: {Task, :start_link, [&Pleroma.Web.Push.init/0]},
         restart: :temporary
       }
     ]
+  end
 
-    if Application.get_env(:pleroma, __MODULE__)[:internal_fetch] do
-      children ++
-        [
-          %{
-            id: :internal_fetch_init,
-            start: {Task, :start_link, [&Pleroma.Web.ActivityPub.InternalFetchActor.init/0]},
-            restart: :temporary
-          }
-        ]
-    else
-      children
-    end
+  defp task_children(_) do
+    [
+      %{
+        id: :web_push_init,
+        start: {Task, :start_link, [&Pleroma.Web.Push.init/0]},
+        restart: :temporary
+      },
+      %{
+        id: :internal_fetch_init,
+        start: {Task, :start_link, [&Pleroma.Web.ActivityPub.InternalFetchActor.init/0]},
+        restart: :temporary
+      }
+    ]
   end
 
   # start hackney and gun pools in tests
-  defp http_children(adapter) do
-    if Application.get_env(:pleroma, __MODULE__)[:test_http_pools] do
-      http_children_hackney() ++ http_children_gun()
-    else
-      cond do
-        match?(Tesla.Adapter.Hackney, adapter) -> http_children_hackney()
-        match?(Tesla.Adapter.Gun, adapter) -> http_children_gun()
-        true -> []
-      end
-    end
+  defp http_children(_, :test) do
+    http_children(Tesla.Adapter.Hackney, nil) ++ http_children(Tesla.Adapter.Gun, nil)
   end
 
-  defp http_children_hackney do
+  defp http_children(Tesla.Adapter.Hackney, _) do
     pools = [:federation, :media]
 
     pools =
@@ -286,18 +311,18 @@ defmodule Pleroma.Application do
     end
   end
 
-  defp http_children_gun do
+  defp http_children(Tesla.Adapter.Gun, _) do
     Pleroma.Gun.ConnectionPool.children() ++
       [{Task, &Pleroma.HTTP.AdapterHelper.Gun.limiter_setup/0}]
   end
 
+  defp http_children(_, _), do: []
+
   @spec limiters_setup() :: :ok
   def limiters_setup do
     config = Config.get(ConcurrentLimiter, [])
 
-    [
-      Pleroma.Search
-    ]
+    [Pleroma.Web.RichMedia.Helpers, Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy]
     |> Enum.each(fn module ->
       mod_config = Keyword.get(config, module, [])
 

lib/pleroma/application_requirements.ex

@@ -7,10 +7,7 @@ defmodule Pleroma.ApplicationRequirements do
   The module represents the collection of validations to runs before start server.
   """
 
-  defmodule VerifyError do
-    defexception([:message])
-    @type t :: %__MODULE__{}
-  end
+  defmodule VerifyError, do: defexception([:message])
 
   alias Pleroma.Config
   alias Pleroma.Helpers.MediaHelper
@@ -28,7 +25,6 @@ defmodule Pleroma.ApplicationRequirements do
     |> check_welcome_message_config!()
     |> check_rum!()
     |> check_repo_pool_size!()
-    |> check_mrfs()
     |> handle_result()
   end
 
@@ -38,7 +34,7 @@ defmodule Pleroma.ApplicationRequirements do
   defp check_welcome_message_config!(:ok) do
     if Pleroma.Config.get([:welcome, :email, :enabled], false) and
          not Pleroma.Emails.Mailer.enabled?() do
-      Logger.warning("""
+      Logger.warn("""
       To send welcome emails, you need to enable the mailer.
       Welcome emails will NOT be sent with the current config.
 
@@ -57,7 +53,7 @@ defmodule Pleroma.ApplicationRequirements do
   def check_confirmation_accounts!(:ok) do
     if Pleroma.Config.get([:instance, :account_activation_required]) &&
          not Pleroma.Emails.Mailer.enabled?() do
-      Logger.warning("""
+      Logger.warn("""
       Account activation is required, but the mailer is disabled.
       Users will NOT be able to confirm their accounts with this config.
       Either disable account activation or enable the mailer.
@@ -172,6 +168,8 @@ defmodule Pleroma.ApplicationRequirements do
       check_filter(Pleroma.Upload.Filter.Exiftool.ReadDescription, "exiftool"),
       check_filter(Pleroma.Upload.Filter.Mogrify, "mogrify"),
       check_filter(Pleroma.Upload.Filter.Mogrifun, "mogrify"),
+      check_filter(Pleroma.Upload.Filter.AnalyzeMetadata, "mogrify"),
+      check_filter(Pleroma.Upload.Filter.AnalyzeMetadata, "convert"),
       check_filter(Pleroma.Upload.Filter.AnalyzeMetadata, "ffprobe")
     ]
 
@@ -189,40 +187,7 @@ defmodule Pleroma.ApplicationRequirements do
         false
       end
 
-    language_detector_commands_status =
-      if Pleroma.Language.LanguageDetector.missing_dependencies() == [] do
-        true
-      else
-        Logger.error(
-          "The following dependencies required by the currently enabled " <>
-            "language detection provider are not installed: " <>
-            inspect(Pleroma.Language.LanguageDetector.missing_dependencies())
-        )
-
-        false
-      end
-
-    translation_commands_status =
-      if Pleroma.Language.Translation.missing_dependencies() == [] do
-        true
-      else
-        Logger.error(
-          "The following dependencies required by the currently enabled " <>
-            "translation provider are not installed: " <>
-            inspect(Pleroma.Language.Translation.missing_dependencies())
-        )
-
-        false
-      end
-
-    if Enum.all?(
-         [
-           preview_proxy_commands_status,
-           language_detector_commands_status,
-           translation_commands_status | filter_commands_statuses
-         ],
-         & &1
-       ) do
+    if Enum.all?([preview_proxy_commands_status | filter_commands_statuses], & &1) do
       :ok
     else
       {:error,
@@ -230,6 +195,8 @@ defmodule Pleroma.ApplicationRequirements do
     end
   end
 
+  defp check_system_commands!(result), do: result
+
   defp check_repo_pool_size!(:ok) do
     if Pleroma.Config.get([Pleroma.Repo, :pool_size], 10) != 10 and
          not Pleroma.Config.get([:dangerzone, :override_repo_pool_size], false) do
@@ -268,24 +235,4 @@ defmodule Pleroma.ApplicationRequirements do
       true
     end
   end
-
-  defp check_mrfs(:ok) do
-    mrfs = Config.get!([:mrf, :policies])
-
-    missing_mrfs =
-      Enum.reduce(mrfs, [], fn x, acc ->
-        case Code.ensure_compiled(x) do
-          {:module, _} -> acc
-          {:error, _} -> acc ++ [x]
-        end
-      end)
-
-    if Enum.empty?(missing_mrfs) do
-      :ok
-    else
-      {:error, "The following MRF modules are configured but missing: #{inspect(missing_mrfs)}"}
-    end
-  end
-
-  defp check_mrfs(result), do: result
 end

lib/pleroma/bookmark.ex

@@ -10,7 +10,6 @@ defmodule Pleroma.Bookmark do
 
   alias Pleroma.Activity
   alias Pleroma.Bookmark
-  alias Pleroma.BookmarkFolder
   alias Pleroma.Repo
   alias Pleroma.User
 
@@ -19,46 +18,33 @@ defmodule Pleroma.Bookmark do
   schema "bookmarks" do
     belongs_to(:user, User, type: FlakeId.Ecto.CompatType)
     belongs_to(:activity, Activity, type: FlakeId.Ecto.CompatType)
-    belongs_to(:folder, BookmarkFolder, type: FlakeId.Ecto.CompatType)
 
     timestamps()
   end
 
-  @spec create(Ecto.UUID.t(), Ecto.UUID.t()) ::
-          {:ok, Bookmark.t()} | {:error, Ecto.Changeset.t()}
-  def create(user_id, activity_id, folder_id \\ nil) do
+  @spec create(FlakeId.Ecto.CompatType.t(), FlakeId.Ecto.CompatType.t()) ::
+          {:ok, Bookmark.t()} | {:error, Changeset.t()}
+  def create(user_id, activity_id) do
     attrs = %{
       user_id: user_id,
-      activity_id: activity_id,
-      folder_id: folder_id
+      activity_id: activity_id
     }
 
     %Bookmark{}
-    |> cast(attrs, [:user_id, :activity_id, :folder_id])
+    |> cast(attrs, [:user_id, :activity_id])
     |> validate_required([:user_id, :activity_id])
     |> unique_constraint(:activity_id, name: :bookmarks_user_id_activity_id_index)
-    |> Repo.insert(
-      on_conflict: [set: [folder_id: folder_id]],
-      conflict_target: [:user_id, :activity_id]
-    )
+    |> Repo.insert()
   end
 
-  @spec for_user_query(Ecto.UUID.t()) :: Ecto.Query.t()
-  def for_user_query(user_id, folder_id \\ nil) do
+  @spec for_user_query(FlakeId.Ecto.CompatType.t()) :: Ecto.Query.t()
+  def for_user_query(user_id) do
     Bookmark
     |> where(user_id: ^user_id)
-    |> maybe_filter_by_folder(folder_id)
     |> join(:inner, [b], activity in assoc(b, :activity))
     |> preload([b, a], activity: a)
   end
 
-  defp maybe_filter_by_folder(query, nil), do: query
-
-  defp maybe_filter_by_folder(query, folder_id) do
-    query
-    |> where(folder_id: ^folder_id)
-  end
-
   def get(user_id, activity_id) do
     Bookmark
     |> where(user_id: ^user_id)
@@ -66,8 +52,8 @@ defmodule Pleroma.Bookmark do
     |> Repo.one()
   end
 
-  @spec destroy(Ecto.UUID.t(), Ecto.UUID.t()) ::
-          {:ok, Bookmark.t()} | {:error, Ecto.Changeset.t()}
+  @spec destroy(FlakeId.Ecto.CompatType.t(), FlakeId.Ecto.CompatType.t()) ::
+          {:ok, Bookmark.t()} | {:error, Changeset.t()}
   def destroy(user_id, activity_id) do
     from(b in Bookmark,
       where: b.user_id == ^user_id,
@@ -76,11 +62,4 @@ defmodule Pleroma.Bookmark do
     |> Repo.one()
     |> Repo.delete()
   end
-
-  def set_folder(bookmark, folder_id) do
-    bookmark
-    |> cast(%{folder_id: folder_id}, [:folder_id])
-    |> validate_required([:folder_id])
-    |> Repo.update()
-  end
 end

lib/pleroma/bookmark_folder.ex

@@ -1,115 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2024 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.BookmarkFolder do
-  use Ecto.Schema
-
-  import Ecto.Changeset
-  import Ecto.Query
-
-  alias Pleroma.BookmarkFolder
-  alias Pleroma.Emoji
-  alias Pleroma.Repo
-  alias Pleroma.User
-
-  @type t :: %__MODULE__{}
-  @primary_key {:id, FlakeId.Ecto.CompatType, autogenerate: true}
-
-  schema "bookmark_folders" do
-    field(:name, :string)
-    field(:emoji, :string)
-
-    belongs_to(:user, User, type: FlakeId.Ecto.CompatType)
-
-    timestamps()
-  end
-
-  def get_by_id(id), do: Repo.get_by(BookmarkFolder, id: id)
-
-  def create(user_id, name, emoji \\ nil) do
-    %BookmarkFolder{}
-    |> cast(
-      %{
-        user_id: user_id,
-        name: name,
-        emoji: emoji
-      },
-      [:user_id, :name, :emoji]
-    )
-    |> validate_required([:user_id, :name])
-    |> fix_emoji()
-    |> validate_emoji()
-    |> unique_constraint([:user_id, :name])
-    |> Repo.insert()
-  end
-
-  def update(folder_id, name, emoji \\ nil) do
-    get_by_id(folder_id)
-    |> cast(
-      %{
-        name: name,
-        emoji: emoji
-      },
-      [:name, :emoji]
-    )
-    |> fix_emoji()
-    |> validate_emoji()
-    |> unique_constraint([:user_id, :name])
-    |> Repo.update()
-  end
-
-  defp fix_emoji(changeset) do
-    with {:emoji_field, emoji} when is_binary(emoji) <-
-           {:emoji_field, get_field(changeset, :emoji)},
-         {:fixed_emoji, emoji} <-
-           {:fixed_emoji,
-            emoji
-            |> Pleroma.Emoji.fully_qualify_emoji()
-            |> Pleroma.Emoji.maybe_quote()} do
-      put_change(changeset, :emoji, emoji)
-    else
-      {:emoji_field, _} -> changeset
-    end
-  end
-
-  defp validate_emoji(changeset) do
-    validate_change(changeset, :emoji, fn
-      :emoji, nil ->
-        []
-
-      :emoji, emoji ->
-        if Emoji.unicode?(emoji) or valid_local_custom_emoji?(emoji) do
-          []
-        else
-          [emoji: "Invalid emoji"]
-        end
-    end)
-  end
-
-  defp valid_local_custom_emoji?(emoji) do
-    with %{file: _path} <- Emoji.get(emoji) do
-      true
-    else
-      _ -> false
-    end
-  end
-
-  def delete(folder_id) do
-    BookmarkFolder
-    |> Repo.get_by(id: folder_id)
-    |> Repo.delete()
-  end
-
-  def for_user(user_id) do
-    BookmarkFolder
-    |> where(user_id: ^user_id)
-    |> Repo.all()
-  end
-
-  def belongs_to_user?(folder_id, user_id) do
-    BookmarkFolder
-    |> where(id: ^folder_id, user_id: ^user_id)
-    |> Repo.exists?()
-  end
-end

lib/pleroma/caching.ex

@@ -8,13 +8,10 @@ defmodule Pleroma.Caching do
   @callback put(Cachex.cache(), any(), any(), Keyword.t()) :: {Cachex.status(), boolean()}
   @callback put(Cachex.cache(), any(), any()) :: {Cachex.status(), boolean()}
   @callback fetch!(Cachex.cache(), any(), function() | nil) :: any()
-  @callback fetch(Cachex.cache(), any(), function() | nil) ::
-              {atom(), any()} | {atom(), any(), any()}
   # @callback del(Cachex.cache(), any(), Keyword.t()) :: {Cachex.status(), boolean()}
   @callback del(Cachex.cache(), any()) :: {Cachex.status(), boolean()}
   @callback stream!(Cachex.cache(), any()) :: Enumerable.t()
   @callback expire_at(Cachex.cache(), binary(), number()) :: {Cachex.status(), boolean()}
-  @callback expire(Cachex.cache(), binary(), number()) :: {Cachex.status(), boolean()}
   @callback exists?(Cachex.cache(), any()) :: {Cachex.status(), boolean()}
   @callback execute!(Cachex.cache(), function()) :: any()
   @callback get_and_update(Cachex.cache(), any(), function()) ::

lib/pleroma/captcha/kocaptcha.ex

@@ -29,7 +29,7 @@ defmodule Pleroma.Captcha.Kocaptcha do
 
   @impl Service
   def validate(_token, captcha, answer_data) do
-    # Here the token is unused, because the unencrypted captcha answer is just passed to method
+    # Here the token is unsed, because the unencrypted captcha answer is just passed to method
     if not is_nil(captcha) and
          :crypto.hash(:md5, captcha) |> Base.encode16() == String.upcase(answer_data),
        do: :ok,

lib/pleroma/chat.ex

@@ -42,7 +42,7 @@ defmodule Pleroma.Chat do
     |> unique_constraint(:user_id, name: :chats_user_id_recipient_index)
   end
 
-  @spec get_by_user_and_id(User.t(), Ecto.UUID.t()) ::
+  @spec get_by_user_and_id(User.t(), FlakeId.Ecto.CompatType.t()) ::
           {:ok, t()} | {:error, :not_found}
   def get_by_user_and_id(%User{id: user_id}, id) do
     from(c in __MODULE__,
@@ -52,17 +52,17 @@ defmodule Pleroma.Chat do
     |> Repo.find_resource()
   end
 
-  @spec get_by_id(Ecto.UUID.t()) :: t() | nil
+  @spec get_by_id(FlakeId.Ecto.CompatType.t()) :: t() | nil
   def get_by_id(id) do
     Repo.get(__MODULE__, id)
   end
 
-  @spec get(Ecto.UUID.t(), String.t()) :: t() | nil
+  @spec get(FlakeId.Ecto.CompatType.t(), String.t()) :: t() | nil
   def get(user_id, recipient) do
     Repo.get_by(__MODULE__, user_id: user_id, recipient: recipient)
   end
 
-  @spec get_or_create(Ecto.UUID.t(), String.t()) ::
+  @spec get_or_create(FlakeId.Ecto.CompatType.t(), String.t()) ::
           {:ok, t()} | {:error, Ecto.Changeset.t()}
   def get_or_create(user_id, recipient) do
     %__MODULE__{}
@@ -75,7 +75,7 @@ defmodule Pleroma.Chat do
     )
   end
 
-  @spec bump_or_create(Ecto.UUID.t(), String.t()) ::
+  @spec bump_or_create(FlakeId.Ecto.CompatType.t(), String.t()) ::
           {:ok, t()} | {:error, Ecto.Changeset.t()}
   def bump_or_create(user_id, recipient) do
     %__MODULE__{}
@@ -87,7 +87,7 @@ defmodule Pleroma.Chat do
     )
   end
 
-  @spec for_user_query(Ecto.UUID.t()) :: Ecto.Query.t()
+  @spec for_user_query(FlakeId.Ecto.CompatType.t()) :: Ecto.Query.t()
   def for_user_query(user_id) do
     from(c in Chat,
       where: c.user_id == ^user_id,

lib/pleroma/config.ex

@@ -27,7 +27,6 @@ defmodule Pleroma.Config do
     Application.get_env(:pleroma, key, default)
   end
 
-  @impl true
   def get!(key) do
     value = get(key, nil)
 

lib/pleroma/config/deprecation_warnings.ex

@@ -24,7 +24,7 @@ defmodule Pleroma.Config.DeprecationWarnings do
     filters = Config.get([Pleroma.Upload]) |> Keyword.get(:filters, [])
 
     if Pleroma.Upload.Filter.Exiftool in filters do
-      Logger.warning("""
+      Logger.warn("""
       !!!DEPRECATION WARNING!!!
       Your config is using Exiftool as a filter instead of Exiftool.StripLocation. This should work for now, but you are advised to change to the new configuration to prevent possible issues later:
 
@@ -63,7 +63,7 @@ defmodule Pleroma.Config.DeprecationWarnings do
       |> Enum.any?(fn {_, v} -> Enum.any?(v, &is_binary/1) end)
 
     if has_strings do
-      Logger.warning("""
+      Logger.warn("""
       !!!DEPRECATION WARNING!!!
       Your config is using strings in the SimplePolicy configuration instead of tuples. They should work for now, but you are advised to change to the new configuration to prevent possible issues later:
 
@@ -121,7 +121,7 @@ defmodule Pleroma.Config.DeprecationWarnings do
     has_strings = Config.get([:instance, :quarantined_instances]) |> Enum.any?(&is_binary/1)
 
     if has_strings do
-      Logger.warning("""
+      Logger.warn("""
       !!!DEPRECATION WARNING!!!
       Your config is using strings in the quarantined_instances configuration instead of tuples. They should work for now, but you are advised to change to the new configuration to prevent possible issues later:
 
@@ -158,7 +158,7 @@ defmodule Pleroma.Config.DeprecationWarnings do
     has_strings = Config.get([:mrf, :transparency_exclusions]) |> Enum.any?(&is_binary/1)
 
     if has_strings do
-      Logger.warning("""
+      Logger.warn("""
       !!!DEPRECATION WARNING!!!
       Your config is using strings in the transparency_exclusions configuration instead of tuples. They should work for now, but you are advised to change to the new configuration to prevent possible issues later:
 
@@ -172,7 +172,7 @@ defmodule Pleroma.Config.DeprecationWarnings do
 
       ```
       config :pleroma, :mrf,
-        transparency_exclusions: [{"instance.tld", "Reason to exclude transparency"}]
+        transparency_exclusions: [{"instance.tld", "Reason to exlude transparency"}]
       ```
       """)
 
@@ -193,7 +193,7 @@ defmodule Pleroma.Config.DeprecationWarnings do
 
   def check_hellthread_threshold do
     if Config.get([:mrf_hellthread, :threshold]) do
-      Logger.warning("""
+      Logger.warn("""
       !!!DEPRECATION WARNING!!!
       You are using the old configuration mechanism for the hellthread filter. Please check config.md.
       """)
@@ -213,7 +213,7 @@ defmodule Pleroma.Config.DeprecationWarnings do
       check_gun_pool_options(),
       check_activity_expiration_config(),
       check_remote_ip_plug_name(),
-      check_uploaders_s3_public_endpoint(),
+      check_uploders_s3_public_endpoint(),
       check_old_chat_shoutbox(),
       check_quarantined_instances_tuples(),
       check_transparency_exclusions_tuples(),
@@ -256,7 +256,7 @@ defmodule Pleroma.Config.DeprecationWarnings do
     move_namespace_and_warn(@mrf_config_map, warning_preface)
   end
 
-  @spec move_namespace_and_warn([config_map()], String.t()) :: :ok | :error
+  @spec move_namespace_and_warn([config_map()], String.t()) :: :ok | nil
   def move_namespace_and_warn(config_map, warning_preface) do
     warning =
       Enum.reduce(config_map, "", fn
@@ -274,17 +274,17 @@ defmodule Pleroma.Config.DeprecationWarnings do
     if warning == "" do
       :ok
     else
-      Logger.warning(warning_preface <> warning)
+      Logger.warn(warning_preface <> warning)
       :error
     end
   end
 
-  @spec check_media_proxy_whitelist_config() :: :ok | :error
+  @spec check_media_proxy_whitelist_config() :: :ok | nil
   def check_media_proxy_whitelist_config do
     whitelist = Config.get([:media_proxy, :whitelist])
 
     if Enum.any?(whitelist, &(not String.starts_with?(&1, "http"))) do
-      Logger.warning("""
+      Logger.warn("""
       !!!DEPRECATION WARNING!!!
       Your config is using old format (only domain) for MediaProxy whitelist option. Setting should work for now, but you are advised to change format to scheme with port to prevent possible issues later.
       """)
@@ -299,7 +299,7 @@ defmodule Pleroma.Config.DeprecationWarnings do
     pool_config = Config.get(:connections_pool)
 
     if timeout = pool_config[:await_up_timeout] do
-      Logger.warning("""
+      Logger.warn("""
       !!!DEPRECATION WARNING!!!
       Your config is using old setting `config :pleroma, :connections_pool, await_up_timeout`. Please change to `config :pleroma, :connections_pool, connect_timeout` to ensure compatibility with future releases.
       """)
@@ -331,7 +331,7 @@ defmodule Pleroma.Config.DeprecationWarnings do
           "\n* `:timeout` options in #{pool_name} pool is now `:recv_timeout`"
         end)
 
-      Logger.warning(Enum.join([warning_preface | pool_warnings]))
+      Logger.warn(Enum.join([warning_preface | pool_warnings]))
 
       Config.put(:pools, updated_config)
       :error
@@ -340,7 +340,7 @@ defmodule Pleroma.Config.DeprecationWarnings do
     end
   end
 
-  @spec check_activity_expiration_config() :: :ok | :error
+  @spec check_activity_expiration_config() :: :ok | nil
   def check_activity_expiration_config do
     warning_preface = """
     !!!DEPRECATION WARNING!!!
@@ -356,7 +356,7 @@ defmodule Pleroma.Config.DeprecationWarnings do
     )
   end
 
-  @spec check_remote_ip_plug_name() :: :ok | :error
+  @spec check_remote_ip_plug_name() :: :ok | nil
   def check_remote_ip_plug_name do
     warning_preface = """
     !!!DEPRECATION WARNING!!!
@@ -372,8 +372,8 @@ defmodule Pleroma.Config.DeprecationWarnings do
     )
   end
 
-  @spec check_uploaders_s3_public_endpoint() :: :ok | :error
-  def check_uploaders_s3_public_endpoint do
+  @spec check_uploders_s3_public_endpoint() :: :ok | nil
+  def check_uploders_s3_public_endpoint do
     s3_config = Pleroma.Config.get([Pleroma.Uploaders.S3])
 
     use_old_config = Keyword.has_key?(s3_config, :public_endpoint)
@@ -393,7 +393,7 @@ defmodule Pleroma.Config.DeprecationWarnings do
     end
   end
 
-  @spec check_old_chat_shoutbox() :: :ok | :error
+  @spec check_old_chat_shoutbox() :: :ok | nil
   def check_old_chat_shoutbox do
     instance_config = Pleroma.Config.get([:instance])
     chat_config = Pleroma.Config.get([:chat]) || []

lib/pleroma/config/getting.ex

@@ -5,14 +5,4 @@
 defmodule Pleroma.Config.Getting do
   @callback get(any()) :: any()
   @callback get(any(), any()) :: any()
-  @callback get!(any()) :: any()
-
-  def get(key), do: get(key, nil)
-  def get(key, default), do: impl().get(key, default)
-
-  def get!(key), do: impl().get!(key)
-
-  def impl do
-    Application.get_env(:pleroma, :config_impl, Pleroma.Config)
-  end
 end

lib/pleroma/config/oban.ex

@@ -23,7 +23,7 @@ defmodule Pleroma.Config.Oban do
           You are using old workers in Oban crontab settings, which were removed.
           Please, remove setting from crontab in your config file (prod.secret.exs): #{inspect(setting)}
           """
-          |> Logger.warning()
+          |> Logger.warn()
 
           List.delete(acc, setting)
         else

lib/pleroma/config/release_runtime_provider.ex

@@ -21,7 +21,7 @@ defmodule Pleroma.Config.ReleaseRuntimeProvider do
     with_runtime_config =
       if File.exists?(config_path) do
         # <https://git.pleroma.social/pleroma/pleroma/-/issues/3135>
-        %File.Stat{mode: mode} = File.stat!(config_path)
+        %File.Stat{mode: mode} = File.lstat!(config_path)
 
         if Bitwise.band(mode, 0o007) > 0 do
           raise "Configuration at #{config_path} has world-permissions, execute the following: chmod o= #{config_path}"

lib/pleroma/config/transfer_task.ex

@@ -1,5 +1,5 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2023 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Config.TransferTask do
@@ -22,8 +22,7 @@ defmodule Pleroma.Config.TransferTask do
       {:pleroma, :markup},
       {:pleroma, :streamer},
       {:pleroma, :pools},
-      {:pleroma, :connections_pool},
-      {:pleroma, :ldap}
+      {:pleroma, :connections_pool}
     ]
 
   defp reboot_time_subkeys,
@@ -45,13 +44,19 @@ defmodule Pleroma.Config.TransferTask do
     with {_, true} <- {:configurable, Config.get(:configurable_from_database)} do
       # We need to restart applications for loaded settings take effect
 
-      settings =
+      {logger, other} =
         (Repo.all(ConfigDB) ++ deleted_settings)
         |> Enum.map(&merge_with_default/1)
+        |> Enum.split_with(fn {group, _, _, _} -> group in [:logger] end)
+
+      logger
+      |> Enum.sort()
+      |> Enum.each(&configure/1)
 
       started_applications = Application.started_applications()
 
-      reject = [nil, :postgrex]
+      # TODO: some problem with prometheus after restart!
+      reject = [nil, :prometheus, :postgrex]
 
       reject =
         if restart_pleroma? do
@@ -60,7 +65,7 @@ defmodule Pleroma.Config.TransferTask do
           [:pleroma | reject]
         end
 
-      settings
+      other
       |> Enum.map(&update/1)
       |> Enum.uniq()
       |> Enum.reject(&(&1 in reject))
@@ -98,6 +103,38 @@ defmodule Pleroma.Config.TransferTask do
     {group, key, value, merged}
   end
 
+  # change logger configuration in runtime, without restart
+  defp configure({_, :backends, _, merged}) do
+    # removing current backends
+    Enum.each(Application.get_env(:logger, :backends), &Logger.remove_backend/1)
+
+    Enum.each(merged, &Logger.add_backend/1)
+
+    :ok = update_env(:logger, :backends, merged)
+  end
+
+  defp configure({_, key, _, merged}) when key in [:console, :ex_syslogger] do
+    merged =
+      if key == :console do
+        put_in(merged[:format], merged[:format] <> "\n")
+      else
+        merged
+      end
+
+    backend =
+      if key == :ex_syslogger,
+        do: {ExSyslogger, :ex_syslogger},
+        else: key
+
+    Logger.configure_backend(backend, merged)
+    :ok = update_env(:logger, key, merged)
+  end
+
+  defp configure({_, key, _, merged}) do
+    Logger.configure([{key, merged}])
+    :ok = update_env(:logger, key, merged)
+  end
+
   defp update({group, key, value, merged}) do
     try do
       :ok = update_env(group, key, merged)
@@ -108,7 +145,7 @@ defmodule Pleroma.Config.TransferTask do
         error_msg =
           "updating env causes error, group: #{inspect(group)}, key: #{inspect(key)}, value: #{inspect(value)} error: #{inspect(error)}"
 
-        Logger.warning(error_msg)
+        Logger.warn(error_msg)
 
         nil
     end
@@ -142,12 +179,12 @@ defmodule Pleroma.Config.TransferTask do
       :ok = Application.start(app)
     else
       nil ->
-        Logger.warning("#{app} is not started.")
+        Logger.warn("#{app} is not started.")
 
       error ->
         error
         |> inspect()
-        |> Logger.warning()
+        |> Logger.warn()
     end
   end
 

lib/pleroma/config_db.ex

@@ -54,7 +54,7 @@ defmodule Pleroma.ConfigDB do
   @spec get_by_params(map()) :: ConfigDB.t() | nil
   def get_by_params(%{group: _, key: _} = params), do: Repo.get_by(ConfigDB, params)
 
-  @spec changeset(ConfigDB.t(), map()) :: Ecto.Changeset.t()
+  @spec changeset(ConfigDB.t(), map()) :: Changeset.t()
   def changeset(config, params \\ %{}) do
     config
     |> cast(params, [:key, :group, :value])
@@ -138,7 +138,7 @@ defmodule Pleroma.ConfigDB do
     end
   end
 
-  @spec update_or_create(map()) :: {:ok, ConfigDB.t()} | {:error, Ecto.Changeset.t()}
+  @spec update_or_create(map()) :: {:ok, ConfigDB.t()} | {:error, Changeset.t()}
   def update_or_create(params) do
     params = Map.put(params, :value, to_elixir_types(params[:value]))
     search_opts = Map.take(params, [:group, :key])
@@ -165,7 +165,8 @@ defmodule Pleroma.ConfigDB do
       {:pleroma, :ecto_repos},
       {:mime, :types},
       {:cors_plug, [:max_age, :methods, :expose, :headers]},
-      {:swarm, :node_blacklist}
+      {:swarm, :node_blacklist},
+      {:logger, :backends}
     ]
 
     Enum.any?(full_key_update, fn
@@ -174,7 +175,7 @@ defmodule Pleroma.ConfigDB do
     end)
   end
 
-  @spec delete(ConfigDB.t() | map()) :: {:ok, ConfigDB.t()} | {:error, Ecto.Changeset.t()}
+  @spec delete(ConfigDB.t() | map()) :: {:ok, ConfigDB.t()} | {:error, Changeset.t()}
   def delete(%ConfigDB{} = config), do: Repo.delete(config)
 
   def delete(params) do
@@ -384,12 +385,7 @@ defmodule Pleroma.ConfigDB do
 
   @spec module_name?(String.t()) :: boolean()
   def module_name?(string) do
-    if String.contains?(string, ".") do
-      [name | _] = String.split(string, ".", parts: 2)
-
-      name in ~w[Pleroma Phoenix Tesla Ueberauth Swoosh Logger LoggerBackends]
-    else
-      string in ~w[Oban Ueberauth ExSyslogger ConcurrentLimiter]
-    end
+    Regex.match?(~r/^(Pleroma|Phoenix|Tesla|Ueberauth|Swoosh)\./, string) or
+      string in ["Oban", "Ueberauth", "ExSyslogger", "ConcurrentLimiter"]
   end
 end

lib/pleroma/constants.ex

@@ -19,9 +19,7 @@ defmodule Pleroma.Constants do
       "context_id",
       "deleted_activity_id",
       "pleroma_internal",
-      "generator",
-      "rules",
-      "language"
+      "generator"
     ]
   )
 
@@ -37,12 +35,10 @@ defmodule Pleroma.Constants do
       "updated",
       "emoji",
       "content",
-      "contentMap",
       "summary",
       "sensitive",
       "attachment",
-      "generator",
-      "language"
+      "generator"
     ]
   )
 
@@ -80,50 +76,6 @@ defmodule Pleroma.Constants do
     ]
   )
 
-  const(allowed_user_actor_types,
-    do: [
-      "Person",
-      "Service",
-      "Group"
-    ]
-  )
-
-  const(activity_types,
-    do: [
-      "Block",
-      "Create",
-      "Update",
-      "Delete",
-      "Follow",
-      "Accept",
-      "Reject",
-      "Add",
-      "Remove",
-      "Like",
-      "Announce",
-      "Undo",
-      "Flag",
-      "EmojiReact",
-      "Listen"
-    ]
-  )
-
-  const(allowed_activity_types_from_strangers,
-    do: [
-      "Block",
-      "Create",
-      "Flag",
-      "Follow",
-      "Like",
-      "EmojiReact",
-      "Announce"
-    ]
-  )
-
-  const(object_types,
-    do: ~w[Event Question Answer Audio Video Image Article Note Page ChatMessage]
-  )
-
   # basic regex, just there to weed out potential mistakes
   # https://datatracker.ietf.org/doc/html/rfc2045#section-5.1
   const(mime_regex,

lib/pleroma/conversation.ex

@@ -57,7 +57,7 @@ defmodule Pleroma.Conversation do
   3. Bump all relevant participations to 'unread'
   """
   def create_or_bump_for(activity, opts \\ []) do
-    with true <- Pleroma.Web.ActivityPub.Visibility.direct?(activity),
+    with true <- Pleroma.Web.ActivityPub.Visibility.is_direct?(activity),
          "Create" <- activity.data["type"],
          %Object{} = object <- Object.normalize(activity, fetch: false),
          true <- object.data["type"] in ["Note", "Question"],