diff --git a/core/public_channel_service.py b/core/public_channel_service.py
index c594251..a7c472b 100644
--- a/core/public_channel_service.py
+++ b/core/public_channel_service.py
@@ -36,12 +36,12 @@ class PublicChannelService(BaseModule):
priority=30)
self.event_service.register_event_type(self.ORG_CHANNEL_MESSAGE_EVENT)
self.event_service.register_event_type(self.ORG_MSG_EVENT)
+
+ def start(self):
self.setting_service.register('core.system', 'org_id', 0,
NumberSettingType(), 'OrgID used for roster')
self.setting_service.register('core.system', 'org_name', "",
TextSettingType(allow_empty=True), 'OrgName used for roster')
-
- def start(self):
org_id_setting = self.setting_service.get("org_id")
if org_id_setting and org_id_setting.get_value() and org_id_setting.get_value() != "0":
self.org_id = org_id_setting.get_value()
diff --git a/modules/core/discord/discord_command_handler.py b/modules/core/discord/discord_command_handler.py
index 0e13bf1..2dc425b 100644
--- a/modules/core/discord/discord_command_handler.py
+++ b/modules/core/discord/discord_command_handler.py
@@ -109,7 +109,7 @@ class DiscordCommandHandler(BaseModule):
m = re.findall(r"
", ctx)
for match in m:
ctx = ctx.replace(f"
",
- f"#_{self.discord.util.get_profession(proficon.get(int(match)))}#_")
+ f"#_#{self.discord.util.get_profession(proficon.get(int(match)))}#_#")
for x in ["`", ' *', ' _', ' |']:
ctx = ctx.replace(x, f' \\{x.strip()}')
@@ -135,7 +135,7 @@ class DiscordCommandHandler(BaseModule):
(r"", "\t"),
(r"\n\n
", ''),
(r"(.+?)", r'\1'),
- ('#', ''),
+ ('#(.+?)#', r'\1'),
('<', '<'),
('>', '>'),
('', '')]:
diff --git a/modules/core/discord/discord_controller.py b/modules/core/discord/discord_controller.py
index 410d579..65bfb50 100644
--- a/modules/core/discord/discord_controller.py
+++ b/modules/core/discord/discord_controller.py
@@ -12,6 +12,8 @@ from typing import TYPE_CHECKING
# noinspection PyPackageRequirements
import discord
from discord import Message, TextChannel, Embed, Role, Guild
+from emojis import emojis
+
from core.chat_blob import ChatBlob
from core.db import DB
from core.decorators import instance, event, timerevent
@@ -326,6 +328,7 @@ class DiscordController:
await discord_user.remove_roles(role)
async def on_message(self, msg: Message):
+ msg.content = emojis.decode(msg.content)
if f"{msg.channel.id}" in self.setting_service.get_value("public_relay").lstrip("[").rstrip("]").split(','):
await msg.delete(delay=3600)
if msg.author.id == self.client.user.id:
diff --git a/modules/onlinebot/accounting/account_service.py b/modules/onlinebot/accounting/account_service.py
index 0432350..400c927 100644
--- a/modules/onlinebot/accounting/account_service.py
+++ b/modules/onlinebot/accounting/account_service.py
@@ -83,7 +83,7 @@ class AccountServiceOnlineBot(AccountService):
@instance(name="command_service", override=True)
class AccountServiceOnlineBot(CommandService):
- def access_denied_response(self, message, sender, cmd_config, reply):
+ def access_denied_response(self, message, sender, cmd_config, reply, channel):
self.relay_hub_service.send_message("access_denied_logger", sender, f"[DENIED] {sender.name}: {message}",
f"[DENIED] {sender.name}: {message}")