From acf165a119900069d16f736ad50a322017e69372 Mon Sep 17 00:00:00 2001 From: Noah Date: Wed, 10 Nov 2021 21:18:49 -0600 Subject: [PATCH 01/24] Add Button Emoji --- Events/ready.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Events/ready.js b/Events/ready.js index 24bfa7f..40eb74c 100644 --- a/Events/ready.js +++ b/Events/ready.js @@ -104,7 +104,8 @@ module.exports = new Event("ready", (client) => { let button = new Discord.MessageButton() .setLabel(panelconfig.ButtonLabel) .setCustomId("openticket") - .setStyle(panelconfig.ButtonColour); + .setStyle(panelconfig.ButtonColour) + .setEmoji(panelconfig.ButtonEmoji); let row = new Discord.MessageActionRow().addComponents(button); From 13972119a8ab1686a0aa72ad156b5de146bf3ed9 Mon Sep 17 00:00:00 2001 From: Noah Date: Wed, 10 Nov 2021 21:21:05 -0600 Subject: [PATCH 02/24] Update package-lock.json --- package-lock.json | 199 ++++++++++++++++++++++++++-------------------- 1 file changed, 114 insertions(+), 85 deletions(-) diff --git a/package-lock.json b/package-lock.json index 96e00a2..5effeb9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,35 +14,28 @@ } }, "node_modules/@discordjs/builders": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/@discordjs/builders/-/builders-0.6.0.tgz", - "integrity": "sha512-mH3Gx61LKk2CD05laCI9K5wp+a3NyASHDUGx83DGJFkqJlRlSV5WMJNY6RS37A5SjqDtGMF4wVR9jzFaqShe6Q==", + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/@discordjs/builders/-/builders-0.8.2.tgz", + "integrity": "sha512-/YRd11SrcluqXkKppq/FAVzLIPRVlIVmc6X8ZklspzMIHDtJ+A4W37D43SHvLdH//+NnK+SHW/WeOF4Ts54PeQ==", "dependencies": { - "@sindresorhus/is": "^4.0.1", - "discord-api-types": "^0.22.0", + "@sindresorhus/is": "^4.2.0", + "discord-api-types": "^0.24.0", "ow": "^0.27.0", "ts-mixer": "^6.0.0", "tslib": "^2.3.1" }, "engines": { - "node": ">=14.0.0", + "node": ">=16.0.0", "npm": ">=7.0.0" } }, - "node_modules/@discordjs/builders/node_modules/discord-api-types": { - "version": "0.22.0", - "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.22.0.tgz", - "integrity": "sha512-l8yD/2zRbZItUQpy7ZxBJwaLX/Bs2TGaCthRppk8Sw24LOIWg12t9JEreezPoYD0SQcC2htNNo27kYEpYW/Srg==", - "engines": { - "node": ">=12" - } - }, "node_modules/@discordjs/collection": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/@discordjs/collection/-/collection-0.2.1.tgz", - "integrity": "sha512-vhxqzzM8gkomw0TYRF3tgx7SwElzUlXT/Aa41O7mOcyN6wIJfj5JmDWaO5XGKsGSsNx7F3i5oIlrucCCWV1Nog==", + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@discordjs/collection/-/collection-0.3.2.tgz", + "integrity": "sha512-dMjLl60b2DMqObbH1MQZKePgWhsNe49XkKBZ0W5Acl5uVV43SN414i2QfZwRI7dXAqIn8pEWD2+XXQFn9KWxqg==", "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0", + "npm": ">=7.0.0" } }, "node_modules/@discordjs/form-data": { @@ -59,9 +52,9 @@ } }, "node_modules/@sapphire/async-queue": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/@sapphire/async-queue/-/async-queue-1.1.7.tgz", - "integrity": "sha512-EBRERa9NqK/EV6DIPBVtjjdHBsu/DSdMuYAydmoIyIPONzp0UAxf2G6JGJ52WkiONtPRx6KNuqB5Q8dm14fwyw==", + "version": "1.1.9", + "resolved": "https://registry.npmjs.org/@sapphire/async-queue/-/async-queue-1.1.9.tgz", + "integrity": "sha512-CbXaGwwlEMq+l1TRu01FJCvySJ1CEFKFclHT48nIfNeZXaAAmmwwy7scUKmYHPUa3GhoMp6Qr1B3eAJux6XgOQ==", "engines": { "node": ">=v14.0.0", "npm": ">=7.0.0" @@ -79,9 +72,18 @@ } }, "node_modules/@types/node": { - "version": "16.11.4", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.4.tgz", - "integrity": "sha512-TMgXmy0v2xWyuCSCJM6NCna2snndD8yvQF67J29ipdzMcsPa9u+o0tjF5+EQNdhcuZplYuouYqpc4zcd5I6amQ==" + "version": "16.11.7", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.7.tgz", + "integrity": "sha512-QB5D2sqfSjCmTuWcBWyJ+/44bcjO7VbjSbOE0ucoVbAsSNQc4Lt6QkgkVXkTDwkL4z/beecZNDvVX15D4P8Jbw==" + }, + "node_modules/@types/node-fetch": { + "version": "2.5.12", + "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.12.tgz", + "integrity": "sha512-MKgC4dlq4kKNa/mYrwpKfzQMB5X3ee5U6fSprkKpToBqBmX4nFZL9cW5jl6sWn+xpRJ7ypWh2yyqqr8UUCstSw==", + "dependencies": { + "@types/node": "*", + "form-data": "^3.0.0" + } }, "node_modules/@types/ws": { "version": "8.2.0", @@ -129,24 +131,25 @@ } }, "node_modules/discord-api-types": { - "version": "0.23.1", - "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.23.1.tgz", - "integrity": "sha512-igWmn+45mzXRWNEPU25I/pr8MwxHb767wAr51oy3VRLRcTlp5ADBbrBR0lq3SA1Rfw3MtM4TQu1xo3kxscfVdQ==", + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.24.0.tgz", + "integrity": "sha512-X0uA2a92cRjowUEXpLZIHWl4jiX1NsUpDhcEOpa1/hpO1vkaokgZ8kkPtPih9hHth5UVQ3mHBu/PpB4qjyfJ4A==", "engines": { "node": ">=12" } }, "node_modules/discord.js": { - "version": "13.2.0", - "resolved": "https://registry.npmjs.org/discord.js/-/discord.js-13.2.0.tgz", - "integrity": "sha512-nyxUvL8wuQG38zx13wUMkpcA8koFszyiXdkSLwwM9opKW2LC2H5gD0cTZxImeJ6GtEnKPWT8xBiE8lLBmbNIhw==", + "version": "13.3.1", + "resolved": "https://registry.npmjs.org/discord.js/-/discord.js-13.3.1.tgz", + "integrity": "sha512-zn4G8tL5+tMV00+0aSsVYNYcIfMSdT2g0nudKny+Ikd+XKv7m6bqI7n3Vji0GIRqXDr5ArPaw+iYFM2I1Iw3vg==", "dependencies": { - "@discordjs/builders": "^0.6.0", - "@discordjs/collection": "^0.2.1", + "@discordjs/builders": "^0.8.1", + "@discordjs/collection": "^0.3.2", "@discordjs/form-data": "^3.0.1", - "@sapphire/async-queue": "^1.1.5", + "@sapphire/async-queue": "^1.1.8", + "@types/node-fetch": "^2.5.12", "@types/ws": "^8.2.0", - "discord-api-types": "^0.23.1", + "discord-api-types": "^0.24.0", "node-fetch": "^2.6.1", "ws": "^8.2.3" }, @@ -169,6 +172,19 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/form-data": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz", + "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/is-obj": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", @@ -194,28 +210,28 @@ "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=" }, "node_modules/mime-db": { - "version": "1.50.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.50.0.tgz", - "integrity": "sha512-9tMZCDlYHqeERXEHO9f/hKfNXhre5dK2eE/krIvUjZbS2KPcqGDfNShIWS1uW9XOTKQKqK6qbeOci18rbfW77A==", + "version": "1.51.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz", + "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==", "engines": { "node": ">= 0.6" } }, "node_modules/mime-types": { - "version": "2.1.33", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.33.tgz", - "integrity": "sha512-plLElXp7pRDd0bNZHw+nMd52vRYjLwQjygaNg7ddJ2uJtTlmnTCjWuPKxVu6//AdaRuME84SvLW91sIkBqGT0g==", + "version": "2.1.34", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz", + "integrity": "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==", "dependencies": { - "mime-db": "1.50.0" + "mime-db": "1.51.0" }, "engines": { "node": ">= 0.6" } }, "node_modules/node-fetch": { - "version": "2.6.5", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.5.tgz", - "integrity": "sha512-mmlIVHJEu5rnIxgEgez6b9GgWXbkZj5YZ7fx+2r94a2E+Uirsp6HsPTPlomfdHtpt/B0cdKviwkoaM6pyvUOpQ==", + "version": "2.6.6", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.6.tgz", + "integrity": "sha512-Z8/6vRlTUChSdIgMa51jxQ4lrw/Jy5SOW10ObaA47/RElsAN2c5Pn8bTgFGWn/ibwzXTE8qwr1Yzx28vsecXEA==", "dependencies": { "whatwg-url": "^5.0.0" }, @@ -313,28 +329,21 @@ }, "dependencies": { "@discordjs/builders": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/@discordjs/builders/-/builders-0.6.0.tgz", - "integrity": "sha512-mH3Gx61LKk2CD05laCI9K5wp+a3NyASHDUGx83DGJFkqJlRlSV5WMJNY6RS37A5SjqDtGMF4wVR9jzFaqShe6Q==", + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/@discordjs/builders/-/builders-0.8.2.tgz", + "integrity": "sha512-/YRd11SrcluqXkKppq/FAVzLIPRVlIVmc6X8ZklspzMIHDtJ+A4W37D43SHvLdH//+NnK+SHW/WeOF4Ts54PeQ==", "requires": { - "@sindresorhus/is": "^4.0.1", - "discord-api-types": "^0.22.0", + "@sindresorhus/is": "^4.2.0", + "discord-api-types": "^0.24.0", "ow": "^0.27.0", "ts-mixer": "^6.0.0", "tslib": "^2.3.1" - }, - "dependencies": { - "discord-api-types": { - "version": "0.22.0", - "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.22.0.tgz", - "integrity": "sha512-l8yD/2zRbZItUQpy7ZxBJwaLX/Bs2TGaCthRppk8Sw24LOIWg12t9JEreezPoYD0SQcC2htNNo27kYEpYW/Srg==" - } } }, "@discordjs/collection": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/@discordjs/collection/-/collection-0.2.1.tgz", - "integrity": "sha512-vhxqzzM8gkomw0TYRF3tgx7SwElzUlXT/Aa41O7mOcyN6wIJfj5JmDWaO5XGKsGSsNx7F3i5oIlrucCCWV1Nog==" + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@discordjs/collection/-/collection-0.3.2.tgz", + "integrity": "sha512-dMjLl60b2DMqObbH1MQZKePgWhsNe49XkKBZ0W5Acl5uVV43SN414i2QfZwRI7dXAqIn8pEWD2+XXQFn9KWxqg==" }, "@discordjs/form-data": { "version": "3.0.1", @@ -347,9 +356,9 @@ } }, "@sapphire/async-queue": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/@sapphire/async-queue/-/async-queue-1.1.7.tgz", - "integrity": "sha512-EBRERa9NqK/EV6DIPBVtjjdHBsu/DSdMuYAydmoIyIPONzp0UAxf2G6JGJ52WkiONtPRx6KNuqB5Q8dm14fwyw==" + "version": "1.1.9", + "resolved": "https://registry.npmjs.org/@sapphire/async-queue/-/async-queue-1.1.9.tgz", + "integrity": "sha512-CbXaGwwlEMq+l1TRu01FJCvySJ1CEFKFclHT48nIfNeZXaAAmmwwy7scUKmYHPUa3GhoMp6Qr1B3eAJux6XgOQ==" }, "@sindresorhus/is": { "version": "4.2.0", @@ -357,9 +366,18 @@ "integrity": "sha512-VkE3KLBmJwcCaVARtQpfuKcKv8gcBmUubrfHGF84dXuuW6jgsRYxPtzcIhPyK9WAPpRt2/xY6zkD9MnRaJzSyw==" }, "@types/node": { - "version": "16.11.4", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.4.tgz", - "integrity": "sha512-TMgXmy0v2xWyuCSCJM6NCna2snndD8yvQF67J29ipdzMcsPa9u+o0tjF5+EQNdhcuZplYuouYqpc4zcd5I6amQ==" + "version": "16.11.7", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.7.tgz", + "integrity": "sha512-QB5D2sqfSjCmTuWcBWyJ+/44bcjO7VbjSbOE0ucoVbAsSNQc4Lt6QkgkVXkTDwkL4z/beecZNDvVX15D4P8Jbw==" + }, + "@types/node-fetch": { + "version": "2.5.12", + "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.12.tgz", + "integrity": "sha512-MKgC4dlq4kKNa/mYrwpKfzQMB5X3ee5U6fSprkKpToBqBmX4nFZL9cW5jl6sWn+xpRJ7ypWh2yyqqr8UUCstSw==", + "requires": { + "@types/node": "*", + "form-data": "^3.0.0" + } }, "@types/ws": { "version": "8.2.0", @@ -398,21 +416,22 @@ "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" }, "discord-api-types": { - "version": "0.23.1", - "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.23.1.tgz", - "integrity": "sha512-igWmn+45mzXRWNEPU25I/pr8MwxHb767wAr51oy3VRLRcTlp5ADBbrBR0lq3SA1Rfw3MtM4TQu1xo3kxscfVdQ==" + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.24.0.tgz", + "integrity": "sha512-X0uA2a92cRjowUEXpLZIHWl4jiX1NsUpDhcEOpa1/hpO1vkaokgZ8kkPtPih9hHth5UVQ3mHBu/PpB4qjyfJ4A==" }, "discord.js": { - "version": "13.2.0", - "resolved": "https://registry.npmjs.org/discord.js/-/discord.js-13.2.0.tgz", - "integrity": "sha512-nyxUvL8wuQG38zx13wUMkpcA8koFszyiXdkSLwwM9opKW2LC2H5gD0cTZxImeJ6GtEnKPWT8xBiE8lLBmbNIhw==", + "version": "13.3.1", + "resolved": "https://registry.npmjs.org/discord.js/-/discord.js-13.3.1.tgz", + "integrity": "sha512-zn4G8tL5+tMV00+0aSsVYNYcIfMSdT2g0nudKny+Ikd+XKv7m6bqI7n3Vji0GIRqXDr5ArPaw+iYFM2I1Iw3vg==", "requires": { - "@discordjs/builders": "^0.6.0", - "@discordjs/collection": "^0.2.1", + "@discordjs/builders": "^0.8.1", + "@discordjs/collection": "^0.3.2", "@discordjs/form-data": "^3.0.1", - "@sapphire/async-queue": "^1.1.5", + "@sapphire/async-queue": "^1.1.8", + "@types/node-fetch": "^2.5.12", "@types/ws": "^8.2.0", - "discord-api-types": "^0.23.1", + "discord-api-types": "^0.24.0", "node-fetch": "^2.6.1", "ws": "^8.2.3" } @@ -425,6 +444,16 @@ "is-obj": "^2.0.0" } }, + "form-data": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz", + "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==", + "requires": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + } + }, "is-obj": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", @@ -444,22 +473,22 @@ "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=" }, "mime-db": { - "version": "1.50.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.50.0.tgz", - "integrity": "sha512-9tMZCDlYHqeERXEHO9f/hKfNXhre5dK2eE/krIvUjZbS2KPcqGDfNShIWS1uW9XOTKQKqK6qbeOci18rbfW77A==" + "version": "1.51.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz", + "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==" }, "mime-types": { - "version": "2.1.33", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.33.tgz", - "integrity": "sha512-plLElXp7pRDd0bNZHw+nMd52vRYjLwQjygaNg7ddJ2uJtTlmnTCjWuPKxVu6//AdaRuME84SvLW91sIkBqGT0g==", + "version": "2.1.34", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz", + "integrity": "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==", "requires": { - "mime-db": "1.50.0" + "mime-db": "1.51.0" } }, "node-fetch": { - "version": "2.6.5", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.5.tgz", - "integrity": "sha512-mmlIVHJEu5rnIxgEgez6b9GgWXbkZj5YZ7fx+2r94a2E+Uirsp6HsPTPlomfdHtpt/B0cdKviwkoaM6pyvUOpQ==", + "version": "2.6.6", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.6.tgz", + "integrity": "sha512-Z8/6vRlTUChSdIgMa51jxQ4lrw/Jy5SOW10ObaA47/RElsAN2c5Pn8bTgFGWn/ibwzXTE8qwr1Yzx28vsecXEA==", "requires": { "whatwg-url": "^5.0.0" } From 8e0326c8f811bb4f704c9db8dc42930301ccfd0c Mon Sep 17 00:00:00 2001 From: Noah Date: Wed, 10 Nov 2021 21:21:50 -0600 Subject: [PATCH 03/24] Removed HelpMenu --- Configs/supportbot.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Configs/supportbot.yml b/Configs/supportbot.yml index 55b4355..963640a 100644 --- a/Configs/supportbot.yml +++ b/Configs/supportbot.yml @@ -18,7 +18,6 @@ SupportBot_Version: "7.3" Name: "SupportBot" # No Prefix, as everything uses the new Slash (/) Commands feature! -Token: "BOT_TOKEN" # ------------------------- # Activity Configuration From c9cf7c942ba42dd43769a22168ec6d977f4c5c3e Mon Sep 17 00:00:00 2001 From: Noah Date: Wed, 10 Nov 2021 21:22:08 -0600 Subject: [PATCH 04/24] Prettier --- Commands/help.js | 92 +++++++++++++++++++++++------------------------- 1 file changed, 45 insertions(+), 47 deletions(-) diff --git a/Commands/help.js b/Commands/help.js index bc02091..f6fc373 100644 --- a/Commands/help.js +++ b/Commands/help.js @@ -40,67 +40,65 @@ module.exports = new Command({ (adminRole) => adminRole.id === supportbot.Admin ); - if (supportbot.HelpMenu) { - let botCommands = ""; - botCommands += `**/${cmdconfig.HelpCommand}** ${cmdconfig.HelpCommandDesc}\n`; - botCommands += `**/${cmdconfig.InfoCommand}** ${cmdconfig.InfoCommandDesc}\n`; - botCommands += `**/${cmdconfig.PingCommand}** ${cmdconfig.PingCommandDesc}\n`; + let botCommands = ""; + botCommands += `**/${cmdconfig.HelpCommand}** ${cmdconfig.HelpCommandDesc}\n`; + botCommands += `**/${cmdconfig.InfoCommand}** ${cmdconfig.InfoCommandDesc}\n`; + botCommands += `**/${cmdconfig.PingCommand}** ${cmdconfig.PingCommandDesc}\n`; - let ticketCommands = ""; - ticketCommands += `**/${cmdconfig.OpenTicket}** ${cmdconfig.OpenTicketDesc}\n`; - ticketCommands += `**/${cmdconfig.CloseTicket}** ${cmdconfig.CloseTicketDesc}\n`; + let ticketCommands = ""; + ticketCommands += `**/${cmdconfig.OpenTicket}** ${cmdconfig.OpenTicketDesc}\n`; + ticketCommands += `**/${cmdconfig.CloseTicket}** ${cmdconfig.CloseTicketDesc}\n`; - let staffCommands = ""; - staffCommands += `**/${cmdconfig.TicketAdd}** ${cmdconfig.TicketAddDesc}\n`; - staffCommands += `**/${cmdconfig.TicketRemove}** ${cmdconfig.TicketRemoveDesc}\n`; + let staffCommands = ""; + staffCommands += `**/${cmdconfig.TicketAdd}** ${cmdconfig.TicketAddDesc}\n`; + staffCommands += `**/${cmdconfig.TicketRemove}** ${cmdconfig.TicketRemoveDesc}\n`; - const HelpEmbed1 = new Discord.MessageEmbed() - .setTitle(supportbot.Name + " Commands") - .setThumbnail(interaction.user.displayAvatarURL()) + const HelpEmbed1 = new Discord.MessageEmbed() + .setTitle(supportbot.Name + " Commands") + .setThumbnail(interaction.user.displayAvatarURL()) - .addFields( - { - name: "🖥️ General Commands\n", - value: `${botCommands}\n`, - inline: false, - }, - { - name: "🎫 Support Commands\n", - value: `${ticketCommands}\n`, - inline: false, - } - ) + .addFields( + { + name: "🖥️ General Commands\n", + value: `${botCommands}\n`, + inline: false, + }, + { + name: "🎫 Support Commands\n", + value: `${ticketCommands}\n`, + inline: false, + } + ) - .setColor(supportbot.EmbedColour) - .setFooter(supportbot.EmbedFooter, interaction.user.displayAvatarURL()); + .setColor(supportbot.EmbedColour) + .setFooter(supportbot.EmbedFooter, interaction.user.displayAvatarURL()); - if (interaction.member.roles.cache.has(SupportStaff.id)) { + if (interaction.member.roles.cache.has(SupportStaff.id)) { + HelpEmbed1.addFields({ + name: "🔐 Staff Commands\n", + value: `${staffCommands}\n`, + inline: false, + }); + } else { + if (interaction.member.roles.cache.has(AdminStaff.id)) { HelpEmbed1.addFields({ name: "🔐 Staff Commands\n", value: `${staffCommands}\n`, inline: false, }); - } else { - if (interaction.member.roles.cache.has(AdminStaff.id)) { - HelpEmbed1.addFields({ - name: "🔐 Staff Commands\n", - value: `${staffCommands}\n`, - inline: false, - }); - } } + } - if (supportbot.SendHelpPage === "dm") { - interaction.user.reply({ - embeds: [HelpEmbed1], - }); - } + if (supportbot.SendHelpPage === "dm") { + interaction.user.reply({ + embeds: [HelpEmbed1], + }); + } - if (supportbot.SendHelpPage === "channel") { - interaction.reply({ - embeds: [HelpEmbed1], - }); - } + if (supportbot.SendHelpPage === "channel") { + interaction.reply({ + embeds: [HelpEmbed1], + }); } }, }); From 12a7680275d1cd6f9553d7d1bb3c4295a51c4151 Mon Sep 17 00:00:00 2001 From: Noah Date: Wed, 10 Nov 2021 21:23:07 -0600 Subject: [PATCH 05/24] Fix spelling --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 01cd9e6..8e9e13e 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ ## What is SupportBot? -SupportBot is an open-sourced support system for discord. It's completely free to use with high amounts of customisation to match your own brand. +SupportBot is an open-sourced support system for discord. It's completely free to use with high amounts of customization to match your own brand. ## Quick Links From b674872c56bff4ce3a246315d35463993d0d3e10 Mon Sep 17 00:00:00 2001 From: Noah Date: Wed, 10 Nov 2021 21:41:12 -0600 Subject: [PATCH 06/24] Fixed Archive Bug --- Events/interactionCreate.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Events/interactionCreate.js b/Events/interactionCreate.js index d7e67a1..801e3e3 100644 --- a/Events/interactionCreate.js +++ b/Events/interactionCreate.js @@ -12,7 +12,7 @@ const cmdconfig = yaml.load(fs.readFileSync("./Configs/commands.yml", "utf8")); const Event = require("../Structures/Event.js"); -module.exports = new Event("interactionCreate", (client, interaction) => { +module.exports = new Event("interactionCreate", async (client, interaction) => { if (interaction.isCommand()) { const command = client.commands.find( (cmd) => cmd.name.toLowerCase() == interaction.commandName @@ -129,7 +129,6 @@ module.exports = new Event("interactionCreate", (client, interaction) => { if (interaction.customId === "ticketlock") { if (interaction.channel.name.startsWith(`${supportbot.TicketPrefix}`)) { interaction.message.fetch(); - interaction.deferUpdate(); let Admin = interaction.guild.roles.cache.find( (AdminUser) => AdminUser.name === supportbot.Admin @@ -137,6 +136,12 @@ module.exports = new Event("interactionCreate", (client, interaction) => { interaction.guild.roles.cache.find( (AdminUser) => AdminUser.id === supportbot.Admin ); + if (!interaction.member.roles.cache.has(Admin.id)) { + return await interaction.reply({ + content: "You don't have permission to do that.", + ephemeral: true, + }); + } let all = interaction.channel.permissionOverwrites.cache; let parent = @@ -175,7 +180,7 @@ module.exports = new Event("interactionCreate", (client, interaction) => { .setDescription(`Archived ${interaction.channel.name}`) .setColor(`${supportbot.SuccessColour}`); - interaction.channel.send({ embeds: [ArchiveEmbed] }); + interaction.reply({ embeds: [ArchiveEmbed] }); interaction.message.edit({ components: [row] }); } } From 300c83512c0dea63b21ec56301975c5ebbd4bc42 Mon Sep 17 00:00:00 2001 From: Noah Date: Thu, 11 Nov 2021 17:18:30 -0600 Subject: [PATCH 07/24] Fixed token, and changed version for future --- Configs/supportbot.yml | 4 ++-- package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Configs/supportbot.yml b/Configs/supportbot.yml index 963640a..b128c03 100644 --- a/Configs/supportbot.yml +++ b/Configs/supportbot.yml @@ -10,7 +10,7 @@ # Discord Support: https://emeraldsrv.dev/discord # Community Resources: https://emeraldsrv.dev/resources -SupportBot_Version: "7.3" +SupportBot_Version: "7.4.0" # ------------------------- # General Configuration @@ -18,6 +18,7 @@ SupportBot_Version: "7.3" Name: "SupportBot" # No Prefix, as everything uses the new Slash (/) Commands feature! +Token: "BOT_TOKEN" # ------------------------- # Activity Configuration @@ -57,7 +58,6 @@ InfoColour: "#f74343" # Help Configuration # ------------------------- -HelpMenu: true # Do not change! SendHelpPage: "channel" # Set to channel or dm # ------------------------- diff --git a/package-lock.json b/package-lock.json index 5effeb9..9690841 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "supportbot", - "version": "7.3.0", + "version": "7.4.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "supportbot", - "version": "7.3.0", + "version": "7.4.0", "license": "MIT", "dependencies": { "discord.js": "^13.2.0", diff --git a/package.json b/package.json index d7e99f0..7ae153e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "supportbot", - "version": "7.3.0", + "version": "7.4.0", "description": "SupportBot is an open-sourced support system for discord. It's completely free to use with high amounts of customization to match your own brand.", "main": "index.js", "scripts": { From 007c78930e4060f029c845a306c65e3c6f55b6ce Mon Sep 17 00:00:00 2001 From: Noah Date: Wed, 17 Nov 2021 19:03:11 -0600 Subject: [PATCH 08/24] Added Guild to config --- Configs/supportbot.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Configs/supportbot.yml b/Configs/supportbot.yml index b128c03..125a608 100644 --- a/Configs/supportbot.yml +++ b/Configs/supportbot.yml @@ -19,6 +19,8 @@ SupportBot_Version: "7.4.0" Name: "SupportBot" # No Prefix, as everything uses the new Slash (/) Commands feature! Token: "BOT_TOKEN" +# Guild ID Ex: 123456789123456789 +Guild: "" # ------------------------- # Activity Configuration @@ -66,7 +68,6 @@ SendHelpPage: "channel" # Set to channel or dm AutoRole: true AutoRole_Role: "Member" -LockdownRole: "@everyone" Staff: "Staff" Admin: "Admin" @@ -131,8 +132,6 @@ RemovedUser: "👍 <@%user%> has been removed from this ticket" # SUCCESS - Green # Secondary - Grey -TicketLockReaction: "🔒" -TicketDeleteReaction: "⛔" LockTicketCategory: "Archive" TicketCloseEmoji: "❌" From a82101ab30e3a9704333b64ae8034924453c21fd Mon Sep 17 00:00:00 2001 From: Noah Date: Wed, 17 Nov 2021 19:03:35 -0600 Subject: [PATCH 09/24] Register commands in Guild --- Structures/Client.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Structures/Client.js b/Structures/Client.js index e70422d..f04bc30 100644 --- a/Structures/Client.js +++ b/Structures/Client.js @@ -76,10 +76,9 @@ class Client extends Discord.Client { this.on("ready", async () => { const allCommands = slashCommands.concat(slashCommands1); - await this.application?.commands.set(allCommands); - + await this.application?.commands.set(allCommands, supportbot.Guild); console.log(" "); - console.log(`\u001b[34;1m`, "▬▬▬▬▬▬▬ Slash Command ▬▬▬▬▬▬▬"), + console.log(`\u001b[34;1m`, "▬▬▬▬▬▬▬ Slash Commands ▬▬▬▬▬▬▬"), console.log(" "); slashCommands.forEach((cmd) => From ef838328198f22a4ac934a3da45ba73261acd0b6 Mon Sep 17 00:00:00 2001 From: Noah Date: Wed, 17 Nov 2021 19:04:20 -0600 Subject: [PATCH 10/24] Added missing role and channel check --- Events/ready.js | 61 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 60 insertions(+), 1 deletion(-) diff --git a/Events/ready.js b/Events/ready.js index 40eb74c..bbf436d 100644 --- a/Events/ready.js +++ b/Events/ready.js @@ -14,7 +14,7 @@ const panelconfig = yaml.load( const Event = require("../Structures/Event.js"); -module.exports = new Event("ready", (client) => { +module.exports = new Event("ready", async (client) => { client.user.setActivity(supportbot.BotActivity, { type: supportbot.ActivityType, url: supportbot.StreamingURL, @@ -65,7 +65,66 @@ module.exports = new Event("ready", (client) => { console.log(`\u001b[37m`, `SupportBot proudly created by Emerald Services`); console.log(` `); console.log(`\u001b[31m`, `――――――――――――――――――――――――――――――――――――――――――――`); + if ( + !supportbot.Guild || + (await client.guilds.cache.size) !== 1 || + (await client.guilds.cache.first().id) !== supportbot.Guild + ) { + console.log( + `\u001b[31m`, + `${client.user.username} is not in the correct server set in your config. Please join the server and restart the bot.` + ); + console.log(`\u001b[31m`, `${client.user.username} will now exit.`); + return process.exit(1); + } + const roles = [ + supportbot.Admin, + supportbot.Staff, + supportbot.TicketBlackListRole, + supportbot.DepartmentRole_1, + supportbot.DepartmentRole_2, + supportbot.DepartmentRole_3, + ]; + if (supportbot.AutoRole) roles.push(supportbot.AutoRole_Role); + const channels = [ + supportbot.SuggestionChannel, + supportbot.TicketLog, + supportbot.TranscriptLog, + panelconfig.Channel, + ]; + const missingR = []; + const missingC = []; + for (let c of channels) { + const find = await client.channels.cache.find( + (channel) => channel.name === c || channel.id === c + ); + if (!find) missingC.push(c); + } + for (let r of roles) { + const find = await client.guilds.cache + .first() + .roles.cache.find((role) => role.name === r || role.id === r); + if (!find) missingR.push(r); + } + + if (missingR.length > 0) { + console.log( + "\u001b[33m", + `[WARN] The following Roles could not be found! Please check your configs!\n${missingR.join( + ", " + )}` + ); + } + + if (missingC.length > 0) { + console.log( + "\u001b[33m", + `[WARN] The following Channels could not be found! Please check your configs!\n${missingC.join( + ", " + )}` + ); + } if (panelconfig.TicketPanel) { let chan1 = client.channels.cache.find( (channel) => channel.name === panelconfig.Channel From 02394e310d6009a468fa9bf1c5972f2ced907142 Mon Sep 17 00:00:00 2001 From: Noah Date: Wed, 17 Nov 2021 19:04:38 -0600 Subject: [PATCH 11/24] Exit if joins or leaves guild --- Events/guildCreate.js | 9 +++++++++ Events/guildDelete.js | 10 ++++++++++ 2 files changed, 19 insertions(+) create mode 100644 Events/guildCreate.js create mode 100644 Events/guildDelete.js diff --git a/Events/guildCreate.js b/Events/guildCreate.js new file mode 100644 index 0000000..16bd038 --- /dev/null +++ b/Events/guildCreate.js @@ -0,0 +1,9 @@ +const Event = require("../Structures/Event.js"); +module.exports = new Event("guildCreate", async (client) => { + console.log( + `\u001b[31m`, + `${client.user.username} is not in the correct server set in your config. Please leave all other servers and restart the bot.` + ); + console.log(`\u001b[31m`, `${client.user.username} will now exit.`); + return process.exit(1); +}); diff --git a/Events/guildDelete.js b/Events/guildDelete.js new file mode 100644 index 0000000..d3cfbd2 --- /dev/null +++ b/Events/guildDelete.js @@ -0,0 +1,10 @@ +const Event = require("../Structures/Event.js"); + +module.exports = new Event("guildDelete", async (client) => { + console.log( + `\u001b[31m`, + `${client.user.username} is not in the correct server set in your config. Please join the server and restart the bot.` + ); + console.log(`\u001b[31m`, `${client.user.username} will now exit.`); + return process.exit(1); +}); From 7eb949f1094a93bb75c3ddfbb44dcdb7ee4ad74b Mon Sep 17 00:00:00 2001 From: Noah Date: Sun, 21 Nov 2021 18:42:18 -0600 Subject: [PATCH 12/24] Better finds --- Commands/add.js | 25 +++++++------ Commands/close.js | 24 ++++++------- Commands/embed.js | 27 +++++++------- Commands/help.js | 25 ++++++------- Commands/remove.js | 25 +++++++------ Commands/suggest.js | 12 +++---- Commands/ticket.js | 86 ++++++++++++++++++--------------------------- 7 files changed, 98 insertions(+), 126 deletions(-) diff --git a/Commands/add.js b/Commands/add.js index 5aee916..6fef2da 100644 --- a/Commands/add.js +++ b/Commands/add.js @@ -32,19 +32,18 @@ module.exports = new Command({ permission: "SEND_MESSAGES", async run(interaction) { - let SupportStaff = - interaction.guild.roles.cache.find( - (SupportTeam) => SupportTeam.name === supportbot.Staff - ) || - interaction.guild.roles.cache.find( - (SupportTeam) => SupportTeam.id === supportbot.Staff - ); - let Admins = - interaction.guild.roles.cache.find( - (AdminUser) => AdminUser.name === supportbot.Admin - ) || - interaction.guild.roles.cache.find( - (AdminUser) => AdminUser.id === supportbot.Admin + let SupportStaff = interaction.guild.roles.cache.find( + (SupportTeam) => + SupportTeam.name == supportbot.Staff || + SupportTeam.id == supportbot.Staff + ); + let Admins = interaction.guild.roles.cache.find( + (AdminUser) => + AdminUser.name == supportbot.Admin || AdminUser.id == supportbot.Admin + ); + if (!SupportStaff || !Admins) + return interaction.reply( + "Some roles seem to be missing!\nPlease check for errors when starting the bot." ); const NoPerms = new Discord.MessageEmbed() diff --git a/Commands/close.js b/Commands/close.js index 2a29c8a..5b8da65 100644 --- a/Commands/close.js +++ b/Commands/close.js @@ -63,13 +63,11 @@ module.exports = new Command({ } ) .then((collected) => { - let logChannel = - interaction.guild.channels.cache.find( - (channel) => channel.name === supportbot.TranscriptLog - ) || - interaction.guild.channels.cache.find( - (channel) => channel.id === supportbot.TranscriptLog - ); + let logChannel = interaction.guild.channels.cache.find( + (channel) => + channel.name === supportbot.TranscriptLog || + channel.id === supportbot.TranscriptLog + ); let user = interaction.user; let reason = interaction.options.getString("reason") || @@ -149,13 +147,11 @@ module.exports = new Command({ } if (!supportbot.CloseConfirmation) { - let logChannel = - interaction.guild.channels.cache.find( - (channel) => channel.name === supportbot.TranscriptLog - ) || - interaction.guild.channels.cache.find( - (channel) => channel.id === supportbot.TranscriptLog - ); + let logChannel = interaction.guild.channels.cache.find( + (channel) => + channel.name === supportbot.TranscriptLog || + channel.id === supportbot.TranscriptLog + ); let user = interaction.user; let reason = (await interaction.options.getString("reason")) || diff --git a/Commands/embed.js b/Commands/embed.js index 9bff3a8..278a777 100644 --- a/Commands/embed.js +++ b/Commands/embed.js @@ -31,21 +31,20 @@ module.exports = new Command({ permission: "SEND_MESSAGES", async run(interaction) { - let SupportStaff = - interaction.guild.roles.cache.find( - (SupportTeam) => SupportTeam.name === supportbot.Staff - ) || - interaction.guild.roles.cache.find( - (SupportTeam) => SupportTeam.id === supportbot.Staff - ); - let Admins = - interaction.guild.roles.cache.find( - (AdminUser) => AdminUser.name === supportbot.Admin - ) || - interaction.guild.roles.cache.find( - (AdminUser) => AdminUser.id === supportbot.Admin - ); + let SupportStaff = interaction.guild.roles.cache.find( + (SupportTeam) => + SupportTeam.name === supportbot.Staff || + SupportTeam.id === supportbot.Staff + ); + let Admins = interaction.guild.roles.cache.find( + (AdminUser) => + AdminUser.name === supportbot.Admin || AdminUser.id === supportbot.Admin + ); + if (!SupportStaff || !Admins) + return interaction.reply( + "Some roles seem to be missing!\nPlease check for errors when starting the bot." + ); const NoPerms = new Discord.MessageEmbed() .setTitle("Invalid Permissions!") .setDescription( diff --git a/Commands/help.js b/Commands/help.js index f6fc373..416bb68 100644 --- a/Commands/help.js +++ b/Commands/help.js @@ -25,21 +25,18 @@ module.exports = new Command({ permission: "SEND_MESSAGES", async run(interaction) { - let SupportStaff = - interaction.guild.roles.cache.find( - (adminRole) => adminRole.name === supportbot.Staff - ) || - interaction.guild.roles.cache.find( - (staffRole) => staffRole.id === supportbot.Staff + let SupportStaff = interaction.guild.roles.cache.find( + (adminRole) => + adminRole.name === supportbot.Staff || staffRole.id === supportbot.Staff + ); + let AdminStaff = interaction.guild.roles.cache.find( + (adminRole) => + adminRole.name === supportbot.Admin || adminRole.id === supportbot.Admin + ); + if (!SupportStaff || !Admins) + return interaction.reply( + "Some roles seem to be missing!\nPlease check for errors when starting the bot." ); - let AdminStaff = - interaction.guild.roles.cache.find( - (adminRole) => adminRole.name === supportbot.Admin - ) || - interaction.guild.roles.cache.find( - (adminRole) => adminRole.id === supportbot.Admin - ); - let botCommands = ""; botCommands += `**/${cmdconfig.HelpCommand}** ${cmdconfig.HelpCommandDesc}\n`; botCommands += `**/${cmdconfig.InfoCommand}** ${cmdconfig.InfoCommandDesc}\n`; diff --git a/Commands/remove.js b/Commands/remove.js index d062584..c90e0a1 100644 --- a/Commands/remove.js +++ b/Commands/remove.js @@ -32,19 +32,18 @@ module.exports = new Command({ permission: "SEND_MESSAGES", async run(interaction) { - let SupportStaff = - interaction.guild.roles.cache.find( - (SupportTeam) => SupportTeam.name === supportbot.Staff - ) || - interaction.guild.roles.cache.find( - (SupportTeam) => SupportTeam.id === supportbot.Staff - ); - let Admins = - interaction.guild.roles.cache.find( - (AdminUser) => AdminUser.name === supportbot.Admin - ) || - interaction.guild.roles.cache.find( - (AdminUser) => AdminUser.id === supportbot.Admin + let SupportStaff = interaction.guild.roles.cache.find( + (SupportTeam) => + SupportTeam.name == supportbot.Staff || + SupportTeam.id == supportbot.Staff + ); + let Admins = interaction.guild.roles.cache.find( + (AdminUser) => + AdminUser.name == supportbot.Admin || AdminUser.id == supportbot.Admin + ); + if (!SupportStaff || !Admins) + return interaction.reply( + "Some roles seem to be missing!\nPlease check for errors when starting the bot." ); const NoPerms = new Discord.MessageEmbed() diff --git a/Commands/suggest.js b/Commands/suggest.js index 99a99bc..f06db63 100644 --- a/Commands/suggest.js +++ b/Commands/suggest.js @@ -25,13 +25,11 @@ module.exports = new Command({ permission: "SEND_MESSAGES", async run(interaction) { - const suggestChannel = - interaction.guild.channels.cache.find( - (channel) => channel.name === supportbot.SuggestionChannel - ) || - interaction.guild.channels.cache.find( - (channel) => channel.id === supportbot.SuggestionChannel - ); + const suggestChannel = interaction.guild.channels.cache.find( + (channel) => + channel.name === supportbot.SuggestionChannel || + channel.id === supportbot.SuggestionChannel + ); const NoChannel = new Discord.MessageEmbed() .setTitle("Missing Channel!") diff --git a/Commands/ticket.js b/Commands/ticket.js index 27329fd..4c62663 100644 --- a/Commands/ticket.js +++ b/Commands/ticket.js @@ -36,10 +36,9 @@ module.exports = new Command({ if ( reactionUser.roles.cache.find( - (role) => role.name === supportbot.TicketBlackListRole - ) || - reactionUser.roles.cache.find( - (role) => role.id === supportbot.TicketBlackListRole + (role) => + role.name == supportbot.TicketBlackListRole || + role.id == supportbot.TicketBlackListRole ) ) { return interaction @@ -70,46 +69,33 @@ module.exports = new Command({ ) { return interaction.reply({ embeds: [TicketExists] }); } - const Staff = - interaction.guild.roles.cache.find( - (SupportTeam) => SupportTeam.name === supportbot.Staff - ) || - interaction.guild.roles.cache.find( - (SupportTeam) => SupportTeam.id === supportbot.Staff - ); - const Admins = - interaction.guild.roles.cache.find( - (AdminUser) => AdminUser.name === supportbot.Admin - ) || - interaction.guild.roles.cache.find( - (AdminUser) => AdminUser.id === supportbot.Admin - ); - const DeptRole1 = - interaction.guild.roles.cache.find( - (DepartmentRole) => - DepartmentRole.name === `${supportbot.DepartmentRole_1}` - ) || - interaction.guild.roles.cache.find( - (DepartmentRole) => - DepartmentRole.id === `${supportbot.DepartmentRole_1}` - ); - const DeptRole2 = - interaction.guild.roles.cache.find( - (DepartmentRole) => - DepartmentRole.name === `${supportbot.DepartmentRole_2}` - ) || - interaction.guild.roles.cache.find( - (DepartmentRole) => - DepartmentRole.id === `${supportbot.DepartmentRole_2}` - ); - const DeptRole3 = - interaction.guild.roles.cache.find( - (DepartmentRole) => - DepartmentRole.name === `${supportbot.DepartmentRole_3}` - ) || - interaction.guild.roles.cache.find( - (DepartmentRole) => - DepartmentRole.id === `${supportbot.DepartmentRole_3}` + const Staff = interaction.guild.roles.cache.find( + (SupportTeam) => + SupportTeam.name === supportbot.Staff || + SupportTeam.id === supportbot.Staff + ); + const Admins = interaction.guild.roles.cache.find( + (AdminUser) => + AdminUser.name === supportbot.Admin || AdminUser.id === supportbot.Admin + ); + const DeptRole1 = interaction.guild.roles.cache.find( + (DepartmentRole) => + DepartmentRole.name === supportbot.DepartmentRole_1 || + DepartmentRole.id === supportbot.DepartmentRole_1 + ); + const DeptRole2 = interaction.guild.roles.cache.find( + (DepartmentRole) => + DepartmentRole.name === supportbot.DepartmentRole_2 || + DepartmentRole.id === supportbot.DepartmentRole_2 + ); + const DeptRole3 = interaction.guild.roles.cache.find( + (DepartmentRole) => + DepartmentRole.name === supportbot.DepartmentRole_3 || + DepartmentRole.id === supportbot.DepartmentRole_3 + ); + if (!Staff || !Admins || !DeptRole1 || !DeptRole2 || !DeptRole3) + return interaction.reply( + "Some roles seem to be missing!\nPlease check for errors when starting the bot." ); const Author = interaction.user; const Everyone = interaction.guild.id; @@ -158,13 +144,11 @@ module.exports = new Command({ ticketChannel.permissionOverwrites.create(index, { VIEW_CHANNEL: false }); }); - let TicketCategory = - interaction.guild.channels.cache.find( - (category) => category.name === supportbot.TicketCategory - ) || - interaction.guild.channels.cache.find( - (category) => category.id === supportbot.TicketCategory - ); + let TicketCategory = interaction.guild.channels.cache.find( + (category) => + category.name === supportbot.TicketCategory || + category.id === supportbot.TicketCategory + ); if (TicketCategory) { ticketChannel.setParent(TicketCategory.id); } From e740c17837cd8d5d20d1c5951f8dac8008c225a1 Mon Sep 17 00:00:00 2001 From: Noah Date: Sun, 21 Nov 2021 18:42:24 -0600 Subject: [PATCH 13/24] Update package-lock.json --- package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9690841..7bc7e43 100644 --- a/package-lock.json +++ b/package-lock.json @@ -72,9 +72,9 @@ } }, "node_modules/@types/node": { - "version": "16.11.7", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.7.tgz", - "integrity": "sha512-QB5D2sqfSjCmTuWcBWyJ+/44bcjO7VbjSbOE0ucoVbAsSNQc4Lt6QkgkVXkTDwkL4z/beecZNDvVX15D4P8Jbw==" + "version": "16.11.9", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.9.tgz", + "integrity": "sha512-MKmdASMf3LtPzwLyRrFjtFFZ48cMf8jmX5VRYrDQiJa8Ybu5VAmkqBWqKU8fdCwD8ysw4mQ9nrEHvzg6gunR7A==" }, "node_modules/@types/node-fetch": { "version": "2.5.12", @@ -366,9 +366,9 @@ "integrity": "sha512-VkE3KLBmJwcCaVARtQpfuKcKv8gcBmUubrfHGF84dXuuW6jgsRYxPtzcIhPyK9WAPpRt2/xY6zkD9MnRaJzSyw==" }, "@types/node": { - "version": "16.11.7", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.7.tgz", - "integrity": "sha512-QB5D2sqfSjCmTuWcBWyJ+/44bcjO7VbjSbOE0ucoVbAsSNQc4Lt6QkgkVXkTDwkL4z/beecZNDvVX15D4P8Jbw==" + "version": "16.11.9", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.9.tgz", + "integrity": "sha512-MKmdASMf3LtPzwLyRrFjtFFZ48cMf8jmX5VRYrDQiJa8Ybu5VAmkqBWqKU8fdCwD8ysw4mQ9nrEHvzg6gunR7A==" }, "@types/node-fetch": { "version": "2.5.12", From b6a0016f5f3fb3ede85c757c60724ae1c61da7f5 Mon Sep 17 00:00:00 2001 From: Noah Date: Tue, 23 Nov 2021 15:48:45 -0600 Subject: [PATCH 14/24] Changed TicketData Structure --- Commands/ticket.js | 20 +++++++++++++++++++- Data/TicketData.json | 5 ++++- Data/ticket-panel-id.json | 4 +--- Structures/TicketID.js | 36 ++++++++++++++---------------------- 4 files changed, 38 insertions(+), 27 deletions(-) diff --git a/Commands/ticket.js b/Commands/ticket.js index 4c62663..b19134d 100644 --- a/Commands/ticket.js +++ b/Commands/ticket.js @@ -51,7 +51,11 @@ module.exports = new Command({ } // Ticket ID - let ticketNumberID = TicketNumberID.pad(interaction.guild.id); + let ticketNumberID = await TicketNumberID.pad(); + + let TicketData = await JSON.parse( + fs.readFileSync("./Data/TicketData.json", "utf8") + ); // Ticket Subject const TicketSubject = @@ -105,6 +109,20 @@ module.exports = new Command({ type: "GUILD_TEXT", } ); + await TicketData.tickets.push({ + id: ticketChannel.id, + name: ticketChannel.name, + user: Author.id, + number: ticketNumberID, + reason: TicketSubject, + }); + fs.writeFileSync( + "./Data/TicketData.json", + JSON.stringify(TicketData, null, 4), + (err) => { + if (err) console.error(err); + } + ); if ( interaction.channel.name === supportbot.ReactionChannel || diff --git a/Data/TicketData.json b/Data/TicketData.json index 0967ef4..6201053 100644 --- a/Data/TicketData.json +++ b/Data/TicketData.json @@ -1 +1,4 @@ -{} +{ + "id": 10, + "tickets": [] +} diff --git a/Data/ticket-panel-id.json b/Data/ticket-panel-id.json index b2367c6..ad5728f 100644 --- a/Data/ticket-panel-id.json +++ b/Data/ticket-panel-id.json @@ -1,3 +1 @@ -{ - "TicketPanelID": "" -} +{"TicketPanelID":""} \ No newline at end of file diff --git a/Structures/TicketID.js b/Structures/TicketID.js index 11c9d9f..6725b8c 100644 --- a/Structures/TicketID.js +++ b/Structures/TicketID.js @@ -14,74 +14,66 @@ const supportbot = yaml.load( ); class TicketNumberID { - static pad(guildId) { - let n = this.get(guildId) + ""; + static async pad() { + let n = this.get() + ""; let z = "0"; let width = 4; - setTimeout(() => { - this.set(guildId, this.get(guildId) + 1); - }, 50); + await this.set(this.get() + 1); return n.length >= width ? n : new Array(width - n.length + 1).join(z) + n; } - static get(guildId) { + static get() { let ticketnumberID = JSON.parse( fs.readFileSync("./Data/TicketData.json", "utf8") ); - if (!ticketnumberID[guildId]) { - ticketnumberID[guildId] = { - id: 0, - }; + if (!ticketnumberID.id) { + ticketnumberID.id = 0; fs.writeFileSync( "./Data/TicketData.json", JSON.stringify(ticketnumberID, null, 4), (err) => { - if (err) console.log(err); + if (err) console.error(err); } ); return 0; } else { - return ticketnumberID[guildId].id; + return ticketnumberID.id; } } - static set(guildId, value) { + static set(value) { let ticketnumberID = JSON.parse( fs.readFileSync("./Data/TicketData.json", "utf8") ); - ticketnumberID[guildId] = { - id: value, - }; + ticketnumberID.id = value; fs.writeFileSync( "./Data/TicketData.json", JSON.stringify(ticketnumberID, null, 4), (err) => { - if (err) console.log(err); + if (err) console.error(err); } ); return value; } - static reset(guildId) { + static reset() { let ticketnumberID = JSON.parse( fs.readFileSync("./Data/TicketData.json", "utf8") ); - ticketnumberID[guildId] = { - id: 0, - }; + ticketnumberID.id = 0; fs.writeFileSync( "./Data/TicketData.json", JSON.stringify(ticketnumberID, null, 4), (err) => { - if (err) console.log(err); + if (err) console.error(err); } ); From edbef6a36f6e232fc0ee8829d281529c3ea394b2 Mon Sep 17 00:00:00 2001 From: Noah Date: Tue, 23 Nov 2021 15:49:37 -0600 Subject: [PATCH 15/24] Fixed close command --- Commands/close.js | 277 +++++++++++++++++----------------------------- 1 file changed, 102 insertions(+), 175 deletions(-) diff --git a/Commands/close.js b/Commands/close.js index 5b8da65..12c4290 100644 --- a/Commands/close.js +++ b/Commands/close.js @@ -11,13 +11,6 @@ const supportbot = yaml.load( const cmdconfig = yaml.load(fs.readFileSync("./Configs/commands.yml", "utf8")); const Command = require("../Structures/Command.js"); -const TicketNumberID = require("../Structures/TicketID.js"); - -async function asyncForEach(array, callback) { - for (let index = 0; index < array.length; index++) { - await callback(array[index], index, array); - } -} module.exports = new Command({ name: cmdconfig.CloseTicket, @@ -32,6 +25,10 @@ module.exports = new Command({ permission: "SEND_MESSAGES", async run(interaction) { + let TicketData = await JSON.parse( + fs.readFileSync("./Data/TicketData.json", "utf8") + ).tickets.find((t) => t.id === interaction.channel.id); + let tUser = interaction.client.users.cache.get(TicketData.user); if (!interaction.channel.name.startsWith(`${supportbot.TicketPrefix}`)) { const Exists = new Discord.MessageEmbed() .setTitle("No Ticket Found!") @@ -39,7 +36,21 @@ module.exports = new Command({ .setColor(supportbot.WarningColour); return interaction.reply({ embed: Exists }); } + let transcriptChannel = await interaction.guild.channels.cache.find( + (channel) => + channel.name == supportbot.TranscriptLog || + channel.id == supportbot.TranscriptLog + ); + let logChannel = await interaction.guild.channels.cache.find( + (channel) => + channel.name == supportbot.TicketLog || + channel.id == supportbot.TicketLog + ); + let reason = + (await interaction.options.getString("reason")) || "No Reason Provided."; + if (!transcriptChannel || !logChannel) + return interaction.reply("Some Channels seem to be missing!"); if (supportbot.CloseConfirmation) { const CloseTicketRequest = new Discord.MessageEmbed() .setTitle(`**${supportbot.ClosingTicket}**`) @@ -48,180 +59,96 @@ module.exports = new Command({ ) .setColor(supportbot.EmbedColour); - interaction - .reply(CloseTicketRequest) - .then((m) => { - interaction.channel - .awaitMessages( - (response) => - response.content.toLowerCase() === - supportbot.ClosingConfirmation_Word, - { - max: 1, - time: 20000, - errors: ["time"], - } - ) - .then((collected) => { - let logChannel = interaction.guild.channels.cache.find( - (channel) => - channel.name === supportbot.TranscriptLog || - channel.id === supportbot.TranscriptLog - ); - let user = interaction.user; - let reason = - interaction.options.getString("reason") || - "No Reason Provided."; - - let name = interaction.channel.name; - let ticketChannel = interaction.channel; - - interaction - .reply(`**${supportbot.ClosingTicket}**`) - - .then(() => { - const logEmbed = new Discord.MessageEmbed() - .setTitle(supportbot.TranscriptTitle) - .setColor(supportbot.EmbedColour) - .setFooter(supportbot.EmbedFooter) - .addField("Closed By", interaction.user.tag) - .addField("Reason", reason); - - interaction.channel.interactions - .fetch({ limit: 100 }) - .then((msgs) => { - let html = ""; - - msgs = msgs.sort( - (a, b) => a.createdTimestamp - b.createdTimestamp - ); - html += ``; - html += `Server Name: ${interaction.guild.name}
`; - html += `Ticket: ${ticketChannel.name}
`; - html += `Message: ${msgs.size} Messages


`; - - msgs.forEach((msg) => { - if (msg.content) { - html += `User: ${msg.author.tag}
`; - html += `Message: ${msg.content}
`; - html += `-----

`; - } - }); - - logChannel.send({ embeds: [logEmbed] }).catch((err) => { - interaction.reply(err); - }); - - let file = new Discord.MessageAttachment( - Buffer.from(html), - `${name}.html` - ); - logChannel - .send({ embeds: [logEmbed], files: [file] }) - .catch((err) => { - interaction.reply(err); - }); - - interaction.channel.delete().catch((error) => { - if ( - error.code !== - Discord.Constants.APIErrors.UNKNOWN_CHANNEL - ) { - console.error( - "Failed to delete the interaction:", - error - ); - } - }); - }); - }); - }); - }) - .catch(() => { - interaction - .followUp({ - content: "The request to close the ticket has timed out.", - }) - .then((m2) => setTimeout(() => interaction.channel.delete(3000))); - }); - } - - if (!supportbot.CloseConfirmation) { - let logChannel = interaction.guild.channels.cache.find( - (channel) => - channel.name === supportbot.TranscriptLog || - channel.id === supportbot.TranscriptLog + await interaction.reply(CloseTicketRequest); + await interaction.channel.awaitMessages( + (r) => + r.content.toLowerCase() === supportbot.ClosingConfirmation_Word && + r.author.id === interaction.author.id, + { + max: 1, + time: 20000, + errors: ["time"], + } ); - let user = interaction.user; - let reason = - (await interaction.options.getString("reason")) || - "No Reason Provided."; + } + try { + await interaction.reply(`**${supportbot.ClosingTicket}**`); + const transcriptEmbed = new Discord.MessageEmbed() + .setTitle(supportbot.TranscriptTitle) + .setColor(supportbot.EmbedColour) + .setFooter(supportbot.EmbedFooter) + .addField( + "Ticket", + `${interaction.channel.name} (${interaction.channel.id})` + ) + .addField( + "User", + `${tUser.username}#${tUser.discriminator} (${tUser.id})` + ) + .addField("Closed By", interaction.user.tag) + .addField("Reason", reason); + const logEmbed = new Discord.MessageEmbed() + .setTitle(supportbot.TicketLog_Title) + .setColor(supportbot.EmbedColour) + .setFooter(supportbot.EmbedFooter) + .addField( + "Ticket", + `${interaction.channel.name} (${interaction.channel.id})` + ) + .addField( + "User", + `${tUser.username}#${tUser.discriminator} (${tUser.id})` + ) + .addField("Closed By", interaction.user.tag) + .addField("Reason", reason); + let msgs = await interaction.channel.messages.fetch(); + let html = ""; - let name = interaction.channel.name; - let ticketChannel = interaction.channel; + msgs = msgs.sort((a, b) => a.createdTimestamp - b.createdTimestamp); + html += ``; + html += `Server Name: ${interaction.guild.name}
`; + html += `Ticket: ${interaction.channel.name}
`; + html += `Message: ${msgs.size} Messages


`; - interaction - .reply(`**${supportbot.ClosingTicket}**`) + await msgs.forEach((msg) => { + if (msg.content) { + html += `User: ${msg.author.tag}
`; + html += `Message: ${msg.content}
`; + html += `-----

`; + } + }); - .then(() => { - const logEmbed = new Discord.MessageEmbed() - .setTitle(supportbot.TranscriptTitle) - .setColor(supportbot.EmbedColour) - .setFooter(supportbot.EmbedFooter) - .addField("Closed By", interaction.user.tag) - .addField("Reason", reason); + await logChannel.send({ embeds: [logEmbed] }).catch((err) => { + console.error(err); + }); - interaction.channel.interactions - .fetch({ limit: 100 }) - .then((msgs) => { - let html = ""; - - msgs = msgs.sort( - (a, b) => a.createdTimestamp - b.createdTimestamp - ); - html += ``; - html += `Server Name: ${interaction.guild.name}
`; - html += `Ticket: ${ticketChannel.name}
`; - html += `Message: ${msgs.size} Messages


`; - - msgs.forEach((msg) => { - if (msg.content) { - html += `User: ${msg.author.tag}
`; - html += `Message: ${msg.content}
`; - html += `-----

`; - } - }); - - logChannel.send({ embeds: [logEmbed] }).catch((err) => { - interaction.reply(err); - }); - - let file = new Discord.MessageAttachment( - Buffer.from(html), - `${name}.html` - ); - logChannel - .send({ embeds: [logEmbed], files: [file] }) - .catch((err) => { - interaction.reply(err); - }); - - interaction.channel.delete().catch((error) => { - if ( - error.code !== Discord.Constants.APIErrors.UNKNOWN_CHANNEL - ) { - console.error("Failed to delete the interaction:", error); - } - }); - }); - }) - .catch(() => { - interaction - .followUp({ - content: "The request to close the ticket has timed out.", - }) - .then((m2) => setTimeout(() => interaction.channel.delete(3000))); + let file = new Discord.MessageAttachment( + Buffer.from(html), + `${interaction.channel.name}.html` + ); + await transcriptChannel + .send({ embeds: [transcriptEmbed], files: [file] }) + .catch(async (err) => { + await console.error(err); }); + await tUser + .send({ embeds: [transcriptEmbed], files: [file] }) + .catch(async (err) => { + await console.error(err); + }); + + await interaction.channel.delete().catch(async (error) => { + console.error(error); + if (error.code !== Discord.Constants.APIErrors.UNKNOWN_CHANNEL) { + console.error("Failed to delete the interaction:", error); + } + }); + } catch (error) { + console.error(error); + await interaction.followUp({ + content: "The request to close the ticket has timed out.", + }); + setTimeout(() => interaction.channel.delete(3000)); } }, }); From cd6df02e30ccb24dfbd0d86961f851fcc296764a Mon Sep 17 00:00:00 2001 From: Noah Date: Tue, 23 Nov 2021 15:50:56 -0600 Subject: [PATCH 16/24] Changed TicketLog_Title --- Configs/supportbot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Configs/supportbot.yml b/Configs/supportbot.yml index 125a608..78732c8 100644 --- a/Configs/supportbot.yml +++ b/Configs/supportbot.yml @@ -92,7 +92,7 @@ TicketLog: "logs" TranscriptLog: "transcripts" TranscriptTitle: "Ticket Transcript" -TicketLog_Title: "Ticket Log" +TicketLog_Title: "Ticket Closed" TicketBlackListMessage: "You are not allowed to open a ticket" TicketSubject: "description" From b6747a034056103b86f12268ea7255159980d1ff Mon Sep 17 00:00:00 2001 From: Noah Date: Tue, 23 Nov 2021 16:51:28 -0600 Subject: [PATCH 17/24] Made warning ephemeral --- Commands/ticket.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Commands/ticket.js b/Commands/ticket.js index b19134d..ef98dba 100644 --- a/Commands/ticket.js +++ b/Commands/ticket.js @@ -98,9 +98,11 @@ module.exports = new Command({ DepartmentRole.id === supportbot.DepartmentRole_3 ); if (!Staff || !Admins || !DeptRole1 || !DeptRole2 || !DeptRole3) - return interaction.reply( - "Some roles seem to be missing!\nPlease check for errors when starting the bot." - ); + return interaction.reply({ + content: + "Some roles seem to be missing!\nPlease check for errors when starting the bot.", + ephemeral: true, + }); const Author = interaction.user; const Everyone = interaction.guild.id; const ticketChannel = await interaction.guild.channels.create( From 6c5799be0dae1330bb0f3007c40a479a8e37e1e1 Mon Sep 17 00:00:00 2001 From: Noah Date: Tue, 23 Nov 2021 17:32:57 -0600 Subject: [PATCH 18/24] Fix ID --- Data/TicketData.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Data/TicketData.json b/Data/TicketData.json index 6201053..f97612b 100644 --- a/Data/TicketData.json +++ b/Data/TicketData.json @@ -1,4 +1,4 @@ { - "id": 10, + "id": 0, "tickets": [] } From 9fed504f375396e755c62aec634dfa2c27cc4d29 Mon Sep 17 00:00:00 2001 From: Noah Date: Tue, 23 Nov 2021 17:37:25 -0600 Subject: [PATCH 19/24] Fixed /close --- Commands/close.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Commands/close.js b/Commands/close.js index 12c4290..e836167 100644 --- a/Commands/close.js +++ b/Commands/close.js @@ -28,14 +28,17 @@ module.exports = new Command({ let TicketData = await JSON.parse( fs.readFileSync("./Data/TicketData.json", "utf8") ).tickets.find((t) => t.id === interaction.channel.id); - let tUser = interaction.client.users.cache.get(TicketData.user); - if (!interaction.channel.name.startsWith(`${supportbot.TicketPrefix}`)) { + if ( + !TicketData || + !interaction.channel.name.startsWith(`${supportbot.TicketPrefix}`) + ) { const Exists = new Discord.MessageEmbed() .setTitle("No Ticket Found!") .setDescription(`${supportbot.NoValidTicket}`) .setColor(supportbot.WarningColour); - return interaction.reply({ embed: Exists }); + return interaction.reply({ embeds: [Exists] }); } + let tUser = interaction.client.users.cache.get(TicketData.user); let transcriptChannel = await interaction.guild.channels.cache.find( (channel) => channel.name == supportbot.TranscriptLog || From ffdce5820ba4664185e10b6b5fc25eb30e56e1b1 Mon Sep 17 00:00:00 2001 From: Noah Date: Tue, 23 Nov 2021 18:08:45 -0600 Subject: [PATCH 20/24] Fix close button --- Events/interactionCreate.js | 76 ++++--------------------------------- 1 file changed, 7 insertions(+), 69 deletions(-) diff --git a/Events/interactionCreate.js b/Events/interactionCreate.js index 801e3e3..32672e3 100644 --- a/Events/interactionCreate.js +++ b/Events/interactionCreate.js @@ -18,8 +18,7 @@ module.exports = new Event("interactionCreate", async (client, interaction) => { (cmd) => cmd.name.toLowerCase() == interaction.commandName ); - if (interaction.user.bot || !interaction.isCommand() || !interaction.guild) - return; + if (interaction.user.bot || !interaction.guild) return; const NotValid = new Discord.MessageEmbed() .setDescription(`:x: \`Invalid Command\` `) @@ -57,73 +56,12 @@ module.exports = new Event("interactionCreate", async (client, interaction) => { } if (interaction.customId === "ticketclose") { - if (interaction.channel.name.startsWith(`${supportbot.TicketPrefix}`)) { - interaction.message.fetch(); - interaction.deferUpdate(); - const DeleteTicketEmbed = new Discord.MessageEmbed() - .setDescription(supportbot.TicketDeleteMessage) - .setColor(supportbot.EmbedColour); - interaction.channel.send({ embeds: [DeleteTicketEmbed] }); - - let logChannel = - interaction.guild.channels.cache.find( - (channel) => channel.name === supportbot.TranscriptLog - ) || - interaction.guild.channels.cache.find( - (channel) => channel.id === supportbot.TranscriptLog - ); - - let user = interaction.user; - let name = interaction.channel.name; - let ticketChannel = interaction.channel; - let reason = "No Reason Provided."; - - interaction.channel - .send({ content: `**${supportbot.ClosingTicket}**` }) - .then(() => { - const logEmbed = new Discord.MessageEmbed() - .setTitle(supportbot.TranscriptTitle) - .setColor(supportbot.EmbedColour) - .setFooter(supportbot.EmbedFooter) - .addField("Closed By", user.username) - .addField("Reason", reason); - - interaction.channel.messages.fetch({ limit: 100 }).then((msgs) => { - let html = ""; - - msgs = msgs.sort( - (a, b) => a.createdTimestamp - b.createdTimestamp - ); - html += ``; - html += `Server Name: ${interaction.guild.name}
`; - html += `Ticket: ${ticketChannel.name}
`; - html += `Message: ${msgs.size} Messages


`; - - msgs.forEach((msg) => { - if (msg.content) { - html += `User: ${msg.author.tag}
`; - html += `Message: ${msg.content}
`; - html += `-----

`; - } - }); - - const TranscriptSavedEmbed = new Discord.MessageEmbed() - .setDescription(supportbot.TranscriptSavedMessage) - .setColor(supportbot.SuccessColour); - interaction.channel.send({ embeds: [TranscriptSavedEmbed] }); - - let file = new Discord.MessageAttachment( - Buffer.from(html), - `${name}.html` - ); - logChannel.send({ embeds: [logEmbed], files: [file] }); - - setTimeout( - () => interaction.channel.delete(), - supportbot.TicketDeleteTime - ); - }); - }); + try { + const cmd = client.commands.get(cmdconfig.CloseTicket); + if (!cmd) return; + cmd.run(interaction); + } catch (error) { + console.error(error); } } if (interaction.customId === "ticketlock") { From 1ee0d4a09e132d11ea047fda32eb30e1207142cd Mon Sep 17 00:00:00 2001 From: Noah Date: Tue, 23 Nov 2021 18:09:06 -0600 Subject: [PATCH 21/24] Update close.js --- Commands/close.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Commands/close.js b/Commands/close.js index e836167..296dd8a 100644 --- a/Commands/close.js +++ b/Commands/close.js @@ -30,7 +30,7 @@ module.exports = new Command({ ).tickets.find((t) => t.id === interaction.channel.id); if ( !TicketData || - !interaction.channel.name.startsWith(`${supportbot.TicketPrefix}`) + !interaction.channel.name.startsWith(supportbot.TicketPrefix) ) { const Exists = new Discord.MessageEmbed() .setTitle("No Ticket Found!") @@ -50,7 +50,7 @@ module.exports = new Command({ channel.id == supportbot.TicketLog ); let reason = - (await interaction.options.getString("reason")) || "No Reason Provided."; + (await interaction.options?.getString("reason")) || "No Reason Provided."; if (!transcriptChannel || !logChannel) return interaction.reply("Some Channels seem to be missing!"); @@ -132,12 +132,12 @@ module.exports = new Command({ await transcriptChannel .send({ embeds: [transcriptEmbed], files: [file] }) .catch(async (err) => { - await console.error(err); + console.error(err); }); await tUser .send({ embeds: [transcriptEmbed], files: [file] }) .catch(async (err) => { - await console.error(err); + console.error(err); }); await interaction.channel.delete().catch(async (error) => { @@ -148,10 +148,12 @@ module.exports = new Command({ }); } catch (error) { console.error(error); + /* await interaction.followUp({ content: "The request to close the ticket has timed out.", }); setTimeout(() => interaction.channel.delete(3000)); + */ } }, }); From c56e78484a5509d902528b8c806b4a73596e9637 Mon Sep 17 00:00:00 2001 From: Noah Date: Tue, 23 Nov 2021 20:29:22 -0600 Subject: [PATCH 22/24] Update dependencies --- package-lock.json | 26 +++++++++++++------------- package.json | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7bc7e43..f8b4d7a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "7.4.0", "license": "MIT", "dependencies": { - "discord.js": "^13.2.0", + "discord.js": "^13.3.1", "js-yaml": "^4.1.0" } }, @@ -72,9 +72,9 @@ } }, "node_modules/@types/node": { - "version": "16.11.9", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.9.tgz", - "integrity": "sha512-MKmdASMf3LtPzwLyRrFjtFFZ48cMf8jmX5VRYrDQiJa8Ybu5VAmkqBWqKU8fdCwD8ysw4mQ9nrEHvzg6gunR7A==" + "version": "16.11.10", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.10.tgz", + "integrity": "sha512-3aRnHa1KlOEEhJ6+CvyHKK5vE9BcLGjtUpwvqYLRvYNQKMfabu3BwfJaA/SLW8dxe28LsNDjtHwePTuzn3gmOA==" }, "node_modules/@types/node-fetch": { "version": "2.5.12", @@ -307,9 +307,9 @@ } }, "node_modules/ws": { - "version": "8.2.3", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz", - "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.3.0.tgz", + "integrity": "sha512-Gs5EZtpqZzLvmIM59w4igITU57lrtYVFneaa434VROv4thzJyV6UjIL3D42lslWlI+D4KzLYnxSwtfuiO79sNw==", "engines": { "node": ">=10.0.0" }, @@ -366,9 +366,9 @@ "integrity": "sha512-VkE3KLBmJwcCaVARtQpfuKcKv8gcBmUubrfHGF84dXuuW6jgsRYxPtzcIhPyK9WAPpRt2/xY6zkD9MnRaJzSyw==" }, "@types/node": { - "version": "16.11.9", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.9.tgz", - "integrity": "sha512-MKmdASMf3LtPzwLyRrFjtFFZ48cMf8jmX5VRYrDQiJa8Ybu5VAmkqBWqKU8fdCwD8ysw4mQ9nrEHvzg6gunR7A==" + "version": "16.11.10", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.10.tgz", + "integrity": "sha512-3aRnHa1KlOEEhJ6+CvyHKK5vE9BcLGjtUpwvqYLRvYNQKMfabu3BwfJaA/SLW8dxe28LsNDjtHwePTuzn3gmOA==" }, "@types/node-fetch": { "version": "2.5.12", @@ -546,9 +546,9 @@ } }, "ws": { - "version": "8.2.3", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz", - "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.3.0.tgz", + "integrity": "sha512-Gs5EZtpqZzLvmIM59w4igITU57lrtYVFneaa434VROv4thzJyV6UjIL3D42lslWlI+D4KzLYnxSwtfuiO79sNw==", "requires": {} } } diff --git a/package.json b/package.json index 7ae153e..277c4e8 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ }, "homepage": "https://github.com/Emerald-Services/SupportBot#readme", "dependencies": { - "discord.js": "^13.2.0", + "discord.js": "^13.3.1", "js-yaml": "^4.1.0" } } From 5a467599e972b292019702f719273f799de15558 Mon Sep 17 00:00:00 2001 From: Noah Date: Wed, 24 Nov 2021 00:15:16 -0600 Subject: [PATCH 23/24] Update hello.js --- Addons/hello.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Addons/hello.js b/Addons/hello.js index e87b181..692eff3 100644 --- a/Addons/hello.js +++ b/Addons/hello.js @@ -10,8 +10,8 @@ const supportbot = yaml.load( ); const cmdconfig = yaml.load(fs.readFileSync("./Configs/commands.yml", "utf8")); -// Your Addon Config file! Saved in /Addons/Settings/YourAddonConfig.yml -// const exampleaddon = yaml.load(fs.readFileSync('./Addons/Settings/YourAddonConfig.yml', 'utf8')); +// Your Addon Config file! Saved in /Addons/Configs/YourAddonConfig.yml +// const exampleaddon = yaml.load(fs.readFileSync('./Addons/Configs/YourAddonConfig.yml', 'utf8')); const Command = require("../Structures/Command.js"); From ffe42f9777bb41d78baae00fcd1ee1e7c21233f8 Mon Sep 17 00:00:00 2001 From: Noah Date: Wed, 24 Nov 2021 18:14:07 -0600 Subject: [PATCH 24/24] Update ticket.js --- Commands/ticket.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Commands/ticket.js b/Commands/ticket.js index ef98dba..db4bf7e 100644 --- a/Commands/ticket.js +++ b/Commands/ticket.js @@ -236,19 +236,19 @@ module.exports = new Command({ }); const Department1Button = new Discord.MessageButton() .setCustomId("Department1") - .setLabel(`${supportbot.DepartmentTitle_1}`) + .setLabel(supportbot.DepartmentTitle_1) .setStyle(supportbot.TicketDept1Colour) .setEmoji(supportbot.TicketDept1Emoji); const Department2Button = new Discord.MessageButton() .setCustomId("Department2") - .setLabel(`${supportbot.DepartmentTitle_2}`) + .setLabel(supportbot.DepartmentTitle_2) .setStyle(supportbot.TicketDept2Colour) .setEmoji(supportbot.TicketDept2Emoji); const Department3Button = new Discord.MessageButton() .setCustomId("Department3") - .setLabel(`${supportbot.DepartmentTitle_3}`) + .setLabel(supportbot.DepartmentTitle_3) .setStyle(supportbot.TicketDept3Colour) .setEmoji(supportbot.TicketDept3Emoji);