Minidodo/igncore
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed warnings caused by non-existing messagehub channels.

Browse Source 
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:
Minidodo
2021-08-29 17:54:18 +02:00
parent 82d2be8de2
commit 9f1da9a00d
24 changed files with 163 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/orgbot/alliance/alliance_relay.py
+21 -22
View File
@@ -5,7 +5,7 @@ from core.aochat.client_packets import PrivateChannelLeave
from core.chat_blob import ChatBlob
from core.command_param_types import Const, Character, Options, Any
from core.conn import Conn
from core.decorators import instance, command
from core.decorators import instance, command, setting
from core.logger import Logger
from core.lookup.character_service import CharacterService
from core.setting_service import SettingService
@@ -35,17 +35,6 @@ class AllianceRelay:
self.message_hub_service.register_message_source(self.MESSAGE_SOURCE)
def start(self):
self.setting_service.register_new(self.module_name, "relay_symbols", {'default': "-"}, DictionarySettingType(), "Symbol for external relay")
self.setting_service.register_new(self.module_name, "relay_symbol_methods", {'default': "always"}, DictionarySettingType(), "When to relay messages")
self.setting_service.register_new(self.module_name, "relay_bots", {}, DictionarySettingType(), "Bot for alliance relay")
self.setting_service.register_new(self.module_name, "relay_command", {"default": "!agcr"}, DictionarySettingType(), "Relay command for the relay")
self.setting_service.register_new(self.module_name, "relay_enabled", {"default": True}, DictionarySettingType(), "Enable the alliance relay")
self.setting_service.register_new(self.module_name, "relay_guild_abbreviations", {"default": self.public_channel_service.get_org_name()}, DictionarySettingType(), "Abbreviation to use for org name")
self.setting_service.register_new(self.module_name, "relay_color_base", {"default": "#00FF00"}, DictionarySettingType(), "Base color for alliance relay")
self.setting_service.register_new(self.module_name, "relay_color_org", {"default": "#FFFF00"}, DictionarySettingType(), "Org color for alliance relay")
self.setting_service.register_new(self.module_name, "relay_color_sender", {"default": "#FF8C00"}, DictionarySettingType(), "Name color for alliance relay")
self.setting_service.register_new(self.module_name, "relay_color_msg", {"default": "#FF8C00"}, DictionarySettingType(), "Message color for alliance relay")
self.message_hub_service.register_message_destination(self.MESSAGE_SOURCE,
self.handle_relay_hub_message,
["org_channel"],
@@ -381,35 +370,45 @@ class AllianceRelay:
packet = client_packets.PrivateChannelMessage(int(alliance), self.text.format_message(msg, False), "\0")
self.bot.conns["main"].send_packet(packet)
@setting(name="relay_symbols", value={"default": "-"}, description="Symbol for external relay")
def relay_symbols(self) -> DictionarySettingType:
return self.setting_service.get("relay_symbols")
return DictionarySettingType()
@setting(name="relay_symbol_methods", value={'default': "always"}, description="Relay methods for the relays")
def relay_symbol_methods(self) -> DictionarySettingType:
return self.setting_service.get("relay_symbol_methods")
return DictionarySettingType()
@setting(name="relay_bots", value={}, description="Bots used for relaying")
def relay_bots(self) -> DictionarySettingType:
return self.setting_service.get("relay_bots")
return DictionarySettingType()
@setting(name="relay_enabled", value={"default": True}, description="Enabled status of the relays")
def relay_enabled(self) -> DictionarySettingType:
return self.setting_service.get("relay_enabled")
return DictionarySettingType()
@setting(name="relay_guild_abbreviations", value={"default": "UNSET"}, description="Abbreviations used for the relays")
def relay_guild_abbreviations(self) -> DictionarySettingType:
return self.setting_service.get("relay_guild_abbreviations")
return DictionarySettingType()
@setting(name="relay_color_base", value={"default": "#00FF00"}, description="Base color used for the relays")
def relay_color_base(self) -> DictionarySettingType:
return self.setting_service.get("relay_color_base")
return DictionarySettingType()
@setting(name="relay_color_org", value={"default": "#FFFF00"}, description="Abbrv color used for the relays")
def relay_color_org(self) -> DictionarySettingType:
return self.setting_service.get("relay_color_org")
return DictionarySettingType()
@setting(name="relay_color_sender", value={"default": "#FF8C00"}, description="Sender color used for the relays")
def relay_color_sender(self) -> DictionarySettingType:
return self.setting_service.get("relay_color_sender")
return DictionarySettingType()
@setting(name="relay_color_msg", value={"default": "#FF8C00"}, description="Message color used for the relays")
def relay_color_msg(self) -> DictionarySettingType:
return self.setting_service.get("relay_color_msg")
return DictionarySettingType()
@setting(name="relay_command", value={"default": "!agcr"}, description="Relay command used for the relays")
def relay_command(self) -> DictionarySettingType:
return self.setting_service.get("relay_command")
return DictionarySettingType()
def check_color(self, msg: str):
if not msg.startswith('#'):