From b3c21a488a1e6bd9d69bae78d8de97b829022802 Mon Sep 17 00:00:00 2001 From: Phil Date: Mon, 13 Feb 2023 19:41:08 +0100 Subject: [PATCH 1/8] add - missing command --- changelog.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/changelog.txt b/changelog.txt index b2d0078..a7219dd 100644 --- a/changelog.txt +++ b/changelog.txt @@ -2,7 +2,8 @@ __Bot update - 2.1.0 - Permissions, Management and Discord Invites!__ New Stuff: - Rename command (/hub rename) -- Transfer command (/hub transfer) +- Transfer hub command (/hub transfer) +- List guild command (/hub listserver) - Guild kick command (/hub kick) - Allow invite to be displayed on other server (/allowinvites) - Block users from your guild (/blockuser) From 5ee17b26122e101ee19ae165eac729612a89ce6b Mon Sep 17 00:00:00 2001 From: Phil Date: Mon, 13 Feb 2023 19:44:20 +0100 Subject: [PATCH 2/8] update - default ephemeral enabled --- changelog.txt | 1 + functions/globalFuncs.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/changelog.txt b/changelog.txt index a7219dd..a7b1ea2 100644 --- a/changelog.txt +++ b/changelog.txt @@ -16,6 +16,7 @@ Boring Bug Fixes: - Better error handling on message deletions (it was spamming the console) - /about better formatting - Wiki has been updated with new features +- default ephemeral enabled for successful commands Planned for the Future: - use bans to deny service to a guild diff --git a/functions/globalFuncs.js b/functions/globalFuncs.js index 39aa6a2..fecc439 100644 --- a/functions/globalFuncs.js +++ b/functions/globalFuncs.js @@ -6,7 +6,7 @@ global.messageFail = async (interaction, body, color, ephemeral) => { global.messageSuccess = async (interaction, body, color, ephemeral) => { const sentMessage = await client.functions.get('EmbedBuilder') - .run(interaction, body, '', color || 'Green', false, ephemeral || false); + .run(interaction, body, '', color || 'Green', false, ephemeral || true); return sentMessage; }; From 70901c5d4ca5c7ae6595492cb642021eb4c79d8e Mon Sep 17 00:00:00 2001 From: Phil Date: Fri, 31 Mar 2023 00:11:56 +0200 Subject: [PATCH 3/8] update - comment --- functions/EVENT/interactionCreate.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/functions/EVENT/interactionCreate.js b/functions/EVENT/interactionCreate.js index 7a42637..3ac47a8 100644 --- a/functions/EVENT/interactionCreate.js +++ b/functions/EVENT/interactionCreate.js @@ -1,9 +1,9 @@ module.exports.run = async (interaction) => { // only guild command - // TODO: implement command permission system, that way permission checking and dm checking is not nessesary anymore. + // TODO: implement command permission system, that way permission checking and dm checking is not necessary anymore. if (!await interaction.inGuild()) return messageFail(interaction, 'The bot is for server-use only.'); - // autocomplete hanlder + // autocomplete handler if (interaction.isAutocomplete()) return client.functions.get('EVENT_interaction_isAutocomplete').run(interaction).catch(ERR); // command handler if (interaction.isCommand()) return client.functions.get('EVENT_interaction_isCommand').run(interaction).catch(ERR); From 7f1681b5c2bfb21d447ff932938d3777cae7ad34 Mon Sep 17 00:00:00 2001 From: Phil Date: Fri, 31 Mar 2023 00:12:14 +0200 Subject: [PATCH 4/8] update - breaking packages --- package-lock.json | 255 +++++++++++++++++++++++++--------------------- package.json | 8 +- 2 files changed, 143 insertions(+), 120 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8e4f29c..701fe0d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,14 +9,14 @@ "version": "2.1.0", "license": "MIT", "dependencies": { - "@discordjs/builders": "^1.4.0", + "@discordjs/builders": "^1.5.0", "axios": "^0.27.2", - "bufferutil": "^4.0.6", - "discord.js": "^14.7.1", + "bufferutil": "^4.0.7", + "discord.js": "^14.8.0", "html-to-image": "^1.10.4", "mysql2": "^2.3.3", "sequelize": "^6.16.1", - "utf-8-validate": "^5.0.9" + "utf-8-validate": "^5.0.10" }, "devDependencies": { "eslint": "^8.9.0", @@ -25,51 +25,63 @@ } }, "node_modules/@discordjs/builders": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/@discordjs/builders/-/builders-1.4.0.tgz", - "integrity": "sha512-nEeTCheTTDw5kO93faM1j8ZJPonAX86qpq/QVoznnSa8WWcCgJpjlu6GylfINTDW6o7zZY0my2SYdxx2mfNwGA==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@discordjs/builders/-/builders-1.5.0.tgz", + "integrity": "sha512-7XxT78mnNBPigHn2y6KAXkicxIBFtZREGWaRZ249EC1l6gBUEP8IyVY5JTciIjJArxkF+tg675aZvsTNTKBpmA==", "dependencies": { - "@discordjs/util": "^0.1.0", - "@sapphire/shapeshift": "^3.7.1", - "discord-api-types": "^0.37.20", + "@discordjs/formatters": "^0.2.0", + "@discordjs/util": "^0.2.0", + "@sapphire/shapeshift": "^3.8.1", + "discord-api-types": "^0.37.35", "fast-deep-equal": "^3.1.3", - "ts-mixer": "^6.0.2", - "tslib": "^2.4.1" + "ts-mixer": "^6.0.3", + "tslib": "^2.5.0" }, "engines": { "node": ">=16.9.0" } }, "node_modules/@discordjs/collection": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@discordjs/collection/-/collection-1.3.0.tgz", - "integrity": "sha512-ylt2NyZ77bJbRij4h9u/wVy7qYw/aDqQLWnadjvDqW/WoWCxrsX6M3CIw9GVP5xcGCDxsrKj5e0r5evuFYwrKg==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@discordjs/collection/-/collection-1.4.0.tgz", + "integrity": "sha512-hiOJyk2CPFf1+FL3a4VKCuu1f448LlROVuu8nLz1+jCOAPokUcdFAV+l4pd3B3h6uJlJQSASoZzrdyNdjdtfzQ==", + "engines": { + "node": ">=16.9.0" + } + }, + "node_modules/@discordjs/formatters": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/@discordjs/formatters/-/formatters-0.2.0.tgz", + "integrity": "sha512-vn4oMSXuMZUm8ITqVOtvE7/fMMISj4cI5oLsR09PEQXHKeKDAMLltG/DWeeIs7Idfy6V8Fk3rn1e69h7NfzuNA==", + "dependencies": { + "discord-api-types": "^0.37.35" + }, "engines": { "node": ">=16.9.0" } }, "node_modules/@discordjs/rest": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/@discordjs/rest/-/rest-1.5.0.tgz", - "integrity": "sha512-lXgNFqHnbmzp5u81W0+frdXN6Etf4EUi8FAPcWpSykKd8hmlWh1xy6BmE0bsJypU1pxohaA8lQCgp70NUI3uzA==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@discordjs/rest/-/rest-1.6.0.tgz", + "integrity": "sha512-HGvqNCZ5Z5j0tQHjmT1lFvE5ETO4hvomJ1r0cbnpC1zM23XhCpZ9wgTCiEmaxKz05cyf2CI9p39+9LL+6Yz1bA==", "dependencies": { - "@discordjs/collection": "^1.3.0", - "@discordjs/util": "^0.1.0", + "@discordjs/collection": "^1.4.0", + "@discordjs/util": "^0.2.0", "@sapphire/async-queue": "^1.5.0", - "@sapphire/snowflake": "^3.2.2", - "discord-api-types": "^0.37.23", - "file-type": "^18.0.0", - "tslib": "^2.4.1", - "undici": "^5.13.0" + "@sapphire/snowflake": "^3.4.0", + "discord-api-types": "^0.37.35", + "file-type": "^18.2.1", + "tslib": "^2.5.0", + "undici": "^5.20.0" }, "engines": { "node": ">=16.9.0" } }, "node_modules/@discordjs/util": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/@discordjs/util/-/util-0.1.0.tgz", - "integrity": "sha512-e7d+PaTLVQav6rOc2tojh2y6FE8S7REkqLldq1XF4soCx74XB/DIjbVbVLtBemf0nLW77ntz0v+o5DytKwFNLQ==", + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/@discordjs/util/-/util-0.2.0.tgz", + "integrity": "sha512-/8qNbebFzLWKOOg+UV+RB8itp4SmU5jw0tBUD3ifElW6rYNOj1Ku5JaSW7lLl/WgjjxF01l/1uQPCzkwr110vg==", "engines": { "node": ">=16.9.0" } @@ -573,27 +585,28 @@ } }, "node_modules/discord-api-types": { - "version": "0.37.33", - "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.37.33.tgz", - "integrity": "sha512-ZMH5RU3q1pvYS+2wGUJ5Zvy8jMGTQ4wCpbDlIQDkbIL/k6kJwBPsXnCg81g2GywlOuf0f8ezakxVSe+sZuY6ig==" + "version": "0.37.37", + "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.37.37.tgz", + "integrity": "sha512-LDMBKzl/zbvHO/yCzno5hevuA6lFIXJwdKSJZQrB+1ToDpFfN9thK+xxgZNR4aVkI7GHRDja0p4Sl2oYVPnHYg==" }, "node_modules/discord.js": { - "version": "14.7.1", - "resolved": "https://registry.npmjs.org/discord.js/-/discord.js-14.7.1.tgz", - "integrity": "sha512-1FECvqJJjjeYcjSm0IGMnPxLqja/pmG1B0W2l3lUY2Gi4KXiyTeQmU1IxWcbXHn2k+ytP587mMWqva2IA87EbA==", + "version": "14.8.0", + "resolved": "https://registry.npmjs.org/discord.js/-/discord.js-14.8.0.tgz", + "integrity": "sha512-UOxYtc/YnV7jAJ2gISluJyYeBw4e+j8gWn+IoqG8unaHAVuvZ13DdYN0M1f9fbUgUvSarV798inIrYFtDNDjwQ==", "dependencies": { - "@discordjs/builders": "^1.4.0", - "@discordjs/collection": "^1.3.0", - "@discordjs/rest": "^1.4.0", - "@discordjs/util": "^0.1.0", - "@sapphire/snowflake": "^3.2.2", - "@types/ws": "^8.5.3", - "discord-api-types": "^0.37.20", + "@discordjs/builders": "^1.5.0", + "@discordjs/collection": "^1.4.0", + "@discordjs/formatters": "^0.2.0", + "@discordjs/rest": "^1.6.0", + "@discordjs/util": "^0.2.0", + "@sapphire/snowflake": "^3.4.0", + "@types/ws": "^8.5.4", + "discord-api-types": "^0.37.35", "fast-deep-equal": "^3.1.3", "lodash.snakecase": "^4.1.1", - "tslib": "^2.4.1", - "undici": "^5.13.0", - "ws": "^8.11.0" + "tslib": "^2.5.0", + "undici": "^5.20.0", + "ws": "^8.12.1" }, "engines": { "node": ">=16.9.0" @@ -1033,9 +1046,9 @@ } }, "node_modules/file-type": { - "version": "18.2.0", - "resolved": "https://registry.npmjs.org/file-type/-/file-type-18.2.0.tgz", - "integrity": "sha512-M3RQMWY3F2ykyWZ+IHwNCjpnUmukYhtdkGGC1ZVEUb0ve5REGF7NNJ4Q9ehCUabtQKtSVFOMbFTXgJlFb0DQIg==", + "version": "18.2.1", + "resolved": "https://registry.npmjs.org/file-type/-/file-type-18.2.1.tgz", + "integrity": "sha512-Yw5MtnMv7vgD2/6Bjmmuegc8bQEVA9GmAyaR18bMYWKqsWDG9wgYZ1j4I6gNMF5Y5JBDcUcjRQqNQx7Y8uotcg==", "dependencies": { "readable-web-to-node-stream": "^3.0.2", "strtok3": "^7.0.0", @@ -2153,9 +2166,9 @@ ] }, "node_modules/readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", "dependencies": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", @@ -2341,9 +2354,9 @@ "integrity": "sha512-hr3Wtp/GZIc/6DAGPDcV4/9WoZhjrkXsi5B/07QgX8tsdc6ilr7BFM6PM6rbdAX1kFSDYeZGLipIZZKyQP0O5Q==" }, "node_modules/sequelize": { - "version": "6.28.0", - "resolved": "https://registry.npmjs.org/sequelize/-/sequelize-6.28.0.tgz", - "integrity": "sha512-+WHqvUQgTp19GLkt+gyQ+F6qg+FIEO2O5F9C0TOYV/PjZ2a/XwWvVkL1NCkS4VSIjVVvAUutiW6Wv9ofveGaVw==", + "version": "6.30.0", + "resolved": "https://registry.npmjs.org/sequelize/-/sequelize-6.30.0.tgz", + "integrity": "sha512-VxQ3gB+isefL8Ic3GDUR6Y8Zwu1ctWNUlffcdSClsLkQ0mwgoLQv3cI3cDwSVn9wZJk0AEwMSm1TYFFRqmcR0A==", "funding": [ { "type": "opencollective", @@ -2358,7 +2371,7 @@ "inflection": "^1.13.2", "lodash": "^4.17.21", "moment": "^2.29.1", - "moment-timezone": "^0.5.34", + "moment-timezone": "^0.5.35", "pg-connection-string": "^2.5.0", "retry-as-promised": "^7.0.3", "semver": "^7.3.5", @@ -2686,9 +2699,9 @@ } }, "node_modules/undici": { - "version": "5.19.1", - "resolved": "https://registry.npmjs.org/undici/-/undici-5.19.1.tgz", - "integrity": "sha512-YiZ61LPIgY73E7syxCDxxa3LV2yl3sN8spnIuTct60boiiRaE1J8mNWHO8Im2Zi/sFrPusjLlmRPrsyraSqX6A==", + "version": "5.21.0", + "resolved": "https://registry.npmjs.org/undici/-/undici-5.21.0.tgz", + "integrity": "sha512-HOjK8l6a57b2ZGXOcUsI5NLfoTrfmbOl90ixJDl0AEFG4wgHNDQxtZy15/ZQp7HhjkpaGlp/eneMgtsu1dIlUA==", "dependencies": { "busboy": "^1.6.0" }, @@ -2813,9 +2826,9 @@ "dev": true }, "node_modules/ws": { - "version": "8.12.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.12.0.tgz", - "integrity": "sha512-kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig==", + "version": "8.13.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz", + "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==", "engines": { "node": ">=10.0.0" }, @@ -2852,42 +2865,51 @@ }, "dependencies": { "@discordjs/builders": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/@discordjs/builders/-/builders-1.4.0.tgz", - "integrity": "sha512-nEeTCheTTDw5kO93faM1j8ZJPonAX86qpq/QVoznnSa8WWcCgJpjlu6GylfINTDW6o7zZY0my2SYdxx2mfNwGA==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@discordjs/builders/-/builders-1.5.0.tgz", + "integrity": "sha512-7XxT78mnNBPigHn2y6KAXkicxIBFtZREGWaRZ249EC1l6gBUEP8IyVY5JTciIjJArxkF+tg675aZvsTNTKBpmA==", "requires": { - "@discordjs/util": "^0.1.0", - "@sapphire/shapeshift": "^3.7.1", - "discord-api-types": "^0.37.20", + "@discordjs/formatters": "^0.2.0", + "@discordjs/util": "^0.2.0", + "@sapphire/shapeshift": "^3.8.1", + "discord-api-types": "^0.37.35", "fast-deep-equal": "^3.1.3", - "ts-mixer": "^6.0.2", - "tslib": "^2.4.1" + "ts-mixer": "^6.0.3", + "tslib": "^2.5.0" } }, "@discordjs/collection": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@discordjs/collection/-/collection-1.3.0.tgz", - "integrity": "sha512-ylt2NyZ77bJbRij4h9u/wVy7qYw/aDqQLWnadjvDqW/WoWCxrsX6M3CIw9GVP5xcGCDxsrKj5e0r5evuFYwrKg==" + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@discordjs/collection/-/collection-1.4.0.tgz", + "integrity": "sha512-hiOJyk2CPFf1+FL3a4VKCuu1f448LlROVuu8nLz1+jCOAPokUcdFAV+l4pd3B3h6uJlJQSASoZzrdyNdjdtfzQ==" + }, + "@discordjs/formatters": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/@discordjs/formatters/-/formatters-0.2.0.tgz", + "integrity": "sha512-vn4oMSXuMZUm8ITqVOtvE7/fMMISj4cI5oLsR09PEQXHKeKDAMLltG/DWeeIs7Idfy6V8Fk3rn1e69h7NfzuNA==", + "requires": { + "discord-api-types": "^0.37.35" + } }, "@discordjs/rest": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/@discordjs/rest/-/rest-1.5.0.tgz", - "integrity": "sha512-lXgNFqHnbmzp5u81W0+frdXN6Etf4EUi8FAPcWpSykKd8hmlWh1xy6BmE0bsJypU1pxohaA8lQCgp70NUI3uzA==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@discordjs/rest/-/rest-1.6.0.tgz", + "integrity": "sha512-HGvqNCZ5Z5j0tQHjmT1lFvE5ETO4hvomJ1r0cbnpC1zM23XhCpZ9wgTCiEmaxKz05cyf2CI9p39+9LL+6Yz1bA==", "requires": { - "@discordjs/collection": "^1.3.0", - "@discordjs/util": "^0.1.0", + "@discordjs/collection": "^1.4.0", + "@discordjs/util": "^0.2.0", "@sapphire/async-queue": "^1.5.0", - "@sapphire/snowflake": "^3.2.2", - "discord-api-types": "^0.37.23", - "file-type": "^18.0.0", - "tslib": "^2.4.1", - "undici": "^5.13.0" + "@sapphire/snowflake": "^3.4.0", + "discord-api-types": "^0.37.35", + "file-type": "^18.2.1", + "tslib": "^2.5.0", + "undici": "^5.20.0" } }, "@discordjs/util": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/@discordjs/util/-/util-0.1.0.tgz", - "integrity": "sha512-e7d+PaTLVQav6rOc2tojh2y6FE8S7REkqLldq1XF4soCx74XB/DIjbVbVLtBemf0nLW77ntz0v+o5DytKwFNLQ==" + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/@discordjs/util/-/util-0.2.0.tgz", + "integrity": "sha512-/8qNbebFzLWKOOg+UV+RB8itp4SmU5jw0tBUD3ifElW6rYNOj1Ku5JaSW7lLl/WgjjxF01l/1uQPCzkwr110vg==" }, "@eslint/eslintrc": { "version": "1.4.1", @@ -3258,27 +3280,28 @@ "integrity": "sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==" }, "discord-api-types": { - "version": "0.37.33", - "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.37.33.tgz", - "integrity": "sha512-ZMH5RU3q1pvYS+2wGUJ5Zvy8jMGTQ4wCpbDlIQDkbIL/k6kJwBPsXnCg81g2GywlOuf0f8ezakxVSe+sZuY6ig==" + "version": "0.37.37", + "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.37.37.tgz", + "integrity": "sha512-LDMBKzl/zbvHO/yCzno5hevuA6lFIXJwdKSJZQrB+1ToDpFfN9thK+xxgZNR4aVkI7GHRDja0p4Sl2oYVPnHYg==" }, "discord.js": { - "version": "14.7.1", - "resolved": "https://registry.npmjs.org/discord.js/-/discord.js-14.7.1.tgz", - "integrity": "sha512-1FECvqJJjjeYcjSm0IGMnPxLqja/pmG1B0W2l3lUY2Gi4KXiyTeQmU1IxWcbXHn2k+ytP587mMWqva2IA87EbA==", + "version": "14.8.0", + "resolved": "https://registry.npmjs.org/discord.js/-/discord.js-14.8.0.tgz", + "integrity": "sha512-UOxYtc/YnV7jAJ2gISluJyYeBw4e+j8gWn+IoqG8unaHAVuvZ13DdYN0M1f9fbUgUvSarV798inIrYFtDNDjwQ==", "requires": { - "@discordjs/builders": "^1.4.0", - "@discordjs/collection": "^1.3.0", - "@discordjs/rest": "^1.4.0", - "@discordjs/util": "^0.1.0", - "@sapphire/snowflake": "^3.2.2", - "@types/ws": "^8.5.3", - "discord-api-types": "^0.37.20", + "@discordjs/builders": "^1.5.0", + "@discordjs/collection": "^1.4.0", + "@discordjs/formatters": "^0.2.0", + "@discordjs/rest": "^1.6.0", + "@discordjs/util": "^0.2.0", + "@sapphire/snowflake": "^3.4.0", + "@types/ws": "^8.5.4", + "discord-api-types": "^0.37.35", "fast-deep-equal": "^3.1.3", "lodash.snakecase": "^4.1.1", - "tslib": "^2.4.1", - "undici": "^5.13.0", - "ws": "^8.11.0" + "tslib": "^2.5.0", + "undici": "^5.20.0", + "ws": "^8.12.1" } }, "doctrine": { @@ -3627,9 +3650,9 @@ } }, "file-type": { - "version": "18.2.0", - "resolved": "https://registry.npmjs.org/file-type/-/file-type-18.2.0.tgz", - "integrity": "sha512-M3RQMWY3F2ykyWZ+IHwNCjpnUmukYhtdkGGC1ZVEUb0ve5REGF7NNJ4Q9ehCUabtQKtSVFOMbFTXgJlFb0DQIg==", + "version": "18.2.1", + "resolved": "https://registry.npmjs.org/file-type/-/file-type-18.2.1.tgz", + "integrity": "sha512-Yw5MtnMv7vgD2/6Bjmmuegc8bQEVA9GmAyaR18bMYWKqsWDG9wgYZ1j4I6gNMF5Y5JBDcUcjRQqNQx7Y8uotcg==", "requires": { "readable-web-to-node-stream": "^3.0.2", "strtok3": "^7.0.0", @@ -4403,9 +4426,9 @@ "dev": true }, "readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", "requires": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", @@ -4516,9 +4539,9 @@ "integrity": "sha512-hr3Wtp/GZIc/6DAGPDcV4/9WoZhjrkXsi5B/07QgX8tsdc6ilr7BFM6PM6rbdAX1kFSDYeZGLipIZZKyQP0O5Q==" }, "sequelize": { - "version": "6.28.0", - "resolved": "https://registry.npmjs.org/sequelize/-/sequelize-6.28.0.tgz", - "integrity": "sha512-+WHqvUQgTp19GLkt+gyQ+F6qg+FIEO2O5F9C0TOYV/PjZ2a/XwWvVkL1NCkS4VSIjVVvAUutiW6Wv9ofveGaVw==", + "version": "6.30.0", + "resolved": "https://registry.npmjs.org/sequelize/-/sequelize-6.30.0.tgz", + "integrity": "sha512-VxQ3gB+isefL8Ic3GDUR6Y8Zwu1ctWNUlffcdSClsLkQ0mwgoLQv3cI3cDwSVn9wZJk0AEwMSm1TYFFRqmcR0A==", "requires": { "@types/debug": "^4.1.7", "@types/validator": "^13.7.1", @@ -4527,7 +4550,7 @@ "inflection": "^1.13.2", "lodash": "^4.17.21", "moment": "^2.29.1", - "moment-timezone": "^0.5.34", + "moment-timezone": "^0.5.35", "pg-connection-string": "^2.5.0", "retry-as-promised": "^7.0.3", "semver": "^7.3.5", @@ -4745,9 +4768,9 @@ } }, "undici": { - "version": "5.19.1", - "resolved": "https://registry.npmjs.org/undici/-/undici-5.19.1.tgz", - "integrity": "sha512-YiZ61LPIgY73E7syxCDxxa3LV2yl3sN8spnIuTct60boiiRaE1J8mNWHO8Im2Zi/sFrPusjLlmRPrsyraSqX6A==", + "version": "5.21.0", + "resolved": "https://registry.npmjs.org/undici/-/undici-5.21.0.tgz", + "integrity": "sha512-HOjK8l6a57b2ZGXOcUsI5NLfoTrfmbOl90ixJDl0AEFG4wgHNDQxtZy15/ZQp7HhjkpaGlp/eneMgtsu1dIlUA==", "requires": { "busboy": "^1.6.0" } @@ -4841,9 +4864,9 @@ "dev": true }, "ws": { - "version": "8.12.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.12.0.tgz", - "integrity": "sha512-kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig==", + "version": "8.13.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz", + "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==", "requires": {} }, "yallist": { diff --git a/package.json b/package.json index 68e3e22..80fb7df 100644 --- a/package.json +++ b/package.json @@ -3,14 +3,14 @@ "version": "2.1.0", "main": "index.js", "dependencies": { - "@discordjs/builders": "^1.4.0", + "@discordjs/builders": "^1.5.0", "axios": "^0.27.2", - "bufferutil": "^4.0.6", - "discord.js": "^14.7.1", + "bufferutil": "^4.0.7", + "discord.js": "^14.8.0", "html-to-image": "^1.10.4", "mysql2": "^2.3.3", "sequelize": "^6.16.1", - "utf-8-validate": "^5.0.9" + "utf-8-validate": "^5.0.10" }, "devDependencies": { "eslint": "^8.9.0", From 6771e36930c777d2db63e8d34335e82bd1a15c20 Mon Sep 17 00:00:00 2001 From: Phil Date: Tue, 2 May 2023 20:06:28 +0200 Subject: [PATCH 5/8] added debug --- functions/AUTOCOMPLETE/RESOLVE/server.js | 1 + 1 file changed, 1 insertion(+) diff --git a/functions/AUTOCOMPLETE/RESOLVE/server.js b/functions/AUTOCOMPLETE/RESOLVE/server.js index 9e2e74b..383d5f7 100644 --- a/functions/AUTOCOMPLETE/RESOLVE/server.js +++ b/functions/AUTOCOMPLETE/RESOLVE/server.js @@ -9,6 +9,7 @@ module.exports.run = async (interaction) => { const allServers = await bridgedChannel.findAll({ attributes: ['serverID'], where: { hubID: hub.hubID } }).catch(ERR); const output = allServers.map((entry) => { + console.log(`DEBUG ${entry.serverID}`); const name = client.guilds.cache.get(entry.serverID).name || entry.serverID; return { name, value: entry.serverID }; }); From eb7cb05285af45b9df8c550ad7a51966fde08151 Mon Sep 17 00:00:00 2001 From: Phil Date: Tue, 2 May 2023 20:14:48 +0200 Subject: [PATCH 6/8] fix - bot removal while it was offline causing no guild info to be returned --- functions/AUTOCOMPLETE/RESOLVE/server.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/functions/AUTOCOMPLETE/RESOLVE/server.js b/functions/AUTOCOMPLETE/RESOLVE/server.js index 383d5f7..14a2626 100644 --- a/functions/AUTOCOMPLETE/RESOLVE/server.js +++ b/functions/AUTOCOMPLETE/RESOLVE/server.js @@ -9,8 +9,8 @@ module.exports.run = async (interaction) => { const allServers = await bridgedChannel.findAll({ attributes: ['serverID'], where: { hubID: hub.hubID } }).catch(ERR); const output = allServers.map((entry) => { - console.log(`DEBUG ${entry.serverID}`); - const name = client.guilds.cache.get(entry.serverID).name || entry.serverID; + const guild = client.guilds.cache.get(entry.serverID); + const name = guild ? guild.name : entry.serverID; return { name, value: entry.serverID }; }); return output; From b896f638fe70b8a760e25f3dd85a81843f34b25b Mon Sep 17 00:00:00 2001 From: Phil Date: Sat, 23 Dec 2023 15:22:36 +0100 Subject: [PATCH 7/8] update DB security --- .github/workflows/deploy.yml | 1 + docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index ab31199..2389da8 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -11,6 +11,7 @@ jobs: env: discordToken: ${{ secrets.TOKEN_DISCORD }} DB_PORT: ${{ secrets.DB_PORT }} + DB_IP: ${{ secrets.DB_IP }} DBpassword: ${{ secrets.DB_PASSWORD }} db_password_root: ${{ secrets.DB_PASSWORD_ROOT }} token_uptime: ${{ secrets.TOKEN_UPTIME }} diff --git a/docker-compose.yml b/docker-compose.yml index 3b910df..c44b85a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,7 +18,7 @@ services: image: mariadb:latest restart: always ports: - - "${DB_PORT}:3306" + - "${DB_IP}:${DB_PORT}:3306" volumes: - db_data:/var/lib/mysql environment: From 4ba3a3712acf79ce7c20080f9c037bae17dd3dd0 Mon Sep 17 00:00:00 2001 From: Phil Date: Sat, 23 Dec 2023 15:22:41 +0100 Subject: [PATCH 8/8] enabled uptime --- config.json | 4 ++-- functions/HEARTBEAT/uptime.js | 4 +++- functions/SETUP/heartbeat.js | 3 +-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/config.json b/config.json index 72326eb..5068eb9 100644 --- a/config.json +++ b/config.json @@ -19,8 +19,8 @@ "functions": { "heartbeat": { "uptime": { - "interval": 50000, - "endpoint": "http://statuspage_app_sp_1:3001/api/push/" + "interval": 60, + "endpoint": "https://status.flipped.codes/api/push/" } }, "messageGarbageCollection": { diff --git a/functions/HEARTBEAT/uptime.js b/functions/HEARTBEAT/uptime.js index 4c7f573..517a615 100644 --- a/functions/HEARTBEAT/uptime.js +++ b/functions/HEARTBEAT/uptime.js @@ -1,7 +1,9 @@ +// TODO: use vanilla implementation so not an entire package is needed const axios = require('axios'); const params = (pingRaw) => ( { + status: 'up', msg: 'OK', ping: Math.round(pingRaw), } @@ -14,7 +16,7 @@ function sendHeartbeat() { module.exports.run = async () => { setInterval(() => { sendHeartbeat(); - }, config.functions.heartbeat.uptime.interval); + }, config.functions.heartbeat.uptime.interval * 1000); }; module.exports.data = { diff --git a/functions/SETUP/heartbeat.js b/functions/SETUP/heartbeat.js index 96bc32b..782694e 100644 --- a/functions/SETUP/heartbeat.js +++ b/functions/SETUP/heartbeat.js @@ -16,8 +16,7 @@ module.exports.run = async () => { // client.functions.get('HEARTBEAT_BOTLIST_discordbots').run(); // client.functions.get('HEARTBEAT_BOTLIST_motiondevelopment').run(); // uptime page - // TODO: curreclty not set up - // client.functions.get('HEARTBEAT_uptime').run(); + client.functions.get('HEARTBEAT_uptime').run(); }; module.exports.data = {