presence scanner working yay

src/scanners/full_scanner.py

@@ -35,9 +35,13 @@ class FullScanner(Scanner):
         self.freq = Frequency()
         self.comp = Composition()
         self.pres = Presence()
-        # Create emotes dict from custom emojis of the guild
+        self.member_specific = len(self.members) > 0
         # Create emotes dict from custom emojis of the guild
         self.emotes = get_emote_dict(message.channel.guild)
+        if self.member_specific:
+            self.emotes_all = get_emote_dict(message.channel.guild)
+        else:
+            self.emotes_all = {}
         return True
 
     def compute_message(self, channel: ChannelLogs, message: MessageLog):
@@ -47,6 +51,8 @@ class FullScanner(Scanner):
         EmotesScanner.analyse_message(
             message, self.emotes, self.raw_members, all_emojis=True
         )
+        if self.member_specific:
+            EmotesScanner.analyse_message(message, self.emotes_all, [], all_emojis=True)
         return not message.bot and (
             len(self.raw_members) == 0 or message.author in self.raw_members
         )
@@ -54,7 +60,7 @@ class FullScanner(Scanner):
     def get_results(self, intro: str) -> List[str]:
         FrequencyScanner.compute_results(self.freq)
         CompositionScanner.compute_results(self.comp, self.emotes)
-        PresenceScanner.compute_results(self.pres, self.emotes)
+        PresenceScanner.compute_results(self.pres, self.emotes, self.emotes_all)
         res = [intro]
         res += ["__Frequency__:"]
         res += self.freq.to_string()
@@ -63,6 +69,6 @@ class FullScanner(Scanner):
         res += ["__Presence__:"]
         res += self.pres.to_string(
             show_top_channel=len(self.channels) > 1,
-            show_mentioned=(len(self.members) > 0),
+            member_specific=self.member_specific,
         )
         return res

src/scanners/presence_scanner.py

@@ -31,24 +31,31 @@ class PresenceScanner(Scanner):
 
     async def init(self, message: discord.Message, *args: str) -> bool:
         self.pres = Presence()
+        self.member_specific = len(self.members) > 0
         # Create emotes dict from custom emojis of the guild
         self.emotes = get_emote_dict(message.channel.guild)
+        if self.member_specific:
+            self.emotes_all = get_emote_dict(message.channel.guild)
+        else:
+            self.emotes_all = {}
         return True
 
     def compute_message(self, channel: ChannelLogs, message: MessageLog):
         EmotesScanner.analyse_message(
             message, self.emotes, self.raw_members, all_emojis=True
         )
+        if self.member_specific:
+            EmotesScanner.analyse_message(message, self.emotes_all, [], all_emojis=True)
         return PresenceScanner.analyse_message(
             channel, message, self.pres, self.raw_members
         )
 
     def get_results(self, intro: str) -> List[str]:
-        PresenceScanner.compute_results(self.pres, self.emotes)
+        PresenceScanner.compute_results(self.pres, self.emotes, self.emotes_all)
         res = [intro]
         res += self.pres.to_string(
             show_top_channel=(len(self.channels) > 1),
-            show_mentioned=(len(self.members) > 0),
+            member_specific=self.member_specific,
         )
         return res
 
@@ -64,15 +71,27 @@ class PresenceScanner(Scanner):
         if not message.bot and (len(raw_members) == 0 or message.author in raw_members):
             impacted = True
             pres.channel_usage[channel.id] += 1
+            pres.msg_count += 1
+            for mention in message.mentions:
+                pres.mention_others[mention] += 1
+        pres.channel_total[channel.id] += 1
         for mention in message.mentions:
             if mention in raw_members:
-                pres.mentions[mention] += 1
+                pres.mentions[message.author] += 1
+            pres.mention_count += 1
+        pres.total_msg += 1
         return impacted
 
     @staticmethod
-    def compute_results(pres: Presence, emotes: Dict[str, Emote]):
+    def compute_results(
+        pres: Presence, emotes: Dict[str, Emote], emotes_all: Dict[str, Emote]
+    ):
         # calculate total reactions
         pres.used_reaction_total = sum([emote.reactions for emote in emotes.values()])
+        if len(emotes_all) > 0:
+            pres.used_reaction_all_total = sum(
+                [emote.reactions for emote in emotes_all.values()]
+            )
         if pres.used_reaction_total > 0:
             # calculate most used reaction
             pres.most_used_reaction = sorted(emotes, key=lambda k: emotes[k].reactions)[