StyAndCo/zeppelin
3
0
Fork 0
mirror of https://github.com/ZeppelinBot/Zeppelin.git synced 2025-05-10 12:25:02 +00:00
Code Releases Activity

Reformat all files with Prettier

Browse source
This commit is contained in:
Dragory 2021-09-11 19:06:51 +03:00
parent 0cde0d46d2
commit ac79eb09f5
No known key found for this signature in database
GPG key ID: 5F387BA66DF8AAC1
206 changed files with 727 additions and 888 deletions
Download patch file Download diff file Expand all files Collapse all files

2
backend/src/plugins/Mutes/commands/ClearBannedMutesCmd.ts
View file

@ -13,7 +13,7 @@ export const ClearBannedMutesCmd = mutesCmd({
const activeMutes = await pluginData.state.mutes.getActiveMutes();
const bans = await pluginData.guild.bans.fetch({ cache: true });
const bannedIds = bans.map(b => b.user.id);
const bannedIds = bans.map((b) => b.user.id);
await msg.channel.send(`Found ${activeMutes.length} mutes and ${bannedIds.length} bans, cross-referencing...`);

37
backend/src/plugins/Mutes/commands/MutesCmd.ts
View file

@ -53,12 +53,12 @@ export const MutesCmd = mutesCmd({
if (args.manual) {
// Show only manual mutes (i.e. "Muted" role added without a logged mute)
const muteUserIds = new Set(activeMutes.map(m => m.user_id));
const muteUserIds = new Set(activeMutes.map((m) => m.user_id));
const manuallyMutedMembers: GuildMember[] = [];
const muteRole = pluginData.config.get().mute_role;
if (muteRole) {
pluginData.guild.members.cache.forEach(member => {
pluginData.guild.members.cache.forEach((member) => {
if (muteUserIds.has(member.id)) return;
if (member.roles.cache.has(muteRole as Snowflake)) manuallyMutedMembers.push(member);
});
@ -66,7 +66,7 @@ export const MutesCmd = mutesCmd({
totalMutes = manuallyMutedMembers.length;
lines = manuallyMutedMembers.map(member => {
lines = manuallyMutedMembers.map((member) => {
return `<@!${member.id}> (**${member.user.tag}**, \`${member.id}\`) 🔧 Manual mute`;
});
} else {
@ -76,11 +76,8 @@ export const MutesCmd = mutesCmd({
// Filter: mute age
if (args.age) {
const cutoff = moment
.utc()
.subtract(args.age, "ms")
.format(DBDateFormat);
filteredMutes = filteredMutes.filter(m => m.created_at <= cutoff);
const cutoff = moment.utc().subtract(args.age, "ms").format(DBDateFormat);
filteredMutes = filteredMutes.filter((m) => m.created_at <= cutoff);
hasFilters = true;
}
@ -93,7 +90,7 @@ export const MutesCmd = mutesCmd({
if (!member) {
if (!bannedIds) {
const bans = await pluginData.guild.bans.fetch({ cache: true });
bannedIds = bans.map(u => u.user.id);
bannedIds = bans.map((u) => u.user.id);
}
muteWithDetails.banned = bannedIds.includes(mute.user_id);
@ -106,18 +103,18 @@ export const MutesCmd = mutesCmd({
// Filter: left the server
if (args.left != null) {
filteredMutes = filteredMutes.filter(m => (args.left && !m.member) || (!args.left && m.member));
filteredMutes = filteredMutes.filter((m) => (args.left && !m.member) || (!args.left && m.member));
hasFilters = true;
}
totalMutes = filteredMutes.length;
// Create a message line for each mute
const caseIds = filteredMutes.map(m => m.case_id).filter(v => !!v);
const caseIds = filteredMutes.map((m) => m.case_id).filter((v) => !!v);
const muteCases = caseIds.length ? await pluginData.state.cases.get(caseIds) : [];
const muteCasesById = muteCases.reduce((map, c) => map.set(c.id, c), new Map());
lines = filteredMutes.map(mute => {
lines = filteredMutes.map((mute) => {
const user = pluginData.client.users.resolve(mute.user_id as Snowflake);
const username = user ? user.tag : "Unknown#0000";
const theCase = muteCasesById.get(mute.case_id);
@ -152,7 +149,7 @@ export const MutesCmd = mutesCmd({
let currentPage = 1;
const totalPages = Math.ceil(lines.length / mutesPerPage);
const drawListPage = async page => {
const drawListPage = async (page) => {
page = Math.max(1, Math.min(totalPages, page));
currentPage = page;
@ -197,19 +194,9 @@ export const MutesCmd = mutesCmd({
const idMod = `${listMessage.id}:muteList`;
const buttons: MessageButton[] = [];
buttons.push(
new MessageButton()
.setStyle("SECONDARY")
.setEmoji("⬅")
.setCustomId(`previousButton:${idMod}`),
);
buttons.push(new MessageButton().setStyle("SECONDARY").setEmoji("⬅").setCustomId(`previousButton:${idMod}`));
buttons.push(
new MessageButton()
.setStyle("SECONDARY")
.setEmoji("➡")
.setCustomId(`nextButton:${idMod}`),
);
buttons.push(new MessageButton().setStyle("SECONDARY").setEmoji("➡").setCustomId(`nextButton:${idMod}`));
const row = new MessageActionRow().addComponents(buttons);
await listMessage.edit({ components: [row] });

2
backend/src/plugins/Mutes/functions/clearExpiredMutes.ts
View file

@ -22,7 +22,7 @@ export async function clearExpiredMutes(pluginData: GuildPluginData<MutesPluginT
}
if (mute.roles_to_restore) {
const guildRoles = pluginData.guild.roles.cache;
const newRoles = [...member.roles.cache.keys()].filter(roleId => roleId !== muteRole);
const newRoles = [...member.roles.cache.keys()].filter((roleId) => roleId !== muteRole);
for (const toRestore of mute.roles_to_restore) {
if (guildRoles.has(toRestore) && toRestore !== muteRole && !newRoles.includes(toRestore)) {
newRoles.push(toRestore);

12
backend/src/plugins/Mutes/functions/muteUser.ts
View file

@ -67,12 +67,12 @@ export async function muteUser(
if (!Array.isArray(removeRoles)) {
if (removeRoles) {
// exclude managed roles from being removed
const managedRoles = pluginData.guild.roles.cache.filter(x => x.managed).map(y => y.id);
newRoles = currentUserRoles.filter(r => !managedRoles.includes(r));
const managedRoles = pluginData.guild.roles.cache.filter((x) => x.managed).map((y) => y.id);
newRoles = currentUserRoles.filter((r) => !managedRoles.includes(r));
await member.roles.set(newRoles as Snowflake[]);
}
} else {
newRoles = currentUserRoles.filter(x => !(<string[]>removeRoles).includes(x));
newRoles = currentUserRoles.filter((x) => !(<string[]>removeRoles).includes(x));
await member.roles.set(newRoles as Snowflake[]);
}
@ -82,7 +82,7 @@ export async function muteUser(
rolesToRestore = currentUserRoles;
}
} else {
rolesToRestore = currentUserRoles.filter(x => (<string[]>restoreRoles).includes(x));
rolesToRestore = currentUserRoles.filter((x) => (<string[]>restoreRoles).includes(x));
}
// Apply mute role if it's missing
@ -100,9 +100,9 @@ export async function muteUser(
}
const zep = await resolveMember(pluginData.client, pluginData.guild, pluginData.client.user!.id);
const zepRoles = pluginData.guild.roles.cache.filter(x => zep!.roles.cache.has(x.id));
const zepRoles = pluginData.guild.roles.cache.filter((x) => zep!.roles.cache.has(x.id));
// If we have roles and one of them is above the muted role, throw generic error
if (zepRoles.size >= 0 && zepRoles.some(zepRole => zepRole.position > actualMuteRole.position)) {
if (zepRoles.size >= 0 && zepRoles.some((zepRole) => zepRole.position > actualMuteRole.position)) {
lock.unlock();
logs.logBotAlert({
body: `Cannot mute user ${member.id}: ${e}`,

2
backend/src/plugins/Mutes/functions/unmuteUser.ts
View file

@ -43,7 +43,7 @@ export async function unmuteUser(
}
if (existingMute?.roles_to_restore) {
const guildRoles = pluginData.guild.roles.cache;
const newRoles = [...member.roles.cache.keys()].filter(roleId => roleId !== muteRole);
const newRoles = [...member.roles.cache.keys()].filter((roleId) => roleId !== muteRole);
for (const toRestore of existingMute.roles_to_restore) {
if (guildRoles.has(toRestore) && toRestore !== muteRole && !newRoles.includes(toRestore)) {
newRoles.push(toRestore);