upstream changes

Author: Nubuki-all

bot/utils/msg_utils.py

@@ -19,6 +19,10 @@
 from .log_utils import log, logger
 
 
+name_regex = "[^]]+"
+url_regex = "tg?://[^)]+"
+markup_regex = '\[(@{0})]\(\s*({1})\s*\)'.format(name_regex, url_regex)
+
 def chat_is_allowed(event):
     if conf.ALLOWED_CHATS:
         return str(event.chat.id) in conf.ALLOWED_CHATS
@@ -27,6 +31,18 @@ def chat_is_allowed(event):
     return not bot.group_dict.get(str(event.chat.id), {}).get("disabled", False)
 
 
+def get_mention(string: str):
+    if not string.startswith("@"):
+        match = re.search(markup_regex, string)
+        return match.groups(0)[1][13:] if match else None
+    else:
+        return string
+
+
+def is_mention(string: str):
+    return bool(get_mention(string))
+
+
 def user_is_allowed(user: str | int):
     user = str(user)
     return not (
@@ -53,9 +69,9 @@ def user_is_sudoer(user: str | int):
     return bot.user_dict.get(user, {}).get("sudoer", False)
 
 
-async def get_user_info(user_name: str | int, id_only=False):
+async def get_user_info(user_id: str | int, id_only=False):
     try:
-        user = await bot.client.get_users(user_name)
+        user = await bot.client.get_users(user_id)
         return user.id if id_only else user
     except Exception:
         return

bot/workers/handlers/gi.py

@@ -34,7 +34,10 @@
     chat_is_allowed,
     clean_reply,
     get_args,
+    get_mention,
     get_msg_from_codes,
+    get_user_info,
+    is_mention,
     sanitize_text,
     user_is_allowed,
     user_is_privileged,
@@ -48,7 +51,7 @@ async def enka_handler(event, args, client):
     Requires character build for the specified uid to be public
 
     Arguments:
-        uid: {genshin player uid} (Required)
+        uid/@mention: {genshin player uid} (Required)
         -c or --card or --character {character name}*: use quotes if the name has spaces eg:- "Hu tao"; Also supports lookups
         -cs or --cards or --characters {characters} same as -c but for multiple characters; delimited by commas
         -t <int> {template}: card generation template; currently only two templates exist; default 1
@@ -80,7 +83,7 @@ async def enka_handler(event, args, client):
         if not chat_is_allowed(event):
             return
         if not user_is_allowed(user):
-            return await event.react("⛔")
+            return
     try:
         arg, unknown = get_args(
             ["--hide_uid", "store_true"],
@@ -111,11 +114,18 @@ async def enka_handler(event, args, client):
         )
         unknowns = unknown.split()
         invalid = str()
+        mention = None
+        mentioned_id = None
+        r_mention = None
         uid = None
         for unkwn in unknowns:
             if unkwn.isdigit() and not uid:
                 uid = unkwn
                 continue
+            elif (unkwn.startswith("@") or (unkwn.startswith("[@") and is_mention(unkwn)))  and not mention:
+                mention = get_mention(unkwn)
+                r_mention = unkwn
+                continue
             invalid += f"{unkwn} "
         invalid = invalid.rstrip()
         card = arg.c or arg.card or arg.character
@@ -135,6 +145,14 @@ async def enka_handler(event, args, client):
             if not vital_args:
                 return await u_reply.edit("Updated enka assets.")
             await u_reply.delete()
+        if mention and uid:
+            await event.reply("`Ignoring your mention…`")
+        elif mention: 
+            mentioned = await get_user_info(mention)
+            not_found_err = "**No idea who {} is.**"
+            if not mentioned:
+                return await event.reply(not_found_err.format(r_mention))
+            mentioned_id = mentioned.id
         if uid and save:
             will_save = True
             if bot.user_dict.get(user, {}).get("genshin_uid") == uid:
@@ -151,7 +169,7 @@ async def enka_handler(event, args, client):
             if not vital_args:
                 return
         if not uid:
-            uid = bot.user_dict.get(user, {}).get("genshin_uid", None)
+            uid = bot.user_dict.get((mentioned_id or user), {}).get("genshin_uid", None)
         if delete:
             if not (saved_uid := bot.user_dict.get(user, {}).get("genshin_uid")):
                 await event.reply("**No saved uid was found to delete!**")
@@ -166,7 +184,11 @@ async def enka_handler(event, args, client):
         if not uid:
             if invalid:
                 await event.reply(f"`{invalid}`?")
-            return await event.reply(f"**Please supply a UID**")
+            if mention:
+                err_msg = f"**Error:** {mentioned.mention()} hasn't saved their uid!"
+            else:
+                err_msg = "**Please supply a UID**"
+            return await event.reply(err_msg)
         if invalid:
             await event.reply(f"**Warning:** No idea what '`{invalid}`' means.")
         if arg.t not in ("1", "2"):
@@ -180,7 +202,10 @@ async def enka_handler(event, args, client):
             await event.reply(characters)
             if not (card or cards or dump or prof):
                 return
-        status = await event.reply("`Fetching card(s), Please Wait…`")
+        status_msg = "`Fetching card(s)"
+        status_msg += f" for {mentioned.first_name}" if mention else str()
+        status_msg += ", Please Wait…`"
+        status = await event.reply(status_msg)
         if prof:
             cprofile, error = (
                 await get_enka_profile(uid, card=True, template=arg.t, huid=hide_uid)

bot/workers/handlers/manage.py

@@ -490,15 +490,15 @@ async def ban(event, args, client):
         if user_is_owner(ban_id):
             return await event.reply("**Why?**")
         if user_is_sudoer(ban_id):
-            return await event.reply(f"@{ban_info.mention()} **is a Sudoer.**")
+            return await event.reply(f"{ban_info.mention()} **is a Sudoer.**")
         if not user_is_allowed(ban_id):
             return await event.reply(
                 f"@{ban_info.mention()} **has already been banned from using the bot.**"
             )
         bot.user_dict.setdefault(ban_id, {}).update(banned=True)
         await save2db2(bot.user_dict, "users")
         return await event.reply(
-            f"@{ban_info.mention()} **has been banned from using the bot.**"
+            f"{ban_info.mention()} **has been banned from using the bot.**"
         )
     except Exception:
         await logger(Exception)
@@ -531,14 +531,14 @@ async def unban(event, args, client):
         if user_is_owner(ban_id):
             return await event.reply("**Why?**")
         if user_is_sudoer(ban_id):
-            return await event.reply(f"@{ban_info.mention()} **is a Sudoer.**")
+            return await event.reply(f"{ban_info.mention()} **is a Sudoer.**")
         if user_is_allowed(ban_id):
             return await event.reply(
-                f"@{ban_info.mention()} **was never banned from using the bot.**"
+                f"{ban_info.mention()} **was never banned from using the bot.**"
             )
         bot.user_dict.setdefault(ban_id, {}).update(banned=False)
         await save2db2(bot.user_dict, "users")
-        return await event.reply(f"@{ban_info.mention()}'s *ban has been lifted.*")
+        return await event.reply(f"{ban_info.mention()}'s *ban has been lifted.*")
     except Exception:
         await logger(Exception)
 
@@ -652,15 +652,15 @@ async def sudoers(event, args, client):
             return await event.reply("**Why?**")
         if arg.a:
             if user_is_sudoer(_id):
-                return await event.reply(f"@{_info.mention()} **is already a Sudoer.**")
+                return await event.reply(f"{_info.mention()} **is already a Sudoer.**")
             bot.user_dict.setdefault(_id, {}).update(sudoer=True)
         if arg.rm:
             if not user_is_sudoer(_id):
-                return await event.reply(f"@{_id} **is not a Sudoer.**")
+                return await event.reply(f"{_id} **is not a Sudoer.**")
             bot.user_dict.setdefault(_id, {}).update(sudoer=False)
         await save2db2(bot.user_dict, "users")
         await event.reply(
-            f"@{_id} **has been successfully {'added to' if arg.a else 'removed from'} sudoers.**"
+            f"{_id} **has been successfully {'added to' if arg.a else 'removed from'} sudoers.**"
         )
     except Exception:
         await logger(Exception)

version.txt

@@ -1 +1 @@
-v0.4.0-alpha
+v0.4.1-alpha