Skip to content

Commit

Permalink
Prettify code
Browse files Browse the repository at this point in the history
  • Loading branch information
@carolinaisslaying
carolinaisslaying committed Mar 2, 2025
1 parent 1cf7342 commit e32d01d
Show file tree
Hide file tree
Showing 7 changed files with 120 additions and 85 deletions.
78 changes: 42 additions & 36 deletions src/Routes/bots.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -663,7 +663,7 @@ router.post(
},
labels: {
ai: req.body.ai ? true : false,
nsfw: req.body.nsfw ? true : false,
nsfw: req.body.nsfw ? true : false
}
} satisfies delBot);

Expand Down Expand Up @@ -752,7 +752,7 @@ router.post(
},
labels: {
ai: req.body.ai ? true : false,
nsfw: req.body.nsfw ? true : false,
nsfw: req.body.nsfw ? true : false
}
} satisfies delBot
}
Expand Down Expand Up @@ -1697,7 +1697,7 @@ router.post(
},
labels: {
ai: req.body.ai ? true : false,
nsfw: req.body.nsfw ? true : false,
nsfw: req.body.nsfw ? true : false
},
"date.edited": Date.now()
}
Expand Down Expand Up @@ -1753,7 +1753,7 @@ router.post(
},
labels: {
ai: botExists.labels?.ai,
nsfw: botExists.labels?.nsfw,
nsfw: botExists.labels?.nsfw
}
} satisfies Partial<delBot>,
new: {
Expand Down Expand Up @@ -1797,7 +1797,7 @@ router.post(
},
labels: {
ai: req.body.ai ? true : false,
nsfw: req.body.nsfw ? true : false,
nsfw: req.body.nsfw ? true : false
}
} satisfies Partial<delBot>
}
Expand Down Expand Up @@ -2041,23 +2041,29 @@ router.post(
embed.setTitle("Bot Report");
embed.setURL(`${settings.website.url}/bots/${bot._id}`);
embed.addFields(
{ name: "Reason", value: req.body.reason ? req.body.reason : "None provided." },
{ name: "Additional information", value: req.body.additionalInfo ? req.body.additionalInfo : "None provided." },
{
name: "Reason",
value: req.body.reason ? req.body.reason : "None provided."
},
{
name: "Additional information",
value: req.body.additionalInfo
? req.body.additionalInfo
: "None provided."
}
);


await discord.channels.alerts
.send({
content: `${settings.emoji.report} **${functions.escapeFormatting(
req.user.db.fullUsername
)}** \`(${
req.user.id
})\` reported bot **${functions.escapeFormatting(
bot.name
)}** \`(${bot._id})\``,
embeds: [embed]
})

await discord.channels.alerts.send({
content: `${settings.emoji.report} **${functions.escapeFormatting(
req.user.db.fullUsername
)}** \`(${
req.user.id
})\` reported bot **${functions.escapeFormatting(
bot.name
)}** \`(${bot._id})\``,
embeds: [embed]
});

return res.status(200).json({
error: false,
status: 200,
Expand Down Expand Up @@ -3161,7 +3167,7 @@ router.post(
},
labels: {
ai: req.body.ai ? true : false,
nsfw: req.body.nsfw ? true : false,
nsfw: req.body.nsfw ? true : false
},
"status.archived": false
}
Expand Down Expand Up @@ -3220,7 +3226,7 @@ router.post(
},
labels: {
ai: botExists.labels?.ai,
nsfw: botExists.labels?.nsfw,
nsfw: botExists.labels?.nsfw
}
} satisfies partialBot,
new: {
Expand Down Expand Up @@ -3267,7 +3273,7 @@ router.post(
},
labels: {
ai: req.body.ai ? true : false,
nsfw: req.body.nsfw ? true : false,
nsfw: req.body.nsfw ? true : false
}
} satisfies partialBot
}
Expand Down Expand Up @@ -3359,7 +3365,7 @@ router.get(

await global.db.collection("users").updateOne(
{ _id: req.user.id },
{
{
$inc: {
"staffTracking.handledBots.allTime.total": 1,
"staffTracking.handledBots.allTime.approved": 1,
Expand All @@ -3368,7 +3374,7 @@ router.get(
}
}
);

await userCache.updateUser(req.user.id);

await discord.channels.logs
Expand Down Expand Up @@ -3683,7 +3689,7 @@ router.post(

await global.db.collection("users").updateOne(
{ _id: req.user.id },
{
{
$inc: {
"staffTracking.handledBots.allTime.total": 1,
"staffTracking.handledBots.allTime.declined": 1,
Expand All @@ -3692,7 +3698,7 @@ router.post(
}
}
);

await userCache.updateUser(req.user.id);

const type = botType(req.body.type);
Expand Down Expand Up @@ -3851,7 +3857,7 @@ router.post(

await global.db.collection("users").updateOne(
{ _id: req.user.id },
{
{
$inc: {
"staffTracking.handledBots.allTime.total": 1,
"staffTracking.handledBots.allTime.unapprove": 1,
Expand All @@ -3860,7 +3866,7 @@ router.post(
}
}
);

await userCache.updateUser(req.user.id);

await global.db.collection("audit").insertOne({
Expand Down Expand Up @@ -4015,7 +4021,7 @@ router.post(

await global.db.collection("users").updateOne(
{ _id: req.user.id },
{
{
$inc: {
"staffTracking.handledBots.allTime.total": 1,
"staffTracking.handledBots.allTime.remove": 1,
Expand All @@ -4024,7 +4030,7 @@ router.post(
}
}
);

await userCache.updateUser(req.user.id);

const type = botType(req.body.type);
Expand Down Expand Up @@ -4181,7 +4187,7 @@ router.post(

await global.db.collection("users").updateOne(
{ _id: req.user.id },
{
{
$inc: {
"staffTracking.handledBots.allTime.total": 1,
"staffTracking.handledBots.allTime.modHidden": 1,
Expand All @@ -4190,7 +4196,7 @@ router.post(
}
}
);

await userCache.updateUser(req.user.id);

const type = botType(req.body.type);
Expand Down Expand Up @@ -4284,14 +4290,14 @@ router.get(

await global.db.collection("users").updateOne(
{ _id: req.user.id },
{
{
$inc: {
"staffTracking.handledBots.allTime.total": 1,
"staffTracking.handledBots.thisWeek.total": 1,
"staffTracking.handledBots.thisWeek.total": 1
}
}
);

await userCache.updateUser(req.user.id);

discord.channels.logs
Expand Down
24 changes: 16 additions & 8 deletions src/Routes/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,8 @@ router.get("/bots", variables, async (req: Request, res: Response) => {
!status.archived &&
!status.hidden &&
!status.modHidden &&
(!req.user?.db?.preferences.hideNSFW || !labels?.nsfw) &&
(!req.user?.db?.preferences.hideNSFW ||
!labels?.nsfw) &&
scopes?.slashCommands
);
break;
Expand All @@ -174,7 +175,8 @@ router.get("/bots", variables, async (req: Request, res: Response) => {
!status.archived &&
!status.hidden &&
!status.modHidden &&
(!req.user?.db?.preferences.hideNSFW || !labels?.nsfw) &&
(!req.user?.db?.preferences.hideNSFW ||
!labels?.nsfw) &&
tags.includes("Fun")
);
break;
Expand All @@ -189,7 +191,8 @@ router.get("/bots", variables, async (req: Request, res: Response) => {
!status.archived &&
!status.hidden &&
!status.modHidden &&
(!req.user?.db?.preferences.hideNSFW || !labels?.nsfw) &&
(!req.user?.db?.preferences.hideNSFW ||
!labels?.nsfw) &&
tags.includes("Social")
);
break;
Expand All @@ -204,7 +207,8 @@ router.get("/bots", variables, async (req: Request, res: Response) => {
!status.archived &&
!status.hidden &&
!status.modHidden &&
(!req.user?.db?.preferences.hideNSFW || !labels?.nsfw) &&
(!req.user?.db?.preferences.hideNSFW ||
!labels?.nsfw) &&
tags.includes("Economy")
);
break;
Expand All @@ -219,7 +223,8 @@ router.get("/bots", variables, async (req: Request, res: Response) => {
!status.archived &&
!status.hidden &&
!status.modHidden &&
(!req.user?.db?.preferences.hideNSFW || !labels?.nsfw) &&
(!req.user?.db?.preferences.hideNSFW ||
!labels?.nsfw) &&
tags.includes("Utility")
);
break;
Expand All @@ -234,7 +239,8 @@ router.get("/bots", variables, async (req: Request, res: Response) => {
!status.archived &&
!status.hidden &&
!status.modHidden &&
(!req.user?.db?.preferences.hideNSFW || !labels?.nsfw) &&
(!req.user?.db?.preferences.hideNSFW ||
!labels?.nsfw) &&
tags.includes("Moderation")
);
break;
Expand All @@ -249,7 +255,8 @@ router.get("/bots", variables, async (req: Request, res: Response) => {
!status.archived &&
!status.hidden &&
!status.modHidden &&
(!req.user?.db?.preferences.hideNSFW || !labels?.nsfw) &&
(!req.user?.db?.preferences.hideNSFW ||
!labels?.nsfw) &&
tags.includes("Multipurpose")
);
break;
Expand All @@ -264,7 +271,8 @@ router.get("/bots", variables, async (req: Request, res: Response) => {
!status.archived &&
!status.hidden &&
!status.modHidden &&
(!req.user?.db?.preferences.hideNSFW || !labels?.nsfw) &&
(!req.user?.db?.preferences.hideNSFW ||
!labels?.nsfw) &&
tags.includes("Music")
);
break;
Expand Down
44 changes: 25 additions & 19 deletions src/Routes/servers.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -497,23 +497,29 @@ router.post(
embed.setTitle("Server Report");
embed.setURL(`${settings.website.url}/bots/${server._id}`);
embed.addFields(
{ name: "Reason", value: req.body.reason ? req.body.reason : "None provided." },
{ name: "Additional information", value: req.body.additionalInfo ? req.body.additionalInfo : "None provided." },
{
name: "Reason",
value: req.body.reason ? req.body.reason : "None provided."
},
{
name: "Additional information",
value: req.body.additionalInfo
? req.body.additionalInfo
: "None provided."
}
);


await discord.channels.alerts
.send({
content: `${settings.emoji.report} **${functions.escapeFormatting(
req.user.db.fullUsername
)}** \`(${
req.user.id
})\` reported server **${functions.escapeFormatting(
server.name
)}** \`(${server._id})\``,
embeds: [embed]
})

await discord.channels.alerts.send({
content: `${settings.emoji.report} **${functions.escapeFormatting(
req.user.db.fullUsername
)}** \`(${
req.user.id
})\` reported server **${functions.escapeFormatting(
server.name
)}** \`(${server._id})\``,
embeds: [embed]
});

return res.status(200).json({
error: false,
status: 200,
Expand Down Expand Up @@ -1000,7 +1006,7 @@ router.post(

await global.db.collection("users").updateOne(
{ _id: req.user.id },
{
{
$inc: {
"staffTracking.handledServers.allTime.total": 1,
"staffTracking.handledServers.allTime.declined": 1,
Expand All @@ -1009,7 +1015,7 @@ router.post(
}
}
);

await userCache.updateUser(req.user.id);

const type = serverType(req.body.type);
Expand Down Expand Up @@ -1108,7 +1114,7 @@ router.get(

await global.db.collection("users").updateOne(
{ _id: req.user.id },
{
{
$inc: {
"staffTracking.handledServers.allTime.total": 1,
"staffTracking.handledServers.allTime.approved": 1,
Expand All @@ -1117,7 +1123,7 @@ router.get(
}
}
);

await userCache.updateUser(req.user.id);

await global.db.collection("audit").insertOne({
Expand Down
Loading

0 comments on commit e32d01d

Please sign in to comment.