StyAndCo/zappyzep
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix several locations that expected resolveUser() to return null

Browse source
This commit is contained in:
Dragory 2020-12-17 04:12:49 +02:00
parent d35564eac8
commit b9dde47a9e
No known key found for this signature in database
GPG key ID: 5F387BA66DF8AAC1
13 changed files with 35 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
backend/src/plugins/ModActions/commands/BanCmd.ts
View file

@ -33,7 +33,9 @@ export const BanCmd = modActionsCmd({
async run({ pluginData, message: msg, args }) {
const user = await resolveUser(pluginData.client, args.user);
if (!user) return sendErrorMessage(pluginData, msg.channel, `User not found`);
if (!user.id) {
return sendErrorMessage(pluginData, msg.channel, `User not found`);
}
const memberToBan = await resolveMember(pluginData.client, pluginData.guild, user.id);

4
backend/src/plugins/ModActions/commands/CasesUserCmd.ts
View file

@ -36,7 +36,9 @@ export const CasesUserCmd = modActionsCmd({
async run({ pluginData, message: msg, args }) {
const user = await resolveUser(pluginData.client, args.user);
if (!user) return sendErrorMessage(pluginData, msg.channel, `User not found`);
if (!user.id) {
return sendErrorMessage(pluginData, msg.channel, `User not found`);
}
const cases = await pluginData.state.cases.with("notes").getByUserId(user.id);
const normalCases = cases.filter(c => !c.is_hidden);

4
backend/src/plugins/ModActions/commands/ForcebanCmd.ts
View file

@ -31,7 +31,9 @@ export const ForcebanCmd = modActionsCmd({
async run({ pluginData, message: msg, args }) {
const user = await resolveUser(pluginData.client, args.user);
if (!user) return sendErrorMessage(pluginData, msg.channel, `User not found`);
if (!user.id) {
return sendErrorMessage(pluginData, msg.channel, `User not found`);
}
// If the user exists as a guild member, make sure we can act on them first
const member = await resolveMember(pluginData.client, pluginData.guild, user.id);

4
backend/src/plugins/ModActions/commands/ForcemuteCmd.ts
View file

@ -33,7 +33,9 @@ export const ForcemuteCmd = modActionsCmd({
async run({ pluginData, message: msg, args }) {
const user = await resolveUser(pluginData.client, args.user);
if (!user) return sendErrorMessage(pluginData, msg.channel, `User not found`);
if (!user.id) {
return sendErrorMessage(pluginData, msg.channel, `User not found`);
}
const memberToMute = await resolveMember(pluginData.client, pluginData.guild, user.id);

4
backend/src/plugins/ModActions/commands/ForceunmuteCmd.ts
View file

@ -31,7 +31,9 @@ export const ForceUnmuteCmd = modActionsCmd({
async run({ pluginData, message: msg, args }) {
const user = await resolveUser(pluginData.client, args.user);
if (!user) return sendErrorMessage(pluginData, msg.channel, `User not found`);
if (!user.id) {
return sendErrorMessage(pluginData, msg.channel, `User not found`);
}
// Check if they're muted in the first place
if (!(await pluginData.state.mutes.isMuted(user.id))) {

4
backend/src/plugins/ModActions/commands/MuteCmd.ts
View file

@ -43,7 +43,9 @@ export const MuteCmd = modActionsCmd({
async run({ pluginData, message: msg, args }) {
const user = await resolveUser(pluginData.client, args.user);
if (!user) return sendErrorMessage(pluginData, msg.channel, `User not found`);
if (!user.id) {
return sendErrorMessage(pluginData, msg.channel, `User not found`);
}
const memberToMute = await resolveMember(pluginData.client, pluginData.guild, user.id);

4
backend/src/plugins/ModActions/commands/NoteCmd.ts
View file

@ -20,7 +20,9 @@ export const NoteCmd = modActionsCmd({
async run({ pluginData, message: msg, args }) {
const user = await resolveUser(pluginData.client, args.user);
if (!user) return sendErrorMessage(pluginData, msg.channel, `User not found`);
if (!user.id) {
return sendErrorMessage(pluginData, msg.channel, `User not found`);
}
const userName = `${user.username}#${user.discriminator}`;
const reason = formatReasonWithAttachments(args.note, msg.attachments);

4
backend/src/plugins/ModActions/commands/UnbanCmd.ts
View file

@ -28,7 +28,9 @@ export const UnbanCmd = modActionsCmd({
async run({ pluginData, message: msg, args }) {
const user = await resolveUser(pluginData.client, args.user);
if (!user) return sendErrorMessage(pluginData, msg.channel, `User not found`);
if (!user.id) {
return sendErrorMessage(pluginData, msg.channel, `User not found`);
}
// The moderator who did the action is the message author or, if used, the specified -mod
let mod = msg.member;

4
backend/src/plugins/ModActions/commands/UnmuteCmd.ts
View file

@ -33,7 +33,9 @@ export const UnmuteCmd = modActionsCmd({
async run({ pluginData, message: msg, args }) {
const user = await resolveUser(pluginData.client, args.user);
if (!user) return sendErrorMessage(pluginData, msg.channel, `User not found`);
if (!user.id) {
return sendErrorMessage(pluginData, msg.channel, `User not found`);
}
const memberToUnmute = await resolveMember(pluginData.client, pluginData.guild, user.id);
const mutesPlugin = pluginData.getPlugin(MutesPlugin);

4
backend/src/plugins/ModActions/commands/WarnCmd.ts
View file

@ -29,7 +29,9 @@ export const WarnCmd = modActionsCmd({
async run({ pluginData, message: msg, args }) {
const user = await resolveUser(pluginData.client, args.user);
if (!user) return sendErrorMessage(pluginData, msg.channel, `User not found`);
if (!user.id) {
return sendErrorMessage(pluginData, msg.channel, `User not found`);
}
const memberToWarn = await resolveMember(pluginData.client, pluginData.guild, user.id);

4
backend/src/plugins/ModActions/functions/actualKickMemberCmd.ts
View file

@ -24,7 +24,9 @@ export async function actualKickMemberCmd(
},
) {
const user = await resolveUser(pluginData.client, args.user);
if (!user) return sendErrorMessage(pluginData, msg.channel, `User not found`);
if (!user.id) {
return sendErrorMessage(pluginData, msg.channel, `User not found`);
}
const memberToKick = await resolveMember(pluginData.client, pluginData.guild, user.id);

2
backend/src/plugins/ModActions/functions/banUserId.ts
View file

@ -27,7 +27,7 @@ export async function banUserId(
): Promise<BanResult> {
const config = pluginData.config.get();
const user = await resolveUser(pluginData.client, userId);
if (!user) {
if (!user.id) {
return {
status: "failed",
error: "Invalid user",

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

@ -42,7 +42,7 @@ export async function muteUser(
}
const user = await resolveUser(pluginData.client, userId);
if (!user) {
if (!user.id) {
lock.unlock();
throw new RecoverablePluginError(ERRORS.INVALID_USER);
}