Merge remote-tracking branch 'origin/master' into better_bots

dr4fters · Nov 12, 2024 · d2d7319 · d2d7319
2 parents 6f836f0 + a5533dc
commit d2d7319
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 28 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -4,25 +4,27 @@
 
 version: 2
 updates:
-  # Enable version updates for npm
-  - package-ecosystem: "npm"
-    # Look for `package.json` and `lock` files in the `root` directory
-    directory: "/"
-    # Check the npm registry for updates once a week
-    schedule:
-      interval: "weekly"
-    # Limit the amout of open PR's (default = 5, disabled = 0, security updates are not impacted)
-    open-pull-requests-limit: 5
-
+  # To reduce noise, CURRENTLY DISABLED non-critical-security updates until the repo is more maintained again
+  #
+  ## Enable version updates for npm
+  #- package-ecosystem: "npm"
+  #  # Look for `package.json` and `lock` files in the `root` directory
+  #  directory: "/"
+  #  # Check the npm registry for updates once a week
+  #  schedule:
+  #    interval: "weekly"
+  #  # Limit the amout of open PR's (default = 5, disabled = 0, security updates are not impacted)
+  #  open-pull-requests-limit: 5
+  #
   # Enable version updates for Docker
-  - package-ecosystem: "docker"
-    # Look for a `Dockerfile` in the `root` directory
-    directory: "/"
-    # Check for updates once a week
-    schedule:
-      interval: "weekly"
-    # Limit the amout of open PR's (default = 5, disabled = 0, security updates are not impacted)
-    open-pull-requests-limit: 1
+  #- package-ecosystem: "docker"
+  #  # Look for a `Dockerfile` in the `root` directory
+  #  directory: "/"
+  #  # Check for updates once a week
+  #  schedule:
+  #    interval: "weekly"
+  #  # Limit the amout of open PR's (default = 5, disabled = 0, security updates are not impacted)
+  #  open-pull-requests-limit: 1
 
   # Enable version updates for GitHub Actions
   - package-ecosystem: "github-actions"

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -27,10 +27,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{matrix.node_version}}
 
@@ -50,7 +50,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Build
         run: docker build --tag dr4ft-app .
@@ -74,10 +74,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 18
 

diff --git a/backend/game.js b/backend/game.js
@@ -589,7 +589,7 @@ module.exports = class Game extends Room {
       this.players.forEach(player => {
         if (!player.isBot) {
           player.exit();
-          player.err("Whoops! An error occurred while starting the game. Please try again later. If the problem persists, you can open an issue on the Github repository: <a href='https://github.com/dr4fters/dr4ft/issues'>https://github.com/dr4fters/dr4ft/issues</a>");
+          player.err("Whoops! An error occurred while starting the game. Please try again later. If the problem persists, you can open an issue on the Github repository: <a href='https://github.com/dr4fters/dr4ft/issues' target='_blank' rel='noreferrer'>https://github.com/dr4fters/dr4ft/issues</a>");
         }
       });
       Rooms.delete(this.id);

diff --git a/frontend/src/config.js b/frontend/src/config.js
@@ -14,7 +14,7 @@ export const STRINGS = {
     FOOTER:
       <div style={{ padding: 10 }}>
         Contributions welcome! &nbsp;
-        <a href='https://github.com/dr4fters/dr4ft'>
+        <a href='https://github.com/dr4fters/dr4ft' target='_blank' rel='noreferrer'>
           <img
             src='https://upload.wikimedia.org/wikipedia/commons/9/91/Octicons-mark-github.svg'
             alt='GitHub' title='GitHub Repository' align='top' height='18'

diff --git a/frontend/src/lobby/CubeList.jsx b/frontend/src/lobby/CubeList.jsx
@@ -47,18 +47,18 @@ const CubeCobra = () => {
     try {
       const {data: {cards}} = await axios.get(`https://cubecobra.com/cube/api/cubeJSON/${cubeId}`);
 
-      setCubeImportMessage(`Fetching card versions... (0/${cards.length})`);
+      setCubeImportMessage(`Fetching card versions... (0/${cards.mainboard.length})`);
 
       let totalCards = 0;
       const cardNames = (await Promise.all(
-        _.chunk(cards, 75)
+        _.chunk(cards.mainboard, 75)
           .map(async (chunk) => {
             const {data} = await axios.post(
               'https://api.scryfall.com/cards/collection',
               {identifiers: chunk.map((card) => ({id: card.cardID}))});
 
             totalCards += data.data.length;
-            setCubeImportMessage(`Fetching card versions... (${totalCards}/${cards.length})`);
+            setCubeImportMessage(`Fetching card versions... (${totalCards}/${cards.mainboard.length})`);
 
             return data.data.map((card) => {
               const name = card.card_faces ? card.card_faces[0].name : card.name;