Rename tyrbot.py -> igncore.py

core/igncore.py

@@ -41,8 +41,8 @@ class Tyrbot:
         self.dimension = None
         self.last_timer_event = 0
         self.start_time = int(time.time())
-        self.major_version = "IGNCore v2.5"
+        self.major_version = "IGNCore v2.6"
-        self.minor_version = "2"
+        self.minor_version = "1"
         self.incoming_queue = FifoQueue()
         self.mass_message_queue = None
         self.conns = DictObject()

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.tyrbot import Tyrbot
+from core.igncore import Tyrbot
 from core.util import Util
 
 

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.tyrbot import Tyrbot
+from core.igncore import Tyrbot
 from modules.core.accounting.register_controller import RegisterController
 from modules.core.accounting.services.account_service import AccountService
 

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.tyrbot import Tyrbot
+from core.igncore import Tyrbot
 from core.util import Util
 from modules.core.accounting.services.account_service import AccountService
 from modules.core.discord.discord_controller import DiscordController

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.tyrbot import Tyrbot
+from core.igncore import Tyrbot
 from core.util import Util
 from modules.core.accounting.services.account_service import AccountService
 

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.tyrbot import Tyrbot
+from core.igncore import Tyrbot
 from modules.core.accounting.services.access_service import AccessService
 
 

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.tyrbot import Tyrbot
+from core.igncore import Tyrbot
 from modules.core.ban.ban_service import BanService
 
 

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.tyrbot import Tyrbot
+from core.igncore import Tyrbot
 from modules.core.accounting.services.account_service import AccountService
 from modules.core.ban.ban_service import BanService
 

modules/core/colors/color_controller.py

@@ -2,7 +2,7 @@ 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.tyrbot import Tyrbot
+from core.igncore import Tyrbot
 
 
 @instance()

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.tyrbot import Tyrbot
+from core.igncore import Tyrbot
 from core.util import Util
 from modules.core.accounting.services.access_service import AccessService
 from modules.core.accounting.services.account_service import AccountService

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.tyrbot import Tyrbot
+from core.igncore import Tyrbot
 from core.util import Util
 from modules.core.accounting.services.account_service import AccountService
 from modules.core.ban.ban_service import BanService

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.tyrbot import Tyrbot
+from core.igncore import Tyrbot
 
 
 # noinspection SqlCaseVsIf,SqlCaseVsCoalesce

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.tyrbot import Tyrbot
+from core.igncore import Tyrbot
 
 
 @instance("Darknet")

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.tyrbot import Tyrbot
+from core.igncore import Tyrbot
 
 
 @instance("AllianceRelayController")

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.tyrbot import Tyrbot
+from core.igncore import Tyrbot
 
 
 @instance("DingController")

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.tyrbot import Tyrbot
+from core.igncore import Tyrbot
 from core.util import Util
 
 

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.tyrbot import Tyrbot
+from core.igncore import Tyrbot
 from core.util import Util
 from modules.core.accounting.services.access_service import AccessService
 

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.tyrbot import Tyrbot
+from core.igncore import Tyrbot
 from core.util import Util
 from modules.core.accounting.services.access_service import AccessService
 # noinspection PyAttributeOutsideInit,SpellCheckingInspection,DuplicatedCode

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.tyrbot import Tyrbot
+from core.igncore import Tyrbot
 from core.util import Util
 from modules.core.accounting.services.account_service import AccountService
 from modules.core.ban.ban_service import BanService

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.tyrbot import Tyrbot
+from core.igncore import Tyrbot
 from core.util import Util
 from modules.core.accounting.services.access_service import AccessService
 

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.tyrbot import Tyrbot
+from core.igncore import Tyrbot
 
 
 # noinspection DuplicatedCode

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.tyrbot import Tyrbot
+from core.igncore import Tyrbot
 from modules.core.accounting.services.account_service import AccountService
 
 

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.tyrbot import Tyrbot
+from core.igncore import Tyrbot
 from core.util import Util
 from modules.core.accounting.services.account_service import AccountService
 from modules.orgbot.org.org_roster_controller import OrgRosterController

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.tyrbot import Tyrbot
+from core.igncore import Tyrbot
 from core.util import Util
 from modules.core.accounting.services.account_service import AccountService
 

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.tyrbot import Tyrbot
+from core.igncore import Tyrbot
 from core.util import Util
 
 

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.tyrbot import Tyrbot
+from core.igncore import Tyrbot
 from core.util import Util
 from modules.core.accounting.services.account_service import AccountService
 

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.tyrbot import Tyrbot
+from core.igncore import Tyrbot
 from core.util import Util
 from modules.core.accounting.services.account_service import AccountService
 from modules.raidbot.raid.preset_controller import PresetController

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.tyrbot import Tyrbot
+from core.igncore import Tyrbot
 from core.util import Util
 from modules.core.accounting.services.account_service import AccountService
 

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.tyrbot import Tyrbot
+from core.igncore import Tyrbot
 from core.util import Util
 from modules.raidbot.tower.tower_service import TowerService
 from modules.standard.helpbot.playfield_controller import PlayfieldController

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.tyrbot import Tyrbot
+from core.igncore import Tyrbot
 from core.util import Util
 from modules.raidbot.tower.tower_service import TowerService
 from modules.standard.helpbot.playfield_controller import PlayfieldController

modules/raidbot/tower/tower_attack_controller.py

@@ -8,7 +8,7 @@ from core.logger import Logger
 from core.public_channel_service import PublicChannelService
 from core.setting_service import SettingService
 from core.text import Text
-from core.tyrbot import Tyrbot
+from core.igncore import Tyrbot
 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

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.tyrbot import Tyrbot
+from core.igncore import Tyrbot
 from modules.standard.helpbot.playfield_controller import PlayfieldController
 
 

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.tyrbot import Tyrbot
+from core.igncore import Tyrbot
 from core.util import Util
 from modules.raidbot.tower.tower_service import TowerService
 from modules.standard.helpbot.playfield_controller import PlayfieldController

modules/raidbot/tower/tower_service.py

@@ -10,7 +10,7 @@ from core.db import DB
 from core.decorators import instance, timerevent, event
 from core.job_scheduler import JobScheduler
 from core.text import Text
-from core.tyrbot import Tyrbot
+from core.igncore import Tyrbot
 from core.util import Util
 from modules.raidbot.tower.tower_controller import TowerController
 from modules.standard.helpbot.playfield_controller import PlayfieldController

modules/standard/MessageDistributor/message_distributor.py

@@ -15,7 +15,7 @@ from core.message_hub_service import MessageHubService
 from core.setting_service import SettingService
 from core.setting_types import NumberSettingType
 from core.text import Text
-from core.tyrbot import Tyrbot
+from core.igncore import Tyrbot
 from modules.core.accounting.services.access_service import AccessService
 from modules.core.discord.discord_controller import DiscordController
 

modules/standard/aou/aou_controller.py

@@ -11,7 +11,7 @@ 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.tyrbot import Tyrbot
+from core.igncore import Tyrbot
 
 
 # noinspection PyUnusedLocal

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.tyrbot import Tyrbot
+from core.igncore import Tyrbot
 from modules.standard.loot.auction_strategy.auction_strategy import AuctionStrategy
 
 

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.tyrbot import Tyrbot
+from core.igncore import Tyrbot
 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

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.tyrbot import Tyrbot
+from core.igncore import Tyrbot
 from modules.core.accounting.services.account_service import AccountService
 from modules.core.ban.ban_service import BanService
 

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.tyrbot import Tyrbot
+from core.igncore import Tyrbot
 from core.util import Util
 from modules.core.accounting.preference_controller import PreferenceController
 from modules.core.accounting.services.account_service import AccountService

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.tyrbot import Tyrbot
+from core.igncore import Tyrbot
 from core.util import Util
 from modules.core.accounting.preference_controller import PreferenceController
 from modules.core.accounting.services.account_service import AccountService

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.tyrbot import Tyrbot
+from core.igncore import Tyrbot
 from core.util import Util
 from modules.standard.datanet.ws_controller import WebsocketRelayController
 

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.tyrbot import Tyrbot
+from core.igncore import Tyrbot
 from core.util import Util
 from modules.standard.online.online_display import OnlineDisplay
 

modules/standard/raid/chat_controller.py

@@ -1,6 +1,6 @@
 from core.command_param_types import Any
 from core.decorators import instance, command
-from core.tyrbot import Tyrbot
+from core.igncore import Tyrbot
 
 
 @instance()

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.tyrbot import Tyrbot
+from core.igncore import Tyrbot
 from modules.core.accounting.services.access_service import AccessService
 
 

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.tyrbot import Tyrbot
+from core.igncore import Tyrbot
 from core.util import Util
 from modules.core.accounting.services.account_service import AccountService
 from modules.raidbot.tower.tower_controller import TowerController

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.tyrbot import Tyrbot
+from core.igncore import Tyrbot
 
 
 @instance()

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.tyrbot import Tyrbot
+from core.igncore import Tyrbot
 
 
 @instance()