From 76ada1acbc754eec643f92f8a2a4945a210bba5e Mon Sep 17 00:00:00 2001 From: Tom Moor Date: Wed, 12 Feb 2025 23:04:53 -0500 Subject: [PATCH] fix: Notifications sent for insignificant changes --- package.json | 1 + server/models/helpers/DocumentHelper.tsx | 15 ++++--- .../tasks/RevisionCreatedNotificationsTask.ts | 4 +- server/typings/index.d.ts | 4 ++ yarn.lock | 39 ++++--------------- 5 files changed, 24 insertions(+), 39 deletions(-) diff --git a/package.json b/package.json index 7aeb5b5c51..26e61933c8 100644 --- a/package.json +++ b/package.json @@ -237,6 +237,7 @@ "tiny-cookie": "^2.5.1", "tmp": "^0.2.3", "turndown": "^7.2.0", + "ukkonen": "^2.1.0", "umzug": "^3.8.2", "utility-types": "^3.11.0", "uuid": "^8.3.2", diff --git a/server/models/helpers/DocumentHelper.tsx b/server/models/helpers/DocumentHelper.tsx index 0809cdd6ff..73c40b6afb 100644 --- a/server/models/helpers/DocumentHelper.tsx +++ b/server/models/helpers/DocumentHelper.tsx @@ -1,5 +1,6 @@ import { JSDOM } from "jsdom"; import { Node } from "prosemirror-model"; +import ukkonen from "ukkonen"; import { updateYFragment, yDocToProsemirrorJSON } from "y-prosemirror"; import * as Y from "yjs"; import textBetween from "@shared/editor/lib/textBetween"; @@ -483,20 +484,22 @@ export class DocumentHelper { * * @param document The document to compare * @param other The other document to compare + * @param threshold The threshold for the change in characters * @returns True if the text content is equal */ - public static isTextContentEqual( + public static isChangeOverThreshold( before: Document | Revision | null, - after: Document | Revision | null + after: Document | Revision | null, + threshold: number ) { if (!before || !after) { return false; } - return ( - before.title === after.title && - this.toMarkdown(before) === this.toMarkdown(after) - ); + const first = before.title + this.toPlainText(before); + const second = after.title + this.toPlainText(after); + const distance = ukkonen(first, second); + return distance > threshold; } private static textSerializers = getTextSerializers(schema); diff --git a/server/queues/tasks/RevisionCreatedNotificationsTask.ts b/server/queues/tasks/RevisionCreatedNotificationsTask.ts index 041815298b..978e04d5f0 100644 --- a/server/queues/tasks/RevisionCreatedNotificationsTask.ts +++ b/server/queues/tasks/RevisionCreatedNotificationsTask.ts @@ -28,10 +28,10 @@ export default class RevisionCreatedNotificationsTask extends BaseTask