From 82ba16870d99e74a781ae097fa63df2d88c09319 Mon Sep 17 00:00:00 2001
From: Max <max@nextcloud.com>
Date: Wed, 16 Jul 2025 12:28:00 +0200
Subject: [PATCH 1/5] chore(move): useDelayedFlag to composables

Signed-off-by: Max <max@nextcloud.com>
---
 src/components/Editor.vue                                     | 2 +-
 src/{components/Editor => composables}/useDelayedFlag.spec.ts | 0
 src/{components/Editor => composables}/useDelayedFlag.ts      | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename src/{components/Editor => composables}/useDelayedFlag.spec.ts (100%)
 rename src/{components/Editor => composables}/useDelayedFlag.ts (100%)

diff --git a/src/components/Editor.vue b/src/components/Editor.vue
index 099141f2597..0c9f903d8a3 100644
--- a/src/components/Editor.vue
+++ b/src/components/Editor.vue
@@ -100,6 +100,7 @@ import { t } from '@nextcloud/l10n'
 import { generateRemoteUrl } from '@nextcloud/router'
 import { Awareness } from 'y-protocols/awareness.js'
 import { provideConnection } from '../composables/useConnection.ts'
+import { useDelayedFlag } from '../composables/useDelayedFlag.ts'
 import { useEditorMethods } from '../composables/useEditorMethods.ts'
 import { provideSaveService } from '../composables/useSaveService.ts'
 import { provideSyncService } from '../composables/useSyncService.ts'
@@ -126,7 +127,6 @@ import ContentContainer from './Editor/ContentContainer.vue'
 import DocumentStatus from './Editor/DocumentStatus.vue'
 import MainContainer from './Editor/MainContainer.vue'
 import Status from './Editor/Status.vue'
-import { useDelayedFlag } from './Editor/useDelayedFlag.ts'
 import Wrapper from './Editor/Wrapper.vue'
 import MenuBar from './Menu/MenuBar.vue'
 import Translate from './Modal/Translate.vue'
diff --git a/src/components/Editor/useDelayedFlag.spec.ts b/src/composables/useDelayedFlag.spec.ts
similarity index 100%
rename from src/components/Editor/useDelayedFlag.spec.ts
rename to src/composables/useDelayedFlag.spec.ts
diff --git a/src/components/Editor/useDelayedFlag.ts b/src/composables/useDelayedFlag.ts
similarity index 100%
rename from src/components/Editor/useDelayedFlag.ts
rename to src/composables/useDelayedFlag.ts

From 427d798beb82d36488510529aa6dcb73708b7d72 Mon Sep 17 00:00:00 2001
From: Max <max@nextcloud.com>
Date: Thu, 17 Jul 2025 20:22:44 +0200
Subject: [PATCH 2/5] enh(status): use awareness state instead of sessions

Signed-off-by: Max <max@nextcloud.com>
---
 src/components/Editor.vue                 | 92 +++++------------------
 src/components/Editor/AvatarWrapper.vue   | 27 +++----
 src/components/Editor/GuestNameDialog.vue | 40 +++-------
 src/components/Editor/SessionList.vue     | 82 +++++++++-----------
 src/components/Editor/Status.vue          | 26 +++----
 src/composables/useClients.ts             | 71 +++++++++++++++++
 src/extensions/CollaborationCursor.ts     |  9 ++-
 src/services/PollingBackend.ts            |  3 +-
 8 files changed, 169 insertions(+), 181 deletions(-)
 create mode 100644 src/composables/useClients.ts

diff --git a/src/components/Editor.vue b/src/components/Editor.vue
index 0c9f903d8a3..6befb7b8c26 100644
--- a/src/components/Editor.vue
+++ b/src/components/Editor.vue
@@ -31,7 +31,7 @@
 							<Status
 								:document="document"
 								:dirty="dirty"
-								:sessions="filteredSessions"
+								:awareness="awareness"
 								:sync-error="syncError"
 								:has-connection-issue="requireReconnect" />
 						</ReadonlyBar>
@@ -48,7 +48,7 @@
 						<Status
 							:document="document"
 							:dirty="dirty"
-							:sessions="filteredSessions"
+							:awareness="awareness"
 							:sync-error="syncError"
 							:has-connection-issue="requireReconnect"
 							@editor-width-change="handleEditorWidthChange" />
@@ -87,7 +87,7 @@ import { File } from '@nextcloud/files'
 import { loadState } from '@nextcloud/initial-state'
 import { Collaboration } from '@tiptap/extension-collaboration'
 import { useElementSize } from '@vueuse/core'
-import Vue, { defineComponent, ref, set, shallowRef, watch } from 'vue'
+import { defineComponent, ref, shallowRef, watch } from 'vue'
 import { Doc } from 'yjs'
 import Autofocus from '../extensions/Autofocus.js'
 
@@ -96,7 +96,6 @@ import { provideEditorFlags } from '../composables/useEditorFlags.ts'
 import { ATTACHMENT_RESOLVER, FILE, IS_MOBILE } from './Editor.provider.ts'
 import ReadonlyBar from './Menu/ReadonlyBar.vue'
 
-import { t } from '@nextcloud/l10n'
 import { generateRemoteUrl } from '@nextcloud/router'
 import { Awareness } from 'y-protocols/awareness.js'
 import { provideConnection } from '../composables/useConnection.ts'
@@ -245,7 +244,10 @@ export default defineComponent({
 		const extensions = [
 			Autofocus.configure({ fileId: props.fileId }),
 			Collaboration.configure({ document: ydoc }),
-			CollaborationCursor.configure({ provider: { awareness } }),
+			CollaborationCursor.configure({
+				provider: { awareness },
+				user: { clientId: ydoc.clientID, name: '' },
+			}),
 		]
 		const editor = isRichEditor
 			? createRichEditor({
@@ -303,12 +305,8 @@ export default defineComponent({
 			IDLE_TIMEOUT,
 
 			document: null,
-			sessions: [],
-			currentSession: null,
 			fileNode: null,
 
-			filteredSessions: {},
-
 			idle: false,
 			lock: null,
 			dirty: false,
@@ -343,7 +341,7 @@ export default defineComponent({
 				: '/'
 		},
 		displayed() {
-			return (this.currentSession && this.active) || this.syncError
+			return (this.connection && this.active) || this.syncError
 		},
 		showLoadingSkeleton() {
 			return (!this.contentLoaded || !this.displayed) && !this.syncError
@@ -503,54 +501,7 @@ export default defineComponent({
 			this.idle = false
 		},
 
-		updateSessions(sessions) {
-			this.sessions = sessions.sort((a, b) => b.lastContact - a.lastContact)
-
-			// Make sure we get our own session updated
-			// This should ideally be part of a global store where we can have that updated on the actual name change for guests
-			const currentUpdatedSession = this.sessions.find(
-				(session) => session.id === this.currentSession.id,
-			)
-			set(this, 'currentSession', currentUpdatedSession)
-
-			const currentSessionIds = this.sessions.map((session) => session.userId)
-			const currentGuestIds = this.sessions.map((session) => session.guestId)
-
-			const removedSessions = Object.keys(this.filteredSessions).filter(
-				(sessionId) =>
-					!currentSessionIds.includes(sessionId)
-					&& !currentGuestIds.includes(sessionId),
-			)
-
-			for (const index in removedSessions) {
-				Vue.delete(this.filteredSessions, removedSessions[index])
-			}
-			for (const index in this.sessions) {
-				const session = this.sessions[index]
-				const sessionKey = session.displayName ? session.userId : session.id
-				if (this.filteredSessions[sessionKey]) {
-					// update timestamp if relevant
-					if (
-						this.filteredSessions[sessionKey].lastContact
-						< session.lastContact
-					) {
-						set(
-							this.filteredSessions[sessionKey],
-							'lastContact',
-							session.lastContact,
-						)
-					}
-				} else {
-					set(this.filteredSessions, sessionKey, session)
-				}
-				if (session.id === this.currentSession.id) {
-					set(this.filteredSessions[sessionKey], 'isCurrent', true)
-				}
-			}
-		},
-
 		onOpened({ document, session, documentSource, documentState }) {
-			this.currentSession = session
 			this.document = document
 			this.readOnly = document.readOnly
 			this.baseVersionEtag = document.baseVersionEtag
@@ -559,18 +510,17 @@ export default defineComponent({
 
 			this.setEditable(this.editMode)
 			this.lock = this.syncService.lock
-			localStorage.setItem('nick', this.currentSession.guestName)
 			this.$attachmentResolver = new AttachmentResolver({
-				session: this.currentSession,
+				session,
 				user: getCurrentUser(),
 				shareToken: this.shareToken,
 				currentDirectory: this.currentDirectory,
 			})
-			if (this.currentSession?.userId && this.relativePath?.length) {
+			if (session?.userId && this.relativePath?.length) {
 				const node = new File({
 					id: this.fileId,
 					source: generateRemoteUrl(
-						`dav/files/${this.currentSession.userId}${this.relativePath}`,
+						`dav/files/${session.userId}${this.relativePath}`,
 					),
 					mime: this.mime,
 				})
@@ -589,20 +539,18 @@ export default defineComponent({
 					})
 				}
 			})
-			const user = {
-				name: session?.userId
-					? session.displayName
-					: session?.guestName || t('text', 'Guest'),
-				color: session?.color,
-				clientId: this.ydoc.clientID,
-			}
-			this.editor.commands.updateUser(user)
+			const { userId, displayName, guestName, color } = session
+			localStorage.setItem('nick', guestName)
+			this.editor.commands.updateUser({
+				...this.awareness.getLocalState().user,
+				userId,
+				name: userId ? displayName : guestName,
+				color,
+			})
 		},
 
-		onChange({ document, sessions }) {
-			this.updateSessions.bind(this)(sessions)
+		onChange({ document }) {
 			this.document = document
-
 			this.syncError = null
 			this.setEditable(this.editMode && !this.requireReconnect)
 		},
diff --git a/src/components/Editor/AvatarWrapper.vue b/src/components/Editor/AvatarWrapper.vue
index 93c405b532e..8ff49cff14d 100644
--- a/src/components/Editor/AvatarWrapper.vue
+++ b/src/components/Editor/AvatarWrapper.vue
@@ -4,16 +4,15 @@
 -->
 
 <template>
-	<div class="avatar-wrapper" :style="sessionAvatarStyle">
+	<div class="avatar-wrapper" :style="clientAvatarStyle">
 		<NcAvatar
-			v-if="session.userId"
-			:user="session.userId ? session.userId : session.guestName"
-			:is-guest="session.userId === null"
+			v-if="client.userId"
+			:user="client.userId"
 			:disable-menu="true"
 			hide-status
 			:disable-tooltip="true"
 			:size="size" />
-		<div v-else class="avatar" :style="sessionBackgroundStyle">
+		<div v-else class="avatar" :style="clientBackgroundStyle">
 			{{ guestInitial }}
 		</div>
 	</div>
@@ -27,7 +26,7 @@ export default {
 		NcAvatar,
 	},
 	props: {
-		session: {
+		client: {
 			type: Object,
 			required: true,
 		},
@@ -37,27 +36,25 @@ export default {
 		},
 	},
 	computed: {
-		sessionAvatarStyle() {
+		clientAvatarStyle() {
 			return {
-				...this.sessionBackgroundStyle,
-				'border-color': this.session.color,
+				...this.clientBackgroundStyle,
+				'border-color': this.client.color,
 				'border-width': '2px',
 				'border-style': 'solid',
 				'--size': this.size + 'px',
 				'--font-size': this.size / 2 + 'px',
 			}
 		},
-		sessionBackgroundStyle() {
+		clientBackgroundStyle() {
 			return {
-				'background-color': this.session.userId
-					? this.session.color + ' !important'
+				'background-color': this.client.userId
+					? this.client.color + ' !important'
 					: '#b9b9b9',
 			}
 		},
 		guestInitial() {
-			return this.session.guestName === ''
-				? '?'
-				: this.session.guestName.slice(0, 1).toUpperCase()
+			return this.client.name?.at(0)?.toUpperCase() || '?'
 		},
 	},
 }
diff --git a/src/components/Editor/GuestNameDialog.vue b/src/components/Editor/GuestNameDialog.vue
index 1767f7e1c3a..16be800dc02 100644
--- a/src/components/Editor/GuestNameDialog.vue
+++ b/src/components/Editor/GuestNameDialog.vue
@@ -8,9 +8,11 @@
 		:title="t('text', 'Enter your name so other people can see who is editing')"
 		class="guest-name-dialog"
 		@submit.prevent="setGuestName()">
-		<label><AvatarWrapper :session="session" :size="32" /></label>
+		<label>
+			<AvatarWrapper :client="client" :size="32" />
+		</label>
 		<input
-			v-model="guestName"
+			v-model="guestNameEntry"
 			type="text"
 			:aria-label="t('text', 'Edit guest name')"
 			:placeholder="t('text', 'Guest')" />
@@ -25,7 +27,6 @@
 <script>
 import { t } from '@nextcloud/l10n'
 import { generateUrl } from '@nextcloud/router'
-import { useSyncService } from '../../composables/useSyncService.ts'
 import AvatarWrapper from './AvatarWrapper.vue'
 
 export default {
@@ -34,50 +35,33 @@ export default {
 		AvatarWrapper,
 	},
 	props: {
-		session: {
+		client: {
 			type: Object,
 			required: true,
 		},
-	},
-	setup() {
-		const { syncService } = useSyncService()
-		return { syncService }
+		guestName: {
+			type: String,
+			required: true,
+		},
 	},
 	data() {
 		return {
-			guestName: '',
-			guestNameBuffered: '',
+			guestNameEntry: this.guestName,
 		}
 	},
 	computed: {
 		avatarUrl() {
 			const size = 32
 			const avatarUrl = generateUrl('/avatar/guest/{user}/{size}', {
-				user: this.guestNameBuffered,
+				user: this.guestName,
 				size,
 			})
 			return window.location.protocol + '//' + window.location.host + avatarUrl
 		},
 	},
-	beforeMount() {
-		this.guestName = this.syncService.guestName
-		this.updateBufferedGuestName()
-	},
 	methods: {
 		setGuestName() {
-			const previousGuestName = this.syncService.guestName
-			this.syncService
-				.updateSession(this.guestName)
-				.then(() => {
-					localStorage.setItem('nick', this.guestName)
-					this.updateBufferedGuestName()
-				})
-				.catch((e) => {
-					this.guestName = previousGuestName
-				})
-		},
-		updateBufferedGuestName() {
-			this.guestNameBuffered = this.guestName
+			this.$emit('set-guest-name', this.guestNameEntry)
 		},
 		t,
 	},
diff --git a/src/components/Editor/SessionList.vue b/src/components/Editor/SessionList.vue
index 8ecc32f5db9..6f56704562f 100644
--- a/src/components/Editor/SessionList.vue
+++ b/src/components/Editor/SessionList.vue
@@ -16,9 +16,9 @@
 					<template #icon>
 						<AccountMultipleOutlineIcon :size="20" />
 						<AvatarWrapper
-							v-for="session in sessionsVisible"
-							:key="session.id"
-							:session="session"
+							v-for="client in visibleClients"
+							:key="client.id"
+							:client="client"
 							:size="28" />
 					</template>
 				</NcButton>
@@ -28,22 +28,21 @@
 			<div class="session-menu">
 				<slot name="lastSaved" />
 				<ul>
+					<GuestNameDialog
+						v-if="!localClient.userId"
+						:guest-name="localClient.guestName ?? ''"
+						:client="localClient"
+						@set-guest-name="setGuestName" />
 					<slot />
 					<li
-						v-for="session in participantsPopover"
-						:key="session.id"
-						:style="avatarStyle(session)">
-						<AvatarWrapper :session="session" :size="36" />
+						v-for="client in clientsToListInPopover"
+						:key="client.clientId"
+						:style="avatarStyle(client)">
+						<AvatarWrapper :client="client" :size="36" />
 						<span class="session-label">
-							{{
-								session.userId
-									? session.displayName
-									: session.guestName
-										? session.guestName
-										: t('text', 'Guest')
-							}}
+							{{ client.name || client.userId || t('text', 'Guest') }}
 						</span>
-						<span v-if="session.userId === null" class="guest-label"
+						<span v-if="client.userId === null" class="guest-label"
 							>({{ t('text', 'guest') }})</span
 						>
 					</li>
@@ -69,29 +68,36 @@ import NcButton from '@nextcloud/vue/components/NcButton'
 import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwitch'
 import NcPopover from '@nextcloud/vue/components/NcPopover'
 import AccountMultipleOutlineIcon from 'vue-material-design-icons/AccountMultipleOutline.vue'
-import {
-	COLLABORATOR_DISCONNECT_TIME,
-	COLLABORATOR_IDLE_TIME,
-} from '../../services/SyncService.ts'
+import { Awareness } from 'y-protocols/awareness.js'
+import { useClients } from '../../composables/useClients.ts'
+import { useEditor } from '../../composables/useEditor.ts'
+import { COLLABORATOR_IDLE_TIME } from '../../services/SyncService.ts'
 import AvatarWrapper from './AvatarWrapper.vue'
+import GuestNameDialog from './GuestNameDialog.vue'
 
 export default {
 	name: 'SessionList',
 	components: {
 		AccountMultipleOutlineIcon,
 		AvatarWrapper,
+		GuestNameDialog,
 		NcButton,
 		NcPopover,
 		NcCheckboxRadioSwitch,
 	},
 	props: {
-		sessions: {
-			type: Object,
+		awareness: {
+			type: Awareness,
 			default: () => {
 				return {}
 			},
 		},
 	},
+	setup(props) {
+		const { editor } = useEditor()
+		const { clients, localClient, setGuestName } = useClients(props, editor)
+		return { clients, localClient, setGuestName }
+	},
 	data() {
 		const isFullWidth = loadState('text', 'is_full_width_editor', false)
 		return {
@@ -103,41 +109,27 @@ export default {
 		label() {
 			return t('text', 'Active people')
 		},
-		participantsPopover() {
-			if (this.currentSession?.guestName) {
-				return this.participantsWithoutCurrent
-			}
-			return this.participants
-		},
-		participantsWithoutCurrent() {
-			return this.participants.filter((session) => !session.isCurrent)
-		},
-		participants() {
-			return Object.values(this.sessions)
-				.filter(
-					(session) =>
-						session.lastContact
-							> Date.now() / 1000 - COLLABORATOR_DISCONNECT_TIME
-						&& (session.userId !== null || session.guestName !== null),
-				)
-				.sort((a, b) => a.lastContact < b.lastContact)
+		clientsToListInPopover() {
+			return this.localClient?.userId ? this.remoteClients : this.clients
 		},
-		currentSession() {
-			return Object.values(this.sessions).find((session) => session.isCurrent)
+		remoteClients() {
+			return this.clients.filter(
+				({ clientId }) => clientId !== this.localClient.clientId,
+			)
 		},
 		avatarStyle() {
-			return (session) => {
+			return (client) => {
 				return {
 					opacity:
-						session.lastContact
+						client.lastContact
 						> Date.now() / 1000 - COLLABORATOR_IDLE_TIME
 							? 1
 							: 0.5,
 				}
 			}
 		},
-		sessionsVisible() {
-			return this.participantsWithoutCurrent.slice(0, 3)
+		visibleClients() {
+			return this.remoteClients.slice(0, 3)
 		},
 	},
 	methods: {
diff --git a/src/components/Editor/Status.vue b/src/components/Editor/Status.vue
index 2d280cb7683..99804f1a7db 100644
--- a/src/components/Editor/Status.vue
+++ b/src/components/Editor/Status.vue
@@ -20,13 +20,12 @@
 				</template>
 			</NcButton>
 		</div>
-		<SessionList :sessions="sessions" @editor-width-change="onEditorWidthChange">
+		<SessionList
+			:awareness="awareness"
+			@editor-width-change="onEditorWidthChange">
 			<p slot="lastSaved" class="last-saved">
 				{{ t('text', 'Last saved') }}: {{ lastSavedString }}
 			</p>
-			<GuestNameDialog
-				v-if="isPublic && currentSession && !currentSession.userId"
-				:session="currentSession" />
 		</SessionList>
 	</div>
 </template>
@@ -50,8 +49,6 @@ export default {
 		NcSavingIndicatorIcon,
 		SessionList: () =>
 			import(/* webpackChunkName: "editor-collab" */ './SessionList.vue'),
-		GuestNameDialog: () =>
-			import(/* webpackChunkName: "editor-guest" */ './GuestNameDialog.vue'),
 	},
 
 	mixins: [useIsMobileMixin, refreshMoment],
@@ -59,11 +56,15 @@ export default {
 	props: {
 		hasConnectionIssue: {
 			type: Boolean,
-			require: true,
+			required: true,
 		},
 		dirty: {
 			type: Boolean,
-			require: true,
+			required: true,
+		},
+		awareness: {
+			type: Object,
+			required: true,
 		},
 		document: {
 			type: Object,
@@ -73,12 +74,6 @@ export default {
 			type: Object,
 			default: null,
 		},
-		sessions: {
-			type: Object,
-			default: () => {
-				return {}
-			},
-		},
 	},
 
 	setup() {
@@ -128,9 +123,6 @@ export default {
 			}
 			return this.dirtyStateIndicator ? 'saving' : 'saved'
 		},
-		currentSession() {
-			return Object.values(this.sessions).find((session) => session.isCurrent)
-		},
 		lastSavedString() {
 			// Make this a dependent of refreshMoment, so it will be recomputed
 			/* eslint-disable-next-line no-unused-expressions */
diff --git a/src/composables/useClients.ts b/src/composables/useClients.ts
new file mode 100644
index 00000000000..4bd8e4bd00e
--- /dev/null
+++ b/src/composables/useClients.ts
@@ -0,0 +1,71 @@
+/**
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+import type { Editor } from '@tiptap/vue-2'
+import { ref } from 'vue'
+import type { Awareness } from 'y-protocols/awareness.js'
+import { COLLABORATOR_DISCONNECT_TIME } from '../services/SyncService.js'
+
+interface Props {
+	awareness: Awareness
+}
+
+interface ClientState {
+	clientId: number
+	name: string
+	userId?: string
+	color?: string
+}
+
+const getLastContact = (client: ClientState, awareness: Awareness) => {
+	const timestamp = awareness.meta.get(client.clientId)?.lastUpdated ?? 0
+	return timestamp / 1000
+}
+
+// In tiptap v3 use editor.storage.users instead of awareness
+export const useClients = (props: Props, editor: Editor) => {
+	const computeClients = () => {
+		const clientsFromAwareness: ClientState[] = Array.from(
+			props.awareness
+				.getStates()
+				.values()
+				.map((v) => v.user),
+		)
+		const activeCollaboratorThreshold =
+			Date.now() / 1000 - COLLABORATOR_DISCONNECT_TIME
+		return clientsFromAwareness
+			.map((client) => ({
+				...client,
+				lastContact: getLastContact(client, props.awareness),
+			}))
+			.filter(({ lastContact }) => lastContact > activeCollaboratorThreshold)
+			.sort((a, b) => a.lastContact - b.lastContact)
+	}
+	const clients = ref<ClientState[]>(computeClients())
+
+	const computeLocalClient = () => {
+		const state = props.awareness.getLocalState()
+		if (!state) {
+			throw new Error('No local state awareness state set')
+		}
+		return state.user
+	}
+	const localClient = ref<ClientState>(computeLocalClient())
+
+	props.awareness.on('update', () => {
+		clients.value = computeClients()
+		localClient.value = computeLocalClient()
+	})
+
+	const setGuestName = (guestName: string) => {
+		editor.commands.updateUser({
+			...localClient.value,
+			name: guestName,
+		})
+		localStorage.setItem('nick', guestName)
+	}
+
+	return { clients, localClient, setGuestName }
+}
diff --git a/src/extensions/CollaborationCursor.ts b/src/extensions/CollaborationCursor.ts
index 8e46022c794..ad111106102 100644
--- a/src/extensions/CollaborationCursor.ts
+++ b/src/extensions/CollaborationCursor.ts
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
+import { t } from '@nextcloud/l10n'
 import { CollaborationCursor as TiptapCollaborationCursor } from '@tiptap/extension-collaboration-cursor'
 
 /**
@@ -37,6 +38,7 @@ const CollaborationCursor = TiptapCollaborationCursor.extend({
 			...this.parent?.(),
 			render: (user) => {
 				const cursor = document.createElement('span')
+				const name = user.name || user.user_id || t('text', 'Guest')
 
 				cursor.classList.add('collaboration-cursor__caret')
 				cursor.setAttribute('style', `border-color: ${user.color}`)
@@ -46,7 +48,7 @@ const CollaborationCursor = TiptapCollaborationCursor.extend({
 				label.classList.add('collaboration-cursor__label')
 				label.id = `collaboration-cursor__label__${user.clientId}`
 				label.setAttribute('style', `background-color: ${user.color}`)
-				label.insertBefore(document.createTextNode(user.name), null)
+				label.insertBefore(document.createTextNode(name), null)
 				cursor.insertBefore(label, null)
 
 				return cursor
@@ -63,9 +65,10 @@ const CollaborationCursor = TiptapCollaborationCursor.extend({
 			) => {
 				if (origin !== 'local') {
 					for (const clientId of [...added, ...updated]) {
-						if (clientId !== this.options.user.clientId) {
-							showCursorLabel(clientId)
+						if (clientId === this.options.user.clientId) {
+							continue
 						}
+						showCursorLabel(clientId)
 					}
 				}
 			},
diff --git a/src/services/PollingBackend.ts b/src/services/PollingBackend.ts
index ef02dc53ae6..16ef4a9a1a3 100644
--- a/src/services/PollingBackend.ts
+++ b/src/services/PollingBackend.ts
@@ -137,7 +137,7 @@ class PollingBackend {
 		const { document, sessions } = data
 		this.#fetchRetryCounter = 0
 
-		this.#syncService.emit('change', { document, sessions })
+		this.#syncService.emit('change', { document })
 		this.#syncService.receiveSteps(data)
 
 		if (data.steps.length === 0) {
@@ -148,6 +148,7 @@ class PollingBackend {
 				return
 			}
 			const disconnect = Date.now() - COLLABORATOR_DISCONNECT_TIME
+			// TODO: update and analyse awareness state instead.
 			const alive = sessions.filter((s) => s.lastContact * 1000 > disconnect)
 			if (this.#syncService.isReadOnly) {
 				this.maximumReadOnlyTimer()

From c9f9948a99870ef33879b3a2ecde43480dff3761 Mon Sep 17 00:00:00 2001
From: Max <max@nextcloud.com>
Date: Sat, 19 Jul 2025 11:56:43 +0200
Subject: [PATCH 3/5] fix(css): render cursor color for logged in users

Css rule from notifications app was setting
```css
box-sizing: content-box;
```

Signed-off-by: Max <max@nextcloud.com>
---
 src/components/Editor/AvatarWrapper.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/Editor/AvatarWrapper.vue b/src/components/Editor/AvatarWrapper.vue
index 8ff49cff14d..a95c60e27f6 100644
--- a/src/components/Editor/AvatarWrapper.vue
+++ b/src/components/Editor/AvatarWrapper.vue
@@ -74,5 +74,6 @@ export default {
 	display: flex;
 	justify-content: center;
 	align-items: center;
+	box-sizing: content-box;
 }
 </style>

From 28ba2f223d765de0c2d847553bdc014e66f15aba Mon Sep 17 00:00:00 2001
From: Max <max@nextcloud.com>
Date: Sat, 19 Jul 2025 11:58:28 +0200
Subject: [PATCH 4/5] fix(people): hide local client for guests

Signed-off-by: Max <max@nextcloud.com>
---
 src/components/Editor/SessionList.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/components/Editor/SessionList.vue b/src/components/Editor/SessionList.vue
index 6f56704562f..8bb25da6d19 100644
--- a/src/components/Editor/SessionList.vue
+++ b/src/components/Editor/SessionList.vue
@@ -29,7 +29,7 @@
 				<slot name="lastSaved" />
 				<ul>
 					<GuestNameDialog
-						v-if="!localClient.userId"
+						v-if="hasGuestNameDialog"
 						:guest-name="localClient.guestName ?? ''"
 						:client="localClient"
 						@set-guest-name="setGuestName" />
@@ -110,7 +110,10 @@ export default {
 			return t('text', 'Active people')
 		},
 		clientsToListInPopover() {
-			return this.localClient?.userId ? this.remoteClients : this.clients
+			return this.hasGuestNameDialog ? this.remoteClients : this.clients
+		},
+		hasGuestNameDialog() {
+			return !this.localClient.userId
 		},
 		remoteClients() {
 			return this.clients.filter(

From 32eff67228bda1946c4912fffae81b8aa3a7ee8a Mon Sep 17 00:00:00 2001
From: Max <max@nextcloud.com>
Date: Sun, 20 Jul 2025 14:21:48 +0200
Subject: [PATCH 5/5] chore(cleanup): unused updateSession and dependencies

Signed-off-by: Max <max@nextcloud.com>
---
 src/services/SessionConnection.js | 55 -------------------------------
 src/services/SyncService.ts       | 10 ------
 2 files changed, 65 deletions(-)

diff --git a/src/services/SessionConnection.js b/src/services/SessionConnection.js
index f07a9d67196..d28ae171f3e 100644
--- a/src/services/SessionConnection.js
+++ b/src/services/SessionConnection.js
@@ -2,17 +2,6 @@
  * SPDX-FileCopyrightText: 2022 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-import axios from '@nextcloud/axios'
-import { generateUrl } from '@nextcloud/router'
-
-export class ConnectionClosedError extends Error {
-	constructor(
-		message = 'Close has already been called on the connection',
-		...rest
-	) {
-		super(message, ...rest)
-	}
-}
 
 export class SessionConnection {
 	#content
@@ -67,25 +56,6 @@ export class SessionConnection {
 		return this.#hasOwner
 	}
 
-	get #defaultParams() {
-		return {
-			documentId: this.#document.id,
-			sessionId: this.#session.id,
-			sessionToken: this.#session.token,
-			token: this.connection.shareToken,
-		}
-	}
-
-	// TODO: maybe return a new connection here so connections have immutable state
-	update(guestName) {
-		return this.#post(this.#url(`session/${this.#document.id}/session`), {
-			...this.#defaultParams,
-			guestName,
-		}).then(({ data }) => {
-			this.#session = data
-		})
-	}
-
 	close() {
 		this.closed = true
 	}
@@ -94,29 +64,4 @@ export class SessionConnection {
 	setBaseVersionEtag(baseVersionEtag) {
 		this.#document.baseVersionEtag = baseVersionEtag
 	}
-
-	#post(...args) {
-		if (this.closed) {
-			return Promise.reject(new ConnectionClosedError())
-		}
-		return axios.post(...args)
-	}
-
-	#url(endpoint) {
-		const isPublic = !!this.#defaultParams.token
-		return _endpointUrl(endpoint, isPublic)
-	}
-}
-
-/**
- *
- * @param {string} endpoint - endpoint of the url inside apps/text
- * @param {boolean} isPublic - public url or not
- */
-function _endpointUrl(endpoint, isPublic = false) {
-	const _baseUrl = generateUrl('/apps/text')
-	if (isPublic) {
-		return `${_baseUrl}/public/${endpoint}`
-	}
-	return `${_baseUrl}/${endpoint}`
 }
diff --git a/src/services/SyncService.ts b/src/services/SyncService.ts
index 1e8ea66a19d..f3f3c9e5566 100644
--- a/src/services/SyncService.ts
+++ b/src/services/SyncService.ts
@@ -192,16 +192,6 @@ class SyncService {
 		}
 	}
 
-	updateSession(guestName: string) {
-		if (!this.sessionConnection?.isPublic) {
-			return Promise.reject(new Error())
-		}
-		return this.sessionConnection.update(guestName).catch((error) => {
-			logger.error('Failed to update the session', { error })
-			return Promise.reject(error)
-		})
-	}
-
 	sendStep(step: ArrayBuffer) {
 		this.#outbox.storeStep(step)
 		this.sendSteps()