6 files changed, 164 insertions, 50 deletions
diff --git a/priv/gettext/config_descriptions.pot b/priv/gettext/config_descriptions.pot
index 9021fbfab..a8074ee64 100644
--- a/priv/gettext/config_descriptions.pot
+++ b/priv/gettext/config_descriptions.pot
@@ -1722,12 +1722,6 @@ msgstr ""
 
 #, elixir-autogen, elixir-format
 #: lib/pleroma/docs/translator.ex:5
-msgctxt "config description at :pleroma-:instance > :birthday_min_age"
-msgid "Minimum required age for users to create account. Only used if birthday is required."
-msgstr ""
-
-#, elixir-autogen, elixir-format
-#: lib/pleroma/docs/translator.ex:5
 msgctxt "config description at :pleroma-:instance > :birthday_required"
 msgid "Require users to enter their birthday."
 msgstr ""
@@ -6021,3 +6015,45 @@ msgstr ""
 msgctxt "config label at :pleroma-:instance > :short_description"
 msgid "Short description"
 msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/pleroma/docs/translator.ex:5
+msgctxt "config description at :pleroma-:delete_context_objects"
+msgid "`delete_context_objects` background migration settings"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/pleroma/docs/translator.ex:5
+msgctxt "config description at :pleroma-:delete_context_objects > :fault_rate_allowance"
+msgid "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 context object deletion failed for all records."
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/pleroma/docs/translator.ex:5
+msgctxt "config description at :pleroma-:delete_context_objects > :sleep_interval_ms"
+msgid "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)."
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/pleroma/docs/translator.ex:5
+msgctxt "config description at :pleroma-:instance > :birthday_min_age"
+msgid "Minimum required age (in days) for users to create account. Only used if birthday is required."
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/pleroma/docs/translator.ex:5
+msgctxt "config label at :pleroma-:delete_context_objects"
+msgid "Delete context objects"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/pleroma/docs/translator.ex:5
+msgctxt "config label at :pleroma-:delete_context_objects > :fault_rate_allowance"
+msgid "Fault rate allowance"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/pleroma/docs/translator.ex:5
+msgctxt "config label at :pleroma-:delete_context_objects > :sleep_interval_ms"
+msgid "Sleep interval ms"
+msgstr ""
diff --git a/priv/gettext/errors.pot b/priv/gettext/errors.pot
index 85854d23e..9e0af2181 100644
--- a/priv/gettext/errors.pot
+++ b/priv/gettext/errors.pot
@@ -90,7 +90,7 @@ msgid "must be equal to %{number}"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/pleroma/web/common_api.ex:523
+#: lib/pleroma/web/common_api.ex:558
 msgid "Account not found"
 msgstr ""
 
@@ -111,7 +111,7 @@ msgid "Can't display this activity"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:325
+#: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:327
 msgid "Can't find user"
 msgstr ""
 
@@ -121,12 +121,12 @@ msgid "Can't get favorites"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/pleroma/web/common_api/utils.ex:482
+#: lib/pleroma/web/common_api/utils.ex:457
 msgid "Cannot post an empty status without attachments"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/pleroma/web/common_api/utils.ex:441
+#: lib/pleroma/web/common_api/utils.ex:445
 msgid "Comment must be up to %{max_size} characters"
 msgstr ""
 
@@ -157,13 +157,13 @@ msgid "Could not unrepeat"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/pleroma/web/common_api.ex:530
-#: lib/pleroma/web/common_api.ex:539
+#: lib/pleroma/web/common_api.ex:565
+#: lib/pleroma/web/common_api.ex:574
 msgid "Could not update state"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex:205
+#: lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex:207
 msgid "Error."
 msgstr ""
 
@@ -173,7 +173,7 @@ msgid "Invalid CAPTCHA"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:144
+#: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:146
 #: lib/pleroma/web/o_auth/o_auth_controller.ex:631
 msgid "Invalid credentials"
 msgstr ""
@@ -194,12 +194,12 @@ msgid "Invalid parameters"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/pleroma/web/common_api/utils.ex:349
+#: lib/pleroma/web/common_api/utils.ex:353
 msgid "Invalid password."
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:255
+#: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:257
 msgid "Invalid request"
 msgstr ""
 
@@ -209,16 +209,11 @@ msgid "Kocaptcha service unavailable"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:140
+#: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:142
 msgid "Missing parameters"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/pleroma/web/common_api/utils.ex:477
-msgid "No such conversation"
-msgstr ""
-
-#, elixir-autogen, elixir-format
 #: lib/pleroma/web/admin_api/controllers/admin_api_controller.ex:171
 #: lib/pleroma/web/admin_api/controllers/admin_api_controller.ex:197
 #: lib/pleroma/web/admin_api/controllers/admin_api_controller.ex:239
@@ -226,7 +221,7 @@ msgid "No such permission_group"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/pleroma/web/activity_pub/activity_pub_controller.ex:515
+#: lib/pleroma/web/activity_pub/activity_pub_controller.ex:502
 #: lib/pleroma/web/admin_api/controllers/fallback_controller.ex:11
 #: lib/pleroma/web/feed/tag_controller.ex:16
 #: lib/pleroma/web/feed/user_controller.ex:69
@@ -241,11 +236,12 @@ msgid "Poll's author can't vote"
 msgstr ""
 
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:492
 #: lib/pleroma/web/mastodon_api/controllers/fallback_controller.ex:20
 #: lib/pleroma/web/mastodon_api/controllers/poll_controller.ex:39
 #: lib/pleroma/web/mastodon_api/controllers/poll_controller.ex:51
 #: lib/pleroma/web/mastodon_api/controllers/poll_controller.ex:52
-#: lib/pleroma/web/mastodon_api/controllers/status_controller.ex:326
+#: lib/pleroma/web/mastodon_api/controllers/status_controller.ex:382
 #: lib/pleroma/web/mastodon_api/controllers/subscription_controller.ex:71
 msgid "Record not found"
 msgstr ""
@@ -264,7 +260,7 @@ msgid "The message visibility must be direct"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/pleroma/web/common_api/utils.ex:492
+#: lib/pleroma/web/common_api/utils.ex:467
 msgid "The status is over the character limit"
 msgstr ""
 
@@ -301,22 +297,22 @@ msgid "Your login is missing a confirmed e-mail address"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/pleroma/web/activity_pub/activity_pub_controller.ex:403
+#: lib/pleroma/web/activity_pub/activity_pub_controller.ex:390
 msgid "can't read inbox of %{nickname} as %{as_nickname}"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/pleroma/web/activity_pub/activity_pub_controller.ex:502
+#: lib/pleroma/web/activity_pub/activity_pub_controller.ex:489
 msgid "can't update outbox of %{nickname} as %{as_nickname}"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/pleroma/web/common_api.ex:475
+#: lib/pleroma/web/common_api.ex:510
 msgid "conversation is already muted"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/pleroma/web/activity_pub/activity_pub_controller.ex:521
+#: lib/pleroma/web/activity_pub/activity_pub_controller.ex:508
 msgid "error"
 msgstr ""
 
@@ -443,7 +439,7 @@ msgid "List not found"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:151
+#: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:153
 msgid "Missing parameter: %{name}"
 msgstr ""
 
@@ -523,6 +519,7 @@ msgstr ""
 #: lib/pleroma/web/pleroma_api/controllers/notification_controller.ex:6
 #: lib/pleroma/web/pleroma_api/controllers/report_controller.ex:6
 #: lib/pleroma/web/pleroma_api/controllers/scrobble_controller.ex:6
+#: lib/pleroma/web/pleroma_api/controllers/settings_controller.ex:6
 #: lib/pleroma/web/pleroma_api/controllers/two_factor_authentication_controller.ex:7
 #: lib/pleroma/web/pleroma_api/controllers/user_import_controller.ex:6
 #: lib/pleroma/web/static_fe/static_fe_controller.ex:6
@@ -551,7 +548,7 @@ msgid "You can't revoke your own admin/moderator status."
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex:129
+#: lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex:131
 msgid "authorization required for timeline view"
 msgstr ""
 
@@ -561,7 +558,7 @@ msgid "Access denied"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:322
+#: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:324
 msgid "This API requires an authenticated user"
 msgstr ""
 
@@ -572,29 +569,19 @@ msgid "User is not an admin."
 msgstr ""
 
 #, elixir-format
-#: lib/pleroma/user/backup.ex:75
+#: lib/pleroma/user/backup.ex:73
 msgid "Last export was less than a day ago"
 msgid_plural "Last export was less than %{days} days ago"
 msgstr[0] ""
 msgstr[1] ""
 
 #, elixir-autogen, elixir-format
-#: lib/pleroma/user/backup.ex:93
-msgid "Backups require enabled email"
-msgstr ""
-
-#, elixir-autogen, elixir-format
-#: lib/pleroma/web/activity_pub/activity_pub_controller.ex:434
+#: lib/pleroma/web/activity_pub/activity_pub_controller.ex:421
 msgid "Character limit (%{limit} characters) exceeded, contains %{length} characters"
 msgstr ""
 
 #, elixir-autogen, elixir-format
-#: lib/pleroma/user/backup.ex:98
-msgid "Email is required"
-msgstr ""
-
-#, elixir-autogen, elixir-format
-#: lib/pleroma/web/common_api/utils.ex:507
+#: lib/pleroma/web/common_api/utils.ex:482
 msgid "Too many attachments"
 msgstr ""
 
diff --git a/priv/gettext/static_pages.pot b/priv/gettext/static_pages.pot
index 8e1b1d9db..3c64f1a29 100644
--- a/priv/gettext/static_pages.pot
+++ b/priv/gettext/static_pages.pot
@@ -83,6 +83,7 @@ msgid "Account followed!"
 msgstr ""
 
 #, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/twitter_api/util/status_interact.html.eex:7
 #: lib/pleroma/web/templates/twitter_api/util/subscribe.html.eex:7
 msgctxt "placeholder text for account id"
 msgid "Your account ID, e.g. lain@quitter.se"
@@ -511,3 +512,51 @@ msgstr ""
 msgctxt "account archive email body - admin requested"
 msgid "<p>Admin @%{admin_nickname} requested a full backup of your Pleroma account. It's ready for download:</p>\n<p><a href=\"%{download_url}\">%{download_url}</a></p>\n"
 msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/pleroma/web/twitter_api/controllers/util_controller.ex:123
+msgctxt "remote follow error message - unknown error"
+msgid "Something went wrong."
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/pleroma/web/twitter_api/controllers/util_controller.ex:67
+msgctxt "remote follow error message - user not found"
+msgid "Could not find user"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/twitter_api/util/status_interact.html.eex:8
+msgctxt "status interact authorization button"
+msgid "Interact"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/twitter_api/util/status_interact.html.eex:2
+msgctxt "status interact error"
+msgid "Error: %{error}"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/pleroma/web/twitter_api/controllers/util_controller.ex:95
+msgctxt "status interact error message - status not found"
+msgid "Could not find status"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/pleroma/web/twitter_api/controllers/util_controller.ex:144
+msgctxt "status interact error message - unknown error"
+msgid "Something went wrong."
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/twitter_api/util/status_interact.html.eex:4
+msgctxt "status interact header"
+msgid "Interacting with %{nickname}'s %{status_link}"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+#: lib/pleroma/web/templates/twitter_api/util/status_interact.html.eex:4
+msgctxt "status interact header - status link text"
+msgid "status"
+msgstr ""
diff --git a/priv/repo/migrations/20220807125023_data_migration_delete_context_objects.exs b/priv/repo/migrations/20220807125023_data_migration_delete_context_objects.exs
new file mode 100644
index 000000000..84365dbe3
--- /dev/null
+++ b/priv/repo/migrations/20220807125023_data_migration_delete_context_objects.exs
@@ -0,0 +1,18 @@
+defmodule Pleroma.Repo.Migrations.DataMigrationDeleteContextObjects do
+  use Ecto.Migration
+
+  require Logger
+
+  def up do
+    dt = NaiveDateTime.utc_now()
+
+    execute(
+      "INSERT INTO data_migrations(name, inserted_at, updated_at) " <>
+        "VALUES ('delete_context_objects', '#{dt}', '#{dt}') ON CONFLICT DO NOTHING;"
+    )
+  end
+
+  def down do
+    execute("DELETE FROM data_migrations WHERE name = 'delete_context_objects';")
+  end
+end
diff --git a/priv/repo/migrations/20220905011454_generate_unset_user_keys.exs b/priv/repo/migrations/20220905011454_generate_unset_user_keys.exs
new file mode 100644
index 000000000..43bc7100b
--- /dev/null
+++ b/priv/repo/migrations/20220905011454_generate_unset_user_keys.exs
@@ -0,0 +1,28 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Pleroma.Repo.Migrations.GenerateUnsetUserKeys do
+  use Ecto.Migration
+  import Ecto.Query
+  alias Pleroma.Keys
+  alias Pleroma.Repo
+  alias Pleroma.User
+
+  def change do
+    query =
+      from(u in User,
+        where: u.local == true,
+        where: is_nil(u.keys),
+        select: u
+      )
+
+    Repo.stream(query)
+    |> Enum.each(fn user ->
+      with {:ok, pem} <- Keys.generate_rsa_pem() do
+        Ecto.Changeset.cast(user, %{keys: pem}, [:keys])
+        |> Repo.update()
+      end
+    end)
+  end
+end
diff --git a/priv/templates/sample_config.eex b/priv/templates/sample_config.eex
index 0068969ac..d44c324ca 100644
--- a/priv/templates/sample_config.eex
+++ b/priv/templates/sample_config.eex
@@ -3,11 +3,7 @@
 # NOTE: This file should not be committed to a repo or otherwise made public
 # without removing sensitive information.
 
-<%= if Code.ensure_loaded?(Config) or not Code.ensure_loaded?(Mix.Config) do
-  "import Config"
-else
-  "use Mix.Config"
-end %>
+import Config
 
 config :pleroma, Pleroma.Web.Endpoint,
    url: [host: "<%= domain %>", scheme: "https", port: <%= port %>],