Merge pull request #38 from Klemek/dev

v1.14 fix

src/scanners/find_scanner.py

@@ -1,7 +1,6 @@
 from typing import Dict, List
 from collections import defaultdict
 import discord
-import re
 
 # Custom libs
 
@@ -13,6 +12,7 @@ from utils import (
     plural,
     precise,
     mention,
+    escape_text,
 )
 
 
@@ -23,6 +23,7 @@ class FindScanner(Scanner):
             "find",
             "Find specific words or phrases (you can use quotes to add spaces in queries)",
             args=[
+                "top - rank users for these queries",
                 "all/everyone - include bots",
             ],
             example='#mychannel1 #mychannel2 @user "I love you" "you too"',
@@ -31,7 +32,7 @@ class FindScanner(Scanner):
     def __init__(self):
         super().__init__(
             all_args=True,
-            valid_args=["all", "everyone"],
+            valid_args=["all", "everyone", "top"],
             help=FindScanner.help(),
             intro_context="Matches",
         )
@@ -39,6 +40,7 @@ class FindScanner(Scanner):
     async def init(self, message: discord.Message, *args: str) -> bool:
         self.matches = defaultdict(Counter)
         self.all_messages = "all" in args or "everyone" in args
+        self.top = "top" in args
         if len(self.other_args) == 0:
             await message.channel.send(
                 "You need to add a query to find (you can use quotes to add spaces in queries)",
@@ -54,25 +56,38 @@ class FindScanner(Scanner):
             self.other_args,
             self.raw_members,
             all_messages=self.all_messages,
+            top=self.top,
         )
 
     def get_results(self, intro: str) -> List[str]:
+        res = [intro]
         matches = [match for match in self.matches]
         matches.sort(key=lambda match: self.matches[match].score(), reverse=True)
         usage_count = Counter.total(self.matches)
-        res = [intro]
+        if self.top:
-        res += [
+            res += [
-            self.matches[match].to_string(
+                self.matches[match].to_string(
-                matches.index(match),
+                    matches.index(match),
-                f"`{match}`",
+                    mention(match),
-                total_usage=self.msg_count,
+                    total_usage=usage_count,
-                ranking=False,
+                )
-                transform=lambda id: f" by {mention(id)}",
+                for match in matches
-                top=len(self.members) != 1,
+            ]
-            )
+        else:
-            for match in matches
+            res += [
-        ]
+                self.matches[match].to_string(
-        if len(matches) > 1:
+                    matches.index(match),
+                    f'"{escape_text(match)}"'
+                    if not match.startswith("<:")
+                    else escape_text(match),
+                    total_usage=self.msg_count,
+                    ranking=False,
+                    transform=lambda id: f" by {mention(id)}",
+                    top=len(self.members) != 1,
+                )
+                for match in matches
+            ]
+        if self.top or len(matches) > 1:
             res += [
                 f"Total: {plural(usage_count,'time')} ({precise(usage_count/self.msg_count)}/msg)"
             ]
@@ -88,6 +103,7 @@ class FindScanner(Scanner):
         raw_members: List[int],
         *,
         all_messages: bool,
+        top: bool,
     ) -> bool:
         impacted = False
         # If author is included in the selection (empty list is all)
@@ -99,7 +115,10 @@ class FindScanner(Scanner):
             impacted = True
             content = message.content.lower()
             for query in queries:
-                matches[query].update_use(
+                count = content.count(query.lower())
-                    content.count(query.lower()), message.created_at, message.author
+                if top:
-                )
+                    if count > 0:
+                        matches[message.author].update_use(count, message.created_at)
+                else:
+                    matches[query].update_use(count, message.created_at, message.author)
         return impacted

src/utils/utils.py

@@ -1,4 +1,3 @@
-from calendar import month
 from typing import Callable, List, Dict, Union, Optional, Any
 import os
 import logging
@@ -81,6 +80,10 @@ def message_link(message: discord.Message) -> str:
     return f"https://discord.com/channels/{message.channel.guild.id}/{message.channel.id}/{message.id}"
 
 
+def escape_text(text: str) -> str:
+    return discord.utils.escape_markdown(discord.utils.escape_mentions(text))
+
+
 class FakeMessage:
     def __init__(self, id: int):
         self.id = id