Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| f1f9d95685 | |||
| 6d8d8402a5 | |||
| 202d0ef7bb | |||
| d26b5e5c56 |
@@ -1,9 +1,31 @@
|
|||||||
|
# Changelog:
|
||||||
|
|
||||||
|
## Nuts:
|
||||||
|
- Nut Stats refactored
|
||||||
|
- Nut Animation fixed
|
||||||
|
|
||||||
|
## Quotes:
|
||||||
|
- Fixed Quote Menu
|
||||||
|
|
||||||
|
## Honors:
|
||||||
|
- Honor Menu fixed
|
||||||
|
- Honors modernized
|
||||||
|
|
||||||
|
## Birthday:
|
||||||
|
- Fixed Boot Event
|
||||||
|
- Fixed Role Management
|
||||||
|
|
||||||
|
## Config:
|
||||||
|
- Role Selection
|
||||||
|
- Channel Selection
|
||||||
|
|
||||||
|
### ToDo:
|
||||||
- quotes leaderboard (count)
|
- quotes leaderboard (count)
|
||||||
- quotes filter by channel
|
- quotes filter by channel
|
||||||
- event creation + reminder 1h before
|
- event creation + reminder 1h before
|
||||||
- birthday role
|
|
||||||
- 8ball (neue Antworten)
|
- 8ball (neue Antworten)
|
||||||
- avatar
|
- avatar
|
||||||
- mittwoch
|
- mittwoch
|
||||||
- wetter
|
- wetter
|
||||||
- WGE (help)
|
- WGE (help)
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
|
After Width: | Height: | Size: 254 KiB |
@@ -24,6 +24,7 @@ async function channelSet(interaction) {
|
|||||||
content: `Set <#${channel.id}> as ${purpose} channel!`, flags: MessageFlags.Ephemeral
|
content: `Set <#${channel.id}> as ${purpose} channel!`, flags: MessageFlags.Ephemeral
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
async function channelSimulate(interaction) {
|
async function channelSimulate(interaction) {
|
||||||
const purpose = interaction.options.getString('purpose')
|
const purpose = interaction.options.getString('purpose')
|
||||||
switch (purpose) {
|
switch (purpose) {
|
||||||
@@ -44,6 +45,7 @@ async function channelSimulate(interaction) {
|
|||||||
}
|
}
|
||||||
return interaction.reply({ content: 'Done.', flags: MessageFlags.Ephemeral })
|
return interaction.reply({ content: 'Done.', flags: MessageFlags.Ephemeral })
|
||||||
}
|
}
|
||||||
|
|
||||||
async function roleSet(interaction) {
|
async function roleSet(interaction) {
|
||||||
const guild = interaction.guild
|
const guild = interaction.guild
|
||||||
const purpose = interaction.options.getString('purpose')
|
const purpose = interaction.options.getString('purpose')
|
||||||
|
|||||||
@@ -171,21 +171,24 @@ async function honorMenu(interaction) {
|
|||||||
const row = new ActionRowBuilder()
|
const row = new ActionRowBuilder()
|
||||||
.addComponents(
|
.addComponents(
|
||||||
new ButtonBuilder()
|
new ButtonBuilder()
|
||||||
.setLabel('Honor')
|
|
||||||
.setEmoji(`<:honorhigh:748176295535443968>`)
|
.setEmoji(`<:honorhigh:748176295535443968>`)
|
||||||
.setCustomId('honor_menu_honor')
|
.setCustomId('honor_menu_honor')
|
||||||
.setStyle(ButtonStyle.Primary)
|
.setStyle(ButtonStyle.Success)
|
||||||
)
|
)
|
||||||
.addComponents(
|
.addComponents(
|
||||||
new ButtonBuilder()
|
new ButtonBuilder()
|
||||||
.setLabel('Dishonor')
|
|
||||||
.setEmoji(`<:honorlow:748176295132790786>`)
|
.setEmoji(`<:honorlow:748176295132790786>`)
|
||||||
.setCustomId('honor_menu_dishonor')
|
.setCustomId('honor_menu_dishonor')
|
||||||
.setStyle(ButtonStyle.Primary)
|
.setStyle(ButtonStyle.Danger)
|
||||||
|
)
|
||||||
|
.addComponents(
|
||||||
|
new ButtonBuilder()
|
||||||
|
.setEmoji(`❌`)
|
||||||
|
.setCustomId('abort')
|
||||||
|
.setStyle(ButtonStyle.Secondary)
|
||||||
)
|
)
|
||||||
.addComponents(
|
.addComponents(
|
||||||
new ButtonBuilder()
|
new ButtonBuilder()
|
||||||
.setLabel('History')
|
|
||||||
.setEmoji('📜')
|
.setEmoji('📜')
|
||||||
.setCustomId('honor_menu_history')
|
.setCustomId('honor_menu_history')
|
||||||
.setStyle(ButtonStyle.Secondary)
|
.setStyle(ButtonStyle.Secondary)
|
||||||
|
|||||||
+70
-43
@@ -138,54 +138,70 @@ async function nutsLeaderboard(interaction) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
async function nutsStats(interaction) {
|
async function nutsStats(interaction) {
|
||||||
const db = mClient.db(process.env.M_DB)
|
const db = mClient.db(process.env.M_DB);
|
||||||
const nStatsColl = db.collection('stats_nuts')
|
const nStatsColl = db.collection('stats_nuts');
|
||||||
const stats = await nStatsColl.find({}).sort({ amount: 1 }).toArray()
|
|
||||||
let nutMin = {
|
// fetch user stats
|
||||||
count: 0,
|
const statsDoc = await nStatsColl.findOne({ userID: interaction.user.id });
|
||||||
amount: 0
|
const stat = statsDoc?.stat || {}; // fallback to empty object
|
||||||
|
|
||||||
|
// compute totals
|
||||||
|
const totalCount = Object.values(stat).reduce((a, b) => a + b, 0);
|
||||||
|
const totalNuts = Object.entries(stat).reduce(
|
||||||
|
(sum, [num, count]) => sum + Number(num) * count,
|
||||||
|
0
|
||||||
|
);
|
||||||
|
|
||||||
|
const rolledNumbers = Object.entries(stat).filter(([_, count]) => count > 0);
|
||||||
|
|
||||||
|
let nutMin = { number: 0, count: 0 };
|
||||||
|
let nutMax = { number: 0, count: 0 };
|
||||||
|
|
||||||
|
if (rolledNumbers.length > 0) {
|
||||||
|
// initialize to first rolled number
|
||||||
|
nutMin = nutMax = { number: Number(rolledNumbers[0][0]), count: rolledNumbers[0][1] };
|
||||||
|
|
||||||
|
for (const [numStr, count] of rolledNumbers) {
|
||||||
|
const num = Number(numStr);
|
||||||
|
|
||||||
|
// best nut: prefer higher number if counts tie
|
||||||
|
if (count > nutMax.count || (count === nutMax.count && num > nutMax.number)) {
|
||||||
|
nutMax = { number: num, count };
|
||||||
|
}
|
||||||
|
|
||||||
|
// worst nut: prefer lower number if counts tie
|
||||||
|
if (count < nutMin.count || (count === nutMin.count && num < nutMin.number)) {
|
||||||
|
nutMin = { number: num, count };
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
let nutMax = {
|
|
||||||
count: 0,
|
const nutAvg = totalCount ? totalNuts / totalCount : 0;
|
||||||
amount: 0
|
|
||||||
}
|
// dynamically create fields for numbers 0-9
|
||||||
let totalNuts = 0
|
const fields = Array.from({ length: 10 }, (_, i) => ({
|
||||||
let totalCount = 0
|
name: `[${i}]`,
|
||||||
stats.forEach(stat => {
|
value: `x${stat[i] ?? 0}`,
|
||||||
totalCount += stat.count
|
inline: true
|
||||||
totalNuts += (stat.count * stat.amount)
|
}));
|
||||||
if (nutMin.count > stat.count) { nutMin = stat }
|
|
||||||
if (nutMax.count < stat.count) { nutMax = stat }
|
|
||||||
})
|
|
||||||
let nutAvg = totalNuts / totalCount
|
|
||||||
const embed = new EmbedBuilder()
|
const embed = new EmbedBuilder()
|
||||||
.setTitle("Nut Statistic")
|
.setTitle("Nut Statistic")
|
||||||
.setDescription(
|
.setDescription(
|
||||||
`Total Nut Actions: **${totalCount}**\r\n
|
`Total Nut Actions: **${totalCount}**\r\n` +
|
||||||
Total Nuts nutted: **${totalNuts}**\r\n
|
`Total Nuts nutted: **${totalNuts}**\r\n` +
|
||||||
Nut Average: **${nutAvg.toFixed(3)}**\r\n
|
`Nut Average: **${nutAvg.toFixed(3)}**\r\n` +
|
||||||
Best Nut: **${nutMax.amount}**\r\n
|
`Best Nut: **${nutMax.number} (x${nutMax.count})**\r\n` +
|
||||||
Worst Nut: **${nutMin.amount}**`
|
`Worst Nut: **${nutMin.number} (x${nutMin.count})**`
|
||||||
)
|
|
||||||
.addFields(
|
|
||||||
{ name: '[0]', value: `x${stats[0].count}`, inline: true },
|
|
||||||
{ name: '[1]', value: `x${stats[1].count}`, inline: true },
|
|
||||||
{ name: '[2]', value: `x${stats[2].count}`, inline: true },
|
|
||||||
{ name: '[3]', value: `x${stats[3].count}`, inline: true },
|
|
||||||
{ name: '[4]', value: `x${stats[4].count}`, inline: true },
|
|
||||||
{ name: '[5]', value: `x${stats[5].count}`, inline: true },
|
|
||||||
{ name: '[6]', value: `x${stats[6].count}`, inline: true },
|
|
||||||
{ name: '[7]', value: `x${stats[7].count}`, inline: true },
|
|
||||||
{ name: '[8]', value: `x${stats[8].count}`, inline: true },
|
|
||||||
{ name: '[9]', value: `x${stats[9].count}`, inline: true }
|
|
||||||
)
|
)
|
||||||
|
.addFields(fields)
|
||||||
.setColor(0x51267)
|
.setColor(0x51267)
|
||||||
.setTimestamp()
|
.setTimestamp()
|
||||||
.setThumbnail(interaction.guild.iconURL())
|
.setThumbnail(interaction.guild.iconURL());
|
||||||
await interaction.editReply({
|
|
||||||
embeds: [embed]
|
await interaction.editReply({ embeds: [embed] });
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async function nutsCooldown(interaction) {
|
async function nutsCooldown(interaction) {
|
||||||
const db = mClient.db(process.env.M_DB)
|
const db = mClient.db(process.env.M_DB)
|
||||||
const nutsColl = db.collection('items_cooldowns')
|
const nutsColl = db.collection('items_cooldowns')
|
||||||
@@ -215,10 +231,11 @@ async function nutsNut(interaction) {
|
|||||||
const db = mClient.db(process.env.M_DB)
|
const db = mClient.db(process.env.M_DB)
|
||||||
const nutsColl = db.collection('items_nuts')
|
const nutsColl = db.collection('items_nuts')
|
||||||
const cdColl = db.collection('items_cooldowns')
|
const cdColl = db.collection('items_cooldowns')
|
||||||
|
const nutsStatsColl = db.collection('stats_nuts')
|
||||||
|
|
||||||
const cdData = await cdColl.findOne({ userID: interaction.user.id })
|
const cdData = await cdColl.findOne({ userID: interaction.user.id })
|
||||||
const embed = new EmbedBuilder()
|
const embed = new EmbedBuilder()
|
||||||
.setThumbnail('https://cdn.discordapp.com/attachments/1152723542836772914/1152991361113538621/png-transparent-subscription-box-label-bag-mysterious-miscellaneous-purple-blue-thumbnail-PhotoRoom.png-PhotoRoom.png')
|
.setImage('https://e7.pngegg.com/pngimages/1011/894/png-clipart-gift-christmas-box-mystery-gift-box-holidays-box-thumbnail.png')
|
||||||
|
|
||||||
let content
|
let content
|
||||||
const images = {
|
const images = {
|
||||||
@@ -249,6 +266,15 @@ async function nutsNut(interaction) {
|
|||||||
upsert: true
|
upsert: true
|
||||||
})
|
})
|
||||||
|
|
||||||
|
await nutsStatsColl.findOneAndUpdate({
|
||||||
|
userID: interaction.user.id
|
||||||
|
}, {
|
||||||
|
$inc: { [`stat.${amount}`]: 1 }
|
||||||
|
}, {
|
||||||
|
upsert: true
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
if (amount) {
|
if (amount) {
|
||||||
content = `Du hast **${amount}** Nüsse bekommen!`
|
content = `Du hast **${amount}** Nüsse bekommen!`
|
||||||
if (amount > 8) {
|
if (amount > 8) {
|
||||||
@@ -262,6 +288,7 @@ async function nutsNut(interaction) {
|
|||||||
content = `Du hast leider keine Nüsse bekommen :(`
|
content = `Du hast leider keine Nüsse bekommen :(`
|
||||||
image = images["none"]
|
image = images["none"]
|
||||||
}
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
content = `Du kannst erst <t:${Math.floor(cdData?.cooldown)}:R> wieder nussen :(`
|
content = `Du kannst erst <t:${Math.floor(cdData?.cooldown)}:R> wieder nussen :(`
|
||||||
image = images["onCD"]
|
image = images["onCD"]
|
||||||
@@ -277,14 +304,14 @@ async function nutsNut(interaction) {
|
|||||||
embeds: [embed]
|
embeds: [embed]
|
||||||
})
|
})
|
||||||
await delay(1000)
|
await delay(1000)
|
||||||
embed.setThumbnail('https://i.pinimg.com/originals/9d/58/37/9d5837c6f0cb8b18be6ddd1e2742472a.gif')
|
embed.setImage('https://i.pinimg.com/originals/9d/58/37/9d5837c6f0cb8b18be6ddd1e2742472a.gif')
|
||||||
await interaction.editReply({
|
await interaction.editReply({
|
||||||
embeds: [embed]
|
embeds: [embed]
|
||||||
})
|
})
|
||||||
|
|
||||||
await delay(1000)
|
await delay(1000)
|
||||||
embed.setDescription(content)
|
embed.setDescription(content)
|
||||||
embed.setThumbnail(image)
|
embed.setImage(image)
|
||||||
await interaction.editReply({
|
await interaction.editReply({
|
||||||
embeds: [embed]
|
embeds: [embed]
|
||||||
})
|
})
|
||||||
|
|||||||
Reference in New Issue
Block a user