[RELEASE] 1.6.0

CLI/BackupFactUpdater/__main__.py

@@ -14,25 +14,26 @@
 import sys
 import pathlib
 import configparser
-import mysql.connector
+from sqlalchemy import create_engine, text, exc
 
 
-# noinspection PyBroadException
-def run():
+def run_facts():
     """Run the Backup Fact Updater"""
     rootpath = pathlib.PurePath(__file__).parent.parent.parent
     rootpath = str(rootpath).replace("\\", "/")
     json_path = rf"{rootpath}/data/facts/backup_facts.json"
     config = configparser.ConfigParser()
     config.read(rf"{rootpath}/CLI/BackupFactUpdater/config.ini")
 
-    dbconfig = {
-        "user": config.get("Database", "user"),
-        "password": config.get("Database", "password"),
-        "host": config.get("Database", "host"),
-        "database": config.get("Database", "database"),
-        "connect_timeout": int(config.get("Database", "timeout")),
-    }
+    dbconfig = (
+        f'mysql+mysqldb://{config["Database"]["user"]}:{config["Database"]["password"]}@'
+        f'{config["Database"]["host"]}/{config["Database"]["database"]}'
+    )
+
+    engine = create_engine(
+        dbconfig,
+        connect_args={"connect_timeout": int(config["Database"]["timeout"])},
+    )
 
     print("=============\nHalpyBOT fact file updater\n=============")
     print("\n")
@@ -54,23 +55,25 @@ def run():
         with open(json_path, "r", encoding="UTF-8") as jsonfile:
             print("20% Opening backup file...")
             resdict = json.load(jsonfile)
-        database_connection = mysql.connector.connect(**dbconfig)
         print("40% Connection started...")
-        cursor = database_connection.cursor()
-        cursor.execute(f"SELECT factName, factLang, factText FROM {table}")
-        print("60% Got data, parsing...")
-        for (name, lang, text) in cursor:
-            resdict[f"{name}-{lang}"] = text
-        database_connection.close()
+        with engine.connect() as conn:
+            result = conn.execute(
+                text(
+                    f"SELECT factName, factLang, factText FROM {table}",
+                )
+            )
+            print("60% Got data, parsing...")
+            for (name, lang, facttext) in result:
+                resdict[f"{name}-{lang}"] = facttext
         print("80% Writing to file...")
         with open(json_path, "w+", encoding="UTF-8") as jsonfile:
             json.dump(resdict, jsonfile, indent=4)
             print(
                 "100% Done. Confirm that the update was successful, and have a great day!"
             )
-    except mysql.connector.Error:
+    except exc.OperationalError:
         print("MySQL encountered an error. Aborting!")
 
 
 if __name__ == "__main__":
-    run()
+    run_facts()

CLI/DSSAUpdater/__main__.py

@@ -30,7 +30,7 @@
 # noinspection PyBroadException
 
 
-def run():
+def run_dssa():
     """Run the DSSA Updater"""
     rootpath = pathlib.PurePath(__file__).parent
     rootpath = str(rootpath).replace("\\", "/")
@@ -42,9 +42,7 @@ def run():
         + "=" * 20
         + "\n"
     )
-    print(
-        f"JSON and CSV files will be placed in folder: {filepath}"
-    )
+    print(f"JSON and CSV files will be placed in folder: {filepath}")
 
     carriers_good = []
     carriers_bad = []
@@ -82,7 +80,7 @@ def run():
     # Create an object for all our carriers and get their locations
     try:
         for carrier in tqdm(carrierdata):
-            crobj = DSSACarrier(name=carrier["Name"], location=carrier["Location"])
+            crobj = DSSACarrier(name=carrier["Name"], location=carrier["Destination"])
             if not crobj.has_system:
                 needs_manual.append(crobj.name)
                 carriers_bad.append(
@@ -139,6 +137,6 @@ def run():
 
 if __name__ == "__main__":
     try:
-        run()
+        run_dssa()
     except KeyboardInterrupt:
         sys.exit()

CLI/EDDBFormatter/__main__.py

@@ -16,7 +16,7 @@
 from tqdm import tqdm
 
 
-def run():
+def run_eddb():
     """Run the EDDB Formatter"""
     rootpath = pathlib.PurePath(__file__).parent
     rootpath = str(rootpath).replace("\\", "/")
@@ -151,6 +151,6 @@ def run():
 
 if __name__ == "__main__":
     try:
-        run()
+        run_eddb()
     except KeyboardInterrupt:
         sys.exit()

CONTRIBUTING.md

@@ -76,7 +76,7 @@ Otherwise, use the type of request:
 
 #### Non-commands
 
-This project uses [Google Style Python Docstrings](https://gist.github.com/redlotus/3bc387c2591e3e908c9b63b97b11d24e)for
+This project uses [Google Style Python Docstrings](https://gist.github.com/redlotus/3bc387c2591e3e908c9b63b97b11d24e) for
 non-commands
 (functions that do not directly interact with a command handler)
 

certs/.gitignore

@@ -0,0 +1,2 @@
+# Ignore everything in this directory
+*

config/config_template.ini

@@ -1,7 +1,12 @@
 [SASL]
+use_sasl = # True or False
+sasl_mode = # PLAIN or EXTERNAL
+# For SASL PLAIN
 identity = # Registered nick
 username = # Hull Seals account name
 password = # Hull Seals account password
+# For SASL EXTERNAL
+cert = # Name of the cert in the /certs directory, if using EXTERNAL
 
 [IRC]
 server = irc.hullseals.space
@@ -32,8 +37,6 @@ joinable = #debrief #Code-Black #Repair-Requests #bot-test #cybers
 
 [Offline Mode]
 enabled = False
-announce_channels = #bot-test
-warning override = False
 
 [EDSM]
 Maximum landmark distance = 10000
@@ -78,8 +81,6 @@ access_token =
 access_secret =
 
 [System Monitoring]
-enabled = True
-anope_timer = 300
 message_channel = #seal-bob
 failure_button = False
 

data/facts/backup_facts.json

@@ -37,5 +37,11 @@
     "rr-en": "Reboot/Repair is a way for your ship to cannibalize working modules in an effort to repair damaged modules. (1/4) %n% To initiate Reboot/Repair, please navigate to the right-hand menu, and select 'Ship'. (2/4) %n% Select 'Reboot/Repair', wait for the timer to complete, then select 'Confirm' (3/4) %n% Ship will power down and reboot all modules/systems until complete. (4/4)",
     "go-en": "{{Mentioned seals, }}You're up.",
     "team-en": "Please add your Seal to your Team. Open your Comms Panel (top left option), and select the third tab. Then, select the Seal(s) you want, and select Invite to Team.",
-    "escapeneutron-en": "Guide to Escaping a Neutron Cone: (1/2) %n% Text: https://hullse.al/enText --- Video: https://hullse.al/enVid (2/2)"
+    "escapeneutron-en": "Guide to escaping Stellar Cones: https://hullse.al/neutronguide",
+    "ticket-en": "Please create a ticket here to ensure the appropriate staff members get notified: https://hullseals.space/support/create_ticket.php. A Hull Seals account is required.",
+    "f-en": "https://dev.hullseals.space/images/Unsuccessful_Rescue.png",
+    "pcfrcb-en": "Please REMAIN in the main menu, go into the Social menu, search for the Seals assigned to you in the search box in the top right corner, and click to add them.",
+    "mechanic-en": "You've not been around for a while, have you...",
+    "toby-en": "Gosh darnit Toby! Have a snish.",
+    "kaboom-en": "https://c.tenor.com/SqrZAbYtcq0AAAAM/madagscar-penguins.gif"
 }

data/help/commands.json

@@ -189,52 +189,6 @@
       "use": "Shorten a provided URL"
     }
   },
-  "Delay": {
-    "delaystatus": {
-      "aliases": [
-        "checkstatus"
-      ],
-      "arguments": "",
-      "use": "Checks the system for Delayed Cases"
-    },
-    "delaycase": {
-      "aliases": [],
-      "arguments": "[case status] [notes]",
-      "use": "Adds a new case to the Delayed system, and responds with a unique Case ID."
-    },
-    "updatestatus": {
-      "aliases": [],
-      "arguments": "[case ID] [case status]",
-      "use": "Updates the Status Code of a case - see the table of different status codes below!"
-    },
-    "updatenotes": {
-      "aliases": [],
-      "arguments": "[case ID] [new notes]",
-      "use": "Updates the Notes attached to a case - this replaces the old notes entirely, so be sure to be complete in your new notes!"
-    },
-    "updatecase": {
-      "aliases": [],
-      "arguments": "[case ID] (case status) (case notes)",
-      "use": "Updates both the Status Code and Notes of a case - this replaces the old notes entirely, so be sure to be complete in your new notes!"
-    },
-    "close": {
-      "aliases": [
-        "endcase"
-      ],
-      "arguments": "[case ID]",
-      "use": "Closes a case and removes it from the Delayed Case system. It's encouraged to update the notes before you close a case!"
-    },
-    "reopen": {
-      "aliases": [],
-      "arguments": "[case ID] [case status]",
-      "use": "Reopens a previously-closed case, if a case is improperly closed. Moderator only"
-    },
-    "checkstatus": {
-      "aliases": [],
-      "arguments": "",
-      "use": "Check if any cases are currently marked as 'Delayed' in the database."
-    }
-  },
   "Drill": {
     "drillcase": {
       "aliases": [],
@@ -312,5 +266,12 @@
       "arguments": "",
       "use": "Shut down the bot. Will restart the bot if configured under daemon processing."
     }
+  },
+  "Fun": {
+    "roll": {
+      "aliases": [],
+      "arguments": "#d#",
+      "use": "Roll the dice! (Up to 10 dice of any size)"
+    }
   }
 }

halpybot/__init__.py

@@ -10,7 +10,7 @@
 
 from halpybot.packages.configmanager import config
 
-__version__ = "1.6.3"
+__version__ = "2.0.0-alpha"
 
 DEFAULT_USER_AGENT = (
     "HalpyBOT/"

halpybot/commands/__init__.py

@@ -8,7 +8,6 @@
 See license.md
 """
 
-from . import delayedboard
 from . import edsm
 from . import fact
 from . import forcejoin
@@ -26,7 +25,6 @@
 from . import misc
 
 __all__ = [
-    "delayedboard",
     "edsm",
     "fact",
     "forcejoin",