fix: handle mixed em dash + hyphen combos correctly

Author: PenguinDevs

src/cogs/commands/karma.py

@@ -37,8 +37,13 @@
 )
 from src.core.functions.karma import build_leaderboard_view, build_team_leaderboard_view
 
-# Matches @user or @role followed by 2+ plus signs, 2+ minus signs, or 1+ em dashes
-KARMA_PATTERN = re.compile(r"<@[!&]?(\d+)>\s*(\+{2,}|-{2,}|\u2014+)")
+# Matches @user or @role followed by 2+ plus signs, or a mix of hyphens/em dashes (min 2 "units")
+# Em dashes count as 2 hyphens each, so a single em dash meets the minimum.
+KARMA_PATTERN = re.compile(r"<@[!&]?(\d+)>\s*(\+{2,}|[\-\u2014]{1,})")
+
+def _count_minus(signs: str) -> int:
+    """Count the effective minus value from a mix of hyphens and em dashes."""
+    return sum(2 if c == "\u2014" else 1 for c in signs)
 
 
 class Karma(commands.Cog):
@@ -181,10 +186,11 @@ async def _resolve_targets(
             signs = raw_match.group(2)
             if signs[0] == "+":
                 amount = len(signs)
-            elif signs[0] == "\u2014":  # em dash — counts as 2 each
-                amount = -len(signs) * 2
             else:
-                amount = -len(signs)
+                minus_count = _count_minus(signs)
+                if minus_count < 2:
+                    continue
+                amount = -minus_count
             is_role = raw_match.group(0).startswith("<@&")
 
             if is_role and mention_id in team_role_ids:

tests/test_karma_pattern.py

@@ -1,8 +1,10 @@
-"""Tests for the karma regex pattern matching."""
+"""Tests for the karma regex pattern and _count_minus helper."""
 
-from src.cogs.commands.karma import KARMA_PATTERN
+from src.cogs.commands.karma import KARMA_PATTERN, _count_minus
 
 
+# ── Pattern matching ─────────────────────────────────────────────
+
 def test_matches_user_plus():
     matches = KARMA_PATTERN.findall("<@123456> +++")
     assert len(matches) == 1
@@ -38,9 +40,12 @@ def test_no_match_single_plus():
     assert len(matches) == 0
 
 
-def test_no_match_single_minus():
+def test_single_minus_matches_but_filtered_by_count():
+    """Single hyphen matches the regex, but _count_minus returns 1 (< 2 min), so
+    _resolve_targets will skip it."""
     matches = KARMA_PATTERN.findall("<@123456> -")
-    assert len(matches) == 0
+    assert len(matches) == 1  # regex matches
+    assert _count_minus(matches[0][1]) < 2  # but below minimum
 
 
 def test_multiple_mentions():
@@ -57,18 +62,65 @@ def test_mixed_plus_minus():
     assert matches[1] == ("222", "---")
 
 
-def test_matches_em_dash():
+def test_matches_single_em_dash():
+    """Single em dash = 2 units, should match."""
     matches = KARMA_PATTERN.findall("<@123456> \u2014")
     assert len(matches) == 1
-    assert matches[0] == ("123456", "\u2014")
 
 
 def test_matches_multiple_em_dashes():
     matches = KARMA_PATTERN.findall("<@123456> \u2014\u2014\u2014")
     assert len(matches) == 1
-    assert matches[0] == ("123456", "\u2014\u2014\u2014")
+
+
+def test_matches_em_dash_plus_hyphen():
+    """— followed by - should match as one group."""
+    matches = KARMA_PATTERN.findall("<@123456> \u2014-")
+    assert len(matches) == 1
+
+
+def test_matches_hyphen_plus_em_dash():
+    """- followed by — should match as one group."""
+    matches = KARMA_PATTERN.findall("<@123456> -\u2014")
+    assert len(matches) == 1
+
+
+def test_matches_hyphens_plus_em_dash():
+    """-- followed by — should match as one group."""
+    matches = KARMA_PATTERN.findall("<@123456> --\u2014")
+    assert len(matches) == 1
 
 
 def test_no_match_plain_text():
     matches = KARMA_PATTERN.findall("hello world")
     assert len(matches) == 0
+
+
+# ── _count_minus helper ─────────────────────────────────────────
+
+def test_count_minus_hyphens():
+    assert _count_minus("---") == 3
+
+
+def test_count_minus_em_dashes():
+    assert _count_minus("\u2014\u2014") == 4
+
+
+def test_count_minus_mixed_em_hyphen():
+    """— followed by - = 2 + 1 = 3."""
+    assert _count_minus("\u2014-") == 3
+
+
+def test_count_minus_mixed_hyphen_em():
+    """- followed by — = 1 + 2 = 3."""
+    assert _count_minus("-\u2014") == 3
+
+
+def test_count_minus_single_em_dash():
+    """Single em dash = 2."""
+    assert _count_minus("\u2014") == 2
+
+
+def test_count_minus_single_hyphen():
+    """Single hyphen = 1."""
+    assert _count_minus("-") == 1