From 8a22cfd6286b13650fb62a97145bad9f3ff8dd36 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Fri, 8 Dec 2023 08:55:15 +0100
Subject: [PATCH] Fix client URLs for channels and accounts

---
 packages/tests/src/client/index-html.ts   | 4 ++--
 server/core/models/account/account.ts     | 2 +-
 server/core/models/video/video-channel.ts | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/tests/src/client/index-html.ts b/packages/tests/src/client/index-html.ts
index 9ff8b8957..4cb9a41c5 100644
--- a/packages/tests/src/client/index-html.ts
+++ b/packages/tests/src/client/index-html.ts
@@ -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))
diff --git a/server/core/models/account/account.ts b/server/core/models/account/account.ts
index 6d1b204e4..daede0abb 100644
--- a/server/core/models/account/account.ts
+++ b/server/core/models/account/account.ts
@@ -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 () {
diff --git a/server/core/models/video/video-channel.ts b/server/core/models/video/video-channel.ts
index 5a6e1b384..9f760f66e 100644
--- a/server/core/models/video/video-channel.ts
+++ b/server/core/models/video/video-channel.ts
@@ -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 () {