Merge pull request #55663 from nextcloud/backport/55645/stable32

[stable32] Fix comments when used by other apps

apps/comments/lib/Collaboration/CommentersSorter.php

@@ -27,6 +27,10 @@ class CommentersSorter implements ISorter {
 	 * @param array $context
 	 */
 	public function sort(array &$sortArray, array $context): void {
+		if (!isset($context['itemType'], $context['itemId'])) {
+			return;
+		}
+
 		$commenters = $this->retrieveCommentsInformation($context['itemType'], $context['itemId']);
 		if (count($commenters) === 0) {
 			return;

apps/comments/src/mixins/CommentView.ts

@@ -27,6 +27,7 @@ export default defineComponent({
 				key: 'editor',
 			},
 			userData: {},
+			currentResourceId: this.resourceId,
 		}
 	},
 	methods: {
@@ -40,8 +41,8 @@ export default defineComponent({
 			const { data } = await axios.get(generateOcsUrl('core/autocomplete/get'), {
 				params: {
 					search,
-					itemType: 'files',
-					itemId: this.resourceId,
+					itemType: this.resourceType,
+					itemId: this.currentResourceId,
 					sorter: 'commenters|share-recipients',
 					limit: loadState('comments', 'maxAutoCompleteResults'),
 				},

apps/comments/src/views/Comments.vue

@@ -106,7 +106,6 @@ export default {
 			loading: false,
 			done: false,
 
-			currentResourceId: this.resourceId,
 			offset: 0,
 			comments: [],
 
@@ -153,7 +152,7 @@ export default {
 		async update(resourceId) {
 			this.currentResourceId = resourceId
 			this.resetState()
-			this.getComments()
+			await this.getComments()
 		},
 
 		/**
@@ -201,8 +200,13 @@ export default {
 					this.done = true
 				}
 
+				// Ensure actor id is a string
+				for (const comment of comments) {
+					comment.props.actorId = comment.props.actorId.toString()
+				}
+
 				// Insert results
-				this.comments.push(...comments)
+				this.comments = [...this.comments, ...comments]
 
 				// Increase offset for next fetch
 				this.offset += DEFAULT_LIMIT