diff options
author | Chocobozzz <me@florianbigard.com> | 2020-05-29 16:16:24 +0200 |
---|---|---|
committer | Chocobozzz <chocobozzz@cpy.re> | 2020-06-10 14:02:41 +0200 |
commit | 5fb2e2888ce032c638e4b75d07458642f0833e52 (patch) | |
tree | 8830d873569316889b8134027e9a43b198cca38f /server/models/account | |
parent | 62e7be634bc189f942ae51cb4b080079ab503ff0 (diff) | |
download | PeerTube-5fb2e2888ce032c638e4b75d07458642f0833e52.tar.gz PeerTube-5fb2e2888ce032c638e4b75d07458642f0833e52.tar.zst PeerTube-5fb2e2888ce032c638e4b75d07458642f0833e52.zip |
First implem global search
Diffstat (limited to 'server/models/account')
-rw-r--r-- | server/models/account/account-blocklist.ts | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/server/models/account/account-blocklist.ts b/server/models/account/account-blocklist.ts index d8a7ce4b4..2c6b756d2 100644 --- a/server/models/account/account-blocklist.ts +++ b/server/models/account/account-blocklist.ts | |||
@@ -5,6 +5,8 @@ import { AccountBlock } from '../../../shared/models/blocklist' | |||
5 | import { Op } from 'sequelize' | 5 | import { Op } from 'sequelize' |
6 | import * as Bluebird from 'bluebird' | 6 | import * as Bluebird from 'bluebird' |
7 | import { MAccountBlocklist, MAccountBlocklistAccounts, MAccountBlocklistFormattable } from '@server/typings/models' | 7 | import { MAccountBlocklist, MAccountBlocklistAccounts, MAccountBlocklistFormattable } from '@server/typings/models' |
8 | import { ActorModel } from '../activitypub/actor' | ||
9 | import { ServerModel } from '../server/server' | ||
8 | 10 | ||
9 | enum ScopeNames { | 11 | enum ScopeNames { |
10 | WITH_ACCOUNTS = 'WITH_ACCOUNTS' | 12 | WITH_ACCOUNTS = 'WITH_ACCOUNTS' |
@@ -149,6 +151,42 @@ export class AccountBlocklistModel extends Model<AccountBlocklistModel> { | |||
149 | }) | 151 | }) |
150 | } | 152 | } |
151 | 153 | ||
154 | static listHandlesBlockedBy (accountIds: number[]): Bluebird<string[]> { | ||
155 | const query = { | ||
156 | attributes: [], | ||
157 | where: { | ||
158 | accountId: { | ||
159 | [Op.in]: accountIds | ||
160 | } | ||
161 | }, | ||
162 | include: [ | ||
163 | { | ||
164 | attributes: [ 'id' ], | ||
165 | model: AccountModel.unscoped(), | ||
166 | required: true, | ||
167 | as: 'BlockedAccount', | ||
168 | include: [ | ||
169 | { | ||
170 | attributes: [ 'preferredUsername' ], | ||
171 | model: ActorModel.unscoped(), | ||
172 | required: true, | ||
173 | include: [ | ||
174 | { | ||
175 | attributes: [ 'host' ], | ||
176 | model: ServerModel.unscoped(), | ||
177 | required: true | ||
178 | } | ||
179 | ] | ||
180 | } | ||
181 | ] | ||
182 | } | ||
183 | ] | ||
184 | } | ||
185 | |||
186 | return AccountBlocklistModel.findAll(query) | ||
187 | .then(entries => entries.map(e => `${e.BlockedAccount.Actor.preferredUsername}@${e.BlockedAccount.Actor.Server.host}`)) | ||
188 | } | ||
189 | |||
152 | toFormattedJSON (this: MAccountBlocklistFormattable): AccountBlock { | 190 | toFormattedJSON (this: MAccountBlocklistFormattable): AccountBlock { |
153 | return { | 191 | return { |
154 | byAccount: this.ByAccount.toFormattedJSON(), | 192 | byAccount: this.ByAccount.toFormattedJSON(), |