From d77fa3bb089b59e4c079aa2d1fdd56296431c2a7 Mon Sep 17 00:00:00 2001 From: tamaina Date: Sun, 26 Dec 2021 02:17:36 +0900 Subject: [PATCH 001/758] wip --- packages/client/src/pizzax.ts | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/packages/client/src/pizzax.ts b/packages/client/src/pizzax.ts index 396abc241..6a876c079 100644 --- a/packages/client/src/pizzax.ts +++ b/packages/client/src/pizzax.ts @@ -1,6 +1,6 @@ import { onUnmounted, Ref, ref, watch } from 'vue'; import { $i } from './account'; -import { api } from './os'; +import { api, stream } from './os'; type StateDef = Record { public readonly state: { [K in keyof T]: T[K]['default'] }; public readonly reactiveState: { [K in keyof T]: Ref }; + private connection = stream.useChannel('main'); + constructor(key: string, def: T) { this.key = key; this.keyForLocalStorage = 'pizzax::' + key; @@ -70,7 +72,14 @@ export class Storage { }); }, 1); - // TODO: streamingのuser storage updateイベントを監視して更新 + // streamingのuser storage updateイベントを監視して更新 + this.connection.on('registryUpdated', ({ scope, key, value }) => { + this.state[key] = value; + this.reactiveState[key].value = value; + const cache = JSON.parse(localStorage.getItem(this.keyForLocalStorage + '::cache::' + $i.id) || '{}'); + cache[key] = value; + localStorage.setItem(this.keyForLocalStorage + '::cache::' + $i.id, JSON.stringify(cache)); + }); } } From 2012f4a198f2071d0212af3b2feebecda24d2f37 Mon Sep 17 00:00:00 2001 From: tamaina Date: Sun, 26 Dec 2021 02:24:45 +0900 Subject: [PATCH 002/758] wip? --- packages/client/src/pizzax.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/client/src/pizzax.ts b/packages/client/src/pizzax.ts index 6a876c079..8672276fe 100644 --- a/packages/client/src/pizzax.ts +++ b/packages/client/src/pizzax.ts @@ -74,8 +74,9 @@ export class Storage { // streamingのuser storage updateイベントを監視して更新 this.connection.on('registryUpdated', ({ scope, key, value }) => { - this.state[key] = value; + this.state[key] = value as typeof this.state[key]['default']; this.reactiveState[key].value = value; + const cache = JSON.parse(localStorage.getItem(this.keyForLocalStorage + '::cache::' + $i.id) || '{}'); cache[key] = value; localStorage.setItem(this.keyForLocalStorage + '::cache::' + $i.id, JSON.stringify(cache)); From f9f64a5e4cadd012e3a6809122a962387029181c Mon Sep 17 00:00:00 2001 From: tamaina Date: Wed, 29 Dec 2021 00:03:44 +0900 Subject: [PATCH 003/758] ? --- packages/client/src/pizzax.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/client/src/pizzax.ts b/packages/client/src/pizzax.ts index 8672276fe..f405ed855 100644 --- a/packages/client/src/pizzax.ts +++ b/packages/client/src/pizzax.ts @@ -73,8 +73,10 @@ export class Storage { }, 1); // streamingのuser storage updateイベントを監視して更新 - this.connection.on('registryUpdated', ({ scope, key, value }) => { - this.state[key] = value as typeof this.state[key]['default']; + this.connection.on('registryUpdated', ({ scope, key, value }: { scope: string[], key: keyof T, value: T[typeof key]['default'] }) => { + if (scope[1] !== this.key) return; + + this.state[key] = value; this.reactiveState[key].value = value; const cache = JSON.parse(localStorage.getItem(this.keyForLocalStorage + '::cache::' + $i.id) || '{}'); From 40abe3d907c85fa3688f8197246973a021f7d711 Mon Sep 17 00:00:00 2001 From: tamaina Date: Wed, 29 Dec 2021 16:05:25 +0900 Subject: [PATCH 004/758] =?UTF-8?q?streaming=E3=81=AEuser=20storage=20upda?= =?UTF-8?q?te=E3=82=A4=E3=83=99=E3=83=B3=E3=83=88=E3=82=92=E7=9B=A3?= =?UTF-8?q?=E8=A6=96=E3=81=97=E3=81=A6=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/client/src/pizzax.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/client/src/pizzax.ts b/packages/client/src/pizzax.ts index f405ed855..63abe40b0 100644 --- a/packages/client/src/pizzax.ts +++ b/packages/client/src/pizzax.ts @@ -74,7 +74,7 @@ export class Storage { // streamingのuser storage updateイベントを監視して更新 this.connection.on('registryUpdated', ({ scope, key, value }: { scope: string[], key: keyof T, value: T[typeof key]['default'] }) => { - if (scope[1] !== this.key) return; + if (scope[1] !== this.key || this.state[key] === value) return; this.state[key] = value; this.reactiveState[key].value = value; From 54bf2808744a552fca45bdd6a08c351147f3cff2 Mon Sep 17 00:00:00 2001 From: tamaina Date: Wed, 29 Dec 2021 16:13:42 +0900 Subject: [PATCH 005/758] =?UTF-8?q?=E5=BF=85=E8=A6=81=E3=81=AA=E6=99=82?= =?UTF-8?q?=E4=BB=A5=E5=A4=96=E3=81=AF=E3=82=B9=E3=83=88=E3=83=AC=E3=83=BC?= =?UTF-8?q?=E3=82=B8=E3=82=92=E6=9B=B4=E6=96=B0=E3=81=97=E3=81=AA=E3=81=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/client/src/pizzax.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/client/src/pizzax.ts b/packages/client/src/pizzax.ts index 63abe40b0..7bfa6a2ab 100644 --- a/packages/client/src/pizzax.ts +++ b/packages/client/src/pizzax.ts @@ -80,8 +80,10 @@ export class Storage { this.reactiveState[key].value = value; const cache = JSON.parse(localStorage.getItem(this.keyForLocalStorage + '::cache::' + $i.id) || '{}'); - cache[key] = value; - localStorage.setItem(this.keyForLocalStorage + '::cache::' + $i.id, JSON.stringify(cache)); + if (cache[key] !== value) { + cache[key] = value; + localStorage.setItem(this.keyForLocalStorage + '::cache::' + $i.id, JSON.stringify(cache)); + } }); } } From 6836c8e98e46dbf3129b4e8fb3a799070454f356 Mon Sep 17 00:00:00 2001 From: tamaina Date: Wed, 29 Dec 2021 16:42:28 +0900 Subject: [PATCH 006/758] fix? --- packages/client/src/pizzax.ts | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/packages/client/src/pizzax.ts b/packages/client/src/pizzax.ts index 7bfa6a2ab..8a742e85f 100644 --- a/packages/client/src/pizzax.ts +++ b/packages/client/src/pizzax.ts @@ -70,21 +70,21 @@ export class Storage { } localStorage.setItem(this.keyForLocalStorage + '::cache::' + $i.id, JSON.stringify(cache)); }); + + // streamingのuser storage updateイベントを監視して更新 + this.connection.on('registryUpdated', ({ scope, key, value }: { scope: string[], key: keyof T, value: T[typeof key]['default'] }) => { + if (scope[1] !== this.key || this.state[key] === value) return; + + this.state[key] = value; + this.reactiveState[key].value = value; + + const cache = JSON.parse(localStorage.getItem(this.keyForLocalStorage + '::cache::' + $i.id) || '{}'); + if (cache[key] !== value) { + cache[key] = value; + localStorage.setItem(this.keyForLocalStorage + '::cache::' + $i.id, JSON.stringify(cache)); + } + }); }, 1); - - // streamingのuser storage updateイベントを監視して更新 - this.connection.on('registryUpdated', ({ scope, key, value }: { scope: string[], key: keyof T, value: T[typeof key]['default'] }) => { - if (scope[1] !== this.key || this.state[key] === value) return; - - this.state[key] = value; - this.reactiveState[key].value = value; - - const cache = JSON.parse(localStorage.getItem(this.keyForLocalStorage + '::cache::' + $i.id) || '{}'); - if (cache[key] !== value) { - cache[key] = value; - localStorage.setItem(this.keyForLocalStorage + '::cache::' + $i.id, JSON.stringify(cache)); - } - }); } } From 39b377c06fd15b8402bb2015b347694ac01cda2f Mon Sep 17 00:00:00 2001 From: tamaina Date: Wed, 29 Dec 2021 17:40:39 +0900 Subject: [PATCH 007/758] wip --- packages/client/src/components/drive.vue | 3 +- .../client/src/components/follow-button.vue | 3 +- .../client/src/components/note-detailed.vue | 3 +- packages/client/src/components/note.vue | 3 +- .../client/src/components/notification.vue | 5 ++-- .../client/src/components/notifications.vue | 5 ++-- packages/client/src/components/post-form.vue | 4 +-- .../client/src/components/taskmanager.vue | 9 +++--- packages/client/src/components/timeline.vue | 21 ++++++------- packages/client/src/os.ts | 2 -- packages/client/src/pages/admin/metrics.vue | 5 ++-- packages/client/src/pages/admin/overview.vue | 3 +- packages/client/src/pages/admin/queue.vue | 3 +- packages/client/src/pages/messaging/index.vue | 3 +- .../pages/messaging/messaging-room.form.vue | 3 +- .../src/pages/messaging/messaging-room.vue | 3 +- packages/client/src/pages/reversi/game.vue | 3 +- packages/client/src/pages/reversi/index.vue | 3 +- packages/client/src/pizzax.ts | 30 +++++++++---------- packages/client/src/scripts/select-file.ts | 3 +- packages/client/src/stream.ts | 6 ++++ .../src/ui/_common_/stream-indicator.vue | 7 +++-- packages/client/src/ui/chat/note.vue | 3 +- packages/client/src/ui/chat/pages/channel.vue | 3 +- .../client/src/ui/chat/pages/timeline.vue | 11 +++---- packages/client/src/ui/chat/post-form.vue | 3 +- packages/client/src/widgets/job-queue.vue | 3 +- packages/client/src/widgets/photos.vue | 3 +- .../src/widgets/server-metric/index.vue | 3 +- 29 files changed, 94 insertions(+), 65 deletions(-) create mode 100644 packages/client/src/stream.ts diff --git a/packages/client/src/components/drive.vue b/packages/client/src/components/drive.vue index 46bcd4255..f8d3d810b 100644 --- a/packages/client/src/components/drive.vue +++ b/packages/client/src/components/drive.vue @@ -53,6 +53,7 @@ import XFolder from './drive.folder.vue'; import XFile from './drive.file.vue'; import MkButton from './ui/button.vue'; import * as os from '@/os'; +import { stream } from '@/stream'; export default defineComponent({ components: { @@ -140,7 +141,7 @@ export default defineComponent({ }); } - this.connection = markRaw(os.stream.useChannel('drive')); + this.connection = markRaw(stream.useChannel('drive')); this.connection.on('fileCreated', this.onStreamDriveFileCreated); this.connection.on('fileUpdated', this.onStreamDriveFileUpdated); diff --git a/packages/client/src/components/follow-button.vue b/packages/client/src/components/follow-button.vue index 713626191..b16b22f26 100644 --- a/packages/client/src/components/follow-button.vue +++ b/packages/client/src/components/follow-button.vue @@ -30,6 +30,7 @@ diff --git a/packages/client/src/pages/settings/index.vue b/packages/client/src/pages/settings/index.vue index 3786cf60f..68be79500 100644 --- a/packages/client/src/pages/settings/index.vue +++ b/packages/client/src/pages/settings/index.vue @@ -9,15 +9,15 @@
{{ childInfo.title }}
-
+
{{ $ts.emailNotConfiguredWarning }} {{ $ts.configure }} - +
-
+
- +
@@ -36,6 +36,7 @@ import { unisonReload } from '@/scripts/unison-reload'; import * as symbols from '@/symbols'; import { instance } from '@/instance'; import { $i } from '@/account'; +import { MisskeyNavigator } from '@/scripts/navigate'; const props = defineProps<{ initialPage?: string @@ -48,11 +49,11 @@ const indexInfo = { hideHeader: true, }; const INFO = ref(indexInfo); -const page = ref(props.initialPage); -const view = ref(null); const el = ref(null); const childInfo = ref(null); +const nav = new MisskeyNavigator(); + const narrow = ref(false); const NARROW_THRESHOLD = 600; @@ -67,42 +68,42 @@ const menuDef = computed(() => [{ icon: 'fas fa-user', text: i18n.ts.profile, to: '/settings/profile', - active: page.value === 'profile', + active: props.initialPage === 'profile', }, { icon: 'fas fa-lock-open', text: i18n.ts.privacy, to: '/settings/privacy', - active: page.value === 'privacy', + active: props.initialPage === 'privacy', }, { icon: 'fas fa-laugh', text: i18n.ts.reaction, to: '/settings/reaction', - active: page.value === 'reaction', + active: props.initialPage === 'reaction', }, { icon: 'fas fa-cloud', text: i18n.ts.drive, to: '/settings/drive', - active: page.value === 'drive', + active: props.initialPage === 'drive', }, { icon: 'fas fa-bell', text: i18n.ts.notifications, to: '/settings/notifications', - active: page.value === 'notifications', + active: props.initialPage === 'notifications', }, { icon: 'fas fa-envelope', text: i18n.ts.email, to: '/settings/email', - active: page.value === 'email', + active: props.initialPage === 'email', }, { icon: 'fas fa-share-alt', text: i18n.ts.integration, to: '/settings/integration', - active: page.value === 'integration', + active: props.initialPage === 'integration', }, { icon: 'fas fa-lock', text: i18n.ts.security, to: '/settings/security', - active: page.value === 'security', + active: props.initialPage === 'security', }], }, { title: i18n.ts.clientSettings, @@ -110,27 +111,27 @@ const menuDef = computed(() => [{ icon: 'fas fa-cogs', text: i18n.ts.general, to: '/settings/general', - active: page.value === 'general', + active: props.initialPage === 'general', }, { icon: 'fas fa-palette', text: i18n.ts.theme, to: '/settings/theme', - active: page.value === 'theme', + active: props.initialPage === 'theme', }, { icon: 'fas fa-list-ul', text: i18n.ts.menu, to: '/settings/menu', - active: page.value === 'menu', + active: props.initialPage === 'menu', }, { icon: 'fas fa-music', text: i18n.ts.sounds, to: '/settings/sounds', - active: page.value === 'sounds', + active: props.initialPage === 'sounds', }, { icon: 'fas fa-plug', text: i18n.ts.plugins, to: '/settings/plugin', - active: page.value === 'plugin', + active: props.initialPage === 'plugin', }], }, { title: i18n.ts.otherSettings, @@ -138,37 +139,37 @@ const menuDef = computed(() => [{ icon: 'fas fa-boxes', text: i18n.ts.importAndExport, to: '/settings/import-export', - active: page.value === 'import-export', + active: props.initialPage === 'import-export', }, { icon: 'fas fa-volume-mute', text: i18n.ts.instanceMute, to: '/settings/instance-mute', - active: page.value === 'instance-mute', + active: props.initialPage === 'instance-mute', }, { icon: 'fas fa-ban', text: i18n.ts.muteAndBlock, to: '/settings/mute-block', - active: page.value === 'mute-block', + active: props.initialPage === 'mute-block', }, { icon: 'fas fa-comment-slash', text: i18n.ts.wordMute, to: '/settings/word-mute', - active: page.value === 'word-mute', + active: props.initialPage === 'word-mute', }, { icon: 'fas fa-key', text: 'API', to: '/settings/api', - active: page.value === 'api', + active: props.initialPage === 'api', }, { icon: 'fas fa-bolt', text: 'Webhook', to: '/settings/webhook', - active: page.value === 'webhook', + active: props.initialPage === 'webhook', }, { icon: 'fas fa-ellipsis-h', text: i18n.ts.other, to: '/settings/other', - active: page.value === 'other', + active: props.initialPage === 'other', }], }, { items: [{ @@ -193,8 +194,8 @@ const menuDef = computed(() => [{ const pageProps = ref({}); const component = computed(() => { - if (page.value == null) return null; - switch (page.value) { + if (props.initialPage == null) return null; + switch (props.initialPage) { case 'accounts': return defineAsyncComponent(() => import('./accounts.vue')); case 'profile': return defineAsyncComponent(() => import('./profile.vue')); case 'privacy': return defineAsyncComponent(() => import('./privacy.vue')); @@ -241,21 +242,26 @@ watch(component, () => { watch(() => props.initialPage, () => { if (props.initialPage == null && !narrow.value) { - page.value = 'profile'; + nav.push('/settings/profile'); } else { - page.value = props.initialPage; if (props.initialPage == null) { INFO.value = indexInfo; } } }); +watch(narrow, () => { + if (!narrow.value && props.initialPage == null) { + nav.push('/settings/profile'); + } +}); + onMounted(() => { ro.observe(el.value); narrow.value = el.value.offsetWidth < NARROW_THRESHOLD; - if (!narrow.value) { - page.value = props.initialPage || 'profile'; + if (!narrow.value && props.initialPage == null) { + nav.push('/settings/profile'); } }); diff --git a/packages/client/src/scripts/navigate.ts b/packages/client/src/scripts/navigate.ts new file mode 100644 index 000000000..5e0fd6073 --- /dev/null +++ b/packages/client/src/scripts/navigate.ts @@ -0,0 +1,34 @@ +import { inject } from 'vue'; +import { router } from '@/router'; +import { defaultStore } from '@/store'; + +export type Navigate = (path: string, record?: boolean) => void; + +export class MisskeyNavigator { + public readonly navHook: Navigate | null = null; + public readonly sideViewHook: Navigate | null = null; + + // It should be constructed during vue creating in order for inject function to work + constructor() { + this.navHook = inject('navHook', null); + this.sideViewHook = inject('sideViewHook', null); + } + + // Use this method instead of router.push() + public push(path: string, record = true) { + if (this.navHook) { + this.navHook(path, record); + } else { + if (defaultStore.state.defaultSideView && this.sideViewHook && path !== '/') { + return this.sideViewHook(path, record); + } + + if (router.currentRoute.value.path === path) { + window.scroll({ top: 0, behavior: 'smooth' }); + } else { + if (record) router.push(path); + else router.replace(path); + } + } + } +} From fed59b1b71573cdb275a5e7b38bd1b302cc2bdde Mon Sep 17 00:00:00 2001 From: tamaina Date: Sun, 17 Apr 2022 01:24:13 +0900 Subject: [PATCH 032/758] clean up --- packages/client/src/pages/settings/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/client/src/pages/settings/index.vue b/packages/client/src/pages/settings/index.vue index 68be79500..1838cb73e 100644 --- a/packages/client/src/pages/settings/index.vue +++ b/packages/client/src/pages/settings/index.vue @@ -251,7 +251,7 @@ watch(() => props.initialPage, () => { }); watch(narrow, () => { - if (!narrow.value && props.initialPage == null) { + if (props.initialPage == null && !narrow.value) { nav.push('/settings/profile'); } }); @@ -260,7 +260,7 @@ onMounted(() => { ro.observe(el.value); narrow.value = el.value.offsetWidth < NARROW_THRESHOLD; - if (!narrow.value && props.initialPage == null) { + if (props.initialPage == null && !narrow.value) { nav.push('/settings/profile'); } }); From 55c6f5a740094631369d44f802c473c983231001 Mon Sep 17 00:00:00 2001 From: tamaina Date: Sun, 17 Apr 2022 01:25:45 +0900 Subject: [PATCH 033/758] clean up --- packages/client/src/scripts/navigate.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/client/src/scripts/navigate.ts b/packages/client/src/scripts/navigate.ts index 5e0fd6073..08b891ec5 100644 --- a/packages/client/src/scripts/navigate.ts +++ b/packages/client/src/scripts/navigate.ts @@ -10,8 +10,8 @@ export class MisskeyNavigator { // It should be constructed during vue creating in order for inject function to work constructor() { - this.navHook = inject('navHook', null); - this.sideViewHook = inject('sideViewHook', null); + this.navHook = inject('navHook', null); + this.sideViewHook = inject('sideViewHook', null); } // Use this method instead of router.push() From 39e4f2c137fbdf9be30e986bceac7230841576ab Mon Sep 17 00:00:00 2001 From: tamaina Date: Sun, 17 Apr 2022 05:12:33 +0900 Subject: [PATCH 034/758] feature: Client Preferences Registry on the account --- locales/ja-JP.yml | 21 ++ packages/client/src/pages/settings/index.vue | 6 + .../pages/settings/preferences-registry.vue | 278 ++++++++++++++++++ packages/client/src/store.ts | 10 + 4 files changed, 315 insertions(+) create mode 100644 packages/client/src/pages/settings/preferences-registry.vue diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 6326094dd..5754ed2bf 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -559,6 +559,8 @@ author: "作者" leaveConfirm: "未保存の変更があります。破棄しますか？" manage: "管理" plugins: "プラグイン" +preferencesRegistry: "クライアント設定のレジストリ" +preferencesRegistryShort: "レジストリ" deck: "デッキ" undeck: "デッキ解除" useBlurEffectForModal: "モーダルにぼかし効果を使用" @@ -894,6 +896,25 @@ _plugin: installWarn: "信頼できないプラグインはインストールしないでください。" manage: "プラグインの管理" +_preferencesRegistry: + list: "一覧" + saveNew: "新規保存" + apply: "適用" + delete: "削除" + save: "上書き保存" + rename: "名称変更" + saveNewDescription: "現在のデバイスの状態をサーバーに保存します。" + inputName: "レジストリ名を入力" + cannotSave: "保存できません" + nameAlreadyExists: "レジストリ名「{name}」は既に存在します。違うレジストリ名を指定してください。" + applyConfirm: "プロファイル「{name}」を現在のデバイスに適用しますか？現在のデバイス設定は失われます。" + saveConfirm: "{name}に上書き保存しますか？" + deleteConfirm: "{name}を削除しますか？" + renameConfirm: "「{old}」を「{new}」に変更しますか？" + noRegistries: "レジストリは登録されていません。「新規保存」で現在のクライアント設定をサーバーに保存できます。" + createdAt: "作成日時: {date} {time}" + updatedAt: "更新日時: {date} {time}" + _registry: scope: "スコープ" key: "キー" diff --git a/packages/client/src/pages/settings/index.vue b/packages/client/src/pages/settings/index.vue index 1838cb73e..752054e9b 100644 --- a/packages/client/src/pages/settings/index.vue +++ b/packages/client/src/pages/settings/index.vue @@ -132,6 +132,11 @@ const menuDef = computed(() => [{ text: i18n.ts.plugins, to: '/settings/plugin', active: props.initialPage === 'plugin', + }, { + icon: 'fas fa-floppy-disk', + text: i18n.ts.preferencesRegistryShort, + to: '/settings/preferences-registry', + active: props.initialPage === 'preferences-registry', }], }, { title: i18n.ts.otherSettings, @@ -225,6 +230,7 @@ const component = computed(() => { case 'deck': return defineAsyncComponent(() => import('./deck.vue')); case 'plugin': return defineAsyncComponent(() => import('./plugin.vue')); case 'plugin/install': return defineAsyncComponent(() => import('./plugin.install.vue')); + case 'preferences-registry': return defineAsyncComponent(() => import('./preferences-registry.vue')); case 'import-export': return defineAsyncComponent(() => import('./import-export.vue')); case 'account-info': return defineAsyncComponent(() => import('./account-info.vue')); case 'delete-account': return defineAsyncComponent(() => import('./delete-account.vue')); diff --git a/packages/client/src/pages/settings/preferences-registry.vue b/packages/client/src/pages/settings/preferences-registry.vue new file mode 100644 index 000000000..d66815004 --- /dev/null +++ b/packages/client/src/pages/settings/preferences-registry.vue @@ -0,0 +1,278 @@ + + + + + diff --git a/packages/client/src/store.ts b/packages/client/src/store.ts index b9800ec60..296eaa206 100644 --- a/packages/client/src/store.ts +++ b/packages/client/src/store.ts @@ -286,6 +286,16 @@ export class ColdDeviceStorage { } } + public static getAll(): Partial { + return (Object.keys(this.default) as (keyof typeof this.default)[]).reduce((acc, key) => { + const value = localStorage.getItem(PREFIX + key); + if (value != null) { + acc[key] = JSON.parse(value); + } + return acc; + }, {} as any); + } + public static set(key: T, value: typeof ColdDeviceStorage.default[T]): void { localStorage.setItem(PREFIX + key, JSON.stringify(value)); From 03dac51e955129711f1c2328979e5949ebd9642f Mon Sep 17 00:00:00 2001 From: tamaina Date: Sun, 17 Apr 2022 05:16:41 +0900 Subject: [PATCH 035/758] add changelog --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 211710134..8b4216d0a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,14 @@ You should also include the user name that made the change. --> +## 12.x.x (unreleased) + +### Improvements +- Client: Preferences Registry + +### Bugfixes +- + ## 12.110.0 (2022/04/11) ### Improvements From 0f9bc926f58446d0f778c26e47ac91165dfa37a1 Mon Sep 17 00:00:00 2001 From: tamaina Date: Sun, 17 Apr 2022 05:25:15 +0900 Subject: [PATCH 036/758] =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=83=87=E3=83=83?= =?UTF-8?q?=E3=82=AF=E3=82=B9=E3=81=AB=E6=88=BB=E3=81=A3=E3=81=A6=E3=82=82?= =?UTF-8?q?=E3=82=BF=E3=82=A4=E3=83=88=E3=83=AB=E3=81=8C=E6=AE=8B=E3=81=A3?= =?UTF-8?q?=E3=81=A6=E3=81=97=E3=81=BE=E3=81=86=E3=81=AE=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/client/src/pages/settings/index.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/client/src/pages/settings/index.vue b/packages/client/src/pages/settings/index.vue index 1838cb73e..e6670ea93 100644 --- a/packages/client/src/pages/settings/index.vue +++ b/packages/client/src/pages/settings/index.vue @@ -272,8 +272,11 @@ onUnmounted(() => { const emailNotConfigured = computed(() => instance.enableEmail && ($i.email == null || !$i.emailVerified)); const pageChanged = (page) => { - if (page == null) return; - childInfo.value = page[symbols.PAGE_INFO]; + if (page == null) { + childInfo.value = null; + } else { + childInfo.value = page[symbols.PAGE_INFO]; + } }; defineExpose({ From 3f14887d2065b5cdfaaee63206aa0530d0029430 Mon Sep 17 00:00:00 2001 From: tamaina Date: Sun, 17 Apr 2022 05:29:02 +0900 Subject: [PATCH 037/758] fix createdAt -> updatedAt --- packages/client/src/pages/settings/preferences-registry.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/client/src/pages/settings/preferences-registry.vue b/packages/client/src/pages/settings/preferences-registry.vue index d66815004..fbf38520b 100644 --- a/packages/client/src/pages/settings/preferences-registry.vue +++ b/packages/client/src/pages/settings/preferences-registry.vue @@ -15,7 +15,7 @@ >
{{ registry.name }}
{{ t('_preferencesRegistry.createdAt', { date: (new Date(registry.createdAt)).toLocaleDateString(), time: (new Date(registry.createdAt)).toLocaleTimeString() }) }}
-
{{ t('_preferencesRegistry.updatedAt', { date: (new Date(registry.createdAt)).toLocaleDateString(), time: (new Date(registry.createdAt)).toLocaleTimeString() }) }}
+
{{ t('_preferencesRegistry.updatedAt', { date: (new Date(registry.updatedAt)).toLocaleDateString(), time: (new Date(registry.updatedAt)).toLocaleTimeString() }) }}
{{ ts._preferencesRegistry.noRegistries }} From 0da0980f94692249f32031b866f2e6b999aafc14 Mon Sep 17 00:00:00 2001 From: tamaina Date: Sun, 17 Apr 2022 05:32:44 +0900 Subject: [PATCH 038/758] remove console.log --- packages/client/src/pages/settings/preferences-registry.vue | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/client/src/pages/settings/preferences-registry.vue b/packages/client/src/pages/settings/preferences-registry.vue index fbf38520b..26ddd1fd1 100644 --- a/packages/client/src/pages/settings/preferences-registry.vue +++ b/packages/client/src/pages/settings/preferences-registry.vue @@ -65,7 +65,6 @@ let registries = $ref(null); os.api('i/registry/get-all', { scope }) .then(res => { registries = res || {}; - console.log(registries); }); function getDefaultStoreValues() { @@ -120,7 +119,6 @@ async function applyRegistry(id: string) { // defaultStore for (const [key, value] of Object.entries(registry.defaultStore)) { if (key in defaultStore.def && defaultStore.def[key].where !== 'account') { - console.log(key); defaultStore.set(key as keyof Registry['defaultStore'], value); } } From 532a2f049f2c4bafd2bab14bdf9f9bf1cdface48 Mon Sep 17 00:00:00 2001 From: tamaina Date: Sun, 17 Apr 2022 05:37:52 +0900 Subject: [PATCH 039/758] =?UTF-8?q?=E9=81=A9=E7=94=A8=E2=86=92=E3=81=93?= =?UTF-8?q?=E3=81=AE=E3=83=87=E3=83=90=E3=82=A4=E3=82=B9=E3=81=AB=E9=81=A9?= =?UTF-8?q?=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- locales/ja-JP.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 5754ed2bf..18d8b3d9e 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -899,7 +899,7 @@ _plugin: _preferencesRegistry: list: "一覧" saveNew: "新規保存" - apply: "適用" + apply: "このデバイスに適用" delete: "削除" save: "上書き保存" rename: "名称変更" From 3d4c09510b875ac995661c3371fd110314a578b2 Mon Sep 17 00:00:00 2001 From: tamaina Date: Sun, 17 Apr 2022 06:31:35 +0900 Subject: [PATCH 040/758] add wallpaper --- .../src/pages/settings/preferences-registry.vue | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/packages/client/src/pages/settings/preferences-registry.vue b/packages/client/src/pages/settings/preferences-registry.vue index 26ddd1fd1..8b5b1c00a 100644 --- a/packages/client/src/pages/settings/preferences-registry.vue +++ b/packages/client/src/pages/settings/preferences-registry.vue @@ -54,6 +54,7 @@ type Registry = { coldDeviceStorage: Partial; fontSize: string | null; useSystemFont: 't' | null; + wallpaper: string | null; }; type Registries = { @@ -99,6 +100,7 @@ async function saveNew() { coldDeviceStorage: ColdDeviceStorage.getAll(), fontSize: localStorage.getItem('fontSize'), useSystemFont: localStorage.getItem('useSystemFont') as 't' | null, + wallpaper: localStorage.getItem('wallpaper'), }; await os.api('i/registry/set', { scope, key: id, value: registry }); registries[id] = registry; @@ -142,6 +144,13 @@ async function applyRegistry(id: string) { localStorage.removeItem('useSystemFont'); } + // wallpaper + if (registry.wallpaper != null) { + localStorage.setItem('wallpaper', registry.wallpaper); + } else { + localStorage.removeItem('wallpaper'); + } + const { canceled: cancel2 } = await os.confirm({ type: 'info', text: ts.reloadToApplySetting, @@ -183,6 +192,9 @@ async function save(id: string) { updatedAt: (new Date()).toISOString(), defaultStore: getDefaultStoreValues(), coldDeviceStorage: ColdDeviceStorage.getAll(), + fontSize: localStorage.getItem('fontSize'), + useSystemFont: localStorage.getItem('useSystemFont') as 't' | null, + wallpaper: localStorage.getItem('wallpaper'), }; await os.api('i/registry/set', { scope, key: id, value: registry }); registries[id] = registry; From 426885bff5dac12298224985bfd833bec79a8b0f Mon Sep 17 00:00:00 2001 From: tamaina Date: Sun, 17 Apr 2022 21:10:50 +0900 Subject: [PATCH 041/758] =?UTF-8?q?=E3=83=AD=E3=83=BC=E3=82=AB=E3=83=AB?= =?UTF-8?q?=E3=81=AEjson=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E3=82=92?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E3=83=BB=E8=AA=AD=E3=81=BF=E8=BE=BC=E3=81=BF?= =?UTF-8?q?=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- locales/ja-JP.yml | 4 + .../pages/settings/preferences-registry.vue | 98 ++++++++++++++++++- 2 files changed, 99 insertions(+), 3 deletions(-) diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 18d8b3d9e..a52c67d34 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -899,10 +899,12 @@ _plugin: _preferencesRegistry: list: "一覧" saveNew: "新規保存" + loadFile: "ファイルを読み込み" apply: "このデバイスに適用" delete: "削除" save: "上書き保存" rename: "名称変更" + download: "ダウンロード" saveNewDescription: "現在のデバイスの状態をサーバーに保存します。" inputName: "レジストリ名を入力" cannotSave: "保存できません" @@ -914,6 +916,8 @@ _preferencesRegistry: noRegistries: "レジストリは登録されていません。「新規保存」で現在のクライアント設定をサーバーに保存できます。" createdAt: "作成日時: {date} {time}" updatedAt: "更新日時: {date} {time}" + cannotLoad: "読み込みできません" + invalidFile: "ファイル形式が違います。" _registry: scope: "スコープ" diff --git a/packages/client/src/pages/settings/preferences-registry.vue b/packages/client/src/pages/settings/preferences-registry.vue index 8b5b1c00a..c01e4ee83 100644 --- a/packages/client/src/pages/settings/preferences-registry.vue +++ b/packages/client/src/pages/settings/preferences-registry.vue @@ -1,6 +1,9 @@ diff --git a/packages/client/src/pages/settings/webhook.vue b/packages/client/src/pages/settings/webhook.vue index 1a7e73940..d3ad475cd 100644 --- a/packages/client/src/pages/settings/webhook.vue +++ b/packages/client/src/pages/settings/webhook.vue @@ -13,7 +13,7 @@ {{ webhook.name || webhook.url }} diff --git a/packages/client/src/pages/share.vue b/packages/client/src/pages/share.vue index 69d22ed63..a7e797eea 100644 --- a/packages/client/src/pages/share.vue +++ b/packages/client/src/pages/share.vue @@ -158,7 +158,7 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.share, - icon: 'fas fa-share-alt', + icon: 'ti ti-share', }); diff --git a/packages/client/src/pages/tag.vue b/packages/client/src/pages/tag.vue index 5498c2999..72775ed5c 100644 --- a/packages/client/src/pages/tag.vue +++ b/packages/client/src/pages/tag.vue @@ -30,6 +30,6 @@ const headerTabs = $computed(() => []); definePageMetadata(computed(() => ({ title: props.tag, - icon: 'fas fa-hashtag', + icon: 'ti ti-hash', }))); diff --git a/packages/client/src/pages/theme-editor.vue b/packages/client/src/pages/theme-editor.vue index 7dfeee16e..f0435427e 100644 --- a/packages/client/src/pages/theme-editor.vue +++ b/packages/client/src/pages/theme-editor.vue @@ -215,7 +215,7 @@ const headerActions = $computed(() => [{ handler: showPreview, }, { asFullButton: true, - icon: 'fas fa-check', + icon: 'ti ti-check', text: i18n.ts.saveAs, handler: saveAs, }]); diff --git a/packages/client/src/pages/timeline.tutorial.vue b/packages/client/src/pages/timeline.tutorial.vue index 9683cc22a..b1a1af138 100644 --- a/packages/client/src/pages/timeline.tutorial.vue +++ b/packages/client/src/pages/timeline.tutorial.vue @@ -71,7 +71,7 @@ {{ i18n.ts.noThankYou }}
diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue index 9d4299702..8c2dc92cc 100644 --- a/packages/client/src/pages/timeline.vue +++ b/packages/client/src/pages/timeline.vue @@ -114,22 +114,22 @@ const headerActions = $computed(() => []); const headerTabs = $computed(() => [{ key: 'home', title: i18n.ts._timelines.home, - icon: 'fas fa-home', + icon: 'ti ti-home-2', iconOnly: true, }, ...(isLocalTimelineAvailable ? [{ key: 'local', title: i18n.ts._timelines.local, - icon: 'fas fa-comments', + icon: 'ti ti-messages', iconOnly: true, }, { key: 'social', title: i18n.ts._timelines.social, - icon: 'fas fa-share-alt', + icon: 'ti ti-share', iconOnly: true, }] : []), ...(isGlobalTimelineAvailable ? [{ key: 'global', title: i18n.ts._timelines.global, - icon: 'fas fa-globe', + icon: 'ti ti-world', iconOnly: true, }] : []), { icon: 'fas fa-list-ul', @@ -150,7 +150,7 @@ const headerTabs = $computed(() => [{ definePageMetadata(computed(() => ({ title: i18n.ts.timeline, - icon: src === 'local' ? 'fas fa-comments' : src === 'social' ? 'fas fa-share-alt' : src === 'global' ? 'fas fa-globe' : 'fas fa-home', + icon: src === 'local' ? 'ti ti-messages' : src === 'social' ? 'ti ti-share' : src === 'global' ? 'ti ti-world' : 'ti ti-home-2', }))); diff --git a/packages/client/src/pages/user-list-timeline.vue b/packages/client/src/pages/user-list-timeline.vue index 4a534e47b..773b20d80 100644 --- a/packages/client/src/pages/user-list-timeline.vue +++ b/packages/client/src/pages/user-list-timeline.vue @@ -69,7 +69,7 @@ const headerActions = $computed(() => list ? [{ text: i18n.ts.jumpToSpecifiedDate, handler: timetravel, }, { - icon: 'fas fa-cog', + icon: 'ti ti-settings', text: i18n.ts.settings, handler: settings, }] : []); diff --git a/packages/client/src/pages/user/home.vue b/packages/client/src/pages/user/home.vue index 352db4616..98c7e9d11 100644 --- a/packages/client/src/pages/user/home.vue +++ b/packages/client/src/pages/user/home.vue @@ -25,7 +25,7 @@ {{ i18n.ts.followsYou }}
- +
diff --git a/packages/client/src/pages/user/index.activity.vue b/packages/client/src/pages/user/index.activity.vue index 630a2cea7..7f25176e8 100644 --- a/packages/client/src/pages/user/index.activity.vue +++ b/packages/client/src/pages/user/index.activity.vue @@ -3,7 +3,7 @@ diff --git a/packages/client/src/pages/user/index.vue b/packages/client/src/pages/user/index.vue index 7e635f8b2..21f1d25df 100644 --- a/packages/client/src/pages/user/index.vue +++ b/packages/client/src/pages/user/index.vue @@ -69,7 +69,7 @@ const headerActions = $computed(() => []); const headerTabs = $computed(() => user ? [{ key: 'home', title: i18n.ts.overview, - icon: 'fas fa-home', + icon: 'ti ti-home-2', }, ...($i && ($i.id === user.id)) || user.publicReactions ? [{ key: 'reactions', title: i18n.ts.reaction, @@ -77,7 +77,7 @@ const headerTabs = $computed(() => user ? [{ }] : [], { key: 'clips', title: i18n.ts.clips, - icon: 'fas fa-paperclip', + icon: 'ti ti-paperclip', }, { key: 'pages', title: i18n.ts.pages, diff --git a/packages/client/src/pages/welcome.entrance.a.vue b/packages/client/src/pages/welcome.entrance.a.vue index 827162a0c..119ba96ec 100644 --- a/packages/client/src/pages/welcome.entrance.a.vue +++ b/packages/client/src/pages/welcome.entrance.a.vue @@ -15,7 +15,7 @@
- +

diff --git a/packages/client/src/pages/welcome.entrance.c.vue b/packages/client/src/pages/welcome.entrance.c.vue index a590834a4..535580e72 100644 --- a/packages/client/src/pages/welcome.entrance.c.vue +++ b/packages/client/src/pages/welcome.entrance.c.vue @@ -41,7 +41,7 @@

- +