UpdatedAt
} from 'sequelize-typescript'
import { FollowState } from '../../../shared/models/actors'
-import { AccountFollow } from '../../../shared/models/actors/follow.model'
+import { ActorFollow } from '../../../shared/models/actors/follow.model'
import { logger } from '../../helpers/logger'
import { getServerActor } from '../../helpers/utils'
import { ACTOR_FOLLOW_SCORE } from '../../initializers'
import { FOLLOW_STATES } from '../../initializers/constants'
import { ServerModel } from '../server/server'
import { getSort } from '../utils'
-import { ActorModel } from './actor'
+import { ActorModel, unusedActorAttributesForAPI } from './actor'
import { VideoChannelModel } from '../video/video-channel'
import { IIncludeOptions } from '../../../node_modules/sequelize-typescript/lib/interfaces/IIncludeOptions'
import { AccountModel } from '../account/account'
return ActorFollowModel.findOne(query)
}
- static loadByActorAndTargetNameAndHost (actorId: number, targetName: string, targetHost: string, t?: Sequelize.Transaction) {
+ static loadByActorAndTargetNameAndHostForAPI (actorId: number, targetName: string, targetHost: string, t?: Sequelize.Transaction) {
const actorFollowingPartInclude: IIncludeOptions = {
model: ActorModel,
required: true,
},
include: [
{
- model: VideoChannelModel,
+ model: VideoChannelModel.unscoped(),
required: false
}
]
actorId
},
include: [
+ actorFollowingPartInclude,
{
model: ActorModel,
required: true,
as: 'ActorFollower'
- },
- actorFollowingPartInclude
+ }
],
transaction: t
}
return ActorFollowModel.findOne(query)
+ .then(result => {
+ if (result && result.ActorFollowing.VideoChannel) {
+ result.ActorFollowing.VideoChannel.Actor = result.ActorFollowing
+ }
+
+ return result
+ })
+ }
+
+ static listSubscribedIn (actorId: number, targets: { name: string, host?: string }[]) {
+ const whereTab = targets
+ .map(t => {
+ if (t.host) {
+ return {
+ [ Sequelize.Op.and ]: [
+ {
+ '$preferredUsername$': t.name
+ },
+ {
+ '$host$': t.host
+ }
+ ]
+ }
+ }
+
+ return {
+ [ Sequelize.Op.and ]: [
+ {
+ '$preferredUsername$': t.name
+ },
+ {
+ '$serverId$': null
+ }
+ ]
+ }
+ })
+
+ const query = {
+ attributes: [],
+ where: {
+ [ Sequelize.Op.and ]: [
+ {
+ [ Sequelize.Op.or ]: whereTab
+ },
+ {
+ actorId
+ }
+ ]
+ },
+ include: [
+ {
+ attributes: [ 'preferredUsername' ],
+ model: ActorModel.unscoped(),
+ required: true,
+ as: 'ActorFollowing',
+ include: [
+ {
+ attributes: [ 'host' ],
+ model: ServerModel.unscoped(),
+ required: false
+ }
+ ]
+ }
+ ]
+ }
+
+ return ActorFollowModel.findAll(query)
}
static listFollowingForApi (id: number, start: number, count: number, sort: string) {
static listSubscriptionsForApi (id: number, start: number, count: number, sort: string) {
const query = {
+ attributes: [],
distinct: true,
offset: start,
limit: count,
},
include: [
{
- model: ActorModel,
+ attributes: [ 'id' ],
+ model: ActorModel.unscoped(),
as: 'ActorFollowing',
required: true,
include: [
{
- model: VideoChannelModel,
+ model: VideoChannelModel.unscoped(),
required: true,
include: [
{
- model: AccountModel,
+ attributes: {
+ exclude: unusedActorAttributesForAPI
+ },
+ model: ActorModel,
required: true
+ },
+ {
+ model: AccountModel.unscoped(),
+ required: true,
+ include: [
+ {
+ attributes: {
+ exclude: unusedActorAttributesForAPI
+ },
+ model: ActorModel,
+ required: true
+ }
+ ]
}
]
}
return ActorFollowModel.findAll(query)
}
- toFormattedJSON (): AccountFollow {
+ toFormattedJSON (): ActorFollow {
const follower = this.ActorFollower.toFormattedJSON()
const following = this.ActorFollowing.toFormattedJSON()