composition scanner working yay

src/scanners/composition_scanner.py

@@ -1,15 +1,14 @@
-from typing import List, Dict
-from collections import defaultdict
+from typing import List
+import re
 import discord
 
 
 # Custom libs
 
 from .scanner import Scanner
-from . import EmotesScanner
-from data_types import Composition, Emote, get_emote_dict
+from data_types import Composition
 from logs import ChannelLogs, MessageLog
-from utils import COMMON_HELP_ARGS
+from utils import emojis, COMMON_HELP_ARGS
 
 
 class CompositionScanner(Scanner):
@@ -31,36 +30,83 @@ class CompositionScanner(Scanner):
         )
 
     async def init(self, message: discord.Message, *args: str) -> bool:
-        guild = message.channel.guild
-        self.comp = Composition()
-        # Create emotes dict from custom emojis of the guild
-        self.emotes = get_emote_dict(message.channel.guild)
+        self.compo = Composition()
         return True
 
     def compute_message(self, channel: ChannelLogs, message: MessageLog):
-        ret = CompositionScanner.analyse_message(message, self.comp, self.raw_members)
-        ret &= EmotesScanner.analyse_message(
-            message, self.emotes, self.raw_members, all_emojis=True
-        )
+        ret = CompositionScanner.analyse_message(message, self.compo, self.raw_members)
         return ret
 
     def get_results(self, intro: str) -> List[str]:
-        CompositionScanner.compute_results(self.comp, self.emotes)
         res = [intro]
-        res += self.comp.to_string()
+        res += self.compo.to_string(self.msg_count)
         return res
 
     @staticmethod
     def analyse_message(
-        message: MessageLog, comp: Composition, raw_members: List[int]
+        message: MessageLog, compo: Composition, raw_members: List[int]
     ) -> bool:
         impacted = False
         # If author is included in the selection (empty list is all)
-        if len(raw_members) == 0 or message.author in raw_members:
+        if not message.bot and len(raw_members) == 0 or message.author in raw_members:
             impacted = True
-            pass  # TODO
-        return impacted
+            compo.total_characters += len(message.content)
 
-    @staticmethod
-    def compute_results(comp: Composition, emotes: Dict[str, Emote]):
-        pass  # TODO
+            emotes_found = emojis.regex.findall(message.content)
+            without_emote = message.content
+            for name in emotes_found:
+                if name not in compo.emotes:
+                    if name not in emojis.unicode_list:
+                        continue
+                compo.emotes[name] += 1
+                i = without_emote.index(name)
+                without_emote = without_emote[:i] + without_emote[i + len(name) :]
+            if len(message.content.strip()) > 0 and len(without_emote.strip()) == 0:
+                compo.emote_only += 1
+            if len(emotes_found) > 0:
+                compo.emote_msg += 1
+
+            links_found = re.findall(r"https?:\/\/", message.content)
+            compo.links += len(links_found)
+            if len(links_found) > 0:
+                compo.link_msg += 1
+
+            mentions = (
+                len(message.mentions)
+                + len(message.role_mentions)
+                + len(message.channel_mentions)
+            )
+            if message.mention_everyone:
+                compo.everyone += 1
+                mentions += 1
+            if mentions > 0:
+                compo.mentions += mentions
+                compo.mention_msg += 1
+
+            spoilers_found = re.findall(r"\|\|[^|]+\|\|", message.content)
+            if len(spoilers_found) > 0:
+                compo.spoilers += 1
+
+            if message.edited_at is not None:
+                compo.edited += 1
+            if message.reference is not None:
+                compo.answers += 1
+            if message.image:
+                compo.images += 1
+            if message.tts:
+                compo.tts += 1
+
+            if (
+                len(emotes_found) == 0
+                and message.reference is None
+                and not message.image
+                and len(message.mentions) == 0
+                and len(message.role_mentions) == 0
+                and len(message.channel_mentions) == 0
+                and not message.tts
+                and not message.mention_everyone
+                and not message.embed
+                and not message.attachment
+            ):
+                compo.plain_text += 1
+        return impacted