feat: add ability to open member context menu by right-clicking on avatar

app.vue

@@ -12,22 +12,20 @@ import type { ContextMenuInterface } from './types/interfaces';
 
 const banner = useState("banner", () => false);
 
-const contextMenu = useState<ContextMenuInterface>("contextMenu");
+const contextMenu = useState<ContextMenuInterface>("contextMenu", () => ({ show: false, pointerX: 0, pointerY: 0, items: [] }));
 
 onMounted(() => {
 	loadPreferredThemes()
 
-	document.removeEventListener("contextmenu", contextMenuHandler);
-	document.addEventListener("contextmenu", (e) => {
-		if (e.target instanceof Element && e.target.classList.contains("default-contextmenu")) return;
-		contextMenuHandler(e);
-	});
 	document.addEventListener("mousedown", (e) => {
-		if (e.target instanceof HTMLElement && e.target.closest("#context-menu")) return;
+		if (e.target instanceof HTMLElement && e.target.classList.contains("context-menu-item")) return;
 		console.log("click");
 		console.log("target:", e.target);
 		console.log(e.target instanceof HTMLDivElement);
+		if (contextMenu.value.show) {
+			console.log("context menu is shown, hiding");
 			removeContextMenu(contextMenu);
+		}
 		if (e.target instanceof HTMLElement && e.target.classList.contains("message-text") && e.target.contentEditable) {
 			e.target.contentEditable = "false";
 		}
@@ -52,14 +50,6 @@ onMounted(() => {
 	});
 });
 
-function contextMenuHandler(e: MouseEvent) {
-	e.preventDefault();
-	//console.log("Opened context menu");
-	//createContextMenu(e, [
-	//	{ name: "Wah", callback: () => { return } }
-	//]);
-}
-
 </script>
 
 <style>

classes/Message.ts

@@ -12,4 +12,8 @@ export default class Message {
 		this.userUuid = user_uuid;
 		this.message = message;
 	}
+
+	getTimestamp() {
+		return uuidToTimestamp(this.uuid);
+	}
 }

components/Guild/MemberEntry.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="member-item" @click.prevent="showModalPopup" tabindex="0">
+    <div class="member-item" @click.prevent="showModalPopup" tabindex="0" @contextmenu="showContextMenu($event, contextMenu, menuItems)">
         <Avatar :profile="props.member" class="member-avatar"/>
         <span class="member-display-name" :style="`color: ${generateIrcColor(props.member.user.uuid)}`">
             {{ getDisplayName(props.member) }}
@@ -11,14 +11,18 @@
 
 <script lang="ts" setup>
 import { ModalProfilePopup } from '#components';
-import type { GuildMemberResponse } from '~/types/interfaces';
+import type { ContextMenuInterface, GuildMemberResponse } from '~/types/interfaces';
 
 const { getDisplayName } = useProfile()
 
+const contextMenu = useState<ContextMenuInterface>("contextMenu");
+
 const props = defineProps<{
     member: GuildMemberResponse
 }>();
 
+const menuItems = await createMemberContextMenuItems(props.member, props.member.guild_uuid);
+
 const modalPopupVisible = ref<boolean>(false);
 
 function showModalPopup() {
@@ -31,6 +35,7 @@ function hideModalPopup() {
 </script>
 
 <style>
+
 .member-item {
     position: relative;
 }
@@ -41,4 +46,9 @@ function hideModalPopup() {
 	min-width: 2.3em;
 	max-width: 2.3em;
 }
+
+.member-display-name {
+	cursor: pointer;
+}
+
 </style>

components/Message.vue

@@ -1,22 +1,24 @@
 <template>
-	<div v-if="props.type == 'normal' || props.replyMessage" ref="messageElement" @contextmenu="showContextMenu($event, contextMenu, menuItems)"
-			class="message normal-message" :class="{ 'highlighted': (props.isMentioned || (props.replyMessage && props.message.member.user.uuid != me!.uuid && props.replyMessage?.member.user.uuid == me!.uuid)) }"
-			:data-message-id="props.message.uuid" :editing.sync="props.editing">
+	<div v-if="props.type == 'normal' || props.replyMessage" ref="messageElement" @contextmenu="showContextMenu($event, contextMenu, messageMenuItems)" :id="props.last ? 'last-message' : undefined"
+			class="message normal-message" :class="{ 'mentioned': (props.replyMessage || props.isMentioned) && props.message.member.user.uuid != props.me.uuid && props.replyMessage?.member.user.uuid == props.me.uuid }" :data-message-id="props.messageId"
+			:editing.sync="props.editing" :replying-to.sync="props.replyingTo">
 		<div v-if="props.replyMessage" class="message-reply-svg">
 			<svg
 				width="1.5em" height="1.5em"
 				viewBox="0 0 150 87.5" version="1.1" id="svg1"
 				style="overflow: visible;">
 				<defs id="defs1" />
-				<g id="layer1" transform="translate(40,-35)">
-					<g id="g3" transform="translate(-35,-20)">
+				<g id="layer1"
+					transform="translate(40,-35)">
+					<g id="g3"
+						transform="translate(-35,-20)">
 					<path
 						style="stroke:var(--reply-text-color);stroke-width:8;stroke-opacity:1"
-						d="m 120,87.5 100,2.5e-5"
+						d="m 120.02168,87.850978 100.76157,2.4e-5"
 						id="path3-5" />
 					<path
 						style="stroke:var(--reply-text-color);stroke-width:8;stroke-opacity:1"
-						d="M 70,150 120,87.5"
+						d="M 69.899501,174.963 120.2803,87.700931"
 						id="path3-5-2" />
 					</g>
 				</g>
@@ -27,36 +29,36 @@
 			:text="props.replyMessage?.message"
 			:reply-id="props.replyMessage.uuid" max-width="reply" />
 		<div class="left-column">
-			<Avatar :profile="props.message.member" class="message-author-avatar"/>
+			<Avatar :profile="props.author" class="message-author-avatar" @contextmenu="showContextMenu($event, contextMenu, memberMenuItems)" />
 		</div>
 		<div class="message-data">
 			<div class="message-metadata">
-				<span class="message-author-username" tabindex="0" :style="`color: ${generateIrcColor(props.message.member.user.uuid)}`">
-					{{ getDisplayName(props.message.member) }}
+				<span class="message-author-username" tabindex="0" :style="`color: ${props.authorColor}`" @contextmenu="showContextMenu($event, contextMenu, memberMenuItems)">
+					{{ getDisplayName(props.author) }}
 				</span>
 				<span class="message-date" :title="date.toString()">
 					<span v-if="getDayDifference(date, currentDate) === 1">Yesterday at</span>
 					<span v-else-if="getDayDifference(date, currentDate) > 1 ">{{ date.toLocaleDateString(undefined) }},</span>
 
-					{{ date.toLocaleTimeString(undefined, { hour12: getPreferredTimeFormat() == "12", timeStyle: "short" }) }}
+					{{ date.toLocaleTimeString(undefined, { hour12: props.format == "12", timeStyle: "short" }) }}
 				</span>
 			</div>
-			<div class="message-text" v-html="sanitized" :hidden="hideText" tabindex="0"></div>
+			<div class="message-text" v-html="sanitized" :hidden="hasEmbed" tabindex="0"></div>
+		</div>
 		<MessageMedia v-if="mediaLinks.length" :links="mediaLinks" />
 	</div>
-	</div>
-	<div v-else ref="messageElement" @contextmenu="showContextMenu($event, contextMenu, menuItems)"
-			class="message grouped-message" :class="{ 'mentioned': props.replyMessage || props.isMentioned }"
-			:data-message-id="props.message.uuid" :editing.sync="props.editing">
+	<div v-else ref="messageElement" @contextmenu="showContextMenu($event, contextMenu, messageMenuItems)" :id="props.last ? 'last-message' : undefined"
+			class="message grouped-message" :class="{ 'message-margin-bottom': props.marginBottom, 'mentioned': props.replyMessage || props.isMentioned }"
+			:data-message-id="props.messageId" :editing.sync="props.editing" :replying-to.sync="props.replyingTo">
 		<div class="left-column">
 			<span :class="{ 'invisible': dateHidden }" class="message-date side-message-date" :title="date.toString()">
-				{{ date.toLocaleTimeString(undefined, { hour12: getPreferredTimeFormat() == "12", timeStyle: "short" }) }}
+				{{ date.toLocaleTimeString(undefined, { hour12: props.format == "12", timeStyle: "short" }) }}
 			</span>
 		</div>
 		<div class="message-data">
-			<div class="message-text" :class="$style['message-text']" v-html="sanitized" :hidden="hideText" tabindex="0"></div>
-			<MessageMedia v-if="mediaLinks.length" :links="mediaLinks"/>
+			<div class="message-text" :class="$style['message-text']" v-html="sanitized" :hidden="hasEmbed" tabindex="0"></div>
 		</div>
+		<MessageMedia v-if="mediaLinks.length" :links="mediaLinks" />
 	</div>
 </template>
 
@@ -69,37 +71,35 @@ import MessageReply from './UserInterface/MessageReply.vue';
 import type { ContextMenuInterface, ContextMenuItem } from '~/types/interfaces';
 
 const { getDisplayName } = useProfile()
-const { getUser } = useAuth()
+
+const route = useRoute();
 
 const props = defineProps<MessageProps>();
 
-const me = await getUser()
-
-const contextMenu = useState<ContextMenuInterface>("contextMenu", () => ({ show: false, pointerX: 0, pointerY: 0, items: [] }));
+const contextMenu = useState<ContextMenuInterface>("contextMenu");
 
 const messageElement = ref<HTMLDivElement>();
 
 const dateHidden = ref<boolean>(true);
 
-const date = uuidToDate(props.message.uuid);
-
+const date = new Date(props.timestamp);
 const currentDate: Date = new Date()
 
 console.log("[MSG] message to render:", props.message);
-console.log("author:", props.message.member);
+console.log("author:", props.author);
 console.log("[MSG] reply message:", props.replyMessage);
 
 const linkRegex = /https?:\/\/(?:www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b(?:[-a-zA-Z0-9()@:%_\+.~#?&\/=]*)/g;
 const linkMatches = props.message.message.matchAll(linkRegex).map(link => link[0]);
-const mediaLinks = ref<string[]>([]);
+const mediaLinks: string[] = [];
 console.log("link matches:", linkMatches);
 
-const hideText = ref(false);
+const hasEmbed = ref(false);
 
 const sanitized = ref<string>();
 
 onMounted(async () => {
-	const parsed = await parse(props.message.message, { gfm: true });
+	const parsed = await parse(props.text, { gfm: true });
 	sanitized.value = DOMPurify.sanitize(parsed, {
 		ALLOWED_TAGS: [
 			"strong", "em", "br", "blockquote",
@@ -123,56 +123,46 @@ onMounted(async () => {
 		console.log("added listeners");
 	}
 
-	const links: string[] = [];
 	for (const link of linkMatches) {
 	console.log("link:", link);
 	try {
 		const res = await $fetch.raw(link);
 		if (res.ok && res.headers.get("content-type")?.match(/^image\/(apng|gif|jpeg|png|webp)$/)) {
 			console.log("link is image");
-				links.push(link);
+			mediaLinks.push(link);
 		}
+		if (mediaLinks.length) {
+			hasEmbed.value = true
+		};
 	} catch (error) {
 		console.error(error);
 	}
+}
 
-		mediaLinks.value = [...links];
-	}
-
-	if (mediaLinks.value.length) {
-		const nonLinks = props.message.message.split(linkRegex);
-		let invalidContent = false;
-		for (const nonLink of nonLinks) {
-			if (nonLink != "" && nonLink != "\n" && nonLink != "<br>") {
-				invalidContent = true;
-				break;
-			}
-		}
-		hideText.value = !invalidContent;
-	};
-
-	console.log("media links:", mediaLinks);
+console.log("media links:", mediaLinks);
 });
 
 //function toggleTooltip(e: Event) {
 //	showHover.value = !showHover.value;
 //}
 
-const menuItems: ContextMenuItem[] = [
+const messageMenuItems: ContextMenuItem[] = [
 	{ name: "Reply", icon: "lucide:reply", type: "normal", callback: () => { if (messageElement.value) replyToMessage(messageElement.value, props) } }
 ]
 
-console.log("me:", me);
-if (props.message.member.user.uuid == me!.uuid) {
+console.log("me:", props.me);
+if (props.author.user.uuid == props.me.uuid) {
 	// Inserts "edit" option at index 1 (below the "reply" option)
-	menuItems.splice(1, 0, { name: "Edit (WIP)", icon: "lucide:square-pen", type: "normal", callback: () => { /* if (messageElement.value) editMessage(messageElement.value, props) */ } });
+	messageMenuItems.splice(Math.min(1, messageMenuItems.length), 0, { name: "Edit (WIP)", icon: "lucide:square-pen", type: "normal", callback: () => { /* if (messageElement.value) editMessage(messageElement.value, props) */ } });
 }
 
-if (props.message.member.user.uuid == me!.uuid /* || check message delete permission*/) {
+if (props.author.user.uuid == props.me.uuid /* || check message delete permission*/) {
 	// Inserts "edit" option at index 2 (below the "edit" option)
-	menuItems.splice(2, 0, { name: "Delete (WIP)", icon: "lucide:trash", type: "danger", callback: () => {} });
+	messageMenuItems.splice(Math.min(2, messageMenuItems.length), 0, { name: "Delete (WIP)", icon: "lucide:trash", type: "danger", callback: () => {} });
 }
 
+const memberMenuItems = await createMemberContextMenuItems(props.author, 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());
@@ -188,20 +178,14 @@ function getDayDifference(date1: Date, date2: Date) {
 
 <style scoped>
 .message {
-	display: grid;
-	grid-template-columns: 4rem 1fr;
-	align-items: center;
-
 	text-align: left;
-	/* -4 dvw due to 2dvw of padding on both sides */
-	width: calc(100% - 4dvw);
+	/* border: 1px solid lightcoral; */
+	display: grid;
+	grid-template-columns: 2rem 1fr;
+	align-items: center;
+	column-gap: 1dvw;
+	width: 100%;
 	overflow-wrap: anywhere;
-
-	padding-top: .2rem;
-	padding-bottom: .2rem;
-	padding-left: 2dvw;
-	padding-right: 1dvw;
-	border-radius: 0 var(--minor-radius) var(--minor-radius) 0;
 }
 
 .message-reply-preview {
@@ -217,6 +201,14 @@ function getDayDifference(date1: Date, date2: Date) {
 	margin-top: 1dvh;
 }
 
+.grouped-message {
+	margin-top: .3em;
+}
+
+#last-message {
+	margin-bottom: 2dvh;
+}
+
 .message-metadata {
 	display: flex;
 	gap: .5dvw;
@@ -225,9 +217,10 @@ function getDayDifference(date1: Date, date2: Date) {
 
 .message-data {
 	/* border: 1px solid white; */
+	margin-left: .5dvw;
 	display: flex;
 	flex-direction: column;
-	height: 100%;
+	height: fit-content;
 	width: 100%;
 	grid-row: 2;
 	grid-column: 2;
@@ -239,10 +232,15 @@ function getDayDifference(date1: Date, date2: Date) {
 }
 
 .message-author-avatar {
-	min-height: 2.5em;
-	max-height: 2.5em;
-	min-width: 2.5em;
-	max-width: 2.5em;
+	min-height: 2em;
+	max-height: 2em;
+	min-width: 2em;
+	max-width: 2em;
+	cursor: pointer;
+}
+
+.message-author-username {
+	cursor: pointer;
 }
 
 .left-column {
@@ -253,11 +251,8 @@ function getDayDifference(date1: Date, date2: Date) {
 	white-space: nowrap;
 	grid-row: 2;
 	grid-column: 1;
-	height: 100%;
-	align-items: start;
 }
 
-
 .author-username {
 	margin-right: .5dvw;
 	color: white;
@@ -271,7 +266,9 @@ function getDayDifference(date1: Date, date2: Date) {
 
 .side-message-date {
 	font-size: .625em;
-	margin-top: .4em;
+	display: flex;
+	align-items: center;
+	align-content: center;
 }
 
 /*
@@ -281,11 +278,11 @@ function getDayDifference(date1: Date, date2: Date) {
 }
 */
 
-.highlighted {
+.mentioned {
 	background-color: var(--chat-important-background-color);
 }
 
-.highlighted:hover {
+.mentioned:hover {
 	background-color: var(--chat-important-highlighted-background-color);
 }
 
@@ -310,7 +307,6 @@ function getDayDifference(date1: Date, date2: Date) {
 
 <style>
 
-/* class used in utils/replyToMessage.ts */
 .replying-to {
 	background-color: var(--chat-featured-message-color);
 }

components/MessageArea.vue

@@ -1,12 +1,14 @@
 <template>
 	<div id="message-area">
 		<div id="messages" ref="messagesElement">
-			<Message v-for="(message, i) of messages" :key="message.uuid"
+			<Message v-for="(message, i) of messages" :username="getDisplayName(message.member.user)" :key="message.uuid"
+				:text="message.message" :timestamp="messageTimestamps[message.uuid]" :img="message.member.user.avatar"
+				:format="timeFormat" :type="messagesType[message.uuid]"
+				:margin-bottom="(messages[i + 1] && messagesType[messages[i + 1].uuid] == 'normal') ?? false"
+				:last="i == messages.length - 1" :message-id="message.uuid" :author="message.member" :me="me"
 				:message="message" :is-reply="message.reply_to"
-				:reply-message="message.reply_to ? getReplyMessage(message.reply_to) : undefined"
-				:type="messagesType[message.uuid]"
-				:editing="false"
-				:is-mentioned="false" />
+				:author-color="`${generateIrcColor(message.member.user.uuid)}`"
+				:reply-message="message.reply_to ? getReplyMessage(message.reply_to) : undefined" />
 		</div>
 		<div id="message-box" class="rounded-corners">
 			<form id="message-form" @submit="sendMessage">
@@ -318,6 +320,8 @@ router.beforeEach((to, from, next) => {
 #message-area {
 	display: flex;
 	flex-direction: column;
+	padding-left: 1dvw;
+	padding-right: 1dvw;
 	overflow: hidden;
 	flex-grow: 1;
 }
@@ -325,8 +329,8 @@ router.beforeEach((to, from, next) => {
 #message-box {
 	margin-top: auto; /* force it to the bottom of the screen */
 	margin-bottom: 2dvh;
-	margin-left: 2dvw;
-	margin-right: 2dvw;
+	margin-left: 1dvw;
+	margin-right: 1dvw;
 
 	padding-left: 2%;
 	padding-right: 2%;
@@ -378,7 +382,8 @@ router.beforeEach((to, from, next) => {
 	overflow-y: scroll;
 	display: flex;
 	flex-direction: column;
-	padding-bottom: 1em;
+	padding-left: 1dvw;
+	padding-right: 1dvw;
 }
 
 .message-box-button {

components/MessageMedia.vue

@@ -1,9 +1,6 @@
 <template>
 	<div class="media-container">
-		<NuxtImg v-for="link of props.links"
-			class="media-item"
-			:src="link"
-			@click.prevent="createModal(link)" />
+		<NuxtImg v-for="link of props.links" class="media-item" :src="link" @click.prevent="createModal(link)" />
 	</div>
 </template>
 
@@ -11,6 +8,7 @@
 import { ModalBase } from '#components';
 import { render } from 'vue';
 
+
 const props = defineProps<{ links: string[] }>();
 
 function createModal(link: string) {
@@ -36,14 +34,14 @@ function createModal(link: string) {
 <style scoped>
 
 .media-container {
-	display: flex;
-	flex-wrap: wrap;
-	gap: .2rem;
-	max-width: 100%;
+	grid-column: 2;
+	grid-row: 3;
+	margin-left: .5dvw;
 }
 
 .media-item {
 	cursor: pointer;
 	max-width: 15dvw;
 }
+
 </style>

components/Modal/Invite.vue

@@ -40,8 +40,7 @@ function copyInvite(type: "link" | "code") {
   if (!invite.value) return;
 
   if (type == "link") {
-	const runtimeConfig = useRuntimeConfig();
-    const inviteUrl = URL.parse(`invite/${invite.value}`, `${window.location.protocol}//${window.location.host}${runtimeConfig.app.baseURL}`);
+    const inviteUrl = URL.parse(`invite/${invite.value}`, `${window.location.protocol}//${window.location.host}`);
     if (inviteUrl) {
       navigator.clipboard.writeText(inviteUrl.href);
     }

components/Settings/AppSettings/Appearance.vue

@@ -34,8 +34,7 @@
               <span class="theme-title" :style="{color:`${layout.complementaryColor}`}">
                 {{ layout.displayName }}
               </span>
-              <!-- this breaks if it's a nuxtimg, i don't know why -->
-              <img class="layout-preview" :src="layout.previewImageUrl"></img>
+              <NuxtImg class="layout-preview" :src="layout.previewImageUrl"></NuxtImg>
             </div>
           </div>
         </div>
@@ -61,8 +60,8 @@ import { settingSave, settingsLoad } from '#imports';
 
 const runtimeConfig = useRuntimeConfig()
 const baseURL = runtimeConfig.app.baseURL;
-const styleFolder = `${baseURL}/themes/style`
-const layoutFolder = `${baseURL}/themes/layout`
+const styleFolder = `${baseURL}themes/style`
+const layoutFolder = `${baseURL}themes/layout`
 
 const timeFormatTextStrings = ["Auto", "12-Hour", "24-Hour"]
 
@@ -116,7 +115,6 @@ async function parseTheme(url: string): Promise<Theme | void> {
           break
         case "previewImageUrl":
           previewImageUrl = `${layoutFolder}/${lineArray[1].trim()}`
-          console.log(previewImageUrl)
           break
       }
     }

components/UserInterface/ContextMenu.vue

@@ -18,6 +18,10 @@ onMounted(() => {
 	if (contextMenu) {
 		contextMenu.style.left = props.pointerX.toString() + "px";
 		contextMenu.style.top = props.pointerY.toString() + "px";
+		const rect = contextMenu.getBoundingClientRect();
+		if (rect.right > (window.innerWidth || document.documentElement.clientWidth)) {
+			contextMenu.style.left = (props.pointerX - contextMenu.clientWidth).toString() + "px";
+		}
 	}
 });
 

components/UserInterface/ResizableSidebar.vue

@@ -1,5 +1,5 @@
 <template>
-	<div ref="resizableSidebar" class="resizable-sidebar"
+	<div ref="resizableSidebar" class="resizable-sidebar" @contextmenu="showContextMenu($event, contextMenu, menuItems)"
 			:style="{
 				'width': storedWidth ? storedWidth : props.width,
 				'min-width': props.minWidth,
@@ -49,10 +49,6 @@ onMounted(() => {
 	if (resizableSidebar.value && widthResizer.value) {
 		widthResizer.value.addEventListener("pointerdown", (e) => {
 			e.preventDefault();
-			if (e.button == 2) {
-				showContextMenu(e, contextMenu.value, menuItems);
-				return
-			};
 			document.body.style.cursor = "ew-resize";
 			function handleMove(pointer: PointerEvent) {
 				if (resizableSidebar.value) {

composables/api.ts

@@ -25,6 +25,17 @@ export const useApi = () => {
 		return await fetchWithApi("/me")
 	}
 
+	async function fetchMeMember(guildId: string): Promise<GuildMemberResponse | undefined> {
+		const { getUser } = useAuth();
+
+		const me = await getUser();
+		if (me) {
+			const members = await fetchMembers(guildId);
+			const meMember = members.objects.find(member => member.user.uuid == me.uuid);
+			return meMember;
+		}
+	}
+
 	async function fetchChannels(guildId: string): Promise<ChannelResponse[]> {
 		return ensureIsArray(await fetchWithApi(`/guilds/${guildId}/channels`));
 	}
@@ -48,6 +59,14 @@ export const useApi = () => {
 		return await fetchWithApi(`/guilds/${guildId}/members/${memberId}`);
 	}
 
+	async function kickMember(memberId: string) {
+		return await fetchWithApi(`/members/${memberId}`, { method: "DELETE" });
+	}
+
+	async function banMember(guildId: string, memberId: string) {
+		//
+	}
+	
 	async function fetchUsers() {
 		return await fetchWithApi(`/users`);
 	}
@@ -114,10 +133,13 @@ export const useApi = () => {
 		fetchGuild,
 		fetchMyGuilds,
 		fetchMe,
+		fetchMeMember,
 		fetchChannels,
 		fetchChannel,
 		fetchMembers,
 		fetchMember,
+		kickMember,
+		banMember,
 		fetchUsers,
 		fetchUser,
 		fetchFriends,

pages/servers/[serverId]/channels/[channelId].vue

@@ -56,7 +56,7 @@ const showGuildSettings = ref(false);
 //const servers = await fetchWithApi("/servers") as { uuid: string, name: string, description: string }[];
 //console.log("channelid: servers:", servers);
 
-const { fetchMembers } = useApi();
+const { fetchMembers, fetchMeMember } = useApi();
 
 onMounted(async () => {
 	console.log("mounting");
@@ -84,6 +84,14 @@ async function setArrayVariables() {
 	console.log("channels:", channels.value);
 	channel.value = await fetchWithApi(`/channels/${route.params.channelId}`);
 	console.log("channel:", channel.value);
+	const meMember = useState<GuildMemberResponse | undefined>("meMember");
+	console.log("[CHANNEL] meMember:", meMember.value);
+	if (!meMember.value) {
+		console.log("[CHANNEL] meMember is uninitialized, initializing");
+		const fetchedMeMember = await fetchMeMember(route.params.serverId as string);
+		meMember.value = fetchedMeMember;
+		console.log("[CHANNEL] meMember set to:", fetchedMeMember);
+	}
 }
 
 function toggleGuildSettings(e: Event) {

public/themes/layout/gorb.css

@@ -9,7 +9,6 @@ complementaryColor = white
 	--sidebar-icon-gap: .25em;
 	--sidebar-margin: .5em;
 	
-	--minor-radius: .35em;
 	--standard-radius: .5em;
 	--button-radius: .6em;
 	--guild-icon-radius: 15%;

public/themes/style/ash.css

@@ -10,15 +10,15 @@ complementaryColor = white
 	--reply-text-color: #969696;
 	--danger-text-color: #ff0000;
 
-	--chat-background-color: #383432;
-    --chat-highlighted-background-color: #4c4a48;
+	--chat-background-color: #2f2e2d;
+    --chat-highlighted-background-color: #3f3b38;
 	--chat-important-background-color: #ffcf5f38;
 	--chat-important-highlighted-background-color: #ffa86f4f;
 	--chat-featured-message-color: #4f3f2f60;
 	--popup-background-color: #2f2828;
 	--popup-highlighted-background-color: #382f2f;
 
-	--sidebar-background-color: #322f2d;
+	--sidebar-background-color: #3e3a37;
 	--sidebar-highlighted-background-color: #46423b;
 	--topbar-background-color: #3a3733;
 	--chatbox-background-color: #3a3733;

public/themes/style/dark.css

@@ -10,16 +10,16 @@ complementaryColor = white
 	--reply-text-color: #969696;
 	--danger-text-color: #ff0000;
 
-	--chat-background-color: #282624;
-    --chat-highlighted-background-color: #383430;
+	--chat-background-color: #1f1e1d;
+    --chat-highlighted-background-color: #2f2b28;
 	--chat-important-background-color: #ffc44f2f;
 	--chat-important-highlighted-background-color: #ffa45f4a;
 	--chat-featured-message-color: #4f2f1f58;
 	--popup-background-color: #2f1f1f;
 	--popup-highlighted-background-color: #3f2f2f;
 
-	--sidebar-background-color: #1f1e1d;
-	--sidebar-highlighted-background-color: #2f2b28;
+	--sidebar-background-color: #2e2a27;
+	--sidebar-highlighted-background-color: #36322b;
 	--topbar-background-color: #2a2723;
 	--chatbox-background-color: #1a1713;
 

public/themes/style/light.css

@@ -10,13 +10,13 @@ complementaryColor = black
 	--reply-text-color: #969696;
 	--danger-text-color: #ff0000;
 
-    --chat-background-color: #f0edeb;
-    --chat-highlighted-background-color: #aba8a4;
+    --chat-background-color: #f0ebe8;
+    --chat-highlighted-background-color: #e8e4e0;
     --chat-important-background-color: #df5f0b26;
     --chat-important-hightlighted-background-color: #df5f0b3d;
     --chat-featured-message-color: #e8ac841f;
-    --popup-background-color: #b8b4b0;
-    --popup-highlighted-background-color: #a6a4a2;
+    --popup-background-color: #e8e4e0;
+    --popup-highlighted-background-color: #dfdbd6;
 
 	--sidebar-background-color: #dbd8d4;
 	--sidebar-highlighted-background-color: #d4d0ca;

types/props.ts

@@ -1,9 +1,21 @@
-import type { MessageResponse, UserResponse } from "./interfaces";
+import type { GuildMemberResponse, MessageResponse, UserResponse } from "./interfaces";
 
 export interface MessageProps {
-	message: MessageResponse,
-	replyMessage?: MessageResponse,
+	class?: string,
+	img?: string | null,
+	author: GuildMemberResponse
+	text: string,
+	timestamp: number,
+	format: "12" | "24",
 	type: "normal" | "grouped",
+	marginBottom: boolean,
+	authorColor: string,
+	last: boolean,
+	messageId: string,
+	replyingTo?: boolean,
 	editing?: boolean,
+	me: UserResponse
+	message: MessageResponse,
+	replyMessage?: MessageResponse
 	isMentioned?: boolean,
 }

utils/createMemberContextMenuItems.ts

@@ -0,0 +1,33 @@
+import { Permission } from "~/types/enums";
+import type { ContextMenuItem, GuildMemberResponse } from "~/types/interfaces";
+
+export default async (member: GuildMemberResponse, guildId: string) => {
+	const menuItems: ContextMenuItem[] = [];
+
+	const { fetchMeMember } = useApi();
+	const me = useState<GuildMemberResponse | undefined>("me");
+	if (!me.value) {
+		const fetchedMe = await fetchMeMember(member.guild_uuid);
+		me.value = fetchedMe;
+	}
+	const { banMember, kickMember } = useApi();
+
+	console.log("[MENUITEM] hi");
+	console.log("[MENUITEM] member:", member.user.username);
+	console.log("[MENUITEM] me:", me.value?.user.username);
+	if (me.value && member.uuid != me.value.uuid) {
+		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) });
+		}
+
+		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) });
+		}
+	}
+
+	console.log("[MENUITEM] returning menu items:", menuItems);
+	return menuItems;
+}

utils/replyToMessage.ts

@@ -9,7 +9,7 @@ export default (element: HTMLDivElement, props: MessageProps) => {
 	const messageBox = document.getElementById("message-box") as HTMLDivElement;
 	if (messageBox) {
 		const div = document.createElement("div");
-		const messageReply = h(MessageReply, { author: getDisplayName(props.message.member), text: props.message.message || "", id: props.message.uuid, replyId: props.replyMessage?.uuid || element.dataset.messageId!, maxWidth: "full" });
+		const messageReply = h(MessageReply, { author: getDisplayName(props.author), text: props.text || "", id: props.message.uuid, replyId: props.replyMessage?.uuid || element.dataset.messageId!, maxWidth: "full" });
 		messageBox.prepend(div);
 		render(messageReply, div);
 		const message = document.querySelector(`.message[data-message-id='${props.message.uuid}']`);

utils/showContextMenu.ts

@@ -3,10 +3,15 @@ import ContextMenu from "~/components/UserInterface/ContextMenu.vue";
 import type { ContextMenuInterface, ContextMenuItem } from "~/types/interfaces";
 
 export default (e: MouseEvent | PointerEvent, contextMenu: ContextMenuInterface, menuItems: ContextMenuItem[]) => {
+  e.preventDefault();
+  e.stopPropagation();
+  console.log("Menu items:", menuItems);
+  if (menuItems.length) {
     console.log("Showing context menu");
     contextMenu.show = true;
     contextMenu.pointerX = e.clientX;
 	contextMenu.pointerY = e.clientY;
     contextMenu.items = menuItems;
     console.log("Showed");
+  }
 }