Bug fixes and ~~performance~~ typing improvements
diff --git a/src/events/channelUpdate.ts b/src/events/channelUpdate.ts
index 6717661..a7af453 100644
--- a/src/events/channelUpdate.ts
+++ b/src/events/channelUpdate.ts
@@ -5,22 +5,12 @@
export async function callback(client, oc, nc) {
const config = await client.memory.readGuildInfo(nc.guild.id);
- const {
- getAuditLog,
- log,
- NucleusColors,
- entry,
- renderDelta,
- renderUser,
- renderChannel
- } = client.logger;
+ const { getAuditLog, log, NucleusColors, entry, renderDelta, renderUser, renderChannel } = client.logger;
if (nc.parent && nc.parent.id === config.tickets.category) return;
const auditLog = await getAuditLog(nc.guild, "CHANNEL_UPDATE");
- const audit = auditLog.entries
- .filter((entry) => entry.target.id === nc.id)
- .first();
+ const audit = auditLog.entries.filter((entry) => entry.target.id === nc.id).first();
if (audit.executor.id === client.user.id) return;
let emoji: string;
@@ -30,18 +20,11 @@
channelId: entry(nc.id, `\`${nc.id}\``),
channel: entry(nc.id, renderChannel(nc)),
edited: entry(new Date().getTime(), renderDelta(new Date().getTime())),
- editedBy: entry(
- audit.executor.id,
- renderUser((await nc.guild.members.fetch(audit.executor.id)).user)
- )
+ editedBy: entry(audit.executor.id, renderUser((await nc.guild.members.fetch(audit.executor.id)).user))
};
- if (oc.name !== nc.name)
- changes.name = entry([oc.name, nc.name], `${oc.name} -> ${nc.name}`);
+ if (oc.name !== nc.name) changes.name = entry([oc.name, nc.name], `${oc.name} -> ${nc.name}`);
if (oc.position !== nc.position)
- changes.position = entry(
- [oc.position, nc.position],
- `${oc.position} -> ${nc.position}`
- );
+ changes.position = entry([oc.position, nc.position], `${oc.position} -> ${nc.position}`);
switch (nc.type) {
case "GUILD_TEXT": {
@@ -52,45 +35,28 @@
newTopic = nc.topic;
if (oldTopic) {
if (oldTopic.length > 256)
- oldTopic = `\`\`\`\n${
- oldTopic.replace("`", "'").substring(0, 253) + "..."
- }\n\`\`\``;
+ oldTopic = `\`\`\`\n${oldTopic.replace("`", "'").substring(0, 253) + "..."}\n\`\`\``;
else oldTopic = `\`\`\`\n${oldTopic.replace("`", "'")}\n\`\`\``;
} else {
oldTopic = "None";
}
if (newTopic) {
if (newTopic.length > 256)
- newTopic = `\`\`\`\n${
- newTopic.replace("`", "'").substring(0, 253) + "..."
- }\n\`\`\``;
+ newTopic = `\`\`\`\n${newTopic.replace("`", "'").substring(0, 253) + "..."}\n\`\`\``;
else newTopic = `\`\`\`\n${newTopic.replace("`", "'")}\n\`\`\``;
} else {
newTopic = "None";
}
const nsfw = ["", ""];
- nsfw[0] = oc.nsfw
- ? `${getEmojiByName("CONTROL.TICK")} Yes`
- : `${getEmojiByName("CONTROL.CROSS")} No`;
- nsfw[1] = nc.nsfw
- ? `${getEmojiByName("CONTROL.TICK")} Yes`
- : `${getEmojiByName("CONTROL.CROSS")} No`;
+ nsfw[0] = oc.nsfw ? `${getEmojiByName("CONTROL.TICK")} Yes` : `${getEmojiByName("CONTROL.CROSS")} No`;
+ nsfw[1] = nc.nsfw ? `${getEmojiByName("CONTROL.TICK")} Yes` : `${getEmojiByName("CONTROL.CROSS")} No`;
if (oc.topic !== nc.topic)
- changes.description = entry(
- [oc.topic, nc.topic],
- `\nBefore: ${oldTopic}\nAfter: ${newTopic}`
- );
- if (oc.nsfw !== nc.nsfw)
- changes.nsfw = entry(
- [oc.nsfw, nc.nsfw],
- `${nsfw[0]} -> ${nsfw[1]}`
- );
+ changes.description = entry([oc.topic, nc.topic], `\nBefore: ${oldTopic}\nAfter: ${newTopic}`);
+ if (oc.nsfw !== nc.nsfw) changes.nsfw = entry([oc.nsfw, nc.nsfw], `${nsfw[0]} -> ${nsfw[1]}`);
if (oc.rateLimitPerUser !== nc.rateLimitPerUser)
changes.rateLimitPerUser = entry(
[oc.rateLimitPerUser, nc.rateLimitPerUser],
- `${humanizeDuration(
- oc.rateLimitPerUser * 1000
- )} -> ${humanizeDuration(nc.rateLimitPerUser * 1000)}`
+ `${humanizeDuration(oc.rateLimitPerUser * 1000)} -> ${humanizeDuration(nc.rateLimitPerUser * 1000)}`
);
break;
@@ -103,27 +69,20 @@
newTopic = nc.topic;
if (oldTopic) {
if (oldTopic.length > 256)
- oldTopic = `\`\`\`\n${
- oldTopic.replace("`", "'").substring(0, 253) + "..."
- }\n\`\`\``;
+ oldTopic = `\`\`\`\n${oldTopic.replace("`", "'").substring(0, 253) + "..."}\n\`\`\``;
else oldTopic = `\`\`\`\n${oldTopic.replace("`", "'")}\n\`\`\``;
} else {
oldTopic = "None";
}
if (newTopic) {
if (newTopic.length > 256)
- newTopic = `\`\`\`\n${
- newTopic.replace("`", "'").substring(0, 253) + "..."
- }\n\`\`\``;
+ newTopic = `\`\`\`\n${newTopic.replace("`", "'").substring(0, 253) + "..."}\n\`\`\``;
else newTopic = `\`\`\`\n${newTopic.replace("`", "'")}\n\`\`\``;
} else {
newTopic = "None";
}
if (oc.nsfw !== nc.nsfw)
- changes.nsfw = entry(
- [oc.nsfw, nc.nsfw],
- `${oc.nsfw ? "On" : "Off"} -> ${nc.nsfw ? "On" : "Off"}`
- );
+ changes.nsfw = entry([oc.nsfw, nc.nsfw], `${oc.nsfw ? "On" : "Off"} -> ${nc.nsfw ? "On" : "Off"}`);
break;
}
case "GUILD_VOICE": {
@@ -131,23 +90,16 @@
readableType = "Voice";
displayName = "Voice Channel";
if (oc.bitrate !== nc.bitrate)
- changes.bitrate = entry(
- [oc.bitrate, nc.bitrate],
- `${oc.bitrate} -> ${nc.bitrate}`
- );
+ changes.bitrate = entry([oc.bitrate, nc.bitrate], `${oc.bitrate} -> ${nc.bitrate}`);
if (oc.userLimit !== nc.userLimit)
changes.maxUsers = entry(
[oc.userLimit, nc.userLimit],
- `${oc.userLimit ? oc.userLimit : "Unlimited"} -> ${
- nc.userLimit
- }`
+ `${oc.userLimit ? oc.userLimit : "Unlimited"} -> ${nc.userLimit}`
);
if (oc.rtcRegion !== nc.rtcRegion)
changes.region = entry(
[oc.rtcRegion, nc.rtcRegion],
- `${oc.rtcRegion || "Automatic"} -> ${
- nc.rtcRegion || "Automatic"
- }`
+ `${oc.rtcRegion || "Automatic"} -> ${nc.rtcRegion || "Automatic"}`
);
break;
}
@@ -159,40 +111,29 @@
newTopic = nc.topic;
if (oldTopic) {
if (oldTopic.length > 256)
- oldTopic = `\`\`\`\n${
- oldTopic.replace("`", "'").substring(0, 253) + "..."
- }\n\`\`\``;
+ oldTopic = `\`\`\`\n${oldTopic.replace("`", "'").substring(0, 253) + "..."}\n\`\`\``;
else oldTopic = `\`\`\`\n${oldTopic.replace("`", "'")}\n\`\`\``;
} else {
oldTopic = "None";
}
if (newTopic) {
if (newTopic.length > 256)
- newTopic = `\`\`\`\n${
- newTopic.replace("`", "'").substring(0, 253) + "..."
- }\n\`\`\``;
+ newTopic = `\`\`\`\n${newTopic.replace("`", "'").substring(0, 253) + "..."}\n\`\`\``;
else newTopic = `\`\`\`\n${newTopic.replace("`", "'")}\n\`\`\``;
} else {
newTopic = "None";
}
if (oc.bitrate !== nc.bitrate)
- changes.bitrate = entry(
- [oc.bitrate, nc.bitrate],
- `${oc.bitrate} -> ${nc.bitrate}`
- );
+ changes.bitrate = entry([oc.bitrate, nc.bitrate], `${oc.bitrate} -> ${nc.bitrate}`);
if (oc.userLimit !== nc.userLimit)
changes.maxUsers = entry(
[oc.userLimit, nc.userLimit],
- `${oc.userLimit ? oc.userLimit : "Unlimited"} -> ${
- nc.userLimit
- }`
+ `${oc.userLimit ? oc.userLimit : "Unlimited"} -> ${nc.userLimit}`
);
if (oc.rtcRegion !== nc.rtcRegion)
changes.region = entry(
[oc.rtcRegion, nc.rtcRegion],
- `${oc.rtcRegion || "Automatic"} -> ${
- nc.rtcRegion || "Automatic"
- }`
+ `${oc.rtcRegion || "Automatic"} -> ${nc.rtcRegion || "Automatic"}`
);
break;
}
@@ -210,10 +151,7 @@
}
const t = oc.type.split("_")[1];
if (oc.type !== nc.type)
- changes.type = entry(
- [oc.type, nc.type],
- `${t[0] + t.splice(1).toLowerCase()} -> ${readableType}`
- );
+ changes.type = entry([oc.type, nc.type], `${t[0] + t.splice(1).toLowerCase()} -> ${readableType}`);
if (!(Object.values(changes).length - 4)) return;
const data = {
meta: {