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

ircd:Ⓜ️:room::power: Improve requirements for different constructions.

Browse source
This commit is contained in:
Jason Volk 2019-02-13 15:59:42 -08:00
parent 11264d2806
commit df64c6e573
2 changed files with 72 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
include/ircd/m/room/power.h
View file

@ -31,7 +31,9 @@ struct ircd::m::room::power
static const int64_t default_user_level;
m::room room;
m::room::state state;
event::idx power_event_idx {0};
json::object power_event_content;
m::id::user room_creator_id;
bool view(const std::function<void (const json::object &)> &) const;
@ -68,8 +70,10 @@ struct ircd::m::room::power
// all who attain great power and riches make use of either force or fraud"
bool operator()(const m::id::user &, const string_view &prop, const string_view &type = {}, const string_view &state_key = {}) const;
power(const m::room &room)
:room{room}
,state{room}
{}
explicit power(const json::object &power_event_content, const m::id::user &room_creator_id);
explicit power(const m::event &power_event, const m::id::user &room_creator_id);
explicit power(const m::event &power_event, const m::event &create_event);
power(const m::room &, const event::idx &power_event_idx);
power(const m::room &);
power() = default;
};

78
ircd/m_room.cc
View file

@ -2131,6 +2131,58 @@ ircd::m::room::power::default_user_level
0
};
ircd::m::room::power::power(const m::room &room)
:power
{
room, room.get(std::nothrow, "m.room.power_levels", "")
}
{
}
ircd::m::room::power::power(const m::room &room,
const event::idx &power_event_idx)
:room
{
room
}
,power_event_idx
{
power_event_idx
}
{
}
ircd::m::room::power::power(const m::event &power_event,
const m::event &create_event)
:power
{
power_event, m::user::id(unquote(json::get<"content"_>(create_event).get("creator")))
}
{
}
ircd::m::room::power::power(const m::event &power_event,
const m::user::id &room_creator_id)
:power
{
json::get<"content"_>(power_event), room_creator_id
}
{
}
ircd::m::room::power::power(const json::object &power_event_content,
const m::user::id &room_creator_id)
:power_event_content
{
power_event_content
}
,room_creator_id
{
room_creator_id
}
{
}
bool
ircd::m::room::power::operator()(const m::user::id &user_id,
const string_view &prop,
@ -2184,9 +2236,14 @@ const try
};
if(!has_power_levels_event)
if(creator(room, user_id))
{
if(room_creator_id && user_id == room_creator_id)
ret = default_creator_level;
if(room.room_id && creator(room, user_id))
ret = default_creator_level;
}
return ret;
}
catch(const json::error &e)
@ -2489,19 +2546,10 @@ bool
ircd::m::room::power::view(const std::function<void (const json::object &)> &closure)
const
{
static const event::keys::include keys
{
"content",
};
if(power_event_idx)
if(m::get(std::nothrow, power_event_idx, "content", closure))
return true;
const m::event::fetch::opts fopts
{
keys, state.fopts? state.fopts->gopts : db::gopts{}
};
return state.get(std::nothrow, "m.room.power_levels", "", [&closure]
(const m::event &event)
{
closure(json::get<"content"_>(event));
});
closure(power_event_content);
return !empty(power_event_content);
}