import { AccountModel } from './account'
import { getSort } from '../utils'
import { AccountBlock } from '../../../shared/models/blocklist'
+import { Op } from 'sequelize'
+import * as Bluebird from 'bluebird'
+import { MAccountBlocklist, MAccountBlocklistAccounts, MAccountBlocklistFormattable } from '@server/typings/models'
enum ScopeNames {
WITH_ACCOUNTS = 'WITH_ACCOUNTS'
}
-@Scopes({
+@Scopes(() => ({
[ScopeNames.WITH_ACCOUNTS]: {
include: [
{
- model: () => AccountModel,
+ model: AccountModel,
required: true,
as: 'ByAccount'
},
{
- model: () => AccountModel,
+ model: AccountModel,
required: true,
as: 'BlockedAccount'
}
]
}
-})
+}))
@Table({
tableName: 'accountBlocklist',
})
BlockedAccount: AccountModel
- static loadByAccountAndTarget (accountId: number, targetAccountId: number) {
+ static isAccountMutedBy (accountId: number, targetAccountId: number) {
+ return AccountBlocklistModel.isAccountMutedByMulti([ accountId ], targetAccountId)
+ .then(result => result[accountId])
+ }
+
+ static isAccountMutedByMulti (accountIds: number[], targetAccountId: number) {
+ const query = {
+ attributes: [ 'accountId', 'id' ],
+ where: {
+ accountId: {
+ [Op.in]: accountIds // FIXME: sequelize ANY seems broken
+ },
+ targetAccountId
+ },
+ raw: true
+ }
+
+ return AccountBlocklistModel.unscoped()
+ .findAll(query)
+ .then(rows => {
+ const result: { [accountId: number]: boolean } = {}
+
+ for (const accountId of accountIds) {
+ result[accountId] = !!rows.find(r => r.accountId === accountId)
+ }
+
+ return result
+ })
+ }
+
+ static loadByAccountAndTarget (accountId: number, targetAccountId: number): Bluebird<MAccountBlocklist> {
const query = {
where: {
accountId,
return AccountBlocklistModel
.scope([ ScopeNames.WITH_ACCOUNTS ])
- .findAndCountAll(query)
+ .findAndCountAll<MAccountBlocklistAccounts>(query)
.then(({ rows, count }) => {
return { total: count, data: rows }
})
}
- toFormattedJSON (): AccountBlock {
+ toFormattedJSON (this: MAccountBlocklistFormattable): AccountBlock {
return {
byAccount: this.ByAccount.toFormattedJSON(),
blockedAccount: this.BlockedAccount.toFormattedJSON(),