Skip to content

Commit eb1fa28

Browse files
committed
debug: resolveUser context
1 parent 5ba4053 commit eb1fa28

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+52
-52
lines changed

backend/src/commandTypes.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,15 @@ export const commandTypes = {
4141
},
4242

4343
async resolvedUser(value, context: CommandContext<any>) {
44-
const result = await resolveUser(context.pluginData.client, value);
44+
const result = await resolveUser(context.pluginData.client, value, "commandTypes:resolvedUser");
4545
if (result == null || result instanceof UnknownUser) {
4646
throw new TypeConversionError(`User \`${escapeCodeBlock(value)}\` was not found`);
4747
}
4848
return result;
4949
},
5050

5151
async resolvedUserLoose(value, context: CommandContext<any>) {
52-
const result = await resolveUser(context.pluginData.client, value);
52+
const result = await resolveUser(context.pluginData.client, value, "commandTypes:resolvedUserLoose");
5353
if (result == null) {
5454
throw new TypeConversionError(`Invalid user: \`${escapeCodeBlock(value)}\``);
5555
}

backend/src/plugins/AutoDelete/util/deleteNextItem.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ export async function deleteNextItem(pluginData: GuildPluginData<AutoDeletePlugi
5555
logger.warn(err);
5656
});
5757

58-
const user = await resolveUser(pluginData.client, itemToDelete.message.user_id);
58+
const user = await resolveUser(pluginData.client, itemToDelete.message.user_id, "AutoDelete:deleteNextItem");
5959
const messageDate = timeAndDate
6060
.inGuildTz(moment.utc(itemToDelete.message.data.timestamp, "x"))
6161
.format(timeAndDate.getDateFormat("pretty_datetime"));

backend/src/plugins/Automod/events/runAutomodOnCounterTrigger.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export async function runAutomodOnCounterTrigger(
1212
userId: string | null,
1313
reverse: boolean,
1414
) {
15-
const user = userId ? await resolveUser(pluginData.client, userId) : undefined;
15+
const user = userId ? await resolveUser(pluginData.client, userId, "Automod:runAutomodOnCounterTrigger") : undefined;
1616
const member = (userId && (await resolveMember(pluginData.client, pluginData.guild, userId))) || undefined;
1717
const prettyCounterName = pluginData.getPlugin(CountersPlugin).getPrettyNameForCounter(counterName);
1818
const prettyTriggerName = pluginData

backend/src/plugins/Automod/events/runAutomodOnModAction.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export async function runAutomodOnModAction(
1212
isAutomodAction = false,
1313
) {
1414
const [user, member] = await Promise.all([
15-
resolveUser(pluginData.client, userId),
15+
resolveUser(pluginData.client, userId, "Automod:runAutomodOnModAction"),
1616
resolveMember(pluginData.client, pluginData.guild, userId),
1717
]);
1818

backend/src/plugins/BotControl/commands/ListDashboardPermsCmd.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ export const ListDashboardPermsCmd = botControlCmd({
6868

6969
finalMessage += `The server ${guildInfo} has the following assigned permissions:\n`; // Double \n for consistency with AddDashboardUserCmd
7070
for (const assignment of existingGuildAssignment) {
71-
const user = await resolveUser(pluginData.client, assignment.target_id);
71+
const user = await resolveUser(pluginData.client, assignment.target_id, "BotControl:ListDashboardPermsCmd");
7272
finalMessage += `\n**${renderUsername(user)}**, \`${assignment.target_id}\`: ${assignment.permissions.join(
7373
", ",
7474
)}`;

backend/src/plugins/BotControl/commands/ListDashboardUsersCmd.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export const ListDashboardUsersCmd = botControlCmd({
2020
const dashboardUsers = await pluginData.state.apiPermissionAssignments.getByGuildId(guild.id);
2121
const users = await Promise.all(
2222
dashboardUsers.map(async (perm) => ({
23-
user: await resolveUser(pluginData.client, perm.target_id),
23+
user: await resolveUser(pluginData.client, perm.target_id, "BotControl:ListDashboardUsersCmd"),
2424
permission: perm,
2525
})),
2626
);

backend/src/plugins/Cases/functions/createCase.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@ import { createCaseNote } from "./createCaseNote.js";
77
import { postCaseToCaseLogChannel } from "./postToCaseLogChannel.js";
88

99
export async function createCase(pluginData: GuildPluginData<CasesPluginType>, args: CaseArgs) {
10-
const user = await resolveUser(pluginData.client, args.userId);
10+
const user = await resolveUser(pluginData.client, args.userId, "Cases:createCase");
1111
const name = renderUsername(user);
1212

13-
const mod = await resolveUser(pluginData.client, args.modId);
13+
const mod = await resolveUser(pluginData.client, args.modId, "Cases:createCase");
1414
const modName = renderUsername(mod);
1515

1616
let ppName: string | null = null;
1717
let ppId: Snowflake | null = null;
1818
if (args.ppId) {
19-
const pp = await resolveUser(pluginData.client, args.ppId);
19+
const pp = await resolveUser(pluginData.client, args.ppId, "Cases:createCase");
2020
ppName = renderUsername(pp);
2121
ppId = pp.id;
2222
}

backend/src/plugins/Cases/functions/createCaseNote.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export async function createCaseNote(pluginData: GuildPluginData<CasesPluginType
1111
throw new RecoverablePluginError(ERRORS.UNKNOWN_NOTE_CASE);
1212
}
1313

14-
const mod = await resolveUser(pluginData.client, args.modId);
14+
const mod = await resolveUser(pluginData.client, args.modId, "Cases:createCaseNote");
1515
if (mod instanceof UnknownUser) {
1616
throw new RecoverablePluginError(ERRORS.INVALID_USER);
1717
}

backend/src/plugins/Censor/util/censorMessage.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export async function censorMessage(
2020
return;
2121
}
2222

23-
const user = await resolveUser(pluginData.client, savedMessage.user_id);
23+
const user = await resolveUser(pluginData.client, savedMessage.user_id, "Censor:censorMessage");
2424
const channel = pluginData.guild.channels.resolve(savedMessage.channel_id as Snowflake)! as GuildTextBasedChannel;
2525

2626
pluginData.getPlugin(LogsPlugin).logCensor({

backend/src/plugins/ContextMenus/commands/ModMenuUserCtxCmd.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ export const ModMenuCmd = guildPluginUserContextMenuCommand({
5252
return;
5353
}
5454

55-
const user = await resolveUser(pluginData.client, interaction.targetId);
55+
const user = await resolveUser(pluginData.client, interaction.targetId, "ContextMenus:ModMenuCmd");
5656
if (!user.id) {
5757
await interaction.followUp("Error: User not found");
5858
return;

0 commit comments

Comments
 (0)