Browse Source

update packages

Markus-Rost 6 years ago
parent
commit
f59445a342
2 changed files with 10 additions and 10 deletions
  1. 8 8
      main.js
  2. 2 2
      package.json

+ 8 - 8
main.js

@@ -945,14 +945,14 @@ function cmd_user(lang, msg, namespace, username, wiki, linksuffix, querypage, c
 				if ( !querypage.noRedirect || ( querypage.missing === undefined && querypage.ns !== -1 ) ) namespace = contribs;
 				if ( !querypage.noRedirect || ( querypage.missing === undefined && querypage.ns !== -1 ) ) namespace = contribs;
 				var blocks = body.query.blocks.map( function(block) {
 				var blocks = body.query.blocks.map( function(block) {
 					var isBlocked = false;
 					var isBlocked = false;
-					var blockedtimestamp = (new Date(block.timestamp)).toLocaleString(lang.user.dateformat, timeoptions);
+					var blockedtimestamp = new Date(block.timestamp).toLocaleString(lang.user.dateformat, timeoptions);
 					var blockexpiry = block.expiry;
 					var blockexpiry = block.expiry;
 					if ( blockexpiry === 'infinity' ) {
 					if ( blockexpiry === 'infinity' ) {
 						blockexpiry = lang.user.block.until_infinity;
 						blockexpiry = lang.user.block.until_infinity;
 						isBlocked = true;
 						isBlocked = true;
 					} else if ( blockexpiry ) {
 					} else if ( blockexpiry ) {
 						if ( Date.parse(blockexpiry) > Date.now() ) isBlocked = true;
 						if ( Date.parse(blockexpiry) > Date.now() ) isBlocked = true;
-						blockexpiry = (new Date(blockexpiry)).toLocaleString(lang.user.dateformat, timeoptions);
+						blockexpiry = new Date(blockexpiry).toLocaleString(lang.user.dateformat, timeoptions);
 					}
 					}
 					if ( isBlocked ) return [lang.user.block.header.replaceSave( '%s', block.user ), lang.user.block.text.replaceSave( '%1$s', blockedtimestamp ).replaceSave( '%2$s', blockexpiry ).replaceSave( '%3$s', '[[User:' + block.by + '|' + block.by + ']]' ).replaceSave( '%4$s', block.reason )];
 					if ( isBlocked ) return [lang.user.block.header.replaceSave( '%s', block.user ), lang.user.block.text.replaceSave( '%1$s', blockedtimestamp ).replaceSave( '%2$s', blockexpiry ).replaceSave( '%3$s', '[[User:' + block.by + '|' + block.by + ']]' ).replaceSave( '%4$s', block.reason )];
 				} ).filter( block => block !== undefined );
 				} ).filter( block => block !== undefined );
@@ -1064,7 +1064,7 @@ function cmd_user(lang, msg, namespace, username, wiki, linksuffix, querypage, c
 						default: 
 						default: 
 							gender.push(lang.user.gender.unknown);
 							gender.push(lang.user.gender.unknown);
 					}
 					}
-					var registration = [lang.user.info.registration, (new Date(body.query.users[0].registration)).toLocaleString(lang.user.dateformat, timeoptions)];
+					var registration = [lang.user.info.registration, new Date(body.query.users[0].registration).toLocaleString(lang.user.dateformat, timeoptions)];
 					var editcount = [lang.user.info.editcount, body.query.users[0].editcount];
 					var editcount = [lang.user.info.editcount, body.query.users[0].editcount];
 					var groups = body.query.users[0].groups;
 					var groups = body.query.users[0].groups;
 					var group = [lang.user.info.group];
 					var group = [lang.user.info.group];
@@ -1077,14 +1077,14 @@ function cmd_user(lang, msg, namespace, username, wiki, linksuffix, querypage, c
 						}
 						}
 					}
 					}
 					var isBlocked = false;
 					var isBlocked = false;
-					var blockedtimestamp = (new Date(body.query.users[0].blockedtimestamp)).toLocaleString(lang.user.dateformat, timeoptions);
+					var blockedtimestamp = new Date(body.query.users[0].blockedtimestamp).toLocaleString(lang.user.dateformat, timeoptions);
 					var blockexpiry = body.query.users[0].blockexpiry;
 					var blockexpiry = body.query.users[0].blockexpiry;
 					if ( blockexpiry === 'infinity' ) {
 					if ( blockexpiry === 'infinity' ) {
 						blockexpiry = lang.user.block.until_infinity;
 						blockexpiry = lang.user.block.until_infinity;
 						isBlocked = true;
 						isBlocked = true;
 					} else if ( blockexpiry ) {
 					} else if ( blockexpiry ) {
 						var blockexpirydate = blockexpiry.replace(/(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2,3})/, '$1-$2-$3T$4:$5:$6Z');
 						var blockexpirydate = blockexpiry.replace(/(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2,3})/, '$1-$2-$3T$4:$5:$6Z');
-						blockexpiry = (new Date(blockexpirydate)).toLocaleString(lang.user.dateformat, timeoptions);
+						blockexpiry = new Date(blockexpirydate).toLocaleString(lang.user.dateformat, timeoptions);
 						if ( Date.parse(blockexpirydate) > Date.now() ) isBlocked = true;
 						if ( Date.parse(blockexpirydate) > Date.now() ) isBlocked = true;
 					}
 					}
 					var blockedby = '[[User:' + body.query.users[0].blockedby + '|' + body.query.users[0].blockedby + ']]';
 					var blockedby = '[[User:' + body.query.users[0].blockedby + '|' + body.query.users[0].blockedby + ']]';
@@ -1366,11 +1366,11 @@ function cmd_diffsend(lang, msg, args, wiki, reaction, spoiler, compare) {
 				}
 				}
 				else {
 				else {
 					var title = pages[0].title;
 					var title = pages[0].title;
-					var revisions = pages[0].revisions;
+					var revisions = pages[0].revisions.sort( (first, second) => Date.parse(second.timestamp) - Date.parse(first.timestamp) );
 					var diff = revisions[0].revid;
 					var diff = revisions[0].revid;
 					var oldid = ( revisions[1] ? revisions[1].revid : 0 );
 					var oldid = ( revisions[1] ? revisions[1].revid : 0 );
 					var editor = [lang.diff.info.editor, ( revisions[0].userhidden !== undefined ? lang.diff.hidden : revisions[0].user )];
 					var editor = [lang.diff.info.editor, ( revisions[0].userhidden !== undefined ? lang.diff.hidden : revisions[0].user )];
-					var timestamp = [lang.diff.info.timestamp, (new Date(revisions[0].timestamp)).toLocaleString(lang.user.dateformat, timeoptions)];
+					var timestamp = [lang.diff.info.timestamp, new Date(revisions[0].timestamp).toLocaleString(lang.user.dateformat, timeoptions)];
 					var difference = revisions[0].size - ( revisions[1] ? revisions[1].size : 0 );
 					var difference = revisions[0].size - ( revisions[1] ? revisions[1].size : 0 );
 					var size = [lang.diff.info.size, lang.diff.info.bytes.replace( '%s', ( difference > 0 ? '+' : '' ) + difference )];
 					var size = [lang.diff.info.size, lang.diff.info.bytes.replace( '%s', ( difference > 0 ? '+' : '' ) + difference )];
 					var comment = [lang.diff.info.comment, ( revisions[0].commenthidden !== undefined ? lang.diff.hidden : ( revisions[0].comment ? revisions[0].comment.toFormatting(msg.showEmbed(), wiki, title) : lang.diff.nocomment ) )];
 					var comment = [lang.diff.info.comment, ( revisions[0].commenthidden !== undefined ? lang.diff.hidden : ( revisions[0].comment ? revisions[0].comment.toFormatting(msg.showEmbed(), wiki, title) : lang.diff.nocomment ) )];
@@ -1638,7 +1638,7 @@ function cmd_overview(lang, msg, wiki, reaction, spoiler) {
 			var site = allSites.find( site => site.wiki_domain === body.query.general.servername );
 			var site = allSites.find( site => site.wiki_domain === body.query.general.servername );
 			
 			
 			var name = [lang.overview.name, site.wiki_display_name];
 			var name = [lang.overview.name, site.wiki_display_name];
-			var created = [lang.overview.created, (new Date(parseInt(site.created + '000', 10))).toLocaleString(lang.user.dateformat, timeoptions)];
+			var created = [lang.overview.created, new Date(parseInt(site.created + '000', 10)).toLocaleString(lang.user.dateformat, timeoptions)];
 			var manager = [lang.overview.manager, site.wiki_managers];
 			var manager = [lang.overview.manager, site.wiki_managers];
 			var official = [lang.overview.official, ( site.official_wiki ? lang.overview.yes : lang.overview.no )];
 			var official = [lang.overview.official, ( site.official_wiki ? lang.overview.yes : lang.overview.no )];
 			var articles = [lang.overview.articles, site.ss_good_articles];
 			var articles = [lang.overview.articles, site.ss_good_articles];

+ 2 - 2
package.json

@@ -11,9 +11,9 @@
   "license": "ISC",
   "license": "ISC",
   "dependencies": {
   "dependencies": {
     "dblapi.js": "^2.3.0",
     "dblapi.js": "^2.3.0",
-    "discord.js": "^11.5.0",
+    "discord.js": "^11.5.1",
     "dotenv": "^6.2.0",
     "dotenv": "^6.2.0",
-    "full-icu": "^1.2.1",
+    "full-icu": "^1.3.0",
     "htmlparser2": "^3.10.1",
     "htmlparser2": "^3.10.1",
     "npm": "^6.9.0",
     "npm": "^6.9.0",
     "request": "^2.88.0"
     "request": "^2.88.0"