From 84347857c67868caccf15ef905905109a0495e83 Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Fri, 1 May 2020 09:44:15 -0700 Subject: [PATCH] ircd::m::room::power: Use conf items to seed all default values. --- include/ircd/m/room/power.h | 8 ++++---- matrix/room_power.cc | 12 ++++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/include/ircd/m/room/power.h b/include/ircd/m/room/power.h index b0abad9f0..c1923ce1a 100644 --- a/include/ircd/m/room/power.h +++ b/include/ircd/m/room/power.h @@ -46,10 +46,10 @@ struct ircd::m::room::power struct revoke; using closure = std::function; - static const int64_t default_creator_level; - static const int64_t default_power_level; - static const int64_t default_event_level; - static const int64_t default_user_level; + static conf::item default_creator_level; + static conf::item default_power_level; + static conf::item default_event_level; + static conf::item default_user_level; m::room room; event::idx power_event_idx {0}; diff --git a/matrix/room_power.cc b/matrix/room_power.cc index 8d2576ce9..76845a128 100644 --- a/matrix/room_power.cc +++ b/matrix/room_power.cc @@ -148,25 +148,29 @@ ircd::m::room::power::grant::grant(json::stack::object &out, decltype(ircd::m::room::power::default_creator_level) ircd::m::room::power::default_creator_level { - 100 + { "name", "ircd.m.room.power.default.creator_level" }, + { "default", 100L }, }; decltype(ircd::m::room::power::default_power_level) ircd::m::room::power::default_power_level { - 50 + { "name", "ircd.m.room.power.default.power_level" }, + { "default", 50L }, }; decltype(ircd::m::room::power::default_event_level) ircd::m::room::power::default_event_level { - 0 + { "name", "ircd.m.room.power.default.event_level" }, + { "default", 0L }, }; decltype(ircd::m::room::power::default_user_level) ircd::m::room::power::default_user_level { - 0 + { "name", "ircd.m.room.power.default.user_level" }, + { "default", 0L }, }; ircd::json::object