TECH-127 Add URL field

bot/database/database.ts

@@ -219,13 +219,14 @@ export async function GetVerifiedUser(guild_id: string, user_id: string): Promis
     }
 }
 
-export async function AddUserWarning(guild_id: string, target_user_id: string, issuer_user_id: string, reason: string, strike: boolean): Promise<Warning> {
+export async function AddUserWarning(guild_id: string, target_user_id: string, issuer_user_id: string, reason: string, url: string | undefined, strike: boolean): Promise<Warning> {
     const pb = await getPb();
     const data = {
         guild_id,
         target_user_id,
         issuer_user_id,
         reason,
+        url,
         strike
     }
     return await pb.collection("warnings").create(data);
@@ -295,38 +296,41 @@ export async function GetStrikeCount(guild_id: string, target_user_id: string):
     return warnings.length;
 }
 
-export async function AddUserBan(guild_id: string, target_user_id: string, issuer_user_id: string, reason: string, automatic: boolean): Promise<Ban> {
+export async function AddUserBan(guild_id: string, target_user_id: string, issuer_user_id: string, reason: string, url: string | undefined, automatic: boolean): Promise<Ban> {
     const pb = await getPb();
     const data = {
         guild_id,
         target_user_id,
         issuer_user_id,
         reason,
+        url,
         automatic
     }
     return await pb.collection("bans").create(data);
 }
 
-export async function AddUserKick(guild_id: string, target_user_id: string, issuer_user_id: string, reason: string, automatic: boolean): Promise<Kick> {
+export async function AddUserKick(guild_id: string, target_user_id: string, issuer_user_id: string, reason: string, url: string | undefined, automatic: boolean): Promise<Kick> {
     const pb = await getPb();
     const data = {
         guild_id,
         target_user_id,
         issuer_user_id,
         reason,
+        url,
         automatic
     }
     return await pb.collection("kicks").create(data);
 }
 
-export async function AddUserTimeout(guild_id: string, target_user_id: string, issuer_user_id: string, duration: number, reason: string, automatic: boolean): Promise<Timeout> {
+export async function AddUserTimeout(guild_id: string, target_user_id: string, issuer_user_id: string, duration: number, reason: string, url: string | undefined, automatic: boolean): Promise<Timeout> {
     const pb = await getPb();
     const data = {
         guild_id,
         target_user_id,
         issuer_user_id,
         duration,
         reason,
+        url,
         automatic
     }
     return await pb.collection("timeouts").create(data);

bot/discord/commands/moderator/Ban.ts

@@ -17,6 +17,12 @@ export const command = new SlashCommandBuilder()
             .setDescription("Reason for ban. This will be displayed to the user.")
             .setRequired(true)
     )
+    .addStringOption((option) =>
+        option
+            .setName("url")
+            .setDescription("URL to the message (optional)")
+            .setRequired(false)
+    )
     .setDefaultMemberPermissions(PermissionFlagsBits.BanMembers);
 
 export async function execute(interaction: CommandInteraction) {
@@ -31,6 +37,7 @@ export async function execute(interaction: CommandInteraction) {
     const issuer = interaction.member! as GuildMember;
     const target = interaction.options.get("user")!.member as GuildMember;
     const reason = interaction.options.get("reason")!.value as string;
+    const url = interaction.options.get("url")?.value as string | undefined;
     const dm = await target.createDM().catch(error => {
 	    console.log(error);
 	    return null;
@@ -40,7 +47,7 @@ export async function execute(interaction: CommandInteraction) {
 	    console.error(`Failed to send message to <@${target.id}>.`);
     }
 
-    const ban = await AddUserBan(guild.id, target.id, issuer.id, reason, false);
+    const ban = await AddUserBan(guild.id, target.id, issuer.id, reason, url, false);
     await LogBan(interaction, ban);
     target.ban({ reason: reason });
     let message = `

bot/discord/commands/moderator/Kick.ts

@@ -17,6 +17,12 @@ export const command = new SlashCommandBuilder()
             .setDescription("Reason for kick. This will be displayed to the user.")
             .setRequired(true)
     )
+    .addStringOption((option) =>
+        option
+            .setName("url")
+            .setDescription("URL to the message (optional)")
+            .setRequired(false)
+    )
     .setDefaultMemberPermissions(PermissionFlagsBits.KickMembers);
 
 export async function execute(interaction: CommandInteraction) {
@@ -31,6 +37,7 @@ export async function execute(interaction: CommandInteraction) {
     const issuer = interaction.member! as GuildMember;
     const target = interaction.options.get("user")!.member as GuildMember;
     const reason = interaction.options.get("reason")!.value as string;
+    const url = interaction.options.get("url")?.value as string | undefined;
     const dm = await target.createDM().catch(error => {
         console.log(error);
         return null;
@@ -40,7 +47,7 @@ export async function execute(interaction: CommandInteraction) {
         console.error(`Failed to send message to <@${target.id}>.`);
     }
 
-    const ban = await AddUserKick(guild.id, target.id, issuer.id, reason, false);
+    const ban = await AddUserKick(guild.id, target.id, issuer.id, reason, url, false);
     await LogKick(interaction, ban);
     target.kick(reason);
     let message = `

bot/discord/commands/moderator/Timeout.ts

@@ -18,6 +18,12 @@ export const command = new SlashCommandBuilder()
             .setDescription("Reason for timeout. This will be displayed to the user.")
             .setRequired(true)
     )
+    .addStringOption((option) =>
+        option
+            .setName("url")
+            .setDescription("URL to the message (optional)")
+            .setRequired(false)
+    )
     .setDefaultMemberPermissions(PermissionFlagsBits.KickMembers);
 
 export async function execute(interaction: CommandInteraction) {
@@ -32,11 +38,12 @@ export async function execute(interaction: CommandInteraction) {
     const issuer = interaction.member! as GuildMember;
     const target = interaction.options.get("user")!.member as GuildMember;
     const reason = interaction.options.get("reason")!.value as string;
+    const url = interaction.options.get("url")?.value as string | undefined;
     const duration = interaction.options.get("duration")!.value as number;
     const durationMilliseconds = duration * 1000 * 60;
     const dm = await target.createDM();
 
-    const ban = await AddUserTimeout(guild.id, target.id, issuer.id, duration, reason, false);
+    const ban = await AddUserTimeout(guild.id, target.id, issuer.id, duration, reason, url, false);
     await LogTimeout(interaction, ban);
     target.timeout(durationMilliseconds, reason);
     let message = `

bot/discord/commands/moderator/Warn.ts

@@ -20,6 +20,12 @@ export const command = new SlashCommandBuilder()
     .addBooleanOption((option) =>
         option.setName("strike").setDescription("Record this warning as a formal strike").setRequired(true)
     )
+    .addStringOption((option) =>
+        option
+            .setName("url")
+            .setDescription("URL to the message (optional)")
+            .setRequired(false)
+    )
     .setDefaultMemberPermissions(PermissionFlagsBits.ManageMessages);
 
 export async function execute(interaction: CommandInteraction) {
@@ -34,9 +40,10 @@ export async function execute(interaction: CommandInteraction) {
     const issuer = interaction.member! as GuildMember;
     const target = interaction.options.get("user")!.member as GuildMember;
     const reason = interaction.options.get("reason")!.value as string;
+    const url = interaction.options.get("url")?.value as string | undefined;
     const strike = interaction.options.get("strike")!.value as boolean;
 
-    const warn = await AddUserWarning(interaction.guild.id, target.id, issuer.id, reason, strike);
+    const warn = await AddUserWarning(interaction.guild.id, target.id, issuer.id, reason, url, strike);
     LogWarning(interaction, warn);
 
     if (strike) {

bot/models/Ban.ts

@@ -8,5 +8,6 @@ export interface Ban {
     target_user_id: string
     issuer_user_id: string
     reason: string
+    url?: string
     automatic: boolean
 }

bot/models/Kick.ts

@@ -8,5 +8,6 @@ export interface Kick {
     target_user_id: string
     issuer_user_id: string
     reason: string
+    url?: string
     automatic: boolean
 }

bot/models/Timeout.ts

@@ -9,5 +9,6 @@ export interface Timeout {
     issuer_user_id: string
     duration: number
     reason: string
+    url?: string
     automatic: boolean
 }

bot/models/Warning.ts

@@ -8,5 +8,6 @@ export interface Warning {
     target_user_id: string
     issuer_user_id: string
     reason: string
+    url?: string
     strike: boolean
 }

bot/templates/embeds/BanLogEmbed.ts

@@ -25,6 +25,7 @@ export default async function BanLogEmbed(client: Client, ban: Ban) {
             { name: "Name", value: targetInfo?.name ?? "<not found>", inline: true },
             { name: "Handle", value: `<@${target.id}>`, inline: true },
             { name: "Reason", value: ban.reason, inline: false },
+            { name: "URL", value: ban.url ? ban.url : "None", inline: false },
             { name: "Automatically issued", value: ban.automatic ? "Yes" : "No", inline: true },
             { name: "Issued by", value: `<@${issuer.id}>`, inline: true }
         );

bot/templates/embeds/KickLogEmbed.ts

@@ -25,6 +25,7 @@ export default async function BanLogEmbed(client: Client, kick: Kick) {
             { name: "Name", value: targetInfo?.name ?? "<not found>", inline: true },
             { name: "Handle", value: `<@${target.id}>`, inline: true },
             { name: "Reason", value: kick.reason, inline: false },
+            { name: "URL", value: kick.url ? kick.url : "None", inline: false },
             { name: "Automatically issued", value: kick.automatic ? "Yes" : "No", inline: true },
             { name: "Issued by", value: `<@${issuer.id}>`, inline: true }
         );

bot/templates/embeds/TimeoutLogEmbed.ts

@@ -25,6 +25,7 @@ export default async function timeoutLogEmbed(client: Client, timeout: Timeout)
             { name: "Name", value: targetInfo?.name ?? "<not found>", inline: true },
             { name: "Handle", value: `<@${target.id}>`, inline: true },
             { name: "Reason", value: timeout.reason, inline: false },
+            { name: "URL", value: timeout.url ? timeout.url : "None", inline: false },
             { name: "Duration", value: timeout.duration.toString(), inline: true},
             { name: "Automatically issued", value: timeout.automatic ? "Yes" : "No", inline: true },
             { name: "Issued by", value: `<@${issuer.id}>`, inline: true }

bot/templates/embeds/WarnLogEmbed.ts

@@ -25,6 +25,7 @@ export default async function WarningLogEmbed(client: Client, warning: Warning)
             { name: "Name", value: targetInfo?.name ?? "<not found>", inline: true },
             { name: "Handle", value: `<@${target.id}>`, inline: true },
             { name: "Reason", value: warning.reason, inline: false },
+            { name: "URL", value: warning.url ? warning.url : "None", inline: false },
             { name: "Strike", value: warning.strike ? "Yes" : "No", inline: true },
             { name: "Issued by", value: `<@${issuer.id}>`, inline: true }
         );