Prism 1.4 Hotfix

Author: Benjamin O'Brien

.gitignore

@@ -1,5 +1,5 @@
 # Rid of the pycache
-__pycache__
+__pycache__/
 
 # HIDE THE .ENV AAAAAAAAA
 .env

assets/effects.py

@@ -0,0 +1,38 @@
+# Modules
+from json import loads, dumps
+
+# Master effect class
+class Effects(object):
+
+    def __init__(self, id):
+
+        self.id = str(id)
+
+        self.db = loads(open("db/users", "r").read())
+        self.data = self.db[self.id]["data"]
+        
+        self.effects = self.data["effects"]
+
+        self.refresh_data()
+
+    def __len__(self):
+
+        return len(self.effects)
+
+    def refresh_data(self):
+
+        self.db = loads(open("db/users", "r").read())
+
+        self.data = self.db[self.id]["data"]
+
+    def dump_data(self):
+
+        open("db/users", "w").write(dumps(self.db, indent = 4))
+
+    def add_effect(self, name, duration):
+
+        refresh_data()
+
+        self.data["effects"][name] = duration
+
+        dump_data()

assets/prism.py

@@ -98,7 +98,7 @@ def on_ready():
 
   async def error_handler(ctx, error):
 
-    if ctx.guild.id in [264445053596991498]:
+    if ctx.guild and ctx.guild.id in [264445053596991498]:
 
       return
 
@@ -149,14 +149,38 @@ async def on_message(message):
     if user.bot:
 
       return
+
+    elif not message.guild:
+
+      command = message.content.lower()
+
+      if not command.startswith("p!"):
+
+        return
+
+      command = command[2:]
+
+      if " " in command:
+
+        command = command.split(" ")[0]
+
+      if not command in ["ping", "help", "uptime", "invite", "stats", "vote", "eval", "load", "reload"]:
+
+        return await ctx.send(embed = Tools.error("That command can only be used in a guild."))
+
+      return True
 
     try:
 
       prefix = gdb[str(message.guild.id)]["prefix"]
 
     except:
 
-      return
+      gdb[str(message.guild.id)] = Constants.guild_preset
+
+      prefix = "p!"
+
+      open("db/guilds", "w").write(dumps(gdb, indent = 4))
 
     if message.content in gdb[str(message.guild.id)]["data"]["triggers"]:
 
@@ -182,7 +206,13 @@ async def on_message(message):
 
         if "levels-enabled" in gdb[str(message.guild.id)]["tags"]:
 
-          await ctx.send(f"> Congratulations, {message.author.mention}! You advanced to level {current_level + 1} :tada:\n> (you can disable these by using ``{prefix}settings levels off``)")
+          try:
+
+            await ctx.send(f"> Congratulations, {message.author.mention}! You advanced to level {current_level + 1} :tada:\n> (you can disable these by using ``{prefix}settings levels off``)")
+
+          except:
+
+            pass
 
       else:
 
@@ -318,6 +348,10 @@ def message_delete(message):
 
       return
 
+    elif not message.guild:
+
+      return
+
     db = loads(open("db/guilds", "r").read())
 
     if len(db[str(message.guild.id)]["data"]["deleted_messages"]) == 5:
@@ -359,7 +393,13 @@ def ensure_command(gdb, msg):
 
   def get_prefix(bot, msg):
 
-    return loads(open("db/guilds", "r").read())[str(msg.guild.id)]["prefix"]
+    db = loads(open("db/guilds", "r").read())
+
+    if not msg.guild:
+      
+      return "p!"
+
+    return db[str(msg.guild.id)]["prefix"]
 
   def uppercase(text):
 
@@ -514,7 +554,8 @@ class Constants:
       "commands": {
         "sent": 0,
         "used": {}
-      }
+      },
+      "effects": {}
     }
   }
 

commands/currency/work.py

@@ -1,9 +1,9 @@
 # Modules
 import discord
-from json import loads, dumps
+from random import randint
 
+from json import loads, dumps
 from discord.ext import commands
-from random import randint, choice
 
 from assets.prism import Tools, Constants, Cooldowns
 
@@ -12,48 +12,23 @@ class Work(commands.Cog):
 
     def __init__(self, bot):
         self.bot = bot
-        self.desc = "Work for some hard, cold cash"
+        self.desc = "Work for some coins"
         self.usage = "work"
 
-        self.problems = [
-            {
-                "equation": "5 + 5",
-                "answer": "10"
-            },
-            {
-                "equation": "16 + 5",
-                "answer": "21"
-            },
-            {
-                "equation": "9 + 10",
-                "answer": "19"
-            },
-            {
-                "equation": "(5 + 5) / 2",
-                "answer": "5"
-            },
-            {
-                "equation": "5x - 5 = 10; what is x?",
-                "answer": "3"
-            },
-            {
-                "equation": "((9 x 9) - 1 + 20) / 100",
-                "answer": "1"
-            }
-        ]
-
     @commands.command()
     async def work(self, ctx):
 
         if Cooldowns.on_cooldown(ctx, "work"):
 
             return await ctx.send(embed = Cooldowns.cooldown_text(ctx, "work"))
-
-        failed_earn = randint(20, 80)
-        
-        problem = choice(self.problems)
 
-        bot_msg = await ctx.send(f"You are now working; solve the equation: `{problem['equation']}`.")
+        n1 = randint(1, 100)
+
+        n2 = randint(1, 100)
+
+        answer = n1 + n2
+
+        bot_msg = await ctx.send(f"You are now working; solve the equation: `{n1} + {n2}`.")
 
         db = loads(open("db/users", "r").read())
 
@@ -66,12 +41,14 @@ def check(m):
             message = await self.bot.wait_for("message", check = check, timeout = 5)
 
         except:
-            
-            db[str(ctx.author.id)]["balance"] += failed_earn
+
+            earnings = randint(20, 100)
+
+            db[str(ctx.author.id)]["balance"] += earnings
 
             open("db/users", "w").write(dumps(db, indent = 4))
 
-            return await ctx.send(embed = Tools.error(f"You didn't respond fast enough; but you still earned {failed_earn} coins."))
+            return await ctx.send(embed = Tools.error(f"You didn't respond fast enough; but you still earned {earnings} coins."))
 
         try:
 
@@ -81,23 +58,25 @@ def check(m):
 
             pass
 
-        if not message.content.lower() == problem["answer"]:
+        if not message.content.lower() == str(answer):
 
-            db[str(ctx.author.id)]["balance"] += failed_earn
+            earnings = randint(20, 100)
+
+            db[str(ctx.author.id)]["balance"] += earnings
 
             open("db/users", "w").write(dumps(db, indent = 4))
 
-            await ctx.send(embed = Tools.error(f"You messed up at work; but you still earned {failed_earn} coins."))
+            await ctx.send(embed = Tools.error(f"You messed up at work; but you still earned {earnings} coins."))
 
             return await Cooldowns.set_cooldown(ctx, "work", 600)
 
-        good_earnings = randint(200, 450)
+        reward = randint(200, 450)
 
-        db[str(ctx.author.id)]["balance"] += good_earnings
+        db[str(ctx.author.id)]["balance"] += reward
 
         open("db/users", "w").write(dumps(db, indent = 4))
 
-        embed = discord.Embed(title = f"Good job, you went to work and earned {good_earnings} coins.", color = 0x126bf1)
+        embed = discord.Embed(title = f"Good job, you went to work and earned {reward} coins.", color = 0x126bf1)
 
         embed.set_author(name = " | Work", icon_url = self.bot.user.avatar_url)
 

commands/entertainment/effects.py

@@ -0,0 +1,27 @@
+# Modules
+from assets.prism import Tools
+from discord.ext import commands
+from assets.effects import Effects as Eff
+
+# Main Command Class
+class Effects(commands.Cog):
+
+  def __init__(self, bot):
+    self.bot = bot
+    self.desc = "Checks out your effects"
+    self.usage = "effects"
+
+  @commands.command()
+  async def effects(self, ctx):
+    
+    effects = Eff(ctx.author.id)
+
+    if not len(effects):
+
+      return await ctx.send(embed = Tools.error("You don't have any effects."))
+
+    return await ctx.send(str(effects))
+
+# Link to bot
+def setup(bot):
+  bot.add_cog(Effects(bot))

commands/misc/help.py

@@ -90,10 +90,16 @@ async def embed(self, ctx, cat, prefix, commandClass = None):
 
   @commands.command(aliases = ["info", "commands", "cmds"])
   async def help(self, ctx, *, category = None):
-        
-    db = loads(open("db/guilds", "r").read())
 
-    prefix = db[str(ctx.guild.id)]["prefix"]
+    if ctx.guild:
+
+      db = loads(open("db/guilds", "r").read())
+
+      prefix = db[str(ctx.guild.id)]["prefix"]
+
+    else:
+
+      prefix = "p!"
 
     if not category:
 

commands/misc/vote.py

@@ -1,12 +1,12 @@
 # Modules
-import json
 import discord
-
 import requests
+
+from json import loads
 from asyncio import sleep
 
 from discord.ext import commands
-from assets.prism import Cooldowns
+from assets.prism import Cooldowns, Tools
 
 # Main Command Class
 class Vote(commands.Cog):
@@ -25,7 +25,7 @@ async def vote(self, ctx):
 
             return await ctx.send(embed = Cooldowns.cooldown_text(ctx, "vote"))
 
-        bot_data = json.loads(requests.get("https://top.gg/api/bots/685550504276787200", headers = {"Authorization": self.token}).text)
+        bot_data = loads(requests.get("https://top.gg/api/bots/685550504276787200", headers = {"Authorization": self.token}).text)
 
         base_upvotes = bot_data["points"]
 
@@ -51,13 +51,13 @@ def check(m):
 
         while failed_attempts < 16:
 
-            bot_data = json.loads(requests.get("https://top.gg/api/bots/685550504276787200", headers = {"Authorization": self.token}).text)
+            bot_data = loads(requests.get("https://top.gg/api/bots/685550504276787200", headers = {"Authorization": self.token}).text)
 
             current_upvotes = bot_data["points"]
 
             if current_upvotes > base_upvotes:
 
-                db = json.loads(open("db/users", "r").read())
+                db = loads(open("db/users", "r").read())
 
                 db[str(ctx.author.id)]["balance"] = db[str(ctx.author.id)]["balance"] + 2750
 
@@ -85,6 +85,12 @@ def check(m):
 
                     pass
 
+                if Tools.has_flag(db, ctx.author, "premium"):
+
+                    await Cooldowns.set_cooldown(ctx, "vote", 86400)
+
+                    break
+
                 await Cooldowns.set_cooldown(ctx, "vote", 43200)
 
                 break