Merge pull request #135 from satisfactorymodding/dev

2.22.2

docker/Dockerfile

@@ -17,7 +17,7 @@ FROM python:3.12-alpine AS build
 WORKDIR /deps
 
 RUN pip --no-cache-dir install --progress-bar=off "poetry==1.8"
-
+RUN apk update; apk add g++ git re2-dev
 COPY pyproject.toml .
 COPY poetry.lock .
 RUN poetry install -nvvv --only main --no-root

fred/fred.py

@@ -18,7 +18,7 @@
 from .fred_commands import Commands, FredHelpEmbed
 from .libraries import createembed, common
 
-__version__ = "2.22.1"
+__version__ = "2.22.2"
 
 
 class Bot(commands.Bot):

fred/fred_commands/_command_utils.py

@@ -1,6 +1,6 @@
 from typing import Type
 
-from regex import E, match, escape
+from regex import ENHANCEMATCH, match, escape
 
 from ._baseclass import BaseCmds
 from ..config import Commands, Crashes, Misc
@@ -19,7 +19,7 @@ def search(table: Type[Commands | Crashes], pattern: str, column: str, force_fuz
     fuzzies: list[str] = [
         item["name"]
         for item in table.fetch_all()
-        if (item.get(column, None) is not None) and match(fuzzy_pattern, item[column], flags=E)
+        if (item.get(column, None) is not None) and match(fuzzy_pattern, item[column], flags=ENHANCEMATCH)
     ]
     BaseCmds.logger.info(fuzzies)
     return fuzzies[:5], False

fred/fred_commands/crashes.py

@@ -1,4 +1,4 @@
-from regex import search, error as RegexError
+from re2 import search, RegexError
 
 from ._baseclass import BaseCmds, commands, config, SearchFlags
 from ._command_utils import get_search

fred/libraries/common.py

@@ -27,11 +27,13 @@ def new_logger(name: str) -> logging.Logger:
 
 class FredCog(commands.Cog):
     bot: Bot = ...  # we can assume any cog will have a bot by the time it needs to be accessed
+    logger: logging.Logger = ...
 
     def __init__(self, bot: Bot):
         self.__class__.bot = bot
         self.bot = bot
         self.logger = new_logger(self.__class__.__name__)
+        self.__class__.logger = self.logger
         self.logger.debug("Cog loaded.")
 
 

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "fred"
-version = "2.22.1"
+version = "2.22.2"
 description = "A Discord bot for the Satisfactory Modding Discord "
 authors = ["Feyko <feykook@gmail.com>", "Mircea Roata <mircearoatapalade@yahoo.ro>", "Borketh <does.not.kompute@gmail.com>"]
 license = "MIT License"
@@ -19,6 +19,7 @@ setuptools = "^72.1.0"
 psycopg2-binary = "^2.9.9"
 semver = "^3.0.2"
 pyre2-updated = "^0.3.8"
+regex = "^2024.7.24"
 
 [tool.poetry.group.dev.dependencies]
 black = {extras = ["d"], version = "^24.8.0"}