From cd5c55ebfb7d27e1c88818be24ead1fcb9000187 Mon Sep 17 00:00:00 2001
From: Josh <josh.t.richards@gmail.com>
Date: Sat, 10 Aug 2024 08:57:49 -0400
Subject: [PATCH 1/2] fix: Reuse NcAutoCompleteResult, remove code duplication

Signed-off-by: Josh <josh.t.richards@gmail.com>
---
 src/components/Suggestion/Mention/MentionList.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/components/Suggestion/Mention/MentionList.vue b/src/components/Suggestion/Mention/MentionList.vue
index cf5835a5655..b222f6ea52d 100644
--- a/src/components/Suggestion/Mention/MentionList.vue
+++ b/src/components/Suggestion/Mention/MentionList.vue
@@ -6,7 +6,7 @@
 <template>
 	<SuggestionListWrapper ref="suggestionList" :command="command" :items="items">
 		<template #default="{ item, active}">
-			<AutoCompleteResult :id="item.id"
+			<NcAutoCompleteResult :id="item.id"
 				:label="item.label"
 				icon="icon-user"
 				source="users"
@@ -19,12 +19,13 @@
 </template>
 
 <script>
-import AutoCompleteResult from './AutoCompleteResult.vue'
+import { NcAutoCompleteResult } from '@nextcloud/vue'
+
 import SuggestionListWrapper from '../SuggestionListWrapper.vue'
 
 export default {
 	components: {
-		AutoCompleteResult,
+		NcAutoCompleteResult,
 		SuggestionListWrapper,
 	},
 	props: {

From a3da687b23a15b97a6c2b233eb6f615a6d936a55 Mon Sep 17 00:00:00 2001
From: Josh <josh.t.richards@gmail.com>
Date: Sat, 10 Aug 2024 09:01:08 -0400
Subject: [PATCH 2/2] chore: Remove unused AutoCompleteResult.vue

Signed-off-by: Josh <josh.t.richards@gmail.com>
---
 .../Suggestion/Mention/AutoCompleteResult.vue | 172 ------------------
 1 file changed, 172 deletions(-)
 delete mode 100644 src/components/Suggestion/Mention/AutoCompleteResult.vue

diff --git a/src/components/Suggestion/Mention/AutoCompleteResult.vue b/src/components/Suggestion/Mention/AutoCompleteResult.vue
deleted file mode 100644
index 64c707d8366..00000000000
--- a/src/components/Suggestion/Mention/AutoCompleteResult.vue
+++ /dev/null
@@ -1,172 +0,0 @@
-<!--
-  - SPDX-FileCopyrightText: 2022 Nextcloud GmbH and Nextcloud contributors
-  - SPDX-License-Identifier: AGPL-3.0-or-later
--->
-
-<template>
-	<div class="autocomplete-result">
-		<!-- Avatar or icon -->
-		<div :class="[icon, `autocomplete-result__icon--${avatarUrl ? 'with-avatar' : ''}`]"
-			:style="avatarUrl ? { backgroundImage: `url(${avatarUrl})` } : null "
-			class="autocomplete-result__icon">
-			<div v-if="haveStatus"
-				:class="[`autocomplete-result__status--${status && status.icon ? 'icon' : status.status}`]"
-				class="autocomplete-result__status">
-				{{ status && status.icon || '' }}
-			</div>
-		</div>
-
-		<!-- Title and subtitle -->
-		<span class="autocomplete-result__content">
-			<span class="autocomplete-result__title">
-				{{ label }}
-			</span>
-			<span v-if="subline" class="autocomplete-result__subline">
-				{{ subline }}
-			</span>
-		</span>
-	</div>
-</template>
-
-<script>
-import { generateUrl } from '@nextcloud/router'
-
-export default {
-	name: 'AutoCompleteResult',
-
-	props: {
-		label: {
-			type: String,
-			required: true,
-		},
-		subline: {
-			type: String,
-			default: null,
-		},
-		id: {
-			type: String,
-			default: null,
-		},
-		icon: {
-			type: String,
-			required: true,
-		},
-		source: {
-			type: String,
-			required: true,
-		},
-		status: {
-			type: [Object, Array],
-			default: () => ({}),
-		},
-	},
-	computed: {
-		avatarUrl() {
-			return this.id && this.source === 'users'
-				? this.getAvatarUrl(this.id, 44)
-				: null
-		},
-		haveStatus() {
-			return this.status?.icon || this.status?.status
-		},
-	},
-
-	methods: {
-		getAvatarUrl(user, size) {
-			return generateUrl('/avatar/{user}/{size}', {
-				user,
-				size,
-			})
-		},
-	},
-}
-</script>
-
-<style lang="scss" scoped>
-$clickable-area: 30px;
-$autocomplete-padding: 10px;
-
-.autocomplete-result {
-	display: flex;
-	height: $clickable-area;
-	padding: $autocomplete-padding;
-
-	.highlight & {
-		color: var(--color-main-text);
-		background: var(--color-primary-element-light);
-		&, * {
-			cursor: pointer;
-		}
-	}
-
-	&__icon {
-		position: relative;
-		flex: 0 0 $clickable-area;
-		width: $clickable-area;
-		min-width: $clickable-area;
-		height: $clickable-area;
-		border-radius: $clickable-area;
-		background-color: var(--color-background-darker);
-		background-repeat: no-repeat;
-		background-position: center;
-		background-size: $clickable-area - 2 * $autocomplete-padding;
-		&--with-avatar {
-			color: inherit;
-			background-size: cover;
-		}
-	}
-
-	&__status {
-		position: absolute;
-		right: -4px;
-		bottom: -4px;
-		box-sizing: border-box;
-		width: 18px;
-		height: 18px;
-		border: 2px solid var(--color-main-background);
-		border-radius: 50%;
-		background-color: var(--color-main-background);
-		font-size: var(--default-font-size);
-		line-height: 15px;
-		background-repeat: no-repeat;
-		background-size: 16px;
-		background-position: center;
-
-		&--online{
-			background-image: url('../../../assets/status-icons/user-status-online.svg');
-		}
-		&--dnd{
-			background-image: url('../../../assets/status-icons/user-status-dnd.svg');
-			background-color: #ffffff;
-		}
-		&--away{
-			background-image: url('../../../assets/status-icons/user-status-away.svg');
-		}
-		&--icon {
-			border: none;
-			background-color: transparent;
-		}
-	}
-
-	&__content {
-		display: flex;
-		flex: 1 1 100%;
-		flex-direction: column;
-		justify-content: center;
-		min-width: 0;
-		padding-left: $autocomplete-padding;
-	}
-
-	&__title,
-	&__subline {
-		white-space: nowrap;
-		overflow: hidden;
-		text-overflow: ellipsis;
-	}
-
-	&__subline {
-		color: var(--color-text-lighter);
-	}
-}
-
-</style>