Merge pull request #3230 from h3poteto/fix-574

refs #574 Add use marker settings for mentions
This commit is contained in:
AkiraFukushima 2022-04-04 23:29:03 +09:00 committed by GitHub
commit 410fea4ea8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 2 deletions

View File

@ -115,7 +115,8 @@
"use_marker": { "use_marker": {
"title": "Load the timeline from the last reading position", "title": "Load the timeline from the last reading position",
"home": "Home", "home": "Home",
"notifications": "Notifications" "notifications": "Notifications",
"mentions": "Mentions"
} }
}, },
"filters": { "filters": {

View File

@ -24,6 +24,9 @@
<el-form-item for="marker_notifications" :label="$t('settings.timeline.use_marker.notifications')"> <el-form-item for="marker_notifications" :label="$t('settings.timeline.use_marker.notifications')">
<el-switch v-model="marker_notifications" id="marker_notifications" /> <el-switch v-model="marker_notifications" id="marker_notifications" />
</el-form-item> </el-form-item>
<el-form-item for="marker_mentions" :label="$t('settings.timeline.use_marker.mentions')">
<el-switch v-model="marker_mentions" id="marker_mentions" />
</el-form-item>
</el-form> </el-form>
</div> </div>
</template> </template>
@ -81,6 +84,16 @@ export default {
notifications: value notifications: value
}) })
} }
},
marker_mentions: {
get() {
return this.$store.state.Settings.Timeline.setting.useMarker.mentions
},
set(value) {
this.$store.dispatch('Settings/Timeline/changeUseMarker', {
mentions: value
})
}
} }
}, },
async created() { async created() {

View File

@ -4,7 +4,7 @@ import { MyWindow } from '~/src/types/global'
import { Setting, UnreadNotification, Timeline as TimelineSetting, UseMarker } from '~src/types/setting' import { Setting, UnreadNotification, Timeline as TimelineSetting, UseMarker } from '~src/types/setting'
import { DefaultSetting } from '~/src/constants/initializer/setting' import { DefaultSetting } from '~/src/constants/initializer/setting'
const win = (window as any) as MyWindow const win = window as any as MyWindow
export type TimelineState = { export type TimelineState = {
setting: TimelineSetting setting: TimelineSetting