From 24f827e6b03feb61e9cb82d6a07a91453b0392ac Mon Sep 17 00:00:00 2001
From: Jorge Orpinel <jorge@orpinel.com>
Date: Sun, 3 Nov 2019 17:11:19 -0500
Subject: [PATCH] hotfix: server redirect of man.dvc.orl/import-url and other
 misc. noted on existing redirects

Fixes #768
---
 server.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/server.js b/server.js
index 99aa0d9c71..c6147f2d1d 100644
--- a/server.js
+++ b/server.js
@@ -34,8 +34,8 @@ app.prepare().then(() => {
     } else if (req.headers.host === 'man.dvc.org') {
       // man.dvc.org/{cmd} -> dvc.org/doc/command-reference/{cmd}
       let normalized_pathname =
-        ['/get-url', '/import-url'].indexOf(pathname) > 0
-          ? pathname.replace(/-/i, '/')
+        ['/get-url', '/import-url'].indexOf(pathname) >= 0
+          ? pathname.replace('-', '/')
           : pathname
       const doc_pathname = '/doc/command-reference' + normalized_pathname
       res.writeHead(301, { Location: 'https://dvc.org' + doc_pathname })
@@ -50,7 +50,7 @@ app.prepare().then(() => {
       })
       res.end()
     } else if (/^\/doc\/commands-reference(\/.*)?/.test(pathname)) {
-      // TMP: path /doc/commands-reference/* -> /doc/command-reference/*
+      // path /doc/commands-reference... -> /doc/command-reference...
       res.writeHead(301, {
         Location: req.url.replace('commands-reference', 'command-reference')
       })
@@ -65,8 +65,8 @@ app.prepare().then(() => {
       pathname === '/doc/use-cases/data-and-model-files-versioning' ||
       pathname === '/doc/use-cases/data-and-model-files-versioning/'
     ) {
-      // path /doc/use-cases/data-and-model-files-versioning ->
-      // /doc/use-cases/versioning-data-and-model-files
+      // path /doc/use-cases/data-and-model-files-versioning
+      //  ->  /doc/use-cases/versioning-data-and-model-files
       res.writeHead(301, {
         Location: req.url.replace(
           'data-and-model-files-versioning',
@@ -75,13 +75,13 @@ app.prepare().then(() => {
       })
       res.end()
     } else if (/^\/doc\/tutorial\/(.*)?/.test(pathname)) {
-      // path /doc/tutorial/* -> /doc/tutorials/deep/*
+      // path /doc/tutorial/... -> /doc/tutorials/deep/...
       res.writeHead(301, {
         Location: req.url.replace('/doc/tutorial/', '/doc/tutorials/deep/')
       })
       res.end()
     } else if (/^\/doc.*/i.test(pathname)) {
-      // path /doc* -> /doc
+      // path /doc*/... -> /doc/...
       let normalized_pathname = pathname.replace(/^\/doc[^?\/]*/i, '/doc')
       if (normalized_pathname !== pathname) {
         res.writeHead(301, {
@@ -103,7 +103,7 @@ app.prepare().then(() => {
       })
       res.end()
     } else if (/^\/(help|chat)\/?$/i.test(pathname)) {
-      // dvc.org/(help|chat) -> Discord Chat
+      // dvc.org/(help|chat) -> Discord chat
       res.writeHead(301, { Location: 'https://discordapp.com/invite/dvwXA2N' })
       res.end()
     } else {