aboutsummaryrefslogtreecommitdiffhomepage
path: root/server
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2018-06-29 14:34:04 +0200
committerChocobozzz <me@florianbigard.com>2018-06-29 14:34:04 +0200
commit52d9f792b3fee5acce80f948295b59e3ad2073eb (patch)
tree661f577e9c7196d199b4b49e475ecd2d88e6d7b7 /server
parent4bbfc6c606c8d3794bae25c64c516120af41f4eb (diff)
downloadPeerTube-52d9f792b3fee5acce80f948295b59e3ad2073eb.tar.gz
PeerTube-52d9f792b3fee5acce80f948295b59e3ad2073eb.tar.zst
PeerTube-52d9f792b3fee5acce80f948295b59e3ad2073eb.zip
Client: Add ability to update video channel avatar
Diffstat (limited to 'server')
-rw-r--r--server/models/video/video.ts4
-rw-r--r--server/tests/api/check-params/video-channels.ts5
2 files changed, 7 insertions, 2 deletions
diff --git a/server/models/video/video.ts b/server/models/video/video.ts
index 0af70cadf..5d8089328 100644
--- a/server/models/video/video.ts
+++ b/server/models/video/video.ts
@@ -251,6 +251,10 @@ export enum ScopeNames {
251 attributes: [ 'host' ], 251 attributes: [ 'host' ],
252 model: () => ServerModel.unscoped(), 252 model: () => ServerModel.unscoped(),
253 required: false 253 required: false
254 },
255 {
256 model: () => AvatarModel.unscoped(),
257 required: false
254 } 258 }
255 ] 259 ]
256 }, 260 },
diff --git a/server/tests/api/check-params/video-channels.ts b/server/tests/api/check-params/video-channels.ts
index 7b05e5882..0980de73b 100644
--- a/server/tests/api/check-params/video-channels.ts
+++ b/server/tests/api/check-params/video-channels.ts
@@ -14,7 +14,8 @@ import {
14 killallServers, 14 killallServers,
15 makeGetRequest, 15 makeGetRequest,
16 makePostBodyRequest, 16 makePostBodyRequest,
17 makePutBodyRequest, makeUploadRequest, 17 makePutBodyRequest,
18 makeUploadRequest,
18 runServer, 19 runServer,
19 ServerInfo, 20 ServerInfo,
20 setAccessTokensToServers, 21 setAccessTokensToServers,
@@ -22,7 +23,7 @@ import {
22} from '../../utils' 23} from '../../utils'
23import { checkBadCountPagination, checkBadSortPagination, checkBadStartPagination } from '../../utils/requests/check-api-params' 24import { checkBadCountPagination, checkBadSortPagination, checkBadStartPagination } from '../../utils/requests/check-api-params'
24import { User } from '../../../../shared/models/users' 25import { User } from '../../../../shared/models/users'
25import { join } from "path" 26import { join } from 'path'
26 27
27const expect = chai.expect 28const expect = chai.expect
28 29