feat: adds rgl variants and only show variants related to that guild (#225)

* refactor(handler): simplify region selection logic and remove 32-bit variant restriction for Santiago

* refact(CreateServer): if guild has special variants, only show those

* feat(rgl): adds RGL Standard and RGL Pro variants

Author: sonikro

config/default.json

@@ -280,6 +280,30 @@
             "admins": [
                 "STEAM_0:1:40459123"
             ]
+        },
+        "rgl-standard": {
+            "displayName": "RGL Standard",
+            "hostname": "RGL | {region} @ TF2-QuickServer",
+            "image": "sonikro/fat-tf2-standard-competitive-i386:latest",
+            "defaultCfgs": {
+                "pl": "rgl_HL_stopwatch.cfg",
+                "koth": "rgl_6s_koth.cfg",
+                "5cp": "rgl_6s_5cp_match_half1.cfg",
+                "ultiduo": "rgl_ud_ultiduo.cfg"
+            },
+            "guildId": "137337002113761281"
+        },
+        "rgl-pro": {
+            "displayName": "RGL PRO",
+            "hostname": "RGL Pro | {region} @ TF2-QuickServer",
+            "image": "sonikro/fat-tf2-standard-competitive-i386:latest",
+            "defaultCfgs": {
+                "pl": "rgl_HL_stopwatch.cfg",
+                "koth": "rgl_6s_koth_pro.cfg",
+                "5cp": "rgl_6s_5cp_match_pro.cfg",
+                "ultiduo": "rgl_ud_ultiduo.cfg"
+            },
+            "guildId": "137337002113761281"
         }
     },
     "discord": {

packages/entrypoints/src/commands/CreateServer/handler.test.ts

@@ -14,11 +14,7 @@ import { createServerCommandHandlerFactory } from "./handler";
 describe("createServerCommandHandler", () => {
     const chance = new Chance();
 
-    // Helper to get a non-Santiago region for tests
-    const getTestRegion = () => {
-        const nonSantiagoRegions = Object.values(Region).filter(r => r !== Region.SA_SANTIAGO_1);
-        return chance.pickone(nonSantiagoRegions);
-    };
+    const getTestRegion = () => chance.pickone(Object.values(Region));
 
     const createHandler = () => {
         const interaction = mock<ChatInputCommandInteraction>();
@@ -353,35 +349,57 @@ describe("createServerCommandHandler", () => {
         expect(backgroundTaskQueue.enqueue).not.toHaveBeenCalled();
     });
 
-    it("should only show variants with matching guildId or no guildId", async () => {
+    it("should only show variants for the requesting guild", async () => {
         const { handler, interaction } = createHandler();
         const region = getTestRegion();
         const guildId = interaction.guildId;
 
-        const variants = getVariantConfigs();
+        const allVariants = getVariantConfigs();
+        const guildSpecificVariants = allVariants.filter(v => v.config.guildId === guildId);
+        const sharedVariants = allVariants.filter(v => !v.config.guildId);
+        
+        const expectedVariants = guildSpecificVariants.length > 0
+            ? guildSpecificVariants
+            : sharedVariants;
+        
+        const expectedLabels = expectedVariants.map(v => v.config.displayName || v.name);
 
-        const variantsWithGuildId = variants.filter(v => v.config.guildId === guildId);
-        const variantsWithoutGuildId = variants.filter(v => !v.config.guildId);
-        const expectedVariants = [...variantsWithoutGuildId]
-            .map(v => v.config.displayName || v.name);
-        const expectedHiddenVariants = variantsWithGuildId.map(v => v.config.displayName || v.name);
         when(interaction.options.getString)
             .calledWith("region")
             .thenReturn(region);
 
         interaction.reply = vi.fn().mockResolvedValue(undefined) as any;
-        // Use the message and collector from createHandler
 
-        // Call the command handler
         await handler(interaction);
-        // Check that only the correct variants are shown
+
         const replyCall = (interaction.reply as any).mock.calls[0][0];
-        expect(replyCall.components.flatMap((row: any) => row.components.map((btn: any) => btn.data.label))).toEqual(
-            expect.arrayContaining(expectedVariants)
-        );
-        expect(replyCall.components.flatMap((row: any) => row.components.map((btn: any) => btn.data.label))).not.toContain(
-            expectedHiddenVariants
-        );
+        const displayedVariants = replyCall.components.flatMap((row: any) => row.components.map((btn: any) => btn.data.label));
+        
+        expect(displayedVariants).toEqual(expectedLabels);
+    });
+
+    it("should show all default variants if a guild has no specific variants", async () => {
+        const { handler, interaction } = createHandler();
+        const region = getTestRegion();
+        const randomGuildId = chance.guid();
+        interaction.guildId = randomGuildId;
+
+        const allVariants = getVariantConfigs();
+        const sharedVariants = allVariants.filter(v => !v.config.guildId);
+        const expectedLabels = sharedVariants.map(v => v.config.displayName || v.name);
+
+        when(interaction.options.getString)
+            .calledWith("region")
+            .thenReturn(region);
+
+        interaction.reply = vi.fn().mockResolvedValue(undefined) as any;
+
+        await handler(interaction);
+
+        const replyCall = (interaction.reply as any).mock.calls[0][0];
+        const displayedVariants = replyCall.components.flatMap((row: any) => row.components.map((btn: any) => btn.data.label));
+        
+        expect(displayedVariants).toEqual(expectedLabels);
     });
 
     it("should reply with abort message if server creation is aborted by the user", async () => {
@@ -465,24 +483,5 @@ describe("createServerCommandHandler", () => {
 
 
 
-    it("it should only show 64bit variants for Santiago", async () => {
-        const { handler, interaction } = createHandler();
-
-        interaction.guildId = "1323509685264842752" // InsertCoin
-
-        when(interaction.options.getString)
-            .calledWith("region")
-            .thenReturn(Region.SA_SANTIAGO_1);
-
-        // Mock admin permissions to bypass the Santiago block
-
-        interaction.reply = vi.fn().mockResolvedValue(undefined) as any;
-
-        await handler(interaction);
 
-        const replyCall = (interaction.reply as any).mock.calls[0][0];
-        const displayedVariants = replyCall.components.flatMap((row: any) => row.components.map((btn: any) => btn.data.label));
-        
-        expect(displayedVariants).toEqual(['Standard Competitive', 'InsertCoin Mixes']);
-    });
 });

packages/entrypoints/src/commands/CreateServer/handler.ts

@@ -27,18 +27,14 @@ export function createServerCommandHandlerFactory(dependencies: {
         const region = interaction.options.getString('region') as Region;
 
         // Step 1: Show variant buttons
-        const variants = getVariantConfigs().filter(variant => {
-            // Filter by guildId
-            if (variant.config.guildId && variant.config.guildId !== interaction.guildId) {
-                return false;
-            }
-
-            // Do not show 32-bit variants in Santiago
-            if (region === Region.SA_SANTIAGO_1 && !variant.config.image.includes("amd64")) {
-                return false;
-            }
-            return true;
-        });
+        const allVariants = getVariantConfigs();
+        const guildSpecificVariants = allVariants.filter(variant => 
+            variant.config.guildId === interaction.guildId
+        );
+        
+        const variants = guildSpecificVariants.length > 0 
+            ? guildSpecificVariants
+            : allVariants.filter(variant => !variant.config.guildId);
 
         const rows = [];
         for (let i = 0; i < variants.length; i += 5) {