-import { BelongsTo, Column, CreatedAt, ForeignKey, Model, Scopes, Table, UpdatedAt } from 'sequelize-typescript'
-import { AccountModel } from './account'
-import { getSort, searchAttribute } from '../utils'
-import { AccountBlock } from '../../../shared/models/blocklist'
import { Op } from 'sequelize'
-import * as Bluebird from 'bluebird'
+import { BelongsTo, Column, CreatedAt, ForeignKey, Model, Scopes, Table, UpdatedAt } from 'sequelize-typescript'
import { MAccountBlocklist, MAccountBlocklistAccounts, MAccountBlocklistFormattable } from '@server/types/models'
-import { ActorModel } from '../activitypub/actor'
+import { AttributesOnly } from '@shared/core-utils'
+import { AccountBlock } from '../../../shared/models'
+import { ActorModel } from '../actor/actor'
import { ServerModel } from '../server/server'
+import { getSort, searchAttribute } from '../utils'
+import { AccountModel } from './account'
enum ScopeNames {
WITH_ACCOUNTS = 'WITH_ACCOUNTS'
}
]
})
-export class AccountBlocklistModel extends Model<AccountBlocklistModel> {
+export class AccountBlocklistModel extends Model<Partial<AttributesOnly<AccountBlocklistModel>>> {
@CreatedAt
createdAt: Date
})
}
- static loadByAccountAndTarget (accountId: number, targetAccountId: number): Bluebird<MAccountBlocklist> {
+ static loadByAccountAndTarget (accountId: number, targetAccountId: number): Promise<MAccountBlocklist> {
const query = {
where: {
accountId,
})
}
- static listHandlesBlockedBy (accountIds: number[]): Bluebird<string[]> {
+ static listHandlesBlockedBy (accountIds: number[]): Promise<string[]> {
const query = {
- attributes: [],
+ attributes: [ 'id' ],
where: {
accountId: {
[Op.in]: accountIds