diff --git a/spec/renderer/integration/store/TimelineSpace.spec.ts b/spec/renderer/integration/store/TimelineSpace.spec.ts index c226c95c..b66ab8bd 100644 --- a/spec/renderer/integration/store/TimelineSpace.spec.ts +++ b/spec/renderer/integration/store/TimelineSpace.spec.ts @@ -4,7 +4,7 @@ import { createStore, Store } from 'vuex' import { ipcMain, ipcRenderer } from '~/spec/mock/electron' import TimelineSpace, { TimelineSpaceState, blankAccount } from '~/src/renderer/store/TimelineSpace' import { MyWindow } from '~/src/types/global' -;(window as any as MyWindow).ipcRenderer = ipcRenderer +;((window as any) as MyWindow).ipcRenderer = ipcRenderer const emacsEmoji: Entity.Emoji = { shortcode: 'emacs', @@ -86,8 +86,7 @@ const state = (): TimelineSpaceState => { }, useMarker: { home: false, - notifications: true, - mentions: false + notifications: true } }, sns: 'mastodon', diff --git a/src/config/locales/en/translation.json b/src/config/locales/en/translation.json index a5e54f05..b1272153 100644 --- a/src/config/locales/en/translation.json +++ b/src/config/locales/en/translation.json @@ -116,8 +116,7 @@ "use_marker": { "title": "Load the timeline from the last reading position", "home": "Home", - "notifications": "Notifications", - "mentions": "Mentions" + "notifications": "Notifications" } }, "filters": { diff --git a/src/constants/initializer/setting.ts b/src/constants/initializer/setting.ts index b6492df8..563f803c 100644 --- a/src/constants/initializer/setting.ts +++ b/src/constants/initializer/setting.ts @@ -8,8 +8,7 @@ const unreadNotification: UnreadNotification = { const useMarker: UseMarker = { home: false, - notifications: true, - mentions: false + notifications: true } const timeline: Timeline = { diff --git a/src/renderer/components/Settings/Timeline.vue b/src/renderer/components/Settings/Timeline.vue index b60d8d8e..ba7f4c60 100644 --- a/src/renderer/components/Settings/Timeline.vue +++ b/src/renderer/components/Settings/Timeline.vue @@ -26,9 +26,6 @@ - - - @@ -79,13 +76,6 @@ export default defineComponent({ notifications: value }) }) - const marker_mentions = computed({ - get: () => store.state.Settings.Timeline.setting.useMarker.mentions, - set: value => - store.dispatch(`${space}/${ACTION_TYPES.CHANGE_USER_MARKER}`, { - mentions: value - }) - }) onMounted(() => { store.dispatch(`${space}/${ACTION_TYPES.LOAD_TIMELINE_SETTING}`) @@ -96,8 +86,7 @@ export default defineComponent({ localNotify, publicNotify, marker_home, - marker_notifications, - marker_mentions + marker_notifications } } }) diff --git a/src/renderer/components/TimelineSpace/Contents/Mentions.vue b/src/renderer/components/TimelineSpace/Contents/Mentions.vue index 9f2f5189..5c58657a 100644 --- a/src/renderer/components/TimelineSpace/Contents/Mentions.vue +++ b/src/renderer/components/TimelineSpace/Contents/Mentions.vue @@ -3,15 +3,15 @@