OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix client URLs for channels and accounts

pull/6126/head
Chocobozzz 2023-12-08 08:55:15 +01:00
parent 2fde12d7e1
commit 8a22cfd628
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/tests/src/client/index-html.ts
View File

@ -103,7 +103,7 @@ describe('Test index HTML generation', function () {
it('Should use the original account URL for the canonical tag', async function () {
const accountURLtest = res => {
expect(res.text).to.contain(`<link rel="canonical" href="${servers[0].url}/a/root" />`)
expect(res.text).to.contain(`<link rel="canonical" href="${servers[0].url}/a/root/video-channels" />`)
}
accountURLtest(await makeHTMLRequest(servers[0].url, '/accounts/root@' + servers[0].host))
@ -113,7 +113,7 @@ describe('Test index HTML generation', function () {
it('Should use the original channel URL for the canonical tag', async function () {
const channelURLtests = res => {
expect(res.text).to.contain(`<link rel="canonical" href="${servers[0].url}/c/root_channel" />`)
expect(res.text).to.contain(`<link rel="canonical" href="${servers[0].url}/c/root_channel/videos" />`)
}
channelURLtests(await makeHTMLRequest(servers[0].url, '/video-channels/root_channel@' + servers[0].host))

2
server/core/models/account/account.ts
View File

@ -457,7 +457,7 @@ export class AccountModel extends Model<Partial<AttributesOnly<AccountModel>>> {
// Avoid error when running this method on MAccount... | MChannel...
getClientUrl (this: MAccountHost | MChannelHost) {
return WEBSERVER.URL + '/a/' + this.Actor.getIdentifier()
return WEBSERVER.URL + '/a/' + this.Actor.getIdentifier() + '/video-channels'
}
isBlocked () {

2
server/core/models/video/video-channel.ts
View File

@ -841,7 +841,7 @@ export class VideoChannelModel extends Model<Partial<AttributesOnly<VideoChannel
// Avoid error when running this method on MAccount... | MChannel...
getClientUrl (this: MAccountHost | MChannelHost) {
return WEBSERVER.URL + '/c/' + this.Actor.getIdentifier()
return WEBSERVER.URL + '/c/' + this.Actor.getIdentifier() + '/videos'
}
getDisplayName () {