Merge branch 'master' of https://github.com/kyb3r/modmail into dev

Author: Taaku18

CHANGELOG.md

@@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+
+# v2.4.5
+
+### Fixed
+Fixed activity setting due to flawed logic in `config.get` function.
+
+# v2.4.4
+### Fixed
+Fixed a bug in activity command where it would fail to set the activity on bot restart if the activity type was `playing` 
+
 # v2.4.3
 Moved selfhosted log viewer to a seperate repo. 
 This update shouldn't affect anyone.

bot.py

@@ -22,7 +22,7 @@
 SOFTWARE.
 """
 
-__version__ = '2.4.3'
+__version__ = '2.4.5'
 
 import asyncio
 import textwrap
@@ -179,7 +179,8 @@ async def on_connect(self):
 
         activity_type = self.config.get('activity_type')
         message = self.config.get('activity_message')
-        if activity_type and message:
+
+        if activity_type is not None and message:
             url = self.config.get('twitch_url', 'https://www.twitch.tv/discord-modmail/') if activity_type == ActivityType.streaming else None
             activity = discord.Activity(type=activity_type, name=message,
                                         url=url)

core/config.py

@@ -75,4 +75,4 @@ def __getitem__(self, key):
         return self.cache[key]
 
     def get(self, value, default=None):
-        return self.cache.get(value) or default
+        return self.cache.get(value, default)