misty.cafe/mistykey
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

enhance(frontend): suppress needless confirmation when turn on pref sync

Browse source
This commit is contained in:
syuilo 2025-03-12 21:05:39 +09:00
parent 3129fcf164
commit a06b9eefaa
2 changed files with 31 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
packages/frontend/src/preferences/manager.ts
View file

@ -13,6 +13,7 @@ import { $i } from '@/account.js';
import { copyToClipboard } from '@/utility/copy-to-clipboard.js';
import { i18n } from '@/i18n.js';
import * as os from '@/os.js';
import { deepEqual } from '@/utility/deep-equal.js';
// NOTE: 明示的な設定値のひとつとして null もあり得るため、設定が存在しないかどうかを判定する目的で null で比較したり ?? を使ってはいけない
@ -340,7 +341,7 @@ export class ProfileManager {
const record = this.getMatchedRecordOf(key);
const existing = await this.storageProvider.cloudGet({ key, cond: record[0] });
if (existing != null) {
if (existing != null && !deepEqual(existing.value, record[1])) {
const { canceled, result } = await os.select({
title: i18n.ts.preferenceSyncConflictTitle,
text: i18n.ts.preferenceSyncConflictText,