import { AccountModel } from './account'
import { getSort } from '../utils'
import { AccountBlock } from '../../../shared/models/blocklist'
+import { Op } from 'sequelize'
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 isAccountMutedBy (accountId: number, targetAccountId: number) {
+ return AccountBlocklistModel.isAccountMutedByMulti([ accountId ], targetAccountId)
+ .then(result => result[accountId])
+ }
+
+ static isAccountMutedByMulti (accountIds: number[], targetAccountId: number) {
const query = {
- attributes: [ 'id' ],
+ attributes: [ 'accountId', 'id' ],
where: {
- accountId,
+ accountId: {
+ [Op.in]: accountIds // FIXME: sequelize ANY seems broken
+ },
targetAccountId
},
raw: true
}
return AccountBlocklistModel.unscoped()
- .findOne(query)
- .then(a => !!a)
+ .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) {