3 files changed, 18 insertions, 21 deletions

diff --git a/client/src/app/videos/video-list/video-list.component.ts b/client/src/app/videos/video-list/video-list.component.ts
index 0c36e5b08..4ac539960 100644
--- a/client/src/app/videos/video-list/video-list.component.ts
+++ b/client/src/app/videos/video-list/video-list.component.ts
@@ -1,5 +1,6 @@
 import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core'
 import { ActivatedRoute, Router } from '@angular/router'
+import { Subscription } from 'rxjs/Subscription'
 import { BehaviorSubject } from 'rxjs/BehaviorSubject'
 
 import { NotificationsService } from 'angular2-notifications'
@@ -30,8 +31,8 @@ export class VideoListComponent implements OnInit, OnDestroy {
   videos: Video[] = []
 
   private search: Search
-  private subActivatedRoute: any
-  private subSearch: any
+  private subActivatedRoute: Subscription
+  private subSearch: Subscription
 
   constructor (
     private notificationsService: NotificationsService,
@@ -98,7 +99,7 @@ export class VideoListComponent implements OnInit, OnDestroy {
     return !this.loading.getValue() && this.videos.length === 0
   }
 
-  onPageChanged (event: any) {
+  onPageChanged (event: { page: number }) {
     // Be sure the current page is set
     this.pagination.currentPage = event.page
 
@@ -113,21 +114,21 @@ export class VideoListComponent implements OnInit, OnDestroy {
 
   private buildRouteParams () {
     // There is always a sort and a current page
-    const params: any = {
+    const params = {
       sort: this.sort,
       page: this.pagination.currentPage
     }
 
     // Maybe there is a search
     if (this.search.value) {
-      params.field = this.search.field
-      params.search = this.search.value
+      params['field'] = this.search.field
+      params['search'] = this.search.value
     }
 
     return params
   }
 
-  private loadRouteParams (routeParams) {
+  private loadRouteParams (routeParams: { [ key: string ]: any }) {
     if (routeParams['search'] !== undefined) {
       this.search = {
         value: routeParams['search'],
diff --git a/client/src/app/videos/video-watch/video-watch.component.ts b/client/src/app/videos/video-watch/video-watch.component.ts
index 12ddf3eef..6bd6c1f7e 100644
--- a/client/src/app/videos/video-watch/video-watch.component.ts
+++ b/client/src/app/videos/video-watch/video-watch.component.ts
@@ -32,7 +32,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
   loading = false
   numPeers: number
   player: videojs.Player
-  playerElement: Element
+  playerElement: HTMLMediaElement
   uploadSpeed: number
   userRating: UserVideoRateType = null
   video: Video = null
@@ -41,7 +41,6 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
   private errorTimer: number
   private paramsSub: Subscription
   private errorsSub: Subscription
-  private warningsSub: Subscription
   private torrentInfosInterval: number
 
   constructor (
@@ -82,8 +81,10 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
       self.player = this
     })
 
-    this.errorsSub = this.webTorrentService.errors.subscribe(err => this.notificationsService.error('Error', err.message))
-    this.warningsSub = this.webTorrentService.errors.subscribe(err => this.notificationsService.alert('Warning', err.message))
+    this.errorsSub = this.webTorrentService.errors.subscribe(err => {
+      const message = typeof err === 'string' ? err : err.message
+      this.notificationsService.error('Error', message)
+    })
   }
 
   ngOnDestroy () {
@@ -102,7 +103,6 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
     // Unsubscribe subscriptions
     this.paramsSub.unsubscribe()
     this.errorsSub.unsubscribe()
-    this.warningsSub.unsubscribe()
   }
 
   loadVideo () {
@@ -117,7 +117,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
     // So we create a timer to inform the user the load is abnormally long
     this.errorTimer = window.setTimeout(() => this.loadTooLong(), VideoWatchComponent.LOADTIME_TOO_LONG)
 
-    this.webTorrentService.add(this.video.magnetUri, (torrent) => {
+    this.webTorrentService.add(this.video.magnetUri, torrent => {
       // Clear the error timer
       window.clearTimeout(this.errorTimer)
       // Maybe the error was fired by the timer, so reset it
diff --git a/client/src/app/videos/video-watch/webtorrent.service.ts b/client/src/app/videos/video-watch/webtorrent.service.ts
index 211894bfd..8819e17d4 100644
--- a/client/src/app/videos/video-watch/webtorrent.service.ts
+++ b/client/src/app/videos/video-watch/webtorrent.service.ts
@@ -5,21 +5,17 @@ import * as WebTorrent from 'webtorrent'
 
 @Injectable()
 export class WebTorrentService {
-  errors = new Subject<Error>()
-  warnings = new Subject<Error>()
+  errors = new Subject<string | Error>()
 
-  // TODO: use WebTorrent @type
-  // private client: WebTorrent.Client
-  private client: any
+  private client: WebTorrent.Instance
 
   constructor () {
     this.client = new WebTorrent({ dht: false })
 
-    this.client.on('error', (err) => this.errors.next(err))
-    this.client.on('warning', (err) => this.warnings.next(err))
+    this.client.on('error', err => this.errors.next(err))
   }
 
-  add (magnetUri: string, callback: Function) {
+  add (magnetUri: string, callback: (torrent: WebTorrent.Torrent) => any) {
     return this.client.add(magnetUri, callback)
   }