From ac5dc381471d32fd7023ea8fbb9a2b6408abef08 Mon Sep 17 00:00:00 2001 From: Minidodo Date: Mon, 6 Sep 2021 20:39:09 +0200 Subject: [PATCH] Removed all references which were still left regarding Tyrbot. --- README.md | 2 +- core/conn.py | 2 +- core/igncore.py | 2 +- core/translation_service.py | 4 +-- modules/core/accounting/alts_controller.py | 4 +-- .../core/accounting/preference_controller.py | 4 +-- .../core/accounting/register_controller.py | 4 +-- .../accounting/services/account_service.py | 4 +-- modules/core/ban/ban_controller.py | 4 +-- modules/core/ban/orgban_controller.py | 4 +-- modules/core/colors/color_controller.py | 4 +-- modules/core/discord/discord_controller.py | 4 +-- modules/core/help/about.txt | 16 +---------- .../private_channel_controller.py | 6 ++--- modules/core/riadmin/riadmin_controller.py | 4 +-- modules/core/system/system.msg | 2 +- .../onlinebot/Darknet/darknet_controller.py | 4 +-- .../alliance/alliance_relay_controller.py | 4 +-- modules/onlinebot/ding/ding_controller.py | 6 ++--- modules/onlinebot/online/bot_controller.py | 4 +-- .../onlinebot/online/org_alias_controller.py | 4 +-- modules/onlinebot/online/org_controller.py | 4 +-- modules/onlinebot/raids/raid_controller.py | 4 +-- modules/onlinebot/stats/stats_controller.py | 4 +-- modules/orgbot/alliance/alliance_relay.py | 8 +++--- modules/orgbot/notify/notify_controller.py | 4 +-- modules/orgbot/org/org_controller.py | 6 ++--- modules/orgbot/org/org_roster_controller.py | 4 +-- modules/orgbot/raidspy/raidspy_controller.py | 6 ++--- modules/raidbot/raid/preset_controller.py | 4 +-- modules/raidbot/raid/raidbot_controller.py | 4 +-- modules/raidbot/spam/massinvite_controller.py | 4 +-- modules/raidbot/tower/contract_controller.py | 4 +-- modules/raidbot/tower/plant_controller.py | 4 +-- .../raidbot/tower/tower_attack_controller.py | 4 +-- modules/raidbot/tower/tower_controller.py | 4 +-- modules/raidbot/tower/tower_hot_controller.py | 4 +-- modules/raidbot/tower/tower_service.py | 4 +-- .../MessageDistributor/message_distributor.py | 4 +-- modules/standard/aou/aou_controller.py | 6 ++--- modules/standard/datanet/relay_controller.py | 27 ++++++++++--------- modules/standard/loot/auction_controller.py | 4 +-- modules/standard/loot/loot_controller.py | 4 +-- modules/standard/news/mail_controller.py | 4 +-- modules/standard/news/news_controller.py | 4 +-- modules/standard/news/weekly_controller.py | 4 +-- modules/standard/news/worldboss_controller.py | 4 +-- modules/standard/online/online_controller.py | 4 +-- modules/standard/raid/chat_controller.py | 4 +-- modules/standard/raid/leader_controller.py | 4 +-- modules/standard/track/track_controller.py | 4 +-- .../whois/character_history_controller.py | 4 +-- .../whois/character_info_controller.py | 4 +-- 53 files changed, 120 insertions(+), 133 deletions(-) diff --git a/README.md b/README.md index b1206a4..7972857 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # IGNCore -IGNcore is a performance oriented rewrite of [Tyrbot](https://github.com/Budabot/Tyrbot), which is an in-game chatbot for the MMORPG Anarchy Online released by Funcom in 2001. +IGNcore is a performance oriented chatbot for the MMORPG Anarchy Online released by Funcom in 2001. **If you're unsure about good ways of setting it up, this bot is NOT for you. The bot targets advanced use cases of bigger bots, and lacks all types of documentation as of now.** diff --git a/core/conn.py b/core/conn.py index e33cb52..b8844db 100644 --- a/core/conn.py +++ b/core/conn.py @@ -24,7 +24,7 @@ class Conn(Bot): self.logger.error(f"no packet received in 90 seconds for conn {self.id}") self.failure_callback() if time_since > 60: - self.send_packet(Ping("tyrbot_aochat")) + self.send_packet(Ping("igncore_aochat")) else: self.packet_last_received_timestamp = time.time() return packet diff --git a/core/igncore.py b/core/igncore.py index 714ecba..67155a6 100644 --- a/core/igncore.py +++ b/core/igncore.py @@ -22,7 +22,7 @@ from modules.core.accounting.services.access_service import AccessService @instance("bot") -class Tyrbot: +class IgnCore: CONNECT_EVENT = "connect" PACKET_EVENT = "packet" PRIVATE_MSG_EVENT = "private_msg" diff --git a/core/translation_service.py b/core/translation_service.py index 441570e..5d24f26 100644 --- a/core/translation_service.py +++ b/core/translation_service.py @@ -7,7 +7,7 @@ from core.event_service import EventService from core.logger import Logger from core.setting_service import SettingService from core.setting_types import TextSettingType -from core.igncore import Tyrbot +from core.igncore import IgnCore from core.util import Util @@ -27,7 +27,7 @@ class TranslationService: self.setting_service: SettingService = registry.get_instance("setting_service") self.event_service: EventService = registry.get_instance("event_service") self.util: Util = registry.get_instance("util") - self.bot: Tyrbot = registry.get_instance("bot") + self.bot: IgnCore = registry.get_instance("bot") def pre_start(self): self.event_service.register_event_type("reload_translation") diff --git a/modules/core/accounting/alts_controller.py b/modules/core/accounting/alts_controller.py index 4cc37f2..bef89a4 100644 --- a/modules/core/accounting/alts_controller.py +++ b/modules/core/accounting/alts_controller.py @@ -9,7 +9,7 @@ from core.dict_object import DictObject from core.setting_service import SettingService from core.text import Text from core.translation_service import TranslationService -from core.igncore import Tyrbot +from core.igncore import IgnCore from modules.core.accounting.register_controller import RegisterController from modules.core.accounting.services.account_service import AccountService @@ -17,7 +17,7 @@ from modules.core.accounting.services.account_service import AccountService @instance() class AltsController: def inject(self, registry): - self.bot: Tyrbot = registry.get_instance("bot") + self.bot: IgnCore = registry.get_instance("bot") self.account_service: AccountService = registry.get_instance("account_service") self.buddy_service = registry.get_instance("buddy_service") self.util = registry.get_instance("util") diff --git a/modules/core/accounting/preference_controller.py b/modules/core/accounting/preference_controller.py index f95b6a7..454cc41 100644 --- a/modules/core/accounting/preference_controller.py +++ b/modules/core/accounting/preference_controller.py @@ -9,7 +9,7 @@ from core.lookup.pork_service import PorkService from core.setting_service import SettingService from core.text import Text from core.translation_service import TranslationService -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.core.discord.discord_controller import DiscordController @@ -20,7 +20,7 @@ class PreferenceController: 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") diff --git a/modules/core/accounting/register_controller.py b/modules/core/accounting/register_controller.py index 393c190..6776baa 100644 --- a/modules/core/accounting/register_controller.py +++ b/modules/core/accounting/register_controller.py @@ -12,7 +12,7 @@ from core.lookup.pork_service import PorkService from core.message_hub_service import MessageHubService 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.services.account_service import AccountService @@ -20,7 +20,7 @@ from modules.core.accounting.services.account_service import AccountService @instance() class RegisterController: def inject(self, registry): - self.bot: Tyrbot = registry.get_instance("bot") + self.bot: IgnCore = registry.get_instance("bot") self.buddy_service = registry.get_instance("buddy_service") self.util: Util = registry.get_instance("util") self.db: DB = registry.get_instance("db") diff --git a/modules/core/accounting/services/account_service.py b/modules/core/accounting/services/account_service.py index 7baf844..d09b900 100644 --- a/modules/core/accounting/services/account_service.py +++ b/modules/core/accounting/services/account_service.py @@ -11,7 +11,7 @@ from core.lookup.pork_service import PorkService 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 modules.core.accounting.services.access_service import AccessService @@ -27,7 +27,7 @@ class AccountService: # noinspection PyAttributeOutsideInit def inject(self, registry): - self.bot: Tyrbot = registry.get_instance("bot") + self.bot: IgnCore = registry.get_instance("bot") self.buddy_service: BuddyService = registry.get_instance("buddy_service") self.util = registry.get_instance("util") self.character_service: CharacterService = registry.get_instance("character_service") diff --git a/modules/core/ban/ban_controller.py b/modules/core/ban/ban_controller.py index d207b5b..219a71c 100644 --- a/modules/core/ban/ban_controller.py +++ b/modules/core/ban/ban_controller.py @@ -7,7 +7,7 @@ from core.db import DB from core.decorators import instance, command from core.lookup.character_service import CharacterService from core.translation_service import TranslationService -from core.igncore import Tyrbot +from core.igncore import IgnCore from modules.core.ban.ban_service import BanService @@ -15,7 +15,7 @@ from modules.core.ban.ban_service import BanService class BanController(BaseModule): # noinspection DuplicatedCode 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 = registry.get_instance("text") self.util = registry.get_instance("util") diff --git a/modules/core/ban/orgban_controller.py b/modules/core/ban/orgban_controller.py index ea2d831..ae9d60a 100644 --- a/modules/core/ban/orgban_controller.py +++ b/modules/core/ban/orgban_controller.py @@ -13,7 +13,7 @@ from core.lookup.character_service import CharacterService from core.lookup.org_pork_service import OrgPorkService from core.private_channel_service import PrivateChannelService from core.translation_service import TranslationService -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 @@ -26,7 +26,7 @@ class OrgBanController(BaseModule): 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.text = registry.get_instance("text") self.util = registry.get_instance("util") diff --git a/modules/core/colors/color_controller.py b/modules/core/colors/color_controller.py index ffc224f..afbec2a 100644 --- a/modules/core/colors/color_controller.py +++ b/modules/core/colors/color_controller.py @@ -2,14 +2,14 @@ from core.aochat.BaseModule import BaseModule from core.decorators import instance from core.setting_service import SettingService from core.setting_types import ColorSettingType -from core.igncore import Tyrbot +from core.igncore import IgnCore @instance() class ColorController(BaseModule): def inject(self, registry): self.setting_service: SettingService = registry.get_instance("setting_service") - self.bot: Tyrbot = registry.get_instance("bot") + self.bot: IgnCore = registry.get_instance("bot") # noinspection LongLine def start(self): diff --git a/modules/core/discord/discord_controller.py b/modules/core/discord/discord_controller.py index 4caaa8e..9c27735 100644 --- a/modules/core/discord/discord_controller.py +++ b/modules/core/discord/discord_controller.py @@ -25,7 +25,7 @@ from core.message_hub_service import MessageHubService from core.setting_service import SettingService from core.setting_types import HiddenSettingType 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.access_service import AccessService from modules.core.accounting.services.account_service import AccountService @@ -92,7 +92,7 @@ class DiscordController: # noinspection PyAttributeOutsideInit 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.character_service: CharacterService = registry.get_instance("character_service") diff --git a/modules/core/help/about.txt b/modules/core/help/about.txt index 6295cdc..5d7b696 100644 --- a/modules/core/help/about.txt +++ b/modules/core/help/about.txt @@ -1,7 +1,7 @@ Our Home: https://www.aoalliance.org/ Gitlab Repository: https://gitlab.com/CynderGames/igncore -IGNCore is a performance oriented fork of Tyrbot based on version 0.5, +IGNCore is a performance oriented Anarchy Online chatbot, and is being maintained by a group Volunteers. At this point, we'd like to send a special "thank you" to the following people, which in one way or another, contributed to IGNCore/IGNCom: @@ -13,18 +13,4 @@ At this point, we'd like to send a special "thank you" to the following people, » helped us by sending bug reports our way, » or just by keeping us busy during a long night of development. -aswell as the initial developers of Tyrbot, on which IGNCore is based: - » Tyrence - » Teeko for all the time he spent testing new features, - reporting bugs, and making suggestions - » nepherius/wafflespower who was critical during the - early parts of development in testing and suggesting changes - » minidodo for his significant contributions and fixes - to Tyrbot, and his willingness to assist other users in the Discord channel - » hughp135 - » jroovers - » dustify - » equinitry - » Ilon Sjögren - If you'd like to know more, feel free to contact us on the toons listed in !admins - Administrators. \ No newline at end of file diff --git a/modules/core/private_channel/private_channel_controller.py b/modules/core/private_channel/private_channel_controller.py index 3345da2..49a916d 100644 --- a/modules/core/private_channel/private_channel_controller.py +++ b/modules/core/private_channel/private_channel_controller.py @@ -12,7 +12,7 @@ from core.private_channel_service import PrivateChannelService from core.setting_service import SettingService from core.text import Text from core.translation_service import TranslationService -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.core.ban.ban_service import BanService @@ -25,7 +25,7 @@ class PrivateChannelController: PRIVATE_CHANNEL_PREFIX = "[Priv] " 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.private_channel_service = registry.get_instance("private_channel_service") self.character_service: CharacterService = registry.get_instance("character_service") @@ -219,7 +219,7 @@ class PrivateChannelController: self.bot.send_private_channel_message(msg, fire_outgoing_event=False) self.message_hub_service.send_message(self.MESSAGE_SOURCE, None, msg, msg) - @event(event_type=Tyrbot.OUTGOING_PRIVATE_CHANNEL_MESSAGE_EVENT, + @event(event_type=IgnCore.OUTGOING_PRIVATE_CHANNEL_MESSAGE_EVENT, description="Relay commands from the private channel to the relay hub", is_hidden=True) def outgoing_private_channel_message_event(self, _, event_data): if isinstance(event_data.message, ChatBlob): diff --git a/modules/core/riadmin/riadmin_controller.py b/modules/core/riadmin/riadmin_controller.py index 8432901..95c07f3 100644 --- a/modules/core/riadmin/riadmin_controller.py +++ b/modules/core/riadmin/riadmin_controller.py @@ -13,7 +13,7 @@ from core.setting_service import SettingService from core.setting_types import TextSettingType from core.text import Text from core.translation_service import TranslationService -from core.igncore import Tyrbot +from core.igncore import IgnCore # noinspection SqlCaseVsIf,SqlCaseVsCoalesce @@ -26,7 +26,7 @@ class RIAdminController: self.logger = Logger(__name__) def inject(self, registry): - self.bot: Tyrbot = registry.get_instance("bot") + self.bot: IgnCore = registry.get_instance("bot") self.db = registry.get_instance("db") self.text: Text = registry.get_instance("text") self.setting_service: SettingService = registry.get_instance("setting_service") diff --git a/modules/core/system/system.msg b/modules/core/system/system.msg index 1335e56..fe28cc6 100644 --- a/modules/core/system/system.msg +++ b/modules/core/system/system.msg @@ -94,7 +94,7 @@ "{access_levels}" ], "de_DE": [ - "Version: Tyrbot {bot_ver}\n", + "Version: Igncore {bot_ver}\n", "Name: \n", "\n", "Betriebssystem: {os_ver}\n", diff --git a/modules/onlinebot/Darknet/darknet_controller.py b/modules/onlinebot/Darknet/darknet_controller.py index ea7adb0..086def2 100644 --- a/modules/onlinebot/Darknet/darknet_controller.py +++ b/modules/onlinebot/Darknet/darknet_controller.py @@ -8,7 +8,7 @@ from core.lookup.character_service import CharacterService 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 @instance("Darknet") @@ -24,7 +24,7 @@ class DarkController: self.logger = Logger(__name__) 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.setting_service: SettingService = registry.get_instance("setting_service") self.character_service: CharacterService = registry.get_instance("character_service") diff --git a/modules/onlinebot/alliance/alliance_relay_controller.py b/modules/onlinebot/alliance/alliance_relay_controller.py index 44d2074..46fda8f 100644 --- a/modules/onlinebot/alliance/alliance_relay_controller.py +++ b/modules/onlinebot/alliance/alliance_relay_controller.py @@ -6,7 +6,7 @@ from core.lookup.character_service import CharacterService from core.setting_service import SettingService from core.setting_types import TextSettingType, BooleanSettingType, ColorSettingType from core.text import Text -from core.igncore import Tyrbot +from core.igncore import IgnCore @instance("AllianceRelayController") @@ -19,7 +19,7 @@ class AllianceRelayController: # noinspection DuplicatedCode def inject(self, registry): - self.bot: Tyrbot = registry.get_instance("bot") + self.bot: IgnCore = registry.get_instance("bot") self.setting_service: SettingService = registry.get_instance("setting_service") self.character_service: CharacterService = registry.get_instance("character_service") self.message_hub_service = registry.get_instance("message_hub_service") diff --git a/modules/onlinebot/ding/ding_controller.py b/modules/onlinebot/ding/ding_controller.py index e149ff2..eecacac 100644 --- a/modules/onlinebot/ding/ding_controller.py +++ b/modules/onlinebot/ding/ding_controller.py @@ -8,7 +8,7 @@ from core.logger import Logger from core.lookup.character_service import CharacterService from core.setting_service import SettingService from core.text import Text -from core.igncore import Tyrbot +from core.igncore import IgnCore @instance("DingController") @@ -67,7 +67,7 @@ class DingController: self.logger = Logger(__name__) 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.setting_service: SettingService = registry.get_instance("setting_service") self.character_service: CharacterService = registry.get_instance("character_service") @@ -90,7 +90,7 @@ class DingController: self.bot.send_mass_message(user.char_id, f"Game Over! " f"{random.choice(self.text_options_axp).format(**user)} " - f"[{self.generate_output('AI 220')}]", + f"[{self.generate_output('AI 30')}]", log_message=True) # XP 220 diff --git a/modules/onlinebot/online/bot_controller.py b/modules/onlinebot/online/bot_controller.py index 79a8382..c87f34f 100644 --- a/modules/onlinebot/online/bot_controller.py +++ b/modules/onlinebot/online/bot_controller.py @@ -11,7 +11,7 @@ from core.decorators import instance, command from core.logger import Logger from core.lookup.pork_service import PorkService from core.text import Text -from core.igncore import Tyrbot +from core.igncore import IgnCore from core.util import Util @@ -23,7 +23,7 @@ class BotController(BaseModule): 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") diff --git a/modules/onlinebot/online/org_alias_controller.py b/modules/onlinebot/online/org_alias_controller.py index 2293a52..3ea9de7 100644 --- a/modules/onlinebot/online/org_alias_controller.py +++ b/modules/onlinebot/online/org_alias_controller.py @@ -5,7 +5,7 @@ from core.decorators import instance from core.logger import Logger from core.lookup.pork_service import PorkService 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.access_service import AccessService @@ -21,7 +21,7 @@ class OrgAliasController: 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") diff --git a/modules/onlinebot/online/org_controller.py b/modules/onlinebot/online/org_controller.py index 678e93a..2d28b9a 100644 --- a/modules/onlinebot/online/org_controller.py +++ b/modules/onlinebot/online/org_controller.py @@ -20,7 +20,7 @@ from core.lookup.org_pork_service import OrgPorkService from core.lookup.pork_service import PorkService from core.message_hub_service import MessageHubService 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.access_service import AccessService # noinspection PyAttributeOutsideInit,SpellCheckingInspection,DuplicatedCode @@ -39,7 +39,7 @@ class OrgController: 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") diff --git a/modules/onlinebot/raids/raid_controller.py b/modules/onlinebot/raids/raid_controller.py index 7ba5686..9be9b11 100644 --- a/modules/onlinebot/raids/raid_controller.py +++ b/modules/onlinebot/raids/raid_controller.py @@ -13,7 +13,7 @@ from core.lookup.pork_service import PorkService 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.core.accounting.services.account_service import AccountService from modules.core.ban.ban_service import BanService @@ -52,7 +52,7 @@ class RaidController: 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") diff --git a/modules/onlinebot/stats/stats_controller.py b/modules/onlinebot/stats/stats_controller.py index 611e3c1..673bcfc 100644 --- a/modules/onlinebot/stats/stats_controller.py +++ b/modules/onlinebot/stats/stats_controller.py @@ -15,7 +15,7 @@ from core.decorators import instance, command from core.lookup.pork_service import PorkService from core.message_hub_service import MessageHubService 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.access_service import AccessService @@ -30,7 +30,7 @@ class StatController: single_org_uri = "https://people.anarchy-online.com/org/stats/d/5/name/%d/basicstats.xml?data_type=json" 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.util: Util = registry.get_instance("util") diff --git a/modules/orgbot/alliance/alliance_relay.py b/modules/orgbot/alliance/alliance_relay.py index db43e48..739ba28 100644 --- a/modules/orgbot/alliance/alliance_relay.py +++ b/modules/orgbot/alliance/alliance_relay.py @@ -11,7 +11,7 @@ from core.lookup.character_service import CharacterService from core.setting_service import SettingService from core.setting_types import DictionarySettingType from core.text import Text -from core.igncore import Tyrbot +from core.igncore import IgnCore # noinspection DuplicatedCode @@ -24,7 +24,7 @@ class AllianceRelay: self.relay_channel = [] def inject(self, registry): - self.bot: Tyrbot = registry.get_instance("bot") + self.bot: IgnCore = registry.get_instance("bot") self.setting_service: SettingService = registry.get_instance("setting_service") self.character_service: CharacterService = registry.get_instance("character_service") self.message_hub_service = registry.get_instance("message_hub_service") @@ -230,8 +230,8 @@ class AllianceRelay: return f"The relay status of {self.character_service.get_char_name(int(bot))} is already {option}" current[bot] = option self.relay_enabled().set_value(current) - return f"Successfully changed the symbol for relaying messages to " \ - f"{self.character_service.get_char_name(int(bot))}: {option}" + return f"Successfully changed the status of the relay " \ + f"{self.character_service.get_char_name(int(bot))} to: {option}" @command(command="mrelay", params=[Const("color"), Character("relaybot_name"), Options(["base", "sender", "org", "msg"]), Any("color_code", is_optional=True)], access_level="admin", description="Change the color settings of the relays") diff --git a/modules/orgbot/notify/notify_controller.py b/modules/orgbot/notify/notify_controller.py index 40e1ba7..cdd27bf 100644 --- a/modules/orgbot/notify/notify_controller.py +++ b/modules/orgbot/notify/notify_controller.py @@ -7,7 +7,7 @@ from core.logger import Logger from core.lookup.character_service import CharacterService from core.text import Text from core.translation_service import TranslationService -from core.igncore import Tyrbot +from core.igncore import IgnCore from modules.core.accounting.services.account_service import AccountService @@ -18,7 +18,7 @@ class NotifyController: self.logger = Logger(__name__) def inject(self, registry): - self.bot: Tyrbot = registry.get_instance("bot") + self.bot: IgnCore = registry.get_instance("bot") self.db = registry.get_instance("db") self.util = registry.get_instance("util") self.text: Text = registry.get_instance("text") diff --git a/modules/orgbot/org/org_controller.py b/modules/orgbot/org/org_controller.py index c987656..6e8fe04 100644 --- a/modules/orgbot/org/org_controller.py +++ b/modules/orgbot/org/org_controller.py @@ -7,7 +7,7 @@ from core.public_channel_service import PublicChannelService 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.core.accounting.services.account_service import AccountService from modules.orgbot.org.org_roster_controller import OrgRosterController @@ -23,7 +23,7 @@ class OrgChannelController: 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.util: Util = registry.get_instance("util") self.character_service = registry.get_instance("character_service") @@ -103,7 +103,7 @@ class OrgChannelController: self.bot.send_org_message(msg, fire_outgoing_event=False) self.message_hub_service.send_message(self.MESSAGE_SOURCE, None, None, "[Org] " + msg) - @event(event_type=Tyrbot.OUTGOING_ORG_MESSAGE_EVENT, + @event(event_type=IgnCore.OUTGOING_ORG_MESSAGE_EVENT, description="Relay commands from the org channel to the relay hub", is_hidden=True) def outgoing_org_message_event(self, _, event_data): diff --git a/modules/orgbot/org/org_roster_controller.py b/modules/orgbot/org/org_roster_controller.py index 0ab533e..93d0fbb 100644 --- a/modules/orgbot/org/org_roster_controller.py +++ b/modules/orgbot/org/org_roster_controller.py @@ -17,7 +17,7 @@ from core.lookup.character_service import CharacterService from core.lookup.org_pork_service import OrgPorkService from core.lookup.pork_service import PorkService from core.public_channel_service import PublicChannelService -from core.igncore import Tyrbot +from core.igncore import IgnCore from core.util import Util from modules.core.accounting.services.account_service import AccountService @@ -47,7 +47,7 @@ class OrgRosterController: 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.text = registry.get_instance("text") self.buddy_service: BuddyService = registry.get_instance("buddy_service") diff --git a/modules/orgbot/raidspy/raidspy_controller.py b/modules/orgbot/raidspy/raidspy_controller.py index 0fab7ad..fdbaaa0 100644 --- a/modules/orgbot/raidspy/raidspy_controller.py +++ b/modules/orgbot/raidspy/raidspy_controller.py @@ -10,7 +10,7 @@ from core.public_channel_service import PublicChannelService from core.setting_service import SettingService from core.setting_types import TextSettingType from core.text import Text -from core.igncore import Tyrbot +from core.igncore import IgnCore from core.util import Util @@ -22,7 +22,7 @@ class RaidSpyController: self.logger = Logger(__name__) def inject(self, registry): - self.bot: Tyrbot = registry.get_instance("bot") + self.bot: IgnCore = registry.get_instance("bot") self.setting_service: SettingService = registry.get_instance("setting_service") self.character_service: CharacterService = registry.get_instance("character_service") self.public_channel_service: PublicChannelService = registry.get_instance("public_channel_service") @@ -34,7 +34,7 @@ class RaidSpyController: def raidbot(self): return TextSettingType(allow_empty=True) - @event(event_type=Tyrbot.PRIVATE_MSG_EVENT, description="update raidlist", is_enabled=False) + @event(event_type=IgnCore.PRIVATE_MSG_EVENT, description="update raidlist", is_enabled=False) def handle_raidbot_msg(self, _, textblob: PrivateMessage): if self.character_service.get_char_name(textblob.char_id) != self.setting_service.get_value("raidbot-name"): return diff --git a/modules/raidbot/raid/preset_controller.py b/modules/raidbot/raid/preset_controller.py index 9110928..1273759 100644 --- a/modules/raidbot/raid/preset_controller.py +++ b/modules/raidbot/raid/preset_controller.py @@ -6,7 +6,7 @@ from core.decorators import command, instance from core.lookup.character_service import CharacterService 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.services.account_service import AccountService @@ -17,7 +17,7 @@ class PresetController: pass 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.character_service: CharacterService = registry.get_instance("character_service") diff --git a/modules/raidbot/raid/raidbot_controller.py b/modules/raidbot/raid/raidbot_controller.py index 25eb1fd..c420789 100644 --- a/modules/raidbot/raid/raidbot_controller.py +++ b/modules/raidbot/raid/raidbot_controller.py @@ -16,7 +16,7 @@ from core.private_channel_service import PrivateChannelService from core.sender_obj import SenderObj 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.services.account_service import AccountService from modules.raidbot.raid.preset_controller import PresetController @@ -61,7 +61,7 @@ class RaidbotController(BaseModule): self.raid = 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.setting_service: SettingService = registry.get_instance("setting_service") diff --git a/modules/raidbot/spam/massinvite_controller.py b/modules/raidbot/spam/massinvite_controller.py index 55c8722..174392e 100644 --- a/modules/raidbot/spam/massinvite_controller.py +++ b/modules/raidbot/spam/massinvite_controller.py @@ -8,7 +8,7 @@ from core.lookup.pork_service import PorkService 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.core.accounting.services.account_service import AccountService @@ -21,7 +21,7 @@ class MassinviteController(BaseModule): self.count = 0 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.setting_service: SettingService = registry.get_instance("setting_service") diff --git a/modules/raidbot/tower/contract_controller.py b/modules/raidbot/tower/contract_controller.py index 07e6bde..ca396f4 100644 --- a/modules/raidbot/tower/contract_controller.py +++ b/modules/raidbot/tower/contract_controller.py @@ -10,7 +10,7 @@ from core.event_service import EventService from core.lookup.pork_service import PorkService from core.public_channel_service import PublicChannelService from core.text import Text -from core.igncore import Tyrbot +from core.igncore import IgnCore from core.util import Util from modules.raidbot.tower.tower_service import TowerService from modules.standard.helpbot.playfield_controller import PlayfieldController @@ -23,7 +23,7 @@ class ContractController(BaseModule): # noinspection DuplicatedCode 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.util: Util = registry.get_instance("util") self.text: Text = registry.get_instance("text") diff --git a/modules/raidbot/tower/plant_controller.py b/modules/raidbot/tower/plant_controller.py index 037bcd6..91f6b8d 100644 --- a/modules/raidbot/tower/plant_controller.py +++ b/modules/raidbot/tower/plant_controller.py @@ -9,7 +9,7 @@ from core.event_service import EventService from core.lookup.pork_service import PorkService from core.public_channel_service import PublicChannelService from core.text import Text -from core.igncore import Tyrbot +from core.igncore import IgnCore from core.util import Util from modules.raidbot.tower.tower_service import TowerService from modules.standard.helpbot.playfield_controller import PlayfieldController @@ -19,7 +19,7 @@ from modules.standard.helpbot.playfield_controller import PlayfieldController class PlantController(BaseModule): # noinspection DuplicatedCode 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.util: Util = registry.get_instance("util") self.text: Text = registry.get_instance("text") diff --git a/modules/raidbot/tower/tower_attack_controller.py b/modules/raidbot/tower/tower_attack_controller.py index 236151d..484f61d 100644 --- a/modules/raidbot/tower/tower_attack_controller.py +++ b/modules/raidbot/tower/tower_attack_controller.py @@ -9,7 +9,7 @@ from core.public_channel_service import PublicChannelService 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 modules.core.accounting.services.account_service import AccountService from modules.raidbot.tower.tower_controller import TowerController from modules.raidbot.tower.tower_service import TowerService @@ -25,7 +25,7 @@ class TowerAttackController: self.logger = Logger(__name__) def inject(self, registry): - self.bot: Tyrbot = registry.get_instance("bot") + self.bot: IgnCore = registry.get_instance("bot") self.db = registry.get_instance("db") self.text: Text = registry.get_instance("text") self.settings: SettingService = registry.get_instance("setting_service") diff --git a/modules/raidbot/tower/tower_controller.py b/modules/raidbot/tower/tower_controller.py index 5229955..149477d 100644 --- a/modules/raidbot/tower/tower_controller.py +++ b/modules/raidbot/tower/tower_controller.py @@ -10,7 +10,7 @@ from core.logger import Logger from core.lookup.pork_service import PorkService from core.public_channel_service import PublicChannelService from core.text import Text -from core.igncore import Tyrbot +from core.igncore import IgnCore from modules.standard.helpbot.playfield_controller import PlayfieldController @@ -37,7 +37,7 @@ class TowerController: 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.text: Text = registry.get_instance("text") self.event_service: EventService = registry.get_instance("event_service") diff --git a/modules/raidbot/tower/tower_hot_controller.py b/modules/raidbot/tower/tower_hot_controller.py index 1d255a7..a0e45a9 100644 --- a/modules/raidbot/tower/tower_hot_controller.py +++ b/modules/raidbot/tower/tower_hot_controller.py @@ -9,7 +9,7 @@ from core.event_service import EventService from core.lookup.pork_service import PorkService from core.public_channel_service import PublicChannelService from core.text import Text -from core.igncore import Tyrbot +from core.igncore import IgnCore from core.util import Util from modules.raidbot.tower.tower_service import TowerService from modules.standard.helpbot.playfield_controller import PlayfieldController @@ -22,7 +22,7 @@ class TowerHotController(BaseModule): # noinspection DuplicatedCode 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.util: Util = registry.get_instance("util") self.text: Text = registry.get_instance("text") diff --git a/modules/raidbot/tower/tower_service.py b/modules/raidbot/tower/tower_service.py index 2a1026a..4faa744 100644 --- a/modules/raidbot/tower/tower_service.py +++ b/modules/raidbot/tower/tower_service.py @@ -11,7 +11,7 @@ from core.decorators import instance, timerevent, event, setting from core.job_scheduler import JobScheduler 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.core.accounting.services.account_service import AccountService from modules.raidbot.tower.tower_controller import TowerController @@ -26,7 +26,7 @@ class TowerService(BaseModule): plant = [] 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.util: Util = registry.get_instance("util") self.text: Text = registry.get_instance("text") diff --git a/modules/standard/MessageDistributor/message_distributor.py b/modules/standard/MessageDistributor/message_distributor.py index efc7306..26cf88e 100644 --- a/modules/standard/MessageDistributor/message_distributor.py +++ b/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") diff --git a/modules/standard/aou/aou_controller.py b/modules/standard/aou/aou_controller.py index 51c7ae1..6b7fbae 100644 --- a/modules/standard/aou/aou_controller.py +++ b/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") diff --git a/modules/standard/datanet/relay_controller.py b/modules/standard/datanet/relay_controller.py index 5f56c75..68afef1 100644 --- a/modules/standard/datanet/relay_controller.py +++ b/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, diff --git a/modules/standard/loot/auction_controller.py b/modules/standard/loot/auction_controller.py index 570ec11..1ae22ff 100644 --- a/modules/standard/loot/auction_controller.py +++ b/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 (" diff --git a/modules/standard/loot/loot_controller.py b/modules/standard/loot/loot_controller.py index 0c82a80..0817a40 100644 --- a/modules/standard/loot/loot_controller.py +++ b/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) diff --git a/modules/standard/news/mail_controller.py b/modules/standard/news/mail_controller.py index 408f637..c87d476 100644 --- a/modules/standard/news/mail_controller.py +++ b/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") diff --git a/modules/standard/news/news_controller.py b/modules/standard/news/news_controller.py index 21a6318..1f22ee2 100644 --- a/modules/standard/news/news_controller.py +++ b/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") diff --git a/modules/standard/news/weekly_controller.py b/modules/standard/news/weekly_controller.py index af21699..b3124ad 100644 --- a/modules/standard/news/weekly_controller.py +++ b/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") diff --git a/modules/standard/news/worldboss_controller.py b/modules/standard/news/worldboss_controller.py index 910a6c1..c949f85 100644 --- a/modules/standard/news/worldboss_controller.py +++ b/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") diff --git a/modules/standard/online/online_controller.py b/modules/standard/online/online_controller.py index 68cc766..65965a7 100644 --- a/modules/standard/online/online_controller.py +++ b/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") diff --git a/modules/standard/raid/chat_controller.py b/modules/standard/raid/chat_controller.py index 5a5a3e6..ff7ad83 100644 --- a/modules/standard/raid/chat_controller.py +++ b/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") diff --git a/modules/standard/raid/leader_controller.py b/modules/standard/raid/leader_controller.py index b36b85e..9bff385 100644 --- a/modules/standard/raid/leader_controller.py +++ b/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") diff --git a/modules/standard/track/track_controller.py b/modules/standard/track/track_controller.py index 54781da..bff2022 100644 --- a/modules/standard/track/track_controller.py +++ b/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") diff --git a/modules/standard/whois/character_history_controller.py b/modules/standard/whois/character_history_controller.py index 150fa56..f43fdb7 100644 --- a/modules/standard/whois/character_history_controller.py +++ b/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") diff --git a/modules/standard/whois/character_info_controller.py b/modules/standard/whois/character_info_controller.py index e689b72..dc54ee2 100644 --- a/modules/standard/whois/character_info_controller.py +++ b/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")