Support '/w/' and '/w/p/' for watch page

And use them as default in client

3 files changed, 4 insertions, 4 deletions

diff --git a/server/controllers/bots.ts b/server/controllers/bots.ts
index 8d1fa72f3..9e92063d4 100644
--- a/server/controllers/bots.ts
+++ b/server/controllers/bots.ts
@@ -75,7 +75,7 @@ async function getSitemapLocalVideoUrls () {
   })
 
   return data.map(v => ({
-    url: WEBSERVER.URL + '/videos/watch/' + v.uuid,
+    url: WEBSERVER.URL + '/w/' + v.uuid,
     video: [
       {
         title: v.name,
diff --git a/server/controllers/client.ts b/server/controllers/client.ts
index 35e5af9d1..fcccc48e0 100644
--- a/server/controllers/client.ts
+++ b/server/controllers/client.ts
@@ -19,8 +19,8 @@ const testEmbedPath = join(distPath, 'standalone', 'videos', 'test-embed.html')
 
 // Special route that add OpenGraph and oEmbed tags
 // Do not use a template engine for a so little thing
-clientsRouter.use('/videos/watch/playlist/:id', asyncMiddleware(generateWatchPlaylistHtmlPage))
-clientsRouter.use('/videos/watch/:id', asyncMiddleware(generateWatchHtmlPage))
+clientsRouter.use([ '/w/p/:id', '/videos/watch/playlist/:id' ], asyncMiddleware(generateWatchPlaylistHtmlPage))
+clientsRouter.use([ '/w/:id', '/videos/watch/:id' ], asyncMiddleware(generateWatchHtmlPage))
 clientsRouter.use([ '/accounts/:nameWithHost', '/a/:nameWithHost' ], asyncMiddleware(generateAccountHtmlPage))
 clientsRouter.use([ '/video-channels/:nameWithHost', '/c/:nameWithHost' ], asyncMiddleware(generateVideoChannelHtmlPage))
 clientsRouter.use('/@:nameWithHost', asyncMiddleware(generateActorHtmlPage))
diff --git a/server/controllers/feeds.ts b/server/controllers/feeds.ts
index f0717bbbc..865f5c2a1 100644
--- a/server/controllers/feeds.ts
+++ b/server/controllers/feeds.ts
@@ -293,7 +293,7 @@ function addVideosToFeed (feed, videos: VideoModel[]) {
     feed.addItem({
       title: video.name,
       id: video.url,
-      link: WEBSERVER.URL + '/videos/watch/' + video.uuid,
+      link: WEBSERVER.URL + '/w/' + video.uuid,
       description: video.getTruncatedDescription(),
       content: video.description,
       author: [