From fec553466ce0305cd6157ca04ca0c5bd9da0f4b2 Mon Sep 17 00:00:00 2001 From: toast-ts <96593068+toast-ts@users.noreply.github.com> Date: Fri, 8 Mar 2024 09:08:09 +1100 Subject: [PATCH] Update TypeScript to 5.4.2 --- .pnp.cjs | 40 ++++++++++++++++++------------------- package.json | 6 +++--- src/events/channelUpdate.ts | 7 ++++--- tsconfig.json | 4 ++-- yarn.lock | 38 +++++++++++++++++------------------ 5 files changed, 48 insertions(+), 47 deletions(-) diff --git a/.pnp.cjs b/.pnp.cjs index 133c085..40aa625 100644 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -28,9 +28,9 @@ const RAW_RUNTIME_STATE = "packageDependencies": [\ ["@napi-rs/canvas", "npm:0.1.51"],\ ["@octokit/rest", "npm:20.0.2"],\ - ["@toast/tokenservice-client", "npm:1.0.14::__archiveUrl=https%3A%2F%2Fgit.toast-server.net%2Fapi%2Fpackages%2Ftoast%2Fnpm%2F%2540toast%252Ftokenservice-client%2F-%2F1.0.14%2Ftokenservice-client-1.0.14.tgz"],\ + ["@toast/tokenservice-client", "npm:1.0.16::__archiveUrl=https%3A%2F%2Fgit.toast-server.net%2Fapi%2Fpackages%2Ftoast%2Fnpm%2F%2540toast%252Ftokenservice-client%2F-%2F1.0.16%2Ftokenservice-client-1.0.16.tgz"],\ ["@types/ms", "npm:0.7.34"],\ - ["@types/node", "npm:20.11.24"],\ + ["@types/node", "npm:20.11.25"],\ ["@types/node-cron", "npm:3.0.11"],\ ["@types/pg", "npm:8.11.2"],\ ["@types/sequelize", "npm:4.28.20"],\ @@ -47,7 +47,7 @@ const RAW_RUNTIME_STATE = ["sequelize", "virtual:20c353e2d6536e37339997f03975c6a660f4d296e664d291bd43620c6162cca8eb5ef90b0998dc9db75ff6862e5da587d0530bae26805f5fadc8f17aaa4ff794#npm:6.37.1"],\ ["simple-git", "npm:3.22.0"],\ ["systeminformation", "npm:5.22.0"],\ - ["typescript", "patch:typescript@npm%3A5.3.3#optional!builtin::version=5.3.3&hash=e012d7"],\ + ["typescript", "patch:typescript@npm%3A5.4.2#optional!builtin::version=5.4.2&hash=5adc0c"],\ ["undici", "npm:6.7.0"]\ ],\ "linkType": "SOFT"\ @@ -609,10 +609,10 @@ const RAW_RUNTIME_STATE = }]\ ]],\ ["@toast/tokenservice-client", [\ - ["npm:1.0.14::__archiveUrl=https%3A%2F%2Fgit.toast-server.net%2Fapi%2Fpackages%2Ftoast%2Fnpm%2F%2540toast%252Ftokenservice-client%2F-%2F1.0.14%2Ftokenservice-client-1.0.14.tgz", {\ - "packageLocation": "./.yarn/cache/@toast-tokenservice-client-npm-1.0.14-8e8e9cba19-b478e70965.zip/node_modules/@toast/tokenservice-client/",\ + ["npm:1.0.16::__archiveUrl=https%3A%2F%2Fgit.toast-server.net%2Fapi%2Fpackages%2Ftoast%2Fnpm%2F%2540toast%252Ftokenservice-client%2F-%2F1.0.16%2Ftokenservice-client-1.0.16.tgz", {\ + "packageLocation": "./.yarn/cache/@toast-tokenservice-client-npm-1.0.16-de708ec9ce-a946df28f2.zip/node_modules/@toast/tokenservice-client/",\ "packageDependencies": [\ - ["@toast/tokenservice-client", "npm:1.0.14::__archiveUrl=https%3A%2F%2Fgit.toast-server.net%2Fapi%2Fpackages%2Ftoast%2Fnpm%2F%2540toast%252Ftokenservice-client%2F-%2F1.0.14%2Ftokenservice-client-1.0.14.tgz"],\ + ["@toast/tokenservice-client", "npm:1.0.16::__archiveUrl=https%3A%2F%2Fgit.toast-server.net%2Fapi%2Fpackages%2Ftoast%2Fnpm%2F%2540toast%252Ftokenservice-client%2F-%2F1.0.16%2Ftokenservice-client-1.0.16.tgz"],\ ["undici", "npm:6.7.0"]\ ],\ "linkType": "HARD"\ @@ -632,7 +632,7 @@ const RAW_RUNTIME_STATE = "packageLocation": "./.yarn/cache/@types-continuation-local-storage-npm-3.2.7-763e4dc12b-1f272b53bc.zip/node_modules/@types/continuation-local-storage/",\ "packageDependencies": [\ ["@types/continuation-local-storage", "npm:3.2.7"],\ - ["@types/node", "npm:20.11.24"]\ + ["@types/node", "npm:20.11.25"]\ ],\ "linkType": "HARD"\ }]\ @@ -666,10 +666,10 @@ const RAW_RUNTIME_STATE = }]\ ]],\ ["@types/node", [\ - ["npm:20.11.24", {\ - "packageLocation": "./.yarn/cache/@types-node-npm-20.11.24-4e19eedf98-7f34bfae5f.zip/node_modules/@types/node/",\ + ["npm:20.11.25", {\ + "packageLocation": "./.yarn/cache/@types-node-npm-20.11.25-b6ac39dd46-861265f1bb.zip/node_modules/@types/node/",\ "packageDependencies": [\ - ["@types/node", "npm:20.11.24"],\ + ["@types/node", "npm:20.11.25"],\ ["undici-types", "npm:5.26.5"]\ ],\ "linkType": "HARD"\ @@ -689,7 +689,7 @@ const RAW_RUNTIME_STATE = "packageLocation": "./.yarn/cache/@types-pg-npm-8.11.2-bdf321bea4-7c05cf63be.zip/node_modules/@types/pg/",\ "packageDependencies": [\ ["@types/pg", "npm:8.11.2"],\ - ["@types/node", "npm:20.11.24"],\ + ["@types/node", "npm:20.11.25"],\ ["pg-protocol", "npm:1.6.0"],\ ["pg-types", "npm:4.0.2"]\ ],\ @@ -723,7 +723,7 @@ const RAW_RUNTIME_STATE = "packageLocation": "./.yarn/cache/@types-ws-npm-8.5.10-a877a38f71-9b414dc5e0.zip/node_modules/@types/ws/",\ "packageDependencies": [\ ["@types/ws", "npm:8.5.10"],\ - ["@types/node", "npm:20.11.24"]\ + ["@types/node", "npm:20.11.25"]\ ],\ "linkType": "HARD"\ }],\ @@ -731,7 +731,7 @@ const RAW_RUNTIME_STATE = "packageLocation": "./.yarn/cache/@types-ws-npm-8.5.9-91d1b2ab07-7cf66383b8.zip/node_modules/@types/ws/",\ "packageDependencies": [\ ["@types/ws", "npm:8.5.9"],\ - ["@types/node", "npm:20.11.24"]\ + ["@types/node", "npm:20.11.25"]\ ],\ "linkType": "HARD"\ }]\ @@ -797,9 +797,9 @@ const RAW_RUNTIME_STATE = ["daggerbot-ts", "workspace:."],\ ["@napi-rs/canvas", "npm:0.1.51"],\ ["@octokit/rest", "npm:20.0.2"],\ - ["@toast/tokenservice-client", "npm:1.0.14::__archiveUrl=https%3A%2F%2Fgit.toast-server.net%2Fapi%2Fpackages%2Ftoast%2Fnpm%2F%2540toast%252Ftokenservice-client%2F-%2F1.0.14%2Ftokenservice-client-1.0.14.tgz"],\ + ["@toast/tokenservice-client", "npm:1.0.16::__archiveUrl=https%3A%2F%2Fgit.toast-server.net%2Fapi%2Fpackages%2Ftoast%2Fnpm%2F%2540toast%252Ftokenservice-client%2F-%2F1.0.16%2Ftokenservice-client-1.0.16.tgz"],\ ["@types/ms", "npm:0.7.34"],\ - ["@types/node", "npm:20.11.24"],\ + ["@types/node", "npm:20.11.25"],\ ["@types/node-cron", "npm:3.0.11"],\ ["@types/pg", "npm:8.11.2"],\ ["@types/sequelize", "npm:4.28.20"],\ @@ -816,7 +816,7 @@ const RAW_RUNTIME_STATE = ["sequelize", "virtual:20c353e2d6536e37339997f03975c6a660f4d296e664d291bd43620c6162cca8eb5ef90b0998dc9db75ff6862e5da587d0530bae26805f5fadc8f17aaa4ff794#npm:6.37.1"],\ ["simple-git", "npm:3.22.0"],\ ["systeminformation", "npm:5.22.0"],\ - ["typescript", "patch:typescript@npm%3A5.3.3#optional!builtin::version=5.3.3&hash=e012d7"],\ + ["typescript", "patch:typescript@npm%3A5.4.2#optional!builtin::version=5.4.2&hash=5adc0c"],\ ["undici", "npm:6.7.0"]\ ],\ "linkType": "SOFT"\ @@ -1541,10 +1541,10 @@ const RAW_RUNTIME_STATE = }]\ ]],\ ["typescript", [\ - ["patch:typescript@npm%3A5.3.3#optional!builtin::version=5.3.3&hash=e012d7", {\ - "packageLocation": "./.yarn/cache/typescript-patch-4778c7998b-c93786fcc9.zip/node_modules/typescript/",\ + ["patch:typescript@npm%3A5.4.2#optional!builtin::version=5.4.2&hash=5adc0c", {\ + "packageLocation": "./.yarn/cache/typescript-patch-c145cea93e-f5f9a4133c.zip/node_modules/typescript/",\ "packageDependencies": [\ - ["typescript", "patch:typescript@npm%3A5.3.3#optional!builtin::version=5.3.3&hash=e012d7"]\ + ["typescript", "patch:typescript@npm%3A5.4.2#optional!builtin::version=5.4.2&hash=5adc0c"]\ ],\ "linkType": "HARD"\ }]\ @@ -1617,7 +1617,7 @@ const RAW_RUNTIME_STATE = "packageLocation": "./.yarn/cache/wkx-npm-0.5.0-fca5152cd8-b8975e33f9.zip/node_modules/wkx/",\ "packageDependencies": [\ ["wkx", "npm:0.5.0"],\ - ["@types/node", "npm:20.11.24"]\ + ["@types/node", "npm:20.11.25"]\ ],\ "linkType": "HARD"\ }]\ diff --git a/package.json b/package.json index 1cb5c0a..bc2f3e3 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "dependencies": { "@napi-rs/canvas": "0.1.51", "@octokit/rest": "20.0.2", - "@toast/tokenservice-client": "1.0.14", + "@toast/tokenservice-client": "1.0.16", "ansi-colors": "4.1.3", "dayjs": "1.11.10", "discord.js": "14.14.1", @@ -47,10 +47,10 @@ }, "devDependencies": { "@types/ms": "0.7.34", - "@types/node": "20.11.24", + "@types/node": "20.11.25", "@types/node-cron": "3.0.11", "@types/pg": "8.11.2", "@types/sequelize": "4.28.20", - "typescript": "5.3.3" + "typescript": "5.4.2" } } diff --git a/src/events/channelUpdate.ts b/src/events/channelUpdate.ts index 6d7692a..8b91c5f 100644 --- a/src/events/channelUpdate.ts +++ b/src/events/channelUpdate.ts @@ -1,8 +1,8 @@ import Discord from 'discord.js'; import TClient from '../client.js'; export default class ChannelUpdate { - static async run(client:TClient, oldChannel:Discord.GuildChannel, newChannel:Discord.GuildChannel) { - if (!client.config.botSwitches.logs) return; + static async run(_client:TClient, _oldChannel:Discord.GuildChannel, _newChannel:Discord.GuildChannel) { +/* if (!client.config.botSwitches.logs) return; if (oldChannel.guild?.id != client.config.dcServer.id) return; const auditChupdate = (await newChannel.guild.fetchAuditLogs({limit: 1, type: Discord.AuditLogEvent.ChannelUpdate})).entries.first(); @@ -22,6 +22,7 @@ export default class ChannelUpdate { } await serverLog.send({embeds: [embed]}); - } + } */ } } +// Commented out, will be refactored later due to issues. diff --git a/tsconfig.json b/tsconfig.json index bdd2702..43d0392 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -11,12 +11,12 @@ "allowSyntheticDefaultImports": true, "target": "ES2022", "module": "ESNext", - "baseUrl": "./", + "baseUrl": ".", "rootDir": "src", "outDir": "dist", "moduleResolution": "bundler", "typeRoots": [ "./src/interfaces.d.ts" ] }, "include": [ "src" ], - "exclude": [ ".yarn/cache", ".yarn/unplugged", ".git", "src/*.json", "postgres-replica-stuff" ] + "exclude": [ ".yarn/cache", ".yarn/unplugged", ".git", "src/*.json" ] } diff --git a/yarn.lock b/yarn.lock index 903baf1..0aec8d3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -427,12 +427,12 @@ __metadata: languageName: node linkType: hard -"@toast/tokenservice-client@npm:1.0.14": - version: 1.0.14 - resolution: "@toast/tokenservice-client@npm:1.0.14::__archiveUrl=https%3A%2F%2Fgit.toast-server.net%2Fapi%2Fpackages%2Ftoast%2Fnpm%2F%2540toast%252Ftokenservice-client%2F-%2F1.0.14%2Ftokenservice-client-1.0.14.tgz" +"@toast/tokenservice-client@npm:1.0.16": + version: 1.0.16 + resolution: "@toast/tokenservice-client@npm:1.0.16::__archiveUrl=https%3A%2F%2Fgit.toast-server.net%2Fapi%2Fpackages%2Ftoast%2Fnpm%2F%2540toast%252Ftokenservice-client%2F-%2F1.0.16%2Ftokenservice-client-1.0.16.tgz" dependencies: undici: "npm:6.7.0" - checksum: 10/b478e70965fec7f2f1c492e5ecf4b5d33b5044c29e2391dec3d52e1137e8f4bf3849e587e1830e9469eba5db7505d691cc625846d2a70610af4a91e1f94833e0 + checksum: 10/a946df28f2ba6e36f881f7160bafe0dfe06227520b2a1a8ace729651064103bce92dcfc0d23deb6df845839f380fbdc17af86b1f1ea11ab3cc513c751ec23fb8 languageName: node linkType: hard @@ -482,12 +482,12 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:*, @types/node@npm:20.11.24": - version: 20.11.24 - resolution: "@types/node@npm:20.11.24" +"@types/node@npm:*, @types/node@npm:20.11.25": + version: 20.11.25 + resolution: "@types/node@npm:20.11.25" dependencies: undici-types: "npm:~5.26.4" - checksum: 10/7f34bfae5f9b98b9910230af4b4c52dc7fb2d1e96fdebfbc3d7576f8ab3d100076f193f9469add9e7418b455294155e7e6a028498cc5e98f9d49349875a459cf + checksum: 10/861265f1bbb151404bd8842b595f027a4ff067c61ecff9a37b9f7f53922c18dd532c8e795e8e7675dd8dba056645623fd2b9848d5ef72863ec3609096cd2923e languageName: node linkType: hard @@ -587,9 +587,9 @@ __metadata: dependencies: "@napi-rs/canvas": "npm:0.1.51" "@octokit/rest": "npm:20.0.2" - "@toast/tokenservice-client": "npm:1.0.14" + "@toast/tokenservice-client": "npm:1.0.16" "@types/ms": "npm:0.7.34" - "@types/node": "npm:20.11.24" + "@types/node": "npm:20.11.25" "@types/node-cron": "npm:3.0.11" "@types/pg": "npm:8.11.2" "@types/sequelize": "npm:4.28.20" @@ -606,7 +606,7 @@ __metadata: sequelize: "npm:6.37.1" simple-git: "npm:3.22.0" systeminformation: "npm:5.22.0" - typescript: "npm:5.3.3" + typescript: "npm:5.4.2" undici: "npm:6.7.0" languageName: unknown linkType: soft @@ -1191,23 +1191,23 @@ __metadata: languageName: node linkType: hard -"typescript@npm:5.3.3": - version: 5.3.3 - resolution: "typescript@npm:5.3.3" +"typescript@npm:5.4.2": + version: 5.4.2 + resolution: "typescript@npm:5.4.2" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 10/6e4e6a14a50c222b3d14d4ea2f729e79f972fa536ac1522b91202a9a65af3605c2928c4a790a4a50aa13694d461c479ba92cedaeb1e7b190aadaa4e4b96b8e18 + checksum: 10/f8cfdc630ab1672f004e9561eb2916935b2d267792d07ce93e97fc601c7a65191af32033d5e9c0169b7dc37da7db9bf320f7432bc84527cb7697effaa4e4559d languageName: node linkType: hard -"typescript@patch:typescript@npm%3A5.3.3#optional!builtin": - version: 5.3.3 - resolution: "typescript@patch:typescript@npm%3A5.3.3#optional!builtin::version=5.3.3&hash=e012d7" +"typescript@patch:typescript@npm%3A5.4.2#optional!builtin": + version: 5.4.2 + resolution: "typescript@patch:typescript@npm%3A5.4.2#optional!builtin::version=5.4.2&hash=5adc0c" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 10/c93786fcc9a70718ba1e3819bab56064ead5817004d1b8186f8ca66165f3a2d0100fee91fa64c840dcd45f994ca5d615d8e1f566d39a7470fc1e014dbb4cf15d + checksum: 10/f5f9a4133c2670761f0166eae5b3bafbc4a3fc24f0f42a93c9c893d9e9d6e66ea066969c5e7483fa66b4ae0e99125592553f3b92fd3599484de8be13b0615176 languageName: node linkType: hard