From: feld <feld@feld.me>
Date: Tue, 25 Aug 2020 21:32:32 +0000 (+0000)
Subject: Merge branch 'feature/1952-read-muted-notifications' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=fb33321fa2b3638af1c1edc35de1e4d23ba18711;p=akkoma

Merge branch 'feature/1952-read-muted-notifications' into 'develop'

Automatically mark notifications about statuses from muted users and threads as read

Closes #1952

See merge request pleroma/pleroma!2893
---

fb33321fa2b3638af1c1edc35de1e4d23ba18711
diff --cc CHANGELOG.md
index 683bb98b5,c462833d7..d0eba0f79
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -34,10 -29,14 +34,11 @@@ The format is based on [Keep a Changelo
  - 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`
  - Mastodon API: Added `pleroma.metadata.post_formats` to /api/v1/instance
  - Mastodon API (legacy): Allow query parameters for `/api/v1/domain_blocks`, e.g. `/api/v1/domain_blocks?domain=badposters.zone`
+ - Mastodon API: Make notifications about statuses from muted users and threads read automatically
  - Pleroma API: `/api/pleroma/captcha` responses now include `seconds_valid` with an integer value.
 +
  </details>
  
  <details>