Minimal dependency updates (#315)

kennytv · web-flow · commit ee07fe6b1d38 · 2025-09-10T21:14:26.000+02:00
Mainly updating jira.js to use newer API endpoints
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -18,7 +18,7 @@
     "discord.js": "^14.16.3",
     "emoji-regex": "^10.4.0",
     "escape-string-regexp": "^5.0.0",
-    "jira.js": "^2.20.1",
+    "jira.js": "^5.2.2",
     "js-yaml": "^4.1.0",
     "log4js": "^6.4.0"
   },
diff --git a/src/commands/BugCommand.ts b/src/commands/BugCommand.ts
@@ -1,4 +1,4 @@
-import { EmbedBuilder, ChatInputCommandInteraction } from 'discord.js';
+import { EmbedBuilder, ChatInputCommandInteraction, MessageFlagsBitField } from 'discord.js';
 import Command from './commandHandlers/Command.js';
 import { MentionRegistry } from '../mentions/MentionRegistry.js';
 import BotConfig from '../BotConfig.js';
@@ -29,7 +29,7 @@ export default class BugCommand extends SlashCommand {
 		for ( const ticket of tickets ) {
 			if ( !ticketRegex.test( ticket ) ) {
 				try {
-					await interaction.reply( { content: `'${ ticket }' is not a valid ticket ID.`, ephemeral: true } );
+					await interaction.reply( { content: `'${ ticket }' is not a valid ticket ID.`, flags: [MessageFlagsBitField.Flags.Ephemeral] } );
 				} catch ( err ) {
 					Command.logger.log( err );
 					return false;
@@ -45,7 +45,7 @@ export default class BugCommand extends SlashCommand {
 			embed = await mention.getEmbed();
 		} catch ( err ) {
 			try {
-				await interaction.reply( { content: err, ephemeral: true } );
+				await interaction.reply( { content: err, flags: [MessageFlagsBitField.Flags.Ephemeral] } );
 			} catch ( err ) {
 				Command.logger.log( err );
 				return false;
diff --git a/src/commands/HelpCommand.ts b/src/commands/HelpCommand.ts
@@ -1,4 +1,4 @@
-import { ChatInputCommandInteraction, EmbedBuilder } from 'discord.js';
+import { ChatInputCommandInteraction, EmbedBuilder, MessageFlagsBitField } from 'discord.js';
 import BotConfig from '../BotConfig.js';
 import SlashCommand from './commandHandlers/SlashCommand.js';
 
@@ -31,7 +31,7 @@ export default class HelpCommand extends SlashCommand {
 					\`/tips\` - Sends helpful info on how to use the bug tracker and this Discord server.`,
 				} )
 				.setFooter( { text: interaction.user.tag, iconURL: interaction.user.avatarURL() ?? undefined } );
-			await interaction.reply( { embeds: [embed], ephemeral: true } );
+			await interaction.reply( { embeds: [embed], flags: [MessageFlagsBitField.Flags.Ephemeral] } );
 		} catch {
 			return false;
 		}
diff --git a/src/commands/ModmailUnbanCommand.ts b/src/commands/ModmailUnbanCommand.ts
@@ -1,4 +1,4 @@
-import { ChatInputCommandInteraction } from 'discord.js';
+import { ChatInputCommandInteraction, MessageFlagsBitField } from 'discord.js';
 import BotConfig from '../BotConfig.js';
 import PermissionRegistry from '../permissions/PermissionRegistry.js';
 import SlashCommand from './commandHandlers/SlashCommand.js';
@@ -25,7 +25,7 @@ export default class ModmailUnbanCommand extends SlashCommand {
 				WHERE user = ?`
 			).run( args.id );
 			if ( unban.changes == 0 ) {
-				await interaction.reply( { content: 'User was never banned.', ephemeral: true } );
+				await interaction.reply( { content: 'User was never banned.', flags: [MessageFlagsBitField.Flags.Ephemeral] } );
 
 				return true;
 			}
diff --git a/src/commands/PollCommand.ts b/src/commands/PollCommand.ts
@@ -1,4 +1,4 @@
-import { ChatInputCommandInteraction, Message, EmbedBuilder } from 'discord.js';
+import { ChatInputCommandInteraction, Message, EmbedBuilder, MessageFlagsBitField } from 'discord.js';
 import Command from './commandHandlers/Command.js';
 import emojiRegex from 'emoji-regex';
 import PermissionRegistry from '../permissions/PermissionRegistry.js';
@@ -43,7 +43,7 @@ export default class PollCommand extends SlashCommand {
 				\`\`\`
 				<emoji> [<First option name>]~<emoji> [<Second option name>]~...
 				\`\`\``.replace( /\t/g, '' ),
-				ephemeral: true,
+				flags: [MessageFlagsBitField.Flags.Ephemeral],
 			} );
 		} catch ( err ) {
 			Command.logger.error( err );
diff --git a/src/commands/SearchCommand.ts b/src/commands/SearchCommand.ts
@@ -1,4 +1,4 @@
-import { EmbedBuilder, escapeMarkdown, ChatInputCommandInteraction } from 'discord.js';
+import { EmbedBuilder, escapeMarkdown, ChatInputCommandInteraction, MessageFlagsBitField } from 'discord.js';
 import SlashCommand from './commandHandlers/SlashCommand.js';
 import BotConfig from '../BotConfig.js';
 import MojiraBot from '../MojiraBot.js';
@@ -22,15 +22,15 @@ export default class SearchCommand extends SlashCommand {
 		try {
 			const embed = new EmbedBuilder();
 			const searchFilter = `(description ~ "${ plainArgs }" OR summary ~ "${ plainArgs }") AND project in (${ BotConfig.projects.join( ', ' ) })`;
-			const searchResults = await MojiraBot.jira.issueSearch.searchForIssuesUsingJql( {
+			const searchResults = await MojiraBot.jira.issueSearch.searchForIssuesUsingJqlEnhancedSearch( {
 				jql: searchFilter,
 				maxResults: BotConfig.maxSearchResults,
 				fields: [ 'key', 'summary' ],
 			} );
 
 			if ( !searchResults.issues ) {
 				embed.setTitle( `No results found for "${ escapeMarkdown( plainArgs ) }"` );
-				await interaction.reply( { embeds: [embed], ephemeral: true } );
+				await interaction.reply( { embeds: [embed], flags: [MessageFlagsBitField.Flags.Ephemeral] } );
 				return true;
 			}
 
@@ -48,14 +48,14 @@ export default class SearchCommand extends SlashCommand {
 			embed.setDescription( `__[See all results](https://bugs.mojang.com/issues/?jql=${ escapedJql })__` );
 
 			if ( interaction.channel !== null && ChannelConfigUtil.publicSearch( interaction.channel ) ) {
-				await interaction.reply( { embeds: [embed], ephemeral: false } );
+				await interaction.reply( { embeds: [embed] } );
 			} else {
-				await interaction.reply( { embeds: [embed], ephemeral: true } );
+				await interaction.reply( { embeds: [embed], flags: [MessageFlagsBitField.Flags.Ephemeral] } );
 			}
 		} catch {
 			const embed = new EmbedBuilder();
 			embed.setTitle( `No results found for "${ escapeMarkdown( plainArgs ) }"` );
-			await interaction.reply( { embeds: [embed], ephemeral: true } );
+			await interaction.reply( { embeds: [embed], flags: [MessageFlagsBitField.Flags.Ephemeral] } );
 			return false;
 		}
 
diff --git a/src/commands/SendCommand.ts b/src/commands/SendCommand.ts
@@ -1,4 +1,4 @@
-import { EmbedBuilder, TextChannel, NewsChannel, ChatInputCommandInteraction } from 'discord.js';
+import { EmbedBuilder, TextChannel, NewsChannel, ChatInputCommandInteraction, MessageFlagsBitField } from 'discord.js';
 import PermissionRegistry from '../permissions/PermissionRegistry.js';
 import SlashCommand from './commandHandlers/SlashCommand.js';
 
@@ -54,7 +54,7 @@ export default class SendCommand extends SlashCommand {
 				}
 			}
 		} else {
-			await interaction.reply( { content: `**Error:** ${ channel.name } is not a valid channel. `, ephemeral: true } );
+			await interaction.reply( { content: `**Error:** ${ channel.name } is not a valid channel. `, flags: [MessageFlagsBitField.Flags.Ephemeral] } );
 			return true;
 		}
 
diff --git a/src/commands/TipsCommand.ts b/src/commands/TipsCommand.ts
@@ -1,4 +1,4 @@
-import { ChatInputCommandInteraction, EmbedBuilder } from 'discord.js';
+import { ChatInputCommandInteraction, EmbedBuilder, MessageFlagsBitField } from 'discord.js';
 import SlashCommand from './commandHandlers/SlashCommand.js';
 
 export default class TipsCommand extends SlashCommand {
@@ -18,7 +18,7 @@ export default class TipsCommand extends SlashCommand {
 				Afterwards, you can use corresponding request channels in each project to make requests for changes to tickets on the bug tracker, like resolutions and adding affected versions. 
 				The moderators and helpers of the bug tracker will then be able to see the requests and resolve them.`.replace( /\t/g, '' ) )
 				.setFooter( { text: interaction.user.tag, iconURL: interaction.user.avatarURL() ?? undefined } );
-			await interaction.reply( { embeds: [embed], ephemeral: true } );
+			await interaction.reply( { embeds: [embed], flags: [MessageFlagsBitField.Flags.Ephemeral] } );
 		} catch {
 			return false;
 		}
diff --git a/src/commands/commandHandlers/SlashCommandRegister.ts b/src/commands/commandHandlers/SlashCommandRegister.ts
@@ -2,7 +2,7 @@ import SlashCommand from './SlashCommand.js';
 import SlashCommandRegistry from './SlashCommandRegistry.js';
 import { REST } from '@discordjs/rest';
 import { Routes } from 'discord-api-types/v9';
-import { Client, Collection, RESTPostAPIApplicationCommandsJSONBody, ChatInputCommandInteraction, GuildMember } from 'discord.js';
+import { Client, Collection, RESTPostAPIApplicationCommandsJSONBody, ChatInputCommandInteraction, GuildMember, MessageFlagsBitField } from 'discord.js';
 import { SlashCommandJsonData } from '../../types/discord.js';
 import { ChannelConfigUtil } from '../../util/ChannelConfigUtil.js';
 
@@ -29,12 +29,12 @@ export default class SlashCommandRegister {
 
 						if ( command.checkPermission( member ) ) {
 							if ( interaction.channel !== null && ChannelConfigUtil.commandsDisabled( interaction.channel ) ) {
-								await interaction.reply( { content: 'Commands are not allowed in this channel.', ephemeral: true } );
+								await interaction.reply( { content: 'Commands are not allowed in this channel.', flags: [MessageFlagsBitField.Flags.Ephemeral] } );
 							} else if ( !await command.run( interaction ) ) {
-								await interaction.reply( { content: 'An error occurred while running this command.', ephemeral: true } );
+								await interaction.reply( { content: 'An error occurred while running this command.', flags: [MessageFlagsBitField.Flags.Ephemeral] } );
 							}
 						} else {
-							await interaction.reply( { content: 'You do not have permission to use this command.', ephemeral: true } );
+							await interaction.reply( { content: 'You do not have permission to use this command.', flags: [MessageFlagsBitField.Flags.Ephemeral] } );
 						}
 					},
 				};
diff --git a/src/events/message/MessageUpdateEventHandler.ts b/src/events/message/MessageUpdateEventHandler.ts
@@ -1,5 +1,5 @@
 import EventHandler from '../EventHandler.js';
-import { Message, MessageType, Snowflake } from 'discord.js';
+import { Message, MessageType, PartialMessage, Snowflake } from 'discord.js';
 import BotConfig from '../../BotConfig.js';
 import RequestUpdateEventHandler from '../request/RequestUpdateEventHandler.js';
 import DiscordUtil from '../../util/DiscordUtil.js';
@@ -18,7 +18,7 @@ export default class MessageUpdateEventHandler implements EventHandler<'messageU
 	}
 
 	// This syntax is used to ensure that `this` refers to the `MessageUpdateEventHandler` object
-	public onEvent = async ( oldMessage: Message, newMessage: Message ): Promise<void> => {
+	public onEvent = async ( oldMessage: Message | PartialMessage, newMessage: Message ): Promise<void> => {
 		oldMessage = await DiscordUtil.fetchMessage( oldMessage );
 		newMessage = await DiscordUtil.fetchMessage( newMessage );
 
diff --git a/src/events/request/RequestUpdateEventHandler.ts b/src/events/request/RequestUpdateEventHandler.ts
@@ -1,4 +1,4 @@
-import { EmbedBuilder, Message, Snowflake, TextChannel } from 'discord.js';
+import { EmbedBuilder, Message, PartialMessage, Snowflake, TextChannel } from 'discord.js';
 import log4js from 'log4js';
 import EventHandler from '../EventHandler.js';
 import { RequestsUtil } from '../../util/RequestsUtil.js';
@@ -19,8 +19,8 @@ export default class RequestUpdateEventHandler implements EventHandler<'messageU
 	}
 
 	// This syntax is used to ensure that `this` refers to the `RequestUpdateEventHandler` object
-	public onEvent = async ( oldMessage: Message, newMessage: Message ): Promise<void> => {
-		this.logger.info( `User ${ oldMessage.author.tag }'s request ${ oldMessage.id } in channel ${ oldMessage.channel.id } was updated` );
+	public onEvent = async ( oldMessage: Message | PartialMessage, newMessage: Message ): Promise<void> => {
+		this.logger.info( `User ${ oldMessage.author?.tag }'s request ${ oldMessage.id } in channel ${ oldMessage.channel.id } was updated` );
 
 		const internalChannelId = this.internalChannels.get( oldMessage.channel.id );
 		if ( internalChannelId === undefined ) return;
@@ -36,7 +36,7 @@ export default class RequestUpdateEventHandler implements EventHandler<'messageU
 				if ( result.channelId === oldMessage.channel.id && result.messageId === oldMessage.id ) {
 					try {
 						const embed = new EmbedBuilder( internalMessage.embeds[0].data );
-						embed.setAuthor( { name: oldMessage.author.tag, iconURL: oldMessage.author.avatarURL() ?? undefined } );
+						embed.setAuthor( { name: oldMessage.author?.tag ?? 'unknown', iconURL: oldMessage.author?.avatarURL() ?? undefined } );
 						embed.setDescription( RequestsUtil.getRequestDescription( newMessage ) );
 						await internalMessage.edit( { embeds: [embed] } );
 					} catch ( error ) {
diff --git a/src/mentions/MultipleMention.ts b/src/mentions/MultipleMention.ts
@@ -20,7 +20,7 @@ export class MultipleMention extends Mention {
 		let searchResults: any;
 
 		try {
-			searchResults = await MojiraBot.jira.issueSearch.searchForIssuesUsingJql( {
+			searchResults = await MojiraBot.jira.issueSearch.searchForIssuesUsingJqlEnhancedSearch( {
 				jql: `id IN (${ this.tickets.join( ',' ) }) ORDER BY key ASC`,
 				maxResults: 10,
 				fields: [ 'key', 'summary' ],
diff --git a/src/tasks/CachedFilterFeedTask.ts b/src/tasks/CachedFilterFeedTask.ts
@@ -8,7 +8,7 @@ import MojiraBot from '../MojiraBot.js';
 
 export default class CachedFilterFeedTask extends Task {
 	private static logger = log4js.getLogger( 'CachedFilterFeedTask' );
-	private static lastRunRegex = /\{\{lastRun\}\}/g;
+	private static lastRunRegex = /\{\{lastRun}}/g;
 
 	private channel: SendableChannels;
 	private jql: string;
@@ -30,14 +30,14 @@ export default class CachedFilterFeedTask extends Task {
 		this.jqlRemoved = feedConfig.jqlRemoved;
 		this.filterFeedEmoji = feedConfig.filterFeedEmoji;
 		this.title = feedConfig.title;
-		this.titleSingle = feedConfig.titleSingle || feedConfig.title.replace( /\{\{num\}\}/g, '1' );
+		this.titleSingle = feedConfig.titleSingle || feedConfig.title.replace( /\{\{num}}/g, '1' );
 		this.publish = feedConfig.publish ?? false;
 	}
 
 	protected async init(): Promise<void> {
 		this.lastRun = new Date().valueOf();
 
-		const searchResults = await MojiraBot.jira.issueSearch.searchForIssuesUsingJql( {
+		const searchResults = await MojiraBot.jira.issueSearch.searchForIssuesUsingJqlEnhancedSearch( {
 			jql: this.jql.replace( CachedFilterFeedTask.lastRunRegex, this.lastRun.toString() ),
 			fields: ['key'],
 		} );
@@ -53,7 +53,7 @@ export default class CachedFilterFeedTask extends Task {
 		let upcomingTickets: string[];
 
 		try {
-			const searchResults = await MojiraBot.jira.issueSearch.searchForIssuesUsingJql( {
+			const searchResults = await MojiraBot.jira.issueSearch.searchForIssuesUsingJqlEnhancedSearch( {
 				jql: this.jql.replace( CachedFilterFeedTask.lastRunRegex, this.lastRun.toString() ),
 				fields: ['key'],
 			} );
@@ -72,7 +72,7 @@ export default class CachedFilterFeedTask extends Task {
 		if ( this.jqlRemoved !== undefined ) {
 			try {
 				const ticketKeys = Array.from( this.knownTickets );
-				const previousTicketResults = await MojiraBot.jira.issueSearch.searchForIssuesUsingJql( {
+				const previousTicketResults = await MojiraBot.jira.issueSearch.searchForIssuesUsingJqlEnhancedSearch( {
 					jql: `${ this.jqlRemoved.replace( CachedFilterFeedTask.lastRunRegex, this.lastRun.toString() ) } AND key in (${ ticketKeys.join( ',' ) })`,
 					fields: ['key'],
 				} );
@@ -107,7 +107,7 @@ export default class CachedFilterFeedTask extends Task {
 
 				if ( unknownTickets.length > 1 ) {
 					embed.setTitle(
-						this.title.replace( /\{\{num\}\}/g, unknownTickets.length.toString() )
+						this.title.replace( /\{\{num}}/g, unknownTickets.length.toString() )
 					);
 					filterFeedMessage = await this.channel.send( { embeds: [embed] } );
 				} else {
diff --git a/src/tasks/FilterFeedTask.ts b/src/tasks/FilterFeedTask.ts
@@ -39,7 +39,7 @@ export default class FilterFeedTask extends Task {
 		let unknownTickets: string[];
 
 		try {
-			const searchResults = await MojiraBot.jira.issueSearch.searchForIssuesUsingJql( {
+			const searchResults = await MojiraBot.jira.issueSearch.searchForIssuesUsingJqlEnhancedSearch( {
 				jql: this.jql.replace( FilterFeedTask.lastRunRegex, this.lastRun.toString() ),
 				fields: ['key'],
 			} );
diff --git a/src/tasks/VersionFeedTask.ts b/src/tasks/VersionFeedTask.ts
@@ -5,7 +5,7 @@ import { NewsUtil } from '../util/NewsUtil.js';
 import MojiraBot from '../MojiraBot.js';
 import Task from './Task.js';
 import { LoggerUtil } from '../util/LoggerUtil.js';
-import { Version } from 'jira.js/out/version2/models';
+import { Version } from 'jira.js/src/version3/models';
 
 interface JiraVersion {
 	id: string;
diff --git a/src/util/RequestsUtil.ts b/src/util/RequestsUtil.ts
@@ -107,7 +107,7 @@ export class RequestsUtil {
 	public static async checkTicketValidity( tickets: string[] ): Promise<boolean> {
 		try {
 			this.logger.debug( `Checking for ticket validity of tickets ${ tickets.join( ',' ) }` );
-			const searchResults = await MojiraBot.jira.issueSearch.searchForIssuesUsingJql( {
+			const searchResults = await MojiraBot.jira.issueSearch.searchForIssuesUsingJqlEnhancedSearch( {
 				jql: `(${ BotConfig.request.invalidRequestJql }) AND key in (${ tickets.join( ',' ) })`,
 				fields: ['key'],
 			} );

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { EmbedBuilder, TextChannel, NewsChannel, ChatInputCommandInteraction } from 'discord.js';`
	`1`	`+import { EmbedBuilder, TextChannel, NewsChannel, ChatInputCommandInteraction, MessageFlagsBitField } from 'discord.js';`
`2`	`2`	`import PermissionRegistry from '../permissions/PermissionRegistry.js';`
`3`	`3`	`import SlashCommand from './commandHandlers/SlashCommand.js';`
`4`	`4`
`@@ -54,7 +54,7 @@ export default class SendCommand extends SlashCommand {`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`	`} else {`
`57`		- await interaction.reply( { content: `Error: ${ channel.name } is not a valid channel. `, ephemeral: true } );
	`57`	+ await interaction.reply( { content: `Error: ${ channel.name } is not a valid channel. `, flags: [MessageFlagsBitField.Flags.Ephemeral] } );
`58`	`58`	`return true;`
`59`	`59`	`}`
`60`	`60`