Merge develop to main

.devcontainer/devcontainer.json

@@ -0,0 +1,24 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/python
+{
+	"name": "Python 3",
+	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
+	"image": "mcr.microsoft.com/devcontainers/python:1-3.10-bullseye",
+
+	// Features to add to the dev container. More info: https://containers.dev/features.
+	 "features": {
+           "ghcr.io/devcontainers-contrib/features/pdm:2": {}
+     },
+
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": [],
+
+	// Use 'postCreateCommand' to run commands after the container is created.
+	 "postCreateCommand": "pdm install --dev && pdm install --plugins"
+
+	// Configure tool-specific properties.
+	// "customizations": {},
+
+	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+	// "remoteUser": "root"
+}

.dockerignore

@@ -1,157 +1,11 @@
-# Byte-compiled / optimized / DLL files
-__pycache__/
-*.py[cod]
-*$py.class
-
-# C extensions
-*.so
-
-# Distribution / packaging
-.Python
-build/
-develop-eggs/
-dist/
-downloads/
-eggs/
-.eggs/
-lib/
-lib64/
-parts/
-sdist/
-var/
-wheels/
-pip-wheel-metadata/
-share/python-wheels/
-*.egg-info/
-.installed.cfg
-*.egg
-MANIFEST
-
-# PyInstaller
-#  Usually these files are written by a python script from a template
-#  before PyInstaller builds the exe, so as to inject date/other infos into it.
-*.manifest
-*.spec
-
-# Installer logs
-pip-log.txt
-pip-delete-this-directory.txt
-
-# Unit test / coverage reports
-htmlcov/
-.tox/
-.nox/
-.coverage
-.coverage.*
-.cache
-nosetests.xml
-coverage.xml
-*.cover
-.hypothesis/
-.pytest_cache/
-.ruff_cache/
-
-# Translations
-*.mo
-*.pot
-
-# Django stuff:
-*.log
-local_settings.py
-db.sqlite3
-
-# Flask stuff:
-instance/
-.webassets-cache
-
-# Scrapy stuff:
-.scrapy
-
-# Sphinx documentation
-docs/_build/
-
-# PyBuilder
-target/
-
-# Jupyter Notebook
-.ipynb_checkpoints
-
-# IPython
-profile_default/
-ipython_config.py
-
-# pyenv
-.python-version
-
-# celery beat schedule file
-celerybeat-schedule
-
-# SageMath parsed files
-*.sage.py
-
-# Environments
-.env
-.venv
-env/
-venv/
-venv2/
-ENV/
-env.bak/
-venv.bak/
-
-# Spyder project settings
-.spyderproject
-.spyproject
-
-# Rope project settings
-.ropeproject
-
-# mkdocs documentation
-/site
-
-# mypy
-.mypy_cache/
-.dmypy.json
-dmypy.json
-
-# Pyre type checker
-.pyre/
-
-# PyCharm
-.idea/
-
-# MacOS
-.DS_Store
-
-# VS Code
-.vscode/
-
-# Node
-package-lock.json
-node_modules/
-
-# Modmail
-config.json
-plugins/
-!plugins/registry.json
-!plugins/@local/
-temp/
-test.py
-
-# Other stuff
-.env.example
-.gitignore
-.dockerignore
-.github/
-app.json
-Procfile
-pyproject.toml
-*.md
-.*.json
-Dockerfile
-docker-compose.yml
-LICENSE
-PRIVACY.md
-
-# Docs
-docs/
+# Ignore everything
+*
+# Ignore the IDE, these are not duplicate and not having this makes the build context potentially *very* large
+**
+!/cogs
+!/core
+!bot.py
+!LICENSE
+!pdm.lock
+!pyproject.toml
+!README.md

.env.example

@@ -3,3 +3,4 @@ LOG_URL=https://logviewername.herokuapp.com/
 GUILD_ID=1234567890
 OWNERS=Owner1ID,Owner2ID,Owner3ID
 CONNECTION_URI=mongodb+srv://mongodburi
+DISABLE_AUTOUPDATES=true

.gitattributes

@@ -0,0 +1 @@
+* text=auto

.github/FUNDING.yml

@@ -1 +0,0 @@
-ko_fi: raidensakura

.github/workflows/docker-image.yml

@@ -8,9 +8,6 @@ on:
       - 'develop'
     tags:
       - 'v*'
-  pull_request:
-    branches:
-      - 'develop'
 
 env:
   REGISTRY: ghcr.io
@@ -24,23 +21,25 @@ jobs:
       packages: write
 
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
+#      - name: Checkout repository
+#        uses: actions/checkout@v4
 
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
       - name: Log in to the Container registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@v4
+      - name: Extract metadata (tags, labels) for Docker main
+        id: docker-meta-base
+        uses: docker/metadata-action@v5
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           tags: |
-            type=schedule,pattern=nightly
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
             type=semver,pattern={{major}}
@@ -49,11 +48,18 @@ jobs:
             type=sha
             # set latest tag for stable releases
             type=raw,value=latest,enable=${{ github.event.release.prerelease == false }}
+          bake-target: docker-metadata-action
 
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v3
+      - name: Build and push
+        uses: docker/bake-action@v6
         with:
-          context: .
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
+#          source: .
+          push: ${{ ! startsWith(github.ref, 'refs/pull/') && ! github.event.act }}
+          pull: true
+          sbom: true
+          files: |            
+            ./docker-bake.hcl
+            cwd://${{ steps.docker-meta-base.outputs.bake-file }}
+          targets: openmodmail
+
+

.github/workflows/lint.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.8"]
+        python-version: ["3.11"]
     name: Python ${{ matrix.python-version }} on ubuntu-latest
     steps:
     - uses: actions/checkout@v3
@@ -21,12 +21,16 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
         architecture: x64
+    - name: Setup PDM
+      uses: pdm-project/setup-pdm@v4
+      with:
+        cache: true
     - name: Install dependencies
       run: |
-        python -m pip install black ruff
+        pdm install --group dev
     - name: Ruff
-      run: ruff . --no-fix
+      run: pdm run ruff . --no-fix
       continue-on-error: true
     - name: Black
       run: |
-        black . --diff --check
+        pdm run black . --diff --check

.gitignore

@@ -138,4 +138,10 @@ config.json
 temp/
 test.py
 stack.yml
-.github/workflows/build_docker.yml
+
+.pdm-python
+
+compose.override.yml
+
+
+s3-data/*

.pre-commit-config.yaml

@@ -1,9 +1,20 @@
 repos:
   - repo: https://github.com/psf/black
-    rev: "22.12.0"
+    rev: "24.4.2"
     hooks:
       - id: black
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: 'v0.0.261'
+    rev: 'v0.4.9'
     hooks:
       - id: ruff
+  - repo: https://github.com/pdm-project/pdm
+    rev: 2.10.0 # a PDM release exposing the hook
+    hooks:
+      - id: pdm-export
+        # command arguments, e.g.:
+        args: [ '-o', 'requirements.txt', '--without-hashes' ]
+        files: ^pdm.lock$
+  - repo: https://github.com/pdm-project/pdm
+    rev: 2.10.0 # a PDM release exposing the hook
+    hooks:
+      - id: pdm-lock-check