diff --git a/package.json b/package.json index 579e3b0..2011dbf 100644 --- a/package.json +++ b/package.json @@ -19,12 +19,11 @@ "dependencies": { "@ctrl/tinycolor": "^3.4.1", "dumpy": "github:Cynosphere/dumpy.js", - "eris": "github:abalabahaha/eris#dev", "google-images": "^2.1.0", "jimp": "^0.16.1", "murmurhash": "^2.0.0", - "node-fetch": "^2.6.1", "node-ffprobe": "^3.0.0", + "oceanic.js": "^1.1.2", "sharp": "^0.28.3", "sqlite3": "^5.0.2", "ytdl-core": "github:GreepTheSheep/node-ytdl-core" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 34c3906..d7c5f14 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -3,13 +3,12 @@ lockfileVersion: 5.4 specifiers: '@ctrl/tinycolor': ^3.4.1 dumpy: github:Cynosphere/dumpy.js - eris: github:abalabahaha/eris#dev eslint: ^7.26.0 google-images: ^2.1.0 jimp: ^0.16.1 murmurhash: ^2.0.0 - node-fetch: ^2.6.1 node-ffprobe: ^3.0.0 + oceanic.js: ^1.1.2 prettier: ^2.3.0 sharp: ^0.28.3 sqlite3: ^5.0.2 @@ -18,12 +17,11 @@ specifiers: dependencies: '@ctrl/tinycolor': 3.4.1 dumpy: github.com/Cynosphere/dumpy.js/5fc22353cdcb97084bab572266390e780d9f7a7b - eris: github.com/abalabahaha/eris/eb403730855714eafa36c541dbe2cb84c9979158 google-images: 2.1.0 jimp: 0.16.1 murmurhash: 2.0.0 - node-fetch: 2.6.1 node-ffprobe: 3.0.0 + oceanic.js: 1.1.2 sharp: 0.28.3 sqlite3: 5.0.2 ytdl-core: github.com/GreepTheSheep/node-ytdl-core/17a77cbe7f3a9670d6536fba7cb3f574c6da596a @@ -63,6 +61,26 @@ packages: engines: {node: '>=10'} dev: false + /@discordjs/voice/0.11.0: + resolution: {integrity: sha512-6+9cj1dxzBJm7WJ9qyG2XZZQ8rcLl6x2caW0C0OxuTtMLAaEDntpb6lqMTFiBg/rDc4Rd59g1w0gJmib33CuHw==} + engines: {node: '>=16.9.0'} + requiresBuild: true + dependencies: + '@types/ws': 8.5.3 + discord-api-types: 0.36.3 + prism-media: 1.3.4 + tslib: 2.4.0 + ws: 8.9.0 + transitivePeerDependencies: + - '@discordjs/opus' + - bufferutil + - ffmpeg-static + - node-opus + - opusscript + - utf-8-validate + dev: false + optional: true + /@eslint/eslintrc/0.4.1: resolution: {integrity: sha512-5v7TDE9plVhvxQeWLXDTvFvJBdH6pEsdnl2g/dAptmuFEPedQ4Erq5rsDsX+mvAM610IhNaO2W5V1dOOnDKxkQ==} engines: {node: ^10.12.0 || >=12.0.0} @@ -471,6 +489,13 @@ packages: '@types/node': 17.0.35 dev: false + /@types/ws/8.5.3: + resolution: {integrity: sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w==} + dependencies: + '@types/node': 17.0.35 + dev: false + optional: true + /abbrev/1.1.1: resolution: {integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==} dev: false @@ -641,6 +666,13 @@ packages: ieee754: 1.2.1 dev: false + /busboy/1.6.0: + resolution: {integrity: sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==} + engines: {node: '>=10.16.0'} + dependencies: + streamsearch: 1.1.0 + dev: false + /callsites/3.1.0: resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==} engines: {node: '>=6'} @@ -812,6 +844,11 @@ packages: hasBin: true dev: false + /discord-api-types/0.36.3: + resolution: {integrity: sha512-bz/NDyG0KBo/tY14vSkrwQ/n3HKPf87a0WFW/1M9+tXYK+vp5Z5EksawfCWo2zkAc6o7CClc0eff1Pjrqznlwg==} + dev: false + optional: true + /doctrine/3.0.0: resolution: {integrity: sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==} engines: {node: '>=6.0.0'} @@ -1669,6 +1706,23 @@ packages: engines: {node: '>=0.10.0'} dev: false + /oceanic.js/1.1.2: + resolution: {integrity: sha512-aABMK2UERHvyiwjWFx5m5ZZY7oPUHmVSOhICadZh/vqyxvGf48p+aqGlRu9bEtN6XZYPZJecQi/9IPN+phXn1Q==} + engines: {node: '>=16.16.0'} + dependencies: + undici: 5.11.0 + ws: 8.9.0 + optionalDependencies: + '@discordjs/voice': 0.11.0 + transitivePeerDependencies: + - '@discordjs/opus' + - bufferutil + - ffmpeg-static + - node-opus + - opusscript + - utf-8-validate + dev: false + /omggif/1.0.10: resolution: {integrity: sha512-LMJTtvgc/nugXj0Vcrrs68Mn2D1r0zf630VNtqtpI1FEO7e+O9FP4gqs9AcnBaSEeoHIPm28u6qgPR0oyEpGSw==} dev: false @@ -1690,12 +1744,6 @@ packages: word-wrap: 1.2.3 dev: true - /opusscript/0.0.8: - resolution: {integrity: sha512-VSTi1aWFuCkRCVq+tx/BQ5q9fMnQ9pVZ3JU4UHKqTkf0ED3fKEPdr+gKAAl3IA2hj9rrP6iyq3hlcJq3HELtNQ==} - requiresBuild: true - dev: false - optional: true - /os-homedir/1.0.2: resolution: {integrity: sha1-/7xJiDNuDoM94MFox+8VISGqf7M=} engines: {node: '>=0.10.0'} @@ -1809,6 +1857,25 @@ packages: hasBin: true dev: true + /prism-media/1.3.4: + resolution: {integrity: sha512-eW7LXORkTCQznZs+eqe9VjGOrLBxcBPXgNyHXMTSRVhphvd/RrxgIR7WaWt4fkLuhshcdT5KHL88LAfcvS3f5g==} + peerDependencies: + '@discordjs/opus': ^0.8.0 + ffmpeg-static: ^5.0.2 || ^4.2.7 || ^3.0.0 || ^2.4.0 + node-opus: ^0.3.3 + opusscript: ^0.0.8 + peerDependenciesMeta: + '@discordjs/opus': + optional: true + ffmpeg-static: + optional: true + node-opus: + optional: true + opusscript: + optional: true + dev: false + optional: true + /process-nextick-args/2.0.1: resolution: {integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==} dev: false @@ -2078,6 +2145,11 @@ packages: dev: false optional: true + /streamsearch/1.1.0: + resolution: {integrity: sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==} + engines: {node: '>=10.0.0'} + dev: false + /string-width/1.0.2: resolution: {integrity: sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=} engines: {node: '>=0.10.0'} @@ -2224,6 +2296,11 @@ packages: dev: false optional: true + /tslib/2.4.0: + resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==} + dev: false + optional: true + /tunnel-agent/0.6.0: resolution: {integrity: sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=} dependencies: @@ -2235,12 +2312,6 @@ packages: dev: false optional: true - /tweetnacl/1.0.3: - resolution: {integrity: sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw==} - requiresBuild: true - dev: false - optional: true - /type-check/0.4.0: resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==} engines: {node: '>= 0.8.0'} @@ -2258,6 +2329,13 @@ packages: engines: {node: '>=8'} dev: true + /undici/5.11.0: + resolution: {integrity: sha512-oWjWJHzFet0Ow4YZBkyiJwiK5vWqEYoH7BINzJAJOLedZ++JpAlCbUktW2GQ2DS2FpKmxD/JMtWUUWl1BtghGw==} + engines: {node: '>=12.18'} + dependencies: + busboy: 1.6.0 + dev: false + /unzip-response/2.0.1: resolution: {integrity: sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=} engines: {node: '>=4'} @@ -2336,8 +2414,8 @@ packages: /wrappy/1.0.2: resolution: {integrity: sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=} - /ws/8.5.0: - resolution: {integrity: sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==} + /ws/8.9.0: + resolution: {integrity: sha512-Ja7nszREasGaYUYCI2k4lCKIRTt+y7XuqVoHR44YpI49TtryyqbqvDMn5eqfW7e6HzTukDRIsXqzVHScqRcafg==} engines: {node: '>=10.0.0'} peerDependencies: bufferutil: ^4.0.1 @@ -2408,18 +2486,3 @@ packages: miniget: 4.2.2 sax: 1.2.4 dev: false - - github.com/abalabahaha/eris/eb403730855714eafa36c541dbe2cb84c9979158: - resolution: {tarball: https://codeload.github.com/abalabahaha/eris/tar.gz/eb403730855714eafa36c541dbe2cb84c9979158} - name: eris - version: 0.17.2-dev - engines: {node: '>=10.4.0'} - dependencies: - ws: 8.5.0 - optionalDependencies: - opusscript: 0.0.8 - tweetnacl: 1.0.3 - transitivePeerDependencies: - - bufferutil - - utf-8-validate - dev: false