Merge branch 'features/mastoapi/2.6.0-conversations' of git.pleroma.social:pleroma...

[akkoma] / lib / pleroma / web / router.ex

diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index f4418cec0b75e28df1f6733008e41ba6010392b2..64e1a2bd8183e171af53308d96d371ad2593eb93 100644 (file)
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -245,6 +245,9 @@ defmodule Pleroma.Web.Router do
 
       get("/suggestions", MastodonAPIController, :suggestions)
 
+      get("/conversations", MastodonAPIController, :conversations)
+      get("/conversations/:id/read", MastodonAPIController, :get_conversation)
+
       get("/endorsements", MastodonAPIController, :empty_array)
 
       get("/pleroma/flavour", MastodonAPIController, :get_flavour)