From 3487330d308166afb542cbacae0475693c0b059e Mon Sep 17 00:00:00 2001 From: Rigel Kent Date: Tue, 9 Jun 2020 16:07:10 +0200 Subject: [PATCH] preserve original variable names server-side --- client/src/app/+admin/admin.component.ts | 2 +- .../+admin/moderation/moderation.component.ts | 2 +- .../+admin/moderation/moderation.routes.ts | 2 +- .../video-abuse-list.component.ts | 4 ++-- .../video-block-list.component.ts | 14 ++++++------- .../users/user-edit/user-create.component.ts | 2 +- .../users/user-edit/user-edit.component.html | 2 +- .../app/+admin/users/user-edit/user-edit.ts | 2 +- .../users/user-edit/user-update.component.ts | 4 ++-- ...ount-notification-preferences.component.ts | 2 +- client/src/app/menu/menu.component.ts | 4 ++-- .../shared/users/user-notification.model.ts | 6 +++--- .../users/user-notifications.component.html | 8 ++++---- .../shared/video-block/video-block.service.ts | 12 +++++------ client/src/app/shared/video/video.model.ts | 4 ++-- .../+video-watch/video-watch.component.ts | 4 ++-- server/controllers/api/videos/blacklist.ts | 8 ++++---- .../custom-validators/video-blacklist.ts | 4 ++-- .../migrations/0350-video-blacklist-type.ts | 4 ++-- server/lib/notifier.ts | 8 ++++---- server/lib/video-blacklist.ts | 10 +++++----- server/models/account/user.ts | 4 ++-- server/models/video/video-blacklist.ts | 8 ++++---- server/tests/api/check-params/users.ts | 2 +- .../tests/api/check-params/video-blacklist.ts | 4 ++-- server/tests/api/users/users.ts | 4 ++-- server/tests/api/videos/video-blacklist.ts | 20 +++++++++---------- .../extra-utils/users/user-notifications.ts | 6 +++--- shared/extra-utils/videos/video-blacklist.ts | 4 ++-- shared/models/users/user-flag.model.ts | 2 +- .../models/users/user-notification.model.ts | 6 +++--- shared/models/users/user-right.enum.ts | 2 +- shared/models/users/user-role.ts | 2 +- .../videos/blacklist/video-blacklist.model.ts | 6 +++--- 34 files changed, 89 insertions(+), 89 deletions(-) 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 => { diff --git a/server/controllers/api/videos/blacklist.ts b/server/controllers/api/videos/blacklist.ts index 2c6948923..3b25ceea2 100644 --- a/server/controllers/api/videos/blacklist.ts +++ b/server/controllers/api/videos/blacklist.ts @@ -23,14 +23,14 @@ const blacklistRouter = express.Router() blacklistRouter.post('/:videoId/blacklist', authenticate, - ensureUserHasRight(UserRight.MANAGE_VIDEO_BLOCKS), + ensureUserHasRight(UserRight.MANAGE_VIDEO_BLACKLIST), asyncMiddleware(videosBlacklistAddValidator), asyncMiddleware(addVideoToBlacklistController) ) blacklistRouter.get('/blacklist', authenticate, - ensureUserHasRight(UserRight.MANAGE_VIDEO_BLOCKS), + ensureUserHasRight(UserRight.MANAGE_VIDEO_BLACKLIST), paginationValidator, blacklistSortValidator, setBlacklistSort, @@ -41,14 +41,14 @@ blacklistRouter.get('/blacklist', blacklistRouter.put('/:videoId/blacklist', authenticate, - ensureUserHasRight(UserRight.MANAGE_VIDEO_BLOCKS), + ensureUserHasRight(UserRight.MANAGE_VIDEO_BLACKLIST), asyncMiddleware(videosBlacklistUpdateValidator), asyncMiddleware(updateVideoBlacklistController) ) blacklistRouter.delete('/:videoId/blacklist', authenticate, - ensureUserHasRight(UserRight.MANAGE_VIDEO_BLOCKS), + ensureUserHasRight(UserRight.MANAGE_VIDEO_BLACKLIST), asyncMiddleware(videosBlacklistRemoveValidator), asyncMiddleware(removeVideoFromBlacklistController) ) diff --git a/server/helpers/custom-validators/video-blacklist.ts b/server/helpers/custom-validators/video-blacklist.ts index de6726b8f..17cb3b00b 100644 --- a/server/helpers/custom-validators/video-blacklist.ts +++ b/server/helpers/custom-validators/video-blacklist.ts @@ -1,7 +1,7 @@ import validator from 'validator' import { exists } from './misc' import { CONSTRAINTS_FIELDS } from '../../initializers/constants' -import { VideoBlockType } from '../../../shared/models/videos' +import { VideoBlacklistType } from '../../../shared/models/videos' const VIDEO_BLACKLIST_CONSTRAINTS_FIELDS = CONSTRAINTS_FIELDS.VIDEO_BLACKLIST @@ -10,7 +10,7 @@ function isVideoBlacklistReasonValid (value: string) { } function isVideoBlacklistTypeValid (value: any) { - return exists(value) && validator.isInt('' + value) && VideoBlockType[value] !== undefined + return exists(value) && validator.isInt('' + value) && VideoBlacklistType[value] !== undefined } // --------------------------------------------------------------------------- diff --git a/server/initializers/migrations/0350-video-blacklist-type.ts b/server/initializers/migrations/0350-video-blacklist-type.ts index 22c82e431..f79ae5ec7 100644 --- a/server/initializers/migrations/0350-video-blacklist-type.ts +++ b/server/initializers/migrations/0350-video-blacklist-type.ts @@ -1,5 +1,5 @@ import * as Sequelize from 'sequelize' -import { VideoBlockType } from '../../../shared/models/videos' +import { VideoBlacklistType } from '../../../shared/models/videos' async function up (utils: { transaction: Sequelize.Transaction @@ -18,7 +18,7 @@ async function up (utils: { } { - const query = 'UPDATE "videoBlacklist" SET "type" = ' + VideoBlockType.MANUAL + const query = 'UPDATE "videoBlacklist" SET "type" = ' + VideoBlacklistType.MANUAL await utils.sequelize.query(query) } diff --git a/server/lib/notifier.ts b/server/lib/notifier.ts index 3e90bb57e..89f91e031 100644 --- a/server/lib/notifier.ts +++ b/server/lib/notifier.ts @@ -387,7 +387,7 @@ class Notifier { } private async notifyModeratorsOfVideoAutoBlacklist (videoBlacklist: MVideoBlacklistLightVideo) { - const moderators = await UserModel.listWithRight(UserRight.MANAGE_VIDEO_BLOCKS) + const moderators = await UserModel.listWithRight(UserRight.MANAGE_VIDEO_BLACKLIST) if (moderators.length === 0) return logger.info('Notifying %s moderators of video auto-blacklist %s.', moderators.length, videoBlacklist.Video.url) @@ -398,7 +398,7 @@ class Notifier { async function notificationCreator (user: MUserWithNotificationSetting) { const notification = await UserNotificationModel.create({ - type: UserNotificationType.VIDEO_AUTO_BLOCK_FOR_MODERATORS, + type: UserNotificationType.VIDEO_AUTO_BLACKLIST_FOR_MODERATORS, userId: user.id, videoBlacklistId: videoBlacklist.id }) @@ -426,7 +426,7 @@ class Notifier { async function notificationCreator (user: MUserWithNotificationSetting) { const notification = await UserNotificationModel.create({ - type: UserNotificationType.BLOCK_ON_MY_VIDEO, + type: UserNotificationType.BLACKLIST_ON_MY_VIDEO, userId: user.id, videoBlacklistId: videoBlacklist.id }) @@ -454,7 +454,7 @@ class Notifier { async function notificationCreator (user: MUserWithNotificationSetting) { const notification = await UserNotificationModel.create({ - type: UserNotificationType.UNBLOCK_ON_MY_VIDEO, + type: UserNotificationType.UNBLACKLIST_ON_MY_VIDEO, userId: user.id, videoId: video.id }) diff --git a/server/lib/video-blacklist.ts b/server/lib/video-blacklist.ts index f1657e8f1..1ee92d22c 100644 --- a/server/lib/video-blacklist.ts +++ b/server/lib/video-blacklist.ts @@ -8,7 +8,7 @@ import { MVideoFullLight, MVideoWithBlacklistLight } from '@server/typings/models' -import { UserRight, VideoBlacklistCreate, VideoBlockType } from '../../shared/models' +import { UserRight, VideoBlacklistCreate, VideoBlacklistType } from '../../shared/models' import { UserAdminFlag } from '../../shared/models/users/user-flag.model' import { logger } from '../helpers/logger' import { CONFIG } from '../initializers/config' @@ -39,7 +39,7 @@ async function autoBlacklistVideoIfNeeded (parameters: { videoId: video.id, unfederated: true, reason: 'Auto-blacklisted. Moderator review required.', - type: VideoBlockType.AUTO_BEFORE_PUBLISHED + type: VideoBlacklistType.AUTO_BEFORE_PUBLISHED } const [ videoBlacklist ] = await VideoBlacklistModel.findOrCreate({ where: { @@ -64,7 +64,7 @@ async function blacklistVideo (videoInstance: MVideoAccountLight, options: Video videoId: videoInstance.id, unfederated: options.unfederate === true, reason: options.reason, - type: VideoBlockType.MANUAL + type: VideoBlacklistType.MANUAL } ) blacklist.Video = videoInstance @@ -94,7 +94,7 @@ async function unblacklistVideo (videoBlacklist: MVideoBlacklist, video: MVideoF Notifier.Instance.notifyOnVideoUnblacklist(video) - if (videoBlacklistType === VideoBlockType.AUTO_BEFORE_PUBLISHED) { + if (videoBlacklistType === VideoBlacklistType.AUTO_BEFORE_PUBLISHED) { Notifier.Instance.notifyOnVideoPublishedAfterRemovedFromAutoBlacklist(video) // Delete on object so new video notifications will send @@ -126,7 +126,7 @@ function autoBlacklistNeeded (parameters: { if (!CONFIG.AUTO_BLACKLIST.VIDEOS.OF_USERS.ENABLED || !user) return false if (isRemote || isNew === false) return false - if (user.hasRight(UserRight.MANAGE_VIDEO_BLOCKS) || user.hasAdminFlag(UserAdminFlag.BYPASS_VIDEO_AUTO_BLOCK)) return false + if (user.hasRight(UserRight.MANAGE_VIDEO_BLACKLIST) || user.hasAdminFlag(UserAdminFlag.BYPASS_VIDEO_AUTO_BLACKLIST)) return false return true } diff --git a/server/models/account/user.ts b/server/models/account/user.ts index 4ea175583..fbd3080c6 100644 --- a/server/models/account/user.ts +++ b/server/models/account/user.ts @@ -739,11 +739,11 @@ export class UserModel extends Model { const videoUserId = video.VideoChannel.Account.userId if (video.isBlacklisted()) { - return videoUserId === this.id || this.hasRight(UserRight.MANAGE_VIDEO_BLOCKS) + return videoUserId === this.id || this.hasRight(UserRight.MANAGE_VIDEO_BLACKLIST) } if (video.privacy === VideoPrivacy.PRIVATE) { - return video.VideoChannel && videoUserId === this.id || this.hasRight(UserRight.MANAGE_VIDEO_BLOCKS) + return video.VideoChannel && videoUserId === this.id || this.hasRight(UserRight.MANAGE_VIDEO_BLACKLIST) } if (video.privacy === VideoPrivacy.INTERNAL) return true diff --git a/server/models/video/video-blacklist.ts b/server/models/video/video-blacklist.ts index 70a6ecb03..8cbfe362e 100644 --- a/server/models/video/video-blacklist.ts +++ b/server/models/video/video-blacklist.ts @@ -3,7 +3,7 @@ import { getBlacklistSort, SortType, throwIfNotValid, searchAttribute } from '.. import { VideoModel } from './video' import { ScopeNames as VideoChannelScopeNames, SummaryOptions, VideoChannelModel } from './video-channel' import { isVideoBlacklistReasonValid, isVideoBlacklistTypeValid } from '../../helpers/custom-validators/video-blacklist' -import { VideoBlocklist, VideoBlockType } from '../../../shared/models/videos' +import { VideoBlacklist, VideoBlacklistType } from '../../../shared/models/videos' import { CONSTRAINTS_FIELDS } from '../../initializers/constants' import { FindOptions } from 'sequelize' import { ThumbnailModel } from './thumbnail' @@ -34,7 +34,7 @@ export class VideoBlacklistModel extends Model { @Default(null) @Is('VideoBlacklistType', value => throwIfNotValid(value, isVideoBlacklistTypeValid, 'type')) @Column - type: VideoBlockType + type: VideoBlacklistType @CreatedAt createdAt: Date @@ -59,7 +59,7 @@ export class VideoBlacklistModel extends Model { count: number sort: SortType search?: string - type?: VideoBlockType + type?: VideoBlacklistType }) { const { start, count, sort, search, type } = parameters @@ -119,7 +119,7 @@ export class VideoBlacklistModel extends Model { return VideoBlacklistModel.findOne(query) } - toFormattedJSON (this: MVideoBlacklistFormattable): VideoBlocklist { + toFormattedJSON (this: MVideoBlacklistFormattable): VideoBlacklist { return { id: this.id, createdAt: this.createdAt, diff --git a/server/tests/api/check-params/users.ts b/server/tests/api/check-params/users.ts index 94d47408a..472fbda43 100644 --- a/server/tests/api/check-params/users.ts +++ b/server/tests/api/check-params/users.ts @@ -188,7 +188,7 @@ describe('Test users API validators', function () { videoQuota: -1, videoQuotaDaily: -1, role: UserRole.USER, - adminFlags: UserAdminFlag.BYPASS_VIDEO_AUTO_BLOCK + adminFlags: UserAdminFlag.BYPASS_VIDEO_AUTO_BLACKLIST } it('Should fail with a too small username', async function () { diff --git a/server/tests/api/check-params/video-blacklist.ts b/server/tests/api/check-params/video-blacklist.ts index b96c26989..145f43980 100644 --- a/server/tests/api/check-params/video-blacklist.ts +++ b/server/tests/api/check-params/video-blacklist.ts @@ -24,7 +24,7 @@ import { checkBadSortPagination, checkBadStartPagination } from '../../../../shared/extra-utils/requests/check-api-params' -import { VideoBlockType, VideoDetails } from '../../../../shared/models/videos' +import { VideoBlacklistType, VideoDetails } from '../../../../shared/models/videos' import { expect } from 'chai' describe('Test video blacklist API validators', function () { @@ -243,7 +243,7 @@ describe('Test video blacklist API validators', function () { }) it('Should succeed with the correct parameters', async function () { - await getBlacklistedVideosList({ url: servers[0].url, token: servers[0].accessToken, type: VideoBlockType.MANUAL }) + await getBlacklistedVideosList({ url: servers[0].url, token: servers[0].accessToken, type: VideoBlacklistType.MANUAL }) }) }) diff --git a/server/tests/api/users/users.ts b/server/tests/api/users/users.ts index af5a5fd25..cad954fcb 100644 --- a/server/tests/api/users/users.ts +++ b/server/tests/api/users/users.ts @@ -265,7 +265,7 @@ describe('Test users', function () { username: user.username, password: user.password, videoQuota: 2 * 1024 * 1024, - adminFlags: UserAdminFlag.BYPASS_VIDEO_AUTO_BLOCK + adminFlags: UserAdminFlag.BYPASS_VIDEO_AUTO_BLACKLIST }) }) @@ -292,7 +292,7 @@ describe('Test users', function () { } expect(userMe.adminFlags).to.be.undefined - expect(userGet.adminFlags).to.equal(UserAdminFlag.BYPASS_VIDEO_AUTO_BLOCK) + expect(userGet.adminFlags).to.equal(UserAdminFlag.BYPASS_VIDEO_AUTO_BLACKLIST) expect(userMe.specialPlaylists).to.have.lengthOf(1) expect(userMe.specialPlaylists[0].type).to.equal(VideoPlaylistType.WATCH_LATER) diff --git a/server/tests/api/videos/video-blacklist.ts b/server/tests/api/videos/video-blacklist.ts index 6e15893f3..a8500627b 100644 --- a/server/tests/api/videos/video-blacklist.ts +++ b/server/tests/api/videos/video-blacklist.ts @@ -25,7 +25,7 @@ import { } from '../../../../shared/extra-utils/index' import { doubleFollow } from '../../../../shared/extra-utils/server/follows' import { waitJobs } from '../../../../shared/extra-utils/server/jobs' -import { VideoBlocklist, VideoBlockType } from '../../../../shared/models/videos' +import { VideoBlacklist, VideoBlacklistType } from '../../../../shared/models/videos' import { UserAdminFlag } from '../../../../shared/models/users/user-flag.model' import { User, UserRole } from '../../../../shared/models/users' import { getMagnetURI, getYoutubeVideoUrl, importVideo } from '../../../../shared/extra-utils/videos/video-imports' @@ -127,7 +127,7 @@ describe('Test video blacklist', function () { const res = await getBlacklistedVideosList({ url: servers[0].url, token: servers[0].accessToken, - type: VideoBlockType.MANUAL + type: VideoBlacklistType.MANUAL }) expect(res.body.total).to.equal(2) @@ -141,7 +141,7 @@ describe('Test video blacklist', function () { const res = await getBlacklistedVideosList({ url: servers[0].url, token: servers[0].accessToken, - type: VideoBlockType.AUTO_BEFORE_PUBLISHED + type: VideoBlacklistType.AUTO_BEFORE_PUBLISHED }) expect(res.body.total).to.equal(0) @@ -219,7 +219,7 @@ describe('Test video blacklist', function () { }) describe('When removing a blacklisted video', function () { - let videoToRemove: VideoBlocklist + let videoToRemove: VideoBlacklist let blacklist = [] it('Should not have any video in videos list on server 1', async function () { @@ -328,7 +328,7 @@ describe('Test video blacklist', function () { it('Should have the correct video blacklist unfederate attribute', async function () { const res = await getBlacklistedVideosList({ url: servers[0].url, token: servers[0].accessToken, sort: 'createdAt' }) - const blacklistedVideos: VideoBlocklist[] = res.body.data + const blacklistedVideos: VideoBlacklist[] = res.body.data const video3Blacklisted = blacklistedVideos.find(b => b.video.uuid === video3UUID) const video4Blacklisted = blacklistedVideos.find(b => b.video.uuid === video4UUID) @@ -396,7 +396,7 @@ describe('Test video blacklist', function () { url: servers[0].url, accessToken: servers[0].accessToken, username: user.username, - adminFlags: UserAdminFlag.BYPASS_VIDEO_AUTO_BLOCK, + adminFlags: UserAdminFlag.BYPASS_VIDEO_AUTO_BLACKLIST, password: user.password, role: UserRole.USER }) @@ -413,7 +413,7 @@ describe('Test video blacklist', function () { const res = await getBlacklistedVideosList({ url: servers[0].url, token: servers[0].accessToken, - type: VideoBlockType.AUTO_BEFORE_PUBLISHED + type: VideoBlacklistType.AUTO_BEFORE_PUBLISHED }) expect(res.body.total).to.equal(1) @@ -434,7 +434,7 @@ describe('Test video blacklist', function () { url: servers[0].url, token: servers[0].accessToken, sort: 'createdAt', - type: VideoBlockType.AUTO_BEFORE_PUBLISHED + type: VideoBlacklistType.AUTO_BEFORE_PUBLISHED }) expect(res.body.total).to.equal(2) @@ -453,7 +453,7 @@ describe('Test video blacklist', function () { url: servers[0].url, token: servers[0].accessToken, sort: 'createdAt', - type: VideoBlockType.AUTO_BEFORE_PUBLISHED + type: VideoBlacklistType.AUTO_BEFORE_PUBLISHED }) expect(res.body.total).to.equal(3) @@ -466,7 +466,7 @@ describe('Test video blacklist', function () { const res = await getBlacklistedVideosList({ url: servers[0].url, token: servers[0].accessToken, - type: VideoBlockType.AUTO_BEFORE_PUBLISHED + type: VideoBlacklistType.AUTO_BEFORE_PUBLISHED }) expect(res.body.total).to.equal(3) diff --git a/shared/extra-utils/users/user-notifications.ts b/shared/extra-utils/users/user-notifications.ts index 6f85bd450..bd00894c4 100644 --- a/shared/extra-utils/users/user-notifications.ts +++ b/shared/extra-utils/users/user-notifications.ts @@ -455,7 +455,7 @@ async function checkNewVideoAbuseForModerators (base: CheckerBaseParams, videoUU } async function checkVideoAutoBlacklistForModerators (base: CheckerBaseParams, videoUUID: string, videoName: string, type: CheckerType) { - const notificationType = UserNotificationType.VIDEO_AUTO_BLOCK_FOR_MODERATORS + const notificationType = UserNotificationType.VIDEO_AUTO_BLACKLIST_FOR_MODERATORS function notificationChecker (notification: UserNotification, type: CheckerType) { if (type === 'presence') { @@ -486,8 +486,8 @@ async function checkNewBlacklistOnMyVideo ( blacklistType: 'blacklist' | 'unblacklist' ) { const notificationType = blacklistType === 'blacklist' - ? UserNotificationType.BLOCK_ON_MY_VIDEO - : UserNotificationType.UNBLOCK_ON_MY_VIDEO + ? UserNotificationType.BLACKLIST_ON_MY_VIDEO + : UserNotificationType.UNBLACKLIST_ON_MY_VIDEO function notificationChecker (notification: UserNotification) { expect(notification).to.not.be.undefined diff --git a/shared/extra-utils/videos/video-blacklist.ts b/shared/extra-utils/videos/video-blacklist.ts index c06b2aa5d..ba139ef95 100644 --- a/shared/extra-utils/videos/video-blacklist.ts +++ b/shared/extra-utils/videos/video-blacklist.ts @@ -1,5 +1,5 @@ import * as request from 'supertest' -import { VideoBlockType } from '../../models/videos' +import { VideoBlacklistType } from '../../models/videos' import { makeGetRequest } from '..' function addVideoToBlacklist ( @@ -45,7 +45,7 @@ function getBlacklistedVideosList (parameters: { url: string token: string sort?: string - type?: VideoBlockType + type?: VideoBlacklistType specialStatus?: number }) { const { url, token, sort, type, specialStatus = 200 } = parameters diff --git a/shared/models/users/user-flag.model.ts b/shared/models/users/user-flag.model.ts index e8b5a5c50..b94262d5e 100644 --- a/shared/models/users/user-flag.model.ts +++ b/shared/models/users/user-flag.model.ts @@ -1,4 +1,4 @@ export enum UserAdminFlag { NONE = 0, - BYPASS_VIDEO_AUTO_BLOCK = 1 << 0 + BYPASS_VIDEO_AUTO_BLACKLIST = 1 << 0 } diff --git a/shared/models/users/user-notification.model.ts b/shared/models/users/user-notification.model.ts index 2329503a8..e9be1ca7f 100644 --- a/shared/models/users/user-notification.model.ts +++ b/shared/models/users/user-notification.model.ts @@ -5,8 +5,8 @@ export enum UserNotificationType { NEW_COMMENT_ON_MY_VIDEO = 2, NEW_VIDEO_ABUSE_FOR_MODERATORS = 3, - BLOCK_ON_MY_VIDEO = 4, - UNBLOCK_ON_MY_VIDEO = 5, + BLACKLIST_ON_MY_VIDEO = 4, + UNBLACKLIST_ON_MY_VIDEO = 5, MY_VIDEO_PUBLISHED = 6, @@ -17,7 +17,7 @@ export enum UserNotificationType { NEW_FOLLOW = 10, COMMENT_MENTION = 11, - VIDEO_AUTO_BLOCK_FOR_MODERATORS = 12, + VIDEO_AUTO_BLACKLIST_FOR_MODERATORS = 12, NEW_INSTANCE_FOLLOWER = 13, diff --git a/shared/models/users/user-right.enum.ts b/shared/models/users/user-right.enum.ts index 3fb760709..2f88a65de 100644 --- a/shared/models/users/user-right.enum.ts +++ b/shared/models/users/user-right.enum.ts @@ -20,7 +20,7 @@ export enum UserRight { MANAGE_ACCOUNTS_BLOCKLIST, MANAGE_SERVERS_BLOCKLIST, - MANAGE_VIDEO_BLOCKS, + MANAGE_VIDEO_BLACKLIST, REMOVE_ANY_VIDEO, REMOVE_ANY_VIDEO_CHANNEL, diff --git a/shared/models/users/user-role.ts b/shared/models/users/user-role.ts index 30ec5edce..2b08b5850 100644 --- a/shared/models/users/user-role.ts +++ b/shared/models/users/user-role.ts @@ -19,7 +19,7 @@ const userRoleRights: { [ id in UserRole ]: UserRight[] } = { ], [UserRole.MODERATOR]: [ - UserRight.MANAGE_VIDEO_BLOCKS, + UserRight.MANAGE_VIDEO_BLACKLIST, UserRight.MANAGE_VIDEO_ABUSES, UserRight.REMOVE_ANY_VIDEO, UserRight.REMOVE_ANY_VIDEO_CHANNEL, diff --git a/shared/models/videos/blacklist/video-blacklist.model.ts b/shared/models/videos/blacklist/video-blacklist.model.ts index e6090b1e9..a6e0ef175 100644 --- a/shared/models/videos/blacklist/video-blacklist.model.ts +++ b/shared/models/videos/blacklist/video-blacklist.model.ts @@ -1,15 +1,15 @@ import { Video } from '../video.model' -export enum VideoBlockType { +export enum VideoBlacklistType { MANUAL = 1, AUTO_BEFORE_PUBLISHED = 2 } -export interface VideoBlocklist { +export interface VideoBlacklist { id: number unfederated: boolean reason?: string - type: VideoBlockType + type: VideoBlacklistType video: Video