Merge branch 'development' into internal-backpack

TF2Autobot · Jan 17, 2023 · 2fc88aa · 2fc88aa
2 parents 436eebd + fafebc2
commit 2fc88aa
Show file tree

Hide file tree

Showing 29 changed files with 622 additions and 410 deletions.
diff --git a/.example/options.json b/.example/options.json
@@ -18,7 +18,8 @@
         },
         "counterOffer": {
             "enable": true,
-            "skipIncludeMessage": false
+            "skipIncludeMessage": false,
+            "autoDeclineLazyOffer": false
         },
         "skipItemsInTrade": {
             "enable": true
@@ -49,6 +50,10 @@
         },
         "pricecheckAfterTrade": {
             "enable": true
+        },
+        "prefixes": {
+            "steam": "!",
+            "discord": "!"
         }
     },
     "sendAlert": {
@@ -430,6 +435,14 @@
         },
         "additionalNotes": ""
     },
+    "inventoryApis": {
+        "steamSupply": {
+            "enable": false
+        },
+        "steamApis": {
+            "enable": false
+        }
+    },
     "discordChat": {
         "online": {
             "type": "LISTENING",
@@ -510,6 +523,29 @@
         "sendStats": {
             "enable": false,
             "url": ""
+        },
+        "sendTf2Events": {
+            "systemMessage": {
+                "enable": true,
+                "url": "",
+                "custom": {
+                    "content": ""
+                }
+            },
+            "displayNotification": {
+                "enable": true,
+                "url": "",
+                "custom": {
+                    "content": ""
+                }
+            },
+            "itemBroadcast": {
+                "enable": true,
+                "url": "",
+                "custom": {
+                    "content": ""
+                }
+            }
         }
     },
     "customMessage": {

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

diff --git a/.github/workflows/docker-commit.yml b/.github/workflows/docker-commit.yml
@@ -28,7 +28,7 @@ jobs:
     name: Tag Commit (node:${{ matrix.node }})
 
     steps:
-      - uses: actions/checkout@v3.2.0
+      - uses: actions/checkout@v3.3.0
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2.1.0
@@ -43,7 +43,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build final image
-        uses: docker/build-push-action@v3.2.0
+        uses: docker/build-push-action@v3.3.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,7 +30,7 @@ jobs:
     name: Tag Latest (node:${{ matrix.node }})
 
     steps:
-      - uses: actions/checkout@v3.2.0
+      - uses: actions/checkout@v3.3.0
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2.1.0
@@ -45,7 +45,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build final image
-        uses: docker/build-push-action@v3.2.0
+        uses: docker/build-push-action@v3.3.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,11 +23,11 @@ jobs:
     name: Tag Release (node:${{ matrix.node }})
 
     steps:
-      - uses: actions/checkout@v3.2.0
+      - uses: actions/checkout@v3.3.0
 
       - name: Docker meta
         id: docker_meta
-        uses: docker/metadata-action@v4.1.1
+        uses: docker/metadata-action@v4.3.0
         with:
           images: tf2autobot/tf2autobot
           tags: |
@@ -47,7 +47,7 @@ jobs:
 
       - name: Build and push (node:${{ matrix.node }})
         id: docker
-        uses: docker/build-push-action@v3.2.0
+        uses: docker/build-push-action@v3.3.0
         with:
           push: true
           context: .