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

fix for Embeds & ChatBlobs

Browse Source
This commit is contained in:
Minidodo
2022-04-15 19:41:38 +02:00
parent 6ac230e4c3
commit 0612b078a4
5 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/igncore.py
+1 -1
View File
@@ -48,7 +48,7 @@ class IgnCore:
self.last_timer_event = 0 self.last_timer_event = 0
self.start_time = int(time.time()) self.start_time = int(time.time())
self.major_version = "IGNCore v2.9" self.major_version = "IGNCore v2.9"
self.minor_version = "0" self.minor_version = "1"
self.incoming_queue = FifoQueue() self.incoming_queue = FifoQueue()
self.mass_message_queue = None self.mass_message_queue = None
self.conns = DictObject() self.conns = DictObject()
modules/core/discord/discord_command_handler.py
+2 -1
View File
@@ -122,7 +122,8 @@ class DiscordCommandHandler(BaseModule):
(r"<a href=skillid://\d+>(.+?)</a>", r'\1'), (r"<a href=skillid://\d+>(.+?)</a>", r'\1'),
('#', ''), ('#', ''),
('&lt;', '<'), ('&lt;', '<'),
('&gt;', '>')]: ('&gt;', '>'),
('</font>', '')]:
ctx = re.sub(pattern, sub, ctx) ctx = re.sub(pattern, sub, ctx)
cnt = 1 cnt = 1
modules/core/discord/discord_controller.py
+2 -1
View File
@@ -184,7 +184,8 @@ class DiscordController:
elif type(msg) == ChatBlob: elif type(msg) == ChatBlob:
if msg.embed: if msg.embed:
msg: ChatBlob 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) asyncio.run_coroutine_threadsafe(ch.send("", delete_after=del_after, embed=blob), self.loop)
return return
rsp = self.cmd.parseDiscord(ctx.formatted_message.page_prefix) + "\n" rsp = self.cmd.parseDiscord(ctx.formatted_message.page_prefix) + "\n"
modules/core/private_channel/private_channel_controller.py
+2 -2
View File
@@ -242,14 +242,14 @@ class PrivateChannelController:
if len(pages) < 4: if len(pages) < 4:
for page in pages: for page in pages:
# message = "{org} {message}".format(org=self.ORG_CHANNEL_PREFIX, message=page) # 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, self.message_hub_service.send_message(self.MESSAGE_SOURCE,
None, None,
page, page,
event_data.message) event_data.message)
else: else:
# message = "{org} {message}".format(org=self.ORG_CHANNEL_PREFIX, message=event_data.message.title) # 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, self.message_hub_service.send_message(self.MESSAGE_SOURCE,
None, None,
event_data.message.title, event_data.message.title,
modules/orgbot/org/org_controller.py
+2 -2
View File
@@ -121,14 +121,14 @@ class OrgChannelController:
if len(pages) < 4: if len(pages) < 4:
for page in pages: for page in pages:
# message = "{org} {message}".format(org=self.ORG_CHANNEL_PREFIX, message=page) # 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, self.message_hub_service.send_message(self.MESSAGE_SOURCE,
None, None,
page, page,
event_data.message) event_data.message)
else: else:
# message = "{org} {message}".format(org=self.ORG_CHANNEL_PREFIX, message=event_data.message.title) # 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, self.message_hub_service.send_message(self.MESSAGE_SOURCE,
None, None,
event_data.message.title, event_data.message.title,