🧰 Prism 1.4 Hotfix 3 🧰

Author: Benjamin O'Brien

.gitignore

@@ -5,8 +5,12 @@ __pycache__/
 .env
 
 # Please dont track the dbs plz :)
+# being removed soon
 users
 guilds
 
+# still a wip
+prism.db
+
 # Developer stuff
 .vscode/

commands/currency/rob.py

@@ -1,10 +1,10 @@
 # Modules
-import random
 import discord
+from random import randint
 
 from json import loads, dumps
-
 from discord.ext import commands
+
 from assets.prism import Cooldowns, Tools
 
 # Main Command Class
@@ -37,98 +37,42 @@ async def rob(self, ctx, user = None):
             return await ctx.send(embed = Tools.error("Stop trying to rob me."))
 
         db = loads(open("db/users", "r").read())
-        
+
         if not str(user.id) in db:
-            
+
             return await ctx.send(embed = Tools.error(f"{user.name} doesn't have an account."))
-        
-        victim = db[str(user.id)]
-        
-        author = db[str(ctx.author.id)]
-        
-        if victim["balance"] < 100:
-          
-          return await ctx.send(embed = Tools.error(f"{user.name} doesn't even have 100 coins."))
-        
-        elif Tools.has_flag(db, user, "protected"):
-          
-          return await ctx.send(embed = Tools.error(f"{user.name} has a Bank Lock active."))
 
-        if random.randint(1, 3) == 1:
-            
-            fine = random.randint(75, 310)
-            
-            author["balance"] -= fine
-            
-            open("db/users", "w").write(dumps(db, indent = 4))
-            
-            await ctx.send(embed = Tools.error(f"You got busted and were fined {fine} coins."))
+        elif db[str(user.id)]["balance"] < 500:
 
-            return await Cooldowns.set_cooldown(ctx, "rob", 3600)
-        
-        number = random.randint(1, 5)
-        
-        if number == 1:
-            
-            author["balance"] += victim["balance"]
-                
-            bal = victim["balance"]
+            return await ctx.send(embed = Tools.error(f"Bruh, {user.name} is poor."))
 
-            victim["balance"] = 0
+        elif db[str(ctx.author.id)]["balance"] < 300:
 
-            embed = discord.Embed(title = f"You just robbed {user.name} for {bal} coins and made them go broke.", color = 0x126bf1)
-            
-            embed.set_author(name = " | Rob", icon_url = self.bot.user.avatar_url)
-            
-            embed.set_footer(text = f" | Robbed by {ctx.author}.", icon_url = ctx.author.avatar_url)
-        
-        elif number in range(2, 4):
-            
-            author["balance"] += round((victim["balance"] / 3) * 2)
+            return await ctx.send(embed = Tools.error("You need at least 300 coins to rob someone."))
 
-            bal = victim["balance"]
+        elif randint(0, 1):
 
-            victim["balance"] -= round((victim["balance"] / 3) * 2)
-                
-            embed = discord.Embed(title = f"You just robbed {user.name} for {round((bal / 3) * 2)} coins.", color = 0x126bf1)
-            
-            embed.set_author(name = " | Rob", icon_url = self.bot.user.avatar_url)
-            
-            embed.set_footer(text = f" | Robbed by {ctx.author}.", icon_url = ctx.author.avatar_url)
+            # user wins
+            earn = randint(250, round(db[str(user.id)]["balance"] / 2))
 
-        else:
-            
-            author["balance"] += round(victim["balance"] / 3)
+            db[str(user.id)]["balance"] -= earn
 
-            bal = victim["balance"]
+            db[str(ctx.author.id)]["balance"] += earn
 
-            victim["balance"] -= round(victim["balance"] / 3)
-                
-            embed = discord.Embed(title = f"You just robbed {user.name} for {round(bal / 3)} coins.", color = 0x126bf1)
-            
-            embed.set_author(name = " | Rob", icon_url = self.bot.user.avatar_url)
-            
-            embed.set_footer(text = f" | Robbed by {ctx.author}.", icon_url = ctx.author.avatar_url)
+            embed = discord.Embed(title = "Nice :ok_hand:", description = f"You just robbed {user.name} and earned `{earn}` coins.", color = 0x126bf1)
 
-        try:
+        else:
 
-            await ctx.send(embed = embed)
-        
-        except:
+            # caught
+            fee = randint(300, round(db[str(ctx.author.id)]["balance"] / 2))
 
-            if number == 1:
+            db[str(ctx.author.id)]["balance"] -= fee
 
-                embed = discord.Embed(title = f"You just robbed {user.name} for their whole wallet.", color = 0x126bf1)
-            
-            else:
+            embed = discord.Embed(title = "L O L", description = f"You failed miserably at robbing {user.name} and got caught!!!111\nYou paid `{fee}` coins as a fee.", color = 0xFF0000)
 
-                embed = discord.Embed(title = f"You just robbed {user.name} for ∞ coins.", color = 0x126bf1)
-            
-            embed.set_author(name = " | Rob", icon_url = self.bot.user.avatar_url)
-            
-            embed.set_footer(text = f" | Robbed by {ctx.author}.", icon_url = ctx.author.avatar_url)
+        embed.set_author(name = " | Rob", icon_url = self.bot.user.avatar_url)
 
-            await ctx.send(embed = embed)
+        embed.set_footer(text = " | Requested by {ctx.author}.", icon_url = ctx.author.avatar_url)
 
         open("db/users", "w").write(dumps(db, indent = 4))
 

commands/music/play.py

@@ -34,7 +34,7 @@ async def play(self, ctx, url: str = None):
 
             except:
 
-                return await ctx.send(embed = Tools.error("Missing permission(s) to join you're voice channel."))
+                return await ctx.send(embed = Tools.error("Missing permission(s) to join your voice channel."))
 
         with youtube_dl.YoutubeDL({}) as ytdl:
 

core/__init__.py

@@ -0,0 +1,2 @@
+# Imports
+from .database import Users, Guilds, setup

core/database.py

@@ -0,0 +1,90 @@
+# Modules
+import sqlite3
+
+# Classes
+class User():
+
+    def __init__(self, resp, user):
+        self.balance = resp[1]
+        self.level = resp[2]
+        self.experience = resp[3]
+        self.user = user
+        self.has_acc = True if self.user else False
+
+# SQLite Functions
+def sql_identifier(s):
+
+  return "\"" + s.replace("\"", "\"\"") + "\""
+
+def get_key(cursor, table, user, key):
+
+    cursor.execute(f"SELECT * FROM {table} WHERE id=?", (user.id,))
+    
+    item = cursor.fetchone()
+
+    return User(item if item else None, user)
+
+# Classes
+class Users():
+
+  def __init__(self):
+
+    self.conn = sqlite3.connect("prism.db")
+    self.cursor = self.conn.cursor()
+
+  def get_user(self, user):
+
+    return get_key(self.cursor, "users", user)
+
+  def setup_user(self, id):
+
+    self.cursor.execute("INSERT INTO users VALUES (?,?,?,?)", (id, 250, 1, 0))
+
+  def save(self):
+
+    self.conn.commit()
+
+    self.conn.close()
+
+class Guilds():
+
+  def __init__(self):
+
+    self.conn = sqlite3.connect("prism.db")
+    self.cursor = self.conn.cursor()
+
+  def get_guild(self, id, key = None):
+
+    return get_key(self.cursor, "guilds", id, key)
+
+  def setup_guild(self, id):
+
+    self.cursor.execute("INSERT INTO guilds VALUES (?,?)", (id, "p!"))
+
+  def save(self):
+
+    self.conn.commit()
+
+    self.conn.close()
+
+# Setup function
+def setup():
+
+  print("Setting up database..")
+
+  db = sqlite3.connect("prism.db")
+  cur = db.cursor()
+
+  print("[db]: Created database file.")
+
+  cur.execute("CREATE TABLE users (id bigint, balance int, level int, xp int)")
+
+  cur.execute("CREATE TABLE guilds (id bigint, prefix text)")
+
+  print("[db]: Tables created.")
+
+  db.commit()
+
+  db.close()
+
+  print("[db]: Database saved.")