Bläddra i källkod

update discord.js

Markus-Rost 4 år sedan
förälder
incheckning
0207c2c4ac
5 ändrade filer med 24 tillägg och 14 borttagningar
  1. 1 1
      RcGcDb
  2. 1 3
      bot.js
  3. 15 3
      cmds/test.js
  4. 6 6
      package-lock.json
  5. 1 1
      package.json

+ 1 - 1
RcGcDb

@@ -1 +1 @@
-Subproject commit f42d2a642f70e156ced34898b7a560c2fdd928df
+Subproject commit 443bb8e5af30496afb21c78c5c6645086cc64fe4

+ 1 - 3
bot.js

@@ -24,7 +24,7 @@ global.voice = {};
 var db = require('./util/database.js');
 var db = require('./util/database.js');
 
 
 const Discord = require('discord.js');
 const Discord = require('discord.js');
-var client = new Discord.Client( {
+const client = new Discord.Client( {
 	messageCacheLifetime: 300,
 	messageCacheLifetime: 300,
 	messageSweepInterval: 300,
 	messageSweepInterval: 300,
 	allowedMentions: {
 	allowedMentions: {
@@ -55,13 +55,11 @@ var client = new Discord.Client( {
 global.pause = {};
 global.pause = {};
 var isStop = false;
 var isStop = false;
 client.on( 'ready', () => {
 client.on( 'ready', () => {
-	client.ready = true;
 	console.log( '\n- ' + shardId + ': Successfully logged in as ' + client.user.username + '!\n' );
 	console.log( '\n- ' + shardId + ': Successfully logged in as ' + client.user.username + '!\n' );
 	Object.keys(voice).forEach( guild => {
 	Object.keys(voice).forEach( guild => {
 		if ( !client.guilds.cache.has(guild) ) delete voice[guild];
 		if ( !client.guilds.cache.has(guild) ) delete voice[guild];
 	} );
 	} );
 } );
 } );
-client.on( 'shardDisconnect', () => client.ready = false );
 
 
 
 
 String.prototype.noWiki = function(href) {
 String.prototype.noWiki = function(href) {

+ 15 - 3
cmds/test.js

@@ -1,6 +1,18 @@
 const {MessageEmbed} = require('discord.js');
 const {MessageEmbed} = require('discord.js');
 const help_setup = require('../functions/helpsetup.js');
 const help_setup = require('../functions/helpsetup.js');
 
 
+const wsStatus = [
+	'READY',
+	'CONNECTING',
+	'RECONNECTING',
+	'IDLE',
+	'NEARLY',
+	'DISCONNECTED',
+	'WAITING_FOR_GUILDS',
+	'IDENTIFYING',
+	'RESUMING'
+];
+
 /**
 /**
  * Processes the "test" command.
  * Processes the "test" command.
  * @param {import('../util/i18n.js')} lang - The user language.
  * @param {import('../util/i18n.js')} lang - The user language.
@@ -70,10 +82,10 @@ function cmd_test(lang, msg, args, line, wiki) {
 				}
 				}
 				embed.addField( wiki, ping );
 				embed.addField( wiki, ping );
 			} ).finally( () => {
 			} ).finally( () => {
-				if ( msg.isOwner() ) return msg.client.shard.fetchClientValues('ready').then( values => {
-					return '```java\n' + values.map( (ready, id) => id + ': ' + ready ).join('\n') + '\n```';
+				if ( msg.isOwner() ) return msg.client.shard.fetchClientValues('ws.status').then( values => {
+					return '```css\n' + values.map( (status, id) => '[' + id + ']: ' + ( wsStatus[status] || status ) ).join('\n') + '\n```';
 				}, error => {
 				}, error => {
-					return '```js\n' + error.name + ': ' + error.message + '\n```';
+					return '```js\n' + error + '\n```';
 				} ).then( shards => {
 				} ).then( shards => {
 					embed.addField( 'Shards', shards );
 					embed.addField( 'Shards', shards );
 					message.edit( message.content, {embed,allowedMentions:{users:[msg.author.id]}} ).catch(log_error);
 					message.edit( message.content, {embed,allowedMentions:{users:[msg.author.id]}} ).catch(log_error);

+ 6 - 6
package-lock.json

@@ -387,18 +387,18 @@
       "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups="
       "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups="
     },
     },
     "discord.js": {
     "discord.js": {
-      "version": "12.2.0",
-      "resolved": "https://registry.npmjs.org/discord.js/-/discord.js-12.2.0.tgz",
-      "integrity": "sha512-Ueb/0SOsxXyqwvwFYFe0msMrGqH1OMqpp2Dpbplnlr4MzcRrFWwsBM9gKNZXPVBHWUKiQkwU8AihXBXIvTTSvg==",
+      "version": "12.3.1",
+      "resolved": "https://registry.npmjs.org/discord.js/-/discord.js-12.3.1.tgz",
+      "integrity": "sha512-mSFyV/mbvzH12UXdS4zadmeUf8IMQOo/YdunubG1wWt1xjWvtaJz/s9CGsFD2B5pTw1W/LXxxUbrQjIZ/xlUdw==",
       "requires": {
       "requires": {
-        "@discordjs/collection": "^0.1.5",
+        "@discordjs/collection": "^0.1.6",
         "@discordjs/form-data": "^3.0.1",
         "@discordjs/form-data": "^3.0.1",
         "abort-controller": "^3.0.0",
         "abort-controller": "^3.0.0",
         "node-fetch": "^2.6.0",
         "node-fetch": "^2.6.0",
-        "prism-media": "^1.2.0",
+        "prism-media": "^1.2.2",
         "setimmediate": "^1.0.5",
         "setimmediate": "^1.0.5",
         "tweetnacl": "^1.0.3",
         "tweetnacl": "^1.0.3",
-        "ws": "^7.2.1"
+        "ws": "^7.3.1"
       }
       }
     },
     },
     "dom-serializer": {
     "dom-serializer": {

+ 1 - 1
package.json

@@ -15,7 +15,7 @@
   },
   },
   "dependencies": {
   "dependencies": {
     "cheerio": "^1.0.0-rc.3",
     "cheerio": "^1.0.0-rc.3",
-    "discord.js": "12.2.0",
+    "discord.js": "^12.3.1",
     "dotenv": "^8.2.0",
     "dotenv": "^8.2.0",
     "full-icu": "^1.3.1",
     "full-icu": "^1.3.1",
     "got": "^11.5.2",
     "got": "^11.5.2",