From 6ac230e4c343208c54382d98df9fe040dbfe4ee4 Mon Sep 17 00:00:00 2001
From: Minidodo <minidodo@cyndergames.at>
Date: Fri, 15 Apr 2022 17:34:36 +0200
Subject: [PATCH] abbrv & !stats hotfix

---
 modules/core/discord/discord_command_handler.py | 1 +
 modules/standard/alliance/alliance_relay.py     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/core/discord/discord_command_handler.py b/modules/core/discord/discord_command_handler.py
index 12944a1..5c02829 100644
--- a/modules/core/discord/discord_command_handler.py
+++ b/modules/core/discord/discord_command_handler.py
@@ -119,6 +119,7 @@ class DiscordCommandHandler(BaseModule):
                              (r"<neutral>(.*?)</neutral>", r":white_circle: \1"),
                              (r"<tab>", "\t"),
                              (r"<img src=(.?)rdb://\d+\1>", ''),
+                             (r"<a href=skillid://\d+>(.+?)</a>", r'\1'),
                              ('#', ''),
                              ('&lt;', '<'),
                              ('&gt;', '>')]:
diff --git a/modules/standard/alliance/alliance_relay.py b/modules/standard/alliance/alliance_relay.py
index d9474cb..f1e8205 100644
--- a/modules/standard/alliance/alliance_relay.py
+++ b/modules/standard/alliance/alliance_relay.py
@@ -407,7 +407,7 @@ class AllianceRelay:
             blob = ""
             if ctx.source.startswith("Discord_("):
                 if self.discord.alias_usage().get_value():
-                    abbrv = self.discord.alias_controller.get_alias(ctx.sender.org_id)
+                    abbrv = self.discord.alias_controller.get_alias(ctx.sender.get("org_id", 0))
                     invite = self.text.make_chatcmd("click here", "/tell <myname> discord invite",
                                                         style="style='text-decoration:none'")
                     # name = "<header2><myname></header2>"