From: Alex Gleason Date: Sun, 19 Dec 2021 18:55:36 +0000 (-0600) Subject: Merge remote-tracking branch 'origin/develop' into moderators X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=3f8fc34593414f6e35925038c38775203333b3f3;p=akkoma Merge remote-tracking branch 'origin/develop' into moderators --- 3f8fc34593414f6e35925038c38775203333b3f3 diff --cc CHANGELOG.md index 16c2b0081,ecefba381..07d6d1934 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@@ -22,10 -60,11 +60,12 @@@ The format is based on [Keep a Changelo - MRF (`FollowBotPolicy`): New MRF Policy which makes a designated local Bot account attempt to follow all users in public Notes received by your instance. Users who require approving follower requests or have #nobot in their profile are excluded. - Return OAuth token `id` (primary key) in POST `/oauth/token`. - AdminAPI: return `created_at` date with users. + - AdminAPI: add DELETE `/api/v1/pleroma/admin/instances/:instance` to delete all content from a remote instance. - `AnalyzeMetadata` upload filter for extracting image/video attachment dimensions and generating blurhashes for images. Blurhashes for videos are not generated at this time. - Attachment dimensions and blurhashes are federated when available. + - Mastodon API: support `poll` notification. - Pinned posts federation +- AdminAPI: allow moderators to manage reports, users, invites, and custom emojis ### Fixed - Don't crash so hard when email settings are invalid. diff --cc lib/pleroma/web/router.ex index f7da55c22,fa1d1b93f..5fbc2509e --- a/lib/pleroma/web/router.ex +++ b/lib/pleroma/web/router.ex @@@ -190,8 -186,16 +185,11 @@@ defmodule Pleroma.Web.Router d post("/users/follow", UserController, :follow) post("/users/unfollow", UserController, :unfollow) - delete("/users", UserController, :delete) post("/users", UserController, :create) - patch("/users/:nickname/toggle_activation", UserController, :toggle_activation) - patch("/users/activate", UserController, :activate) - patch("/users/deactivate", UserController, :deactivate) - patch("/users/approve", UserController, :approve) + patch("/users/suggest", UserController, :suggest) + patch("/users/unsuggest", UserController, :unsuggest) + get("/relay", RelayController, :index) post("/relay", RelayController, :follow) delete("/relay", RelayController, :unfollow) @@@ -258,8 -215,16 +256,9 @@@ get("/users/:nickname/statuses", AdminAPIController, :list_user_statuses) get("/users/:nickname/chats", AdminAPIController, :list_user_chats) - get("/instances/:instance/statuses", AdminAPIController, :list_instance_statuses) + get("/instances/:instance/statuses", InstanceController, :list_statuses) + delete("/instances/:instance", InstanceController, :delete) - get("/instance_document/:name", InstanceDocumentController, :show) - patch("/instance_document/:name", InstanceDocumentController, :update) - delete("/instance_document/:name", InstanceDocumentController, :delete) - - patch("/users/confirm_email", AdminAPIController, :confirm_email) - patch("/users/resend_confirmation_email", AdminAPIController, :resend_confirmation_email) - get("/reports", ReportController, :index) get("/reports/:id", ReportController, :show) patch("/reports", ReportController, :update)