diff options
| author | Mar0xy <marie@kaifa.ch> | 2023-09-28 02:01:01 +0200 |
|---|---|---|
| committer | Mar0xy <marie@kaifa.ch> | 2023-09-28 02:01:01 +0200 |
| commit | 0c7011bd02c85bb0ecb41a44c0e2b7ff4a6bc4c2 (patch) | |
| tree | c9fb04f44e37082bb329c614096195332d278c37 | |
| parent | upd: autoload conversation (diff) | |
| download | sharkey-0c7011bd02c85bb0ecb41a44c0e2b7ff4a6bc4c2.tar.gz sharkey-0c7011bd02c85bb0ecb41a44c0e2b7ff4a6bc4c2.tar.bz2 sharkey-0c7011bd02c85bb0ecb41a44c0e2b7ff4a6bc4c2.zip | |
upd: make autoload conversation a toggle
| -rw-r--r-- | packages/frontend/src/components/MkNoteDetailed.vue | 2 | ||||
| -rw-r--r-- | packages/frontend/src/pages/settings/general.vue | 2 | ||||
| -rw-r--r-- | packages/frontend/src/store.ts | 4 |
3 files changed, 7 insertions, 1 deletions
diff --git a/packages/frontend/src/components/MkNoteDetailed.vue b/packages/frontend/src/components/MkNoteDetailed.vue index 5a0394a29e..3956c9dc51 100644 --- a/packages/frontend/src/components/MkNoteDetailed.vue +++ b/packages/frontend/src/components/MkNoteDetailed.vue @@ -517,7 +517,7 @@ function loadConversation() { conversation.value = res.reverse(); }); } -if (appearNote.reply && appearNote.reply.replyId) loadConversation(); +if (appearNote.reply && appearNote.reply.replyId && defaultStore.state.autoloadConversation) loadConversation(); </script> <style lang="scss" module> diff --git a/packages/frontend/src/pages/settings/general.vue b/packages/frontend/src/pages/settings/general.vue index a536bd1baa..30015bb285 100644 --- a/packages/frontend/src/pages/settings/general.vue +++ b/packages/frontend/src/pages/settings/general.vue @@ -47,6 +47,7 @@ SPDX-License-Identifier: AGPL-3.0-only <MkSwitch v-model="showNoteActionsOnlyHover">{{ i18n.ts.showNoteActionsOnlyHover }}</MkSwitch> <MkSwitch v-model="showClipButtonInNoteFooter">{{ i18n.ts.showClipButtonInNoteFooter }}</MkSwitch> <MkSwitch v-model="collapseRenotes">{{ i18n.ts.collapseRenotes }}</MkSwitch> + <MkSwitch v-model="autoloadConversation">Load conversation on replies</MkSwitch> <MkSwitch v-model="advancedMfm">{{ i18n.ts.enableAdvancedMfm }}</MkSwitch> <MkSwitch v-if="advancedMfm" v-model="animatedMfm">{{ i18n.ts.enableAnimatedMfm }}</MkSwitch> <MkSwitch v-model="showGapBetweenNotesInTimeline">{{ i18n.ts.showGapBetweenNotesInTimeline }}</MkSwitch> @@ -224,6 +225,7 @@ const showNoteActionsOnlyHover = computed(defaultStore.makeGetterSetter('showNot const showClipButtonInNoteFooter = computed(defaultStore.makeGetterSetter('showClipButtonInNoteFooter')); const reactionsDisplaySize = computed(defaultStore.makeGetterSetter('reactionsDisplaySize')); const collapseRenotes = computed(defaultStore.makeGetterSetter('collapseRenotes')); +const autoloadConversation = computed(defaultStore.makeGetterSetter('autoloadConversation')); const reduceAnimation = computed(defaultStore.makeGetterSetter('animation', v => !v, v => !v)); const useBlurEffectForModal = computed(defaultStore.makeGetterSetter('useBlurEffectForModal')); const useBlurEffect = computed(defaultStore.makeGetterSetter('useBlurEffect')); diff --git a/packages/frontend/src/store.ts b/packages/frontend/src/store.ts index 3ff70d043c..3805c95550 100644 --- a/packages/frontend/src/store.ts +++ b/packages/frontend/src/store.ts @@ -113,6 +113,10 @@ export const defaultStore = markRaw(new Storage('base', { where: 'account', default: false, }, + autoloadConversation: { + where: 'account', + default: true, + }, menu: { where: 'deviceAccount', |