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

Removed all references which were still left regarding Tyrbot.

Browse Source
This commit is contained in:
Minidodo
2021-09-06 20:39:09 +02:00
parent 10df6c3d26
commit ac5dc38147
53 changed files with 120 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/orgbot/alliance/alliance_relay.py
+4 -4
View File
@@ -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"<highlight>{self.character_service.get_char_name(int(bot))}</highlight>: <highlight>{option}</highlight>"
return f"Successfully changed the status of the relay " \
f"<highlight>{self.character_service.get_char_name(int(bot))}</highlight> to: <highlight>{option}</highlight>"
@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")
modules/orgbot/notify/notify_controller.py
+2 -2
View File
@@ -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")
modules/orgbot/org/org_controller.py
+3 -3
View File
@@ -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, "[<cyan>Org</cyan>] " + 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):
modules/orgbot/org/org_roster_controller.py
+2 -2
View File
@@ -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")
modules/orgbot/raidspy/raidspy_controller.py
+3 -3
View File
@@ -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