yetangitu/Peertube
1
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-10-04 02:09:37 +02:00
Code Issues Releases Wiki Activity

Cleanup

Browse source 
We must not expose private actor objects to clients
Just make 2 GET requests on channel/accounts instead
This commit is contained in:
Chocobozzz 2021-05-28 10:21:39 +02:00
parent d6d96bed80
commit 012580d98f
No known key found for this signature in database
GPG key ID: 583A612D890159BE
21 changed files with 221 additions and 397 deletions
Download patch file Download diff file Expand all files Collapse all files

12
server/lib/client-html.ts
View file

@ -208,14 +208,12 @@ class ClientHtml {
}
static async getActorHTMLPage (nameWithHost: string, req: express.Request, res: express.Response) {
const accountModel = await AccountModel.loadByNameWithHost(nameWithHost)
const [ account, channel ] = await Promise.all([
AccountModel.loadByNameWithHost(nameWithHost),
VideoChannelModel.loadByNameWithHostAndPopulateAccount(nameWithHost)
])
if (accountModel) {
return this.getAccountOrChannelHTMLPage(() => new Promise(resolve => resolve(accountModel)), req, res)
} else {
const videoChannelModelPromise = VideoChannelModel.loadByNameWithHostAndPopulateAccount(nameWithHost)
return this.getAccountOrChannelHTMLPage(() => videoChannelModelPromise, req, res)
}
return this.getAccountOrChannelHTMLPage(() => Promise.resolve(account || channel), req, res)
}
static async getEmbedHTML () {