24 files changed, 642 insertions, 645 deletions

diff --git a/client/src/app/videos/index.ts b/client/src/app/videos/index.ts
index 5158a23f8..83edcc758 100644
--- a/client/src/app/videos/index.ts
+++ b/client/src/app/videos/index.ts
@@ -1,7 +1,7 @@
-export * from './shared';
-export * from './video-edit';
-export * from './video-list';
-export * from './video-watch';
-export * from './videos-routing.module';
-export * from './videos.component';
-export * from './videos.module';
+export * from './shared'
+export * from './video-edit'
+export * from './video-list'
+export * from './video-watch'
+export * from './videos-routing.module'
+export * from './videos.component'
+export * from './videos.module'
diff --git a/client/src/app/videos/shared/index.ts b/client/src/app/videos/shared/index.ts
index a68491022..0fa14f641 100644
--- a/client/src/app/videos/shared/index.ts
+++ b/client/src/app/videos/shared/index.ts
@@ -1,4 +1,4 @@
-export * from './sort-field.type';
-export * from './rate-type.type';
-export * from './video.model';
-export * from './video.service';
+export * from './sort-field.type'
+export * from './rate-type.type'
+export * from './video.model'
+export * from './video.service'
diff --git a/client/src/app/videos/shared/rate-type.type.ts b/client/src/app/videos/shared/rate-type.type.ts
index 88034d1ff..20eea3ae5 100644
--- a/client/src/app/videos/shared/rate-type.type.ts
+++ b/client/src/app/videos/shared/rate-type.type.ts
@@ -1 +1 @@
-export type RateType = 'like' | 'dislike';
+export type RateType = 'like' | 'dislike'
diff --git a/client/src/app/videos/shared/sort-field.type.ts b/client/src/app/videos/shared/sort-field.type.ts
index 6cc598d8b..776f360f8 100644
--- a/client/src/app/videos/shared/sort-field.type.ts
+++ b/client/src/app/videos/shared/sort-field.type.ts
@@ -2,5 +2,4 @@ export type SortField = 'name' | '-name'
                       | 'duration' | '-duration'
                       | 'createdAt' | '-createdAt'
                       | 'views' | '-views'
-                      | 'likes' | '-likes';
-
+                      | 'likes' | '-likes'
diff --git a/client/src/app/videos/shared/video.model.ts b/client/src/app/videos/shared/video.model.ts
index e897eb175..f5e16fc13 100644
--- a/client/src/app/videos/shared/video.model.ts
+++ b/client/src/app/videos/shared/video.model.ts
@@ -1,56 +1,56 @@
-import { Video as VideoServerModel } from '../../../../../shared';
-import { User } from '../../shared';
+import { Video as VideoServerModel } from '../../../../../shared'
+import { User } from '../../shared'
 
 export class Video implements VideoServerModel {
-  author: string;
-  by: string;
-  createdAt: Date;
-  categoryLabel: string;
-  category: number;
-  licenceLabel: string;
-  licence: number;
-  languageLabel: string;
-  language: number;
-  description: string;
-  duration: number;
-  durationLabel: string;
-  id: string;
-  isLocal: boolean;
-  magnetUri: string;
-  name: string;
-  podHost: string;
-  tags: string[];
-  thumbnailPath: string;
-  thumbnailUrl: string;
-  views: number;
-  likes: number;
-  dislikes: number;
-  nsfw: boolean;
+  author: string
+  by: string
+  createdAt: Date
+  categoryLabel: string
+  category: number
+  licenceLabel: string
+  licence: number
+  languageLabel: string
+  language: number
+  description: string
+  duration: number
+  durationLabel: string
+  id: string
+  isLocal: boolean
+  magnetUri: string
+  name: string
+  podHost: string
+  tags: string[]
+  thumbnailPath: string
+  thumbnailUrl: string
+  views: number
+  likes: number
+  dislikes: number
+  nsfw: boolean
 
-  private static createByString(author: string, podHost: string) {
-    return author + '@' + podHost;
+  private static createByString (author: string, podHost: string) {
+    return author + '@' + podHost
   }
 
-  private static createDurationString(duration: number) {
-    const minutes = Math.floor(duration / 60);
-    const seconds = duration % 60;
-    const minutes_padding = minutes >= 10 ? '' : '0';
-    const seconds_padding = seconds >= 10 ? '' : '0';
+  private static createDurationString (duration: number) {
+    const minutes = Math.floor(duration / 60)
+    const seconds = duration % 60
+    const minutesPadding = minutes >= 10 ? '' : '0'
+    const secondsPadding = seconds >= 10 ? '' : '0'
 
-    return minutes_padding + minutes.toString() + ':' + seconds_padding + seconds.toString();
+    return minutesPadding + minutes.toString() + ':' + secondsPadding + seconds.toString()
   }
 
-  constructor(hash: {
+  constructor (hash: {
     author: string,
     createdAt: string,
     categoryLabel: string,
     category: number,
     licenceLabel: string,
     licence: number,
-    languageLabel: string;
-    language: number;
+    languageLabel: string
+    language: number
     description: string,
-    duration: number;
+    duration: number
     id: string,
     isLocal: boolean,
     magnetUri: string,
@@ -63,57 +63,57 @@ export class Video implements VideoServerModel {
     dislikes: number,
     nsfw: boolean
   }) {
-    this.author  = hash.author;
-    this.createdAt = new Date(hash.createdAt);
-    this.categoryLabel = hash.categoryLabel;
-    this.category = hash.category;
-    this.licenceLabel = hash.licenceLabel;
-    this.licence = hash.licence;
-    this.languageLabel = hash.languageLabel;
-    this.language = hash.language;
-    this.description = hash.description;
-    this.duration = hash.duration;
-    this.durationLabel = Video.createDurationString(hash.duration);
-    this.id = hash.id;
-    this.isLocal = hash.isLocal;
-    this.magnetUri = hash.magnetUri;
-    this.name = hash.name;
-    this.podHost = hash.podHost;
-    this.tags = hash.tags;
-    this.thumbnailPath = hash.thumbnailPath;
-    this.thumbnailUrl = API_URL + hash.thumbnailPath;
-    this.views = hash.views;
-    this.likes = hash.likes;
-    this.dislikes = hash.dislikes;
-    this.nsfw = hash.nsfw;
+    this.author = hash.author
+    this.createdAt = new Date(hash.createdAt)
+    this.categoryLabel = hash.categoryLabel
+    this.category = hash.category
+    this.licenceLabel = hash.licenceLabel
+    this.licence = hash.licence
+    this.languageLabel = hash.languageLabel
+    this.language = hash.language
+    this.description = hash.description
+    this.duration = hash.duration
+    this.durationLabel = Video.createDurationString(hash.duration)
+    this.id = hash.id
+    this.isLocal = hash.isLocal
+    this.magnetUri = hash.magnetUri
+    this.name = hash.name
+    this.podHost = hash.podHost
+    this.tags = hash.tags
+    this.thumbnailPath = hash.thumbnailPath
+    this.thumbnailUrl = API_URL + hash.thumbnailPath
+    this.views = hash.views
+    this.likes = hash.likes
+    this.dislikes = hash.dislikes
+    this.nsfw = hash.nsfw
 
-    this.by = Video.createByString(hash.author, hash.podHost);
+    this.by = Video.createByString(hash.author, hash.podHost)
   }
 
-  isRemovableBy(user) {
-    return user && this.isLocal === true && (this.author === user.username || user.isAdmin() === true);
+  isRemovableBy (user) {
+    return user && this.isLocal === true && (this.author === user.username || user.isAdmin() === true)
   }
 
-  isBlackistableBy(user) {
-    return user && user.isAdmin() === true && this.isLocal === false;
+  isBlackistableBy (user) {
+    return user && user.isAdmin() === true && this.isLocal === false
   }
 
-  isUpdatableBy(user) {
-    return user && this.isLocal === true && user.username === this.author;
+  isUpdatableBy (user) {
+    return user && this.isLocal === true && user.username === this.author
   }
 
-  isVideoNSFWForUser(user: User) {
+  isVideoNSFWForUser (user: User) {
     // If the video is NSFW and the user is not logged in, or the user does not want to display NSFW videos...
-    return (this.nsfw && (!user || user.displayNSFW === false));
+    return (this.nsfw && (!user || user.displayNSFW === false))
   }
 
-  patch(values: Object) {
+  patch (values: Object) {
     Object.keys(values).forEach((key) => {
-      this[key] = values[key];
-    });
+      this[key] = values[key]
+    })
   }
 
-  toJSON() {
+  toJSON () {
     return {
       author: this.author,
       createdAt: this.createdAt,
@@ -133,6 +133,6 @@ export class Video implements VideoServerModel {
       likes: this.likes,
       dislikes: this.dislikes,
       nsfw: this.nsfw
-    };
+    }
   }
 }
diff --git a/client/src/app/videos/shared/video.service.ts b/client/src/app/videos/shared/video.service.ts
index a53ea1064..a4e3d16df 100644
--- a/client/src/app/videos/shared/video.service.ts
+++ b/client/src/app/videos/shared/video.service.ts
@@ -1,13 +1,13 @@
-import { Injectable } from '@angular/core';
-import { Http, Headers, RequestOptions } from '@angular/http';
-import { Observable } from 'rxjs/Observable';
-import 'rxjs/add/operator/catch';
-import 'rxjs/add/operator/map';
-
-import { Search } from '../../shared';
-import { SortField } from './sort-field.type';
-import { RateType } from './rate-type.type';
-import { AuthService } from '../../core';
+import { Injectable } from '@angular/core'
+import { Http, Headers, RequestOptions } from '@angular/http'
+import { Observable } from 'rxjs/Observable'
+import 'rxjs/add/operator/catch'
+import 'rxjs/add/operator/map'
+
+import { Search } from '../../shared'
+import { SortField } from './sort-field.type'
+import { RateType } from './rate-type.type'
+import { AuthService } from '../../core'
 import {
   AuthHttp,
   RestExtractor,
@@ -15,18 +15,18 @@ import {
   RestService,
   ResultList,
   UserService
-} from '../../shared';
-import { Video } from './video.model';
+} from '../../shared'
+import { Video } from './video.model'
 
 @Injectable()
 export class VideoService {
-  private static BASE_VIDEO_URL = API_URL + '/api/v1/videos/';
+  private static BASE_VIDEO_URL = API_URL + '/api/v1/videos/'
 
-  videoCategories: Array<{ id: number, label: string }> = [];
-  videoLicences: Array<{ id: number, label: string }> = [];
-  videoLanguages: Array<{ id: number, label: string }> = [];
+  videoCategories: Array<{ id: number, label: string }> = []
+  videoLicences: Array<{ id: number, label: string }> = []
+  videoLanguages: Array<{ id: number, label: string }> = []
 
-  constructor(
+  constructor (
     private authService: AuthService,
     private authHttp: AuthHttp,
     private http: Http,
@@ -34,54 +34,54 @@ export class VideoService {
     private restService: RestService
   ) {}
 
-  loadVideoCategories() {
+  loadVideoCategories () {
     return this.http.get(VideoService.BASE_VIDEO_URL + 'categories')
                     .map(this.restExtractor.extractDataGet)
                     .subscribe(data => {
                       Object.keys(data).forEach(categoryKey => {
                         this.videoCategories.push({
-                          id: parseInt(categoryKey),
+                          id: parseInt(categoryKey, 10),
                           label: data[categoryKey]
-                        });
-                      });
-                    });
+                        })
+                      })
+                    })
   }
 
-  loadVideoLicences() {
+  loadVideoLicences () {
     return this.http.get(VideoService.BASE_VIDEO_URL + 'licences')
                     .map(this.restExtractor.extractDataGet)
                     .subscribe(data => {
                       Object.keys(data).forEach(licenceKey => {
                         this.videoLicences.push({
-                          id: parseInt(licenceKey),
+                          id: parseInt(licenceKey, 10),
                           label: data[licenceKey]
-                        });
-                      });
-                    });
+                        })
+                      })
+                    })
   }
 
-  loadVideoLanguages() {
+  loadVideoLanguages () {
     return this.http.get(VideoService.BASE_VIDEO_URL + 'languages')
                     .map(this.restExtractor.extractDataGet)
                     .subscribe(data => {
                       Object.keys(data).forEach(languageKey => {
                         this.videoLanguages.push({
-                          id: parseInt(languageKey),
+                          id: parseInt(languageKey, 10),
                           label: data[languageKey]
-                        });
-                      });
-                    });
+                        })
+                      })
+                    })
   }
 
-  getVideo(id: string): Observable<Video> {
+  getVideo (id: string): Observable<Video> {
     return this.http.get(VideoService.BASE_VIDEO_URL + id)
                     .map(this.restExtractor.extractDataGet)
-                    .map(video_hash => new Video(video_hash))
-                    .catch((res) => this.restExtractor.handleError(res));
+                    .map(videoHash => new Video(videoHash))
+                    .catch((res) => this.restExtractor.handleError(res))
   }
 
-  updateVideo(video: Video) {
-    const language = video.language ? video.language : null;
+  updateVideo (video: Video) {
+    const language = video.language ? video.language : null
 
     const body = {
       name: video.name,
@@ -90,94 +90,94 @@ export class VideoService {
       language,
       description: video.description,
       tags: video.tags
-    };
+    }
 
-    const headers = new Headers({ 'Content-Type': 'application/json' });
-    const options = new RequestOptions({ headers: headers });
+    const headers = new Headers({ 'Content-Type': 'application/json' })
+    const options = new RequestOptions({ headers: headers })
 
     return this.authHttp.put(`${VideoService.BASE_VIDEO_URL}/${video.id}`, body, options)
                         .map(this.restExtractor.extractDataBool)
-                        .catch(this.restExtractor.handleError);
+                        .catch(this.restExtractor.handleError)
   }
 
-  getVideos(pagination: RestPagination, sort: SortField) {
-    const params = this.restService.buildRestGetParams(pagination, sort);
+  getVideos (pagination: RestPagination, sort: SortField) {
+    const params = this.restService.buildRestGetParams(pagination, sort)
 
     return this.http.get(VideoService.BASE_VIDEO_URL, { search: params })
                     .map(res => res.json())
                     .map(this.extractVideos)
-                    .catch((res) => this.restExtractor.handleError(res));
+                    .catch((res) => this.restExtractor.handleError(res))
   }
 
-  removeVideo(id: string) {
+  removeVideo (id: string) {
     return this.authHttp.delete(VideoService.BASE_VIDEO_URL + id)
                         .map(this.restExtractor.extractDataBool)
-                        .catch((res) => this.restExtractor.handleError(res));
+                        .catch((res) => this.restExtractor.handleError(res))
   }
 
-  searchVideos(search: Search, pagination: RestPagination, sort: SortField) {
-    const params = this.restService.buildRestGetParams(pagination, sort);
+  searchVideos (search: Search, pagination: RestPagination, sort: SortField) {
+    const params = this.restService.buildRestGetParams(pagination, sort)
 
-    if (search.field) params.set('field', search.field);
+    if (search.field) params.set('field', search.field)
 
     return this.http.get(VideoService.BASE_VIDEO_URL + 'search/' + encodeURIComponent(search.value), { search: params })
                     .map(this.restExtractor.extractDataList)
                     .map(this.extractVideos)
-                    .catch((res) => this.restExtractor.handleError(res));
+                    .catch((res) => this.restExtractor.handleError(res))
   }
 
-  reportVideo(id: string, reason: string) {
-    const url = VideoService.BASE_VIDEO_URL + id + '/abuse';
+  reportVideo (id: string, reason: string) {
+    const url = VideoService.BASE_VIDEO_URL + id + '/abuse'
     const body = {
       reason
-    };
+    }
 
     return this.authHttp.post(url, body)
                         .map(this.restExtractor.extractDataBool)
-                        .catch((res) => this.restExtractor.handleError(res));
+                        .catch((res) => this.restExtractor.handleError(res))
   }
 
-  setVideoLike(id: string) {
-    return this.setVideoRate(id, 'like');
+  setVideoLike (id: string) {
+    return this.setVideoRate(id, 'like')
   }
 
-  setVideoDislike(id: string) {
-    return this.setVideoRate(id, 'dislike');
+  setVideoDislike (id: string) {
+    return this.setVideoRate(id, 'dislike')
   }
 
-  getUserVideoRating(id: string) {
-    const url = UserService.BASE_USERS_URL + '/me/videos/' + id + '/rating';
+  getUserVideoRating (id: string) {
+    const url = UserService.BASE_USERS_URL + '/me/videos/' + id + '/rating'
 
     return this.authHttp.get(url)
                         .map(this.restExtractor.extractDataGet)
-                        .catch((res) => this.restExtractor.handleError(res));
+                        .catch((res) => this.restExtractor.handleError(res))
   }
 
-  blacklistVideo(id: string) {
+  blacklistVideo (id: string) {
     return this.authHttp.post(VideoService.BASE_VIDEO_URL + id + '/blacklist', {})
                         .map(this.restExtractor.extractDataBool)
-                        .catch((res) => this.restExtractor.handleError(res));
+                        .catch((res) => this.restExtractor.handleError(res))
   }
 
-  private setVideoRate(id: string, rateType: RateType) {
-    const url = VideoService.BASE_VIDEO_URL + id + '/rate';
+  private setVideoRate (id: string, rateType: RateType) {
+    const url = VideoService.BASE_VIDEO_URL + id + '/rate'
     const body = {
       rating: rateType
-    };
+    }
 
     return this.authHttp.put(url, body)
                         .map(this.restExtractor.extractDataBool)
-                        .catch((res) => this.restExtractor.handleError(res));
+                        .catch((res) => this.restExtractor.handleError(res))
   }
 
-  private extractVideos(result: ResultList) {
-    const videosJson = result.data;
-    const totalVideos = result.total;
-    const videos = [];
+  private extractVideos (result: ResultList) {
+    const videosJson = result.data
+    const totalVideos = result.total
+    const videos = []
     for (const videoJson of videosJson) {
-      videos.push(new Video(videoJson));
+      videos.push(new Video(videoJson))
     }
 
-    return { videos, totalVideos };
+    return { videos, totalVideos }
   }
 }
diff --git a/client/src/app/videos/video-edit/index.ts b/client/src/app/videos/video-edit/index.ts
index 5ce4fb9b1..3b4a9cb87 100644
--- a/client/src/app/videos/video-edit/index.ts
+++ b/client/src/app/videos/video-edit/index.ts
@@ -1,2 +1,2 @@
-export * from './video-add.component';
-export * from './video-update.component';
+export * from './video-add.component'
+export * from './video-update.component'
diff --git a/client/src/app/videos/video-edit/video-add.component.ts b/client/src/app/videos/video-edit/video-add.component.ts
index e5eb9a9f4..0653f5ac4 100644
--- a/client/src/app/videos/video-edit/video-add.component.ts
+++ b/client/src/app/videos/video-edit/video-add.component.ts
@@ -1,11 +1,11 @@
-import { Component, ElementRef, OnInit } from '@angular/core';
-import { FormBuilder, FormGroup } from '@angular/forms';
-import { Router } from '@angular/router';
+import { Component, ElementRef, OnInit } from '@angular/core'
+import { FormBuilder, FormGroup } from '@angular/forms'
+import { Router } from '@angular/router'
 
-import { FileUploader } from 'ng2-file-upload/ng2-file-upload';
-import { NotificationsService } from 'angular2-notifications';
+import { FileUploader } from 'ng2-file-upload/ng2-file-upload'
+import { NotificationsService } from 'angular2-notifications'
 
-import { AuthService } from '../../core';
+import { AuthService } from '../../core'
 import {
   FormReactive,
   VIDEO_NAME,
@@ -14,8 +14,8 @@ import {
   VIDEO_LANGUAGE,
   VIDEO_DESCRIPTION,
   VIDEO_TAGS
-} from '../../shared';
-import { VideoService } from '../shared';
+} from '../../shared'
+import { VideoService } from '../shared'
 
 @Component({
   selector: 'my-videos-add',
@@ -24,36 +24,36 @@ import { VideoService } from '../shared';
 })
 
 export class VideoAddComponent extends FormReactive implements OnInit {
-  tags: string[] = [];
-  uploader: FileUploader;
-  videoCategories = [];
-  videoLicences = [];
-  videoLanguages = [];
+  tags: string[] = []
+  uploader: FileUploader
+  videoCategories = []
+  videoLicences = []
+  videoLanguages = []
 
-  tagValidators = VIDEO_TAGS.VALIDATORS;
-  tagValidatorsMessages = VIDEO_TAGS.MESSAGES;
+  tagValidators = VIDEO_TAGS.VALIDATORS
+  tagValidatorsMessages = VIDEO_TAGS.MESSAGES
 
-  error: string = null;
-  form: FormGroup;
+  error: string = null
+  form: FormGroup
   formErrors = {
     name: '',
     category: '',
     licence: '',
     language: '',
     description: ''
-  };
+  }
   validationMessages = {
     name: VIDEO_NAME.MESSAGES,
     category: VIDEO_CATEGORY.MESSAGES,
     licence: VIDEO_LICENCE.MESSAGES,
     language: VIDEO_LANGUAGE.MESSAGES,
     description: VIDEO_DESCRIPTION.MESSAGES
-  };
+  }
 
   // Special error messages
-  fileError = '';
+  fileError = ''
 
-  constructor(
+  constructor (
     private authService: AuthService,
     private elementRef: ElementRef,
     private formBuilder: FormBuilder,
@@ -61,18 +61,18 @@ export class VideoAddComponent extends FormReactive implements OnInit {
     private notificationsService: NotificationsService,
     private videoService: VideoService
   ) {
-    super();
+    super()
   }
 
-  get filename() {
+  get filename () {
     if (this.uploader.queue.length === 0) {
-      return null;
+      return null
     }
 
-    return this.uploader.queue[0].file.name;
+    return this.uploader.queue[0].file.name
   }
 
-  buildForm() {
+  buildForm () {
     this.form = this.formBuilder.group({
       name: [ '', VIDEO_NAME.VALIDATORS ],
       nsfw: [ false ],
@@ -81,115 +81,106 @@ export class VideoAddComponent extends FormReactive implements OnInit {
       language: [ '', VIDEO_LANGUAGE.VALIDATORS ],
       description: [ '', VIDEO_DESCRIPTION.VALIDATORS ],
       tags: [ '']
-    });
+    })
 
-    this.form.valueChanges.subscribe(data => this.onValueChanged(data));
+    this.form.valueChanges.subscribe(data => this.onValueChanged(data))
   }
 
-  ngOnInit() {
-    this.videoCategories = this.videoService.videoCategories;
-    this.videoLicences = this.videoService.videoLicences;
-    this.videoLanguages = this.videoService.videoLanguages;
+  ngOnInit () {
+    this.videoCategories = this.videoService.videoCategories
+    this.videoLicences = this.videoService.videoLicences
+    this.videoLanguages = this.videoService.videoLanguages
 
     this.uploader = new FileUploader({
       authToken: this.authService.getRequestHeaderValue(),
       queueLimit: 1,
       url: API_URL + '/api/v1/videos',
       removeAfterUpload: true
-    });
+    })
 
     this.uploader.onBuildItemForm = (item, form) => {
-      const name = this.form.value['name'];
-      const nsfw = this.form.value['nsfw'];
-      const category = this.form.value['category'];
-      const licence = this.form.value['licence'];
-      const language = this.form.value['language'];
-      const description = this.form.value['description'];
-      const tags = this.form.value['tags'];
-
-      form.append('name', name);
-      form.append('category', category);
-      form.append('nsfw', nsfw);
-      form.append('licence', licence);
+      const name = this.form.value['name']
+      const nsfw = this.form.value['nsfw']
+      const category = this.form.value['category']
+      const licence = this.form.value['licence']
+      const language = this.form.value['language']
+      const description = this.form.value['description']
+      const tags = this.form.value['tags']
+
+      form.append('name', name)
+      form.append('category', category)
+      form.append('nsfw', nsfw)
+      form.append('licence', licence)
 
       // Language is optional
       if (language) {
-        form.append('language', language);
+        form.append('language', language)
       }
 
-      form.append('description', description);
+      form.append('description', description)
 
       for (let i = 0; i < tags.length; i++) {
-        form.append(`tags[${i}]`, tags[i]);
+        form.append(`tags[${i}]`, tags[i])
       }
-    };
+    }
 
-    this.buildForm();
+    this.buildForm()
   }
 
-  checkForm() {
-    this.forceCheck();
+  checkForm () {
+    this.forceCheck()
 
     if (this.filename === null) {
-      this.fileError = 'You did not add a file.';
+      this.fileError = 'You did not add a file.'
     }
 
-    return this.form.valid === true && this.fileError === '';
+    return this.form.valid === true && this.fileError === ''
   }
 
-  fileChanged() {
-    this.fileError = '';
+  fileChanged () {
+    this.fileError = ''
   }
 
-  removeFile() {
-    this.uploader.clearQueue();
+  removeFile () {
+    this.uploader.clearQueue()
   }
 
-  upload() {
+  upload () {
     if (this.checkForm() === false) {
-      return;
+      return
     }
 
-    const item = this.uploader.queue[0];
+    const item = this.uploader.queue[0]
     // TODO: wait for https://github.com/valor-software/ng2-file-upload/pull/242
-    item.alias = 'videofile';
-
-    // FIXME: remove
-    // Run detection change for progress bar
-    const interval = setInterval(() => { ; }, 250);
+    item.alias = 'videofile'
 
     item.onSuccess = () => {
-      clearInterval(interval);
-
-      console.log('Video uploaded.');
-      this.notificationsService.success('Success', 'Video uploaded.');
-
+      console.log('Video uploaded.')
+      this.notificationsService.success('Success', 'Video uploaded.')
 
       // Print all the videos once it's finished
-      this.router.navigate(['/videos/list']);
-    };
+      this.router.navigate(['/videos/list'])
+    }
 
     item.onError = (response: string, status: number) => {
-      clearInterval(interval);
-
       // We need to handle manually these cases beceause we use the FileUpload component
       if (status === 400) {
-        this.error = response;
+        this.error = response
       } else if (status === 401) {
-        this.error = 'Access token was expired, refreshing token...';
+        this.error = 'Access token was expired, refreshing token...'
         this.authService.refreshAccessToken().subscribe(
           () => {
             // Update the uploader request header
-            this.uploader.authToken = this.authService.getRequestHeaderValue();
-            this.error += ' access token refreshed. Please retry your request.';
+            this.uploader.authToken = this.authService.getRequestHeaderValue()
+            this.error += ' access token refreshed. Please retry your request.'
           }
-        );
+        )
       } else {
-        this.error = 'Unknow error';
-        console.error(this.error);
+        this.error = 'Unknow error'
+        console.error(this.error)
       }
-    };
+    }
 
-    this.uploader.uploadAll();
+    this.uploader.uploadAll()
   }
 }
diff --git a/client/src/app/videos/video-edit/video-update.component.ts b/client/src/app/videos/video-edit/video-update.component.ts
index 933132cc0..9ee7ca6a8 100644
--- a/client/src/app/videos/video-edit/video-update.component.ts
+++ b/client/src/app/videos/video-edit/video-update.component.ts
@@ -1,11 +1,11 @@
-import { Component, ElementRef, OnInit } from '@angular/core';
-import { FormBuilder, FormGroup } from '@angular/forms';
-import { ActivatedRoute, Router } from '@angular/router';
+import { Component, ElementRef, OnInit } from '@angular/core'
+import { FormBuilder, FormGroup } from '@angular/forms'
+import { ActivatedRoute, Router } from '@angular/router'
 
-import { FileUploader } from 'ng2-file-upload/ng2-file-upload';
-import { NotificationsService } from 'angular2-notifications';
+import { FileUploader } from 'ng2-file-upload/ng2-file-upload'
+import { NotificationsService } from 'angular2-notifications'
 
-import { AuthService } from '../../core';
+import { AuthService } from '../../core'
 import {
   FormReactive,
   VIDEO_NAME,
@@ -14,8 +14,8 @@ import {
   VIDEO_LANGUAGE,
   VIDEO_DESCRIPTION,
   VIDEO_TAGS
-} from '../../shared';
-import { Video, VideoService } from '../shared';
+} from '../../shared'
+import { Video, VideoService } from '../shared'
 
 @Component({
   selector: 'my-videos-update',
@@ -24,35 +24,35 @@ import { Video, VideoService } from '../shared';
 })
 
 export class VideoUpdateComponent extends FormReactive implements OnInit {
-  tags: string[] = [];
-  videoCategories = [];
-  videoLicences = [];
-  videoLanguages = [];
-  video: Video;
+  tags: string[] = []
+  videoCategories = []
+  videoLicences = []
+  videoLanguages = []
+  video: Video
 
-  tagValidators = VIDEO_TAGS.VALIDATORS;
-  tagValidatorsMessages = VIDEO_TAGS.MESSAGES;
+  tagValidators = VIDEO_TAGS.VALIDATORS
+  tagValidatorsMessages = VIDEO_TAGS.MESSAGES
 
-  error: string = null;
-  form: FormGroup;
+  error: string = null
+  form: FormGroup
   formErrors = {
     name: '',
     category: '',
     licence: '',
     language: '',
     description: ''
-  };
+  }
   validationMessages = {
     name: VIDEO_NAME.MESSAGES,
     category: VIDEO_CATEGORY.MESSAGES,
     licence: VIDEO_LICENCE.MESSAGES,
     language: VIDEO_LANGUAGE.MESSAGES,
     description: VIDEO_DESCRIPTION.MESSAGES
-  };
+  }
 
-  fileError = '';
+  fileError = ''
 
-  constructor(
+  constructor (
     private authService: AuthService,
     private elementRef: ElementRef,
     private formBuilder: FormBuilder,
@@ -61,10 +61,10 @@ export class VideoUpdateComponent extends FormReactive implements OnInit {
     private notificationsService: NotificationsService,
     private videoService: VideoService
   ) {
-    super();
+    super()
   }
 
-  buildForm() {
+  buildForm () {
     this.form = this.formBuilder.group({
       name: [ '', VIDEO_NAME.VALIDATORS ],
       nsfw: [ false ],
@@ -73,60 +73,63 @@ export class VideoUpdateComponent extends FormReactive implements OnInit {
       language: [ '', VIDEO_LANGUAGE.VALIDATORS ],
       description: [ '', VIDEO_DESCRIPTION.VALIDATORS ],
       tags: [ '' ]
-    });
+    })
 
-    this.form.valueChanges.subscribe(data => this.onValueChanged(data));
+    this.form.valueChanges.subscribe(data => this.onValueChanged(data))
   }
 
-  ngOnInit() {
-    this.buildForm();
+  ngOnInit () {
+    this.buildForm()
 
-    this.videoCategories = this.videoService.videoCategories;
-    this.videoLicences = this.videoService.videoLicences;
-    this.videoLanguages = this.videoService.videoLanguages;
+    this.videoCategories = this.videoService.videoCategories
+    this.videoLicences = this.videoService.videoLicences
+    this.videoLanguages = this.videoService.videoLanguages
 
-    const id = this.route.snapshot.params['id'];
+    const id = this.route.snapshot.params['id']
     this.videoService.getVideo(id)
                      .subscribe(
                        video => {
-                         this.video = video;
+                         this.video = video
 
-                         this.hydrateFormFromVideo();
+                         this.hydrateFormFromVideo()
                        },
 
-                       err => this.error = 'Cannot fetch video.'
-                     );
+                       err => {
+                         console.error(err)
+                         this.error = 'Cannot fetch video.'
+                       }
+                     )
   }
 
-  checkForm() {
-    this.forceCheck();
+  checkForm () {
+    this.forceCheck()
 
-    return this.form.valid;
+    return this.form.valid
   }
 
-  update() {
+  update () {
     if (this.checkForm() === false) {
-      return;
+      return
     }
 
-    this.video.patch(this.form.value);
+    this.video.patch(this.form.value)
 
     this.videoService.updateVideo(this.video)
                      .subscribe(
                        () => {
-                         this.notificationsService.success('Success', 'Video updated.');
-                         this.router.navigate([ '/videos/watch', this.video.id ]);
+                         this.notificationsService.success('Success', 'Video updated.')
+                         this.router.navigate([ '/videos/watch', this.video.id ])
                        },
 
                        err => {
-                         this.error = 'Cannot update the video.';
-                         console.error(err);
+                         this.error = 'Cannot update the video.'
+                         console.error(err)
                        }
-                      );
+                      )
 
   }
 
-  private hydrateFormFromVideo() {
-    this.form.patchValue(this.video.toJSON());
+  private hydrateFormFromVideo () {
+    this.form.patchValue(this.video.toJSON())
   }
 }
diff --git a/client/src/app/videos/video-list/index.ts b/client/src/app/videos/video-list/index.ts
index 71d3b78e6..a490e6bb5 100644
--- a/client/src/app/videos/video-list/index.ts
+++ b/client/src/app/videos/video-list/index.ts
@@ -1,4 +1,4 @@
-export * from './loader.component';
-export * from './video-list.component';
-export * from './video-miniature.component';
-export * from './video-sort.component';
+export * from './loader.component'
+export * from './video-list.component'
+export * from './video-miniature.component'
+export * from './video-sort.component'
diff --git a/client/src/app/videos/video-list/loader.component.ts b/client/src/app/videos/video-list/loader.component.ts
index e72d2f3f3..e5780e0fa 100644
--- a/client/src/app/videos/video-list/loader.component.ts
+++ b/client/src/app/videos/video-list/loader.component.ts
@@ -1,4 +1,4 @@
-import { Component, Input } from '@angular/core';
+import { Component, Input } from '@angular/core'
 
 @Component({
   selector: 'my-loader',
@@ -7,5 +7,5 @@ import { Component, Input } from '@angular/core';
 })
 
 export class LoaderComponent {
-  @Input() loading: boolean;
+  @Input() loading: boolean
 }
diff --git a/client/src/app/videos/video-list/video-list.component.html b/client/src/app/videos/video-list/video-list.component.html
index f80592279..680fba3f5 100644
--- a/client/src/app/videos/video-list/video-list.component.html
+++ b/client/src/app/videos/video-list/video-list.component.html
@@ -17,7 +17,7 @@
 
   <my-video-miniature
     class="ng-animate"
-    *ngFor="let video of videos" [video]="video" [user]="user" [currentSort]="sort" (removed)="onRemoved(video)"
+    *ngFor="let video of videos" [video]="video" [user]="user" [currentSort]="sort"
   >
   </my-video-miniature>
 </div>
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 16a40bdc4..0c36e5b08 100644
--- a/client/src/app/videos/video-list/video-list.component.ts
+++ b/client/src/app/videos/video-list/video-list.component.ts
@@ -1,17 +1,17 @@
-import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { BehaviorSubject } from 'rxjs/BehaviorSubject';
+import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core'
+import { ActivatedRoute, Router } from '@angular/router'
+import { BehaviorSubject } from 'rxjs/BehaviorSubject'
 
-import { NotificationsService } from 'angular2-notifications';
+import { NotificationsService } from 'angular2-notifications'
 
 import {
   SortField,
   Video,
   VideoService
-} from '../shared';
-import { AuthService, AuthUser } from '../../core';
-import { RestPagination, Search, SearchField } from '../../shared';
-import { SearchService } from '../../shared';
+} from '../shared'
+import { AuthService, AuthUser } from '../../core'
+import { RestPagination, Search, SearchField } from '../../shared'
+import { SearchService } from '../../shared'
 
 @Component({
   selector: 'my-videos-list',
@@ -19,21 +19,21 @@ import { SearchService } from '../../shared';
   templateUrl: './video-list.component.html'
 })
 export class VideoListComponent implements OnInit, OnDestroy {
-  loading: BehaviorSubject<boolean> = new BehaviorSubject(false);
+  loading: BehaviorSubject<boolean> = new BehaviorSubject(false)
   pagination: RestPagination = {
     currentPage: 1,
     itemsPerPage: 25,
     totalItems: null
-  };
-  sort: SortField;
-  user: AuthUser = null;
-  videos: Video[] = [];
+  }
+  sort: SortField
+  user: AuthUser = null
+  videos: Video[] = []
 
-  private search: Search;
-  private subActivatedRoute: any;
-  private subSearch: any;
+  private search: Search
+  private subActivatedRoute: any
+  private subSearch: any
 
-  constructor(
+  constructor (
     private notificationsService: NotificationsService,
     private authService: AuthService,
     private changeDetector: ChangeDetectorRef,
@@ -43,114 +43,114 @@ export class VideoListComponent implements OnInit, OnDestroy {
     private searchService: SearchService
   ) {}
 
-  ngOnInit() {
+  ngOnInit () {
     if (this.authService.isLoggedIn()) {
-      this.user = AuthUser.load();
+      this.user = AuthUser.load()
     }
 
     // Subscribe to route changes
     this.subActivatedRoute = this.route.params.subscribe(routeParams => {
-      this.loadRouteParams(routeParams);
+      this.loadRouteParams(routeParams)
 
       // Update the search service component
-      this.searchService.updateSearch.next(this.search);
-      this.getVideos();
-    });
+      this.searchService.updateSearch.next(this.search)
+      this.getVideos()
+    })
 
     // Subscribe to search changes
     this.subSearch = this.searchService.searchUpdated.subscribe(search => {
-      this.search = search;
+      this.search = search
       // Reset pagination
-      this.pagination.currentPage = 1;
+      this.pagination.currentPage = 1
 
-      this.navigateToNewParams();
-    });
+      this.navigateToNewParams()
+    })
   }
 
-  ngOnDestroy() {
-    this.subActivatedRoute.unsubscribe();
-    this.subSearch.unsubscribe();
+  ngOnDestroy () {
+    this.subActivatedRoute.unsubscribe()
+    this.subSearch.unsubscribe()
   }
 
-  getVideos() {
-    this.loading.next(true);
-    this.videos = [];
+  getVideos () {
+    this.loading.next(true)
+    this.videos = []
 
-    let observable = null;
+    let observable = null
     if (this.search.value) {
-      observable = this.videoService.searchVideos(this.search, this.pagination, this.sort);
+      observable = this.videoService.searchVideos(this.search, this.pagination, this.sort)
     } else {
-      observable = this.videoService.getVideos(this.pagination, this.sort);
+      observable = this.videoService.getVideos(this.pagination, this.sort)
     }
 
     observable.subscribe(
       ({ videos, totalVideos }) => {
-        this.videos = videos;
-        this.pagination.totalItems = totalVideos;
+        this.videos = videos
+        this.pagination.totalItems = totalVideos
 
-        this.loading.next(false);
+        this.loading.next(false)
       },
       error => this.notificationsService.error('Error', error.text)
-    );
+    )
   }
 
-  isThereNoVideo() {
-    return !this.loading.getValue() && this.videos.length === 0;
+  isThereNoVideo () {
+    return !this.loading.getValue() && this.videos.length === 0
   }
 
-  onPageChanged(event: any) {
+  onPageChanged (event: any) {
     // Be sure the current page is set
-    this.pagination.currentPage = event.page;
+    this.pagination.currentPage = event.page
 
-    this.navigateToNewParams();
+    this.navigateToNewParams()
   }
 
-  onSort(sort: SortField) {
-    this.sort = sort;
+  onSort (sort: SortField) {
+    this.sort = sort
 
-    this.navigateToNewParams();
+    this.navigateToNewParams()
   }
 
-  private buildRouteParams() {
+  private buildRouteParams () {
     // There is always a sort and a current page
     const params: any = {
       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;
+    return params
   }
 
-  private loadRouteParams(routeParams) {
+  private loadRouteParams (routeParams) {
     if (routeParams['search'] !== undefined) {
       this.search = {
         value: routeParams['search'],
-        field: <SearchField>routeParams['field']
-      };
+        field: routeParams['field'] as SearchField
+      }
     } else {
       this.search = {
         value: '',
         field: 'name'
-      };
+      }
     }
 
-    this.sort = <SortField>routeParams['sort'] || '-createdAt';
+    this.sort = routeParams['sort'] as SortField || '-createdAt'
 
     if (routeParams['page'] !== undefined) {
-      this.pagination.currentPage = parseInt(routeParams['page']);
+      this.pagination.currentPage = parseInt(routeParams['page'], 10)
     } else {
-      this.pagination.currentPage = 1;
+      this.pagination.currentPage = 1
     }
   }
 
-  private navigateToNewParams() {
-    const routeParams = this.buildRouteParams();
-    this.router.navigate(['/videos/list', routeParams]);
+  private navigateToNewParams () {
+    const routeParams = this.buildRouteParams()
+    this.router.navigate(['/videos/list', routeParams])
   }
 }
diff --git a/client/src/app/videos/video-list/video-miniature.component.ts b/client/src/app/videos/video-list/video-miniature.component.ts
index 28601ca7f..1cfeacf36 100644
--- a/client/src/app/videos/video-list/video-miniature.component.ts
+++ b/client/src/app/videos/video-list/video-miniature.component.ts
@@ -1,10 +1,10 @@
-import { Component, Input, Output, EventEmitter } from '@angular/core';
+import { Component, Input, Output, EventEmitter } from '@angular/core'
 
-import { NotificationsService } from 'angular2-notifications';
+import { NotificationsService } from 'angular2-notifications'
 
-import { ConfirmService, ConfigService } from '../../core';
-import { SortField, Video, VideoService } from '../shared';
-import { User } from '../../shared';
+import { ConfirmService, ConfigService } from '../../core'
+import { SortField, Video, VideoService } from '../shared'
+import { User } from '../../shared'
 
 @Component({
   selector: 'my-video-miniature',
@@ -13,25 +13,26 @@ import { User } from '../../shared';
 })
 
 export class VideoMiniatureComponent {
-  @Input() currentSort: SortField;
-  @Input() user: User;
-  @Input() video: Video;
+  @Input() currentSort: SortField
+  @Input() user: User
+  @Input() video: Video
 
-  constructor(
+  constructor (
     private notificationsService: NotificationsService,
     private confirmService: ConfirmService,
     private configService: ConfigService,
     private videoService: VideoService
   ) {}
 
-  getVideoName() {
-    if (this.isVideoNSFWForThisUser())
-      return 'NSFW';
+  getVideoName () {
+    if (this.isVideoNSFWForThisUser()) {
+      return 'NSFW'
+    }
 
-    return this.video.name;
+    return this.video.name
   }
 
-  isVideoNSFWForThisUser() {
-    return this.video.isVideoNSFWForUser(this.user);
+  isVideoNSFWForThisUser () {
+    return this.video.isVideoNSFWForUser(this.user)
   }
 }
diff --git a/client/src/app/videos/video-list/video-sort.component.ts b/client/src/app/videos/video-list/video-sort.component.ts
index 20979a395..64916bf16 100644
--- a/client/src/app/videos/video-list/video-sort.component.ts
+++ b/client/src/app/videos/video-list/video-sort.component.ts
@@ -1,6 +1,6 @@
-import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { Component, EventEmitter, Input, Output } from '@angular/core'
 
-import { SortField } from '../shared';
+import { SortField } from '../shared'
 
 @Component({
   selector: 'my-video-sort',
@@ -8,9 +8,9 @@ import { SortField } from '../shared';
 })
 
 export class VideoSortComponent {
-  @Output() sort = new EventEmitter<any>();
+  @Output() sort = new EventEmitter<any>()
 
-  @Input() currentSort: SortField;
+  @Input() currentSort: SortField
 
   sortChoices: { [ P in SortField ]: string } = {
     'name': 'Name - Asc',
@@ -23,17 +23,17 @@ export class VideoSortComponent {
     '-views': 'Views - Desc',
     'likes': 'Likes - Asc',
     '-likes': 'Likes - Desc'
-  };
+  }
 
-  get choiceKeys() {
-    return Object.keys(this.sortChoices);
+  get choiceKeys () {
+    return Object.keys(this.sortChoices)
   }
 
-  getStringChoice(choiceKey: SortField) {
-    return this.sortChoices[choiceKey];
+  getStringChoice (choiceKey: SortField) {
+    return this.sortChoices[choiceKey]
   }
 
-  onSortChange() {
-    this.sort.emit(this.currentSort);
+  onSortChange () {
+    this.sort.emit(this.currentSort)
   }
 }
diff --git a/client/src/app/videos/video-watch/index.ts b/client/src/app/videos/video-watch/index.ts
index ed0ed2fc0..6e35262d3 100644
--- a/client/src/app/videos/video-watch/index.ts
+++ b/client/src/app/videos/video-watch/index.ts
@@ -1,5 +1,5 @@
-export * from './video-magnet.component';
-export * from './video-share.component';
-export * from './video-report.component';
-export * from './video-watch.component';
-export * from './webtorrent.service';
+export * from './video-magnet.component'
+export * from './video-share.component'
+export * from './video-report.component'
+export * from './video-watch.component'
+export * from './webtorrent.service'
diff --git a/client/src/app/videos/video-watch/video-magnet.component.ts b/client/src/app/videos/video-watch/video-magnet.component.ts
index 894fa45fc..f9432e92c 100644
--- a/client/src/app/videos/video-watch/video-magnet.component.ts
+++ b/client/src/app/videos/video-watch/video-magnet.component.ts
@@ -1,27 +1,27 @@
-import { Component, Input, ViewChild } from '@angular/core';
+import { Component, Input, ViewChild } from '@angular/core'
 
-import { ModalDirective } from 'ngx-bootstrap/modal';
+import { ModalDirective } from 'ngx-bootstrap/modal'
 
-import { Video } from '../shared';
+import { Video } from '../shared'
 
 @Component({
   selector: 'my-video-magnet',
   templateUrl: './video-magnet.component.html'
 })
 export class VideoMagnetComponent {
-  @Input() video: Video = null;
+  @Input() video: Video = null
 
-  @ViewChild('modal') modal: ModalDirective;
+  @ViewChild('modal') modal: ModalDirective
 
-  constructor() {
+  constructor () {
     // empty
   }
 
-  show() {
-    this.modal.show();
+  show () {
+    this.modal.show()
   }
 
-  hide() {
-    this.modal.hide();
+  hide () {
+    this.modal.hide()
   }
 }
diff --git a/client/src/app/videos/video-watch/video-report.component.ts b/client/src/app/videos/video-watch/video-report.component.ts
index 528005b84..61213cd68 100644
--- a/client/src/app/videos/video-watch/video-report.component.ts
+++ b/client/src/app/videos/video-watch/video-report.component.ts
@@ -1,69 +1,69 @@
-import { Component, Input, OnInit, ViewChild } from '@angular/core';
-import { FormBuilder, FormGroup } from '@angular/forms';
+import { Component, Input, OnInit, ViewChild } from '@angular/core'
+import { FormBuilder, FormGroup } from '@angular/forms'
 
-import { ModalDirective } from 'ngx-bootstrap/modal';
-import { NotificationsService } from 'angular2-notifications';
+import { ModalDirective } from 'ngx-bootstrap/modal'
+import { NotificationsService } from 'angular2-notifications'
 
-import { FormReactive, VideoAbuseService, VIDEO_ABUSE_REASON } from '../../shared';
-import { Video, VideoService } from '../shared';
+import { FormReactive, VideoAbuseService, VIDEO_ABUSE_REASON } from '../../shared'
+import { Video, VideoService } from '../shared'
 
 @Component({
   selector: 'my-video-report',
   templateUrl: './video-report.component.html'
 })
 export class VideoReportComponent extends FormReactive implements OnInit {
-  @Input() video: Video = null;
+  @Input() video: Video = null
 
-  @ViewChild('modal') modal: ModalDirective;
+  @ViewChild('modal') modal: ModalDirective
 
-  error: string = null;
-  form: FormGroup;
+  error: string = null
+  form: FormGroup
   formErrors = {
     reason: ''
-  };
+  }
   validationMessages = {
     reason: VIDEO_ABUSE_REASON.MESSAGES
-  };
+  }
 
-  constructor(
+  constructor (
     private formBuilder: FormBuilder,
     private videoAbuseService: VideoAbuseService,
     private notificationsService: NotificationsService
    ) {
-    super();
+    super()
   }
 
-  ngOnInit() {
-    this.buildForm();
+  ngOnInit () {
+    this.buildForm()
   }
 
-  buildForm() {
+  buildForm () {
     this.form = this.formBuilder.group({
       reason: [ '', VIDEO_ABUSE_REASON.VALIDATORS ]
-    });
+    })
 
-    this.form.valueChanges.subscribe(data => this.onValueChanged(data));
+    this.form.valueChanges.subscribe(data => this.onValueChanged(data))
   }
 
-  show() {
-    this.modal.show();
+  show () {
+    this.modal.show()
   }
 
-  hide() {
-    this.modal.hide();
+  hide () {
+    this.modal.hide()
   }
 
-  report() {
-    const reason = this.form.value['reason'];
+  report () {
+    const reason = this.form.value['reason']
 
     this.videoAbuseService.reportVideo(this.video.id, reason)
                           .subscribe(
                             () => {
-                              this.notificationsService.success('Success', 'Video reported.');
-                              this.hide();
+                              this.notificationsService.success('Success', 'Video reported.')
+                              this.hide()
                             },
 
                             err => this.notificationsService.error('Error', err.text)
-                           );
+                           )
   }
 }
diff --git a/client/src/app/videos/video-watch/video-share.component.ts b/client/src/app/videos/video-watch/video-share.component.ts
index aa921afc2..bbd25f5ef 100644
--- a/client/src/app/videos/video-watch/video-share.component.ts
+++ b/client/src/app/videos/video-watch/video-share.component.ts
@@ -1,42 +1,42 @@
-import { Component, Input, ViewChild } from '@angular/core';
+import { Component, Input, ViewChild } from '@angular/core'
 
-import { ModalDirective } from 'ngx-bootstrap/modal';
+import { ModalDirective } from 'ngx-bootstrap/modal'
 
-import { Video } from '../shared';
+import { Video } from '../shared'
 
 @Component({
   selector: 'my-video-share',
   templateUrl: './video-share.component.html'
 })
 export class VideoShareComponent {
-  @Input() video: Video = null;
+  @Input() video: Video = null
 
-  @ViewChild('modal') modal: ModalDirective;
+  @ViewChild('modal') modal: ModalDirective
 
-  constructor() {
+  constructor () {
     // empty
   }
 
-  show() {
-    this.modal.show();
+  show () {
+    this.modal.show()
   }
 
-  hide() {
-    this.modal.hide();
+  hide () {
+    this.modal.hide()
   }
 
-  getVideoIframeCode() {
+  getVideoIframeCode () {
     return '<iframe width="560" height="315" ' +
            'src="' + window.location.origin + '/videos/embed/' + this.video.id + '" ' +
            'frameborder="0" allowfullscreen>' +
-           '</iframe>';
+           '</iframe>'
   }
 
-  getVideoUrl() {
-    return window.location.href;
+  getVideoUrl () {
+    return window.location.href
   }
 
-  notSecure() {
-    return window.location.protocol === 'http:';
+  notSecure () {
+    return window.location.protocol === 'http:'
   }
 }
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 bcfebf2fd..4a547f7e4 100644
--- a/client/src/app/videos/video-watch/video-watch.component.ts
+++ b/client/src/app/videos/video-watch/video-watch.component.ts
@@ -1,18 +1,18 @@
-import { Component, ElementRef, NgZone, OnDestroy, OnInit, ViewChild } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { Observable } from 'rxjs/Observable';
-import { Subscription } from 'rxjs/Subscription';
-
-import * as videojs from 'video.js';
-import { MetaService } from '@nglibs/meta';
-import { NotificationsService } from 'angular2-notifications';
-
-import { AuthService, ConfirmService } from '../../core';
-import { VideoMagnetComponent } from './video-magnet.component';
-import { VideoShareComponent } from './video-share.component';
-import { VideoReportComponent } from './video-report.component';
-import { RateType, Video, VideoService } from '../shared';
-import { WebTorrentService } from './webtorrent.service';
+import { Component, ElementRef, NgZone, OnDestroy, OnInit, ViewChild } from '@angular/core'
+import { ActivatedRoute, Router } from '@angular/router'
+import { Observable } from 'rxjs/Observable'
+import { Subscription } from 'rxjs/Subscription'
+
+import * as videojs from 'video.js'
+import { MetaService } from '@nglibs/meta'
+import { NotificationsService } from 'angular2-notifications'
+
+import { AuthService, ConfirmService } from '../../core'
+import { VideoMagnetComponent } from './video-magnet.component'
+import { VideoShareComponent } from './video-share.component'
+import { VideoReportComponent } from './video-report.component'
+import { RateType, Video, VideoService } from '../shared'
+import { WebTorrentService } from './webtorrent.service'
 
 @Component({
   selector: 'my-video-watch',
@@ -21,30 +21,30 @@ import { WebTorrentService } from './webtorrent.service';
 })
 
 export class VideoWatchComponent implements OnInit, OnDestroy {
-  private static LOADTIME_TOO_LONG = 20000;
-
-  @ViewChild('videoMagnetModal') videoMagnetModal: VideoMagnetComponent;
-  @ViewChild('videoShareModal') videoShareModal: VideoShareComponent;
-  @ViewChild('videoReportModal') videoReportModal: VideoReportComponent;
-
-  downloadSpeed: number;
-  error = false;
-  loading = false;
-  numPeers: number;
-  player: videojs.Player;
-  playerElement: Element;
-  uploadSpeed: number;
-  userRating: RateType = null;
-  video: Video = null;
-  videoNotFound = false;
-
-  private errorTimer: number;
-  private paramsSub: Subscription;
-  private errorsSub: Subscription;
-  private warningsSub: Subscription;
-  private torrentInfosInterval: number;
-
-  constructor(
+  private static LOADTIME_TOO_LONG = 20000
+
+  @ViewChild('videoMagnetModal') videoMagnetModal: VideoMagnetComponent
+  @ViewChild('videoShareModal') videoShareModal: VideoShareComponent
+  @ViewChild('videoReportModal') videoReportModal: VideoReportComponent
+
+  downloadSpeed: number
+  error = false
+  loading = false
+  numPeers: number
+  player: videojs.Player
+  playerElement: Element
+  uploadSpeed: number
+  userRating: RateType = null
+  video: Video = null
+  videoNotFound = false
+
+  private errorTimer: number
+  private paramsSub: Subscription
+  private errorsSub: Subscription
+  private warningsSub: Subscription
+  private torrentInfosInterval: number
+
+  constructor (
     private elementRef: ElementRef,
     private ngZone: NgZone,
     private route: ActivatedRoute,
@@ -57,278 +57,281 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
     private notificationsService: NotificationsService
   ) {}
 
-  ngOnInit() {
+  ngOnInit () {
     this.paramsSub = this.route.params.subscribe(routeParams => {
-      let id = routeParams['id'];
+      let id = routeParams['id']
       this.videoService.getVideo(id).subscribe(
         video => this.onVideoFetched(video),
 
-        error => this.videoNotFound = true
-      );
-    });
+        error => {
+          console.error(error)
+          this.videoNotFound = true
+        }
+      )
+    })
 
-    this.playerElement = this.elementRef.nativeElement.querySelector('#video-container');
+    this.playerElement = this.elementRef.nativeElement.querySelector('#video-container')
 
     const videojsOptions = {
       controls: true,
       autoplay: false
-    };
+    }
 
-    const self = this;
+    const self = this
     videojs(this.playerElement, videojsOptions, function () {
-      self.player = this;
-    });
+      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 => this.notificationsService.error('Error', err.message))
+    this.warningsSub = this.webTorrentService.errors.subscribe(err => this.notificationsService.alert('Warning', err.message))
   }
 
-  ngOnDestroy() {
+  ngOnDestroy () {
     // Remove WebTorrent stuff
-    console.log('Removing video from webtorrent.');
-    window.clearInterval(this.torrentInfosInterval);
-    window.clearTimeout(this.errorTimer);
+    console.log('Removing video from webtorrent.')
+    window.clearInterval(this.torrentInfosInterval)
+    window.clearTimeout(this.errorTimer)
 
     if (this.video !== null && this.webTorrentService.has(this.video.magnetUri)) {
-      this.webTorrentService.remove(this.video.magnetUri);
+      this.webTorrentService.remove(this.video.magnetUri)
     }
 
     // Remove player
-    videojs(this.playerElement).dispose();
+    videojs(this.playerElement).dispose()
 
     // Unsubscribe subscriptions
-    this.paramsSub.unsubscribe();
-    this.errorsSub.unsubscribe();
-    this.warningsSub.unsubscribe();
+    this.paramsSub.unsubscribe()
+    this.errorsSub.unsubscribe()
+    this.warningsSub.unsubscribe()
   }
 
-  loadVideo() {
+  loadVideo () {
     // Reset the error
-    this.error = false;
+    this.error = false
     // We are loading the video
-    this.loading = true;
+    this.loading = true
 
-    console.log('Adding ' + this.video.magnetUri + '.');
+    console.log('Adding ' + this.video.magnetUri + '.')
 
     // The callback might never return if there are network issues
     // 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.errorTimer = window.setTimeout(() => this.loadTooLong(), VideoWatchComponent.LOADTIME_TOO_LONG)
 
     this.webTorrentService.add(this.video.magnetUri, (torrent) => {
       // Clear the error timer
-      window.clearTimeout(this.errorTimer);
+      window.clearTimeout(this.errorTimer)
       // Maybe the error was fired by the timer, so reset it
-      this.error = false;
+      this.error = false
 
       // We are not loading the video anymore
-      this.loading = false;
+      this.loading = false
 
-      console.log('Added ' + this.video.magnetUri + '.');
+      console.log('Added ' + this.video.magnetUri + '.')
       torrent.files[0].renderTo(this.playerElement, { autoplay: true }, (err) => {
         if (err) {
-          this.notificationsService.error('Error', 'Cannot append the file in the video element.');
-          console.error(err);
+          this.notificationsService.error('Error', 'Cannot append the file in the video element.')
+          console.error(err)
         }
-      });
+      })
 
-      this.runInProgress(torrent);
-    });
+      this.runInProgress(torrent)
+    })
   }
 
-  setLike() {
-    if (this.isUserLoggedIn() === false) return;
+  setLike () {
+    if (this.isUserLoggedIn() === false) return
     // Already liked this video
-    if (this.userRating === 'like') return;
+    if (this.userRating === 'like') return
 
     this.videoService.setVideoLike(this.video.id)
                      .subscribe(
                       () => {
                         // Update the video like attribute
-                        this.updateVideoRating(this.userRating, 'like');
-                        this.userRating = 'like';
+                        this.updateVideoRating(this.userRating, 'like')
+                        this.userRating = 'like'
                       },
 
                       err => this.notificationsService.error('Error', err.text)
-                     );
+                     )
   }
 
-  setDislike() {
-    if (this.isUserLoggedIn() === false) return;
+  setDislike () {
+    if (this.isUserLoggedIn() === false) return
     // Already disliked this video
-    if (this.userRating === 'dislike') return;
+    if (this.userRating === 'dislike') return
 
     this.videoService.setVideoDislike(this.video.id)
                      .subscribe(
                       () => {
                         // Update the video dislike attribute
-                        this.updateVideoRating(this.userRating, 'dislike');
-                        this.userRating = 'dislike';
+                        this.updateVideoRating(this.userRating, 'dislike')
+                        this.userRating = 'dislike'
                       },
 
                       err => this.notificationsService.error('Error', err.text)
-                     );
+                     )
   }
 
-  removeVideo(event: Event) {
-    event.preventDefault();
+  removeVideo (event: Event) {
+    event.preventDefault()
 
     this.confirmService.confirm('Do you really want to delete this video?', 'Delete').subscribe(
       res => {
-        if (res === false) return;
+        if (res === false) return
 
         this.videoService.removeVideo(this.video.id)
                          .subscribe(
                            status => {
-                             this.notificationsService.success('Success', `Video ${this.video.name} deleted.`);
+                             this.notificationsService.success('Success', `Video ${this.video.name} deleted.`)
                              // Go back to the video-list.
-                             this.router.navigate(['/videos/list']);
+                             this.router.navigate(['/videos/list'])
                            },
 
                            error => this.notificationsService.error('Error', error.text)
-                          );
+                          )
       }
-    );
+    )
   }
 
-  blacklistVideo(event: Event) {
-    event.preventDefault();
+  blacklistVideo (event: Event) {
+    event.preventDefault()
 
     this.confirmService.confirm('Do you really want to blacklist this video ?', 'Blacklist').subscribe(
       res => {
-        if (res === false) return;
+        if (res === false) return
 
         this.videoService.blacklistVideo(this.video.id)
                          .subscribe(
                            status => {
-                             this.notificationsService.success('Success', `Video ${this.video.name} had been blacklisted.`);
-                             this.router.navigate(['/videos/list']);
+                             this.notificationsService.success('Success', `Video ${this.video.name} had been blacklisted.`)
+                             this.router.navigate(['/videos/list'])
                            },
 
                            error => this.notificationsService.error('Error', error.text)
-                         );
+                         )
       }
-    );
+    )
   }
 
-  showReportModal(event: Event) {
-    event.preventDefault();
-    this.videoReportModal.show();
+  showReportModal (event: Event) {
+    event.preventDefault()
+    this.videoReportModal.show()
   }
 
-  showShareModal() {
-    this.videoShareModal.show();
+  showShareModal () {
+    this.videoShareModal.show()
   }
 
-  showMagnetUriModal(event: Event) {
-    event.preventDefault();
-    this.videoMagnetModal.show();
+  showMagnetUriModal (event: Event) {
+    event.preventDefault()
+    this.videoMagnetModal.show()
   }
 
-  isUserLoggedIn() {
-    return this.authService.isLoggedIn();
+  isUserLoggedIn () {
+    return this.authService.isLoggedIn()
   }
 
-  canUserUpdateVideo() {
-    return this.video.isUpdatableBy(this.authService.getUser());
+  canUserUpdateVideo () {
+    return this.video.isUpdatableBy(this.authService.getUser())
   }
 
-  isVideoRemovable() {
-    return this.video.isRemovableBy(this.authService.getUser());
+  isVideoRemovable () {
+    return this.video.isRemovableBy(this.authService.getUser())
   }
 
-  isVideoBlacklistable() {
-    return this.video.isBlackistableBy(this.authService.getUser());
+  isVideoBlacklistable () {
+    return this.video.isBlackistableBy(this.authService.getUser())
   }
 
-  private checkUserRating() {
+  private checkUserRating () {
     // Unlogged users do not have ratings
-    if (this.isUserLoggedIn() === false) return;
+    if (this.isUserLoggedIn() === false) return
 
     this.videoService.getUserVideoRating(this.video.id)
                      .subscribe(
                        ratingObject => {
                          if (ratingObject) {
-                           this.userRating = ratingObject.rating;
+                           this.userRating = ratingObject.rating
                          }
                        },
 
                        err => this.notificationsService.error('Error', err.text)
-                      );
+                      )
   }
 
-  private onVideoFetched(video: Video) {
-    this.video = video;
+  private onVideoFetched (video: Video) {
+    this.video = video
 
-    let observable;
+    let observable
     if (this.video.isVideoNSFWForUser(this.authService.getUser())) {
-      observable = this.confirmService.confirm('This video is not safe for work. Are you sure you want to watch it?', 'NSFW');
+      observable = this.confirmService.confirm('This video is not safe for work. Are you sure you want to watch it?', 'NSFW')
     } else {
-      observable = Observable.of(true);
+      observable = Observable.of(true)
     }
 
     observable.subscribe(
       res => {
         if (res === false) {
-          return this.router.navigate([ '/videos/list' ]);
+          return this.router.navigate([ '/videos/list' ])
         }
 
-        this.setOpenGraphTags();
-        this.loadVideo();
-        this.checkUserRating();
+        this.setOpenGraphTags()
+        this.loadVideo()
+        this.checkUserRating()
       }
-    );
+    )
   }
 
-  private updateVideoRating(oldRating: RateType, newRating: RateType) {
-    let likesToIncrement = 0;
-    let dislikesToIncrement = 0;
+  private updateVideoRating (oldRating: RateType, newRating: RateType) {
+    let likesToIncrement = 0
+    let dislikesToIncrement = 0
 
     if (oldRating) {
-      if (oldRating === 'like') likesToIncrement--;
-      if (oldRating === 'dislike') dislikesToIncrement--;
+      if (oldRating === 'like') likesToIncrement--
+      if (oldRating === 'dislike') dislikesToIncrement--
     }
 
-    if (newRating === 'like') likesToIncrement++;
-    if (newRating === 'dislike') dislikesToIncrement++;
+    if (newRating === 'like') likesToIncrement++
+    if (newRating === 'dislike') dislikesToIncrement++
 
-    this.video.likes += likesToIncrement;
-    this.video.dislikes += dislikesToIncrement;
+    this.video.likes += likesToIncrement
+    this.video.dislikes += dislikesToIncrement
   }
 
-  private loadTooLong() {
-    this.error = true;
-    console.error('The video load seems to be abnormally long.');
+  private loadTooLong () {
+    this.error = true
+    console.error('The video load seems to be abnormally long.')
   }
 
-  private setOpenGraphTags() {
-    this.metaService.setTitle(this.video.name);
+  private setOpenGraphTags () {
+    this.metaService.setTitle(this.video.name)
 
-    this.metaService.setTag('og:type', 'video');
+    this.metaService.setTag('og:type', 'video')
 
-    this.metaService.setTag('og:title', this.video.name);
-    this.metaService.setTag('name', this.video.name);
+    this.metaService.setTag('og:title', this.video.name)
+    this.metaService.setTag('name', this.video.name)
 
-    this.metaService.setTag('og:description', this.video.description);
-    this.metaService.setTag('description', this.video.description);
+    this.metaService.setTag('og:description', this.video.description)
+    this.metaService.setTag('description', this.video.description)
 
-    this.metaService.setTag('og:image', this.video.thumbnailPath);
+    this.metaService.setTag('og:image', this.video.thumbnailPath)
 
-    this.metaService.setTag('og:duration', this.video.duration.toString());
+    this.metaService.setTag('og:duration', this.video.duration.toString())
 
-    this.metaService.setTag('og:site_name', 'PeerTube');
+    this.metaService.setTag('og:site_name', 'PeerTube')
 
-    this.metaService.setTag('og:url', window.location.href);
-    this.metaService.setTag('url', window.location.href);
+    this.metaService.setTag('og:url', window.location.href)
+    this.metaService.setTag('url', window.location.href)
   }
 
-  private runInProgress(torrent: any) {
+  private runInProgress (torrent: any) {
     // Refresh each second
     this.torrentInfosInterval = window.setInterval(() => {
       this.ngZone.run(() => {
-        this.downloadSpeed = torrent.downloadSpeed;
-        this.numPeers = torrent.numPeers;
-        this.uploadSpeed = torrent.uploadSpeed;
-      });
-    }, 1000);
+        this.downloadSpeed = torrent.downloadSpeed
+        this.numPeers = torrent.numPeers
+        this.uploadSpeed = torrent.uploadSpeed
+      })
+    }, 1000)
   }
 }
diff --git a/client/src/app/videos/video-watch/webtorrent.service.ts b/client/src/app/videos/video-watch/webtorrent.service.ts
index 8936e7992..211894bfd 100644
--- a/client/src/app/videos/video-watch/webtorrent.service.ts
+++ b/client/src/app/videos/video-watch/webtorrent.service.ts
@@ -1,33 +1,33 @@
-import { Injectable } from '@angular/core';
-import { Subject } from 'rxjs/Subject';
+import { Injectable } from '@angular/core'
+import { Subject } from 'rxjs/Subject'
 
-import * as WebTorrent from 'webtorrent';
+import * as WebTorrent from 'webtorrent'
 
 @Injectable()
 export class WebTorrentService {
-  errors = new Subject<Error>();
-  warnings = new Subject<Error>();
+  errors = new Subject<Error>()
+  warnings = new Subject<Error>()
 
   // TODO: use WebTorrent @type
-  // private client: WebTorrent.Client;
-  private client: any;
+  // private client: WebTorrent.Client
+  private client: any
 
-  constructor() {
-    this.client = new WebTorrent({ dht: false });
+  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))
+    this.client.on('warning', (err) => this.warnings.next(err))
   }
 
-  add(magnetUri: string, callback: Function) {
-    return this.client.add(magnetUri, callback);
+  add (magnetUri: string, callback: Function) {
+    return this.client.add(magnetUri, callback)
   }
 
-  remove(magnetUri: string) {
-    return this.client.remove(magnetUri);
+  remove (magnetUri: string) {
+    return this.client.remove(magnetUri)
   }
 
-  has(magnetUri: string) {
-    return this.client.get(magnetUri) !== null;
+  has (magnetUri: string) {
+    return this.client.get(magnetUri) !== null
   }
 }
diff --git a/client/src/app/videos/videos-routing.module.ts b/client/src/app/videos/videos-routing.module.ts
index 70968b4d1..7d002abde 100644
--- a/client/src/app/videos/videos-routing.module.ts
+++ b/client/src/app/videos/videos-routing.module.ts
@@ -1,10 +1,10 @@
-import { NgModule } from '@angular/core';
-import { RouterModule, Routes } from '@angular/router';
+import { NgModule } from '@angular/core'
+import { RouterModule, Routes } from '@angular/router'
 
-import { VideoAddComponent, VideoUpdateComponent } from './video-edit';
-import { VideoListComponent } from './video-list';
-import { VideosComponent } from './videos.component';
-import { VideoWatchComponent } from './video-watch';
+import { VideoAddComponent, VideoUpdateComponent } from './video-edit'
+import { VideoListComponent } from './video-list'
+import { VideosComponent } from './videos.component'
+import { VideoWatchComponent } from './video-watch'
 
 const videosRoutes: Routes = [
   {
@@ -48,7 +48,7 @@ const videosRoutes: Routes = [
       }
     ]
   }
-];
+]
 
 @NgModule({
   imports: [ RouterModule.forChild(videosRoutes) ],
diff --git a/client/src/app/videos/videos.component.ts b/client/src/app/videos/videos.component.ts
index 591e7523d..972c2221f 100644
--- a/client/src/app/videos/videos.component.ts
+++ b/client/src/app/videos/videos.component.ts
@@ -1,4 +1,4 @@
-import { Component } from '@angular/core';
+import { Component } from '@angular/core'
 
 @Component({
   template: '<router-outlet></router-outlet>'
diff --git a/client/src/app/videos/videos.module.ts b/client/src/app/videos/videos.module.ts
index adfbe7031..75a8dd24f 100644
--- a/client/src/app/videos/videos.module.ts
+++ b/client/src/app/videos/videos.module.ts
@@ -1,20 +1,20 @@
-import { NgModule } from '@angular/core';
+import { NgModule } from '@angular/core'
 
-import { TagInputModule } from 'ng2-tag-input';
+import { TagInputModule } from 'ng2-tag-input'
 
-import { VideosRoutingModule } from './videos-routing.module';
-import { VideosComponent } from './videos.component';
-import { VideoAddComponent, VideoUpdateComponent } from './video-edit';
-import { LoaderComponent, VideoListComponent, VideoMiniatureComponent, VideoSortComponent } from './video-list';
+import { VideosRoutingModule } from './videos-routing.module'
+import { VideosComponent } from './videos.component'
+import { VideoAddComponent, VideoUpdateComponent } from './video-edit'
+import { LoaderComponent, VideoListComponent, VideoMiniatureComponent, VideoSortComponent } from './video-list'
 import {
   VideoWatchComponent,
   VideoMagnetComponent,
   VideoReportComponent,
   VideoShareComponent,
   WebTorrentService
-} from './video-watch';
-import { VideoService } from './shared';
-import { SharedModule } from '../shared';
+} from './video-watch'
+import { VideoService } from './shared'
+import { SharedModule } from '../shared'
 
 @NgModule({
   imports: [