2 Commits a713aa5d96 ... 2995dc42cf

Author SHA1 Message Date
  Sv443 2995dc42cf ref: re-flagged more jokes 1 month ago
  Sv443 6c2a48e106 fix: I brokered it 1 month ago
2 changed files with 35 additions and 35 deletions
  1. 34 34
      data/jokes/jokes-en.json
  2. 1 1
      src/parseURL.js

+ 34 - 34
data/jokes/jokes-en.json

@@ -153,7 +153,7 @@
                 "political": false,
                 "racist": false,
                 "sexist": false,
-                "explicit": true
+                "explicit": false
             },
             "id": 9,
             "safe": false
@@ -848,7 +848,7 @@
                 "political": false,
                 "racist": false,
                 "sexist": false,
-                "explicit": true
+                "explicit": false
             },
             "id": 55,
             "safe": false
@@ -1228,7 +1228,7 @@
                 "political": false,
                 "racist": false,
                 "sexist": false,
-                "explicit": true
+                "explicit": false
             },
             "id": 79,
             "safe": false
@@ -1608,7 +1608,7 @@
                 "political": false,
                 "racist": true,
                 "sexist": false,
-                "explicit": true
+                "explicit": false
             },
             "id": 103,
             "safe": false
@@ -1624,7 +1624,7 @@
                 "political": false,
                 "racist": true,
                 "sexist": false,
-                "explicit": true
+                "explicit": false
             },
             "id": 104,
             "safe": false
@@ -1632,7 +1632,7 @@
         {
             "category": "Dark",
             "type": "twopart",
-            "setup": "Why are Americans shit at Dota?",
+            "setup": "Why are Americans bad at Dota?",
             "delivery": "They can't protect their towers.",
             "flags": {
                 "nsfw": false,
@@ -1640,7 +1640,7 @@
                 "political": true,
                 "racist": false,
                 "sexist": false,
-                "explicit": true
+                "explicit": false
             },
             "id": 105,
             "safe": false
@@ -1656,7 +1656,7 @@
                 "political": false,
                 "racist": true,
                 "sexist": false,
-                "explicit": true
+                "explicit": false
             },
             "id": 106,
             "safe": false
@@ -1815,7 +1815,7 @@
                 "political": false,
                 "racist": true,
                 "sexist": false,
-                "explicit": true
+                "explicit": false
             },
             "id": 116,
             "safe": false
@@ -1824,7 +1824,7 @@
             "category": "Dark",
             "type": "twopart",
             "setup": "Dark humor is like cancer.",
-            "delivery": "It's more funny when children get it.",
+            "delivery": "It's funnier when children get it.",
             "flags": {
                 "nsfw": false,
                 "religious": false,
@@ -1879,7 +1879,7 @@
                 "political": false,
                 "racist": false,
                 "sexist": false,
-                "explicit": true
+                "explicit": false
             },
             "id": 120,
             "safe": false
@@ -1895,7 +1895,7 @@
                 "political": false,
                 "racist": false,
                 "sexist": false,
-                "explicit": true
+                "explicit": false
             },
             "id": 121,
             "safe": false
@@ -2005,7 +2005,7 @@
                 "political": false,
                 "racist": true,
                 "sexist": false,
-                "explicit": true
+                "explicit": false
             },
             "id": 128,
             "safe": false
@@ -2021,7 +2021,7 @@
                 "political": false,
                 "racist": true,
                 "sexist": false,
-                "explicit": true
+                "explicit": false
             },
             "id": 129,
             "safe": false
@@ -2147,7 +2147,7 @@
                 "political": false,
                 "racist": false,
                 "sexist": false,
-                "explicit": true
+                "explicit": false
             },
             "id": 137,
             "safe": false
@@ -2225,7 +2225,7 @@
                 "political": false,
                 "racist": false,
                 "sexist": false,
-                "explicit": true
+                "explicit": false
             },
             "id": 142,
             "safe": false
@@ -2352,7 +2352,7 @@
                 "political": false,
                 "racist": true,
                 "sexist": false,
-                "explicit": true
+                "explicit": false
             },
             "id": 150,
             "safe": false
@@ -2399,7 +2399,7 @@
                 "political": false,
                 "racist": false,
                 "sexist": false,
-                "explicit": true
+                "explicit": false
             },
             "id": 153,
             "safe": false
@@ -2488,7 +2488,7 @@
             "category": "Dark",
             "type": "twopart",
             "setup": "What is the difference between acne and a catholic priest?",
-            "delivery": "Acne usually comes on a boys face after he turns 12.",
+            "delivery": "Acne usually comes on a boys face *after* he turns 12.",
             "flags": {
                 "nsfw": true,
                 "religious": true,
@@ -2503,7 +2503,7 @@
         {
             "category": "Dark",
             "type": "twopart",
-            "setup": "My first high-school football game was a lot like my first time having sex...",
+            "setup": "My first high-school football game was a lot like my first time having sex.",
             "delivery": "I was bloody and sore at the end, but at least my dad came.",
             "flags": {
                 "nsfw": true,
@@ -2527,7 +2527,7 @@
                 "political": false,
                 "racist": false,
                 "sexist": false,
-                "explicit": true
+                "explicit": false
             },
             "id": 161,
             "safe": false
@@ -2542,7 +2542,7 @@
                 "political": false,
                 "racist": true,
                 "sexist": false,
-                "explicit": true
+                "explicit": false
             },
             "id": 162,
             "safe": false
@@ -2717,7 +2717,7 @@
                 "political": false,
                 "racist": true,
                 "sexist": false,
-                "explicit": true
+                "explicit": false
             },
             "id": 173,
             "safe": false
@@ -2749,7 +2749,7 @@
                 "political": false,
                 "racist": false,
                 "sexist": false,
-                "explicit": true
+                "explicit": false
             },
             "id": 175,
             "safe": false
@@ -2953,7 +2953,7 @@
                 "political": false,
                 "racist": false,
                 "sexist": false,
-                "explicit": true
+                "explicit": false
             },
             "id": 188,
             "safe": false
@@ -3248,7 +3248,7 @@
                 "political": false,
                 "racist": false,
                 "sexist": false,
-                "explicit": true
+                "explicit": false
             },
             "id": 207,
             "safe": false
@@ -3423,7 +3423,7 @@
                 "political": false,
                 "racist": false,
                 "sexist": true,
-                "explicit": true
+                "explicit": false
             },
             "id": 218,
             "safe": false
@@ -3439,7 +3439,7 @@
                 "political": false,
                 "racist": true,
                 "sexist": false,
-                "explicit": true
+                "explicit": false
             },
             "id": 219,
             "safe": false
@@ -3751,7 +3751,7 @@
                 "political": false,
                 "racist": true,
                 "sexist": false,
-                "explicit": true
+                "explicit": false
             },
             "id": 239,
             "safe": false
@@ -4228,7 +4228,7 @@
                 "political": false,
                 "racist": false,
                 "sexist": false,
-                "explicit": true
+                "explicit": false
             },
             "safe": false,
             "id": 269
@@ -4277,7 +4277,7 @@
                 "sexist": false,
                 "explicit": false
             },
-            "safe": false,
+            "safe": true,
             "id": 272
         },
         {
@@ -4305,7 +4305,7 @@
                 "political": false,
                 "racist": false,
                 "sexist": false,
-                "explicit": true
+                "explicit": false
             },
             "safe": false,
             "id": 274
@@ -4718,7 +4718,7 @@
                 "political": false,
                 "racist": false,
                 "sexist": false,
-                "explicit": true
+                "explicit": false
             },
             "safe": false,
             "id": 300
@@ -4818,7 +4818,7 @@
         {
             "category": "Misc",
             "type": "single",
-            "joke": "I went to the zoo the other day. There was only a dog in it  it was a shihtzu.",
+            "joke": "I went to the zoo the other day. There was only a dog in it - it was a shihtzu.",
             "flags": {
                 "nsfw": false,
                 "religious": false,

+ 1 - 1
src/parseURL.js

@@ -59,7 +59,7 @@ function parseURL(url)
                     let val = decodeURIComponent(splitEntry[1].toLowerCase());
 
                     if(["true", "false"].includes(val.toLowerCase()))
-                        val = Boolean(val.toLowerCase());
+                        val = val.toLowerCase() === "true";
 
                     qstrObj[decodeURIComponent(splitEntry[0])] = val;
                 }