Merge pull request #2878 from nextcloud/bug/use-primary-attr-for-curr…

…ent-user-mention fix: add primary attribute for current user
nextcloud · Sep 13, 2022 · 6b7ea64 · 6b7ea64
2 parents 9a45c93 + 7f883b1
commit 6b7ea64
Show file tree

Hide file tree

Showing 16 changed files with 32 additions and 23 deletions.
diff --git a/js/editor-rich.js b/js/editor-rich.js
diff --git a/js/editor-rich.js.map b/js/editor-rich.js.map
diff --git a/js/editor.js b/js/editor.js
diff --git a/js/editor.js.map b/js/editor.js.map
diff --git a/js/files-modal.js b/js/files-modal.js
diff --git a/js/files-modal.js.map b/js/files-modal.js.map
diff --git a/js/text-files.js b/js/text-files.js
diff --git a/js/text-files.js.map b/js/text-files.js.map
diff --git a/js/text-public.js b/js/text-public.js
diff --git a/js/text-public.js.map b/js/text-public.js.map
diff --git a/js/text-text.js b/js/text-text.js
diff --git a/js/text-text.js.map b/js/text-text.js.map
diff --git a/js/text-viewer.js b/js/text-viewer.js
diff --git a/js/text-viewer.js.map b/js/text-viewer.js.map
diff --git a/src/components/Editor.vue b/src/components/Editor.vue
@@ -670,7 +670,7 @@ export default {
 			return true
 		},
 
-		/** @param {Event} event */
+		/** @param {Event} event The passed event */
 		preparePrinting(event) {
 			const content = document.getElementById('content')
 			// Hide Content behind modal, this also hides the sidebar if open

diff --git a/src/extensions/Mention.vue b/src/extensions/Mention.vue
@@ -1,6 +1,9 @@
 <template>
 	<NodeViewWrapper as="span" class="mention" contenteditable="false">
-		<NcUserBubble :user="node.attrs.id" :display-name="username" class="mention-user-bubble">
+		<NcUserBubble :user="node.attrs.id"
+			:display-name="username"
+			:primary="isCurrentUser"
+			class="mention-user-bubble">
 			@{{ username }}
 		</NcUserBubble>
 	</NodeViewWrapper>
@@ -9,6 +12,7 @@
 <script>
 import NcUserBubble from '@nextcloud/vue/dist/Components/NcUserBubble.js'
 import { NodeViewWrapper } from '@tiptap/vue-2'
+import { getCurrentUser } from '@nextcloud/auth'
 
 export default {
 	name: 'Mention',
@@ -32,6 +36,11 @@ export default {
 			username: this.node.attrs.label,
 		}
 	},
+	computed: {
+		isCurrentUser() {
+			return this.node.attrs.id === getCurrentUser().uid
+		},
+	},
 }
 </script>
 <style scoped>