coop-cloud-chaos-patchs/outline
coop-cloud-chaos-patchs
/
outline
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: Occassional user context not available in collaborative persistence

This commit is contained in:
Tom Moor 2021-11-08 18:56:36 -08:00
parent a600a897c3
commit 9865eab61c
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/collaboration/persistence.js
View File

@ -52,7 +52,7 @@ export default class Persistence {
documentName, documentName,
}: { }: {
document: Y.Doc, document: Y.Doc,
context: { user: User }, context: { user: ?User },
documentName: string, documentName: string,
}) => { }) => {
const [, documentId] = documentName.split("."); const [, documentId] = documentName.split(".");
@ -63,7 +63,7 @@ export default class Persistence {
await documentUpdater({ await documentUpdater({
documentId, documentId,
ydoc: document, ydoc: document,
userId: context.user.id, userId: context.user?.id,
}); });
} catch (err) { } catch (err) {
Logger.error("Unable to persist document", err, { Logger.error("Unable to persist document", err, {

5
server/commands/documentUpdater.js
View File

@ -13,7 +13,7 @@ export default async function documentUpdater({
}: { }: {
documentId: string, documentId: string,
ydoc: Y.Doc, ydoc: Y.Doc,
userId: string, userId?: string,
}) { }) {
const document = await Document.findByPk(documentId); const document = await Document.findByPk(documentId);
const state = Y.encodeStateAsUpdate(ydoc); const state = Y.encodeStateAsUpdate(ydoc);
@ -38,7 +38,8 @@ export default async function documentUpdater({
text, text,
state: Buffer.from(state), state: Buffer.from(state),
updatedAt: isUnchanged ? document.updatedAt : new Date(), updatedAt: isUnchanged ? document.updatedAt : new Date(),
lastModifiedById: isUnchanged ? document.lastModifiedById : userId, lastModifiedById:
isUnchanged || !userId ? document.lastModifiedById : userId,
collaboratorIds, collaboratorIds,
}, },
{ {