Skip to content

Commit ee29ee2

Browse files
Sv443Sv443
authored
Merge pull request #365 from Sv443/211210-fix_jokes
2 parents 2dbae2d + 3d47f13 commit ee29ee2

File tree

1 file changed

+37
-38
lines changed

1 file changed

+37
-38
lines changed

‎data/jokes/regular/jokes-en.json‎

Lines changed: 37 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1371,7 +1371,7 @@
13711371
"explicit": false
13721372
},
13731373
"id": 114,
1374-
"safe": false
1374+
"safe": true
13751375
},
13761376
{
13771377
"category": "Programming",
@@ -1465,7 +1465,7 @@
14651465
"explicit": false
14661466
},
14671467
"id": 131,
1468-
"safe": false
1468+
"safe": true
14691469
},
14701470
{
14711471
"category": "Programming",
@@ -1493,10 +1493,10 @@
14931493
"political": false,
14941494
"racist": false,
14951495
"sexist": false,
1496-
"explicit": true
1496+
"explicit": false
14971497
},
14981498
"id": 136,
1499-
"safe": false
1499+
"safe": true
15001500
},
15011501
{
15021502
"category": "Misc",
@@ -1509,7 +1509,7 @@
15091509
"political": false,
15101510
"racist": false,
15111511
"sexist": false,
1512-
"explicit": true
1512+
"explicit": false
15131513
},
15141514
"id": 137,
15151515
"safe": false
@@ -1571,14 +1571,14 @@
15711571
"religious": false,
15721572
"political": false,
15731573
"racist": false,
1574-
"sexist": false,
1575-
"explicit": true
1574+
"sexist": true,
1575+
"explicit": false
15761576
},
15771577
"id": 142,
15781578
"safe": false
15791579
},
15801580
{
1581-
"category": "Misc",
1581+
"category": "Dark",
15821582
"type": "twopart",
15831583
"setup": "My neighbor is a 90 year old with Alzheimer's, I see him every morning and he asks me If I've seen his wife.\nEvery day I have to tell this poor man that his wife died 20 years ago.\nI could have moved to another house or even ignore his question.",
15841584
"delivery": "But the look of joy in his eyes whenever I answer him is worth the world.",
@@ -1652,7 +1652,7 @@
16521652
"political": false,
16531653
"racist": false,
16541654
"sexist": false,
1655-
"explicit": true
1655+
"explicit": false
16561656
},
16571657
"id": 155,
16581658
"safe": false
@@ -1668,7 +1668,7 @@
16681668
"political": false,
16691669
"racist": false,
16701670
"sexist": false,
1671-
"explicit": true
1671+
"explicit": false
16721672
},
16731673
"id": 156,
16741674
"safe": false
@@ -1700,7 +1700,7 @@
17001700
"political": false,
17011701
"racist": false,
17021702
"sexist": false,
1703-
"explicit": true
1703+
"explicit": false
17041704
},
17051705
"id": 163,
17061706
"safe": false
@@ -1716,7 +1716,7 @@
17161716
"political": false,
17171717
"racist": false,
17181718
"sexist": false,
1719-
"explicit": true
1719+
"explicit": false
17201720
},
17211721
"id": 164,
17221722
"safe": false
@@ -1732,7 +1732,7 @@
17321732
"political": false,
17331733
"racist": false,
17341734
"sexist": false,
1735-
"explicit": true
1735+
"explicit": false
17361736
},
17371737
"id": 167,
17381738
"safe": false
@@ -1812,7 +1812,7 @@
18121812
"political": false,
18131813
"racist": false,
18141814
"sexist": false,
1815-
"explicit": true
1815+
"explicit": false
18161816
},
18171817
"id": 172,
18181818
"safe": false
@@ -1828,7 +1828,7 @@
18281828
"political": false,
18291829
"racist": false,
18301830
"sexist": false,
1831-
"explicit": true
1831+
"explicit": false
18321832
},
18331833
"id": 175,
18341834
"safe": false
@@ -1837,7 +1837,7 @@
18371837
"category": "Pun",
18381838
"type": "twopart",
18391839
"setup": "What do you call a witch at the beach?",
1840-
"delivery": "A Sandwich.",
1840+
"delivery": "A sandwich.",
18411841
"flags": {
18421842
"nsfw": false,
18431843
"religious": false,
@@ -1985,10 +1985,10 @@
19851985
"political": false,
19861986
"racist": false,
19871987
"sexist": false,
1988-
"explicit": true
1988+
"explicit": false
19891989
},
19901990
"id": 188,
1991-
"safe": false
1991+
"safe": true
19921992
},
19931993
{
19941994
"category": "Pun",
@@ -2310,7 +2310,7 @@
23102310
"flags": {
23112311
"nsfw": false,
23122312
"religious": false,
2313-
"political": true,
2313+
"political": false,
23142314
"racist": false,
23152315
"sexist": false,
23162316
"explicit": false
@@ -2326,7 +2326,7 @@
23262326
"flags": {
23272327
"nsfw": false,
23282328
"religious": false,
2329-
"political": true,
2329+
"political": false,
23302330
"racist": false,
23312331
"sexist": false,
23322332
"explicit": false
@@ -2377,7 +2377,7 @@
23772377
"political": false,
23782378
"racist": false,
23792379
"sexist": false,
2380-
"explicit": true
2380+
"explicit": false
23812381
},
23822382
"id": 216,
23832383
"safe": false
@@ -2652,7 +2652,7 @@
26522652
"category": "Christmas",
26532653
"type": "twopart",
26542654
"setup": "Why does Santa have three gardens?",
2655-
"delivery": "So he can 'ho ho ho'!",
2655+
"delivery": "So he can \"ho ho ho\"!",
26562656
"flags": {
26572657
"nsfw": false,
26582658
"religious": false,
@@ -2668,7 +2668,7 @@
26682668
"category": "Christmas",
26692669
"type": "twopart",
26702670
"setup": "Why did Santa's helper see the doctor?",
2671-
"delivery": "Because he had a low \"elf\" esteem!",
2671+
"delivery": "Because he had a low elf-esteem.",
26722672
"flags": {
26732673
"nsfw": false,
26742674
"religious": false,
@@ -2699,8 +2699,8 @@
26992699
{
27002700
"category": "Christmas",
27012701
"type": "twopart",
2702-
"setup": "What says Oh Oh Oh?",
2703-
"delivery": "Santa walking backwards!",
2702+
"setup": "What says \"Oh Oh Oh\"?",
2703+
"delivery": "Santa walking backwards.",
27042704
"flags": {
27052705
"nsfw": false,
27062706
"religious": false,
@@ -2716,7 +2716,7 @@
27162716
"category": "Christmas",
27172717
"type": "twopart",
27182718
"setup": "Who is Santa's favourite singer?",
2719-
"delivery": "Elf-is Presley!",
2719+
"delivery": "Elf-is Presley.",
27202720
"flags": {
27212721
"nsfw": false,
27222722
"religious": false,
@@ -2748,7 +2748,7 @@
27482748
"category": "Christmas",
27492749
"type": "twopart",
27502750
"setup": "What do Santa's little helpers learn at school?",
2751-
"delivery": "The elf-abet!\n",
2751+
"delivery": "The elf-abet.",
27522752
"flags": {
27532753
"nsfw": false,
27542754
"religious": false,
@@ -2995,7 +2995,7 @@
29952995
"sexist": false,
29962996
"explicit": false
29972997
},
2998-
"safe": false,
2998+
"safe": true,
29992999
"id": 266
30003000
},
30013001
{
@@ -3143,8 +3143,8 @@
31433143
{
31443144
"category": "Pun",
31453145
"type": "twopart",
3146-
"setup": "Which is faster, Hot or cold?",
3147-
"delivery": "Hot, because you can catch a cold",
3146+
"setup": "Which is faster, hot or cold?",
3147+
"delivery": "Hot, because you can catch a cold.",
31483148
"flags": {
31493149
"nsfw": false,
31503150
"religious": false,
@@ -3159,7 +3159,7 @@
31593159
{
31603160
"category": "Pun",
31613161
"type": "twopart",
3162-
"setup": "To prove he was right, the flat-earther walked to the end of the Earth.",
3162+
"setup": "To prove he was right, the flat-earther walked to the end of the earth.",
31633163
"delivery": "He eventually came around.",
31643164
"flags": {
31653165
"nsfw": false,
@@ -3254,9 +3254,8 @@
32543254
},
32553255
{
32563256
"category": "Pun",
3257-
"type": "twopart",
3258-
"setup": "A Roman walks into a bar and raises 2 fingers and says to the bartender...",
3259-
"delivery": "\"Five beers, please.\"",
3257+
"type": "single",
3258+
"joke": "A Roman walks into a bar, raises 2 fingers and says to the bartender \"five beers, please.\"",
32603259
"flags": {
32613260
"nsfw": false,
32623261
"religious": false,
@@ -3309,7 +3308,7 @@
33093308
"political": false,
33103309
"racist": false,
33113310
"sexist": false,
3312-
"explicit": true
3311+
"explicit": false
33133312
},
33143313
"safe": false,
33153314
"id": 289
@@ -3333,8 +3332,8 @@
33333332
{
33343333
"category": "Programming",
33353334
"type": "twopart",
3336-
"setup": "Why was the JavaScript developer sad?",
3337-
"delivery": "Because they didn't Node how to Express themself!",
3335+
"setup": "Why was the Javascript developer sad?",
3336+
"delivery": "Because they didn't Node how to Express themself.",
33383337
"flags": {
33393338
"nsfw": false,
33403339
"religious": false,
@@ -3469,7 +3468,7 @@
34693468
"political": false,
34703469
"racist": false,
34713470
"sexist": false,
3472-
"explicit": true
3471+
"explicit": false
34733472
},
34743473
"safe": false,
34753474
"id": 300

0 commit comments

Comments
 (0)