From 9b5f005394a2d6e418b02749d6be6fab8b3f85c8 Mon Sep 17 00:00:00 2001 From: Sugden <28943913+NotSugden@users.noreply.github.com> Date: Sat, 7 Mar 2020 05:05:57 +0000 Subject: [PATCH] test: update tests (#3865) * test: update tests * style: fix indent * test: suggested changes * test: require correct directory Co-authored-by: Crawl --- test/random.js | 38 ++++++++++++++++++++------------------ test/shard.js | 8 ++++---- test/sharder.js | 2 +- test/voice.js | 6 +++--- 4 files changed, 28 insertions(+), 26 deletions(-) diff --git a/test/random.js b/test/random.js index 05ec5fb2b..77112883b 100644 --- a/test/random.js +++ b/test/random.js @@ -5,11 +5,11 @@ const request = require('superagent'); const ytdl = require('ytdl-core'); const { token, song } = require('./auth.js'); -const Discord = require('../'); +const Discord = require('../src'); console.time('magic'); -const client = new Discord.Client({ fetchAllMembers: true, apiRequestMethod: 'sequential' }); +const client = new Discord.Client({ fetchAllMembers: true }); client .login(token) @@ -17,7 +17,7 @@ client .catch(console.error); client.on('ready', () => { - console.log(`ready with ${client.users.size} users`); + console.log(`ready with ${client.users.cache.size} users`); console.timeEnd('magic'); }); @@ -30,7 +30,7 @@ client.on('message', message => { if (true) { if (message.content === 'makechann') { if (message.channel.guild) { - message.channel.guild.createChannel('hi', 'text').then(console.log); + message.channel.guild.channels.create('hi', { type: 'text' }).then(console.log); } } @@ -44,8 +44,8 @@ client.on('message', message => { count++; console.log('reached', count, ecount); }) - .catch(m => { - console.error(m); + .catch(e => { + console.error(e); ecount++; console.log('reached', count, ecount); }); @@ -95,11 +95,11 @@ client.on('message', message => { if (message.content === 'stats') { let m = ''; - m += `I am aware of ${message.guild.channels.size} channels\n`; - m += `I am aware of ${message.guild.members.size} members\n`; - m += `I am aware of ${client.channels.size} channels overall\n`; - m += `I am aware of ${client.guilds.size} guilds overall\n`; - m += `I am aware of ${client.users.size} users overall\n`; + m += `I am aware of ${message.guild.channels.cache.size} channels\n`; + m += `I am aware of ${message.guild.members.cache.size} members\n`; + m += `I am aware of ${client.channels.cache.size} channels overall\n`; + m += `I am aware of ${client.guilds.cache.size} guilds overall\n`; + m += `I am aware of ${client.users.cache.size} users overall\n`; message.channel .send(m) .then(msg => msg.edit('nah')) @@ -116,7 +116,7 @@ client.on('message', message => { if (message.content.startsWith('kick')) { message.guild - .member(message.mentions[0]) + .member(message.mentions.users.first()) .kick() .then(member => { console.log(member); @@ -140,7 +140,8 @@ client.on('message', message => { if (message.content === 'makerole') { message.guild - .createRole() + .roles + .create() .then(role => { message.channel.send(`Made role ${role.name}`); }) @@ -150,7 +151,7 @@ client.on('message', message => { }); function nameLoop(user) { - // User.setUsername(user.username + 'a').then(nameLoop).catch(console.error); + // user.setUsername(user.username + 'a').then(nameLoop).catch(console.error); } function chanLoop(channel) { @@ -191,7 +192,7 @@ client.on('message', msg => { .join(' '); const s = ytdl(chan, { filter: 'audioonly' }, { passes: 3 }); s.on('error', e => console.log(`e w stream 1 ${e}`)); - con.playStream(s); + con.play(s); } if (msg.content.startsWith('/join')) { const chan = msg.content @@ -199,6 +200,7 @@ client.on('message', msg => { .slice(1) .join(' '); msg.channel.guild.channels + .cache .get(chan) .join() .then(conn => { @@ -227,9 +229,9 @@ client.on('messageReactionRemove', (reaction, user) => { client.on('message', m => { if (m.content.startsWith('#reactions')) { const mID = m.content.split(' ')[1]; - m.channel.fetchMessage(mID).then(rM => { - for (const reaction of rM.reactions.values()) { - reaction.fetchUsers().then(users => { + m.channel.messages.fetch(mID).then(rM => { + for (const reaction of rM.reactions.cache.values()) { + reaction.users.fetch().then(users => { m.channel.send( `The following gave that message ${reaction.emoji}:\n` + `${users diff --git a/test/shard.js b/test/shard.js index 702f70dfb..52225370c 100644 --- a/test/shard.js +++ b/test/shard.js @@ -1,10 +1,10 @@ 'use strict'; const { token } = require('./auth.json'); -const Discord = require('../'); +const Discord = require('../src'); const client = new Discord.Client({ - shardID: process.argv[2], + shards: process.argv[2], shardCount: process.argv[3], }); @@ -27,8 +27,8 @@ client.on('message', msg => { process.send(123); client.on('ready', () => { - console.log('Ready', client.options.shardID); - if (client.options.shardID === 0) { + console.log('Ready', client.options.shards); + if (client.options.shards === 0) { setTimeout(() => { console.log('kek dying'); client.destroy(); diff --git a/test/sharder.js b/test/sharder.js index 195b14bd9..9c1755038 100644 --- a/test/sharder.js +++ b/test/sharder.js @@ -1,7 +1,7 @@ 'use strict'; const { token } = require('./auth'); -const Discord = require('../'); +const Discord = require('../src'); const sharder = new Discord.ShardingManager(`${process.cwd()}/test/shard.js`, { token, respawn: false }); diff --git a/test/voice.js b/test/voice.js index 8ee9c7225..37d2669a3 100644 --- a/test/voice.js +++ b/test/voice.js @@ -3,9 +3,9 @@ const ytdl = require('ytdl-core'); const auth = require('./auth.js'); -const Discord = require('../'); +const Discord = require('../src'); -const client = new Discord.Client({ fetchAllMembers: false, partials: [], apiRequestMethod: 'sequential' }); +const client = new Discord.Client({ fetchAllMembers: false, partials: [] }); client .login(auth.token) @@ -37,7 +37,7 @@ client.on('message', m => { if (!m.guild) return; if (m.author.id !== '66564597481480192') return; if (m.content.startsWith('/join')) { - const channel = m.guild.channels.get(m.content.split(' ')[1]) || m.member.voice.channel; + const channel = m.guild.channels.cache.get(m.content.split(' ')[1]) || m.member.voice.channel; if (channel && channel.type === 'voice') { channel.join().then(conn => { conn.receiver.createStream(m.author, true).on('data', b => console.log(b.toString()));