Type fixes for djs

This commit is contained in:
Dark 2021-06-30 04:56:56 +02:00
parent 653d6c1dc2
commit 0822fc15e5
No known key found for this signature in database
GPG key ID: 2CD6ACB6B0A87B8A
130 changed files with 8877 additions and 411 deletions

View file

@ -1,4 +1,4 @@
import { Role } from "discord.js";
import { Role, Snowflake } from "discord.js";
import { commandTypeHelpers as ct } from "../../../commandTypes";
import { sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils";
import { memberRolesLock } from "../../../utils/lockNameHelpers";
@ -31,7 +31,7 @@ export const RoleAddCmd = selfGrantableRolesCmd({
const hasUnknownRoles = matchedRoleIds.length !== roleNames.length;
const rolesToAdd: Map<string, Role> = Array.from(matchedRoleIds.values())
.map(id => pluginData.guild.roles.cache.get(id)!)
.map(id => pluginData.guild.roles.cache.get(id as Snowflake)!)
.filter(Boolean)
.reduce((map, role) => {
map.set(role.id, role);
@ -68,10 +68,10 @@ export const RoleAddCmd = selfGrantableRolesCmd({
newRoleIds.delete(roleId);
rolesToAdd.delete(roleId);
if (msg.member.roles.cache.has(roleId)) {
removed.add(pluginData.guild.roles.cache.get(roleId)!);
if (msg.member.roles.cache.has(roleId as Snowflake)) {
removed.add(pluginData.guild.roles.cache.get(roleId as Snowflake)!);
} else {
skipped.add(pluginData.guild.roles.cache.get(roleId)!);
skipped.add(pluginData.guild.roles.cache.get(roleId as Snowflake)!);
}
}
}

View file

@ -47,6 +47,6 @@ export const RoleHelpCmd = selfGrantableRolesCmd({
color: parseInt("42bff4", 16),
};
msg.channel.send({ embed: helpEmbed });
msg.channel.send({ embeds: [helpEmbed] });
},
});

View file

@ -1,3 +1,4 @@
import { Snowflake } from "discord.js";
import { commandTypeHelpers as ct } from "../../../commandTypes";
import { sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils";
import { memberRolesLock } from "../../../utils/lockNameHelpers";
@ -27,7 +28,9 @@ export const RoleRemoveCmd = selfGrantableRolesCmd({
const roleNames = normalizeRoleNames(splitRoleNames(args.roleNames));
const matchedRoleIds = findMatchingRoles(roleNames, applyingEntries);
const rolesToRemove = Array.from(matchedRoleIds.values()).map(id => pluginData.guild.roles.cache.get(id)!);
const rolesToRemove = Array.from(matchedRoleIds.values()).map(
id => pluginData.guild.roles.cache.get(id as Snowflake)!,
);
const roleIdsToRemove = rolesToRemove.map(r => r.id);
// Remove the roles