update deps

Author: Markus-Rost

RcGcDb

@@ -219,9 +219,11 @@ function interactionCreate(interaction) {
 	}
 	else if ( interaction.isModalSubmit() ) {
 		console.log( interaction.author + ': Modal: ' + interaction.customId + ' ' + interaction.fields.components.reduce( (prev, next) => {
-			return prev.concat(next.components);
+			if ( next.type === Discord.ComponentType.ActionRow ) return prev.concat(next.components);
+			else if ( next.type === Discord.ComponentType.Label ) return prev.concat([next.component]);
+			else return prev.slice();
 		}, [] ).map( option => {
-			return option.customId + ':' + option.value;
+			return option.customId + ':' + ( option.value ?? option.values );
 		} ).join(' ') );
 		if ( !interaction_commands.modal.hasOwnProperty(interaction.customId) ) {
 			if ( interaction.inGuild() && interaction.customId.startsWith( 'rc_' ) ) rcscriptButtons(interaction);

RcGcDw_buttons

@@ -154,13 +154,36 @@ function checkWiki(wiki) {
 					reject(dberror);
 				} );
 			} ).then( jsonBody => {
-				let body = JSON.parse(jsonBody);
-				delete body.logs;
-				delete body.tags;
-				delete body.namespaces;
-				delete body.wiki_rc;
-				body.timeline?.splice?.(5);
-				result.debug = body;
+				let {
+					wiki_url,
+					rc_targets,
+					discussion_targets,
+					last_checked_rc,
+					last_action,
+					last_checked_discussion,
+					last_post,
+					msgdelay,
+					recache_requested,
+					dont_fetch_before,
+					farm_wikiid,
+					timeline,
+					miraheze,
+				} = JSON.parse(jsonBody);
+				result.debug = {
+					wiki_url,
+					rc_targets,
+					discussion_targets,
+					last_checked_rc,
+					last_action,
+					last_checked_discussion,
+					last_post,
+					msgdelay,
+					timeline: timeline?.slice?.(0, 5),
+					recache_requested,
+					dont_fetch_before,
+					farm_wikiid,
+					miraheze,
+				};
 			} ).catch( error => {
 				result.debug = {error};
 			} ),

bot.js

@@ -32,10 +32,17 @@ function rcscript_buttons(interaction) {
 			data: {
 				custom_id: interaction.customId.replace( 'rc_', '' ),
 				component_type: interaction.componentType,
+				values: interaction.values,
 				components: interaction.components?.map( row => {
 					return {
 						type: row.type,
-						components: row.components.map( component => {
+						component: row.component && {
+							type: row.component.type,
+							value: row.component.value,
+							values: row.component.values,
+							custom_id: row.component.customId
+						},
+						components: row.components?.map( component => {
 							return {
 								type: component.type,
 								value: component.value,

cmds/eval.js

@@ -485,7 +485,7 @@ export default function verify(lang, logLang, channel, member, username, wiki, r
 				}
 			}
 			if ( wiki.hasCentralAuth() ) {
-				if ( mwbody.query.globaluserinfo.locked !== undefined ) {
+				if ( mwbody.query.globaluserinfo?.locked !== undefined ) {
 					embed.setColor('#FF0000').setDescription( lang.get('verify.user_gblocked', '[' + escapeFormatting(username) + '](<' + pagelink + '>)', queryuser.gender) );
 					result.content = lang.get('verify.user_gblocked_reply', escapeFormatting(username), queryuser.gender);
 					logEmbed.setColor('#FF0000').setDescription( logLang.get('verify.user_gblocked', '[' + escapeFormatting(username) + '](<' + pagelink + '>)', queryuser.gender) );
@@ -505,7 +505,7 @@ export default function verify(lang, logLang, channel, member, username, wiki, r
 					result.add_button = false;
 					return;
 				}
-				queryuser.groups.push(...mwbody.query.globaluserinfo.groups);
+				if ( mwbody.query.globaluserinfo?.groups?.length ) queryuser.groups.push(...mwbody.query.globaluserinfo.groups);
 			}
 			var {
 				'-1': {title: mypage} = {},
@@ -860,7 +860,7 @@ globalThis.verifyOauthUser = function(state, access_token, settings) {
 				}
 			}
 			if ( wiki.hasCentralAuth() ) {
-				if ( body.query.globaluserinfo.locked !== undefined ) {
+				if ( body.query.globaluserinfo?.locked !== undefined ) {
 					embed.setColor('#FF0000').setDescription( lang.get('verify.user_gblocked', '[' + escapeFormatting(username) + '](<' + pagelink + '>)', queryuser.gender) );
 					logEmbed.setColor('#FF0000').setDescription( logLang.get('verify.user_gblocked', '[' + escapeFormatting(username) + '](<' + pagelink + '>)', queryuser.gender) );
 					return sendMessage( {content: lang.get('verify.user_gblocked_reply', escapeFormatting(username), queryuser.gender), embeds: [embed]} ).then( msg => {
@@ -882,7 +882,7 @@ globalThis.verifyOauthUser = function(state, access_token, settings) {
 						verifynotice.logchannel.send( logMessage ).catch(log_error);
 					}, log_error );
 				}
-				queryuser.groups.push(...body.query.globaluserinfo.groups);
+				if ( body.query.globaluserinfo?.groups?.length ) queryuser.groups.push(...body.query.globaluserinfo.groups);
 			}
 
 			/** @type {[Set<String>,Set<String>]} */

functions/rcscript_buttons.js

@@ -1,5 +1,5 @@
 import { randomBytes } from 'node:crypto';
-import { MessageFlags, ActionRowBuilder, ButtonBuilder, ModalBuilder, TextInputBuilder, PermissionFlagsBits, ButtonStyle, TextInputStyle } from 'discord.js';
+import { MessageFlags, ActionRowBuilder, ButtonBuilder, ModalBuilder, TextInputBuilder, PermissionFlagsBits, ButtonStyle, TextInputStyle, LabelBuilder } from 'discord.js';
 import { inputToWikiProject } from 'mediawiki-projects-list';
 import db from '../util/database.js';
 import user_interaction from './user.js';
@@ -148,8 +148,8 @@ function interaction_verify(interaction, lang, wiki) {
 
 		if ( !username.trim() ) {
 			if ( interaction.isModalSubmit() ) return interaction.reply( {content: userLang.get('interaction.verify'), flags: MessageFlags.Ephemeral} ).catch(log_error);
-			return interaction.showModal( new ModalBuilder().setCustomId('verify').setTitle(userLang.get('verify.title')).addComponents(new ActionRowBuilder().addComponents(
-				new TextInputBuilder().setCustomId('username').setLabel(userLang.get('verify.username')).setPlaceholder(userLang.get('verify.placeholder')).setStyle(TextInputStyle.Short).setRequired().setMinLength(1).setMaxLength(500)
+			return interaction.showModal( new ModalBuilder().setCustomId('verify').setTitle(userLang.get('verify.title')).addLabelComponents(new LabelBuilder().setLabel(userLang.get('verify.username')).setTextInputComponent(
+				new TextInputBuilder().setCustomId('username').setPlaceholder(userLang.get('verify.placeholder')).setStyle(TextInputStyle.Short).setRequired().setMinLength(1).setMaxLength(500)
 			)) ).catch(log_error);
 		}
 

functions/verify.js

@@ -16,13 +16,13 @@
     "node": ">=23.1.0"
   },
   "dependencies": {
-    "cheerio": "^1.1.1",
+    "cheerio": "^1.1.2",
     "datetime-difference": "^1.0.2",
     "discord-oauth2": "^2.12.1",
-    "discord.js": "^14.21.0",
-    "dotenv": "^17.2.0",
+    "discord.js": "^14.23.0",
+    "dotenv": "^17.2.3",
     "full-icu": "^1.5.0",
-    "got": "^14.4.7",
+    "got": "^14.4.9",
     "got-ssrf": "^3.0.0",
     "htmlparser2": "^10.0.0",
     "mediawiki-projects-list": "^4.9.5",