fix(comments): dismiss mention notifications and clear unread badge when viewed in activity sidebar

apps/comments/appinfo/routes.php

@@ -10,5 +10,6 @@
 return [
 	'routes' => [
 		['name' => 'Notifications#view', 'url' => '/notifications/view/{id}', 'verb' => 'GET'],
+		['name' => 'Notifications#dismiss', 'url' => '/notifications/{id}', 'verb' => 'DELETE'],
 	]
 ];

apps/comments/lib/Controller/NotificationsController.php

@@ -8,9 +8,11 @@
 
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http;
+use OCP\AppFramework\Http\Attribute\NoAdminRequired;
 use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
 use OCP\AppFramework\Http\Attribute\OpenAPI;
 use OCP\AppFramework\Http\Attribute\PublicPage;
+use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\Http\NotFoundResponse;
 use OCP\AppFramework\Http\RedirectResponse;
 use OCP\Comments\IComment;
@@ -92,6 +94,36 @@ public function view(string $id): RedirectResponse|NotFoundResponse {
 		}
 	}
 
+	/**
+	 * Dismiss the mention notification for a comment
+	 *
+	 * @param string $id ID of the comment
+	 *
+	 * @return DataResponse<Http::STATUS_OK, array{}, array{}>|DataResponse<Http::STATUS_FORBIDDEN, array{}, array{}>|DataResponse<Http::STATUS_NOT_FOUND, array{}, array{}>
+	 *
+	 * 200: Notification dismissed successfully
+	 * 403: Not logged in
+	 * 404: Comment not found
+	 */
+	#[NoAdminRequired]
+	public function dismiss(string $id): DataResponse {
+		$currentUser = $this->userSession->getUser();
+		if (!$currentUser instanceof IUser) {
+			return new DataResponse([], Http::STATUS_FORBIDDEN);
+		}
+
+		try {
+			$comment = $this->commentsManager->get($id);
+			if ($comment->getObjectType() !== 'files') {
+				return new DataResponse([], Http::STATUS_NOT_FOUND);
+			}
+			$this->markProcessed($comment, $currentUser);
+			return new DataResponse([]);
+		} catch (\Exception $e) {
+			return new DataResponse([], Http::STATUS_NOT_FOUND);
+		}
+	}
+
 	/**
 	 * Marks the notification about a comment as processed
 	 */

apps/comments/src/comments-activity-tab.ts

@@ -6,10 +6,14 @@
 import type { INode } from '@nextcloud/files'
 import type { App } from 'vue'
 
+import { getCurrentUser } from '@nextcloud/auth'
+import axios from '@nextcloud/axios'
+import { generateUrl } from '@nextcloud/router'
 import { createPinia } from 'pinia'
 import { createApp } from 'vue'
 import logger from './logger.ts'
 import { getComments } from './services/GetComments.ts'
+import { markCommentsAsRead } from './services/ReadComments.ts'
 
 /**
  * Register the comments plugins for the Activity sidebar
@@ -50,6 +54,26 @@ export function registerCommentsPlugins() {
 			},
 		)
 		logger.debug('Loaded comments', { node, comments })
+
+		// Mark all comments as read and clear the unread badge in the files list
+		if (node.fileid) {
+			markCommentsAsRead('files', node.fileid, new Date())
+				.then(() => node.update({ 'comments-unread': 0 }))
+				.catch(() => {})
+		}
+
+		// Mark mention notifications as read for comments that mention the current user
+		const currentUser = getCurrentUser()
+		if (currentUser) {
+			for (const comment of comments) {
+				const mentions = Object.values(comment.props?.mentions ?? {}) as { mentionType: string, mentionId: string }[]
+				const isMentioned = comment.props?.id && mentions.some((m) => m.mentionType === 'user' && m.mentionId === currentUser.uid)
+				if (isMentioned) {
+					axios.delete(generateUrl('/apps/comments/notifications/{id}', { id: comment.props.id }))
+						.catch(() => {})
+				}
+			}
+		}
 		const { default: CommentView } = await import('./views/ActivityCommentEntry.vue')
 
 		return comments.map((comment) => ({

apps/comments/tests/Unit/Controller/NotificationsTest.php

@@ -10,6 +10,7 @@
 namespace OCA\Comments\Tests\Unit\Controller;
 
 use OCA\Comments\Controller\NotificationsController;
+use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\Http\NotFoundResponse;
 use OCP\AppFramework\Http\RedirectResponse;
 use OCP\Comments\IComment;
@@ -163,6 +164,104 @@ public function testViewInvalidComment(): void {
 		$this->assertInstanceOf(NotFoundResponse::class, $response);
 	}
 
+	public function testDismissNotLoggedIn(): void {
+		$this->session->expects($this->once())
+			->method('getUser')
+			->willReturn(null);
+
+		$this->commentsManager->expects($this->never())
+			->method('get');
+		$this->notificationManager->expects($this->never())
+			->method('markProcessed');
+
+		$response = $this->notificationsController->dismiss('42');
+		$this->assertInstanceOf(DataResponse::class, $response);
+		$this->assertSame(403, $response->getStatus());
+	}
+
+	public function testDismissSuccess(): void {
+		$comment = $this->createMock(IComment::class);
+		$comment->expects($this->any())
+			->method('getObjectType')
+			->willReturn('files');
+		$comment->expects($this->any())
+			->method('getId')
+			->willReturn('1234');
+
+		$this->commentsManager->expects($this->once())
+			->method('get')
+			->with('42')
+			->willReturn($comment);
+
+		$user = $this->createMock(IUser::class);
+		$user->expects($this->any())
+			->method('getUID')
+			->willReturn('user');
+
+		$this->session->expects($this->once())
+			->method('getUser')
+			->willReturn($user);
+
+		$notification = $this->createMock(INotification::class);
+		$notification->expects($this->any())
+			->method($this->anything())
+			->willReturn($notification);
+
+		$this->notificationManager->expects($this->once())
+			->method('createNotification')
+			->willReturn($notification);
+		$this->notificationManager->expects($this->once())
+			->method('markProcessed')
+			->with($notification);
+
+		$response = $this->notificationsController->dismiss('42');
+		$this->assertInstanceOf(DataResponse::class, $response);
+		$this->assertSame(200, $response->getStatus());
+	}
+
+	public function testDismissInvalidComment(): void {
+		$this->commentsManager->expects($this->once())
+			->method('get')
+			->with('42')
+			->willThrowException(new NotFoundException());
+
+		$user = $this->createMock(IUser::class);
+		$this->session->expects($this->once())
+			->method('getUser')
+			->willReturn($user);
+
+		$this->notificationManager->expects($this->never())
+			->method('markProcessed');
+
+		$response = $this->notificationsController->dismiss('42');
+		$this->assertInstanceOf(DataResponse::class, $response);
+		$this->assertSame(404, $response->getStatus());
+	}
+
+	public function testDismissNonFileComment(): void {
+		$comment = $this->createMock(IComment::class);
+		$comment->expects($this->any())
+			->method('getObjectType')
+			->willReturn('calendar');
+
+		$this->commentsManager->expects($this->once())
+			->method('get')
+			->with('42')
+			->willReturn($comment);
+
+		$user = $this->createMock(IUser::class);
+		$this->session->expects($this->once())
+			->method('getUser')
+			->willReturn($user);
+
+		$this->notificationManager->expects($this->never())
+			->method('markProcessed');
+
+		$response = $this->notificationsController->dismiss('42');
+		$this->assertInstanceOf(DataResponse::class, $response);
+		$this->assertSame(404, $response->getStatus());
+	}
+
 	public function testViewNoFile(): void {
 		$comment = $this->createMock(IComment::class);
 		$comment->expects($this->any())

apps/files_sharing/src/views/SharingDetailsTab.vue

@@ -1131,9 +1131,6 @@ export default {
 
 				// ugly hack to make code work - we need the id to be set but at the same time we need to keep values we want to update
 				this.share._share.id = share.id
-				// Similarly the token is always set by the backend when the
-				// share is created.
-				this.share._share.token = share.token
 				await this.queueUpdate(...permissionsAndAttributes)
 				// Also a ugly hack to update the updated permissions
 				for (const prop of permissionsAndAttributes) {

build/eslint-baseline-legacy.json

@@ -16,7 +16,7 @@
   },
   "apps/files_sharing/src/views/SharingDetailsTab.vue": {
     "vue/no-mutating-props": {
-      "count": 24
+      "count": 23
     }
   },
   "apps/files_sharing/src/views/SharingLinkList.vue": {

cypress/e2e/comments/comments-unread.cy.ts

@@ -0,0 +1,105 @@
+/**
+ * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+import type { User } from '@nextcloud/e2e-test-server/cypress'
+
+import axios from 'axios'
+import { getInlineActionEntryForFile, triggerInlineActionForFile } from '../files/FilesUtils.ts'
+
+/**
+ * Add a comment to a file via the DAV API.
+ *
+ * @param user The user adding the comment
+ * @param fileId The numeric file ID
+ * @param message The comment text
+ */
+function addCommentViaApi(user: User, fileId: number, message: string) {
+	cy.clearCookies().then(async () => {
+		await axios({
+			url: `${Cypress.env('baseUrl')}/remote.php/dav/comments/files/${fileId}`,
+			method: 'POST',
+			auth: {
+				username: user.userId,
+				password: user.password,
+			},
+			headers: { 'Content-Type': 'application/json' },
+			data: JSON.stringify({ actorType: 'users', verb: 'comment', message }),
+		})
+	})
+}
+
+describe('Comments: unread badge in the files list', { testIsolation: true }, () => {
+	let fileOwner: User
+	let fileId: number
+
+	beforeEach(() => {
+		// The admin user can comment on any file without needing a share
+		const admin = { userId: 'admin', password: 'admin' } as User
+
+		cy.createRandomUser().then(($user) => {
+			fileOwner = $user
+			cy.uploadContent(fileOwner, new Blob(['hello']), 'text/plain', '/commented-file.txt')
+				.then((response) => {
+					fileId = Number.parseInt(response.headers['oc-fileid'] ?? '0')
+					// Add a comment as admin so fileOwner has an unread comment
+					addCommentViaApi(admin, fileId, 'Hey, take a look at this!')
+				})
+		})
+	})
+
+	it('shows the unread comments badge when there are unread comments', () => {
+		cy.login(fileOwner)
+		cy.visit('/apps/files')
+
+		getInlineActionEntryForFile('commented-file.txt', 'comments-unread')
+			.should('be.visible')
+			.find('button')
+			.should('have.attr', 'aria-label')
+			.and('match', /new comment/)
+	})
+
+	it('removes the unread badge after opening the sidebar comments tab', () => {
+		cy.login(fileOwner)
+		cy.visit('/apps/files')
+
+		// Verify badge is present first
+		getInlineActionEntryForFile('commented-file.txt', 'comments-unread')
+			.should('be.visible')
+
+		// Intercept the PROPPATCH that marks comments as read
+		cy.intercept('PROPPATCH', /\/remote\.php\/dav\/comments\/files\//).as('markRead')
+
+		// Click the badge — opens the comments or activity sidebar
+		triggerInlineActionForFile('commented-file.txt', 'comments-unread')
+
+		cy.get('[data-cy-sidebar]').should('be.visible')
+
+		// The read-marker PROPPATCH must have been sent
+		cy.wait('@markRead')
+
+		// Badge must be gone without a page reload
+		getInlineActionEntryForFile('commented-file.txt', 'comments-unread')
+			.should('not.exist')
+	})
+
+	it('badge stays absent after closing and re-opening the sidebar', () => {
+		cy.login(fileOwner)
+		cy.visit('/apps/files')
+
+		cy.intercept('PROPPATCH', /\/remote\.php\/dav\/comments\/files\//).as('markRead')
+
+		triggerInlineActionForFile('commented-file.txt', 'comments-unread')
+		cy.get('[data-cy-sidebar]').should('be.visible')
+		cy.wait('@markRead')
+
+		// Close the sidebar
+		cy.get('[data-cy-sidebar] .app-sidebar__close').click({ force: true })
+		cy.get('[data-cy-sidebar]').should('not.be.visible')
+
+		// Badge must still be gone
+		getInlineActionEntryForFile('commented-file.txt', 'comments-unread')
+			.should('not.exist')
+	})
+})

dist/5638-5638.js.map.license

@@ -0,0 +1 @@
+5638-5638.js.license

dist/ActivityCommentAction-CsbmNmci.chunk.mjs

@@ -0,0 +1,2 @@
+import{a as t}from"./index-C1xmmKTZ-BdqLiU2K.chunk.mjs";import{t as e}from"./translation-DoG5ZELJ-CPJIGC2H.chunk.mjs";import{C as m,a}from"./CommentView-CX3IUGTX.chunk.mjs";import{l as p}from"./activity-CS_yDSTQ.chunk.mjs";import{b as i,r as s,o as n,c,m as u}from"./preload-helper-CX9gtE7n.chunk.mjs";import{_ as l}from"./public-C1mLBHT3.chunk.mjs";import"./index-C6zIcU-d.chunk.mjs";import"./NcModal-kyWZ3UFC-CV6Hvf6d.chunk.mjs";import"./ArrowRight-JDdFcric.chunk.mjs";import"./Web-lLWc6zap.chunk.mjs";import"./index-CziSTDUD.chunk.mjs";import"./TrashCanOutline-B-GxU5E3.chunk.mjs";import"./mdi-BjKyjJ9m.chunk.mjs";import"./pinia-Bx2CoJV6.chunk.mjs";import"./PencilOutline-Bexowggr.chunk.mjs";/* empty css                                          */import"./NcAvatar-ruClKRzS-DbbQH8Qz.chunk.mjs";import"./index-BpWtOFbq.chunk.mjs";import"./util-BUyb4W9M.chunk.mjs";import"./colors-BfjxNgsx-CknPG731.chunk.mjs";import"./NcUserStatusIcon-JWiuiAXe-FPvdKWWr.chunk.mjs";import"./NcDateTime.vue_vue_type_script_setup_true_lang-B4upiZjL-CDStkW4e.chunk.mjs";import"./NcUserBubble-BE6yD-R0-BI6ZwX-N.chunk.mjs";import"./ReadComments-CMOQZLlB.chunk.mjs";import"./index-COu4RIcm.chunk.mjs";const d=i({components:{Comment:a},mixins:[m],props:{reloadCallback:{type:Function,required:!0}},methods:{onNewComment(){try{this.reloadCallback()}catch(o){t(e("comments","Could not reload comments")),p.error("Could not reload comments",{error:o})}}}});function C(o,f,y,w,D,N){const r=s("Comment");return n(),c(r,u(o.editorData,{autoComplete:o.autoComplete,resourceType:o.resourceType,editor:!0,userData:o.userData,resourceId:o.resourceId,class:"comments-action",onNew:o.onNewComment}),null,16,["autoComplete","resourceType","userData","resourceId","onNew"])}const R=l(d,[["render",C],["__scopeId","data-v-29a1e244"]]);export{R as default};
+//# sourceMappingURL=ActivityCommentAction-CsbmNmci.chunk.mjs.map