MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-10-01 13:18:58 +02:00
Code Issues Releases Wiki Activity

modules/client/createroom: Add graceful error handling and granular reporting to client.

Browse source
This commit is contained in:
Jason Volk 2019-03-05 12:42:53 -08:00
parent f0598bb27a
commit 70484be697
1 changed files with 70 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

82
modules/client/createroom.cc
View file

@ -32,6 +32,9 @@ extern "C" room
createroom_(const id::room &room_id, createroom_(const id::room &room_id,
const id::user &creator); const id::user &creator);
thread_local char
error_buf[512];
const room::id::buf const room::id::buf
init_room_id init_room_id
{ {
@ -67,6 +70,31 @@ try
createroom_(room_id, sender_id) createroom_(room_id, sender_id)
}; };
resource::response::chunked response
{
client, http::CREATED, 2_KiB
};
json::stack out
{
response.buf, response.flusher()
};
json::stack::object top
{
out
};
json::stack::member
{
top, "room_id", room.room_id
};
json::stack::array errors
{
top, "errors"
};
const event::id::buf join_event_id const event::id::buf join_event_id
{ {
join(room, sender_id) join(room, sender_id)
@ -74,26 +102,39 @@ try
// Takes precedence over events set by preset, but gets overriden by name // Takes precedence over events set by preset, but gets overriden by name
// and topic keys. // and topic keys.
for(const json::object &event : json::get<"initial_state"_>(request)) size_t i(0);
for(const json::object &event : json::get<"initial_state"_>(request)) try
{ {
const json::string &type(event["type"]); const json::string &type(event["type"]);
if(empty(type))
continue;
const json::string &state_key(event["state_key"]); const json::string &state_key(event["state_key"]);
const json::object &content(event["content"]); const json::object &content(event["content"]);
send(room, sender_id, type, state_key, content); send(room, sender_id, type, state_key, content);
++i;
}
catch(const std::exception &e)
{
errors.append(string_view{fmt::sprintf
{
error_buf, "Failed to set initial_state event @%zu: %s", i++, e.what()
}});
} }
if(json::get<"guest_can_join"_>(request)) if(json::get<"guest_can_join"_>(request)) try
{ {
send(room, sender_id, "m.room.guest_access", "", send(room, sender_id, "m.room.guest_access", "",
{ {
{ "guest_access", "can_join" } { "guest_access", "can_join" }
}); });
} }
catch(const std::exception &e)
{
errors.append(string_view{fmt::sprintf
{
error_buf, "Failed to set guest_access: %s", e.what()
}});
}
if(json::get<"name"_>(request)) if(json::get<"name"_>(request)) try
{ {
static const size_t name_max_len static const size_t name_max_len
{ {
@ -111,28 +152,43 @@ try
{ "name", name } { "name", name }
}); });
} }
catch(const std::exception &e)
{
errors.append(string_view{fmt::sprintf
{
error_buf, "Failed to set room name: %s", e.what()
}});
}
if(json::get<"topic"_>(request)) if(json::get<"topic"_>(request)) try
{ {
send(room, sender_id, "m.room.topic", "", send(room, sender_id, "m.room.topic", "",
{ {
{ "topic", json::get<"topic"_>(request) } { "topic", json::get<"topic"_>(request) }
}); });
} }
catch(const std::exception &e)
{
errors.append(string_view{fmt::sprintf
{
error_buf, "Failed to set room topic: %s", e.what()
}});
}
for(const json::string &_user_id : json::get<"invite"_>(request)) for(const json::string &_user_id : json::get<"invite"_>(request)) try
{ {
const m::user::id &user_id{_user_id}; const m::user::id &user_id{_user_id};
invite(room, user_id, sender_id); invite(room, user_id, sender_id);
} }
catch(const std::exception &e)
return resource::response
{ {
client, http::CREATED, errors.append(string_view{fmt::sprintf
{ {
{ "room_id", room_id }, error_buf, "Failed to invite user '%s': %s", _user_id, e.what()
}});
} }
};
return {};
} }
catch(const db::not_found &e) catch(const db::not_found &e)
{ {