regex

app.py

@@ -66,7 +66,7 @@ async def on_message(message):
         
         for trigger, slack_mention in TRIGGERS.items():
             if all(word in content for word in trigger):     
-                adjacent_words = extract_adjacent_words(message.content, trigger, 3)
+                adjacent_words = extract_adjacent_words(message.content, trigger)
                 daily_pings.append({
                     'author': str(message.author),
                     'content': adjacent_words,
@@ -94,16 +94,20 @@ async def on_message(message):
     await bot.process_commands(message)
 
 
-def extract_adjacent_words(content, trigger, num_words=5):
-    pattern = r'\b' + r'\b\s*\b'.join(map(re.escape, trigger)) + r'\b'
-    regex = re.compile(pattern, re.IGNORECASE)
+def extract_adjacent_words(content, trigger):
+    trigger_regex = re.compile(r'\b' + re.escape(trigger) + r'\b', re.IGNORECASE)
+    matches = trigger_regex.finditer(content)
     
-    for match in regex.finditer(content):
+    if match in matches:
         start, end = match.span()
-        before_words = re.findall(r'\b\w+\b', content[:start])[-num_words:]
-        after_words = re.findall(r'\b\w+\b', content[end:end + 100])[:num_words]
-        return '...' + ' '.join(before_words + [match.group()] + after_words) + '...'
-    return content
+        before = content[:start].strip().split()
+        after = content[end:].strip().split()
+
+        context_before = ' '.join(before[-5:])
+        context_after = ' '.join(after[:5])
+
+        output = f"...{context_before} + {match.group()} + {context_after}..."
+        return output
 
 
 @bot.event