diff options
author | lain <lain@soykaf.club> | 2020-08-22 22:53:27 +0200 |
---|---|---|
committer | lain <lain@soykaf.club> | 2020-08-22 22:53:27 +0200 |
commit | 9fd7c0591efe5334baa250dc5f9b8ce65648648e (patch) | |
tree | 417705f4eb36a4c922c180da0e34a2cc4905c56d | |
parent | 967856c784892fd1c7c88aee608931c29fcc5fff (diff) | |
download | pleroma-9fd7c0591efe5334baa250dc5f9b8ce65648648e.tar.gz |
MatrixController: Implement some more placeholders.
-rw-r--r-- | lib/pleroma/web/matrix_controller.ex | 23 | ||||
-rw-r--r-- | lib/pleroma/web/router.ex | 2 |
2 files changed, 21 insertions, 4 deletions
diff --git a/lib/pleroma/web/matrix_controller.ex b/lib/pleroma/web/matrix_controller.ex index 23c776ca6..011eed85b 100644 --- a/lib/pleroma/web/matrix_controller.ex +++ b/lib/pleroma/web/matrix_controller.ex @@ -24,7 +24,14 @@ defmodule Pleroma.Web.MatrixController do plug( OAuthScopesPlug, %{scopes: ["write"]} - when action in [:set_presence_status, :set_filter] + when action in [ + :set_presence_status, + :set_filter, + :send_event, + :set_read_marker, + :typing, + :set_account_data + ] ) plug( @@ -40,11 +47,9 @@ defmodule Pleroma.Web.MatrixController do :room_keys_version, :key_upload, :capabilities, - :set_read_marker, :room_members, :publicised_groups, - :turn_server, - :send_event + :turn_server ] ) @@ -522,4 +527,14 @@ defmodule Pleroma.Web.MatrixController do |> put_status(404) |> json("not found") end + + def typing(conn, _) do + conn + |> json(%{}) + end + + def set_account_data(conn, _) do + conn + |> json(%{}) + end end diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex index 270baccc9..ebffbf6a6 100644 --- a/lib/pleroma/web/router.ex +++ b/lib/pleroma/web/router.ex @@ -743,10 +743,12 @@ defmodule Pleroma.Web.Router do post("/client/r0/keys/upload/:whoknows", MatrixController, :key_upload) get("/client/r0/capabilities", MatrixController, :capabilities) post("/client/r0/rooms/:room_id/read_markers", MatrixController, :set_read_marker) + put("/client/r0/rooms/:room_id/typing/:user_id", MatrixController, :typing) get("/client/r0/rooms/:room_id/members", MatrixController, :room_members) post("/client/r0/publicised_groups", MatrixController, :publicised_groups) get("/client/r0/voip/turnServer", MatrixController, :turn_server) put("/client/r0/rooms/:room_id/send/:event_type/:txn_id", MatrixController, :send_event) + put("/client/r0/user/:user_id/account_data/:type", MatrixController, :set_account_data) end scope "/", Pleroma.Web.MongooseIM do |