} from 'sequelize-typescript'
import { CONFIG } from '@server/initializers/config'
import { MAccountActor } from '@server/types/models'
-import { pick } from '@shared/core-utils'
+import { forceNumber, pick } from '@shared/core-utils'
import { AttributesOnly } from '@shared/typescript-utils'
import { ActivityPubActor } from '../../../shared/models/activitypub'
import { VideoChannel, VideoChannelSummary } from '../../../shared/models/videos'
import { CONSTRAINTS_FIELDS, WEBSERVER } from '../../initializers/constants'
import { sendDeleteActor } from '../../lib/activitypub/send'
import {
+ MChannel,
MChannelActor,
MChannelAP,
MChannelBannerAccountDefault,
search?: string
host?: string
handles?: string[]
+ forCount?: boolean
}
type AvailableWithStatsOptions = {
})
}
- let rootWhere: WhereOptions
- if (options.handles) {
- const or: WhereOptions[] = []
+ if (Array.isArray(options.handles) && options.handles.length !== 0) {
+ const or: string[] = []
for (const handle of options.handles || []) {
const [ preferredUsername, host ] = handle.split('@')
if (!host || host === WEBSERVER.HOST) {
- or.push({
- '$Actor.preferredUsername$': preferredUsername,
- '$Actor.serverId$': null
- })
+ or.push(`("preferredUsername" = ${VideoChannelModel.sequelize.escape(preferredUsername)} AND "serverId" IS NULL)`)
} else {
- or.push({
- '$Actor.preferredUsername$': preferredUsername,
- '$Actor.Server.host$': host
- })
+ or.push(
+ `(` +
+ `"preferredUsername" = ${VideoChannelModel.sequelize.escape(preferredUsername)} ` +
+ `AND "host" = ${VideoChannelModel.sequelize.escape(host)}` +
+ `)`
+ )
}
}
- rootWhere = {
- [Op.or]: or
- }
+ whereActorAnd.push({
+ id: {
+ [Op.in]: literal(`(SELECT "actor".id FROM actor LEFT JOIN server on server.id = actor."serverId" WHERE ${or.join(' OR ')})`)
+ }
+ })
+ }
+
+ const channelActorInclude: Includeable[] = []
+ const accountActorInclude: Includeable[] = []
+
+ if (options.forCount !== true) {
+ accountActorInclude.push({
+ model: ServerModel,
+ required: false
+ })
+
+ accountActorInclude.push({
+ model: ActorImageModel,
+ as: 'Avatars',
+ required: false
+ })
+
+ channelActorInclude.push({
+ model: ActorImageModel,
+ as: 'Avatars',
+ required: false
+ })
+
+ channelActorInclude.push({
+ model: ActorImageModel,
+ as: 'Banners',
+ required: false
+ })
+ }
+
+ if (options.forCount !== true || serverRequired) {
+ channelActorInclude.push({
+ model: ServerModel,
+ duplicating: false,
+ required: serverRequired,
+ where: whereServer
+ })
}
return {
- where: rootWhere,
include: [
{
attributes: {
exclude: unusedActorAttributesForAPI
},
- model: ActorModel,
+ model: ActorModel.unscoped(),
where: {
[Op.and]: whereActorAnd
},
- include: [
- {
- model: ServerModel,
- required: serverRequired,
- where: whereServer
- },
- {
- model: ActorImageModel,
- as: 'Avatar',
- required: false
- },
- {
- model: ActorImageModel,
- as: 'Banner',
- required: false
- }
- ]
+ include: channelActorInclude
},
{
- model: AccountModel,
+ model: AccountModel.unscoped(),
required: true,
include: [
{
attributes: {
exclude: unusedActorAttributesForAPI
},
- model: ActorModel, // Default scope includes avatar and server
- required: true
+ model: ActorModel.unscoped(),
+ required: true,
+ include: accountActorInclude
}
]
}
[ScopeNames.SUMMARY]: (options: SummaryOptions = {}) => {
const include: Includeable[] = [
{
- attributes: [ 'id', 'preferredUsername', 'url', 'serverId', 'avatarId' ],
+ attributes: [ 'id', 'preferredUsername', 'url', 'serverId' ],
model: ActorModel.unscoped(),
required: options.actorRequired ?? true,
include: [
required: false
},
{
- model: ActorImageModel.unscoped(),
- as: 'Avatar',
+ model: ActorImageModel,
+ as: 'Avatars',
required: false
}
]
{
model: ActorImageModel,
required: false,
- as: 'Banner'
+ as: 'Banners'
}
]
}
]
},
[ScopeNames.WITH_STATS]: (options: AvailableWithStatsOptions = { daysPrior: 30 }) => {
- const daysPrior = parseInt(options.daysPrior + '', 10)
+ const daysPrior = forceNumber(options.daysPrior)
return {
attributes: {
')'
),
'viewsPerDay'
+ ],
+ [
+ literal(
+ '(' +
+ 'SELECT COALESCE(SUM("video".views), 0) AS totalViews ' +
+ 'FROM "video" ' +
+ 'WHERE "video"."channelId" = "VideoChannelModel"."id"' +
+ ')'
+ ),
+ 'totalViews'
]
]
}
}
}
- return VideoChannelModel.count(query)
+ return VideoChannelModel.unscoped().count(query)
}
static async getStats () {
order: getSort(parameters.sort)
}
- return VideoChannelModel
- .scope({
- method: [ ScopeNames.FOR_API, { actorId } as AvailableForListOptions ]
- })
- .findAndCountAll(query)
- .then(({ rows, count }) => {
- return { total: count, data: rows }
- })
+ const getScope = (forCount: boolean) => {
+ return { method: [ ScopeNames.FOR_API, { actorId, forCount } as AvailableForListOptions ] }
+ }
+
+ return Promise.all([
+ VideoChannelModel.scope(getScope(true)).count(),
+ VideoChannelModel.scope(getScope(false)).findAll(query)
+ ]).then(([ total, data ]) => ({ total, data }))
}
static searchForApi (options: Pick<AvailableForListOptions, 'actorId' | 'search' | 'host' | 'handles'> & {
where
}
- return VideoChannelModel
- .scope({
- method: [ ScopeNames.FOR_API, pick(options, [ 'actorId', 'host', 'handles' ]) as AvailableForListOptions ]
- })
- .findAndCountAll(query)
- .then(({ rows, count }) => {
- return { total: count, data: rows }
- })
+ const getScope = (forCount: boolean) => {
+ return {
+ method: [
+ ScopeNames.FOR_API, {
+ ...pick(options, [ 'actorId', 'host', 'handles' ]),
+
+ forCount
+ } as AvailableForListOptions
+ ]
+ }
+ }
+
+ return Promise.all([
+ VideoChannelModel.scope(getScope(true)).count(query),
+ VideoChannelModel.scope(getScope(false)).findAll(query)
+ ]).then(([ total, data ]) => ({ total, data }))
}
static listByAccountForAPI (options: {
}
: null
- const query = {
- offset: options.start,
- limit: options.count,
- order: getSort(options.sort),
- include: [
- {
- model: AccountModel,
- where: {
- id: options.accountId
- },
- required: true
- }
- ],
- where
+ const getQuery = (forCount: boolean) => {
+ const accountModel = forCount
+ ? AccountModel.unscoped()
+ : AccountModel
+
+ return {
+ offset: options.start,
+ limit: options.count,
+ order: getSort(options.sort),
+ include: [
+ {
+ model: accountModel,
+ where: {
+ id: options.accountId
+ },
+ required: true
+ }
+ ],
+ where
+ }
}
- const scopes: string | ScopeOptions | (string | ScopeOptions)[] = [ ScopeNames.WITH_ACTOR_BANNER ]
+ const findScopes: string | ScopeOptions | (string | ScopeOptions)[] = [ ScopeNames.WITH_ACTOR_BANNER ]
if (options.withStats === true) {
- scopes.push({
+ findScopes.push({
method: [ ScopeNames.WITH_STATS, { daysPrior: 30 } as AvailableWithStatsOptions ]
})
}
- return VideoChannelModel
- .scope(scopes)
- .findAndCountAll(query)
- .then(({ rows, count }) => {
- return { total: count, data: rows }
- })
+ return Promise.all([
+ VideoChannelModel.unscoped().count(getQuery(true)),
+ VideoChannelModel.scope(findScopes).findAll(getQuery(false))
+ ]).then(([ total, data ]) => ({ total, data }))
}
- static listAllByAccount (accountId: number) {
+ static listAllByAccount (accountId: number): Promise<MChannel[]> {
const query = {
limit: CONFIG.VIDEO_CHANNELS.MAX_PER_USER,
include: [
{
attributes: [],
- model: AccountModel,
+ model: AccountModel.unscoped(),
where: {
id: accountId
},
{
model: ActorImageModel,
required: false,
- as: 'Banner'
+ as: 'Banners'
}
]
}
{
model: ActorImageModel,
required: false,
- as: 'Banner'
+ as: 'Banners'
}
]
}
{
model: ActorImageModel,
required: false,
- as: 'Banner'
+ as: 'Banners'
}
]
}
displayName: this.getDisplayName(),
url: actor.url,
host: actor.host,
+ avatars: actor.avatars,
+
+ // TODO: remove, deprecated in 4.2
avatar: actor.avatar
}
}
})
}
+ const totalViews = this.get('totalViews') as number
+
const actor = this.Actor.toFormattedJSON()
const videoChannel = {
id: this.id,
support: this.support,
isLocal: this.Actor.isOwned(),
updatedAt: this.updatedAt,
+
ownerAccount: undefined,
+
videosCount,
- viewsPerDay
+ viewsPerDay,
+ totalViews,
+
+ avatars: actor.avatars,
+
+ // TODO: remove, deprecated in 4.2
+ avatar: actor.avatar
}
if (this.Account) videoChannel.ownerAccount = this.Account.toFormattedJSON()