+import * as Bluebird from 'bluebird'
+import { Op } from 'sequelize'
import { BelongsTo, Column, CreatedAt, ForeignKey, Model, Scopes, Table, UpdatedAt } from 'sequelize-typescript'
+import { MAccountBlocklist, MAccountBlocklistAccounts, MAccountBlocklistFormattable } from '@server/types/models'
+import { AccountBlock } from '../../../shared/models'
+import { ActorModel } from '../activitypub/actor'
+import { ServerModel } from '../server/server'
+import { getSort, searchAttribute } from '../utils'
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: [ 'accountId', 'id' ],
where: {
accountId: {
- [Op.any]: accountIds
+ [Op.in]: accountIds
},
targetAccountId
},
})
}
- static loadByAccountAndTarget (accountId: number, targetAccountId: number) {
+ static loadByAccountAndTarget (accountId: number, targetAccountId: number): Bluebird<MAccountBlocklist> {
const query = {
where: {
accountId,
return AccountBlocklistModel.findOne(query)
}
- static listForApi (accountId: number, start: number, count: number, sort: string) {
+ 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
- }
+ order: getSort(sort)
+ }
+
+ const where = {
+ accountId
+ }
+
+ if (search) {
+ Object.assign(where, {
+ [Op.or]: [
+ searchAttribute(search, '$BlockedAccount.name$'),
+ searchAttribute(search, '$BlockedAccount.Actor.url$')
+ ]
+ })
}
+ Object.assign(query, { where })
+
return AccountBlocklistModel
.scope([ ScopeNames.WITH_ACCOUNTS ])
- .findAndCountAll(query)
+ .findAndCountAll<MAccountBlocklistAccounts>(query)
.then(({ rows, count }) => {
return { total: count, data: rows }
})
}
- toFormattedJSON (): AccountBlock {
+ static listHandlesBlockedBy (accountIds: number[]): Bluebird<string[]> {
+ const query = {
+ attributes: [],
+ where: {
+ accountId: {
+ [Op.in]: accountIds
+ }
+ },
+ include: [
+ {
+ attributes: [ 'id' ],
+ model: AccountModel.unscoped(),
+ required: true,
+ as: 'BlockedAccount',
+ include: [
+ {
+ attributes: [ 'preferredUsername' ],
+ model: ActorModel.unscoped(),
+ required: true,
+ include: [
+ {
+ attributes: [ 'host' ],
+ model: ServerModel.unscoped(),
+ required: true
+ }
+ ]
+ }
+ ]
+ }
+ ]
+ }
+
+ return AccountBlocklistModel.findAll(query)
+ .then(entries => entries.map(e => `${e.BlockedAccount.Actor.preferredUsername}@${e.BlockedAccount.Actor.Server.host}`))
+ }
+
+ toFormattedJSON (this: MAccountBlocklistFormattable): AccountBlock {
return {
byAccount: this.ByAccount.toFormattedJSON(),
blockedAccount: this.BlockedAccount.toFormattedJSON(),