self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-11-23 22:36:32 +02:00
Code Issues Releases Activity

Cli,Desktop,Mobile: Resolves #9465: Log user actions (deletions) (#9585)

Browse Source
This commit is contained in:
Henry Heino
2024-03-09 02:33:05 -08:00
committed by GitHub
parent 3222b620b9
commit 75cb639ed2
36 changed files with 182 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
packages/lib/Synchronizer.ts
View File

@@ -12,7 +12,7 @@ import Resource from './models/Resource';
import ItemChange from './models/ItemChange';
import ResourceLocalState from './models/ResourceLocalState';
import MasterKey from './models/MasterKey';
import BaseModel, { ModelType } from './BaseModel';
import BaseModel, { DeleteOptions, ModelType } from './BaseModel';
import time from './time';
import ResourceService from './services/ResourceService';
import EncryptionService from './services/e2ee/EncryptionService';
@@ -404,7 +404,7 @@ export default class Synchronizer {
this.logSyncOperation('starting', null, null, `Starting synchronisation to target ${syncTargetId}... supportsAccurateTimestamp = ${this.api().supportsAccurateTimestamp}; supportsMultiPut = ${this.api().supportsMultiPut}} [${synchronizationId}]`);
const handleCannotSyncItem = async (ItemClass: any, syncTargetId: any, item: any, cannotSyncReason: string, itemLocation: any = null) => {
const handleCannotSyncItem = async (ItemClass: typeof BaseItem, syncTargetId: any, item: any, cannotSyncReason: string, itemLocation: any = null) => {
await ItemClass.saveSyncDisabled(syncTargetId, item, cannotSyncReason, itemLocation);
};
@@ -1005,7 +1005,14 @@ export default class Synchronizer {
}
const ItemClass = BaseItem.itemClass(local.type_);
await ItemClass.delete(local.id, { trackDeleted: false, changeSource: ItemChange.SOURCE_SYNC });
await ItemClass.delete(
local.id,
{
trackDeleted: false,
changeSource: ItemChange.SOURCE_SYNC,
sourceDescription: 'sync: deleteLocal',
},
);
}
}
@@ -1050,7 +1057,14 @@ export default class Synchronizer {
// CONFLICT
await Folder.markNotesAsConflict(item.id);
}
await Folder.delete(item.id, { deleteChildren: false, changeSource: ItemChange.SOURCE_SYNC, trackDeleted: false });
const deletionOptions: DeleteOptions = {
deleteChildren: false,
trackDeleted: false,
changeSource: ItemChange.SOURCE_SYNC,
sourceDescription: 'Sync',
};
await Folder.delete(item.id, deletionOptions);
}
}