From 8db1d6699695c1cc041ad39af64e06ba8b06955a Mon Sep 17 00:00:00 2001
From: Ave O <ave@ave.zone>
Date: Fri, 20 Apr 2018 04:53:35 +0300
Subject: [PATCH] fix 2 bugs

---
 botbase.py     |  2 +-
 cogs/common.py | 65 +++++++++++++++++++++++++-------------------------
 2 files changed, 33 insertions(+), 34 deletions(-)

diff --git a/botbase.py b/botbase.py
index 892ac78..80f27ca 100755
--- a/botbase.py
+++ b/botbase.py
@@ -70,7 +70,7 @@ async def on_ready():
     log.info(f'\nLogged in as: {bot.user.name} - '
              f'{bot.user.id}\ndpy version: {discord.__version__}\n')
     game_name = f"{config['base']['prefix']}help"
-    await bot.change_presence(game=discord.Game(name=game_name))
+    await bot.change_presence(activity=discord.Game(name=game_name))
 
 
 @bot.event
diff --git a/cogs/common.py b/cogs/common.py
index 74deed2..69450af 100644
--- a/cogs/common.py
+++ b/cogs/common.py
@@ -18,39 +18,38 @@ class Common:
         self.bot.aiogetbytes = self.aiogetbytes
         self.bot.get_relative_timestamp = self.get_relative_timestamp
 
-
-def get_relative_timestamp(self, time_from=None, time_to=None,
-                           humanized=False, include_from=False,
-                           include_to=False):
-    # Setting default value to utcnow() makes it show time from cog load
-    # which is not what we want
-    if not time_from:
-        time_from = datetime.datetime.utcnow()
-    if not time_to:
-        time_to = datetime.datetime.utcnow()
-    if humanized:
-        humanized_string = humanize.naturaltime(time_to - time_from)
-        if include_from and include_to:
-            str_with_from_and_to = f"{humanized_string} "\
-                                   f"({str(time_from).split('.')[0]} "\
-                                   f"- {str(time_to).split('.')[0]})"
-            return str_with_from_and_to
-        elif include_from:
-            str_with_from = f"{humanized_string} "\
-                            f"({str(time_from).split('.')[0]})"
-            return str_with_from
-        elif include_to:
-            str_with_to = f"{humanized_string} ({str(time_to).split('.')[0]})"
-            return str_with_to
-        return humanized_string
-    else:
-        epoch = datetime.datetime.utcfromtimestamp(0)
-        epoch_from = (time_from - epoch).total_seconds()
-        epoch_to = (time_to - epoch).total_seconds()
-        second_diff = epoch_to - epoch_from
-        result_string = str(datetime.timedelta(
-            seconds=second_diff)).split('.')[0]
-        return result_string
+    def get_relative_timestamp(self, time_from=None, time_to=None,
+                               humanized=False, include_from=False,
+                               include_to=False):
+        # Setting default value to utcnow() makes it show time from cog load
+        # which is not what we want
+        if not time_from:
+            time_from = datetime.datetime.utcnow()
+        if not time_to:
+            time_to = datetime.datetime.utcnow()
+        if humanized:
+            humanized_string = humanize.naturaltime(time_to - time_from)
+            if include_from and include_to:
+                str_with_from_and_to = f"{humanized_string} "\
+                                       f"({str(time_from).split('.')[0]} "\
+                                       f"- {str(time_to).split('.')[0]})"
+                return str_with_from_and_to
+            elif include_from:
+                str_with_from = f"{humanized_string} "\
+                                f"({str(time_from).split('.')[0]})"
+                return str_with_from
+            elif include_to:
+                str_with_to = f"{humanized_string} ({str(time_to).split('.')[0]})"
+                return str_with_to
+            return humanized_string
+        else:
+            epoch = datetime.datetime.utcfromtimestamp(0)
+            epoch_from = (time_from - epoch).total_seconds()
+            epoch_to = (time_to - epoch).total_seconds()
+            second_diff = epoch_to - epoch_from
+            result_string = str(datetime.timedelta(
+                seconds=second_diff)).split('.')[0]
+            return result_string
 
     async def aioget(self, url):
         try: