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/standard/datanet/relay_controller.py
+17 -18
View File
@@ -43,35 +43,34 @@ class RelayController:
def start(self):
self.message_hub_service.register_message_destination(self.MESSAGE_SOURCE,
self.handle_message_from_hub,
["private_channel", "org_channel",
"discord", "tell_relay"],
["private_channel", "org_channel"],
[self.MESSAGE_SOURCE])
self.setting_service.register_new(self.module_name, "websocket_relay_enabled", False, BooleanSettingType(),
self.setting_service.register(self.module_name, "websocket_relay_enabled", False, BooleanSettingType(),
"Enable the websocket relay")
self.setting_service.register_new(self.module_name, "websocket_relay_server_address",
self.setting_service.register(self.module_name, "websocket_relay_server_address",
"ws://localhost/subscribe/relay",
TextSettingType(["ws://localhost/subscribe/relay"]),
TextSettingType(["ws://localhost/subscribe/relay"]),
"The address of the websocket relay server",
"All bots on the relay must connect to the same server and channel. "
"If using the public relay server, use a unique channel name.")
self.setting_service.register_new(self.module_name, "websocket_relay_channel_color", "#FFFF00",
ColorSettingType(), "Color of the channel in websocket relay messages")
self.setting_service.register_new(self.module_name, "websocket_relay_message_color", "#FCA712",
ColorSettingType(),
self.setting_service.register(self.module_name, "websocket_relay_channel_color", "#FFFF00",
ColorSettingType(), "Color of the channel in websocket relay messages")
self.setting_service.register(self.module_name, "websocket_relay_message_color", "#FCA712",
ColorSettingType(),
"Color of the message content in websocket relay messages")
self.setting_service.register_new(self.module_name, "websocket_relay_sender_color", "#00DE42",
ColorSettingType(), "Color of the sender in websocket relay messages")
self.setting_service.register_new(self.module_name, "websocket_encryption_key", "",
HiddenSettingType(allow_empty=True),
self.setting_service.register(self.module_name, "websocket_relay_sender_color", "#00DE42",
ColorSettingType(), "Color of the sender in websocket relay messages")
self.setting_service.register(self.module_name, "websocket_encryption_key", "",
HiddenSettingType(allow_empty=True),
"An encryption key used to encrypt messages over a public websocket relay")
self.setting_service.register_new(self.module_name, "ws_relay_prefix", "", TextSettingType(allow_empty=True),
self.setting_service.register(self.module_name, "ws_relay_prefix", "", TextSettingType(allow_empty=True),
"Name of this relay (if you don't want to use org or bot name)")
self.setting_service.register_new(self.module_name, "ws_msg_relay_prefix", "||",
TextSettingType(["!", "#", "*", "@", "$", "+", "-"]),
self.setting_service.register(self.module_name, "ws_msg_relay_prefix", "||",
TextSettingType(["!", "#", "*", "@", "$", "+", "-"]),
"Prefix for Messages which should get relayed")
self.setting_service.register_new(self.module_name, "ws_relay_type", "with_symbol",
TextSettingType(["with_symbol", "unless_symbol", "always"]),
self.setting_service.register(self.module_name, "ws_relay_type", "with_symbol",
TextSettingType(["with_symbol", "unless_symbol", "always"]),
"Relay Messages", )
self.initialize_encrypter(self.setting_service.get("websocket_encryption_key").get_value())
modules/standard/datanet/ws_controller.py
+2 -2
View File
@@ -36,10 +36,10 @@ class WebsocketRelayController(BaseModule):
def pre_start(self):
self.event_service.register_event_type(self.WS_RELAY)
self.setting_service.register_new(self.module_name,
self.setting_service.register(self.module_name,
'relay_address',
'ws://localhost:25500',
TextSettingType([], allow_empty=True),
TextSettingType([], allow_empty=True),
"relay for timers, tower info, ...")
@timerevent(budatime="1s", description="Relay messages from Data relay to the internal message hub",