From: Alex Gleason <alex@alexgleason.me>
Date: Mon, 27 Dec 2021 17:31:15 +0000 (-0600)
Subject: Merge remote-tracking branch 'origin/develop' into finch
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=326575d5b7b39396afe14e96adb16a7f73aa55e9;p=akkoma

Merge remote-tracking branch 'origin/develop' into finch
---

326575d5b7b39396afe14e96adb16a7f73aa55e9
diff --cc CHANGELOG.md
index 18f6b1c81,79fe674a9..e527f32de
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -15,7 -15,8 +15,9 @@@ The format is based on [Keep a Changelo
  
  ### Added
  - `activeMonth` and `activeHalfyear` fields in NodeInfo usage.users object
 +- Experimental support for Finch. Put `config :tesla, :adapter, {Tesla.Adapter.Finch, name: MyFinch}` in your secrets file to use it. Reverse Proxy will still use Hackney.
+ - AdminAPI: allow moderators to manage reports, users, invites, and custom emojis
+ - AdminAPI: restrict moderators to access sensitive data: change user credentials, get password reset token, read private statuses and chats, etc
  
  ### Fixed
  - Subscription(Bell) Notifications: Don't create from Pipeline Ingested replies