merge: Add show bots toggle to hamburger menu (!664)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/664 Approved-by: dakkar <dakkar@thenautilus.net> Approved-by: Marie <github@yuugi.dev>
This commit is contained in:
commit
8e85487f64
2 changed files with 5 additions and 10 deletions
|
@ -231,7 +231,6 @@ SPDX-License-Identifier: AGPL-3.0-only
|
||||||
<MkSwitch v-model="enableInfiniteScroll">{{ i18n.ts.enableInfiniteScroll }}</MkSwitch>
|
<MkSwitch v-model="enableInfiniteScroll">{{ i18n.ts.enableInfiniteScroll }}</MkSwitch>
|
||||||
<MkSwitch v-model="keepScreenOn">{{ i18n.ts.keepScreenOn }}</MkSwitch>
|
<MkSwitch v-model="keepScreenOn">{{ i18n.ts.keepScreenOn }}</MkSwitch>
|
||||||
<MkSwitch v-model="clickToOpen">{{ i18n.ts.clickToOpen }}</MkSwitch>
|
<MkSwitch v-model="clickToOpen">{{ i18n.ts.clickToOpen }}</MkSwitch>
|
||||||
<MkSwitch v-model="showBots">{{ i18n.ts.showBots }}</MkSwitch>
|
|
||||||
<MkSwitch v-model="disableStreamingTimeline">{{ i18n.ts.disableStreamingTimeline }}</MkSwitch>
|
<MkSwitch v-model="disableStreamingTimeline">{{ i18n.ts.disableStreamingTimeline }}</MkSwitch>
|
||||||
<MkSwitch v-model="enableHorizontalSwipe">{{ i18n.ts.enableHorizontalSwipe }}</MkSwitch>
|
<MkSwitch v-model="enableHorizontalSwipe">{{ i18n.ts.enableHorizontalSwipe }}</MkSwitch>
|
||||||
<MkSwitch v-model="alwaysConfirmFollow">{{ i18n.ts.alwaysConfirmFollow }}</MkSwitch>
|
<MkSwitch v-model="alwaysConfirmFollow">{{ i18n.ts.alwaysConfirmFollow }}</MkSwitch>
|
||||||
|
@ -378,14 +377,6 @@ const limitWidthOfReaction = computed(defaultStore.makeGetterSetter('limitWidthO
|
||||||
const collapseRenotes = computed(defaultStore.makeGetterSetter('collapseRenotes'));
|
const collapseRenotes = computed(defaultStore.makeGetterSetter('collapseRenotes'));
|
||||||
const collapseNotesRepliedTo = computed(defaultStore.makeGetterSetter('collapseNotesRepliedTo'));
|
const collapseNotesRepliedTo = computed(defaultStore.makeGetterSetter('collapseNotesRepliedTo'));
|
||||||
const clickToOpen = computed(defaultStore.makeGetterSetter('clickToOpen'));
|
const clickToOpen = computed(defaultStore.makeGetterSetter('clickToOpen'));
|
||||||
// copied from src/pages/timeline.vue
|
|
||||||
const showBots = computed<boolean>({
|
|
||||||
get: () => defaultStore.reactiveState.tl.value.filter.withBots,
|
|
||||||
set: (newValue) => {
|
|
||||||
const out = deepMerge({ filter: { withBots: newValue } }, defaultStore.state.tl);
|
|
||||||
defaultStore.set('tl', out);
|
|
||||||
},
|
|
||||||
});
|
|
||||||
const collapseFiles = computed(defaultStore.makeGetterSetter('collapseFiles'));
|
const collapseFiles = computed(defaultStore.makeGetterSetter('collapseFiles'));
|
||||||
const autoloadConversation = computed(defaultStore.makeGetterSetter('autoloadConversation'));
|
const autoloadConversation = computed(defaultStore.makeGetterSetter('autoloadConversation'));
|
||||||
const reduceAnimation = computed(defaultStore.makeGetterSetter('animation', v => !v, v => !v));
|
const reduceAnimation = computed(defaultStore.makeGetterSetter('animation', v => !v, v => !v));
|
||||||
|
|
|
@ -17,7 +17,7 @@ SPDX-License-Identifier: AGPL-3.0-only
|
||||||
<div :class="$style.tl">
|
<div :class="$style.tl">
|
||||||
<MkTimeline
|
<MkTimeline
|
||||||
ref="tlComponent"
|
ref="tlComponent"
|
||||||
:key="src + withRenotes + withReplies + onlyFiles"
|
:key="src + withRenotes + withBots + withReplies + onlyFiles"
|
||||||
:src="src.split(':')[0]"
|
:src="src.split(':')[0]"
|
||||||
:list="src.split(':')[1]"
|
:list="src.split(':')[1]"
|
||||||
:withRenotes="withRenotes"
|
:withRenotes="withRenotes"
|
||||||
|
@ -271,6 +271,10 @@ const headerActions = computed(() => {
|
||||||
type: 'switch',
|
type: 'switch',
|
||||||
text: i18n.ts.showRenotes,
|
text: i18n.ts.showRenotes,
|
||||||
ref: withRenotes,
|
ref: withRenotes,
|
||||||
|
}, {
|
||||||
|
type: 'switch',
|
||||||
|
text: i18n.ts.showBots,
|
||||||
|
ref: withBots,
|
||||||
}, isBasicTimeline(src.value) && hasWithReplies(src.value) ? {
|
}, isBasicTimeline(src.value) && hasWithReplies(src.value) ? {
|
||||||
type: 'switch',
|
type: 'switch',
|
||||||
text: i18n.ts.showRepliesToOthersInTimeline,
|
text: i18n.ts.showRepliesToOthersInTimeline,
|
||||||
|
|
Loading…
Reference in a new issue