Merge pull request #1007 from DokterKaj/patch-1

Redirect redd.it/xxxxxx shortlinks

src/assets/javascripts/services.js

@@ -220,15 +220,17 @@ function rewrite(url, originUrl, frontend, randomInstance) {
       return `${randomInstance}${url.pathname}${url.search}`
     case "redlib":
     case "libreddit": {
-      const subdomain = url.hostname.match(/^(?:(?:external-)?preview|i)(?=\.redd\.it)/)
+      const subdomain = url.hostname.match(/^(?:((?:external-)?preview|i)\.)?redd\.it/)
       if (!subdomain) return `${randomInstance}${url.pathname}${url.search}`
-      switch (subdomain[0]) {
+      switch (subdomain[1]) {
         case "preview":
           return `${randomInstance}/preview/pre${url.pathname}${url.search}`
         case "external-preview":
           return `${randomInstance}/preview/external-pre${url.pathname}${url.search}`
         case "i":
           return `${randomInstance}/img${url.pathname}`
+        default:
+          return `${randomInstance}/comments${url.pathname}`
       }
       return randomInstance
     }

src/config.json

@@ -268,8 +268,8 @@
         }
       },
       "targets": [
-        "^https?:\\/{2}(www\\.|old\\.|np\\.|new\\.|amp\\.)?(reddit|reddittorjg6rue252oqsxryoxengawnmo46qy4kyii5wtqnwfj4ooad)\\.(com|onion)(?=\\/u(ser)?\\/|\\/r\\/|\\/search|\\/new|\\/?$)",
-        "^https?:\\/{2}(i|(external-)?preview)\\.redd\\.it"
+        "^https?:\\/{2}(www\\.|old\\.|np\\.|new\\.|amp\\.)?(reddit|reddittorjg6rue252oqsxryoxengawnmo46qy4kyii5wtqnwfj4ooad)\\.(com|onion)(?=\\/u(ser)?\\/|\\/r\\/|\\/search|\\/new|\\/comments|\\/?$)",
+        "^https?:\\/{2}((i|(external-)?preview)\\.)?redd\\.it"
       ],
       "name": "Reddit",
       "options": {
@@ -1358,4 +1358,4 @@
       "url": "https://coub.com"
     }
   }
-}
+}