usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update manager.ts

This commit is contained in:
syuilo 2025-05-31 16:29:00 +09:00
parent 1a62cc2dbb
commit 9735c87a9c
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/frontend/src/preferences/manager.ts
View File

@ -450,9 +450,7 @@ export class PreferencesManager {
let newValue = record[1];
console.log({ key, scope: record[0] });
const existing = await this.storageProvider.cloudGet({ key, scope: record[0] });
console.log(record[1], existing?.value, deepEqual(record[1], existing?.value));
if (existing != null && !deepEqual(record[1], existing.value)) {
const resolvedValue = await resolveConflict(record[1], existing.value);
if (resolvedValue === undefined) return { enabled: false }; // canceled