Skip to content

648 overwrite suspensions #677

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DavidZhang22 wants to merge 6 commits into
base: master
Choose a base branch
from
Open

648 overwrite suspensions #677

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8ebddd9
change overwriting suspensions to create new suspension
DavidZhang22 Jan 31, 2024
732bae4
formatting
DavidZhang22 Jan 31, 2024
2a58ac1
more formatting
DavidZhang22 Jan 31, 2024
22e7531
prepared statements/formatting fixes
DavidZhang22 Jan 31, 2024
77537c6
fix some old code
DavidZhang22 Feb 1, 2024
25bab07
add promise() to db query
DavidZhang22 Feb 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 25 additions & 18 deletions commands/suspend.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,26 +106,33 @@ module.exports = {
.setFooter({ text: `Unsuspending at ` })
.setTimestamp(Date.now() + time);
if (overwrite) {
db.query(`UPDATE suspensions SET uTime = '${Date.now() + time}' WHERE id = '${member.id}' AND suspended = true`)
embed.data.fields[3].value = `Overwritten suspensions. Roles the same as prior suspension`
suspensionLog.send({ embeds: [embed] }).then(member.user.send({ embeds: [embed] }).catch(() => {}))
} else {
let userRolesString = '', userRoles = []
const roles = [...member.roles.cache.filter(r => !r.managed && (!settings.lists.discordRoles.map(role => settings.roles[role]).includes(r.id))).values()];
embed.data.fields[3].value = roles.join(', ') || 'None!';
member.roles.cache.each(r => {
if (r.managed) return
if (settings.lists.discordRoles.map(role => settings.roles[role]).includes(r.id)) return
userRoles.push(r.id)
userRolesString = userRolesString.concat(`${r.id} `)
db.query(`SELECT reason FROM suspensions WHERE id = ? AND suspended = ? `, [member.id, true], async (err, rows) => {
Copy link
Contributor

@Huntifer-RotMG Huntifer-RotMG Feb 3, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

await db.promise().query(...) instead? Unless you want to spin off this async promise instead.

if(err) {
ErrorLogger.log(err, bot, message.guild)
}else{
const overwriter = message.guild.members.cache.get(message.author.id).nickname ?? 'Unknown'
db.query(`UPDATE suspensions SET suspended = ?, reason = ? WHERE id = ? AND suspended = ?`, [false, '(overwritten: ' + overwriter + ') ' + reason, member.id, true])
embed.data.fields[3].value = `Overwritten suspensions. Roles the same as prior suspension`
await suspensionLog.send({ embeds: [embed] }).then(()=>member.user.send({ embeds: [embed] }).catch(() => {}))
}
})
messageId = await suspensionLog.send({ embeds: [embed] });
await member.roles.remove(userRoles)
setTimeout(() => { member.roles.add(suspendedRole.id); }, 1000)
await member.user.send({ embeds: [embed] }).catch(() => {})
db.query(`INSERT INTO suspensions (id, guildid, suspended, uTime, reason, modid, roles, logmessage, unixTimestamp, length) VALUES ('${member.id}', '${message.guild.id}', true, '${Date.now() + time}', ${db.escape(reason)}, '${message.author.id}', '${userRolesString}', '${messageId.id}', '${Date.now()}', '${`${timeString} ${timeTypeString}`}');`)
}
}
let userRolesString = '', userRoles = []
const roles = [...member.roles.cache.filter(r => !r.managed && (!settings.lists.discordRoles.map(role => settings.roles[role]).includes(r.id))).values()];
embed.data.fields[3].value = roles.join(', ') || 'None!';
member.roles.cache.each(r => {
if (r.managed) return
if (settings.lists.discordRoles.map(role => settings.roles[role]).includes(r.id)) return
userRoles.push(r.id)
userRolesString = userRolesString.concat(`${r.id} `)
})
messageId = await suspensionLog.send({ embeds: [embed] });
await member.roles.remove(userRoles)
await member.roles.add(suspendedRole.id)
db.promise().query(`INSERT INTO suspensions (id, guildid, suspended, uTime, reason, modid, roles, logmessage, unixTimestamp, length) VALUES (?,?,?,?,?,?,?,?,?,?);`, [member.id, message.guild.id, true, Date.now() + time, reason, message.author.id, userRolesString, messageId.id, Date.now(), timeString + ' ' + timeTypeString])
message.channel.send(`${member} has been suspended`)
member.user.send({ embeds: [embed] }).catch(() => {})

}

})
Expand Down