From 03b4ce445853a754f2cfbebe11cf6d39012a9ae2 Mon Sep 17 00:00:00 2001 From: lin onetwo Date: Tue, 19 Mar 2024 23:39:20 +0800 Subject: [PATCH] Update mergeTiddler.ts --- src/tw-mobile-sync/data/mergeTiddler.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/tw-mobile-sync/data/mergeTiddler.ts b/src/tw-mobile-sync/data/mergeTiddler.ts index 2be685f..c8bcf42 100644 --- a/src/tw-mobile-sync/data/mergeTiddler.ts +++ b/src/tw-mobile-sync/data/mergeTiddler.ts @@ -24,6 +24,7 @@ export function mergeTiddler(a: ITiddlerFields, b: ITiddlerFields): ITiddlerFiel } // both is string tiddler, we can merge them using diff-match-patch algorithm // FIXME: Currently not working, it needs `c` that is an older version from server to work (3-way-merge), otherwise it will just use `b.text` as the merged text + // FIXME: `Error when processing tiddler { title: '2024-03-19T13:45:00+08:00', created: '20240319063429986', creator: '林一二', startDate: '20240319054500000', endDate: '20240319063000000', calendarEntry: 'yes', tags: 'xxx', modified: '20240319063429986', modifier: '林一二', caption: 'yyy', type: 'text/vnd.tiddlywiki', text: '' } Error: Unknown call format to make() at make ($:/plugins/linonetwo/tw-mobile-sync/server-sync-v1-endpoint.js:1:19900) at mergeTiddler ($:/plugins/linonetwo/tw-mobile-sync/server-sync-v1-endpoint.js:1:25987) at $:/plugins/linonetwo/tw-mobile-sync/server-sync-v1-endpoint.js:9:1558 at Array.forEach () at Object.handler2 [as handler] ($:/plugins/linonetwo/tw-mobile-sync/server-sync-v1-endpoint.js:9:1426) at IncomingMessage. ($:/core/modules/server/server.js:308:10) at IncomingMessage.emit (node:events:517:28) at endReadableNT (node:internal/streams/readable:1368:12) at processTicksAndRejections (node:internal/process/task_queues:82:21)` const patches = makePatches(a.text, b.text); const [mergedText] = applyPatches(patches, a.text); const fields: ITiddlerFields = {