import { CONSTRAINTS_FIELDS, WEBSERVER } from '../../initializers/constants'
import { sendDeleteActor } from '../../lib/activitypub/send'
import {
- MChannelAccountDefault,
MChannelActor,
- MChannelActorAccountDefaultVideos,
MChannelAP,
+ MChannelBannerAccountDefault,
MChannelFormattable,
MChannelSummaryFormattable
} from '../../types/models/video'
import { AccountModel, ScopeNames as AccountModelScopeNames, SummaryOptions as AccountSummaryOptions } from '../account/account'
+import { ActorImageModel } from '../account/actor-image'
import { ActorModel, unusedActorAttributesForAPI } from '../activitypub/actor'
import { ActorFollowModel } from '../activitypub/actor-follow'
-import { AvatarModel } from '../avatar/avatar'
import { ServerModel } from '../server/server'
import { buildServerIdsFollowedBy, buildTrigramSearchIndex, createSimilarityAttribute, getSort, throwIfNotValid } from '../utils'
import { VideoModel } from './video'
SUMMARY = 'SUMMARY',
WITH_ACCOUNT = 'WITH_ACCOUNT',
WITH_ACTOR = 'WITH_ACTOR',
+ WITH_ACTOR_BANNER = 'WITH_ACTOR_BANNER',
WITH_VIDEOS = 'WITH_VIDEOS',
WITH_STATS = 'WITH_STATS'
}
}
}
]
- }
+ },
+ include: [
+ {
+ model: ActorImageModel,
+ as: 'Banner',
+ required: false
+ }
+ ]
},
{
model: AccountModel,
required: false
},
{
- model: AvatarModel.unscoped(),
+ model: ActorImageModel.unscoped(),
+ as: 'Avatar',
required: false
}
]
ActorModel
]
},
+ [ScopeNames.WITH_ACTOR_BANNER]: {
+ include: [
+ {
+ model: ActorModel,
+ include: [
+ {
+ model: ActorImageModel,
+ required: false,
+ as: 'Banner'
+ }
+ ]
+ }
+ ]
+ },
[ScopeNames.WITH_VIDEOS]: {
include: [
VideoModel
where
}
- const scopes: string | ScopeOptions | (string | ScopeOptions)[] = [ ScopeNames.WITH_ACTOR ]
+ const scopes: string | ScopeOptions | (string | ScopeOptions)[] = [ ScopeNames.WITH_ACTOR_BANNER ]
if (options.withStats === true) {
scopes.push({
})
}
- static loadByIdAndPopulateAccount (id: number): Promise<MChannelAccountDefault> {
+ static loadAndPopulateAccount (id: number): Promise<MChannelBannerAccountDefault> {
return VideoChannelModel.unscoped()
- .scope([ ScopeNames.WITH_ACTOR, ScopeNames.WITH_ACCOUNT ])
+ .scope([ ScopeNames.WITH_ACTOR_BANNER, ScopeNames.WITH_ACCOUNT ])
.findByPk(id)
}
- static loadByIdAndAccount (id: number, accountId: number): Promise<MChannelAccountDefault> {
- const query = {
- where: {
- id,
- accountId
- }
- }
-
- return VideoChannelModel.unscoped()
- .scope([ ScopeNames.WITH_ACTOR, ScopeNames.WITH_ACCOUNT ])
- .findOne(query)
- }
-
- static loadAndPopulateAccount (id: number): Promise<MChannelAccountDefault> {
- return VideoChannelModel.unscoped()
- .scope([ ScopeNames.WITH_ACTOR, ScopeNames.WITH_ACCOUNT ])
- .findByPk(id)
- }
-
- static loadByUrlAndPopulateAccount (url: string): Promise<MChannelAccountDefault> {
+ static loadByUrlAndPopulateAccount (url: string): Promise<MChannelBannerAccountDefault> {
const query = {
include: [
{
required: true,
where: {
url
- }
+ },
+ include: [
+ {
+ model: ActorImageModel,
+ required: false,
+ as: 'Banner'
+ }
+ ]
}
]
}
return VideoChannelModel.loadByNameAndHostAndPopulateAccount(name, host)
}
- static loadLocalByNameAndPopulateAccount (name: string): Promise<MChannelAccountDefault> {
+ static loadLocalByNameAndPopulateAccount (name: string): Promise<MChannelBannerAccountDefault> {
const query = {
include: [
{
where: {
preferredUsername: name,
serverId: null
- }
+ },
+ include: [
+ {
+ model: ActorImageModel,
+ required: false,
+ as: 'Banner'
+ }
+ ]
}
]
}
return VideoChannelModel.unscoped()
- .scope([ ScopeNames.WITH_ACTOR, ScopeNames.WITH_ACCOUNT ])
+ .scope([ ScopeNames.WITH_ACCOUNT ])
.findOne(query)
}
- static loadByNameAndHostAndPopulateAccount (name: string, host: string): Promise<MChannelAccountDefault> {
+ static loadByNameAndHostAndPopulateAccount (name: string, host: string): Promise<MChannelBannerAccountDefault> {
const query = {
include: [
{
model: ServerModel,
required: true,
where: { host }
+ },
+ {
+ model: ActorImageModel,
+ required: false,
+ as: 'Banner'
}
]
}
}
return VideoChannelModel.unscoped()
- .scope([ ScopeNames.WITH_ACTOR, ScopeNames.WITH_ACCOUNT ])
+ .scope([ ScopeNames.WITH_ACCOUNT ])
.findOne(query)
}
- static loadAndPopulateAccountAndVideos (id: number): Promise<MChannelActorAccountDefaultVideos> {
- const options = {
- include: [
- VideoModel
- ]
- }
-
- return VideoChannelModel.unscoped()
- .scope([ ScopeNames.WITH_ACTOR, ScopeNames.WITH_ACCOUNT, ScopeNames.WITH_VIDEOS ])
- .findByPk(id, options)
- }
-
toFormattedSummaryJSON (this: MChannelSummaryFormattable): VideoChannelSummary {
const actor = this.Actor.toFormattedSummaryJSON()