From: Ivan Tashkinov <ivantashkinov@gmail.com>
Date: Sat, 22 Feb 2020 06:31:43 +0000 (+0300)
Subject: Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=8f0ca19b9cafeedc70df2d60bd7bd7c6bf7aa160;p=akkoma

Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation

# Conflicts:
#	CHANGELOG.md
#	config/config.exs
---

8f0ca19b9cafeedc70df2d60bd7bd7c6bf7aa160
diff --cc CHANGELOG.md
index e0ab69d8b,90791d7bd..2ab098591
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -74,7 -74,7 +74,8 @@@ The format is based on [Keep a Changelo
  - User settings: Add _This account is a_ option.
  - A new users admin digest email
  - OAuth: admin scopes support (relevant setting: `[:auth, :enforce_oauth_admin_scope_usage]`).
+ - Add an option `authorized_fetch_mode` to require HTTP signatures for AP fetches.
 +- ActivityPub: support for `replies` collection (output for outgoing federation & fetching on incoming federation).
  <details>
    <summary>API Changes</summary>
  
@@@ -116,7 -116,7 +117,8 @@@
  - Configuration: `feed.logo` option for tag feed.
  - Tag feed: `/tags/:tag.rss` - list public statuses by hashtag.
  - Mastodon API: Add `reacted` property to `emoji_reactions`
+ - Pleroma API: Add reactions for a single emoji.
 +- ActivityPub: `[:activitypub, :note_replies_output_limit]` setting sets the number of note self-replies to output on outgoing federation.
  </details>
  
  ### Fixed
diff --cc config/config.exs
index c5a56b14d,641b2c867..a92130ec8
--- a/config/config.exs
+++ b/config/config.exs
@@@ -326,8 -326,8 +326,9 @@@ config :pleroma, :activitypub
    unfollow_blocked: true,
    outgoing_blocks: true,
    follow_handshake_timeout: 500,
 +  note_replies_output_limit: 5,
-   sign_object_fetches: true
+   sign_object_fetches: true,
+   authorized_fetch_mode: false
  
  config :pleroma, :streamer,
    workers: 3,