diff --git a/ircd/m.cc b/ircd/m.cc index 9a4beab50..a297aa2f5 100644 --- a/ircd/m.cc +++ b/ircd/m.cc @@ -4691,7 +4691,7 @@ ircd::m::send(const room &room, static mods::import function { - "m_room", "ircd::m::send" + "client_rooms", "ircd::m::send" }; return function(room, sender, type, state_key, content); @@ -4741,7 +4741,7 @@ ircd::m::send(const room &room, static mods::import function { - "m_room", "ircd::m::send" + "client_rooms", "ircd::m::send" }; return function(room, sender, type, content); diff --git a/modules/client/rooms/send.cc b/modules/client/rooms/send.cc index 9cd6c21ca..097c79387 100644 --- a/modules/client/rooms/send.cc +++ b/modules/client/rooms/send.cc @@ -97,6 +97,23 @@ put__send(client &client, }; } +ircd::m::event::id::buf +IRCD_MODULE_EXPORT +ircd::m::send(const m::room &room, + const m::id::user &sender, + const string_view &type, + const json::iov &content) +{ + json::iov event; + const json::iov::push push[] + { + { event, { "sender", sender }}, + { event, { "type", type }}, + }; + + return commit(room, event, content); +} + resource::response handle_command(client &client, const resource::request &request, diff --git a/modules/client/rooms/state.cc b/modules/client/rooms/state.cc index 91b4b8f8c..e56ec5e21 100644 --- a/modules/client/rooms/state.cc +++ b/modules/client/rooms/state.cc @@ -13,6 +13,11 @@ using namespace ircd::m; using namespace ircd; +static resource::response +get__state(client &client, + const resource::request &request, + const m::room::state &state); + resource::response put__state(client &client, const resource::request &request, @@ -61,11 +66,6 @@ put__state(client &client, }; } -static resource::response -get__state(client &client, - const resource::request &request, - const m::room::state &state); - resource::response get__state(client &client, const resource::request &request, @@ -167,3 +167,22 @@ get__state(client &client, return response; } + +m::event::id::buf +IRCD_MODULE_EXPORT +ircd::m::send(const m::room &room, + const m::id::user &sender, + const string_view &type, + const string_view &state_key, + const json::iov &content) +{ + json::iov event; + const json::iov::push push[] + { + { event, { "sender", sender }}, + { event, { "type", type }}, + { event, { "state_key", state_key }}, + }; + + return commit(room, event, content); +} diff --git a/modules/m_room.cc b/modules/m_room.cc index 4609a5527..528138975 100644 --- a/modules/m_room.cc +++ b/modules/m_room.cc @@ -16,42 +16,6 @@ IRCD_MODULE "Matrix room library; modular components." }; -ircd::m::event::id::buf -IRCD_MODULE_EXPORT -ircd::m::send(const m::room &room, - const m::id::user &sender, - const string_view &type, - const json::iov &content) -{ - json::iov event; - const json::iov::push push[] - { - { event, { "sender", sender }}, - { event, { "type", type }}, - }; - - return commit(room, event, content); -} - -m::event::id::buf -IRCD_MODULE_EXPORT -ircd::m::send(const m::room &room, - const m::id::user &sender, - const string_view &type, - const string_view &state_key, - const json::iov &content) -{ - json::iov event; - const json::iov::push push[] - { - { event, { "sender", sender }}, - { event, { "type", type }}, - { event, { "state_key", state_key }}, - }; - - return commit(room, event, content); -} - size_t IRCD_MODULE_EXPORT ircd::m::count_since(const m::room &room,