Fix avatars on video watch page
authorChocobozzz <me@florianbigard.com>
Fri, 16 Feb 2018 10:19:54 +0000 (11:19 +0100)
committerChocobozzz <me@florianbigard.com>
Fri, 16 Feb 2018 10:19:54 +0000 (11:19 +0100)
CHANGELOG.md
server/models/video/video.ts

index 1e5f7f8f2dd46bc4a1160fe0133297ba4929e2ba..eadbb1cce1b5c4f346b4df05cd2b4b2f4b599114 100644 (file)
@@ -1,5 +1,13 @@
 # Changelog
 
+
+## v0.0.25-alpha
+
+### Bug fixes
+
+ * Fix avatars on video watch page
+
+
 ## v0.0.24-alpha
 
 ### Features
index d748e81bd51bfb0b648691073e9b8b5bb023e20d..aa1878caac311566ae88dedbc5cf7bba4ae02349 100644 (file)
@@ -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
                   }
                 ]
               }