Added more shortcuts in our test server and noticed some bugs, have been resolved now.

Author: skruglov2023

.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+    "githubPullRequests.ignoredPullRequestBranches": [
+        "master"
+    ]
+}

dozer/cogs/shortcuts.py

@@ -143,35 +143,35 @@ async def on_message(self, msg: discord.Message):
         prefix = setting.prefix
         prefix_index = msg.content.find(prefix)
 
+
         if prefix_index != -1:
             # before running any chatgpt stuff, check if there's a space between prefix and shortcut
             if prefix_index + len(prefix) < len(msg.content) and msg.content[prefix_index + len(prefix)] == ' ':
                 return  # there's a space, so it was probably meant to be used in text rather than call a shortcut
-            # Extract the command part from the message directly after the prefix
+            # Extract the word immediately after the prefix
             start_index = prefix_index + len(prefix)
             remaining_content = msg.content[start_index:].strip()
+            first_word = remaining_content.split()[0] if remaining_content else ''
 
-            # Check if the remaining content starts with a valid command name
-            all_shortcuts = await ShortcutEntry.get_by(guild_id = msg.guild.id)
+            # Check if the first word is a valid command name
+            all_shortcuts = await ShortcutEntry.get_by(guild_id=msg.guild.id)
             all_shortcuts = [s.name for s in all_shortcuts]
 
-            best_match = process.extractOne(remaining_content, all_shortcuts, scorer = fuzz.partial_ratio)
+            best_match = process.extractOne(first_word, all_shortcuts, scorer=fuzz.partial_ratio)
 
-            if best_match and best_match[1] > 90:  # Adjust the threshold as needed
+            if best_match and best_match[1] > 80:  # Adjust the threshold as needed
                 shortcut_name = best_match[0]
 
-                # Ensure the command follows immediately after the prefix without any intervening characters
-                if remaining_content.startswith(shortcut_name.casefold()):
-                    shortcut = await ShortcutEntry.get_unique_by(guild_id = msg.guild.id, name = shortcut_name)
-                    if msg.reference:
-                        # Fetch the original message being replied to
-                        original_message = await msg.channel.fetch_message(msg.reference.message_id)
-                        if original_message:
-                            # Ping the original author in the new message
-                            await original_message.reply(f"{shortcut.value}")
-                    else:
-                        # Send the shortcut value without pinging if original message is not found
-                        await msg.channel.send(shortcut.value)
+                shortcut = await ShortcutEntry.get_unique_by(guild_id=msg.guild.id, name=shortcut_name)
+                if msg.reference:
+                    # Fetch the original message being replied to
+                    original_message = await msg.channel.fetch_message(msg.reference.message_id)
+                    if original_message:
+                        # Ping the original author in the new message
+                        await original_message.reply(f"{shortcut.value}")
+                else:
+                    # Send the shortcut value without pinging if original message is not found
+                    await msg.channel.send(shortcut.value)
         else:
             # If the prefix is not found in the message, do nothing
             pass