diff --git a/package.json b/package.json index caab13aa1..7f8a5e422 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "halo-discord-extension", - "version": "2.2.0", + "version": "2.2.1", "description": "Receive Discord notifications for updates in Halo", "author": "Elijah Olmos", "license": "AGPL-3.0-only", diff --git a/src/popup/Settings.svelte b/src/popup/Settings.svelte index 3139e286b..e59069e51 100644 --- a/src/popup/Settings.svelte +++ b/src/popup/Settings.svelte @@ -51,7 +51,7 @@ // settings default_settings = await getDefaultSettings(); //apply default settings to user_settings - user_settings = Object.values(default_settings).reduce( + user_settings = default_settings.reduce( (acc, { id, value }) => (!!acc.hasOwnProperty(id) ? acc : { ...acc, [id]: value }), await getUserSettings() ); diff --git a/src/util/auth.js b/src/util/auth.js index 56ce59a81..e3b4617f6 100644 --- a/src/util/auth.js +++ b/src/util/auth.js @@ -84,10 +84,10 @@ export const getDefaultSettings = async function () { try { console.log('getDefaultSettings'); const settings = await get(ref(db, 'default_settings')); - return settings.exists() ? settings.val() : {}; + return settings.exists() ? Object.values(settings.val()) : []; } catch (e) { console.error('getUserSettings error', e); - return {}; + return []; } };