|
@ -222,11 +222,18 @@ export const PlatformServiceMixin = { |
|
|
let value = row[index]; |
|
|
let value = row[index]; |
|
|
|
|
|
|
|
|
// Convert SQLite integer booleans to JavaScript booleans
|
|
|
// Convert SQLite integer booleans to JavaScript booleans
|
|
|
if (column === 'isRegistered' || column === 'finishedOnboarding' || |
|
|
if ( |
|
|
column === 'filterFeedByVisible' || column === 'filterFeedByNearby' || |
|
|
column === "isRegistered" || |
|
|
column === 'hideRegisterPromptOnNewContact' || column === 'showContactGivesInline' || |
|
|
column === "finishedOnboarding" || |
|
|
column === 'showGeneralAdvanced' || column === 'showShortcutBvc' || |
|
|
column === "filterFeedByVisible" || |
|
|
column === 'warnIfProdServer' || column === 'warnIfTestServer') { |
|
|
column === "filterFeedByNearby" || |
|
|
|
|
|
column === "hideRegisterPromptOnNewContact" || |
|
|
|
|
|
column === "showContactGivesInline" || |
|
|
|
|
|
column === "showGeneralAdvanced" || |
|
|
|
|
|
column === "showShortcutBvc" || |
|
|
|
|
|
column === "warnIfProdServer" || |
|
|
|
|
|
column === "warnIfTestServer" |
|
|
|
|
|
) { |
|
|
if (value === 1) { |
|
|
if (value === 1) { |
|
|
value = true; |
|
|
value = true; |
|
|
} else if (value === 0) { |
|
|
} else if (value === 0) { |
|
@ -1401,7 +1408,9 @@ export const PlatformServiceMixin = { |
|
|
); |
|
|
); |
|
|
|
|
|
|
|
|
if (!result?.values?.length) { |
|
|
if (!result?.values?.length) { |
|
|
logger.warn(`[PlatformServiceMixin] No settings found for DID: ${did}`); |
|
|
logger.warn( |
|
|
|
|
|
`[PlatformServiceMixin] No settings found for DID: ${did}`, |
|
|
|
|
|
); |
|
|
return null; |
|
|
return null; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
@ -1411,7 +1420,9 @@ export const PlatformServiceMixin = { |
|
|
); |
|
|
); |
|
|
|
|
|
|
|
|
if (!mappedResults.length) { |
|
|
if (!mappedResults.length) { |
|
|
logger.warn(`[PlatformServiceMixin] Failed to map settings for DID: ${did}`); |
|
|
logger.warn( |
|
|
|
|
|
`[PlatformServiceMixin] Failed to map settings for DID: ${did}`, |
|
|
|
|
|
); |
|
|
return null; |
|
|
return null; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
@ -1426,7 +1437,10 @@ export const PlatformServiceMixin = { |
|
|
|
|
|
|
|
|
return settings; |
|
|
return settings; |
|
|
} catch (error) { |
|
|
} catch (error) { |
|
|
logger.error(`[PlatformServiceMixin] Error debugging settings for DID ${did}:`, error); |
|
|
logger.error( |
|
|
|
|
|
`[PlatformServiceMixin] Error debugging settings for DID ${did}:`, |
|
|
|
|
|
error, |
|
|
|
|
|
); |
|
|
return null; |
|
|
return null; |
|
|
} |
|
|
} |
|
|
}, |
|
|
}, |
|
@ -1440,14 +1454,24 @@ export const PlatformServiceMixin = { |
|
|
async $debugMergedSettings(did: string): Promise<void> { |
|
|
async $debugMergedSettings(did: string): Promise<void> { |
|
|
try { |
|
|
try { |
|
|
// Get default settings
|
|
|
// Get default settings
|
|
|
const defaultSettings = await this.$getSettings(MASTER_SETTINGS_KEY, {}); |
|
|
const defaultSettings = await this.$getSettings( |
|
|
logger.info(`[PlatformServiceMixin] Default settings:`, defaultSettings); |
|
|
MASTER_SETTINGS_KEY, |
|
|
|
|
|
{}, |
|
|
|
|
|
); |
|
|
|
|
|
logger.info( |
|
|
|
|
|
`[PlatformServiceMixin] Default settings:`, |
|
|
|
|
|
defaultSettings, |
|
|
|
|
|
); |
|
|
|
|
|
|
|
|
// Get DID-specific settings
|
|
|
// Get DID-specific settings
|
|
|
const didSettings = await this.$debugDidSettings(did); |
|
|
const didSettings = await this.$debugDidSettings(did); |
|
|
|
|
|
|
|
|
// Get merged settings
|
|
|
// Get merged settings
|
|
|
const mergedSettings = await this.$getMergedSettings(MASTER_SETTINGS_KEY, did, defaultSettings || {}); |
|
|
const mergedSettings = await this.$getMergedSettings( |
|
|
|
|
|
MASTER_SETTINGS_KEY, |
|
|
|
|
|
did, |
|
|
|
|
|
defaultSettings || {}, |
|
|
|
|
|
); |
|
|
|
|
|
|
|
|
logger.info(`[PlatformServiceMixin] Merged settings for ${did}:`, { |
|
|
logger.info(`[PlatformServiceMixin] Merged settings for ${did}:`, { |
|
|
defaultSettings, |
|
|
defaultSettings, |
|
@ -1456,7 +1480,10 @@ export const PlatformServiceMixin = { |
|
|
isRegistered: mergedSettings.isRegistered, |
|
|
isRegistered: mergedSettings.isRegistered, |
|
|
}); |
|
|
}); |
|
|
} catch (error) { |
|
|
} catch (error) { |
|
|
logger.error(`[PlatformServiceMixin] Error debugging merged settings for DID ${did}:`, error); |
|
|
logger.error( |
|
|
|
|
|
`[PlatformServiceMixin] Error debugging merged settings for DID ${did}:`, |
|
|
|
|
|
error, |
|
|
|
|
|
); |
|
|
} |
|
|
} |
|
|
}, |
|
|
}, |
|
|
}, |
|
|
}, |
|
|