X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=server%2Fmodels%2Futils.ts;h=6e5522346dcca1273671d9b34ce52d2c20b7c601;hb=97816649b793bdd0f3df64631ae0ef7cf3d7461c;hp=bdf2291f0ceb5b34ed3c089de5e71044ec7304b8;hpb=0251197e249cc03b65805ed6805da72bf4573529;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/models/utils.ts b/server/models/utils.ts index bdf2291f0..6e5522346 100644 --- a/server/models/utils.ts +++ b/server/models/utils.ts @@ -3,23 +3,6 @@ import validator from 'validator' import { Col } from 'sequelize/types/lib/utils' import { literal, OrderItem, Op } from 'sequelize' -type Primitive = string | Function | number | boolean | Symbol | undefined | null -type DeepOmitHelper = { - [P in K]: // extra level of indirection needed to trigger homomorhic behavior - T[P] extends infer TP // distribute over unions - ? TP extends Primitive - ? TP // leave primitives and functions alone - : TP extends any[] - ? DeepOmitArray // Array special handling - : DeepOmit - : never -} -type DeepOmit = T extends Primitive ? T : DeepOmitHelper> - -type DeepOmitArray = { - [P in keyof T]: DeepOmit -} - type SortType = { sortModel: string, sortValue: string } // Translate for example "-name" to [ [ 'name', 'DESC' ], [ 'id', 'ASC' ] ] @@ -136,10 +119,7 @@ function createSimilarityAttribute (col: string, value: string) { ) } -function buildBlockedAccountSQL (serverAccountId: number, userAccountId?: number) { - const blockerIds = [ serverAccountId ] - if (userAccountId) blockerIds.push(userAccountId) - +function buildBlockedAccountSQL (blockerIds: number[]) { const blockerIdsString = blockerIds.join(', ') return 'SELECT "targetAccountId" AS "id" FROM "accountBlocklist" WHERE "accountId" IN (' + blockerIdsString + ')' + @@ -149,6 +129,30 @@ function buildBlockedAccountSQL (serverAccountId: number, userAccountId?: number 'WHERE "serverBlocklist"."accountId" IN (' + blockerIdsString + ')' } +function buildBlockedAccountSQLOptimized (columnNameJoin: string, blockerIds: number[]) { + const blockerIdsString = blockerIds.join(', ') + + return [ + literal( + `NOT EXISTS (` + + ` SELECT 1 FROM "accountBlocklist" ` + + ` WHERE "targetAccountId" = ${columnNameJoin} ` + + ` AND "accountId" IN (${blockerIdsString})` + + `)` + ), + + literal( + `NOT EXISTS (` + + ` SELECT 1 FROM "account" ` + + ` INNER JOIN "actor" ON account."actorId" = actor.id ` + + ` INNER JOIN "serverBlocklist" ON "actor"."serverId" = "serverBlocklist"."targetServerId" ` + + ` WHERE "account"."id" = ${columnNameJoin} ` + + ` AND "serverBlocklist"."accountId" IN (${blockerIdsString})` + + `)` + ) + ] +} + function buildServerIdsFollowedBy (actorId: any) { const actorIdNumber = parseInt(actorId + '', 10) @@ -207,23 +211,21 @@ function buildDirectionAndField (value: string) { return { direction, field } } -function searchAttribute (sourceField, targetField) { - if (sourceField) { - return { - [targetField]: { - [Op.iLike]: `%${sourceField}%` - } +function searchAttribute (sourceField?: string, targetField?: string) { + if (!sourceField) return {} + + return { + [targetField]: { + [Op.iLike]: `%${sourceField}%` } - } else { - return {} } } // --------------------------------------------------------------------------- export { - DeepOmit, buildBlockedAccountSQL, + buildBlockedAccountSQLOptimized, buildLocalActorIdsIn, SortType, buildLocalAccountIdsIn,