Fixed warnings caused by non-existing messagehub channels.
Changed the setting registration, removed the warnings. Loot roll messages are more obvious now. Superadmins are meant to stay mostily hidden, but are being exposed in !system again.
This commit is contained in:
+1
-1
@@ -42,7 +42,7 @@ class Tyrbot:
|
||||
self.last_timer_event = 0
|
||||
self.start_time = int(time.time())
|
||||
self.major_version = "IGNCore v2.6"
|
||||
self.minor_version = "2"
|
||||
self.minor_version = "3"
|
||||
self.incoming_queue = FifoQueue()
|
||||
self.mass_message_queue = None
|
||||
self.conns = DictObject()
|
||||
|
||||
@@ -36,10 +36,10 @@ class PublicChannelService(BaseModule):
|
||||
priority=30)
|
||||
self.event_service.register_event_type(self.ORG_CHANNEL_MESSAGE_EVENT)
|
||||
self.event_service.register_event_type(self.ORG_MSG_EVENT)
|
||||
self.setting_service.register_new('core.system', 'org_id', 0,
|
||||
NumberSettingType(), 'OrgID used for roster')
|
||||
self.setting_service.register_new('core.system', 'org_name', "",
|
||||
TextSettingType(allow_empty=True), 'OrgName used for roster')
|
||||
self.setting_service.register('core.system', 'org_id', 0,
|
||||
NumberSettingType(), 'OrgID used for roster')
|
||||
self.setting_service.register('core.system', 'org_name', "",
|
||||
TextSettingType(allow_empty=True), 'OrgName used for roster')
|
||||
|
||||
def start(self):
|
||||
org_id_setting = self.setting_service.get("org_id")
|
||||
|
||||
@@ -25,14 +25,9 @@ class SettingService:
|
||||
for name, method in get_attrs(inst).items():
|
||||
if hasattr(method, "setting"):
|
||||
setting_name, value, description, extended_description, obj = getattr(method, "setting")
|
||||
self.register(setting_name, value, description, obj, inst.module_name, extended_description)
|
||||
self.register(inst.module_name, setting_name, value, obj, description, extended_description)
|
||||
|
||||
def register(self, name, value, description, setting, module, extended_description=None):
|
||||
"""Deprecated. Use register_new()"""
|
||||
self.logger.warning(f"Using deprecated register method for setting '{name}' in module {module}")
|
||||
self.register_new(module, name, value, setting, description, extended_description)
|
||||
|
||||
def register_new(self, module, name, value, setting, description, extended_description=None):
|
||||
def register(self, module, name, value, setting, description, extended_description=None):
|
||||
"""Call during start"""
|
||||
name = name.lower()
|
||||
module = module.lower()
|
||||
@@ -44,10 +39,10 @@ class SettingService:
|
||||
setting.set_extended_description(extended_description)
|
||||
|
||||
if not description:
|
||||
self.logger.warning("No description specified for setting '%s'" % name)
|
||||
self.logger.warning(f"No description specified for setting '{name}'")
|
||||
|
||||
if " " in name:
|
||||
raise Exception("One or more spaces found in setting name '%s' for module '%s'" % (name, module))
|
||||
raise Exception(f"One or more spaces found in setting name '{name}' for module '{module}'")
|
||||
|
||||
row = self.db.query_single("SELECT name, value, description FROM setting WHERE name = ?", [name])
|
||||
|
||||
|
||||
@@ -33,8 +33,8 @@ class TranslationService:
|
||||
self.event_service.register_event_type("reload_translation")
|
||||
|
||||
def start(self):
|
||||
self.setting_service.register_new("core.system", self.LANGUAGE_SETTING, "en_US",
|
||||
TextSettingType(self.lang_codes), "Language of the Bot")
|
||||
self.setting_service.register("core.system", self.LANGUAGE_SETTING, "en_US",
|
||||
TextSettingType(self.lang_codes), "Language of the Bot")
|
||||
|
||||
self.language = self.setting_service.get_value(self.LANGUAGE_SETTING)
|
||||
self.register_translation("global", self.load_global_msg)
|
||||
|
||||
Reference in New Issue
Block a user