update version 0.4.8 => 0.4.9

add legal jargon (fixes #369 )
add support for 7 character IDs for short urls (#290 )
2023-02-26 14:28:28 +01:00 · 2023-02-26 14:26:01 +01:00 · 2023-02-26 13:47:10 +01:00 · 2023-02-26 13:45:43 +01:00 · 2023-02-26 12:22:46 +00:00 · 2023-02-26 12:20:46 +00:00
8 changed files with 323 additions and 20 deletions
--- a/README.md
+++ b/README.md
@ -213,3 +213,7 @@ pm2 stop teddit
 ```

 See also the [pm2 instructions for running a project on startup](https://pm2.keymetrics.io/docs/usage/startup/). In particular, if using systemd, see the section on how to modify the systemd init file so that it runs after your system connects to the network.
+
+## Legal
+
+Teddit does not host any content. All content on Teddit is from Reddit™. Reddit is a trademark of Reddit Inc. Teddit is not affiliated with Reddit Inc. Any issues with content should be reported to Reddit.
--- a/inc/commons.js
+++ b/inc/commons.js
@ -257,25 +257,45 @@ module.exports = function(request, fs) {
      return str
    
    if(typeof(user_preferences.domain_youtube) != 'undefined')
-      if(user_preferences.domain_youtube)
-        str = str.replace(youtubeRegex, protocol + user_preferences.domain_youtube)
+      if(user_preferences.domain_youtube){
+        if (!youtubeRegex.test(str)){
+          youtubeRegex = /(https?:\/\/)([A-z.]+\.)?youtu(be\.com|\.be)(?=.+)/gm;
+        }
+        str = str.replace(youtubeRegex, protocol + user_preferences.domain_youtube);
+      }
    
    if(typeof(user_preferences.domain_twitter) != 'undefined')
-      if(user_preferences.domain_twitter)
+      if(user_preferences.domain_twitter){
+      if (!twitterRegex.test(str)){
+          twitterRegex = /(https?:\/\/)(www\.)?twitter\.com(?=.)/gm;
+        }
        str = str.replace(twitterRegex, protocol + user_preferences.domain_twitter)
+      }
    
-    if(typeof(user_preferences.domain_instagram) != 'undefined')
-      if(user_preferences.domain_instagram)
-        str = str.replace(instagramRegex, protocol + user_preferences.domain_instagram)
-    
-    if(typeof(user_preferences.domain_quora) != 'undefined')
-      if(user_preferences.domain_quora)
+    if(typeof(user_preferences.domain_instagram) != 'undefined'){
+      if(user_preferences.domain_instagram){
+        if (!instagramRegex.test(str)){
+          instagramRegex = /(https?:\/\/)(www+\.)?instagram.com(?=.)/gm;
+        }
+        str = str.replace(instagramRegex, protocol + user_preferences.domain_instagram);
+      }
+    }
+    if(typeof(user_preferences.domain_quora) != 'undefined'){
+      if(user_preferences.domain_quora){
+        if (!quoraRegex.test(str)){
+          quoraRegex = /(https?:\/\/)([A-z.]+\.)?quora\.com(?=.)/gm;
+        }
        str = str.replace(quoraRegex, protocol + user_preferences.domain_quora)
-
-    if(typeof(user_preferences.domain_imgur) != 'undefined')
-      if(user_preferences.domain_imgur)
+      }
+    } 
+    if(typeof(user_preferences.domain_imgur) != 'undefined'){
+      if(user_preferences.domain_imgur){
+        if (!imgurRegex.test(str)){
+          imgurRegex = /(https?:\/{2})([im]\.)?(stack\.)?imgur\.(com|io)(?=.)/gm;
+        }
        str = str.replace(imgurRegex, protocol + user_preferences.domain_imgur)
-    
+      }
+    }
    return str
  }

--- a/inc/compilePostComments.js
+++ b/inc/compilePostComments.js
@ -210,7 +210,7 @@ module.exports = function() {
              }
              comments_html += replies_html + '</details></div>'
            } else {
-              if(comment.children.length > 0) {
+              if(comment.children.length > 0) {
                let parent_id = comment.parent_id.split('_')[1]
                let load_comms_href = parent_id

--- a/package-lock.json
+++ b/package-lock.json
@ -1,6 +1,6 @@
 {
  "name": "teddit",
-  "version": "0.4.8",
+  "version": "0.4.9",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
@ -41,6 +41,12 @@
        "safe-buffer": "^5.0.1"
      }
    },
+    "abbrev": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+      "dev": true
+    },
    "accepts": {
      "version": "1.3.7",
      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
@ -89,6 +95,16 @@
        "uri-js": "^4.2.2"
      }
    },
+    "anymatch": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+      "dev": true,
+      "requires": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      }
+    },
    "array-flatten": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
@ -140,6 +156,12 @@
        "@babel/types": "^7.9.6"
      }
    },
+    "balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true
+    },
    "base64-js": {
      "version": "1.5.1",
      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
@ -153,6 +175,12 @@
        "tweetnacl": "^0.14.3"
      }
    },
+    "binary-extensions": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
+      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
+      "dev": true
+    },
    "bluebird": {
      "version": "2.11.0",
      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz",
@ -184,6 +212,25 @@
        }
      }
    },
+    "brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "requires": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "braces": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "dev": true,
+      "requires": {
+        "fill-range": "^7.0.1"
+      }
+    },
    "brotli": {
      "version": "1.3.2",
      "resolved": "https://registry.npmjs.org/brotli/-/brotli-1.3.2.tgz",
@ -219,6 +266,22 @@
        "is-regex": "^1.0.3"
      }
    },
+    "chokidar": {
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
+      "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
+      "dev": true,
+      "requires": {
+        "anymatch": "~3.1.2",
+        "braces": "~3.0.2",
+        "fsevents": "~2.3.2",
+        "glob-parent": "~5.1.2",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.6.0"
+      }
+    },
    "combined-stream": {
      "version": "1.0.8",
      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
@ -249,6 +312,12 @@
        "vary": "~1.1.2"
      }
    },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+      "dev": true
+    },
    "constantinople": {
      "version": "4.0.1",
      "resolved": "https://registry.npmjs.org/constantinople/-/constantinople-4.0.1.tgz",
@ -456,6 +525,15 @@
      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
    },
+    "fill-range": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "dev": true,
+      "requires": {
+        "to-regex-range": "^5.0.1"
+      }
+    },
    "finalhandler": {
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
@ -485,6 +563,13 @@
      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q=="
    },
+    "fsevents": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "dev": true,
+      "optional": true
+    },
    "function-bind": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
@ -508,6 +593,15 @@
        "assert-plus": "^1.0.0"
      }
    },
+    "glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "requires": {
+        "is-glob": "^4.0.1"
+      }
+    },
    "har-schema": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
@ -530,6 +624,12 @@
        "function-bind": "^1.1.1"
      }
    },
+    "has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "dev": true
+    },
    "has-symbols": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
@ -602,6 +702,12 @@
        "safer-buffer": ">= 2.1.2 < 3"
      }
    },
+    "ignore-by-default": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz",
+      "integrity": "sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==",
+      "dev": true
+    },
    "inherits": {
      "version": "2.0.4",
      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
@ -612,6 +718,15 @@
      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="
    },
+    "is-binary-path": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "dev": true,
+      "requires": {
+        "binary-extensions": "^2.0.0"
+      }
+    },
    "is-core-module": {
      "version": "2.8.0",
      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.0.tgz",
@ -629,6 +744,27 @@
        "object-assign": "^4.1.1"
      }
    },
+    "is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "dev": true
+    },
+    "is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "requires": {
+        "is-extglob": "^2.1.1"
+      }
+    },
+    "is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true
+    },
    "is-promise": {
      "version": "2.2.2",
      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz",
@ -731,6 +867,15 @@
        "mime-db": "1.51.0"
      }
    },
+    "minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "requires": {
+        "brace-expansion": "^1.1.7"
+      }
+    },
    "minipass": {
      "version": "3.1.6",
      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.6.tgz",
@ -766,6 +911,56 @@
        "whatwg-url": "^5.0.0"
      }
    },
+    "nodemon": {
+      "version": "2.0.20",
+      "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.20.tgz",
+      "integrity": "sha512-Km2mWHKKY5GzRg6i1j5OxOHQtuvVsgskLfigG25yTtbyfRGn/GNvIbRyOf1PSCKJ2aT/58TiuUsuOU5UToVViw==",
+      "dev": true,
+      "requires": {
+        "chokidar": "^3.5.2",
+        "debug": "^3.2.7",
+        "ignore-by-default": "^1.0.1",
+        "minimatch": "^3.1.2",
+        "pstree.remy": "^1.1.8",
+        "semver": "^5.7.1",
+        "simple-update-notifier": "^1.0.7",
+        "supports-color": "^5.5.0",
+        "touch": "^3.1.0",
+        "undefsafe": "^2.0.5"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "ms": {
+          "version": "2.1.3",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+          "dev": true
+        }
+      }
+    },
+    "nopt": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz",
+      "integrity": "sha512-NWmpvLSqUrgrAC9HCuxEvb+PSloHpqVu+FqcO4eeF2h5qYRhA7ev6KvelyQAKtegUbC6RypJnlEOhd8vloNKYg==",
+      "dev": true,
+      "requires": {
+        "abbrev": "1"
+      }
+    },
+    "normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true
+    },
    "oauth-sign": {
      "version": "0.9.0",
      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
@ -814,6 +1009,12 @@
      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
    },
+    "picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "dev": true
+    },
    "postman-request": {
      "version": "2.88.1-postman.30",
      "resolved": "https://registry.npmjs.org/postman-request/-/postman-request-2.88.1-postman.30.tgz",
@ -872,6 +1073,12 @@
      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="
    },
+    "pstree.remy": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz",
+      "integrity": "sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==",
+      "dev": true
+    },
    "pug": {
      "version": "3.0.2",
      "resolved": "https://registry.npmjs.org/pug/-/pug-3.0.2.tgz",
@ -1020,6 +1227,15 @@
        }
      }
    },
+    "readdirp": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+      "dev": true,
+      "requires": {
+        "picomatch": "^2.2.1"
+      }
+    },
    "redis": {
      "version": "3.1.2",
      "resolved": "https://registry.npmjs.org/redis/-/redis-3.1.2.tgz",
@ -1068,6 +1284,12 @@
      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
    },
+    "semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true
+    },
    "send": {
      "version": "0.18.0",
      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
@ -1121,6 +1343,23 @@
        "object-inspect": "^1.9.0"
      }
    },
+    "simple-update-notifier": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz",
+      "integrity": "sha512-VpsrsJSUcJEseSbMHkrsrAVSdvVS5I96Qo1QAQ4FxQ9wXFcB+pjj7FB7/us9+GcgfW4ziHtYMc1J0PLczb55mg==",
+      "dev": true,
+      "requires": {
+        "semver": "~7.0.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
+          "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
+          "dev": true
+        }
+      }
+    },
    "sshpk": {
      "version": "1.16.1",
      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
@ -1150,11 +1389,29 @@
        "bluebird": "^2.6.2"
      }
    },
+    "supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "requires": {
+        "has-flag": "^3.0.0"
+      }
+    },
    "to-fast-properties": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
      "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4="
    },
+    "to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "requires": {
+        "is-number": "^7.0.0"
+      }
+    },
    "toidentifier": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
@ -1165,6 +1422,15 @@
      "resolved": "https://registry.npmjs.org/token-stream/-/token-stream-1.0.0.tgz",
      "integrity": "sha1-zCAOqyYT9BZtJ/+a/HylbUnfbrQ="
    },
+    "touch": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz",
+      "integrity": "sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA==",
+      "dev": true,
+      "requires": {
+        "nopt": "~1.0.10"
+      }
+    },
    "tough-cookie": {
      "version": "2.5.0",
      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
@ -1193,6 +1459,12 @@
        "mime-types": "~2.1.24"
      }
    },
+    "undefsafe": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.5.tgz",
+      "integrity": "sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==",
+      "dev": true
+    },
    "unpipe": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "teddit",
-  "version": "0.4.8",
+  "version": "0.4.9",
  "description": "A free and open source alternative Reddit front-end focused on privacy.",
  "homepage": "https://teddit.net",
  "bugs": {
@ -20,7 +20,8 @@
  },
  "scripts": {
    "test": "echo \"Error: no test specified\" && exit 1",
-    "start": "node app.js"
+    "start": "node app.js",
+    "dev": "nodemon app.js"
  },
  "dependencies": {
    "compression": "^1.7.4",
@ -34,5 +35,7 @@
    "pug": "^3.0.2",
    "redis": "^3.1.2"
  },
-  "devDependencies": {}
+  "devDependencies": {
+    "nodemon": "^2.0.20"
+  }
 }
--- a/routes/home.js
+++ b/routes/home.js
@ -72,7 +72,7 @@ homeRoute.get([`/:sort?`, '/frontpage'], async (req, res, next) => {
  }

  let is_comment =
-    sortby.length == 6 &&
+    (sortby.length == 6 || sortby.length == 7) &&
    sortby != "rising"
      ? true
      : false;
--- a/routes/preferences.js
+++ b/routes/preferences.js
@ -186,12 +186,14 @@ preferenceRoutes.post('/saveprefs', (req, res, next) => {
  });

  if (prefer_frontpage === 'on') prefer_frontpage = 'true';
+  else prefer_frontpage = 'false';
  res.cookie('prefer_frontpage', prefer_frontpage, {
    maxAge: 365 * 24 * 60 * 60 * 1000,
    httpOnly: true,
  });

  if (show_large_gallery_images === 'on') show_large_gallery_images = 'true';
+  else show_large_gallery_images = 'false';
  res.cookie('show_large_gallery_images', show_large_gallery_images, {
    maxAge: 365 * 24 * 60 * 60 * 1000,
    httpOnly: true,
--- a/views/about.pug
+++ b/views/about.pug
@ -21,8 +21,10 @@ html
        a(href="/privacy") Privacy policy
        h2 Donating
        p(class="word-break") XMR: 832ogRwuoSs2JGYg7wJTqshidK7dErgNdfpenQ9dzMghNXQTJRby1xGbqC3gW3GAifRM9E84J91VdMZRjoSJ32nkAZnaCEj
+        h2 Legal
+        p Teddit does not host any content. All content on Teddit is from Reddit™. Reddit is a trademark of Reddit Inc. Teddit is not affiliated with Reddit Inc. Any issues with content should be reported to Reddit.
        .bottom
          a(href="https://en.wikipedia.org/wiki/Piratbyr%C3%A5n#Kopimi", target="_blank")
            img(src="kopimi.gif")
-          p.version v.0.4.8
+          p.version v.0.4.9
    include includes/footer.pug
Author	SHA1	Message	Date
teddit	21ddd3b89f	update version 0.4.8 => 0.4.9	2023-02-26 14:28:28 +01:00
teddit	25e789fdad	add legal jargon (fixes #369 )	2023-02-26 14:26:01 +01:00
teddit	68aed7b9be	add support for 7 character IDs for short urls (#290 )	2023-02-26 13:47:10 +01:00
teddit	9cb6a80c15	update packages	2023-02-26 13:45:43 +01:00
teddit	8c52544404	Merge pull request 'Add logic to parse and remove any instances of https://twitter.com by replacing with user's preference' (#378 ) from anshumankmr/teddit:main into main Reviewed-on: https://codeberg.org/teddit/teddit/pulls/378	2023-02-26 12:22:46 +00:00
teddit	563be382d3	Merge pull request 'added else statements for prefer_frontpage and show_large_gallery_images' (#383 ) from The1029/teddit:main into main Reviewed-on: https://codeberg.org/teddit/teddit/pulls/383	2023-02-26 12:20:46 +00:00
The1029	596e8ef093	added else statements for prefer_frontpage and show_large_gallery_images	2023-01-22 11:51:32 +00:00
Anshuman Kumar	0969d694db	Merge branch 'main' into main	2023-01-02 11:46:26 +00:00
Anshuman Kumar	aa75cc239a	Revert changes to package-lock.json and package.json	2023-01-02 08:34:50 +05:30
Anshuman Kumar	ed0c0c7d28	Handle all variation of user preference for regexes	2022-12-30 17:43:43 +05:30
Anshuman Kumar	9a328612c4	Merge pull request #1 from anshumankmr/dependabot/npm_and_yarn/node-fetch-3.3.0 Bump node-fetch from 2.6.7 to 3.3.0	2022-12-30 17:25:52 +05:30
dependabot[bot]	e28ddf2935	Bump node-fetch from 2.6.7 to 3.3.0 Bumps [node-fetch](https://github.com/node-fetch/node-fetch) from 2.6.7 to 3.3.0. - [Release notes](https://github.com/node-fetch/node-fetch/releases) - [Commits](https://github.com/node-fetch/node-fetch/compare/v2.6.7...v3.3.0) --- updated-dependencies: - dependency-name: node-fetch dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2022-12-30 11:55:45 +00:00
Anshuman Kumar	b3b1cbbc95	Merge pull request #2 from anshumankmr/dependabot/npm_and_yarn/redis-4.5.1 Bump redis from 3.1.2 to 4.5.1	2022-12-30 17:25:29 +05:30
Anshuman Kumar	b6acf7542a	Merge pull request #3 from anshumankmr/dependabot/npm_and_yarn/postman-request-2.88.1-postman.31 Bump postman-request from 2.88.1-postman.30 to 2.88.1-postman.31	2022-12-30 17:25:16 +05:30
Anshuman Kumar	2873e2aea5	Merge pull request #4 from anshumankmr/dependabot/npm_and_yarn/https-proxy-agent-5.0.1 Bump https-proxy-agent from 5.0.0 to 5.0.1	2022-12-30 17:25:04 +05:30
Anshuman Kumar	ab95c341c6	Merge branch 'main' of https://github.com/anshumankmr/teddit	2022-12-30 09:48:34 +05:30
Anshuman Kumar	f7f2d0beec	Update regex to find a match and replace if present	2022-12-30 09:42:08 +05:30
dependabot[bot]	f7cecfd465	Bump https-proxy-agent from 5.0.0 to 5.0.1 Bumps [https-proxy-agent](https://github.com/TooTallNate/node-https-proxy-agent) from 5.0.0 to 5.0.1. - [Release notes](https://github.com/TooTallNate/node-https-proxy-agent/releases) - [Commits](https://github.com/TooTallNate/node-https-proxy-agent/compare/5.0.0...5.0.1) --- updated-dependencies: - dependency-name: https-proxy-agent dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2022-12-30 03:41:34 +00:00
Anshuman Kumar	df20a9c7fe	Merge pull request #5 from anshumankmr/dependabot/npm_and_yarn/helmet-6.0.1 Bump helmet from 4.6.0 to 6.0.1	2022-12-30 09:11:11 +05:30
dependabot[bot]	0ea8b831c3	Bump helmet from 4.6.0 to 6.0.1 Bumps [helmet](https://github.com/helmetjs/helmet) from 4.6.0 to 6.0.1. - [Release notes](https://github.com/helmetjs/helmet/releases) - [Changelog](https://github.com/helmetjs/helmet/blob/main/CHANGELOG.md) - [Commits](https://github.com/helmetjs/helmet/compare/v4.6.0...v6.0.1) --- updated-dependencies: - dependency-name: helmet dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2022-12-29 16:59:08 +00:00
dependabot[bot]	625c86a2b2	Bump postman-request from 2.88.1-postman.30 to 2.88.1-postman.31 Bumps [postman-request](https://github.com/postmanlabs/postman-request) from 2.88.1-postman.30 to 2.88.1-postman.31. - [Release notes](https://github.com/postmanlabs/postman-request/releases) - [Changelog](https://github.com/postmanlabs/postman-request/blob/master/CHANGELOG.md) - [Commits](https://github.com/postmanlabs/postman-request/compare/v2.88.1-postman.30...v2.88.1-postman.31) --- updated-dependencies: - dependency-name: postman-request dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2022-12-29 16:58:48 +00:00
dependabot[bot]	a9c8f6b6ce	Bump redis from 3.1.2 to 4.5.1 Bumps [redis](https://github.com/redis/node-redis) from 3.1.2 to 4.5.1. - [Release notes](https://github.com/redis/node-redis/releases) - [Changelog](https://github.com/redis/node-redis/blob/master/CHANGELOG.md) - [Commits](https://github.com/redis/node-redis/compare/v3.1.2...redis@4.5.1) --- updated-dependencies: - dependency-name: redis dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2022-12-29 16:58:42 +00:00
Anshuman Kumar	c71bf6ee48	Add logic to parse and remove any instances of https://twitter.com by replacing with user's preference The issue was happening since the original regex is checking for href tags only, so I tried a simpler approach of searching for https://twitter.com instead whenever the regex does not match the input string Add Nodemon package to dev dependencies for local debugging	2022-12-29 20:21:09 +05:30