Dm messages sent by the owner are sent in #general

Dm sent by anyone else are sent in #enso-chan-commands

EnsoBot.py

@@ -248,20 +248,17 @@ async def marry(ctx, member: discord.Member):
 # Allows the bot to echo the dm's that it receives
 @client.event
 async def on_message(message):
+    # Checking if the message is not sent in server
+    if message.guild is None:
+        # Checking if the owner is sending the message
         if commands.is_owner():
+            # Send message to #general
             channel = client.get_channel(663651584399507481)
+            await channel.send(message.content)
         else:
-        # Get the channel id of the channel it wants to push messages to
+            # Send message to #enso-chan~commands
             channel = client.get_channel(721449922838134876)
-
-    # If the channel that the message is sent in is private
-    if message.guild is None:
-        if message.author.id == 578919370697342977:
-            # Echo the message contents to the channel specified
             await channel.send(message.content)
-        else:
-            # Do nothing
-            return
 
     await client.process_commands(message)