Add libheif-tools to the builds

Hardcoding that the command isn't available is wrong. We check it on startup.

.gitignore

@@ -28,7 +28,6 @@ erl_crash.dump
 # variables.
 /config/*.secret.exs
 /config/generated_config.exs
-/config/runtime.exs
 /config/*.env
 
 
@@ -54,7 +53,3 @@ pleroma.iml
 
 # asdf
 .tool-versions
-
-# Editor temp files
-/*~
-/*#

.gitlab-ci.yml

@@ -8,9 +8,7 @@ variables: &global_variables
   MIX_ENV: test
 
 cache: &global_cache_policy
-  key:
-    files:
-      - mix.lock
+  key: ${CI_COMMIT_REF_SLUG}
   paths:
     - deps
     - _build
@@ -24,34 +22,20 @@ stages:
   - docker
 
 before_script:
-  - echo $MIX_ENV
-  - rm -rf _build/*/lib/pleroma
   - apt-get update && apt-get install -y cmake
   - mix local.hex --force
   - mix local.rebar --force
-  - mix deps.get
   - apt-get -qq update
   - apt-get install -y libmagic-dev
 
-after_script:
-  - rm -rf _build/*/lib/pleroma
-
 build:
   stage: build
-  only:
-    changes:
-      - "**/*.ex"
-      - "**/*.exs"
-      - "mix.lock"
   script:
+  - mix deps.get
   - mix compile --force
 
 spec-build:
   stage: test
-  only:
-    changes:
-      - "lib/pleroma/web/api_spec/**/*.ex"
-      - "lib/pleroma/web/api_spec.ex"
   artifacts:
     paths:
     - spec.json
@@ -68,17 +52,13 @@ benchmark:
     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
     - mix pleroma.load_testing
 
 unit-testing:
   stage: test
-  only:
-    changes:
-      - "**/*.ex"
-      - "**/*.exs"
-      - "mix.lock"
   retry: 2
   cache: &testing_cache_policy
     <<: *global_cache_policy
@@ -89,7 +69,8 @@ unit-testing:
     alias: postgres
     command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
   script:
-    - apt-get update && apt-get install -y libimage-exiftool-perl ffmpeg
+    - apt-get update && apt-get install -y libheif-examples libimage-exiftool-perl ffmpeg
+    - mix deps.get
     - mix ecto.create
     - mix ecto.migrate
     - mix coveralls --preload-modules
@@ -112,11 +93,6 @@ unit-testing:
 
 unit-testing-rum:
   stage: test
-  only:
-    changes:
-      - "**/*.ex"
-      - "**/*.exs"
-      - "mix.lock"
   retry: 2
   cache: *testing_cache_policy
   services:
@@ -127,7 +103,8 @@ unit-testing-rum:
     <<: *global_variables
     RUM_ENABLED: "true"
   script:
-    - apt-get update && apt-get install -y libimage-exiftool-perl ffmpeg
+    - apt-get update && apt-get install -y libheif-examples libimage-exiftool-perl ffmpeg
+    - mix deps.get
     - mix ecto.create
     - mix ecto.migrate
     - "mix ecto.migrate --migrations-path priv/repo/optional_migrations/rum_indexing/"
@@ -135,39 +112,16 @@ unit-testing-rum:
 
 lint:
   stage: test
-  only:
-    changes:
-      - "**/*.ex"
-      - "**/*.exs"
-      - "mix.lock"
   cache: *testing_cache_policy
   script:
     - mix format --check-formatted
 
 analysis:
   stage: test
-  only:
-    changes:
-      - "**/*.ex"
-      - "**/*.exs"
-      - "mix.lock"
   cache: *testing_cache_policy
   script:
-    - mix credo --strict --only=warnings,todo,fixme,consistency,readability
-
-cycles:
-  stage: test
-  image: elixir:1.11
-  only:
-    changes:
-      - "**/*.ex"
-      - "**/*.exs"
-      - "mix.lock"
-  cache: {}
-  script:
     - mix deps.get
-    - mix compile
-    - mix xref graph --format cycles --label compile | awk '{print $0} END{exit ($0 != "No cycles found")}'
+    - mix credo --strict --only=warnings,todo,fixme,consistency,readability
 
 docs-deploy:
   stage: deploy
@@ -221,8 +175,8 @@ spec-deploy:
     - apk add curl
   script:
     - curl -X POST -F"token=$API_DOCS_PIPELINE_TRIGGER" -F'ref=master' -F"variables[BRANCH]=$CI_COMMIT_REF_NAME" -F"variables[JOB_REF]=$CI_JOB_ID" https://git.pleroma.social/api/v4/projects/1130/trigger/pipeline
-
-
+  
+ 
 stop_review_app:
   image: alpine:3.9
   stage: deploy
@@ -281,11 +235,11 @@ amd64-musl:
   stage: release
   artifacts: *release-artifacts
   only: *release-only
-  image: elixir:1.10.3-alpine
+  image: elixir:1.10.3-alpine 
   cache: *release-cache
   variables: *release-variables
   before_script: &before-release-musl
-  - apk add git gcc g++ musl-dev make cmake file-dev
+  - apk add git gcc g++ musl-dev make cmake file-dev libheif-tools
   - echo "import Mix.Config" > config/prod.secret.exs
   - mix local.hex --force
   - mix local.rebar --force
@@ -417,26 +371,3 @@ docker-release:
     - dind
   only:
     - /^release/.*$/@pleroma/pleroma
-
-docker-adhoc:
-  stage: docker
-  image: docker:latest
-  cache: {}
-  dependencies: []
-  variables: *docker-variables
-  before_script: *before-docker
-  allow_failure: true
-  script:
-  script:
-    - mkdir -p /root/.docker/cli-plugins
-    - wget "${DOCKER_BUILDX_URL}" -O ~/.docker/cli-plugins/docker-buildx
-    - echo "${DOCKER_BUILDX_HASH}  /root/.docker/cli-plugins/docker-buildx" | sha1sum -c
-    - chmod +x ~/.docker/cli-plugins/docker-buildx
-    - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-    - docker buildx create --name mbuilder --driver docker-container --use
-    - docker buildx inspect --bootstrap
-    - docker buildx build --platform linux/amd64,linux/arm/v7,linux/arm64/v8 --push --cache-from $IMAGE_TAG_SLUG --build-arg VCS_REF=$CI_VCS_REF --build-arg BUILD_DATE=$CI_JOB_TIMESTAMP -t $IMAGE_TAG -t $IMAGE_TAG_SLUG .
-  tags:
-    - dind
-  only:
-    - /^build-docker/.*$/@pleroma/pleroma

.mailmap

@@ -1,3 +1,2 @@
 Ariadne Conill <ariadne@dereferenced.org> <nenolod@dereferenced.org>
 Ariadne Conill <ariadne@dereferenced.org> <nenolod@gmail.com>
-rinpatch <rin@patch.cx> <rinpatch@sdf.org>

CHANGELOG.md

@@ -8,88 +8,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ### Changed
 
-### Added
-
-### Fixed
-
-### Removed
-
-## 2.4.1 - 2021-08-29
-
-### Changed
-- Make `mix pleroma.database set_text_search_config` run concurrently and indefinitely
-
-### Added
-- AdminAPI: Missing configuration description for StealEmojiPolicy
-
-### Fixed
-- MastodonAPI: Stream out Create activities
-- MRF ObjectAgePolicy: Fix pattern matching on "published"
-- TwitterAPI: Make `change_password` and `change_email` require params on body instead of query
-- Subscription(Bell) Notifications: Don't create from Pipeline Ingested replies
-- AdminAPI: Fix rendering reports containing a `nil` object
-- Mastodon API: Activity Search fallbacks on status fetching after a DB Timeout/Error
-- Mastodon API: Fix crash in Streamer related to reblogging
-- AdminAPI: List available frontends when `static/frontends` folder is missing
-- Make activity search properly use language-aware GIN indexes
-- AdminAPI: Fix suggestions for MRF Policies
-
-## 2.4.0 - 2021-08-08
-
-### Changed
-
-- **Breaking:** Configuration: `:chat, enabled` moved to `:shout, enabled` and `:instance, chat_limit` moved to `:shout, limit`
-- Support for Erlang/OTP 24
-- The `application` metadata returned with statuses is no longer hardcoded. Apps that want to display these details will now have valid data for new posts after this change.
-- HTTPSecurityPlug now sends a response header to opt out of Google's FLoC (Federated Learning of Cohorts) targeted advertising.
-- Email address is now returned if requesting user is the owner of the user account so it can be exposed in client and FE user settings UIs.
-- Improved Twittercard and OpenGraph meta tag generation including thumbnails and image dimension metadata when available.
-- AdminAPI: sort users so the newest are at the top.
-- ActivityPub Client-to-Server(C2S): Limitation on the type of Activity/Object are lifted as they are now passed through ObjectValidators
-
-### Added
-
-- MRF (`FollowBotPolicy`): New MRF Policy which makes a designated local Bot account attempt to follow all users in public Notes received by your instance. Users who require approving follower requests or have #nobot in their profile are excluded.
-- Return OAuth token `id` (primary key) in POST `/oauth/token`.
-- AdminAPI: return `created_at` date with users.
-- `AnalyzeMetadata` upload filter for extracting image/video attachment dimensions and generating blurhashes for images. Blurhashes for videos are not generated at this time.
-- Attachment dimensions and blurhashes are federated when available.
-- Pinned posts federation
-
-### Fixed
-- Don't crash so hard when email settings are invalid.
-- Checking activated Upload Filters for required commands.
-- Remote users can no longer reappear after being deleted.
-- Deactivated users may now be deleted.
-- Mix task `pleroma.database prune_objects`
-- Fixed rendering of JSON errors on ActivityPub endpoints.
-- Linkify: Parsing crash with URLs ending in unbalanced closed paren, no path separator, and no query parameters
-- Try to save exported ConfigDB settings (migrate_from_db) in the system temp directory if default location is not writable.
-- Uploading custom instance thumbnail via AdminAPI/AdminFE generated invalid URL to the image
-- Applying ConcurrentLimiter settings via AdminAPI
-- User login failures if their `notification_settings` were in a NULL state.
-- Mix task `pleroma.user delete_activities` query transaction timeout is now :infinity
-- MRF (`SimplePolicy`): Embedded objects are now checked. If any embedded object would be rejected, its parent is rejected. This fixes Announces leaking posts from blocked domains.
-- Fixed some Markdown issues, including trailing slash in links.
-
-### Removed
-- **Breaking**: Remove deprecated `/api/qvitter/statuses/notifications/read` (replaced by `/api/v1/pleroma/notifications/read`)
-
-## [2.3.0] - 2021-03-01
-
-### Security
-
-- Fixed client user agent leaking through MediaProxy
-
-### Removed
-
-- `:auth, :enforce_oauth_admin_scope_usage` configuration option.
-
-### Changed
-
 - **Breaking**: Changed `mix pleroma.user toggle_confirmed` to `mix pleroma.user confirm`
 - **Breaking**: Changed `mix pleroma.user toggle_activated` to `mix pleroma.user activate/deactivate`
-- **Breaking:** NSFW hashtag is no longer added on sensitive posts
 - Polls now always return a `voters_count`, even if they are single-choice.
 - Admin Emails: The ap id is used as the user link in emails now.
 - Improved registration workflow for email confirmation and account approval modes.
@@ -101,7 +21,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Provide redirect of external posts from `/notice/:id` to their original URL
 - Admins no longer receive notifications for reports if they are the actor making the report.
 - Improved Mailer configuration setting descriptions for AdminFE.
-- Updated default avatar to look nicer.
 
 <details>
   <summary>API Changes</summary>
@@ -112,15 +31,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - **Breaking:** AdminAPI `GET /api/pleroma/admin/users/:nickname_or_id/statuses` changed response format and added the number of total users posts.
 - **Breaking:** AdminAPI `GET /api/pleroma/admin/instances/:instance/statuses` changed response format and added the number of total users posts.
 - Admin API: Reports now ordered by newest
-- Pleroma API: `GET /api/v1/pleroma/chats` is deprecated in favor of `GET /api/v2/pleroma/chats`.
-- Pleroma API: Reroute `/api/pleroma/*` to `/api/v1/pleroma/*`
 
 </details>
-- Improved hashtag timeline performance (requires a background migration).
 
 ### Added
 
 - Reports now generate notifications for admins and mods.
+- Experimental websocket-based federation between Pleroma instances.
 - Support for local-only statuses.
 - Support pagination of blocks and mutes.
 - Account backup.
@@ -136,12 +53,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Ability to define custom HTTP headers per each frontend
 - MRF (`NoEmptyPolicy`): New MRF Policy which will deny empty statuses or statuses of only mentions from being created by local users
 - New users will receive a simple email confirming their registration if no other emails will be dispatched. (e.g., Welcome, Confirmation, or Approval Required)
+- Added Pleroma.Upload.Filter.HeifToJpeg to automate converting .heic files from Apple devices to JPEGs which can be viewed in browsers. Requires heic-convert tool from libheif.
 
 <details>
   <summary>API Changes</summary>
 - Admin API: (`GET /api/pleroma/admin/users`) filter users by `unconfirmed` status and `actor_type`.
-- Admin API: OpenAPI spec for the user-related operations
-- Pleroma API: `GET /api/v2/pleroma/chats` added. It is exactly like `GET /api/v1/pleroma/chats` except supports pagination.
 - Pleroma API: Add `idempotency_key` to the chat message entity that can be used for optimistic message sending.
 - Pleroma API: (`GET /api/v1/pleroma/federation_status`) Add a way to get a list of unreachable instances.
 - Mastodon API: User and conversation mutes can now auto-expire if `expires_in` parameter was given while adding the mute.
@@ -151,8 +67,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Mastodon API: Add monthly active users to `/api/v1/instance` (`pleroma.stats.mau`).
 - Mastodon API: Home, public, hashtag & list timelines accept `only_media`, `remote` & `local` parameters for filtration.
 - Mastodon API: `/api/v1/accounts/:id` & `/api/v1/mutes` endpoints accept `with_relationships` parameter and return filled `pleroma.relationship` field.
-- Mastodon API: Endpoint to remove a conversation (`DELETE /api/v1/conversations/:id`).
-- Mastodon API: `expires_in` in the scheduled post `params` field on `/api/v1/statuses` and `/api/v1/scheduled_statuses/:id` endpoints.
 </details>
 
 ### Fixed
@@ -176,7 +90,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
   - Mastodon API: Support for expires_in/expires_at in the Filters.
 </details>
 
-## [2.2.2] - 2021-01-18
+## Unreleased (Patch)
+
+
+## [2.2.2] - 2020-01-18
 
 ### Fixed
 
@@ -572,6 +489,7 @@ switched to a new configuration mechanism, however it was not officially removed
 - Static-FE: Fix remote posts not being sanitized
 
 ### Fixed
+=======
 - 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

COPYING

@@ -5,13 +5,6 @@ copy of the license file as AGPL-3.
 
 ---
 
-Files inside docs directory are copyright © 2021 Pleroma Authors
-<https://pleroma.social/>, and are distributed under the Creative Commons
-Attribution 4.0 International license, you should have received
-a copy of the license file as CC-BY-4.0.
-
----
-
 The following files are copyright © 2019 shitposter.club, and are distributed
 under the Creative Commons Attribution-ShareAlike 4.0 International license,
 you should have received a copy of the license file as CC-BY-SA-4.0.

Dockerfile

@@ -33,7 +33,7 @@ ARG DATA=/var/lib/pleroma
 
 RUN echo "http://nl.alpinelinux.org/alpine/latest-stable/community" >> /etc/apk/repositories &&\
 	apk update &&\
-	apk add exiftool ffmpeg imagemagick libmagic ncurses postgresql-client &&\
+	apk add exiftool imagemagick libmagic ncurses postgresql-client &&\
 	adduser --system --shell /bin/false --home ${HOME} pleroma &&\
 	mkdir -p ${DATA}/uploads &&\
 	mkdir -p ${DATA}/static &&\

README.md

@@ -35,9 +35,6 @@ Currently Pleroma is not packaged by any OS/Distros, but if you want to package
 ### Docker
 While we don’t provide docker files, other people have written very good ones. Take a look at <https://github.com/angristan/docker-pleroma> or <https://glitch.sh/sn0w/pleroma-docker>.
 
-### Raspberry Pi
-Community maintained Raspberry Pi image that you can flash and run Pleroma on your Raspberry Pi. Available here <https://github.com/guysoft/PleromaPi>.
-
 ### Compilation Troubleshooting
 If you ever encounter compilation issues during the updating of Pleroma, you can try these commands and see if they fix things:
 
@@ -53,5 +50,5 @@ If you are not developing Pleroma, it is better to use the OTP release, which co
 - Latest Git revision: <https://docs-develop.pleroma.social>
 
 ## Community Channels
-* IRC: **#pleroma** and **#pleroma-dev** on libera.chat, webchat is available at <https://irc.pleroma.social>
-* Matrix: [#pleroma:libera.chat](https://matrix.to/#/#pleroma:libera.chat) and [#pleroma-dev:libera.chat](https://matrix.to/#/#pleroma-dev:libera.chat)
+* IRC: **#pleroma** and **#pleroma-dev** on freenode, webchat is available at <https://irc.pleroma.social>
+* Matrix: <https://matrix.to/#/#freenode_#pleroma:matrix.org> and <https://matrix.to/#/#freenode_#pleroma-dev:matrix.org>

benchmarks/load_testing/activities.ex

@@ -299,7 +299,7 @@ defmodule Pleroma.LoadTesting.Activities do
       "url" => [
         %{
           "href" =>
-            "#{Pleroma.Web.Endpoint.url()}/media/b1b873552422a07bf53af01f3c231c841db4dfc42c35efde681abaf0f2a4eab7.jpg",
+            "#{Pleroma.Web.base_url()}/media/b1b873552422a07bf53af01f3c231c841db4dfc42c35efde681abaf0f2a4eab7.jpg",
           "mediaType" => "image/jpeg",
           "type" => "Link"
         }

config/benchmark.exs

@@ -1,4 +1,4 @@
-import Config
+use Mix.Config
 
 # We don't run a server during test. If one is required,
 # you can enable the server option below.

config/config.exs

@@ -41,7 +41,7 @@
 #
 # This configuration file is loaded before any dependency and
 # is restricted to this project.
-import Config
+use Mix.Config
 
 # General application configuration
 config :pleroma, ecto_repos: [Pleroma.Repo]
@@ -190,6 +190,7 @@ config :pleroma, :instance,
   instance_thumbnail: "/instance/thumbnail.jpeg",
   limit: 5_000,
   description_limit: 5_000,
+  chat_limit: 5_000,
   remote_limit: 100_000,
   upload_limit: 16_000_000,
   avatar_upload_limit: 2_000_000,
@@ -390,11 +391,6 @@ config :pleroma, :mrf_keyword,
   federated_timeline_removal: [],
   replace: []
 
-config :pleroma, :mrf_hashtag,
-  sensitive: ["nsfw"],
-  reject: [],
-  federated_timeline_removal: []
-
 config :pleroma, :mrf_subchain, match_actor: %{}
 
 config :pleroma, :mrf_activity_expiration, days: 365
@@ -408,8 +404,6 @@ config :pleroma, :mrf_object_age,
   threshold: 604_800,
   actions: [:delist, :strip_followers]
 
-config :pleroma, :mrf_follow_bot, follower_nickname: nil
-
 config :pleroma, :rich_media,
   enabled: true,
   ignore_hosts: [],
@@ -456,11 +450,9 @@ config :pleroma, :media_preview_proxy,
   image_quality: 85,
   min_content_length: 100 * 1024
 
-config :pleroma, :shout,
-  enabled: true,
-  limit: 5_000
+config :pleroma, :chat, enabled: true
 
-config :phoenix, :format_encoders, json: Jason, "activity+json": Jason
+config :phoenix, :format_encoders, json: Jason
 
 config :phoenix, :json_library, Jason
 
@@ -619,7 +611,10 @@ config :ueberauth,
        base_path: "/oauth",
        providers: ueberauth_providers
 
-config :pleroma, :auth, oauth_consumer_strategies: oauth_consumer_strategies
+config :pleroma,
+       :auth,
+       enforce_oauth_admin_scope_usage: true,
+       oauth_consumer_strategies: oauth_consumer_strategies
 
 config :pleroma, Pleroma.Emails.Mailer, adapter: Swoosh.Adapters.Sendmail, enabled: false
 
@@ -662,10 +657,6 @@ config :pleroma, :oauth2,
 
 config :pleroma, :database, rum_enabled: false
 
-config :pleroma, :features, improved_hashtag_timeline: :auto
-
-config :pleroma, :populate_hashtags_table, fault_rate_allowance: 0.01
-
 config :pleroma, :env, Mix.env()
 
 config :http_signatures,

config/description.exs

@@ -1,4 +1,4 @@
-import Config
+use Mix.Config
 
 websocket_config = [
   path: "/websocket",
@@ -461,42 +461,6 @@ config :pleroma, :config_description, [
   },
   %{
     group: :pleroma,
-    key: :features,
-    type: :group,
-    description: "Customizable features",
-    children: [
-      %{
-        key: :improved_hashtag_timeline,
-        type: {:dropdown, :atom},
-        description:
-          "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).",
-        suggestions: [:auto, :enabled, :disabled]
-      }
-    ]
-  },
-  %{
-    group: :pleroma,
-    key: :populate_hashtags_table,
-    type: :group,
-    description: "`populate_hashtags_table` background migration settings",
-    children: [
-      %{
-        key: :fault_rate_allowance,
-        type: :float,
-        description:
-          "Max accepted rate of objects that failed in the migration. Any value from 0.0 which tolerates no errors to 1.0 which will enable the feature even if hashtags transfer failed for all records.",
-        suggestions: [0.01]
-      },
-      %{
-        key: :sleep_interval_ms,
-        type: :integer,
-        description:
-          "Sleep interval between each chunk of processed records in order to decrease the load on the system (defaults to 0 and should be keep default on most instances)."
-      }
-    ]
-  },
-  %{
-    group: :pleroma,
     key: :instance,
     type: :group,
     description: "Instance-related settings",
@@ -545,6 +509,14 @@ config :pleroma, :config_description, [
         ]
       },
       %{
+        key: :chat_limit,
+        type: :integer,
+        description: "Character limit of the instance chat messages",
+        suggestions: [
+          5_000
+        ]
+      },
+      %{
         key: :remote_limit,
         type: :integer,
         description: "Hard character limit beyond which remote posts will be dropped",
@@ -674,8 +646,7 @@ config :pleroma, :config_description, [
       %{
         key: :allow_relay,
         type: :boolean,
-        description:
-          "Permits remote instances to subscribe to all public posts of your instance. (Important!) This may increase the visibility of your instance."
+        description: "Enable Pleroma's Relay, which makes it possible to follow a whole instance"
       },
       %{
         key: :public,
@@ -1175,6 +1146,7 @@ config :pleroma, :config_description, [
             alwaysShowSubjectInput: true,
             background: "/static/aurora_borealis.jpg",
             collapseMessageWithSubject: false,
+            disableChat: false,
             greentext: false,
             hideFilteredStatuses: false,
             hideMutedPosts: false,
@@ -1222,6 +1194,12 @@ config :pleroma, :config_description, [
               "When a message has a subject (aka Content Warning), collapse it by default"
           },
           %{
+            key: :disableChat,
+            label: "PleromaFE Chat",
+            type: :boolean,
+            description: "Disables PleromaFE Chat component"
+          },
+          %{
             key: :greentext,
             label: "Greentext",
             type: :boolean,
@@ -2638,22 +2616,13 @@ config :pleroma, :config_description, [
   },
   %{
     group: :pleroma,
-    key: :shout,
+    key: :chat,
     type: :group,
-    description: "Pleroma shout settings",
+    description: "Pleroma chat settings",
     children: [
       %{
         key: :enabled,
-        type: :boolean,
-        description: "Enables the backend Shoutbox chat feature."
-      },
-      %{
-        key: :limit,
-        type: :integer,
-        description: "Shout message character limit.",
-        suggestions: [
-          5_000
-        ]
+        type: :boolean
       }
     ]
   },
@@ -2939,23 +2908,6 @@ config :pleroma, :config_description, [
   },
   %{
     group: :pleroma,
-    key: :mrf_follow_bot,
-    tab: :mrf,
-    related_policy: "Pleroma.Web.ActivityPub.MRF.FollowBotPolicy",
-    label: "MRF FollowBot Policy",
-    type: :group,
-    description: "Automatically follows newly discovered accounts.",
-    children: [
-      %{
-        key: :follower_nickname,
-        type: :string,
-        description: "The name of the bot account to use for following newly discovered users.",
-        suggestions: ["followbot"]
-      }
-    ]
-  },
-  %{
-    group: :pleroma,
     key: :modules,
     type: :group,
     description: "Custom Runtime Modules",

config/dev.exs

@@ -1,4 +1,4 @@
-import Config
+use Mix.Config
 
 # For development, we disable any cache and enable
 # debugging and code reloading.
@@ -54,10 +54,6 @@ config :pleroma, Pleroma.Repo,
 
 config :pleroma, Pleroma.Web.ApiSpec.CastAndValidate, strict: true
 
-# Reduce recompilation time
-# https://dashbit.co/blog/speeding-up-re-compilation-of-elixir-projects
-config :phoenix, :plug_init_mode, :runtime
-
 if File.exists?("./config/dev.secret.exs") do
   import_config "dev.secret.exs"
 else

config/dokku.exs

@@ -1,4 +1,4 @@
-import Config
+use Mix.Config
 
 config :pleroma, Pleroma.Web.Endpoint,
   http: [

config/prod.exs

@@ -1,4 +1,4 @@
-import Config
+use Mix.Config
 
 # For production, we often load configuration from external
 # sources, such as your system environment. For this reason,
@@ -63,12 +63,7 @@ config :logger, :ex_syslogger, level: :info
 
 # Finally import the config/prod.secret.exs
 # which should be versioned separately.
-if File.exists?("./config/prod.secret.exs") do
-  import_config "prod.secret.exs"
-else
-  "`config/prod.secret.exs` not found. You may want to create one by running `mix pleroma.instance gen`"
-  |> IO.warn([])
-end
+import_config "prod.secret.exs"
 
 if File.exists?("./config/prod.exported_from_db.secret.exs"),
   do: import_config("prod.exported_from_db.secret.exs")

config/test.exs

@@ -1,4 +1,4 @@
-import Config
+use Mix.Config
 
 # We don't run a server during test. If one is required,
 # you can enable the server option below.
@@ -38,7 +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
+config :pleroma, :activitypub, sign_object_fetches: false
 
 # Configure your database
 config :pleroma, Pleroma.Repo,
@@ -133,10 +133,6 @@ config :pleroma, :side_effects,
   ap_streamer: Pleroma.Web.ActivityPub.ActivityPubMock,
   logger: Pleroma.LoggerMock
 
-# Reduce recompilation time
-# https://dashbit.co/blog/speeding-up-re-compilation-of-elixir-projects
-config :phoenix, :plug_init_mode, :runtime
-
 if File.exists?("./config/test.secret.exs") do
   import_config "test.secret.exs"
 else

docs/administration/CLI_tasks/config.md

@@ -32,20 +32,16 @@
     config :pleroma, configurable_from_database: false
     ```
 
-Options:
-
-- `<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
+To delete transferred settings from database optional flag `-d` can be used. `<env>` is `prod` by default.
 
 === "OTP"
     ```sh
-     ./bin/pleroma_ctl config migrate_from_db [--env=<env>] [-d] [--path=<path>]
+     ./bin/pleroma_ctl config migrate_from_db [--env=<env>] [-d]
     ```
 
 === "From Source"
     ```sh
-    mix pleroma.config migrate_from_db [--env=<env>] [-d] [--path=<path>]
+    mix pleroma.config migrate_from_db [--env=<env>] [-d]
     ```
 
 ## Dump all of the config settings defined in the database

docs/clients.md

@@ -17,7 +17,7 @@ Feel free to contact us to be added to this list!
 - Features: MastoAPI
 
 ### Whalebird
-- Homepage: <https://whalebird.social/>
+- Homepage: <https://whalebird.org/>
 - Source Code: <https://github.com/h3poteto/whalebird-desktop>
 - Contact: [@h3poteto@pleroma.io](https://pleroma.io/users/h3poteto)
 - Platforms: Windows, Mac, Linux

docs/configuration/cheatsheet.md

@@ -8,10 +8,9 @@ For from source installations Pleroma configuration works by first importing the
 
 To add configuration to your config file, you can copy it from the base config. The latest version of it can be viewed [here](https://git.pleroma.social/pleroma/pleroma/blob/develop/config/config.exs). You can also use this file if you don't know how an option is supposed to be formatted.
 
-## :shout
+## :chat
 
-* `enabled` - Enables the backend Shoutbox chat feature. Defaults to `true`.
-* `limit` - Shout character limit. Defaults to `5_000`
+* `enabled` - Enables the backend chat. Defaults to `true`.
 
 ## :instance
 * `name`: The instance’s name.
@@ -20,6 +19,7 @@ To add configuration to your config file, you can copy it from the base config.
 * `description`: The instance’s description, can be seen in nodeinfo and ``/api/v1/instance``.
 * `limit`: Posts character limit (CW/Subject included in the counter).
 * `description_limit`: The character limit for image descriptions.
+* `chat_limit`: Character limit of the instance chat messages.
 * `remote_limit`: Hard character limit beyond which remote posts will be dropped.
 * `upload_limit`: File size limit of uploads (except for avatar, background, banner).
 * `avatar_upload_limit`: File size limit of user’s profile avatars.
@@ -37,7 +37,7 @@ To add configuration to your config file, you can copy it from the base config.
 * `federating`: Enable federation with other instances.
 * `federation_incoming_replies_max_depth`: Max. depth of reply-to activities fetching on incoming federation, to prevent out-of-memory situations while fetching very long threads. If set to `nil`, threads of any depth will be fetched. Lower this value if you experience out-of-memory crashes.
 * `federation_reachability_timeout_days`: Timeout (in days) of each external federation target being unreachable prior to pausing federating to it.
-* `allow_relay`: Permits remote instances to subscribe to all public posts of your instance. This may increase the visibility of your instance.
+* `allow_relay`: Enable Pleroma’s Relay, which makes it possible to follow a whole 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`: List of ActivityPub instances where private (DMs, followers-only) activities will not be send.
 * `allowed_post_formats`: MIME-type list of formats allowed to be posted (transformed into HTML).
@@ -49,7 +49,7 @@ To add configuration to your config file, you can copy it from the base config.
 * `attachment_links`: Set to true to enable automatically adding attachment link text to statuses.
 * `max_report_comment_size`: The maximum size of the report comment (Default: `1000`).
 * `safe_dm_mentions`: If set to true, only mentions at the beginning of a post will be used to address people in direct messages. This is to prevent accidental mentioning of people when talking about them (e.g. "@friend hey i really don't like @enemy"). Default: `false`.
-* `healthcheck`: If set to true, system data will be shown on ``/api/v1/pleroma/healthcheck``.
+* `healthcheck`: If set to true, system data will be shown on ``/api/pleroma/healthcheck``.
 * `remote_post_retention_days`: The default amount of days to retain remote posts when pruning the database.
 * `user_bio_length`: A user bio maximum length (default: `5000`).
 * `user_name_length`: A user name maximum length (default: `100`).
@@ -65,13 +65,6 @@ To add configuration to your config file, you can copy it from the base config.
 * `show_reactions`: Let favourites and emoji reactions be viewed through the API (default: `true`).
 * `password_reset_token_validity`: The time after which reset tokens aren't accepted anymore, in seconds (default: one day).
 
-## :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
-* `populate_hashtags_table/sleep_interval_ms`: Sleep interval between each chunk of processed records in order to decrease the load on the system (defaults to 0 and should be keep default on most instances).
-* `populate_hashtags_table/fault_rate_allowance`: Max rate of failed objects to actually processed objects in order to enable the feature (any value from 0.0 which tolerates no errors to 1.0 which will enable the feature even if hashtags transfer failed for all records).
-
 ## Welcome
 * `direct_message`: - welcome message sent as a direct message.
   * `enabled`: Enables the send a direct message to a newly registered user. Defaults to `false`.
@@ -124,7 +117,6 @@ To add configuration to your config file, you can copy it from the base config.
     * `Pleroma.Web.ActivityPub.MRF.ObjectAgePolicy`: Rejects or delists posts based on their age when received. (See [`:mrf_object_age`](#mrf_object_age)).
     * `Pleroma.Web.ActivityPub.MRF.ActivityExpirationPolicy`: Sets a default expiration on all posts made by users of the local instance. Requires `Pleroma.Workers.PurgeExpiredActivity` to be enabled for processing the scheduled delections.
     * `Pleroma.Web.ActivityPub.MRF.ForceBotUnlistedPolicy`: Makes all bot posts to disappear from public timelines.
-    * `Pleroma.Web.ActivityPub.MRF.FollowBotPolicy`: Automatically follows newly discovered users from the specified bot account. Local accounts, locked accounts, and users with "#nobot" in their bio are respected and excluded from being followed.
 * `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.
 
@@ -211,21 +203,6 @@ config :pleroma, :mrf_user_allowlist, %{
 
 * `days`: Default global expiration time for all local Create activities (in days)
 
-#### :mrf_hashtag
-
-* `sensitive`: List of hashtags to mark activities as sensitive (default: `nsfw`)
-* `federated_timeline_removal`: List of hashtags to remove activities from the federated timeline (aka TWNK)
-* `reject`: List of hashtags to reject activities from
-
-Notes:
-- The hashtags in the configuration do not have a leading `#`.
-- This MRF Policy is always enabled, if you want to disable it you have to set empty lists
-
-#### :mrf_follow_bot
-
-* `follower_nickname`: The name of the bot account to use for following newly discovered users. Using `followbot` or similar is strongly suggested.
-
-
 ### :activitypub
 * `unfollow_blocked`: Whether blocks result in people getting unfollowed
 * `outgoing_blocks`: Whether to federate blocks to other instances
@@ -248,7 +225,7 @@ Notes:
 
 This can be used to configure a keyword list that keeps the configuration data for any kind of frontend. By default, settings for `pleroma_fe` and `masto_fe` are configured. You can find the documentation for `pleroma_fe` configuration into [Pleroma-FE configuration and customization for instance administrators](/frontend/CONFIGURATION/#options).
 
-Frontends can access these settings at `/api/v1/pleroma/frontend_configurations`
+Frontends can access these settings at `/api/pleroma/frontend_configurations`
 
 To add your own configuration for PleromaFE, use it like this:
 
@@ -871,13 +848,13 @@ config :pleroma, :admin_token, "somerandomtoken"
 You can then do
 
 ```shell
-curl "http://localhost:4000/api/v1/pleroma/admin/users/invites?admin_token=somerandomtoken"
+curl "http://localhost:4000/api/pleroma/admin/users/invites?admin_token=somerandomtoken"
 ```
 
 or
 
 ```shell
-curl -H "X-Admin-Token: somerandomtoken" "http://localhost:4000/api/v1/pleroma/admin/users/invites"
+curl -H "X-Admin-Token: somerandomtoken" "http://localhost:4000/api/pleroma/admin/users/invites"
 ```
 
 Warning: it's discouraged to use this feature because of the associated security risk: static / rarely changed instance-wide token is much weaker compared to email-password pair of a real admin user; consider using HTTP Basic Auth or OAuth-based authentication instead.

docs/configuration/howto_search_cjk.md

@@ -5,7 +5,7 @@ Pleroma's full text search feature is powered by PostgreSQL's native [text searc
 
 ## Setup and test the new search config
 
-In most cases, you would need an extension installed to support parsing CJK text. Here are a few extensions you may choose from, or you are more than welcome to share additional ones you found working for you with the rest of Pleroma community.
+In most cases, you would need an extension installed to support parsing CJK text. Here are a few extension you may choose from, or you are more than welcome to share additional ones you found working for you with the rest of Pleroma community.
 
  * [a generic n-gram parser](https://github.com/huangjimmy/pg_cjk_parser) supports Simplifed/Traditional Chinese, Japanese, and Korean
  * [a Korean parser](https://github.com/i0seph/textsearch_ko) based on mecab
@@ -34,7 +34,7 @@ Check output of the query, and see if it matches your expectation.
     mix pleroma.database set_text_search_config YOUR.CONFIG
     ```
 
-Note: index update may take a while, and it can be done while the instance is up and running, so you may restart db connection as soon as you see `Recreate index` in task output.
+Note: index update may take a while.
 
 ## Restart database connection
 Since some changes above will only apply with a new database connection, you will have to restart either Pleroma or PostgreSQL process, or use `pg_terminate_backend` SQL command without restarting either. 

docs/configuration/mrf.md

@@ -82,7 +82,7 @@ For example, here is a sample policy module which rewrites all messages to "new
 ```elixir
 defmodule Pleroma.Web.ActivityPub.MRF.RewritePolicy do
   @moduledoc "MRF policy which rewrites all Notes to have 'new message content'."
-  @behaviour Pleroma.Web.ActivityPub.MRF.Policy
+  @behaviour Pleroma.Web.ActivityPub.MRF
 
   # Catch messages which contain Note objects with actual data to filter.
   # Capture the object as `object`, the message content as `content` and the

docs/development/API/admin_api.md

@@ -2,9 +2,14 @@
 
 Authentication is required and the user must be an admin.
 
-The `/api/v1/pleroma/admin/*` path is backwards compatible with `/api/pleroma/admin/*` (`/api/pleroma/admin/*` will be deprecated in the future).
+Configuration options:
 
-## `GET /api/v1/pleroma/admin/users`
+* `[:auth, :enforce_oauth_admin_scope_usage]` — OAuth admin scope requirement toggle.
+    If `true`, admin actions explicitly demand admin OAuth scope(s) presence in OAuth token (client app must support admin scopes).
+    If `false` and token doesn't have admin scope(s), `is_admin` user flag grants access to admin-specific actions.
+    Note that client app needs to explicitly support admin scopes and request them when obtaining auth token.
+
+## `GET /api/pleroma/admin/users`
 
 ### List users
 
@@ -25,7 +30,7 @@ The `/api/v1/pleroma/admin/*` path is backwards compatible with `/api/pleroma/ad
   - *optional* `actor_types`: **[string]** actor type list (`Person`, `Service`, `Application`)
   - *optional* `name`: **string** user display name
   - *optional* `email`: **string** user email
-- Example: `https://mypleroma.org/api/v1/pleroma/admin/users?query=john&filters=local,active&page=1&page_size=10&tags[]=some_tag&tags[]=another_tag&name=display_name&email=email@example.com`
+- Example: `https://mypleroma.org/api/pleroma/admin/users?query=john&filters=local,active&page=1&page_size=10&tags[]=some_tag&tags[]=another_tag&name=display_name&email=email@example.com`
 - Response:
 
 ```json
@@ -54,7 +59,7 @@ The `/api/v1/pleroma/admin/*` path is backwards compatible with `/api/pleroma/ad
 }
 ```
 
-## DEPRECATED `DELETE /api/v1/pleroma/admin/users`
+## DEPRECATED `DELETE /api/pleroma/admin/users`
 
 ### Remove a user
 
@@ -62,7 +67,7 @@ The `/api/v1/pleroma/admin/*` path is backwards compatible with `/api/pleroma/ad
   - `nickname`
 - Response: User’s nickname
 
-## `DELETE /api/v1/pleroma/admin/users`
+## `DELETE /api/pleroma/admin/users`
 
 ### Remove a user
 
@@ -83,7 +88,7 @@ The `/api/v1/pleroma/admin/*` path is backwards compatible with `/api/pleroma/ad
   ]
 - Response: User’s nickname
 
-## `POST /api/v1/pleroma/admin/users/follow`
+## `POST /api/pleroma/admin/users/follow`
 
 ### Make a user follow another user
 
@@ -93,7 +98,7 @@ The `/api/v1/pleroma/admin/*` path is backwards compatible with `/api/pleroma/ad
 - Response:
   - "ok"
 
-## `POST /api/v1/pleroma/admin/users/unfollow`
+## `POST /api/pleroma/admin/users/unfollow`
 
 ### Make a user unfollow another user
 
@@ -103,7 +108,7 @@ The `/api/v1/pleroma/admin/*` path is backwards compatible with `/api/pleroma/ad
 - Response:
   - "ok"
 
-## `PATCH /api/v1/pleroma/admin/users/:nickname/toggle_activation`
+## `PATCH /api/pleroma/admin/users/:nickname/toggle_activation`
 
 ### Toggle user activation
 
@@ -119,7 +124,7 @@ The `/api/v1/pleroma/admin/*` path is backwards compatible with `/api/pleroma/ad
 }
 ```
 
-## `PUT /api/v1/pleroma/admin/users/tag`
+## `PUT /api/pleroma/admin/users/tag`
 
 ### Tag a list of users
 
@@ -127,7 +132,7 @@ The `/api/v1/pleroma/admin/*` path is backwards compatible with `/api/pleroma/ad
   - `nicknames` (array)
   - `tags` (array)
 
-## `DELETE /api/v1/pleroma/admin/users/tag`
+## `DELETE /api/pleroma/admin/users/tag`
 
 ### Untag a list of users
 
@@ -135,7 +140,7 @@ The `/api/v1/pleroma/admin/*` path is backwards compatible with `/api/pleroma/ad
   - `nicknames` (array)
   - `tags` (array)
 
-## `GET /api/v1/pleroma/admin/users/:nickname/permission_group`
+## `GET /api/pleroma/admin/users/:nickname/permission_group`
 
 ### Get user user permission groups membership
 
@@ -149,7 +154,7 @@ The `/api/v1/pleroma/admin/*` path is backwards compatible with `/api/pleroma/ad
 }
 ```
 
-## `GET /api/v1/pleroma/admin/users/:nickname/permission_group/:permission_group`
+## `GET /api/pleroma/admin/users/:nickname/permission_group/:permission_group`
 
 Note: Available `:permission_group` is currently moderator and admin. 404 is returned when the permission group doesn’t exist.
 
@@ -165,7 +170,7 @@ Note: Available `:permission_group` is currently moderator and admin. 404 is ret
 }
 ```
 
-## DEPRECATED `POST /api/v1/pleroma/admin/users/:nickname/permission_group/:permission_group`
+## DEPRECATED `POST /api/pleroma/admin/users/:nickname/permission_group/:permission_group`
 
 ### Add user to permission group
 
@@ -174,7 +179,7 @@ Note: Available `:permission_group` is currently moderator and admin. 404 is ret
   - On failure: `{"error": "…"}`
   - On success: JSON of the user
 
-## `POST /api/v1/pleroma/admin/users/permission_group/:permission_group`
+## `POST /api/pleroma/admin/users/permission_group/:permission_group`
 
 ### Add users to permission group
 
@@ -184,9 +189,9 @@ Note: Available `:permission_group` is currently moderator and admin. 404 is ret
   - On failure: `{"error": "…"}`
   - On success: JSON of the user
 
-## DEPRECATED `DELETE /api/v1/pleroma/admin/users/:nickname/permission_group/:permission_group`
+## DEPRECATED `DELETE /api/pleroma/admin/users/:nickname/permission_group/:permission_group`
 
-## `DELETE /api/v1/pleroma/admin/users/:nickname/permission_group/:permission_group`
+## `DELETE /api/pleroma/admin/users/:nickname/permission_group/:permission_group`
 
 ### Remove user from permission group
 
@@ -196,7 +201,7 @@ Note: Available `:permission_group` is currently moderator and admin. 404 is ret
   - On success: JSON of the user
 - Note: An admin cannot revoke their own admin status.
 
-## `DELETE /api/v1/pleroma/admin/users/permission_group/:permission_group`
+## `DELETE /api/pleroma/admin/users/permission_group/:permission_group`
 
 ### Remove users from permission group
 
@@ -207,7 +212,7 @@ Note: Available `:permission_group` is currently moderator and admin. 404 is ret
   - On success: JSON of the user
 - Note: An admin cannot revoke their own admin status.
 
-## `PATCH /api/v1/pleroma/admin/users/activate`
+## `PATCH /api/pleroma/admin/users/activate`
 
 ### Activate user
 
@@ -225,7 +230,7 @@ Note: Available `:permission_group` is currently moderator and admin. 404 is ret
 }
 ```
 
-## `PATCH /api/v1/pleroma/admin/users/deactivate`
+## `PATCH /api/pleroma/admin/users/deactivate`
 
 ### Deactivate user
 
@@ -243,7 +248,7 @@ Note: Available `:permission_group` is currently moderator and admin. 404 is ret
 }
 ```
 
-## `PATCH /api/v1/pleroma/admin/users/approve`
+## `PATCH /api/pleroma/admin/users/approve`
 
 ### Approve user
 
@@ -261,7 +266,7 @@ Note: Available `:permission_group` is currently moderator and admin. 404 is ret
 }
 ```
 
-## `GET /api/v1/pleroma/admin/users/:nickname_or_id`
+## `GET /api/pleroma/admin/users/:nickname_or_id`
 
 ### Retrive the details of a user
 
@@ -271,7 +276,7 @@ Note: Available `:permission_group` is currently moderator and admin. 404 is ret
   - On failure: `Not found`
   - On success: JSON of the user
 
-## `GET /api/v1/pleroma/admin/users/:nickname_or_id/statuses`
+## `GET /api/pleroma/admin/users/:nickname_or_id/statuses`
 
 ### Retrive user's latest statuses
 
@@ -295,7 +300,7 @@ Note: Available `:permission_group` is currently moderator and admin. 404 is ret
 }
 ```
 
-## `GET /api/v1/pleroma/admin/instances/:instance/statuses`
+## `GET /api/pleroma/admin/instances/:instance/statuses`
 
 ### Retrive instance's latest statuses
 
@@ -319,7 +324,7 @@ Note: Available `:permission_group` is currently moderator and admin. 404 is ret
 }
 ```
 
-## `GET /api/v1/pleroma/admin/statuses`
+## `GET /api/pleroma/admin/statuses`
 
 ### Retrives all latest statuses
 
@@ -332,7 +337,7 @@ Note: Available `:permission_group` is currently moderator and admin. 404 is ret
   - On failure: `Not found`
   - On success: JSON array of user's latest statuses
 
-## `GET /api/v1/pleroma/admin/relay`
+## `GET /api/pleroma/admin/relay`
 
 ### List Relays
 
@@ -348,7 +353,7 @@ Response:
 ]
 ```
 
-## `POST /api/v1/pleroma/admin/relay`
+## `POST /api/pleroma/admin/relay`
 
 ### Follow a Relay
 
@@ -364,7 +369,7 @@ Response:
 {"actor": "https://example.com/relay", "followed_back": true}
 ```
 
-## `DELETE /api/v1/pleroma/admin/relay`
+## `DELETE /api/pleroma/admin/relay`
 
 ### Unfollow a Relay
 
@@ -380,7 +385,7 @@ Response:
 {"https://example.com/relay"}
 ```
 
-## `POST /api/v1/pleroma/admin/users/invite_token`
+## `POST /api/pleroma/admin/users/invite_token`
 
 ### Create an account registration invite token
 
@@ -401,7 +406,7 @@ Response:
 }
 ```
 
-## `GET /api/v1/pleroma/admin/users/invites`
+## `GET /api/pleroma/admin/users/invites`
 
 ### Get a list of generated invites
 
@@ -426,7 +431,7 @@ Response:
 }
 ```
 
-## `POST /api/v1/pleroma/admin/users/revoke_invite`
+## `POST /api/pleroma/admin/users/revoke_invite`
 
 ### Revoke invite by token
 
@@ -447,7 +452,7 @@ Response:
 }
 ```
 
-## `POST /api/v1/pleroma/admin/users/email_invite`
+## `POST /api/pleroma/admin/users/email_invite`
 
 ### Sends registration invite via email
 
@@ -468,7 +473,7 @@ Response:
       ]
     ```
 
-## `GET /api/v1/pleroma/admin/users/:nickname/password_reset`
+## `GET /api/pleroma/admin/users/:nickname/password_reset`
 
 ### Get a password reset token for a given nickname
 
@@ -479,11 +484,11 @@ Response:
 ```json
 {
   "token": "base64 reset token",
-  "link": "https://pleroma.social/api/v1/pleroma/password_reset/url-encoded-base64-token"
+  "link": "https://pleroma.social/api/pleroma/password_reset/url-encoded-base64-token"
 }
 ```
 
-## `PATCH /api/v1/pleroma/admin/users/force_password_reset`
+## `PATCH /api/pleroma/admin/users/force_password_reset`
 
 ### Force passord reset for a user with a given nickname
 
@@ -491,7 +496,7 @@ Response:
   - `nicknames`
 - Response: none (code `204`)
 
-## PUT `/api/v1/pleroma/admin/users/disable_mfa`
+## PUT `/api/pleroma/admin/users/disable_mfa`
 
 ### Disable mfa for user's account.
 
@@ -499,7 +504,7 @@ Response:
   - `nickname`
 - Response: User’s nickname
 
-## `GET /api/v1/pleroma/admin/users/:nickname/credentials`
+## `GET /api/pleroma/admin/users/:nickname/credentials`
 
 ### Get the user's email, password, display and settings-related fields
 
@@ -547,7 +552,7 @@ Response:
 }
 ```
 
-## `PATCH /api/v1/pleroma/admin/users/:nickname/credentials`
+## `PATCH /api/pleroma/admin/users/:nickname/credentials`
 
 ### Change the user's email, password, display and settings-related fields
 
@@ -598,7 +603,7 @@ Status: 404
 {"error": "Not found"}
 ```
 
-## `GET /api/v1/pleroma/admin/reports`
+## `GET /api/pleroma/admin/reports`
 
 ### Get a list of reports
 
@@ -758,17 +763,17 @@ Status: 404
 }
 ```
 
-## `GET /api/v1/pleroma/admin/grouped_reports`
+## `GET /api/pleroma/admin/grouped_reports`
 
 ### Get a list of reports, grouped by status
 
 - Params: none
 - On success: JSON, returns a list of reports, where:
   - `date`: date of the latest report
-  - `account`: the user who has been reported (see `/api/v1/pleroma/admin/reports` for reference)
-  - `status`: reported status (see `/api/v1/pleroma/admin/reports` for reference)
-  - `actors`: users who had reported this status (see `/api/v1/pleroma/admin/reports` for reference)
-  - `reports`: reports (see `/api/v1/pleroma/admin/reports` for reference)
+  - `account`: the user who has been reported (see `/api/pleroma/admin/reports` for reference)
+  - `status`: reported status (see `/api/pleroma/admin/reports` for reference)
+  - `actors`: users who had reported this status (see `/api/pleroma/admin/reports` for reference)
+  - `reports`: reports (see `/api/pleroma/admin/reports` for reference)
 
 ```json
   "reports": [
@@ -782,7 +787,7 @@ Status: 404
   ]
 ```
 
-## `GET /api/v1/pleroma/admin/reports/:id`
+## `GET /api/pleroma/admin/reports/:id`
 
 ### Get an individual report
 
@@ -794,7 +799,7 @@ Status: 404
     - 404 Not Found `"Not found"`
   - On success: JSON, Report object (see above)
 
-## `PATCH /api/v1/pleroma/admin/reports`
+## `PATCH /api/pleroma/admin/reports`
 
 ### Change the state of one or multiple reports
 
@@ -825,7 +830,7 @@ Status: 404
 
   - On success: `204`, empty response
 
-## `POST /api/v1/pleroma/admin/reports/:id/notes`
+## `POST /api/pleroma/admin/reports/:id/notes`
 
 ### Create report note
 
@@ -837,7 +842,7 @@ Status: 404
     - 400 Bad Request `"Invalid parameters"` when `status` is missing
   - On success: `204`, empty response
 
-## `DELETE /api/v1/pleroma/admin/reports/:report_id/notes/:id`
+## `DELETE /api/pleroma/admin/reports/:report_id/notes/:id`
 
 ### Delete report note
 
@@ -849,7 +854,7 @@ Status: 404
     - 400 Bad Request `"Invalid parameters"` when `status` is missing
   - On success: `204`, empty response
 
-## `GET /api/v1/pleroma/admin/statuses/:id`
+## `GET /api/pleroma/admin/statuses/:id`
 
 ### Show status by id
 
@@ -860,7 +865,7 @@ Status: 404
     - 404 Not Found `"Not Found"`
   - On success: JSON, Mastodon Status entity
 
-## `PUT /api/v1/pleroma/admin/statuses/:id`
+## `PUT /api/pleroma/admin/statuses/:id`
 
 ### Change the scope of an individual reported status
 
@@ -875,7 +880,7 @@ Status: 404
     - 404 Not Found `"Not found"`
   - On success: JSON, Mastodon Status entity
 
-## `DELETE /api/v1/pleroma/admin/statuses/:id`
+## `DELETE /api/pleroma/admin/statuses/:id`
 
 ### Delete an individual reported status
 
@@ -887,7 +892,7 @@ Status: 404
     - 404 Not Found `"Not found"`
   - On success: 200 OK `{}`
 
-## `GET /api/v1/pleroma/admin/restart`
+## `GET /api/pleroma/admin/restart`
 
 ### Restarts pleroma application
 
@@ -902,7 +907,7 @@ Status: 404
 {}
 ```
 
-## `GET /api/v1/pleroma/admin/need_reboot`
+## `GET /api/pleroma/admin/need_reboot`
 
 ### Returns the flag whether the pleroma should be restarted
 
@@ -915,7 +920,7 @@ Status: 404
 }
 ```
 
-## `GET /api/v1/pleroma/admin/config`
+## `GET /api/pleroma/admin/config`
 
 ### Get list of merged default settings with saved in database.
 
@@ -942,7 +947,7 @@ Status: 404
 }
 ```
 
-## `POST /api/v1/pleroma/admin/config`
+## `POST /api/pleroma/admin/config`
 
 ### Update config settings
 
@@ -1091,7 +1096,7 @@ config :quack,
 }
 ```
 
-## ` GET /api/v1/pleroma/admin/config/descriptions`
+## ` GET /api/pleroma/admin/config/descriptions`
 
 ### Get JSON with config descriptions.
 Loads json generated from `config/descriptions.exs`.
@@ -1124,7 +1129,7 @@ Loads json generated from `config/descriptions.exs`.
 }]
 ```
 
-## `GET /api/v1/pleroma/admin/moderation_log`
+## `GET /api/pleroma/admin/moderation_log`
 
 ### Get moderation log
 
@@ -1154,7 +1159,7 @@ Loads json generated from `config/descriptions.exs`.
 ]
 ```
 
-## `POST /api/v1/pleroma/admin/reload_emoji`
+## `POST /api/pleroma/admin/reload_emoji`
 
 ### Reload the instance's custom emoji
 
@@ -1162,7 +1167,7 @@ Loads json generated from `config/descriptions.exs`.
 - Params: None
 - Response: JSON, "ok" and 200 status
 
-## `PATCH /api/v1/pleroma/admin/users/confirm_email`
+## `PATCH /api/pleroma/admin/users/confirm_email`
 
 ### Confirm users' emails
 
@@ -1170,7 +1175,7 @@ Loads json generated from `config/descriptions.exs`.
   - `nicknames`
 - Response: Array of user nicknames
 
-## `PATCH /api/v1/pleroma/admin/users/resend_confirmation_email`
+## `PATCH /api/pleroma/admin/users/resend_confirmation_email`
 
 ### Resend confirmation email
 
@@ -1178,13 +1183,13 @@ Loads json generated from `config/descriptions.exs`.
   - `nicknames`
 - Response: Array of user nicknames
 
-## `GET /api/v1/pleroma/admin/stats`
+## `GET /api/pleroma/admin/stats`
 
 ### Stats
 
 - Query Params:
   - *optional* `instance`: **string** instance hostname (without protocol) to get stats for
-- Example: `https://mypleroma.org/api/v1/pleroma/admin/stats?instance=lain.com`
+- Example: `https://mypleroma.org/api/pleroma/admin/stats?instance=lain.com`
 
 - Response:
 
@@ -1199,7 +1204,7 @@ Loads json generated from `config/descriptions.exs`.
 }
 ```
 
-## `GET /api/v1/pleroma/admin/oauth_app`
+## `GET /api/pleroma/admin/oauth_app`
 
 ### List OAuth app
 
@@ -1231,7 +1236,7 @@ Loads json generated from `config/descriptions.exs`.
 ```
 
 
-## `POST /api/v1/pleroma/admin/oauth_app`
+## `POST /api/pleroma/admin/oauth_app`
 
 ### Create OAuth App
 
@@ -1264,7 +1269,7 @@ Loads json generated from `config/descriptions.exs`.
 }
 ```
 
-## `PATCH /api/v1/pleroma/admin/oauth_app/:id`
+## `PATCH /api/pleroma/admin/oauth_app/:id`
 
 ### Update OAuth App
 
@@ -1289,7 +1294,7 @@ Loads json generated from `config/descriptions.exs`.
 }
 ```
 
-## `DELETE /api/v1/pleroma/admin/oauth_app/:id`
+## `DELETE /api/pleroma/admin/oauth_app/:id`
 
 ### Delete OAuth App
 
@@ -1300,7 +1305,7 @@ Loads json generated from `config/descriptions.exs`.
   - On failure:
     - 400 Bad Request `"Invalid parameters"` when `status` is missing
 
-## `GET /api/v1/pleroma/admin/media_proxy_caches`
+## `GET /api/pleroma/admin/media_proxy_caches`
 
 ### Get a list of all banned MediaProxy URLs in Cachex
 
@@ -1324,7 +1329,7 @@ Loads json generated from `config/descriptions.exs`.
 
 ```
 
-## `POST /api/v1/pleroma/admin/media_proxy_caches/delete`
+## `POST /api/pleroma/admin/media_proxy_caches/delete`
 
 ### Remove a banned MediaProxy URL from Cachex
 
@@ -1339,7 +1344,7 @@ Loads json generated from `config/descriptions.exs`.
 
 ```
 
-## `POST /api/v1/pleroma/admin/media_proxy_caches/purge`
+## `POST /api/pleroma/admin/media_proxy_caches/purge`
 
 ### Purge a MediaProxy URL
 
@@ -1355,7 +1360,7 @@ Loads json generated from `config/descriptions.exs`.
 
 ```
 
-## GET /api/v1/pleroma/admin/users/:nickname/chats
+## GET /api/pleroma/admin/users/:nickname/chats
 
 ### List a user's chats
 
@@ -1384,7 +1389,7 @@ Loads json generated from `config/descriptions.exs`.
 ]
 ```
 
-## GET /api/v1/pleroma/admin/chats/:chat_id
+## GET /api/pleroma/admin/chats/:chat_id
 
 ### View a single chat
 
@@ -1411,7 +1416,7 @@ Loads json generated from `config/descriptions.exs`.
 }
 ```
 
-## GET /api/v1/pleroma/admin/chats/:chat_id/messages
+## GET /api/pleroma/admin/chats/:chat_id/messages
 
 ### List the messages in a chat
 
@@ -1449,7 +1454,7 @@ Loads json generated from `config/descriptions.exs`.
 ]
 ```
 
-## DELETE /api/v1/pleroma/admin/chats/:chat_id/messages/:message_id
+## DELETE /api/pleroma/admin/chats/:chat_id/messages/:message_id
 
 ### Delete a single message
 
@@ -1476,7 +1481,7 @@ Loads json generated from `config/descriptions.exs`.
 }
 ```
 
-## `GET /api/v1/pleroma/admin/instance_document/:document_name`
+## `GET /api/pleroma/admin/instance_document/:document_name`
 
 ### Get an instance document
 
@@ -1490,7 +1495,7 @@ Returns the content of the document
 <h1>Instance panel</h1>
 ```
 
-## `PATCH /api/v1/pleroma/admin/instance_document/:document_name`
+## `PATCH /api/pleroma/admin/instance_document/:document_name`
 - Params:
   - `file` (the file to be uploaded, using multipart form data.)
 
@@ -1506,7 +1511,7 @@ Returns the content of the document
 }
 ```
 
-## `DELETE /api/v1/pleroma/admin/instance_document/:document_name`
+## `DELETE /api/pleroma/admin/instance_document/:document_name`
 
 ### Delete an instance document
 
@@ -1518,7 +1523,7 @@ Returns the content of the document
 }
 ```
 
-## `GET /api/v1/pleroma/admin/frontends
+## `GET /api/pleroma/admin/frontends
 
 ### List available frontends
 
@@ -1543,7 +1548,7 @@ Returns the content of the document
 ]
 ```
 
-## `POST /api/v1/pleroma/admin/frontends/install`
+## `POST /api/pleroma/admin/frontends/install`
 
 ### Install a frontend
 

docs/development/API/differences_in_mastoapi_responses.md

@@ -38,13 +38,6 @@ Has these additional fields under the `pleroma` object:
 - `thread_muted`: true if the thread the post belongs to is muted
 - `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.
-
-## Scheduled statuses
-
-Has these additional fields in `params`:
-
-- `expires_in`: the number of seconds the posted activity should expire in.
 
 ## Media Attachments
 
@@ -99,12 +92,12 @@ Has these additional fields under the `pleroma` object:
 - `hide_followers_count`: boolean, true when the user has follower stat hiding enabled
 - `hide_follows_count`: boolean, true when the user has follow stat hiding enabled
 - `settings_store`: A generic map of settings for frontends. Opaque to the backend. Only returned in `/api/v1/accounts/verify_credentials` and `/api/v1/accounts/update_credentials`
-- `chat_token`: The token needed for Pleroma shoutbox. Only returned in `/api/v1/accounts/verify_credentials`
+- `chat_token`: The token needed for Pleroma chat. Only returned in `/api/v1/accounts/verify_credentials`
 - `deactivated`: boolean, true when the user is deactivated
 - `allow_following_move`: boolean, true when the user allows automatically follow moved following accounts
 - `unread_conversation_count`: The count of unread conversations. Only returned to the account owner.
 - `unread_notifications_count`: The count of unread notifications. Only returned to the account owner.
-- `notification_settings`: object, can be absent. See `/api/v1/pleroma/notification_settings` for the parameters/keys returned.
+- `notification_settings`: object, can be absent. See `/api/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
 
@@ -256,29 +249,9 @@ This information is returned in the `/api/v1/accounts/verify_credentials` endpoi
 
 *Pleroma supports refreshing tokens.*
 
-### POST `/oauth/token`
+`POST /oauth/token`
 
-You can obtain access tokens for a user in a few additional ways.
-
-#### Refreshing a token
-
-To obtain a new access token from a refresh token, pass `grant_type=refresh_token` with the following extra parameters:
-
-- `refresh_token`: The refresh token.
-
-#### Getting a token with a password
-
-To obtain a token from a user's password, pass `grant_type=password` with the following extra parameters:
-
-- `username`: Username to authenticate.
-- `password`: The user's password.
-
-#### Response body
-
-Additional fields are returned in the response:
-
-- `id`: The primary key of this token in Pleroma's database.
-- `me` (user tokens only): The ActivityPub ID of the user who owns the token.
+Post here request with `grant_type=refresh_token` to obtain new access token. Returns an access token.
 
 ## Account Registration
 

docs/development/API/pleroma_api.md

@@ -4,9 +4,7 @@ Requests that require it can be authenticated with [an OAuth token](https://tool
 
 Request parameters can be passed via [query strings](https://en.wikipedia.org/wiki/Query_string) or as [form data](https://www.w3.org/TR/html401/interact/forms.html). Files must be uploaded as `multipart/form-data`.
 
-The `/api/v1/pleroma/*` path is backwards compatible with `/api/pleroma/*` (`/api/pleroma/*` will be deprecated in the future).
-
-## `/api/v1/pleroma/emoji`
+## `/api/pleroma/emoji`
 ### Lists the custom emoji on that server.
 * Method: `GET`
 * Authentication: not required
@@ -37,7 +35,7 @@ The `/api/v1/pleroma/*` path is backwards compatible with `/api/pleroma/*` (`/ap
 ```
 * Note: Same data as Mastodon API’s `/api/v1/custom_emojis` but in a different format
 
-## `/api/v1/pleroma/follow_import`
+## `/api/pleroma/follow_import`
 ### Imports your follows, for example from a Mastodon CSV file.
 * Method: `POST`
 * Authentication: required
@@ -46,7 +44,7 @@ The `/api/v1/pleroma/*` path is backwards compatible with `/api/pleroma/*` (`/ap
 * Response: HTTP 200 on success, 500 on error
 * Note: Users that can't be followed are silently skipped.
 
-## `/api/v1/pleroma/blocks_import`
+## `/api/pleroma/blocks_import`
 ### Imports your blocks.
 * Method: `POST`
 * Authentication: required
@@ -54,7 +52,7 @@ The `/api/v1/pleroma/*` path is backwards compatible with `/api/pleroma/*` (`/ap
     * `list`: STRING or FILE containing a whitespace-separated list of accounts to block
 * Response: HTTP 200 on success, 500 on error
 
-## `/api/v1/pleroma/mutes_import`
+## `/api/pleroma/mutes_import`
 ### Imports your mutes.
 * Method: `POST`
 * Authentication: required
@@ -62,7 +60,7 @@ The `/api/v1/pleroma/*` path is backwards compatible with `/api/pleroma/*` (`/ap
     * `list`: STRING or FILE containing a whitespace-separated list of accounts to mute
 * Response: HTTP 200 on success, 500 on error
 
-## `/api/v1/pleroma/captcha`
+## `/api/pleroma/captcha`
 ### Get a new captcha
 * Method: `GET`
 * Authentication: not required
@@ -70,7 +68,7 @@ The `/api/v1/pleroma/*` path is backwards compatible with `/api/pleroma/*` (`/ap
 * Response: Provider specific JSON, the only guaranteed parameter is `type`
 * Example response: `{"type": "kocaptcha", "token": "whatever", "url": "https://captcha.kotobank.ch/endpoint", "seconds_valid": 300}`
 
-## `/api/v1/pleroma/delete_account`
+## `/api/pleroma/delete_account`
 ### Delete an account
 * Method `POST`
 * Authentication: required
@@ -79,7 +77,7 @@ The `/api/v1/pleroma/*` path is backwards compatible with `/api/pleroma/*` (`/ap
 * Response: JSON. Returns `{"status": "success"}` if the deletion was successful, `{"error": "[error message]"}` otherwise
 * Example response: `{"error": "Invalid password."}`
 
-## `/api/v1/pleroma/disable_account`
+## `/api/pleroma/disable_account`
 ### Disable an account
 * Method `POST`
 * Authentication: required
@@ -88,21 +86,21 @@ The `/api/v1/pleroma/*` path is backwards compatible with `/api/pleroma/*` (`/ap
 * Response: JSON. Returns `{"status": "success"}` if the account was successfully disabled, `{"error": "[error message]"}` otherwise
 * Example response: `{"error": "Invalid password."}`
 
-## `/api/v1/pleroma/accounts/mfa`
+## `/api/pleroma/accounts/mfa`
 #### Gets current MFA settings
 * method: `GET`
 * Authentication: required
 * OAuth scope: `read:security`
 * Response: JSON. Returns `{"enabled": "false", "totp": false }`
 
-## `/api/v1/pleroma/accounts/mfa/setup/totp`
+## `/api/pleroma/accounts/mfa/setup/totp`
 #### Pre-setup the MFA/TOTP method
 * method: `GET`
 * Authentication: required
 * OAuth scope: `write:security`
 * Response: JSON. Returns `{"key": [secret_key], "provisioning_uri": "[qr code uri]"  }` when successful, otherwise returns HTTP 422 `{"error": "error_msg"}`
 
-## `/api/v1/pleroma/accounts/mfa/confirm/totp`
+## `/api/pleroma/accounts/mfa/confirm/totp`
 #### Confirms & enables MFA/TOTP support for user account.
 * method: `POST`
 * Authentication: required
@@ -113,7 +111,7 @@ The `/api/v1/pleroma/*` path is backwards compatible with `/api/pleroma/*` (`/ap
 * Response: JSON. Returns `{}` if the enable was successful, HTTP 422 `{"error": "[error message]"}` otherwise
 
 
-## `/api/v1/pleroma/accounts/mfa/totp`
+## `/api/pleroma/accounts/mfa/totp`
 ####  Disables MFA/TOTP method for user account.
 * method: `DELETE`
 * Authentication: required
@@ -123,14 +121,14 @@ The `/api/v1/pleroma/*` path is backwards compatible with `/api/pleroma/*` (`/ap
 * Response: JSON. Returns `{}` if the disable was successful, HTTP 422 `{"error": "[error message]"}` otherwise
 * Example response: `{"error": "Invalid password."}`
 
-## `/api/v1/pleroma/accounts/mfa/backup_codes`
+## `/api/pleroma/accounts/mfa/backup_codes`
 ####  Generstes backup codes MFA for user account.
 * method: `GET`
 * Authentication: required
 * OAuth scope: `write:security`
 * Response: JSON. Returns `{"codes": codes}`when successful, otherwise HTTP 422 `{"error": "[error message]"}`
 
-## `/api/v1/pleroma/admin/`
+## `/api/pleroma/admin/`
 See [Admin-API](admin_api.md)
 
 ## `/api/v1/pleroma/notifications/read`
@@ -309,7 +307,7 @@ See [Admin-API](admin_api.md)
     * `hide_notification_contents`: BOOLEAN field. When set to true, it removes the contents of a message from the push notification.
 * Response: JSON. Returns `{"status": "success"}` if the update was successful, otherwise returns `{"error": "error_msg"}`
 
-## `/api/v1/pleroma/healthcheck`
+## `/api/pleroma/healthcheck`
 ### Healthcheck endpoint with additional system data.
 * Method `GET`
 * Authentication: not required
@@ -327,7 +325,7 @@ See [Admin-API](admin_api.md)
 }
 ```
 
-## `/api/v1/pleroma/change_email`
+## `/api/pleroma/change_email`
 ### Change account email
 * Method `POST`
 * Authentication: required
@@ -380,7 +378,7 @@ The status posting endpoint takes an additional parameter, `in_reply_to_conversa
 * Params: None
 * Response: JSON, returns a list of Mastodon Conversation entities that were marked as read (200 - healthy, 503 unhealthy).
 
-## `GET /api/v1/pleroma/emoji/pack?name=:name`
+## `GET /api/pleroma/emoji/pack?name=:name`
 
 ### Get pack.json for the pack
 
@@ -399,7 +397,7 @@ The status posting endpoint takes an additional parameter, `in_reply_to_conversa
 }
 ```
 
-## `POST /api/v1/pleroma/emoji/pack?name=:name`
+## `POST /api/pleroma/emoji/pack?name=:name`
 
 ### Creates an empty pack
 
@@ -409,7 +407,7 @@ The status posting endpoint takes an additional parameter, `in_reply_to_conversa
   * `name`: pack name
 * Response: JSON, "ok" and 200 status or 409 if the pack with that name already exists
 
-## `PATCH /api/v1/pleroma/emoji/pack?name=:name`
+## `PATCH /api/pleroma/emoji/pack?name=:name`
 
 ### Updates (replaces) pack metadata
 
@@ -427,7 +425,7 @@ The status posting endpoint takes an additional parameter, `in_reply_to_conversa
 * Response: JSON, updated "metadata" section of the pack and 200 status or 400 if there was a
   problem with the new metadata (the error is specified in the "error" part of the response JSON)
 
-## `DELETE /api/v1/pleroma/emoji/pack?name=:name`
+## `DELETE /api/pleroma/emoji/pack?name=:name`
 
 ### Delete a custom emoji pack
 
@@ -437,7 +435,7 @@ The status posting endpoint takes an additional parameter, `in_reply_to_conversa
   * `name`: pack name
 * Response: JSON, "ok" and 200 status or 500 if there was an error deleting the pack
 
-## `GET /api/v1/pleroma/emoji/packs/import`
+## `GET /api/pleroma/emoji/packs/import`
 
 ### Imports packs from filesystem
 
@@ -446,7 +444,7 @@ The status posting endpoint takes an additional parameter, `in_reply_to_conversa
 * Params: None
 * Response: JSON, returns a list of imported packs.
 
-## `GET /api/v1/pleroma/emoji/packs/remote`
+## `GET /api/pleroma/emoji/packs/remote`
 
 ### Make request to another instance for packs list
 
@@ -458,7 +456,7 @@ The status posting endpoint takes an additional parameter, `in_reply_to_conversa
   * `page_size`: page size for packs (default 50)
 * Response: JSON with the pack list, hashmap with pack name and pack contents
 
-## `POST /api/v1/pleroma/emoji/packs/download`
+## `POST /api/pleroma/emoji/packs/download`
 
 ### Download pack from another instance
 
@@ -471,7 +469,7 @@ The status posting endpoint takes an additional parameter, `in_reply_to_conversa
 * Response: JSON, "ok" with 200 status if the pack was downloaded, or 500 if there were
   errors downloading the pack
 
-## `POST /api/v1/pleroma/emoji/packs/files?name=:name`
+## `POST /api/pleroma/emoji/packs/files?name=:name`
 
 ### Add new file to the pack
 
@@ -484,7 +482,7 @@ The status posting endpoint takes an additional parameter, `in_reply_to_conversa
   * `filename`: (*optional*) new emoji file name. If not specified will be taken from original filename.
 * Response: JSON, list of files for updated pack (hashmap -> shortcode => filename) with status 200, either error status with error message.
 
-## `PATCH /api/v1/pleroma/emoji/packs/files?name=:name`
+## `PATCH /api/pleroma/emoji/packs/files?name=:name`
 
 ### Update emoji file from pack
 
@@ -498,7 +496,7 @@ The status posting endpoint takes an additional parameter, `in_reply_to_conversa
   * `force`: (*optional*) with true value to overwrite existing emoji with new shortcode
 * Response: JSON, list with updated files for updated pack (hashmap -> shortcode => filename) with status 200, either error status with error message.
 
-## `DELETE /api/v1/pleroma/emoji/packs/files?name=:name`
+## `DELETE /api/pleroma/emoji/packs/files?name=:name`
 
 ### Delete emoji file from pack
 
@@ -509,7 +507,7 @@ The status posting endpoint takes an additional parameter, `in_reply_to_conversa
   * `shortcode`: emoji file shortcode
 * Response: JSON, list with updated files for updated pack (hashmap -> shortcode => filename) with status 200, either error status with error message.
 
-## `GET /api/v1/pleroma/emoji/packs`
+## `GET /api/pleroma/emoji/packs`
 
 ### Lists local custom emoji packs
 
@@ -530,7 +528,7 @@ The status posting endpoint takes an additional parameter, `in_reply_to_conversa
 }
 ```
 
-## `GET /api/v1/pleroma/emoji/packs/archive?name=:name`
+## `GET /api/pleroma/emoji/packs/archive?name=:name`
 
 ### Requests a local pack archive from the instance
 

docs/index.md

@@ -20,7 +20,7 @@ The default front-end used by Pleroma is Pleroma-FE. You can find more informati
 
 ### Mastodon interface
 If the Pleroma interface isn't your thing, or you're just trying something new but you want to keep using the familiar Mastodon interface, we got that too!
-Just add a "/web" after your instance url (e.g. <https://pleroma.soykaf.com/web>) and you'll end on the Mastodon web interface, but with a Pleroma backend! MAGIC!
+Just add a "/web" after your instance url (e.g. <https://pleroma.soycaf.com/web>) and you'll end on the Mastodon web interface, but with a Pleroma backend! MAGIC!
 The Mastodon interface is from the Glitch-soc fork. For more information on the Mastodon interface you can check the [Mastodon](https://docs.joinmastodon.org/) and [Glitch-soc](https://glitch-soc.github.io/docs/) documentation.
 
 Remember, what you see is only the frontend part of Mastodon, the backend is still Pleroma.

docs/installation/alpine_linux_en.md

@@ -1,14 +1,29 @@
 # Installing on Alpine Linux
-
-{! backend/installation/otp_vs_from_source_source.include !}
-
 ## Installation
 
 This guide is a step-by-step installation guide for Alpine Linux. The instructions were verified against Alpine v3.10 standard image. You might miss additional dependencies if you use `netboot` instead.
 
 It assumes that you have administrative rights, either as root or a user with [sudo permissions](https://www.linode.com/docs/tools-reference/custom-kernels-distros/install-alpine-linux-on-your-linode/#configuration). If you want to run this guide with root, ignore the `sudo` at the beginning of the lines, unless it calls a user like `sudo -Hu pleroma`; in this case, use `su -l <username> -s $SHELL -c 'command'` instead.
 
-{! backend/installation/generic_dependencies.include !}
+### Required packages
+
+* `postgresql`
+* `elixir`
+* `erlang`
+* `erlang-parsetools`
+* `erlang-xmerl`
+* `git`
+* `file-dev`
+* Development Tools
+* `cmake`
+
+#### Optional packages used in this guide
+
+* `nginx` (preferred, example configs for other reverse proxies can be found in the repo)
+* `certbot` (or any other ACME client for Let’s Encrypt certificates)
+* `ImageMagick`
+* `ffmpeg`
+* `exiftool`
 
 ### Prepare the system
 
@@ -102,7 +117,7 @@ cd /opt/pleroma
 sudo -Hu pleroma mix deps.get
 ```
 
-* Generate the configuration: `sudo -Hu pleroma MIX_ENV=prod mix pleroma.instance gen`
+* Generate the configuration: `sudo -Hu pleroma 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`.
@@ -225,4 +240,4 @@ sudo -Hu pleroma MIX_ENV=prod mix pleroma.user new <username> <your@emailaddress
 
 ## Questions
 
-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.
+Questions about the installation or didn’t it work as it should be, ask in [#pleroma:matrix.org](https://matrix.heldscal.la/#/room/#freenode_#pleroma:matrix.org) or IRC Channel **#pleroma** on **Freenode**.

docs/installation/arch_linux_en.md

@@ -1,7 +1,4 @@
 # Installing on Arch Linux
-
-{! backend/installation/otp_vs_from_source_source.include !}
-
 ## Installation
 
 This guide will assume that you have administrative rights, either as root or a user with [sudo permissions](https://wiki.archlinux.org/index.php/Sudo). If you want to run this guide with root, ignore the `sudo` at the beginning of the lines, unless it calls a user like `sudo -Hu pleroma`; in this case, use `su <username> -s $SHELL -c 'command'` instead.
@@ -95,7 +92,7 @@ cd /opt/pleroma
 sudo -Hu pleroma mix deps.get
 ```
 
-* Generate the configuration: `sudo -Hu pleroma MIX_ENV=prod mix pleroma.instance gen`
+* Generate the configuration: `sudo -Hu pleroma 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`.
@@ -218,4 +215,4 @@ sudo -Hu pleroma MIX_ENV=prod mix pleroma.user new <username> <your@emailaddress
 
 ## Questions
 
-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.
+Questions about the installation or didn’t it work as it should be, ask in [#pleroma:matrix.org](https://matrix.heldscal.la/#/room/#freenode_#pleroma:matrix.org) or IRC Channel **#pleroma** on **Freenode**.

docs/installation/debian_based_en.md

@@ -1,12 +1,27 @@
 # Installing on Debian Based Distributions
-
-{! backend/installation/otp_vs_from_source_source.include !}
-
 ## Installation
 
-This guide will assume you are on Debian 11 (“bullseye”) or later. This guide should also work with Ubuntu 18.04 (“Bionic Beaver”) and later. It also assumes that you have administrative rights, either as root or a user with [sudo permissions](https://www.digitalocean.com/community/tutorials/how-to-add-delete-and-grant-sudo-privileges-to-users-on-a-debian-vps). If you want to run this guide with root, ignore the `sudo` at the beginning of the lines, unless it calls a user like `sudo -Hu pleroma`; in this case, use `su <username> -s $SHELL -c 'command'` instead.
+This guide will assume you are on Debian Stretch. This guide should also work with Ubuntu 16.04 and 18.04. It also assumes that you have administrative rights, either as root or a user with [sudo permissions](https://www.digitalocean.com/community/tutorials/how-to-add-delete-and-grant-sudo-privileges-to-users-on-a-debian-vps). If you want to run this guide with root, ignore the `sudo` at the beginning of the lines, unless it calls a user like `sudo -Hu pleroma`; in this case, use `su <username> -s $SHELL -c 'command'` instead.
 
-{! backend/installation/generic_dependencies.include !}
+### Required packages
+
+* `postgresql` (9.6+, Ubuntu 16.04 comes with 9.5, you can get a newer version from [here](https://www.postgresql.org/download/linux/ubuntu/))
+* `postgresql-contrib` (9.6+, same situtation as above)
+* `elixir` (1.8+, Follow the guide to install from the Erlang Solutions repo or use [asdf](https://github.com/asdf-vm/asdf) as the pleroma user)
+* `erlang-dev`
+* `erlang-nox`
+* `libmagic-dev`
+* `git`
+* `build-essential`
+* `cmake`
+
+#### Optional packages used in this guide
+
+* `nginx` (preferred, example configs for other reverse proxies can be found in the repo)
+* `certbot` (or any other ACME client for Let’s Encrypt certificates)
+* `ImageMagick`
+* `ffmpeg`
+* `exiftool`
 
 ### Prepare the system
 
@@ -25,14 +40,20 @@ sudo apt install git build-essential postgresql postgresql-contrib cmake libmagi
 
 ### Install Elixir and Erlang
 
-* Install Elixir and Erlang (you might need to use backports or [asdf](https://github.com/asdf-vm/asdf) on old systems):
+* Download and add the Erlang repository:
+
+```shell
+wget -P /tmp/ https://packages.erlang-solutions.com/erlang-solutions_2.0_all.deb
+sudo dpkg -i /tmp/erlang-solutions_2.0_all.deb
+```
+
+* Install Elixir and Erlang:
 
 ```shell
 sudo apt update
 sudo apt install elixir erlang-dev erlang-nox
 ```
 
-
 ### Optional packages: [`docs/installation/optional/media_graphics_packages.md`](../installation/optional/media_graphics_packages.md)
 
 ```shell
@@ -69,7 +90,7 @@ cd /opt/pleroma
 sudo -Hu pleroma mix deps.get
 ```
 
-* Generate the configuration: `sudo -Hu pleroma MIX_ENV=prod mix pleroma.instance gen`
+* Generate the configuration: `sudo -Hu pleroma 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`.
@@ -181,4 +202,4 @@ sudo -Hu pleroma MIX_ENV=prod mix pleroma.user new <username> <your@emailaddress
 
 ## Questions
 
-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.
+Questions about the installation or didn’t it work as it should be, ask in [#pleroma:matrix.org](https://matrix.heldscal.la/#/room/#freenode_#pleroma:matrix.org) or IRC Channel **#pleroma** on **Freenode**.

docs/installation/debian_based_jp.md

@@ -89,7 +89,7 @@ sudo -Hu pleroma mix deps.get
 
 * コンフィギュレーションを生成します。
 ```
-sudo -Hu pleroma MIX_ENV=prod mix pleroma.instance gen
+sudo -Hu pleroma mix pleroma.instance gen
 ```
     * rebar3をインストールしてもよいか聞かれたら、yesを入力してください。
     * このときにpleromaの一部がコンパイルされるため、この処理には時間がかかります。
@@ -103,7 +103,7 @@ sudo -Hu pleroma mv config/{generated_config.exs,prod.secret.exs}
 
 * 先程のコマンドで、すでに `config/setup_db.psql` というファイルが作られています。このファイルをもとに、データベースを作成します。
 ```
-sudo -Hu pleroma MIX_ENV=prod mix pleroma.instance gen
+sudo -Hu pleroma mix pleroma.instance gen
 ```
 
 * そして、データベースのマイグレーションを実行します。
@@ -191,5 +191,5 @@ sudo -Hu pleroma MIX_ENV=prod mix pleroma.user new <username> <your@emailaddress
 
 インストールについて質問がある、もしくは、うまくいかないときは、以下のところで質問できます。
 
-* [#pleroma:libera.chat](https://matrix.to/#/#pleroma:libera.chat)
-* **libera.chat** の **#pleroma** IRCチャンネル
+* [#pleroma:matrix.org](https://matrix.heldscal.la/#/room/#freenode_#pleroma:matrix.org)
+* **Freenode** の **#pleroma** IRCチャンネル

docs/installation/freebsd_en.md

@@ -1,10 +1,8 @@
-# Installing on FreeBSD
+# Installing on FreeBSD 
 
 This document was written for FreeBSD 12.1, but should be work on future releases.
 
-{! backend/installation/generic_dependencies.include !}
-
-## Installing software used in this guide
+## Required software 
 
 This assumes the target system has `pkg(8)`.
 
@@ -56,7 +54,7 @@ Configure Pleroma. Note that you need a domain name at this point:
 ```
 $ cd /home/pleroma/pleroma
 $ mix deps.get # Enter "y" when asked to install Hex
-$ MIX_ENV=prod mix pleroma.instance gen # You will be asked a few questions here.
+$ mix pleroma.instance gen # You will be asked a few questions here.
 $ cp config/generated_config.exs config/prod.secret.exs
 ```
 
@@ -215,4 +213,4 @@ incorrect timestamps. You should have ntpd running.
 
 ## Questions
 
-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.
+Questions about the installation or didn’t it work as it should be, ask in [#pleroma:matrix.org](https://matrix.heldscal.la/#/room/#freenode_#pleroma:matrix.org) or IRC Channel **#pleroma** on **Freenode**.

docs/installation/generic_dependencies.include

@@ -1,16 +0,0 @@
-## Required dependencies
-
-* PostgreSQL 9.6+
-* Elixir 1.9+
-* Erlang OTP 22.2+
-* git
-* file / libmagic
-* gcc (clang might also work)
-* GNU make
-* CMake
-
-## Optionnal dependencies
-
-* ImageMagick
-* FFmpeg
-* exiftool

docs/installation/gentoo_en.md

@@ -1,12 +1,11 @@
 # Installing on Gentoo GNU/Linux
-
-{! backend/installation/otp_vs_from_source_source.include !}
-
 ## Installation
 
 This guide will assume that you have administrative rights, either as root or a user with [sudo permissions](https://wiki.gentoo.org/wiki/Sudo). Lines that begin with `#` indicate that they should be run as the superuser. Lines using `$` should be run as the indicated user, e.g. `pleroma$` should be run as the `pleroma` user.
 
-{! backend/installation/generic_dependencies.include !}
+### Configuring your hostname (optional)
+
+If you would like your prompt to permanently include your host/domain, change `/etc/conf.d/hostname` to your hostname. You can reboot or use the `hostname` command to make immediate changes.
 
 ### Your make.conf, package.use, and USE flags
 
@@ -55,7 +54,7 @@ Gentoo quite pointedly does not come with a cron daemon installed, and as such i
  # emerge --ask dev-db/postgresql dev-lang/elixir dev-vcs/git www-servers/nginx app-crypt/certbot app-crypt/certbot-nginx dev-util/cmake sys-apps/file
 ```
 
-If you would not like to install the optional packages, remove them from this line.
+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, 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.
 
@@ -80,12 +79,12 @@ The output from emerging postgresql should give you a command for initializing t
 ```
 
 * Start postgres and enable the system service
-
+ 
 ```shell
  # /etc/init.d/postgresql-11 start
  # rc-update add postgresql-11 default
  ```
-
+ 
 ### A note on licenses, the AGPL, and deployment procedures
 
 If you do not plan to make any modifications to your Pleroma instance, cloning directly from the main repo will get you what you need. However, if you plan on doing any contributions to upstream development, making changes or modifications to your instance, making custom themes, or want to play around--and let's be honest here, if you're using Gentoo that is most likely you--you will save yourself a lot of headache later if you take the time right now to fork the Pleroma repo and use that in the following section.
@@ -136,7 +135,7 @@ pleroma$ mix deps.get
 * Generate the configuration:
 
 ```shell
-pleroma$ MIX_ENV=prod mix pleroma.instance gen
+pleroma$ mix pleroma.instance gen
 ```
 
   * Answer with `yes` if it asks you to install `rebar3`.
@@ -242,7 +241,7 @@ First, ensure that the command you will be installing into your crontab works.
  # /usr/bin/certbot renew --nginx
 ```
 
-Assuming not much time has passed since you got certbot working a few steps ago, you should get a message for all domains you installed certificates for saying `Cert not yet due for renewal`.
+Assuming not much time has passed since you got certbot working a few steps ago, you should get a message for all domains you installed certificates for saying `Cert not yet due for renewal`. 
 
 Now, run crontab as a superuser with `crontab -e` or `sudo crontab -e` as appropriate, and add the following line to your cron:
 
@@ -299,4 +298,4 @@ If you opted to allow sudo for the `pleroma` user but would like to remove the a
 
 ## Questions
 
-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.
+Questions about the installation or didn’t it work as it should be, ask in [#pleroma:matrix.org](https://matrix.heldscal.la/#/room/#freenode_#pleroma:matrix.org) or IRC Channel **#pleroma** on **Freenode**.

docs/installation/migrating_from_source_otp_en.md

@@ -1,8 +1,7 @@
 # Switching a from-source install to OTP releases
 
-{! backend/installation/otp_vs_from_source.include !}
-
-In this guide we cover how you can migrate from a from source installation to one using OTP releases.
+## What are OTP releases?
+OTP releases are as close as you can get to binary releases with Erlang/Elixir. The release is self-contained, and provides everything needed to boot it, it is easily administered via the provided shell script to open up a remote console, start/stop/restart the release, start in the background, send remote commands, and more.
 
 ## Pre-requisites
 You will be running commands as root. If you aren't root already, please elevate your priviledges by executing `sudo su`/`su`.

docs/installation/netbsd_en.md

@@ -1,8 +1,6 @@
 # Installing on NetBSD
 
-{! backend/installation/generic_dependencies.include !}
-
-## Installing software used in this guide
+## Required software 
 
 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.
@@ -73,7 +71,7 @@ Configure Pleroma. Note that you need a domain name at this point:
 ```
 $ cd /home/pleroma/pleroma
 $ mix deps.get
-$ MIX_ENV=prod mix pleroma.instance gen # You will be asked a few questions here.
+$ mix pleroma.instance gen # You will be asked a few questions here.
 ```
 
 Since Postgres is configured, we can now initialize the database. There should
@@ -195,6 +193,8 @@ Run `# /etc/rc.d/pleroma start` to start Pleroma.
 
 Restart nginx with `# /etc/rc.d/nginx restart` and you should be up and running.
 
+If you need further help, contact niaa on freenode.
+
 Make sure your time is in sync, or other instances will receive your posts with
 incorrect timestamps. You should have ntpd running.
 
@@ -208,4 +208,4 @@ incorrect timestamps. You should have ntpd running.
 
 ## Questions
 
-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.
+Questions about the installation or didn’t it work as it should be, ask in [#pleroma:matrix.org](https://matrix.heldscal.la/#/room/#freenode_#pleroma:matrix.org) or IRC Channel **#pleroma** on **Freenode**.

docs/installation/openbsd_en.md

@@ -4,11 +4,19 @@ This guide describes the installation and configuration of pleroma (and the requ
 
 For any additional information regarding commands and configuration files mentioned here, check the man pages [online](https://man.openbsd.org/) or directly on your server with the man command.
 
-{! backend/installation/generic_dependencies.include !}
-
-### Preparing the system
 #### Required software
 
+The following packages need to be installed:
+
+  * elixir
+  * gmake
+  * git
+  * postgresql-server
+  * postgresql-contrib
+  * cmake
+  * ffmpeg
+  * ImageMagick
+
 To install them, run the following command (with doas or as root):
 
 ```
@@ -231,7 +239,7 @@ Enter a shell as \_pleroma (as root `su _pleroma -`) and enter pleroma's install
 Then follow the main installation guide:
 
   * run `mix deps.get`
-  * run `MIX_ENV=prod mix pleroma.instance gen` and enter your instance's information when asked
+  * run `mix pleroma.instance gen` and enter your instance's information when asked
   * copy config/generated\_config.exs to config/prod.secret.exs. The default values should be sufficient but you should edit it and check that everything seems OK.
   * exit your current shell back to a root one and run `psql -U postgres -f /home/_pleroma/pleroma/config/setup_db.psql` to setup the database.
   * return to a \_pleroma shell into pleroma's installation directory (`su _pleroma -;cd ~/pleroma`) and run `MIX_ENV=prod mix ecto.migrate`
@@ -256,4 +264,4 @@ LC_ALL=en_US.UTF-8 MIX_ENV=prod mix pleroma.user new <username> <your@emailaddre
 
 ## Questions
 
-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.
+Questions about the installation or didn’t it work as it should be, ask in [#pleroma:matrix.org](https://matrix.heldscal.la/#/room/#freenode_#pleroma:matrix.org) or IRC Channel **#pleroma** on **Freenode**.

docs/installation/openbsd_fi.md

@@ -10,8 +10,8 @@ suositeltavaa tehdä komennon `doas` avulla, katso `doas (1)` ja `doas.conf (5)`
 Tästä eteenpäin oletuksena on, että domain "esimerkki.com" osoittaa
 serverin IP-osoitteeseen.
 
-Jos asennuksen kanssa on ongelmia, IRC-kanava #pleroma Libera.chat tai
-Matrix-kanava #pleroma:libera.chat ovat hyviä paikkoja löytää apua
+Jos asennuksen kanssa on ongelmia, IRC-kanava #pleroma Freenodessa tai
+Matrix-kanava #freenode_#pleroma:matrix.org ovat hyviä paikkoja löytää apua
 (englanniksi), `/msg eal kukkuu` jos haluat välttämättä puhua härmää.
 
 Asenna tarvittava ohjelmisto:

docs/installation/otp_en.md

@@ -1,9 +1,5 @@
 # Installing on Linux using OTP releases
 
-{! backend/installation/otp_vs_from_source.include !}
-
-This guide covers a installation using an OTP release. To install Pleroma from source, please check out the corresponding guide for your distro.
-
 ## Pre-requisites
 * A machine running Linux with GNU (e.g. Debian, Ubuntu) or musl (e.g. Alpine) libc and `x86_64`, `aarch64` or `armv7l` CPU, you have root access to. If you are not sure if it's compatible see [Detecting flavour section](#detecting-flavour) below
 * A (sub)domain pointed to the machine
@@ -35,7 +31,7 @@ Other than things bundled in the OTP release Pleroma depends on:
 
 === "Alpine"
     ```
-    awk 'NR==2' /etc/apk/repositories | sed 's/main/community/' | tee -a /etc/apk/repositories
+    echo "http://nl.alpinelinux.org/alpine/latest-stable/community" >> /etc/apk/repositories
     apk update
     apk add curl unzip ncurses postgresql postgresql-contrib nginx certbot file-dev
     ```
@@ -54,6 +50,7 @@ Per [`docs/installation/optional/media_graphics_packages.md`](optional/media_gra
 
 === "Alpine"
     ```
+    echo "http://nl.alpinelinux.org/alpine/latest-stable/community" >> /etc/apk/repositories
     apk update
     apk add imagemagick ffmpeg exiftool
     ```
@@ -153,7 +150,7 @@ su pleroma -s $SHELL -lc "./bin/pleroma_ctl migrate"
 # su pleroma -s $SHELL -lc "./bin/pleroma_ctl migrate --migrations-path priv/repo/optional_migrations/rum_indexing/"
 
 # Start the instance to verify that everything is working as expected
-su pleroma -s $SHELL -lc "./bin/pleroma daemon"
+su pleroma -s $SHELL -lc "export $(cat /opt/pleroma/config/pleroma.env); ./bin/pleroma daemon"
 
 # Wait for about 20 seconds and query the instance endpoint, if it shows your uri, name and email correctly, you are configured correctly
 sleep 20 && curl http://localhost:4000/api/v1/instance
@@ -235,7 +232,7 @@ At this point if you open your (sub)domain in a browser you should see a 502 err
 
 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).
+Still doesn't work? Feel free to contact us on [#pleroma on freenode](https://irc.pleroma.social) or via matrix at <https://matrix.heldscal.la/#/room/#freenode_#pleroma:matrix.org>, you can also [file an issue on our Gitlab](https://git.pleroma.social/pleroma/pleroma-support/issues/new)
 
 ## Post installation
 
@@ -293,7 +290,7 @@ nginx -t
 
 ## Create your first user and set as admin
 ```sh
-cd /opt/pleroma
+cd /opt/pleroma/bin
 su pleroma -s $SHELL -lc "./bin/pleroma_ctl user new joeuser joeuser@sld.tld --admin"
 ```
 This will create an account withe the username of 'joeuser' with the email address of joeuser@sld.tld, and set that user's account as an admin. This will result in a link that you can paste into the browser, which logs you in and enables you to set the password.
@@ -304,4 +301,4 @@ This will create an account withe the username of 'joeuser' with the email addre
 
 ## Questions
 
-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).
+Questions about the installation or didn’t it work as it should be, ask in [#pleroma:matrix.org](https://matrix.heldscal.la/#/room/#freenode_#pleroma:matrix.org) or IRC Channel **#pleroma** on **Freenode**.

docs/installation/otp_vs_from_source.include

@@ -1,3 +0,0 @@
-## OTP releases vs from-source installations
-
-There are two ways to install Pleroma. You can use OTP releases or do a from-source installation. OTP releases are as close as you can get to binary releases with Erlang/Elixir. The release is self-contained, and provides everything needed to boot it, it is easily administered via the provided shell script to open up a remote console, start/stop/restart the release, start in the background, send remote commands, and more. With from source installations you install Pleroma from source, meaning you have to install certain dependencies like Erlang+Elixir and compile Pleroma yourself.

docs/installation/otp_vs_from_source_source.include

@@ -1,3 +0,0 @@
-{! backend/installation/otp_vs_from_source.include !}
-
-This guide covers a from-source installation. To install using OTP releases, please check out [the OTP guide](./otp_en.md).

lib/mix/tasks/pleroma/config.ex

@@ -27,7 +27,7 @@ defmodule Mix.Tasks.Pleroma.Config do
 
       {opts, _} =
         OptionParser.parse!(options,
-          strict: [env: :string, delete: :boolean, path: :string],
+          strict: [env: :string, delete: :boolean],
           aliases: [d: :delete]
         )
 
@@ -259,43 +259,18 @@ defmodule Mix.Tasks.Pleroma.Config do
   defp migrate_from_db(opts) do
     env = opts[:env] || Pleroma.Config.get(:env)
 
-    filename = "#{env}.exported_from_db.secret.exs"
-
     config_path =
-      cond do
-        opts[:path] ->
-          opts[:path]
-
-        Pleroma.Config.get(:release) ->
-          :config_path
-          |> Pleroma.Config.get()
-          |> Path.dirname()
-
-        true ->
-          "config"
+      if Pleroma.Config.get(:release) do
+        :config_path
+        |> Pleroma.Config.get()
+        |> Path.dirname()
+      else
+        "config"
       end
-      |> Path.join(filename)
+      |> Path.join("#{env}.exported_from_db.secret.exs")
 
-    with {:ok, file} <- File.open(config_path, [:write, :utf8]) do
-      write_config(file, config_path, opts)
-      shell_info("Database configuration settings have been exported to #{config_path}")
-    else
-      _ ->
-        shell_error("Impossible to save settings to this directory #{Path.dirname(config_path)}")
-        tmp_config_path = Path.join(System.tmp_dir!(), filename)
-        file = File.open!(tmp_config_path)
+    file = File.open!(config_path, [:write, :utf8])
 
-        shell_info(
-          "Saving database configuration settings to #{tmp_config_path}. Copy it to the #{
-            Path.dirname(config_path)
-          } manually."
-        )
-
-        write_config(file, tmp_config_path, opts)
-    end
-  end
-
-  defp write_config(file, path, opts) do
     IO.write(file, config_header())
 
     ConfigDB
@@ -303,7 +278,11 @@ defmodule Mix.Tasks.Pleroma.Config do
     |> Enum.each(&write_and_delete(&1, file, opts[:delete]))
 
     :ok = File.close(file)
-    System.cmd("mix", ["format", path])
+    System.cmd("mix", ["format", config_path])
+
+    shell_info(
+      "Database configuration settings have been exported to config/#{env}.exported_from_db.secret.exs"
+    )
   end
 
   if Code.ensure_loaded?(Config.Reader) do

lib/mix/tasks/pleroma/database.ex

@@ -8,13 +8,10 @@ defmodule Mix.Tasks.Pleroma.Database do
   alias Pleroma.Object
   alias Pleroma.Repo
   alias Pleroma.User
-
   require Logger
   require Pleroma.Constants
-
   import Ecto.Query
   import Mix.Pleroma
-
   use Mix.Task
 
   @shortdoc "A collection of database related tasks"
@@ -96,15 +93,6 @@ defmodule Mix.Tasks.Pleroma.Database do
     )
     |> Repo.delete_all(timeout: :infinity)
 
-    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(prune_hashtags_query)
-
     if Keyword.get(options, :vacuum) do
       Maintenance.vacuum("full")
     end
@@ -209,9 +197,7 @@ defmodule Mix.Tasks.Pleroma.Database do
           new.fts_content := to_tsvector(new.data->>'content');
           RETURN new;
           END
-          $$ LANGUAGE plpgsql",
-          [],
-          timeout: :infinity
+          $$ LANGUAGE plpgsql"
         )
 
         shell_info("Refresh RUM index")
@@ -221,41 +207,11 @@ defmodule Mix.Tasks.Pleroma.Database do
 
         Ecto.Adapters.SQL.query!(
           Pleroma.Repo,
-          "CREATE INDEX CONCURRENTLY objects_fts ON objects USING gin(to_tsvector('#{tsconfig}', data->>'content')); ",
-          [],
-          timeout: :infinity
+          "CREATE INDEX objects_fts ON objects USING gin(to_tsvector('#{tsconfig}', data->>'content')); "
         )
       end
 
       shell_info('Done.')
     end
   end
-
-  # Rolls back a specific migration (leaving subsequent migrations applied).
-  # WARNING: imposes a risk of unrecoverable data loss — proceed at your own responsibility.
-  # Based on https://stackoverflow.com/a/53825840
-  def run(["rollback", version]) do
-    prompt = "SEVERE WARNING: this operation may result in unrecoverable data loss. Continue?"
-
-    if shell_prompt(prompt, "n") in ~w(Yn Y y) do
-      {_, result, _} =
-        Ecto.Migrator.with_repo(Pleroma.Repo, fn repo ->
-          version = String.to_integer(version)
-          re = ~r/^#{version}_.*\.exs/
-          path = Ecto.Migrator.migrations_path(repo)
-
-          with {_, "" <> file} <- {:find, Enum.find(File.ls!(path), &String.match?(&1, re))},
-               {_, [{mod, _} | _]} <- {:compile, Code.compile_file(Path.join(path, file))},
-               {_, :ok} <- {:rollback, Ecto.Migrator.down(repo, version, mod)} do
-            {:ok, "Reversed migration: #{file}"}
-          else
-            {:find, _} -> {:error, "No migration found with version prefix: #{version}"}
-            {:compile, e} -> {:error, "Problem compiling migration module: #{inspect(e)}"}
-            {:rollback, e} -> {:error, "Problem reversing migration: #{inspect(e)}"}
-          end
-        end)
-
-      shell_info(inspect(result))
-    end
-  end
 end

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

@@ -20,8 +20,7 @@ defmodule Mix.Tasks.Pleroma.Ecto.Rollback do
     start: :boolean,
     quiet: :boolean,
     log_sql: :boolean,
-    migrations_path: :string,
-    env: :string
+    migrations_path: :string
   ]
 
   @moduledoc """
@@ -60,7 +59,7 @@ defmodule Mix.Tasks.Pleroma.Ecto.Rollback do
     level = Logger.level()
     Logger.configure(level: :info)
 
-    if opts[:env] == "test" do
+    if Pleroma.Config.get(:env) == :test do
       Logger.info("Rollback succesfully")
     else
       {:ok, _, _} =

lib/pleroma/activity.ex

@@ -113,7 +113,6 @@ defmodule Pleroma.Activity do
     from([a] in query,
       left_join: b in Bookmark,
       on: b.user_id == ^user.id and b.activity_id == a.id,
-      as: :bookmark,
       preload: [bookmark: b]
     )
   end
@@ -124,7 +123,6 @@ defmodule Pleroma.Activity do
     from([a] in query,
       left_join: r in ReportNote,
       on: a.id == r.activity_id,
-      as: :report_note,
       preload: [report_notes: r]
     )
   end
@@ -184,48 +182,40 @@ defmodule Pleroma.Activity do
     |> Repo.one()
   end
 
-  @doc """
-  Gets activity by ID, doesn't load activities from deactivated actors by default.
-  """
-  @spec get_by_id(String.t(), keyword()) :: t() | nil
-  def get_by_id(id, opts \\ [filter: [:restrict_deactivated]]), do: get_by_id_with_opts(id, opts)
+  @spec get_by_id(String.t()) :: Activity.t() | nil
+  def get_by_id(id) do
+    case FlakeId.flake_id?(id) do
+      true ->
+        Activity
+        |> where([a], a.id == ^id)
+        |> restrict_deactivated_users()
+        |> Repo.one()
 
-  @spec get_by_id_with_user_actor(String.t()) :: t() | nil
-  def get_by_id_with_user_actor(id), do: get_by_id_with_opts(id, preload: [:user_actor])
-
-  @spec get_by_id_with_object(String.t()) :: t() | nil
-  def get_by_id_with_object(id), do: get_by_id_with_opts(id, preload: [:object])
-
-  defp get_by_id_with_opts(id, opts) do
-    if FlakeId.flake_id?(id) do
-      query = Queries.by_id(id)
-
-      with_filters_query =
-        if is_list(opts[:filter]) do
-          Enum.reduce(opts[:filter], query, fn
-            {:type, type}, acc -> Queries.by_type(acc, type)
-            :restrict_deactivated, acc -> restrict_deactivated_users(acc)
-            _, acc -> acc
-          end)
-        else
-          query
-        end
-
-      with_preloads_query =
-        if is_list(opts[:preload]) do
-          Enum.reduce(opts[:preload], with_filters_query, fn
-            :user_actor, acc -> with_preloaded_user_actor(acc)
-            :object, acc -> with_preloaded_object(acc)
-            _, acc -> acc
-          end)
-        else
-          with_filters_query
-        end
-
-      Repo.one(with_preloads_query)
+      _ ->
+        nil
     end
   end
 
+  def get_by_id_with_user_actor(id) do
+    case FlakeId.flake_id?(id) do
+      true ->
+        Activity
+        |> where([a], a.id == ^id)
+        |> with_preloaded_user_actor()
+        |> Repo.one()
+
+      _ ->
+        nil
+    end
+  end
+
+  def get_by_id_with_object(id) do
+    Activity
+    |> where(id: ^id)
+    |> with_preloaded_object()
+    |> Repo.one()
+  end
+
   def all_by_ids_with_object(ids) do
     Activity
     |> where([a], a.id in ^ids)
@@ -277,11 +267,6 @@ defmodule Pleroma.Activity do
 
   def get_create_by_object_ap_id_with_object(_), do: nil
 
-  @spec create_by_id_with_object(String.t()) :: t() | nil
-  def create_by_id_with_object(id) do
-    get_by_id_with_opts(id, preload: [:object], filter: [type: "Create"])
-  end
-
   defp get_in_reply_to_activity_from_object(%Object{data: %{"inReplyTo" => ap_id}}) do
     get_create_by_object_ap_id_with_object(ap_id)
   end
@@ -292,8 +277,7 @@ defmodule Pleroma.Activity do
     get_in_reply_to_activity_from_object(Object.normalize(activity, fetch: false))
   end
 
-  def normalize(%Activity{data: %{"id" => ap_id}}), do: get_by_ap_id_with_object(ap_id)
-  def normalize(%{"id" => ap_id}), do: get_by_ap_id_with_object(ap_id)
+  def normalize(obj) when is_map(obj), do: get_by_ap_id_with_object(obj["id"])
   def normalize(ap_id) when is_binary(ap_id), do: get_by_ap_id_with_object(ap_id)
   def normalize(_), do: nil
 
@@ -314,15 +298,13 @@ defmodule Pleroma.Activity do
 
   def delete_all_by_object_ap_id(_), do: nil
 
-  defp purge_web_resp_cache(%Activity{data: %{"id" => id}} = activity) when is_binary(id) do
-    with %{path: path} <- URI.parse(id) do
-      @cachex.del(:web_resp_cache, path)
-    end
-
+  defp purge_web_resp_cache(%Activity{} = activity) do
+    %{path: path} = URI.parse(activity.data["id"])
+    @cachex.del(:web_resp_cache, path)
     activity
   end
 
-  defp purge_web_resp_cache(activity), do: activity
+  defp purge_web_resp_cache(nil), do: nil
 
   def follow_accepted?(
         %Activity{data: %{"type" => "Follow", "object" => followed_ap_id}} = activity
@@ -384,6 +366,12 @@ defmodule Pleroma.Activity do
     end
   end
 
+  @spec pinned_by_actor?(Activity.t()) :: boolean()
+  def pinned_by_actor?(%Activity{} = activity) do
+    actor = user_actor(activity)
+    activity.id in actor.pinned_activities
+  end
+
   @spec get_by_object_ap_id_with_object(String.t()) :: t() | nil
   def get_by_object_ap_id_with_object(ap_id) when is_binary(ap_id) do
     ap_id
@@ -394,13 +382,4 @@ defmodule Pleroma.Activity do
   end
 
   def get_by_object_ap_id_with_object(_), do: nil
-
-  @spec add_by_params_query(String.t(), String.t(), String.t()) :: Ecto.Query.t()
-  def add_by_params_query(object_id, actor, target) do
-    object_id
-    |> Queries.by_object_id()
-    |> Queries.by_type("Add")
-    |> Queries.by_actor(actor)
-    |> where([a], fragment("?->>'target' = ?", a.data, ^target))
-  end
 end

lib/pleroma/activity/html.ex

@@ -1,45 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.Activity.HTML do
-  alias Pleroma.HTML
-  alias Pleroma.Object
-
-  @cachex Pleroma.Config.get([:cachex, :provider], Cachex)
-
-  def get_cached_scrubbed_html_for_activity(
-        content,
-        scrubbers,
-        activity,
-        key \\ "",
-        callback \\ fn x -> x end
-      ) do
-    key = "#{key}#{generate_scrubber_signature(scrubbers)}|#{activity.id}"
-
-    @cachex.fetch!(:scrubber_cache, key, fn _key ->
-      object = Object.normalize(activity, fetch: false)
-      HTML.ensure_scrubbed_html(content, scrubbers, object.data["fake"] || false, callback)
-    end)
-  end
-
-  def get_cached_stripped_html_for_activity(content, activity, key) do
-    get_cached_scrubbed_html_for_activity(
-      content,
-      FastSanitize.Sanitizer.StripTags,
-      activity,
-      key,
-      &HtmlEntities.decode/1
-    )
-  end
-
-  defp generate_scrubber_signature(scrubber) when is_atom(scrubber) do
-    generate_scrubber_signature([scrubber])
-  end
-
-  defp generate_scrubber_signature(scrubbers) do
-    Enum.reduce(scrubbers, "", fn scrubber, signature ->
-      "#{signature}#{to_string(scrubber)}"
-    end)
-  end
-end

lib/pleroma/activity/ir/topics.ex

@@ -48,12 +48,14 @@ defmodule Pleroma.Activity.Ir.Topics do
     tags
   end
 
-  defp hashtags_to_topics(object) do
-    object
-    |> Object.hashtags()
-    |> Enum.map(fn hashtag -> "hashtag:" <> hashtag end)
+  defp hashtags_to_topics(%{data: %{"tag" => tags}}) do
+    tags
+    |> Enum.filter(&is_bitstring(&1))
+    |> Enum.map(fn tag -> "hashtag:" <> tag end)
   end
 
+  defp hashtags_to_topics(_), do: []
+
   defp remote_topics(%{local: true}), do: []
 
   defp remote_topics(%{actor: actor}) when is_binary(actor),

lib/pleroma/activity/queries.ex

@@ -14,11 +14,6 @@ defmodule Pleroma.Activity.Queries do
   alias Pleroma.Activity
   alias Pleroma.User
 
-  @spec by_id(query(), String.t()) :: query()
-  def by_id(query \\ Activity, id) do
-    from(a in query, where: a.id == ^id)
-  end
-
   @spec by_ap_id(query, String.t()) :: query
   def by_ap_id(query \\ Activity, ap_id) do
     from(

lib/pleroma/activity/search.ex

@@ -26,23 +26,19 @@ defmodule Pleroma.Activity.Search do
         :plain
       end
 
-    try do
-      Activity
-      |> Activity.with_preloaded_object()
-      |> Activity.restrict_deactivated_users()
-      |> restrict_public()
-      |> query_with(index_type, search_query, search_function)
-      |> maybe_restrict_local(user)
-      |> maybe_restrict_author(author)
-      |> maybe_restrict_blocked(user)
-      |> Pagination.fetch_paginated(
-        %{"offset" => offset, "limit" => limit, "skip_order" => index_type == :rum},
-        :offset
-      )
-      |> maybe_fetch(user, search_query)
-    rescue
-      _ -> maybe_fetch([], user, search_query)
-    end
+    Activity
+    |> Activity.with_preloaded_object()
+    |> Activity.restrict_deactivated_users()
+    |> restrict_public()
+    |> query_with(index_type, search_query, search_function)
+    |> maybe_restrict_local(user)
+    |> maybe_restrict_author(author)
+    |> maybe_restrict_blocked(user)
+    |> Pagination.fetch_paginated(
+      %{"offset" => offset, "limit" => limit, "skip_order" => index_type == :rum},
+      :offset
+    )
+    |> maybe_fetch(user, search_query)
   end
 
   def maybe_restrict_author(query, %User{} = author) do
@@ -65,17 +61,10 @@ defmodule Pleroma.Activity.Search do
   end
 
   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,
+          "to_tsvector(?->>'content') @@ plainto_tsquery(?)",
           o.data,
           ^search_query
         )
@@ -83,17 +72,10 @@ defmodule Pleroma.Activity.Search do
   end
 
   defp query_with(q, :gin, search_query, :websearch) 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') @@ websearch_to_tsquery(?)",
-          ^tsc,
+          "to_tsvector(?->>'content') @@ websearch_to_tsquery(?)",
           o.data,
           ^search_query
         )

lib/pleroma/application.ex

@@ -25,7 +25,7 @@ defmodule Pleroma.Application do
     if Process.whereis(Pleroma.Web.Endpoint) do
       case Config.get([:http, :user_agent], :default) do
         :default ->
-          info = "#{Pleroma.Web.Endpoint.url()} <#{Config.get([:instance, :email], "")}>"
+          info = "#{Pleroma.Web.base_url()} <#{Config.get([:instance, :email], "")}>"
           named_version() <> "; " <> info
 
         custom ->
@@ -97,13 +97,15 @@ defmodule Pleroma.Application do
           Pleroma.Stats,
           Pleroma.JobQueueMonitor,
           {Majic.Pool, [name: Pleroma.MajicPool, pool_size: Config.get([:majic_pool, :size], 2)]},
-          {Oban, Config.get(Oban)},
-          Pleroma.Web.Endpoint
+          {Oban, Config.get(Oban)}
         ] ++
         task_children(@mix_env) ++
         dont_run_in_test(@mix_env) ++
-        shout_child(shout_enabled?()) ++
-        [Pleroma.Gopher.Server]
+        chat_child(chat_enabled?()) ++
+        [
+          Pleroma.Web.Endpoint,
+          Pleroma.Gopher.Server
+        ]
 
     # See http://elixir-lang.org/docs/stable/elixir/Supervisor.html
     # for other strategies and supported options
@@ -216,7 +218,7 @@ defmodule Pleroma.Application do
       type: :worker
     }
 
-  defp shout_enabled?, do: Config.get([:shout, :enabled])
+  defp chat_enabled?, do: Config.get([:chat, :enabled])
 
   defp dont_run_in_test(env) when env in [:test, :benchmark], do: []
 
@@ -228,23 +230,17 @@ defmodule Pleroma.Application do
          keys: :duplicate,
          partitions: System.schedulers_online()
        ]}
-    ] ++ background_migrators()
-  end
-
-  defp background_migrators do
-    [
-      Pleroma.Migrators.HashtagsTableMigrator
     ]
   end
 
-  defp shout_child(true) do
+  defp chat_child(true) do
     [
-      Pleroma.Web.ShoutChannel.ShoutChannelState,
+      Pleroma.Web.ChatChannel.ChatChannelState,
       {Phoenix.PubSub, [name: Pleroma.PubSub, adapter: Phoenix.PubSub.PG2]}
     ]
   end
 
-  defp shout_child(_), do: []
+  defp chat_child(_), do: []
 
   defp task_children(:test) do
     [

lib/pleroma/application_requirements.ex

@@ -34,16 +34,15 @@ 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.warn("""
-      To send welcome emails, you need to enable the mailer.
-      Welcome emails will NOT be sent with the current config.
-
-      Enable the mailer:
-        config :pleroma, Pleroma.Emails.Mailer, enabled: true
+      Logger.error("""
+      To send welcome email do you need to enable mail.
+      \nconfig :pleroma, Pleroma.Emails.Mailer, enabled: true
       """)
-    end
 
-    :ok
+      {:error, "The mail disabled."}
+    else
+      :ok
+    end
   end
 
   defp check_welcome_message_config!(result), do: result
@@ -52,21 +51,18 @@ 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.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.
+         not Pleroma.Config.get([Pleroma.Emails.Mailer, :enabled]) do
+      Logger.error(
+        "Account activation enabled, but no Mailer settings enabled.\n" <>
+          "Please set config :pleroma, :instance, account_activation_required: false\n" <>
+          "Otherwise setup and enable Mailer."
+      )
 
-      Disable account activation:
-        config :pleroma, :instance, account_activation_required: false
-
-      Enable the mailer:
-        config :pleroma, Pleroma.Emails.Mailer, enabled: true
-      """)
+      {:error,
+       "Account activation enabled, but Mailer is disabled. Cannot send confirmation emails."}
+    else
+      :ok
     end
-
-    :ok
   end
 
   def check_confirmation_accounts!(result), do: result
@@ -164,12 +160,10 @@ defmodule Pleroma.ApplicationRequirements do
 
   defp check_system_commands!(:ok) do
     filter_commands_statuses = [
-      check_filter(Pleroma.Upload.Filter.Exiftool, "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")
+      check_filter(Pleroma.Upload.Filters.Exiftool, "exiftool"),
+      check_filter(Pleroma.Upload.Filters.Mogrify, "mogrify"),
+      check_filter(Pleroma.Upload.Filters.Mogrifun, "mogrify"),
+      check_filter(Pleroma.Upload.Filters.HeifToJpeg, "heic-convert")
     ]
 
     preview_proxy_commands_status =

lib/pleroma/config.ex

@@ -100,7 +100,15 @@ defmodule Pleroma.Config do
 
   def oauth_consumer_enabled?, do: oauth_consumer_strategies() != []
 
-  def feature_enabled?(feature_name) do
-    get([:features, feature_name]) not in [nil, false, :disabled, :auto]
+  def enforce_oauth_admin_scope_usage?, do: !!get([:auth, :enforce_oauth_admin_scope_usage])
+
+  def oauth_admin_scopes(scopes) when is_list(scopes) do
+    Enum.flat_map(
+      scopes,
+      fn scope ->
+        ["admin:#{scope}"] ++
+          if enforce_oauth_admin_scope_usage?(), do: [], else: [scope]
+      end
+    )
   end
 end

lib/pleroma/config/deprecation_warnings.ex

@@ -41,8 +41,7 @@ defmodule Pleroma.Config.DeprecationWarnings do
          :ok <- check_gun_pool_options(),
          :ok <- check_activity_expiration_config(),
          :ok <- check_remote_ip_plug_name(),
-         :ok <- check_uploders_s3_public_endpoint(),
-         :ok <- check_old_chat_shoutbox() do
+         :ok <- check_uploders_s3_public_endpoint() do
       :ok
     else
       _ ->
@@ -216,27 +215,4 @@ defmodule Pleroma.Config.DeprecationWarnings do
       :ok
     end
   end
-
-  @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]) || []
-
-    use_old_config =
-      Keyword.has_key?(instance_config, :chat_limit) or
-        Keyword.has_key?(chat_config, :enabled)
-
-    if use_old_config do
-      Logger.error("""
-      !!!DEPRECATION WARNING!!!
-      Your config is using the old namespace for the Shoutbox configuration. You need to convert to the new namespace. e.g.,
-      \n* `config :pleroma, :chat, enabled` and `config :pleroma, :instance, chat_limit` are now equal to:
-      \n* `config :pleroma, :shout, enabled` and `config :pleroma, :shout, limit`
-      """)
-
-      :error
-    else
-      :ok
-    end
-  end
 end

lib/pleroma/config/loader.ex

@@ -3,11 +3,9 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Config.Loader do
-  # These modules are only being used as keys here (for equality check),
-  # so it's okay to use `Module.concat/1` to have the compiler ignore them.
   @reject_keys [
-    Module.concat(["Pleroma.Repo"]),
-    Module.concat(["Pleroma.Web.Endpoint"]),
+    Pleroma.Repo,
+    Pleroma.Web.Endpoint,
     :env,
     :configurable_from_database,
     :database,

lib/pleroma/config/release_runtime_provider.ex

@@ -1,6 +1,6 @@
 defmodule Pleroma.Config.ReleaseRuntimeProvider do
   @moduledoc """
-  Imports runtime config and `{env}.exported_from_db.secret.exs` for releases.
+  Imports `runtime.exs` and `{env}.exported_from_db.secret.exs` for elixir releases.
   """
   @behaviour Config.Provider
 
@@ -8,11 +8,10 @@ defmodule Pleroma.Config.ReleaseRuntimeProvider do
   def init(opts), do: opts
 
   @impl true
-  def load(config, opts) do
+  def load(config, _opts) do
     with_defaults = Config.Reader.merge(config, Pleroma.Config.Holder.release_defaults())
 
-    config_path =
-      opts[:config_path] || System.get_env("PLEROMA_CONFIG_PATH") || "/etc/pleroma/config.exs"
+    config_path = System.get_env("PLEROMA_CONFIG_PATH") || "/etc/pleroma/config.exs"
 
     with_runtime_config =
       if File.exists?(config_path) do
@@ -25,7 +24,7 @@ defmodule Pleroma.Config.ReleaseRuntimeProvider do
         warning = [
           IO.ANSI.red(),
           IO.ANSI.bright(),
-          "!!! Config path is not declared! Please ensure it exists and that PLEROMA_CONFIG_PATH is unset or points to an existing file",
+          "!!! #{config_path} not found! Please ensure it exists and that PLEROMA_CONFIG_PATH is unset or points to an existing file",
           IO.ANSI.reset()
         ]
 
@@ -34,14 +33,13 @@ defmodule Pleroma.Config.ReleaseRuntimeProvider do
       end
 
     exported_config_path =
-      opts[:exported_config_path] ||
-        config_path
-        |> Path.dirname()
-        |> Path.join("#{Pleroma.Config.get(:env)}.exported_from_db.secret.exs")
+      config_path
+      |> Path.dirname()
+      |> Path.join("prod.exported_from_db.secret.exs")
 
     with_exported =
       if File.exists?(exported_config_path) do
-        exported_config = Config.Reader.read!(exported_config_path)
+        exported_config = Config.Reader.read!(with_runtime_config)
         Config.Reader.merge(with_runtime_config, exported_config)
       else
         with_runtime_config

lib/pleroma/config/transfer_task.ex

@@ -13,25 +13,23 @@ defmodule Pleroma.Config.TransferTask do
 
   @type env() :: :test | :benchmark | :dev | :prod
 
-  defp reboot_time_keys,
-    do: [
-      {:pleroma, :hackney_pools},
-      {:pleroma, :shout},
-      {:pleroma, Oban},
-      {:pleroma, :rate_limit},
-      {:pleroma, :markup},
-      {:pleroma, :streamer},
-      {:pleroma, :pools},
-      {:pleroma, :connections_pool}
-    ]
+  @reboot_time_keys [
+    {:pleroma, :hackney_pools},
+    {:pleroma, :chat},
+    {:pleroma, Oban},
+    {:pleroma, :rate_limit},
+    {:pleroma, :markup},
+    {:pleroma, :streamer},
+    {:pleroma, :pools},
+    {:pleroma, :connections_pool}
+  ]
 
-  defp reboot_time_subkeys,
-    do: [
-      {:pleroma, Pleroma.Captcha, [:seconds_valid]},
-      {:pleroma, Pleroma.Upload, [:proxy_remote]},
-      {:pleroma, :instance, [:upload_limit]},
-      {:pleroma, :gopher, [:enabled]}
-    ]
+  @reboot_time_subkeys [
+    {:pleroma, Pleroma.Captcha, [:seconds_valid]},
+    {:pleroma, Pleroma.Upload, [:proxy_remote]},
+    {:pleroma, :instance, [:upload_limit]},
+    {:pleroma, :gopher, [:enabled]}
+  ]
 
   def start_link(restart_pleroma? \\ true) do
     load_and_update_env([], restart_pleroma?)
@@ -167,12 +165,12 @@ defmodule Pleroma.Config.TransferTask do
   end
 
   defp group_and_key_need_reboot?(group, key) do
-    Enum.any?(reboot_time_keys(), fn {g, k} -> g == group and k == key end)
+    Enum.any?(@reboot_time_keys, fn {g, k} -> g == group and k == key end)
   end
 
   defp group_and_subkey_need_reboot?(group, key, value) do
     Keyword.keyword?(value) and
-      Enum.any?(reboot_time_subkeys(), fn {g, k, subkeys} ->
+      Enum.any?(@reboot_time_subkeys, fn {g, k, subkeys} ->
         g == group and k == key and
           Enum.any?(Keyword.keys(value), &(&1 in subkeys))
       end)

lib/pleroma/config_db.ex

@@ -387,6 +387,6 @@ defmodule Pleroma.ConfigDB do
   @spec module_name?(String.t()) :: boolean()
   def module_name?(string) do
     Regex.match?(~r/^(Pleroma|Phoenix|Tesla|Quack|Ueberauth|Swoosh)\./, string) or
-      string in ["Oban", "Ueberauth", "ExSyslogger", "ConcurrentLimiter"]
+      string in ["Oban", "Ueberauth", "ExSyslogger"]
   end
 end

lib/pleroma/constants.ex

@@ -18,8 +18,7 @@ defmodule Pleroma.Constants do
       "emoji",
       "context_id",
       "deleted_activity_id",
-      "pleroma_internal",
-      "generator"
+      "pleroma_internal"
     ]
   )
 
@@ -27,4 +26,6 @@ defmodule Pleroma.Constants do
     do:
       ~w(index.html robots.txt static static-fe finmoji emoji packs sounds images instance sw.js sw-pleroma.js favicon.png schemas doc embed.js embed.css)
   )
+
+  def as_local_public, do: Pleroma.Web.base_url() <> "/#Public"
 end

lib/pleroma/conversation.ex

@@ -61,8 +61,9 @@ defmodule Pleroma.Conversation do
          "Create" <- activity.data["type"],
          %Object{} = object <- Object.normalize(activity, fetch: false),
          true <- object.data["type"] in ["Note", "Question"],
-         ap_id when is_binary(ap_id) and byte_size(ap_id) > 0 <- object.data["context"],
-         {:ok, conversation} <- create_for_ap_id(ap_id) do
+         ap_id when is_binary(ap_id) and byte_size(ap_id) > 0 <- object.data["context"] do
+      {:ok, conversation} = create_for_ap_id(ap_id)
+
       users = User.get_users_from_set(activity.recipients, local_only: false)
 
       participations =

lib/pleroma/conversation/participation.ex

@@ -220,8 +220,4 @@ defmodule Pleroma.Conversation.Participation do
       select: %{count: count(p.id)}
     )
   end
-
-  def delete(%__MODULE__{} = participation) do
-    Repo.delete(participation)
-  end
 end

lib/pleroma/data_migration.ex

@@ -1,45 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.DataMigration do
-  use Ecto.Schema
-
-  alias Pleroma.DataMigration
-  alias Pleroma.DataMigration.State
-  alias Pleroma.Repo
-
-  import Ecto.Changeset
-  import Ecto.Query
-
-  schema "data_migrations" do
-    field(:name, :string)
-    field(:state, State, default: :pending)
-    field(:feature_lock, :boolean, default: false)
-    field(:params, :map, default: %{})
-    field(:data, :map, default: %{})
-
-    timestamps()
-  end
-
-  def changeset(data_migration, params \\ %{}) do
-    data_migration
-    |> cast(params, [:name, :state, :feature_lock, :params, :data])
-    |> validate_required([:name])
-    |> unique_constraint(:name)
-  end
-
-  def update_one_by_id(id, params \\ %{}) do
-    with {1, _} <-
-           from(dm in DataMigration, where: dm.id == ^id)
-           |> Repo.update_all(set: params) do
-      :ok
-    end
-  end
-
-  def get_by_name(name) do
-    Repo.get_by(DataMigration, name: name)
-  end
-
-  def populate_hashtags_table, do: get_by_name("populate_hashtags_table")
-end

lib/pleroma/delivery.ex

@@ -9,6 +9,7 @@ defmodule Pleroma.Delivery do
   alias Pleroma.Object
   alias Pleroma.Repo
   alias Pleroma.User
+  alias Pleroma.User
 
   import Ecto.Changeset
   import Ecto.Query

lib/pleroma/earmark_renderer.ex

@@ -0,0 +1,256 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+#
+# This file is derived from Earmark, under the following copyright:
+# Copyright © 2014 Dave Thomas, The Pragmatic Programmers
+# SPDX-License-Identifier: Apache-2.0
+# Upstream: https://github.com/pragdave/earmark/blob/master/lib/earmark/html_renderer.ex
+defmodule Pleroma.EarmarkRenderer do
+  @moduledoc false
+
+  alias Earmark.Block
+  alias Earmark.Context
+  alias Earmark.HtmlRenderer
+  alias Earmark.Options
+
+  import Earmark.Inline, only: [convert: 3]
+  import Earmark.Helpers.HtmlHelpers
+  import Earmark.Message, only: [add_messages_from: 2, get_messages: 1, set_messages: 2]
+  import Earmark.Context, only: [append: 2, set_value: 2]
+  import Earmark.Options, only: [get_mapper: 1]
+
+  @doc false
+  def render(blocks, %Context{options: %Options{}} = context) do
+    messages = get_messages(context)
+
+    {contexts, html} =
+      get_mapper(context.options).(
+        blocks,
+        &render_block(&1, put_in(context.options.messages, []))
+      )
+      |> Enum.unzip()
+
+    all_messages =
+      contexts
+      |> Enum.reduce(messages, fn ctx, messages1 -> messages1 ++ get_messages(ctx) end)
+
+    {put_in(context.options.messages, all_messages), html |> IO.iodata_to_binary()}
+  end
+
+  #############
+  # Paragraph #
+  #############
+  defp render_block(%Block.Para{lnb: lnb, lines: lines, attrs: attrs}, context) do
+    lines = convert(lines, lnb, context)
+    add_attrs(lines, "<p>#{lines.value}</p>", attrs, [], lnb)
+  end
+
+  ########
+  # Html #
+  ########
+  defp render_block(%Block.Html{html: html}, context) do
+    {context, html}
+  end
+
+  defp render_block(%Block.HtmlComment{lines: lines}, context) do
+    {context, lines}
+  end
+
+  defp render_block(%Block.HtmlOneline{html: html}, context) do
+    {context, html}
+  end
+
+  #########
+  # Ruler #
+  #########
+  defp render_block(%Block.Ruler{lnb: lnb, attrs: attrs}, context) do
+    add_attrs(context, "<hr />", attrs, [], lnb)
+  end
+
+  ###########
+  # Heading #
+  ###########
+  defp render_block(
+         %Block.Heading{lnb: lnb, level: level, content: content, attrs: attrs},
+         context
+       ) do
+    converted = convert(content, lnb, context)
+    html = "<h#{level}>#{converted.value}</h#{level}>"
+    add_attrs(converted, html, attrs, [], lnb)
+  end
+
+  ##############
+  # Blockquote #
+  ##############
+
+  defp render_block(%Block.BlockQuote{lnb: lnb, blocks: blocks, attrs: attrs}, context) do
+    {context1, body} = render(blocks, context)
+    html = "<blockquote>#{body}</blockquote>"
+    add_attrs(context1, html, attrs, [], lnb)
+  end
+
+  #########
+  # Table #
+  #########
+
+  defp render_block(
+         %Block.Table{lnb: lnb, header: header, rows: rows, alignments: aligns, attrs: attrs},
+         context
+       ) do
+    {context1, html} = add_attrs(context, "<table>", attrs, [], lnb)
+    context2 = set_value(context1, html)
+
+    context3 =
+      if header do
+        append(add_trs(append(context2, "<thead>"), [header], "th", aligns, lnb), "</thead>")
+      else
+        # Maybe an error, needed append(context, html)
+        context2
+      end
+
+    context4 = append(add_trs(append(context3, "<tbody>"), rows, "td", aligns, lnb), "</tbody>")
+
+    {context4, [context4.value, "</table>"]}
+  end
+
+  ########
+  # Code #
+  ########
+
+  defp render_block(
+         %Block.Code{lnb: lnb, language: language, attrs: attrs} = block,
+         %Context{options: options} = context
+       ) do
+    class =
+      if language, do: ~s{ class="#{code_classes(language, options.code_class_prefix)}"}, else: ""
+
+    tag = ~s[<pre><code#{class}>]
+    lines = options.render_code.(block)
+    html = ~s[#{tag}#{lines}</code></pre>]
+    add_attrs(context, html, attrs, [], lnb)
+  end
+
+  #########
+  # Lists #
+  #########
+
+  defp render_block(
+         %Block.List{lnb: lnb, type: type, blocks: items, attrs: attrs, start: start},
+         context
+       ) do
+    {context1, content} = render(items, context)
+    html = "<#{type}#{start}>#{content}</#{type}>"
+    add_attrs(context1, html, attrs, [], lnb)
+  end
+
+  # format a single paragraph list item, and remove the para tags
+  defp render_block(
+         %Block.ListItem{lnb: lnb, blocks: blocks, spaced: false, attrs: attrs},
+         context
+       )
+       when length(blocks) == 1 do
+    {context1, content} = render(blocks, context)
+    content = Regex.replace(~r{</?p>}, content, "")
+    html = "<li>#{content}</li>"
+    add_attrs(context1, html, attrs, [], lnb)
+  end
+
+  # format a spaced list item
+  defp render_block(%Block.ListItem{lnb: lnb, blocks: blocks, attrs: attrs}, context) do
+    {context1, content} = render(blocks, context)
+    html = "<li>#{content}</li>"
+    add_attrs(context1, html, attrs, [], lnb)
+  end
+
+  ##################
+  # Footnote Block #
+  ##################
+
+  defp render_block(%Block.FnList{blocks: footnotes}, context) do
+    items =
+      Enum.map(footnotes, fn note ->
+        blocks = append_footnote_link(note)
+        %Block.ListItem{attrs: "#fn:#{note.number}", type: :ol, blocks: blocks}
+      end)
+
+    {context1, html} = render_block(%Block.List{type: :ol, blocks: items}, context)
+    {context1, Enum.join([~s[<div class="footnotes">], "<hr />", html, "</div>"])}
+  end
+
+  #######################################
+  # Isolated IALs are rendered as paras #
+  #######################################
+
+  defp render_block(%Block.Ial{verbatim: verbatim}, context) do
+    {context, "<p>{:#{verbatim}}</p>"}
+  end
+
+  ####################
+  # IDDef is ignored #
+  ####################
+
+  defp render_block(%Block.IdDef{}, context), do: {context, ""}
+
+  #####################################
+  # And here are the inline renderers #
+  #####################################
+
+  defdelegate br, to: HtmlRenderer
+  defdelegate codespan(text), to: HtmlRenderer
+  defdelegate em(text), to: HtmlRenderer
+  defdelegate strong(text), to: HtmlRenderer
+  defdelegate strikethrough(text), to: HtmlRenderer
+
+  defdelegate link(url, text), to: HtmlRenderer
+  defdelegate link(url, text, title), to: HtmlRenderer
+
+  defdelegate image(path, alt, title), to: HtmlRenderer
+
+  defdelegate footnote_link(ref, backref, number), to: HtmlRenderer
+
+  # Table rows
+  defp add_trs(context, rows, tag, aligns, lnb) do
+    numbered_rows =
+      rows
+      |> Enum.zip(Stream.iterate(lnb, &(&1 + 1)))
+
+    numbered_rows
+    |> Enum.reduce(context, fn {row, lnb}, ctx ->
+      append(add_tds(append(ctx, "<tr>"), row, tag, aligns, lnb), "</tr>")
+    end)
+  end
+
+  defp add_tds(context, row, tag, aligns, lnb) do
+    Enum.reduce(1..length(row), context, add_td_fn(row, tag, aligns, lnb))
+  end
+
+  defp add_td_fn(row, tag, aligns, lnb) do
+    fn n, ctx ->
+      style =
+        case Enum.at(aligns, n - 1, :default) do
+          :default -> ""
+          align -> " style=\"text-align: #{align}\""
+        end
+
+      col = Enum.at(row, n - 1)
+      converted = convert(col, lnb, set_messages(ctx, []))
+      append(add_messages_from(ctx, converted), "<#{tag}#{style}>#{converted.value}</#{tag}>")
+    end
+  end
+
+  ###############################
+  # Append Footnote Return Link #
+  ###############################
+
+  defdelegate append_footnote_link(note), to: HtmlRenderer
+  defdelegate append_footnote_link(note, fnlink), to: HtmlRenderer
+
+  defdelegate render_code(lines), to: HtmlRenderer
+
+  defp code_classes(language, prefix) do
+    ["" | String.split(prefix || "")]
+    |> Enum.map(fn pfx -> "#{pfx}#{language}" end)
+    |> Enum.join(" ")
+  end
+end

lib/pleroma/ecto_enums.ex

@@ -17,11 +17,3 @@ defenum(Pleroma.FollowingRelationship.State,
   follow_accept: 2,
   follow_reject: 3
 )
-
-defenum(Pleroma.DataMigration.State,
-  pending: 1,
-  running: 2,
-  complete: 3,
-  failed: 4,
-  manual: 5
-)

lib/pleroma/ecto_type/activity_pub/object_validators/recipients.ex

@@ -13,33 +13,21 @@ defmodule Pleroma.EctoType.ActivityPub.ObjectValidators.Recipients do
     cast([object])
   end
 
-  def cast(object) when is_map(object) do
-    case ObjectID.cast(object) do
-      {:ok, data} -> {:ok, [data]}
-      _ -> :error
-    end
-  end
-
   def cast(data) when is_list(data) do
-    data =
-      data
-      |> Enum.reduce_while([], fn element, list ->
-        case ObjectID.cast(element) do
-          {:ok, id} ->
-            {:cont, [id | list]}
+    data
+    |> Enum.reduce_while({:ok, []}, fn element, {:ok, list} ->
+      case ObjectID.cast(element) do
+        {:ok, id} ->
+          {:cont, {:ok, [id | list]}}
 
-          _ ->
-            {:cont, list}
-        end
-      end)
-      |> Enum.sort()
-      |> Enum.uniq()
-
-    {:ok, data}
+        _ ->
+          {:halt, :error}
+      end
+    end)
   end
 
-  def cast(data) do
-    {:error, data}
+  def cast(_) do
+    :error
   end
 
   def dump(data) do

lib/pleroma/emails/admin_email.ex

@@ -73,7 +73,7 @@ defmodule Pleroma.Emails.AdminEmail do
     #{comment_html}
     #{statuses_html}
     <p>
-    <a href="#{Pleroma.Web.Endpoint.url()}/pleroma/admin/#/reports/index">View Reports in AdminFE</a>
+    <a href="#{Pleroma.Web.base_url()}/pleroma/admin/#/reports/index">View Reports in AdminFE</a>
     """
 
     new()
@@ -87,7 +87,7 @@ defmodule Pleroma.Emails.AdminEmail do
     html_body = """
     <p>New account for review: <a href="#{account.ap_id}">@#{account.nickname}</a></p>
     <blockquote>#{HTML.strip_tags(account.registration_reason)}</blockquote>
-    <a href="#{Pleroma.Web.Endpoint.url()}/pleroma/admin/#/users/#{account.id}/">Visit AdminFE</a>
+    <a href="#{Pleroma.Web.base_url()}/pleroma/admin/#/users/#{account.id}/">Visit AdminFE</a>
     """
 
     new()

lib/pleroma/emails/user_email.ex

@@ -5,22 +5,15 @@
 defmodule Pleroma.Emails.UserEmail do
   @moduledoc "User emails"
 
+  use Phoenix.Swoosh, view: Pleroma.Web.EmailView, layout: {Pleroma.Web.LayoutView, :email}
+
   alias Pleroma.Config
   alias Pleroma.User
   alias Pleroma.Web.Endpoint
   alias Pleroma.Web.Router
 
-  import Swoosh.Email
-  import Phoenix.Swoosh, except: [render_body: 3]
   import Pleroma.Config.Helpers, only: [instance_name: 0, sender: 0]
 
-  def render_body(email, template, assigns \\ %{}) do
-    email
-    |> put_new_layout({Pleroma.Web.LayoutView, :email})
-    |> put_new_view(Pleroma.Web.EmailView)
-    |> Phoenix.Swoosh.render_body(template, assigns)
-  end
-
   defp recipient(email, nil), do: email
   defp recipient(email, name), do: {name, email}
   defp recipient(%User{} = user), do: recipient(user.email, user.name)

lib/pleroma/emoji/formatter.ex

@@ -5,7 +5,7 @@
 defmodule Pleroma.Emoji.Formatter do
   alias Pleroma.Emoji
   alias Pleroma.HTML
-  alias Pleroma.Web.Endpoint
+  alias Pleroma.Web
   alias Pleroma.Web.MediaProxy
 
   def emojify(text) do
@@ -44,7 +44,7 @@ defmodule Pleroma.Emoji.Formatter do
     Emoji.get_all()
     |> Enum.filter(fn {emoji, %Emoji{}} -> String.contains?(text, ":#{emoji}:") end)
     |> Enum.reduce(%{}, fn {name, %Emoji{file: file}}, acc ->
-      Map.put(acc, name, to_string(URI.merge(Endpoint.url(), file)))
+      Map.put(acc, name, to_string(URI.merge(Web.base_url(), file)))
     end)
   end
 

lib/pleroma/formatter.ex

@@ -62,7 +62,7 @@ defmodule Pleroma.Formatter do
 
   def hashtag_handler("#" <> tag = tag_text, _buffer, _opts, acc) do
     tag = String.downcase(tag)
-    url = "#{Pleroma.Web.Endpoint.url()}/tag/#{tag}"
+    url = "#{Pleroma.Web.base_url()}/tag/#{tag}"
 
     link =
       Phoenix.HTML.Tag.content_tag(:a, tag_text,
@@ -121,10 +121,6 @@ defmodule Pleroma.Formatter do
     end
   end
 
-  def markdown_to_html(text) do
-    Earmark.as_html!(text, %Earmark.Options{compact_output: true})
-  end
-
   def html_escape({text, mentions, hashtags}, type) do
     {html_escape(text, type), mentions, hashtags}
   end

lib/pleroma/gun.ex

@@ -11,7 +11,9 @@ defmodule Pleroma.Gun do
   @callback await(pid(), reference()) :: {:response, :fin, 200, []}
   @callback set_owner(pid(), pid()) :: :ok
 
-  defp api, do: Pleroma.Config.get([Pleroma.Gun], Pleroma.Gun.API)
+  @api Pleroma.Config.get([Pleroma.Gun], Pleroma.Gun.API)
+
+  defp api, do: @api
 
   def open(host, port, opts), do: api().open(host, port, opts)
 

lib/pleroma/gun/connection_pool/reclaimer.ex

@@ -5,11 +5,11 @@
 defmodule Pleroma.Gun.ConnectionPool.Reclaimer do
   use GenServer, restart: :temporary
 
-  defp registry, do: Pleroma.Gun.ConnectionPool
+  @registry Pleroma.Gun.ConnectionPool
 
   def start_monitor do
     pid =
-      case :gen_server.start(__MODULE__, [], name: {:via, Registry, {registry(), "reclaimer"}}) do
+      case :gen_server.start(__MODULE__, [], name: {:via, Registry, {@registry, "reclaimer"}}) do
         {:ok, pid} ->
           pid
 
@@ -46,7 +46,7 @@ defmodule Pleroma.Gun.ConnectionPool.Reclaimer do
     #   {worker_pid, crf, last_reference} end)
     unused_conns =
       Registry.select(
-        registry(),
+        @registry,
         [
           {{:_, :"$1", {:_, :"$2", :"$3", :"$4"}}, [{:==, :"$2", []}], [{{:"$1", :"$3", :"$4"}}]}
         ]

lib/pleroma/gun/connection_pool/worker.ex

@@ -6,10 +6,10 @@ defmodule Pleroma.Gun.ConnectionPool.Worker do
   alias Pleroma.Gun
   use GenServer, restart: :temporary
 
-  defp registry, do: Pleroma.Gun.ConnectionPool
+  @registry Pleroma.Gun.ConnectionPool
 
   def start_link([key | _] = opts) do
-    GenServer.start_link(__MODULE__, opts, name: {:via, Registry, {registry(), key}})
+    GenServer.start_link(__MODULE__, opts, name: {:via, Registry, {@registry, key}})
   end
 
   @impl true
@@ -24,7 +24,7 @@ defmodule Pleroma.Gun.ConnectionPool.Worker do
       time = :erlang.monotonic_time(:millisecond)
 
       {_, _} =
-        Registry.update_value(registry(), key, fn _ ->
+        Registry.update_value(@registry, key, fn _ ->
           {conn_pid, [client_pid], 1, time}
         end)
 
@@ -65,7 +65,7 @@ defmodule Pleroma.Gun.ConnectionPool.Worker do
     time = :erlang.monotonic_time(:millisecond)
 
     {{conn_pid, used_by, _, _}, _} =
-      Registry.update_value(registry(), key, fn {conn_pid, used_by, crf, last_reference} ->
+      Registry.update_value(@registry, key, fn {conn_pid, used_by, crf, last_reference} ->
         {conn_pid, [client_pid | used_by], crf(time - last_reference, crf), time}
       end)
 
@@ -92,7 +92,7 @@ defmodule Pleroma.Gun.ConnectionPool.Worker do
   @impl true
   def handle_call(:remove_client, {client_pid, _}, %{key: key} = state) do
     {{_conn_pid, used_by, _crf, _last_reference}, _} =
-      Registry.update_value(registry(), key, fn {conn_pid, used_by, crf, last_reference} ->
+      Registry.update_value(@registry, key, fn {conn_pid, used_by, crf, last_reference} ->
         {conn_pid, List.delete(used_by, client_pid), crf, last_reference}
       end)
 

lib/pleroma/hashtag.ex

@@ -1,106 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.Hashtag do
-  use Ecto.Schema
-
-  import Ecto.Changeset
-  import Ecto.Query
-
-  alias Ecto.Multi
-  alias Pleroma.Hashtag
-  alias Pleroma.Object
-  alias Pleroma.Repo
-
-  schema "hashtags" do
-    field(:name, :string)
-
-    many_to_many(:objects, Object, join_through: "hashtags_objects", on_replace: :delete)
-
-    timestamps()
-  end
-
-  def normalize_name(name) do
-    name
-    |> String.downcase()
-    |> String.trim()
-  end
-
-  def get_or_create_by_name(name) do
-    changeset = changeset(%Hashtag{}, %{name: name})
-
-    Repo.insert(
-      changeset,
-      on_conflict: [set: [name: get_field(changeset, :name)]],
-      conflict_target: :name,
-      returning: true
-    )
-  end
-
-  def get_or_create_by_names(names) when is_list(names) do
-    names = Enum.map(names, &normalize_name/1)
-    timestamp = NaiveDateTime.truncate(NaiveDateTime.utc_now(), :second)
-
-    structs =
-      Enum.map(names, fn name ->
-        %Hashtag{}
-        |> changeset(%{name: name})
-        |> Map.get(:changes)
-        |> Map.merge(%{inserted_at: timestamp, updated_at: timestamp})
-      end)
-
-    try do
-      with {:ok, %{query_op: hashtags}} <-
-             Multi.new()
-             |> Multi.insert_all(:insert_all_op, Hashtag, structs,
-               on_conflict: :nothing,
-               conflict_target: :name
-             )
-             |> Multi.run(:query_op, fn _repo, _changes ->
-               {:ok, Repo.all(from(ht in Hashtag, where: ht.name in ^names))}
-             end)
-             |> Repo.transaction() do
-        {:ok, hashtags}
-      else
-        {:error, _name, value, _changes_so_far} -> {:error, value}
-      end
-    rescue
-      e -> {:error, e}
-    end
-  end
-
-  def changeset(%Hashtag{} = struct, params) do
-    struct
-    |> cast(params, [:name])
-    |> update_change(:name, &normalize_name/1)
-    |> validate_required([:name])
-    |> unique_constraint(:name)
-  end
-
-  def unlink(%Object{id: object_id}) do
-    with {_, hashtag_ids} <-
-           from(hto in "hashtags_objects",
-             where: hto.object_id == ^object_id,
-             select: hto.hashtag_id
-           )
-           |> Repo.delete_all(),
-         {:ok, unreferenced_count} <- delete_unreferenced(hashtag_ids) do
-      {:ok, length(hashtag_ids), unreferenced_count}
-    end
-  end
-
-  @delete_unreferenced_query """
-  DELETE FROM hashtags WHERE id IN
-    (SELECT hashtags.id FROM hashtags
-      LEFT OUTER JOIN hashtags_objects
-        ON hashtags_objects.hashtag_id = hashtags.id
-      WHERE hashtags_objects.hashtag_id IS NULL AND hashtags.id = ANY($1));
-  """
-
-  def delete_unreferenced(ids) do
-    with {:ok, %{num_rows: deleted_count}} <- Repo.query(@delete_unreferenced_query, [ids]) do
-      {:ok, deleted_count}
-    end
-  end
-end

lib/pleroma/html.ex

@@ -49,6 +49,31 @@ defmodule Pleroma.HTML do
   def filter_tags(html), do: filter_tags(html, nil)
   def strip_tags(html), do: filter_tags(html, FastSanitize.Sanitizer.StripTags)
 
+  def get_cached_scrubbed_html_for_activity(
+        content,
+        scrubbers,
+        activity,
+        key \\ "",
+        callback \\ fn x -> x end
+      ) do
+    key = "#{key}#{generate_scrubber_signature(scrubbers)}|#{activity.id}"
+
+    @cachex.fetch!(:scrubber_cache, key, fn _key ->
+      object = Pleroma.Object.normalize(activity, fetch: false)
+      ensure_scrubbed_html(content, scrubbers, object.data["fake"] || false, callback)
+    end)
+  end
+
+  def get_cached_stripped_html_for_activity(content, activity, key) do
+    get_cached_scrubbed_html_for_activity(
+      content,
+      FastSanitize.Sanitizer.StripTags,
+      activity,
+      key,
+      &HtmlEntities.decode/1
+    )
+  end
+
   def ensure_scrubbed_html(
         content,
         scrubbers,
@@ -67,6 +92,16 @@ defmodule Pleroma.HTML do
     end
   end
 
+  defp generate_scrubber_signature(scrubber) when is_atom(scrubber) do
+    generate_scrubber_signature([scrubber])
+  end
+
+  defp generate_scrubber_signature(scrubbers) do
+    Enum.reduce(scrubbers, "", fn scrubber, signature ->
+      "#{signature}#{to_string(scrubber)}"
+    end)
+  end
+
   def extract_first_external_url_from_object(%{data: %{"content" => content}} = object)
       when is_binary(content) do
     unless object.data["fake"] do

lib/pleroma/http/adapter_helper/gun.ex

@@ -54,8 +54,8 @@ defmodule Pleroma.HTTP.AdapterHelper.Gun do
     Config.get([:pools, pool, :recv_timeout], default)
   end
 
+  @prefix Pleroma.Gun.ConnectionPool
   def limiter_setup do
-    prefix = Pleroma.Gun.ConnectionPool
     wait = Config.get([:connections_pool, :connection_acquisition_wait])
     retries = Config.get([:connections_pool, :connection_acquisition_retries])
 
@@ -66,7 +66,7 @@ defmodule Pleroma.HTTP.AdapterHelper.Gun do
       max_waiting = Keyword.get(opts, :max_waiting, 10)
 
       result =
-        ConcurrentLimiter.new(:"#{prefix}.#{name}", max_running, max_waiting,
+        ConcurrentLimiter.new(:"#{@prefix}.#{name}", max_running, max_waiting,
           wait: wait,
           max_retries: retries
         )

lib/pleroma/http/web_push.ex

@@ -5,8 +5,8 @@
 defmodule Pleroma.HTTP.WebPush do
   @moduledoc false
 
-  def post(url, payload, headers, options \\ []) do
+  def post(url, payload, headers) do
     list_headers = Map.to_list(headers)
-    Pleroma.HTTP.post(url, payload, list_headers, options)
+    Pleroma.HTTP.post(url, payload, list_headers)
   end
 end

lib/pleroma/instances.ex

@@ -5,18 +5,13 @@
 defmodule Pleroma.Instances do
   @moduledoc "Instances context."
 
-  alias Pleroma.Instances.Instance
+  @adapter Pleroma.Instances.Instance
 
-  def filter_reachable(urls_or_hosts), do: Instance.filter_reachable(urls_or_hosts)
-
-  def reachable?(url_or_host), do: Instance.reachable?(url_or_host)
-
-  def set_reachable(url_or_host), do: Instance.set_reachable(url_or_host)
-
-  def set_unreachable(url_or_host, unreachable_since \\ nil),
-    do: Instance.set_unreachable(url_or_host, unreachable_since)
-
-  def get_consistently_unreachable, do: Instance.get_consistently_unreachable()
+  defdelegate filter_reachable(urls_or_hosts), to: @adapter
+  defdelegate reachable?(url_or_host), to: @adapter
+  defdelegate set_reachable(url_or_host), to: @adapter
+  defdelegate set_unreachable(url_or_host, unreachable_since \\ nil), to: @adapter
+  defdelegate get_consistently_unreachable(), to: @adapter
 
   def set_consistently_unreachable(url_or_host),
     do: set_unreachable(url_or_host, reachability_datetime_threshold())

lib/pleroma/maps.ex

@@ -12,10 +12,4 @@ defmodule Pleroma.Maps do
       _ -> map
     end
   end
-
-  def safe_put_in(data, keys, value) when is_map(data) and is_list(keys) do
-    Kernel.put_in(data, keys, value)
-  rescue
-    _ -> data
-  end
 end

lib/pleroma/mfa/totp.ex

@@ -34,7 +34,7 @@ defmodule Pleroma.MFA.TOTP do
   defp default_digits, do: Config.get(@config_ns ++ [:digits])
 
   defp default_issuer,
-    do: Config.get(@config_ns ++ [:issuer], Config.get([:instance, :host]))
+    do: Config.get(@config_ns ++ [:issuer], Config.get([:instance, :name]))
 
   @doc "Creates a random Base 32 encoded string"
   def generate_secret do

lib/pleroma/migrators/hashtags_table_migrator.ex

@@ -1,208 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.Migrators.HashtagsTableMigrator do
-  defmodule State do
-    use Pleroma.Migrators.Support.BaseMigratorState
-
-    @impl Pleroma.Migrators.Support.BaseMigratorState
-    defdelegate data_migration(), to: Pleroma.DataMigration, as: :populate_hashtags_table
-  end
-
-  use Pleroma.Migrators.Support.BaseMigrator
-
-  alias Pleroma.Hashtag
-  alias Pleroma.Migrators.Support.BaseMigrator
-  alias Pleroma.Object
-
-  @impl BaseMigrator
-  def feature_config_path, do: [:features, :improved_hashtag_timeline]
-
-  @impl BaseMigrator
-  def fault_rate_allowance, do: Config.get([:populate_hashtags_table, :fault_rate_allowance], 0)
-
-  @impl BaseMigrator
-  def perform do
-    data_migration_id = data_migration_id()
-    max_processed_id = get_stat(:max_processed_id, 0)
-
-    Logger.info("Transferring embedded hashtags to `hashtags` (from oid: #{max_processed_id})...")
-
-    query()
-    |> where([object], object.id > ^max_processed_id)
-    |> Repo.chunk_stream(100, :batches, timeout: :infinity)
-    |> Stream.each(fn objects ->
-      object_ids = Enum.map(objects, & &1.id)
-
-      results = Enum.map(objects, &transfer_object_hashtags(&1))
-
-      failed_ids =
-        results
-        |> Enum.filter(&(elem(&1, 0) == :error))
-        |> Enum.map(&elem(&1, 1))
-
-      # Count of objects with hashtags: `{:noop, id}` is returned for objects having other AS2 tags
-      chunk_affected_count =
-        results
-        |> Enum.filter(&(elem(&1, 0) == :ok))
-        |> length()
-
-      for failed_id <- failed_ids do
-        _ =
-          Repo.query(
-            "INSERT INTO data_migration_failed_ids(data_migration_id, record_id) " <>
-              "VALUES ($1, $2) ON CONFLICT DO NOTHING;",
-            [data_migration_id, failed_id]
-          )
-      end
-
-      _ =
-        Repo.query(
-          "DELETE FROM data_migration_failed_ids " <>
-            "WHERE data_migration_id = $1 AND record_id = ANY($2)",
-          [data_migration_id, object_ids -- failed_ids]
-        )
-
-      max_object_id = Enum.at(object_ids, -1)
-
-      put_stat(:max_processed_id, max_object_id)
-      increment_stat(:iteration_processed_count, length(object_ids))
-      increment_stat(:processed_count, length(object_ids))
-      increment_stat(:failed_count, length(failed_ids))
-      increment_stat(:affected_count, chunk_affected_count)
-      put_stat(:records_per_second, records_per_second())
-      persist_state()
-
-      # A quick and dirty approach to controlling the load this background migration imposes
-      sleep_interval = Config.get([:populate_hashtags_table, :sleep_interval_ms], 0)
-      Process.sleep(sleep_interval)
-    end)
-    |> Stream.run()
-  end
-
-  @impl BaseMigrator
-  def query do
-    # Note: most objects have Mention-type AS2 tags and no hashtags (but we can't filter them out)
-    # Note: not checking activity type, expecting remove_non_create_objects_hashtags/_ to clean up
-    from(
-      object in Object,
-      where:
-        fragment("(?)->'tag' IS NOT NULL AND (?)->'tag' != '[]'::jsonb", object.data, object.data),
-      select: %{
-        id: object.id,
-        tag: fragment("(?)->'tag'", object.data)
-      }
-    )
-    |> join(:left, [o], hashtags_objects in fragment("SELECT object_id FROM hashtags_objects"),
-      on: hashtags_objects.object_id == o.id
-    )
-    |> where([_o, hashtags_objects], is_nil(hashtags_objects.object_id))
-  end
-
-  @spec transfer_object_hashtags(Map.t()) :: {:noop | :ok | :error, integer()}
-  defp transfer_object_hashtags(object) do
-    embedded_tags = if Map.has_key?(object, :tag), do: object.tag, else: object.data["tag"]
-    hashtags = Object.object_data_hashtags(%{"tag" => embedded_tags})
-
-    if Enum.any?(hashtags) do
-      transfer_object_hashtags(object, hashtags)
-    else
-      {:noop, object.id}
-    end
-  end
-
-  defp transfer_object_hashtags(object, hashtags) do
-    Repo.transaction(fn ->
-      with {:ok, hashtag_records} <- Hashtag.get_or_create_by_names(hashtags) do
-        maps = Enum.map(hashtag_records, &%{hashtag_id: &1.id, object_id: object.id})
-        base_error = "ERROR when inserting hashtags_objects for object with id #{object.id}"
-
-        try do
-          with {rows_count, _} when is_integer(rows_count) <-
-                 Repo.insert_all("hashtags_objects", maps, on_conflict: :nothing) do
-            object.id
-          else
-            e ->
-              Logger.error("#{base_error}: #{inspect(e)}")
-              Repo.rollback(object.id)
-          end
-        rescue
-          e ->
-            Logger.error("#{base_error}: #{inspect(e)}")
-            Repo.rollback(object.id)
-        end
-      else
-        e ->
-          error = "ERROR: could not create hashtags for object #{object.id}: #{inspect(e)}"
-          Logger.error(error)
-          Repo.rollback(object.id)
-      end
-    end)
-  end
-
-  @impl BaseMigrator
-  def retry_failed do
-    data_migration_id = data_migration_id()
-
-    failed_objects_query()
-    |> Repo.chunk_stream(100, :one)
-    |> Stream.each(fn object ->
-      with {res, _} when res != :error <- transfer_object_hashtags(object) do
-        _ =
-          Repo.query(
-            "DELETE FROM data_migration_failed_ids " <>
-              "WHERE data_migration_id = $1 AND record_id = $2",
-            [data_migration_id, object.id]
-          )
-      end
-    end)
-    |> Stream.run()
-
-    put_stat(:failed_count, failures_count())
-    persist_state()
-
-    force_continue()
-  end
-
-  defp failed_objects_query do
-    from(o in Object)
-    |> join(:inner, [o], dmf in fragment("SELECT * FROM data_migration_failed_ids"),
-      on: dmf.record_id == o.id
-    )
-    |> where([_o, dmf], dmf.data_migration_id == ^data_migration_id())
-    |> order_by([o], asc: o.id)
-  end
-
-  @doc """
-  Service func to delete `hashtags_objects` for legacy objects not associated with Create activity.
-  Also deletes unreferenced `hashtags` records (might occur after deletion of `hashtags_objects`).
-  """
-  def delete_non_create_activities_hashtags do
-    hashtags_objects_cleanup_query = """
-    DELETE FROM hashtags_objects WHERE object_id IN
-      (SELECT DISTINCT objects.id FROM objects
-        JOIN hashtags_objects ON hashtags_objects.object_id = objects.id LEFT JOIN activities
-          ON COALESCE(activities.data->'object'->>'id', activities.data->>'object') =
-            (objects.data->>'id')
-          AND activities.data->>'type' = 'Create'
-        WHERE activities.id IS NULL);
-    """
-
-    hashtags_cleanup_query = """
-    DELETE FROM hashtags WHERE id IN
-      (SELECT hashtags.id FROM hashtags
-        LEFT OUTER JOIN hashtags_objects
-          ON hashtags_objects.hashtag_id = hashtags.id
-        WHERE hashtags_objects.hashtag_id IS NULL);
-    """
-
-    {:ok, %{num_rows: hashtags_objects_count}} =
-      Repo.query(hashtags_objects_cleanup_query, [], timeout: :infinity)
-
-    {:ok, %{num_rows: hashtags_count}} =
-      Repo.query(hashtags_cleanup_query, [], timeout: :infinity)
-
-    {:ok, hashtags_objects_count, hashtags_count}
-  end
-end

lib/pleroma/migrators/support/base_migrator.ex

@@ -1,210 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.Migrators.Support.BaseMigrator do
-  @moduledoc """
-  Base background migrator functionality.
-  """
-
-  @callback perform() :: any()
-  @callback retry_failed() :: any()
-  @callback feature_config_path() :: list(atom())
-  @callback query() :: Ecto.Query.t()
-  @callback fault_rate_allowance() :: integer() | float()
-
-  defmacro __using__(_opts) do
-    quote do
-      use GenServer
-
-      require Logger
-
-      import Ecto.Query
-
-      alias __MODULE__.State
-      alias Pleroma.Config
-      alias Pleroma.Repo
-
-      @behaviour Pleroma.Migrators.Support.BaseMigrator
-
-      defdelegate data_migration(), to: State
-      defdelegate data_migration_id(), to: State
-      defdelegate state(), to: State
-      defdelegate persist_state(), to: State, as: :persist_to_db
-      defdelegate get_stat(key, value \\ nil), to: State, as: :get_data_key
-      defdelegate put_stat(key, value), to: State, as: :put_data_key
-      defdelegate increment_stat(key, increment), to: State, as: :increment_data_key
-
-      @reg_name {:global, __MODULE__}
-
-      def whereis, do: GenServer.whereis(@reg_name)
-
-      def start_link(_) do
-        case whereis() do
-          nil ->
-            GenServer.start_link(__MODULE__, nil, name: @reg_name)
-
-          pid ->
-            {:ok, pid}
-        end
-      end
-
-      @impl true
-      def init(_) do
-        {:ok, nil, {:continue, :init_state}}
-      end
-
-      @impl true
-      def handle_continue(:init_state, _state) do
-        {:ok, _} = State.start_link(nil)
-
-        data_migration = data_migration()
-        manual_migrations = Config.get([:instance, :manual_data_migrations], [])
-
-        cond do
-          Config.get(:env) == :test ->
-            update_status(:noop)
-
-          is_nil(data_migration) ->
-            message = "Data migration does not exist."
-            update_status(:failed, message)
-            Logger.error("#{__MODULE__}: #{message}")
-
-          data_migration.state == :manual or data_migration.name in manual_migrations ->
-            message = "Data migration is in manual execution or manual fix mode."
-            update_status(:manual, message)
-            Logger.warn("#{__MODULE__}: #{message}")
-
-          data_migration.state == :complete ->
-            on_complete(data_migration)
-
-          true ->
-            send(self(), :perform)
-        end
-
-        {:noreply, nil}
-      end
-
-      @impl true
-      def handle_info(:perform, state) do
-        State.reinit()
-
-        update_status(:running)
-        put_stat(:iteration_processed_count, 0)
-        put_stat(:started_at, NaiveDateTime.utc_now())
-
-        perform()
-
-        fault_rate = fault_rate()
-        put_stat(:fault_rate, fault_rate)
-        fault_rate_allowance = fault_rate_allowance()
-
-        cond do
-          fault_rate == 0 ->
-            set_complete()
-
-          is_float(fault_rate) and fault_rate <= fault_rate_allowance ->
-            message = """
-            Done with fault rate of #{fault_rate} which doesn't exceed #{fault_rate_allowance}.
-            Putting data migration to manual fix mode. Try running `#{__MODULE__}.retry_failed/0`.
-            """
-
-            Logger.warn("#{__MODULE__}: #{message}")
-            update_status(:manual, message)
-            on_complete(data_migration())
-
-          true ->
-            message = "Too many failures. Try running `#{__MODULE__}.retry_failed/0`."
-            Logger.error("#{__MODULE__}: #{message}")
-            update_status(:failed, message)
-        end
-
-        persist_state()
-        {:noreply, state}
-      end
-
-      defp on_complete(data_migration) do
-        if data_migration.feature_lock || feature_state() == :disabled do
-          Logger.warn(
-            "#{__MODULE__}: migration complete but feature is locked; consider enabling."
-          )
-
-          :noop
-        else
-          Config.put(feature_config_path(), :enabled)
-          :ok
-        end
-      end
-
-      @doc "Approximate count for current iteration (including processed records count)"
-      def count(force \\ false, timeout \\ :infinity) do
-        stored_count = get_stat(:count)
-
-        if stored_count && !force do
-          stored_count
-        else
-          processed_count = get_stat(:processed_count, 0)
-          max_processed_id = get_stat(:max_processed_id, 0)
-          query = where(query(), [entity], entity.id > ^max_processed_id)
-
-          count = Repo.aggregate(query, :count, :id, timeout: timeout) + processed_count
-          put_stat(:count, count)
-          persist_state()
-
-          count
-        end
-      end
-
-      def failures_count do
-        with {:ok, %{rows: [[count]]}} <-
-               Repo.query(
-                 "SELECT COUNT(record_id) FROM data_migration_failed_ids WHERE data_migration_id = $1;",
-                 [data_migration_id()]
-               ) do
-          count
-        end
-      end
-
-      def feature_state, do: Config.get(feature_config_path())
-
-      def force_continue do
-        send(whereis(), :perform)
-      end
-
-      def force_restart do
-        :ok = State.reset()
-        force_continue()
-      end
-
-      def set_complete do
-        update_status(:complete)
-        persist_state()
-        on_complete(data_migration())
-      end
-
-      defp update_status(status, message \\ nil) do
-        put_stat(:state, status)
-        put_stat(:message, message)
-      end
-
-      defp fault_rate do
-        with failures_count when is_integer(failures_count) <- failures_count() do
-          failures_count / Enum.max([get_stat(:affected_count, 0), 1])
-        else
-          _ -> :error
-        end
-      end
-
-      defp records_per_second do
-        get_stat(:iteration_processed_count, 0) / Enum.max([running_time(), 1])
-      end
-
-      defp running_time do
-        NaiveDateTime.diff(
-          NaiveDateTime.utc_now(),
-          get_stat(:started_at, NaiveDateTime.utc_now())
-        )
-      end
-    end
-  end
-end

lib/pleroma/migrators/support/base_migrator_state.ex

@@ -1,117 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.Migrators.Support.BaseMigratorState do
-  @moduledoc """
-  Base background migrator state functionality.
-  """
-
-  @callback data_migration() :: Pleroma.DataMigration.t()
-
-  defmacro __using__(_opts) do
-    quote do
-      use Agent
-
-      alias Pleroma.DataMigration
-
-      @behaviour Pleroma.Migrators.Support.BaseMigratorState
-      @reg_name {:global, __MODULE__}
-
-      def start_link(_) do
-        Agent.start_link(fn -> load_state_from_db() end, name: @reg_name)
-      end
-
-      def data_migration, do: raise("data_migration/0 is not implemented")
-      defoverridable data_migration: 0
-
-      defp load_state_from_db do
-        data_migration = data_migration()
-
-        data =
-          if data_migration do
-            Map.new(data_migration.data, fn {k, v} -> {String.to_atom(k), v} end)
-          else
-            %{}
-          end
-
-        %{
-          data_migration_id: data_migration && data_migration.id,
-          data: data
-        }
-      end
-
-      def persist_to_db do
-        %{data_migration_id: data_migration_id, data: data} = state()
-
-        if data_migration_id do
-          DataMigration.update_one_by_id(data_migration_id, data: data)
-        else
-          {:error, :nil_data_migration_id}
-        end
-      end
-
-      def reset do
-        %{data_migration_id: data_migration_id} = state()
-
-        with false <- is_nil(data_migration_id),
-             :ok <-
-               DataMigration.update_one_by_id(data_migration_id,
-                 state: :pending,
-                 data: %{}
-               ) do
-          reinit()
-        else
-          true -> {:error, :nil_data_migration_id}
-          e -> e
-        end
-      end
-
-      def reinit do
-        Agent.update(@reg_name, fn _state -> load_state_from_db() end)
-      end
-
-      def state do
-        Agent.get(@reg_name, & &1)
-      end
-
-      def get_data_key(key, default \\ nil) do
-        get_in(state(), [:data, key]) || default
-      end
-
-      def put_data_key(key, value) do
-        _ = persist_non_data_change(key, value)
-
-        Agent.update(@reg_name, fn state ->
-          put_in(state, [:data, key], value)
-        end)
-      end
-
-      def increment_data_key(key, increment \\ 1) do
-        Agent.update(@reg_name, fn state ->
-          initial_value = get_in(state, [:data, key]) || 0
-          updated_value = initial_value + increment
-          put_in(state, [:data, key], updated_value)
-        end)
-      end
-
-      defp persist_non_data_change(:state, value) do
-        with true <- get_data_key(:state) != value,
-             true <- value in Pleroma.DataMigration.State.__valid_values__(),
-             %{data_migration_id: data_migration_id} when not is_nil(data_migration_id) <-
-               state() do
-          DataMigration.update_one_by_id(data_migration_id, state: value)
-        else
-          false -> :ok
-          _ -> {:error, :nil_data_migration_id}
-        end
-      end
-
-      defp persist_non_data_change(_, _) do
-        nil
-      end
-
-      def data_migration_id, do: Map.get(state(), :data_migration_id)
-    end
-  end
-end

lib/pleroma/notification.ex

@@ -112,6 +112,13 @@ defmodule Pleroma.Notification do
 
     Notification
     |> where(user_id: ^user.id)
+    |> where(
+      [n, a],
+      fragment(
+        "? not in (SELECT ap_id FROM users WHERE is_active = 'false')",
+        a.actor
+      )
+    )
     |> join(:inner, [n], activity in assoc(n, :activity))
     |> join(:left, [n, a], object in Object,
       on:
@@ -122,9 +129,7 @@ defmodule Pleroma.Notification do
           a.data
         )
     )
-    |> join(:inner, [_n, a], u in User, on: u.ap_id == a.actor, as: :user_actor)
     |> preload([n, a, o], activity: {a, object: o})
-    |> where([user_actor: user_actor], user_actor.is_active)
     |> exclude_notification_muted(user, exclude_notification_muted_opts)
     |> exclude_blocked(user, exclude_blocked_opts)
     |> exclude_filtered(user)
@@ -151,10 +156,9 @@ defmodule Pleroma.Notification do
     query
     |> where([n, a], a.actor not in ^notification_muted_ap_ids)
     |> join(:left, [n, a], tm in ThreadMute,
-      on: tm.user_id == ^user.id and tm.context == fragment("?->>'context'", a.data),
-      as: :thread_mute
+      on: tm.user_id == ^user.id and tm.context == fragment("?->>'context'", a.data)
     )
-    |> where([thread_mute: thread_mute], is_nil(thread_mute.user_id))
+    |> where([n, a, o, tm], is_nil(tm.user_id))
   end
 
   defp exclude_filtered(query, user) do

lib/pleroma/object.ex

@@ -10,7 +10,6 @@ defmodule Pleroma.Object do
 
   alias Pleroma.Activity
   alias Pleroma.Config
-  alias Pleroma.Hashtag
   alias Pleroma.Object
   alias Pleroma.Object.Fetcher
   alias Pleroma.ObjectTombstone
@@ -29,8 +28,6 @@ defmodule Pleroma.Object do
   schema "objects" do
     field(:data, :map)
 
-    many_to_many(:hashtags, Hashtag, join_through: "hashtags_objects", on_replace: :delete)
-
     timestamps()
   end
 
@@ -52,8 +49,7 @@ defmodule Pleroma.Object do
   end
 
   def create(data) do
-    %Object{}
-    |> Object.change(%{data: data})
+    Object.change(%Object{}, %{data: data})
     |> Repo.insert()
   end
 
@@ -62,41 +58,8 @@ defmodule Pleroma.Object do
     |> cast(params, [:data])
     |> validate_required([:data])
     |> unique_constraint(:ap_id, name: :objects_unique_apid_index)
-    # Expecting `maybe_handle_hashtags_change/1` to run last:
-    |> maybe_handle_hashtags_change(struct)
   end
 
-  # Note: not checking activity type (assuming non-legacy objects are associated with Create act.)
-  defp maybe_handle_hashtags_change(changeset, struct) do
-    with %Ecto.Changeset{valid?: true} <- changeset,
-         data_hashtags_change = get_change(changeset, :data),
-         {_, true} <- {:changed, hashtags_changed?(struct, data_hashtags_change)},
-         {:ok, hashtag_records} <-
-           data_hashtags_change
-           |> object_data_hashtags()
-           |> Hashtag.get_or_create_by_names() do
-      put_assoc(changeset, :hashtags, hashtag_records)
-    else
-      %{valid?: false} ->
-        changeset
-
-      {:changed, false} ->
-        changeset
-
-      {:error, _} ->
-        validate_change(changeset, :data, fn _, _ ->
-          [data: "error referencing hashtags"]
-        end)
-    end
-  end
-
-  defp hashtags_changed?(%Object{} = struct, %{"tag" => _} = data) do
-    Enum.sort(embedded_hashtags(struct)) !=
-      Enum.sort(object_data_hashtags(data))
-  end
-
-  defp hashtags_changed?(_, _), do: false
-
   def get_by_id(nil), do: nil
   def get_by_id(id), do: Repo.get(Object, id)
 
@@ -224,13 +187,9 @@ defmodule Pleroma.Object do
   def swap_object_with_tombstone(object) do
     tombstone = make_tombstone(object)
 
-    with {:ok, object} <-
-           object
-           |> Object.change(%{data: tombstone})
-           |> Repo.update() do
-      Hashtag.unlink(object)
-      {:ok, object}
-    end
+    object
+    |> Object.change(%{data: tombstone})
+    |> Repo.update()
   end
 
   def delete(%Object{data: %{"id" => id}} = object) do
@@ -366,7 +325,7 @@ defmodule Pleroma.Object do
   end
 
   def local?(%Object{data: %{"id" => id}}) do
-    String.starts_with?(id, Pleroma.Web.Endpoint.url() <> "/")
+    String.starts_with?(id, Pleroma.Web.base_url() <> "/")
   end
 
   def replies(object, opts \\ []) do
@@ -390,39 +349,4 @@ defmodule Pleroma.Object do
 
   def self_replies(object, opts \\ []),
     do: replies(object, Keyword.put(opts, :self_only, true))
-
-  def tags(%Object{data: %{"tag" => tags}}) when is_list(tags), do: tags
-
-  def tags(_), do: []
-
-  def hashtags(%Object{} = object) do
-    # Note: always using embedded hashtags regardless whether they are migrated to hashtags table
-    #   (embedded hashtags stay in sync anyways, and we avoid extra joins and preload hassle)
-    embedded_hashtags(object)
-  end
-
-  def embedded_hashtags(%Object{data: data}) do
-    object_data_hashtags(data)
-  end
-
-  def embedded_hashtags(_), do: []
-
-  def object_data_hashtags(%{"tag" => tags}) when is_list(tags) do
-    tags
-    |> Enum.filter(fn
-      %{"type" => "Hashtag"} = data -> Map.has_key?(data, "name")
-      plain_text when is_bitstring(plain_text) -> true
-      _ -> false
-    end)
-    |> Enum.map(fn
-      %{"name" => "#" <> hashtag} -> String.downcase(hashtag)
-      %{"name" => hashtag} -> String.downcase(hashtag)
-      hashtag when is_bitstring(hashtag) -> String.downcase(hashtag)
-    end)
-    |> Enum.uniq()
-    # Note: "" elements (plain text) might occur in `data.tag` for incoming objects
-    |> Enum.filter(&(&1 not in [nil, ""]))
-  end
-
-  def object_data_hashtags(_), do: []
 end

lib/pleroma/object/containment.ex

@@ -71,14 +71,6 @@ defmodule Pleroma.Object.Containment do
     compare_uris(id_uri, other_uri)
   end
 
-  # Mastodon pin activities don't have an id, so we check the object field, which will be pinned.
-  def contain_origin_from_id(id, %{"object" => object}) when is_binary(object) do
-    id_uri = URI.parse(id)
-    object_uri = URI.parse(object)
-
-    compare_uris(id_uri, object_uri)
-  end
-
   def contain_origin_from_id(_id, _data), do: :error
 
   def contain_child(%{"object" => %{"id" => id, "attributedTo" => _} = object}),

lib/pleroma/object/fetcher.ex

@@ -4,7 +4,6 @@
 
 defmodule Pleroma.Object.Fetcher do
   alias Pleroma.HTTP
-  alias Pleroma.Maps
   alias Pleroma.Object
   alias Pleroma.Object.Containment
   alias Pleroma.Repo
@@ -102,9 +101,6 @@ defmodule Pleroma.Object.Fetcher do
       {:transmogrifier, {:error, {:reject, e}}} ->
         {:reject, e}
 
-      {:transmogrifier, {:reject, e}} ->
-        {:reject, e}
-
       {:transmogrifier, _} = e ->
         {:error, e}
 
@@ -128,14 +124,12 @@ defmodule Pleroma.Object.Fetcher do
   defp prepare_activity_params(data) do
     %{
       "type" => "Create",
+      "to" => data["to"] || [],
+      "cc" => data["cc"] || [],
       # Should we seriously keep this attributedTo thing?
       "actor" => data["actor"] || data["attributedTo"],
       "object" => data
     }
-    |> Maps.put_if_present("to", data["to"])
-    |> Maps.put_if_present("cc", data["cc"])
-    |> Maps.put_if_present("bto", data["bto"])
-    |> Maps.put_if_present("bcc", data["bcc"])
   end
 
   def fetch_object_from_id!(id, options \\ []) do

lib/pleroma/pagination.ex

@@ -93,7 +93,6 @@ defmodule Pleroma.Pagination do
       max_id: :string,
       offset: :integer,
       limit: :integer,
-      skip_extra_order: :boolean,
       skip_order: :boolean
     }
 
@@ -115,8 +114,6 @@ defmodule Pleroma.Pagination do
 
   defp restrict(query, :order, %{skip_order: true}, _), do: query
 
-  defp restrict(%{order_bys: [_ | _]} = query, :order, %{skip_extra_order: true}, _), do: query
-
   defp restrict(query, :order, %{min_id: _}, table_binding) do
     order_by(
       query,

lib/pleroma/repo.ex

@@ -63,8 +63,8 @@ defmodule Pleroma.Repo do
   iex> Pleroma.Repo.chunk_stream(Pleroma.Activity.Queries.by_actor(ap_id), 500, :batches)
   """
   @spec chunk_stream(Ecto.Query.t(), integer(), atom()) :: Enumerable.t()
-  def chunk_stream(query, chunk_size, returns_as \\ :one, query_options \\ []) do
-    # We don't actually need start and end functions of resource streaming,
+  def chunk_stream(query, chunk_size, returns_as \\ :one) do
+    # We don't actually need start and end funcitons of resource streaming,
     # but it seems to be the only way to not fetch records one-by-one and
     # have individual records be the elements of the stream, instead of
     # lists of records
@@ -76,7 +76,7 @@ defmodule Pleroma.Repo do
           |> order_by(asc: :id)
           |> where([r], r.id > ^last_id)
           |> limit(^chunk_size)
-          |> all(query_options)
+          |> all()
           |> case do
             [] ->
               {:halt, last_id}

lib/pleroma/reverse_proxy.ex

@@ -4,7 +4,7 @@
 
 defmodule Pleroma.ReverseProxy do
   @range_headers ~w(range if-range)
-  @keep_req_headers ~w(accept accept-encoding cache-control if-modified-since) ++
+  @keep_req_headers ~w(accept user-agent accept-encoding cache-control if-modified-since) ++
                       ~w(if-unmodified-since if-none-match) ++ @range_headers
   @resp_cache_headers ~w(etag date last-modified)
   @keep_resp_headers @resp_cache_headers ++
@@ -57,6 +57,9 @@ defmodule Pleroma.ReverseProxy do
     * `false` will add `content-disposition: attachment` to any request,
     * a list of whitelisted content types
 
+    * `keep_user_agent` will forward the client's user-agent to the upstream. This may be useful if the upstream is
+    doing content transformation (encoding, …) depending on the request.
+
   * `req_headers`, `resp_headers` additional headers.
 
   * `http`: options for [hackney](https://github.com/benoitc/hackney) or [gun](https://github.com/ninenines/gun).
@@ -81,7 +84,8 @@ defmodule Pleroma.ReverseProxy do
   import Plug.Conn
 
   @type option() ::
-          {:max_read_duration, :timer.time() | :infinity}
+          {:keep_user_agent, boolean}
+          | {:max_read_duration, :timer.time() | :infinity}
           | {:max_body_length, non_neg_integer() | :infinity}
           | {:failed_request_ttl, :timer.time() | :infinity}
           | {:http, []}
@@ -287,13 +291,17 @@ defmodule Pleroma.ReverseProxy do
     end
   end
 
-  defp build_req_user_agent_header(headers, _opts) do
-    List.keystore(
-      headers,
-      "user-agent",
-      0,
-      {"user-agent", Pleroma.Application.user_agent()}
-    )
+  defp build_req_user_agent_header(headers, opts) do
+    if Keyword.get(opts, :keep_user_agent, false) do
+      List.keystore(
+        headers,
+        "user-agent",
+        0,
+        {"user-agent", Pleroma.Application.user_agent()}
+      )
+    else
+      headers
+    end
   end
 
   defp build_resp_headers(headers, opts) do
@@ -411,7 +419,7 @@ defmodule Pleroma.ReverseProxy do
     {:ok, :no_duration_limit, :no_duration_limit}
   end
 
-  defp client, do: Pleroma.ReverseProxy.Client.Wrapper
+  defp client, do: Pleroma.ReverseProxy.Client
 
   defp track_failed_url(url, error, opts) do
     ttl =

lib/pleroma/reverse_proxy/client.ex

@@ -17,4 +17,22 @@ defmodule Pleroma.ReverseProxy.Client do
   @callback stream_body(map()) :: {:ok, binary(), map()} | :done | {:error, atom() | String.t()}
 
   @callback close(reference() | pid() | map()) :: :ok
+
+  def request(method, url, headers, body \\ "", opts \\ []) do
+    client().request(method, url, headers, body, opts)
+  end
+
+  def stream_body(ref), do: client().stream_body(ref)
+
+  def close(ref), do: client().close(ref)
+
+  defp client do
+    :tesla
+    |> Application.get_env(:adapter)
+    |> client()
+  end
+
+  defp client(Tesla.Adapter.Hackney), do: Pleroma.ReverseProxy.Client.Hackney
+  defp client(Tesla.Adapter.Gun), do: Pleroma.ReverseProxy.Client.Tesla
+  defp client(_), do: Pleroma.Config.get!(Pleroma.ReverseProxy.Client)
 end

lib/pleroma/reverse_proxy/client/wrapper.ex

@@ -1,29 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.ReverseProxy.Client.Wrapper do
-  @moduledoc "Meta-client that calls the appropriate client from the config."
-  @behaviour Pleroma.ReverseProxy.Client
-
-  @impl true
-  def request(method, url, headers, body \\ "", opts \\ []) do
-    client().request(method, url, headers, body, opts)
-  end
-
-  @impl true
-  def stream_body(ref), do: client().stream_body(ref)
-
-  @impl true
-  def close(ref), do: client().close(ref)
-
-  defp client do
-    :tesla
-    |> Application.get_env(:adapter)
-    |> client()
-  end
-
-  defp client(Tesla.Adapter.Hackney), do: Pleroma.ReverseProxy.Client.Hackney
-  defp client(Tesla.Adapter.Gun), do: Pleroma.ReverseProxy.Client.Tesla
-  defp client(_), do: Pleroma.Config.get!(Pleroma.ReverseProxy.Client)
-end

lib/pleroma/stats.ex

@@ -23,11 +23,7 @@ defmodule Pleroma.Stats do
 
   @impl true
   def init(_args) do
-    if Pleroma.Config.get(:env) != :test do
-      {:ok, nil, {:continue, :calculate_stats}}
-    else
-      {:ok, calculate_stat_data()}
-    end
+    {:ok, nil, {:continue, :calculate_stats}}
   end
 
   @doc "Performs update stats"

lib/pleroma/tests/auth_test_controller.ex

@@ -9,6 +9,7 @@ defmodule Pleroma.Tests.AuthTestController do
   use Pleroma.Web, :controller
 
   alias Pleroma.User
+  alias Pleroma.Web.Plugs.EnsurePublicOrAuthenticatedPlug
   alias Pleroma.Web.Plugs.OAuthScopesPlug
 
   # Serves only with proper OAuth token (:api and :authenticated_api)
@@ -46,7 +47,10 @@ defmodule Pleroma.Tests.AuthTestController do
   # Via :authenticated_api, serves if token is present and has requested scopes
   #
   # Suggested use: as :fallback_oauth_check but open with nil :user for :api on private instances
-  plug(:skip_public_check when action == :fallback_oauth_skip_publicity_check)
+  plug(
+    :skip_plug,
+    EnsurePublicOrAuthenticatedPlug when action == :fallback_oauth_skip_publicity_check
+  )
 
   plug(
     OAuthScopesPlug,
@@ -58,7 +62,11 @@ defmodule Pleroma.Tests.AuthTestController do
   # Via :authenticated_api, serves if :user is set (regardless of token presence and its scopes)
   #
   # Suggested use: making an :api endpoint always accessible (e.g. email confirmation endpoint)
-  plug(:skip_auth when action == :skip_oauth_skip_publicity_check)
+  plug(
+    :skip_plug,
+    [OAuthScopesPlug, EnsurePublicOrAuthenticatedPlug]
+    when action == :skip_oauth_skip_publicity_check
+  )
 
   # Via :authenticated_api, always fails with 403 (endpoint is insecure)
   # Via :api, drops :user if present and serves if public (private instance rejects on no user)

lib/pleroma/upload.ex

@@ -23,9 +23,6 @@ defmodule Pleroma.Upload do
     is once created permanent and changing it (especially in uploaders) is probably a bad idea!
   * `:tempfile` - path to the temporary file. Prefer in-place changes on the file rather than changing the
   path as the temporary file is also tracked by `Plug.Upload{}` and automatically deleted once the request is over.
-  * `:width` - width of the media in pixels
-  * `:height` - height of the media in pixels
-  * `:blurhash` - string hash of the image encoded with the blurhash algorithm (https://blurha.sh/)
 
   Related behaviors:
 
@@ -35,7 +32,6 @@ defmodule Pleroma.Upload do
   """
   alias Ecto.UUID
   alias Pleroma.Config
-  alias Pleroma.Maps
   require Logger
 
   @type source ::
@@ -57,12 +53,9 @@ defmodule Pleroma.Upload do
           name: String.t(),
           tempfile: String.t(),
           content_type: String.t(),
-          width: integer(),
-          height: integer(),
-          blurhash: String.t(),
           path: String.t()
         }
-  defstruct [:id, :name, :tempfile, :content_type, :width, :height, :blurhash, :path]
+  defstruct [:id, :name, :tempfile, :content_type, :path]
 
   defp get_description(opts, upload) do
     case {opts[:description], Pleroma.Config.get([Pleroma.Upload, :default_description])} do
@@ -96,12 +89,9 @@ defmodule Pleroma.Upload do
              "mediaType" => upload.content_type,
              "href" => url_from_spec(upload, opts.base_url, url_spec)
            }
-           |> Maps.put_if_present("width", upload.width)
-           |> Maps.put_if_present("height", upload.height)
          ],
          "name" => description
-       }
-       |> Maps.put_if_present("blurhash", upload.blurhash)}
+       }}
     else
       {:description_limit, _} ->
         {:error, :description_too_long}
@@ -235,7 +225,7 @@ defmodule Pleroma.Upload do
 
     case uploader do
       Pleroma.Uploaders.Local ->
-        upload_base_url || Pleroma.Web.Endpoint.url() <> "/media/"
+        upload_base_url || Pleroma.Web.base_url() <> "/media/"
 
       Pleroma.Uploaders.S3 ->
         bucket = Config.get([Pleroma.Uploaders.S3, :bucket])
@@ -261,7 +251,7 @@ defmodule Pleroma.Upload do
         end
 
       _ ->
-        public_endpoint || upload_base_url || Pleroma.Web.Endpoint.url() <> "/media/"
+        public_endpoint || upload_base_url || Pleroma.Web.base_url() <> "/media/"
     end
   end
 end

lib/pleroma/upload/filter.ex

@@ -15,13 +15,13 @@ defmodule Pleroma.Upload.Filter do
 
   require Logger
 
-  @callback filter(upload :: struct()) ::
+  @callback filter(Pleroma.Upload.t()) ::
               {:ok, :filtered}
               | {:ok, :noop}
-              | {:ok, :filtered, upload :: struct()}
+              | {:ok, :filtered, Pleroma.Upload.t()}
               | {:error, any()}
 
-  @spec filter([module()], upload :: struct()) :: {:ok, upload :: struct()} | {:error, any()}
+  @spec filter([module()], Pleroma.Upload.t()) :: {:ok, Pleroma.Upload.t()} | {:error, any()}
 
   def filter([], upload) do
     {:ok, upload}

lib/pleroma/upload/filter/analyze_metadata.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 Pleroma.Upload.Filter.AnalyzeMetadata do
-  @moduledoc """
-  Extracts metadata about the upload, such as width/height
-  """
-  require Logger
-
-  @behaviour Pleroma.Upload.Filter
-
-  @spec filter(Pleroma.Upload.t()) ::
-          {:ok, :filtered, Pleroma.Upload.t()} | {:ok, :noop} | {:error, String.t()}
-  def filter(%Pleroma.Upload{tempfile: file, content_type: "image" <> _} = upload) do
-    try do
-      image =
-        file
-        |> Mogrify.open()
-        |> Mogrify.verbose()
-
-      upload =
-        upload
-        |> Map.put(:width, image.width)
-        |> Map.put(:height, image.height)
-        |> Map.put(:blurhash, get_blurhash(file))
-
-      {:ok, :filtered, upload}
-    rescue
-      e in ErlangError ->
-        Logger.warn("#{__MODULE__}: #{inspect(e)}")
-        {:ok, :noop}
-    end
-  end
-
-  def filter(%Pleroma.Upload{tempfile: file, content_type: "video" <> _} = upload) do
-    try do
-      result = media_dimensions(file)
-
-      upload =
-        upload
-        |> Map.put(:width, result.width)
-        |> Map.put(:height, result.height)
-
-      {:ok, :filtered, upload}
-    rescue
-      e in ErlangError ->
-        Logger.warn("#{__MODULE__}: #{inspect(e)}")
-        {:ok, :noop}
-    end
-  end
-
-  def filter(_), do: {:ok, :noop}
-
-  defp get_blurhash(file) do
-    with {:ok, blurhash} <- :eblurhash.magick(file) do
-      blurhash
-    else
-      _ -> nil
-    end
-  end
-
-  defp media_dimensions(file) do
-    with executable when is_binary(executable) <- System.find_executable("ffprobe"),
-         args = [
-           "-v",
-           "error",
-           "-show_entries",
-           "stream=width,height",
-           "-of",
-           "csv=p=0:s=x",
-           file
-         ],
-         {result, 0} <- System.cmd(executable, args),
-         [width, height] <-
-           String.split(String.trim(result), "x") |> Enum.map(&String.to_integer(&1)) do
-      %{width: width, height: height}
-    else
-      nil -> {:error, {:ffprobe, :command_not_found}}
-      {:error, _} = error -> error
-    end
-  end
-end

lib/pleroma/upload/filter/exiftool.ex

@@ -11,8 +11,7 @@ defmodule Pleroma.Upload.Filter.Exiftool do
 
   @spec filter(Pleroma.Upload.t()) :: {:ok, any()} | {:error, String.t()}
 
-  # Formats not compatible with exiftool at this time
-  def filter(%Pleroma.Upload{content_type: "image/heic"}), do: {:ok, :noop}
+  # webp is not compatible with exiftool at this time
   def filter(%Pleroma.Upload{content_type: "image/webp"}), do: {:ok, :noop}
 
   def filter(%Pleroma.Upload{tempfile: file, content_type: "image" <> _}) do
@@ -22,8 +21,8 @@ defmodule Pleroma.Upload.Filter.Exiftool do
         {error, 1} -> {:error, error}
       end
     rescue
-      e in ErlangError ->
-        {:error, "#{__MODULE__}: #{inspect(e)}"}
+      _e in ErlangError ->
+        {:error, "exiftool command not found"}
     end
   end
 

lib/pleroma/upload/filter/heif_to_jpeg.ex

@@ -0,0 +1,44 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Pleroma.Upload.Filter.HeifToJpeg do
+  @behaviour Pleroma.Upload.Filter
+  alias Pleroma.Upload
+
+  @type conversion :: action :: String.t() | {action :: String.t(), opts :: String.t()}
+  @type conversions :: conversion() | [conversion()]
+
+  @spec filter(Pleroma.Upload.t()) :: {:ok, :atom} | {:error, String.t()}
+  def filter(
+        %Pleroma.Upload{name: name, path: path, tempfile: tempfile, content_type: "image/heic"} =
+          upload
+      ) do
+    try do
+      name = name |> String.replace_suffix(".heic", ".jpg")
+      path = path |> String.replace_suffix(".heic", ".jpg")
+      convert(tempfile)
+
+      {:ok, :filtered, %Upload{upload | name: name, path: path, content_type: "image/jpeg"}}
+    rescue
+      e in ErlangError ->
+        {:error, "#{__MODULE__}: #{inspect(e)}"}
+    end
+  end
+
+  def filter(_), do: {:ok, :noop}
+
+  defp convert(tempfile) do
+    with_extension = tempfile <> ".heic"
+    jpeg = tempfile <> ".jpg"
+
+    File.rename!(tempfile, with_extension)
+
+    args = [with_extension, jpeg]
+
+    {_, 0} = System.cmd("heif-convert", args)
+
+    File.rm!(with_extension)
+    File.rename!(jpeg, tempfile)
+  end
+end

lib/pleroma/upload/filter/mogrifun.ex

@@ -44,8 +44,8 @@ defmodule Pleroma.Upload.Filter.Mogrifun do
       Filter.Mogrify.do_filter(file, [Enum.random(@filters)])
       {:ok, :filtered}
     rescue
-      e in ErlangError ->
-        {:error, "#{__MODULE__}: #{inspect(e)}"}
+      _e in ErlangError ->
+        {:error, "mogrify command not found"}
     end
   end
 

lib/pleroma/upload/filter/mogrify.ex

@@ -14,8 +14,8 @@ defmodule Pleroma.Upload.Filter.Mogrify do
       do_filter(file, Pleroma.Config.get!([__MODULE__, :args]))
       {:ok, :filtered}
     rescue
-      e in ErlangError ->
-        {:error, "#{__MODULE__}: #{inspect(e)}"}
+      _e in ErlangError ->
+        {:error, "mogrify command not found"}
     end
   end
 

lib/pleroma/uploaders/uploader.ex

@@ -35,7 +35,7 @@ defmodule Pleroma.Uploaders.Uploader do
 
   """
   @type file_spec :: {:file | :url, String.t()}
-  @callback put_file(upload :: struct()) ::
+  @callback put_file(Pleroma.Upload.t()) ::
               :ok | {:ok, file_spec()} | {:error, String.t()} | :wait_callback
 
   @callback delete_file(file :: String.t()) :: :ok | {:error, String.t()}
@@ -46,7 +46,7 @@ defmodule Pleroma.Uploaders.Uploader do
               | {:error, Plug.Conn.t(), String.t()}
   @optional_callbacks http_callback: 2
 
-  @spec put_file(module(), upload :: struct()) :: {:ok, file_spec()} | {:error, String.t()}
+  @spec put_file(module(), Pleroma.Upload.t()) :: {:ok, file_spec()} | {:error, String.t()}
   def put_file(uploader, upload) do
     case uploader.put_file(upload) do
       :ok -> {:ok, {:file, upload.path}}

lib/pleroma/user.ex

@@ -27,13 +27,13 @@ defmodule Pleroma.User do
   alias Pleroma.Repo
   alias Pleroma.User
   alias Pleroma.UserRelationship
+  alias Pleroma.Web
   alias Pleroma.Web.ActivityPub.ActivityPub
   alias Pleroma.Web.ActivityPub.Builder
   alias Pleroma.Web.ActivityPub.Pipeline
   alias Pleroma.Web.ActivityPub.Utils
   alias Pleroma.Web.CommonAPI
   alias Pleroma.Web.CommonAPI.Utils, as: CommonUtils
-  alias Pleroma.Web.Endpoint
   alias Pleroma.Web.OAuth
   alias Pleroma.Web.RelMe
   alias Pleroma.Workers.BackgroundWorker
@@ -99,7 +99,6 @@ defmodule Pleroma.User do
     field(:local, :boolean, default: true)
     field(:follower_address, :string)
     field(:following_address, :string)
-    field(:featured_address, :string)
     field(:search_rank, :float, virtual: true)
     field(:search_type, :integer, virtual: true)
     field(:tags, {:array, :string}, default: [])
@@ -131,6 +130,7 @@ defmodule Pleroma.User do
     field(:hide_followers, :boolean, default: false)
     field(:hide_follows, :boolean, default: false)
     field(:hide_favorites, :boolean, default: true)
+    field(:pinned_activities, {:array, :string}, default: [])
     field(:email_notifications, :map, default: %{"digest" => false})
     field(:mascot, :map, default: nil)
     field(:emoji, :map, default: %{})
@@ -147,8 +147,6 @@ defmodule Pleroma.User do
     field(:shared_inbox, :string)
     field(:accepts_chat_messages, :boolean, default: nil)
     field(:last_active_at, :naive_datetime)
-    field(:disclose_client, :boolean, default: true)
-    field(:pinned_objects, :map, default: %{})
 
     embeds_one(
       :notification_settings,
@@ -360,7 +358,7 @@ defmodule Pleroma.User do
 
       _ ->
         unless options[:no_default] do
-          Config.get([:assets, :default_user_avatar], "#{Endpoint.url()}/images/avi.png")
+          Config.get([:assets, :default_user_avatar], "#{Web.base_url()}/images/avi.png")
         end
     end
   end
@@ -368,15 +366,13 @@ defmodule Pleroma.User do
   def banner_url(user, options \\ []) do
     case user.banner do
       %{"url" => [%{"href" => href} | _]} -> href
-      _ -> !options[:no_default] && "#{Endpoint.url()}/images/banner.png"
+      _ -> !options[:no_default] && "#{Web.base_url()}/images/banner.png"
     end
   end
 
   # Should probably be renamed or removed
-  @spec ap_id(User.t()) :: String.t()
-  def ap_id(%User{nickname: nickname}), do: "#{Endpoint.url()}/users/#{nickname}"
+  def ap_id(%User{nickname: nickname}), do: "#{Web.base_url()}/users/#{nickname}"
 
-  @spec ap_followers(User.t()) :: String.t()
   def ap_followers(%User{follower_address: fa}) when is_binary(fa), do: fa
   def ap_followers(%User{} = user), do: "#{ap_id(user)}/followers"
 
@@ -384,11 +380,6 @@ defmodule Pleroma.User do
   def ap_following(%User{following_address: fa}) when is_binary(fa), do: fa
   def ap_following(%User{} = user), do: "#{ap_id(user)}/following"
 
-  @spec ap_featured_collection(User.t()) :: String.t()
-  def ap_featured_collection(%User{featured_address: fa}) when is_binary(fa), do: fa
-
-  def ap_featured_collection(%User{} = user), do: "#{ap_id(user)}/collections/featured"
-
   defp truncate_fields_param(params) do
     if Map.has_key?(params, :fields) do
       Map.put(params, :fields, Enum.map(params[:fields], &truncate_field/1))
@@ -451,7 +442,6 @@ defmodule Pleroma.User do
         :uri,
         :follower_address,
         :following_address,
-        :featured_address,
         :hide_followers,
         :hide_follows,
         :hide_followers_count,
@@ -463,8 +453,7 @@ defmodule Pleroma.User do
         :invisible,
         :actor_type,
         :also_known_as,
-        :accepts_chat_messages,
-        :pinned_objects
+        :accepts_chat_messages
       ]
     )
     |> cast(params, [:name], empty_values: [])
@@ -524,8 +513,7 @@ defmodule Pleroma.User do
         :pleroma_settings_store,
         :is_discoverable,
         :actor_type,
-        :accepts_chat_messages,
-        :disclose_client
+        :accepts_chat_messages
       ]
     )
     |> unique_constraint(:nickname)
@@ -696,7 +684,7 @@ defmodule Pleroma.User do
     |> validate_format(:nickname, local_nickname_regex())
     |> put_ap_id()
     |> unique_constraint(:ap_id)
-    |> put_following_and_follower_and_featured_address()
+    |> put_following_and_follower_address()
   end
 
   def register_changeset(struct, params \\ %{}, opts \\ []) do
@@ -757,7 +745,7 @@ defmodule Pleroma.User do
     |> put_password_hash
     |> put_ap_id()
     |> unique_constraint(:ap_id)
-    |> put_following_and_follower_and_featured_address()
+    |> put_following_and_follower_address()
   end
 
   def maybe_validate_required_email(changeset, true), do: changeset
@@ -775,16 +763,11 @@ defmodule Pleroma.User do
     put_change(changeset, :ap_id, ap_id)
   end
 
-  defp put_following_and_follower_and_featured_address(changeset) do
-    user = %User{nickname: get_field(changeset, :nickname)}
-    followers = ap_followers(user)
-    following = ap_following(user)
-    featured = ap_featured_collection(user)
+  defp put_following_and_follower_address(changeset) do
+    followers = ap_followers(%User{nickname: get_field(changeset, :nickname)})
 
     changeset
     |> put_change(:follower_address, followers)
-    |> put_change(:following_address, following)
-    |> put_change(:featured_address, featured)
   end
 
   defp autofollow_users(user) do
@@ -1695,6 +1678,8 @@ defmodule Pleroma.User do
       email: nil,
       name: nil,
       password_hash: nil,
+      keys: nil,
+      public_key: nil,
       avatar: %{},
       tags: [],
       last_refreshed_at: nil,
@@ -1705,7 +1690,9 @@ defmodule Pleroma.User do
       follower_count: 0,
       following_count: 0,
       is_locked: false,
+      is_confirmed: true,
       password_reset_pending: false,
+      is_approved: true,
       registration_reason: nil,
       confirmation_token: nil,
       domain_blocks: [],
@@ -1721,53 +1708,45 @@ defmodule Pleroma.User do
       raw_fields: [],
       is_discoverable: false,
       also_known_as: []
-      # id: preserved
-      # ap_id: preserved
-      # nickname: preserved
     })
   end
 
-  # Purge doesn't delete the user from the database.
-  # It just nulls all its fields and deactivates it.
-  # See `User.purge_user_changeset/1` above.
-  defp purge(%User{} = user) do
-    user
-    |> purge_user_changeset()
-    |> update_and_set_cache()
-  end
-
   def delete(users) when is_list(users) do
     for user <- users, do: delete(user)
   end
 
   def delete(%User{} = user) do
-    # Purge the user immediately
-    purge(user)
     BackgroundWorker.enqueue("delete_user", %{"user_id" => user.id})
   end
 
-  # *Actually* delete the user from the DB
-  defp delete_from_db(%User{} = user) do
+  defp delete_and_invalidate_cache(%User{} = user) do
     invalidate_cache(user)
     Repo.delete(user)
   end
 
-  # If the user never finalized their account, it's safe to delete them.
-  defp maybe_delete_from_db(%User{local: true, is_confirmed: false} = user),
-    do: delete_from_db(user)
+  defp delete_or_deactivate(%User{local: false} = user), do: delete_and_invalidate_cache(user)
 
-  defp maybe_delete_from_db(%User{local: true, is_approved: false} = user),
-    do: delete_from_db(user)
+  defp delete_or_deactivate(%User{local: true} = user) do
+    status = account_status(user)
 
-  defp maybe_delete_from_db(user), do: {:ok, user}
+    case status do
+      :confirmation_pending ->
+        delete_and_invalidate_cache(user)
+
+      :approval_pending ->
+        delete_and_invalidate_cache(user)
+
+      _ ->
+        user
+        |> purge_user_changeset()
+        |> update_and_set_cache()
+    end
+  end
 
   def perform(:force_password_reset, user), do: force_password_reset(user)
 
   @spec perform(atom(), User.t()) :: {:ok, User.t()}
   def perform(:delete, %User{} = user) do
-    # Purge the user again, in case perform/2 is called directly
-    purge(user)
-
     # Remove all relationships
     user
     |> get_followers()
@@ -1785,9 +1764,10 @@ defmodule Pleroma.User do
 
     delete_user_activities(user)
     delete_notifications_from_user_activities(user)
+
     delete_outgoing_pending_follow_requests(user)
 
-    maybe_delete_from_db(user)
+    delete_or_deactivate(user)
   end
 
   def perform(:set_activation_async, user, status), do: set_activation(user, status)
@@ -2273,6 +2253,13 @@ defmodule Pleroma.User do
     |> update_and_set_cache()
   end
 
+  def roles(%{is_moderator: is_moderator, is_admin: is_admin}) do
+    %{
+      admin: is_admin,
+      moderator: is_moderator
+    }
+  end
+
   def validate_fields(changeset, remote? \\ false) do
     limit_name = if remote?, do: :max_remote_account_fields, else: :max_account_fields
     limit = Config.get([:instance, limit_name], 0)
@@ -2361,35 +2348,45 @@ defmodule Pleroma.User do
     cast(user, %{is_approved: approved?}, [:is_approved])
   end
 
-  @spec add_pinned_object_id(User.t(), String.t()) :: {:ok, User.t()} | {:error, term()}
-  def add_pinned_object_id(%User{} = user, object_id) do
-    if !user.pinned_objects[object_id] do
-      params = %{pinned_objects: Map.put(user.pinned_objects, object_id, NaiveDateTime.utc_now())}
+  def add_pinnned_activity(user, %Pleroma.Activity{id: id}) do
+    if id not in user.pinned_activities do
+      max_pinned_statuses = Config.get([:instance, :max_pinned_statuses], 0)
+      params = %{pinned_activities: user.pinned_activities ++ [id]}
+
+      # if pinned activity was scheduled for deletion, we remove job
+      if expiration = Pleroma.Workers.PurgeExpiredActivity.get_expiration(id) do
+        Oban.cancel_job(expiration.id)
+      end
 
       user
-      |> cast(params, [:pinned_objects])
-      |> validate_change(:pinned_objects, fn :pinned_objects, pinned_objects ->
-        max_pinned_statuses = Config.get([:instance, :max_pinned_statuses], 0)
-
-        if Enum.count(pinned_objects) <= max_pinned_statuses do
-          []
-        else
-          [pinned_objects: "You have already pinned the maximum number of statuses"]
-        end
-      end)
+      |> cast(params, [:pinned_activities])
+      |> validate_length(:pinned_activities,
+        max: max_pinned_statuses,
+        message: "You have already pinned the maximum number of statuses"
+      )
     else
       change(user)
     end
     |> update_and_set_cache()
   end
 
-  @spec remove_pinned_object_id(User.t(), String.t()) :: {:ok, t()} | {:error, term()}
-  def remove_pinned_object_id(%User{} = user, object_id) do
+  def remove_pinnned_activity(user, %Pleroma.Activity{id: id, data: data}) do
+    params = %{pinned_activities: List.delete(user.pinned_activities, id)}
+
+    # if pinned activity was scheduled for deletion, we reschedule it for deletion
+    if data["expires_at"] do
+      # MRF.ActivityExpirationPolicy used UTC timestamps for expires_at in original implementation
+      {:ok, expires_at} =
+        data["expires_at"] |> Pleroma.EctoType.ActivityPub.ObjectValidators.DateTime.cast()
+
+      Pleroma.Workers.PurgeExpiredActivity.enqueue(%{
+        activity_id: id,
+        expires_at: expires_at
+      })
+    end
+
     user
-    |> cast(
-      %{pinned_objects: Map.delete(user.pinned_objects, object_id)},
-      [:pinned_objects]
-    )
+    |> cast(params, [:pinned_activities])
     |> update_and_set_cache()
   end
 

lib/pleroma/user/query.ex

@@ -27,7 +27,7 @@ defmodule Pleroma.User.Query do
       - e.g. Pleroma.User.Query.build(%{ap_id: ["http://ap_id1", "http://ap_id2"]})
   """
   import Ecto.Query
-  import Pleroma.Web.Utils.Guards, only: [not_empty_string: 1]
+  import Pleroma.Web.AdminAPI.Search, only: [not_empty_string: 1]
 
   alias Pleroma.FollowingRelationship
   alias Pleroma.User