Renamed bot

eladavron · Dec 19, 2020 · 023f6c5 · 023f6c5
1 parent 854fe14
commit 023f6c5
Show file tree

Hide file tree

Showing 13 changed files with 16 additions and 14 deletions.
diff --git a/CQXBot/_helpers.py → CosmoGolem/_helpers.py b/CQXBot/_helpers.py → CosmoGolem/_helpers.py
diff --git a/CQXBot/_settings.py → CosmoGolem/_settings.py b/CQXBot/_settings.py → CosmoGolem/_settings.py
diff --git a/CQXBot/archive.py → CosmoGolem/archive.py b/CQXBot/archive.py → CosmoGolem/archive.py
diff --git a/CQXBot/bedtime.py → CosmoGolem/bedtime.py b/CQXBot/bedtime.py → CosmoGolem/bedtime.py
@@ -86,9 +86,11 @@ async def get_bedtime(self, ctx):
     async def bedtime(self, ctx):
         await ctx.send(
             embed=embedder(
-                "To set your bedtime, type `.set_bedtime <bedtime> <morning> <utc_offset>`\n"
-                "with `<bedtime>` and `<morning>` being integers between 0 and 23, and `<utc_offset>` being between -12 and 12.\n"
-                "\nTo check your bedtime, type `.get_bedtime`\nTo remove your bedtime, type `.remove_bedtime`"
+                f"To set your bedtime, type `{self.bot.command_prefix}set_bedtime <bedtime> <morning> <utc_offset>`\n"
+                "with `<bedtime>` and `<morning>` being integers between 0 and 23,"
+                "and `<utc_offset>` being between -12 and 12.\n"
+                f"\nTo check your bedtime, type `{self.bot.command_prefix}get_bedtime`\n"
+                f"To remove your bedtime, type `{self.bot.command_prefix}remove_bedtime`"
             )
         )
 

diff --git a/CQXBot/commands.py → CosmoGolem/commands.py b/CQXBot/commands.py → CosmoGolem/commands.py
@@ -11,7 +11,7 @@
 
 import discord
 from discord.ext import commands
-
+from _settings import Settings
 from _helpers import Color, LOG_PATH, embedder, exception_handler
 from archive import archive, archive_server, parse_channel_role_overrides
 
@@ -95,7 +95,7 @@ async def ud(self, ctx, *, query):
 
     # Mod Commands
     @commands.command(help="Posts the given message or image to the given channel as the bot.")
-    @commands.has_role("mods")
+    @commands.has_role(Settings.static_settings["mod_role_id"])
     async def echo(self, ctx, channel_name, *, echoString=None):
         """ Allows puppeteering the bot by having it send commands or images to other channels """
         if not ctx.message.channel_mentions:
@@ -117,17 +117,17 @@ async def echo(self, ctx, channel_name, *, echoString=None):
                     await channel.send(file=discord.File(f, filename=filename))
             elif echoString is None:
                 await ctx.send("Cannot echo an empty message!")
-            await channel.send(echoString)
+            await channel.send(embed=embedder(echoString))
 
     ### Generic Commands ###
     @commands.command(help="Gives generic details about the bot.")
     async def info(self, ctx):
         """ Handles the "info" command """
         await ctx.trigger_typing()
-        await ctx.send(embed=embedder("Written in Python 3.9 by Ambious", title="CosmoQuestX Bot", color=Color.AQUA))
+        await ctx.send(embed=embedder("Written in Python 3.9 by Ambious", title="CosmoGolem", color=Color.AQUA))
 
     @commands.command(help="Archives a channel to a file then uploads to the where you request.")
-    @commands.has_role("Moderator")
+    @commands.has_role(Settings.static_settings["mod_role_id"])
     async def archive(self, ctx, channel_name):
         """ Archives an entire channel into a json and uploads it to the archive channel """
         if not ctx.message.channel_mentions:
@@ -146,7 +146,7 @@ async def archive(self, ctx, channel_name):
         await archive(channel, where_to_upload)
 
     @commands.command(help="Archives the entire server.")
-    @commands.has_role("Moderator")
+    @commands.has_role(Settings.static_settings["mod_role_id"])
     async def archive_server(self, ctx):
         """ Archives an entire server into a jsons and uploads it to a zip """
         if ctx.message.channel_mentions:

diff --git a/CQXBot/cqxbot.py → CosmoGolem/cqxbot.py b/CQXBot/cqxbot.py → CosmoGolem/cqxbot.py
@@ -1,5 +1,5 @@
 """
-cqxbot's main module
+CosmoGolem's main module
 """
 
 import os
@@ -32,7 +32,7 @@ def guild(self):
         return self.get_guild(self.settings["server_id"])
 
 
-bot = Bot(command_prefix="$", description="CosmoQuestX Bot 1.0", pm_help=True)
+bot = Bot(command_prefix="$", description="CosmoGolem 1.0", pm_help=True)
 
 
 def startup(debug):

diff --git a/CQXBot/eggs.py → CosmoGolem/eggs.py b/CQXBot/eggs.py → CosmoGolem/eggs.py
diff --git a/CQXBot/emoji_roles.py → CosmoGolem/emoji_roles.py b/CQXBot/emoji_roles.py → CosmoGolem/emoji_roles.py
diff --git a/CQXBot/handlers.py → CosmoGolem/handlers.py b/CQXBot/handlers.py → CosmoGolem/handlers.py
diff --git a/CQXBot/images.py → CosmoGolem/images.py b/CQXBot/images.py → CosmoGolem/images.py
diff --git a/CQXBot/loopers.py → CosmoGolem/loopers.py b/CQXBot/loopers.py → CosmoGolem/loopers.py
diff --git a/Dockerfile b/Dockerfile
@@ -3,7 +3,7 @@ FROM gorialis/discord.py
 WORKDIR /
 
 COPY requirements.txt ./
-COPY CQXBot app
+COPY CosmoGolem app
 COPY data data
 
 VOLUME [ "/data" ]

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# CosmoQuestX Bot
+# CosmoGolem
 A bot for the CosmoQuestX Discord Server.  
 ***Both the bot and this readme file are still under construciton!***
 
@@ -20,7 +20,7 @@ use `docker-compose`:
   (Make sure you install pip as well)
 * Once installed, navigate to the root of the repository and type:  
   `pip install -r requirements.txt`
-* Start the bot using `python CQXBot/cqxbot.py`
+* Start the bot using `python CosmoGolem/cqxbot.py`
 
 ### The Settings File
 You will have to edit the settings file in the `data` folder before you can actually use the bot.