Обработка временно выключенных уведомлений

Author: danyadev

Diff for: src/components/App.vue

@@ -15,6 +15,7 @@
   import { fields } from 'js/utils';
   import { mapState } from 'vuex';
   import vkapi from 'js/vkapi';
+  import { addNotificationsTimer } from 'js/messages';
 
   import Titlebar from './Titlebar.vue';
   import MainMenu from './MainMenu.vue';
@@ -44,15 +45,19 @@
             this.$router.replace('/messages');
           }
 
-          const { lp, counters, user } = await vkapi('execute.init', {
+          const { lp, counters, user, temporarilyDisabledNotifications } = await vkapi('execute.init', {
             lp_version: longpoll.version,
-            fields: fields
+            fields
           });
 
           this.$store.commit('users/updateUser', user);
           this.$store.commit('setMenuCounters', counters);
 
           longpoll.start(lp);
+
+          for(const peer of temporarilyDisabledNotifications) {
+            addNotificationsTimer(peer);
+          }
         }
       }
     },

Diff for: src/js/longpollEvents.js

@@ -1,4 +1,4 @@
-import { parseMessage, parseConversation, loadConversation, loadConversationMembers } from './messages';
+import { parseMessage, parseConversation, loadConversation, loadConversationMembers, addNotificationsTimer } from './messages';
 import { supportedAttachments, preloadAttachments } from '../components/messages/chat/attachments/attachments';
 import longpoll from 'js/longpoll';
 import store from './store/';
@@ -723,7 +723,6 @@ export default {
     // Изменеие настроек пуш-уведомлений в беседе
     // [{ peer_id, sound, disabled_until }]
     // disabled_until: -1 - выключены; 0 - включены; * - время их включения
-    // При значении > 0 нужно самому следить за временем, ибо событие при включении не приходит.
     parser: (data) => data,
     handler([{ peer_id, disabled_until }]) {
       if(!store.state.messages.conversations[peer_id]) return;
@@ -734,6 +733,8 @@ export default {
           muted: !!disabled_until
         }
       });
+
+      addNotificationsTimer({ peer_id, disabled_until }, disabled_until <= 0);
     }
   },
 

Diff for: src/js/messages.js

@@ -206,3 +206,27 @@ export async function loadConversationMembers(id, force) {
     }
   }
 }
+
+const activeNotificationsTimers = new Map();
+
+export function addNotificationsTimer({ peer_id, disabled_until }, remove) {
+  if(remove) {
+    clearTimeout(activeNotificationsTimers.get(peer_id));
+    return activeNotificationsTimers.delete(peer_id);
+  }
+
+  if(activeNotificationsTimers.has(peer_id)) {
+    clearTimeout(activeNotificationsTimers.get(peer_id));
+  }
+
+  activeNotificationsTimers.set(peer_id, setTimeout(() => {
+    activeNotificationsTimers.delete(peer_id);
+
+    store.commit('messages/updateConversation', {
+      peer: {
+        id: peer_id,
+        muted: false
+      }
+    });
+  }, disabled_until * 1000 - Date.now()));
+}