aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/models
diff options
context:
space:
mode:
Diffstat (limited to 'server/models')
-rw-r--r--server/models/activitypub/actor-follow.ts27
1 files changed, 15 insertions, 12 deletions
diff --git a/server/models/activitypub/actor-follow.ts b/server/models/activitypub/actor-follow.ts
index 90a8ac43c..20d3aa5fc 100644
--- a/server/models/activitypub/actor-follow.ts
+++ b/server/models/activitypub/actor-follow.ts
@@ -28,6 +28,7 @@ import { ServerModel } from '../server/server'
28import { getSort } from '../utils' 28import { getSort } from '../utils'
29import { ActorModel } from './actor' 29import { ActorModel } from './actor'
30import { VideoChannelModel } from '../video/video-channel' 30import { VideoChannelModel } from '../video/video-channel'
31import { IIncludeOptions } from '../../../node_modules/sequelize-typescript/lib/interfaces/IIncludeOptions'
31 32
32@Table({ 33@Table({
33 tableName: 'actorFollow', 34 tableName: 'actorFollow',
@@ -166,28 +167,30 @@ export class ActorFollowModel extends Model<ActorFollowModel> {
166 } 167 }
167 168
168 static loadByActorAndTargetNameAndHost (actorId: number, targetName: string, targetHost: string, t?: Sequelize.Transaction) { 169 static loadByActorAndTargetNameAndHost (actorId: number, targetName: string, targetHost: string, t?: Sequelize.Transaction) {
169 const actorFollowingPartInclude = { 170 const actorFollowingPartInclude: IIncludeOptions = {
170 model: ActorModel, 171 model: ActorModel,
171 required: true, 172 required: true,
172 as: 'ActorFollowing', 173 as: 'ActorFollowing',
173 where: { 174 where: {
174 preferredUsername: targetName 175 preferredUsername: targetName
175 } 176 },
177 include: [
178 {
179 model: VideoChannelModel,
180 required: false
181 }
182 ]
176 } 183 }
177 184
178 if (targetHost === null) { 185 if (targetHost === null) {
179 actorFollowingPartInclude.where['serverId'] = null 186 actorFollowingPartInclude.where['serverId'] = null
180 } else { 187 } else {
181 Object.assign(actorFollowingPartInclude, { 188 actorFollowingPartInclude.include.push({
182 include: [ 189 model: ServerModel,
183 { 190 required: true,
184 model: ServerModel, 191 where: {
185 required: true, 192 host: targetHost
186 where: { 193 }
187 host: targetHost
188 }
189 }
190 ]
191 }) 194 })
192 } 195 }
193 196