diff --git a/core/igncore.py b/core/igncore.py index 7fd7d0c..4becf2c 100644 --- a/core/igncore.py +++ b/core/igncore.py @@ -48,7 +48,7 @@ class IgnCore: self.last_timer_event = 0 self.start_time = int(time.time()) self.major_version = "IGNCore v2.9" - self.minor_version = "0" + self.minor_version = "1" self.incoming_queue = FifoQueue() self.mass_message_queue = None self.conns = DictObject() diff --git a/modules/core/discord/discord_command_handler.py b/modules/core/discord/discord_command_handler.py index 5c02829..7d1d7d1 100644 --- a/modules/core/discord/discord_command_handler.py +++ b/modules/core/discord/discord_command_handler.py @@ -122,7 +122,8 @@ class DiscordCommandHandler(BaseModule): (r"(.+?)", r'\1'), ('#', ''), ('<', '<'), - ('>', '>')]: + ('>', '>'), + ('', '')]: ctx = re.sub(pattern, sub, ctx) cnt = 1 diff --git a/modules/core/discord/discord_controller.py b/modules/core/discord/discord_controller.py index 25e8345..9d77671 100644 --- a/modules/core/discord/discord_controller.py +++ b/modules/core/discord/discord_controller.py @@ -184,7 +184,8 @@ class DiscordController: elif type(msg) == ChatBlob: if msg.embed: msg: ChatBlob - blob = Embed(title=msg.title, color=0x00FF00, description=self.cmd.parseDiscord(msg.msg).replace("\n> ", '\n')) + blob = Embed(title=self.cmd.parseDiscord(f"{msg.page_prefix} {msg.title} {msg.page_postfix}"), + color=0x00FF00, description=self.cmd.parseDiscord(msg.msg).replace("\n> ", '\n')) asyncio.run_coroutine_threadsafe(ch.send("", delete_after=del_after, embed=blob), self.loop) return rsp = self.cmd.parseDiscord(ctx.formatted_message.page_prefix) + "\n" diff --git a/modules/core/private_channel/private_channel_controller.py b/modules/core/private_channel/private_channel_controller.py index c3a2e76..944496d 100644 --- a/modules/core/private_channel/private_channel_controller.py +++ b/modules/core/private_channel/private_channel_controller.py @@ -242,14 +242,14 @@ class PrivateChannelController: if len(pages) < 4: for page in pages: # message = "{org} {message}".format(org=self.ORG_CHANNEL_PREFIX, message=page) - event_data.message.page_prefix = self.PRIVATE_CHANNEL_PREFIX + event_data.message.page_prefix = self.PRIVATE_CHANNEL_PREFIX + " " + event_data.message.page_prefix self.message_hub_service.send_message(self.MESSAGE_SOURCE, None, page, event_data.message) else: # message = "{org} {message}".format(org=self.ORG_CHANNEL_PREFIX, message=event_data.message.title) - event_data.message.page_prefix = self.PRIVATE_CHANNEL_PREFIX + event_data.message.page_prefix = self.PRIVATE_CHANNEL_PREFIX + " " + event_data.message.page_prefix self.message_hub_service.send_message(self.MESSAGE_SOURCE, None, event_data.message.title, diff --git a/modules/orgbot/org/org_controller.py b/modules/orgbot/org/org_controller.py index 1adedb5..825d4a9 100644 --- a/modules/orgbot/org/org_controller.py +++ b/modules/orgbot/org/org_controller.py @@ -121,14 +121,14 @@ class OrgChannelController: if len(pages) < 4: for page in pages: # message = "{org} {message}".format(org=self.ORG_CHANNEL_PREFIX, message=page) - event_data.message.page_prefix = self.ORG_CHANNEL_PREFIX + event_data.message.page_prefix = self.ORG_CHANNEL_PREFIX + " " + event_data.message.page_prefix self.message_hub_service.send_message(self.MESSAGE_SOURCE, None, page, event_data.message) else: # message = "{org} {message}".format(org=self.ORG_CHANNEL_PREFIX, message=event_data.message.title) - event_data.message.page_prefix = self.ORG_CHANNEL_PREFIX + event_data.message.page_prefix = self.ORG_CHANNEL_PREFIX + " " + event_data.message.page_prefix self.message_hub_service.send_message(self.MESSAGE_SOURCE, None, event_data.message.title,