From 643aad2a18067b8166510adfa9c18a79ab7f1295 Mon Sep 17 00:00:00 2001 From: miro Date: Sun, 17 Nov 2024 14:15:21 +0000 Subject: [PATCH 1/2] fix: skilljson --- MANIFEST.in | 2 + README.md | 2 +- res/icon/dadjokes.png => dadjokes.png | Bin locale/en-us/skill.json | 21 ++++++++ res/desktop/skill-icanhazdadjokes.desktop | 10 ---- res/desktop/skill.json | 27 ---------- skill.json | 59 ---------------------- 7 files changed, 24 insertions(+), 97 deletions(-) create mode 100644 MANIFEST.in rename res/icon/dadjokes.png => dadjokes.png (100%) create mode 100644 locale/en-us/skill.json delete mode 100644 res/desktop/skill-icanhazdadjokes.desktop delete mode 100644 res/desktop/skill.json delete mode 100644 skill.json diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 0000000..fb05bf3 --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,2 @@ +recursive-include locale * +include *.txt \ No newline at end of file diff --git a/README.md b/README.md index 224344b..c77941a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Jokes +# Jokes Let OVOS brighten your day with a little humor from [icanhazdadjoke](icanhazdadjoke.com) Chuck Norris jokes powered by [pyjokes](https://github.com/pyjokes/pyjokes) diff --git a/res/icon/dadjokes.png b/dadjokes.png similarity index 100% rename from res/icon/dadjokes.png rename to dadjokes.png diff --git a/locale/en-us/skill.json b/locale/en-us/skill.json new file mode 100644 index 0000000..5e51674 --- /dev/null +++ b/locale/en-us/skill.json @@ -0,0 +1,21 @@ +{ + "title": "Jokes", + "description": "Brighten your day with dad humor. _WARNING: Laughter is not guaranteed, but eye rolls are likely._ Works in all languages NOTE: this will automatically blacklist the official mycroft skill", + "examples": [ + "Tell me a joke.", + "Say a joke.", + "Do you know any jokes?", + "Can you tell jokes?", + "Make me laugh.", + "Tell me a joke about dentists.", + "Do you know any Chuck Norris jokes?" + ], + "tags": [ + "Entertainment", + "joke", + "jokes", + "humor", + "humour", + "funny" + ] +} \ No newline at end of file diff --git a/res/desktop/skill-icanhazdadjokes.desktop b/res/desktop/skill-icanhazdadjokes.desktop deleted file mode 100644 index 8d97b7b..0000000 --- a/res/desktop/skill-icanhazdadjokes.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Terminal=false -Type=Application -Name=Jokes Skill -Exec=mycroft-gui-app --hideTextInput --skill=skill-icanhazdadjokes.jarbasskills.home -Icon=dadjokes.png -Categories=VoiceApp -StartupNotify=false -X-DBUS-StartupType=None -X-KDE-StartupNotify=false diff --git a/res/desktop/skill.json b/res/desktop/skill.json deleted file mode 100644 index 200d36b..0000000 --- a/res/desktop/skill.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "name": "Jokes", - "skillname": "skill-icanhazdadjokes", - "authorname": "JarbasSkills", - "foldername": "", - "url": "https://github.com/JarbasSkills/skill-icanhazdadjokes", - "branch": "master", - "desktopFile": false, - "warning": "", - "systemDeps": false, - "platforms": [ - "arm", - "arm64", - "i386", - "x86_64", - "ia64" - ], - "examples": [ - "Tell me a joke.", - "Say a joke.", - "Do you know any jokes?", - "Can you tell jokes?", - "Make me laugh.", - "Tell me a joke about dentists.", - "Do you know any Chuck Norris jokes?" - ] -} diff --git a/skill.json b/skill.json deleted file mode 100644 index a55090f..0000000 --- a/skill.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "title": "Jokes", - "url": "https://github.com/JarbasSkills/skill-icanhazdadjokes", - "summary": "Let Mycroft brighten your day with a little humor from [icanhazdadjoke](icanhazdadjoke.com) ![](./ui/logo.png) Chuck Norris jokes powered by [pyjokes](https://github.com/pyjokes/pyjokes)", - "short_description": "Let Mycroft brighten your day with a little humor from [icanhazdadjoke](icanhazdadjoke.com) ![](./ui/logo.png) Chuck Norris jokes powered by [pyjokes](https://github.com/pyjokes/pyjokes)", - "description": "Brighten your day with dad humor. _WARNING: Laughter is not guaranteed, but eye rolls are likely._ Works in all languages NOTE: this will automatically blacklist the official mycroft skill", - "examples": [ - "Tell me a joke.", - "Say a joke.", - "Do you know any jokes?", - "Can you tell jokes?", - "Make me laugh.", - "Tell me a joke about dentists.", - "Do you know any Chuck Norris jokes?" - ], - "desktopFile": false, - "warning": "", - "systemDeps": false, - "requirements": { - "python": [ - "ovos-translate-server-plugin~=0.0.0", - "ovos_classifiers", - "ovos_plugin_manager~=0.0.25", - "ovos_utils~=0.0,>=0.0.38", - "ovos_workshop~=0.0.15", - "pyjokes~=0.6" - ], - "system": {}, - "skill": [] - }, - "incompatible_skills": [], - "platforms": [ - "arm", - "arm64", - "i386", - "x86_64", - "ia64" - ], - "branch": "master", - "license": "Unknown", - "icon": "res/icon/dadjokes.png", - "category": "Entertainment", - "categories": [ - "Entertainment" - ], - "tags": [ - "joke", - "jokes", - "humor", - "humour", - "funny" - ], - "credits": [], - "skillname": "skill-icanhazdadjokes", - "authorname": "JarbasSkills", - "foldername": null, - "name": "Jokes", - "logo": "action/skill/ui/logo.png" -} \ No newline at end of file From 3d833cc4420abf2bcae35418488dbbb071e9cd04 Mon Sep 17 00:00:00 2001 From: miro Date: Sun, 17 Nov 2024 14:23:29 +0000 Subject: [PATCH 2/2] fix: skilljson --- README.md | 3 +-- locale/en-us/skill.json | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index c77941a..da41fc4 100644 --- a/README.md +++ b/README.md @@ -8,9 +8,8 @@ Brighten your day with dad humor. _WARNING: Laughter is not guaranteed, but eye rolls are likely._ -Works in all languages +> NOTE: jokes will be automatically translated if language is not english -NOTE: this will automatically blacklist the official mycroft skill ## Examples * "Tell me a joke." diff --git a/locale/en-us/skill.json b/locale/en-us/skill.json index 5e51674..ff757e8 100644 --- a/locale/en-us/skill.json +++ b/locale/en-us/skill.json @@ -1,6 +1,6 @@ { "title": "Jokes", - "description": "Brighten your day with dad humor. _WARNING: Laughter is not guaranteed, but eye rolls are likely._ Works in all languages NOTE: this will automatically blacklist the official mycroft skill", + "description": "Brighten your day with dad humor. Laughter is not guaranteed, but eye rolls are likely.", "examples": [ "Tell me a joke.", "Say a joke.",