kirameki-cafe-mirror/Yumi
1
0
Fork 0
mirror of https://github.com/kirameki-cafe/Yumi.git synced 2026-09-13 18:59:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed breaking changes

Browse Source
This commit is contained in:
yuzu
2022-07-15 15:41:29 +07:00
parent b207ca5cb3
commit 8b5f3ac2f8
9 changed files with 77 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/discord/Developer/Debug.ts
+2 -2
View File
@@ -162,7 +162,7 @@ export default class Debug extends DiscordModule {
}); });
}, },
invalidInteraction: async (data: HybridInteractionMessage) => { invalidInteraction: async (data: HybridInteractionMessage) => {
const row = new ActionRowBuilder<ButtonBuilder>().addComponents( const row = new ActionRowBuilder<ButtonBuilder>().addComponents([
new ButtonBuilder() new ButtonBuilder()
.setEmoji('😥') .setEmoji('😥')
.setLabel( .setLabel(
@@ -170,7 +170,7 @@ export default class Debug extends DiscordModule {
) )
.setCustomId('dev_make_invalid_interaction') .setCustomId('dev_make_invalid_interaction')
.setStyle(ButtonStyle.Primary) .setStyle(ButtonStyle.Primary)
); ]);
await sendHybridInteractionMessageResponse(data, { await sendHybridInteractionMessageResponse(data, {
embeds: [EMBEDS.INVALID_TEST(data)], embeds: [EMBEDS.INVALID_TEST(data)],
components: [row] components: [row]
src/discord/MembershipScreening.ts
+34 -27
View File
@@ -272,28 +272,34 @@ export default class MembershipScreening extends DiscordModule {
}); });
if (!requesterMember) { if (!requesterMember) {
newEmbed.addFields({ newEmbed.addFields([
name: '❌ Invalid', {
value: `Unable to find the user. User left already?` name: '❌ Invalid',
}); value: `Unable to find the user. User left already?`
}
]);
return await message.edit({ components: [], embeds: [newEmbed] }); return await message.edit({ components: [], embeds: [newEmbed] });
} }
if (requesterMember.roles.cache.has(PrismaGuild.MembershipScreening_GivenRole)) { if (requesterMember.roles.cache.has(PrismaGuild.MembershipScreening_GivenRole)) {
newEmbed.addFields({ newEmbed.addFields([
name: '✅ Approved', {
value: `By: Unknown (User already obtained the role by other means)` name: '✅ Approved',
}); value: `By: Unknown (User already obtained the role by other means)`
}
]);
return await message.edit({ components: [], embeds: [newEmbed] }); return await message.edit({ components: [], embeds: [newEmbed] });
} }
if (payload.a === 'approve') { if (payload.a === 'approve') {
try { try {
await requesterMember.roles.add(role); await requesterMember.roles.add(role);
newEmbed.addFields({ newEmbed.addFields([
name: '✅ Approved', {
value: `By: ${interaction.user.username}#${interaction.user.discriminator} (${interaction.user.id})` name: '✅ Approved',
}); value: `By: ${interaction.user.username}#${interaction.user.discriminator} (${interaction.user.id})`
}
]);
await message.edit({ components: [], embeds: [newEmbed] }); await message.edit({ components: [], embeds: [newEmbed] });
} catch (err) { } catch (err) {
return interaction.reply({ return interaction.reply({
@@ -304,10 +310,12 @@ export default class MembershipScreening extends DiscordModule {
} else if (payload.a === 'deny') { } else if (payload.a === 'deny') {
try { try {
await requesterMember.kick(); await requesterMember.kick();
newEmbed.addFields({ newEmbed.addFields([
name: '❌ Denied', {
value: `By: ${interaction.user.username}#${interaction.user.discriminator} (${interaction.user.id})` name: '❌ Denied',
}); value: `By: ${interaction.user.username}#${interaction.user.discriminator} (${interaction.user.id})`
}
]);
await message.edit({ components: [], embeds: [newEmbed] }); await message.edit({ components: [], embeds: [newEmbed] });
} catch (err) { } catch (err) {
return interaction.reply({ return interaction.reply({
@@ -320,10 +328,12 @@ export default class MembershipScreening extends DiscordModule {
await requesterMember.ban({ await requesterMember.ban({
reason: `Membership Screening, action issued by ${interaction.user.username}#${interaction.user.discriminator} (${interaction.user.id})` reason: `Membership Screening, action issued by ${interaction.user.username}#${interaction.user.discriminator} (${interaction.user.id})`
}); });
newEmbed.addFields({ newEmbed.addFields([
name: '🔪 Banned', {
value: `By: ${interaction.user.username}#${interaction.user.discriminator} (${interaction.user.id})` name: '🔪 Banned',
}); value: `By: ${interaction.user.username}#${interaction.user.discriminator} (${interaction.user.id})`
}
]);
await message.edit({ components: [], embeds: [newEmbed] }); await message.edit({ components: [], embeds: [newEmbed] });
} catch (err) { } catch (err) {
return interaction.reply({ return interaction.reply({
@@ -556,7 +566,7 @@ export default class MembershipScreening extends DiscordModule {
embed.setThumbnail(`${member.user.displayAvatarURL()}?size=4096`); embed.setThumbnail(`${member.user.displayAvatarURL()}?size=4096`);
const row = new ActionRowBuilder<ButtonBuilder>() const row = new ActionRowBuilder<ButtonBuilder>()
.addComponents( .addComponents([
new ButtonBuilder() new ButtonBuilder()
.setCustomId( .setCustomId(
JSON.stringify({ JSON.stringify({
@@ -569,9 +579,7 @@ export default class MembershipScreening extends DiscordModule {
) )
.setEmoji('✅') .setEmoji('✅')
.setLabel(' Approve') .setLabel(' Approve')
.setStyle(ButtonStyle.Success) .setStyle(ButtonStyle.Success),
)
.addComponents(
new ButtonBuilder() new ButtonBuilder()
.setCustomId( .setCustomId(
JSON.stringify({ JSON.stringify({
@@ -584,9 +592,7 @@ export default class MembershipScreening extends DiscordModule {
) )
.setEmoji('⛔') .setEmoji('⛔')
.setLabel(' Deny and kick') .setLabel(' Deny and kick')
.setStyle(ButtonStyle.Danger) .setStyle(ButtonStyle.Danger),
)
.addComponents(
new ButtonBuilder() new ButtonBuilder()
.setCustomId( .setCustomId(
JSON.stringify({ JSON.stringify({
@@ -600,6 +606,7 @@ export default class MembershipScreening extends DiscordModule {
.setEmoji('🔪') .setEmoji('🔪')
.setLabel(' Vision Hunt Decree (Ban)') .setLabel(' Vision Hunt Decree (Ban)')
.setStyle(ButtonStyle.Danger) .setStyle(ButtonStyle.Danger)
]
); );
await channel.send({ content: '\u200b', embeds: [embed], components: [row] }); await channel.send({ content: '\u200b', embeds: [embed], components: [row] });
src/discord/MusicPlayer/Join.ts
+6 -6
View File
@@ -232,23 +232,23 @@ export async function joinVoiceChannelProcedure(
const row = new ActionRowBuilder<ButtonBuilder>(); const row = new ActionRowBuilder<ButtonBuilder>();
if(event.instance.queue.track[0] instanceof SpotifyTrack) if(event.instance.queue.track[0] instanceof SpotifyTrack)
row.addComponents( row.addComponents([
new ButtonBuilder() new ButtonBuilder()
.setEmoji('🟢') .setEmoji('🟢')
.setLabel(' Open in Spotify') .setLabel(' Open in Spotify')
.setURL(encodeURI(`https://open.spotify.com/track/${event.instance.queue.track[0].id}`)) .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) { if(event.instance.queue.track[0] instanceof YouTubeVideo || event.instance.queue.track[0] instanceof SpotifyTrack) {
const actualPlaybackURL = event.instance.getActualPlaybackURL(); const actualPlaybackURL = event.instance.getActualPlaybackURL();
if(event.instance.queue.track[0] instanceof SpotifyTrack && !actualPlaybackURL) return; if(event.instance.queue.track[0] instanceof SpotifyTrack && !actualPlaybackURL) return;
row.addComponents( row.addComponents([
new ButtonBuilder() new ButtonBuilder()
.setEmoji('🔴') .setEmoji('🔴')
.setLabel(' Open in YouTube') .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()!)) .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) { if (event.instance.textChannel) {
src/discord/MusicPlayer/NowPlaying.ts
+4 -4
View File
@@ -61,23 +61,23 @@ export default class NowPlaying extends DiscordModule {
const row = new ActionRowBuilder<ButtonBuilder>(); const row = new ActionRowBuilder<ButtonBuilder>();
if(instance.queue.track[0] instanceof SpotifyTrack) if(instance.queue.track[0] instanceof SpotifyTrack)
row.addComponents( row.addComponents([
new ButtonBuilder() new ButtonBuilder()
.setEmoji('🟢') .setEmoji('🟢')
.setLabel(' Open in Spotify') .setLabel(' Open in Spotify')
.setURL(encodeURI(`https://open.spotify.com/track/${instance.queue.track[0].id}`)) .setURL(encodeURI(`https://open.spotify.com/track/${instance.queue.track[0].id}`))
.setStyle(ButtonStyle.Link), .setStyle(ButtonStyle.Link),
) ]);
if(instance.queue.track[0] instanceof YouTubeVideo || instance.queue.track[0] instanceof SpotifyTrack) { if(instance.queue.track[0] instanceof YouTubeVideo || instance.queue.track[0] instanceof SpotifyTrack) {
const actualPlaybackURL = instance.getActualPlaybackURL(); const actualPlaybackURL = instance.getActualPlaybackURL();
if(instance.queue.track[0] instanceof SpotifyTrack && !actualPlaybackURL) return; if(instance.queue.track[0] instanceof SpotifyTrack && !actualPlaybackURL) return;
row.addComponents( row.addComponents([
new ButtonBuilder() new ButtonBuilder()
.setEmoji('🔴') .setEmoji('🔴')
.setLabel(' Open in YouTube') .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()!)) .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), .setStyle(ButtonStyle.Link),
) ]);
} }
return await sendHybridInteractionMessageResponse(data, { embeds: [await EMBEDS.NOW_PLAYING(data, locale, instance.queue.track[0])], components: [row] }); return await sendHybridInteractionMessageResponse(data, { embeds: [await EMBEDS.NOW_PLAYING(data, locale, instance.queue.track[0])], components: [row] });
} }
src/discord/MusicPlayer/Play.ts
+4 -3
View File
@@ -360,7 +360,7 @@ export default class Play extends DiscordModule {
instance.addTrackToQueue(result); instance.addTrackToQueue(result);
if (linkData.list) { if (linkData.list) {
const row = new ActionRowBuilder<ButtonBuilder>().addComponents( const row = new ActionRowBuilder<ButtonBuilder>().addComponents([
new ButtonBuilder() new ButtonBuilder()
.setEmoji('✅') .setEmoji('✅')
.setCustomId( .setCustomId(
@@ -372,6 +372,7 @@ export default class Play extends DiscordModule {
) )
.setLabel(' Add the remaining songs in the playlist') .setLabel(' Add the remaining songs in the playlist')
.setStyle(ButtonStyle.Primary) .setStyle(ButtonStyle.Primary)
]
); );
return await sendHybridInteractionMessageResponse(data, { return await sendHybridInteractionMessageResponse(data, {
@@ -445,7 +446,7 @@ export default class Play extends DiscordModule {
// The query length is too long to fit in json // The query length is too long to fit in json
if (query.length > 100 - 51) return; if (query.length > 100 - 51) return;
const row = new ActionRowBuilder<ButtonBuilder>().addComponents( const row = new ActionRowBuilder<ButtonBuilder>().addComponents([
new ButtonBuilder() new ButtonBuilder()
.setEmoji('🔎') .setEmoji('🔎')
.setCustomId( .setCustomId(
@@ -459,7 +460,7 @@ export default class Play extends DiscordModule {
) )
.setLabel(' Not this? Search!') .setLabel(' Not this? Search!')
.setStyle(ButtonStyle.Primary) .setStyle(ButtonStyle.Primary)
); ]);
return await sendHybridInteractionMessageResponse(data, { return await sendHybridInteractionMessageResponse(data, {
embeds: [await EMBEDS.ADDED_QUEUE(data, locale, result[0])], embeds: [await EMBEDS.ADDED_QUEUE(data, locale, result[0])],
src/discord/MusicPlayer/PlayMy.ts
+2 -2
View File
@@ -124,7 +124,7 @@ export default class PlayMy extends DiscordModule {
// The query length is too long to fit in json // The query length is too long to fit in json
if (query.length > 100 - 51) return; if (query.length > 100 - 51) return;
row = new ActionRowBuilder<ButtonBuilder>().addComponents( row = new ActionRowBuilder<ButtonBuilder>().addComponents([
new ButtonBuilder() new ButtonBuilder()
.setEmoji('🔎') .setEmoji('🔎')
.setCustomId( .setCustomId(
@@ -138,7 +138,7 @@ export default class PlayMy extends DiscordModule {
) )
.setLabel(' Not this? Search!') .setLabel(' Not this? Search!')
.setStyle(ButtonStyle.Primary) .setStyle(ButtonStyle.Primary)
); ]);
} }
if(!row) if(!row)
src/discord/MusicPlayer/Search.ts
+1 -1
View File
@@ -158,7 +158,7 @@ export default class Search extends DiscordModule {
messageSelectMenu.addOptions(menuOptions); messageSelectMenu.addOptions(menuOptions);
const row = new ActionRowBuilder<SelectMenuBuilder>(); const row = new ActionRowBuilder<SelectMenuBuilder>();
row.addComponents(messageSelectMenu); row.addComponents([messageSelectMenu]);
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.SEARCH_RESULT(data, locale, result)], components: [row] }); return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.SEARCH_RESULT(data, locale, result)], components: [row] });
} }
src/discord/UserInfo.ts
+6 -6
View File
@@ -74,7 +74,7 @@ const EMBEDS = {
if (user.presence?.activities) { if (user.presence?.activities) {
for (let activity of user.presence?.activities) { for (let activity of user.presence?.activities) {
if (activity.type === ActivityType.Custom) if (activity.type === ActivityType.Custom)
embed.addFields({ embed.addFields([{
name: `✨ ${locale.__('userinfo.custom_status')}`, name: `✨ ${locale.__('userinfo.custom_status')}`,
value: `${ value: `${
!activity.emoji !activity.emoji
@@ -89,7 +89,7 @@ const EMBEDS = {
} ${activity.state === null ? '' : activity.state} } ${activity.state === null ? '' : activity.state}
\u200b`, \u200b`,
inline: false inline: false
}); }]);
else { else {
let title = ''; let title = '';
switch (activity.type) { switch (activity.type) {
@@ -111,7 +111,7 @@ const EMBEDS = {
} }
const startTime = activity.timestamps?.start; const startTime = activity.timestamps?.start;
const endTime = activity.timestamps?.end; const endTime = activity.timestamps?.end;
embed.addFields({ embed.addFields([{
name: `${title}`, name: `${title}`,
value: `${activity.details === null ? '' : activity.details} value: `${activity.details === null ? '' : activity.details}
${activity.state === null ? '' : activity.state} ${activity.state === null ? '' : activity.state}
@@ -126,12 +126,12 @@ const EMBEDS = {
} }
\u200b`, \u200b`,
inline: false inline: false
}); }]);
} }
} }
} }
embed.addFields({ embed.addFields([{
name: `📰 ${locale.__('userinfo.user_guild_info')}`, name: `📰 ${locale.__('userinfo.user_guild_info')}`,
value: `${ value: `${
user.joinedAt === null user.joinedAt === null
@@ -142,7 +142,7 @@ const EMBEDS = {
} }
${user.isGuildOwner ? `${locale.__('userinfo.guild_owner')}` : ''} ${user.isGuildOwner ? `${locale.__('userinfo.guild_owner')}` : ''}
` `
}); }]);
embed.setThumbnail(user.displayAvatarURL + '?size=4096'); embed.setThumbnail(user.displayAvatarURL + '?size=4096');
embed.setAuthor({ embed.setAuthor({
src/discord/osu.ts
+18 -22
View File
@@ -259,13 +259,13 @@ export default class osu extends DiscordModule {
'https://osu.ppy.sh/images/layout/avatar-guest.png' 'https://osu.ppy.sh/images/layout/avatar-guest.png'
); );
const row = new ActionRowBuilder<ButtonBuilder>().addComponents( const row = new ActionRowBuilder<ButtonBuilder>().addComponents([
new ButtonBuilder() new ButtonBuilder()
.setEmoji('🔗') .setEmoji('🔗')
.setLabel(' Open Profile') .setLabel(' Open Profile')
.setURL(`https://osu.ppy.sh/users/${result.id}`) .setURL(`https://osu.ppy.sh/users/${result.id}`)
.setStyle(ButtonStyle.Link) .setStyle(ButtonStyle.Link)
); ]);
return await sendHybridInteractionMessageResponse(data, { return await sendHybridInteractionMessageResponse(data, {
embeds: [embed], embeds: [embed],
@@ -439,31 +439,27 @@ export default class osu extends DiscordModule {
const row = new ActionRowBuilder<ButtonBuilder>(); const row = new ActionRowBuilder<ButtonBuilder>();
if (bm_result.hasDownload) if (bm_result.hasDownload)
row.addComponents( row.addComponents([
new ButtonBuilder() new ButtonBuilder()
.setEmoji('🌎') .setEmoji('🌎')
.setLabel(' Download (Beatconnect)') .setLabel(' Download (Beatconnect)')
.setURL(`https://beatconnect.io/b/${bm_result.beatmapSetId}/`) .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) .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, { return await sendHybridInteractionMessageResponse(data, {
embeds: [embed2], embeds: [embed2],