+import { literal, Op, OrderItem } from 'sequelize'
import { Model, Sequelize } from 'sequelize-typescript'
-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<T, K extends keyof T> = {
- [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<TP, K> // Array special handling
- : DeepOmit<TP, K>
- : never
-}
-type DeepOmit<T, K> = T extends Primitive ? T : DeepOmitHelper<T, Exclude<keyof T, K>>
-
-type DeepOmitArray<T extends any[], K> = {
- [P in keyof T]: DeepOmit<T[P], K>
-}
+import validator from 'validator'
type SortType = { sortModel: string, sortValue: string }
return [ [ finalField, direction ], lastSort ]
}
+function getPlaylistSort (value: string, lastSort: OrderItem = [ 'id', 'ASC' ]): OrderItem[] {
+ const { direction, field } = buildDirectionAndField(value)
+
+ if (field.toLowerCase() === 'name') {
+ return [ [ 'displayName', direction ], lastSort ]
+ }
+
+ return getSort(value, lastSort)
+}
+
function getCommentSort (value: string, lastSort: OrderItem = [ 'id', 'ASC' ]): OrderItem[] {
const { direction, field } = buildDirectionAndField(value)
'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)
// ---------------------------------------------------------------------------
export {
- DeepOmit,
buildBlockedAccountSQL,
+ buildBlockedAccountSQLOptimized,
buildLocalActorIdsIn,
+ getPlaylistSort,
SortType,
buildLocalAccountIdsIn,
getSort,