components/Message.vue

@@ -43,9 +43,9 @@
 					{{ date.toLocaleTimeString(undefined, { hour12: props.format == "12", timeStyle: "short" }) }}
 				</span>
 			</div>
-			<div class="message-text" v-html="sanitized" :hidden="hideText" tabindex="0"></div>
-			<MessageMedia v-if="mediaLinks.length" :links="mediaLinks" />
+			<div class="message-text" v-html="sanitized" :hidden="hasEmbed" tabindex="0"></div>
 		</div>
+		<MessageMedia v-if="mediaLinks.length" :links="mediaLinks" />
 	</div>
 	<div v-else ref="messageElement" @contextmenu="showContextMenu($event, contextMenu, menuItems)" :id="props.last ? 'last-message' : undefined"
 			class="message grouped-message" :class="{ 'message-margin-bottom': props.marginBottom, 'mentioned': props.replyMessage || props.isMentioned }"
@@ -56,7 +56,7 @@
 			</span>
 		</div>
 		<div class="message-data">
-			<div class="message-text" :class="$style['message-text']" v-html="sanitized" :hidden="hideText" tabindex="0"></div>
+			<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>
@@ -89,10 +89,10 @@ 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>();
 
@@ -121,34 +121,22 @@ 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);
 });
 
@@ -189,8 +177,9 @@ function getDayDifference(date1: Date, date2: Date) {
 	text-align: left;
 	/* border: 1px solid lightcoral; */
 	display: grid;
-	grid-template-columns: 4rem 1fr;
+	grid-template-columns: 2rem 1fr;
 	align-items: center;
+	column-gap: 1dvw;
 	width: 100%;
 	overflow-wrap: anywhere;
 }
@@ -224,9 +213,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;
@@ -238,10 +228,10 @@ 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;
 }
 
 .left-column {
@@ -252,11 +242,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;

components/MessageMedia.vue

@@ -34,16 +34,9 @@ function createModal(link: string) {
 <style scoped>
 
 .media-container {
-	display: flex;
 	grid-column: 2;
 	grid-row: 3;
-	gap: .2rem;
-}
-
-.grouped-message .media-container {
-	display: flex;
-	grid-column: 2;
-	grid-row: 2;
+	margin-left: .5dvw;
 }
 
 .media-item {