From b6a4fd6b099b3363ac59c06cfd81b54e1356d8bc Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Fri, 16 Feb 2018 11:19:54 +0100
Subject: Fix avatars on video watch page

---
 CHANGELOG.md                 | 8 ++++++++
 server/models/video/video.ts | 5 +++++
 2 files changed, 13 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1e5f7f8f2..eadbb1cce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+
+## v0.0.25-alpha
+
+### Bug fixes
+
+ * Fix avatars on video watch page
+
+
 ## v0.0.24-alpha
 
 ### 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'
 import { AccountModel } from '../account/account'
 import { AccountVideoRateModel } from '../account/account-video-rate'
 import { ActorModel } from '../activitypub/actor'
+import { AvatarModel } from '../avatar/avatar'
 import { ServerModel } from '../server/server'
 import { getSort, throwIfNotValid } from '../utils'
 import { TagModel } from './tag'
@@ -175,6 +176,10 @@ enum ScopeNames {
                     attributes: [ 'host' ],
                     model: () => ServerModel.unscoped(),
                     required: false
+                  },
+                  {
+                    model: () => AvatarModel.unscoped(),
+                    required: false
                   }
                 ]
               }
-- 
cgit v1.2.3