Fix bugs with alias and autotrigger, resolve #2870

Author: fourjr

Diff for: CHANGELOG.md

@@ -4,9 +4,9 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 This project mostly adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html);
-however, insignificant breaking changes do not guarantee a major version bump, see the reasoning [here](https://github.com/kyb3r/modmail/issues/319). If you're a plugins developer, note the "BREAKING" section.
+however, insignificant breaking changes do not guarantee a major version bump, see the reasoning [here](https://github.com/kyb3r/modmail/issues/319). If you're a plugin developer, note the "BREAKING" section.
 
-# v3.7.0-dev11
+# v3.7.0-dev12
 
 ### Added
 
@@ -31,7 +31,8 @@ however, insignificant breaking changes do not guarantee a major version bump, s
 ### Fixed
 
 - `?contact` now sends members a DM.
-- Fixed issue where `level_permissions` and `command_permissions` would sometimes be reset. ([GH #2856](https://github.com/kyb3r/modmail/issues/2856))
+- `level_permissions` and `command_permissions` would sometimes be reset. ([GH #2856](https://github.com/kyb3r/modmail/issues/2856))
+- Command truncated after && in alias ([GH #2870](https://github.com/kyb3r/modmail/issues/2870))
 
 ### Improved
 

Diff for: bot.py

@@ -849,6 +849,7 @@ async def get_contexts(self, message, *, cls=commands.Context):
                 discord.utils.find(view.skip_string, prefixes)
                 ctx_.invoked_with = view.get_word().lower()
                 ctx_.command = self.all_commands.get(ctx_.invoked_with)
+                print(ctx_.invoked_with, ctx_.args, ctx_.kwargs)
                 ctxs += [ctx_]
             return ctxs
 

Diff for: core/models.py

@@ -225,6 +225,9 @@ def __init__(self, message):
     def __getattr__(self, name: str):
         return getattr(self._message, name)
 
+    def __bool__(self):
+        return bool(self._message)
+
     async def delete(self, *, delay=None):
         return
 

Diff for: core/utils.py

@@ -270,7 +270,7 @@ def create_not_found_embed(word, possibilities, name, n=2, cutoff=0.6) -> discor
     return embed
 
 
-def parse_alias(alias):
+def parse_alias(alias, *, split=True):
     def encode_alias(m):
         return "\x1AU" + base64.b64encode(m.group(1).encode()).decode() + "\x1AU"
 
@@ -288,7 +288,12 @@ def decode_alias(m):
     if not alias:
         return aliases
 
-    for a in re.split(r"\s*&&\s*", alias):
+    if split:
+        iterate = re.split(r"\s*&&\s*", alias)
+    else:
+        iterate = [alias]
+
+    for a in iterate:
         a = re.sub("\x1AU(.+?)\x1AU", decode_alias, a)
         if a[0] == a[-1] == '"':
             a = a[1:-1]
@@ -299,7 +304,7 @@ def decode_alias(m):
 
 def normalize_alias(alias, message):
     aliases = parse_alias(alias)
-    contents = parse_alias(message)
+    contents = parse_alias(message, split=False)
 
     final_aliases = []
     for a, content in zip_longest(aliases, contents):