From feb34f6b6b991046aab6a10df747b48fa4da07a7 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 6 May 2020 17:39:07 +0200 Subject: Use video abuse filters on client side --- server/models/utils.ts | 60 ++---------------- server/models/video/video-abuse.ts | 127 +++++++++++++++++++------------------ 2 files changed, 73 insertions(+), 114 deletions(-) (limited to 'server/models') diff --git a/server/models/utils.ts b/server/models/utils.ts index fe4596d31..b2573cd35 100644 --- a/server/models/utils.ts +++ b/server/models/utils.ts @@ -207,60 +207,13 @@ function buildDirectionAndField (value: string) { return { direction, field } } -function searchAttribute (sourceField, targetField) { - if (sourceField) { - return { - [targetField]: { - [Op.iLike]: `%${sourceField}%` - } - } - } else { - return {} - } -} - -interface QueryStringFilterPrefixes { - [key: string]: string | { prefix: string, handler: Function, multiple?: boolean } -} - -function parseQueryStringFilter (q: string, prefixes: QueryStringFilterPrefixes): { - search: string - [key: string]: string | number | string[] | number[] -} { - const tokens = q // tokenize only if we have a querystring - ? [].concat.apply([], q.split('"').map((v, i) => i % 2 ? v : v.split(' '))).filter(Boolean) // split by space unless using double quotes - : [] - - const objectMap = (obj, fn) => Object.fromEntries( - Object.entries(obj).map( - ([ k, v ], i) => [ k, fn(v, k, i) ] - ) - ) +function searchAttribute (sourceField?: string, targetField?: string) { + if (!sourceField) return {} return { - // search is the querystring minus defined filters - search: tokens.filter(e => !Object.values(prefixes).some(p => { - if (typeof p === 'string') { - return e.startsWith(p) - } else { - return e.startsWith(p.prefix) - } - })).join(' '), - // filters defined in prefixes are added under their own name - ...objectMap(prefixes, p => { - if (typeof p === 'string') { - return tokens.filter(e => e.startsWith(p)).map(e => e.slice(p.length)) // we keep the matched item, and remove its prefix - } else { - const _tokens = tokens.filter(e => e.startsWith(p.prefix)).map(e => e.slice(p.prefix.length)).map(p.handler) - // multiple is false by default, meaning we usually just keep the first occurence of a given prefix - if (!p.multiple && _tokens.length > 0) { - return _tokens[0] - } else if (!p.multiple) { - return '' - } - return _tokens - } - }) + [targetField]: { + [Op.iLike]: `%${sourceField}%` + } } } @@ -286,8 +239,7 @@ export { getFollowsSort, buildDirectionAndField, createSafeIn, - searchAttribute, - parseQueryStringFilter + searchAttribute } // --------------------------------------------------------------------------- diff --git a/server/models/video/video-abuse.ts b/server/models/video/video-abuse.ts index 6cd2c0418..0844f702d 100644 --- a/server/models/video/video-abuse.ts +++ b/server/models/video/video-abuse.ts @@ -1,6 +1,21 @@ +import * as Bluebird from 'bluebird' +import { literal, Op } from 'sequelize' import { - AllowNull, BelongsTo, Column, CreatedAt, DataType, Default, ForeignKey, Is, Model, Table, UpdatedAt, Scopes + AllowNull, + BelongsTo, + Column, + CreatedAt, + DataType, + Default, + ForeignKey, + Is, + Model, + Scopes, + Table, + UpdatedAt } from 'sequelize-typescript' +import { VideoAbuseVideoIs } from '@shared/models/videos/abuse/video-abuse-video-is.type' +import { VideoAbuseState, VideoDetails } from '../../../shared' import { VideoAbuseObject } from '../../../shared/models/activitypub/objects' import { VideoAbuse } from '../../../shared/models/videos' import { @@ -8,15 +23,12 @@ import { isVideoAbuseReasonValid, isVideoAbuseStateValid } from '../../helpers/custom-validators/video-abuses' -import { AccountModel } from '../account/account' -import { buildBlockedAccountSQL, getSort, throwIfNotValid, searchAttribute, parseQueryStringFilter } from '../utils' -import { VideoModel } from './video' -import { VideoAbuseState, VideoDetails } from '../../../shared' import { CONSTRAINTS_FIELDS, VIDEO_ABUSE_STATES } from '../../initializers/constants' import { MUserAccountId, MVideoAbuse, MVideoAbuseFormattable, MVideoAbuseVideo } from '../../typings/models' -import * as Bluebird from 'bluebird' -import { literal, Op } from 'sequelize' +import { AccountModel } from '../account/account' +import { buildBlockedAccountSQL, getSort, searchAttribute, throwIfNotValid } from '../utils' import { ThumbnailModel } from './thumbnail' +import { VideoModel } from './video' import { VideoBlacklistModel } from './video-blacklist' import { ScopeNames as VideoChannelScopeNames, SummaryOptions, VideoChannelModel } from './video-channel' @@ -35,21 +47,22 @@ export enum ScopeNames { // filters id?: number + state?: VideoAbuseState - is?: 'deleted' | 'blacklisted' + videoIs?: VideoAbuseVideoIs // accountIds serverAccountId: number userAccountId: number }) => { - let where = { + const where = { reporterAccountId: { [Op.notIn]: literal('(' + buildBlockedAccountSQL(options.serverAccountId, options.userAccountId) + ')') } } if (options.search) { - where = Object.assign(where, { + Object.assign(where, { [Op.or]: [ { [Op.and]: [ @@ -80,26 +93,18 @@ export enum ScopeNames { }) } - if (options.id) { - where = Object.assign(where, { - id: options.id - }) - } + if (options.id) Object.assign(where, { id: options.id }) + if (options.state) Object.assign(where, { state: options.state }) - if (options.state) { - where = Object.assign(where, { - state: options.state + if (options.videoIs === 'deleted') { + Object.assign(where, { + deletedVideo: { + [Op.not]: null + } }) } - let onlyBlacklisted = false - if (options.is === 'deleted') { - where = Object.assign(where, { - deletedVideo: { [Op.not]: null } - }) - } else if (options.is === 'blacklisted') { - onlyBlacklisted = true - } + const onlyBlacklisted = options.videoIs === 'blacklisted' return { attributes: { @@ -189,7 +194,7 @@ export enum ScopeNames { }, { model: VideoModel, - required: onlyBlacklisted, + required: !!(onlyBlacklisted || options.searchVideo || options.searchReportee || options.searchVideoChannel), where: searchAttribute(options.searchVideo, 'name'), include: [ { @@ -301,11 +306,36 @@ export class VideoAbuseModel extends Model { start: number count: number sort: string - search?: string + serverAccountId: number user?: MUserAccountId + + id?: number + state?: VideoAbuseState + videoIs?: VideoAbuseVideoIs + + search?: string + searchReporter?: string + searchReportee?: string + searchVideo?: string + searchVideoChannel?: string }) { - const { start, count, sort, search, user, serverAccountId } = parameters + const { + start, + count, + sort, + search, + user, + serverAccountId, + state, + videoIs, + searchReportee, + searchVideo, + searchVideoChannel, + searchReporter, + id + } = parameters + const userAccountId = user ? user.Account.id : undefined const query = { @@ -317,37 +347,14 @@ export class VideoAbuseModel extends Model { } const filters = { - ...parseQueryStringFilter(search, { - id: { - prefix: '#', - handler: v => v - }, - state: { - prefix: 'state:', - handler: v => { - if (v === 'accepted') return VideoAbuseState.ACCEPTED - if (v === 'pending') return VideoAbuseState.PENDING - if (v === 'rejected') return VideoAbuseState.REJECTED - return undefined - } - }, - is: { - prefix: 'is:', - handler: v => { - if (v === 'deleted') return v - if (v === 'blacklisted') return v - return undefined - } - }, - searchReporter: { - prefix: 'reporter:', - handler: v => v - }, - searchReportee: { - prefix: 'reportee:', - handler: v => v - } - }), + id, + search, + state, + videoIs, + searchReportee, + searchVideo, + searchVideoChannel, + searchReporter, serverAccountId, userAccountId } -- cgit v1.2.3