Minz/toho-miku
1
0
Fork 0
Code Issues 33 Pull Requests 8 Actions Packages Projects Releases Wiki Activity

Merge new rendering into master #60

Merged
JanGross merged 25 commits from dev-new-rendering into master 2023-08-07 17:34:19 +02:00
Conversation 0 Commits 25 Files Changed 17 +9 -8
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit fe9b52c02d - Show all commits

17
commands/editprofile.js
View File

@@ -51,8 +51,8 @@ module.exports = {
let message = await interaction.editReply({ content: "", components: [mainRow, pingRow], fetchReply: true }); let message = await interaction.editReply({ content: "", components: [mainRow, pingRow], fetchReply: true });
//filter only events from the user who triggered the command //filter only events from the user who triggered the command
const filter = (m) => m.author.id === interaction.author.id; const filter = (m) => m.user.id === interaction.user.id;
const collector = message.createMessageComponentCollector({ componentType: ComponentType.Button, time: 25000 }) const collector = message.createMessageComponentCollector({ filter: filter, componentType: ComponentType.Button, time: 300000 })
collector.on('collect', async (i) => { collector.on('collect', async (i) => {
switch (i.customId) { switch (i.customId) {
@@ -63,18 +63,22 @@ module.exports = {
await this.openShowcaseModal(i, user, profile); await this.openShowcaseModal(i, user, profile);
break; break;
case 'toggle-wishlist-ping': case 'toggle-wishlist-ping':
await i.deferUpdate();
user.wishlistPing = !user.wishlistPing; user.wishlistPing = !user.wishlistPing;
user.save(); user.save();
break; break;
case 'toggle-drop-ping': case 'toggle-drop-ping':
await i.deferUpdate();
user.dropPing = !user.dropPing; user.dropPing = !user.dropPing;
user.save(); user.save();
break; break;
case 'toggle-daily-ping': case 'toggle-daily-ping':
await i.deferUpdate();
user.dailyPing = !user.dailyPing; user.dailyPing = !user.dailyPing;
user.save(); user.save();
break; break;
default: default:
await i.deferReply();
i.editReply({ content: "Invalid selection" }); i.editReply({ content: "Invalid selection" });
return; return;
break; break;
@@ -88,8 +92,6 @@ module.exports = {
} }
}); });
await message.edit({ components: newComponents }); await message.edit({ components: newComponents });
let msg = await i.editReply({content: '...'});
await msg.delete();
}); });
}, },
async openShowcaseModal(interaction, user, profile) { async openShowcaseModal(interaction, user, profile) {
@@ -117,13 +119,12 @@ module.exports = {
let submitted = await interaction.awaitModalSubmit({ let submitted = await interaction.awaitModalSubmit({
time: 60000, time: 60000,
filter: i => i.user.id === interaction.user.id, filter: i => i.user.id === interaction.user.id && i.customId === 'cardSlotModal',
}).catch(error => { }).catch(error => {
//Error includes timeout //Error includes timeout
console.error(error) console.error(error)
return null return null
}) })
if (submitted) { if (submitted) {
let updatePayload = {}; let updatePayload = {};
for (slot of slots) { for (slot of slots) {
@@ -143,7 +144,7 @@ module.exports = {
}, },
async openStatusModal(interaction, user, profile) { async openStatusModal(interaction, user, profile) {
const modal = new ModalBuilder() const modal = new ModalBuilder()
.setCustomId('descriptionModal') .setCustomId('statusModal')
.setTitle('Edit profile status/description'); .setTitle('Edit profile status/description');
let row = new ActionRowBuilder(); let row = new ActionRowBuilder();
@@ -161,7 +162,7 @@ module.exports = {
let submitted = await interaction.awaitModalSubmit({ let submitted = await interaction.awaitModalSubmit({
time: 300000, time: 300000,
filter: i => i.user.id === interaction.user.id, filter: i => i.user.id === interaction.user.id && i.customId === 'statusModal',
}).catch(error => { }).catch(error => {
//Error includes timeout //Error includes timeout
console.error(error) console.error(error)