Merge branch 'develop' into 'master'

[RELEASE] 1.6.1

See merge request hull-seals/code/irc/halpybot!141

CLI/BackupFactUpdater/__main__.py

@@ -3,7 +3,7 @@
 
 Simple tool for automatically updating the backup fact file
 
-Copyright (c) 2022 The Hull Seals,
+Copyright (c) The Hull Seals,
 All rights reserved.
 
 Licensed under the GNU General Public License

CLI/DSSAUpdater/__main__.py

@@ -6,7 +6,7 @@
 Spreadsheet data used with permission from Fleetcomm and
 DSSA administration
 
-Copyright (c) 2022 The Hull Seals,
+Copyright (c) The Hull Seals,
 All rights reserved.
 
 Licensed under the GNU General Public License

CLI/DSSAUpdater/src/__init__.py

@@ -1,9 +1,7 @@
 """
-HalpyBOT v1.6
-
 __init__.py - Initilization for DSSA Updater module
 
-Copyright (c) 2022 The Hull Seals,
+Copyright (c) The Hull Seals,
 All rights reserved.
 
 Licensed under the GNU General Public License

CLI/DSSAUpdater/src/carrier.py

@@ -3,7 +3,7 @@
 
 carrier.py - DSSA carrier object
 
-Copyright (c) 2022 The Hull Seals,
+Copyright (c) The Hull Seals,
 All rights reserved.
 
 Licensed under the GNU General Public License
@@ -79,7 +79,7 @@ def __eq__(self, other):
         """
         if not isinstance(other, DSSACarrier):
             return False
-        return self.name.lower() == other.name.lower()
+        return self.name.casefold() == other.name.casefold()
 
     def __repr__(self):
         """Return a string representation of the carrier

CLI/DSSAUpdater/src/scraper.py

@@ -3,7 +3,7 @@
 
 scraper.py - Spreadsheet scraper function, powered by BeautifulSoup
 
-Copyright (c) 2022 The Hull Seals,
+Copyright (c) The Hull Seals,
 All rights reserved.
 
 Licensed under the GNU General Public License
@@ -63,7 +63,7 @@ def scrape_spreadsheet(path: str, sheetlink: str, timestamp: str):
     for index, row in enumerate(rows):
         if row == [""] * 20:  # This would be an empty row, ignore it
             continue
-        if row[2].lower() != "carrier operational":  # 2 - Carrier status
+        if row[2].casefold() != "carrier operational":  # 2 - Carrier status
             continue
         if row[9] == "":  # 9 - Carrier name
             anomalies.append(f"{index + 1} - Name field has no value")

CLI/EDDBFormatter/__main__.py

@@ -3,7 +3,7 @@
 
 EDDB File Formatter
 
-Copyright (c) 2022 The Hull Seals,
+Copyright (c) The Hull Seals,
 All rights reserved.
 
 Licensed under the GNU General Public License

CONTRIBUTING.md

@@ -100,11 +100,9 @@ have to start with a docstring of the following format:
 
 ```python
 """
-HalpyBOT v[VERSION]
-
 file_name.py - One-sentence description of what this file does.
 
-Copyright (c) 2022 The Hull Seals,
+Copyright (c) The Hull Seals,
 All rights reserved.
 
 Licensed under the GNU General Public License

README.md

@@ -1,4 +1,4 @@
-# HalpyBOT 1.6
+# HalpyBOT 1.6.1
 This is the repository for HalpyBOT, the Hull Seals IRC Chatbot Assistant.
 
 # Description

config/config_template.ini

@@ -84,4 +84,8 @@ message_channel = #seal-bob
 failure_button = False
 
 [UserAgent]
-agent_comment = Your Organization Here
+agent_comment = Your Organization Here
+
+[YOURLS]
+uri = YOURLS URL Here
+pwd = Your PasswordlessAPI Key here

data/help/commands.json

@@ -182,6 +182,11 @@
       "aliases": [],
       "arguments": "[channel] [text]",
       "use": "Make the Bot say something"
+    },
+    "shorten": {
+      "aliases": [],
+      "arguments": "[url]",
+      "use": "Shorten a provided URL"
     }
   },
   "Delay": {

halpybot/__init__.py

@@ -1,9 +1,7 @@
 """
-HalpyBOT v1.6
-
 __init__.py - Initilization for HalpyBOT core
 
-Copyright (c) 2022 The Hull Seals,
+Copyright (c) The Hull Seals,
 All rights reserved.
 
 Licensed under the GNU General Public License
@@ -12,7 +10,7 @@
 
 from halpybot.packages.configmanager import config
 
-__version__ = "1.5.3"
+__version__ = "1.6.1"
 
 DEFAULT_USER_AGENT = (
     "HalpyBOT/"

halpybot/commands/__init__.py

@@ -1,9 +1,7 @@
 """
-HalpyBOT v1.6
-
 __init__.py - Initilization for HalpyBOT Commands
 
-Copyright (c) 2022 The Hull Seals,
+Copyright (c) The Hull Seals,
 All rights reserved.
 
 Licensed under the GNU General Public License
@@ -25,6 +23,7 @@
 from . import bot_help
 from . import caseutils
 from . import drill
+from . import misc
 
 __all__ = [
     "delayedboard",
@@ -42,4 +41,5 @@
     "bot_help",
     "caseutils",
     "drill",
+    "misc",
 ]

halpybot/commands/bot_help.py

@@ -1,9 +1,7 @@
 """
-HalpyBOT v1.6
-
 bot_help.py - get command list and command details when queried
 
-Copyright (c) 2022 The Hull Seals,
+Copyright (c) The Hull Seals,
 All rights reserved.
 
 Licensed under the GNU General Public License

halpybot/commands/caseutils.py

@@ -1,9 +1,7 @@
 """
-HalpyBOT v1.6
-
 caseutils.py - Commands involving the management of Seal cases
 
-Copyright (c) 2022 The Hull Seals,
+Copyright (c) The Hull Seals,
 All rights reserved.
 
 Licensed under the GNU General Public License

halpybot/commands/delayedboard.py

@@ -1,9 +1,7 @@
 """
-HalpyBOT v1.6
-
 delayedboard.py - Delayed Case Board commands
 
-Copyright (c) 2022 The Hull Seals,
+Copyright (c) The Hull Seals,
 All rights reserved.
 
 Licensed under the GNU General Public License
@@ -49,6 +47,7 @@ async def cmd_create_delayed_case(ctx: Context, args: List[str]):
     try:
         results = await DelayedCase.open(case_status, message, ctx.sender)
     except NoDatabaseConnection:
+        logger.exception("Offline Mode Set, No Database Connection")
         return await ctx.reply(
             "Cannot create case: running in OFFLINE MODE. "
             "Contact a cyberseal immediately!"
@@ -93,6 +92,7 @@ async def cmd_reopen_delayed_case(ctx: Context, args: List[str]):
     try:
         results = await DelayedCase.reopen(case_id, casestat, ctx.sender)
     except NoDatabaseConnection:
+        logger.exception("Offline Mode Set, No Database Connection")
         return await ctx.reply(
             "Cannot reopen case: running in OFFLINE MODE. "
             "Contact a cyberseal immediately!"
@@ -127,6 +127,7 @@ async def cmd_close_delayed_case(ctx: Context, args: List[str]):
             case_id, 3, ctx.sender
         )  # set casestat to 3 to close case
     except NoDatabaseConnection:
+        logger.exception("Offline Mode Set, No Database Connection")
         return await ctx.reply(
             "Cannot update case: running in OFFLINE MODE. "
             "Contact a cyberseal immediately!"
@@ -163,6 +164,7 @@ async def cmd_update_delayed_status(ctx: Context, args: List[str]):
     try:
         results = await DelayedCase.status(case_id, casestat, ctx.sender)
     except NoDatabaseConnection:
+        logger.exception("Offline Mode Set, No Database Connection")
         return await ctx.reply(
             "Cannot update case: running in OFFLINE MODE. "
             "Contact a cyberseal immediately!"
@@ -207,6 +209,7 @@ async def cmd_update_delayed_notes(ctx: Context, args: List[str]):
     try:
         results = await DelayedCase.notes(case_id, message, ctx.sender)
     except NoDatabaseConnection:
+        logger.exception("Offline Mode Set, No Database Connection")
         return await ctx.reply(
             "Cannot update case: running in OFFLINE MODE. "
             "Contact a cyberseal immediately!"
@@ -235,6 +238,7 @@ async def cmd_check_delayed_cases(ctx: Context, args: List[str]):
     try:
         count = await DelayedCase.check()
     except NoDatabaseConnection:
+        logger.exception("Offline Mode Set, No Database Connection")
         return await ctx.reply(
             "Cannot connect to board: running in OFFLINE MODE. "
             "Contact a cyberseal immediately!"
@@ -287,6 +291,7 @@ async def cmd_update_delayed_case(ctx: Context, args: List[str]):
         notesout = await DelayedCase.notes(case_id, message, ctx.sender)
 
     except NoDatabaseConnection:
+        logger.exception("Offline Mode Set, No Database Connection")
         return await ctx.reply(
             "Cannot update case: running in OFFLINE MODE. "
             "Contact a cyberseal immediately!"

halpybot/commands/drill.py

@@ -1,16 +1,14 @@
 """
-HalpyBOT v1.6
-
 drill.py - Commands for the training and drilling of Seals
 
-Copyright (c) 2022 The Hull Seals,
+Copyright (c) The Hull Seals,
 All rights reserved.
 
 Licensed under the GNU General Public License
 See license.md
 """
 from typing import List
-
+from loguru import logger
 from ..packages.command import Commands, get_help_text
 from ..packages.checks import Require, Drilled
 from ..packages.models import Context
@@ -158,4 +156,5 @@ async def lookup(system):
                 )
         return "System Not Found in EDSM.\nPlease check system name with client "
     except EDSMLookupError:
+        logger.exception("Something went wrong with EDSM.")
         return "Unable to query EDSM"

halpybot/commands/edsm.py

@@ -1,9 +1,7 @@
 """
-HalpyBOT v1.6
-
 edsm.py - EDSM Interface commands
 
-Copyright (c) 2022 The Hull Seals,
+Copyright (c) The Hull Seals,
 All rights reserved.
 
 Licensed under the GNU General Public License
@@ -24,6 +22,7 @@
     diversions,
     NoResultsEDSM,
     NoNearbyEDSM,
+    EDSMReturnError,
 )
 from ..packages.command import Commands, get_help_text
 from ..packages.models import Context
@@ -60,7 +59,11 @@ async def cmd_systemlookup(ctx: Context, args: List[str]):
         return await ctx.reply(
             f"No system named {system} was found in the EDSM database."
         )
-
+    except EDSMReturnError:
+        logger.exception("Received malformed reply from EDSM.")
+        return await ctx.reply(
+            f"Received a reply from EDSM about {system}, but could not process the return."
+        )
     except EDSMLookupError:
         logger.exception("Failed to query EDSM for system details.")
         return await ctx.reply("Failed to query EDSM for system details.")
@@ -91,9 +94,13 @@ async def cmd_cmdrlocate(ctx: Context, args: List[str]):
         location = await Commander.location(name=cmdr, cache_override=cache_override)
     except NoResultsEDSM:
         return await ctx.reply(f"No CMDR named {cmdr} was found in the EDSM database.")
+    except EDSMReturnError:
+        logger.exception("Received malformed reply from EDSM.")
+        return await ctx.reply(
+            f"Received a reply from EDSM about {cmdr}, but could not process the return."
+        )
     except EDSMConnectionError:
         logger.exception("Failed to query EDSM for commander data.")
-        # kill it. kill it with fire. ~ TheUnkn0wn1
         return await ctx.reply("Failed to query EDSM for commander data.")
 
     if location is None:
@@ -139,6 +146,11 @@ async def cmd_distlookup(ctx: Context, args: List[str]):
         return await ctx.reply(
             "No system and/or commander was found in the EDSM database for one of the points."
         )
+    except EDSMReturnError:
+        logger.exception("Received a malformed reply from EDSM.")
+        return await ctx.reply(
+            "Received a reply from EDSM, but could not process the return."
+        )
     except EDSMLookupError:
         logger.exception("Failed to query EDSM for system or CMDR details.")
         return await ctx.reply("Failed to query EDSM for system or CMDR details.")
@@ -191,8 +203,11 @@ async def cmd_landmarklookup(ctx: Context, args: List[str]):
             f"The closest DSSA Carrier is in {dssa}, {distance} LY "
             f"{direction} of {system}."
         )
-    logger.exception("Failed to query EDSM for landmark details.")
-    return await ctx.reply("Failed to query EDSM for landmark details.")
+    except EDSMReturnError:
+        logger.exception("Received a malformed reply from EDSM.")
+        return await ctx.reply(
+            f"Received a reply from EDSM about {system}, but could not process the return."
+        )
 
 
 @Commands.command("dssa")
@@ -231,6 +246,11 @@ async def cmd_dssalookup(ctx: Context, args: List[str]):
         return await ctx.reply(
             f"No system and/or commander named {system} was found in the EDSM database."
         )
+    except EDSMReturnError:
+        logger.exception("Received a malformed reply from EDSM.")
+        return await ctx.reply(
+            f"Received a reply from EDSM about {system}, but could not process the return."
+        )
     except EDSMLookupError:
         logger.exception("Failed to query EDSM for DSSA details.")
         return await ctx.reply("Failed to query EDSM for DSSA details.")
@@ -264,6 +284,11 @@ async def cmd_coordslookup(ctx, args: List[str]):
         return await ctx.reply(
             f"No system and/or commander named {system} was found in the EDSM database."
         )
+    except EDSMReturnError:
+        logger.exception("Received a malformed reply from EDSM.")
+        return await ctx.reply(
+            f"Received a reply from EDSM about {system}, but could not process the return."
+        )
     except EDSMLookupError:
         logger.exception("Failed to query EDSM for coordinate details.")
         return await ctx.reply("Failed to query EDSM for coordinate details.")
@@ -318,6 +343,11 @@ async def cmd_diversionlookup(ctx: Context, args: List[str]):
         return await ctx.reply(
             f"No system and/or commander named {system} was found in the EDSM database."
         )
+    except EDSMReturnError:
+        logger.exception("Received a malformed reply from EDSM.")
+        return await ctx.reply(
+            f"Received a reply from EDSM about {system}, but could not process the return."
+        )
     except EDSMLookupError:
         logger.exception("Failed to query EDSM for coordinate details.")
         return await ctx.reply("Failed to query EDSM for coordinate details.")