Merge branch 'master' into patch-1

2 files changed, 10 insertions, 1 deletions

diff --git a/bot/__init__.py b/bot/__init__.py
index 4729e50c..6976e089 100644
--- a/bot/__init__.py
+++ b/bot/__init__.py
@@ -1,3 +1,4 @@
+import asyncio
 import logging
 import logging.handlers
 import os
@@ -63,3 +64,8 @@ logging.basicConfig(
     handlers=[console_handler, file_handler]
 )
 logging.getLogger().info('Logging initialization complete')
+
+
+# On Windows, the selector event loop is required for aiodns.
+if os.name == "nt":
+    asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())
diff --git a/bot/bot.py b/bot/bot.py
index b0162377..39ed8bbe 100644
--- a/bot/bot.py
+++ b/bot/bot.py
@@ -203,4 +203,7 @@ class SeasonalBot(commands.Bot):
         await self._guild_available.wait()
 
 
-bot = SeasonalBot(command_prefix=Client.prefix)
+bot = SeasonalBot(
+    command_prefix=Client.prefix,
+    activity=discord.Game(name=f"Commands: {Client.prefix}help"),
+)