diff options
author | Chocobozzz <me@florianbigard.com> | 2018-08-24 11:04:02 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-08-27 09:41:54 +0200 |
commit | f5b0af50c85e2f8b6b2b054ac1f47123cacbe08d (patch) | |
tree | 1b2f8a578b2d35138ac326d65674a9c9d740e8c9 /server/models | |
parent | aa55a4da422330fe2816f1764b64f6607a0ca4aa (diff) | |
download | PeerTube-f5b0af50c85e2f8b6b2b054ac1f47123cacbe08d.tar.gz PeerTube-f5b0af50c85e2f8b6b2b054ac1f47123cacbe08d.tar.zst PeerTube-f5b0af50c85e2f8b6b2b054ac1f47123cacbe08d.zip |
Search video channel handle/uri
Diffstat (limited to 'server/models')
-rw-r--r-- | server/models/activitypub/actor-follow.ts | 10 | ||||
-rw-r--r-- | server/models/activitypub/actor.ts | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/server/models/activitypub/actor-follow.ts b/server/models/activitypub/actor-follow.ts index ebb2d47c2..8bc095997 100644 --- a/server/models/activitypub/actor-follow.ts +++ b/server/models/activitypub/actor-follow.ts | |||
@@ -325,15 +325,13 @@ export class ActorFollowModel extends Model<ActorFollowModel> { | |||
325 | }, | 325 | }, |
326 | include: [ | 326 | include: [ |
327 | { | 327 | { |
328 | attributes: { | 328 | attributes: [ 'id' ], |
329 | exclude: unusedActorAttributesForAPI | 329 | model: ActorModel.unscoped(), |
330 | }, | ||
331 | model: ActorModel, | ||
332 | as: 'ActorFollowing', | 330 | as: 'ActorFollowing', |
333 | required: true, | 331 | required: true, |
334 | include: [ | 332 | include: [ |
335 | { | 333 | { |
336 | model: VideoChannelModel, | 334 | model: VideoChannelModel.unscoped(), |
337 | required: true, | 335 | required: true, |
338 | include: [ | 336 | include: [ |
339 | { | 337 | { |
@@ -344,7 +342,7 @@ export class ActorFollowModel extends Model<ActorFollowModel> { | |||
344 | required: true | 342 | required: true |
345 | }, | 343 | }, |
346 | { | 344 | { |
347 | model: AccountModel, | 345 | model: AccountModel.unscoped(), |
348 | required: true, | 346 | required: true, |
349 | include: [ | 347 | include: [ |
350 | { | 348 | { |
diff --git a/server/models/activitypub/actor.ts b/server/models/activitypub/actor.ts index e16bd5d79..119d0c1da 100644 --- a/server/models/activitypub/actor.ts +++ b/server/models/activitypub/actor.ts | |||
@@ -50,7 +50,9 @@ export const unusedActorAttributesForAPI = [ | |||
50 | 'sharedInboxUrl', | 50 | 'sharedInboxUrl', |
51 | 'followersUrl', | 51 | 'followersUrl', |
52 | 'followingUrl', | 52 | 'followingUrl', |
53 | 'url' | 53 | 'url', |
54 | 'createdAt', | ||
55 | 'updatedAt' | ||
54 | ] | 56 | ] |
55 | 57 | ||
56 | @DefaultScope({ | 58 | @DefaultScope({ |