From: Egor Kislitsyn <egor@kislitsyn.com>
Date: Mon, 2 Mar 2020 20:32:34 +0000 (+0400)
Subject: Merge remote-tracking branch 'origin/develop' into global-status-expiration
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=0f386110c6e15148ff1ff5ea3451885485fcb7ff;p=akkoma

Merge remote-tracking branch 'origin/develop' into global-status-expiration
---

0f386110c6e15148ff1ff5ea3451885485fcb7ff
diff --cc CHANGELOG.md
index c5558e0c7,c8f3794a3..ec6b0cb38
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -34,8 -38,7 +38,8 @@@ The format is based on [Keep a Changelo
  - Rate limiter is now disabled for localhost/socket (unless remoteip plug is enabled)
  - Logger: default log level changed from `warn` to `info`.
  - Config mix task `migrate_to_db` truncates `config` table before migrating the config file.
 +- MFR policy to set global expiration for all local Create activities
- 
+ - Default to `prepare: :unnamed` in the database configuration.
  <details>
    <summary>API Changes</summary>
  
diff --cc docs/configuration/cheatsheet.md
index f50c8bab7,05fd6ceb1..3fd372b95
--- a/docs/configuration/cheatsheet.md
+++ b/docs/configuration/cheatsheet.md
@@@ -143,19 -144,20 +145,24 @@@ config :pleroma, :mrf_user_allowlist
    * `:strip_followers` removes followers from the ActivityPub recipient list, ensuring they won't be delivered to home timelines
    * `:reject` rejects the message entirely
  
 +#### :mrf_activity_expiration
 +
 +* `days`: Default global expiration time for all local Create activities (in days)
 +
  ### :activitypub
- * ``unfollow_blocked``: Whether blocks result in people getting unfollowed
- * ``outgoing_blocks``: Whether to federate blocks to other instances
- * ``deny_follow_blocked``: Whether to disallow following an account that has blocked the user in question
- * ``sign_object_fetches``: Sign object fetches with HTTP signatures
+ * `unfollow_blocked`: Whether blocks result in people getting unfollowed
+ * `outgoing_blocks`: Whether to federate blocks to other instances
+ * `deny_follow_blocked`: Whether to disallow following an account that has blocked the user in question
+ * `sign_object_fetches`: Sign object fetches with HTTP signatures
+ * `authorized_fetch_mode`: Require HTTP signatures for AP fetches
  
  ### :fetch_initial_posts
- * `enabled`: if enabled, when a new user is federated with, fetch some of their latest posts
- * `pages`: the amount of pages to fetch
+ 
+ !!! warning
+     Be careful with this setting, fetching posts may lead to new users being discovered whose posts will then also be fetched. This can lead to serious load on your instance and database.
+ 
+ * `enabled`: If enabled, when a new user is discovered by your instance, fetch some of their latest posts.
+ * `pages`: The amount of pages to fetch
  
  ## Pleroma.ScheduledActivity
  
diff --cc lib/pleroma/web/activity_pub/activity_pub.ex
index 408f6c966,04b853dcf..07121a798
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@@ -5,8 -5,8 +5,9 @@@
  defmodule Pleroma.Web.ActivityPub.ActivityPub do
    alias Pleroma.Activity
    alias Pleroma.Activity.Ir.Topics
 +  alias Pleroma.ActivityExpiration
    alias Pleroma.Config
+   alias Pleroma.Constants
    alias Pleroma.Conversation
    alias Pleroma.Conversation.Participation
    alias Pleroma.Notification