mirror of
https://github.com/ZeppelinBot/Zeppelin.git
synced 2025-05-17 15:15:02 +00:00
Merge master
This commit is contained in:
commit
1518d58e25
53 changed files with 289 additions and 320 deletions
|
@ -1,23 +1,23 @@
|
|||
import type { Snowflake } from "discord.js";
|
||||
import { GuildPluginData } from "knub";
|
||||
import { logger } from "../../../logger";
|
||||
import { renderUserUsername, resolveUser } from "../../../utils";
|
||||
import { renderUsername, resolveUser } from "../../../utils";
|
||||
import { CaseArgs, CasesPluginType } from "../types";
|
||||
import { createCaseNote } from "./createCaseNote";
|
||||
import { postCaseToCaseLogChannel } from "./postToCaseLogChannel";
|
||||
|
||||
export async function createCase(pluginData: GuildPluginData<CasesPluginType>, args: CaseArgs) {
|
||||
const user = await resolveUser(pluginData.client, args.userId);
|
||||
const userName = renderUserUsername(user);
|
||||
const name = renderUsername(user);
|
||||
|
||||
const mod = await resolveUser(pluginData.client, args.modId);
|
||||
const modName = mod.tag;
|
||||
const modName = renderUsername(mod);
|
||||
|
||||
let ppName: string | null = null;
|
||||
let ppId: Snowflake | null = null;
|
||||
if (args.ppId) {
|
||||
const pp = await resolveUser(pluginData.client, args.ppId);
|
||||
ppName = pp.tag;
|
||||
ppName = renderUsername(pp);
|
||||
ppId = pp.id;
|
||||
}
|
||||
|
||||
|
@ -32,7 +32,7 @@ export async function createCase(pluginData: GuildPluginData<CasesPluginType>, a
|
|||
const createdCase = await pluginData.state.cases.create({
|
||||
type: args.type,
|
||||
user_id: user.id,
|
||||
user_name: userName,
|
||||
user_name: name,
|
||||
mod_id: mod.id,
|
||||
mod_name: modName,
|
||||
audit_log_id: args.auditLogId,
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import { GuildPluginData } from "knub";
|
||||
import { ERRORS, RecoverablePluginError } from "../../../RecoverablePluginError";
|
||||
import { UnknownUser, resolveUser } from "../../../utils";
|
||||
import { UnknownUser, renderUsername, resolveUser } from "../../../utils";
|
||||
import { CaseNoteArgs, CasesPluginType } from "../types";
|
||||
import { postCaseToCaseLogChannel } from "./postToCaseLogChannel";
|
||||
import { resolveCaseId } from "./resolveCaseId";
|
||||
|
@ -16,7 +16,7 @@ export async function createCaseNote(pluginData: GuildPluginData<CasesPluginType
|
|||
throw new RecoverablePluginError(ERRORS.INVALID_USER);
|
||||
}
|
||||
|
||||
const modName = mod.tag;
|
||||
const modName = renderUsername(mod);
|
||||
|
||||
let body = args.body;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue