Fix flake8 errors (#24)

And simplify time expression code with a pluralizer.

Author: jdevera

bot.py

@@ -1,5 +1,4 @@
 import logging
-import datetime
 
 import telegram
 from telegram.ext import Updater, Filters, MessageHandler, CommandHandler
@@ -90,7 +89,8 @@ def main():
     dp.add_handler(CommandHandler('start', command_start))
     dp.add_handler(CommandHandler('help', command_help))
     dp.add_handler(CommandHandler('status', command_status))
-    dp.add_handler(MessageHandler(Filters.status_update.new_chat_members, welcome))
+    dp.add_handler(MessageHandler(Filters.status_update.new_chat_members,
+                                  welcome))
     dp.add_handler(MessageHandler(Filters.group, reply))
 
     logger.info('Bot is ready')

config.py

@@ -5,6 +5,7 @@
 
 _config_registry = []
 
+
 class _ConfigItem(NamedTuple):
     name: str
     value: Any
@@ -47,7 +48,8 @@ def log(logger_method):
 POLL_INTERVAL = config('POLL_INTERVAL', int, default=3)
 
 # Bot message for start command
-BOT_GREETING = config('BOT_GREETING', default="Hi! I'm a friendly, slightly psychopath robot")
+BOT_GREETING = config('BOT_GREETING',
+                      default="Hi! I'm a friendly, slightly psychopath robot")
 
 # A username longer than this will be considered non-human
 # - Allowed values: An integer larger than 1

utils.py

@@ -2,8 +2,7 @@
 import datetime
 import random
 import re
-import typing
-from typing import Tuple
+from typing import Tuple, Optional, NamedTuple
 
 from telegram import User
 import config
@@ -75,13 +74,13 @@ def bot_wants_to_reply() -> bool:
     return random.random() < config.VERBOSITY
 
 
-class BotReplySpec(typing.NamedTuple):
+class BotReplySpec(NamedTuple):
     message: str
     trigger: str
     reply: str
 
 
-def triggers_reply(message: str) -> typing.Optional[BotReplySpec]:
+def triggers_reply(message: str) -> Optional[BotReplySpec]:
     for trigger_words, bot_reply in config.REPLIES.items():
         regex = get_reply_regex(trigger_words)
         match = regex.search(message)
@@ -96,6 +95,12 @@ def triggers_reply(message: str) -> typing.Optional[BotReplySpec]:
     return None
 
 
+def pluralise(number: int, singular: str, plural: Optional[str] = None) -> str:
+    if plural is None:
+        plural = f"{singular}s"
+    return singular if number == 1 else plural
+
+
 def since(dt=None, reference=datetime.datetime.now()) -> str:
     """Returns a textual description of time passed.
 
@@ -115,15 +120,15 @@ def since(dt=None, reference=datetime.datetime.now()) -> str:
     buff = []
     days = delta.days
     if days:
-        buff.append(f"{days} day" if days == 1 else f"{days} days")
+        buff.append(f"{days} {pluralise(days, 'day')}")
     seconds = delta.seconds
     if seconds > 3600:
         hours = seconds // 3600
-        buff.append(f"{hours} hour" if hours == 1 else f"{hours} hours")
+        buff.append(f"{hours} {pluralise(hours, 'hour')}")
         seconds = seconds % 3600
     minutes = seconds // 60
     if minutes > 0:
-        buff.append(f"{minutes} minute" if minutes == 1 else f"{minutes} minutes")
+        buff.append(f"{minutes} {pluralise(minutes, 'minute')}")
     seconds = seconds % 60
-    buff.append(f"{seconds} second" if seconds == 1 else f"{seconds} seconds")
+    buff.append(f"{seconds} {pluralise(seconds, 'second')}")
     return " ".join(buff)