Merge branch 'development' into internal-backpack

TF2Autobot · Jul 17, 2023 · b7eb67e · b7eb67e
2 parents 2fc88aa + 89eb808
commit b7eb67e
Show file tree

Hide file tree

Showing 38 changed files with 3,496 additions and 11,394 deletions.
diff --git a/.example/options.json b/.example/options.json
@@ -10,6 +10,9 @@
         "createListings": {
             "enable": true
         },
+        "startHalted": {
+            "enable": false
+        },
         "addFriends": {
             "enable": true
         },
@@ -575,7 +578,8 @@
             "manual": "",
             "failedToCounter": "",
             "takingItemsWithIntentBuy": "",
-            "givingItemsWithIntentSell": ""
+            "givingItemsWithIntentSell": "",
+            "containsKeysOnBothSides": ""
         },
         "accepted": {
             "automatic": {
@@ -787,7 +791,7 @@
             "Chromatic Corruption": "CC 🪀",
             "Spectral Spectrum": "Spec 🔵🔴",
             "Sinister Staining": "Sin 🍈",
-            "Voices From Below": "VFB 🗣️",
+            "Voices from Below": "VFB 🗣️",
             "Team Spirit Footprints": "TS-FP 🔵🔴",
             "Gangreen Footprints": "GG-FP 🟡",
             "Corpse Gray Footprints": "CG-FP 👽",

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ jobs:
         node-version: [16.x, 18.x]
 
     steps:
-    - uses: actions/checkout@v3.3.0
+    - uses: actions/checkout@v3.5.3
     - name: Use Node.js ${{ matrix.node-version }}
       uses: actions/setup-node@v3.6.0
       with:

diff --git a/.github/workflows/docker-commit.yml b/.github/workflows/docker-commit.yml
@@ -28,22 +28,22 @@ jobs:
     name: Tag Commit (node:${{ matrix.node }})
 
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.5.3
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2.1.0
+        uses: docker/setup-qemu-action@v2.2.0
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2.2.1
+        uses: docker/setup-buildx-action@v2.7.0
 
       - name: Login to DockerHub
-        uses: docker/login-action@v2.1.0
+        uses: docker/login-action@v2.2.0
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build final image
-        uses: docker/build-push-action@v3.3.0
+        uses: docker/build-push-action@v4.0.0
         with:
           push: true
           tags: tf2autobot/tf2autobot:${{ github.sha }}-${{ matrix.node }}
diff --git a/.github/workflows/docker-latest-tag.yml b/.github/workflows/docker-latest-tag.yml
@@ -30,22 +30,22 @@ jobs:
     name: Tag Latest (node:${{ matrix.node }})
 
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.5.3
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2.1.0
+        uses: docker/setup-qemu-action@v2.2.0
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2.2.1
+        uses: docker/setup-buildx-action@v2.7.0
 
       - name: Login to DockerHub
-        uses: docker/login-action@v2.1.0
+        uses: docker/login-action@v2.2.0
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build final image
-        uses: docker/build-push-action@v3.3.0
+        uses: docker/build-push-action@v4.0.0
         with:
           push: true
           tags: tf2autobot/tf2autobot:latest-${{ matrix.node }}
diff --git a/.github/workflows/docker-release.tag.yml b/.github/workflows/docker-release.tag.yml
@@ -23,31 +23,31 @@ jobs:
     name: Tag Release (node:${{ matrix.node }})
 
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.5.3
 
       - name: Docker meta
         id: docker_meta
-        uses: docker/metadata-action@v4.3.0
+        uses: docker/metadata-action@v4.6.0
         with:
           images: tf2autobot/tf2autobot
           tags: |
             type=semver,pattern={{version}}-${{ matrix.node }}
             type=semver,pattern={{major}}.{{minor}}-${{ matrix.node }}
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2.1.0
+        uses: docker/setup-qemu-action@v2.2.0
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2.2.1
+        uses: docker/setup-buildx-action@v2.7.0
 
       - name: Login to DockerHub
-        uses: docker/login-action@v2.1.0
+        uses: docker/login-action@v2.2.0
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build and push (node:${{ matrix.node }})
         id: docker
-        uses: docker/build-push-action@v3.3.0
+        uses: docker/build-push-action@v4.0.0
         with:
           push: true
           context: .

diff --git a/README.md b/README.md
@@ -7,8 +7,8 @@ A free and open source fully automated TF2 trading bot advertising on [backpack.
 **TF2Autobot** is an improved and feature rich version of the original **tf2-automatic** made by [Nicklason](https://github.com/Nicklason). You can find out more about the original repository [here](https://github.com/Nicklason/tf2-automatic).
 
 ![GitHub package version](https://img.shields.io/github/package-json/v/idinium96/tf2autobot.svg)
-[![Build Status](https://img.shields.io/github/workflow/status/idinium96/tf2autobot/CI/development)](https://github.com/idinium96/tf2autobot/actions)
-[![Docker Build Status](https://img.shields.io/github/workflow/status/idinium96/tf2autobot/Docker/development?label=docker%20build)](https://github.com/idinium96/tf2autobot/actions)
+[![Build Status](https://img.shields.io/github/actions/workflow/status/TF2Autobot/tf2autobot/ci.yml?branch=development)](https://github.com/idinium96/tf2autobot/actions)
+[![Docker Build Status](https://img.shields.io/github/actions/workflow/status/TF2Autobot/tf2autobot/docker-latest-tag.yml?label=docker%20build)](https://github.com/idinium96/tf2autobot/actions)
 [![GitHub issues](https://img.shields.io/github/issues/idinium96/tf2autobot)](https://github.com/idinium96/tf2autobot/issues)
 [![GitHub forks](https://img.shields.io/github/forks/idinium96/tf2autobot)](https://github.com/idinium96/tf2autobot/network/members)
 [![GitHub stars](https://img.shields.io/github/stars/idinium96/tf2autobot)](https://github.com/idinium96/tf2autobot/stargazers)