diff options
| author | Freya Murphy <freya@freyacat.org> | 2026-03-02 16:05:12 -0500 |
|---|---|---|
| committer | Freya Murphy <freya@freyacat.org> | 2026-03-02 18:39:22 -0500 |
| commit | 24734d408700a72d45c3ff4a679606cab3ec544f (patch) | |
| tree | d0fee0bcf508f3c631f7c26724bb5cd94dfc88a0 /packages/frontend/src/preferences | |
| parent | merge: Release/2025.4.5 (!1258) (diff) | |
| download | sharkey-24734d408700a72d45c3ff4a679606cab3ec544f.tar.gz sharkey-24734d408700a72d45c3ff4a679606cab3ec544f.tar.bz2 sharkey-24734d408700a72d45c3ff4a679606cab3ec544f.zip | |
split url into webUrl and localUrl (like mastodon)stable
Diffstat (limited to 'packages/frontend/src/preferences')
| -rw-r--r-- | packages/frontend/src/preferences/manager.ts | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/packages/frontend/src/preferences/manager.ts b/packages/frontend/src/preferences/manager.ts index 349040d98e..9e882ea9ed 100644 --- a/packages/frontend/src/preferences/manager.ts +++ b/packages/frontend/src/preferences/manager.ts @@ -5,7 +5,7 @@ import { computed, nextTick, onUnmounted, ref, watch } from 'vue'; import { v4 as uuid } from 'uuid'; -import { host, version } from '@@/js/config.js'; +import { localHost, version } from '@@/js/config.js'; import { PREF_DEF } from './def.js'; import type { Ref, WritableComputedRef } from 'vue'; import type { MenuItem } from '@/types/menu.js'; @@ -182,7 +182,7 @@ export class PreferencesManager { if (parseScope(record[0]).account == null && this.isAccountDependentKey(key)) { this.profile.preferences[key].push([makeScope({ - server: host, + server: localHost, account: $i!.id, }), v, {}]); this.save(); @@ -191,7 +191,7 @@ export class PreferencesManager { if (parseScope(record[0]).server == null && this.isServerDependentKey(key)) { this.profile.preferences[key].push([makeScope({ - server: host, + server: localHost, }), v, {}]); this.save(); return; @@ -339,10 +339,10 @@ export class PreferencesManager { if ($i == null) return records.find(([scope, v]) => parseScope(scope).account == null)!; - const accountOverrideRecord = records.find(([scope, v]) => parseScope(scope).server === host && parseScope(scope).account === $i!.id); + const accountOverrideRecord = records.find(([scope, v]) => parseScope(scope).server === localHost && parseScope(scope).account === $i!.id); if (accountOverrideRecord) return accountOverrideRecord; - const serverOverrideRecord = records.find(([scope, v]) => parseScope(scope).server === host && parseScope(scope).account == null); + const serverOverrideRecord = records.find(([scope, v]) => parseScope(scope).server === localHost && parseScope(scope).account == null); if (serverOverrideRecord) return serverOverrideRecord; const record = records.find(([scope, v]) => parseScope(scope).account == null); @@ -351,7 +351,7 @@ export class PreferencesManager { public isAccountOverrided<K extends keyof PREF>(key: K): boolean { if ($i == null) return false; - return this.profile.preferences[key].some(([scope, v]) => parseScope(scope).server === host && parseScope(scope).account === $i!.id) ?? false; + return this.profile.preferences[key].some(([scope, v]) => parseScope(scope).server === localHost && parseScope(scope).account === $i!.id) ?? false; } public setAccountOverride<K extends keyof PREF>(key: K) { @@ -361,7 +361,7 @@ export class PreferencesManager { const records = this.profile.preferences[key]; records.push([makeScope({ - server: host, + server: localHost, account: $i!.id, }), this.s[key], {}]); @@ -374,7 +374,7 @@ export class PreferencesManager { const records = this.profile.preferences[key]; - const index = records.findIndex(([scope, v]) => parseScope(scope).server === host && parseScope(scope).account === $i!.id); + const index = records.findIndex(([scope, v]) => parseScope(scope).server === localHost && parseScope(scope).account === $i!.id); if (index === -1) return; records.splice(index, 1); |