MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-09-26 18:38:52 +02:00
Code Issues Releases Wiki Activity

modules: Disambiguations for clang.

Browse source
This commit is contained in:
Jason Volk 2019-06-24 01:25:53 -06:00
parent fc786afbd5
commit ce7bb21ea4
7 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -39,7 +39,7 @@ activate__user(const m::user &user)
user user
}; };
return send(user_room, m::me.user_id, "ircd.account", "active", return send(user_room, m::me.user_id, "ircd.account", "active", json::members
{ {
{ "value", true } { "value", true }
}); });

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

@ -69,7 +69,7 @@ deactivate__user(const m::user &user,
user user
}; };
return send(user_room, m::me.user_id, "ircd.account", "active", return send(user_room, m::me.user_id, "ircd.account", "active", json::members
{ {
{ "value", false } { "value", false }
}); });

4
modules/client/register.cc
View file

@ -297,7 +297,7 @@ register_user(const m::registar &request,
// Store the options from registration. // Store the options from registration.
m::user::room user_room{user}; m::user::room user_room{user};
send(user_room, user.user_id, "ircd.account.options", "registration", send(user_room, user.user_id, "ircd.account.options", "registration", json::members
{ {
{ "bind_email", bind_email }, { "bind_email", bind_email },
}); });
@ -327,7 +327,7 @@ register_user(const m::registar &request,
const m::event::id::buf access_token_id const m::event::id::buf access_token_id
{ {
m::send(m::user::tokens, user_id, "ircd.access_token", access_token, m::send(m::user::tokens, user_id, "ircd.access_token", access_token, json::members
{ {
{ "ip", last_seen_ip }, { "ip", last_seen_ip },
{ "device_id", device_id }, { "device_id", device_id },

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

@ -34,7 +34,7 @@ get_rooms(client &client,
const resource::request &request) const resource::request &request)
{ {
if(request.parv.size() < 2) if(request.parv.size() < 2)
throw NEED_MORE_PARAMS throw m::NEED_MORE_PARAMS
{ {
"/rooms command required" "/rooms command required"
}; };
@ -70,7 +70,7 @@ get_rooms(client &client,
if(cmd == "initialSync") if(cmd == "initialSync")
return get__initialsync(client, request, room_id); return get__initialsync(client, request, room_id);
throw NOT_FOUND throw m::NOT_FOUND
{ {
"/rooms command not found" "/rooms command not found"
}; };
@ -87,7 +87,7 @@ put_rooms(client &client,
const resource::request &request) const resource::request &request)
{ {
if(request.parv.size() < 2) if(request.parv.size() < 2)
throw NEED_MORE_PARAMS throw m::NEED_MORE_PARAMS
{ {
"/rooms command required" "/rooms command required"
}; };
@ -114,7 +114,7 @@ put_rooms(client &client,
if(cmd == "redact") if(cmd == "redact")
return put__redact(client, request, room_id); return put__redact(client, request, room_id);
throw NOT_FOUND throw m::NOT_FOUND
{ {
"/rooms command not found" "/rooms command not found"
}; };
@ -134,7 +134,7 @@ post_rooms(client &client,
const resource::request &request) const resource::request &request)
{ {
if(request.parv.size() < 2) if(request.parv.size() < 2)
throw NEED_MORE_PARAMS throw m::NEED_MORE_PARAMS
{ {
"/rooms command required" "/rooms command required"
}; };
@ -182,7 +182,7 @@ post_rooms(client &client,
if(cmd == "report") if(cmd == "report")
return post__report(client, request, room_id); return post__report(client, request, room_id);
throw NOT_FOUND throw m::NOT_FOUND
{ {
"/rooms command not found" "/rooms command not found"
}; };

4
modules/m_device.cc
View file

@ -43,7 +43,7 @@ ircd::m::device::set(const m::user &user,
buf, "ircd.device.%s", prop buf, "ircd.device.%s", prop
}}; }};
m::send(user_room, user, type, device_id, m::send(user_room, user, type, device_id, json::members
{ {
{ "", val } { "", val }
}); });
@ -66,7 +66,7 @@ ircd::m::device::set(const m::user &user,
}}; }};
const user::room user_room{user}; const user::room user_room{user};
m::send(user_room, user, type, id, m::send(user_room, user, type, id, json::members
{ {
{ "", val } { "", val }
}); });

4
modules/m_user.cc
View file

@ -95,14 +95,14 @@ highlighted_count__between(const user &user,
it.seek_idx(a); it.seek_idx(a);
if(!it && !exists(room)) if(!it && !exists(room))
throw NOT_FOUND throw m::NOT_FOUND
{ {
"Cannot find room '%s' to count highlights for '%s'", "Cannot find room '%s' to count highlights for '%s'",
string_view{room.room_id}, string_view{room.room_id},
string_view{user.user_id} string_view{user.user_id}
}; };
else if(!it) else if(!it)
throw NOT_FOUND throw m::NOT_FOUND
{ {
"Event @ idx:%lu or idx:%lu not found in '%s' to count highlights for '%s'", "Event @ idx:%lu or idx:%lu not found in '%s' to count highlights for '%s'",
a, a,

6
modules/media/media.cc
View file

@ -356,13 +356,13 @@ write_file(const m::room &room,
const string_view &content_type) const string_view &content_type)
{ {
//TODO: TXN //TODO: TXN
send(room, user_id, "ircd.file.stat", "size", send(room, user_id, "ircd.file.stat", "size", json::members
{ {
{ "value", long(size(content)) } { "value", long(size(content)) }
}); });
//TODO: TXN //TODO: TXN
send(room, user_id, "ircd.file.stat", "type", send(room, user_id, "ircd.file.stat", "type", json::members
{ {
{ "value", content_type } { "value", content_type }
}); });
@ -476,7 +476,7 @@ block_set(const m::room &room,
block_set(mutable_buffer{b58buf}, block) block_set(mutable_buffer{b58buf}, block)
}; };
return send(room, user_id, "ircd.file.block", return send(room, user_id, "ircd.file.block", json::members
{ {
{ "size", long(size(block)) }, { "size", long(size(block)) },
{ "hash", hash } { "hash", hash }