From 198b205c10dba362b9ae1ef6895b29d7e0dd685f Mon Sep 17 00:00:00 2001 From: Green-Star Date: Wed, 26 Apr 2017 21:22:10 +0200 Subject: Add ability for an administrator to remove any video (#61) * Add ability for an admin to remove every video on the pod. * Server: add BlacklistedVideos relation. * Server: Insert in BlacklistedVideos relation upon deletion of a video. * Server: Modify BlacklistedVideos schema to add Pod id information. * Server: Moving insertion of a blacklisted video from the `afterDestroy` hook into the process of deletion of a video. To avoid inserting a video when it is removed on its origin pod. When a video is removed on its origin pod, the `afterDestroy` hook is fire, but no request is made on the delete('/:videoId') interface. Hence, we insert into `BlacklistedVideos` only on request on delete('/:videoId') (if requirements for insertion are met). * Server: Add removeVideoFromBlacklist hook on deletion of a video. We are going to proceed in another way :). We will add a new route : /:videoId/blacklist to blacklist a video. We do not blacklist a video upon its deletion now (to distinguish a video blacklist from a regular video delete) When we blacklist a video, the video remains in the DB, so we don't have any concern about its update. It just doesn't appear in the video list. When we remove a video, we then have to remove it from the blacklist too. We could also remove a video from the blacklist to 'unremove' it and make it appear again in the video list (will be another feature). * Server: Add handler for new route post(/:videoId/blacklist) * Client: Add isBlacklistable method * Client: Update isRemovableBy method. * Client: Move 'Delete video' feature from the video-list to the video-watch module. * Server: Exclude blacklisted videos from the video list * Server: Use findAll() in BlacklistedVideos.list() method * Server: Fix addVideoToBlacklist function. * Client: Add blacklist feature. * Server: Use JavaScript Standard Style. * Server: In checkUserCanDeleteVideo, move the callback call inside the db callback function * Server: Modify BlacklistVideo relation * Server: Modifiy Videos methods. * Server: Add checkVideoIsBlacklistable method * Server: Rewrite addVideoToBlacklist method * Server: Fix checkVideoIsBlacklistable method * Server: Add return to addVideoToBlacklist method --- client/src/app/videos/shared/video.model.ts | 8 +++- client/src/app/videos/shared/video.service.ts | 6 +++ .../app/videos/video-list/video-list.component.ts | 5 --- .../video-list/video-miniature.component.html | 4 -- .../video-list/video-miniature.component.scss | 14 ------- .../videos/video-list/video-miniature.component.ts | 20 --------- .../videos/video-watch/video-watch.component.html | 12 ++++++ .../videos/video-watch/video-watch.component.ts | 47 ++++++++++++++++++++++ 8 files changed, 71 insertions(+), 45 deletions(-) (limited to 'client/src/app') diff --git a/client/src/app/videos/shared/video.model.ts b/client/src/app/videos/shared/video.model.ts index 404e3bf45..1cfb312b6 100644 --- a/client/src/app/videos/shared/video.model.ts +++ b/client/src/app/videos/shared/video.model.ts @@ -85,8 +85,12 @@ export class Video { this.by = Video.createByString(hash.author, hash.podHost); } - isRemovableBy(user: User) { - return this.isLocal === true && user && this.author === user.username; + isRemovableBy(user) { + return user && this.isLocal === true && (this.author === user.username || user.isAdmin() === true); + } + + isBlackistableBy(user) { + return user && user.isAdmin() === true && this.isLocal === false; } isVideoNSFWForUser(user: User) { diff --git a/client/src/app/videos/shared/video.service.ts b/client/src/app/videos/shared/video.service.ts index ee67bc1ae..a0965e20c 100644 --- a/client/src/app/videos/shared/video.service.ts +++ b/client/src/app/videos/shared/video.service.ts @@ -150,6 +150,12 @@ export class VideoService { .catch((res) => this.restExtractor.handleError(res)); } + blacklistVideo(id: string) { + return this.authHttp.post(VideoService.BASE_VIDEO_URL + id + '/blacklist', {}) + .map(this.restExtractor.extractDataBool) + .catch((res) => this.restExtractor.handleError(res)); + } + private setVideoRate(id: string, rateType: RateType) { const url = VideoService.BASE_VIDEO_URL + id + '/rate'; const body = { 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 ede1b51a9..b9f19b4f1 100644 --- a/client/src/app/videos/video-list/video-list.component.ts +++ b/client/src/app/videos/video-list/video-list.component.ts @@ -108,11 +108,6 @@ export class VideoListComponent implements OnInit, OnDestroy { this.navigateToNewParams(); } - onRemoved(video: Video) { - this.notificationsService.success('Success', `Video ${video.name} deleted.`); - this.getVideos(); - } - onSort(sort: SortField) { this.sort = sort; diff --git a/client/src/app/videos/video-list/video-miniature.component.html b/client/src/app/videos/video-list/video-miniature.component.html index 94b892698..b8b448631 100644 --- a/client/src/app/videos/video-list/video-miniature.component.html +++ b/client/src/app/videos/video-list/video-miniature.component.html @@ -10,10 +10,6 @@ {{ video.duration }} -
diff --git a/client/src/app/videos/video-list/video-miniature.component.scss b/client/src/app/videos/video-list/video-miniature.component.scss index b8e90e8c5..f88ced819 100644 --- a/client/src/app/videos/video-list/video-miniature.component.scss +++ b/client/src/app/videos/video-list/video-miniature.component.scss @@ -42,20 +42,6 @@ } } - .video-miniature-remove { - display: inline-block; - position: absolute; - left: 16px; - background-color: rgba(0, 0, 0, 0.8); - color: rgba(255, 255, 255, 0.8); - padding: 2px; - cursor: pointer; - - &:hover { - color: rgba(255, 255, 255, 0.9); - } - } - .video-miniature-informations { width: 200px; 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 888026dde..13deec381 100644 --- a/client/src/app/videos/video-list/video-miniature.component.ts +++ b/client/src/app/videos/video-list/video-miniature.component.ts @@ -13,8 +13,6 @@ import { User } from '../../shared'; }) export class VideoMiniatureComponent { - @Output() removed = new EventEmitter(); - @Input() currentSort: SortField; @Input() user: User; @Input() video: Video; @@ -28,10 +26,6 @@ export class VideoMiniatureComponent { private videoService: VideoService ) {} - displayRemoveIcon() { - return this.hovering && this.video.isRemovableBy(this.user); - } - getVideoName() { if (this.isVideoNSFWForThisUser()) return 'NSFW'; @@ -47,20 +41,6 @@ export class VideoMiniatureComponent { this.hovering = true; } - removeVideo(id: string) { - this.confirmService.confirm('Do you really want to delete this video?', 'Delete').subscribe( - res => { - if (res === false) return; - - this.videoService.removeVideo(id).subscribe( - status => this.removed.emit(true), - - error => this.notificationsService.error('Error', error.text) - ); - } - ); - } - isVideoNSFWForThisUser() { return this.video.isVideoNSFWForUser(this.user); } diff --git a/client/src/app/videos/video-watch/video-watch.component.html b/client/src/app/videos/video-watch/video-watch.component.html index 19e9bd9ed..ed26b513e 100644 --- a/client/src/app/videos/video-watch/video-watch.component.html +++ b/client/src/app/videos/video-watch/video-watch.component.html @@ -96,6 +96,18 @@ Report + +
  • + + Delete + +
    • + +
  • + + Blacklist + +
    • 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 e04626a67..f582df45c 100644 --- a/client/src/app/videos/video-watch/video-watch.component.ts +++ b/client/src/app/videos/video-watch/video-watch.component.ts @@ -169,6 +169,45 @@ export class VideoWatchComponent implements OnInit, OnDestroy { ); } + removeVideo(event: Event) { + event.preventDefault(); + this.confirmService.confirm('Do you really want to delete this video?', 'Delete').subscribe( + res => { + if (res === false) return; + + this.videoService.removeVideo(this.video.id) + .subscribe( + status => { + this.notificationsService.success('Success', `Video ${this.video.name} deleted.`) + // Go back to the video-list. + this.router.navigate(['/videos/list']) + }, + + error => this.notificationsService.error('Error', error.text) + ); + } + ); + } + + blacklistVideo(event: Event) { + event.preventDefault() + this.confirmService.confirm('Do you really want to blacklist this video ?', 'Blacklist').subscribe( + res => { + 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']) + }, + + error => this.notificationsService.error('Error', error.text) + ) + } + ) + } + showReportModal(event: Event) { event.preventDefault(); this.videoReportModal.show(); @@ -192,6 +231,14 @@ export class VideoWatchComponent implements OnInit, OnDestroy { this.authService.getUser().username === this.video.author; } + isVideoRemovable() { + return this.video.isRemovableBy(this.authService.getUser()); + } + + isVideoBlacklistable() { + return this.video.isBlackistableBy(this.authService.getUser()); + } + private checkUserRating() { // Unlogged users do not have ratings if (this.isUserLoggedIn() === false) return; -- cgit v1.2.3