From: rinpatch <rin@patch.cx>
Date: Wed, 17 Feb 2021 15:14:27 +0000 (+0000)
Subject: Merge branch 'remove-conversation-api' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=158f9f18ee61fda5371ee62314c46da90b57eb5a;p=akkoma

Merge branch 'remove-conversation-api' into 'develop'

Add API endpoint to remove a conversation

Closes #2488

See merge request pleroma/pleroma!3321
---

158f9f18ee61fda5371ee62314c46da90b57eb5a
diff --cc lib/pleroma/web/router.ex
index 297f03fbd,b8aa8c67c..e71686d31
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@@ -441,8 -432,11 +441,9 @@@ defmodule Pleroma.Web.Router d
      post("/accounts/:id/mute", AccountController, :mute)
      post("/accounts/:id/unmute", AccountController, :unmute)
  
 -    get("/apps/verify_credentials", AppController, :verify_credentials)
 -
      get("/conversations", ConversationController, :index)
      post("/conversations/:id/read", ConversationController, :mark_as_read)
+     delete("/conversations/:id", ConversationController, :delete)
  
      get("/domain_blocks", DomainBlockController, :index)
      post("/domain_blocks", DomainBlockController, :create)