From: Mark Felder <feld@FreeBSD.org>
Date: Mon, 13 Jul 2020 18:32:21 +0000 (-0500)
Subject: Merge branch 'develop' into refactor/notification_settings
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=80c21100db306ce45856bbdb97d3439676babeeb;p=akkoma

Merge branch 'develop' into refactor/notification_settings
---

80c21100db306ce45856bbdb97d3439676babeeb
diff --cc CHANGELOG.md
index 1d640f292,5fed80a99..4af195f7d
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -16,11 -16,14 +16,18 @@@ The format is based on [Keep a Changelo
  <details>
    <summary>API Changes</summary>
  
+ - **Breaking:** Pleroma API: The routes to update avatar, banner and background have been removed.
+ - **Breaking:** Image description length is limited now.
  - **Breaking:** Emoji API: changed methods and renamed routes.
+ - MastodonAPI: Allow removal of avatar, banner and background.
+ - Streaming: Repeats of a user's posts will no longer be pushed to the user's stream.
+ - Mastodon API: Added `pleroma.metadata.fields_limits` to /api/v1/instance
+ - Mastodon API: On deletion, returns the original post text.
+ - Mastodon API: Add `pleroma.unread_count` to the Marker entity.
 +- **Breaking:** Notification Settings API for suppressing notifications
 +  has been simplified down to `block_from_strangers`.
 +- **Breaking:** Notification Settings API option for hiding push notification
 +  contents has been renamed to `hide_notification_contents`
  </details>
  
  <details>
diff --cc lib/pleroma/notification.ex
index 8a28a1821,32bcfcaba..0b171563b
--- a/lib/pleroma/notification.ex
+++ b/lib/pleroma/notification.ex
@@@ -550,8 -571,12 +571,9 @@@ defmodule Pleroma.Notification d
      [
        :self,
        :invisible,
 -      :followers,
 -      :follows,
 -      :non_followers,
 -      :non_follows,
 +      :block_from_strangers,
-       :recently_followed
+       :recently_followed,
+       :filtered
      ]
      |> Enum.find(&skip?(&1, activity, user))
    end