new scanner %chan

src/scanners/__init__.py

@@ -6,3 +6,4 @@ from .full_scanner import FullScanner
 from .mentions_scanner import MentionsScanner
 from .mentioned_scanner import MentionedScanner
 from .messages_scanner import MessagesScanner
+from .channels_scanner import ChannelsScanner

src/scanners/channels_scanner.py

@@ -0,0 +1,87 @@
+from typing import Dict, List
+from collections import defaultdict
+import discord
+
+
+# Custom libs
+
+from logs import ChannelLogs, MessageLog
+from .scanner import Scanner
+from data_types import Counter
+from utils import COMMON_HELP_ARGS, mention, channel_mention
+
+
+class ChannelsScanner(Scanner):
+    @staticmethod
+    def help() -> str:
+        return (
+            "```\n"
+            + "%chan: Rank channels by their messages\n"
+            + "arguments:\n"
+            + COMMON_HELP_ARGS
+            + "* <n> - top <n>, default is 10\n"
+            + "* all - include bots\n"
+            + "Example: %chan 10 @user\n"
+            + "```"
+        )
+
+    def __init__(self):
+        super().__init__(
+            has_digit_args=True,
+            valid_args=["all"],
+            help=ChannelsScanner.help(),
+            intro_context="Channels",
+        )
+
+    async def init(self, message: discord.Message, *args: str) -> bool:
+        # get max emotes to view
+        self.top = 10
+        for arg in args:
+            if arg.isdigit():
+                self.top = int(arg)
+        self.all_messages = "all" in args
+        # Create mentions dict
+        self.messages = defaultdict(Counter)
+        return True
+
+    def compute_message(self, channel: ChannelLogs, message: MessageLog):
+        return ChannelsScanner.analyse_message(
+            channel.id,
+            message,
+            self.messages,
+            self.raw_members,
+            all_messages=self.all_messages,
+        )
+
+    def get_results(self, intro: str) -> List[str]:
+        names = [name for name in self.messages]
+        names.sort(key=lambda name: self.messages[name].score(), reverse=True)
+        names = names[: self.top]
+        usage_count = Counter.total(self.messages)
+        res = [intro]
+        res += [
+            self.messages[name].to_string(
+                names.index(name),
+                channel_mention(name),
+                total_usage=usage_count,
+                counted="message",
+                transform=lambda id: f" by {mention(id)}",
+            )
+            for name in names
+        ]
+        return res
+
+    @staticmethod
+    def analyse_message(
+        channel_id: int,
+        message: MessageLog,
+        messages: Dict[str, Counter],
+        raw_members: List[int],
+        *,
+        all_messages: bool,
+    ) -> bool:
+        impacted = False
+        if not message.bot or all_messages:
+            impacted = True
+            messages[channel_id].update_use(1, message.created_at, message.author)
+        return impacted

src/scanners/mentioned_scanner.py

@@ -60,7 +60,7 @@ class MentionedScanner(Scanner):
         names.sort(key=lambda name: self.mentions[name].score(), reverse=True)
         names = names[: self.top]
         # Get the total of all emotes used
-        usage_count = sum([mention.usages for mention in self.mentions.values()])
+        usage_count = Counter.total(self.mentions)
         res = [intro]
         res += [
             self.mentions[name].to_string(

src/scanners/mentions_scanner.py

@@ -63,7 +63,7 @@ class MentionsScanner(Scanner):
         names.sort(key=lambda name: self.mentions[name].score(), reverse=True)
         names = names[: self.top]
         # Get the total of all emotes used
-        usage_count = sum([mention.usages for mention in self.mentions.values()])
+        usage_count = Counter.total(self.mentions)
         res = [intro]
         res += [
             self.mentions[name].to_string(

src/scanners/messages_scanner.py

@@ -8,7 +8,7 @@ import discord
 from logs import ChannelLogs, MessageLog
 from .scanner import Scanner
 from data_types import Counter
-from utils import COMMON_HELP_ARGS, plural, precise, mention, alt_mention
+from utils import COMMON_HELP_ARGS, mention, channel_mention
 
 
 class MessagesScanner(Scanner):
@@ -16,7 +16,7 @@ class MessagesScanner(Scanner):
     def help() -> str:
         return (
             "```\n"
-            + "%msg: Rank users mentions by their messages\n"
+            + "%msg: Rank users by their messages\n"
             + "arguments:\n"
             + COMMON_HELP_ARGS
             + "* <n> - top <n>, default is 10\n"
@@ -39,21 +39,25 @@ class MessagesScanner(Scanner):
         for arg in args:
             if arg.isdigit():
                 self.top = int(arg)
-        self.all_mentions = "all" in args
+        self.all_messages = "all" in args
         # Create mentions dict
         self.messages = defaultdict(Counter)
         return True
 
     def compute_message(self, channel: ChannelLogs, message: MessageLog):
         return MessagesScanner.analyse_message(
-            message, self.messages, self.raw_members, all_mentions=self.all_mentions
+            channel.id,
+            message,
+            self.messages,
+            self.raw_members,
+            all_messages=self.all_messages,
         )
 
     def get_results(self, intro: str) -> List[str]:
         names = [name for name in self.messages]
         names.sort(key=lambda name: self.messages[name].score(), reverse=True)
         names = names[: self.top]
-        usage_count = sum([message.usages for message in self.messages.values()])
+        usage_count = Counter.total(self.messages)
         res = [intro]
         res += [
             self.messages[name].to_string(
@@ -61,6 +65,7 @@ class MessagesScanner(Scanner):
                 mention(name),
                 total_usage=usage_count,
                 counted="message",
+                transform=lambda id: f" in {channel_mention(id)}",
             )
             for name in names
         ]
@@ -68,14 +73,15 @@ class MessagesScanner(Scanner):
 
     @staticmethod
     def analyse_message(
+        channel_id: int,
         message: MessageLog,
         messages: Dict[str, Counter],
         raw_members: List[int],
         *,
-        all_mentions: bool,
+        all_messages: bool,
     ) -> bool:
         impacted = False
-        if not message.bot or all_mentions:
+        if not message.bot or all_messages:
             impacted = True
-            messages[message.author].update_use(1, message.created_at)
+            messages[message.author].update_use(1, message.created_at, channel_id)
         return impacted