From 3487330d308166afb542cbacae0475693c0b059e Mon Sep 17 00:00:00 2001 From: Rigel Kent Date: Tue, 9 Jun 2020 16:07:10 +0200 Subject: preserve original variable names server-side --- client/src/app/+admin/admin.component.ts | 2 +- client/src/app/+admin/moderation/moderation.component.ts | 2 +- client/src/app/+admin/moderation/moderation.routes.ts | 2 +- .../video-abuse-list/video-abuse-list.component.ts | 4 ++-- .../video-block-list/video-block-list.component.ts | 14 +++++++------- .../app/+admin/users/user-edit/user-create.component.ts | 2 +- .../app/+admin/users/user-edit/user-edit.component.html | 2 +- client/src/app/+admin/users/user-edit/user-edit.ts | 2 +- .../app/+admin/users/user-edit/user-update.component.ts | 4 ++-- .../my-account-notification-preferences.component.ts | 2 +- client/src/app/menu/menu.component.ts | 4 ++-- client/src/app/shared/users/user-notification.model.ts | 6 +++--- .../src/app/shared/users/user-notifications.component.html | 8 ++++---- client/src/app/shared/video-block/video-block.service.ts | 12 ++++++------ client/src/app/shared/video/video.model.ts | 4 ++-- .../src/app/videos/+video-watch/video-watch.component.ts | 4 ++-- 16 files changed, 37 insertions(+), 37 deletions(-) (limited to 'client') diff --git a/client/src/app/+admin/admin.component.ts b/client/src/app/+admin/admin.component.ts index 4cf3da0e8..a97a33cf5 100644 --- a/client/src/app/+admin/admin.component.ts +++ b/client/src/app/+admin/admin.component.ts @@ -37,7 +37,7 @@ export class AdminComponent implements OnInit { } hasVideoBlocklistRight () { - return this.auth.getUser().hasRight(UserRight.MANAGE_VIDEO_BLOCKS) + return this.auth.getUser().hasRight(UserRight.MANAGE_VIDEO_BLACKLIST) } hasConfigRight () { diff --git a/client/src/app/+admin/moderation/moderation.component.ts b/client/src/app/+admin/moderation/moderation.component.ts index d48305eed..1b1df6f09 100644 --- a/client/src/app/+admin/moderation/moderation.component.ts +++ b/client/src/app/+admin/moderation/moderation.component.ts @@ -25,7 +25,7 @@ export class ModerationComponent implements OnInit { } hasVideoBlocklistRight () { - return this.auth.getUser().hasRight(UserRight.MANAGE_VIDEO_BLOCKS) + return this.auth.getUser().hasRight(UserRight.MANAGE_VIDEO_BLACKLIST) } hasAccountsBlocklistRight () { diff --git a/client/src/app/+admin/moderation/moderation.routes.ts b/client/src/app/+admin/moderation/moderation.routes.ts index aeb555c4a..c08333f17 100644 --- a/client/src/app/+admin/moderation/moderation.routes.ts +++ b/client/src/app/+admin/moderation/moderation.routes.ts @@ -57,7 +57,7 @@ export const ModerationRoutes: Routes = [ component: VideoBlockListComponent, canActivate: [ UserRightGuard ], data: { - userRight: UserRight.MANAGE_VIDEO_BLOCKS, + userRight: UserRight.MANAGE_VIDEO_BLACKLIST, meta: { title: 'Videos blocked' } diff --git a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts index ca37bccf3..a36acc2ab 100644 --- a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts +++ b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts @@ -107,7 +107,7 @@ export class VideoAbuseListComponent extends RestTable implements OnInit, AfterV this.videoBlocklistService.blockVideo(videoAbuse.video.id, undefined, true) .subscribe( () => { - this.notifier.success(this.i18n('Video blocklisted.')) + this.notifier.success(this.i18n('Video blocked.')) this.updateVideoAbuseState(videoAbuse, VideoAbuseState.ACCEPTED) }, @@ -123,7 +123,7 @@ export class VideoAbuseListComponent extends RestTable implements OnInit, AfterV this.videoBlocklistService.unblockVideo(videoAbuse.video.id) .subscribe( () => { - this.notifier.success(this.i18n('Video unblocklisted.')) + this.notifier.success(this.i18n('Video unblocked.')) this.updateVideoAbuseState(videoAbuse, VideoAbuseState.ACCEPTED) }, diff --git a/client/src/app/+admin/moderation/video-block-list/video-block-list.component.ts b/client/src/app/+admin/moderation/video-block-list/video-block-list.component.ts index e72ab5348..7b3691332 100644 --- a/client/src/app/+admin/moderation/video-block-list/video-block-list.component.ts +++ b/client/src/app/+admin/moderation/video-block-list/video-block-list.component.ts @@ -3,7 +3,7 @@ import { SortMeta } from 'primeng/api' import { Notifier, ServerService } from '@app/core' import { ConfirmService } from '../../../core' import { RestPagination, RestTable, VideoBlockService } from '../../../shared' -import { VideoBlocklist, VideoBlockType } from '../../../../../../shared' +import { VideoBlacklist, VideoBlacklistType } from '../../../../../../shared' import { I18n } from '@ngx-translate/i18n-polyfill' import { DropdownAction } from '../../../shared/buttons/action-dropdown.component' import { Video } from '../../../shared/video/video.model' @@ -18,13 +18,13 @@ import { VideoService } from '@app/shared/video/video.service' styleUrls: [ '../moderation.component.scss', './video-block-list.component.scss' ] }) export class VideoBlockListComponent extends RestTable implements OnInit { - blocklist: (VideoBlocklist & { reasonHtml?: string })[] = [] + blocklist: (VideoBlacklist & { reasonHtml?: string })[] = [] totalRecords = 0 sort: SortMeta = { field: 'createdAt', order: -1 } pagination: RestPagination = { count: this.rowsPerPage, start: 0 } - listBlockTypeFilter: VideoBlockType = undefined + blocklistTypeFilter: VideoBlacklistType = undefined - videoBlocklistActions: DropdownAction[][] = [] + videoBlocklistActions: DropdownAction[][] = [] constructor ( private notifier: Notifier, @@ -99,7 +99,7 @@ export class VideoBlockListComponent extends RestTable implements OnInit { .subscribe(config => { // don't filter if auto-blacklist is not enabled as this will be the only list if (config.autoBlacklist.videos.ofUsers.enabled) { - this.listBlockTypeFilter = VideoBlockType.MANUAL + this.blocklistTypeFilter = VideoBlacklistType.MANUAL } }) @@ -141,7 +141,7 @@ export class VideoBlockListComponent extends RestTable implements OnInit { return 'VideoBlockListComponent' } - getVideoUrl (videoBlock: VideoBlocklist) { + getVideoUrl (videoBlock: VideoBlacklist) { return Video.buildClientUrl(videoBlock.video.uuid) } @@ -155,7 +155,7 @@ export class VideoBlockListComponent extends RestTable implements OnInit { return this.markdownRenderer.textMarkdownToHTML(text) } - async unblockVideo (entry: VideoBlocklist) { + async unblockVideo (entry: VideoBlacklist) { const confirmMessage = this.i18n( 'Do you really want to unblock this video? It will be available again in the videos list.' ) diff --git a/client/src/app/+admin/users/user-edit/user-create.component.ts b/client/src/app/+admin/users/user-edit/user-create.component.ts index a394418cb..b459eb8fa 100644 --- a/client/src/app/+admin/users/user-edit/user-create.component.ts +++ b/client/src/app/+admin/users/user-edit/user-create.component.ts @@ -52,7 +52,7 @@ export class UserCreateComponent extends UserEdit implements OnInit { role: this.userValidatorsService.USER_ROLE, videoQuota: this.userValidatorsService.USER_VIDEO_QUOTA, videoQuotaDaily: this.userValidatorsService.USER_VIDEO_QUOTA_DAILY, - byPassAutoBlacklist: null + byPassAutoBlock: null }, defaultValues) } diff --git a/client/src/app/+admin/users/user-edit/user-edit.component.html b/client/src/app/+admin/users/user-edit/user-edit.component.html index d30a606d6..0454df7b7 100644 --- a/client/src/app/+admin/users/user-edit/user-edit.component.html +++ b/client/src/app/+admin/users/user-edit/user-edit.component.html @@ -164,7 +164,7 @@
diff --git a/client/src/app/+admin/users/user-edit/user-edit.ts b/client/src/app/+admin/users/user-edit/user-edit.ts index 98249bcc1..5f5cc590c 100644 --- a/client/src/app/+admin/users/user-edit/user-edit.ts +++ b/client/src/app/+admin/users/user-edit/user-edit.ts @@ -88,7 +88,7 @@ export abstract class UserEdit extends FormReactive implements OnInit { } protected buildAdminFlags (formValue: any) { - return formValue.byPassAutoBlacklist ? UserAdminFlag.BYPASS_VIDEO_AUTO_BLOCK : UserAdminFlag.NONE + return formValue.byPassAutoBlock ? UserAdminFlag.BYPASS_VIDEO_AUTO_BLACKLIST : UserAdminFlag.NONE } protected buildQuotaOptions () { diff --git a/client/src/app/+admin/users/user-edit/user-update.component.ts b/client/src/app/+admin/users/user-edit/user-update.component.ts index f2bd8c8ec..035c0d4bb 100644 --- a/client/src/app/+admin/users/user-edit/user-update.component.ts +++ b/client/src/app/+admin/users/user-edit/user-update.component.ts @@ -56,7 +56,7 @@ export class UserUpdateComponent extends UserEdit implements OnInit, OnDestroy { role: this.userValidatorsService.USER_ROLE, videoQuota: this.userValidatorsService.USER_VIDEO_QUOTA, videoQuotaDaily: this.userValidatorsService.USER_VIDEO_QUOTA_DAILY, - byPassAutoBlacklist: null + byPassAutoBlock: null }, defaultValues) this.paramsSub = this.route.params.subscribe(routeParams => { @@ -125,7 +125,7 @@ export class UserUpdateComponent extends UserEdit implements OnInit, OnDestroy { role: userJson.role.toString(), videoQuota: userJson.videoQuota, videoQuotaDaily: userJson.videoQuotaDaily, - byPassAutoBlacklist: userJson.adminFlags & UserAdminFlag.BYPASS_VIDEO_AUTO_BLOCK + byPassAutoBlock: userJson.adminFlags & UserAdminFlag.BYPASS_VIDEO_AUTO_BLACKLIST }) } } diff --git a/client/src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts b/client/src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts index 72e26ac28..af17a0352 100644 --- a/client/src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts +++ b/client/src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts @@ -49,7 +49,7 @@ export class MyAccountNotificationPreferencesComponent implements OnInit { this.rightNotifications = { videoAbuseAsModerator: UserRight.MANAGE_VIDEO_ABUSES, - videoAutoBlacklistAsModerator: UserRight.MANAGE_VIDEO_BLOCKS, + videoAutoBlacklistAsModerator: UserRight.MANAGE_VIDEO_BLACKLIST, newUserRegistration: UserRight.MANAGE_USERS, newInstanceFollower: UserRight.MANAGE_SERVER_FOLLOW, autoInstanceFollowing: UserRight.MANAGE_CONFIGURATION diff --git a/client/src/app/menu/menu.component.ts b/client/src/app/menu/menu.component.ts index 79bf29e9c..ba3342541 100644 --- a/client/src/app/menu/menu.component.ts +++ b/client/src/app/menu/menu.component.ts @@ -33,7 +33,7 @@ export class MenuComponent implements OnInit { [UserRight.MANAGE_USERS]: '/admin/users', [UserRight.MANAGE_SERVER_FOLLOW]: '/admin/friends', [UserRight.MANAGE_VIDEO_ABUSES]: '/admin/moderation/video-abuses', - [UserRight.MANAGE_VIDEO_BLOCKS]: '/admin/moderation/video-blocks', + [UserRight.MANAGE_VIDEO_BLACKLIST]: '/admin/moderation/video-blocks', [UserRight.MANAGE_JOBS]: '/admin/jobs', [UserRight.MANAGE_CONFIGURATION]: '/admin/config' } @@ -131,7 +131,7 @@ export class MenuComponent implements OnInit { UserRight.MANAGE_USERS, UserRight.MANAGE_SERVER_FOLLOW, UserRight.MANAGE_VIDEO_ABUSES, - UserRight.MANAGE_VIDEO_BLOCKS, + UserRight.MANAGE_VIDEO_BLACKLIST, UserRight.MANAGE_JOBS, UserRight.MANAGE_CONFIGURATION ] diff --git a/client/src/app/shared/users/user-notification.model.ts b/client/src/app/shared/users/user-notification.model.ts index bc1861c64..7b8368d87 100644 --- a/client/src/app/shared/users/user-notification.model.ts +++ b/client/src/app/shared/users/user-notification.model.ts @@ -96,7 +96,7 @@ export class UserNotification implements UserNotificationServer { this.videoUrl = this.buildVideoUrl(this.video) break - case UserNotificationType.UNBLOCK_ON_MY_VIDEO: + case UserNotificationType.UNBLACKLIST_ON_MY_VIDEO: this.videoUrl = this.buildVideoUrl(this.video) break @@ -112,7 +112,7 @@ export class UserNotification implements UserNotificationServer { this.videoUrl = this.buildVideoUrl(this.videoAbuse.video) break - case UserNotificationType.VIDEO_AUTO_BLOCK_FOR_MODERATORS: + case UserNotificationType.VIDEO_AUTO_BLACKLIST_FOR_MODERATORS: this.videoAutoBlacklistUrl = '/admin/moderation/video-auto-blacklist/list' // Backward compatibility where we did not assign videoBlacklist to this type of notification before if (!this.videoBlacklist) this.videoBlacklist = { id: null, video: this.video } @@ -120,7 +120,7 @@ export class UserNotification implements UserNotificationServer { this.videoUrl = this.buildVideoUrl(this.videoBlacklist.video) break - case UserNotificationType.BLOCK_ON_MY_VIDEO: + case UserNotificationType.BLACKLIST_ON_MY_VIDEO: this.videoUrl = this.buildVideoUrl(this.videoBlacklist.video) break diff --git a/client/src/app/shared/users/user-notifications.component.html b/client/src/app/shared/users/user-notifications.component.html index 5a102995a..c6037f0a9 100644 --- a/client/src/app/shared/users/user-notifications.component.html +++ b/client/src/app/shared/users/user-notifications.component.html @@ -26,7 +26,7 @@ - +
@@ -34,7 +34,7 @@
- +
@@ -50,11 +50,11 @@
- +
- The recently added video {{ notification.videoBlacklist.video.name }} has been auto-blocked + The recently added video {{ notification.videoBlacklist.video.name }} has been automatically blocked
diff --git a/client/src/app/shared/video-block/video-block.service.ts b/client/src/app/shared/video-block/video-block.service.ts index 67ca1d85b..31ccc84ea 100644 --- a/client/src/app/shared/video-block/video-block.service.ts +++ b/client/src/app/shared/video-block/video-block.service.ts @@ -3,7 +3,7 @@ import { HttpClient, HttpParams } from '@angular/common/http' import { Injectable } from '@angular/core' import { SortMeta } from 'primeng/api' import { from as observableFrom, Observable } from 'rxjs' -import { VideoBlocklist, VideoBlockType, ResultList } from '../../../../../shared' +import { VideoBlacklist, VideoBlacklistType, ResultList } from '../../../../../shared' import { environment } from '../../../environments/environment' import { RestExtractor, RestPagination, RestService } from '../rest' @@ -21,8 +21,8 @@ export class VideoBlockService { pagination: RestPagination sort: SortMeta search?: string - type?: VideoBlockType - }): Observable> { + type?: VideoBlacklistType + }): Observable> { const { pagination, sort, search, type } = options let params = new HttpParams() @@ -33,8 +33,8 @@ export class VideoBlockService { type: { prefix: 'type:', handler: v => { - if (v === 'manual') return VideoBlockType.MANUAL - if (v === 'auto') return VideoBlockType.AUTO_BEFORE_PUBLISHED + if (v === 'manual') return VideoBlacklistType.MANUAL + if (v === 'auto') return VideoBlacklistType.AUTO_BEFORE_PUBLISHED return undefined } @@ -44,7 +44,7 @@ export class VideoBlockService { params = this.restService.addObjectParams(params, filters) } - return this.authHttp.get>(VideoBlockService.BASE_VIDEOS_URL + 'blacklist', { params }) + return this.authHttp.get>(VideoBlockService.BASE_VIDEOS_URL + 'blacklist', { params }) .pipe( map(res => this.restExtractor.convertResultListDateToHuman(res)), catchError(res => this.restExtractor.handleError(res)) diff --git a/client/src/app/shared/video/video.model.ts b/client/src/app/shared/video/video.model.ts index 2b3d915ef..16e43cbd8 100644 --- a/client/src/app/shared/video/video.model.ts +++ b/client/src/app/shared/video/video.model.ts @@ -164,11 +164,11 @@ export class Video implements VideoServerModel { } isBlockableBy (user: AuthUser) { - return this.blacklisted !== true && user && user.hasRight(UserRight.MANAGE_VIDEO_BLOCKS) === true + return this.blacklisted !== true && user && user.hasRight(UserRight.MANAGE_VIDEO_BLACKLIST) === true } isUnblockableBy (user: AuthUser) { - return this.blacklisted === true && user && user.hasRight(UserRight.MANAGE_VIDEO_BLOCKS) === true + return this.blacklisted === true && user && user.hasRight(UserRight.MANAGE_VIDEO_BLACKLIST) === true } isUpdatableBy (user: AuthUser) { 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 9f726cf35..df0c1058c 100644 --- a/client/src/app/videos/+video-watch/video-watch.component.ts +++ b/client/src/app/videos/+video-watch/video-watch.component.ts @@ -335,7 +335,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy { this.videoCaptionService.listCaptions(videoId) ]) .pipe( - // If 401, the video is private or blocklisted so redirect to 404 + // If 401, the video is private or blocked so redirect to 404 catchError(err => this.restExtractor.redirectTo404IfNotFound(err, [ 400, 401, 403, 404 ])) ) .subscribe(([ video, captionsResult ]) => { @@ -364,7 +364,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy { this.playlistService.getVideoPlaylist(playlistId) .pipe( - // If 401, the video is private or blocklisted so redirect to 404 + // If 401, the video is private or blocked so redirect to 404 catchError(err => this.restExtractor.redirectTo404IfNotFound(err, [ 400, 401, 403, 404 ])) ) .subscribe(playlist => { -- cgit v1.2.3