diff --git a/.swcrc b/.swcrc index 71761d4..94c9b99 100644 --- a/.swcrc +++ b/.swcrc @@ -14,11 +14,10 @@ "preserveAllComments": false, "baseUrl": "./", "paths": { - "utils/*": ["src/utils/*"], - "schemas/*": ["src/schemas/*"], - "config/*": ["src/config/*"], - "interfaces": ["src/interfaces/index"], - "typings": ["src/typings/index"] + "~/utils/*": ["src/utils/*"], + "~/config/*": ["src/config/*"], + "~/interfaces": ["src/interfaces/index"], + "~/typings": ["src/typings/index"] } }, "module": { @@ -31,4 +30,4 @@ }, "minify": false, "sourceMaps": false -} \ No newline at end of file +} diff --git a/dev-db.yml b/dev-db.yml index a96ed6b..16407b2 100644 --- a/dev-db.yml +++ b/dev-db.yml @@ -5,7 +5,7 @@ services: image: postgres restart: unless-stopped volumes: - - ./dev/data:/var/lib/postgresql/data + - ./dev/pgdata:/var/lib/postgresql/data ports: - 5432:5432 environment: diff --git a/package.json b/package.json index 8de730c..26dc9d8 100644 --- a/package.json +++ b/package.json @@ -45,14 +45,11 @@ "discord-player": "^6.7.1", "discord-player-youtubei": "^1.3.2", "discord.js": "^14.16.2", - "dotenv": "^16.4.5", "drizzle-orm": "^0.33.0", "ioredis": "^5.4.1", - "mongoose": "^8.6.3", "ms": "^2.1.3", "postgres": "^3.4.4", - "pretty-ms": "^9.1.0", - "sequelize": "^6.37.3" + "pretty-ms": "^9.1.0" }, "devDependencies": { "@eslint/eslintrc": "^3.1.0", @@ -64,12 +61,12 @@ "@typescript-eslint/eslint-plugin": "^8.7.0", "@typescript-eslint/parser": "^8.7.0", "chokidar": "^4.0.1", + "dotenv": "^16.4.5", "dprint": "^0.47.2", "drizzle-kit": "^0.24.2", "eslint": "^9.11.1", "eslint-plugin-drizzle": "^0.2.3", "globals": "^15.9.0", - "sqlite3": "^5.1.7", "tsx": "^4.19.1", "typescript": "^5.6.2" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index fcd2d03..97861cf 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -43,18 +43,12 @@ importers: discord.js: specifier: ^14.16.2 version: 14.16.2 - dotenv: - specifier: ^16.4.5 - version: 16.4.5 drizzle-orm: specifier: ^0.33.0 version: 0.33.0(@types/pg@8.11.10)(pg@8.13.0)(postgres@3.4.4)(sqlite3@5.1.7) ioredis: specifier: ^5.4.1 version: 5.4.1 - mongoose: - specifier: ^8.6.3 - version: 8.6.3(socks@2.8.3) ms: specifier: ^2.1.3 version: 2.1.3 @@ -64,9 +58,6 @@ importers: pretty-ms: specifier: ^9.1.0 version: 9.1.0 - sequelize: - specifier: ^6.37.3 - version: 6.37.3(pg@8.13.0)(sqlite3@5.1.7) devDependencies: '@eslint/eslintrc': specifier: ^3.1.0 @@ -95,6 +86,9 @@ importers: chokidar: specifier: ^4.0.1 version: 4.0.1 + dotenv: + specifier: ^16.4.5 + version: 16.4.5 dprint: specifier: ^0.47.2 version: 0.47.2 @@ -110,9 +104,6 @@ importers: globals: specifier: ^15.9.0 version: 15.9.0 - sqlite3: - specifier: ^5.1.7 - version: 5.1.7 tsx: specifier: ^4.19.1 version: 4.19.1 @@ -690,9 +681,6 @@ packages: resolution: {integrity: sha512-sTGoeZnjI8N4KS+sW2AN95gDBErhAguvkw/tWdCjeM8bvxpz5lqrnd0vOJABA1A+Ic3zED7PYoLP/RANLgVotA==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - '@mongodb-js/saslprep@1.1.9': - resolution: {integrity: sha512-tVkljjeEaAhCqTzajSdgbQ6gE6f3oneVwa3iXR6csiEwXXOFsiC6Uh9iAjAhXPtqa/XMDHWjjeNH/77m/Yq2dw==} - '@napi-rs/nice-android-arm-eabi@1.0.1': resolution: {integrity: sha512-5qpvOu5IGwDo7MEKVqqyAxF90I6aLj4n07OzpARdgDRfz8UbBztTByBp0RC59r3J1Ij8uzYi6jI7r5Lws7nn6w==} engines: {node: '>= 10'} @@ -929,9 +917,6 @@ packages: '@types/cacheable-request@6.0.3': resolution: {integrity: sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==} - '@types/debug@4.1.12': - resolution: {integrity: sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==} - '@types/estree@1.0.6': resolution: {integrity: sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==} @@ -959,15 +944,6 @@ packages: '@types/responselike@1.0.3': resolution: {integrity: sha512-H/+L+UkTV33uf49PH5pCAUBVPNj2nDBXTN+qS1dOwyyg24l3CcicicCA7ca+HMvJBZcFgl5r8e+RR6elsb4Lyw==} - '@types/validator@13.12.2': - resolution: {integrity: sha512-6SlHBzUW8Jhf3liqrGGXyTJSIFe4nqlJ5A5KaMZ2l/vbM3Wh3KSybots/wfWVzNLK4D1NZluDlSQIbIEPx6oyA==} - - '@types/webidl-conversions@7.0.3': - resolution: {integrity: sha512-CiJJvcRtIgzadHCYXw7dqEnMNRjhGZlYK05Mj9OyktqV8uVT8fD2BFOB7S1uwBE3Kj2Z+4UyPmFw/Ixgw/LAlA==} - - '@types/whatwg-url@11.0.5': - resolution: {integrity: sha512-coYR071JRaHa+xoEvvYqvnIHaVqaYrLPbsufM9BF63HkwI5Lgmy2QR8Q5K/lYDYo5AK82wOvSOS0UsLTpTG7uQ==} - '@types/ws@8.5.12': resolution: {integrity: sha512-3tPRkv1EtkDpzlgyKyI8pGsGZAGPEaXeu0DOj5DI25Ja91bdAYddYHbADRYVrZMRbfW+1l5YwXVDKohDJNQxkQ==} @@ -1133,10 +1109,6 @@ packages: resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==} engines: {node: '>=8'} - bson@6.8.0: - resolution: {integrity: sha512-iOJg8pr7wq2tg/zSlCCHMi3hMm5JTOxLTagf3zxhcenHsFp+c6uOs6K7W5UE7A4QIJGtqh/ZovFNMP4mOPJynQ==} - engines: {node: '>=16.20.1'} - buffer-from@1.1.2: resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==} @@ -1321,9 +1293,6 @@ packages: resolution: {integrity: sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==} engines: {node: '>=12'} - dottie@2.0.6: - resolution: {integrity: sha512-iGCHkfUc5kFekGiqhe8B/mdaurD+lakO9txNnTvKtA6PISrw86LgqHvRzWYPyoE2Ph5aMIrCw9/uko6XHTKCwA==} - dprint@0.47.2: resolution: {integrity: sha512-geUcVIIrmLaY+YtuOl4gD7J/QCjsXZa5gUqre9sO6cgH0X/Fa9heBN3l/AWVII6rKPw45ATuCSDWz1pyO+HkPQ==} hasBin: true @@ -1752,10 +1721,6 @@ packages: infer-owner@1.0.4: resolution: {integrity: sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==} - inflection@1.13.4: - resolution: {integrity: sha512-6I/HUDeYFfuNCVS3td055BaXBwKYuzw7K3ExVMStBowKo9oOAMJIXIHvdyR3iboTCp1b+1i5DSkIZTcwIktuDw==} - engines: {'0': node >= 0.4.0} - inflight@1.0.6: resolution: {integrity: sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==} deprecated: This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful. @@ -1834,10 +1799,6 @@ packages: json-stable-stringify-without-jsonify@1.0.1: resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==} - kareem@2.6.3: - resolution: {integrity: sha512-C3iHfuGUXK2u8/ipq9LfjFfXFxAZMQJJq7vLS45r3D9Y2xQ/m4S8zaR4zMLFWh9AsNPXmcFfUDhTEO8UIC/V6Q==} - engines: {node: '>=12.0.0'} - keyv@4.5.4: resolution: {integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==} @@ -1892,9 +1853,6 @@ packages: resolution: {integrity: sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==} engines: {node: '>= 10'} - memory-pager@1.5.0: - resolution: {integrity: sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg==} - merge-stream@2.0.0: resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==} @@ -1980,54 +1938,6 @@ packages: engines: {node: '>=10'} hasBin: true - moment-timezone@0.5.45: - resolution: {integrity: sha512-HIWmqA86KcmCAhnMAN0wuDOARV/525R2+lOLotuGFzn4HO+FH+/645z2wx0Dt3iDv6/p61SIvKnDstISainhLQ==} - - moment@2.30.1: - resolution: {integrity: sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==} - - mongodb-connection-string-url@3.0.1: - resolution: {integrity: sha512-XqMGwRX0Lgn05TDB4PyG2h2kKO/FfWJyCzYQbIhXUxz7ETt0I/FqHjUeqj37irJ+Dl1ZtU82uYyj14u2XsZKfg==} - - mongodb@6.8.0: - resolution: {integrity: sha512-HGQ9NWDle5WvwMnrvUxsFYPd3JEbqD3RgABHBQRuoCEND0qzhsd0iH5ypHsf1eJ+sXmvmyKpP+FLOKY8Il7jMw==} - engines: {node: '>=16.20.1'} - peerDependencies: - '@aws-sdk/credential-providers': ^3.188.0 - '@mongodb-js/zstd': ^1.1.0 - gcp-metadata: ^5.2.0 - kerberos: ^2.0.1 - mongodb-client-encryption: '>=6.0.0 <7' - snappy: ^7.2.2 - socks: ^2.7.1 - peerDependenciesMeta: - '@aws-sdk/credential-providers': - optional: true - '@mongodb-js/zstd': - optional: true - gcp-metadata: - optional: true - kerberos: - optional: true - mongodb-client-encryption: - optional: true - snappy: - optional: true - socks: - optional: true - - mongoose@8.6.3: - resolution: {integrity: sha512-++yRmm7hjMbqVA/8WeiygTnEfrFbiy+OBjQi49GFJIvCQuSYE56myyQWo4j5hbpcHjhHQU8NukMNGTwAWFWjIw==} - engines: {node: '>=16.20.1'} - - mpath@0.9.0: - resolution: {integrity: sha512-ikJRQTk8hw5DEoFVxHG1Gn9T/xcjtdnOKIU1JTmGjZZlg9LST2mBLmcX3/ICIbgJydT2GOc15RnNy5mHmzfSew==} - engines: {node: '>=4.0.0'} - - mquery@5.0.0: - resolution: {integrity: sha512-iQMncpmEK8R8ncT8HJGsGc9Dsp8xcgYMVSbs5jgnm1lFHTZqMJTUWTDx1LBO8+mK3tPNZWFLBghQEIOULSTHZg==} - engines: {node: '>=14.0.0'} - ms@2.1.3: resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==} @@ -2359,9 +2269,6 @@ packages: responselike@2.0.1: resolution: {integrity: sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==} - retry-as-promised@7.0.4: - resolution: {integrity: sha512-XgmCoxKWkDofwH8WddD0w85ZfqYz+ZHlr5yo+3YUCfycWawU56T5ckWXsScsj5B8tqUcIG67DxXByo3VUgiAdA==} - retry@0.12.0: resolution: {integrity: sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==} engines: {node: '>= 4'} @@ -2400,43 +2307,6 @@ packages: engines: {node: '>=10'} hasBin: true - sequelize-pool@7.1.0: - resolution: {integrity: sha512-G9c0qlIWQSK29pR/5U2JF5dDQeqqHRragoyahj/Nx4KOOQ3CPPfzxnfqFPCSB7x5UgjOgnZ61nSxz+fjDpRlJg==} - engines: {node: '>= 10.0.0'} - - sequelize@6.37.3: - resolution: {integrity: sha512-V2FTqYpdZjPy3VQrZvjTPnOoLm0KudCRXfGWp48QwhyPPp2yW8z0p0sCYZd/em847Tl2dVxJJ1DR+hF+O77T7A==} - engines: {node: '>=10.0.0'} - peerDependencies: - ibm_db: '*' - mariadb: '*' - mysql2: '*' - oracledb: '*' - pg: '*' - pg-hstore: '*' - snowflake-sdk: '*' - sqlite3: '*' - tedious: '*' - peerDependenciesMeta: - ibm_db: - optional: true - mariadb: - optional: true - mysql2: - optional: true - oracledb: - optional: true - pg: - optional: true - pg-hstore: - optional: true - snowflake-sdk: - optional: true - sqlite3: - optional: true - tedious: - optional: true - set-blocking@2.0.0: resolution: {integrity: sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==} @@ -2456,9 +2326,6 @@ packages: resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==} engines: {node: '>=8'} - sift@17.1.3: - resolution: {integrity: sha512-Rtlj66/b0ICeFzYTuNvX/EF1igRbbnGSvEyT79McoZa/DeGhMyC5pWKOEsZKnpkqtSeovd5FL/bjHWC3CIIvCQ==} - signal-exit@3.0.7: resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==} @@ -2506,9 +2373,6 @@ packages: resolution: {integrity: sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==} engines: {node: '>= 8'} - sparse-bitfield@3.0.3: - resolution: {integrity: sha512-kvzhi7vqKTfkh0PZU+2D2PIllw2ymqJKujUcyPMd9Y75Nv4nPbGJZXNhxsgdQab2BmlDct1YnfQCguEvHr7VsQ==} - split2@4.2.0: resolution: {integrity: sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==} engines: {node: '>= 10.x'} @@ -2606,16 +2470,9 @@ packages: resolution: {integrity: sha512-Y2fmSnZjQdDb9W4w4r1tswlMHylzWIeOKpx0aZH9BgGtACHhrk3OkT52AzwcuqTRBZtvvnTjDBh8eynMulu8Vg==} engines: {node: '>=14.16'} - toposort-class@1.0.1: - resolution: {integrity: sha512-OsLcGGbYF3rMjPUf8oKktyvCiUxSbqMMS39m33MAjLTC1DVIH6x3WSt63/M77ihI09+Sdfk1AXvfhCEeUmC7mg==} - tr46@0.0.3: resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==} - tr46@4.1.1: - resolution: {integrity: sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw==} - engines: {node: '>=14'} - trim-repeated@2.0.0: resolution: {integrity: sha512-QUHBFTJGdOwmp0tbOG505xAgOp/YliZP/6UgafFXYZ26WT1bvQmSMJUvkeVSASuJJHbqsFbynTvkd5W8RBTipg==} engines: {node: '>=12'} @@ -2675,14 +2532,6 @@ packages: util-deprecate@1.0.2: resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==} - uuid@8.3.2: - resolution: {integrity: sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==} - hasBin: true - - validator@13.12.0: - resolution: {integrity: sha512-c1Q0mCiPlgdTVVVIJIrBuxNicYE+t/7oKeI9MWLj3fh/uq2Pxh/3eeWbVZ4OcGW1TUf53At0njHw5SMdA3tmMg==} - engines: {node: '>= 0.10'} - web-streams-polyfill@3.3.3: resolution: {integrity: sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw==} engines: {node: '>= 8'} @@ -2690,14 +2539,6 @@ packages: webidl-conversions@3.0.1: resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==} - webidl-conversions@7.0.0: - resolution: {integrity: sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==} - engines: {node: '>=12'} - - whatwg-url@13.0.0: - resolution: {integrity: sha512-9WWbymnqj57+XEuqADHrCJ2eSXzn8WXIW/YSGaZtb2WKAInQ6CHfaUUcTyyver0p8BDg5StLQq8h1vtZuwmOig==} - engines: {node: '>=16'} - whatwg-url@5.0.0: resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==} @@ -2713,9 +2554,6 @@ packages: wide-align@1.1.5: resolution: {integrity: sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==} - wkx@0.5.0: - resolution: {integrity: sha512-Xng/d4Ichh8uN4l0FToV/258EjMGU9MGcA0HV2d9B/ZpZB3lqQm7nkOdZdm5GhKtLLhAE7PiVQwN4eN+2YJJUg==} - word-wrap@1.2.5: resolution: {integrity: sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==} engines: {node: '>=0.10.0'} @@ -3135,10 +2973,6 @@ snapshots: got: 11.8.6 os-filter-obj: 2.0.0 - '@mongodb-js/saslprep@1.1.9': - dependencies: - sparse-bitfield: 3.0.3 - '@napi-rs/nice-android-arm-eabi@1.0.1': optional: true @@ -3325,10 +3159,6 @@ snapshots: '@types/node': 22.7.2 '@types/responselike': 1.0.3 - '@types/debug@4.1.12': - dependencies: - '@types/ms': 0.7.34 - '@types/estree@1.0.6': {} '@types/http-cache-semantics@4.0.4': {} @@ -3358,14 +3188,6 @@ snapshots: dependencies: '@types/node': 22.7.2 - '@types/validator@13.12.2': {} - - '@types/webidl-conversions@7.0.3': {} - - '@types/whatwg-url@11.0.5': - dependencies: - '@types/webidl-conversions': 7.0.3 - '@types/ws@8.5.12': dependencies: '@types/node': 22.7.2 @@ -3524,7 +3346,8 @@ snapshots: balanced-match@1.0.2: {} - base64-js@1.5.1: {} + base64-js@1.5.1: + optional: true bin-check@4.1.0: dependencies: @@ -3545,12 +3368,14 @@ snapshots: bindings@1.5.0: dependencies: file-uri-to-path: 1.0.0 + optional: true bl@4.1.0: dependencies: buffer: 5.7.1 inherits: 2.0.4 readable-stream: 3.6.2 + optional: true boolbase@1.0.0: {} @@ -3567,14 +3392,13 @@ snapshots: dependencies: fill-range: 7.1.1 - bson@6.8.0: {} - buffer-from@1.1.2: {} buffer@5.7.1: dependencies: base64-js: 1.5.1 ieee754: 1.2.1 + optional: true cacache@15.3.0: dependencies: @@ -3625,9 +3449,11 @@ snapshots: dependencies: readdirp: 4.0.1 - chownr@1.1.4: {} + chownr@1.1.4: + optional: true - chownr@2.0.0: {} + chownr@2.0.0: + optional: true clean-stack@2.2.0: optional: true @@ -3699,7 +3525,8 @@ snapshots: dependencies: mimic-response: 3.1.0 - deep-extend@0.6.0: {} + deep-extend@0.6.0: + optional: true deep-is@0.1.4: {} @@ -3712,7 +3539,8 @@ snapshots: denque@2.1.0: {} - detect-libc@2.0.3: {} + detect-libc@2.0.3: + optional: true discord-api-types@0.37.101: {} @@ -3797,8 +3625,6 @@ snapshots: dotenv@16.4.5: {} - dottie@2.0.6: {} - dprint@0.47.2: optionalDependencies: '@dprint/darwin-arm64': 0.47.2 @@ -4034,7 +3860,8 @@ snapshots: dependencies: pify: 2.3.0 - expand-template@2.0.3: {} + expand-template@2.0.3: + optional: true ext-list@2.2.2: dependencies: @@ -4084,7 +3911,8 @@ snapshots: strtok3: 7.1.1 token-types: 5.0.1 - file-uri-to-path@1.0.0: {} + file-uri-to-path@1.0.0: + optional: true filename-reserved-regex@3.0.0: {} @@ -4126,11 +3954,13 @@ snapshots: dependencies: fetch-blob: 3.2.0 - fs-constants@1.0.0: {} + fs-constants@1.0.0: + optional: true fs-minipass@2.1.0: dependencies: minipass: 3.3.6 + optional: true fs.realpath@1.0.0: optional: true @@ -4167,7 +3997,8 @@ snapshots: dependencies: resolve-pkg-maps: 1.0.0 - github-from-package@0.0.0: {} + github-from-package@0.0.0: + optional: true glob-parent@5.1.2: dependencies: @@ -4272,8 +4103,6 @@ snapshots: infer-owner@1.0.4: optional: true - inflection@1.13.4: {} - inflight@1.0.6: dependencies: once: 1.4.0 @@ -4282,7 +4111,8 @@ snapshots: inherits@2.0.4: {} - ini@1.3.8: {} + ini@1.3.8: + optional: true ioredis@5.4.1: dependencies: @@ -4350,8 +4180,6 @@ snapshots: json-stable-stringify-without-jsonify@1.0.1: {} - kareem@2.6.3: {} - keyv@4.5.4: dependencies: json-buffer: 3.0.1 @@ -4420,8 +4248,6 @@ snapshots: - supports-color optional: true - memory-pager@1.5.0: {} - merge-stream@2.0.0: {} merge2@1.4.1: {} @@ -4453,7 +4279,8 @@ snapshots: dependencies: brace-expansion: 2.0.1 - minimist@1.2.8: {} + minimist@1.2.8: + optional: true minipass-collect@1.0.2: dependencies: @@ -4487,67 +4314,27 @@ snapshots: minipass@3.3.6: dependencies: yallist: 4.0.0 + optional: true - minipass@5.0.0: {} + minipass@5.0.0: + optional: true minizlib@2.1.2: dependencies: minipass: 3.3.6 yallist: 4.0.0 + optional: true - mkdirp-classic@0.5.3: {} + mkdirp-classic@0.5.3: + optional: true - mkdirp@1.0.4: {} - - moment-timezone@0.5.45: - dependencies: - moment: 2.30.1 - - moment@2.30.1: {} - - mongodb-connection-string-url@3.0.1: - dependencies: - '@types/whatwg-url': 11.0.5 - whatwg-url: 13.0.0 - - mongodb@6.8.0(socks@2.8.3): - dependencies: - '@mongodb-js/saslprep': 1.1.9 - bson: 6.8.0 - mongodb-connection-string-url: 3.0.1 - optionalDependencies: - socks: 2.8.3 - - mongoose@8.6.3(socks@2.8.3): - dependencies: - bson: 6.8.0 - kareem: 2.6.3 - mongodb: 6.8.0(socks@2.8.3) - mpath: 0.9.0 - mquery: 5.0.0 - ms: 2.1.3 - sift: 17.1.3 - transitivePeerDependencies: - - '@aws-sdk/credential-providers' - - '@mongodb-js/zstd' - - gcp-metadata - - kerberos - - mongodb-client-encryption - - snappy - - socks - - supports-color - - mpath@0.9.0: {} - - mquery@5.0.0: - dependencies: - debug: 4.3.7 - transitivePeerDependencies: - - supports-color + mkdirp@1.0.4: + optional: true ms@2.1.3: {} - napi-build-utils@1.0.2: {} + napi-build-utils@1.0.2: + optional: true natural-compare@1.4.0: {} @@ -4557,8 +4344,10 @@ snapshots: node-abi@3.68.0: dependencies: semver: 7.6.3 + optional: true - node-addon-api@7.1.1: {} + node-addon-api@7.1.1: + optional: true node-domexception@1.0.0: {} @@ -4686,7 +4475,8 @@ snapshots: pg-cloudflare@1.1.1: optional: true - pg-connection-string@2.7.0: {} + pg-connection-string@2.7.0: + optional: true pg-int8@1.0.1: optional: true @@ -4793,6 +4583,7 @@ snapshots: simple-get: 4.0.1 tar-fs: 2.1.1 tunnel-agent: 0.6.0 + optional: true prelude-ls@1.2.1: {} @@ -4832,6 +4623,7 @@ snapshots: ini: 1.3.8 minimist: 1.2.8 strip-json-comments: 2.0.1 + optional: true readable-stream@3.6.2: dependencies: @@ -4861,8 +4653,6 @@ snapshots: dependencies: lowercase-keys: 2.0.0 - retry-as-promised@7.0.4: {} - retry@0.12.0: optional: true @@ -4896,32 +4686,6 @@ snapshots: semver@7.6.3: {} - sequelize-pool@7.1.0: {} - - sequelize@6.37.3(pg@8.13.0)(sqlite3@5.1.7): - dependencies: - '@types/debug': 4.1.12 - '@types/validator': 13.12.2 - debug: 4.3.7 - dottie: 2.0.6 - inflection: 1.13.4 - lodash: 4.17.21 - moment: 2.30.1 - moment-timezone: 0.5.45 - pg-connection-string: 2.7.0 - retry-as-promised: 7.0.4 - semver: 7.6.3 - sequelize-pool: 7.1.0 - toposort-class: 1.0.1 - uuid: 8.3.2 - validator: 13.12.0 - wkx: 0.5.0 - optionalDependencies: - pg: 8.13.0 - sqlite3: 5.1.7 - transitivePeerDependencies: - - supports-color - set-blocking@2.0.0: optional: true @@ -4937,17 +4701,17 @@ snapshots: shebang-regex@3.0.0: {} - sift@17.1.3: {} - signal-exit@3.0.7: {} - simple-concat@1.0.1: {} + simple-concat@1.0.1: + optional: true simple-get@4.0.1: dependencies: decompress-response: 6.0.0 once: 1.4.0 simple-concat: 1.0.1 + optional: true slash@3.0.0: {} @@ -4990,10 +4754,6 @@ snapshots: source-map@0.7.4: {} - sparse-bitfield@3.0.3: - dependencies: - memory-pager: 1.5.0 - split2@4.2.0: optional: true @@ -5018,6 +4778,7 @@ snapshots: transitivePeerDependencies: - bluebird - supports-color + optional: true ssri@8.0.1: dependencies: @@ -5045,7 +4806,8 @@ snapshots: strip-final-newline@2.0.0: {} - strip-json-comments@2.0.1: {} + strip-json-comments@2.0.1: + optional: true strip-json-comments@3.1.1: {} @@ -5071,6 +4833,7 @@ snapshots: mkdirp-classic: 0.5.3 pump: 3.0.2 tar-stream: 2.2.0 + optional: true tar-stream@2.2.0: dependencies: @@ -5079,6 +4842,7 @@ snapshots: fs-constants: 1.0.0 inherits: 2.0.4 readable-stream: 3.6.2 + optional: true tar@6.2.1: dependencies: @@ -5088,6 +4852,7 @@ snapshots: minizlib: 2.1.2 mkdirp: 1.0.4 yallist: 4.0.0 + optional: true text-table@0.2.0: {} @@ -5107,14 +4872,8 @@ snapshots: '@tokenizer/token': 0.3.0 ieee754: 1.2.1 - toposort-class@1.0.1: {} - tr46@0.0.3(patch_hash=bpj6gcw6zugqpvk6vn5cnxkdsq): {} - tr46@4.1.1: - dependencies: - punycode: 2.3.1 - trim-repeated@2.0.0: dependencies: escape-string-regexp: 5.0.0 @@ -5137,6 +4896,7 @@ snapshots: tunnel-agent@0.6.0: dependencies: safe-buffer: 5.2.1 + optional: true type-check@0.4.0: dependencies: @@ -5170,21 +4930,10 @@ snapshots: util-deprecate@1.0.2: {} - uuid@8.3.2: {} - - validator@13.12.0: {} - web-streams-polyfill@3.3.3: {} webidl-conversions@3.0.1: {} - webidl-conversions@7.0.0: {} - - whatwg-url@13.0.0: - dependencies: - tr46: 4.1.1 - webidl-conversions: 7.0.0 - whatwg-url@5.0.0(patch_hash=qm5bqxbojl4aucv5lfj4d2vjuu): dependencies: tr46: 0.0.3(patch_hash=bpj6gcw6zugqpvk6vn5cnxkdsq) @@ -5203,10 +4952,6 @@ snapshots: string-width: 4.2.3 optional: true - wkx@0.5.0: - dependencies: - '@types/node': 22.7.2 - word-wrap@1.2.5: {} wrappy@1.0.2: {} @@ -5218,7 +4963,8 @@ snapshots: yallist@2.1.2: {} - yallist@4.0.0: {} + yallist@4.0.0: + optional: true yocto-queue@0.1.0: {} diff --git a/src/commands-contextmenu/congratsmessage.ts b/src/commands-contextmenu/congratsmessage.ts index 54328c5..b72133e 100644 --- a/src/commands-contextmenu/congratsmessage.ts +++ b/src/commands-contextmenu/congratsmessage.ts @@ -1,5 +1,5 @@ import { ApplicationCommandType, ContextMenuCommandBuilder, PermissionFlagsBits, userMention } from "discord.js" -import { IContextMenu } from "interfaces" +import { IContextMenu } from "~/interfaces" export default { name: "congratsmessage", diff --git a/src/commands-contextmenu/resetnick.ts b/src/commands-contextmenu/resetnick.ts index fdbe3c3..2886c43 100644 --- a/src/commands-contextmenu/resetnick.ts +++ b/src/commands-contextmenu/resetnick.ts @@ -1,5 +1,5 @@ import { ApplicationCommandType, ContextMenuCommandBuilder, PermissionFlagsBits } from "discord.js" -import { IContextMenu } from "interfaces" +import { IContextMenu } from "~/interfaces" export default { name: "resetnick", diff --git a/src/commands-contextmenu/updateuser.ts b/src/commands-contextmenu/updateuser.ts index b025fff..7f25989 100644 --- a/src/commands-contextmenu/updateuser.ts +++ b/src/commands-contextmenu/updateuser.ts @@ -1,10 +1,10 @@ -import { devMessage, embedColor, hypixelGuildID } from "config/options.js" -import { waitingListRole } from "config/roles.js" import { ApplicationCommandType, ContextMenuCommandBuilder, PermissionFlagsBits, userMention } from "discord.js" -import { IContextMenu } from "interfaces" import db from "src/drizzle/db.js" -import roleManage from "utils/functions/rolesmanage.js" -import { getGuild, getHeadURL, getIGN } from "utils/Hypixel.js" +import { devMessage, embedColor, hypixelGuildID } from "~/config/options.js" +import { waitingListRole } from "~/config/roles.js" +import { IContextMenu } from "~/interfaces" +import roleManage from "~/utils/functions/rolesmanage.js" +import { getGuild, getHeadURL, getIGN } from "~/utils/Hypixel.js" export default { name: "Update User", diff --git a/src/commands/anime.ts b/src/commands/anime.ts index 98bc70f..dc4371d 100644 --- a/src/commands/anime.ts +++ b/src/commands/anime.ts @@ -1,7 +1,7 @@ import { anilist } from "anilist" -import { devMessage, embedColor } from "config/options.js" import { InteractionContextType, SlashCommandBuilder } from "discord.js" -import { ICommand } from "interfaces" +import { devMessage, embedColor } from "~/config/options.js" +import { ICommand } from "~/interfaces" export default { name: "anime", diff --git a/src/commands/ban.ts b/src/commands/ban.ts index a7932f6..59dc822 100644 --- a/src/commands/ban.ts +++ b/src/commands/ban.ts @@ -1,8 +1,8 @@ -import { devMessage, embedColor } from "config/options.js" -import { admin, helper } from "config/roles.js" import { GuildMember, InteractionContextType, PermissionFlagsBits, SlashCommandBuilder, userMention } from "discord.js" -import { ICommand } from "interfaces" -import logToChannel from "utils/functions/logtochannel.js" +import { devMessage, embedColor } from "~/config/options.js" +import { admin, helper } from "~/config/roles.js" +import { ICommand } from "~/interfaces" +import logToChannel from "~/utils/functions/logtochannel.js" export default { name: "ban", diff --git a/src/commands/botinfo.ts b/src/commands/botinfo.ts index 59ae4b6..fd94f65 100644 --- a/src/commands/botinfo.ts +++ b/src/commands/botinfo.ts @@ -1,10 +1,10 @@ import { execSync } from "child_process" -import { devMessage, embedColor } from "config/options.js" import { InteractionContextType, SlashCommandBuilder } from "discord.js" -import { ICommand } from "interfaces" import { createRequire } from "node:module" import os from "os" import prettyMs from "pretty-ms" +import { devMessage, embedColor } from "~/config/options.js" +import { ICommand } from "~/interfaces" const require = createRequire(import.meta.url) const { dependencies, devDependencies } = require("../../package.json") diff --git a/src/commands/check.ts b/src/commands/check.ts index 43d44d6..4c6e16b 100644 --- a/src/commands/check.ts +++ b/src/commands/check.ts @@ -1,8 +1,8 @@ -import { devMessage, embedColor } from "config/options.js" -import { bwfkdr, bwstars, bwwins, duelswins, duelswlr, swkdr, swstars } from "config/reqs.js" import { InteractionContextType, SlashCommandBuilder } from "discord.js" -import { ICommand } from "interfaces" -import { bedwarsLevel, getGuild, getHeadURL, getPlayer, getUUID, hypixelLevel, skywarsLevel } from "utils/Hypixel.js" +import { devMessage, embedColor } from "~/config/options.js" +import { bwfkdr, bwstars, bwwins, duelswins, duelswlr, swkdr, swstars } from "~/config/reqs.js" +import { ICommand } from "~/interfaces" +import { bedwarsLevel, getGuild, getHeadURL, getPlayer, getUUID, hypixelLevel, skywarsLevel } from "~/utils/Hypixel.js" export default { name: "check", diff --git a/src/commands/clear.ts b/src/commands/clear.ts index 5d62c7c..4435384 100644 --- a/src/commands/clear.ts +++ b/src/commands/clear.ts @@ -1,7 +1,7 @@ -import { embedColor } from "config/options.js" import { channelMention, InteractionContextType, PermissionFlagsBits, SlashCommandBuilder, TextChannel, userMention } from "discord.js" -import { ICommand } from "interfaces" -import logToChannel from "utils/functions/logtochannel.js" +import { embedColor } from "~/config/options.js" +import { ICommand } from "~/interfaces" +import logToChannel from "~/utils/functions/logtochannel.js" export default { name: "clear", diff --git a/src/commands/config.ts b/src/commands/config.ts index 199bbc8..b772b35 100644 --- a/src/commands/config.ts +++ b/src/commands/config.ts @@ -1,9 +1,9 @@ -import { embedColor } from "config/options.js" import { InteractionContextType, PermissionFlagsBits, SlashCommandBuilder } from "discord.js" import { eq } from "drizzle-orm" -import { ICommand } from "interfaces" import db from "src/drizzle/db.js" import { settings } from "src/drizzle/schema.js" +import { embedColor } from "~/config/options.js" +import { ICommand } from "~/interfaces" export default { name: "config", diff --git a/src/commands/counting.ts b/src/commands/counting.ts index eb2704b..7c7168b 100644 --- a/src/commands/counting.ts +++ b/src/commands/counting.ts @@ -1,6 +1,6 @@ -import { devMessage, embedColor } from "config/options.js" import { InteractionContextType, PermissionFlagsBits, SlashCommandBuilder } from "discord.js" -import { ICommand } from "interfaces" +import { devMessage, embedColor } from "~/config/options.js" +import { ICommand } from "~/interfaces" import ban from "./counting/ban.js" import unban from "./counting/unban.js" diff --git a/src/commands/counting/ban.ts b/src/commands/counting/ban.ts index e4a1e5e..5b77695 100644 --- a/src/commands/counting/ban.ts +++ b/src/commands/counting/ban.ts @@ -1,6 +1,6 @@ -import { devMessage, embedColor } from "config/options.js" -import { countingBanned } from "config/roles.js" import { ChatInputCommandInteraction, GuildMember, userMention } from "discord.js" +import { devMessage, embedColor } from "~/config/options.js" +import { countingBanned } from "~/config/roles.js" export default async function ban(interaction: ChatInputCommandInteraction): Promise { const member = interaction.options.getMember("user")! as GuildMember diff --git a/src/commands/counting/unban.ts b/src/commands/counting/unban.ts index d3323a8..0bdd667 100644 --- a/src/commands/counting/unban.ts +++ b/src/commands/counting/unban.ts @@ -1,6 +1,6 @@ -import { devMessage, embedColor } from "config/options.js" -import { countingBanned } from "config/roles.js" import { ChatInputCommandInteraction, GuildMember, userMention } from "discord.js" +import { devMessage, embedColor } from "~/config/options.js" +import { countingBanned } from "~/config/roles.js" export default async function ban(interaction: ChatInputCommandInteraction): Promise { const member = interaction.options.getMember("user")! as GuildMember diff --git a/src/commands/find.ts b/src/commands/find.ts index 74bbd3d..9589194 100644 --- a/src/commands/find.ts +++ b/src/commands/find.ts @@ -1,8 +1,8 @@ -import { devMessage, embedColor } from "config/options.js" import { InteractionContextType, PermissionFlagsBits, SlashCommandBuilder, userMention } from "discord.js" -import { ICommand } from "interfaces" import db from "src/drizzle/db.js" -import { getHeadURL, getIGN, getUUID } from "utils/Hypixel.js" +import { devMessage, embedColor } from "~/config/options.js" +import { ICommand } from "~/interfaces" +import { getHeadURL, getIGN, getUUID } from "~/utils/Hypixel.js" export default { name: "find", diff --git a/src/commands/forceunverify.ts b/src/commands/forceunverify.ts index 2fed862..8cf9365 100644 --- a/src/commands/forceunverify.ts +++ b/src/commands/forceunverify.ts @@ -1,12 +1,12 @@ -import { devMessage, embedColor } from "config/options.js" import { GuildMember, InteractionContextType, PermissionFlagsBits, SlashCommandBuilder, userMention } from "discord.js" import { eq } from "drizzle-orm" -import { ICommand } from "interfaces" import db from "src/drizzle/db.js" import { verifies } from "src/drizzle/schema.js" -import logToChannel from "utils/functions/logtochannel.js" -import roleManage from "utils/functions/rolesmanage.js" -import { getIGN } from "utils/Hypixel.js" +import { devMessage, embedColor } from "~/config/options.js" +import { ICommand } from "~/interfaces" +import logToChannel from "~/utils/functions/logtochannel.js" +import roleManage from "~/utils/functions/rolesmanage.js" +import { getIGN } from "~/utils/Hypixel.js" export default { name: "forceunverify", diff --git a/src/commands/forceupdate.ts b/src/commands/forceupdate.ts index a2379a5..f370121 100644 --- a/src/commands/forceupdate.ts +++ b/src/commands/forceupdate.ts @@ -1,10 +1,10 @@ -import { devMessage, embedColor, hypixelGuildID } from "config/options.js" -import { waitingListRole } from "config/roles.js" import { GuildMember, InteractionContextType, PermissionFlagsBits, SlashCommandBuilder, userMention } from "discord.js" -import { ICommand } from "interfaces" import db from "src/drizzle/db.js" -import roleManage from "utils/functions/rolesmanage.js" -import { getGuild, getHeadURL, getIGN } from "utils/Hypixel.js" +import { devMessage, embedColor, hypixelGuildID } from "~/config/options.js" +import { waitingListRole } from "~/config/roles.js" +import { ICommand } from "~/interfaces" +import roleManage from "~/utils/functions/rolesmanage.js" +import { getGuild, getHeadURL, getIGN } from "~/utils/Hypixel.js" export default { name: "forceupdate", diff --git a/src/commands/forceverify.ts b/src/commands/forceverify.ts index 012c6a8..12cc033 100644 --- a/src/commands/forceverify.ts +++ b/src/commands/forceverify.ts @@ -1,11 +1,11 @@ -import { devMessage, embedColor, hypixelGuildID } from "config/options.js" import { GuildMember, InteractionContextType, PermissionFlagsBits, SlashCommandBuilder, userMention } from "discord.js" -import { ICommand } from "interfaces" import db from "src/drizzle/db.js" import { verifies } from "src/drizzle/schema.js" -import logToChannel from "utils/functions/logtochannel.js" -import roleManage from "utils/functions/rolesmanage.js" -import { getGuild, getHeadURL, getPlayer, getUUID } from "utils/Hypixel.js" +import { devMessage, embedColor, hypixelGuildID } from "~/config/options.js" +import { ICommand } from "~/interfaces" +import logToChannel from "~/utils/functions/logtochannel.js" +import roleManage from "~/utils/functions/rolesmanage.js" +import { getGuild, getHeadURL, getPlayer, getUUID } from "~/utils/Hypixel.js" export default { name: "forceverify", diff --git a/src/commands/guild.ts b/src/commands/guild.ts index 4db08de..99f7075 100644 --- a/src/commands/guild.ts +++ b/src/commands/guild.ts @@ -1,6 +1,6 @@ -import { devMessage, embedColor } from "config/options.js" import { InteractionContextType, SlashCommandBuilder } from "discord.js" -import { ICommand } from "interfaces" +import { devMessage, embedColor } from "~/config/options.js" +import { ICommand } from "~/interfaces" import guildInfo from "./guild/info.js" import guildMember from "./guild/member.js" import guildTop from "./guild/top.js" diff --git a/src/commands/guild/info.ts b/src/commands/guild/info.ts index e88e564..b73eabf 100644 --- a/src/commands/guild/info.ts +++ b/src/commands/guild/info.ts @@ -1,7 +1,7 @@ -import { devMessage, embedColor } from "config/options.js" import { ChatInputCommandInteraction } from "discord.js" -import { IGuildData } from "interfaces" -import { getGuild, getIGN, getPlayer, getUUID, guildLevel } from "utils/Hypixel.js" +import { devMessage, embedColor } from "~/config/options.js" +import { IGuildData } from "~/interfaces" +import { getGuild, getIGN, getPlayer, getUUID, guildLevel } from "~/utils/Hypixel.js" export default async function guildInfo(interaction: ChatInputCommandInteraction): Promise { await interaction.deferReply() diff --git a/src/commands/guild/member.ts b/src/commands/guild/member.ts index e720e50..f2b4ae3 100644 --- a/src/commands/guild/member.ts +++ b/src/commands/guild/member.ts @@ -1,6 +1,6 @@ -import { devMessage, embedColor } from "config/options.js" import { ChatInputCommandInteraction } from "discord.js" -import { getGuild, getHeadURL, getPlayer, getUUID } from "utils/Hypixel.js" +import { devMessage, embedColor } from "~/config/options.js" +import { getGuild, getHeadURL, getPlayer, getUUID } from "~/utils/Hypixel.js" export default async function guildMember(interaction: ChatInputCommandInteraction): Promise { await interaction.deferReply() diff --git a/src/commands/guild/top.ts b/src/commands/guild/top.ts index 32876e9..83b58be 100644 --- a/src/commands/guild/top.ts +++ b/src/commands/guild/top.ts @@ -1,8 +1,8 @@ -import { devMessage, embedColor } from "config/options.js" import { ChatInputCommandInteraction } from "discord.js" -import { IGuildData } from "interfaces" -import { getGuild, getIGN, getPlayer, getUUID } from "utils/Hypixel.js" -import { redis } from "utils/Illegitimate.js" +import { devMessage, embedColor } from "~/config/options.js" +import { IGuildData } from "~/interfaces" +import { getGuild, getIGN, getPlayer, getUUID } from "~/utils/Hypixel.js" +import { redis } from "~/utils/Illegitimate.js" export default async function guildTop(interaction: ChatInputCommandInteraction): Promise { await interaction.deferReply() diff --git a/src/commands/help.ts b/src/commands/help.ts index 4fafd38..b11930e 100644 --- a/src/commands/help.ts +++ b/src/commands/help.ts @@ -1,6 +1,6 @@ -import { devMessage, embedColor } from "config/options.js" import { ActionRowBuilder, ButtonBuilder, ButtonStyle, ComponentType, InteractionContextType, SlashCommandBuilder } from "discord.js" -import { ICommand } from "interfaces" +import { devMessage, embedColor } from "~/config/options.js" +import { ICommand } from "~/interfaces" export default { name: "help", diff --git a/src/commands/instructions.ts b/src/commands/instructions.ts index 27eda26..79dd633 100644 --- a/src/commands/instructions.ts +++ b/src/commands/instructions.ts @@ -1,6 +1,6 @@ -import { devMessage, embedColor, instructionsgif } from "config/options.js" import { InteractionContextType, PermissionFlagsBits, SlashCommandBuilder } from "discord.js" -import { ICommand } from "interfaces" +import { devMessage, embedColor, instructionsgif } from "~/config/options.js" +import { ICommand } from "~/interfaces" export default { name: "instructions", diff --git a/src/commands/kick.ts b/src/commands/kick.ts index 8259cb9..198f801 100644 --- a/src/commands/kick.ts +++ b/src/commands/kick.ts @@ -1,8 +1,8 @@ -import { devMessage, embedColor } from "config/options.js" -import { admin, helper } from "config/roles.js" import { GuildMember, InteractionContextType, PermissionFlagsBits, SlashCommandBuilder, userMention } from "discord.js" -import { ICommand } from "interfaces" -import logToChannel from "utils/functions/logtochannel.js" +import { devMessage, embedColor } from "~/config/options.js" +import { admin, helper } from "~/config/roles.js" +import { ICommand } from "~/interfaces" +import logToChannel from "~/utils/functions/logtochannel.js" export default { name: "kick", diff --git a/src/commands/music.ts b/src/commands/music.ts index 78e7d7f..835a491 100644 --- a/src/commands/music.ts +++ b/src/commands/music.ts @@ -1,5 +1,5 @@ import { InteractionContextType, PermissionFlagsBits, SlashCommandBuilder } from "discord.js" -import { ICommand } from "interfaces" +import { ICommand } from "~/interfaces" import leave from "./music/leave.js" import nowplaying from "./music/nowplaying.js" import pause from "./music/pause.js" diff --git a/src/commands/music/leave.ts b/src/commands/music/leave.ts index 522d084..5b71043 100644 --- a/src/commands/music/leave.ts +++ b/src/commands/music/leave.ts @@ -1,6 +1,6 @@ -import { embedColor } from "config/options.js" import { useMainPlayer } from "discord-player" import { ChatInputCommandInteraction } from "discord.js" +import { embedColor } from "~/config/options.js" export default async function leave(interaction: ChatInputCommandInteraction) { const player = useMainPlayer() diff --git a/src/commands/music/nowplaying.ts b/src/commands/music/nowplaying.ts index 0ab34c6..640d89b 100644 --- a/src/commands/music/nowplaying.ts +++ b/src/commands/music/nowplaying.ts @@ -1,6 +1,6 @@ -import { embedColor } from "config/options.js" import { useMainPlayer } from "discord-player" import { ChatInputCommandInteraction } from "discord.js" +import { embedColor } from "~/config/options.js" export default async function nowplaying(interaction: ChatInputCommandInteraction) { await interaction.deferReply() diff --git a/src/commands/music/pause.ts b/src/commands/music/pause.ts index b7c1c81..7ab88c4 100644 --- a/src/commands/music/pause.ts +++ b/src/commands/music/pause.ts @@ -1,6 +1,6 @@ -import { embedColor } from "config/options.js" import { useMainPlayer } from "discord-player" import { ChatInputCommandInteraction } from "discord.js" +import { embedColor } from "~/config/options.js" export default async function pause(interaction: ChatInputCommandInteraction) { await interaction.deferReply() diff --git a/src/commands/music/play.ts b/src/commands/music/play.ts index a8c1e08..1394ea1 100644 --- a/src/commands/music/play.ts +++ b/src/commands/music/play.ts @@ -1,6 +1,6 @@ -import { embedColor } from "config/options.js" import { useMainPlayer } from "discord-player" import { ChatInputCommandInteraction, GuildMember } from "discord.js" +import { embedColor } from "~/config/options.js" export default async function play(interaction: ChatInputCommandInteraction) { await interaction.deferReply() diff --git a/src/commands/music/queue.ts b/src/commands/music/queue.ts index a2b1dd8..53ebdff 100644 --- a/src/commands/music/queue.ts +++ b/src/commands/music/queue.ts @@ -1,6 +1,6 @@ -import { embedColor } from "config/options.js" import { useMainPlayer } from "discord-player" import { ChatInputCommandInteraction } from "discord.js" +import { embedColor } from "~/config/options.js" export default async function queue(interaction: ChatInputCommandInteraction) { await interaction.deferReply() diff --git a/src/commands/music/skip.ts b/src/commands/music/skip.ts index e57c6b5..1cec46f 100644 --- a/src/commands/music/skip.ts +++ b/src/commands/music/skip.ts @@ -1,6 +1,6 @@ -import { embedColor } from "config/options.js" import { useMainPlayer } from "discord-player" import { ChatInputCommandInteraction } from "discord.js" +import { embedColor } from "~/config/options.js" export default async function skip(interaction: ChatInputCommandInteraction) { await interaction.deferReply() diff --git a/src/commands/music/unpause.ts b/src/commands/music/unpause.ts index b03eee8..1fc34b1 100644 --- a/src/commands/music/unpause.ts +++ b/src/commands/music/unpause.ts @@ -1,6 +1,6 @@ -import { embedColor } from "config/options.js" import { useMainPlayer } from "discord-player" import { ChatInputCommandInteraction } from "discord.js" +import { embedColor } from "~/config/options.js" export default async function pause(interaction: ChatInputCommandInteraction) { await interaction.deferReply() diff --git a/src/commands/music/volume.ts b/src/commands/music/volume.ts index 0b0c09b..ca0e66e 100644 --- a/src/commands/music/volume.ts +++ b/src/commands/music/volume.ts @@ -1,6 +1,6 @@ -import { embedColor } from "config/options.js" import { useMainPlayer } from "discord-player" import { ChatInputCommandInteraction } from "discord.js" +import { embedColor } from "~/config/options.js" export default async function volume(interaction: ChatInputCommandInteraction) { await interaction.deferReply() diff --git a/src/commands/ping.ts b/src/commands/ping.ts index 88b737d..14485ee 100644 --- a/src/commands/ping.ts +++ b/src/commands/ping.ts @@ -1,6 +1,6 @@ -import { devMessage, embedColor } from "config/options.js" import { InteractionContextType, SlashCommandBuilder } from "discord.js" -import { ICommand } from "interfaces" +import { devMessage, embedColor } from "~/config/options.js" +import { ICommand } from "~/interfaces" export default { name: "ping", diff --git a/src/commands/pp.ts b/src/commands/pp.ts index 0ee611c..1b3a213 100644 --- a/src/commands/pp.ts +++ b/src/commands/pp.ts @@ -1,7 +1,7 @@ -import { embedColor } from "config/options.js" import { InteractionContextType, SlashCommandBuilder, User } from "discord.js" -import { ICommand } from "interfaces" -import env from "utils/Env.js" +import { embedColor } from "~/config/options.js" +import { ICommand } from "~/interfaces" +import env from "~/utils/Env.js" export default { name: "pp", diff --git a/src/commands/remove.ts b/src/commands/remove.ts index 41a3a49..4889feb 100644 --- a/src/commands/remove.ts +++ b/src/commands/remove.ts @@ -1,11 +1,11 @@ -import { devMessage, embedColor } from "config/options.js" -import { waitingListRole } from "config/roles.js" import { GuildMember, InteractionContextType, PermissionFlagsBits, SlashCommandBuilder, userMention } from "discord.js" import { eq } from "drizzle-orm" -import { ICommand } from "interfaces" import db from "src/drizzle/db.js" import { waitingLists } from "src/drizzle/schema.js" -import logToChannel from "utils/functions/logtochannel.js" +import { devMessage, embedColor } from "~/config/options.js" +import { waitingListRole } from "~/config/roles.js" +import { ICommand } from "~/interfaces" +import logToChannel from "~/utils/functions/logtochannel.js" export default { name: "remove", diff --git a/src/commands/reqs.ts b/src/commands/reqs.ts index 26a4631..b6a3a9e 100644 --- a/src/commands/reqs.ts +++ b/src/commands/reqs.ts @@ -1,7 +1,7 @@ -import { devMessage, embedColor } from "config/options.js" -import { bwfkdr, bwstars, bwwins, duelswins, duelswlr, swkdr, swstars } from "config/reqs.js" import { InteractionContextType, SlashCommandBuilder } from "discord.js" -import { ICommand } from "interfaces" +import { devMessage, embedColor } from "~/config/options.js" +import { bwfkdr, bwstars, bwwins, duelswins, duelswlr, swkdr, swstars } from "~/config/reqs.js" +import { ICommand } from "~/interfaces" export default { name: "reqs", diff --git a/src/commands/send.ts b/src/commands/send.ts index 5bdde90..4941882 100644 --- a/src/commands/send.ts +++ b/src/commands/send.ts @@ -1,6 +1,6 @@ -import { devMessage, embedColor } from "config/options.js" import { ChannelType, InteractionContextType, PermissionFlagsBits, SlashCommandBuilder, TextChannel } from "discord.js" -import { ICommand } from "interfaces" +import { devMessage, embedColor } from "~/config/options.js" +import { ICommand } from "~/interfaces" export default { name: "send", diff --git a/src/commands/setnick.ts b/src/commands/setnick.ts index 1cdfb40..421ab5a 100644 --- a/src/commands/setnick.ts +++ b/src/commands/setnick.ts @@ -1,7 +1,7 @@ -import { devMessage, embedColor } from "config/options.js" import { GuildMember, InteractionContextType, PermissionFlagsBits, SlashCommandBuilder, userMention } from "discord.js" -import { ICommand } from "interfaces" -import logToChannel from "utils/functions/logtochannel.js" +import { devMessage, embedColor } from "~/config/options.js" +import { ICommand } from "~/interfaces" +import logToChannel from "~/utils/functions/logtochannel.js" export default { name: "setnick", diff --git a/src/commands/setup.ts b/src/commands/setup.ts index 9f9cb5d..1d12dee 100644 --- a/src/commands/setup.ts +++ b/src/commands/setup.ts @@ -1,4 +1,3 @@ -import { devMessage, embedColor } from "config/options.js" import { ActionRowBuilder, ButtonBuilder, @@ -9,7 +8,8 @@ import { SlashCommandBuilder, TextChannel } from "discord.js" -import { ICommand } from "interfaces" +import { devMessage, embedColor } from "~/config/options.js" +import { ICommand } from "~/interfaces" export default { name: "setup", diff --git a/src/commands/slowmode.ts b/src/commands/slowmode.ts index dea4337..3e9c0cc 100644 --- a/src/commands/slowmode.ts +++ b/src/commands/slowmode.ts @@ -1,7 +1,7 @@ -import { devMessage, embedColor } from "config/options.js" import { channelMention, ChannelType, InteractionContextType, PermissionFlagsBits, SlashCommandBuilder, TextChannel, userMention } from "discord.js" -import { ICommand } from "interfaces" -import logToChannel from "utils/functions/logtochannel.js" +import { devMessage, embedColor } from "~/config/options.js" +import { ICommand } from "~/interfaces" +import logToChannel from "~/utils/functions/logtochannel.js" export default { name: "slowmode", diff --git a/src/commands/staff.ts b/src/commands/staff.ts index 70224c1..f0dc37c 100644 --- a/src/commands/staff.ts +++ b/src/commands/staff.ts @@ -1,6 +1,6 @@ -import { devMessage, embedColor } from "config/options.js" import { InteractionContextType, PermissionFlagsBits, SlashCommandBuilder } from "discord.js" -import { ICommand } from "interfaces" +import { devMessage, embedColor } from "~/config/options.js" +import { ICommand } from "~/interfaces" import beast from "./staff/beast.js" import help from "./staff/help.js" import prune from "./staff/prune.js" diff --git a/src/commands/staff/beast.ts b/src/commands/staff/beast.ts index 8b12287..2cdedb2 100644 --- a/src/commands/staff/beast.ts +++ b/src/commands/staff/beast.ts @@ -1,7 +1,7 @@ -import { devMessage, embedColor } from "config/options.js" -import { beastbwfkdr, beastbwstars, beastduelswins, beastswkdr, beastswstars, bwwins, duelswlr } from "config/reqs.js" import { ChatInputCommandInteraction } from "discord.js" -import { bedwarsLevel, getGuild, getHeadURL, getPlayer, getUUID, hypixelLevel, skywarsLevel } from "utils/Hypixel.js" +import { devMessage, embedColor } from "~/config/options.js" +import { beastbwfkdr, beastbwstars, beastduelswins, beastswkdr, beastswstars, bwwins, duelswlr } from "~/config/reqs.js" +import { bedwarsLevel, getGuild, getHeadURL, getPlayer, getUUID, hypixelLevel, skywarsLevel } from "~/utils/Hypixel.js" export default async function beast(interaction: ChatInputCommandInteraction): Promise { await interaction.deferReply() diff --git a/src/commands/staff/help.ts b/src/commands/staff/help.ts index 50772f5..51f8fae 100644 --- a/src/commands/staff/help.ts +++ b/src/commands/staff/help.ts @@ -1,6 +1,6 @@ -import { devMessage, embedColor } from "config/options.js" import { ActionRowBuilder, ButtonBuilder, ButtonStyle, ChatInputCommandInteraction, ComponentType } from "discord.js" -import { ExtendedClient as Client } from "utils/Client.js" +import { devMessage, embedColor } from "~/config/options.js" +import { ExtendedClient as Client } from "~/utils/Client.js" export default async function help(interaction: ChatInputCommandInteraction, client: Client): Promise { await interaction.deferReply() diff --git a/src/commands/staff/prune.ts b/src/commands/staff/prune.ts index 0392e09..2a5af2f 100644 --- a/src/commands/staff/prune.ts +++ b/src/commands/staff/prune.ts @@ -1,6 +1,6 @@ -import { devMessage, embedColor } from "config/options.js" import { ActionRowBuilder, ButtonBuilder, ButtonInteraction, ButtonStyle, ChatInputCommandInteraction, ComponentType } from "discord.js" -import env from "utils/Env.js" +import { devMessage, embedColor } from "~/config/options.js" +import env from "~/utils/Env.js" export default async function prune(interaction: ChatInputCommandInteraction): Promise { await interaction.deferReply() diff --git a/src/commands/staff/removeguildroles.ts b/src/commands/staff/removeguildroles.ts index f23a3e1..c10a58c 100644 --- a/src/commands/staff/removeguildroles.ts +++ b/src/commands/staff/removeguildroles.ts @@ -1,10 +1,10 @@ -import { embedColor, hypixelGuildID } from "config/options.js" import { ChatInputCommandInteraction, GuildMember } from "discord.js" -import { IGuildData } from "interfaces" import db from "src/drizzle/db.js" -import env from "utils/Env.js" -import roleManage from "utils/functions/rolesmanage.js" -import { getGuild } from "utils/Hypixel.js" +import { embedColor, hypixelGuildID } from "~/config/options.js" +import { IGuildData } from "~/interfaces" +import env from "~/utils/Env.js" +import roleManage from "~/utils/functions/rolesmanage.js" +import { getGuild } from "~/utils/Hypixel.js" export default async function removeGuildRoles(interaction: ChatInputCommandInteraction): Promise { await interaction.deferReply() diff --git a/src/commands/staff/updateall.ts b/src/commands/staff/updateall.ts index 0a054ae..83adac9 100644 --- a/src/commands/staff/updateall.ts +++ b/src/commands/staff/updateall.ts @@ -1,11 +1,11 @@ -import { embedColor, hypixelGuildID } from "config/options.js" import { ChannelType, ChatInputCommandInteraction, GuildMember } from "discord.js" -import { IGuildData } from "interfaces" import db from "src/drizzle/db.js" -import env from "utils/Env.js" -import { color } from "utils/functions/colors.js" -import roleManage from "utils/functions/rolesmanage.js" -import { getGuild, getIGN } from "utils/Hypixel.js" +import { embedColor, hypixelGuildID } from "~/config/options.js" +import { IGuildData } from "~/interfaces" +import env from "~/utils/Env.js" +import { color } from "~/utils/functions/colors.js" +import roleManage from "~/utils/functions/rolesmanage.js" +import { getGuild, getIGN } from "~/utils/Hypixel.js" export default async function updateAll(interaction: ChatInputCommandInteraction): Promise { await interaction.deferReply() diff --git a/src/commands/timeout.ts b/src/commands/timeout.ts index 03e53c1..bb3d906 100644 --- a/src/commands/timeout.ts +++ b/src/commands/timeout.ts @@ -1,9 +1,9 @@ -import { devMessage, embedColor } from "config/options.js" import { GuildMember, InteractionContextType, PermissionFlagsBits, SlashCommandBuilder, userMention } from "discord.js" -import { ICommand } from "interfaces" import ms from "ms" import prettyMs from "pretty-ms" -import logToChannel from "utils/functions/logtochannel.js" +import { devMessage, embedColor } from "~/config/options.js" +import { ICommand } from "~/interfaces" +import logToChannel from "~/utils/functions/logtochannel.js" export default { name: "timeout", diff --git a/src/commands/unban.ts b/src/commands/unban.ts index 0679bba..803cc91 100644 --- a/src/commands/unban.ts +++ b/src/commands/unban.ts @@ -1,7 +1,7 @@ -import { devMessage, embedColor } from "config/options.js" import { InteractionContextType, PermissionFlagsBits, SlashCommandBuilder, User, userMention } from "discord.js" -import { ICommand } from "interfaces" -import logToChannel from "utils/functions/logtochannel.js" +import { devMessage, embedColor } from "~/config/options.js" +import { ICommand } from "~/interfaces" +import logToChannel from "~/utils/functions/logtochannel.js" export default { name: "unban", diff --git a/src/commands/update.ts b/src/commands/update.ts index 676213d..3f41122 100644 --- a/src/commands/update.ts +++ b/src/commands/update.ts @@ -1,10 +1,10 @@ -import { devMessage, embedColor, hypixelGuildID } from "config/options.js" -import { waitingListRole } from "config/roles.js" import { GuildMember, InteractionContextType, SlashCommandBuilder } from "discord.js" -import { ICommand } from "interfaces" import db from "src/drizzle/db.js" -import roleManage from "utils/functions/rolesmanage.js" -import { getGuild, getHeadURL, getIGN } from "utils/Hypixel.js" +import { devMessage, embedColor, hypixelGuildID } from "~/config/options.js" +import { waitingListRole } from "~/config/roles.js" +import { ICommand } from "~/interfaces" +import roleManage from "~/utils/functions/rolesmanage.js" +import { getGuild, getHeadURL, getIGN } from "~/utils/Hypixel.js" export default { name: "update", diff --git a/src/commands/uuid.ts b/src/commands/uuid.ts index ba7deeb..85eb6ab 100644 --- a/src/commands/uuid.ts +++ b/src/commands/uuid.ts @@ -1,7 +1,7 @@ -import { devMessage, embedColor } from "config/options.js" import { InteractionContextType, SlashCommandBuilder } from "discord.js" -import { ICommand } from "interfaces" -import { formatUuid, getHeadURL, getIGN, getUUID } from "utils/Hypixel.js" +import { devMessage, embedColor } from "~/config/options.js" +import { ICommand } from "~/interfaces" +import { formatUuid, getHeadURL, getIGN, getUUID } from "~/utils/Hypixel.js" export default { name: "uuid", diff --git a/src/commands/verify.ts b/src/commands/verify.ts index d3d1fc8..9ffecd3 100644 --- a/src/commands/verify.ts +++ b/src/commands/verify.ts @@ -1,12 +1,12 @@ -import { devMessage, embedColor, hypixelGuildID } from "config/options.js" import { GuildMember, InteractionContextType, SlashCommandBuilder } from "discord.js" -import { ICommand } from "interfaces" -import { IPlayerData } from "interfaces" -import { IGuildData } from "interfaces" import db from "src/drizzle/db.js" import { verifies } from "src/drizzle/schema.js" -import roleManage from "utils/functions/rolesmanage.js" -import { getGuild, getHeadURL, getPlayer, getUUID } from "utils/Hypixel.js" +import { devMessage, embedColor, hypixelGuildID } from "~/config/options.js" +import { ICommand } from "~/interfaces" +import { IPlayerData } from "~/interfaces" +import { IGuildData } from "~/interfaces" +import roleManage from "~/utils/functions/rolesmanage.js" +import { getGuild, getHeadURL, getPlayer, getUUID } from "~/utils/Hypixel.js" export default { name: "verify", diff --git a/src/commands/whoami.ts b/src/commands/whoami.ts index 4f565d6..17065bd 100644 --- a/src/commands/whoami.ts +++ b/src/commands/whoami.ts @@ -1,8 +1,8 @@ -import { devMessage, embedColor } from "config/options.js" import { InteractionContextType, SlashCommandBuilder, userMention } from "discord.js" -import { ICommand } from "interfaces" import db from "src/drizzle/db.js" -import { getHeadURL, getIGN } from "utils/Hypixel.js" +import { devMessage, embedColor } from "~/config/options.js" +import { ICommand } from "~/interfaces" +import { getHeadURL, getIGN } from "~/utils/Hypixel.js" export default { name: "whoami", diff --git a/src/commands/whois.ts b/src/commands/whois.ts index 8094473..2d6a25a 100644 --- a/src/commands/whois.ts +++ b/src/commands/whois.ts @@ -1,8 +1,8 @@ -import { devMessage, embedColor } from "config/options.js" import { InteractionContextType, PermissionFlagsBits, SlashCommandBuilder, userMention } from "discord.js" -import { ICommand } from "interfaces" import db from "src/drizzle/db.js" -import { getHeadURL, getIGN } from "utils/Hypixel.js" +import { devMessage, embedColor } from "~/config/options.js" +import { ICommand } from "~/interfaces" +import { getHeadURL, getIGN } from "~/utils/Hypixel.js" export default { name: "whois", diff --git a/src/components/autocomplete/music.ts b/src/components/autocomplete/music.ts index 8eb71ca..161a115 100644 --- a/src/components/autocomplete/music.ts +++ b/src/components/autocomplete/music.ts @@ -1,5 +1,5 @@ import { QueryType, useMainPlayer } from "discord-player" -import { IAutocomplete } from "interfaces" +import { IAutocomplete } from "~/interfaces" export default { name: "music", diff --git a/src/components/autocomplete/unban.ts b/src/components/autocomplete/unban.ts index 9e11090..75fb4e6 100644 --- a/src/components/autocomplete/unban.ts +++ b/src/components/autocomplete/unban.ts @@ -1,4 +1,4 @@ -import { IAutocomplete } from "interfaces" +import { IAutocomplete } from "~/interfaces" export default { name: "unban", diff --git a/src/components/buttons/checkstats.ts b/src/components/buttons/checkstats.ts index 410feee..41e51f1 100644 --- a/src/components/buttons/checkstats.ts +++ b/src/components/buttons/checkstats.ts @@ -1,8 +1,8 @@ -import { devMessage, embedColor } from "config/options.js" -import { bwfkdr, bwstars, bwwins, duelswins, duelswlr, swkdr, swstars } from "config/reqs.js" -import { IButton } from "interfaces" import db from "src/drizzle/db.js" -import { bedwarsLevel, getGuild, getHeadURL, getPlayer, hypixelLevel, skywarsLevel } from "utils/Hypixel.js" +import { devMessage, embedColor } from "~/config/options.js" +import { bwfkdr, bwstars, bwwins, duelswins, duelswlr, swkdr, swstars } from "~/config/reqs.js" +import { IButton } from "~/interfaces" +import { bedwarsLevel, getGuild, getHeadURL, getPlayer, hypixelLevel, skywarsLevel } from "~/utils/Hypixel.js" export default { name: "checkstats", diff --git a/src/components/buttons/guildapplicationaccept.ts b/src/components/buttons/guildapplicationaccept.ts index e37ce3d..e0c4ac0 100644 --- a/src/components/buttons/guildapplicationaccept.ts +++ b/src/components/buttons/guildapplicationaccept.ts @@ -1,12 +1,12 @@ -import { embedColor, hypixelGuildID, waitingListChannel, waitingListMessage } from "config/options.js" -import { waitingListRole } from "config/roles.js" import { ActionRowBuilder, ButtonBuilder, ButtonStyle, TextChannel } from "discord.js" import { eq } from "drizzle-orm" -import { IButton } from "interfaces" import db from "src/drizzle/db.js" import { guildApps, waitingLists } from "src/drizzle/schema.js" -import { color } from "utils/functions/colors.js" -import { getGuild, getIGN } from "utils/Hypixel.js" +import { embedColor, hypixelGuildID, waitingListChannel, waitingListMessage } from "~/config/options.js" +import { waitingListRole } from "~/config/roles.js" +import { IButton } from "~/interfaces" +import { color } from "~/utils/functions/colors.js" +import { getGuild, getIGN } from "~/utils/Hypixel.js" export default { name: "guildapplicationaccept", diff --git a/src/components/buttons/guildapplicationdeny.ts b/src/components/buttons/guildapplicationdeny.ts index 391f5b9..3ebccd1 100644 --- a/src/components/buttons/guildapplicationdeny.ts +++ b/src/components/buttons/guildapplicationdeny.ts @@ -1,5 +1,5 @@ import { ActionRowBuilder, ModalBuilder, TextInputBuilder, TextInputStyle } from "discord.js" -import { IButton } from "interfaces" +import { IButton } from "~/interfaces" export default { name: "guildapplicationdeny", diff --git a/src/components/buttons/guildapply.ts b/src/components/buttons/guildapply.ts index dad5ef4..e515390 100644 --- a/src/components/buttons/guildapply.ts +++ b/src/components/buttons/guildapply.ts @@ -1,12 +1,12 @@ -import { ignM, largeM, smallM } from "config/limitmessages.js" -import { applicationsChannel, embedColor } from "config/options.js" -import { guild as guildQuestions } from "config/questions.js" -import { guildRole } from "config/roles.js" import { ActionRowBuilder, ButtonBuilder, ButtonStyle, GuildMember, TextChannel } from "discord.js" -import { IButton } from "interfaces" import db from "src/drizzle/db.js" import { guildApps } from "src/drizzle/schema.js" -import applicationQuestions from "utils/functions/applicationquestions.js" +import { ignM, largeM, smallM } from "~/config/limitmessages.js" +import { applicationsChannel, embedColor } from "~/config/options.js" +import { guild as guildQuestions } from "~/config/questions.js" +import { guildRole } from "~/config/roles.js" +import { IButton } from "~/interfaces" +import applicationQuestions from "~/utils/functions/applicationquestions.js" export default { name: "guildapply", diff --git a/src/components/buttons/guildinactivitylog.ts b/src/components/buttons/guildinactivitylog.ts index e78a432..c1c1e43 100644 --- a/src/components/buttons/guildinactivitylog.ts +++ b/src/components/buttons/guildinactivitylog.ts @@ -1,10 +1,10 @@ -import { ignM, largeM, smallM } from "config/limitmessages.js" -import { embedColor, inactivityLogChannel } from "config/options.js" -import { inactivity } from "config/questions.js" -import { beast, gm, guildRole, guildStaff, manager, member, moderator } from "config/roles.js" import { ActionRowBuilder, ButtonBuilder, ButtonStyle, GuildMember, TextChannel } from "discord.js" -import { IButton } from "interfaces" -import applicationQuestions from "utils/functions/applicationquestions.js" +import { ignM, largeM, smallM } from "~/config/limitmessages.js" +import { embedColor, inactivityLogChannel } from "~/config/options.js" +import { inactivity } from "~/config/questions.js" +import { beast, gm, guildRole, guildStaff, manager, member, moderator } from "~/config/roles.js" +import { IButton } from "~/interfaces" +import applicationQuestions from "~/utils/functions/applicationquestions.js" const guildRoles = [gm, manager, moderator, beast, member, guildStaff, guildRole] export default { diff --git a/src/components/buttons/inactiveapplicationaccept.ts b/src/components/buttons/inactiveapplicationaccept.ts index 8654c0d..171f620 100644 --- a/src/components/buttons/inactiveapplicationaccept.ts +++ b/src/components/buttons/inactiveapplicationaccept.ts @@ -1,4 +1,4 @@ -import { IButton } from "interfaces" +import { IButton } from "~/interfaces" export default { name: "inactiveapplicationaccept", diff --git a/src/components/buttons/inactiveapplicationdeny.ts b/src/components/buttons/inactiveapplicationdeny.ts index 666a94e..1895848 100644 --- a/src/components/buttons/inactiveapplicationdeny.ts +++ b/src/components/buttons/inactiveapplicationdeny.ts @@ -1,4 +1,4 @@ -import { IButton } from "interfaces" +import { IButton } from "~/interfaces" export default { name: "inactiveapplicationdeny", diff --git a/src/components/buttons/staffapplicationaccept.ts b/src/components/buttons/staffapplicationaccept.ts index 2f6e694..74f5fe7 100644 --- a/src/components/buttons/staffapplicationaccept.ts +++ b/src/components/buttons/staffapplicationaccept.ts @@ -1,9 +1,9 @@ -import { embedColor } from "config/options.js" import { ActionRowBuilder, ButtonBuilder, ButtonStyle } from "discord.js" import { eq } from "drizzle-orm" -import { IButton } from "interfaces" import db from "src/drizzle/db.js" import { staffApps } from "src/drizzle/schema.js" +import { embedColor } from "~/config/options.js" +import { IButton } from "~/interfaces" export default { name: "staffapplicationaccept", diff --git a/src/components/buttons/staffapplicationdeny.ts b/src/components/buttons/staffapplicationdeny.ts index 36508f5..e6c1d0f 100644 --- a/src/components/buttons/staffapplicationdeny.ts +++ b/src/components/buttons/staffapplicationdeny.ts @@ -1,5 +1,5 @@ import { ActionRowBuilder, ModalBuilder, TextInputBuilder, TextInputStyle } from "discord.js" -import { IButton } from "interfaces" +import { IButton } from "~/interfaces" export default { name: "staffapplicationdeny", diff --git a/src/components/buttons/staffapply.ts b/src/components/buttons/staffapply.ts index 8d87e67..44686bc 100644 --- a/src/components/buttons/staffapply.ts +++ b/src/components/buttons/staffapply.ts @@ -1,13 +1,13 @@ -import { ignM, largeM } from "config/limitmessages.js" -import { embedColor, staffApplicationsChannel } from "config/options.js" -import { staff as staffQuestions } from "config/questions.js" -import { guildRole, guildStaff } from "config/roles.js" import { ActionRowBuilder, ButtonBuilder, ButtonStyle, GuildMember, TextChannel } from "discord.js" -import { IButton } from "interfaces" import db from "src/drizzle/db.js" import { staffApps } from "src/drizzle/schema.js" -import env from "utils/Env.js" -import applicationQuestions from "utils/functions/applicationquestions.js" +import { ignM, largeM } from "~/config/limitmessages.js" +import { embedColor, staffApplicationsChannel } from "~/config/options.js" +import { staff as staffQuestions } from "~/config/questions.js" +import { guildRole, guildStaff } from "~/config/roles.js" +import { IButton } from "~/interfaces" +import env from "~/utils/Env.js" +import applicationQuestions from "~/utils/functions/applicationquestions.js" export default { name: "staffapply", diff --git a/src/components/buttons/verify.ts b/src/components/buttons/verify.ts index 03d1925..a802578 100644 --- a/src/components/buttons/verify.ts +++ b/src/components/buttons/verify.ts @@ -1,5 +1,5 @@ import { ActionRowBuilder, ModalBuilder, TextInputBuilder, TextInputStyle } from "discord.js" -import { IButton } from "interfaces" +import { IButton } from "~/interfaces" export default { name: "verify", diff --git a/src/components/buttons/waitingListUpdate.ts b/src/components/buttons/waitingListUpdate.ts index 05a6fb3..1b208b5 100644 --- a/src/components/buttons/waitingListUpdate.ts +++ b/src/components/buttons/waitingListUpdate.ts @@ -1,9 +1,9 @@ -import { hypixelGuildID } from "config/options.js" import { eq } from "drizzle-orm" -import { IButton } from "interfaces" import db from "src/drizzle/db.js" import { waitingLists } from "src/drizzle/schema.js" -import { getGuild, getIGN } from "utils/Hypixel.js" +import { hypixelGuildID } from "~/config/options.js" +import { IButton } from "~/interfaces" +import { getGuild, getIGN } from "~/utils/Hypixel.js" export default { name: "waitinglistupdate", diff --git a/src/components/modals/denyreasonbox.ts b/src/components/modals/denyreasonbox.ts index 3686e95..1d78ee4 100644 --- a/src/components/modals/denyreasonbox.ts +++ b/src/components/modals/denyreasonbox.ts @@ -1,9 +1,9 @@ -import { embedColor } from "config/options.js" import { ActionRowBuilder, ButtonBuilder, ButtonStyle, EmbedBuilder, GuildMember, Message } from "discord.js" import { eq } from "drizzle-orm" -import { IModal } from "interfaces" import db from "src/drizzle/db.js" import { guildApps } from "src/drizzle/schema.js" +import { embedColor } from "~/config/options.js" +import { IModal } from "~/interfaces" export default { name: "denyreasonbox", diff --git a/src/components/modals/staffdenyreasonbox.ts b/src/components/modals/staffdenyreasonbox.ts index 20d92be..e243de1 100644 --- a/src/components/modals/staffdenyreasonbox.ts +++ b/src/components/modals/staffdenyreasonbox.ts @@ -1,9 +1,9 @@ -import { embedColor } from "config/options.js" import { ActionRowBuilder, ButtonBuilder, ButtonStyle, EmbedBuilder } from "discord.js" import { eq } from "drizzle-orm" -import { IModal } from "interfaces" import db from "src/drizzle/db.js" import { staffApps } from "src/drizzle/schema.js" +import { embedColor } from "~/config/options.js" +import { IModal } from "~/interfaces" export default { name: "staffdenyreasonbox", diff --git a/src/components/modals/verifyModal.ts b/src/components/modals/verifyModal.ts index c4d80a0..459fb79 100644 --- a/src/components/modals/verifyModal.ts +++ b/src/components/modals/verifyModal.ts @@ -1,10 +1,10 @@ -import { devMessage, embedColor, hypixelGuildID } from "config/options.js" import { GuildMember } from "discord.js" -import { IModal } from "interfaces" import db from "src/drizzle/db.js" import { verifies } from "src/drizzle/schema.js" -import roleManage from "utils/functions/rolesmanage.js" -import { getGuild, getHeadURL, getPlayer, getUUID } from "utils/Hypixel.js" +import { devMessage, embedColor, hypixelGuildID } from "~/config/options.js" +import { IModal } from "~/interfaces" +import roleManage from "~/utils/functions/rolesmanage.js" +import { getGuild, getHeadURL, getPlayer, getUUID } from "~/utils/Hypixel.js" export default { name: "verifybox", diff --git a/src/drizzle/db.ts b/src/drizzle/db.ts index f2d500d..440205f 100644 --- a/src/drizzle/db.ts +++ b/src/drizzle/db.ts @@ -1,6 +1,6 @@ import { drizzle } from "drizzle-orm/postgres-js" import postgres from "postgres" -import env from "utils/Env.js" +import env from "~/utils/Env.js" import * as schema from "./schema.js" const queryClient = postgres(env.prod.postgresURI) diff --git a/src/drizzle/migrations/0001_quick_meggan.sql b/src/drizzle/migrations/0001_quick_meggan.sql new file mode 100644 index 0000000..546c09a --- /dev/null +++ b/src/drizzle/migrations/0001_quick_meggan.sql @@ -0,0 +1,10 @@ +ALTER TABLE "guildApps" ALTER COLUMN "userID" SET DATA TYPE varchar(32);--> statement-breakpoint +ALTER TABLE "guildApps" ALTER COLUMN "uuid" SET DATA TYPE varchar(32);--> statement-breakpoint +ALTER TABLE "settings" ALTER COLUMN "name" SET DATA TYPE varchar(32);--> statement-breakpoint +ALTER TABLE "settings" ALTER COLUMN "value" SET DATA TYPE varchar(256);--> statement-breakpoint +ALTER TABLE "staffApps" ALTER COLUMN "userID" SET DATA TYPE varchar(32);--> statement-breakpoint +ALTER TABLE "staffApps" ALTER COLUMN "uuid" SET DATA TYPE varchar(32);--> statement-breakpoint +ALTER TABLE "verifies" ALTER COLUMN "userID" SET DATA TYPE varchar(32);--> statement-breakpoint +ALTER TABLE "verifies" ALTER COLUMN "uuid" SET DATA TYPE varchar(32);--> statement-breakpoint +ALTER TABLE "waitingLists" ALTER COLUMN "userID" SET DATA TYPE varchar(32);--> statement-breakpoint +ALTER TABLE "waitingLists" ALTER COLUMN "uuid" SET DATA TYPE varchar(32); \ No newline at end of file diff --git a/src/drizzle/migrations/0002_jittery_wallow.sql b/src/drizzle/migrations/0002_jittery_wallow.sql new file mode 100644 index 0000000..26d58f6 --- /dev/null +++ b/src/drizzle/migrations/0002_jittery_wallow.sql @@ -0,0 +1,9 @@ +CREATE INDEX IF NOT EXISTS "guildapps_userid_index" ON "guildApps" USING btree ("userID");--> statement-breakpoint +CREATE INDEX IF NOT EXISTS "guildapps_uuid_index" ON "guildApps" USING btree ("uuid");--> statement-breakpoint +CREATE INDEX IF NOT EXISTS "settings_name_index" ON "settings" USING btree ("name");--> statement-breakpoint +CREATE INDEX IF NOT EXISTS "staffapps_userid_index" ON "staffApps" USING btree ("userID");--> statement-breakpoint +CREATE INDEX IF NOT EXISTS "staffapps_uuid_index" ON "staffApps" USING btree ("uuid");--> statement-breakpoint +CREATE INDEX IF NOT EXISTS "verifies_userid_index" ON "verifies" USING btree ("userID");--> statement-breakpoint +CREATE INDEX IF NOT EXISTS "verifies_uuid_index" ON "verifies" USING btree ("uuid");--> statement-breakpoint +CREATE INDEX IF NOT EXISTS "wl_userid_index" ON "waitingLists" USING btree ("userID");--> statement-breakpoint +CREATE INDEX IF NOT EXISTS "wl_uuid_index" ON "waitingLists" USING btree ("uuid"); \ No newline at end of file diff --git a/src/drizzle/migrations/meta/0001_snapshot.json b/src/drizzle/migrations/meta/0001_snapshot.json new file mode 100644 index 0000000..13d1ea7 --- /dev/null +++ b/src/drizzle/migrations/meta/0001_snapshot.json @@ -0,0 +1,232 @@ +{ + "id": "de8f78f2-dc26-427d-9c12-233b5d3fa301", + "prevId": "6343d646-6e68-4bcd-ae1e-5cecb4569268", + "version": "7", + "dialect": "postgresql", + "tables": { + "public.guildApps": { + "name": "guildApps", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "serial", + "primaryKey": true, + "notNull": true + }, + "userID": { + "name": "userID", + "type": "varchar(32)", + "primaryKey": false, + "notNull": true + }, + "uuid": { + "name": "uuid", + "type": "varchar(32)", + "primaryKey": false, + "notNull": true + }, + "createdAt": { + "name": "createdAt", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updatedAt": { + "name": "updatedAt", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {} + }, + "public.settings": { + "name": "settings", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "serial", + "primaryKey": true, + "notNull": true + }, + "name": { + "name": "name", + "type": "varchar(32)", + "primaryKey": false, + "notNull": true + }, + "value": { + "name": "value", + "type": "varchar(256)", + "primaryKey": false, + "notNull": true + }, + "createdAt": { + "name": "createdAt", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updatedAt": { + "name": "updatedAt", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {} + }, + "public.staffApps": { + "name": "staffApps", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "serial", + "primaryKey": true, + "notNull": true + }, + "userID": { + "name": "userID", + "type": "varchar(32)", + "primaryKey": false, + "notNull": true + }, + "uuid": { + "name": "uuid", + "type": "varchar(32)", + "primaryKey": false, + "notNull": true + }, + "createdAt": { + "name": "createdAt", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updatedAt": { + "name": "updatedAt", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {} + }, + "public.verifies": { + "name": "verifies", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "serial", + "primaryKey": true, + "notNull": true + }, + "userID": { + "name": "userID", + "type": "varchar(32)", + "primaryKey": false, + "notNull": true + }, + "uuid": { + "name": "uuid", + "type": "varchar(32)", + "primaryKey": false, + "notNull": true + }, + "createdAt": { + "name": "createdAt", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updatedAt": { + "name": "updatedAt", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {} + }, + "public.waitingLists": { + "name": "waitingLists", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "serial", + "primaryKey": true, + "notNull": true + }, + "userID": { + "name": "userID", + "type": "varchar(32)", + "primaryKey": false, + "notNull": true + }, + "uuid": { + "name": "uuid", + "type": "varchar(32)", + "primaryKey": false, + "notNull": true + }, + "timestamp": { + "name": "timestamp", + "type": "bigint", + "primaryKey": false, + "notNull": true + }, + "createdAt": { + "name": "createdAt", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updatedAt": { + "name": "updatedAt", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": {}, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {} + } + }, + "enums": {}, + "schemas": {}, + "sequences": {}, + "_meta": { + "columns": {}, + "schemas": {}, + "tables": {} + } +} \ No newline at end of file diff --git a/src/drizzle/migrations/meta/0002_snapshot.json b/src/drizzle/migrations/meta/0002_snapshot.json new file mode 100644 index 0000000..292bb60 --- /dev/null +++ b/src/drizzle/migrations/meta/0002_snapshot.json @@ -0,0 +1,372 @@ +{ + "id": "85b695a3-72dd-4eb8-961b-0fe5220542ad", + "prevId": "de8f78f2-dc26-427d-9c12-233b5d3fa301", + "version": "7", + "dialect": "postgresql", + "tables": { + "public.guildApps": { + "name": "guildApps", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "serial", + "primaryKey": true, + "notNull": true + }, + "userID": { + "name": "userID", + "type": "varchar(32)", + "primaryKey": false, + "notNull": true + }, + "uuid": { + "name": "uuid", + "type": "varchar(32)", + "primaryKey": false, + "notNull": true + }, + "createdAt": { + "name": "createdAt", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updatedAt": { + "name": "updatedAt", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "guildapps_userid_index": { + "name": "guildapps_userid_index", + "columns": [ + { + "expression": "userID", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "guildapps_uuid_index": { + "name": "guildapps_uuid_index", + "columns": [ + { + "expression": "uuid", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {} + }, + "public.settings": { + "name": "settings", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "serial", + "primaryKey": true, + "notNull": true + }, + "name": { + "name": "name", + "type": "varchar(32)", + "primaryKey": false, + "notNull": true + }, + "value": { + "name": "value", + "type": "varchar(256)", + "primaryKey": false, + "notNull": true + }, + "createdAt": { + "name": "createdAt", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updatedAt": { + "name": "updatedAt", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "settings_name_index": { + "name": "settings_name_index", + "columns": [ + { + "expression": "name", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {} + }, + "public.staffApps": { + "name": "staffApps", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "serial", + "primaryKey": true, + "notNull": true + }, + "userID": { + "name": "userID", + "type": "varchar(32)", + "primaryKey": false, + "notNull": true + }, + "uuid": { + "name": "uuid", + "type": "varchar(32)", + "primaryKey": false, + "notNull": true + }, + "createdAt": { + "name": "createdAt", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updatedAt": { + "name": "updatedAt", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "staffapps_userid_index": { + "name": "staffapps_userid_index", + "columns": [ + { + "expression": "userID", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "staffapps_uuid_index": { + "name": "staffapps_uuid_index", + "columns": [ + { + "expression": "uuid", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {} + }, + "public.verifies": { + "name": "verifies", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "serial", + "primaryKey": true, + "notNull": true + }, + "userID": { + "name": "userID", + "type": "varchar(32)", + "primaryKey": false, + "notNull": true + }, + "uuid": { + "name": "uuid", + "type": "varchar(32)", + "primaryKey": false, + "notNull": true + }, + "createdAt": { + "name": "createdAt", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updatedAt": { + "name": "updatedAt", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "verifies_userid_index": { + "name": "verifies_userid_index", + "columns": [ + { + "expression": "userID", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "verifies_uuid_index": { + "name": "verifies_uuid_index", + "columns": [ + { + "expression": "uuid", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {} + }, + "public.waitingLists": { + "name": "waitingLists", + "schema": "", + "columns": { + "id": { + "name": "id", + "type": "serial", + "primaryKey": true, + "notNull": true + }, + "userID": { + "name": "userID", + "type": "varchar(32)", + "primaryKey": false, + "notNull": true + }, + "uuid": { + "name": "uuid", + "type": "varchar(32)", + "primaryKey": false, + "notNull": true + }, + "timestamp": { + "name": "timestamp", + "type": "bigint", + "primaryKey": false, + "notNull": true + }, + "createdAt": { + "name": "createdAt", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "default": "now()" + }, + "updatedAt": { + "name": "updatedAt", + "type": "timestamp", + "primaryKey": false, + "notNull": true, + "default": "now()" + } + }, + "indexes": { + "wl_userid_index": { + "name": "wl_userid_index", + "columns": [ + { + "expression": "userID", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + }, + "wl_uuid_index": { + "name": "wl_uuid_index", + "columns": [ + { + "expression": "uuid", + "isExpression": false, + "asc": true, + "nulls": "last" + } + ], + "isUnique": false, + "concurrently": false, + "method": "btree", + "with": {} + } + }, + "foreignKeys": {}, + "compositePrimaryKeys": {}, + "uniqueConstraints": {} + } + }, + "enums": {}, + "schemas": {}, + "sequences": {}, + "_meta": { + "columns": {}, + "schemas": {}, + "tables": {} + } +} \ No newline at end of file diff --git a/src/drizzle/migrations/meta/_journal.json b/src/drizzle/migrations/meta/_journal.json index a1d64b8..703862b 100644 --- a/src/drizzle/migrations/meta/_journal.json +++ b/src/drizzle/migrations/meta/_journal.json @@ -8,6 +8,20 @@ "when": 1727906753913, "tag": "0000_bouncy_thor_girl", "breakpoints": true + }, + { + "idx": 1, + "version": "7", + "when": 1728318584421, + "tag": "0001_quick_meggan", + "breakpoints": true + }, + { + "idx": 2, + "version": "7", + "when": 1728321163523, + "tag": "0002_jittery_wallow", + "breakpoints": true } ] } \ No newline at end of file diff --git a/src/drizzle/schema.ts b/src/drizzle/schema.ts index cb1d050..99a96a1 100644 --- a/src/drizzle/schema.ts +++ b/src/drizzle/schema.ts @@ -1,45 +1,84 @@ -import { bigint, pgTable, serial, text, timestamp } from "drizzle-orm/pg-core" +import { bigint, index, pgTable, serial, timestamp, varchar } from "drizzle-orm/pg-core" const createdAt = timestamp("createdAt").notNull().defaultNow() const updatedAt = timestamp("updatedAt").notNull().defaultNow().$onUpdate(() => new Date()) export const verifies = pgTable("verifies", { id: serial("id").primaryKey(), - userID: text("userID").notNull(), - uuid: text("uuid").notNull(), + userID: varchar("userID", { length: 32 }).notNull(), + uuid: varchar("uuid", { length: 32 }).notNull(), createdAt, updatedAt +}, table => { + return { + useridIndex: index("verifies_userid_index").on(table.userID), + uuidIndex: index("verifies_uuid_index").on(table.uuid) + } }) export const guildApps = pgTable("guildApps", { id: serial("id").primaryKey(), - userID: text("userID").notNull(), - uuid: text("uuid").notNull(), + userID: varchar("userID", { length: 32 }).notNull(), + uuid: varchar("uuid", { length: 32 }).notNull(), createdAt, updatedAt +}, table => { + return { + useridIndex: index("guildapps_userid_index").on(table.userID), + uuidIndex: index("guildapps_uuid_index").on(table.uuid) + } }) export const staffApps = pgTable("staffApps", { id: serial("id").primaryKey(), - userID: text("userID").notNull(), - uuid: text("uuid").notNull(), + userID: varchar("userID", { length: 32 }).notNull(), + uuid: varchar("uuid", { length: 32 }).notNull(), createdAt, updatedAt +}, table => { + return { + useridIndex: index("staffapps_userid_index").on(table.userID), + uuidIndex: index("staffapps_uuid_index").on(table.uuid) + } }) export const waitingLists = pgTable("waitingLists", { id: serial("id").primaryKey(), - userID: text("userID").notNull(), - uuid: text("uuid").notNull(), + userID: varchar("userID", { length: 32 }).notNull(), + uuid: varchar("uuid", { length: 32 }).notNull(), timestamp: bigint("timestamp", { mode: "number" }).notNull(), createdAt, updatedAt +}, table => { + return { + useridIndex: index("wl_userid_index").on(table.userID), + uuidIndex: index("wl_uuid_index").on(table.uuid) + } }) export const settings = pgTable("settings", { id: serial("id").primaryKey(), - name: text("name").notNull(), - value: text("value").notNull(), + name: varchar("name", { length: 32 }).notNull(), + value: varchar("value", { length: 256 }).notNull(), createdAt, updatedAt +}, table => { + return { + nameIndex: index("settings_name_index").on(table.name) + } }) + +export type SelectVerify = typeof verifies.$inferSelect +export type InsertVerify = typeof verifies.$inferInsert + +export type SelectGuildApp = typeof guildApps.$inferSelect +export type InsertGuildApp = typeof guildApps.$inferInsert + +export type SelectStaffApp = typeof staffApps.$inferSelect +export type InsertStaffApp = typeof staffApps.$inferInsert + +export type SelectWaitingList = typeof waitingLists.$inferSelect +export type InsertWaitingList = typeof waitingLists.$inferInsert + +export type SelectSetting = typeof settings.$inferSelect +export type InsertSetting = typeof settings.$inferInsert diff --git a/src/events/cron/weeklyGexp.ts b/src/events/cron/weeklyGexp.ts index 11c768a..ceb32ce 100644 --- a/src/events/cron/weeklyGexp.ts +++ b/src/events/cron/weeklyGexp.ts @@ -1,9 +1,9 @@ -import { devMessage, embedColor, guildLogChannel, hypixelGuildID } from "config/options.js" import { TextChannel } from "discord.js" -import { ICron, IGuildData } from "interfaces" -import { color } from "utils/functions/colors.js" -import { getGuild, getIGN } from "utils/Hypixel.js" -import { client } from "utils/Illegitimate.js" +import { devMessage, embedColor, guildLogChannel, hypixelGuildID } from "~/config/options.js" +import { ICron, IGuildData } from "~/interfaces" +import { color } from "~/utils/functions/colors.js" +import { getGuild, getIGN } from "~/utils/Hypixel.js" +import { client } from "~/utils/Illegitimate.js" async function guildWeekly() { const channel = client.channels.cache.get(guildLogChannel) as TextChannel diff --git a/src/events/server/guildMemberAdd/logNewJoins.ts b/src/events/server/guildMemberAdd/logNewJoins.ts index f174da5..67156f0 100644 --- a/src/events/server/guildMemberAdd/logNewJoins.ts +++ b/src/events/server/guildMemberAdd/logNewJoins.ts @@ -1,7 +1,7 @@ -import { embedColor } from "config/options.js" import { GuildMember, userMention } from "discord.js" -import { IEvent } from "interfaces" -import logToChannel from "utils/functions/logtochannel.js" +import { embedColor } from "~/config/options.js" +import { IEvent } from "~/interfaces" +import logToChannel from "~/utils/functions/logtochannel.js" export default { event: "guildMemberAdd", diff --git a/src/events/server/interactions/logBtnsCmds.ts b/src/events/server/interactions/logBtnsCmds.ts index 99561a1..da8daf6 100644 --- a/src/events/server/interactions/logBtnsCmds.ts +++ b/src/events/server/interactions/logBtnsCmds.ts @@ -1,5 +1,5 @@ -import { IEvent } from "interfaces" -import { color } from "utils/functions/colors.js" +import { IEvent } from "~/interfaces" +import { color } from "~/utils/functions/colors.js" export default { event: "interactionCreate", diff --git a/src/events/server/messages/eval.ts b/src/events/server/messages/eval.ts index 795f84c..382007e 100644 --- a/src/events/server/messages/eval.ts +++ b/src/events/server/messages/eval.ts @@ -1,6 +1,6 @@ import { ChannelType } from "discord.js" -import { IEvent } from "interfaces" -import env from "utils/Env.js" +import { IEvent } from "~/interfaces" +import env from "~/utils/Env.js" export default { event: "messageCreate", diff --git a/src/events/server/messages/react.ts b/src/events/server/messages/react.ts index 7a42ca8..f3fd3da 100644 --- a/src/events/server/messages/react.ts +++ b/src/events/server/messages/react.ts @@ -1,4 +1,4 @@ -import { IEvent } from "interfaces" +import { IEvent } from "~/interfaces" export default { event: "messageCreate", diff --git a/src/events/server/ready/consolelog.ts b/src/events/server/ready/consolelog.ts index be36d0c..99dd98b 100644 --- a/src/events/server/ready/consolelog.ts +++ b/src/events/server/ready/consolelog.ts @@ -1,5 +1,5 @@ -import { IEvent } from "interfaces" -import { color } from "utils/functions/colors.js" +import { IEvent } from "~/interfaces" +import { color } from "~/utils/functions/colors.js" export default { event: "ready", diff --git a/src/events/server/ready/sendOnlineMessage.ts b/src/events/server/ready/sendOnlineMessage.ts index 8becca8..13ae7b2 100644 --- a/src/events/server/ready/sendOnlineMessage.ts +++ b/src/events/server/ready/sendOnlineMessage.ts @@ -1,6 +1,6 @@ -import { embedColor } from "config/options.js" -import { IEvent } from "interfaces" -import logToChannel from "utils/functions/logtochannel.js" +import { embedColor } from "~/config/options.js" +import { IEvent } from "~/interfaces" +import logToChannel from "~/utils/functions/logtochannel.js" export default { event: "ready", diff --git a/src/events/server/ready/status.ts b/src/events/server/ready/status.ts index f0060cd..1cecaf2 100644 --- a/src/events/server/ready/status.ts +++ b/src/events/server/ready/status.ts @@ -1,7 +1,7 @@ -import { guildid } from "config/options.js" -import statuses from "config/statuses.js" import { Guild } from "discord.js" -import { IEvent } from "interfaces" +import { guildid } from "~/config/options.js" +import statuses from "~/config/statuses.js" +import { IEvent } from "~/interfaces" export default { event: "ready", diff --git a/src/events/server/voiceStateUpdate/updatecache.ts b/src/events/server/voiceStateUpdate/updatecache.ts index fd411f2..84fa740 100644 --- a/src/events/server/voiceStateUpdate/updatecache.ts +++ b/src/events/server/voiceStateUpdate/updatecache.ts @@ -1,4 +1,4 @@ -import { IEvent } from "interfaces" +import { IEvent } from "~/interfaces" export default { event: "voiceStateUpdate", diff --git a/src/index.ts b/src/index.ts index b7b9fb2..d65f034 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,3 +1,3 @@ -import { Illegitimate } from "utils/Illegitimate.js" +import { Illegitimate } from "~/utils/Illegitimate.js" new Illegitimate().start() diff --git a/src/interfaces/IAutocomplete.ts b/src/interfaces/IAutocomplete.ts index 30b8ac5..200cb19 100644 --- a/src/interfaces/IAutocomplete.ts +++ b/src/interfaces/IAutocomplete.ts @@ -1,5 +1,5 @@ import { AutocompleteInteraction } from "discord.js" -import { ExtendedClient } from "utils/Client.js" +import { ExtendedClient } from "~/utils/Client.js" export default interface IAutocomplete { name: string diff --git a/src/interfaces/IButton.ts b/src/interfaces/IButton.ts index 1e8b64c..776d666 100644 --- a/src/interfaces/IButton.ts +++ b/src/interfaces/IButton.ts @@ -1,5 +1,5 @@ import { ButtonInteraction } from "discord.js" -import { ExtendedClient } from "utils/Client.js" +import { ExtendedClient } from "~/utils/Client.js" export default interface IButton { name: string diff --git a/src/interfaces/ICommand.ts b/src/interfaces/ICommand.ts index 406924e..5602db2 100644 --- a/src/interfaces/ICommand.ts +++ b/src/interfaces/ICommand.ts @@ -1,5 +1,5 @@ import { ChatInputCommandInteraction, SlashCommandBuilder } from "discord.js" -import { ExtendedClient as Client } from "utils/Client.js" +import { ExtendedClient as Client } from "~/utils/Client.js" export default interface ICommand { name: string diff --git a/src/interfaces/IContextMenu.ts b/src/interfaces/IContextMenu.ts index 13f37f2..2026e6b 100644 --- a/src/interfaces/IContextMenu.ts +++ b/src/interfaces/IContextMenu.ts @@ -1,5 +1,5 @@ import { ContextMenuCommandBuilder, ContextMenuCommandInteraction } from "discord.js" -import { ExtendedClient } from "utils/Client.js" +import { ExtendedClient } from "~/utils/Client.js" export default interface IContextMenu { name: string diff --git a/src/interfaces/ICron.ts b/src/interfaces/ICron.ts index a5e4fd4..2cdd358 100644 --- a/src/interfaces/ICron.ts +++ b/src/interfaces/ICron.ts @@ -1,4 +1,4 @@ -import { TimeZones } from "typings" +import { TimeZones } from "~/typings" interface TimeFormat { seconds: "*" | number diff --git a/src/interfaces/IModal.ts b/src/interfaces/IModal.ts index 2762209..28ab649 100644 --- a/src/interfaces/IModal.ts +++ b/src/interfaces/IModal.ts @@ -1,5 +1,5 @@ import { ModalSubmitInteraction } from "discord.js" -import { ExtendedClient } from "utils/Client.js" +import { ExtendedClient } from "~/utils/Client.js" export default interface IModal { name: string diff --git a/src/utils/Autodeploy.ts b/src/utils/Autodeploy.ts index b9d44ce..7205799 100644 --- a/src/utils/Autodeploy.ts +++ b/src/utils/Autodeploy.ts @@ -1,6 +1,6 @@ import { RESTPostAPIChatInputApplicationCommandsJSONBody, RESTPostAPIContextMenuApplicationCommandsJSONBody } from "discord.js" import fs from "fs" -import { ICommand, IContextMenu } from "interfaces" +import { ICommand, IContextMenu } from "~/interfaces" import { ExtendedClient } from "./Client.js" import env from "./Env.js" import { color } from "./functions/colors.js" diff --git a/src/utils/Client.ts b/src/utils/Client.ts index c9793a1..61ca7e6 100644 --- a/src/utils/Client.ts +++ b/src/utils/Client.ts @@ -1,5 +1,5 @@ import { Client, Collection, GatewayIntentBits, Partials } from "discord.js" -import { IAutocomplete, IButton, ICommand, IContextMenu, IModal } from "interfaces" +import { IAutocomplete, IButton, ICommand, IContextMenu, IModal } from "~/interfaces" import autoDeployCommands from "./Autodeploy.js" import env from "./Env.js" import { color } from "./functions/colors.js" diff --git a/src/utils/Env.ts b/src/utils/Env.ts index 226a5f6..2190079 100644 --- a/src/utils/Env.ts +++ b/src/utils/Env.ts @@ -1,4 +1,4 @@ -import { IEnv } from "interfaces" +import { IEnv } from "~/interfaces" import "dotenv/config" const env: IEnv = { diff --git a/src/utils/Events/autocomplete.ts b/src/utils/Events/autocomplete.ts index 68aefde..e66a3ae 100644 --- a/src/utils/Events/autocomplete.ts +++ b/src/utils/Events/autocomplete.ts @@ -1,10 +1,10 @@ -import { embedColor } from "config/options.js" import { Events } from "discord.js" import fs from "fs" -import { IAutocomplete } from "interfaces" import path from "path" -import { ExtendedClient as Client } from "utils/Client.js" -import logToChannel from "utils/functions/logtochannel.js" +import { embedColor } from "~/config/options.js" +import { IAutocomplete } from "~/interfaces" +import { ExtendedClient as Client } from "~/utils/Client.js" +import logToChannel from "~/utils/functions/logtochannel.js" type FileType = "js" | "ts" const __dirname = import.meta.dirname diff --git a/src/utils/Events/button.ts b/src/utils/Events/button.ts index 5f98279..6509592 100644 --- a/src/utils/Events/button.ts +++ b/src/utils/Events/button.ts @@ -1,10 +1,10 @@ -import { embedColor } from "config/options.js" import { Events } from "discord.js" import fs from "fs" -import { IButton } from "interfaces" import path from "path" -import { ExtendedClient as Client } from "utils/Client.js" -import logToChannel from "utils/functions/logtochannel.js" +import { embedColor } from "~/config/options.js" +import { IButton } from "~/interfaces" +import { ExtendedClient as Client } from "~/utils/Client.js" +import logToChannel from "~/utils/functions/logtochannel.js" type FileType = "js" | "ts" const __dirname = import.meta.dirname diff --git a/src/utils/Events/command.ts b/src/utils/Events/command.ts index 480f26a..2ced467 100644 --- a/src/utils/Events/command.ts +++ b/src/utils/Events/command.ts @@ -1,10 +1,10 @@ -import { embedColor } from "config/options.js" import { Events } from "discord.js" import fs from "fs" -import { ICommand } from "interfaces" import path from "path" -import { ExtendedClient as Client } from "utils/Client.js" -import logToChannel from "utils/functions/logtochannel.js" +import { embedColor } from "~/config/options.js" +import { ICommand } from "~/interfaces" +import { ExtendedClient as Client } from "~/utils/Client.js" +import logToChannel from "~/utils/functions/logtochannel.js" type FileType = "js" | "ts" const __dirname = import.meta.dirname diff --git a/src/utils/Events/contextmenu.ts b/src/utils/Events/contextmenu.ts index b81dc6f..ab90a74 100644 --- a/src/utils/Events/contextmenu.ts +++ b/src/utils/Events/contextmenu.ts @@ -1,10 +1,10 @@ -import { embedColor } from "config/options.js" import { Events } from "discord.js" import fs from "fs" -import { IContextMenu } from "interfaces" import path from "path" -import { ExtendedClient as Client } from "utils/Client.js" -import logToChannel from "utils/functions/logtochannel.js" +import { embedColor } from "~/config/options.js" +import { IContextMenu } from "~/interfaces" +import { ExtendedClient as Client } from "~/utils/Client.js" +import logToChannel from "~/utils/functions/logtochannel.js" type FileType = "js" | "ts" const __dirname = import.meta.dirname diff --git a/src/utils/Events/cron.ts b/src/utils/Events/cron.ts index f1c264e..c7b8951 100644 --- a/src/utils/Events/cron.ts +++ b/src/utils/Events/cron.ts @@ -1,7 +1,7 @@ import { CronJob } from "cron" import fs from "fs" -import { ICron } from "interfaces" import path from "path" +import { ICron } from "~/interfaces" type FileType = "js" | "ts" const __dirname = import.meta.dirname diff --git a/src/utils/Events/events.ts b/src/utils/Events/events.ts index d803e6e..8115c46 100644 --- a/src/utils/Events/events.ts +++ b/src/utils/Events/events.ts @@ -1,6 +1,6 @@ import fs from "fs" import path from "path" -import { ExtendedClient as Client } from "utils/Client.js" +import { ExtendedClient as Client } from "~/utils/Client.js" const __dirname = import.meta.dirname export default async function loadEvents(client: Client) { diff --git a/src/utils/Events/modal.ts b/src/utils/Events/modal.ts index c26f3b9..91a2164 100644 --- a/src/utils/Events/modal.ts +++ b/src/utils/Events/modal.ts @@ -1,10 +1,10 @@ -import { embedColor } from "config/options.js" import { Events } from "discord.js" import fs from "fs" -import { IModal } from "interfaces" import path from "path" -import { ExtendedClient as Client } from "utils/Client.js" -import logToChannel from "utils/functions/logtochannel.js" +import { embedColor } from "~/config/options.js" +import { IModal } from "~/interfaces" +import { ExtendedClient as Client } from "~/utils/Client.js" +import logToChannel from "~/utils/functions/logtochannel.js" type FileType = "js" | "ts" const __dirname = import.meta.dirname diff --git a/src/utils/HypixelFunctions/account.ts b/src/utils/HypixelFunctions/account.ts index 0e4a68c..2c9f46b 100644 --- a/src/utils/HypixelFunctions/account.ts +++ b/src/utils/HypixelFunctions/account.ts @@ -1,7 +1,7 @@ import fetch from "axios" -import { IPlayer, IPlayerData } from "interfaces" -import { IGuild, IGuildData } from "interfaces" -import env from "utils/Env.js" +import { IPlayer, IPlayerData } from "~/interfaces" +import { IGuild, IGuildData } from "~/interfaces" +import env from "~/utils/Env.js" const apikey = env.prod.hypixelapikey const mojang = "https://api.mojang.com/users/profiles/minecraft/" const mojanguuid = "https://sessionserver.mojang.com/session/minecraft/profile/" diff --git a/src/utils/Illegitimate.ts b/src/utils/Illegitimate.ts index 4b76eae..0f24e34 100644 --- a/src/utils/Illegitimate.ts +++ b/src/utils/Illegitimate.ts @@ -1,21 +1,15 @@ -import { Redis } from "ioredis" -import { ExtendedClient as Client } from "utils/Client.js" -import env from "utils/Env.js" -import { color } from "utils/functions/colors.js" -// import { connect } from "mongoose" import { Player } from "discord-player" import { YoutubeiExtractor } from "discord-player-youtubei" -// import { Sequelize } from "sequelize" +import { Redis } from "ioredis" +import { ExtendedClient as Client } from "~/utils/Client.js" +import env from "~/utils/Env.js" +import { color } from "~/utils/functions/colors.js" import { MissingEnvVarsError } from "./Classes.js" import loadAllEvents from "./Events/loadevents.js" const client = new Client() const redis = new Redis(env.prod.redisURI) const player = new Player(client) -// const sequelize = new Sequelize({ -// dialect: "sqlite", -// storage: "dev/db.sqlite" -// }) let ft: "js" | "ts" if (process.env.NODE_ENV === "dev" && process.env.TYPESCRIPT === "true") { @@ -40,14 +34,6 @@ class Illegitimate { redis.on("ready", () => { console.log(color("Connected to Redis", "green")) }) - // if (process.env.NODE_ENV === "dev") { - // sequelize.sync({ logging: false }).then(() => { - // console.log(color("Synced the db [dev]", "green")) - // }) - // } - // connect(env.prod.mongoURI, {}).then(() => { - // console.log(color("Connected to MongoDB", "green")) - // }) } private async init() { diff --git a/src/utils/functions/applicationquestions.ts b/src/utils/functions/applicationquestions.ts index 251758c..6c4a9b4 100644 --- a/src/utils/functions/applicationquestions.ts +++ b/src/utils/functions/applicationquestions.ts @@ -1,6 +1,6 @@ -import { embedColor } from "config/options.js" import { Collection, EmbedBuilder, GuildMember, Message } from "discord.js" -import { getUUID } from "utils/Hypixel.js" +import { embedColor } from "~/config/options.js" +import { getUUID } from "~/utils/Hypixel.js" const tooLong = new EmbedBuilder() .setDescription("You took too long to respond.") diff --git a/src/utils/functions/logtochannel.ts b/src/utils/functions/logtochannel.ts index e2438f0..a8f4b4a 100644 --- a/src/utils/functions/logtochannel.ts +++ b/src/utils/functions/logtochannel.ts @@ -1,6 +1,6 @@ -import { botLogChannel, devLogChannel, errorLogChannel, guildid, guildLogChannel, moderationLogChannel, onlineLogChannel } from "config/options.js" import { Guild, MessageCreateOptions, TextChannel } from "discord.js" -import { client } from "utils/Illegitimate.js" +import { botLogChannel, devLogChannel, errorLogChannel, guildid, guildLogChannel, moderationLogChannel, onlineLogChannel } from "~/config/options.js" +import { client } from "~/utils/Illegitimate.js" const channels = { online: onlineLogChannel, diff --git a/src/utils/functions/rolesmanage.ts b/src/utils/functions/rolesmanage.ts index b7047b5..ca33ca1 100644 --- a/src/utils/functions/rolesmanage.ts +++ b/src/utils/functions/rolesmanage.ts @@ -1,4 +1,4 @@ -import { beast, defaultMember, elite, gm, guildRole, guildStaff, manager, member, moderator, verifyTick } from "config/roles.js" +import { beast, defaultMember, elite, gm, guildRole, guildStaff, manager, member, moderator, verifyTick } from "~/config/roles.js" const roles = [ gm, manager, diff --git a/tsconfig.json b/tsconfig.json index 3acb70c..50151ac 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -16,13 +16,24 @@ "outDir": "dist", "baseUrl": ".", "paths": { - "utils/*": ["src/utils/*"], - "schemas/*": ["src/schemas/*"], - "config/*": ["src/config/*"], - "interfaces": ["src/interfaces/index"], - "typings": ["src/typings/index"] + "~/utils/*": [ + "src/utils/*" + ], + "~/config/*": [ + "src/config/*" + ], + "~/interfaces": [ + "src/interfaces/index" + ], + "~/typings": [ + "src/typings/index" + ] } }, - "include": ["src"], - "exclude": ["node_modules"] + "include": [ + "src" + ], + "exclude": [ + "node_modules" + ] }