Removed all references which were still left regarding Tyrbot.

modules/standard/MessageDistributor/message_distributor.py

@@ -16,7 +16,7 @@ from core.registry import Registry
 from core.setting_service import SettingService
 from core.setting_types import NumberSettingType
 from core.text import Text
-from core.igncore import Tyrbot
+from core.igncore import IgnCore
 from modules.core.accounting.services.access_service import AccessService
 from modules.core.discord.discord_controller import DiscordController
 
@@ -30,7 +30,7 @@ class MessageDistributor:
         self.logger = Logger(__name__)
 
     def inject(self, registry):
-        self.bot: Tyrbot = registry.get_instance("bot")
+        self.bot: IgnCore = registry.get_instance("bot")
         self.db: DB = registry.get_instance("db")
         self.character_service: CharacterService = registry.get_instance("character_service")
         self.access_service: AccessService = registry.get_instance("access_service")

modules/standard/aou/aou_controller.py

@@ -11,13 +11,13 @@ from core.command_param_types import Any, Const, Int
 from core.decorators import instance, command
 from core.dict_object import DictObject
 from core.translation_service import TranslationService
-from core.igncore import Tyrbot
+from core.igncore import IgnCore
 
 
 # noinspection PyUnusedLocal
 @instance()
 class AOUController:
-    AOU_URL = "https://www.ao-universe.com/mobile/parser.php?bot=tyrbot"
+    AOU_URL = "https://www.ao-universe.com/mobile/parser.php?bot=igncore"
 
     CACHE_GROUP = "aou"
     CACHE_MAX_AGE = 604800
@@ -45,7 +45,7 @@ class AOUController:
 
     def inject(self, registry):
         self.text = registry.get_instance("text")
-        self.bot: Tyrbot = registry.get_instance("bot")
+        self.bot: IgnCore = registry.get_instance("bot")
         self.items_controller = registry.get_instance("items_controller")
         self.cache_service = registry.get_instance("cache_service")
         self.command_alias_service = registry.get_instance("command_alias_service")

modules/standard/datanet/relay_controller.py

@@ -47,31 +47,34 @@ class RelayController:
                                                               [self.MESSAGE_SOURCE])
 
         self.setting_service.register(self.module_name, "websocket_relay_enabled", False, BooleanSettingType(),
-                                          "Enable the websocket relay")
+                                      "Enable the websocket relay")
         self.setting_service.register(self.module_name, "websocket_relay_server_address",
-                                          "ws://localhost/subscribe/relay",
+                                      "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.")
+                                      "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(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")
+                                      "Color of the message content in websocket relay messages")
         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")
+                                      "An encryption key used to encrypt messages over a public websocket relay")
         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)")
+                                      "Name of this relay (if you don't want to use org or bot name)")
         self.setting_service.register(self.module_name, "ws_msg_relay_prefix", "||",
                                       TextSettingType(["!", "#", "*", "@", "$", "+", "-"]),
-                                          "Prefix for Messages which should get relayed")
+                                      "Prefix for Messages which should get relayed")
         self.setting_service.register(self.module_name, "ws_relay_type", "with_symbol",
                                       TextSettingType(["with_symbol", "unless_symbol", "always"]),
-                                          "Relay Messages", )
+                                      "Relay Messages", )
+        self.setting_service.register(self.module_name, "ws_relay_salt", "IGNCore",
+                                      TextSettingType(["IGNCore", "IgnCore"]),
+                                      "Relay Messages", )
         self.initialize_encrypter(self.setting_service.get("websocket_encryption_key").get_value())
 
         self.setting_service.register_change_listener("websocket_relay_enabled", self.websocket_relay_update)
@@ -84,9 +87,7 @@ class RelayController:
 
     def initialize_encrypter(self, password):
         if password:
-            # using hard-coded salt is less secure as it nullifies the
-            # function of the salt and allows for rainbow attacks
-            salt = b"tyrbot"
+            salt = self.setting_service.get("ws_relay_salt").get_value()
             kdf = PBKDF2HMAC(
                 algorithm=hashes.SHA256(),
                 length=32,

modules/standard/loot/auction_controller.py

@@ -4,7 +4,7 @@ from core.command_param_types import Const, Options, Int, Any, Time
 from core.db import DB
 from core.decorators import command, instance, setting
 from core.setting_types import TimeSettingType
-from core.igncore import Tyrbot
+from core.igncore import IgnCore
 from modules.standard.loot.auction_strategy.auction_strategy import AuctionStrategy
 
 
@@ -17,7 +17,7 @@ class AuctionController:
 
     def inject(self, registry):
         self.db: DB = registry.get_instance("db")
-        self.bot: Tyrbot = registry.get_instance("bot")
+        self.bot: IgnCore = registry.get_instance("bot")
 
     def pre_start(self):
         self.db.shared.exec("CREATE TABLE IF NOT EXISTS auction_log ("

modules/standard/loot/loot_controller.py

@@ -10,7 +10,7 @@ from core.db import DB
 from core.decorators import instance, command, timerevent
 from core.setting_service import SettingService
 from core.text import Text
-from core.igncore import Tyrbot
+from core.igncore import IgnCore
 from modules.core.accounting.services.account_service import AccountService
 from modules.raidbot.raid.raidbot_controller import Raider
 from modules.standard.items.items_controller import ItemsController
@@ -28,7 +28,7 @@ class LootController:
         self.last_modify = None
 
     def inject(self, registry):
-        self.bot: Tyrbot = registry.get_instance("bot")
+        self.bot: IgnCore = registry.get_instance("bot")
         self.db: DB = registry.get_instance("db")
         self.text: Text = registry.get_instance("text")
         self.leader_controller: LeaderController = registry.get_instance("leader_controller", is_optional=True)

modules/standard/news/mail_controller.py

@@ -10,7 +10,7 @@ from core.dict_object import DictObject
 from core.job_scheduler import JobScheduler
 from core.logger import Logger
 from core.text import Text
-from core.igncore import Tyrbot
+from core.igncore import IgnCore
 from modules.core.accounting.services.account_service import AccountService
 from modules.core.ban.ban_service import BanService
 
@@ -20,7 +20,7 @@ class MailController:
 
     def inject(self, registry):
         self.logger = Logger(__name__)
-        self.bot: Tyrbot = registry.get_instance("bot")
+        self.bot: IgnCore = registry.get_instance("bot")
         self.db: DB = registry.get_instance("db")
         self.text: Text = registry.get_instance("text")
         self.ban: BanService = registry.get_instance("ban_service")

modules/standard/news/news_controller.py

@@ -15,7 +15,7 @@ from core.logger import Logger
 from core.lookup.pork_service import PorkService
 from core.setting_service import SettingService
 from core.text import Text
-from core.igncore import Tyrbot
+from core.igncore import IgnCore
 from core.util import Util
 from modules.core.accounting.preference_controller import PreferenceController
 from modules.core.accounting.services.account_service import AccountService
@@ -54,7 +54,7 @@ hh:mm - DD.MM.YYYY
 
     def inject(self, registry):
         self.logger = Logger(__name__)
-        self.bot: Tyrbot = registry.get_instance("bot")
+        self.bot: IgnCore = registry.get_instance("bot")
         self.db: DB = registry.get_instance("db")
         self.text: Text = registry.get_instance("text")
         self.account_service: AccountService = registry.get_instance("account_service")

modules/standard/news/weekly_controller.py

@@ -11,7 +11,7 @@ from core.logger import Logger
 from core.lookup.pork_service import PorkService
 from core.setting_service import SettingService
 from core.text import Text
-from core.igncore import Tyrbot
+from core.igncore import IgnCore
 from core.util import Util
 from modules.core.accounting.preference_controller import PreferenceController
 from modules.core.accounting.services.account_service import AccountService
@@ -34,7 +34,7 @@ class WeeklyController:
 
     def inject(self, registry):
         self.logger = Logger(__name__)
-        self.bot: Tyrbot = registry.get_instance("bot")
+        self.bot: IgnCore = registry.get_instance("bot")
         self.db: DB = registry.get_instance("db")
         self.text: Text = registry.get_instance("text")
         self.ban: BanService = registry.get_instance("ban_service")

modules/standard/news/worldboss_controller.py

@@ -8,7 +8,7 @@ from core.logger import Logger
 from core.setting_service import SettingService
 from core.setting_types import BooleanSettingType
 from core.text import Text
-from core.igncore import Tyrbot
+from core.igncore import IgnCore
 from core.util import Util
 from modules.standard.datanet.ws_controller import WebsocketRelayController
 
@@ -30,7 +30,7 @@ class WorldBossController:
 
     def inject(self, registry):
         self.logger = Logger(__name__)
-        self.bot: Tyrbot = registry.get_instance("bot")
+        self.bot: IgnCore = registry.get_instance("bot")
         self.text: Text = registry.get_instance("text")
         self.util: Util = registry.get_instance("util")
         self.command_alias_service: CommandAliasService = registry.get_instance("command_alias_service")

modules/standard/online/online_controller.py

@@ -12,7 +12,7 @@ from core.logger import Logger
 from core.private_channel_service import PrivateChannelService
 from core.setting_service import SettingService
 from core.text import Text
-from core.igncore import Tyrbot
+from core.igncore import IgnCore
 from core.util import Util
 from modules.standard.online.online_display import OnlineDisplay
 
@@ -31,7 +31,7 @@ class OnlineController:
 
     def inject(self, registry):
         self.logger = Logger(__name__)
-        self.bot: Tyrbot = registry.get_instance("bot")
+        self.bot: IgnCore = registry.get_instance("bot")
         self.db: DB = registry.get_instance("db")
         self.text: Text = registry.get_instance("text")
         self.util: Util = registry.get_instance("util")

modules/standard/raid/chat_controller.py

@@ -1,13 +1,13 @@
 from core.command_param_types import Any
 from core.decorators import instance, command
-from core.igncore import Tyrbot
+from core.igncore import IgnCore
 
 
 @instance()
 class ChatController:
     def inject(self, registry):
         self.command_alias_service = registry.get_instance("command_alias_service")
-        self.bot: Tyrbot = registry.get_instance("bot")
+        self.bot: IgnCore = registry.get_instance("bot")
 
     def start(self):
         self.command_alias_service.add_alias("cmd", "shout")

modules/standard/raid/leader_controller.py

@@ -9,7 +9,7 @@ from core.private_channel_service import PrivateChannelService
 from core.setting_service import SettingService
 from core.setting_types import ColorSettingType, BooleanSettingType
 from core.text import Text
-from core.igncore import Tyrbot
+from core.igncore import IgnCore
 from modules.core.accounting.services.access_service import AccessService
 
 
@@ -28,7 +28,7 @@ class LeaderController:
         self.text: Text = registry.get_instance("text")
         self.access_service: AccessService = registry.get_instance("access_service")
         self.character_service: CharacterService = registry.get_instance("character_service")
-        self.bot: Tyrbot = registry.get_instance("bot")
+        self.bot: IgnCore = registry.get_instance("bot")
         self.setting_service: SettingService = registry.get_instance("setting_service")
         self.command_alias_service: CommandAliasService = registry.get_instance("command_alias_service")
 

modules/standard/track/track_controller.py

@@ -16,7 +16,7 @@ from core.private_channel_service import PrivateChannelService
 from core.setting_service import SettingService
 from core.setting_types import TextSettingType, ColorSettingType
 from core.text import Text
-from core.igncore import Tyrbot
+from core.igncore import IgnCore
 from core.util import Util
 from modules.core.accounting.services.account_service import AccountService
 from modules.raidbot.tower.tower_controller import TowerController
@@ -30,7 +30,7 @@ class TrackController(BaseModule):
     MESSAGE_SOURCE = "track_log"
 
     def inject(self, registry):
-        self.bot: Tyrbot = registry.get_instance("bot")
+        self.bot: IgnCore = registry.get_instance("bot")
         self.util: Util = registry.get_instance("util")
         self.pork: PorkService = registry.get_instance("pork_service")
         self.job_scheduler: JobScheduler = registry.get_instance("job_scheduler")

modules/standard/whois/character_history_controller.py

@@ -2,7 +2,7 @@ from core.command_param_types import Int, Character, NamedParameters
 from core.decorators import instance, command
 from core.lookup.character_history_service import CharacterHistoryService
 from core.text import Text
-from core.igncore import Tyrbot
+from core.igncore import IgnCore
 
 
 @instance()
@@ -12,7 +12,7 @@ class CharacterHistoryController:
         pass
 
     def inject(self, registry):
-        self.bot: Tyrbot = registry.get_instance("bot")
+        self.bot: IgnCore = registry.get_instance("bot")
         self.text: Text = registry.get_instance("text")
         self.util = registry.get_instance("util")
         self.character_history_service: CharacterHistoryService = registry.get_instance("character_history_service")

modules/standard/whois/character_info_controller.py

@@ -10,7 +10,7 @@ from core.decorators import instance, command, timerevent
 from core.dict_object import DictObject
 from core.lookup.pork_service import PorkService
 from core.text import Text
-from core.igncore import Tyrbot
+from core.igncore import IgnCore
 
 
 @instance()
@@ -22,7 +22,7 @@ class CharacterInfoController:
         self.waiting_for_update = {}
 
     def inject(self, registry):
-        self.bot: Tyrbot = registry.get_instance("bot")
+        self.bot: IgnCore = registry.get_instance("bot")
         self.db: DB = registry.get_instance("db")
         self.text: Text = registry.get_instance("text")
         self.pork_service: PorkService = registry.get_instance("pork_service")