Allow configuration to be static/readonly (#4315)

[github/Chocobozzz/PeerTube.git] / client / src / app / core / notification / peertube-socket.service.ts

diff --git a/client/src/app/core/notification/peertube-socket.service.ts b/client/src/app/core/notification/peertube-socket.service.ts
index 2f17fd70910f946586b19a4c7d3083dcb88ac34c..50d5df68f49853ae33ea4b7be8369fce3c359f42 100644 (file)
--- a/client/src/app/core/notification/peertube-socket.service.ts
+++ b/client/src/app/core/notification/peertube-socket.service.ts
@@ -38,7 +38,7 @@ export class PeerTubeSocket {
     this.liveVideosSocket.emit('subscribe', { videoId })
   }
 
-  async unsubscribeLiveVideos (videoId: number) {
+  unsubscribeLiveVideos (videoId: number) {
     if (!this.liveVideosSocket) return
 
     this.liveVideosSocket.emit('unsubscribe', { videoId })
@@ -53,12 +53,15 @@ export class PeerTubeSocket {
 
     await this.importIOIfNeeded()
 
+    // Prevent protractor issues https://github.com/angular/angular/issues/11853
     this.ngZone.runOutsideAngular(() => {
       this.notificationSocket = this.io(environment.apiUrl + '/user-notifications', {
         query: { accessToken: this.auth.getAccessToken() }
       })
+    })
 
-      this.notificationSocket.on('new-notification', (n: UserNotificationServer) => this.dispatchNotificationEvent('new', n))
+    this.notificationSocket.on('new-notification', (n: UserNotificationServer) => {
+      this.ngZone.run(() => this.dispatchNotificationEvent('new', n))
     })
   }
 
@@ -67,12 +70,18 @@ export class PeerTubeSocket {
 
     await this.importIOIfNeeded()
 
+    // Prevent protractor issues https://github.com/angular/angular/issues/11853
     this.ngZone.runOutsideAngular(() => {
       this.liveVideosSocket = this.io(environment.apiUrl + '/live-videos')
-
-      const type: LiveVideoEventType = 'state-change'
-      this.liveVideosSocket.on(type, (payload: LiveVideoEventPayload) => this.dispatchLiveVideoEvent(type, payload))
     })
+
+    const types: LiveVideoEventType[] = [ 'views-change', 'state-change' ]
+
+    for (const type of types) {
+      this.liveVideosSocket.on(type, (payload: LiveVideoEventPayload) => {
+        this.ngZone.run(() => this.dispatchLiveVideoEvent(type, payload))
+      })
+    }
   }
 
   private async importIOIfNeeded () {