diff --git a/src/components/FeedFilters.vue b/src/components/FeedFilters.vue index 6ca4c55f..79be2317 100644 --- a/src/components/FeedFilters.vue +++ b/src/components/FeedFilters.vue @@ -99,8 +99,11 @@ import { LTileLayer, } from "@vue-leaflet/vue-leaflet"; import { Router } from "vue-router"; + +import { USE_DEXIE_DB } from "@/constants/app"; import { MASTER_SETTINGS_KEY } from "../db/tables/settings"; import { db, retrieveSettingsForActiveAccount } from "../db/index"; +import { PlatformServiceFactory } from "@/services/PlatformServiceFactory"; @Component({ components: { @@ -144,9 +147,17 @@ export default class FeedFilters extends Vue { async toggleNearby() { this.settingChanged = true; this.isNearby = !this.isNearby; - await db.settings.update(MASTER_SETTINGS_KEY, { - filterFeedByNearby: this.isNearby, - }); + const platformService = PlatformServiceFactory.getInstance(); + await platformService.dbExec( + `UPDATE settings SET filterFeedByNearby = ? WHERE id = ?`, + [this.isNearby, MASTER_SETTINGS_KEY], + ); + + if (USE_DEXIE_DB) { + await db.settings.update(MASTER_SETTINGS_KEY, { + filterFeedByNearby: this.isNearby, + }); + } } async clearAll() { @@ -154,10 +165,18 @@ export default class FeedFilters extends Vue { this.settingChanged = true; } - await db.settings.update(MASTER_SETTINGS_KEY, { - filterFeedByNearby: false, - filterFeedByVisible: false, - }); + const platformService = PlatformServiceFactory.getInstance(); + await platformService.dbExec( + `UPDATE settings SET filterFeedByNearby = ? AND filterFeedByVisible = ? WHERE id = ?`, + [false, false, MASTER_SETTINGS_KEY], + ); + + if (USE_DEXIE_DB) { + await db.settings.update(MASTER_SETTINGS_KEY, { + filterFeedByNearby: false, + filterFeedByVisible: false, + }); + } this.hasVisibleDid = false; this.isNearby = false; @@ -168,10 +187,18 @@ export default class FeedFilters extends Vue { this.settingChanged = true; } - await db.settings.update(MASTER_SETTINGS_KEY, { - filterFeedByNearby: true, - filterFeedByVisible: true, - }); + const platformService = PlatformServiceFactory.getInstance(); + await platformService.dbExec( + `UPDATE settings SET filterFeedByNearby = ? AND filterFeedByVisible = ? WHERE id = ?`, + [true, true, MASTER_SETTINGS_KEY], + ); + + if (USE_DEXIE_DB) { + await db.settings.update(MASTER_SETTINGS_KEY, { + filterFeedByNearby: true, + filterFeedByVisible: true, + }); + } this.hasVisibleDid = true; this.isNearby = true; diff --git a/src/components/GiftedDialog.vue b/src/components/GiftedDialog.vue index 80951c81..28c93141 100644 --- a/src/components/GiftedDialog.vue +++ b/src/components/GiftedDialog.vue @@ -89,7 +89,7 @@