From ab16fb3a3fff96a4fa2bc1fc0e56a87c129a4625 Mon Sep 17 00:00:00 2001 From: syuilo Date: Tue, 29 May 2018 01:22:39 +0900 Subject: [PATCH] #1634 --- .../app/common/scripts/streaming/home.ts | 24 +++++++++ .../components/ui.header.notifications.vue | 39 ++------------ .../app/mobile/views/components/ui.header.vue | 52 +++++-------------- .../app/mobile/views/components/ui.nav.vue | 52 +++++-------------- src/publishers/notify.ts | 8 +++ .../api/common/read-messaging-message.ts | 8 +++ src/server/api/common/read-notification.ts | 8 +++ src/server/api/endpoints.ts | 10 ---- .../api/endpoints/messaging/messages.ts | 7 --- .../endpoints/messaging/messages/create.ts | 7 +++ src/server/api/endpoints/messaging/unread.ts | 29 ----------- .../notifications/get_unread_count.ts | 28 ---------- .../notifications/mark_as_read_all.ts | 11 ++-- 13 files changed, 92 insertions(+), 191 deletions(-) delete mode 100644 src/server/api/endpoints/messaging/unread.ts delete mode 100644 src/server/api/endpoints/notifications/get_unread_count.ts diff --git a/src/client/app/common/scripts/streaming/home.ts b/src/client/app/common/scripts/streaming/home.ts index 2715b9e0e..50bbb5689 100644 --- a/src/client/app/common/scripts/streaming/home.ts +++ b/src/client/app/common/scripts/streaming/home.ts @@ -28,6 +28,30 @@ export class HomeStream extends Stream { os.store.dispatch('mergeMe', i); }); + this.on('read_all_notifications', () => { + os.store.dispatch('mergeMe', { + hasUnreadNotification: false + }); + }); + + this.on('unread_notification', () => { + os.store.dispatch('mergeMe', { + hasUnreadNotification: true + }); + }); + + this.on('read_all_messaging_messages', () => { + os.store.dispatch('mergeMe', { + hasUnreadMessagingMessage: false + }); + }); + + this.on('unread_messaging_message', () => { + os.store.dispatch('mergeMe', { + hasUnreadMessagingMessage: true + }); + }); + this.on('clientSettingUpdated', x => { os.store.commit('settings/set', { key: x.key, diff --git a/src/client/app/desktop/views/components/ui.header.notifications.vue b/src/client/app/desktop/views/components/ui.header.notifications.vue index 9eaaa62c6..59a16df9e 100644 --- a/src/client/app/desktop/views/components/ui.header.notifications.vue +++ b/src/client/app/desktop/views/components/ui.header.notifications.vue @@ -1,7 +1,7 @@