Merge remote-tracking branch 'weblate/develop' into develop

[github/Chocobozzz/PeerTube.git] / client / src / app / menu / avatar-notification.component.ts

diff --git a/client/src/app/menu/avatar-notification.component.ts b/client/src/app/menu/avatar-notification.component.ts
index c447f031c61196fa7bb7a871cde7d9593e9b909c..ed3ffc2d8e7f97943d21a0f3903c4261af849637 100644 (file)
--- a/client/src/app/menu/avatar-notification.component.ts
+++ b/client/src/app/menu/avatar-notification.component.ts
@@ -1,11 +1,10 @@
-import { Component, Input, OnDestroy, OnInit, ViewChild } from '@angular/core'
-import { User } from '../shared/users/user.model'
-import { UserNotificationService } from '@app/shared/users/user-notification.service'
 import { Subject, Subscription } from 'rxjs'
-import { Notifier, UserNotificationSocket } from '@app/core'
-import { NgbPopover } from '@ng-bootstrap/ng-bootstrap'
-import { NavigationEnd, Router } from '@angular/router'
 import { filter } from 'rxjs/operators'
+import { Component, EventEmitter, Input, Output, OnDestroy, OnInit, ViewChild } from '@angular/core'
+import { NavigationEnd, Router } from '@angular/router'
+import { Notifier, User, PeerTubeSocket } from '@app/core'
+import { UserNotificationService } from '@app/shared/shared-main'
+import { NgbPopover } from '@ng-bootstrap/ng-bootstrap'
 
 @Component({
   selector: 'my-avatar-notification',
@@ -16,6 +15,7 @@ export class AvatarNotificationComponent implements OnInit, OnDestroy {
   @ViewChild('popover', { static: true }) popover: NgbPopover
 
   @Input() user: User
+  @Output() navigate = new EventEmitter<HTMLAnchorElement>()
 
   unreadNotifications = 0
   loaded = false
@@ -27,7 +27,7 @@ export class AvatarNotificationComponent implements OnInit, OnDestroy {
 
   constructor (
     private userNotificationService: UserNotificationService,
-    private userNotificationSocket: UserNotificationSocket,
+    private peertubeSocket: PeerTubeSocket,
     private notifier: Notifier,
     private router: Router
   ) {
@@ -66,12 +66,16 @@ export class AvatarNotificationComponent implements OnInit, OnDestroy {
     this.loaded = true
   }
 
+  onNavigate (link: HTMLAnchorElement) {
+    this.navigate.emit(link)
+  }
+
   markAllAsRead () {
     this.markAllAsReadSubject.next(true)
   }
 
   private async subscribeToNotifications () {
-    const obs = await this.userNotificationSocket.getMyNotificationsSocket()
+    const obs = await this.peertubeSocket.getMyNotificationsSocket()
 
     this.notificationSub = obs.subscribe(data => {
       if (data.type === 'new') return this.unreadNotifications++