Merge v2.3.2 into master

Author: Sv443

.env.template

@@ -1,3 +1,4 @@
 RESTART_TOKEN=123456789    # A POST request to "[JokeAPI_URL]/restart" with this token as a "text/plain" payload will restart JokeAPI - alternatively, open the JavaScript console on the documentation page and enter "restart()"
 DB_USERNAME=User123        # A user with access to the analytics database
 DB_PASSWORD=password123    # The password of the above user
+NODE_ENV=stage             # The deployment environment of JokeAPI (accepts "prod" / "production" or "stage" - case insensitive, defaults to "stage")

.eslintrc.json

@@ -14,6 +14,7 @@
         "ecmaVersion": 2018
     },
     "rules": {
-        "no-console": "off"
+        "no-console": "off",
+        "no-async-promise-executor": "off"
     }
 }

.gitignore

@@ -30,6 +30,7 @@ data/submissions/*/*.json
 
 # Auth Tokens:
 data/tokens.json
+data/auth/tokens.json
 
 # Other potentially sensitive information:
 data/lists/*.json

.vscode/launch.json

@@ -7,7 +7,7 @@
         {
             "type": "node",
             "request": "launch",
-            "name": "Debug JokeAPI",
+            "name": "JokeAPI",
             "skipFiles": [
                 "<node_internals>/**"
             ],
@@ -30,7 +30,7 @@
             "console": "integratedTerminal"
         },
         {
-            "program": "${workspaceFolder}/tools/submissions.js",
+            "program": "${workspaceFolder}/tools/info.js",
             "name": "Tools/xy",
             "request": "launch",
             "type": "node",
@@ -40,7 +40,20 @@
             "args": [
                 "--trace-deprecation"
             ],
-            "console": "externalTerminal"
+            "console": "integratedTerminal"
+        },
+        {
+            "program": "${workspaceFolder}/tools/cli.js",
+            "name": "CLI",
+            "request": "launch",
+            "type": "node",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "args": [
+                "--trace-deprecation"
+            ],
+            "console": "integratedTerminal"
         }
     ],
     "debug.javascript.usePreview": true

.vscode/settings.json

@@ -50,5 +50,7 @@
     "files.exclude": {         // hide files so they can't be opened in the IDE
         "docs/compiled": true, // to prevent accidentally changing the compiled documentation to only have it be overridden after the next compile
         "dev/madge": true,     // the files don't need to be modified, they only serve as a distraction
-    }
+    },
+
+    "deno.enable": false
 }

changelog.md

@@ -1,4 +1,4 @@
-# JokeAPI Changelog (Version 2.3.1)
+# JokeAPI Changelog (Version 2.3.2)
 
 <br><br><br>
 
@@ -11,7 +11,18 @@
 
 <br><br><br>
 
-## [CURRENT: 2.3.1] - The Safe Mode Hotfix, because bugs exist for some reason ([pull request #214](https://github.com/Sv443/JokeAPI/pull/214))
+## [CURRENT: 2.3.2] - Joke update
+- Added new jokes
+- Rewrote the submission script to make it much more streamlined ([issue #340](https://github.com/Sv443/JokeAPI/issues/340))
+- Rewrote the add-joke script so it's easier for me to use
+- Added a new info script to make working with JokeAPI easier for me
+- Added a global CLI interface ([issue #344](https://github.com/Sv443/JokeAPI/issues/344))
+- API now adjusts environment-dependent settings automatically ([issue #343](https://github.com/Sv443/JokeAPI/issues/343))
+
+
+<br><br><br>
+
+## [2.3.1] - The Safe Mode Hotfix, because bugs exist for some reason ([pull request #214](https://github.com/Sv443/JokeAPI/pull/214))
 - Fixed bug "API Error 500 - Cannot read property 'msBeforeNext' of null" ([issue #212](https://github.com/Sv443/JokeAPI/issues/212))
 - Fixed bug where API responded with Error 106 when using format=txt on endpoint /joke ([issue #218](https://github.com/Sv443/JokeAPI/issues/218))
 - Re-flagged joke 79 ([issue #220](https://github.com/Sv443/JokeAPI/issues/220))

changelog.txt

@@ -1,6 +1,6 @@
 =====================
   JokeAPI Changelog
-  - Version 2.3.1 -
+  - Version 2.3.2 -
 =====================
 
 
@@ -11,7 +11,16 @@
     - Serve docs with nginx to speed up page load times (issue #118)
 
 
-[CURRENT: 2.3.1] - The Safe Mode Hotfix, because bugs exist for some reason (PR #214)
+[CURRENT: 2.3.2] - Joke update
+    - Added new jokes
+    - Rewrote the submission script to make it much more streamlined (issue #340)
+    - Rewrote the add-joke script so it's easier for me to use
+    - Added a new info script to make working with JokeAPI easier for me
+    - Added a global CLI interface (issue #344)
+    - API now adjusts environment-dependent settings automatically (issue #343)
+
+
+[2.3.1] - The Safe Mode Hotfix, because bugs exist for some reason (PR #214)
     - Fixed bug "API Error 500 - Cannot read property 'msBeforeNext' of null" (issue #212)
     - Fixed bug where API responded with Error 106 when using format=txt on endpoint /joke (issue #218)
     - Re-flagged joke 79 (issue #220)

data/jokes/jokes-cs.json

@@ -1,5 +1,6 @@
 {
     "info": {
+        "disclaimer": "Mnohé z níže uvedených vtipů jsou rasistické, sexistické nebo jinak explicitní. Vstup na vlastní nebezpečí!",
         "formatVersion": 3
     },
     "jokes": [

data/jokes/jokes-de.json

@@ -1,5 +1,6 @@
 {
     "info": {
+        "disclaimer": "Viele der folgenden Witze sind rassistisch, sexistisch oder in anderer Weise explizit. Betreten auf eigene Gefahr!",
         "formatVersion": 3
     },
     "jokes": [
@@ -503,6 +504,69 @@
             },
             "id": 31,
             "safe": true
+        },
+        {
+            "category": "Pun",
+            "type": "twopart",
+            "setup": "Mir ist heute Morgen ein Joghurtbecher aus der Hand gefallen.",
+            "delivery": "Er war nicht mehr haltbar.",
+            "flags": {
+                "nsfw": false,
+                "religious": false,
+                "political": false,
+                "racist": false,
+                "sexist": false,
+                "explicit": false
+            },
+            "id": 32,
+            "safe": true
+        },
+        {
+            "category": "Pun",
+            "type": "twopart",
+            "setup": "Im EDEKA ist gestern das Obstregal umgefallen.",
+            "delivery": "Es entstand ein Schaden in Melonenhöhe.",
+            "flags": {
+                "nsfw": false,
+                "religious": false,
+                "political": false,
+                "racist": false,
+                "sexist": false,
+                "explicit": false
+            },
+            "id": 33,
+            "safe": true
+        },
+        {
+            "category": "Pun",
+            "type": "twopart",
+            "setup": "Gab es in Ihrer Familie jemals Fälle von Inzest?",
+            "delivery": "Mitnichten!",
+            "flags": {
+                "nsfw": true,
+                "religious": false,
+                "political": false,
+                "racist": false,
+                "sexist": false,
+                "explicit": false
+            },
+            "id": 34,
+            "safe": false
+        },
+        {
+            "category": "Pun",
+            "type": "single",
+            "joke": "Stauseen sind auch nur verdammte Flüsse.",
+            "flags": {
+                "nsfw": false,
+                "religious": false,
+                "political": false,
+                "racist": false,
+                "sexist": false,
+                "explicit": false
+            },
+            "id": 35,
+            "safe": true
         }
     ]
 }