update deps

Markus-Rost · Jan 23, 2025 · 29b346f · 29b346f
1 parent 44cb9ab
commit 29b346f
Show file tree

Hide file tree

Showing 33 changed files with 394 additions and 819 deletions.
diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
@@ -21,7 +21,7 @@ jobs:
           - 5432:5432
     strategy:	
       matrix:	
-        node-version: [21.6.1]
+        node-version: [23.6.1]
     steps:
     - uses: actions/checkout@v4
     - name: Use Node.js ${{ matrix.node-version }}

diff --git a/RcGcDw_buttons b/RcGcDw_buttons
diff --git a/cmds/eval.js b/cmds/eval.js
@@ -1,16 +1,18 @@
 import { inspect } from 'node:util';
 import { load as cheerioLoad } from 'cheerio';
 import * as Discord from 'discord.js';
+import { botLimits } from '../util/defaults.js';
 import { got, isMessage } from '../util/functions.js';
 import newMessage from '../util/newMessage.js';
 import Wiki from '../util/wiki.js';
 import db from '../util/database.js';
 import { createRequire } from 'node:module';
 const require = createRequire(import.meta.url);
-const {limit: {verification: verificationLimit, rcgcdw: rcgcdwLimit}} = require('../util/default.json');
 
 inspect.defaultOptions = {compact: false, breakLength: Infinity, depth: 3};
 
+const {verification: verificationLimit, rcgcdw: rcgcdwLimit} = botLimits;
+
 /**
  * Processes the "eval" command.
  * @param {import('../util/i18n.js').default} lang - The user language.

diff --git a/cmds/get.js b/cmds/get.js
@@ -1,9 +1,8 @@
 import { EmbedBuilder, ShardClientUtil, ChannelType, PermissionFlagsBits } from 'discord.js';
+import { defaultSettings, defaultPermissions } from '../util/defaults.js';
 import { canShowEmbed, escapeFormatting, splitMessage } from '../util/functions.js';
 import db from '../util/database.js';
-import { createRequire } from 'node:module';
-const require = createRequire(import.meta.url);
-const {defaultSettings, defaultPermissions} = require('../util/default.json');
+
 const {shardIdForGuildId} = ShardClientUtil;
 
 /**

diff --git a/cmds/help.js b/cmds/help.js
@@ -1,10 +1,10 @@
 import { wikiProjects, frontendProxies } from 'mediawiki-projects-list';
 import help_server from '../functions/helpserver.js';
 import { splitMessage } from '../util/functions.js';
-import { createRequire } from 'node:module';
 import { ApplicationCommandOptionType } from 'discord.js';
-const require = createRequire(import.meta.url);
-const {wikis: mcw} = require('./minecraft/commands.json');
+import mcwCommands from './minecraft/commands.json' with { type: 'json' };
+
+const mcw = mcwCommands.wikis;
 
 const helpmap = {
 	linkHelp: ['slash.wiki', 'default', 'slash.inline', 'inline.link', 'inline.template', 'subprefix', 'slash.interwiki', 'mwprojects'],

diff --git a/cmds/invite.js b/cmds/invite.js
@@ -1,7 +1,5 @@
 import { OAuth2Scopes } from 'discord.js';
-import { createRequire } from 'node:module';
-const require = createRequire(import.meta.url);
-const {defaultPermissions} = require('../util/default.json');
+import { defaultPermissions } from '../util/defaults.js';
 
 /**
  * Processes the "invite" command.
@@ -25,7 +23,7 @@ export default function cmd_invite(lang, msg, args, line, wiki) {
 		});
 		let text = lang.get('invite.bot') + '\n<' + invite + '>';
 		if ( msg.client.application.id === '461189216198590464' ) {
-			text += '\n' + lang.get('invite.directory') + '\nhttps://discord.com/application-directory/' + msg.client.application.id;
+			text += '\n' + lang.get('invite.directory') + '\nhttps://discord.com/discovery/applications/' + msg.client.application.id;
 		}
 		msg.sendChannel( text );
 	}

diff --git a/cmds/minecraft/syntax.js b/cmds/minecraft/syntax.js
@@ -1,8 +1,6 @@
+import commands from './commands.json' with { type: 'json' };
 import { got, splitMessage } from '../../util/functions.js';
 import Wiki from '../../util/wiki.js';
-import { createRequire } from 'node:module';
-const require = createRequire(import.meta.url);
-const commands = require('./commands.json');
 
 /**
  * Sends a Minecraft command.

diff --git a/cmds/patreon.js b/cmds/patreon.js
@@ -1,8 +1,8 @@
 import { ShardClientUtil, OAuth2Scopes, ChannelType } from 'discord.js';
+import { botLimits, defaultPermissions } from '../util/defaults.js';
 import db from '../util/database.js';
-import { createRequire } from 'node:module';
-const require = createRequire(import.meta.url);
-const {defaultPermissions, limit: {verification: verificationLimit, rcgcdw: rcgcdwLimit}} = require('../util/default.json');
+
+const {verification: verificationLimit, rcgcdw: rcgcdwLimit} = botLimits;
 const {shardIdForGuildId} = ShardClientUtil;
 
 /**

diff --git a/cmds/rcscript.js b/cmds/rcscript.js
@@ -1,14 +1,14 @@
 import { existsSync } from 'node:fs';
 import { load as cheerioLoad } from 'cheerio';
 import { ButtonStyle, ActionRowBuilder, ButtonBuilder, PermissionFlagsBits } from 'discord.js';
+import { botLimits } from '../util/defaults.js';
 import help_setup from '../functions/helpsetup.js';
 import { got, canShowEmbed, splitMessage } from '../util/functions.js';
 import Lang from '../util/i18n.js';
 import Wiki from '../util/wiki.js';
 import db from '../util/database.js';
-import { createRequire } from 'node:module';
-const require = createRequire(import.meta.url);
-const {limit: {rcgcdw: rcgcdwLimit}} = require('../util/default.json');
+
+const {rcgcdw: rcgcdwLimit} = botLimits;
 const allLangs = Lang.allLangs(true);
 
 const rcscriptExists = ( isDebug || existsSync('./RcGcDb/start.py') );

diff --git a/cmds/settings.js b/cmds/settings.js
@@ -1,12 +1,11 @@
 import { load as cheerioLoad } from 'cheerio';
 import { EmbedBuilder, ActionRowBuilder, ButtonBuilder, ButtonStyle } from 'discord.js';
+import { defaultSettings } from '../util/defaults.js';
 import { got, splitMessage } from '../util/functions.js';
 import Lang from '../util/i18n.js';
 import Wiki from '../util/wiki.js';
 import db from '../util/database.js';
-import { createRequire } from 'node:module';
-const require = createRequire(import.meta.url);
-const {defaultSettings} = require('../util/default.json');
+
 const allLangs = Lang.allLangs();
 
 /**

diff --git a/cmds/verification.js b/cmds/verification.js
@@ -1,10 +1,10 @@
 import { ButtonStyle, ActionRowBuilder, ButtonBuilder, PermissionFlagsBits, ChannelType } from 'discord.js';
+import { botLimits } from '../util/defaults.js';
 import help_setup from '../functions/helpsetup.js';
 import db from '../util/database.js';
 import { got, splitMessage } from '../util/functions.js';
-import { createRequire } from 'node:module';
-const require = createRequire(import.meta.url);
-const {limit: {verification: verificationLimit}} = require('../util/default.json');
+
+const {verification: verificationLimit} = botLimits;
 
 /**
  * Processes the "verification" command.

diff --git a/cmds/wiki/diff.js b/cmds/wiki/diff.js
@@ -1,10 +1,8 @@
 import { EmbedBuilder, time as timeMarkdown, TimestampStyles } from 'discord.js';
+import { timeoptions } from '../../util/defaults.js';
 import logging from '../../util/logging.js';
 import { got, htmlToDiscord, escapeFormatting, splitMessage } from '../../util/functions.js';
 import diffParser from '../../util/edit_diff.js';
-import { createRequire } from 'node:module';
-const require = createRequire(import.meta.url);
-const {timeoptions} = require('../../util/default.json');
 
 /**
  * Processes a wiki edit.

diff --git a/cmds/wiki/discussion.js b/cmds/wiki/discussion.js
@@ -1,9 +1,9 @@
 import { Parser as HTMLParser } from 'htmlparser2';
 import { EmbedBuilder } from 'discord.js';
+import { botLimits } from '../../util/defaults.js';
 import { got, htmlToDiscord, escapeFormatting, splitMessage } from '../../util/functions.js';
-import { createRequire } from 'node:module';
-const require = createRequire(import.meta.url);
-const {limit: {discussion: discussionLimit}} = require('../../util/default.json');
+
+const {discussion: discussionLimit} = botLimits;
 
 /**
  * Processes discussion commands.

diff --git a/cmds/wiki/general.js b/cmds/wiki/general.js
@@ -1,17 +1,18 @@
 import { readdir } from 'node:fs';
 import { EmbedBuilder } from 'discord.js';
 import { getWikiProject, urlToIdString } from 'mediawiki-projects-list';
+import mcwCommands from '../minecraft/commands.json' with { type: 'json' };
+import { botLimits } from '../../util/defaults.js';
 import parse_page from '../../functions/parse_page.js';
 import phabricator, { phabricatorSites } from '../../functions/phabricator.js';
 import logging from '../../util/logging.js';
 import { got, isMessage, htmlToDiscord, escapeFormatting, escapeRegExp, partialURIdecode, breakOnTimeoutPause } from '../../util/functions.js';
 import extract_desc from '../../util/extract_desc.js';
 import Wiki from '../../util/wiki.js';
 import * as fn from './functions.js'
-import { createRequire } from 'node:module';
-const require = createRequire(import.meta.url);
-const {limit: {interwiki: interwikiLimit}} = require('../../util/default.json');
-const {wikis: mcw} = require('../minecraft/commands.json');
+
+const {interwiki: interwikiLimit} = botLimits;
+const mcw = mcwCommands.wikis;
 
 var minecraft = {
 	WIKI: mw_check_wiki

diff --git a/cmds/wiki/overview.js b/cmds/wiki/overview.js
@@ -1,10 +1,8 @@
 import { load as cheerioLoad } from 'cheerio';
 import { EmbedBuilder, time as timeMarkdown, TimestampStyles } from 'discord.js';
+import { timeoptions } from '../../util/defaults.js';
 import logging from '../../util/logging.js';
 import { got, isMessage, toMarkdown, escapeFormatting, limitLength } from '../../util/functions.js';
-import { createRequire } from 'node:module';
-const require = createRequire(import.meta.url);
-const {timeoptions} = require('../../util/default.json');
 
 /**
  * Sends a wiki overview.

diff --git a/cmds/wiki/search.js b/cmds/wiki/search.js
@@ -1,8 +1,8 @@
 import { EmbedBuilder } from 'discord.js';
+import { botLimits } from '../../util/defaults.js';
 import { got, escapeFormatting, splitMessage } from '../../util/functions.js';
-import { createRequire } from 'node:module';
-const require = createRequire(import.meta.url);
-const {limit: {search: searchLimit}} = require('../../util/default.json');
+
+const {search: searchLimit} = botLimits;
 
 /**
  * Searches a wiki.

diff --git a/cmds/wiki/special_page.js b/cmds/wiki/special_page.js
@@ -1,9 +1,7 @@
 import { EmbedBuilder, PermissionFlagsBits, time as timeMarkdown, TimestampStyles } from 'discord.js';
+import { timeoptions } from '../../util/defaults.js';
 import logging from '../../util/logging.js';
 import { got, toMarkdown, escapeFormatting, splitMessage } from '../../util/functions.js';
-import { createRequire } from 'node:module';
-const require = createRequire(import.meta.url);
-const {timeoptions} = require('../../util/default.json');
 
 const overwrites = {
 	/** @param {import('../../util/wiki.js').default} wiki */

diff --git a/cmds/wiki/user.js b/cmds/wiki/user.js
@@ -1,13 +1,11 @@
 import { EmbedBuilder, time as timeMarkdown, TimestampStyles } from 'discord.js';
 import datetimeDifference from 'datetime-difference';
+import { timeoptions, usergroups } from '../../util/defaults.js';
 import global_block from '../../functions/global_block.js';
 import parse_page from '../../functions/parse_page.js';
 import logging from '../../util/logging.js';
 import extract_desc from '../../util/extract_desc.js';
 import { got, isMessage, toMarkdown, htmlToDiscord, escapeFormatting } from '../../util/functions.js';
-import { createRequire } from 'node:module';
-const require = createRequire(import.meta.url);
-const {timeoptions, usergroups} = require('../../util/default.json');
 
 /**
  * Processes a wiki user.

diff --git a/dashboard/functions/rcscript.js b/dashboard/functions/rcscript.js
@@ -1,11 +1,11 @@
 import { existsSync } from 'node:fs';
 import { load as cheerioLoad } from 'cheerio';
+import { botLimits, defaultSettings } from '../../util/defaults.js';
 import Lang from '../../util/i18n.js';
 import Wiki from '../../util/wiki.js';
 import { got, db, canRcGcDwButtons, sendMsg, createNotice, hasPerm, PermissionFlagsBits } from '../util.js';
-import { createRequire } from 'node:module';
-const require = createRequire(import.meta.url);
-const {defaultSettings, limit: {rcgcdw: rcgcdwLimit}} = require('../../util/default.json');
+
+const {rcgcdw: rcgcdwLimit} = botLimits;
 const allLangs = Lang.allLangs(true).names;
 
 const buttonsExists = ( process.env.buttons_token && process.env.buttons_url && existsSync('./RcGcDw_buttons/main.js') );

diff --git a/dashboard/functions/settings.js b/dashboard/functions/settings.js
@@ -1,11 +1,10 @@
 import { load as cheerioLoad } from 'cheerio';
 import { wikiProjects, frontendProxies } from 'mediawiki-projects-list';
+import { defaultSettings } from '../../util/defaults.js';
 import Lang from '../../util/i18n.js';
 import Wiki from '../../util/wiki.js';
 import { got, db, sendMsg, createNotice, hasPerm, PermissionFlagsBits } from '../util.js';
-import { createRequire } from 'node:module';
-const require = createRequire(import.meta.url);
-const {defaultSettings} = require('../../util/default.json');
+
 const allLangs = Lang.allLangs().names;
 const wikiProjectNames = [];
 wikiProjects.forEach( wikiProject => {

diff --git a/dashboard/functions/verification.js b/dashboard/functions/verification.js
@@ -1,9 +1,9 @@
 import { EmbedBuilder } from 'discord.js';
+import { botLimits, usergroups } from '../../util/defaults.js';
 import Lang from '../../util/i18n.js';
 import { got, db, sendMsg, createNotice, escapeText, hasPerm, PermissionFlagsBits } from '../util.js';
-import { createRequire } from 'node:module';
-const require = createRequire(import.meta.url);
-const {limit: {verification: verificationLimit}, usergroups} = require('../../util/default.json');
+
+const {verification: verificationLimit} = botLimits;
 
 const buttonStyles = ['Primary', 'Secondary', 'Success', 'Danger'];
 

diff --git a/dashboard/guilds.js b/dashboard/guilds.js
@@ -1,11 +1,10 @@
 import { existsSync, readFileSync } from 'node:fs';
 import { load as cheerioLoad } from 'cheerio';
+import { defaultPermissions } from '../util/defaults.js';
 import { forms, beta } from './functions.js';
 import Lang from './i18n.js';
 import { oauth, enabledOAuth2, settingsData, addWidgets, createNotice, OAuth2Scopes } from './util.js';
-import { createRequire } from 'node:module';
-const require = createRequire(import.meta.url);
-const {defaultPermissions} = require('../util/default.json');
+
 const allLangs = Lang.allLangs().names;
 
 const rcscriptExists = ( isDebug || existsSync('./RcGcDb/start.py') );

diff --git a/dashboard/i18n.js b/dashboard/i18n.js
@@ -1,9 +1,10 @@
+import i18n from './i18n/allLangs.json' with { type: 'json' };
+import { defaultSettings } from '../util/defaults.js';
 import { escapeText } from './util.js';
-import { createRequire } from 'node:module';
-const require = createRequire(import.meta.url);
-const {defaultSettings} = require('../util/default.json');
-const i18n = require('./i18n/allLangs.json');
-Object.keys(i18n.allLangs.names).forEach( lang => i18n[lang] = require('./i18n/' + lang + '.json') );
+
+await Promise.all(
+	Object.keys(i18n.allLangs.names).map( async lang => i18n[lang] = ( await import(`./i18n/${lang}.json`, {with: {type: 'json'}}) ).default )
+);
 
 /**
  * A language.

diff --git a/dashboard/oauth.js b/dashboard/oauth.js
@@ -1,12 +1,11 @@
 import { readFileSync } from 'node:fs';
 import { randomBytes } from 'node:crypto';
 import { load as cheerioLoad } from 'cheerio';
+import { defaultPermissions } from '../util/defaults.js';
 import Wiki from '../util/wiki.js';
 import { allLangs } from './i18n.js';
 import { got, db, oauth, enabledOAuth2, canRcGcDwButtons, sessionData, settingsData, oauthVerify, sendMsg, addWidgets, createNotice, hasPerm, PermissionFlagsBits, OAuth2Scopes } from './util.js';
-import { createRequire } from 'node:module';
-const require = createRequire(import.meta.url);
-const {defaultPermissions} = require('../util/default.json');
+
 const allLangNames = allLangs().names;
 
 const file = readFileSync('./dashboard/login.html');

diff --git a/database.js b/database.js
@@ -1,7 +1,7 @@
-import { createRequire } from 'node:module';
 import pg from 'pg';
-const require = createRequire(import.meta.url);
-const {defaultSettings} = require('./util/default.json');
+import defaultData from './util/default.json' with { type: 'json' };
+
+const defaultSettings = defaultData.defaultSettings;
 const db = new pg.Client(process.env.PGSSL === 'true' ? {ssl: true} : {});
 db.on( 'error', dberror => {
 	console.log( '- Error while connecting to the database: ' + dberror );

diff --git a/interactions/interwiki.js b/interactions/interwiki.js
@@ -1,11 +1,9 @@
 import { wikiProjects, inputToWikiProject, idStringToUrl, inputToFrontendProxy } from 'mediawiki-projects-list';
+import { defaultSettings } from '../util/defaults.js';
 import db from '../util/database.js';
 import Wiki from '../util/wiki.js';
 import { got } from '../util/functions.js';
 import wiki_interaction from './wiki.js';
-import { createRequire } from 'node:module';
-const require = createRequire(import.meta.url);
-const {defaultSettings} = require('../util/default.json');
 
 const allWikiProjects = [...wikiProjects.values()];
 /** @type {Set<String>} */

diff --git a/interactions/patreon.js b/interactions/patreon.js
@@ -1,8 +1,8 @@
 import { ShardClientUtil, OAuth2Scopes, ChannelType } from 'discord.js';
+import { botLimits, defaultPermissions } from '../util/defaults.js';
 import db from '../util/database.js';
-import { createRequire } from 'node:module';
-const require = createRequire(import.meta.url);
-const {defaultPermissions, limit: {verification: verificationLimit, rcgcdw: rcgcdwLimit}} = require('../util/default.json');
+
+const {verification: verificationLimit, rcgcdw: rcgcdwLimit} = botLimits;
 const {shardIdForGuildId} = ShardClientUtil;
 
 /** @type {Map<String, {id: String, name: String, patreon: Boolean}[]>} */
+9 −0		i18n/id.json
+209 −637		package-lock.json
+4 −4		package.json
+3 −0		src/block.js
+3 −0		src/delete.js
+6 −0		src/filerevert.js
+3 −0		src/move.js
+3 −0		src/rollback.js
+3 −0		src/thank.js
+3 −0		src/token.js
+3 −0		src/undo.js
+17 −4		src/util.js