mirror of
https://github.com/matrix-construct/construct
synced 2024-12-28 08:24:08 +01:00
modules/console: Remove branch for members iteration arguments.
This commit is contained in:
parent
6a3f30afb6
commit
1aa3c68724
1 changed files with 9 additions and 12 deletions
|
@ -2509,14 +2509,19 @@ console_cmd__room__depth(opt &out, const string_view &line)
|
||||||
bool
|
bool
|
||||||
console_cmd__room__members(opt &out, const string_view &line)
|
console_cmd__room__members(opt &out, const string_view &line)
|
||||||
{
|
{
|
||||||
|
const params param{line, " ",
|
||||||
|
{
|
||||||
|
"room_id", "[membership]"
|
||||||
|
}};
|
||||||
|
|
||||||
const auto &room_id
|
const auto &room_id
|
||||||
{
|
{
|
||||||
m::room_id(token(line, ' ', 0))
|
m::room_id(param.at(0))
|
||||||
};
|
};
|
||||||
|
|
||||||
const string_view membership
|
const string_view membership
|
||||||
{
|
{
|
||||||
token_count(line, ' ') > 1? token(line, ' ', 1) : string_view{}
|
param[1]
|
||||||
};
|
};
|
||||||
|
|
||||||
const m::room room
|
const m::room room
|
||||||
|
@ -2534,11 +2539,7 @@ console_cmd__room__members(opt &out, const string_view &line)
|
||||||
out << pretty_oneline(event) << std::endl;
|
out << pretty_oneline(event) << std::endl;
|
||||||
}};
|
}};
|
||||||
|
|
||||||
if(membership)
|
|
||||||
members.for_each(membership, closure);
|
members.for_each(membership, closure);
|
||||||
else
|
|
||||||
members.for_each(closure);
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2646,11 +2647,7 @@ console_cmd__room__members__read(opt &out, const string_view &line)
|
||||||
user_room.get(std::nothrow, "ircd.read", room_id, event_closure);
|
user_room.get(std::nothrow, "ircd.read", room_id, event_closure);
|
||||||
}};
|
}};
|
||||||
|
|
||||||
if(membership)
|
|
||||||
members.for_each(membership, member_closure);
|
members.for_each(membership, member_closure);
|
||||||
else
|
|
||||||
members.for_each(member_closure);
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue