From 78b7732411e285cd191e02f751fae0102f56be3a Mon Sep 17 00:00:00 2001
From: SauceyRed <saucey@saucey.red>
Date: Sat, 16 Aug 2025 11:59:48 +0200
Subject: [PATCH 1/2] feat: add Confirmation modal to prompt users to confirm
 or cancel dangerous actions

---
 components/Modal/Base.vue         |  5 +++
 components/Modal/Confirmation.vue | 54 +++++++++++++++++++++++++++++++
 types/interfaces.ts               |  5 +++
 3 files changed, 64 insertions(+)
 create mode 100644 components/Modal/Confirmation.vue

diff --git a/components/Modal/Base.vue b/components/Modal/Base.vue
index 3fd7079..68fd96a 100644
--- a/components/Modal/Base.vue
+++ b/components/Modal/Base.vue
@@ -25,6 +25,11 @@ onMounted(() => {
     if (props.onCancel) dialog.value.addEventListener("cancel", props.onCancel);
   }
 });
+
+function close() { dialog.value?.close() }
+
+defineExpose({ close });
+
 </script>
 
 <style scoped>
diff --git a/components/Modal/Confirmation.vue b/components/Modal/Confirmation.vue
new file mode 100644
index 0000000..8958909
--- /dev/null
+++ b/components/Modal/Confirmation.vue
@@ -0,0 +1,54 @@
+<template>
+	<ModalBase ref="modal" class="confirmation-modal" :obscure="true" :onClose="props.onClose" :onCancel="props.onCancel">
+		<div class="confirmation-modal-body">
+			<div>
+				<h1 class="confirmation-modal-message">Are you sure you would like to {{ props.actionName.toLowerCase() }} {{ props.displayName }}?</h1>
+			</div>
+			<div class="confirmation-modal-buttons">
+				<Button :variant="'normal'" :text="'Cancel'" @click="closeModal()" />
+				<Button :variant="'scary'" :text="'Confirm'" :callback="props.callback()" />
+			</div>
+		</div>
+	</ModalBase>
+</template>
+
+<script lang="ts" setup>
+import Button from '../UserInterface/Button.vue';
+
+const props = defineProps<{ actionName: string, displayName?: string, callback: CallableFunction, onClose: () => void, onCancel: () => void }>();
+
+const modal = ref<{ close: () => void }>();
+
+function closeModal() {
+	const test = document.getElementsByClassName("confirmation-modal")[0];
+	console.log("[CONFIRM] modal rah:", test);
+	if (modal.value) {
+		modal.value.close();
+	}
+}
+
+</script>
+
+<style>
+
+.confirmation-modal-body {
+	display: flex;
+	flex-direction: column;
+	background-color: var(--modal-background-color);
+	align-items: center;
+	text-align: center;
+	padding: 1rem;
+	color: var(--text-color);
+	border: .1rem solid var(--primary-color);
+}
+
+.confirmation-modal-buttons {
+	display: flex;
+	gap: 1rem;
+}
+
+.confirmation-modal-message {
+	font-size: 1.5em;
+}
+
+</style>
\ No newline at end of file
diff --git a/types/interfaces.ts b/types/interfaces.ts
index bb6489b..02235e0 100644
--- a/types/interfaces.ts
+++ b/types/interfaces.ts
@@ -140,3 +140,8 @@ export interface NavbarOptions {
 	isDirectMessages?: boolean
 }
 
+export interface IConfirmationModal {
+	show: boolean,
+	actionName: string,
+	callback: CallableFunction
+}

From 3a9df965c23f418f46fa027bb5c7d4f614c440b7 Mon Sep 17 00:00:00 2001
From: SauceyRed <saucey@saucey.red>
Date: Sat, 16 Aug 2025 12:01:36 +0200
Subject: [PATCH 2/2] feat: implement Confirmation modal on kick and ban
 context menu actions

---
 components/Message.vue                | 21 ++++++++++++--
 utils/createMemberContextMenuItems.ts | 42 ++++++++++++++++++++++++---
 2 files changed, 56 insertions(+), 7 deletions(-)

diff --git a/components/Message.vue b/components/Message.vue
index 066331b..fa202aa 100644
--- a/components/Message.vue
+++ b/components/Message.vue
@@ -59,6 +59,9 @@
 			<MessageMedia v-if="mediaLinks.length" :links="mediaLinks"/>
 		</div>
 	</div>
+	<ModalConfirmation v-if="confirmationModal && confirmationModal.show" :action-name="confirmationModal.actionName"
+		:display-name="getDisplayName(props.message.member)" :callback="confirmationModal.callback"
+		:onClose="resetConfirmationModal" :onCancel="resetConfirmationModal" />
 </template>
 
 <script lang="ts" setup>
@@ -67,7 +70,7 @@ import { parse } from 'marked';
 import type { MessageProps } from '~/types/props';
 import MessageMedia from './MessageMedia.vue';
 import MessageReply from './UserInterface/MessageReply.vue';
-import type { ContextMenuInterface, ContextMenuItem } from '~/types/interfaces';
+import type { ContextMenuInterface, ContextMenuItem, IConfirmationModal } from '~/types/interfaces';
 
 const { getDisplayName } = useProfile()
 const { getUser } = useAuth()
@@ -88,6 +91,10 @@ const date = uuidToDate(props.message.uuid);
 
 const currentDate: Date = new Date()
 
+const confirmationModal = ref<IConfirmationModal>();
+
+const memberMenuItems = ref<ContextMenuItem[]>([]);
+
 console.log("[MSG] message to render:", props.message);
 console.log("author:", props.message.member);
 console.log("[MSG] reply message:", props.replyMessage);
@@ -155,6 +162,9 @@ onMounted(async () => {
 	};
 
 	console.log("media links:", mediaLinks);
+
+	console.log("[CONFIRM] modal:", confirmationModal.value);
+	memberMenuItems.value = await createMemberContextMenuItems(props.message.member, route.params.serverId as string, confirmationModal);
 });
 
 //function toggleTooltip(e: Event) {
@@ -176,8 +186,6 @@ if (props.message.member.user.uuid == me!.uuid /* || check message delete permis
 	messageMenuItems.splice(Math.min(2, messageMenuItems.length), 0, { name: "Delete (WIP)", icon: "lucide:trash", type: "danger", callback: () => {} });
 }
 
-const memberMenuItems = await createMemberContextMenuItems(props.message.member, route.params.serverId as string);
-
 function getDayDifference(date1: Date, date2: Date) {
     const midnight1 = new Date(date1.getFullYear(), date1.getMonth(), date1.getDate());
     const midnight2 = new Date(date2.getFullYear(), date2.getMonth(), date2.getDate());
@@ -189,6 +197,13 @@ function getDayDifference(date1: Date, date2: Date) {
     return Math.round(dayDifference);
 }
 
+function resetConfirmationModal() {
+	console.log("[CONFIRM] resetting");
+	if (confirmationModal) {
+		confirmationModal.value = { show: false, actionName: "", callback: () => {} };
+	}
+}
+
 </script>
 
 <style scoped>
diff --git a/utils/createMemberContextMenuItems.ts b/utils/createMemberContextMenuItems.ts
index 0ad5e46..06c5032 100644
--- a/utils/createMemberContextMenuItems.ts
+++ b/utils/createMemberContextMenuItems.ts
@@ -1,7 +1,7 @@
 import { Permission } from "~/types/enums";
-import type { ContextMenuItem, GuildMemberResponse } from "~/types/interfaces";
+import type { ContextMenuItem, GuildMemberResponse, IConfirmationModal } from "~/types/interfaces";
 
-export default async (member: GuildMemberResponse, guildId: string) => {
+export default async (member: GuildMemberResponse, guildId: string, confirmationModal?: Ref<IConfirmationModal | undefined>) => {
 	const menuItems: ContextMenuItem[] = [];
 
 	const { fetchMeMember } = useApi();
@@ -19,12 +19,46 @@ export default async (member: GuildMemberResponse, guildId: string) => {
 		console.log("[MENUITEM] member is not me");
 		if (hasPermission(me.value, Permission.KickMember)) {
 			console.log("[MENUITEM] has kick member permission");
-			menuItems.splice(Math.min(3, menuItems.length), 0, { name: "Kick", icon: "lucide:user-x", type: "danger", callback: async () => await kickMember(member.uuid) });
+			menuItems.splice(Math.min(3, menuItems.length), 0, {
+				name: "Kick",
+				icon: "lucide:user-x",
+				type: "danger",
+				callback: async () => {
+					if (confirmationModal) {
+						console.log("[CONFIRM] HEYO THERE!!");
+						confirmationModal.value = {
+							actionName: "kick",
+							callback: async () => await kickMember(member.uuid),
+							show: true
+						}
+					} else {
+						console.log("[CONFIRM] no modal");
+						await kickMember(member.uuid)
+					}
+				}
+			});
 		}
 
 		if (hasPermission(me.value, Permission.BanMember)) {
 			console.log("[MENUITEM] has ban permission");
-			menuItems.splice(Math.min(4, menuItems.length), 0, { name: "Ban (WIP)", icon: "lucide:ban", type: "danger", callback: async () => await banMember(guildId, member.uuid) });
+			menuItems.splice(Math.min(4, menuItems.length), 0, {
+				name: "Ban (WIP)",
+				icon: "lucide:ban",
+				type: "danger",
+				callback: async () => {
+					if (confirmationModal) {
+						console.log("[CONFIRM] HEYO THERE!! 2");
+						confirmationModal.value = {
+							actionName: "ban",
+							callback: async () => await banMember(member.guild_uuid, member.uuid),
+							show: true
+						}
+					} else {
+						console.log("[CONFIRM] no modal 2");
+						await banMember(member.guild_uuid, member.uuid)
+					}
+		 		}
+			});
 		}
 	}