+import * as Bluebird from 'bluebird'
+import { Op } from 'sequelize'
import { BelongsTo, Column, CreatedAt, ForeignKey, Model, Scopes, Table, UpdatedAt } from 'sequelize-typescript'
+import { MServerBlocklist, MServerBlocklistAccountServer, MServerBlocklistFormattable } from '@server/types/models'
+import { ServerBlock } from '@shared/models'
import { AccountModel } from '../account/account'
+import { getSort, searchAttribute } from '../utils'
import { ServerModel } from './server'
-import { ServerBlock } from '../../../shared/models/blocklist'
-import { getSort } from '../utils'
-import * as Bluebird from 'bluebird'
-import { MServerBlocklist, MServerBlocklistAccountServer, MServerBlocklistFormattable } from '@server/typings/models'
-import { Op } from 'sequelize'
enum ScopeNames {
WITH_ACCOUNT = 'WITH_ACCOUNT',
attributes: [ 'accountId', 'id' ],
where: {
accountId: {
- [Op.in]: accountIds // FIXME: sequelize ANY seems broken
+ [Op.in]: accountIds
},
targetServerId
},
return ServerBlocklistModel.findOne(query)
}
- static listForApi (accountId: number, start: number, count: number, sort: string) {
+ static listHostsBlockedBy (accountIds: number[]): Bluebird<string[]> {
+ const query = {
+ attributes: [ ],
+ where: {
+ accountId: {
+ [Op.in]: accountIds
+ }
+ },
+ include: [
+ {
+ attributes: [ 'host' ],
+ model: ServerModel.unscoped(),
+ required: true
+ }
+ ]
+ }
+
+ return ServerBlocklistModel.findAll(query)
+ .then(entries => entries.map(e => e.BlockedServer.host))
+ }
+
+ static listForApi (parameters: {
+ start: number
+ count: number
+ sort: string
+ search?: string
+ accountId: number
+ }) {
+ const { start, count, sort, search, accountId } = parameters
+
const query = {
offset: start,
limit: count,
order: getSort(sort),
where: {
- accountId
+ accountId,
+ ...searchAttribute(search, '$BlockedServer.host$')
}
}