diff --git a/src/discord/Developer/Debug.ts b/src/discord/Developer/Debug.ts index 328e856..87d726d 100644 --- a/src/discord/Developer/Debug.ts +++ b/src/discord/Developer/Debug.ts @@ -162,7 +162,7 @@ export default class Debug extends DiscordModule { }); }, invalidInteraction: async (data: HybridInteractionMessage) => { - const row = new ActionRowBuilder().addComponents( + const row = new ActionRowBuilder().addComponents([ new ButtonBuilder() .setEmoji('πŸ˜₯') .setLabel( @@ -170,7 +170,7 @@ export default class Debug extends DiscordModule { ) .setCustomId('dev_make_invalid_interaction') .setStyle(ButtonStyle.Primary) - ); + ]); await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.INVALID_TEST(data)], components: [row] diff --git a/src/discord/MembershipScreening.ts b/src/discord/MembershipScreening.ts index a591a7d..475feb6 100644 --- a/src/discord/MembershipScreening.ts +++ b/src/discord/MembershipScreening.ts @@ -272,28 +272,34 @@ export default class MembershipScreening extends DiscordModule { }); if (!requesterMember) { - newEmbed.addFields({ - name: '❌ Invalid', - value: `Unable to find the user. User left already?` - }); + newEmbed.addFields([ + { + name: '❌ Invalid', + value: `Unable to find the user. User left already?` + } + ]); return await message.edit({ components: [], embeds: [newEmbed] }); } if (requesterMember.roles.cache.has(PrismaGuild.MembershipScreening_GivenRole)) { - newEmbed.addFields({ - name: 'βœ… Approved', - value: `By: Unknown (User already obtained the role by other means)` - }); + newEmbed.addFields([ + { + name: 'βœ… Approved', + value: `By: Unknown (User already obtained the role by other means)` + } + ]); return await message.edit({ components: [], embeds: [newEmbed] }); } if (payload.a === 'approve') { try { await requesterMember.roles.add(role); - newEmbed.addFields({ - name: 'βœ… Approved', - value: `By: ${interaction.user.username}#${interaction.user.discriminator} (${interaction.user.id})` - }); + newEmbed.addFields([ + { + name: 'βœ… Approved', + value: `By: ${interaction.user.username}#${interaction.user.discriminator} (${interaction.user.id})` + } + ]); await message.edit({ components: [], embeds: [newEmbed] }); } catch (err) { return interaction.reply({ @@ -304,10 +310,12 @@ export default class MembershipScreening extends DiscordModule { } else if (payload.a === 'deny') { try { await requesterMember.kick(); - newEmbed.addFields({ - name: '❌ Denied', - value: `By: ${interaction.user.username}#${interaction.user.discriminator} (${interaction.user.id})` - }); + newEmbed.addFields([ + { + name: '❌ Denied', + value: `By: ${interaction.user.username}#${interaction.user.discriminator} (${interaction.user.id})` + } + ]); await message.edit({ components: [], embeds: [newEmbed] }); } catch (err) { return interaction.reply({ @@ -320,10 +328,12 @@ export default class MembershipScreening extends DiscordModule { await requesterMember.ban({ reason: `Membership Screening, action issued by ${interaction.user.username}#${interaction.user.discriminator} (${interaction.user.id})` }); - newEmbed.addFields({ - name: 'πŸ”ͺ Banned', - value: `By: ${interaction.user.username}#${interaction.user.discriminator} (${interaction.user.id})` - }); + newEmbed.addFields([ + { + name: 'πŸ”ͺ Banned', + value: `By: ${interaction.user.username}#${interaction.user.discriminator} (${interaction.user.id})` + } + ]); await message.edit({ components: [], embeds: [newEmbed] }); } catch (err) { return interaction.reply({ @@ -556,7 +566,7 @@ export default class MembershipScreening extends DiscordModule { embed.setThumbnail(`${member.user.displayAvatarURL()}?size=4096`); const row = new ActionRowBuilder() - .addComponents( + .addComponents([ new ButtonBuilder() .setCustomId( JSON.stringify({ @@ -569,9 +579,7 @@ export default class MembershipScreening extends DiscordModule { ) .setEmoji('βœ…') .setLabel(' Approve') - .setStyle(ButtonStyle.Success) - ) - .addComponents( + .setStyle(ButtonStyle.Success), new ButtonBuilder() .setCustomId( JSON.stringify({ @@ -584,9 +592,7 @@ export default class MembershipScreening extends DiscordModule { ) .setEmoji('β›”') .setLabel(' Deny and kick') - .setStyle(ButtonStyle.Danger) - ) - .addComponents( + .setStyle(ButtonStyle.Danger), new ButtonBuilder() .setCustomId( JSON.stringify({ @@ -600,6 +606,7 @@ export default class MembershipScreening extends DiscordModule { .setEmoji('πŸ”ͺ') .setLabel(' Vision Hunt Decree (Ban)') .setStyle(ButtonStyle.Danger) + ] ); await channel.send({ content: '\u200b', embeds: [embed], components: [row] }); diff --git a/src/discord/MusicPlayer/Join.ts b/src/discord/MusicPlayer/Join.ts index 7e288e9..694cd74 100644 --- a/src/discord/MusicPlayer/Join.ts +++ b/src/discord/MusicPlayer/Join.ts @@ -232,23 +232,23 @@ export async function joinVoiceChannelProcedure( const row = new ActionRowBuilder(); if(event.instance.queue.track[0] instanceof SpotifyTrack) - row.addComponents( + row.addComponents([ new ButtonBuilder() .setEmoji('🟒') .setLabel(' Open in Spotify') .setURL(encodeURI(`https://open.spotify.com/track/${event.instance.queue.track[0].id}`)) - .setStyle(ButtonStyle.Link), - ) + .setStyle(ButtonStyle.Link) + ]); if(event.instance.queue.track[0] instanceof YouTubeVideo || event.instance.queue.track[0] instanceof SpotifyTrack) { const actualPlaybackURL = event.instance.getActualPlaybackURL(); if(event.instance.queue.track[0] instanceof SpotifyTrack && !actualPlaybackURL) return; - row.addComponents( + row.addComponents([ new ButtonBuilder() .setEmoji('πŸ”΄') .setLabel(' Open in YouTube') .setURL(event.instance.queue.track[0] instanceof YouTubeVideo ? encodeURI(`https://www.youtube.com/watch?v=${event.instance.queue.track[0].id}`) : encodeURI(event.instance.getActualPlaybackURL()!)) - .setStyle(ButtonStyle.Link), - ) + .setStyle(ButtonStyle.Link) + ]); } if (event.instance.textChannel) { diff --git a/src/discord/MusicPlayer/NowPlaying.ts b/src/discord/MusicPlayer/NowPlaying.ts index 32139be..9f93310 100644 --- a/src/discord/MusicPlayer/NowPlaying.ts +++ b/src/discord/MusicPlayer/NowPlaying.ts @@ -61,23 +61,23 @@ export default class NowPlaying extends DiscordModule { const row = new ActionRowBuilder(); if(instance.queue.track[0] instanceof SpotifyTrack) - row.addComponents( + row.addComponents([ new ButtonBuilder() .setEmoji('🟒') .setLabel(' Open in Spotify') .setURL(encodeURI(`https://open.spotify.com/track/${instance.queue.track[0].id}`)) .setStyle(ButtonStyle.Link), - ) + ]); if(instance.queue.track[0] instanceof YouTubeVideo || instance.queue.track[0] instanceof SpotifyTrack) { const actualPlaybackURL = instance.getActualPlaybackURL(); if(instance.queue.track[0] instanceof SpotifyTrack && !actualPlaybackURL) return; - row.addComponents( + row.addComponents([ new ButtonBuilder() .setEmoji('πŸ”΄') .setLabel(' Open in YouTube') .setURL(instance.queue.track[0] instanceof YouTubeVideo ? encodeURI(`https://www.youtube.com/watch?v=${instance.queue.track[0].id}`) : encodeURI(instance.getActualPlaybackURL()!)) .setStyle(ButtonStyle.Link), - ) + ]); } return await sendHybridInteractionMessageResponse(data, { embeds: [await EMBEDS.NOW_PLAYING(data, locale, instance.queue.track[0])], components: [row] }); } diff --git a/src/discord/MusicPlayer/Play.ts b/src/discord/MusicPlayer/Play.ts index 3b41e59..b5d0d1b 100644 --- a/src/discord/MusicPlayer/Play.ts +++ b/src/discord/MusicPlayer/Play.ts @@ -360,7 +360,7 @@ export default class Play extends DiscordModule { instance.addTrackToQueue(result); if (linkData.list) { - const row = new ActionRowBuilder().addComponents( + const row = new ActionRowBuilder().addComponents([ new ButtonBuilder() .setEmoji('βœ…') .setCustomId( @@ -372,6 +372,7 @@ export default class Play extends DiscordModule { ) .setLabel(' Add the remaining songs in the playlist') .setStyle(ButtonStyle.Primary) + ] ); return await sendHybridInteractionMessageResponse(data, { @@ -445,7 +446,7 @@ export default class Play extends DiscordModule { // The query length is too long to fit in json if (query.length > 100 - 51) return; - const row = new ActionRowBuilder().addComponents( + const row = new ActionRowBuilder().addComponents([ new ButtonBuilder() .setEmoji('πŸ”Ž') .setCustomId( @@ -459,7 +460,7 @@ export default class Play extends DiscordModule { ) .setLabel(' Not this? Search!') .setStyle(ButtonStyle.Primary) - ); + ]); return await sendHybridInteractionMessageResponse(data, { embeds: [await EMBEDS.ADDED_QUEUE(data, locale, result[0])], diff --git a/src/discord/MusicPlayer/PlayMy.ts b/src/discord/MusicPlayer/PlayMy.ts index c64089f..a2b3884 100644 --- a/src/discord/MusicPlayer/PlayMy.ts +++ b/src/discord/MusicPlayer/PlayMy.ts @@ -124,7 +124,7 @@ export default class PlayMy extends DiscordModule { // The query length is too long to fit in json if (query.length > 100 - 51) return; - row = new ActionRowBuilder().addComponents( + row = new ActionRowBuilder().addComponents([ new ButtonBuilder() .setEmoji('πŸ”Ž') .setCustomId( @@ -138,7 +138,7 @@ export default class PlayMy extends DiscordModule { ) .setLabel(' Not this? Search!') .setStyle(ButtonStyle.Primary) - ); + ]); } if(!row) diff --git a/src/discord/MusicPlayer/Search.ts b/src/discord/MusicPlayer/Search.ts index 9b9ada0..e5a8e86 100644 --- a/src/discord/MusicPlayer/Search.ts +++ b/src/discord/MusicPlayer/Search.ts @@ -158,7 +158,7 @@ export default class Search extends DiscordModule { messageSelectMenu.addOptions(menuOptions); const row = new ActionRowBuilder(); - row.addComponents(messageSelectMenu); + row.addComponents([messageSelectMenu]); return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.SEARCH_RESULT(data, locale, result)], components: [row] }); } diff --git a/src/discord/UserInfo.ts b/src/discord/UserInfo.ts index dbcb9e0..d1e4047 100644 --- a/src/discord/UserInfo.ts +++ b/src/discord/UserInfo.ts @@ -74,7 +74,7 @@ const EMBEDS = { if (user.presence?.activities) { for (let activity of user.presence?.activities) { if (activity.type === ActivityType.Custom) - embed.addFields({ + embed.addFields([{ name: `✨ ${locale.__('userinfo.custom_status')}`, value: `${ !activity.emoji @@ -89,7 +89,7 @@ const EMBEDS = { } ${activity.state === null ? '' : activity.state} \u200b`, inline: false - }); + }]); else { let title = ''; switch (activity.type) { @@ -111,7 +111,7 @@ const EMBEDS = { } const startTime = activity.timestamps?.start; const endTime = activity.timestamps?.end; - embed.addFields({ + embed.addFields([{ name: `${title}`, value: `${activity.details === null ? '' : activity.details} ${activity.state === null ? '' : activity.state} @@ -126,12 +126,12 @@ const EMBEDS = { } \u200b`, inline: false - }); + }]); } } } - embed.addFields({ + embed.addFields([{ name: `πŸ“° ${locale.__('userinfo.user_guild_info')}`, value: `${ user.joinedAt === null @@ -142,7 +142,7 @@ const EMBEDS = { } ${user.isGuildOwner ? `${locale.__('userinfo.guild_owner')}` : ''} ` - }); + }]); embed.setThumbnail(user.displayAvatarURL + '?size=4096'); embed.setAuthor({ diff --git a/src/discord/osu.ts b/src/discord/osu.ts index e2c8faf..e2e0d0a 100644 --- a/src/discord/osu.ts +++ b/src/discord/osu.ts @@ -259,13 +259,13 @@ export default class osu extends DiscordModule { 'https://osu.ppy.sh/images/layout/avatar-guest.png' ); - const row = new ActionRowBuilder().addComponents( + const row = new ActionRowBuilder().addComponents([ new ButtonBuilder() .setEmoji('πŸ”—') .setLabel(' Open Profile') .setURL(`https://osu.ppy.sh/users/${result.id}`) .setStyle(ButtonStyle.Link) - ); + ]); return await sendHybridInteractionMessageResponse(data, { embeds: [embed], @@ -439,31 +439,27 @@ export default class osu extends DiscordModule { const row = new ActionRowBuilder(); if (bm_result.hasDownload) - row.addComponents( + row.addComponents([ new ButtonBuilder() .setEmoji('🌎') .setLabel(' Download (Beatconnect)') .setURL(`https://beatconnect.io/b/${bm_result.beatmapSetId}/`) + .setStyle(ButtonStyle.Link), + new ButtonBuilder() + .setEmoji('πŸ”—') + .setLabel(' Open listing') + .setURL( + `https://osu.ppy.sh/beatmapsets/${bm_result.beatmapSetId}${url_mode}/${bm_result.id}` + ) + .setStyle(ButtonStyle.Link), + new ButtonBuilder() + .setEmoji('πŸ’¬') + .setLabel(' Open discussion') + .setURL( + `https://osu.ppy.sh/beatmapsets/${bm_result.beatmapSetId}/discussion` + ) .setStyle(ButtonStyle.Link) - ); - row.addComponents( - new ButtonBuilder() - .setEmoji('πŸ”—') - .setLabel(' Open listing') - .setURL( - `https://osu.ppy.sh/beatmapsets/${bm_result.beatmapSetId}${url_mode}/${bm_result.id}` - ) - .setStyle(ButtonStyle.Link) - ); - row.addComponents( - new ButtonBuilder() - .setEmoji('πŸ’¬') - .setLabel(' Open discussion') - .setURL( - `https://osu.ppy.sh/beatmapsets/${bm_result.beatmapSetId}/discussion` - ) - .setStyle(ButtonStyle.Link) - ); + ]); return await sendHybridInteractionMessageResponse(data, { embeds: [embed2],