🩹 Prism 1.3 Patch 🩹

Author: Benjamin O'Brien

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])
 

assets/res/plain-text/update.txt

@@ -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/balance.py

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

commands/currency/bank.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/beg.py

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

commands/currency/bet.py

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

commands/currency/buy.py

@@ -1,5 +1,3 @@
-# Prism Rewrite - Basic Command
-
 # Modules
 import discord
 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

@@ -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())