MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-05-20 03:43:47 +02:00
Code Issues Releases Wiki Activity

ircd::json: Remove redundant typedef; simplify.

Browse source 
ircd:Ⓜ️ Fix ambiguous (C++20).
This commit is contained in:
Jason Volk 2022-06-17 19:58:35 -07:00
parent 24fcc7b4bc
commit ffa62d0f4c
5 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/ircd/json/member.h
View file

@ -14,7 +14,6 @@
namespace ircd::json
{
struct member;
using members = std::initializer_list<const member>;
bool operator==(const member &a, const member &b);
bool operator==(const member &a, const string_view &b);

2
include/ircd/json/type.h
View file

@ -21,7 +21,7 @@ namespace ircd::json
struct array;
struct vector;
struct iov;
using members = std::initializer_list<const member>;
using members = std::initializer_list<member>;
/// strict_t overloads scan the whole string to determine both the type
/// and validity of the string. For large strings this may involve a lot

10
matrix/homeserver_bootstrap.cc
View file

@ -124,27 +124,27 @@ try
create(alias_room, me);
create(control_room, me);
send(my_room, me, "m.room.name", "",
send(my_room, me, "m.room.name", "", json::members
{
{ "name", "IRCd's Room" }
});
send(my_room, me, "m.room.topic", "",
send(my_room, me, "m.room.topic", "", json::members
{
{ "topic", "The daemon's den." }
});
send(conf_room, me, "m.room.name", "",
send(conf_room, me, "m.room.name", "", json::members
{
{ "name", "Server Configuration" }
});
send(tokens_room, me, "m.room.name", "",
send(tokens_room, me, "m.room.name", "", json::members
{
{ "name", "User Tokens" }
});
send(control_room, me, "m.room.name", "",
send(control_room, me, "m.room.name", "", json::members
{
{ "name", "Control Room" }
});

4
matrix/room_create.cc
View file

@ -198,7 +198,7 @@ try
if(guest_access == "can_join") try
{
send(room, creator, "m.room.guest_access", "",
send(room, creator, "m.room.guest_access", "", json::members
{
{ "guest_access", "can_join" }
});
@ -326,7 +326,7 @@ try
if(json::get<"guest_can_join"_>(c) && guest_access != "can_join") try
{
send(room, creator, "m.room.guest_access", "",
send(room, creator, "m.room.guest_access", "", json::members
{
{ "guest_access", "can_join" }
});

2
modules/m_control.cc
View file

@ -141,7 +141,7 @@ create_control_room(const m::event &,
{
create(control_room_id, m::me());
join(control_room, m::me());
send(control_room, m::me(), "m.room.name", "",
send(control_room, m::me(), "m.room.name", "", json::members
{
{ "name", "Control Room" }
});