murm
/
mrmBot-Matrix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update packages

This commit is contained in:
Essem 2022-08-11 10:40:10 -05:00
parent a84f332786
commit 34ac7b3380
No known key found for this signature in database
GPG Key ID: 7D497397CC3A2A8C
5 changed files with 361 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
package.json
View File

@ -28,25 +28,25 @@
"dotenv": "^16.0.1", "dotenv": "^16.0.1",
"emoji-regex": "^10.1.0", "emoji-regex": "^10.1.0",
"eris": "github:esmBot/eris#dev", "eris": "github:esmBot/eris#dev",
"eris-fleet": "^1.0.2", "eris-fleet": "github:esmBot/eris-fleet#dev",
"file-type": "^17.1.2", "file-type": "^17.1.6",
"format-duration": "^2.0.0", "format-duration": "^2.0.0",
"jsqr": "^1.4.0", "jsqr": "^1.4.0",
"node-addon-api": "^5.0.0", "node-addon-api": "^5.0.0",
"node-emoji": "^1.11.0", "node-emoji": "^1.11.0",
"node-fetch": "^3.2.9", "node-fetch": "^3.2.10",
"qrcode": "^1.5.1", "qrcode": "^1.5.1",
"sharp": "^0.30.7", "sharp": "^0.30.7",
"shoukaku": "github:TheEssem/shoukaku", "shoukaku": "github:Deivu/shoukaku",
"winston": "^3.8.1", "winston": "^3.8.1",
"winston-daily-rotate-file": "^4.7.1" "winston-daily-rotate-file": "^4.7.1"
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "^7.18.9", "@babel/core": "^7.18.10",
"@babel/eslint-parser": "^7.18.9", "@babel/eslint-parser": "^7.18.9",
"@babel/eslint-plugin": "^7.17.7", "@babel/eslint-plugin": "^7.18.10",
"@babel/plugin-proposal-class-properties": "^7.18.6", "@babel/plugin-proposal-class-properties": "^7.18.6",
"eslint": "^8.20.0", "eslint": "^8.21.0",
"eslint-plugin-unicorn": "^42.0.0" "eslint-plugin-unicorn": "^42.0.0"
}, },
"optionalDependencies": { "optionalDependencies": {

501
pnpm-lock.yaml
View File

File diff suppressed because it is too large Load Diff

2
utils/awaitrejoin.js
View File

@ -9,7 +9,7 @@ class AwaitRejoin extends EventEmitter {
this.channel = channel; this.channel = channel;
this.rejoined = false; this.rejoined = false;
this.ended = false; this.ended = false;
this.bot = channel.guild ? channel.guild.shard.client : channel._client; this.bot = channel.guild ? channel.guild.shard._client : channel._client;
this.listener = (member, newChannel) => this.verify(member, newChannel); this.listener = (member, newChannel) => this.verify(member, newChannel);
this.bot.on("voiceChannelJoin", this.listener); this.bot.on("voiceChannelJoin", this.listener);
this.bot.on("voiceChannelSwitch", this.listener); this.bot.on("voiceChannelSwitch", this.listener);

4
utils/imagedetect.js
View File

@ -132,8 +132,8 @@ export default async (client, cmdMessage, interaction, options, extraReturnTypes
// we can get a raw attachment or a URL in the interaction itself // we can get a raw attachment or a URL in the interaction itself
if (options) { if (options) {
if (options.image) { if (options.image) {
const attachment = interaction.data.resolved.attachments[options.image]; const attachment = interaction.data.resolved.attachments.get(options.image);
const result = await getImage(attachment.proxy_url, attachment.url, video, attachment.content_type); const result = await getImage(attachment.proxyUrl, attachment.url, video, attachment.contentType);
if (result !== false) return result; if (result !== false) return result;
} else if (options.link) { } else if (options.link) {
const result = await getImage(options.link, options.link, video, extraReturnTypes, false, null, true); const result = await getImage(options.link, options.link, video, extraReturnTypes, false, null, true);

2
utils/soundplayer.js
View File

@ -65,7 +65,6 @@ export async function play(client, sound, options, music = false) {
if (!options.channel.guild.permissionsOf(client.user.id).has("voiceConnect")) return "I can't join this voice channel!"; if (!options.channel.guild.permissionsOf(client.user.id).has("voiceConnect")) return "I can't join this voice channel!";
const voiceChannel = options.channel.guild.channels.get(options.member.voiceState.channelID); const voiceChannel = options.channel.guild.channels.get(options.member.voiceState.channelID);
if (!voiceChannel.permissionsOf(client.user.id).has("voiceConnect")) return "I don't have permission to join this voice channel!"; if (!voiceChannel.permissionsOf(client.user.id).has("voiceConnect")) return "I don't have permission to join this voice channel!";
const playerMeta = players.get(options.channel.guild.id);
if (!music && manager.players.has(options.channel.guild.id)) return "I can't play a sound effect while other audio is playing!"; if (!music && manager.players.has(options.channel.guild.id)) return "I can't play a sound effect while other audio is playing!";
let node = manager.getNode(); let node = manager.getNode();
if (!node) { if (!node) {
@ -94,6 +93,7 @@ export async function play(client, sound, options, music = false) {
const playlistTracks = response.playlistInfo.selectedTrack ? sortedTracks : [sortedTracks[0]]; const playlistTracks = response.playlistInfo.selectedTrack ? sortedTracks : [sortedTracks[0]];
queues.set(voiceChannel.guild.id, oldQueue ? [...oldQueue, ...playlistTracks] : playlistTracks); queues.set(voiceChannel.guild.id, oldQueue ? [...oldQueue, ...playlistTracks] : playlistTracks);
} }
const playerMeta = players.get(options.channel.guild.id);
let player; let player;
if (node.players.has(voiceChannel.guild.id)) { if (node.players.has(voiceChannel.guild.id)) {
player = node.players.get(voiceChannel.guild.id); player = node.players.get(voiceChannel.guild.id);