diff --git a/matrix/room.cc b/matrix/room.cc index 7e6d92c26..873640b05 100644 --- a/matrix/room.cc +++ b/matrix/room.cc @@ -60,18 +60,20 @@ ircd::m::invite(const room &room, ircd::m::event::id::buf ircd::m::invite(const room &room, - const id::user &target, - const id::user &sender, + const user::id &target, + const user::id &sender, json::iov &content) { - using prototype = event::id::buf (const m::room &, const id::user &, const id::user &, json::iov &); - - static mods::import call + json::iov event; + const json::iov::push push[] { - "client_rooms", "ircd::m::invite" + { event, { "type", "m.room.member" }}, + { event, { "sender", sender }}, + { event, { "state_key", target }}, + { content, { "membership", "invite" }}, }; - return call(room, target, sender, content); + return commit(room, event, content); } ircd::m::event::id::buf diff --git a/modules/client/rooms/invite.cc b/modules/client/rooms/invite.cc index 6d3ca6498..373214fc9 100644 --- a/modules/client/rooms/invite.cc +++ b/modules/client/rooms/invite.cc @@ -57,25 +57,6 @@ post__invite(ircd::client &client, }; } -ircd::m::event::id::buf -IRCD_MODULE_EXPORT -ircd::m::invite(const m::room &room, - const m::user::id &target, - const m::user::id &sender, - json::iov &content) -{ - json::iov event; - const json::iov::push push[] - { - { event, { "type", "m.room.member" }}, - { event, { "sender", sender }}, - { event, { "state_key", target }}, - { content, { "membership", "invite" }}, - }; - - return commit(room, event, content); -} - void ircd::m::on_invite_foreign(const event &event, vm::eval &eval)