This should get us back on track (tested on ARCH Linux)
This commit is contained in:
@@ -69,6 +69,8 @@ class DiscordCommandHandler(BaseModule):
|
||||
if type(reply) == str:
|
||||
reply = self.discord.text.format_message(reply)
|
||||
rsp = f"> {self.parseDiscord(reply)}"
|
||||
|
||||
# Sender == init? Should be Sender == bot
|
||||
self.discord.relay_hub_service.send_message(f"Discord_({ctx.channel.name})",
|
||||
DictObject({'char_id': 0, 'name': ctx.author.name,
|
||||
'discord_handle':
|
||||
@@ -87,6 +89,8 @@ class DiscordCommandHandler(BaseModule):
|
||||
rsp += f"**__{reply.title}__**\n"
|
||||
rsp += self.parseDiscord(reply.msg, blob=True)
|
||||
rsp += f"\n {self.parseDiscord(reply.page_postfix)}"
|
||||
|
||||
# Sender == init? Should be Sender == bot
|
||||
self.discord.relay_hub_service.send_message(f"Discord_({ctx.channel.name})",
|
||||
DictObject({'char_id': 0, 'name': ctx.author.name,
|
||||
'discord_handle':
|
||||
@@ -151,6 +155,7 @@ class DiscordCommandHandler(BaseModule):
|
||||
(r"<a href=(.*?)itemid://(\d+)/(\d+)\1>(.+?)<\/a>", r"[\4](https://aoitems.com/item/\2/\3/)" if blob else r"`\4`"),
|
||||
(r"<(.+?)>\s*?<\1>", ''),
|
||||
(r"<pagebreak>", ''),
|
||||
(r"<a.+?href=\'.*?\'><img.+?></a>", r''),
|
||||
(r"<a.+?href=\'.*?\'>(.*?)</a>", r'`\1`'),
|
||||
(r"<clan>(.*?)</clan>", r":yellow_circle: \1"),
|
||||
(r"<omni>(.*?)</omni>", r":blue_circle: \1"),
|
||||
@@ -229,14 +234,15 @@ class DiscordCommandHandler(BaseModule):
|
||||
if not self.discord.client:
|
||||
return "Discord module has not been initiated yet. Please try again later."
|
||||
blob = ""
|
||||
for member in self.discord.guild.members:
|
||||
for member in sorted(self.discord.guild.members, key=lambda x: x.display_name):
|
||||
member_roles = []
|
||||
for role in member.roles:
|
||||
if role.name == "@everyone": # Skip @everyone as everyone has it.
|
||||
continue
|
||||
member_roles.append(f"{role.name}")
|
||||
member_roles.sort(key=str.lower)
|
||||
blob += f"{member.name + '#' + member.discriminator} ({', '.join(member_roles)})\n"
|
||||
# blob += f"{member.name + '#' + member.discriminator} ({', '.join(member_roles)})\n"
|
||||
blob += f"- <highlight>{member.display_name}</highlight> [{member.name + '#' + member.discriminator}] ({', '.join(member_roles)})<br>"
|
||||
return ChatBlob(f"Discord Members ({len(self.discord.guild.members):d})", blob)
|
||||
|
||||
@event(event_type="connect", description="Connects the Discord client automatically on startup, if a token exists")
|
||||
|
||||
@@ -47,7 +47,6 @@ class PrivateChannelController:
|
||||
self.online_controller = registry.get_instance("online_controller", is_optional=True)
|
||||
|
||||
def pre_start(self):
|
||||
self.db.create_view("online")
|
||||
self.message_hub_service.register_message_source(self.MESSAGE_SOURCE)
|
||||
|
||||
try:
|
||||
@@ -58,6 +57,8 @@ class PrivateChannelController:
|
||||
self.reinvite = []
|
||||
|
||||
def start(self):
|
||||
self.db.create_view("online")
|
||||
|
||||
self.message_hub_service.register_message_destination(self.MESSAGE_SOURCE,
|
||||
self.handle_incoming_relay_message,
|
||||
["registration"],
|
||||
|
||||
Reference in New Issue
Block a user