hhhhh

Author: script-head

assets/languages/english.json

@@ -1,7 +1,8 @@
 {
 	"bot.errors.disabled_command":"This command has been disabled.",
-	"bot.errors.dev_only":"This command can only be ran by the bot developers.",
 	"bot.errors.owner_only":"This command can only be ran by the bot owner.",
+	"bot.errors.dev_only":"This command can only be ran by the bot developers.",
+	"bot.errors.support_only":"This command can only be ran by the bot's support team.",
 	"bot.errors.not_nsfw_channel":"This command can only be ran in NSFW channels.",
 	"bot.errors.not_guild_owner":"Only the server owner (`{0}`) can use this command.",
 	"bot.errors.no_permission":"You do not have permission to use this command.",
@@ -212,7 +213,7 @@
 	"myanimelist.no_anime_found":"Couldn't find any anime named `{0}`.",
 	"myanimelist.no_manga_found":"Couldn't find any manga named `{0}`.",
 	"configuration.set_success":"Successfully set the {0} to `{1}`",
-	"config.invalid_set_type":"`{0}` is not a valid type! Valid types are `mod-role` and `mute-role`",
+	"configuration.invalid_set_type":"`{0}` is not a valid type! Valid types are `mod-role` and `mute-role`",
 	"configuration.mod_role":"Mod Role",
 	"configuration.mute_role":"Mute Role",
 	"configuration.server_configuration":"Server Configuration",

assets/languages/finnish.json

@@ -1,7 +1,8 @@
 {
 	"bot.errors.disabled_command":"Tama komento to poistettu kaytösta.",
+	"bot.errors.owner_only":"Vain botin omistaja voi suorittaa taman komennon.",
 	"bot.errors.dev_only":"Vain kehittajat voivat kayttaa tata komentoa.",
-	"bot.errors.owner_only":"vain botin omistaja voi suorittaa taman komennon.",
+	"bot.errors.support_only":"This command can only be ran by the bot's support team.",
 	"bot.errors.not_nsfw_channel":"Tama komento voidaan suorittaa vain NSFW kanavissa.",
 	"bot.errors.not_guild_owner":"Ainoastaan Palvelimen omistaja  (`{0}`) voi suorittaa taman komennon.",
 	"bot.errors.no_permission":"Sinulla ei ole oikeuksia kayttaa tata komentoa.",
@@ -212,7 +213,7 @@
 	"myanimelist.no_anime_found":"Couldn't find any anime named `{0}`.",
 	"myanimelist.no_manga_found":"Couldn't find any manga named `{0}`.",
 	"configuration.set_success":"Successfully set the {0} to `{1}`",
-	"config.invalid_set_type":"`{0}` is not a valid type! Valid types are `mod-role` and `mute-role`",
+	"configuration.invalid_set_type":"`{0}` is not a valid type! Valid types are `mod-role` and `mute-role`",
 	"configuration.mod_role":"Mod Role",
 	"configuration.mute_role":"Mute Role",
 	"configuration.server_configuration":"Server Configuration",

assets/languages/french.json

@@ -1,7 +1,8 @@
 {
 	"bot.errors.disabled_command":"Cette commande a été désactivé.",
-	"bot.errors.dev_only":"Cette commande ne peut être utilisé que par les développeurs du bot.",
 	"bot.errors.owner_only":"Cette commande ne peut être utilisé que par le propriétaire.",
+	"bot.errors.dev_only":"Cette commande ne peut être utilisé que par les développeurs du bot.",
+	"bot.errors.support_only":"This command can only be ran by the bot's support team.",
 	"bot.errors.not_nsfw_channel":" Cette commande ne peut être utilisé que dans les salons NSFW.",
 	"bot.errors.not_guild_owner":"Seulement le propriétaire du serveur (`{0}`) peut utiliser cette commande.",
 	"bot.errors.no_permission":"Vouz n’avez pas le droit d’utiliser cette commande.",
@@ -211,7 +212,7 @@
 	"myanimelist.no_anime_found":"Impossible de trouver un anime nommé `{0}`.",
 	"myanimelist.no_manga_found":"Impossible de trouver un manga nommé `{0}`.",
 	"configuration.set_success":"Mit le {0} à `{1}`",
-	"config.invalid_set_type":"`{0}` N’est pas un type valide! Les types valides sont `mod-role` et `mute-role`",
+	"configuration.invalid_set_type":"`{0}` N’est pas un type valide! Les types valides sont `mod-role` et `mute-role`",
 	"configuration.mod_role":"Rôle de moderateur",
 	"configuration.mute_role":"Rôle de muet",
 	"configuration.server_configuration":"Configuration serveur",

assets/languages/hebrew.json

@@ -1,7 +1,8 @@
 {
 	"bot.errors.disabled_command":"פונקציה זו כבויה.",
-	"bot.errors.dev_only":"פונקציה זו מיועדת למפתחים.",
 	"bot.errors.owner_only":"פונקציה זו מיועדת לבעלים.",
+	"bot.errors.dev_only":"פונקציה זו מיועדת למפתחים.",
+	"bot.errors.support_only":"This command can only be ran by the bot's support team.",
 	"bot.errors.not_nsfw_channel":"פונקציה זו חייבת להתבצע בערוץ NSFW.",
 	"bot.errors.not_guild_owner":"רק בעל השרת ('{0}') מיועדת לבצע את הפונקציה הזו.",
 	"bot.errors.no_permission":"אין לך רשות נאחוץ הפונקציה הזה.",
@@ -212,7 +213,7 @@
 	"myanimelist.no_anime_found":"לא מצאתי אנימה עם השם `{0}`.",
 	"myanimelist.no_manga_found":"לא מצאתי מנגה עם השם `{0}`.",
 	"configuration.set_success":"הצלחתי לשנות את ה-{0} ל-`{1}`",
-	"config.invalid_set_type":"`{0}` זה לא סוג זמין! סוגות זמינים הם `mod-role` ו-`mute-role`",
+	"configuration.invalid_set_type":"`{0}` זה לא סוג זמין! סוגות זמינים הם `mod-role` ו-`mute-role`",
 	"configuration.mod_role":"תפקיד מנחה",
 	"configuration.mute_role":"תפקיד אילם",
 	"configuration.server_configuration":"תצורה של השרת",

assets/languages/spanish.json

@@ -1,7 +1,8 @@
 {
 	"bot.errors.disabled_command":"Este comando ha sido deshabilitado.",
-	"bot.errors.dev_only":"Este comando solo puede ser usado por uno de los desarrolladores.",
 	"bot.errors.owner_only":"Este comando solo puede ser usado por el dueño del bot",
+	"bot.errors.dev_only":"Este comando solo puede ser usado por uno de los desarrolladores.",
+	"bot.errors.support_only":"This command can only be ran by the bot's support team.",
 	"bot.errors.not_nsfw_channel":"Este comando solo puede ser usado en los canales NSFW.",
 	"bot.errors.not_guild_owner":"Solo el dueño (`{0}`) puede usar este comando.",
 	"bot.errors.no_permission":"No tienes los permisos para usar este comando.",
@@ -212,7 +213,7 @@
 	"myanimelist.no_anime_found":"No se pudo encontrar ningún anime llamado`{0}`.",
 	"myanimelist.no_manga_found":"No se pudo encontrar ningún manga llamado `{0}`.",
 	"configuration.set_success":"Se ha puesto {0} a `{1}`",
-	"config.invalid_set_type":"`{0}` no es un tipo válido. Los tipos válidos son `mod-role` y `mute-role`",
+	"configuration.invalid_set_type":"`{0}` no es un tipo válido. Los tipos válidos son `mod-role` y `mute-role`",
 	"configuration.mod_role":"Rol de moderador",
 	"configuration.mute_role":"Rol de silenciado",
 	"configuration.server_configuration":"Configuración del servidor.",

bot.py

@@ -51,9 +51,14 @@
     "Fixed the userinfocommand ",
     "Fixed the serverinfo command",
     "Fixed the invite command ",
-    "Fixed the joinserver command"
+    "Fixed the joinserver command",
+    "Fixed the uploadfile command",
+    "+ uppercase",
+    "+ lowercase",
     "Other things:",
     "Now using python 3.6",
+    "Fixed the \"no nsfw channel\" message that wouldn't display in dms",
+    "Support team members now ave a seperate id config entry."
 ]
 
 async def _restart_bot():
@@ -151,11 +156,14 @@ async def on_command_error(ctx, error):
     if isinstance(error, commands.DisabledCommand):
         await ctx.send(Language.get("bot.errors.disabled_command", ctx))
         return
+    if isinstance(error, checks.owner_only):
+        await ctx.send(Language.get("bot.errors.owner_only", ctx))
+        return
     if isinstance(error, checks.dev_only):
         await ctx.send(Language.get("bot.errors.dev_only", ctx))
         return
-    if isinstance(error, checks.owner_only):
-        await ctx.send(Language.get("bot.errors.owner_only", ctx))
+    if isinstance(error, checks.support_only):
+        await ctx.send(Language.get("bot.errors.support_only", ctx))
         return
     if isinstance(error, checks.not_nsfw_channel):
         await ctx.send(Language.get("bot.errors.not_nsfw_channel", ctx))
@@ -321,6 +329,10 @@ async def notifydev(ctx, *, message:str):
         dev = bot.get_user(id)
         if dev:
             await dev.send("You have received a new message! The user's ID is `{}` Server: {}".format(ctx.author.id, guild), embed=msg)
+    for id in config.support_ids:
+        support_member = bot.get_user(id)
+        if support_member:
+            await support_member.send("You have received a new message! The user's ID is `{}` Server: {}".format(ctx.author.id, guild), embed=msg)
     await ctx.author.send(Language.get("bot.dev_notify", ctx).format(message))
 
 @bot.command()
@@ -338,6 +350,10 @@ async def suggest(ctx, *, suggestion:str):
         dev = bot.get_user(id)
         if dev:
             await dev.send("You have received a new suggestion! The user's ID is `{}` Server: {}".format(ctx.author.id, guild), embed=msg)
+    for id in config.support_ids:
+        support_member = bot.get_user(id)
+        if support_member:
+            await support_member.send("You have received a new message! The user's ID is `{}` Server: {}".format(ctx.author.id, guild), embed=msg)
     await ctx.author.send(Language.get("bot.errors.dev_suggest", ctx).format(suggestion))
 
 @bot.command(hidden=True)
@@ -458,7 +474,7 @@ async def uploadfile(ctx, *, path:str):
     """Uploads any file on the system. What is this hackery?"""
     await ctx.channel.trigger_typing()
     try:
-        await bot.send_file(ctx.channel, path)
+        await ctx.send(file=discord.File(path))
     except FileNotFoundError:
         await ctx.send("That file does not exist!")
 
@@ -473,7 +489,7 @@ async def version(ctx):
     await ctx.send(Language.get("bot.version", ctx).format(BUILD_VERSION, BUILD_AUTHORS, BUILD_CODENAME, BUILD_DATE))
 
 @bot.command(hidden=True)
-@checks.is_dev()
+@checks.is_support()
 async def dm(ctx, id:int, *, message:str):
     """DMs a user"""
     msg = make_message_embed(ctx.author, 0xFF0000, message, formatUser=True)
@@ -566,6 +582,7 @@ async def stats(ctx):
     await ctx.send(embed=embed)
 
 @bot.command()
+@commands.guild_only()
 @checks.is_dev()
 async def editmessage(ctx, id:int, *, newmsg:str):
     """Edits a message sent by the bot"""

commands/fun.py

@@ -281,14 +281,24 @@ async def md5(self, ctx, *, msg:str):
         await ctx.send("`{}`".format(hashlib.md5(bytes(msg.encode("utf-8"))).hexdigest()))\
 
     @commands.command()
-    async def sha256(self, ctx, *, msg: str):
+    async def sha256(self, ctx, *, msg:str):
         """Convert something to sha256"""
         await ctx.send("`{}`".format(hashlib.sha256(bytes(msg.encode("utf-8"))).hexdigest()))
 
     @commands.command()
-    async def sha512(self, ctx, *, msg: str):
+    async def sha512(self, ctx, *, msg:str):
         """Convert something to sha512"""
         await ctx.send("`{}`".format(hashlib.sha512(bytes(msg.encode("utf-8"))).hexdigest()))
 
+    @commands.command()
+    async def uppercase(self, ctx, *, msg:str):
+        """UPPERCASE DIS"""
+        await ctx.send(msg.upper())
+
+    @commands.command()
+    async def lowercase(self, ctx, *, msg: str):
+        """lowercase dis"""
+        await ctx.send(msg.lower())
+
 def setup(bot):
     bot.add_cog(Fun(bot))

config/config.ini.example

@@ -31,6 +31,11 @@ Command_Prefix = *
 ; Do NOT put the owner ID here!
 ;Developer_IDs =
 
+; Example: ID1 ID2 ID3
+; Be sure to uncomment if you are entering a developer ID!
+; Do NOT put the owner ID or any dev IDs here!
+;Support_IDs =
+
 ; How many results should the NSFW commands get?
 Max_NSFW_Count = 500
 

utils/checks.py

@@ -3,10 +3,13 @@
 from utils.mysql import *
 config = Config()
 
+class owner_only(commands.CommandError):
+    pass
+
 class dev_only(commands.CommandError):
     pass
 
-class owner_only(commands.CommandError):
+class support_only(commands.CommandError):
     pass
 
 class not_nsfw_channel(commands.CommandError):
@@ -34,9 +37,17 @@ def predicate(ctx):
             raise dev_only
     return commands.check(predicate)
 
+def is_support():
+    def predicate(ctx):
+        if ctx.author.id in config.support_ids or ctx.author.id in config.dev_ids or ctx.author.id == int(config.owner_id):
+            return True
+        else:
+            raise support_only
+    return commands.check(predicate)
+
 def is_nsfw_channel():
     def predicate(ctx):
-        if ctx.channel.is_nsfw():
+        if not isinstance(ctx.channel, discord.DMChannel) and ctx.channel.is_nsfw():
             return True
         else:
             raise not_nsfw_channel

utils/config.py

@@ -11,6 +11,7 @@ class Defaults:
     owner_id = None
     command_prefix = "*"
     dev_ids = []
+    support_ids = []
     skip_votes_needed = 3
     channel_logger_id = None
     debug = False
@@ -55,6 +56,7 @@ def __init__(self):
         self.command_prefix = config.get("Bot", "Command_Prefix", fallback=Defaults.command_prefix)
         self.max_nsfw_count = config.getint("Bot", "Max_NSFW_Count", fallback=Defaults.max_nsfw_count)
         self.dev_ids = config.get("Bot", "Developer_IDs", fallback=Defaults.dev_ids)
+        self.support_ids = config.get("Bot", "Support_IDs", fallback=Defaults.support_ids)
         self.skip_votes_needed = config.getint("Bot", "Skip_Votes_Needed", fallback=Defaults.skip_votes_needed)
         self.lock_status = config.getboolean("Status", "Lock_Status", fallback=Defaults.lock_status)
         self.enable_default_status = config.getboolean("Status", "Enable_Default_Status", fallback=Defaults.enable_default_status)
@@ -91,6 +93,16 @@ def check(self):
                 log.warning("Developer IDs are invalid, all developer IDs have been ignored!")
                 self.dev_ids = Defaults.dev_ids
 
+        if len(self.support_ids) is not 0:
+            try:
+                ids = self.support_ids.split()
+                self.support_ids = []
+                for id in ids:
+                    self.support_ids.append(int(id))
+            except:
+                log.warning("Support IDs are invalid, all support member IDs have been ignored!")
+                self.support_ids = Defaults.support_ids
+
         if self.enableMal:
             if not self._malUsername and not self._malPassword:
                 log.critical("The MyAnimeList module was enabled, but no MAL credinals were specified!")