🎆 Prism 1.4 Preparation 🎆

Author: Benjamin O'Brien

commands/entertainment/avatar.py

@@ -1,7 +1,8 @@
 # Modules
 import discord
-from assets.prism import Tools
+from random import choice
 
+from assets.prism import Tools
 from discord.ext import commands
 
 # Main Command Class
@@ -21,7 +22,7 @@ def __init__(self, bot):
   @commands.command(aliases = ["pfp", "picture"])
   async def avatar(self, ctx, *, user: str = None):
 
-    user = Tools.getClosestUser(ctx, user if user else ctx.author)
+    user = await Tools.getClosestUser(ctx, user if user else ctx.author)
 
     embed = discord.Embed(title = choice(self.options).format(user.name), color = 0x126bf1)
 

commands/entertainment/dictionary.py

@@ -42,6 +42,16 @@ async def dictionary(self, ctx, *, word = None):
 
             return await ctx.send(embed = Tools.error("That word/phrase is too long."))
 
+        elif word.lower() == "commuter":
+
+            embed = discord.Embed(title = word, description = f"[Commuter] is a person that likes to play [beamng.drive]. His catchphrase is [idiot] although he has multiple other [phrases] that he says often. He likes playing around with [Prism] and talking about corn. He plays Roblox games and stuff, he is [super duper insanely] smart when it comes to learning Python.", color = 0x126bf1)
+
+            embed.set_author(name = " | Dictionary", 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)
+
         request = get(f"https://api.urbandictionary.com/v0/define?term={word.lower()}", headers = {"content-type": "application/json"}).text
 
         if not request:

commands/entertainment/gay.py

@@ -30,7 +30,7 @@ async def gay(self, ctx, user: str = None):
 
           return await ctx.send(embed = Tools.error("NSFW is not enabled in this channel."))
 
-        user = Tools.getClosestUser(ctx, user if user else ctx.author)
+        user = await Tools.getClosestUser(ctx, user if user else ctx.author)
 
         rating = randint(0, 100)
 

commands/entertainment/lesbian.py

@@ -30,7 +30,7 @@ async def lesbian(self, ctx, user: str = None):
 
           return await ctx.send(embed = Tools.error("NSFW is not enabled in this channel."))
 
-        user = Tools.getClosestUser(ctx, user if user else ctx.author)
+        user = await Tools.getClosestUser(ctx, user if user else ctx.author)
 
         rating = randint(0, 100)
 

commands/misc/stats.py

@@ -35,93 +35,81 @@ def scale_size(self, bytes, suffix = "B"):
       bytes /= factor
 
   @commands.command(aliases = ["statistics", "bot"])
-  async def stats(self, ctx, *, etc: str = None):
+  async def stats(self, ctx):
 
-    orig_time = time.time()
+    percore_usage = ""
 
-    command_count = 0
+    for i, percentage in enumerate(psutil.cpu_percent(percpu = True, interval = 1)):
 
-    for folder in os.listdir("commands"):
+      percore_usage = f"{percore_usage}\tCore #{i + 1}: {percentage}%\n"
 
-      for file in os.listdir(f"commands/{folder}"):
+    bt = datetime.fromtimestamp(psutil.boot_time()).strftime("%D %I:%M %p")
 
-        if file != "__pycache__":
+    uname = platform.uname()
 
-          command_count += 1
+    svmem = psutil.virtual_memory()
 
-    bot = f"""
-      Server Count: {len(self.bot.guilds)}
-      User Count: {len(self.bot.users)}
-      Command Count: {command_count}
-      Bot Latency: {str(time.time() - orig_time).split(".")[1][:2]}ms
-      Staff Member(s):
-        - <@633185043774177280> (Developer)
-        - <@666839157502378014> (Management)
-    """
+    cpufreq = psutil.cpu_freq()
 
-    other = f"""
-      Python Version: {str(sys.version).split(" ")[0]}
-      Discord.py Version: {discord.__version__}
-      API Latency: {round(self.bot.latency * 1000)}ms
+    embed = discord.Embed(title = "Prism Statistics", color = 0x126bf1)
 
-      Last updated: {str(datetime.now()).split(" ")[0]}
-    """
+    embed.add_field(
+      name = "Bot Information",
+      value = f"""```
+        Guild Count: {len(self.bot.guilds)}
+        Member Count: {len(self.bot.users)}
+        Command Count: {len(self.bot.commands)}
 
-    embed = discord.Embed(color = 0x126bf1)
+        Latency: {round(self.bot.latency * 1000)}ms
 
-    embed.add_field(name = "Bot Information", value = bot, inline = False)
+        Staff Member(s):
+          - iiPython#0768 (Developer)
+          - Commuter#4083 (Management)```
+      """.replace("  ", ""),
+      inline = False
+    )
 
-    if etc and etc.lower() == "all":
+    embed.add_field(
+      name = "System Information",
+      value = f"""```
+        Running {uname.system} v{uname.version} ({uname.machine})
+        Lastest Boot: {bt}```
+      """.replace("  ", ""),
+      inline = False
+    )
 
-      percore_usage = ""
+    embed.add_field(
+      name = "Processor Information",
+      value = f"""```
+        Physical: {psutil.cpu_count(logical = False)} | Total: {psutil.cpu_count(logical = True)}
+        Frequency: {cpufreq.current:.2f}Mhz
 
-      for i, percentage in enumerate(psutil.cpu_percent(percpu = True, interval = 1)):
-
-        percore_usage = f"{percore_usage}Core {i + 1}: {percentage}%\n"
-
-      svmem = psutil.virtual_memory()
-
-      cpufreq = psutil.cpu_freq()
-
-      boot_time_timestamp = psutil.boot_time()
-
-      bt = datetime.fromtimestamp(boot_time_timestamp)
-
-      uname = platform.uname()
-
-      system = f"""
-        System: {uname.system}
-        Node Name: {uname.node}
-        Release: {uname.release}
-        Version: {uname.version}
-        Machine: {uname.machine}
-        Boot Time: {bt.year}/{bt.month}/{bt.day} {bt.hour}:{bt.minute}:{bt.second}
-      """
-
-      processor = f"""
-        Physical Cores: {psutil.cpu_count(logical = False)}
-        Total Cores: {psutil.cpu_count(logical = True)}
-        Current Frequency: {cpufreq.current:.2f}Mhz
-
-        CPU Usage (per core):
+        Core Usage:
         {percore_usage}
-        Total CPU Usage: {psutil.cpu_percent()}%
-      """
-
-      memory = f"""
-        Total: {self.scale_size(svmem.total)}
-        Available: {self.scale_size(svmem.available)}
-        Used: {self.scale_size(svmem.used)}
-        Percentage: {svmem.percent}%
-      """
-
-      embed.add_field(name = "System Information", value = system, inline = False)
-
-      embed.add_field(name = "Processor Information", value = processor, inline = False)
-
-      embed.add_field(name = "Memory Information", value = memory, inline = False)
-
-    embed.add_field(name = "Other Information", value = other, inline = False)
+        CPU Usage: {psutil.cpu_percent()}%```
+      """.replace("  ", ""),
+      inline = False
+    )
+
+    embed.add_field(
+      name = "RAM Information",
+      value = f"""```
+        Total: {self.scale_size(svmem.total)} | Free: {self.scale_size(svmem.available)}
+        Used: {self.scale_size(svmem.used)} | Percentage: {svmem.percent}%```
+      """.replace("  ", ""),
+      inline = False
+    )
+
+    embed.add_field(
+      name = "Other Information",
+      value = f"""```
+        Python Version: {str(sys.version).split(" ")[0]}
+        Discord.py Version: {discord.__version__}
+
+        Time requested: {datetime.now().strftime("%D %I:%M:%S %p")} CST```
+      """.replace("  ", ""),
+      inline = False
+    )
 
     embed.set_author(name = " | Statistics", icon_url = self.bot.user.avatar_url)