Update rustlabs

.github/workflows/docker-publish.yml

@@ -1,28 +1,25 @@
 name: Docker
 
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-
 on:
   push:
-    branches: [ master ]
-    # Publish semver tags as releases.
-    tags: [ 'v*.*.*' ]
+    branches:
+      - master
+    tags:
+      - "v*.*.*"
   pull_request:
-    branches: [ main ]
+    branches:
+      - master
 
 env:
-  # Use docker.io for Docker Hub if empty
   REGISTRY: ghcr.io
-  # github.repository as <account>/<repo>
   IMAGE_NAME: ${{ github.repository }}
 
+concurrency:
+  group: docker-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -32,8 +29,6 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      # Login against a Docker registry except on PR
-      # https://github.com/docker/login-action
       - name: Log into registry ${{ env.REGISTRY }}
         if: github.event_name != 'pull_request'
         uses: docker/login-action@v3
@@ -42,16 +37,12 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      # Extract metadata (tags, labels) for Docker
-      # https://github.com/docker/metadata-action
       - name: Extract Docker metadata
         id: meta
         uses: docker/metadata-action@v5
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
 
-      # Build and push Docker image with Buildx (don't push on PR)
-      # https://github.com/docker/build-push-action
       - name: Build and push Docker image
         uses: docker/build-push-action@v6
         with:

.github/workflows/translate-language.yml

@@ -0,0 +1,59 @@
+name: Translate language files
+
+on:
+  pull_request:
+    branches:
+      - master
+
+permissions:
+  contents: write
+  pull-requests: write
+
+concurrency:
+  group: translate-pr-${{ github.event.pull_request.number }}
+  cancel-in-progress: true
+
+jobs:
+  translate-language:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout PR branch
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.ref }}
+          fetch-depth: 0
+
+      - name: Setup Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.11"
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install requests
+
+      - name: Run translation script
+        env:
+          DEEPL_API_KEY: ${{ secrets.DEEPL_API_KEY }}
+        run: |
+          python src/external/translate_language_json.py \
+            --source src/languages/en.json \
+            --output-dir src/languages \
+            --provider deepl
+
+      - name: Commit translation changes
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+
+          git add src/languages/*.json
+
+          if git diff --cached --quiet; then
+            echo "No translation changes to commit."
+            exit 0
+          fi
+
+          git commit -m "chore(i18n): update translations"
+          git push origin HEAD:${{ github.event.pull_request.head.ref }}

README.md

@@ -3,12 +3,11 @@
 </p>
 
 <p align="center">
-<a href="https://discord.gg/vcrKbKVAbc"><img src="https://img.shields.io/badge/Discord-Alexemanuel-%237289DA?style=flat&logo=discord" alt="discord"/></a>
-<a href="https://www.reddit.com/user/Alexemanuelol"><img src="https://img.shields.io/badge/Reddit-Alexemanuelol-FF4500?style=flat&logo=reddit" alt="reddit"/></a>
+<a href="https://discord.gg/vcrKbKVAbc"><img src="https://img.shields.io/badge/Discord-Rust++-%237289DA?style=flat&logo=discord" alt="discord"/></a>
 <a href="https://ko-fi.com/alexemanuelol"><img src="https://img.shields.io/badge/Donate%20a%20Coffee-alexemanuelol-yellow?style=flat&logo=buy-me-a-coffee" alt="donate on ko-fi"/></a>
 
 <p align="center">
-<a href="https://crowdin.com/project/rustplusplus"><img src="https://badges.crowdin.net/rustplusplus/localized.svg" alt="donate on ko-fi"/></a>
+<a href="https://crowdin.com/project/rustplusplus"><img src="https://badges.crowdin.net/rustplusplus/localized.svg" alt="Crowdin"/></a>
 </p>
 
 <p align="center">
@@ -42,7 +41,7 @@ A NodeJS Discord Bot that uses the [rustplus.js](https://github.com/liamcottle/r
 
 ## **Documentation**
 
-> Documentation can be found [here](https://github.com/alexemanuelol/rustplusplus/blob/master/docs/documentation.md). The documentation explains the features as well as `how to setup the bot`, so make sure to take a look at it 😉
+> Documentation can be found [here](https://github.com/faithix/rustplusplus/blob/master/docs/documentation.md). The documentation explains the features as well as `how to setup the bot`, so make sure to take a look at it 😉
 
 ## **Credentials**
 
@@ -69,7 +68,7 @@ or
 
 ## **Running via docker**
 
-    $ docker run --rm -it -v ${pwd}/credentials:/app/credentials -v ${pwd}/instances:/app/instances -v ${pwd}/logs:/app/logs -e RPP_DISCORD_CLIENT_ID=111....1111 -e RPP_DISCORD_TOKEN=token --name rpp ghcr.io/alexemanuelol/rustplusplus
+    $ docker run --rm -it -v ${pwd}/credentials:/app/credentials -v ${pwd}/instances:/app/instances -v ${pwd}/logs:/app/logs -e RPP_DISCORD_CLIENT_ID=111....1111 -e RPP_DISCORD_TOKEN=token --name rpp ghcr.io/faithix/rustplusplus
 
 or
 
@@ -82,3 +81,5 @@ Make sure you use the correct values for DISCORD_CLIENT_ID as well as DISCORD_TO
 **liamcottle**@GitHub - for the [rustplus.js](https://github.com/liamcottle/rustplus.js) library.
 <br>
 **.Vegas.#4844**@Discord - for the awesome icons!
+<br>
+**alexemanuelol**@GitHub - for the Main Development of the [Rust++ Bot](https://github.com/alexemanuelol/rustPlusPlus).

docker-compose.yml

@@ -1,13 +1,13 @@
-version: '3.3'
 services:
-    app:
-        volumes:
-            - ./credentials:/app/credentials
-            - ./instances:/app/instances
-            - ./logs:/app/logs
-            - ./maps:/app/maps
-        environment:
-            - RPP_DISCORD_CLIENT_ID=111....1111
-            - RPP_DISCORD_TOKEN=token
-        container_name: rpp
-        image: ghcr.io/alexemanuelol/rustplusplus
+  rustplusbot:
+    image: ghcr.io/faithix/rustplusplus:master
+    container_name: rustplusbot
+    environment:
+      - RPP_DISCORD_TOKEN=TOKEN
+      - RPP_DISCORD_CLIENT_ID=CLIENT_ID
+    volumes:
+      - ./logs:/app/logs
+      - ./instances:/app/instances
+      - ./credentials:/app/credentials
+      - ./maps:/app/maps
+    restart: unless-stopped

docs/commands.md

@@ -17,6 +17,7 @@ Slash Command | Description
 [**/credentials**](commands.md#credentials) | Set/Clear the Credentials for the user account.
 [**/decay**](commands.md#decay) | Display the decay time of an item.
 [**/help**](commands.md#help) | Display help message.
+[**/ingameaccess**](commands.md#ingameaccess) | Set in-game command access mode.
 [**/item**](commands.md#item) | Get the details of an item.
 [**/leader**](commands.md#leader) | Give or take the leadership from/to a team member.
 [**/map**](commands.md#map) | Get the currently connected server map image.
@@ -30,6 +31,7 @@ Slash Command | Description
 [**/switch**](commands.md#switch) | Operations on Smart Switches.
 [**/upkeep**](commands.md#upkeep) | Get the upkeep cost of an item.
 [**/uptime**](commands.md#uptime) | Display uptime of the bot and server.
+[**/whitelist**](commands.md#whitelist) | Whitelist a user for in-game bot commands.
 [**/voice**](commands.md#voice) | Operations on Voice Feature.
 
 
@@ -79,6 +81,17 @@ Subcommand | Options | Description | Required
 ![Discord Slash Command blacklist Image](images/slash_commands/blacklist.png)
 
 
+## **/ingameaccess**
+
+> **Set in-game command access mode.**
+
+Subcommand | Options | Description | Required
+---------- | ------- | ----------- | --------
+`mode` |   | Set access mode for in-game commands. |  
+  | `mode` | Select blacklist or whitelist mode. | `True`
+`show` |   | Show current in-game command access mode. |  
+
+
 ## **/cctv**
 
 > **Posts CCTV codes for a monument.**
@@ -329,6 +342,18 @@ Subcommand | Options | Description | Required
 
 ![Discord Slash Command uptime Image](images/slash_commands/uptime.png)
 
+## **/whitelist**
+
+> **Whitelist a user for in-game bot commands.**
+
+Subcommand | Options | Description | Required
+---------- | ------- | ----------- | --------
+`add` |   | Add user to the whitelist. |  
+  | `steamid` | The steamid of the user. | `True`
+`remove` |   | Remove user from the whitelist. |  
+  | `steamid` | The steamid of the user. | `True`
+`show` |   | Show whitelisted users. |  
+
 ## **/voice**
 
 > **Operations on Voice Feature.**
@@ -729,4 +754,4 @@ Subcommand | Description | Required
 > **Get the time since it was wiped.**
 <br>Command: `!wipe`
 
-![In-Game Command wipe Image](images/ingame_commands/wipe_ingame.png)
+![In-Game Command wipe Image](images/ingame_commands/wipe_ingame.png)

docs/full_list_features.md

@@ -9,6 +9,7 @@
 - **/credentials** - Setup Credentials.
 - **/decay** - Display the decay time of an item.
 - **/help** - Get help message.
+- **/ingameaccess** - Set in-game command access mode.
 - **/item** - Get the details of an item.
 - **/leader** - Transfer leadership.
 - **/map** - Display the In-Game Map.
@@ -22,6 +23,7 @@
 - **/switch** - Change image of paired Storage Monitors.
 - **/upkeep** - Get the upkeep cost of an item.
 - **/uptime** - Get the current uptime for rustplusplus.
+- **/whitelist** - Whitelist a user for in-game bot commands.
 - **/voice** - Let rustplusplus join voicechat.
 
 ## In-Game Commands
@@ -100,4 +102,4 @@
 - Communicate with teammates from In-Game to Discord and vice versa.
 - Get activity information in the `activity` Text-Channel on Discord. Information such as Smart Devices not reachable, Teammate connect/disconnect/leave/join/death, Smart Alarms notify when triggered, Server went offline/online, Map Wipe Detection, Storage Monitor Decay Notification, Tracker notifications etc...
 - Create Battlemetrics Trackers to track players or groups.
-- Get Facepunch news in Discord.
+- Get Facepunch news in Discord.

package.json

@@ -1,6 +1,6 @@
 {
     "name": "rustplusplus",
-    "version": "1.22.0",
+    "version": "1.24.2",
     "description": "A NodeJS Discord Bot that uses the rustplus.js library to utilize the power of the Rust+ Companion App with additional Quality-of-Life features.",
     "main": "index.ts",
     "scripts": {
@@ -10,18 +10,18 @@
     },
     "repository": {
         "type": "git",
-        "url": "https://github.com/alexemanuelol/rustplusplus.git"
+        "url": "https://github.com/faithix/rustplusplus.git"
     },
-    "author": "Alexemanuelol",
+    "author": "FaiThiX forked from Alexemanuelol",
     "license": "SEE LICENSE IN LICENSE",
     "bugs": {
-        "url": "https://github.com/alexemanuelol/rustplusplus/issues"
+        "url": "https://github.com/faithix/rustplusplus/issues"
     },
-    "homepage": "https://github.com/alexemanuelol/rustplusplus#readme",
-    "dependencies": {
-        "@discordjs/rest": "^2.5.1",
-        "@discordjs/voice": "^0.18.0",
-        "@formatjs/intl": "^2.6.9",
+    "homepage": "https://github.com/faithix/rustplusplus#readme",
+    "dependencies": {
+        "@discordjs/rest": "^2.5.1",
+        "@discordjs/voice": "^0.18.0",
+        "@formatjs/intl": "^2.6.9",
         "@liamcottle/push-receiver": "^0.0.4",
         "@liamcottle/rustplus.js": "git+https://github.com/alexemanuelol/rustplus.js.git#089cfd3db1b04709911948bce669273139c6a124",
         "axios": "^1.3.4",
@@ -30,16 +30,19 @@
         "discord.js": "^14.21.0",
         "ffmpeg-static": "^5.1.0",
         "gm": "^1.25.0",
-        "jimp": "^0.22.7",
-        "libsodium-wrappers": "^0.7.11",
-        "lodash": "^4.17.21",
-        "translate": "^1.4.1",
-        "ts-node": "^10.9.2",
-        "typescript": "^5.8.3",
-        "winston": "^3.8.2"
-    },
-    "resolutions": {
-        "jpeg-js": "0.4.4",
-        "protobufjs": "7.2.4"
+        "jimp": "^0.22.7",
+        "libsodium-wrappers": "^0.7.11",
+        "lodash": "^4.17.21",
+        "translate": "^1.4.1",
+        "ts-node": "^10.9.2",
+        "typescript": "^5.8.3",
+        "winston": "^3.8.2"
+    },
+    "devDependencies": {
+        "playwright-core": "^1.58.2"
+    },
+    "resolutions": {
+        "jpeg-js": "0.4.4",
+        "protobufjs": "7.2.4"
     }
-}
+}