diff options
author | Chocobozzz <me@florianbigard.com> | 2018-04-25 10:21:38 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-04-25 13:50:48 +0200 |
commit | 6b738c7a31591a83fdcd9c78b6b1f98e543c378b (patch) | |
tree | db771d0e99e9ff27570885fe2a6f58a7c1948fbc /server/controllers/api | |
parent | 48dce1c90dff4e90a4bcffefaecf157336cf904b (diff) | |
download | PeerTube-6b738c7a31591a83fdcd9c78b6b1f98e543c378b.tar.gz PeerTube-6b738c7a31591a83fdcd9c78b6b1f98e543c378b.tar.zst PeerTube-6b738c7a31591a83fdcd9c78b6b1f98e543c378b.zip |
Video channel API routes refractor
Diffstat (limited to 'server/controllers/api')
-rw-r--r-- | server/controllers/api/accounts.ts | 4 | ||||
-rw-r--r-- | server/controllers/api/users.ts | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/server/controllers/api/accounts.ts b/server/controllers/api/accounts.ts index 04c5897c5..85987c912 100644 --- a/server/controllers/api/accounts.ts +++ b/server/controllers/api/accounts.ts | |||
@@ -126,7 +126,8 @@ async function addVideoChannelRetryWrapper (req: express.Request, res: express.R | |||
126 | const videoChannel = await retryTransactionWrapper(addVideoChannel, options) | 126 | const videoChannel = await retryTransactionWrapper(addVideoChannel, options) |
127 | return res.json({ | 127 | return res.json({ |
128 | videoChannel: { | 128 | videoChannel: { |
129 | id: videoChannel.id | 129 | id: videoChannel.id, |
130 | uuid: videoChannel.Actor.uuid | ||
130 | } | 131 | } |
131 | }).end() | 132 | }).end() |
132 | } | 133 | } |
@@ -233,7 +234,6 @@ async function listVideoChannelVideos (req: express.Request, res: express.Respon | |||
233 | return res.json(getFormattedObjects(resultList.data, resultList.total)) | 234 | return res.json(getFormattedObjects(resultList.data, resultList.total)) |
234 | } | 235 | } |
235 | 236 | ||
236 | |||
237 | async function listAccountVideos (req: express.Request, res: express.Response, next: express.NextFunction) { | 237 | async function listAccountVideos (req: express.Request, res: express.Response, next: express.NextFunction) { |
238 | const account: AccountModel = res.locals.account | 238 | const account: AccountModel = res.locals.account |
239 | 239 | ||
diff --git a/server/controllers/api/users.ts b/server/controllers/api/users.ts index 474329b58..dcc4ef196 100644 --- a/server/controllers/api/users.ts +++ b/server/controllers/api/users.ts | |||
@@ -185,7 +185,10 @@ async function createUserRetryWrapper (req: express.Request, res: express.Respon | |||
185 | return res.json({ | 185 | return res.json({ |
186 | user: { | 186 | user: { |
187 | id: user.id, | 187 | id: user.id, |
188 | uuid: account.uuid | 188 | account: { |
189 | id: account.id, | ||
190 | uuid: account.Actor.uuid | ||
191 | } | ||
189 | } | 192 | } |
190 | }).end() | 193 | }).end() |
191 | } | 194 | } |