MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-11-29 18:22:50 +01:00
Code Issues Releases Wiki Activity

modules/client/rooms/forget: Simplify checks. (closes #130)

Browse source
This commit is contained in:
Jason Volk 2019-09-18 11:37:34 -07:00
parent 601f26983e
commit 321b7e32c1
1 changed files with 3 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -39,43 +39,11 @@ post__forget(client &client,
string_view{room_id}
};
char room_membuf[m::room::MEMBERSHIP_MAX_SIZE];
const string_view &room_membership
{
membership(room_membuf, room, request.user_id)
};
char user_membuf[m::room::MEMBERSHIP_MAX_SIZE];
string_view user_membership;
m::get(std::nothrow, event_idx, "content", [&user_membuf, &user_membership]
(const json::object &content)
{
const json::string &membership
{
content.get("membership")
};
user_membership =
{
user_membuf, copy(user_membuf, membership)
};
});
if(room_membership != user_membership)
log::critical
{
"Membership mismatch for user %s in room %s: user:%s vs. room:%s",
string_view{request.user_id},
string_view{room_id},
user_membership,
room_membership
};
if(user_membership != "leave")
if(m::membership(event_idx, m::membership_positive))
throw m::error
{
http::OK, "M_MEMBERSHIP_NOT_LEAVE",
"You must leave the room first to forget it"
http::UNPROCESSABLE_ENTITY, "M_MEMBERSHIP_POSITIVE",
"You must leave or be banned from the room to forget it."
};
const auto event_id