From 4505d7acbd97c311012f1e7cc0893e4866c99b50 Mon Sep 17 00:00:00 2001
From: klemek <klemek@outlook.fr>
Date: Thu, 14 Jan 2021 18:02:06 +0100
Subject: [PATCH] mention => counter

---
 src/data_types/__init__.py                |  2 +-
 src/data_types/{mention.py => counter.py} | 10 +++-------
 src/scanners/mentioned_scanner.py         | 16 ++++------------
 src/scanners/mentions_scanner.py          |  6 +++---
 4 files changed, 11 insertions(+), 23 deletions(-)
 rename src/data_types/{mention.py => counter.py} (81%)

diff --git a/src/data_types/__init__.py b/src/data_types/__init__.py
index 0aa2d3a..38daabd 100644
--- a/src/data_types/__init__.py
+++ b/src/data_types/__init__.py
@@ -2,4 +2,4 @@ from .emote import Emote, get_emote_dict
 from .frequency import Frequency
 from .composition import Composition
 from .presence import Presence
-from .mention import Mention
+from .counter import Counter
diff --git a/src/data_types/mention.py b/src/data_types/counter.py
similarity index 81%
rename from src/data_types/mention.py
rename to src/data_types/counter.py
index 7554715..82bb19a 100644
--- a/src/data_types/mention.py
+++ b/src/data_types/counter.py
@@ -5,7 +5,7 @@ from datetime import datetime
 from utils import plural, from_now, percent
 
 
-class Mention:
+class Counter:
     def __init__(self):
         self.usages = 0
         self.last_used = None
@@ -25,11 +25,7 @@ class Mention:
         )
 
     def to_string(
-        self,
-        i: int,
-        name: str,
-        *,
-        total_usage: int,
+        self, i: int, name: str, *, total_usage: int, counted: str = "time"
     ) -> str:
         # place
         output = ""
@@ -41,5 +37,5 @@ class Mention:
             output += ":third_place:"
         else:
             output += f"**#{i + 1}**"
-        output += f" {name} - {plural(self.usages, 'time')} ({percent(self.usages/total_usage)}) (last {from_now(self.last_used)})"
+        output += f" {name} - {plural(self.usages, counted)} ({percent(self.usages/total_usage)}) (last {from_now(self.last_used)})"
         return output
diff --git a/src/scanners/mentioned_scanner.py b/src/scanners/mentioned_scanner.py
index 8e4a1db..2764957 100644
--- a/src/scanners/mentioned_scanner.py
+++ b/src/scanners/mentioned_scanner.py
@@ -7,16 +7,8 @@ import discord
 
 from logs import ChannelLogs, MessageLog
 from .scanner import Scanner
-from data_types import Mention
-from utils import (
-    COMMON_HELP_ARGS,
-    plural,
-    precise,
-    mention,
-    alt_mention,
-    role_mention,
-    channel_mention,
-)
+from data_types import Counter
+from utils import COMMON_HELP_ARGS, plural, precise, mention, alt_mention
 
 
 class MentionedScanner(Scanner):
@@ -55,7 +47,7 @@ class MentionedScanner(Scanner):
             return False
         self.all_mentions = "all" in args
         # Create mentions dict
-        self.mentions = defaultdict(Mention)
+        self.mentions = defaultdict(Counter)
         return True
 
     def compute_message(self, channel: ChannelLogs, message: MessageLog):
@@ -86,7 +78,7 @@ class MentionedScanner(Scanner):
     @staticmethod
     def analyse_message(
         message: MessageLog,
-        mentions: Dict[str, Mention],
+        mentions: Dict[str, Counter],
         raw_members: List[int],
         *,
         all_mentions: bool,
diff --git a/src/scanners/mentions_scanner.py b/src/scanners/mentions_scanner.py
index 7126213..d8d62d4 100644
--- a/src/scanners/mentions_scanner.py
+++ b/src/scanners/mentions_scanner.py
@@ -7,7 +7,7 @@ import discord
 
 from logs import ChannelLogs, MessageLog
 from .scanner import Scanner
-from data_types import Mention
+from data_types import Counter
 from utils import (
     COMMON_HELP_ARGS,
     plural,
@@ -51,7 +51,7 @@ class MentionsScanner(Scanner):
         # check other args
         self.all_mentions = "all" in args
         # Create mentions dict
-        self.mentions = defaultdict(Mention)
+        self.mentions = defaultdict(Counter)
         return True
 
     def compute_message(self, channel: ChannelLogs, message: MessageLog):
@@ -82,7 +82,7 @@ class MentionsScanner(Scanner):
     @staticmethod
     def analyse_message(
         message: MessageLog,
-        mentions: Dict[str, Mention],
+        mentions: Dict[str, Counter],
         raw_members: List[int],
         *,
         all_mentions: bool,