MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-05-19 19:33:45 +02:00
Code Issues Releases Wiki Activity

modules: Re-type matrix resource handlers under m::resource.

Browse source
This commit is contained in:
Jason Volk 2019-09-28 16:12:07 -07:00
parent 85845dcff2
commit d03cf8f7a8
78 changed files with 668 additions and 668 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
modules/client/account/3pid.cc
View file

@ -12,7 +12,7 @@
using namespace ircd;
resource
m::resource
account_3pid
{
"/_matrix/client/r0/account/3pid",
@ -21,9 +21,9 @@ account_3pid
}
};
resource::response
m::resource::response
get__3pid(client &client,
const resource::request &request)
const m::resource::request &request)
{
std::vector<json::value> vec;
json::value threepids
@ -31,7 +31,7 @@ get__3pid(client &client,
vec.data(), vec.size()
};
return resource::response
return m::resource::response
{
client, json::members
{
@ -40,7 +40,7 @@ get__3pid(client &client,
};
}
resource::method
m::resource::method
get_3pid
{
account_3pid, "GET", get__3pid,
@ -49,17 +49,17 @@ get_3pid
}
};
resource::response
m::resource::response
post__3pid(client &client,
const resource::request &request)
const m::resource::request &request)
{
return resource::response
return m::resource::response
{
client, http::OK
};
}
resource::method
m::resource::method
post_3pid
{
account_3pid, "POST", post__3pid,

2
modules/client/account/account.cc
View file

@ -22,7 +22,7 @@ IRCD_MODULE
"Client 3.4,3.5,3.6 :Account"
};
resource
m::resource
account_resource
{
"/_matrix/client/r0/account",

10
modules/client/account/deactivate.cc
View file

@ -12,7 +12,7 @@
using namespace ircd;
resource
m::resource
account_deactivate
{
"/_matrix/client/r0/account/deactivate",
@ -21,9 +21,9 @@ account_deactivate
}
};
resource::response
m::resource::response
post__deactivate(client &client,
const resource::request &request)
const m::resource::request &request)
{
const json::object &auth
{
@ -47,7 +47,7 @@ post__deactivate(client &client,
user.deactivate();
return resource::response
return m::resource::response
{
client, json::members
{
@ -56,7 +56,7 @@ post__deactivate(client &client,
};
}
resource::method
m::resource::method
post_deactivate
{
account_deactivate, "POST", post__deactivate,

10
modules/client/account/password.cc
View file

@ -12,7 +12,7 @@
using namespace ircd;
resource
m::resource
account_password
{
"/_matrix/client/r0/account/password",
@ -21,9 +21,9 @@ account_password
}
};
resource::response
m::resource::response
post__password(client &client,
const resource::request &request)
const m::resource::request &request)
try
{
const json::string &new_password
@ -58,7 +58,7 @@ try
};
user.password(new_password);
return resource::response
return m::resource::response
{
client, http::OK
};
@ -71,7 +71,7 @@ catch(const db::not_found &e)
};
}
resource::method
m::resource::method
post_password
{
account_password, "POST", post__password,

10
modules/client/account/whoami.cc
View file

@ -12,7 +12,7 @@
using namespace ircd;
resource
m::resource
account_whoami
{
"/_matrix/client/r0/account/whoami",
@ -21,11 +21,11 @@ account_whoami
}
};
resource::response
m::resource::response
get__whoami(client &client,
const resource::request &request)
const m::resource::request &request)
{
return resource::response
return m::resource::response
{
client, json::members
{
@ -34,7 +34,7 @@ get__whoami(client &client,
};
}
resource::method
m::resource::method
get_whoami
{
account_whoami, "GET", get__whoami,

2
modules/client/capabilities.cc
View file

@ -13,7 +13,7 @@ namespace ircd::m::client_capabilities
static resource::response get(client &, const resource::request &);
extern resource::method method_get;
extern ircd::resource resource;
extern m::resource resource;
}
ircd::mapi::header

14
modules/client/createroom.cc
View file

@ -10,9 +10,9 @@
using namespace ircd;
static resource::response
static m::resource::response
post__createroom(client &client,
const resource::request::object<m::createroom> &request);
const m::resource::request::object<m::createroom> &request);
mapi::header
IRCD_MODULE
@ -20,7 +20,7 @@ IRCD_MODULE
"Client 7.1.1 :Create Room"
};
resource
m::resource
createroom_resource
{
"/_matrix/client/r0/createRoom",
@ -29,7 +29,7 @@ createroom_resource
}
};
resource::method
m::resource::method
post_method
{
createroom_resource, "POST", post__createroom,
@ -38,9 +38,9 @@ post_method
}
};
resource::response
m::resource::response
post__createroom(client &client,
const resource::request::object<m::createroom> &request)
const m::resource::request::object<m::createroom> &request)
{
m::createroom c
{
@ -101,7 +101,7 @@ post__createroom(client &client,
errors.~array();
top.~object();
return resource::response
return m::resource::response
{
client, http::CREATED, json::object
{

20
modules/client/delete_devices.cc
View file

@ -10,9 +10,9 @@
using namespace ircd;
static resource::response
static m::resource::response
post__delete_devices(client &client,
const resource::request &request);
const m::resource::request &request);
extern const std::string flows;
@ -22,7 +22,7 @@ IRCD_MODULE
"Client 14.10.1.5 :Device Management"
};
ircd::resource
ircd::m::resource
delete_devices_resource
{
"/_matrix/client/r0/delete_devices/",
@ -31,7 +31,7 @@ delete_devices_resource
}
};
ircd::resource
ircd::m::resource
delete_devices_resource__unstable
{
"/_matrix/client/unstable/delete_devices/",
@ -40,7 +40,7 @@ delete_devices_resource__unstable
}
};
resource::method
m::resource::method
method_post
{
delete_devices_resource, "POST", post__delete_devices,
@ -49,7 +49,7 @@ method_post
}
};
resource::method
m::resource::method
method_post__unstable
{
delete_devices_resource__unstable, "POST", post__delete_devices,
@ -58,9 +58,9 @@ method_post__unstable
}
};
resource::response
m::resource::response
post__delete_devices(client &client,
const resource::request &request)
const m::resource::request &request)
{
const json::array &devices
{
@ -75,7 +75,7 @@ post__delete_devices(client &client,
// 14.10.2 Security considerations
const json::string &type{auth["type"]};
if(type != "m.login.password")
return resource::response
return m::resource::response
{
client, http::UNAUTHORIZED, json::object{flows}
};
@ -90,7 +90,7 @@ post__delete_devices(client &client,
for(const json::string &device_id : devices)
m::device::del(request.user_id, device_id);
return resource::response
return m::resource::response
{
client, http::OK
};

58
modules/client/devices.cc
View file

@ -15,22 +15,22 @@ _get_device(json::stack::object &obj,
const m::user &user,
const string_view &device_id);
static resource::response
static m::resource::response
get__devices_all(client &client,
const resource::request &request,
const m::resource::request &request,
const m::room user_room);
static resource::response
static m::resource::response
get__devices(client &client,
const resource::request &request);
const m::resource::request &request);
static resource::response
static m::resource::response
put__devices(client &client,
const resource::request &request);
const m::resource::request &request);
static resource::response
static m::resource::response
delete__devices(client &client,
const resource::request &request);
const m::resource::request &request);
extern const std::string flows;
@ -40,7 +40,7 @@ IRCD_MODULE
"Client 11.9 Device Management"
};
ircd::resource
ircd::m::resource
devices_resource
{
"/_matrix/client/r0/devices/",
@ -50,7 +50,7 @@ devices_resource
}
};
ircd::resource
ircd::m::resource
devices_resource__unstable
{
"/_matrix/client/unstable/devices/",
@ -60,7 +60,7 @@ devices_resource__unstable
}
};
resource::method
m::resource::method
method_get
{
devices_resource, "GET", get__devices,
@ -69,7 +69,7 @@ method_get
}
};
resource::method
m::resource::method
method_get__unstable
{
devices_resource__unstable, "GET", get__devices,
@ -78,7 +78,7 @@ method_get__unstable
}
};
resource::method
m::resource::method
method_delete
{
devices_resource, "DELETE", delete__devices,
@ -87,7 +87,7 @@ method_delete
}
};
resource::method
m::resource::method
method_delete__unstable
{
devices_resource__unstable, "DELETE", delete__devices,
@ -96,7 +96,7 @@ method_delete__unstable
}
};
resource::method
m::resource::method
method_put
{
devices_resource, "PUT", put__devices,
@ -105,7 +105,7 @@ method_put
}
};
resource::method
m::resource::method
method_put__unstable
{
devices_resource__unstable, "PUT", put__devices,
@ -114,9 +114,9 @@ method_put__unstable
}
};
resource::response
m::resource::response
get__devices(client &client,
const resource::request &request)
const m::resource::request &request)
{
const m::user::room user_room
{
@ -137,7 +137,7 @@ get__devices(client &client,
"Device ID '%s' not found", device_id
};
resource::response::chunked response
m::resource::response::chunked response
{
client, http::OK
};
@ -156,9 +156,9 @@ get__devices(client &client,
return {};
}
resource::response
m::resource::response
put__devices(client &client,
const resource::request &request)
const m::resource::request &request)
{
if(request.parv.size() < 1)
throw m::NEED_MORE_PARAMS
@ -176,15 +176,15 @@ put__devices(client &client,
m::device::set(request.user_id, data);
return resource::response
return m::resource::response
{
client, http::OK
};
}
resource::response
m::resource::response
delete__devices(client &client,
const resource::request &request)
const m::resource::request &request)
{
if(request.parv.size() < 1)
throw m::NEED_MORE_PARAMS
@ -205,7 +205,7 @@ delete__devices(client &client,
// 14.10.2 Security considerations
const json::string &type{auth["type"]};
if(type != "m.login.password")
return resource::response
return m::resource::response
{
client, http::UNAUTHORIZED, json::object{flows}
};
@ -219,18 +219,18 @@ delete__devices(client &client,
m::device::del(request.user_id, device_id);
return resource::response
return m::resource::response
{
client, http::OK
};
}
resource::response
m::resource::response
get__devices_all(client &client,
const resource::request &request,
const m::resource::request &request,
const m::room user_room)
{
resource::response::chunked response
m::resource::response::chunked response
{
client, http::OK
};

26
modules/client/directory/list/room.cc
View file

@ -10,13 +10,13 @@
using namespace ircd;
static resource::response
static m::resource::response
get__list_room(client &client,
const resource::request &request);
const m::resource::request &request);
static resource::response
static m::resource::response
put__list_room(client &client,
const resource::request &request);
const m::resource::request &request);
mapi::header
IRCD_MODULE
@ -24,7 +24,7 @@ IRCD_MODULE
"Client 10.5 :Listing rooms"
};
resource
m::resource
list_room_resource
{
"/_matrix/client/r0/directory/list/room/",
@ -34,7 +34,7 @@ list_room_resource
}
};
resource::method
m::resource::method
list_room_put
{
list_room_resource, "PUT", put__list_room,
@ -43,9 +43,9 @@ list_room_put
}
};
resource::response
m::resource::response
put__list_room(client &client,
const resource::request &request)
const m::resource::request &request)
{
if(request.parv.size() < 1)
throw m::NEED_MORE_PARAMS
@ -112,21 +112,21 @@ put__list_room(client &client,
};
}
return resource::response
return m::resource::response
{
client, http::OK
};
}
resource::method
m::resource::method
list_room_get
{
list_room_resource, "GET", get__list_room
};
resource::response
m::resource::response
get__list_room(client &client,
const resource::request &request)
const m::resource::request &request)
{
if(request.parv.size() < 1)
throw m::NEED_MORE_PARAMS
@ -156,7 +156,7 @@ get__list_room(client &client,
m::rooms::summary::has(room_id)? "public" : "private"
};
return resource::response
return m::resource::response
{
client, json::members
{

40
modules/client/directory/room.cc
View file

@ -16,7 +16,7 @@ IRCD_MODULE
"Client 7.2 :Room aliases"
};
resource
m::resource
directory_room_resource
{
"/_matrix/client/r0/directory/room/",
@ -26,19 +26,19 @@ directory_room_resource
}
};
static resource::response
static m::resource::response
get__directory_room(client &client,
const resource::request &request);
const m::resource::request &request);
resource::method
m::resource::method
directory_room_get
{
directory_room_resource, "GET", get__directory_room
};
resource::response
m::resource::response
get__directory_room(client &client,
const resource::request &request)
const m::resource::request &request)
{
m::room::alias::buf room_alias
{
@ -50,7 +50,7 @@ get__directory_room(client &client,
m::room_id(room_alias)
};
return resource::response
return m::resource::response
{
client, json::members
{
@ -59,11 +59,11 @@ get__directory_room(client &client,
};
}
static resource::response
static m::resource::response
put__directory_room(client &client,
const resource::request &request);
const m::resource::request &request);
resource::method
m::resource::method
directory_room_put
{
directory_room_resource, "PUT", put__directory_room,
@ -72,9 +72,9 @@ directory_room_put
}
};
resource::response
m::resource::response
put__directory_room(client &client,
const resource::request &request)
const m::resource::request &request)
{
if(request.parv.size() < 1)
throw m::NEED_MORE_PARAMS
@ -150,7 +150,7 @@ put__directory_room(client &client,
})
};
return resource::response
return m::resource::response
{
client, json::members
{
@ -159,11 +159,11 @@ put__directory_room(client &client,
};
}
static resource::response
static m::resource::response
delete__directory_room(client &client,
const resource::request &request);
const m::resource::request &request);
resource::method
m::resource::method
directory_room_delete
{
directory_room_resource, "DELETE", delete__directory_room,
@ -172,9 +172,9 @@ directory_room_delete
}
};
resource::response
m::resource::response
delete__directory_room(client &client,
const resource::request &request)
const m::resource::request &request)
{
if(request.parv.size() < 1)
throw m::NEED_MORE_PARAMS
@ -227,7 +227,7 @@ delete__directory_room(client &client,
}
if(!removed)
return resource::response
return m::resource::response
{
client, http::OK
};
@ -242,7 +242,7 @@ delete__directory_room(client &client,
})
};
return resource::response
return m::resource::response
{
client, json::members
{

2
modules/client/events.cc
View file

@ -36,7 +36,7 @@ static resource::response
get__events(client &client,
const m::resource::request &request);
resource
m::resource
events_resource
{
"/_matrix/client/r0/events",

78
modules/client/initialsync.cc
View file

@ -34,7 +34,7 @@ call the /sync API with no since parameter.
// sync resource
//
resource
m::resource
initialsync_resource
{
"/_matrix/client/r0/initialSync",
@ -43,11 +43,11 @@ initialsync_resource
}
};
resource::response
m::resource::response
initialsync(client &client,
const resource::request &request);
const m::resource::request &request);
resource::method
m::resource::method
get_initialsync
{
initialsync_resource, "GET", initialsync,
@ -73,12 +73,12 @@ initialsync_limit_max
static void
_initialsync(client &client,
const resource::request &request,
const m::resource::request &request,
json::stack::object &out);
resource::response
m::resource::response
initialsync(client &client,
const resource::request &request)
const m::resource::request &request)
try
{
const auto &filter_id
@ -106,7 +106,7 @@ try
96_KiB
};
resource::response::chunked response
m::resource::response::chunked response
{
client, http::OK, "application/json; charset=utf-8"
};
@ -139,25 +139,25 @@ catch(const std::exception &e)
static void
initialsync_rooms(client &client,
const resource::request &request,
const m::resource::request &request,
json::stack::object &out,
const m::user::room &);
static void
initialsync_presence(client &client,
const resource::request &request,
const m::resource::request &request,
json::stack::object &out,
const m::user &user);
static void
initialsync_account_data(client &client,
const resource::request &request,
const m::resource::request &request,
json::stack::object &out,
const m::user::room &);
void
_initialsync(client &client,
const resource::request &request,
const m::resource::request &request,
json::stack::object &out)
{
const m::user user{request.user_id};
@ -200,7 +200,7 @@ _initialsync(client &client,
void
initialsync_presence(client &client,
const resource::request &request,
const m::resource::request &request,
json::stack::object &out,
const m::user &user)
{
@ -247,7 +247,7 @@ initialsync_presence(client &client,
void
initialsync_account_data(client &client,
const resource::request &request,
const m::resource::request &request,
json::stack::object &out,
const m::user::room &user_room)
{
@ -280,25 +280,25 @@ initialsync_account_data(client &client,
static void
initialsync_rooms_join(client &client,
const resource::request &request,
const m::resource::request &request,
json::stack::object &out,
const m::user::room &user_room);
static void
initialsync_rooms_leave(client &client,
const resource::request &request,
const m::resource::request &request,
json::stack::object &out,
const m::user::room &user_room);
static void
initialsync_rooms_invite(client &client,
const resource::request &request,
const m::resource::request &request,
json::stack::object &out,
const m::user::room &user_room);
void
initialsync_rooms(client &client,
const resource::request &request,
const m::resource::request &request,
json::stack::object &out,
const m::user::room &user_room)
{
@ -326,13 +326,13 @@ initialsync_rooms(client &client,
void
initialsync_rooms__membership(client &client,
const resource::request &request,
const m::resource::request &request,
json::stack::object &out,
const m::user::room &user_room,
const string_view &membership);
void
initialsync_rooms_join(client &client,
const resource::request &request,
const m::resource::request &request,
json::stack::object &out,
const m::user::room &user_room)
{
@ -341,7 +341,7 @@ initialsync_rooms_join(client &client,
void
initialsync_rooms_leave(client &client,
const resource::request &request,
const m::resource::request &request,
json::stack::object &out,
const m::user::room &user_room)
{
@ -350,7 +350,7 @@ initialsync_rooms_leave(client &client,
void
initialsync_rooms_invite(client &client,
const resource::request &request,
const m::resource::request &request,
json::stack::object &out,
const m::user::room &user_room)
{
@ -359,7 +359,7 @@ initialsync_rooms_invite(client &client,
static void
initialsync_room(client &client,
const resource::request &request,
const m::resource::request &request,
json::stack::object &out,
const m::user::room &user_room,
const m::room &room,
@ -367,7 +367,7 @@ initialsync_room(client &client,
void
initialsync_rooms__membership(client &client,
const resource::request &request,
const m::resource::request &request,
json::stack::object &out,
const m::user::room &user_room,
const string_view &membership)
@ -389,42 +389,42 @@ initialsync_rooms__membership(client &client,
static void
initialsync_room_state(client &client,
const resource::request &request,
const m::resource::request &request,
json::stack::object &out,
const m::user::room &user_room,
const m::room &room);
static void
initialsync_room_timeline(client &client,
const resource::request &request,
const m::resource::request &request,
json::stack::object &out,
const m::user::room &user_room,
const m::room &room);
static void
initialsync_room_ephemeral(client &client,
const resource::request &request,
const m::resource::request &request,
json::stack::object &out,
const m::user::room &user_room,
const m::room &room);
static void
initialsync_room_account_data(client &client,
const resource::request &request,
const m::resource::request &request,
json::stack::object &out,
const m::user::room &user_room,
const m::room &room);
static void
initialsync_room_unread_notifications(client &client,
const resource::request &request,
const m::resource::request &request,
json::stack::object &out,
const m::user::room &user_room,
const m::room &room);
void
initialsync_room(client &client,
const resource::request &request,
const m::resource::request &request,
json::stack::object &out,
const m::user::room &user_room,
const m::room &room,
@ -474,7 +474,7 @@ initialsync_room(client &client,
void
initialsync_room_state(client &client,
const resource::request &request,
const m::resource::request &request,
json::stack::object &out,
const m::user::room &user_room,
const m::room &room)
@ -497,14 +497,14 @@ initialsync_room_state(client &client,
static m::event::id::buf
initialsync_room_timeline_events(client &client,
const resource::request &request,
const m::resource::request &request,
json::stack::array &out,
const m::user::room &user_room,
const m::room &room);
void
initialsync_room_timeline(client &client,
const resource::request &request,
const m::resource::request &request,
json::stack::object &out,
const m::user::room &user_room,
const m::room &room)
@ -539,7 +539,7 @@ initialsync_room_timeline(client &client,
m::event::id::buf
initialsync_room_timeline_events(client &client,
const resource::request &request,
const m::resource::request &request,
json::stack::array &out,
const m::user::room &user_room,
const m::room &room)
@ -572,13 +572,13 @@ initialsync_room_timeline_events(client &client,
static void
initialsync_room_ephemeral_events(client &client,
const resource::request &request,
const m::resource::request &request,
json::stack::array &out,
const m::room &room);
void
initialsync_room_ephemeral(client &client,
const resource::request &request,
const m::resource::request &request,
json::stack::object &out,
const m::user::room &user_room,
const m::room &room)
@ -592,7 +592,7 @@ initialsync_room_ephemeral(client &client,
void
initialsync_room_ephemeral_events(client &client,
const resource::request &request,
const m::resource::request &request,
json::stack::array &events,
const m::room &room)
{
@ -655,7 +655,7 @@ initialsync_room_ephemeral_events(client &client,
void
initialsync_room_account_data(client &client,
const resource::request &request,
const m::resource::request &request,
json::stack::object &out,
const m::user::room &user_room,
const m::room &room)
@ -665,7 +665,7 @@ initialsync_room_account_data(client &client,
void
initialsync_room_unread_notifications(client &client,
const resource::request &request,
const m::resource::request &request,
json::stack::object &out,
const m::user::room &user_room,
const m::room &room)

28
modules/client/join.cc
View file

@ -16,7 +16,7 @@ IRCD_MODULE
"Client 7.4.2.3 :Join"
};
resource
m::resource
join_resource
{
"/_matrix/client/r0/join/",
@ -26,19 +26,19 @@ join_resource
}
};
static resource::response
static m::resource::response
_post__join(client &client,
const resource::request &request,
const m::resource::request &request,
const m::room::id &room_id);
static resource::response
static m::resource::response
_post__join(client &client,
const resource::request &request,
const m::resource::request &request,
const m::room::alias &room_alias);
resource::response
m::resource::response
post__join(client &client,
const resource::request &request)
const m::resource::request &request)
{
if(request.parv.size() < 1)
throw http::error
@ -67,7 +67,7 @@ post__join(client &client,
}
}
resource::method
m::resource::method
method_post
{
join_resource, "POST", post__join,
@ -76,14 +76,14 @@ method_post
}
};
static resource::response
static m::resource::response
_post__join(client &client,
const resource::request &request,
const m::resource::request &request,
const m::room::alias &room_alias)
{
m::join(room_alias, request.user_id);
return resource::response
return m::resource::response
{
client, json::members
{
@ -95,9 +95,9 @@ _post__join(client &client,
/// This function forwards the join request to the /rooms/{room_id}/join
/// module so they can reuse the same code. That's done with the m::join()
/// convenience linkage.
static resource::response
static m::resource::response
_post__join(client &client,
const resource::request &request,
const m::resource::request &request,
const m::room::id &room_id)
{
const m::room room
@ -107,7 +107,7 @@ _post__join(client &client,
m::join(room, request.user_id);
return resource::response
return m::resource::response
{
client, json::members
{

18
modules/client/keys/changes.cc
View file

@ -10,9 +10,9 @@
using namespace ircd;
static resource::response
static m::resource::response
get__keys_changes(client &client,
const resource::request &request);
const m::resource::request &request);
mapi::header
IRCD_MODULE
@ -20,7 +20,7 @@ IRCD_MODULE
"Client 14.11.5.2 :Key management API"
};
ircd::resource
ircd::m::resource
changes_resource
{
"/_matrix/client/r0/keys/changes",
@ -29,7 +29,7 @@ changes_resource
}
};
ircd::resource
ircd::m::resource
changes_resource__unstable
{
"/_matrix/client/unstable/keys/changes",
@ -38,7 +38,7 @@ changes_resource__unstable
}
};
resource::method
m::resource::method
method_get
{
changes_resource, "GET", get__keys_changes,
@ -47,7 +47,7 @@ method_get
}
};
resource::method
m::resource::method
method_get__unstable
{
changes_resource__unstable, "GET", get__keys_changes,
@ -56,11 +56,11 @@ method_get__unstable
}
};
resource::response
m::resource::response
get__keys_changes(client &client,
const resource::request &request)
const m::resource::request &request)
{
return resource::response
return m::resource::response
{
client, http::OK
};

18
modules/client/keys/claim.cc
View file

@ -51,9 +51,9 @@ static void
handle_failures(const failure_map &,
json::stack::object &);
static resource::response
static m::resource::response
post__keys_claim(client &client,
const resource::request &request);
const m::resource::request &request);
mapi::header
IRCD_MODULE
@ -61,7 +61,7 @@ IRCD_MODULE
"Client 14.11.5.2 :Key management API"
};
ircd::resource
ircd::m::resource
claim_resource
{
"/_matrix/client/r0/keys/claim",
@ -70,7 +70,7 @@ claim_resource
}
};
ircd::resource
ircd::m::resource
claim_resource__unstable
{
"/_matrix/client/unstable/keys/claim",
@ -79,7 +79,7 @@ claim_resource__unstable
}
};
resource::method
m::resource::method
method_post
{
claim_resource, "POST", post__keys_claim,
@ -88,7 +88,7 @@ method_post
}
};
resource::method
m::resource::method
method_post__unstable
{
claim_resource__unstable, "POST", post__keys_claim,
@ -118,9 +118,9 @@ claim_timeout_max
{ "default", 20000L },
};
resource::response
m::resource::response
post__keys_claim(client &client,
const resource::request &request)
const m::resource::request &request)
{
const milliseconds timeout{[&request]
{
@ -148,7 +148,7 @@ post__keys_claim(client &client,
send_requests(map, buffers, failures)
};
resource::response::chunked response
m::resource::response::chunked response
{
client, http::OK
};

18
modules/client/keys/query.cc
View file

@ -50,9 +50,9 @@ static void
handle_failures(const failure_map &,
json::stack::object &);
static resource::response
static m::resource::response
post__keys_query(client &client,
const resource::request &request);
const m::resource::request &request);
mapi::header
IRCD_MODULE
@ -60,7 +60,7 @@ IRCD_MODULE
"Client 14.11.5.2 :Key management API"
};
ircd::resource
ircd::m::resource
query_resource
{
"/_matrix/client/r0/keys/query",
@ -69,7 +69,7 @@ query_resource
}
};
ircd::resource
ircd::m::resource
query_resource__unstable
{
"/_matrix/client/unstable/keys/query",
@ -78,7 +78,7 @@ query_resource__unstable
}
};
resource::method
m::resource::method
method_post
{
query_resource, "POST", post__keys_query,
@ -87,7 +87,7 @@ method_post
}
};
resource::method
m::resource::method
method_post__unstable
{
query_resource__unstable, "POST", post__keys_query,
@ -117,9 +117,9 @@ query_timeout_max
{ "default", 20000L },
};
resource::response
m::resource::response
post__keys_query(client &client,
const resource::request &request)
const m::resource::request &request)
{
const milliseconds timeout{[&request]
{
@ -152,7 +152,7 @@ post__keys_query(client &client,
send_requests(map, buffers, failures)
};
resource::response::chunked response
m::resource::response::chunked response
{
client, http::OK
};

26
modules/client/keys/upload.cc
View file

@ -12,19 +12,19 @@ using namespace ircd;
static void
upload_device_keys(client &,
const resource::request &,
const m::resource::request &,
const m::device::id &,
const m::device_keys &);
static void
upload_one_time_keys(client &,
const resource::request &,
const m::resource::request &,
const m::device::id &,
const json::object &);
static resource::response
static m::resource::response
post__keys_upload(client &client,
const resource::request &request);
const m::resource::request &request);
mapi::header
IRCD_MODULE
@ -32,7 +32,7 @@ IRCD_MODULE
"Client 14.11.5.2 :Key management API"
};
ircd::resource
ircd::m::resource
upload_resource
{
"/_matrix/client/r0/keys/upload",
@ -42,7 +42,7 @@ upload_resource
}
};
ircd::resource
ircd::m::resource
upload_resource__unstable
{
"/_matrix/client/unstable/keys/upload",
@ -52,7 +52,7 @@ upload_resource__unstable
}
};
resource::method
m::resource::method
method_post
{
upload_resource, "POST", post__keys_upload,
@ -61,7 +61,7 @@ method_post
}
};
resource::method
m::resource::method
method_post__unstable
{
upload_resource__unstable, "POST", post__keys_upload,
@ -70,9 +70,9 @@ method_post__unstable
}
};
resource::response
m::resource::response
post__keys_upload(client &client,
const resource::request &request)
const m::resource::request &request)
{
const m::user::room user_room
{
@ -125,7 +125,7 @@ post__keys_upload(client &client,
one_time_key_counts.~object();
top.~object();
return resource::response
return m::resource::response
{
client, json::object
{
@ -136,7 +136,7 @@ post__keys_upload(client &client,
void
upload_one_time_keys(client &client,
const resource::request &request,
const m::resource::request &request,
const m::device::id &device_id,
const json::object &one_time_keys)
{
@ -174,7 +174,7 @@ upload_one_time_keys(client &client,
void
upload_device_keys(client &client,
const resource::request &request,
const m::resource::request &request,
const m::device::id &device_id,
const m::device_keys &device_keys)
{

28
modules/client/logout.cc
View file

@ -14,13 +14,13 @@ static bool
do_logout(const m::user::id &user_id,
const m::event::idx &token_event_idx);
static resource::response
static m::resource::response
post__logout(client &,
const resource::request &);
const m::resource::request &);
static resource::response
static m::resource::response
post__logout_all(client &,
const resource::request &);
const m::resource::request &);
mapi::header
IRCD_MODULE
@ -28,7 +28,7 @@ IRCD_MODULE
"Client 3.3.2 :Logout"
};
resource
m::resource
logout_resource
{
"/_matrix/client/r0/logout",
@ -38,7 +38,7 @@ logout_resource
}
};
resource
m::resource
logout_all_resource
{
"/_matrix/client/r0/logout/all",
@ -49,7 +49,7 @@ logout_all_resource
}
};
resource::method
m::resource::method
post_method
{
logout_resource, "POST", post__logout,
@ -58,7 +58,7 @@ post_method
}
};
resource::method
m::resource::method
post_all_method
{
logout_all_resource, "POST", post__logout_all,
@ -67,9 +67,9 @@ post_all_method
}
};
resource::response
m::resource::response
post__logout(client &client,
const resource::request &request)
const m::resource::request &request)
{
const auto &access_token
{
@ -88,15 +88,15 @@ post__logout(client &client,
do_logout(request.user_id, token_event_idx);
return resource::response
return m::resource::response
{
client, http::OK
};
}
resource::response
m::resource::response
post__logout_all(client &client,
const resource::request &request)
const m::resource::request &request)
{
const m::room::state tokens
{
@ -121,7 +121,7 @@ post__logout_all(client &client,
}
}});
return resource::response
return m::resource::response
{
client, json::members
{

46
modules/client/presence.cc
View file

@ -16,7 +16,7 @@ IRCD_MODULE
"Client 11.6 :Presence"
};
ircd::resource
m::resource
presence_resource
{
"/_matrix/client/r0/presence/",
@ -30,11 +30,11 @@ presence_resource
// get
//
static resource::response
static m::resource::response
get__presence(client &,
const resource::request &);
const m::resource::request &);
resource::method
m::resource::method
method_get
{
presence_resource, "GET", get__presence
@ -42,12 +42,12 @@ method_get
static resource::response
get__presence_status(client &,
const resource::request &,
const m::resource::request &,
const m::user::id &);
resource::response
get__presence(client &client,
const resource::request &request)
const m::resource::request &request)
{
if(request.parv.size() < 1)
throw m::NEED_MORE_PARAMS
@ -82,7 +82,7 @@ get__presence(client &client,
resource::response
get__presence_status(client &client,
const resource::request &request,
const m::resource::request &request,
const m::user::id &user_id)
{
const m::user user
@ -106,11 +106,11 @@ get__presence_status(client &client,
// POST ?
//
static resource::response
static m::resource::response
post__presence(client &,
const resource::request &);
const m::resource::request &);
resource::method
m::resource::method
method_post
{
presence_resource, "POST", post__presence,
@ -119,9 +119,9 @@ method_post
}
};
resource::response
m::resource::response
post__presence(client &client,
const resource::request &request)
const m::resource::request &request)
{
if(request.parv.size() < 1)
throw m::NEED_MORE_PARAMS
@ -139,16 +139,16 @@ post__presence(client &client,
// put
//
static resource::response
static m::resource::response
put__presence_status(client &,
const resource::request &,
const m::resource::request &,
const m::user::id &);
static resource::response
static m::resource::response
put__presence(client &,
const resource::request &);
const m::resource::request &);
resource::method
m::resource::method
method_put
{
presence_resource, "PUT", put__presence,
@ -157,9 +157,9 @@ method_put
}
};
resource::response
m::resource::response
put__presence(client &client,
const resource::request &request)
const m::resource::request &request)
{
if(request.parv.size() < 1)
throw m::NEED_MORE_PARAMS
@ -200,9 +200,9 @@ put__presence(client &client,
};
}
resource::response
m::resource::response
put__presence_status(client &client,
const resource::request &request,
const m::resource::request &request,
const m::user::id &user_id)
{
const string_view &presence
@ -240,7 +240,7 @@ put__presence_status(client &client,
});
if(!modified)
return resource::response
return m::resource::response
{
client, http::OK
};
@ -250,7 +250,7 @@ put__presence_status(client &client,
m::presence::set(user, presence, status_msg)
};
return resource::response
return m::resource::response
{
client, http::OK
};

26
modules/client/profile.cc
View file

@ -12,8 +12,8 @@ using namespace ircd;
[[noreturn]] static void rethrow(const std::exception_ptr &, const m::user &, const string_view &);
static std::exception_ptr fetch_profile_remote(const m::user &, const string_view &);
static resource::response get__profile(client &, const resource::request &);
static resource::response put__profile(client &, const resource::request &);
static m::resource::response get__profile(client &, const m::resource::request &);
static m::resource::response put__profile(client &, const m::resource::request &);
mapi::header
IRCD_MODULE
@ -27,7 +27,7 @@ PARAM_MAX_SIZE
128
};
ircd::resource
ircd::m::resource
profile_resource
{
"/_matrix/client/r0/profile/",
@ -37,13 +37,13 @@ profile_resource
}
};
resource::method
m::resource::method
method_get
{
profile_resource, "GET", get__profile
};
resource::method
m::resource::method
method_put
{
profile_resource, "PUT", put__profile,
@ -52,9 +52,9 @@ method_put
}
};
resource::response
m::resource::response
put__profile(client &client,
const resource::request &request)
const m::resource::request &request)
{
if(request.parv.size() < 1)
throw m::NEED_MORE_PARAMS
@ -110,7 +110,7 @@ put__profile(client &client,
});
if(!modified)
return resource::response
return m::resource::response
{
client, http::OK
};
@ -120,15 +120,15 @@ put__profile(client &client,
profile.set(param, value)
};
return resource::response
return m::resource::response
{
client, http::OK
};
}
resource::response
m::resource::response
get__profile(client &client,
const resource::request &request)
const m::resource::request &request)
{
if(request.parv.size() < 1)
throw m::NEED_MORE_PARAMS
@ -176,7 +176,7 @@ get__profile(client &client,
profile.get(param, [&client]
(const string_view &param, const string_view &value)
{
resource::response
m::resource::response
{
client, json::members
{
@ -220,7 +220,7 @@ get__profile(client &client,
string_view{user.user_id}
};
resource::response::chunked response
m::resource::response::chunked response
{
client, http::OK
};

6
modules/client/rooms/ban.cc
View file

@ -12,9 +12,9 @@
using namespace ircd;
resource::response
m::resource::response
post__ban(client &client,
const resource::request &request,
const m::resource::request &request,
const m::room::id &room_id)
{
const m::user::id &user_id
@ -61,7 +61,7 @@ post__ban(client &client,
})
};
return resource::response
return m::resource::response
{
client, http::OK, json::members
{

6
modules/client/rooms/context.cc
View file

@ -47,9 +47,9 @@ _append(json::stack::array &,
const int64_t &,
const bool &query_txnid = true);
resource::response
m::resource::response
get__context(client &client,
const resource::request &request,
const m::resource::request &request,
const m::room::id &room_id)
{
if(request.parv.size() < 3)
@ -114,7 +114,7 @@ get__context(client &client,
m::depth(std::nothrow, room_id)
};
resource::response::chunked response
m::resource::response::chunked response
{
client, http::OK
};

6
modules/client/rooms/event.cc
View file

@ -12,9 +12,9 @@
using namespace ircd;
resource::response
m::resource::response
get__event(client &client,
const resource::request &request,
const m::resource::request &request,
const m::room::id &room_id)
{
if(request.parv.size() < 3)
@ -46,7 +46,7 @@ get__event(client &client,
event_id, fopts
};
return resource::response
return m::resource::response
{
client, event.source
};

6
modules/client/rooms/forget.cc
View file

@ -12,9 +12,9 @@
using namespace ircd;
resource::response
m::resource::response
post__forget(client &client,
const resource::request &request,
const m::resource::request &request,
const m::room::id &room_id)
{
const m::room room
@ -56,7 +56,7 @@ post__forget(client &client,
redact(user_room, request.user_id, event_id, "forget")
};
return resource::response
return m::resource::response
{
client, http::OK
};

14
modules/client/rooms/initialsync.cc
View file

@ -12,12 +12,12 @@ using namespace ircd;
static void
get__initialsync_remote(client &client,
const resource::request &request,
const m::resource::request &request,
const m::room &room);
static void
get__initialsync_local(client &client,
const resource::request &request,
const m::resource::request &request,
const m::room &room,
const m::user &user,
json::stack::object &out);
@ -43,9 +43,9 @@ flush_hiwat
{ "default", long(32_KiB) },
};
resource::response
m::resource::response
get__initialsync(client &client,
const resource::request &request,
const m::resource::request &request,
const m::room::id &room_id)
{
const m::room room
@ -64,7 +64,7 @@ get__initialsync(client &client,
};
}
resource::response::chunked response
m::resource::response::chunked response
{
client, http::OK, buffer_size
};
@ -85,7 +85,7 @@ get__initialsync(client &client,
void
get__initialsync_local(client &client,
const resource::request &request,
const m::resource::request &request,
const m::room &room,
const m::user &user,
json::stack::object &out)
@ -258,7 +258,7 @@ get__initialsync_local(client &client,
void
get__initialsync_remote(client &client,
const resource::request &request,
const m::resource::request &request,
const m::room &room)
{
const m::room::origins origins{room};

6
modules/client/rooms/invite.cc
View file

@ -29,9 +29,9 @@ ircd::m::invite_foreign_hook
}
};
ircd::resource::response
ircd::m::resource::response
post__invite(ircd::client &client,
const ircd::resource::request &request,
const ircd::m::resource::request &request,
const ircd::m::room::id &room_id)
{
using namespace ircd;
@ -51,7 +51,7 @@ post__invite(ircd::client &client,
m::invite(room_id, target, sender)
};
return resource::response
return m::resource::response
{
client, http::OK
};

6
modules/client/rooms/join.cc
View file

@ -12,9 +12,9 @@
using namespace ircd;
resource::response
m::resource::response
post__join(client &client,
const resource::request &request,
const m::resource::request &request,
const m::room::id &room_id)
{
const json::string &third_party_signed
@ -34,7 +34,7 @@ post__join(client &client,
m::join(room, request.user_id);
return resource::response
return m::resource::response
{
client, json::members
{

6
modules/client/rooms/kick.cc
View file

@ -12,9 +12,9 @@
using namespace ircd;
resource::response
m::resource::response
post__kick(client &client,
const resource::request &request,
const m::resource::request &request,
const m::room::id &room_id)
{
const m::user::id &user_id
@ -61,7 +61,7 @@ post__kick(client &client,
})
};
return resource::response
return m::resource::response
{
client, http::OK, json::members
{

8
modules/client/rooms/leave.cc
View file

@ -12,9 +12,9 @@
using namespace ircd;
resource::response
m::resource::response
post__leave(client &client,
const resource::request &request,
const m::resource::request &request,
const m::room::id &room_id)
{
const m::room room
@ -48,7 +48,7 @@ post__leave(client &client,
})
};
return resource::response
return m::resource::response
{
client, http::OK, json::members
{
@ -62,7 +62,7 @@ post__leave(client &client,
m::leave(room, request.user_id)
};
return resource::response
return m::resource::response
{
client, http::OK, json::members
{

12
modules/client/rooms/members.cc
View file

@ -12,9 +12,9 @@
using namespace ircd;
resource::response
m::resource::response
get__members(client &client,
const resource::request &request,
const m::resource::request &request,
const m::room::id &room_id)
{
// Acquire the membership/not_membership constraints from query string
@ -88,7 +88,7 @@ get__members(client &client,
string_view{room_id}
};
resource::response::chunked response
m::resource::response::chunked response
{
client, http::OK
};
@ -185,9 +185,9 @@ get__members(client &client,
return std::move(response);
}
resource::response
m::resource::response
get__joined_members(client &client,
const resource::request &request,
const m::resource::request &request,
const m::room::id &room_id)
{
const m::room room
@ -209,7 +209,7 @@ get__joined_members(client &client,
string_view{room_id}
};
resource::response::chunked response
m::resource::response::chunked response
{
client, http::OK
};

10
modules/client/rooms/messages.cc
View file

@ -19,7 +19,7 @@ struct pagination_tokens
m::event::id::buf from;
m::event::id::buf to;
pagination_tokens(const resource::request &);
pagination_tokens(const m::resource::request &);
};
static bool
@ -42,9 +42,9 @@ messages_log
"m.messages"
};
resource::response
m::resource::response
get__messages(client &client,
const resource::request &request,
const m::resource::request &request,
const m::room::id &room_id)
{
const pagination_tokens page
@ -95,7 +95,7 @@ get__messages(client &client,
m::depth(std::nothrow, room)
};
resource::response::chunked response
m::resource::response::chunked response
{
client, http::OK
};
@ -202,7 +202,7 @@ _append(json::stack::array &chunk,
}
// Client-Server 6.3.6 query parameters
pagination_tokens::pagination_tokens(const resource::request &request)
pagination_tokens::pagination_tokens(const m::resource::request &request)
try
:limit
{

12
modules/client/rooms/read_markers.cc
View file

@ -14,19 +14,19 @@ using namespace ircd;
void // This is in receipt.cc; not listed in rooms.h so we declare here.
handle_receipt_m_read(client &client,
const resource::request &request,
const m::resource::request &request,
const m::room::id &room_id,
const m::event::id &event_id);
static void
handle_m_fully_read(client &client,
const resource::request &request,
const m::resource::request &request,
const m::room::id &room_id,
const json::string &input);
resource::response
m::resource::response
post__read_markers(client &client,
const resource::request &request,
const m::resource::request &request,
const m::room::id &room_id)
{
const json::string &m_read
@ -45,7 +45,7 @@ post__read_markers(client &client,
if(m_read)
handle_receipt_m_read(client, request, room_id, m_read);
return resource::response
return m::resource::response
{
client, http::OK
};
@ -53,7 +53,7 @@ post__read_markers(client &client,
void
handle_m_fully_read(client &client,
const resource::request &request,
const m::resource::request &request,
const m::room::id &room_id,
const json::string &input)
{

10
modules/client/rooms/receipt.cc
View file

@ -14,13 +14,13 @@ using namespace ircd;
void
handle_receipt_m_read(client &client,
const resource::request &request,
const m::resource::request &request,
const m::room::id &room_id,
const m::event::id &event_id);
resource::response
m::resource::response
post__receipt(client &client,
const resource::request &request,
const m::resource::request &request,
const m::room::id &room_id)
{
if(request.parv.size() < 3)
@ -55,7 +55,7 @@ post__receipt(client &client,
receipt_type
};
return resource::response
return m::resource::response
{
client, http::OK
};
@ -63,7 +63,7 @@ post__receipt(client &client,
void
handle_receipt_m_read(client &client,
const resource::request &request,
const m::resource::request &request,
const m::room::id &room_id,
const m::event::id &event_id)
{

12
modules/client/rooms/redact.cc
View file

@ -13,9 +13,9 @@
using namespace ircd::m;
using namespace ircd;
resource::response
m::resource::response
put__redact(client &client,
const resource::request &request,
const m::resource::request &request,
const room::id &room_id)
{
if(request.parv.size() < 3)
@ -55,7 +55,7 @@ put__redact(client &client,
m::redact(room, request.user_id, redacts, reason)
};
return resource::response
return m::resource::response
{
client, json::members
{
@ -64,9 +64,9 @@ put__redact(client &client,
};
}
resource::response
m::resource::response
post__redact(client &client,
const resource::request &request,
const m::resource::request &request,
const room::id &room_id)
{
if(request.parv.size() < 3)
@ -95,7 +95,7 @@ post__redact(client &client,
m::redact(room, request.user_id, redacts, reason)
};
return resource::response
return m::resource::response
{
client, json::members
{

10
modules/client/rooms/relations.cc
View file

@ -14,16 +14,16 @@ using namespace ircd;
static void
relations_chunk(client &client,
const resource::request &request,
const m::resource::request &request,
const m::room::id &room_id,
const m::event::id &event_id,
const string_view &rel_type,
const string_view &type,
json::stack::array &chunk);
resource::response
m::resource::response
get__relations(client &client,
const resource::request &request,
const m::resource::request &request,
const m::room::id &room_id)
{
if(!m::exists(room_id))
@ -80,7 +80,7 @@ get__relations(client &client,
url::decode(type_buf, request.parv[4])
};
resource::response::chunked response
m::resource::response::chunked response
{
client, http::OK
};
@ -106,7 +106,7 @@ get__relations(client &client,
void
relations_chunk(client &client,
const resource::request &request,
const m::resource::request &request,
const m::room::id &room_id,
const m::event::id &event_id,
const string_view &rel_type,

6
modules/client/rooms/report.cc
View file

@ -38,9 +38,9 @@ create_report_room_hook
}
};
resource::response
m::resource::response
post__report(client &client,
const resource::request &request,
const m::resource::request &request,
const m::room::id &room_id)
{
if(request.parv.size() < 3)
@ -97,7 +97,7 @@ post__report(client &client,
{ "reason", trunc(reason, size_t(reason_max)) },
});
return resource::response
return m::resource::response
{
client, http::OK
};

33
modules/client/rooms/rooms.cc
View file

@ -10,16 +10,15 @@
#include "rooms.h"
using namespace ircd::m;
using namespace ircd;
mapi::header
ircd::mapi::header
IRCD_MODULE
{
"Client 7 :Rooms"
};
resource
m::resource
rooms_resource
{
"/_matrix/client/r0/rooms/",
@ -29,7 +28,7 @@ rooms_resource
}
};
resource
m::resource
rooms_resource_unstable
{
"/_matrix/client/unstable/rooms/",
@ -39,9 +38,9 @@ rooms_resource_unstable
}
};
resource::response
m::resource::response
get_rooms(client &client,
const resource::request &request)
const m::resource::request &request)
{
if(request.parv.size() < 2)
throw m::NEED_MORE_PARAMS
@ -49,7 +48,7 @@ get_rooms(client &client,
"/rooms command required"
};
room::id::buf room_id
m::room::id::buf room_id
{
url::decode(room_id, request.parv[0])
};
@ -89,21 +88,21 @@ get_rooms(client &client,
};
}
resource::method
m::resource::method
method_get
{
rooms_resource, "GET", get_rooms
};
resource::method
m::resource::method
method_get_unstable
{
rooms_resource_unstable, "GET", get_rooms
};
resource::response
m::resource::response
put_rooms(client &client,
const resource::request &request)
const m::resource::request &request)
{
if(request.parv.size() < 2)
throw m::NEED_MORE_PARAMS
@ -111,7 +110,7 @@ put_rooms(client &client,
"/rooms command required"
};
room::id::buf room_id
m::room::id::buf room_id
{
url::decode(room_id, request.parv[0])
};
@ -139,7 +138,7 @@ put_rooms(client &client,
};
}
resource::method
m::resource::method
method_put
{
rooms_resource, "PUT", put_rooms,
@ -148,9 +147,9 @@ method_put
}
};
resource::response
m::resource::response
post_rooms(client &client,
const resource::request &request)
const m::resource::request &request)
{
if(request.parv.size() < 2)
throw m::NEED_MORE_PARAMS
@ -158,7 +157,7 @@ post_rooms(client &client,
"/rooms command required"
};
room::id::buf room_id
m::room::id::buf room_id
{
url::decode(room_id, request.parv[0])
};
@ -207,7 +206,7 @@ post_rooms(client &client,
};
}
resource::method
m::resource::method
method_post
{
rooms_resource, "POST", post_rooms,

94
modules/client/rooms/rooms.h
View file

@ -8,16 +8,16 @@
// copyright notice and this permission notice is present in all copies. The
// full license for this software is available in the LICENSE file.
extern ircd::resource rooms_resource;
extern ircd::m::resource rooms_resource;
///////////////////////////////////////////////////////////////////////////////
//
// event.cc
//
ircd::resource::response
ircd::m::resource::response
get__event(ircd::client &client,
const ircd::resource::request &request,
const ircd::m::resource::request &request,
const ircd::m::room::id &room_id);
///////////////////////////////////////////////////////////////////////////////
@ -25,9 +25,9 @@ get__event(ircd::client &client,
// messages.cc
//
ircd::resource::response
ircd::m::resource::response
get__messages(ircd::client &,
const ircd::resource::request &,
const ircd::m::resource::request &,
const ircd::m::room::id &);
///////////////////////////////////////////////////////////////////////////////
@ -35,14 +35,14 @@ get__messages(ircd::client &,
// state.cc
//
ircd::resource::response
ircd::m::resource::response
get__state(ircd::client &client,
const ircd::resource::request &request,
const ircd::m::resource::request &request,
const ircd::m::room::id &room_id);
ircd::resource::response
ircd::m::resource::response
put__state(ircd::client &client,
const ircd::resource::request &request,
const ircd::m::resource::request &request,
const ircd::m::room::id &room_id);
///////////////////////////////////////////////////////////////////////////////
@ -50,14 +50,14 @@ put__state(ircd::client &client,
// members.cc
//
ircd::resource::response
ircd::m::resource::response
get__members(ircd::client &client,
const ircd::resource::request &request,
const ircd::m::resource::request &request,
const ircd::m::room::id &room_id);
ircd::resource::response
ircd::m::resource::response
get__joined_members(ircd::client &client,
const ircd::resource::request &request,
const ircd::m::resource::request &request,
const ircd::m::room::id &room_id);
///////////////////////////////////////////////////////////////////////////////
@ -65,9 +65,9 @@ get__joined_members(ircd::client &client,
// context.cc
//
ircd::resource::response
ircd::m::resource::response
get__context(ircd::client &client,
const ircd::resource::request &request,
const ircd::m::resource::request &request,
const ircd::m::room::id &room_id);
///////////////////////////////////////////////////////////////////////////////
@ -75,9 +75,9 @@ get__context(ircd::client &client,
// send.cc
//
ircd::resource::response
ircd::m::resource::response
put__send(ircd::client &client,
const ircd::resource::request &request,
const ircd::m::resource::request &request,
const ircd::m::room::id &room_id);
///////////////////////////////////////////////////////////////////////////////
@ -85,9 +85,9 @@ put__send(ircd::client &client,
// typing.cc
//
ircd::resource::response
ircd::m::resource::response
put__typing(ircd::client &client,
const ircd::resource::request &request,
const ircd::m::resource::request &request,
const ircd::m::room::id &room_id);
///////////////////////////////////////////////////////////////////////////////
@ -95,14 +95,14 @@ put__typing(ircd::client &client,
// redact.cc
//
ircd::resource::response
ircd::m::resource::response
put__redact(ircd::client &client,
const ircd::resource::request &request,
const ircd::m::resource::request &request,
const ircd::m::room::id &room_id);
ircd::resource::response
ircd::m::resource::response
post__redact(ircd::client &client,
const ircd::resource::request &request,
const ircd::m::resource::request &request,
const ircd::m::room::id &room_id);
///////////////////////////////////////////////////////////////////////////////
@ -110,9 +110,9 @@ post__redact(ircd::client &client,
// receipt.cc
//
ircd::resource::response
ircd::m::resource::response
post__receipt(ircd::client &,
const ircd::resource::request &,
const ircd::m::resource::request &,
const ircd::m::room::id &);
///////////////////////////////////////////////////////////////////////////////
@ -120,9 +120,9 @@ post__receipt(ircd::client &,
// join.cc
//
ircd::resource::response
ircd::m::resource::response
post__join(ircd::client &,
const ircd::resource::request &,
const ircd::m::resource::request &,
const ircd::m::room::id &);
///////////////////////////////////////////////////////////////////////////////
@ -130,9 +130,9 @@ post__join(ircd::client &,
// invite.cc
//
ircd::resource::response
ircd::m::resource::response
post__invite(ircd::client &,
const ircd::resource::request &,
const ircd::m::resource::request &,
const ircd::m::room::id &);
///////////////////////////////////////////////////////////////////////////////
@ -140,9 +140,9 @@ post__invite(ircd::client &,
// leave.cc
//
ircd::resource::response
ircd::m::resource::response
post__leave(ircd::client &,
const ircd::resource::request &,
const ircd::m::resource::request &,
const ircd::m::room::id &);
///////////////////////////////////////////////////////////////////////////////
@ -150,9 +150,9 @@ post__leave(ircd::client &,
// forget.cc
//
ircd::resource::response
ircd::m::resource::response
post__forget(ircd::client &,
const ircd::resource::request &,
const ircd::m::resource::request &,
const ircd::m::room::id &);
///////////////////////////////////////////////////////////////////////////////
@ -160,9 +160,9 @@ post__forget(ircd::client &,
// kick.cc
//
ircd::resource::response
ircd::m::resource::response
post__kick(ircd::client &,
const ircd::resource::request &,
const ircd::m::resource::request &,
const ircd::m::room::id &);
///////////////////////////////////////////////////////////////////////////////
@ -170,9 +170,9 @@ post__kick(ircd::client &,
// ban.cc
//
ircd::resource::response
ircd::m::resource::response
post__ban(ircd::client &,
const ircd::resource::request &,
const ircd::m::resource::request &,
const ircd::m::room::id &);
///////////////////////////////////////////////////////////////////////////////
@ -180,9 +180,9 @@ post__ban(ircd::client &,
// unban.cc
//
ircd::resource::response
ircd::m::resource::response
post__unban(ircd::client &,
const ircd::resource::request &,
const ircd::m::resource::request &,
const ircd::m::room::id &);
///////////////////////////////////////////////////////////////////////////////
@ -190,9 +190,9 @@ post__unban(ircd::client &,
// read_markers.cc
//
ircd::resource::response
ircd::m::resource::response
post__read_markers(ircd::client &,
const ircd::resource::request &,
const ircd::m::resource::request &,
const ircd::m::room::id &);
///////////////////////////////////////////////////////////////////////////////
@ -200,9 +200,9 @@ post__read_markers(ircd::client &,
// initialsync.cc
//
ircd::resource::response
ircd::m::resource::response
get__initialsync(ircd::client &,
const ircd::resource::request &,
const ircd::m::resource::request &,
const ircd::m::room::id &);
///////////////////////////////////////////////////////////////////////////////
@ -210,9 +210,9 @@ get__initialsync(ircd::client &,
// report.cc
//
ircd::resource::response
ircd::m::resource::response
post__report(ircd::client &,
const ircd::resource::request &,
const ircd::m::resource::request &,
const ircd::m::room::id &);
///////////////////////////////////////////////////////////////////////////////
@ -220,7 +220,7 @@ post__report(ircd::client &,
// relations.cc
//
ircd::resource::response
ircd::m::resource::response
get__relations(ircd::client &,
const ircd::resource::request &,
const ircd::m::resource::request &,
const ircd::m::room::id &);

16
modules/client/rooms/send.cc
View file

@ -17,9 +17,9 @@ static void
save_transaction_id(const m::event &,
m::vm::eval &);
static resource::response
static m::resource::response
handle_command(client &,
const resource::request &,
const m::resource::request &,
const room &);
m::hookfn<m::vm::eval &>
@ -32,9 +32,9 @@ save_transaction_id_hookfn
}
};
resource::response
m::resource::response
put__send(client &client,
const resource::request &request,
const m::resource::request &request,
const room::id &room_id)
{
if(request.parv.size() < 3)
@ -88,7 +88,7 @@ put__send(client &client,
m::send(room, request.user_id, type, content)
};
return resource::response
return m::resource::response
{
client, json::members
{
@ -97,9 +97,9 @@ put__send(client &client,
};
}
resource::response
m::resource::response
handle_command(client &client,
const resource::request &request,
const m::resource::request &request,
const room &room)
{
const user::room user_room
@ -117,7 +117,7 @@ handle_command(client &client,
})
};
return resource::response
return m::resource::response
{
client, json::members
{

22
modules/client/rooms/state.cc
View file

@ -13,14 +13,14 @@
using namespace ircd::m;
using namespace ircd;
static resource::response
static m::resource::response
get__state(client &client,
const resource::request &request,
const m::resource::request &request,
const m::room::state &state);
resource::response
m::resource::response
put__state(client &client,
const resource::request &request,
const m::resource::request &request,
const room::id &room_id)
{
if(request.parv.size() < 3)
@ -53,7 +53,7 @@ put__state(client &client,
m::send(room_id, request.user_id, type, state_key, content)
};
return resource::response
return m::resource::response
{
client, json::members
{
@ -62,9 +62,9 @@ put__state(client &client,
};
}
resource::response
m::resource::response
get__state(client &client,
const resource::request &request,
const m::resource::request &request,
const room::id &room_id)
{
char type_buf[m::event::TYPE_MAX_SIZE];
@ -128,18 +128,18 @@ get__state(client &client,
string_view{room_id}
};
return resource::response
return m::resource::response
{
client, event.source
};
}
resource::response
m::resource::response
get__state(client &client,
const resource::request &request,
const m::resource::request &request,
const m::room::state &state)
{
resource::response::chunked response
m::resource::response::chunked response
{
client, http::OK
};

6
modules/client/rooms/typing.cc
View file

@ -19,9 +19,9 @@ timeout_default
{ "default", 30 * 1000L },
};
resource::response
m::resource::response
put__typing(client &client,
const resource::request &request,
const m::resource::request &request,
const m::room::id &room_id)
{
if(request.parv.size() < 3)
@ -64,7 +64,7 @@ put__typing(client &client,
event
};
return resource::response
return m::resource::response
{
client, http::OK
};

6
modules/client/rooms/unban.cc
View file

@ -12,9 +12,9 @@
using namespace ircd;
resource::response
m::resource::response
post__unban(client &client,
const resource::request &request,
const m::resource::request &request,
const m::room::id &room_id)
{
const m::user::id &user_id
@ -64,7 +64,7 @@ post__unban(client &client,
})
};
return resource::response
return m::resource::response
{
client, http::OK, json::members
{

18
modules/client/send_to_device.cc
View file

@ -18,9 +18,9 @@ send_to_device(const string_view &txnid,
const string_view &type,
const json::object &message);
static resource::response
static m::resource::response
put__send_to_device(client &client,
const resource::request &request);
const m::resource::request &request);
mapi::header
IRCD_MODULE
@ -28,7 +28,7 @@ IRCD_MODULE
"Client 14.9 :Send-to-Device messaging"
};
ircd::resource
ircd::m::resource
send_to_device_resource
{
"/_matrix/client/r0/sendToDevice/",
@ -38,7 +38,7 @@ send_to_device_resource
}
};
ircd::resource
ircd::m::resource
send_to_device_resource__unstable
{
"/_matrix/client/unstable/sendToDevice/",
@ -48,7 +48,7 @@ send_to_device_resource__unstable
}
};
resource::method
m::resource::method
method_put
{
send_to_device_resource, "PUT", put__send_to_device,
@ -57,7 +57,7 @@ method_put
}
};
resource::method
m::resource::method
method_put__unstable
{
send_to_device_resource__unstable, "PUT", put__send_to_device,
@ -66,9 +66,9 @@ method_put__unstable
}
};
resource::response
m::resource::response
put__send_to_device(client &client,
const resource::request &request)
const m::resource::request &request)
{
if(request.parv.size() < 1)
throw m::NEED_MORE_PARAMS
@ -103,7 +103,7 @@ put__send_to_device(client &client,
for(const auto &[device_id, message] : json::object(messages))
send_to_device(txnid, request.user_id, user_id, device_id, type, message);
return resource::response
return m::resource::response
{
client, http::OK
};

12
modules/client/user/filter.cc
View file

@ -12,9 +12,9 @@
using namespace ircd;
resource::response
m::resource::response
get__filter(client &client,
const resource::request &request,
const m::resource::request &request,
const m::user::id &user_id)
{
char filter_id_buf[64];
@ -36,7 +36,7 @@ get__filter(client &client,
filter.get(filter_id, [&client]
(const string_view &filter_id, const json::object &filter)
{
resource::response
m::resource::response
{
client, filter
};
@ -48,9 +48,9 @@ get__filter(client &client,
// (5.2) Uploads a new filter definition to the homeserver. Returns a filter ID that
// may be used in future requests to restrict which events are returned to the client.
resource::response
m::resource::response
post__filter(client &client,
const resource::request::object<const m::filter> &request,
const m::resource::request::object<const m::filter> &request,
const m::user::id &user_id)
{
// (5.2) Required. The id of the user uploading the filter. The access
@ -120,7 +120,7 @@ post__filter(client &client,
filter.set(filter_id_buf, request.body)
};
return resource::response
return m::resource::response
{
client, http::CREATED,
{

14
modules/client/user/openid.cc
View file

@ -12,14 +12,14 @@
using namespace ircd;
static resource::response
static m::resource::response
post__openid__request_token(client &client,
const resource::request &request,
const m::resource::request &request,
const m::user::id &user_id);
resource::response
m::resource::response
post__openid(client &client,
const resource::request &request,
const m::resource::request &request,
const m::user::id &user_id)
{
if(user_id != request.user_id)
@ -46,12 +46,12 @@ post__openid(client &client,
};
}
resource::response
m::resource::response
post__openid__request_token(client &client,
const resource::request &request,
const m::resource::request &request,
const m::user::id &user_id)
{
return resource::response
return m::resource::response
{
client, http::TOO_MANY_REQUESTS
};

26
modules/client/user/user.cc
View file

@ -18,7 +18,7 @@ IRCD_MODULE
"Client X.X :User endpoints"
};
resource
m::resource
user_resource
{
"/_matrix/client/r0/user/",
@ -28,8 +28,8 @@ user_resource
}
};
resource::response
get_user(client &client, const resource::request &request)
m::resource::response
get_user(client &client, const m::resource::request &request)
{
if(request.parv.size() < 2)
throw m::NEED_MORE_PARAMS
@ -68,7 +68,7 @@ get_user(client &client, const resource::request &request)
};
}
resource::method
m::resource::method
get_method
{
user_resource, "GET", get_user,
@ -77,8 +77,8 @@ get_method
}
};
resource::response
post_user(client &client, resource::request &request)
m::resource::response
post_user(client &client, m::resource::request &request)
{
if(request.parv.size() < 2)
throw m::NEED_MORE_PARAMS
@ -114,7 +114,7 @@ post_user(client &client, resource::request &request)
};
}
resource::method
m::resource::method
post_method
{
user_resource, "POST", post_user,
@ -123,8 +123,8 @@ post_method
}
};
resource::response
put_user(client &client, const resource::request &request)
m::resource::response
put_user(client &client, const m::resource::request &request)
{
if(request.parv.size() < 1)
throw m::NEED_MORE_PARAMS
@ -166,7 +166,7 @@ put_user(client &client, const resource::request &request)
};
}
resource::method
m::resource::method
put_method
{
user_resource, "PUT", put_user,
@ -175,8 +175,8 @@ put_method
}
};
resource::response
delete_user(client &client, const resource::request &request)
m::resource::response
delete_user(client &client, const m::resource::request &request)
{
if(request.parv.size() < 1)
throw m::NEED_MORE_PARAMS
@ -215,7 +215,7 @@ delete_user(client &client, const resource::request &request)
};
}
resource::method
m::resource::method
delete_method
{
user_resource, "DELETE", delete_user,

34
modules/client/user/user.h
View file

@ -8,21 +8,21 @@
// copyright notice and this permission notice is present in all copies. The
// full license for this software is available in the LICENSE file.
extern ircd::resource user_resource;
extern ircd::m::resource user_resource;
///////////////////////////////////////////////////////////////////////////////
//
// filter.cc
//
ircd::resource::response
ircd::m::resource::response
get__filter(ircd::client &,
const ircd::resource::request &,
const ircd::m::resource::request &,
const ircd::m::user::id &);
ircd::resource::response
ircd::m::resource::response
post__filter(ircd::client &,
const ircd::resource::request::object<const ircd::m::filter> &,
const ircd::m::resource::request::object<const ircd::m::filter> &,
const ircd::m::user::id &);
///////////////////////////////////////////////////////////////////////////////
@ -30,14 +30,14 @@ post__filter(ircd::client &,
// account_data.cc
//
ircd::resource::response
ircd::m::resource::response
put__account_data(ircd::client &client,
const ircd::resource::request &request,
const ircd::m::resource::request &request,
const ircd::m::user &user);
ircd::resource::response
ircd::m::resource::response
get__account_data(ircd::client &client,
const ircd::resource::request &request,
const ircd::m::resource::request &request,
const ircd::m::user &user);
///////////////////////////////////////////////////////////////////////////////
@ -45,9 +45,9 @@ get__account_data(ircd::client &client,
// openid.cc
//
ircd::resource::response
ircd::m::resource::response
post__openid(ircd::client &client,
const ircd::resource::request &request,
const ircd::m::resource::request &request,
const ircd::m::user::id &user_id);
///////////////////////////////////////////////////////////////////////////////
@ -55,17 +55,17 @@ post__openid(ircd::client &client,
// rooms.cc
//
ircd::resource::response
ircd::m::resource::response
get__rooms(ircd::client &client,
const ircd::resource::request &request,
const ircd::m::resource::request &request,
const ircd::m::user::id &user_id);
ircd::resource::response
ircd::m::resource::response
put__rooms(ircd::client &client,
const ircd::resource::request &request,
const ircd::m::resource::request &request,
const ircd::m::user::id &user_id);
ircd::resource::response
ircd::m::resource::response
delete__rooms(ircd::client &client,
const ircd::resource::request &request,
const ircd::m::resource::request &request,
const ircd::m::user::id &user_id);

4
modules/console.cc
View file

@ -5758,12 +5758,12 @@ console_cmd__client(opt &out, const string_view &line)
<< " "
<< left << setw(50) << remote(*client)
;
/*
if(client->request.user_id)
out << " " << client->request.user_id;
else if(client->request.origin)
out << " " << client->request.origin;
*/
if(client->request.head.method)
out << " " << client->request.head.method;

18
modules/federation/backfill.cc
View file

@ -16,7 +16,7 @@ IRCD_MODULE
"federation backfill"
};
resource
m::resource
backfill_resource
{
"/_matrix/federation/v1/backfill/",
@ -27,13 +27,13 @@ backfill_resource
};
static size_t
calc_limit(const resource::request &request);
calc_limit(const m::resource::request &request);
resource::response
m::resource::response
get__backfill(client &client,
const resource::request &request);
const m::resource::request &request);
resource::method
m::resource::method
method_get
{
backfill_resource, "GET", get__backfill,
@ -63,9 +63,9 @@ backfill_flush_hiwat
{ "default", 16384L },
};
resource::response
m::resource::response
get__backfill(client &client,
const resource::request &request)
const m::resource::request &request)
{
if(request.parv.size() < 1)
throw m::NEED_MORE_PARAMS
@ -101,7 +101,7 @@ get__backfill(client &client,
room_id, event_id
};
resource::response::chunked response
m::resource::response::chunked response
{
client, http::OK
};
@ -131,7 +131,7 @@ get__backfill(client &client,
}
static size_t
calc_limit(const resource::request &request)
calc_limit(const m::resource::request &request)
{
const auto &limit
{

12
modules/federation/backfill_ids.cc
View file

@ -16,7 +16,7 @@ IRCD_MODULE
"federation backfill event IDs"
};
resource
m::resource
backfill_ids_resource
{
"/_matrix/federation/v1/backfill_ids/",
@ -41,7 +41,7 @@ backfill_ids_limit_default
};
static size_t
calc_limit(const resource::request &request)
calc_limit(const m::resource::request &request)
{
const auto &limit
{
@ -59,9 +59,9 @@ calc_limit(const resource::request &request)
return std::min(ret, size_t(backfill_ids_limit_max));
}
resource::response
m::resource::response
get__backfill_ids(client &client,
const resource::request &request)
const m::resource::request &request)
{
if(request.parv.size() < 1)
throw m::NEED_MORE_PARAMS
@ -108,7 +108,7 @@ get__backfill_ids(client &client,
room
};
resource::response::chunked response
m::resource::response::chunked response
{
client, http::OK
};
@ -138,7 +138,7 @@ get__backfill_ids(client &client,
return response;
}
resource::method
m::resource::method
method_get
{
backfill_ids_resource, "GET", get__backfill_ids,

13
modules/federation/event.cc
View file

@ -16,9 +16,9 @@ mapi::header IRCD_MODULE
};
struct send
:resource
:m::resource
{
using resource::resource;
using m::resource::resource;
}
event_resource
{
@ -29,9 +29,9 @@ event_resource
}
};
resource::response
m::resource::response
handle_get(client &client,
const resource::request &request)
const m::resource::request &request)
{
if(request.parv.size() < 1)
throw m::NEED_MORE_PARAMS
@ -55,7 +55,7 @@ handle_get(client &client,
"You are not permitted to view this event"
};
resource::response::chunked response
m::resource::response::chunked response
{
client, http::OK
};
@ -75,7 +75,8 @@ handle_get(client &client,
return std::move(response);
}
resource::method method_get
m::resource::method
method_get
{
event_resource, "GET", handle_get,
{

10
modules/federation/event_auth.cc
View file

@ -16,7 +16,7 @@ IRCD_MODULE
"federation event_auth (undocumented)"
};
resource
m::resource
event_auth_resource
{
"/_matrix/federation/v1/event_auth/",
@ -33,9 +33,9 @@ event_auth_flush_hiwat
{ "default", 16384L },
};
resource::response
m::resource::response
get__event_auth(client &client,
const resource::request &request)
const m::resource::request &request)
{
if(request.parv.size() < 1)
throw m::NEED_MORE_PARAMS
@ -97,7 +97,7 @@ get__event_auth(client &client,
"You are not permitted to view the room at this event"
};
resource::response::chunked response
m::resource::response::chunked response
{
client, http::OK
};
@ -131,7 +131,7 @@ get__event_auth(client &client,
return std::move(response);
}
resource::method
m::resource::method
method_get
{
event_auth_resource, "GET", get__event_auth,

12
modules/federation/get_groups_publicised.cc
View file

@ -16,7 +16,7 @@ IRCD_MODULE
"Federation (undocumented) :Get groups publicised."
};
resource
m::resource
get_groups_publicised_resource
{
"/_matrix/federation/v1/get_groups_publicised",
@ -25,9 +25,9 @@ get_groups_publicised_resource
}
};
static resource::response post__groups_publicised(client &, const resource::request &);
static m::resource::response post__groups_publicised(client &, const m::resource::request &);
resource::method
m::resource::method
method_post
{
get_groups_publicised_resource, "POST", post__groups_publicised,
@ -36,9 +36,9 @@ method_post
}
};
resource::response
m::resource::response
post__groups_publicised(client &client,
const resource::request &request)
const m::resource::request &request)
{
const json::array user_ids
{
@ -59,7 +59,7 @@ post__groups_publicised(client &client,
users.emplace_back(user_id, json::empty_array);
}
return resource::response
return m::resource::response
{
client, json::members
{

14
modules/federation/get_missing_events.cc
View file

@ -16,7 +16,7 @@ IRCD_MODULE
"Federation (undocumented) :Get missing events."
};
resource
m::resource
get_missing_events_resource
{
"/_matrix/federation/v1/get_missing_events/",
@ -26,9 +26,9 @@ get_missing_events_resource
}
};
static resource::response get__missing_events(client &, const resource::request &);
static m::resource::response get__missing_events(client &, const m::resource::request &);
resource::method
m::resource::method
method_get
{
get_missing_events_resource, "GET", get__missing_events,
@ -37,7 +37,7 @@ method_get
}
};
resource::method
m::resource::method
method_post
{
get_missing_events_resource, "POST", get__missing_events,
@ -60,9 +60,9 @@ flush_hiwat
{ "default", long(16_KiB) },
};
resource::response
m::resource::response
get__missing_events(client &client,
const resource::request &request)
const m::resource::request &request)
{
if(request.parv.size() < 1)
throw m::NEED_MORE_PARAMS
@ -114,7 +114,7 @@ get__missing_events(client &client,
});
}};
resource::response::chunked response
m::resource::response::chunked response
{
client, http::OK
};

18
modules/federation/invite.cc
View file

@ -11,12 +11,12 @@
using namespace ircd;
static void
check_event(const resource::request &request,
check_event(const m::resource::request &request,
const m::event &event);
static resource::response
static m::resource::response
put__invite(client &client,
const resource::request &request);
const m::resource::request &request);
mapi::header
IRCD_MODULE
@ -32,7 +32,7 @@ user is on a different server, the inviting server will send a request to
the invited server.
)"};
resource
m::resource
invite_resource
{
"/_matrix/federation/v1/invite/",
@ -42,7 +42,7 @@ invite_resource
}
};
resource::method
m::resource::method
method_put
{
invite_resource, "PUT", put__invite,
@ -58,9 +58,9 @@ stream_cross_sleeptime
{ "default", 5000L },
};
resource::response
m::resource::response
put__invite(client &client,
const resource::request &request)
const m::resource::request &request)
{
if(request.parv.size() < 1)
throw m::NEED_MORE_PARAMS
@ -138,7 +138,7 @@ put__invite(client &client,
// (one for this request, and another when m::eval effects connect to them
// and make any requests). But either way if this call fails then we will
// lose the invite but that may not be such a bad thing.
resource::response response
m::resource::response response
{
client, json::value
{
@ -190,7 +190,7 @@ put__invite(client &client,
}
void
check_event(const resource::request &request,
check_event(const m::resource::request &request,
const m::event &event)
{
if(at<"type"_>(event) != "m.room.member")

18
modules/federation/invite2.cc
View file

@ -12,12 +12,12 @@ using namespace ircd;
static void
process(client &,
const resource::request &,
const m::resource::request &,
const m::event &);
static resource::response
static m::resource::response
put__invite(client &client,
const resource::request &request);
const m::resource::request &request);
mapi::header
IRCD_MODULE
@ -25,7 +25,7 @@ IRCD_MODULE
"Federation 12 :Inviting to a room (v2)"
};
resource
m::resource
invite_resource
{
"/_matrix/federation/v2/invite/",
@ -35,7 +35,7 @@ invite_resource
}
};
resource::method
m::resource::method
method_put
{
invite_resource, "PUT", put__invite,
@ -50,9 +50,9 @@ stream_cross_sleeptime
"federation_invite", "stream_cross_sleeptime"
};
resource::response
m::resource::response
put__invite(client &client,
const resource::request &request)
const m::resource::request &request)
{
if(request.parv.size() < 1)
throw m::NEED_MORE_PARAMS
@ -201,7 +201,7 @@ put__invite(client &client,
// (one for this request, and another when m::eval effects connect to them
// and make any requests). But either way if this call fails then we will
// lose the invite but that may not be such a bad thing.
resource::response response
m::resource::response response
{
client, json::members
{
@ -223,7 +223,7 @@ put__invite(client &client,
void
process(client &client,
const resource::request &request,
const m::resource::request &request,
const m::event &event)
try
{

10
modules/federation/make_join.cc
View file

@ -25,7 +25,7 @@ create a join event 'in the blind' for one of their users.
)"};
resource
m::resource
make_join_resource
{
"/_matrix/federation/v1/make_join/",
@ -35,9 +35,9 @@ make_join_resource
}
};
resource::response
m::resource::response
get__make_join(client &client,
const resource::request &request)
const m::resource::request &request)
{
if(request.parv.size() < 1)
throw m::NEED_MORE_PARAMS
@ -207,7 +207,7 @@ get__make_join(client &client,
event.~object();
top.~object();
return resource::response
return m::resource::response
{
client, json::object
{
@ -216,7 +216,7 @@ get__make_join(client &client,
};
}
resource::method
m::resource::method
method_get
{
make_join_resource, "GET", get__make_join,

10
modules/federation/make_leave.cc
View file

@ -25,7 +25,7 @@ create a leave event 'in the blind' for one of their users.
)"};
resource
m::resource
make_leave_resource
{
"/_matrix/federation/v1/make_leave/",
@ -35,9 +35,9 @@ make_leave_resource
}
};
resource::response
m::resource::response
get__make_leave(client &client,
const resource::request &request)
const m::resource::request &request)
{
if(request.parv.size() < 1)
throw m::NEED_MORE_PARAMS
@ -192,7 +192,7 @@ get__make_leave(client &client,
event.~object();
top.~object();
return resource::response
return m::resource::response
{
client, json::object
{
@ -201,7 +201,7 @@ get__make_leave(client &client,
};
}
resource::method
m::resource::method
method_get
{
make_leave_resource, "GET", get__make_leave,

14
modules/federation/publicrooms.cc
View file

@ -16,7 +16,7 @@ IRCD_MODULE
"Federation 14.1 :Public Rooms"
};
resource
m::resource
publicrooms_resource
{
"/_matrix/federation/v1/publicRooms",
@ -34,11 +34,11 @@ flush_hiwat
{ "default", 16384L },
};
static resource::response
static m::resource::response
handle_get(client &,
const resource::request &);
const m::resource::request &);
resource::method
m::resource::method
get_method
{
publicrooms_resource, "GET", handle_get,
@ -47,9 +47,9 @@ get_method
}
};
resource::response
m::resource::response
handle_get(client &client,
const resource::request &request)
const m::resource::request &request)
{
char sincebuf[m::room::id::buf::SIZE];
const string_view &since
@ -81,7 +81,7 @@ handle_get(client &client,
request.get<bool>("include_all_networks", false)
};
resource::response::chunked response
m::resource::response::chunked response
{
client, http::OK
};

30
modules/federation/query.cc
View file

@ -26,7 +26,7 @@ that kind of query. The response is a JSON-encoded object whose
meaning also depends on the kind of query.
)"};
resource
m::resource
query_resource
{
"/_matrix/federation/v1/query/",
@ -36,17 +36,17 @@ query_resource
}
};
static resource::response
static m::resource::response
get__query_profile(client &client,
const resource::request &request);
const m::resource::request &request);
static resource::response
static m::resource::response
get__query_directory(client &client,
const resource::request &request);
const m::resource::request &request);
resource::response
m::resource::response
get__query(client &client,
const resource::request &request)
const m::resource::request &request)
{
const auto type
{
@ -65,7 +65,7 @@ get__query(client &client,
};
}
resource::method
m::resource::method
method_get
{
query_resource, "GET", get__query,
@ -74,9 +74,9 @@ method_get
}
};
resource::response
m::resource::response
get__query_profile(client &client,
const resource::request &request)
const m::resource::request &request)
{
m::user::id::buf user_id
{
@ -103,7 +103,7 @@ get__query_profile(client &client,
profile.get(field, [&client]
(const string_view &field, const string_view &value)
{
resource::response
m::resource::response
{
client, json::members
{
@ -115,7 +115,7 @@ get__query_profile(client &client,
return {};
}
resource::response::chunked response
m::resource::response::chunked response
{
client, http::OK
};
@ -144,9 +144,9 @@ get__query_profile(client &client,
return response;
}
resource::response
m::resource::response
get__query_directory(client &client,
const resource::request &request)
const m::resource::request &request)
{
m::room::alias::buf room_alias
{
@ -209,7 +209,7 @@ get__query_directory(client &client,
servers.~array();
top.~object();
return resource::response
return m::resource::response
{
client, json::object
{

14
modules/federation/query_auth.cc
View file

@ -16,7 +16,7 @@ IRCD_MODULE
"Federation 5.1.5.2 :Query Auth"
};
resource
m::resource
query_auth_resource
{
"/_matrix/federation/v1/query_auth/",
@ -26,11 +26,11 @@ query_auth_resource
}
};
static resource::response
static m::resource::response
post__query_auth(client &client,
const resource::request &request);
const m::resource::request &request);
resource::method
m::resource::method
method_post
{
query_auth_resource, "POST", post__query_auth,
@ -39,9 +39,9 @@ method_post
}
};
resource::response
m::resource::response
post__query_auth(client &client,
const resource::request &request)
const m::resource::request &request)
{
if(request.parv.size() < 1)
throw m::NEED_MORE_PARAMS
@ -90,7 +90,7 @@ post__query_auth(client &client,
// This method appears to be unused by synapse.
//
return resource::response
return m::resource::response
{
client, http::NOT_IMPLEMENTED
};

16
modules/federation/send.cc
View file

@ -16,7 +16,7 @@ IRCD_MODULE
"federation send"
};
resource
m::resource
send_resource
{
"/_matrix/federation/v1/send/",
@ -35,7 +35,7 @@ allow_self
void
handle_edu(client &client,
const resource::request::object<m::txn> &request,
const m::resource::request::object<m::txn> &request,
const string_view &txn_id,
const m::edu &edu)
{
@ -59,7 +59,7 @@ handle_edu(client &client,
void
handle_pdus(client &client,
const resource::request::object<m::txn> &request,
const m::resource::request::object<m::txn> &request,
const string_view &txn_id,
const json::array &pdus)
{
@ -78,7 +78,7 @@ handle_pdus(client &client,
void
handle_pdu_failure(client &client,
const resource::request::object<m::txn> &request,
const m::resource::request::object<m::txn> &request,
const string_view &txn_id,
const json::object &pdu_failure)
{
@ -92,9 +92,9 @@ handle_pdu_failure(client &client,
};
}
resource::response
m::resource::response
handle_put(client &client,
const resource::request::object<m::txn> &request)
const m::resource::request::object<m::txn> &request)
{
if(request.parv.size() < 1)
throw m::NEED_MORE_PARAMS
@ -156,13 +156,13 @@ handle_put(client &client,
for(const json::object &edu : edus)
handle_edu(client, request, txn_id, edu);
return resource::response
return m::resource::response
{
client, http::OK
};
}
resource::method
m::resource::method
method_put
{
send_resource, "PUT", handle_put,

10
modules/federation/send_join.cc
View file

@ -25,7 +25,7 @@ users in that room.
)"};
resource
m::resource
send_join_resource
{
"/_matrix/federation/v1/send_join/",
@ -35,9 +35,9 @@ send_join_resource
}
};
resource::response
m::resource::response
put__send_join(client &client,
const resource::request &request)
const m::resource::request &request)
{
if(request.parv.size() < 1)
throw m::NEED_MORE_PARAMS
@ -123,7 +123,7 @@ put__send_join(client &client,
m::head_idx(room_id)
};
resource::response::chunked response
m::resource::response::chunked response
{
client, http::OK
};
@ -230,7 +230,7 @@ put__send_join(client &client,
return std::move(response);
}
resource::method
m::resource::method
method_put
{
send_join_resource, "PUT", put__send_join,

10
modules/federation/send_leave.cc
View file

@ -25,7 +25,7 @@ users in that room.
)"};
resource
m::resource
send_leave_resource
{
"/_matrix/federation/v1/send_leave/",
@ -35,9 +35,9 @@ send_leave_resource
}
};
resource::response
m::resource::response
put__send_leave(client &client,
const resource::request &request)
const m::resource::request &request)
{
if(request.parv.size() < 1)
throw m::NEED_MORE_PARAMS
@ -118,13 +118,13 @@ put__send_leave(client &client,
"[200,{}]"
};
return resource::response
return m::resource::response
{
client, http::OK, response
};
}
resource::method
m::resource::method
method_put
{
send_leave_resource, "PUT", put__send_leave,

10
modules/federation/state.cc
View file

@ -16,7 +16,7 @@ IRCD_MODULE
"federation state"
};
resource
m::resource
state_resource
{
"/_matrix/federation/v1/state/",
@ -33,9 +33,9 @@ state_flush_hiwat
{ "default", 16384L },
};
resource::response
m::resource::response
get__state(client &client,
const resource::request &request)
const m::resource::request &request)
{
if(request.parv.size() < 1)
throw m::NEED_MORE_PARAMS
@ -81,7 +81,7 @@ get__state(client &client,
m::head_idx(room)
};
resource::response::chunked response
m::resource::response::chunked response
{
client, http::OK
};
@ -130,7 +130,7 @@ get__state(client &client,
return std::move(response);
}
resource::method
m::resource::method
method_get
{
state_resource, "GET", get__state,

10
modules/federation/state_ids.cc
View file

@ -16,7 +16,7 @@ IRCD_MODULE
"federation state_ids"
};
resource
m::resource
state_ids_resource
{
"/_matrix/federation/v1/state_ids/",
@ -26,9 +26,9 @@ state_ids_resource
}
};
resource::response
m::resource::response
get__state_ids(client &client,
const resource::request &request)
const m::resource::request &request)
{
if(request.parv.size() < 1)
throw m::NEED_MORE_PARAMS
@ -74,7 +74,7 @@ get__state_ids(client &client,
m::head_idx(room)
};
resource::response::chunked response
m::resource::response::chunked response
{
client, http::OK
};
@ -126,7 +126,7 @@ get__state_ids(client &client,
return std::move(response);
}
resource::method
m::resource::method
method_get
{
state_ids_resource, "GET", get__state_ids,

14
modules/federation/user_devices.cc
View file

@ -16,7 +16,7 @@ IRCD_MODULE
"Federation 20 :Device Management"
};
resource
m::resource
user_devices_resource
{
"/_matrix/federation/v1/user/devices",
@ -26,11 +26,11 @@ user_devices_resource
}
};
static resource::response
static m::resource::response
get__user_devices(client &client,
const resource::request &request);
const m::resource::request &request);
resource::method
m::resource::method
method_get
{
user_devices_resource, "GET", get__user_devices,
@ -39,9 +39,9 @@ method_get
}
};
resource::response
m::resource::response
get__user_devices(client &client,
const resource::request &request)
const m::resource::request &request)
{
if(request.parv.size() < 1)
throw m::NEED_MORE_PARAMS
@ -54,7 +54,7 @@ get__user_devices(client &client,
url::decode(user_id, request.parv[0])
};
resource::response::chunked response
m::resource::response::chunked response
{
client, http::OK
};

14
modules/federation/user_keys_claim.cc
View file

@ -16,7 +16,7 @@ IRCD_MODULE
"Federation 21 :End-to-End Encryption"
};
resource
m::resource
user_keys_claim_resource
{
"/_matrix/federation/v1/user/keys/claim",
@ -25,11 +25,11 @@ user_keys_claim_resource
}
};
static resource::response
static m::resource::response
post__user_keys_claim(client &client,
const resource::request &request);
const m::resource::request &request);
resource::method
m::resource::method
user_keys_claim__post
{
user_keys_claim_resource, "POST", post__user_keys_claim,
@ -38,11 +38,11 @@ user_keys_claim__post
}
};
resource::response
m::resource::response
post__user_keys_claim(client &client,
const resource::request &request)
const m::resource::request &request)
{
return resource::response
return m::resource::response
{
client, http::NOT_FOUND
};

18
modules/federation/user_keys_query.cc
View file

@ -16,7 +16,7 @@ IRCD_MODULE
"Federation 21 :End-to-End Encryption"
};
resource
m::resource
user_keys_query_resource
{
"/_matrix/federation/v1/user/keys/query",
@ -27,16 +27,16 @@ user_keys_query_resource
static void
_query_user_device(client &client,
const resource::request &request,
const m::resource::request &request,
const m::user::id &user_id,
const string_view &device_id,
json::stack::object &out);
static resource::response
static m::resource::response
post__user_keys_query(client &client,
const resource::request &request);
const m::resource::request &request);
resource::method
m::resource::method
user_keys_query__post
{
user_keys_query_resource, "POST", post__user_keys_query,
@ -45,16 +45,16 @@ user_keys_query__post
}
};
resource::response
m::resource::response
post__user_keys_query(client &client,
const resource::request &request)
const m::resource::request &request)
{
const json::object &request_keys
{
request.at("device_keys")
};
resource::response::chunked response
m::resource::response::chunked response
{
client, http::OK
};
@ -96,7 +96,7 @@ post__user_keys_query(client &client,
void
_query_user_device(client &client,
const resource::request &request,
const m::resource::request &request,
const m::user::id &user_id,
const string_view &device_id,
json::stack::object &out)

10
modules/federation/version.cc
View file

@ -16,7 +16,7 @@ IRCD_MODULE
"Federation 2.2 :Version"
};
resource
m::resource
version_resource
{
"/_matrix/federation/v1/version",
@ -25,9 +25,9 @@ version_resource
}
};
resource::response
m::resource::response
get__version(client &client,
const resource::request &request)
const m::resource::request &request)
{
const json::members server
{
@ -35,7 +35,7 @@ get__version(client &client,
{ "version", ircd::info::version },
};
return resource::response
return m::resource::response
{
client, json::members
{
@ -44,7 +44,7 @@ get__version(client &client,
};
}
resource::method
m::resource::method
method_get
{
version_resource, "GET", get__version

14
modules/identity/pubkey.cc
View file

@ -16,7 +16,7 @@ IRCD_MODULE
"Identity Service 7 :Key management"
};
resource
m::resource
pubkey_resource
{
"/_matrix/identity/api/v1/pubkey/",
@ -26,19 +26,19 @@ pubkey_resource
}
};
static resource::response
static m::resource::response
handle_get(client &,
const resource::request &);
const m::resource::request &);
resource::method
m::resource::method
method_get
{
pubkey_resource, "GET", handle_get
};
resource::response
m::resource::response
handle_get(client &client,
const resource::request &request)
const m::resource::request &request)
{
if(request.parv.size() < 1)
throw m::NEED_MORE_PARAMS
@ -67,7 +67,7 @@ handle_get(client &client,
};
return resource::response
return m::resource::response
{
client, http::NOT_FOUND, json::members
{

10
modules/identity/v1.cc
View file

@ -16,7 +16,7 @@ IRCD_MODULE
"Identity Service 6 :Status Check"
};
resource
m::resource
identity_resource
{
"/_matrix/identity/api/v1",
@ -26,17 +26,17 @@ identity_resource
}
};
static resource::response
static m::resource::response
handle_get(client &client,
const resource::request &request)
const m::resource::request &request)
{
return resource::response
return m::resource::response
{
client, http::NOT_IMPLEMENTED
};
}
resource::method
m::resource::method
method_get
{
identity_resource, "GET", handle_get

10
modules/key/server.cc
View file

@ -16,7 +16,7 @@ IRCD_MODULE
"Federation 2.2.1.1 :Publishing Keys"
};
resource
m::resource
server_resource
{
"/_matrix/key/v2/server/",
@ -26,9 +26,9 @@ server_resource
}
};
resource::response
m::resource::response
handle_get(client &client,
const resource::request &request)
const m::resource::request &request)
{
char key_id_buf[256];
const auto key_id
@ -41,7 +41,7 @@ handle_get(client &client,
m::keys::get(my_host(), key_id, [&client]
(const json::object &keys)
{
resource::response
m::resource::response
{
client, http::OK, keys
};
@ -50,7 +50,7 @@ handle_get(client &client,
return {};
}
resource::method
m::resource::method
method_get
{
server_resource, "GET", handle_get

22
modules/media/download.cc
View file

@ -12,7 +12,7 @@
using namespace ircd;
resource
m::resource
download_resource
{
"/_matrix/media/r0/download/",
@ -22,7 +22,7 @@ download_resource
}
};
resource
m::resource
download_resource__legacy
{
"/_matrix/media/v1/download/",
@ -32,16 +32,16 @@ download_resource__legacy
}
};
static resource::response
static m::resource::response
get__download_local(client &client,
const resource::request &request,
const m::resource::request &request,
const string_view &server,
const string_view &file,
const m::room &room);
static resource::response
static m::resource::response
get__download(client &client,
const resource::request &request)
const m::resource::request &request)
{
if(request.parv.size() < 2)
throw http::error
@ -81,9 +81,9 @@ get__download(client &client,
return get__download_local(client, request, server, file, room_id);
}
static resource::response
static m::resource::response
get__download_local(client &client,
const resource::request &request,
const m::resource::request &request,
const string_view &server,
const string_view &file,
const m::room &room)
@ -128,7 +128,7 @@ get__download_local(client &client,
});
// Send HTTP head to client
resource::response
m::resource::response
{
client, http::OK, content_type, file_size
};
@ -159,13 +159,13 @@ get__download_local(client &client,
return {};
}
static resource::method
static m::resource::method
method_get
{
download_resource, "GET", get__download
};
static resource::method
static m::resource::method
method_get__legacy
{
download_resource__legacy, "GET", get__download

10
modules/media/preview_url.cc
View file

@ -12,7 +12,7 @@
using namespace ircd;
resource
m::resource
preview_url_resource
{
"/_matrix/media/r0/preview_url",
@ -27,9 +27,9 @@ request_url(const string_view &urle);
static json::strung
parse_og(const string_view &content);
static resource::response
static m::resource::response
get__preview_url(client &client,
const resource::request &request)
const m::resource::request &request)
{
const auto &url
{
@ -56,13 +56,13 @@ get__preview_url(client &client,
parse_og(content)
};
return resource::response
return m::resource::response
{
client, json::object{ogs}
};
}
static resource::method
static m::resource::method
method_get
{
preview_url_resource, "GET", get__preview_url

26
modules/media/thumbnail.cc
View file

@ -69,7 +69,7 @@ ircd::m::media::thumbnail::mime_blacklist
{ "default", "" },
};
resource
m::resource
thumbnail_resource__legacy
{
"/_matrix/media/v1/thumbnail/",
@ -79,7 +79,7 @@ thumbnail_resource__legacy
}
};
resource
m::resource
thumbnail_resource
{
"/_matrix/media/r0/thumbnail/",
@ -89,15 +89,15 @@ thumbnail_resource
}
};
static resource::response
static m::resource::response
get__thumbnail_local(client &client,
const resource::request &request,
const m::resource::request &request,
const m::media::mxc &,
const m::room &room);
resource::response
m::resource::response
get__thumbnail(client &client,
const resource::request &request)
const m::resource::request &request)
{
if(request.parv.size() < 1)
throw m::NEED_MORE_PARAMS
@ -133,7 +133,7 @@ get__thumbnail(client &client,
};
if(!exists(room_id))
return resource::response
return m::resource::response
{
client, http::NOT_FOUND
};
@ -147,21 +147,21 @@ get__thumbnail(client &client,
return get__thumbnail_local(client, request, mxc, room_id);
}
static resource::method
static m::resource::method
method_get__legacy
{
thumbnail_resource__legacy, "GET", get__thumbnail
};
static resource::method
static m::resource::method
method_get
{
thumbnail_resource, "GET", get__thumbnail
};
static resource::response
static m::resource::response
get__thumbnail_local(client &client,
const resource::request &request,
const m::resource::request &request,
const m::media::mxc &mxc,
const m::room &room)
{
@ -316,7 +316,7 @@ get__thumbnail_local(client &client,
};
if(fallback)
return resource::response
return m::resource::response
{
client, buf, content_type
};
@ -324,7 +324,7 @@ get__thumbnail_local(client &client,
const auto closure{[&client, &content_type]
(const const_buffer &buf)
{
resource::response
m::resource::response
{
client, buf, content_type
};

20
modules/media/upload.cc
View file

@ -12,7 +12,7 @@
using namespace ircd;
resource
m::resource
upload_resource__legacy
{
"/_matrix/media/v1/upload/",
@ -21,7 +21,7 @@ upload_resource__legacy
}
};
resource
m::resource
upload_resource
{
"/_matrix/media/r0/upload/",
@ -30,9 +30,9 @@ upload_resource
}
};
resource::response
m::resource::response
post__upload(client &client,
const resource::request &request)
const m::resource::request &request)
{
const auto &content_type
{
@ -104,7 +104,7 @@ post__upload(client &client,
filename,
};
return resource::response
return m::resource::response
{
client, http::CREATED, json::members
{
@ -113,24 +113,24 @@ post__upload(client &client,
};
}
static const struct resource::method::opts
static const struct m::resource::method::opts
method_post_opts
{
resource::method::REQUIRES_AUTH |
resource::method::CONTENT_DISCRETION,
m::resource::method::REQUIRES_AUTH |
m::resource::method::CONTENT_DISCRETION,
-1s, // TODO: no coarse timer
8_MiB //TODO: conf; (this is the payload max option)
};
static resource::method
static m::resource::method
method_post
{
upload_resource, "POST", post__upload, method_post_opts
};
static resource::method
static m::resource::method
method_post__legacy
{
upload_resource__legacy, "POST", post__upload, method_post_opts