aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2018-02-16 11:19:54 +0100
committerChocobozzz <me@florianbigard.com>2018-02-16 11:19:54 +0100
commitb6a4fd6b099b3363ac59c06cfd81b54e1356d8bc (patch)
treefc5154a7c3a9ad10e2612f164e2cf0b5095a9047
parent0b4957126899975f603038501337421f84bcb3e4 (diff)
downloadPeerTube-b6a4fd6b099b3363ac59c06cfd81b54e1356d8bc.tar.gz
PeerTube-b6a4fd6b099b3363ac59c06cfd81b54e1356d8bc.tar.zst
PeerTube-b6a4fd6b099b3363ac59c06cfd81b54e1356d8bc.zip
Fix avatars on video watch page
-rw-r--r--CHANGELOG.md8
-rw-r--r--server/models/video/video.ts5
2 files changed, 13 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1e5f7f8f2..eadbb1cce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
1# Changelog 1# Changelog
2 2
3
4## v0.0.25-alpha
5
6### Bug fixes
7
8 * Fix avatars on video watch page
9
10
3## v0.0.24-alpha 11## v0.0.24-alpha
4 12
5### Features 13### Features
diff --git a/server/models/video/video.ts b/server/models/video/video.ts
index d748e81bd..aa1878caa 100644
--- a/server/models/video/video.ts
+++ b/server/models/video/video.ts
@@ -68,6 +68,7 @@ import { sendDeleteVideo } from '../../lib/activitypub/send'
68import { AccountModel } from '../account/account' 68import { AccountModel } from '../account/account'
69import { AccountVideoRateModel } from '../account/account-video-rate' 69import { AccountVideoRateModel } from '../account/account-video-rate'
70import { ActorModel } from '../activitypub/actor' 70import { ActorModel } from '../activitypub/actor'
71import { AvatarModel } from '../avatar/avatar'
71import { ServerModel } from '../server/server' 72import { ServerModel } from '../server/server'
72import { getSort, throwIfNotValid } from '../utils' 73import { getSort, throwIfNotValid } from '../utils'
73import { TagModel } from './tag' 74import { TagModel } from './tag'
@@ -175,6 +176,10 @@ enum ScopeNames {
175 attributes: [ 'host' ], 176 attributes: [ 'host' ],
176 model: () => ServerModel.unscoped(), 177 model: () => ServerModel.unscoped(),
177 required: false 178 required: false
179 },
180 {
181 model: () => AvatarModel.unscoped(),
182 required: false
178 } 183 }
179 ] 184 ]
180 } 185 }