From 4c57d18caadfb4e919b6a448bf0bd0a1345b3407 Mon Sep 17 00:00:00 2001 From: SrIzan10 <66965250+SrIzan10@users.noreply.github.com> Date: Sun, 3 Sep 2023 21:46:33 +0200 Subject: [PATCH] fix: various stuff --- package.json | 4 +- tsconfig.json | 4 +- util/minecraftstatus.ts | 13 +++- yarn.lock | 136 +++++++++++++++++++++++++++++++++++++++- 4 files changed, 148 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 573f477..e51b832 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "main": "dist/index.js", "scripts": { "test": "echo \"Error: no test specified\" && exit 1", - "dev": "tsc-watch --onSuccess \"node ./dist/index.js --dev\"", + "dev": "tsc-watch -p \"./tsconfig.json\" --onSuccess \"node ./dist/index.js --dev\"", "compile": "tsc --build", "build": "tsc --build", "web": "node webserver.js", @@ -40,7 +40,7 @@ "axios": "^1.1.3", "dayjs": "^1.11.6", "discord-tictactoe": "^4.0.0", - "discord.js": "^14.7.1", + "discord.js": "^14.13.0", "dotenv": "^16.0.1", "execa": "^6.1.0", "express": "^4.18.1", diff --git a/tsconfig.json b/tsconfig.json index f2fc374..2f3e709 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -76,7 +76,7 @@ "forceConsistentCasingInFileNames": true, /* Ensure that casing is correct in imports. */ /* Type Checking */ - "strict": true, /* Enable all strict type-checking options. */ + "strict": false, /* Enable all strict type-checking options. */ "noImplicitAny": false, /* Enable error reporting for expressions and declarations with an implied 'any' type. */ // "strictNullChecks": true, /* When type checking, take into account 'null' and 'undefined'. */ // "strictFunctionTypes": true, /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */ @@ -97,7 +97,7 @@ // "allowUnreachableCode": true, /* Disable error reporting for unreachable code. */ /* Completeness */ - // "skipDefaultLibCheck": true, /* Skip type checking .d.ts files that are included with TypeScript. */ + "skipDefaultLibCheck": true, /* Skip type checking .d.ts files that are included with TypeScript. */ "skipLibCheck": true, /* Skip type checking all .d.ts files. */ "paths": { "#plugins": ["./plugins/index.js"], diff --git a/util/minecraftstatus.ts b/util/minecraftstatus.ts index 4952afe..2f826a3 100644 --- a/util/minecraftstatus.ts +++ b/util/minecraftstatus.ts @@ -9,9 +9,16 @@ export default async function minecraftstatus(client: Client) { dayjs.extend(utc) dayjs.extend(timezone) - const request = await axios.get('https://api.minetools.eu/ping/minecraft.maraturing.com/25565', { - httpsAgent: new https.Agent({ rejectUnauthorized: false }) - }).then(res => res.data) + let request + try { + const req = await axios.get('https://api.minetools.eu/ping/minecraft.maraturing.com/25565', { + httpsAgent: new https.Agent({ rejectUnauthorized: false }) + }); + + request = req.data; + } catch (error) { + return; + } const fetchMsg = await (await client.channels.fetch('1063944267258662922')! as TextChannel).messages.fetch('1063950406474010674') as Message let onlineorelse: string diff --git a/yarn.lock b/yarn.lock index d8657f8..8c4d238 100644 --- a/yarn.lock +++ b/yarn.lock @@ -720,10 +720,35 @@ ts-mixer "^6.0.2" tslib "^2.4.1" +"@discordjs/builders@^1.6.5": + version "1.6.5" + resolved "https://registry.yarnpkg.com/@discordjs/builders/-/builders-1.6.5.tgz#3e23912eaab1d542b61ca0fa7202e5aaef2b7200" + integrity sha512-SdweyCs/+mHj+PNhGLLle7RrRFX9ZAhzynHahMCLqp5Zeq7np7XC6/mgzHc79QoVlQ1zZtOkTTiJpOZu5V8Ufg== + dependencies: + "@discordjs/formatters" "^0.3.2" + "@discordjs/util" "^1.0.1" + "@sapphire/shapeshift" "^3.9.2" + discord-api-types "0.37.50" + fast-deep-equal "^3.1.3" + ts-mixer "^6.0.3" + tslib "^2.6.1" + "@discordjs/collection@^1.3.0": version "1.3.0" resolved "https://registry.npmjs.org/@discordjs/collection/-/collection-1.3.0.tgz" +"@discordjs/collection@^1.5.3": + version "1.5.3" + resolved "https://registry.yarnpkg.com/@discordjs/collection/-/collection-1.5.3.tgz#5a1250159ebfff9efa4f963cfa7e97f1b291be18" + integrity sha512-SVb428OMd3WO1paV3rm6tSjM4wC+Kecaa1EUGX7vc6/fddvw/6lg90z4QtCqm21zvVe92vMMDt9+DkIvjXImQQ== + +"@discordjs/formatters@^0.3.2": + version "0.3.2" + resolved "https://registry.yarnpkg.com/@discordjs/formatters/-/formatters-0.3.2.tgz#3ae054f7b3097cc0dc7645fade37a3f20fa1fb4b" + integrity sha512-lE++JZK8LSSDRM5nLjhuvWhGuKiXqu+JZ/DsOR89DVVia3z9fdCJVcHF2W/1Zxgq0re7kCzmAJlCMMX3tetKpA== + dependencies: + discord-api-types "0.37.50" + "@discordjs/node-pre-gyp@^0.4.5": version "0.4.5" resolved "https://registry.npmjs.org/@discordjs/node-pre-gyp/-/node-pre-gyp-0.4.5.tgz" @@ -758,10 +783,30 @@ tslib "^2.4.1" undici "^5.13.0" +"@discordjs/rest@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@discordjs/rest/-/rest-2.0.1.tgz#100c208a964e54b8d7cd418bbaed279c816b8ec5" + integrity sha512-/eWAdDRvwX/rIE2tuQUmKaxmWeHmGealttIzGzlYfI4+a7y9b6ZoMp8BG/jaohs8D8iEnCNYaZiOFLVFLQb8Zg== + dependencies: + "@discordjs/collection" "^1.5.3" + "@discordjs/util" "^1.0.1" + "@sapphire/async-queue" "^1.5.0" + "@sapphire/snowflake" "^3.5.1" + "@vladfrangu/async_event_emitter" "^2.2.2" + discord-api-types "0.37.50" + magic-bytes.js "^1.0.15" + tslib "^2.6.1" + undici "5.22.1" + "@discordjs/util@^0.1.0": version "0.1.0" resolved "https://registry.npmjs.org/@discordjs/util/-/util-0.1.0.tgz" +"@discordjs/util@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@discordjs/util/-/util-1.0.1.tgz#7d6f97b65425d3a8b46ea1180150dee6991a88cf" + integrity sha512-d0N2yCxB8r4bn00/hvFZwM7goDcUhtViC5un4hPj73Ba4yrChLSJD8fy7Ps5jpTLg1fE9n4K0xBLc1y9WGwSsA== + "@discordjs/voice@^0.15.0": version "0.15.0" resolved "https://registry.npmjs.org/@discordjs/voice/-/voice-0.15.0.tgz" @@ -772,6 +817,21 @@ tslib "^2.5.0" ws "^8.12.1" +"@discordjs/ws@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@discordjs/ws/-/ws-1.0.1.tgz#fab8aa4c1667040a95b5268a2875add27353d323" + integrity sha512-avvAolBqN3yrSvdBPcJ/0j2g42ABzrv3PEL76e3YTp2WYMGH7cuspkjfSyNWaqYl1J+669dlLp+YFMxSVQyS5g== + dependencies: + "@discordjs/collection" "^1.5.3" + "@discordjs/rest" "^2.0.1" + "@discordjs/util" "^1.0.1" + "@sapphire/async-queue" "^1.5.0" + "@types/ws" "^8.5.5" + "@vladfrangu/async_event_emitter" "^2.2.2" + discord-api-types "0.37.50" + tslib "^2.6.1" + ws "^8.13.0" + "@jridgewell/resolve-uri@^3.0.3": version "3.1.0" resolved "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz" @@ -848,10 +908,23 @@ fast-deep-equal "^3.1.3" lodash "^4.17.21" +"@sapphire/shapeshift@^3.9.2": + version "3.9.2" + resolved "https://registry.yarnpkg.com/@sapphire/shapeshift/-/shapeshift-3.9.2.tgz#a9c12cd51e1bc467619bb56df804450dd14871ac" + integrity sha512-YRbCXWy969oGIdqR/wha62eX8GNHsvyYi0Rfd4rNW6tSVVa8p0ELiMEuOH/k8rgtvRoM+EMV7Csqz77YdwiDpA== + dependencies: + fast-deep-equal "^3.1.3" + lodash "^4.17.21" + "@sapphire/snowflake@^3.2.2": version "3.4.0" resolved "https://registry.npmjs.org/@sapphire/snowflake/-/snowflake-3.4.0.tgz" +"@sapphire/snowflake@^3.5.1": + version "3.5.1" + resolved "https://registry.yarnpkg.com/@sapphire/snowflake/-/snowflake-3.5.1.tgz#254521c188b49e8b2d4cc048b475fb2b38737fec" + integrity sha512-BxcYGzgEsdlG0dKAyOm0ehLGm2CafIrfQTZGWgkfKYbj+pNNsorZ7EotuZukc2MT70E0UbppVbtpBrqpzVzjNA== + "@sern/handler@^2.5.3": version "2.5.3" resolved "https://registry.npmjs.org/@sern/handler/-/handler-2.5.3.tgz" @@ -978,6 +1051,18 @@ dependencies: "@types/node" "*" +"@types/ws@^8.5.5": + version "8.5.5" + resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.5.tgz#af587964aa06682702ee6dcbc7be41a80e4b28eb" + integrity sha512-lwhs8hktwxSjf9UaZ9tG5M03PGogvFaH8gUgLNbN9HKIg0dvv6q+gkSuJ8HN4/VbyxkuLzCjlN7GquQ0gUJfIg== + dependencies: + "@types/node" "*" + +"@vladfrangu/async_event_emitter@^2.2.2": + version "2.2.2" + resolved "https://registry.yarnpkg.com/@vladfrangu/async_event_emitter/-/async_event_emitter-2.2.2.tgz#84c5a3f8d648842cec5cc649b88df599af32ed88" + integrity sha512-HIzRG7sy88UZjBJamssEczH5q7t5+axva19UbZLO6u0ySbYPrwzWiXBcC0WuHyhKKoeCyneH+FvYzKQq/zTtkQ== + abbrev@1: version "1.1.1" resolved "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz" @@ -1321,6 +1406,11 @@ diff@^4.0.1: version "4.0.2" resolved "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz" +discord-api-types@0.37.50: + version "0.37.50" + resolved "https://registry.yarnpkg.com/discord-api-types/-/discord-api-types-0.37.50.tgz#6059eb8c0b784ad8194655a8b8b7f540fcfac428" + integrity sha512-X4CDiMnDbA3s3RaUXWXmgAIbY1uxab3fqe3qwzg5XutR3wjqi7M3IkgQbsIBzpqBN2YWr/Qdv7JrFRqSgb4TFg== + discord-api-types@^0.37.20, discord-api-types@^0.37.23, discord-api-types@^0.37.35: version "0.37.35" resolved "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.37.35.tgz" @@ -1331,7 +1421,27 @@ discord-tictactoe@^4.0.0: dependencies: discord.js "^14.3.0" -discord.js@^14.3.0, discord.js@^14.7.1: +discord.js@^14.13.0: + version "14.13.0" + resolved "https://registry.yarnpkg.com/discord.js/-/discord.js-14.13.0.tgz#e7a00bdba70adb9e266a06884ca1acaf9a0b5c20" + integrity sha512-Kufdvg7fpyTEwANGy9x7i4od4yu5c6gVddGi5CKm4Y5a6sF0VBODObI3o0Bh7TGCj0LfNT8Qp8z04wnLFzgnbA== + dependencies: + "@discordjs/builders" "^1.6.5" + "@discordjs/collection" "^1.5.3" + "@discordjs/formatters" "^0.3.2" + "@discordjs/rest" "^2.0.1" + "@discordjs/util" "^1.0.1" + "@discordjs/ws" "^1.0.1" + "@sapphire/snowflake" "^3.5.1" + "@types/ws" "^8.5.5" + discord-api-types "0.37.50" + fast-deep-equal "^3.1.3" + lodash.snakecase "^4.1.1" + tslib "^2.6.1" + undici "5.22.1" + ws "^8.13.0" + +discord.js@^14.3.0: version "14.7.1" resolved "https://registry.npmjs.org/discord.js/-/discord.js-14.7.1.tgz" dependencies: @@ -1801,6 +1911,11 @@ lru-cache@^6.0.0: dependencies: yallist "^4.0.0" +magic-bytes.js@^1.0.15: + version "1.0.15" + resolved "https://registry.yarnpkg.com/magic-bytes.js/-/magic-bytes.js-1.0.15.tgz#3c9d2b7d45bb8432482646b5f74bbf6725274616" + integrity sha512-bpRmwbRHqongRhA+mXzbLWjVy7ylqmfMBYaQkSs6pac0z6hBTvsgrH0r4FBYd/UYVJBmS6Rp/O+oCCQVLzKV1g== + make-dir@^3.1.0: version "3.1.0" resolved "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz" @@ -2387,7 +2502,7 @@ tr46@~0.0.3: version "0.0.3" resolved "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz" -ts-mixer@^6.0.2: +ts-mixer@^6.0.2, ts-mixer@^6.0.3: version "6.0.3" resolved "https://registry.npmjs.org/ts-mixer/-/ts-mixer-6.0.3.tgz" @@ -2435,6 +2550,11 @@ tslib@^2.1.0, tslib@^2.2.0, tslib@^2.3.1, tslib@^2.4.1, tslib@^2.5.0: version "2.5.0" resolved "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz" +tslib@^2.6.1: + version "2.6.2" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae" + integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q== + type-is@~1.6.18: version "1.6.18" resolved "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz" @@ -2446,6 +2566,13 @@ typescript@^4.9.3: version "4.9.5" resolved "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz" +undici@5.22.1: + version "5.22.1" + resolved "https://registry.yarnpkg.com/undici/-/undici-5.22.1.tgz#877d512effef2ac8be65e695f3586922e1a57d7b" + integrity sha512-Ji2IJhFXZY0x/0tVBXeQwgPlLWw13GVzpsWPQ3rV50IFMMof2I55PZZxtm4P6iNq+L5znYN9nSTAq0ZyE6lSJw== + dependencies: + busboy "^1.6.0" + undici@^5.13.0, undici@^5.8.2: version "5.20.0" resolved "https://registry.npmjs.org/undici/-/undici-5.20.0.tgz" @@ -2530,6 +2657,11 @@ ws@^8.11.0, ws@^8.12.1: version "8.12.1" resolved "https://registry.npmjs.org/ws/-/ws-8.12.1.tgz" +ws@^8.13.0: + version "8.13.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.13.0.tgz#9a9fb92f93cf41512a0735c8f4dd09b8a1211cd0" + integrity sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA== + yallist@^4.0.0: version "4.0.0" resolved "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz"