🩹 Prism 1.3 Patch 🩹

assets/prism.py

@@ -118,6 +118,10 @@ async def error_handler(ctx, error):
 
         pass
 
+    elif "NoSuchUser" in str(error):
+
+      return
+
     await ctx.send(embed = discord.Embed(title = "Unexpected Error", description = "The command you just used generated an unexpected error.\nPrism has sent an automatic bug report about this problem.\n\nIn the meantime, try some of our other commands. :)", color = 0xFF0000))
 
     base = ctx.message.content.split(" ")[0] if " " in ctx.message.content else ctx.message.content
@@ -408,7 +412,7 @@ def bought(name, amount):
 
     return embed
 
-  def getClosestUser(ctx, user, return_member = False):
+  async def getClosestUser(ctx, user, return_member = False):
 
     if ctx.author.id == user.id:
 
@@ -460,7 +464,9 @@ def getClosestUser(ctx, user, return_member = False):
 
     if not matches:
 
-      return await ctx.send(embed = Tools.error("Couldn't find that user."))
+      await ctx.send(embed = Tools.error("Couldn't find that user."))
+
+      raise AttributeError("NoSuchUser")
 
     id = int(max(matches.items(), key = itemgetter(1))[0])
 

commands/currency/balance.py

@@ -20,19 +20,11 @@ async def balance(self, ctx, user: str = None):
 
         db = loads(open("db/users", "r").read())
 
-        if not user:
-
-            user = ctx.author.name + "#" + str(ctx.author.discriminator)
-
-        user = Tools.getClosestUser(ctx, user)
-
-        if not user:
-
-            return await ctx.send(embed = Tools.error(f"I couldn't find that user; try again with more letters."))
+        user = await Tools.getClosestUser(ctx, user if user else ctx.author)
 
-        elif not str(user.id) in db:
+        if not str(user.id) in db:
 
-            return await ctx.send(embed = Tools.error(f"{user.name} doesn't have an account."))
+            return await ctx.send(embed = Tools.error(f"{user.name} doesn't have a Prism account."))
 
         _user = db[str(user.id)]
 

commands/currency/bank.py

@@ -1,5 +1,3 @@
-# Prism Rewrite - Basic Command
-
 # Modules
 import discord
 from json import loads, dumps

commands/currency/beg.py

@@ -34,11 +34,7 @@ async def beg(self, ctx, member: str = None):
 
         if member:
 
-            member = Tools.getClosestUser(ctx, member)
-
-            if not member:
-
-                return await ctx.send(embed = Tools.error(f"I couldn't find that user; try again with more letters."))
+            member = await Tools.getClosestUser(ctx, member)
 
             user = member.name
 

commands/currency/bet.py

@@ -1,5 +1,3 @@
-# Prism Rewrite - Basic Command
-
 # Modules
 import discord
 from random import randint

commands/currency/buy.py

@@ -1,5 +1,3 @@
-# Prism Rewrite - Basic Command
-
 # Modules
 from asyncio import sleep
 from json import loads, dumps

commands/currency/daily.py

@@ -1,5 +1,3 @@
-# Prism Rewrite - Basic Command
-
 # Modules
 import discord
 from json import loads, dumps

commands/currency/deposit.py

@@ -1,5 +1,3 @@
-# Prism Rewrite - Basic Command
-
 # Modules
 import discord
 from json import loads, dumps

commands/currency/inventory.py

@@ -18,16 +18,7 @@ def __init__(self, bot):
     @commands.command(aliases = ["inv"])
     async def inventory(self, ctx, user = None):
 
-        if not user:
-
-            user = ctx.author.name + "#" + str(ctx.author.discriminator)
-
-        user = Tools.getClosestUser(ctx, user)
-
-        if not user:
-
-            return await ctx.send(embed = Tools.error(f"I couldn't find that user; try again with more letters."))
-
+        user = await Tools.getClosestUser(ctx, user if user else ctx.author)
 
         db = loads(open("db/users", "r").read())
 

commands/currency/lottery.py

@@ -1,5 +1,3 @@
-# Prism Rewrite - Basic Command
-
 # Modules
 import discord
 from random import randint

commands/currency/pay.py

@@ -28,11 +28,7 @@ async def pay(self, ctx, user = None, amount = None):
 
     user = Tools.getClosestUser(ctx, user)
 
-    if not user:
-
-      return await ctx.send(embed = Tools.error(f"I couldn't find that user; try again with more letters."))
-
-    elif user.id == ctx.author.id:
+    if user.id == ctx.author.id:
 
       return await ctx.send(embed = Tools.error("No paying yourself. >:C"))
 

commands/currency/premium.py

@@ -16,7 +16,7 @@ def __init__(self, bot):
         self.usage = "premium"
 
     @commands.command(aliases = ["upgrade"])
-    async def premium(self, ctx, *, sentence: str = None):
+    async def premium(self, ctx):
 
         db = loads(open("db/users", "r").read())
 

commands/currency/rob.py

@@ -1,5 +1,3 @@
-# Prism Rewrite - Basic Command
-
 # Modules
 import random
 import discord
@@ -28,13 +26,9 @@ async def rob(self, ctx, user = None):
 
             return await ctx.send(embed = Tools.error("Please specify somebody to rob."))
 
-        user = Tools.getClosestUser(ctx, user)
-
-        if not user:
-
-            return await ctx.send(embed = Tools.error(f"I couldn't find that user; try again with more letters."))
+        user = await Tools.getClosestUser(ctx, user)
 
-        elif user.id == ctx.author.id:
+        if user.id == ctx.author.id:
 
             return await ctx.send(embed = Tools.error("Stop trying to rob yourself."))
 

commands/currency/shop.py

@@ -1,5 +1,3 @@
-# Prism Rewrite - Basic Command
-
 # Modules
 import discord
 from json import loads

commands/currency/sock.py

@@ -1,5 +1,3 @@
-# Prism Rewrite - Basic Command
-
 # Modules
 import discord
 from random import randint
@@ -18,22 +16,18 @@ def __init__(self, bot):
     self.usage = "sock [user]"
 
   @commands.command()
-  async def sock(self, ctx, user: str = None):
+  async def sock(self, ctx, user = None):
 
     if Cooldowns.on_cooldown(ctx, "sock"):
 
       return await ctx.send(embed = Cooldowns.cooldown_text(ctx, "sock"))
 
     elif not user:
 
-      return await ctx.send(embed = Tools.error("I need to know who your trying to sock."))
+      return await ctx.send(embed = Tools.error("No user specified to sock."))
 
     user = Tools.getClosestUser(ctx, user)
 
-    if not user:
-
-      return await ctx.send(embed = Tools.error(f"I couldn't find that user; try again with more letters."))
-
     db = loads(open("db/users", "r").read())
 
     if user.id == ctx.author.id:

commands/currency/withdraw.py

@@ -1,5 +1,3 @@
-# Prism Rewrite - Basic Command
-
 # Modules
 import discord
 from json import loads, dumps

commands/currency/work.py

@@ -1,5 +1,3 @@
-# Prism Rewrite - Basic Command
-
 # Modules
 import discord
 from json import loads, dumps

commands/entertainment/sue.py

@@ -1,5 +1,3 @@
-# Prism Rewrite - Basic Command
-
 # Modules
 import discord
 from random import randint

commands/entertainment/sun.py

@@ -1,5 +1,3 @@
-# Prism Rewrite - Basic Command
-
 # Modules
 import discord
 from random import choice

commands/entertainment/trigger.py

@@ -1,5 +1,3 @@
-# Prism Rewrite - Basic Command
-
 # Modules
 import discord
 from json import loads, dumps

commands/entertainment/tts.py

@@ -1,6 +1,5 @@
-# Prism Rewrite - Basic Command
-
 # Modules
+from assets.prism import Tools
 from discord.ext import commands
 
 # Main Command Class
@@ -10,22 +9,21 @@ def __init__(self, bot):
         self.bot = bot
         self.desc = "Make the bot speak"
         self.usage = "tts [text]"
-        self.tags = []
 
     @commands.command(aliases = ["text2speech", "texttospeech", "speak", "speech"])
     async def tts(self, ctx, *, sentence: str = None):
 
         if not sentence:
 
-            return await ctx.send("I can't speak if you don't give me anything to say. >:C")
+            return await ctx.send(embed = Tools.error("No text specified."))
 
         try:
 
             return await ctx.send(sentence, tts = True)
 
         except:
 
-            return await ctx.send("I don't have permission to send TTS messages.")
+            return await ctx.send(embed = Tools.error("Missing permissions to send TTS messages."))
 
 # Link to bot
 def setup(bot):

commands/entertainment/unicorn.py

@@ -1,5 +1,3 @@
-# Prism Rewrite - Basic Command
-
 # Modules
 import discord
 from json import loads

commands/entertainment/use.py

@@ -1,5 +1,3 @@
-# Prism Rewrite - Basic Command
-
 # Modules
 import discord
 from random import randint
@@ -24,59 +22,7 @@ async def use(self, ctx, item: str = None):
 
             return await ctx.send(embed = Tools.error("No item specified to use."))
 
-        return await ctx.send("wip")
-
-        user = Tools.getClosestUser(ctx, user)
-
-        if not user:
-
-            return await ctx.send(embed = Tools.error("Yea I don't think that's an actual person."))
-
-        db = loads(open("db/users", "r").read())
-
-        _user = db[str(ctx.author.id)]
-
-        __user = db[str(user.id)]
-
-        inventory = _user["data"]["inventory"]
-
-        if not "Hotdog" in inventory:
-
-            return await ctx.send(embed = Tools.error("You don't have any hotdogs! Buy some with the ``shop`` command."))
-
-        inventory["Hotdog"]["count"] -= 1
-
-        if inventory["Hotdog"]["count"] == 0:
-
-            inventory.pop("Hotdog")
-
-        if randint(1, 2) == 1:
-
-            amt = randint(100, 1000)
-
-            _user["balance"] += amt
-
-            __user["balance"] -= amt
-
-        else:
-
-            amt = None
-
-        open("db/users", "w").write(dumps(db, indent = 4))
-
-        if amt:
-
-            embed = discord.Embed(title = f"You just threw your hotdog at {user.name}!", description = f"They dropped {amt} coins!", color = 0x126bf1)
-
-        else:
-
-            embed = discord.Embed(title = "Woops! Your hotdog missed! oh no :(", color = 0x126bf1)
-
-        embed.set_author(name = " | Hotdog", icon_url = self.bot.user.avatar_url)
-
-        embed.set_footer(text = f" | Requested by {ctx.author}.", icon_url = ctx.author.avatar_url)
-
-        return await ctx.send(embed = embed)
+        return await ctx.send(embed = Tools.error("This command is coming in `v1.4`."))
 
 # Link to bot
 def setup(bot):

commands/entertainment/weirdtext.py

@@ -1,5 +1,3 @@
-# Prism Rewrite - Basic Command
-
 # Modules
 import random
 

commands/misc/bio.py

@@ -1,5 +1,3 @@
-# Prism Rewrite - Basic Command
-
 # Modules
 import json
 import discord
@@ -24,7 +22,7 @@ async def biography(self, ctx, *, bio: str = None):
 
         elif len(bio) > 200:
 
-            return await ctx.send(embed = Tools.error("Your biography is way too long."))
+            return await ctx.send(embed = Tools.error("You're biography is way too long."))
 
         db = json.loads(open("db/users", "r").read())