Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
65f1ad5
Began working on submission script rewrite + added .d.ts for jokes & …
Sv443 Oct 14, 2021
a752736
bit more submission stuff
Sv443 Oct 14, 2021
ac1e481
fixed some stuff
Sv443 Oct 14, 2021
9e4bbca
a LOT of submission script stuff
Sv443 Oct 15, 2021
e0529a1
gitignore
Sv443 Oct 15, 2021
4f343db
comment
Sv443 Oct 15, 2021
281ee0b
stuff
Sv443 Oct 15, 2021
3953556
Merge branch 'master' into version/2.3.2
Sv443 Oct 16, 2021
70eead6
add jokeapi bin
Sv443 Oct 16, 2021
81bd374
add parsing
Sv443 Oct 16, 2021
f05938b
stuff
Sv443 Oct 17, 2021
2b34eb8
added all tools to cli bin
Sv443 Oct 18, 2021
fd5db61
cli stuff
Sv443 Oct 18, 2021
3df4c98
types & submission stuff
Sv443 Oct 19, 2021
ae6b6cc
Merge branch 'version/2.3.2' of https://github.com/Sv443/JokeAPI into…
Sv443 Oct 19, 2021
5b7dd05
submission fixes
Sv443 Oct 19, 2021
fdae885
stuff
Sv443 Oct 19, 2021
d0a963e
version bump + fix vulns
Sv443 Oct 20, 2021
f2d3805
fixed #343
Sv443 Oct 20, 2021
4332ead
more submission script stuff
Sv443 Oct 20, 2021
533dc44
submission script pretty much done now :)
Sv443 Oct 20, 2021
fa07dec
changelog
Sv443 Oct 20, 2021
af89782
stuff
Sv443 Oct 20, 2021
d2079a0
change some CLI aliases
Sv443 Oct 21, 2021
803ee89
new german jokes
Sv443 Oct 21, 2021
4d84e7a
remove stray_submissions
Sv443 Oct 21, 2021
080b54f
tools readme
Sv443 Oct 21, 2021
7309c73
update cascadia code font
Sv443 Oct 21, 2021
4941446
fixed font weight
Sv443 Oct 21, 2021
0ab93ff
tsconf
Sv443 Oct 23, 2021
7318d24
remove unncecessary IP from whitelist
Sv443 Oct 23, 2021
811b25b
disable ratelimit log file
Sv443 Oct 23, 2021
24471a9
fix error if no lang prop present
Sv443 Oct 23, 2021
c24b9ee
disable debug log on translation (too spammy)
Sv443 Oct 23, 2021
a68cf4e
went through stray submissions + added disclaimers
Sv443 Oct 23, 2021
3dd48c3
disclaimer fix
Sv443 Oct 23, 2021
367b6ac
cli stuff
Sv443 Oct 23, 2021
6aa8727
i forgor
Sv443 Oct 23, 2021
4904b9e
whoops
Sv443 Oct 23, 2021
26f2569
add-joke script
Sv443 Oct 23, 2021
9a10cf8
add-joke script stuff
Sv443 Oct 24, 2021
912c528
add-joke stuff again
Sv443 Oct 24, 2021
e50bf6b
more stuff
Sv443 Oct 24, 2021
f32f864
add-joke edit props prompts
Sv443 Oct 25, 2021
5a28d00
tf
Sv443 Oct 25, 2021
6dba3c4
update eslint
Sv443 Oct 25, 2021
ad30e02
fix codeql issue
Sv443 Oct 26, 2021
204d31e
Merge branch 'version/2.3.2' of https://github.com/Sv443/JokeAPI into…
Sv443 Oct 26, 2021
17891dd
fix broken anchor
Sv443 Oct 26, 2021
83898c2
lots of improvements to add-joke
Sv443 Oct 26, 2021
6d46bc0
finished add-joke script
Sv443 Oct 26, 2021
44d81b5
a few fixes
Sv443 Oct 27, 2021
6d752d5
update dependency
Sv443 Oct 27, 2021
7afd81d
delete old add-joke
Sv443 Oct 27, 2021
55b904a
info script stuff
Sv443 Oct 28, 2021
658a77c
fixed wrong format in reformatJoke function, yikes
Sv443 Oct 28, 2021
38a9ce6
add a few more jokes
Sv443 Oct 28, 2021
2cbca6f
changelog
Sv443 Oct 28, 2021
0412992
info script improvements
Sv443 Oct 28, 2021
6559cde
changelog
Sv443 Oct 28, 2021
20d8c19
info script stuff
Sv443 Oct 29, 2021
435e799
mode info script
Sv443 Oct 29, 2021
77b348a
finished
Sv443 Oct 29, 2021
b9083bf
set engine requirements
Sv443 Oct 29, 2021
b848784
fixed it
Sv443 Oct 29, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions 1 .env.template
Original file line number Diff line number Diff line change
@@ -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")
3 changes: 2 additions & 1 deletion 3 .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"ecmaVersion": 2018
},
"rules": {
"no-console": "off"
"no-console": "off",
"no-async-promise-executor": "off"
}
}
1 change: 1 addition & 0 deletions 1 .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ data/submissions/*/*.json

# Auth Tokens:
data/tokens.json
data/auth/tokens.json

# Other potentially sensitive information:
data/lists/*.json
19 changes: 16 additions & 3 deletions 19 .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
{
"type": "node",
"request": "launch",
"name": "Debug JokeAPI",
"name": "JokeAPI",
"skipFiles": [
"<node_internals>/**"
],
Expand All @@ -30,7 +30,7 @@
"console": "integratedTerminal"
},
{
"program": "${workspaceFolder}/tools/submissions.js",
"program": "${workspaceFolder}/tools/info.js",
"name": "Tools/xy",
"request": "launch",
"type": "node",
Expand All @@ -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
Expand Down
4 changes: 3 additions & 1 deletion 4 .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
15 changes: 13 additions & 2 deletions 15 changelog.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# JokeAPI Changelog (Version 2.3.1)
# JokeAPI Changelog (Version 2.3.2)

<br><br><br>

Expand All @@ -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))
Expand Down
13 changes: 11 additions & 2 deletions 13 changelog.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
=====================
JokeAPI Changelog
- Version 2.3.1 -
- Version 2.3.2 -
=====================


Expand All @@ -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)
Expand Down
1 change: 1 addition & 0 deletions 1 data/jokes/jokes-cs.json
Original file line number Diff line number Diff line change
@@ -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": [
Expand Down
64 changes: 64 additions & 0 deletions 64 data/jokes/jokes-de.json
Original file line number Diff line number Diff line change
@@ -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": [
Expand Down Expand Up @@ -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
}
]
}
Loading
Morty Proxy This is a proxified and sanitized view of the page, visit original site.