From 0f8d00e3144060270d7fe603865fccaf18649c47 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 13 Nov 2020 16:38:23 +0100 Subject: [PATCH 1/2] Implement video comment list in admin --- client/src/app/+admin/admin.component.ts | 11 ++ client/src/app/+admin/admin.module.ts | 4 + .../+admin/moderation/moderation.routes.ts | 24 +++- .../moderation/video-comment-list/index.ts | 1 + .../video-comment-list.component.html | 102 ++++++++++++++ .../video-comment-list.component.scss | 27 ++++ .../video-comment-list.component.ts | 111 +++++++++++++++ .../video-comment.model.ts | 52 ++++++- .../video-comment.service.ts | 45 +++++- server/controllers/api/videos/comment.ts | 36 ++++- server/initializers/constants.ts | 3 + server/middlewares/validators/sort.ts | 3 + .../validators/videos/video-comments.ts | 32 ++++- server/models/video/video-comment.ts | 132 +++++++++++++++++- server/types/models/video/video-comment.ts | 9 +- shared/core-utils/users/user-role.ts | 3 +- shared/models/users/user-right.enum.ts | 1 + shared/models/videos/video-comment.model.ts | 20 +++ 18 files changed, 602 insertions(+), 14 deletions(-) create mode 100644 client/src/app/+admin/moderation/video-comment-list/index.ts create mode 100644 client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.html create mode 100644 client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.scss create mode 100644 client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.ts diff --git a/client/src/app/+admin/admin.component.ts b/client/src/app/+admin/admin.component.ts index b661a5517..dd92ed2ca 100644 --- a/client/src/app/+admin/admin.component.ts +++ b/client/src/app/+admin/admin.component.ts @@ -62,6 +62,13 @@ export class AdminComponent implements OnInit { iconName: 'cross' }) } + if (this.hasVideoCommentsRight()) { + moderationItems.children.push({ + label: $localize`Video comments`, + routerLink: '/admin/moderation/video-comments/list', + iconName: 'message-circle' + }) + } if (this.hasAccountsBlocklistRight()) { moderationItems.children.push({ label: $localize`Muted accounts`, @@ -140,4 +147,8 @@ export class AdminComponent implements OnInit { hasDebugRight () { return this.auth.getUser().hasRight(UserRight.MANAGE_DEBUG) } + + hasVideoCommentsRight () { + return this.auth.getUser().hasRight(UserRight.SEE_ALL_COMMENTS) + } } diff --git a/client/src/app/+admin/admin.module.ts b/client/src/app/+admin/admin.module.ts index da517a55b..5c0864f48 100644 --- a/client/src/app/+admin/admin.module.ts +++ b/client/src/app/+admin/admin.module.ts @@ -7,6 +7,7 @@ import { SharedFormModule } from '@app/shared/shared-forms' import { SharedGlobalIconModule } from '@app/shared/shared-icons' import { SharedMainModule } from '@app/shared/shared-main' import { SharedModerationModule } from '@app/shared/shared-moderation' +import { SharedVideoCommentModule } from '@app/shared/shared-video-comment' import { AdminRoutingModule } from './admin-routing.module' import { AdminComponent } from './admin.component' import { ConfigComponent, EditCustomConfigComponent } from './config' @@ -18,6 +19,7 @@ import { VideoRedundancyInformationComponent } from './follows/video-redundancie import { AbuseListComponent, VideoBlockListComponent } from './moderation' import { InstanceAccountBlocklistComponent, InstanceServerBlocklistComponent } from './moderation/instance-blocklist' import { ModerationComponent } from './moderation/moderation.component' +import { VideoCommentListComponent } from './moderation/video-comment-list' import { PluginListInstalledComponent } from './plugins/plugin-list-installed/plugin-list-installed.component' import { PluginSearchComponent } from './plugins/plugin-search/plugin-search.component' import { PluginShowInstalledComponent } from './plugins/plugin-show-installed/plugin-show-installed.component' @@ -37,6 +39,7 @@ import { UserCreateComponent, UserListComponent, UserPasswordComponent, UsersCom SharedModerationModule, SharedGlobalIconModule, SharedAbuseListModule, + SharedVideoCommentModule, TableModule, SelectButtonModule, @@ -62,6 +65,7 @@ import { UserCreateComponent, UserListComponent, UserPasswordComponent, UsersCom ModerationComponent, VideoBlockListComponent, AbuseListComponent, + VideoCommentListComponent, InstanceServerBlocklistComponent, InstanceAccountBlocklistComponent, diff --git a/client/src/app/+admin/moderation/moderation.routes.ts b/client/src/app/+admin/moderation/moderation.routes.ts index b60dd5334..2e28f0911 100644 --- a/client/src/app/+admin/moderation/moderation.routes.ts +++ b/client/src/app/+admin/moderation/moderation.routes.ts @@ -1,8 +1,9 @@ import { Routes } from '@angular/router' +import { AbuseListComponent } from '@app/+admin/moderation/abuse-list' import { InstanceAccountBlocklistComponent, InstanceServerBlocklistComponent } from '@app/+admin/moderation/instance-blocklist' import { ModerationComponent } from '@app/+admin/moderation/moderation.component' -import { AbuseListComponent } from '@app/+admin/moderation/abuse-list' import { VideoBlockListComponent } from '@app/+admin/moderation/video-block-list' +import { VideoCommentListComponent } from './video-comment-list' import { UserRightGuard } from '@app/core' import { UserRight } from '@shared/models' @@ -37,6 +38,7 @@ export const ModerationRoutes: Routes = [ } } }, + { path: 'video-blacklist', redirectTo: 'video-blocks/list', @@ -64,10 +66,28 @@ export const ModerationRoutes: Routes = [ data: { userRight: UserRight.MANAGE_VIDEO_BLACKLIST, meta: { - title: $localize`Videos blocked` + title: $localize`Blocked videos` } } }, + + { + path: 'video-comments', + redirectTo: 'video-comments/list', + pathMatch: 'full' + }, + { + path: 'video-comments/list', + component: VideoCommentListComponent, + canActivate: [ UserRightGuard ], + data: { + userRight: UserRight.SEE_ALL_COMMENTS, + meta: { + title: $localize`Video comments` + } + } + }, + { path: 'blocklist/accounts', component: InstanceAccountBlocklistComponent, diff --git a/client/src/app/+admin/moderation/video-comment-list/index.ts b/client/src/app/+admin/moderation/video-comment-list/index.ts new file mode 100644 index 000000000..eb08b4177 --- /dev/null +++ b/client/src/app/+admin/moderation/video-comment-list/index.ts @@ -0,0 +1 @@ +export * from './video-comment-list.component' diff --git a/client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.html b/client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.html new file mode 100644 index 000000000..b4f66a75f --- /dev/null +++ b/client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.html @@ -0,0 +1,102 @@ +

+ + Video comments +

+ +this view does show comments from muted accounts so you can delete them + + + +
+
+
+
+
+ +
+ +
+
Advanced comments filters
+ Local comments + Remote comments +
+
+ + + Clear filters +
+
+
+ + + + + + Account + Video + Comment + Date + + + + + + + + + + + + + + {{ videoComment.by }} + + + + {{ videoComment.video.name }} + + + +
+ + + {{ videoComment.createdAt | date: 'short' }} + + + + + + + + + + +
+ + + + + + + +
+ No comments found matching current filters. + No comments found. +
+ + + + + diff --git a/client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.scss b/client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.scss new file mode 100644 index 000000000..c92d1c39c --- /dev/null +++ b/client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.scss @@ -0,0 +1,27 @@ +@import 'mixins'; + +my-global-icon { + @include apply-svg-color(#7d7d7d); + + width: 12px; + height: 12px; + position: relative; + top: -1px; +} + +.input-group { + @include peertube-input-group(300px); + + .dropdown-toggle::after { + margin-left: 0; + } +} + +.caption { + justify-content: flex-end; + + input { + @include peertube-input-text(250px); + flex-grow: 1; + } +} diff --git a/client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.ts b/client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.ts new file mode 100644 index 000000000..fdd5ec76e --- /dev/null +++ b/client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.ts @@ -0,0 +1,111 @@ +import { SortMeta } from 'primeng/api' +import { filter } from 'rxjs/operators' +import { AfterViewInit, Component, OnInit } from '@angular/core' +import { DomSanitizer } from '@angular/platform-browser' +import { ActivatedRoute, Params, Router } from '@angular/router' +import { ConfirmService, MarkdownService, Notifier, RestPagination, RestTable, ServerService } from '@app/core' +import { DropdownAction, VideoService } from '@app/shared/shared-main' +import { VideoCommentAdmin, VideoCommentService } from '@app/shared/shared-video-comment' + +@Component({ + selector: 'my-video-comment-list', + templateUrl: './video-comment-list.component.html', + styleUrls: [ './video-comment-list.component.scss' ] +}) +export class VideoCommentListComponent extends RestTable implements OnInit, AfterViewInit { + comments: VideoCommentAdmin[] + totalRecords = 0 + sort: SortMeta = { field: 'createdAt', order: -1 } + pagination: RestPagination = { count: this.rowsPerPage, start: 0 } + + videoCommentActions: DropdownAction[][] = [] + + constructor ( + private notifier: Notifier, + private serverService: ServerService, + private confirmService: ConfirmService, + private videoCommentService: VideoCommentService, + private markdownRenderer: MarkdownService, + private sanitizer: DomSanitizer, + private videoService: VideoService, + private route: ActivatedRoute, + private router: Router + ) { + super() + + this.videoCommentActions = [ + [ + + // remove this comment, + + // remove all comments of this account + + ] + ] + } + + ngOnInit () { + this.initialize() + + this.route.queryParams + .pipe(filter(params => params.search !== undefined && params.search !== null)) + .subscribe(params => { + this.search = params.search + this.setTableFilter(params.search) + this.loadData() + }) + } + + ngAfterViewInit () { + if (this.search) this.setTableFilter(this.search) + } + + onSearch (event: Event) { + this.onSearch(event) + this.setQueryParams((event.target as HTMLInputElement).value) + } + + setQueryParams (search: string) { + const queryParams: Params = {} + + if (search) Object.assign(queryParams, { search }) + this.router.navigate([ '/admin/moderation/video-comments/list' ], { queryParams }) + } + + resetTableFilter () { + this.setTableFilter('') + this.setQueryParams('') + this.resetSearch() + } + /* END Table filter functions */ + + getIdentifier () { + return 'VideoCommentListComponent' + } + + toHtml (text: string) { + return this.markdownRenderer.textMarkdownToHTML(text) + } + + protected loadData () { + this.videoCommentService.getAdminVideoComments({ + pagination: this.pagination, + sort: this.sort, + search: this.search + }).subscribe( + async resultList => { + this.totalRecords = resultList.total + + this.comments = [] + + for (const c of resultList.data) { + this.comments.push( + new VideoCommentAdmin(c, await this.toHtml(c.text)) + ) + } + }, + + err => this.notifier.error(err.message) + ) + } +} diff --git a/client/src/app/shared/shared-video-comment/video-comment.model.ts b/client/src/app/shared/shared-video-comment/video-comment.model.ts index e85443196..1589091e5 100644 --- a/client/src/app/shared/shared-video-comment/video-comment.model.ts +++ b/client/src/app/shared/shared-video-comment/video-comment.model.ts @@ -1,6 +1,6 @@ import { getAbsoluteAPIUrl } from '@app/helpers' import { Actor } from '@app/shared/shared-main' -import { Account as AccountInterface, VideoComment as VideoCommentServerModel } from '@shared/models' +import { Account as AccountInterface, VideoComment as VideoCommentServerModel, VideoCommentAdmin as VideoCommentAdminServerModel } from '@shared/models' export class VideoComment implements VideoCommentServerModel { id: number @@ -46,3 +46,53 @@ export class VideoComment implements VideoCommentServerModel { } } } + +export class VideoCommentAdmin implements VideoCommentAdminServerModel { + id: number + url: string + text: string + textHtml: string + + threadId: number + inReplyToCommentId: number + + createdAt: Date | string + updatedAt: Date | string + + account: AccountInterface + + video: { + id: number + uuid: string + name: string + } + + by: string + accountAvatarUrl: string + + constructor (hash: VideoCommentAdminServerModel, textHtml: string) { + this.id = hash.id + this.url = hash.url + this.text = hash.text + this.textHtml = textHtml + + this.threadId = hash.threadId + this.inReplyToCommentId = hash.inReplyToCommentId + + this.createdAt = new Date(hash.createdAt.toString()) + this.updatedAt = new Date(hash.updatedAt.toString()) + + this.video = { + id: hash.video.id, + uuid: hash.video.uuid, + name: hash.video.name + } + + this.account = hash.account + + if (this.account) { + this.by = Actor.CREATE_BY_STRING(this.account.name, this.account.host) + this.accountAvatarUrl = Actor.GET_ACTOR_AVATAR_URL(this.account) + } + } +} diff --git a/client/src/app/shared/shared-video-comment/video-comment.service.ts b/client/src/app/shared/shared-video-comment/video-comment.service.ts index 81c65aa38..e318e069d 100644 --- a/client/src/app/shared/shared-video-comment/video-comment.service.ts +++ b/client/src/app/shared/shared-video-comment/video-comment.service.ts @@ -2,18 +2,20 @@ import { Observable } from 'rxjs' import { catchError, map } from 'rxjs/operators' import { HttpClient, HttpParams } from '@angular/common/http' import { Injectable } from '@angular/core' -import { ComponentPaginationLight, RestExtractor, RestService } from '@app/core' +import { ComponentPaginationLight, RestExtractor, RestPagination, RestService } from '@app/core' import { objectLineFeedToHtml } from '@app/helpers' import { FeedFormat, ResultList, VideoComment as VideoCommentServerModel, + VideoCommentAdmin, VideoCommentCreate, VideoCommentThreadTree as VideoCommentThreadTreeServerModel } from '@shared/models' import { environment } from '../../../environments/environment' import { VideoCommentThreadTree } from './video-comment-thread-tree.model' import { VideoComment } from './video-comment.model' +import { SortMeta } from 'primeng/api' @Injectable() export class VideoCommentService { @@ -48,6 +50,27 @@ export class VideoCommentService { ) } + getAdminVideoComments (options: { + pagination: RestPagination, + sort: SortMeta, + search?: string + }): Observable> { + const { pagination, sort, search } = options + const url = VideoCommentService.BASE_VIDEO_URL + '/comments' + + let params = new HttpParams() + params = this.restService.addRestGetParams(params, pagination, sort) + + if (search) { + params = this.buildParamsFromSearch(search, params) + } + + return this.authHttp.get>(url, { params }) + .pipe( + catchError(res => this.restExtractor.handleError(res)) + ) + } + getVideoCommentThreads (parameters: { videoId: number | string, componentPagination: ComponentPaginationLight, @@ -146,4 +169,24 @@ export class VideoCommentService { return tree as VideoCommentThreadTree } + + private buildParamsFromSearch (search: string, params: HttpParams) { + const filters = this.restService.parseQueryStringFilter(search, { + state: { + prefix: 'local:', + isBoolean: true, + handler: v => { + if (v === 'true') return v + if (v === 'false') return v + + return undefined + } + }, + + searchAccount: { prefix: 'account:' }, + searchVideo: { prefix: 'video:' } + }) + + return this.restService.addObjectParams(params, filters) + } } diff --git a/server/controllers/api/videos/comment.ts b/server/controllers/api/videos/comment.ts index 45ff969d9..ccd76c093 100644 --- a/server/controllers/api/videos/comment.ts +++ b/server/controllers/api/videos/comment.ts @@ -1,5 +1,5 @@ import * as express from 'express' -import { ResultList } from '../../../../shared/models' +import { ResultList, UserRight } from '../../../../shared/models' import { VideoCommentCreate } from '../../../../shared/models/videos/video-comment.model' import { auditLoggerFactory, CommentAuditView, getAuditIdFromRes } from '../../../helpers/audit-logger' import { getFormattedObjects } from '../../../helpers/utils' @@ -11,6 +11,7 @@ import { asyncMiddleware, asyncRetryTransactionMiddleware, authenticate, + ensureUserHasRight, optionalAuthenticate, paginationValidator, setDefaultPagination, @@ -19,9 +20,11 @@ import { import { addVideoCommentReplyValidator, addVideoCommentThreadValidator, + listVideoCommentsValidator, listVideoCommentThreadsValidator, listVideoThreadCommentsValidator, removeVideoCommentValidator, + videoCommentsValidator, videoCommentThreadsSortValidator } from '../../../middlewares/validators' import { AccountModel } from '../../../models/account/account' @@ -61,6 +64,17 @@ videoCommentRouter.delete('/:videoId/comments/:commentId', asyncRetryTransactionMiddleware(removeVideoComment) ) +videoCommentRouter.get('/comments', + authenticate, + ensureUserHasRight(UserRight.SEE_ALL_COMMENTS), + paginationValidator, + videoCommentsValidator, + setDefaultSort, + setDefaultPagination, + listVideoCommentsValidator, + asyncMiddleware(listComments) +) + // --------------------------------------------------------------------------- export { @@ -69,6 +83,26 @@ export { // --------------------------------------------------------------------------- +async function listComments (req: express.Request, res: express.Response) { + const options = { + start: req.query.start, + count: req.query.count, + sort: req.query.sort, + + isLocal: req.query.isLocal, + search: req.query.search, + searchAccount: req.query.searchAccount, + searchVideo: req.query.searchVideo + } + + const resultList = await VideoCommentModel.listCommentsForApi(options) + + return res.json({ + total: resultList.total, + data: resultList.data.map(c => c.toFormattedAdminJSON()) + }) +} + async function listVideoThreads (req: express.Request, res: express.Response) { const video = res.locals.onlyVideo const user = res.locals.oauth ? res.locals.oauth.token.User : undefined diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts index 02e42a594..fde87d9f8 100644 --- a/server/initializers/constants.ts +++ b/server/initializers/constants.ts @@ -63,7 +63,10 @@ const SORTABLE_COLUMNS = { JOBS: [ 'createdAt' ], VIDEO_CHANNELS: [ 'id', 'name', 'updatedAt', 'createdAt' ], VIDEO_IMPORTS: [ 'createdAt' ], + VIDEO_COMMENT_THREADS: [ 'createdAt', 'totalReplies' ], + VIDEO_COMMENTS: [ 'createdAt' ], + VIDEO_RATES: [ 'createdAt' ], BLACKLISTS: [ 'id', 'name', 'duration', 'views', 'likes', 'dislikes', 'uuid', 'createdAt' ], FOLLOWERS: [ 'createdAt', 'state', 'score' ], diff --git a/server/middlewares/validators/sort.ts b/server/middlewares/validators/sort.ts index 29aba0436..e93ceb200 100644 --- a/server/middlewares/validators/sort.ts +++ b/server/middlewares/validators/sort.ts @@ -10,6 +10,7 @@ const SORTABLE_VIDEOS_COLUMNS = createSortableColumns(SORTABLE_COLUMNS.VIDEOS) const SORTABLE_VIDEOS_SEARCH_COLUMNS = createSortableColumns(SORTABLE_COLUMNS.VIDEOS_SEARCH) const SORTABLE_VIDEO_CHANNELS_SEARCH_COLUMNS = createSortableColumns(SORTABLE_COLUMNS.VIDEO_CHANNELS_SEARCH) const SORTABLE_VIDEO_IMPORTS_COLUMNS = createSortableColumns(SORTABLE_COLUMNS.VIDEO_IMPORTS) +const SORTABLE_VIDEO_COMMENTS_COLUMNS = createSortableColumns(SORTABLE_COLUMNS.VIDEO_COMMENT_THREADS) const SORTABLE_VIDEO_COMMENT_THREADS_COLUMNS = createSortableColumns(SORTABLE_COLUMNS.VIDEO_COMMENT_THREADS) const SORTABLE_VIDEO_RATES_COLUMNS = createSortableColumns(SORTABLE_COLUMNS.VIDEO_RATES) const SORTABLE_BLACKLISTS_COLUMNS = createSortableColumns(SORTABLE_COLUMNS.BLACKLISTS) @@ -33,6 +34,7 @@ const videosSortValidator = checkSort(SORTABLE_VIDEOS_COLUMNS) const videoImportsSortValidator = checkSort(SORTABLE_VIDEO_IMPORTS_COLUMNS) const videosSearchSortValidator = checkSort(SORTABLE_VIDEOS_SEARCH_COLUMNS) const videoChannelsSearchSortValidator = checkSort(SORTABLE_VIDEO_CHANNELS_SEARCH_COLUMNS) +const videoCommentsValidator = checkSort(SORTABLE_VIDEO_COMMENTS_COLUMNS) const videoCommentThreadsSortValidator = checkSort(SORTABLE_VIDEO_COMMENT_THREADS_COLUMNS) const videoRatesSortValidator = checkSort(SORTABLE_VIDEO_RATES_COLUMNS) const blacklistSortValidator = checkSort(SORTABLE_BLACKLISTS_COLUMNS) @@ -55,6 +57,7 @@ export { abusesSortValidator, videoChannelsSortValidator, videoImportsSortValidator, + videoCommentsValidator, videosSearchSortValidator, videosSortValidator, blacklistSortValidator, diff --git a/server/middlewares/validators/videos/video-comments.ts b/server/middlewares/validators/videos/video-comments.ts index 77f5c6ff3..55fb60b98 100644 --- a/server/middlewares/validators/videos/video-comments.ts +++ b/server/middlewares/validators/videos/video-comments.ts @@ -1,8 +1,8 @@ import * as express from 'express' -import { body, param } from 'express-validator' +import { body, param, query } from 'express-validator' import { MUserAccountUrl } from '@server/types/models' import { UserRight } from '../../../../shared' -import { isIdOrUUIDValid, isIdValid } from '../../../helpers/custom-validators/misc' +import { exists, isBooleanValid, isIdOrUUIDValid, isIdValid } from '../../../helpers/custom-validators/misc' import { doesVideoCommentExist, doesVideoCommentThreadExist, @@ -15,6 +15,33 @@ import { Hooks } from '../../../lib/plugins/hooks' import { MCommentOwnerVideoReply, MVideo, MVideoFullLight } from '../../../types/models/video' import { areValidationErrors } from '../utils' +const listVideoCommentsValidator = [ + query('isLocal') + .optional() + .custom(isBooleanValid) + .withMessage('Should have a valid is local boolean'), + + query('search') + .optional() + .custom(exists).withMessage('Should have a valid search'), + + query('searchAccount') + .optional() + .custom(exists).withMessage('Should have a valid account search'), + + query('searchVideo') + .optional() + .custom(exists).withMessage('Should have a valid video search'), + + (req: express.Request, res: express.Response, next: express.NextFunction) => { + logger.debug('Checking listVideoCommentsValidator parameters.', { parameters: req.query }) + + if (areValidationErrors(req, res)) return + + return next() + } +] + const listVideoCommentThreadsValidator = [ param('videoId').custom(isIdOrUUIDValid).not().isEmpty().withMessage('Should have a valid videoId'), @@ -116,6 +143,7 @@ export { listVideoCommentThreadsValidator, listVideoThreadCommentsValidator, addVideoCommentThreadValidator, + listVideoCommentsValidator, addVideoCommentReplyValidator, videoCommentGetValidator, removeVideoCommentValidator diff --git a/server/models/video/video-comment.ts b/server/models/video/video-comment.ts index de27b3d87..70aed75d6 100644 --- a/server/models/video/video-comment.ts +++ b/server/models/video/video-comment.ts @@ -1,6 +1,6 @@ import * as Bluebird from 'bluebird' import { uniq } from 'lodash' -import { FindOptions, Op, Order, ScopeOptions, Sequelize, Transaction, WhereOptions } from 'sequelize' +import { FindAndCountOptions, FindOptions, Op, Order, ScopeOptions, Sequelize, Transaction, WhereOptions } from 'sequelize' import { AllowNull, BelongsTo, @@ -20,13 +20,14 @@ import { MAccount, MAccountId, MUserAccountId } from '@server/types/models' import { VideoPrivacy } from '@shared/models' import { ActivityTagObject, ActivityTombstoneObject } from '../../../shared/models/activitypub/objects/common-objects' import { VideoCommentObject } from '../../../shared/models/activitypub/objects/video-comment-object' -import { VideoComment } from '../../../shared/models/videos/video-comment.model' +import { VideoComment, VideoCommentAdmin } from '../../../shared/models/videos/video-comment.model' import { actorNameAlphabet } from '../../helpers/custom-validators/activitypub/actor' import { isActivityPubUrlValid } from '../../helpers/custom-validators/activitypub/misc' import { regexpCapture } from '../../helpers/regexp' import { CONSTRAINTS_FIELDS, WEBSERVER } from '../../initializers/constants' import { MComment, + MCommentAdminFormattable, MCommentAP, MCommentFormattable, MCommentId, @@ -40,7 +41,14 @@ import { import { VideoCommentAbuseModel } from '../abuse/video-comment-abuse' import { AccountModel } from '../account/account' import { ActorModel, unusedActorAttributesForAPI } from '../activitypub/actor' -import { buildBlockedAccountSQL, buildBlockedAccountSQLOptimized, buildLocalAccountIdsIn, getCommentSort, throwIfNotValid } from '../utils' +import { + buildBlockedAccountSQL, + buildBlockedAccountSQLOptimized, + buildLocalAccountIdsIn, + getCommentSort, + searchAttribute, + throwIfNotValid +} from '../utils' import { VideoModel } from './video' import { VideoChannelModel } from './video-channel' @@ -303,6 +311,90 @@ export class VideoCommentModel extends Model { return VideoCommentModel.scope([ ScopeNames.WITH_IN_REPLY_TO, ScopeNames.WITH_ACCOUNT ]).findOne(query) } + static listCommentsForApi (parameters: { + start: number + count: number + sort: string + + isLocal?: boolean + search?: string + searchAccount?: string + searchVideo?: string + }) { + const { start, count, sort, isLocal, search, searchAccount, searchVideo } = parameters + + const query: FindAndCountOptions = { + offset: start, + limit: count, + order: getCommentSort(sort) + } + + const where: WhereOptions = { + isDeleted: false + } + + const whereAccount: WhereOptions = {} + const whereActor: WhereOptions = {} + const whereVideo: WhereOptions = {} + + if (isLocal === true) { + Object.assign(where, { + serverId: null + }) + } else if (isLocal === false) { + Object.assign(where, { + serverId: { + [Op.ne]: null + } + }) + } + + if (search) { + Object.assign(where, searchAttribute(search, 'text')) + Object.assign(whereActor, searchAttribute(search, 'preferredUsername')) + Object.assign(whereAccount, searchAttribute(search, 'name')) + Object.assign(whereVideo, searchAttribute(search, 'name')) + } + + if (searchAccount) { + Object.assign(whereActor, searchAttribute(search, 'preferredUsername')) + Object.assign(whereAccount, searchAttribute(search, 'name')) + } + + if (searchVideo) { + Object.assign(whereVideo, searchAttribute(search, 'name')) + } + + query.include = [ + { + model: AccountModel.unscoped(), + required: !!searchAccount, + where: whereAccount, + include: [ + { + attributes: { + exclude: unusedActorAttributesForAPI + }, + model: ActorModel, // Default scope includes avatar and server + required: true, + where: whereActor + } + ] + }, + { + model: VideoModel.unscoped(), + required: true, + where: whereVideo + } + ] + + return VideoCommentModel + .findAndCountAll(query) + .then(({ rows, count }) => { + return { total: count, data: rows } + }) + } + static async listThreadsForApi (parameters: { videoId: number isVideoOwned: boolean @@ -656,19 +748,51 @@ export class VideoCommentModel extends Model { id: this.id, url: this.url, text: this.text, + threadId: this.getThreadId(), inReplyToCommentId: this.inReplyToCommentId || null, videoId: this.videoId, + createdAt: this.createdAt, updatedAt: this.updatedAt, deletedAt: this.deletedAt, + isDeleted: this.isDeleted(), + totalRepliesFromVideoAuthor: this.get('totalRepliesFromVideoAuthor') || 0, totalReplies: this.get('totalReplies') || 0, - account: this.Account ? this.Account.toFormattedJSON() : null + + account: this.Account + ? this.Account.toFormattedJSON() + : null } as VideoComment } + toFormattedAdminJSON (this: MCommentAdminFormattable) { + return { + id: this.id, + url: this.url, + text: this.text, + + threadId: this.getThreadId(), + inReplyToCommentId: this.inReplyToCommentId || null, + videoId: this.videoId, + + createdAt: this.createdAt, + updatedAt: this.updatedAt, + + video: { + id: this.Video.id, + uuid: this.Video.uuid, + name: this.Video.name + }, + + account: this.Account + ? this.Account.toFormattedJSON() + : null + } as VideoCommentAdmin + } + toActivityPubObject (this: MCommentAP, threadParentComments: MCommentOwner[]): VideoCommentObject | ActivityTombstoneObject { let inReplyTo: string // New thread, so in AS we reply to the video diff --git a/server/types/models/video/video-comment.ts b/server/types/models/video/video-comment.ts index f1c50c753..83479e7b2 100644 --- a/server/types/models/video/video-comment.ts +++ b/server/types/models/video/video-comment.ts @@ -1,7 +1,7 @@ -import { VideoCommentModel } from '../../../models/video/video-comment' import { PickWith, PickWithOpt } from '@shared/core-utils' +import { VideoCommentModel } from '../../../models/video/video-comment' import { MAccountDefault, MAccountFormattable, MAccountUrl } from '../account' -import { MVideoAccountLight, MVideoFeed, MVideoIdUrl, MVideoUrl } from './video' +import { MVideo, MVideoAccountLight, MVideoFeed, MVideoIdUrl, MVideoUrl } from './video' type Use = PickWith @@ -59,6 +59,11 @@ export type MCommentFormattable = MCommentTotalReplies & Use<'Account', MAccountFormattable> +export type MCommentAdminFormattable = + MComment & + Use<'Account', MAccountFormattable> & + Use<'Video', MVideo> + export type MCommentAP = MComment & Use<'Account', MAccountUrl> & diff --git a/shared/core-utils/users/user-role.ts b/shared/core-utils/users/user-role.ts index 2b322faf3..81cba1dad 100644 --- a/shared/core-utils/users/user-role.ts +++ b/shared/core-utils/users/user-role.ts @@ -22,7 +22,8 @@ const userRoleRights: { [ id in UserRole ]: UserRight[] } = { UserRight.SEE_ALL_VIDEOS, UserRight.MANAGE_ACCOUNTS_BLOCKLIST, UserRight.MANAGE_SERVERS_BLOCKLIST, - UserRight.MANAGE_USERS + UserRight.MANAGE_USERS, + UserRight.SEE_ALL_COMMENTS ], [UserRole.USER]: [] diff --git a/shared/models/users/user-right.enum.ts b/shared/models/users/user-right.enum.ts index e815fa893..bbedc9f00 100644 --- a/shared/models/users/user-right.enum.ts +++ b/shared/models/users/user-right.enum.ts @@ -32,6 +32,7 @@ export const enum UserRight { GET_ANY_LIVE, SEE_ALL_VIDEOS, + SEE_ALL_COMMENTS, CHANGE_VIDEO_OWNERSHIP, MANAGE_PLUGINS, diff --git a/shared/models/videos/video-comment.model.ts b/shared/models/videos/video-comment.model.ts index eec7dba1c..9730a3f76 100644 --- a/shared/models/videos/video-comment.model.ts +++ b/shared/models/videos/video-comment.model.ts @@ -16,6 +16,26 @@ export interface VideoComment { account: Account } +export interface VideoCommentAdmin { + id: number + url: string + text: string + + threadId: number + inReplyToCommentId: number + + createdAt: Date | string + updatedAt: Date | string + + account: Account + + video: { + id: number + uuid: string + name: string + } +} + export interface VideoCommentThreadTree { comment: VideoComment children: VideoCommentThreadTree[] From f1273314593a4a7dc7ec9594ce0c6c3ae8f62b34 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 16 Nov 2020 11:55:17 +0100 Subject: [PATCH 2/2] Add admin view to manage comments --- .../video-block-list.component.scss | 8 +- .../video-comment-list.component.html | 36 +- .../video-comment-list.component.scss | 51 ++- .../video-comment-list.component.ts | 86 +++- .../shared-main/feeds/feed.component.html | 2 +- .../shared-main/feeds/feed.component.scss | 2 +- .../video-comment.model.ts | 11 +- .../video-comment.service.ts | 7 +- server/middlewares/validators/users.ts | 1 + .../validators/videos/video-comments.ts | 3 +- server/models/video/video-comment.ts | 84 ++-- server/tests/api/check-params/users.ts | 12 - .../tests/api/check-params/video-comments.ts | 48 +++ server/tests/api/videos/multiple-servers.ts | 2 +- server/tests/api/videos/video-comments.ts | 392 ++++++++++-------- shared/extra-utils/videos/video-comments.ts | 37 +- 16 files changed, 522 insertions(+), 260 deletions(-) diff --git a/client/src/app/+admin/moderation/video-block-list/video-block-list.component.scss b/client/src/app/+admin/moderation/video-block-list/video-block-list.component.scss index c92d1c39c..0e34150c1 100644 --- a/client/src/app/+admin/moderation/video-block-list/video-block-list.component.scss +++ b/client/src/app/+admin/moderation/video-block-list/video-block-list.component.scss @@ -1,12 +1,8 @@ @import 'mixins'; my-global-icon { - @include apply-svg-color(#7d7d7d); - - width: 12px; - height: 12px; - position: relative; - top: -1px; + width: 24px; + height: 24px; } .input-group { diff --git a/client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.html b/client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.html index b4f66a75f..45c5fe28f 100644 --- a/client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.html +++ b/client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.html @@ -1,9 +1,11 @@

- + Video comments + +

-this view does show comments from muted accounts so you can delete them +This view also shows comments from muted accounts. Clear filters @@ -41,9 +43,9 @@ this view does show comments from muted accounts so you can delete them - Account - Video - Comment + Account + Video + Comment Date @@ -58,14 +60,28 @@ this view does show comments from muted accounts so you can delete them - {{ videoComment.by }} + +
+ +
+ {{ videoComment.account.displayName }} + {{ videoComment.by }} +
+
+ - - {{ videoComment.video.name }} + + Commented video + + {{ videoComment.video.name }} - +
diff --git a/client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.scss b/client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.scss index c92d1c39c..b3746b0c5 100644 --- a/client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.scss +++ b/client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.scss @@ -1,12 +1,22 @@ @import 'mixins'; -my-global-icon { - @include apply-svg-color(#7d7d7d); +h1 { + my-feed { + margin-left: 5px; + display: inline-block; - width: 12px; - height: 12px; - position: relative; - top: -1px; + ::ng-deep { + my-global-icon { + width: 15px !important; + top: 0 !important; + } + } + } +} + +my-global-icon { + width: 24px; + height: 24px; } .input-group { @@ -25,3 +35,32 @@ my-global-icon { flex-grow: 1; } } + +.video { + display: flex; + flex-direction: column; + + em { + font-size: 11px; + } + + a { + @include ellipsis + } +} + +.comment-html { + ::ng-deep { + > div { + max-height: 22px; + } + + div, p { + @include ellipsis; + } + + p { + margin: 0; + } + } +} diff --git a/client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.ts b/client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.ts index fdd5ec76e..d26047125 100644 --- a/client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.ts +++ b/client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.ts @@ -1,16 +1,17 @@ import { SortMeta } from 'primeng/api' import { filter } from 'rxjs/operators' import { AfterViewInit, Component, OnInit } from '@angular/core' -import { DomSanitizer } from '@angular/platform-browser' import { ActivatedRoute, Params, Router } from '@angular/router' -import { ConfirmService, MarkdownService, Notifier, RestPagination, RestTable, ServerService } from '@app/core' -import { DropdownAction, VideoService } from '@app/shared/shared-main' +import { AuthService, ConfirmService, MarkdownService, Notifier, RestPagination, RestTable } from '@app/core' +import { DropdownAction } from '@app/shared/shared-main' +import { BulkService } from '@app/shared/shared-moderation' import { VideoCommentAdmin, VideoCommentService } from '@app/shared/shared-video-comment' +import { FeedFormat, UserRight } from '@shared/models' @Component({ selector: 'my-video-comment-list', templateUrl: './video-comment-list.component.html', - styleUrls: [ './video-comment-list.component.scss' ] + styleUrls: [ '../../../shared/shared-moderation/moderation.scss', './video-comment-list.component.scss' ] }) export class VideoCommentListComponent extends RestTable implements OnInit, AfterViewInit { comments: VideoCommentAdmin[] @@ -20,26 +21,54 @@ export class VideoCommentListComponent extends RestTable implements OnInit, Afte videoCommentActions: DropdownAction[][] = [] + syndicationItems = [ + { + format: FeedFormat.RSS, + label: 'media rss 2.0', + url: VideoCommentService.BASE_FEEDS_URL + FeedFormat.RSS.toLowerCase() + }, + { + format: FeedFormat.ATOM, + label: 'atom 1.0', + url: VideoCommentService.BASE_FEEDS_URL + FeedFormat.ATOM.toLowerCase() + }, + { + format: FeedFormat.JSON, + label: 'json 1.0', + url: VideoCommentService.BASE_FEEDS_URL + FeedFormat.JSON.toLowerCase() + } + ] + + get authUser () { + return this.auth.getUser() + } + constructor ( + private auth: AuthService, private notifier: Notifier, - private serverService: ServerService, private confirmService: ConfirmService, private videoCommentService: VideoCommentService, private markdownRenderer: MarkdownService, - private sanitizer: DomSanitizer, - private videoService: VideoService, private route: ActivatedRoute, - private router: Router + private router: Router, + private bulkService: BulkService ) { super() this.videoCommentActions = [ [ + { + label: $localize`Delete this comment`, + handler: comment => this.deleteComment(comment), + isDisplayed: () => this.authUser.hasRight(UserRight.REMOVE_ANY_VIDEO_COMMENT) + }, - // remove this comment, - - // remove all comments of this account - + { + label: $localize`Delete all comments of this account`, + description: $localize`Comments are deleted after a few minutes`, + handler: comment => this.deleteUserComments(comment), + isDisplayed: () => this.authUser.hasRight(UserRight.REMOVE_ANY_VIDEO_COMMENT) + } ] ] } @@ -60,7 +89,7 @@ export class VideoCommentListComponent extends RestTable implements OnInit, Afte if (this.search) this.setTableFilter(this.search) } - onSearch (event: Event) { + onInputSearch (event: Event) { this.onSearch(event) this.setQueryParams((event.target as HTMLInputElement).value) } @@ -84,7 +113,7 @@ export class VideoCommentListComponent extends RestTable implements OnInit, Afte } toHtml (text: string) { - return this.markdownRenderer.textMarkdownToHTML(text) + return this.markdownRenderer.textMarkdownToHTML(text, true, true) } protected loadData () { @@ -108,4 +137,33 @@ export class VideoCommentListComponent extends RestTable implements OnInit, Afte err => this.notifier.error(err.message) ) } + + private deleteComment (comment: VideoCommentAdmin) { + this.videoCommentService.deleteVideoComment(comment.video.id, comment.id) + .subscribe( + () => this.loadData(), + + err => this.notifier.error(err.message) + ) + } + + private async deleteUserComments (comment: VideoCommentAdmin) { + const message = $localize`Do you really want to delete all comments of ${comment.by}?` + const res = await this.confirmService.confirm(message, $localize`Delete`) + if (res === false) return + + const options = { + accountName: comment.by, + scope: 'instance' as 'instance' + } + + this.bulkService.removeCommentsOf(options) + .subscribe( + () => { + this.notifier.success($localize`Comments of ${options.accountName} will be deleted in a few minutes`) + }, + + err => this.notifier.error(err.message) + ) + } } diff --git a/client/src/app/shared/shared-main/feeds/feed.component.html b/client/src/app/shared/shared-main/feeds/feed.component.html index 13883fd9b..a00011785 100644 --- a/client/src/app/shared/shared-main/feeds/feed.component.html +++ b/client/src/app/shared/shared-main/feeds/feed.component.html @@ -1,4 +1,4 @@ -
+
> { const { pagination, sort, search } = options - const url = VideoCommentService.BASE_VIDEO_URL + '/comments' + const url = VideoCommentService.BASE_VIDEO_URL + 'comments' let params = new HttpParams() params = this.restService.addRestGetParams(params, pagination, sort) @@ -172,7 +173,7 @@ export class VideoCommentService { private buildParamsFromSearch (search: string, params: HttpParams) { const filters = this.restService.parseQueryStringFilter(search, { - state: { + isLocal: { prefix: 'local:', isBoolean: true, handler: v => { diff --git a/server/middlewares/validators/users.ts b/server/middlewares/validators/users.ts index 452c7fb93..c91c378b3 100644 --- a/server/middlewares/validators/users.ts +++ b/server/middlewares/validators/users.ts @@ -41,6 +41,7 @@ import { Hooks } from '@server/lib/plugins/hooks' const usersListValidator = [ query('blocked') .optional() + .customSanitizer(toBooleanOrNull) .isBoolean().withMessage('Should be a valid boolean banned state'), (req: express.Request, res: express.Response, next: express.NextFunction) => { diff --git a/server/middlewares/validators/videos/video-comments.ts b/server/middlewares/validators/videos/video-comments.ts index 55fb60b98..a3c9febc4 100644 --- a/server/middlewares/validators/videos/video-comments.ts +++ b/server/middlewares/validators/videos/video-comments.ts @@ -2,7 +2,7 @@ import * as express from 'express' import { body, param, query } from 'express-validator' import { MUserAccountUrl } from '@server/types/models' import { UserRight } from '../../../../shared' -import { exists, isBooleanValid, isIdOrUUIDValid, isIdValid } from '../../../helpers/custom-validators/misc' +import { exists, isBooleanValid, isIdOrUUIDValid, isIdValid, toBooleanOrNull } from '../../../helpers/custom-validators/misc' import { doesVideoCommentExist, doesVideoCommentThreadExist, @@ -18,6 +18,7 @@ import { areValidationErrors } from '../utils' const listVideoCommentsValidator = [ query('isLocal') .optional() + .customSanitizer(toBooleanOrNull) .custom(isBooleanValid) .withMessage('Should have a valid is local boolean'), diff --git a/server/models/video/video-comment.ts b/server/models/video/video-comment.ts index 70aed75d6..ed4a345eb 100644 --- a/server/models/video/video-comment.ts +++ b/server/models/video/video-comment.ts @@ -323,14 +323,8 @@ export class VideoCommentModel extends Model { }) { const { start, count, sort, isLocal, search, searchAccount, searchVideo } = parameters - const query: FindAndCountOptions = { - offset: start, - limit: count, - order: getCommentSort(sort) - } - const where: WhereOptions = { - isDeleted: false + deletedAt: null } const whereAccount: WhereOptions = {} @@ -338,11 +332,11 @@ export class VideoCommentModel extends Model { const whereVideo: WhereOptions = {} if (isLocal === true) { - Object.assign(where, { + Object.assign(whereActor, { serverId: null }) } else if (isLocal === false) { - Object.assign(where, { + Object.assign(whereActor, { serverId: { [Op.ne]: null } @@ -350,43 +344,57 @@ export class VideoCommentModel extends Model { } if (search) { - Object.assign(where, searchAttribute(search, 'text')) - Object.assign(whereActor, searchAttribute(search, 'preferredUsername')) - Object.assign(whereAccount, searchAttribute(search, 'name')) - Object.assign(whereVideo, searchAttribute(search, 'name')) + Object.assign(where, { + [Op.or]: [ + searchAttribute(search, 'text'), + searchAttribute(search, '$Account.Actor.preferredUsername$'), + searchAttribute(search, '$Account.name$'), + searchAttribute(search, '$Video.name$') + ] + }) } if (searchAccount) { - Object.assign(whereActor, searchAttribute(search, 'preferredUsername')) - Object.assign(whereAccount, searchAttribute(search, 'name')) + Object.assign(whereActor, { + [Op.or]: [ + searchAttribute(searchAccount, '$Account.Actor.preferredUsername$'), + searchAttribute(searchAccount, '$Account.name$') + ] + }) } if (searchVideo) { - Object.assign(whereVideo, searchAttribute(search, 'name')) + Object.assign(whereVideo, searchAttribute(searchVideo, 'name')) } - query.include = [ - { - model: AccountModel.unscoped(), - required: !!searchAccount, - where: whereAccount, - include: [ - { - attributes: { - exclude: unusedActorAttributesForAPI - }, - model: ActorModel, // Default scope includes avatar and server - required: true, - where: whereActor - } - ] - }, - { - model: VideoModel.unscoped(), - required: true, - where: whereVideo - } - ] + const query: FindAndCountOptions = { + offset: start, + limit: count, + order: getCommentSort(sort), + where, + include: [ + { + model: AccountModel.unscoped(), + required: true, + where: whereAccount, + include: [ + { + attributes: { + exclude: unusedActorAttributesForAPI + }, + model: ActorModel, // Default scope includes avatar and server + required: true, + where: whereActor + } + ] + }, + { + model: VideoModel.unscoped(), + required: true, + where: whereVideo + } + ] + } return VideoCommentModel .findAndCountAll(query) diff --git a/server/tests/api/check-params/users.ts b/server/tests/api/check-params/users.ts index 3e53c445d..2a220be83 100644 --- a/server/tests/api/check-params/users.ts +++ b/server/tests/api/check-params/users.ts @@ -154,18 +154,6 @@ describe('Test users API validators', function () { await checkBadSortPagination(server.url, path, server.accessToken) }) - it('Should fail with a bad blocked/banned user filter', async function () { - await makeGetRequest({ - url: server.url, - path, - query: { - blocked: 42 - }, - token: server.accessToken, - statusCodeExpected: 400 - }) - }) - it('Should fail with a non authenticated user', async function () { await makeGetRequest({ url: server.url, diff --git a/server/tests/api/check-params/video-comments.ts b/server/tests/api/check-params/video-comments.ts index 181282ce1..662d4a70d 100644 --- a/server/tests/api/check-params/video-comments.ts +++ b/server/tests/api/check-params/video-comments.ts @@ -296,6 +296,54 @@ describe('Test video comments API validator', function () { it('Should return conflict on comment thread add') }) + describe('When listing admin comments threads', function () { + const path = '/api/v1/videos/comments' + + it('Should fail with a bad start pagination', async function () { + await checkBadStartPagination(server.url, path, server.accessToken) + }) + + it('Should fail with a bad count pagination', async function () { + await checkBadCountPagination(server.url, path, server.accessToken) + }) + + it('Should fail with an incorrect sort', async function () { + await checkBadSortPagination(server.url, path, server.accessToken) + }) + + it('Should fail with a non authenticated user', async function () { + await makeGetRequest({ + url: server.url, + path, + statusCodeExpected: 401 + }) + }) + + it('Should fail with a non admin user', async function () { + await makeGetRequest({ + url: server.url, + path, + token: userAccessToken, + statusCodeExpected: 403 + }) + }) + + it('Should succeed with the correct params', async function () { + await makeGetRequest({ + url: server.url, + path, + token: server.accessToken, + query: { + isLocal: false, + search: 'toto', + searchAccount: 'toto', + searchVideo: 'toto' + }, + statusCodeExpected: 200 + }) + }) + }) + after(async function () { await cleanupTests([ server ]) }) diff --git a/server/tests/api/videos/multiple-servers.ts b/server/tests/api/videos/multiple-servers.ts index d7b04373f..c90fd09fb 100644 --- a/server/tests/api/videos/multiple-servers.ts +++ b/server/tests/api/videos/multiple-servers.ts @@ -158,7 +158,7 @@ describe('Test multiple servers', function () { }) it('Should upload the video on server 2 and propagate on each server', async function () { - this.timeout(50000) + this.timeout(100000) const user = { username: 'user1', diff --git a/server/tests/api/videos/video-comments.ts b/server/tests/api/videos/video-comments.ts index afb58e95a..18a86bead 100644 --- a/server/tests/api/videos/video-comments.ts +++ b/server/tests/api/videos/video-comments.ts @@ -2,7 +2,7 @@ import * as chai from 'chai' import 'mocha' -import { VideoComment, VideoCommentThreadTree } from '../../../../shared/models/videos/video-comment.model' +import { VideoComment, VideoCommentAdmin, VideoCommentThreadTree } from '../../../../shared/models/videos/video-comment.model' import { cleanupTests, testImage } from '../../../../shared/extra-utils' import { createUser, @@ -18,9 +18,11 @@ import { addVideoCommentReply, addVideoCommentThread, deleteVideoComment, + getAdminVideoComments, getVideoCommentThreads, getVideoThreadComments } from '../../../../shared/extra-utils/videos/video-comments' +import { isLocalLiveVideoAccepted } from '@server/lib/moderation' const expect = chai.expect @@ -59,186 +61,248 @@ describe('Test video comments', function () { userAccessTokenServer1 = await getAccessToken(server.url, 'user1', 'password') }) - it('Should not have threads on this video', async function () { - const res = await getVideoCommentThreads(server.url, videoUUID, 0, 5) + describe('User comments', function () { - expect(res.body.total).to.equal(0) - expect(res.body.data).to.be.an('array') - expect(res.body.data).to.have.lengthOf(0) + it('Should not have threads on this video', async function () { + const res = await getVideoCommentThreads(server.url, videoUUID, 0, 5) + + expect(res.body.total).to.equal(0) + expect(res.body.data).to.be.an('array') + expect(res.body.data).to.have.lengthOf(0) + }) + + it('Should create a thread in this video', async function () { + const text = 'my super first comment' + + const res = await addVideoCommentThread(server.url, server.accessToken, videoUUID, text) + const comment = res.body.comment + + expect(comment.inReplyToCommentId).to.be.null + expect(comment.text).equal('my super first comment') + expect(comment.videoId).to.equal(videoId) + expect(comment.id).to.equal(comment.threadId) + expect(comment.account.name).to.equal('root') + expect(comment.account.host).to.equal('localhost:' + server.port) + expect(comment.account.url).to.equal('http://localhost:' + server.port + '/accounts/root') + expect(comment.totalReplies).to.equal(0) + expect(comment.totalRepliesFromVideoAuthor).to.equal(0) + expect(dateIsValid(comment.createdAt as string)).to.be.true + expect(dateIsValid(comment.updatedAt as string)).to.be.true + }) + + it('Should list threads of this video', async function () { + const res = await getVideoCommentThreads(server.url, videoUUID, 0, 5) + + expect(res.body.total).to.equal(1) + expect(res.body.data).to.be.an('array') + expect(res.body.data).to.have.lengthOf(1) + + const comment: VideoComment = res.body.data[0] + expect(comment.inReplyToCommentId).to.be.null + expect(comment.text).equal('my super first comment') + expect(comment.videoId).to.equal(videoId) + expect(comment.id).to.equal(comment.threadId) + expect(comment.account.name).to.equal('root') + expect(comment.account.host).to.equal('localhost:' + server.port) + + await testImage(server.url, 'avatar-resized', comment.account.avatar.path, '.png') + + expect(comment.totalReplies).to.equal(0) + expect(comment.totalRepliesFromVideoAuthor).to.equal(0) + expect(dateIsValid(comment.createdAt as string)).to.be.true + expect(dateIsValid(comment.updatedAt as string)).to.be.true + + threadId = comment.threadId + }) + + it('Should get all the thread created', async function () { + const res = await getVideoThreadComments(server.url, videoUUID, threadId) + + const rootComment = res.body.comment + expect(rootComment.inReplyToCommentId).to.be.null + expect(rootComment.text).equal('my super first comment') + expect(rootComment.videoId).to.equal(videoId) + expect(dateIsValid(rootComment.createdAt as string)).to.be.true + expect(dateIsValid(rootComment.updatedAt as string)).to.be.true + }) + + it('Should create multiple replies in this thread', async function () { + const text1 = 'my super answer to thread 1' + const childCommentRes = await addVideoCommentReply(server.url, server.accessToken, videoId, threadId, text1) + const childCommentId = childCommentRes.body.comment.id + + const text2 = 'my super answer to answer of thread 1' + await addVideoCommentReply(server.url, server.accessToken, videoId, childCommentId, text2) + + const text3 = 'my second answer to thread 1' + await addVideoCommentReply(server.url, server.accessToken, videoId, threadId, text3) + }) + + it('Should get correctly the replies', async function () { + const res = await getVideoThreadComments(server.url, videoUUID, threadId) + + const tree: VideoCommentThreadTree = res.body + expect(tree.comment.text).equal('my super first comment') + expect(tree.children).to.have.lengthOf(2) + + const firstChild = tree.children[0] + expect(firstChild.comment.text).to.equal('my super answer to thread 1') + expect(firstChild.children).to.have.lengthOf(1) + + const childOfFirstChild = firstChild.children[0] + expect(childOfFirstChild.comment.text).to.equal('my super answer to answer of thread 1') + expect(childOfFirstChild.children).to.have.lengthOf(0) + + const secondChild = tree.children[1] + expect(secondChild.comment.text).to.equal('my second answer to thread 1') + expect(secondChild.children).to.have.lengthOf(0) + + replyToDeleteId = secondChild.comment.id + }) + + it('Should create other threads', async function () { + const text1 = 'super thread 2' + await addVideoCommentThread(server.url, server.accessToken, videoUUID, text1) + + const text2 = 'super thread 3' + await addVideoCommentThread(server.url, server.accessToken, videoUUID, text2) + }) + + it('Should list the threads', async function () { + const res = await getVideoCommentThreads(server.url, videoUUID, 0, 5, 'createdAt') + + expect(res.body.total).to.equal(3) + expect(res.body.data).to.be.an('array') + expect(res.body.data).to.have.lengthOf(3) + + expect(res.body.data[0].text).to.equal('my super first comment') + expect(res.body.data[0].totalReplies).to.equal(3) + expect(res.body.data[1].text).to.equal('super thread 2') + expect(res.body.data[1].totalReplies).to.equal(0) + expect(res.body.data[2].text).to.equal('super thread 3') + expect(res.body.data[2].totalReplies).to.equal(0) + }) + + it('Should delete a reply', async function () { + await deleteVideoComment(server.url, server.accessToken, videoId, replyToDeleteId) + + const res = await getVideoThreadComments(server.url, videoUUID, threadId) + + const tree: VideoCommentThreadTree = res.body + expect(tree.comment.text).equal('my super first comment') + expect(tree.children).to.have.lengthOf(2) + + const firstChild = tree.children[0] + expect(firstChild.comment.text).to.equal('my super answer to thread 1') + expect(firstChild.children).to.have.lengthOf(1) + + const childOfFirstChild = firstChild.children[0] + expect(childOfFirstChild.comment.text).to.equal('my super answer to answer of thread 1') + expect(childOfFirstChild.children).to.have.lengthOf(0) + + const deletedChildOfFirstChild = tree.children[1] + expect(deletedChildOfFirstChild.comment.text).to.equal('') + expect(deletedChildOfFirstChild.comment.isDeleted).to.be.true + expect(deletedChildOfFirstChild.comment.deletedAt).to.not.be.null + expect(deletedChildOfFirstChild.comment.account).to.be.null + expect(deletedChildOfFirstChild.children).to.have.lengthOf(0) + }) + + it('Should delete a complete thread', async function () { + await deleteVideoComment(server.url, server.accessToken, videoId, threadId) + + const res = await getVideoCommentThreads(server.url, videoUUID, 0, 5, 'createdAt') + expect(res.body.total).to.equal(3) + expect(res.body.data).to.be.an('array') + expect(res.body.data).to.have.lengthOf(3) + + expect(res.body.data[0].text).to.equal('') + expect(res.body.data[0].isDeleted).to.be.true + expect(res.body.data[0].deletedAt).to.not.be.null + expect(res.body.data[0].account).to.be.null + expect(res.body.data[0].totalReplies).to.equal(3) + expect(res.body.data[1].text).to.equal('super thread 2') + expect(res.body.data[1].totalReplies).to.equal(0) + expect(res.body.data[2].text).to.equal('super thread 3') + expect(res.body.data[2].totalReplies).to.equal(0) + }) + + it('Should count replies from the video author correctly', async function () { + const text = 'my super first comment' + await addVideoCommentThread(server.url, server.accessToken, videoUUID, text) + let res = await getVideoCommentThreads(server.url, videoUUID, 0, 5) + const comment: VideoComment = res.body.data[0] + const threadId2 = comment.threadId + + const text2 = 'a first answer to thread 4 by a third party' + await addVideoCommentReply(server.url, userAccessTokenServer1, videoId, threadId2, text2) + + const text3 = 'my second answer to thread 4' + await addVideoCommentReply(server.url, server.accessToken, videoId, threadId2, text3) + + res = await getVideoThreadComments(server.url, videoUUID, threadId2) + const tree: VideoCommentThreadTree = res.body + expect(tree.comment.totalReplies).to.equal(tree.comment.totalRepliesFromVideoAuthor + 1) + }) }) - it('Should create a thread in this video', async function () { - const text = 'my super first comment' + describe('All instance comments', function () { + async function getComments (options: any = {}) { + const res = await getAdminVideoComments(Object.assign({ + url: server.url, + token: server.accessToken, + start: 0, + count: 10 + }, options)) - const res = await addVideoCommentThread(server.url, server.accessToken, videoUUID, text) - const comment = res.body.comment + return { comments: res.body.data as VideoCommentAdmin[], total: res.body.total as number } + } - expect(comment.inReplyToCommentId).to.be.null - expect(comment.text).equal('my super first comment') - expect(comment.videoId).to.equal(videoId) - expect(comment.id).to.equal(comment.threadId) - expect(comment.account.name).to.equal('root') - expect(comment.account.host).to.equal('localhost:' + server.port) - expect(comment.account.url).to.equal('http://localhost:' + server.port + '/accounts/root') - expect(comment.totalReplies).to.equal(0) - expect(comment.totalRepliesFromVideoAuthor).to.equal(0) - expect(dateIsValid(comment.createdAt as string)).to.be.true - expect(dateIsValid(comment.updatedAt as string)).to.be.true - }) + it('Should list instance comments as admin', async function () { + const { comments } = await getComments({ start: 0, count: 1 }) - it('Should list threads of this video', async function () { - const res = await getVideoCommentThreads(server.url, videoUUID, 0, 5) + expect(comments[0].text).to.equal('my second answer to thread 4') + }) - expect(res.body.total).to.equal(1) - expect(res.body.data).to.be.an('array') - expect(res.body.data).to.have.lengthOf(1) + it('Should filter instance comments by isLocal', async function () { + const { total, comments } = await getComments({ isLocal: false }) - const comment: VideoComment = res.body.data[0] - expect(comment.inReplyToCommentId).to.be.null - expect(comment.text).equal('my super first comment') - expect(comment.videoId).to.equal(videoId) - expect(comment.id).to.equal(comment.threadId) - expect(comment.account.name).to.equal('root') - expect(comment.account.host).to.equal('localhost:' + server.port) + expect(comments).to.have.lengthOf(0) + expect(total).to.equal(0) + }) - await testImage(server.url, 'avatar-resized', comment.account.avatar.path, '.png') + it('Should search instance comments by account', async function () { + const { total, comments } = await getComments({ searchAccount: 'user' }) - expect(comment.totalReplies).to.equal(0) - expect(comment.totalRepliesFromVideoAuthor).to.equal(0) - expect(dateIsValid(comment.createdAt as string)).to.be.true - expect(dateIsValid(comment.updatedAt as string)).to.be.true + expect(comments).to.have.lengthOf(1) + expect(total).to.equal(1) - threadId = comment.threadId - }) + expect(comments[0].text).to.equal('a first answer to thread 4 by a third party') + }) - it('Should get all the thread created', async function () { - const res = await getVideoThreadComments(server.url, videoUUID, threadId) + it('Should search instance comments by video', async function () { + { + const { total, comments } = await getComments({ searchVideo: 'video' }) - const rootComment = res.body.comment - expect(rootComment.inReplyToCommentId).to.be.null - expect(rootComment.text).equal('my super first comment') - expect(rootComment.videoId).to.equal(videoId) - expect(dateIsValid(rootComment.createdAt as string)).to.be.true - expect(dateIsValid(rootComment.updatedAt as string)).to.be.true - }) + expect(comments).to.have.lengthOf(7) + expect(total).to.equal(7) + } - it('Should create multiple replies in this thread', async function () { - const text1 = 'my super answer to thread 1' - const childCommentRes = await addVideoCommentReply(server.url, server.accessToken, videoId, threadId, text1) - const childCommentId = childCommentRes.body.comment.id + { + const { total, comments } = await getComments({ searchVideo: 'hello' }) - const text2 = 'my super answer to answer of thread 1' - await addVideoCommentReply(server.url, server.accessToken, videoId, childCommentId, text2) + expect(comments).to.have.lengthOf(0) + expect(total).to.equal(0) + } + }) - const text3 = 'my second answer to thread 1' - await addVideoCommentReply(server.url, server.accessToken, videoId, threadId, text3) - }) + it('Should search instance comments', async function () { + const { total, comments } = await getComments({ search: 'super thread 3' }) - it('Should get correctly the replies', async function () { - const res = await getVideoThreadComments(server.url, videoUUID, threadId) - - const tree: VideoCommentThreadTree = res.body - expect(tree.comment.text).equal('my super first comment') - expect(tree.children).to.have.lengthOf(2) - - const firstChild = tree.children[0] - expect(firstChild.comment.text).to.equal('my super answer to thread 1') - expect(firstChild.children).to.have.lengthOf(1) - - const childOfFirstChild = firstChild.children[0] - expect(childOfFirstChild.comment.text).to.equal('my super answer to answer of thread 1') - expect(childOfFirstChild.children).to.have.lengthOf(0) - - const secondChild = tree.children[1] - expect(secondChild.comment.text).to.equal('my second answer to thread 1') - expect(secondChild.children).to.have.lengthOf(0) - - replyToDeleteId = secondChild.comment.id - }) - - it('Should create other threads', async function () { - const text1 = 'super thread 2' - await addVideoCommentThread(server.url, server.accessToken, videoUUID, text1) - - const text2 = 'super thread 3' - await addVideoCommentThread(server.url, server.accessToken, videoUUID, text2) - }) - - it('Should list the threads', async function () { - const res = await getVideoCommentThreads(server.url, videoUUID, 0, 5, 'createdAt') - - expect(res.body.total).to.equal(3) - expect(res.body.data).to.be.an('array') - expect(res.body.data).to.have.lengthOf(3) - - expect(res.body.data[0].text).to.equal('my super first comment') - expect(res.body.data[0].totalReplies).to.equal(3) - expect(res.body.data[1].text).to.equal('super thread 2') - expect(res.body.data[1].totalReplies).to.equal(0) - expect(res.body.data[2].text).to.equal('super thread 3') - expect(res.body.data[2].totalReplies).to.equal(0) - }) - - it('Should delete a reply', async function () { - await deleteVideoComment(server.url, server.accessToken, videoId, replyToDeleteId) - - const res = await getVideoThreadComments(server.url, videoUUID, threadId) - - const tree: VideoCommentThreadTree = res.body - expect(tree.comment.text).equal('my super first comment') - expect(tree.children).to.have.lengthOf(2) - - const firstChild = tree.children[0] - expect(firstChild.comment.text).to.equal('my super answer to thread 1') - expect(firstChild.children).to.have.lengthOf(1) - - const childOfFirstChild = firstChild.children[0] - expect(childOfFirstChild.comment.text).to.equal('my super answer to answer of thread 1') - expect(childOfFirstChild.children).to.have.lengthOf(0) - - const deletedChildOfFirstChild = tree.children[1] - expect(deletedChildOfFirstChild.comment.text).to.equal('') - expect(deletedChildOfFirstChild.comment.isDeleted).to.be.true - expect(deletedChildOfFirstChild.comment.deletedAt).to.not.be.null - expect(deletedChildOfFirstChild.comment.account).to.be.null - expect(deletedChildOfFirstChild.children).to.have.lengthOf(0) - }) - - it('Should delete a complete thread', async function () { - await deleteVideoComment(server.url, server.accessToken, videoId, threadId) - - const res = await getVideoCommentThreads(server.url, videoUUID, 0, 5, 'createdAt') - expect(res.body.total).to.equal(3) - expect(res.body.data).to.be.an('array') - expect(res.body.data).to.have.lengthOf(3) - - expect(res.body.data[0].text).to.equal('') - expect(res.body.data[0].isDeleted).to.be.true - expect(res.body.data[0].deletedAt).to.not.be.null - expect(res.body.data[0].account).to.be.null - expect(res.body.data[0].totalReplies).to.equal(3) - expect(res.body.data[1].text).to.equal('super thread 2') - expect(res.body.data[1].totalReplies).to.equal(0) - expect(res.body.data[2].text).to.equal('super thread 3') - expect(res.body.data[2].totalReplies).to.equal(0) - }) - - it('Should count replies from the video author correctly', async function () { - const text = 'my super first comment' - await addVideoCommentThread(server.url, server.accessToken, videoUUID, text) - let res = await getVideoCommentThreads(server.url, videoUUID, 0, 5) - const comment: VideoComment = res.body.data[0] - const threadId2 = comment.threadId - - const text2 = 'a first answer to thread 4 by a third party' - await addVideoCommentReply(server.url, userAccessTokenServer1, videoId, threadId2, text2) - - const text3 = 'my second answer to thread 4' - await addVideoCommentReply(server.url, server.accessToken, videoId, threadId2, text3) - - res = await getVideoThreadComments(server.url, videoUUID, threadId2) - const tree: VideoCommentThreadTree = res.body - expect(tree.comment.totalReplies).to.equal(tree.comment.totalRepliesFromVideoAuthor + 1) + expect(comments).to.have.lengthOf(1) + expect(total).to.equal(1) + expect(comments[0].text).to.equal('super thread 3') + }) }) after(async function () { diff --git a/shared/extra-utils/videos/video-comments.ts b/shared/extra-utils/videos/video-comments.ts index 831e5e7d4..0b0df81dc 100644 --- a/shared/extra-utils/videos/video-comments.ts +++ b/shared/extra-utils/videos/video-comments.ts @@ -1,7 +1,41 @@ /* eslint-disable @typescript-eslint/no-floating-promises */ import * as request from 'supertest' -import { makeDeleteRequest } from '../requests/requests' +import { makeDeleteRequest, makeGetRequest } from '../requests/requests' + +function getAdminVideoComments (options: { + url: string + token: string + start: number + count: number + sort?: string + isLocal?: boolean + search?: string + searchAccount?: string + searchVideo?: string +}) { + const { url, token, start, count, sort, isLocal, search, searchAccount, searchVideo } = options + const path = '/api/v1/videos/comments' + + const query = { + start, + count, + sort: sort || '-createdAt' + } + + if (isLocal !== undefined) Object.assign(query, { isLocal }) + if (search !== undefined) Object.assign(query, { search }) + if (searchAccount !== undefined) Object.assign(query, { searchAccount }) + if (searchVideo !== undefined) Object.assign(query, { searchVideo }) + + return makeGetRequest({ + url, + path, + token, + query, + statusCodeExpected: 200 + }) +} function getVideoCommentThreads (url: string, videoId: number | string, start: number, count: number, sort?: string, token?: string) { const path = '/api/v1/videos/' + videoId + '/comment-threads' @@ -88,6 +122,7 @@ function deleteVideoComment ( export { getVideoCommentThreads, + getAdminVideoComments, getVideoThreadComments, addVideoCommentThread, addVideoCommentReply,