Backend fixing and some command changes

Author: Benjamin O'Brien

.gitignore

@@ -1,16 +1,16 @@
 # Rid of the pycache
 __pycache__/
+*.pyc
 
 # HIDE THE .ENV AAAAAAAAA
 .env
 
 # Please dont track the dbs plz :)
 # being removed soon
-users
-guilds
+db/
 
-# still a wip
-prism.db
+# No need for vs code stuff
+.vscode/
 
 # Developer stuff
 .vscode/

assets/database.py

@@ -0,0 +1,32 @@
+# Modules
+import sqlite3
+
+# Classes
+class Users():
+
+    def __init__(self):
+
+        self.connection = sqlite3.connect("db/users.db")
+        self.cursor = self.connection.cursor()
+
+class Guilds():
+
+    def __init__(self):
+        
+        self.connection = sqlite3.connect("db/guilds.db")
+        self.cursor = self.connection.cursor()
+
+# Setup function
+def setup():
+
+    u = Users()
+    g = Guilds()
+
+    u.cursor.execute("CREATE TABLE users (id int)")
+    g.cursor.execute("CREATE TABLE guilds (id int)")
+
+    u.connection.commit()
+    g.connection.commit()
+
+    u.connection.close()
+    g.connection.close()

assets/effects.py

@@ -0,0 +1,51 @@
+# assets/functions.py
+# Just a bunch of helpful functions that DO NOT require the bot instance.
+
+# Modules
+from os import name, system
+from json import loads, dumps
+
+# Functions
+def clear():
+
+    if name == "nt":
+
+      system("cls")
+
+    elif name == "posix":
+
+      system("clear")
+
+    else:
+
+        raise SystemError("This is an unsupported operating system.")
+
+def server_check(bot):
+
+    constant = loads(open("db/guilds", "r").read())
+
+    data = loads(open("db/guilds", "r").read())
+    
+    for server in constant:
+        
+      if not bot.get_guild(int(server)):
+          
+        data.pop(server)
+            
+    for server in bot.guilds:
+        
+      if not str(server.id) in constant:
+            
+        data[str(server.id)] = Constants.guild_preset
+    
+    open("db/guilds", "w").write(dumps(data, indent = 4))
+
+    data = loads(open("db/users", "r").read())
+
+    for user in data:
+
+      if "protected" in data[user]["data"]["tags"]:
+
+        data[user]["data"]["tags"].remove("protected")
+
+    open("db/users", "w").write(dumps(data, indent = 4))

assets/functions.py

@@ -5,44 +5,53 @@
 from termcolor import colored
 
 # Main class
-class Logging:
+class Logging():
 
-  """
+    """
 
-    Represents the Prism logging system.
-    This allows you to output errors in a more user-friendly format.
+        Represents the Prism logging system.
+        This allows you to output errors in a more user-friendly format.
 
-  """
+    """
 
-  def error(_, e):
+    def __init__(self):
 
-    """
+        self.warnings = 0
+        self.errors = 0
 
-      Prints an error message to the console.
-      By default, in a red message wrapped in "[ERROR]".
+    def error(self, e):
 
-    """
+        """
 
-    return print(colored(f"[ERROR]: {e.split('exception: ')[1]}", "red"))
+        Prints an error message to the console.
+        By default, in a red message wrapped in "[ERROR]".
 
-  def warn(_, e):
+        """
 
-    """
+        self.errors += 1
 
-      Prints an warning message to the console.
-      By default, in a yellow/orange message wrapped in "[WARN]".
+        return print(colored(f"[ERROR]: {e.split('exception: ')[1]}", "red"))
 
-    """
+    def warn(self, e):
 
-    return print(colored(f"[WARN]: {e}", "yellow"))
+        """
 
-  def inform(_, e):
+        Prints an warning message to the console.
+        By default, in a yellow/orange message wrapped in "[WARN]".
 
-    """
+        """
 
-      Prints an informative message to the console.
-      By default, in a green message wrapped in "[INFO]"
+        self.warnings += 1
 
-    """
+        return print(colored(f"[WARN]: {e}", "yellow"))
+
+    def inform(self, e):
+
+        """
+
+        Prints an informative message to the console.
+        By default, in a green message wrapped in "[INFO]"
+
+        """
 
-    return print(colored(f"[INFO]: {e}", "green"))
+        return print(colored(f"[INFO]: {e}", "green"))

assets/logging.py

@@ -4,6 +4,11 @@
 # Last revision on August 25th, 2020.
 
 # Modules
+from .functions import clear, server_check
+
+
+
+
 import discord
 from random import choice
 
@@ -18,83 +23,52 @@
 
 from Levenshtein.StringMatcher import StringMatcher
 
-# Classes
-class BotInstance:
+# Bot creation
+def Bot():
 
-  def create():
+  global log, bot
 
-    global log
-    
-    global bot
+  log = Logging()  # might as well setup logging too
+  
+  bot = commands.Bot(
+    command_prefix = Tools.get_prefix,
+    case_insensitive = True,
+    owner_ids = [
+      633185043774177280,
+      666839157502378014
+    ]
+  )
+  
+  bot.remove_command("help")  # we replace it with our own
 
-    log = Logging()
-    
-    bot = commands.Bot(
-      command_prefix = Tools.get_prefix,
-      case_insensitive = True,
-      owner_ids = [
-        633185043774177280,
-        666839157502378014
-      ]
-    )
-    
-    bot.remove_command("help")
+  return bot
 
-    return bot
-  
+# Classes
 class Events:
 
   def on_ready():
 
-    if name == "nt":
-
-      system("cls")
-
-    else:
-
-      system("clear")
+    # Nice startup message
+    clear()
 
     print(f"Logged in as {bot.user}.")
 
     print(f"-------------{'-' * len(str(bot.user))}-")
 
     print()
-    
-    constant = loads(open("db/guilds", "r").read())
-
-    data = loads(open("db/guilds", "r").read())
-    
-    for server in constant:
-        
-      if not bot.get_guild(int(server)):
-          
-        data.pop(server)
-            
-    for server in bot.guilds:
-        
-      if not str(server.id) in constant:
-            
-        data[str(server.id)] = Constants.guild_preset
-    
-    open("db/guilds", "w").write(dumps(data, indent = 4))
-
-    data = loads(open("db/users", "r").read())
-
-    for user in data:
-
-      if "protected" in data[user]["data"]["tags"]:
-
-        data[user]["data"]["tags"].remove("protected")
 
-    open("db/users", "w").write(dumps(data, indent = 4))
+    # Basic server checking
+    # This insures that a server is registered if it added Prism during a downtime.
+    server_check(bot)
 
+    # Start our 15-minute status changer
     try:
 
       return Tools.status_change.start()
 
     except:
 
-      pass
+      return log.warn("Failed to start the status changer, please do this manually.")
 
   async def error_handler(ctx, error):