Add six mans

.env.local

@@ -1,2 +1,6 @@
 BOT_TOKEN=/secrets/bot-token
 CONFIG_FILE=/config/config.yaml.local
+DB_DATABASE=SCUFFBOT
+DB_HOST=db
+DB_PASSWORD_FILE=/secrets/db-password
+DB_USER=SCUFFBOT

README.md

@@ -12,5 +12,32 @@ If you would like to run locally:
    | Filename | Description |
    |--------------------|------------------------------------|
    | `bot-token` | Token for Discord bot |
+   | `db-password` | Default password for database |
+   | `db-root-password` | Root password for the database |
 4. Copy [/db/.env.template](./db/.env.template) to `db/.env`, and adjust values as necessary.
 5. Run the bot with `docker compose up -d --build`.
+
+If you have something to suggest, whether it is feedback or a bug report, put it in the thread below. As I acknowledge your feedback, I will update this list. This is what I have so far:
+
+# Feedback
+
+- [x] Implement a queue timeout, perhaps 45-60mins?
+- [x] Notify the channel when a player has joined the queue
+- [ ] Have request to spectate six mans matches
+- [x] Wait for all 6 people to join call before starting otherwise cancel after 5 mins
+- [ ] Incorporate personal stats page
+- [x] Disable general text chat messaging
+- [x] Change Team A/B to actual team names
+- [ ] Add rematch button
+- [x] Disable break out button after clicked
+- [x] Ping the six mans lobby channel when the lobby is created
+- [ ] Connect up the MMR system
+- [ ] Send players back to the general six mans voice channel after the game has been ended
+- [x] Convert score reporting to win/loss reporting
+- [x] Add administrative commands to manipulate six man lobbies
+  - Added `close` command
+
+# Bugs
+
+- [x] Users get kicked from queue even after finding a match
+- [x] Captains are able to click select 1s players multiple times resulting in multiple 1s players in the party per team

SIX-MANS.md

@@ -0,0 +1,23 @@
+
+# Feedback
+
+- [x] Implement a queue timeout, perhaps 45-60mins?
+- [x] Notify the channel when a player has joined the queue
+- [ ] Have request to spectate six mans matches
+- [x] Wait for all 6 people to join call before starting otherwise cancel after 5 mins
+- [ ] Incorporate personal stats page
+- [x] Disable general text chat messaging
+- [x] Change Team A/B to actual team names
+- [ ] Add rematch button
+- [x] Disable break out button after clicked
+- [x] Ping the six mans lobby channel when the lobby is created
+- [ ] Connect up the MMR system
+- [ ] Send players back to the general six mans voice channel after the game has been ended
+- [x] Convert score reporting to win/loss reporting
+- [x] Add administrative commands to manipulate six man lobbies
+  - Added `close` command
+
+# Bugs
+
+- [x] Users get kicked from queue even after finding a match
+- [x] Captains are able to click select 1s players multiple times resulting in multiple 1s players in the party per team

dagger.json

@@ -1,9 +1,9 @@
 {
   "name": "ScuffBot",
-  "engineVersion": "v0.19.9",
+  "engineVersion": "v0.20.3",
   "blueprint": {
     "name": "generic-deploy",
-    "source": "github.com/mocbotau/infra-dagger-modules/blueprints/generic-deploy@v0.2.1",
-    "pin": "d3b5d9928ca1aa7ab0199362d2d0f0e7cd6e792a"
+    "source": "github.com/mocbotau/infra-dagger-modules/blueprints/generic-deploy@v0.2.3",
+    "pin": "baa540a83e74639fb6ff0b1ef1a51a35dd688e85"
   }
 }

db/.env.template

@@ -0,0 +1,4 @@
+MYSQL_DATABASE=SCUFFBOT
+MYSQL_USER=SCUFFBOT
+MYSQL_PASSWORD_FILE=/secrets/db-password
+MYSQL_ROOT_PASSWORD_FILE=/secrets/db-root-password

db/data/init.sql

@@ -0,0 +1,65 @@
+CREATE TABLE
+	`SixManParty` (
+		`PartyID` INTEGER NOT NULL AUTO_INCREMENT,
+		`LobbyID` INTEGER DEFAULT NULL,
+		`GameID` INTEGER DEFAULT NULL,
+		PRIMARY KEY (`PartyID`)
+	);
+
+CREATE TABLE
+	`SixManLobby` (
+		`LobbyID` INTEGER NOT NULL,
+		`MessageID` TEXT NOT NULL,
+		`VoiceChannelID` TEXT NOT NULL,
+		`TextChannelID` TEXT NOT NULL,
+		`RoleID` TEXT NOT NULL,
+		`VoiceChannelA` VARCHAR(255) DEFAULT NULL UNIQUE,
+		`VoiceChannelB` VARCHAR(255) DEFAULT NULL UNIQUE,
+		PRIMARY KEY (`LobbyID`)
+	);
+
+CREATE TABLE
+	`SixManGames` (
+		`GameID` INTEGER NOT NULL AUTO_INCREMENT,
+		`Timestamp` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+		`MatchCode` TEXT NOT NULL,
+		`MatchPassword` TEXT NOT NULL,
+		`1v1_A` INTEGER DEFAULT NULL,
+		`1v1_B` INTEGER DEFAULT NULL,
+		`2v2_A` INTEGER DEFAULT NULL,
+		`2v2_B` INTEGER DEFAULT NULL,
+		`3v3_A_A` INTEGER DEFAULT NULL,
+		`3v3_A_B` INTEGER DEFAULT NULL,
+		`3v3_B_A` INTEGER DEFAULT NULL,
+		`3v3_B_B` INTEGER DEFAULT NULL,
+		`3v3_C_A` INTEGER DEFAULT NULL,
+		`3v3_C_B` INTEGER DEFAULT NULL,
+		PRIMARY KEY (`GameID`)
+	);
+
+CREATE TABLE
+	`SixManUsers` (
+		`PartyID` INTEGER NOT NULL,
+		`UserID` VARCHAR(255) NOT NULL,
+		`Type` INTEGER NOT NULL DEFAULT 0,
+		`Team` INTEGER NOT NULL DEFAULT 0,
+		`isOnesPlayer` INTEGER DEFAULT NULL,
+		PRIMARY KEY (`PartyID`, `UserID`)
+	);
+
+ALTER TABLE `SixManParty` ADD CONSTRAINT `FK_LobbyID_SixManParty` FOREIGN KEY (`LobbyID`) REFERENCES `SixManLobby` (`LobbyID`) ON DELETE SET NULL,
+ADD CONSTRAINT `FK_GameID` FOREIGN KEY (`GameID`) REFERENCES `SixManGames` (`GameID`) ON DELETE SET NULL;
+
+ALTER TABLE `SixManUsers` ADD CONSTRAINT `FK_PartyID_SixManUsers` FOREIGN KEY (`PartyID`) REFERENCES `SixManParty` (`PartyID`) ON DELETE CASCADE;
+
+DELIMITER $$
+
+CREATE TRIGGER DeletePartyCascade
+AFTER DELETE ON SixManParty
+FOR EACH ROW
+BEGIN
+  DELETE FROM SixManLobby WHERE LobbyID = OLD.LobbyID;
+  DELETE FROM SixManGames WHERE GameID = OLD.GameID;
+END $$
+
+DELIMITER ;

docker-compose.yaml

@@ -6,5 +6,45 @@ services:
     volumes:
       - ./.local-secrets:/secrets
       - ./config.yaml.local:/config/config.yaml.local
+    depends_on:
+      db:
+        condition: service_healthy
     env_file:
       - ./.env.local
+    networks:
+      - backend
+  # MySQL Server
+  db:
+    image: "mysql:9.2.0"
+    restart: unless-stopped
+    env_file:
+      - ./db/.env
+    volumes:
+      - db_data:/var/lib/mysql
+      - ./db/data:/docker-entrypoint-initdb.d/
+      - .local-secrets/db-password:/secrets/db-password
+      - .local-secrets/db-root-password:/secrets/db-root-password
+    networks:
+      - backend
+    healthcheck:
+      test: ["CMD", "mysqladmin", "ping", "-h", "127.0.0.1", "--silent"]
+      interval: 5s
+      timeout: 3s
+      retries: 2
+      start_period: 0s
+  # phpmyadmin
+  phpmyadmin:
+    depends_on:
+      - db
+    image: phpmyadmin
+    restart: always
+    ports:
+      - "8080:80"
+    environment:
+      PMA_HOST: db
+    networks:
+      - backend
+volumes:
+  db_data:
+networks:
+  backend:

helmfile.yaml.gotmpl

@@ -33,3 +33,5 @@ releases:
     set:
       - name: scuffbotConfig
         file: config.yaml
+      - name: sqlInitFile
+        file: db/data/init.sql

infra/values.yaml.gotmpl

@@ -10,7 +10,43 @@ deployments:
     environment:
       BOT_TOKEN: "/secrets/bot-token"
       CONFIG_FILE: "/config/config.yaml"
+      DB_DATABASE: "SCUFFBOT"
+      DB_HOST: "service-scuffbot-db"
+      DB_PASSWORD_FILE: "/secrets/db-password"
+      DB_USER: "SCUFFBOT"
     secretProviderClass:
       projectId: "e1420e9b-7c7d-4f54-b916-74d17f594a83"
       secrets:
         - secretKey: "BOT_TOKEN"
+        - secretKey: "DB_PASSWORD"
+
+statefulSets:
+  - name: "scuffbot-db"
+    image: "mysql:9.2.0"
+    updateStrategy: "OnDelete"
+    config:
+      fileName: "init.sql"
+      fileVariable: "sqlInitFile"
+      mountPath: "/docker-entrypoint-initdb.d/"
+    environment:
+      MYSQL_DATABASE: "SCUFFBOT"
+      MYSQL_USER: "SCUFFBOT"
+      MYSQL_PASSWORD_FILE: "/secrets/db-password"
+      MYSQL_ROOT_PASSWORD_FILE: "/secrets/db-root-password"
+    readinessProbe:
+      tcpSocket:
+        port: 3306
+    secretProviderClass:
+      projectId: "e1420e9b-7c7d-4f54-b916-74d17f594a83"
+      secrets:
+        - secretKey: "DB_PASSWORD"
+        - secretKey: "DB_ROOT_PASSWORD"
+    service:
+      type: "ClusterIP"
+      port: 3306
+      targetPort: 3306
+    volumes:
+      - name: "scuffbot-db-longhorn"
+        storageClass: "longhorn"
+        mountPath: "/var/lib/mysql"
+        size: "1Gi"

src/lib/bot/__init__.py

@@ -14,10 +14,12 @@
 with open(os.environ["CONFIG_FILE"], "r", encoding="utf-8") as f:
     config = yaml.safe_load(f)
 
+
 class SCUFFBOT(commands.Bot):
 
     def __init__(self, is_dev):
-        super().__init__(command_prefix="!", owner_id=169402073404669952, intents=discord.Intents.all())
+        super().__init__(command_prefix="/",
+                         owner_id=169402073404669952, intents=discord.Intents.all())
         self.is_dev = is_dev
         self.mode = "DEVELOPMENT" if is_dev else "PRODUCTION"
 
@@ -32,7 +34,6 @@ def setup_logger(self):
         for handler in logging.getLogger().handlers:
             if handler.name == "file" and os.path.isfile('logs/latest.log'):
                 handler.doRollover()
-        logging.getLogger('discord').setLevel(logging.DEBUG)
 
     async def load_cog_manager(self):
         await self.load_extension("src.lib.cogs.Cogs")
@@ -41,14 +42,17 @@ def run(self, bot_token: str):
         super().run(bot_token, log_handler=None)
 
     def create_embed(self, title, description, colour):
-        embed = discord.Embed(title=None, description=description, colour=colour if colour else 0xDC3145, timestamp=discord.utils.utcnow())
-        embed.set_author(name=title if title else None, icon_url=self.avatar_url)
+        embed = discord.Embed(title=None, description=description,
+                              colour=colour if colour else 0xDC3145, timestamp=discord.utils.utcnow())
+        embed.set_author(name=title if title else None,
+                         icon_url=self.avatar_url)
         return embed
 
     #  Doesn't work, need to look into
     @staticmethod
     def has_permissions(**perms):
         original = app_commands.checks.has_permissions(**perms)
+
         async def extended_check(interaction):
             if interaction.guild is None:
                 return False
@@ -63,15 +67,16 @@ async def on_ready(self):
         self.appinfo = await super().application_info()
         self.avatar_url = self.appinfo.icon.url if self.appinfo.icon is not None else None
         self.logger.info(
-            f"Connected on {self.user.name} ({self.mode}) | d.py v{str(discord.__version__)}"
+            f"Connected on {self.user.name} | d.py v{str(discord.__version__)}"
         )
 
     async def on_interaction(self, interaction):
-        self.logger.info(f"[COMMAND] [{interaction.guild} // {interaction.guild.id}] {interaction.user} ({interaction.user.id}) used command {interaction.command.name}")
+        self.logger.info(
+            f"[COMMAND] [{interaction.guild} // {interaction.guild.id}] {interaction.user} ({interaction.user.id}) used command {interaction.command.name}")
 
     async def on_message(self, message):
         await self.wait_until_ready()
-        if(isinstance(message.channel, discord.DMChannel) and message.author.id == self.owner_id):
+        if (isinstance(message.channel, discord.DMChannel) and message.author.id == self.owner_id):
             message_components = message.content.lower().split(" ")
             match message_components[0]:
                 case "sync":

src/lib/cogs/Cogs.py

@@ -8,6 +8,7 @@
 import os
 import traceback
 
+
 class Cogs(commands.Cog):
 
     def __init__(self, bot):
@@ -71,8 +72,8 @@ async def load_cogs(self):
     async def cog_load(self):
         self.logger.info(f"[COG] Loaded {self.__class__.__name__}")
 
-    CogGroup = app_commands.Group(
-        name="cog", description="Manages SCUFFBOT cogs.", guild_ids=[1165195575013163038, 422983658257907732])
+    CogGroup = app_commands.Group(name="cog", description="Manages SCUFFBOT cogs.", guild_ids=[
+                                  1165195575013163038, 422983658257907732])
 
     @CogGroup.command(name="list", description="Lists all cog statuses.")
     @app_commands.checks.has_permissions(manage_guild=True)

src/lib/cogs/ErrorHandler.py

@@ -2,6 +2,7 @@
 import logging
 import traceback
 
+
 class ErrorHandler(commands.Cog):
 
     def __init__(self, bot):
@@ -11,14 +12,17 @@ def __init__(self, bot):
 
     async def cog_load(self):
         self.logger.info(f"[COG] Loaded {self.__class__.__name__}")
-        
+
     async def on_app_command_error(self, interaction, error):
-        embed = self.bot.create_embed("SCUFFBOT ERROR", "An unexpected error has occurred.", 0xFF0000)
-        embed.add_field(name="ERROR:", value="> {}\n\nIf this error is a regular occurrence, please contact {}. This error has been logged.".format(str(error), self.appinfo.owner.mention), inline=False)
+        embed = self.bot.create_embed(
+            "SCUFFBOT ERROR", "An unexpected error has occurred.", 0xFF0000)
+        embed.add_field(name="ERROR:", value="> {}\n\nIf this error is a regular occurrence, please contact {}. This error has been logged.".format(
+            str(error), self.appinfo.owner.mention), inline=False)
         await interaction.response.send_message(embed=embed, ephemeral=True)
-        
+
         self.logger.error(f"[ERROR] Unhandled Error: {error}")
         traceback.print_exc()
 
+
 async def setup(bot):
     await bot.add_cog(ErrorHandler(bot))