fix: improve TwitchAlert regex

Author: JayDwee

KoalaBot.py

@@ -160,13 +160,14 @@ def check_guild_has_ext(ctx, extension_id):
 async def on_command_error(ctx, error):
     if isinstance(error, commands.MissingRequiredArgument):
         await ctx.send(embed=error_embed(description=error))
-    # elif isinstance(error, commands.CommandInvokeError):
-    #     await ctx.send(embed=error_embed(description=error.original))
     elif isinstance(error, commands.CommandOnCooldown):
         await ctx.send(embed=error_embed(description=f"{ctx.author.mention}, this command is still on cooldown for "
                                                      f"{str(error.retry_after)}s."))
     elif isinstance(error, commands.errors.ChannelNotFound):
         await ctx.send(embed=error_embed(description=f"The channel ID provided is either invalid, or not in this server."))
+    elif isinstance(error, commands.CommandInvokeError):
+        # logger.warning("CommandInvokeError(%s), guild_id: %s, message: %s", error.original, ctx.guild.id, ctx.message)
+        await ctx.send(embed=error_embed(description=error.original))
     else:
         await ctx.send(embed=error_embed(
             description=f"An unexpected error occured, please contact an administrator Timestamp: {time.time()}")) # FIXME: better timestamp

devdocs/sqlalchemy-alembic.md

@@ -0,0 +1,12 @@
+# sqlalchemy and alembic
+
+sqlalchemy: Python SQL toolkit and Object Relational Mapper
+alembic: a lightweight database migration tool for usage with the SQLAlchemy Database Toolkit for Python.
+
+## Documentation
+[sqlalchemy docs](https://sqlalchemy.org)
+[alembic docs](https://alembic.sqlalchemy.org)
+
+## Tutorials/ Talks
+[Talk: Hannah Stepanek - Let's talk Databases in Python: SQLAlchemy and Alembic](https://www.youtube.com/watch?v=36yw8VC3KU8)
+["SQLAlchemy 2.0 - The One-Point-Four-Ening 2021" by: Mike Bayer](https://www.youtube.com/watch?v=1Va493SMTcY)

koala/cogs/twitch_alert/env.py

@@ -4,4 +4,4 @@
 load_dotenv()
 
 TWITCH_KEY = os.environ.get('TWITCH_TOKEN')
-TWITCH_SECRET = os.environ.get('TWITCH_SECRET')
+TWITCH_SECRET = os.environ.get('TWITCH_SECRET')

koala/cogs/twitch_alert/utils.py

@@ -12,7 +12,7 @@
 DEFAULT_MESSAGE = ""
 TWITCH_ICON = "https://cdn3.iconfinder.com/data/icons/social-messaging-ui-color-shapes-2-free" \
               "/128/social-twitch-circle-512.png"
-TWITCH_USERNAME_REGEX = "^[a-z0-9][a-z0-9_]{3,24}$"
+TWITCH_USERNAME_REGEX = "^[a-z0-9][a-z0-9_-]{3,24}$"
 
 LOOP_CHECK_LIVE_DELAY = 1
 TEAMS_LOOP_CHECK_LIVE_DELAY = 1

koala/db.py

@@ -13,7 +13,7 @@
 
 # Libs
 from pathlib import Path
-from sqlalchemy import select, update, insert, delete, and_, func, create_engine
+from sqlalchemy import select, update, delete, and_, func, create_engine
 from sqlalchemy.orm import sessionmaker