diff --git a/plugins/smalltalk.py b/plugins/smalltalk.py index 88e941b..cef9c01 100644 --- a/plugins/smalltalk.py +++ b/plugins/smalltalk.py @@ -2,6 +2,8 @@ # -*- coding: utf-8 -*- #by Joh Gerna +import urllib2, urllib +import json from plugin import * class smalltalk(Plugin): @@ -44,7 +46,7 @@ def st_thank_you(self, speech, language): self.say("This is my job.") self.complete_request() - @register("de-DE", "(.*möchtest.*heiraten.*)|(.*willst.*heiraten.*)") + @register("de-DE", "(.*m�chtest.*heiraten.*)|(.*willst.*heiraten.*)") @register("en-US", ".*Want.*marry*") def st_marry_me(self, speech, language): if language == 'de-DE': @@ -53,7 +55,7 @@ def st_marry_me(self, speech, language): self.say("No thank you, I'm in love with the black iPhone from you friend.") self.complete_request() - @register("de-DE", ".*erzähl.*Witz.*") + @register("de-DE", ".*erz�hl.*Witz.*") @register("en-US", ".*tell.*joke*") def st_tell_joke(self, speech, language): if language == 'de-DE': @@ -61,8 +63,22 @@ def st_tell_joke(self, speech, language): else: self.say("Two iPhones walk into a bar ... I forget the rest.") self.complete_request() + + @register("de-DE", ".*erzähl.*Witz.*") + @register("en-US", ".*tell.*joke.*chuck.*norris.*") + def st_tell_joke(self, speech, language): + if language == 'de-DE': + self.say("Zwei iPhones stehen an der Bar ... den Rest habe ich vergessen.") + else: + SearchURL = 'http://api.icndb.com/jokes/random' + jsonResponse = urllib2.urlopen(SearchURL).read() + jsonDecoded = json.JSONDecoder().decode(jsonResponse) + joke = jsonDecoded['value']['joke'] + self.say(joke) + self.complete_request() + - @register("de-DE", ".*erzähl.*Geschichte.*") + @register("de-DE", ".*erz�hl.*Geschichte.*") @register("en-US", ".*tell.*story*") def st_tell_story(self, speech, language): if language == 'de-DE': @@ -71,11 +87,11 @@ def st_tell_story(self, speech, language): self.say("Far far away, there was ... no, too stupid") self.complete_request() - @register("de-DE", "(.*Was trägst Du?.*)|(.*Was.*hast.*an.*)") + @register("de-DE", "(.*Was tr�gst Du?.*)|(.*Was.*hast.*an.*)") @register("en-US", ".*what.*wearing*") def st_tell_clothes(self, speech, language): if language == 'de-DE': - self.say("Das kleine schwarze oder war es das weiße?") + self.say("Das kleine schwarze oder war es das wei�e?") self.say("Bin morgends immer so neben der Spur.") else: self.say("I guess the small black one, or was it white?") @@ -85,7 +101,7 @@ def st_tell_clothes(self, speech, language): @register("en-US", ".*Am I fat*") def st_fat(self, speech, language): if language == 'de-DE': - self.say("Dazu möchte ich nichts sagen.") + self.say("Dazu m�chte ich nichts sagen.") else: self.say("I would prefer not to say.") self.complete_request() @@ -139,7 +155,7 @@ def st_123_test(self, speech, language): self.say("I can here you very clear.") self.complete_request() - @register("de-DE", ".*Herzlichen.*Glückwunsch.*Geburtstag.*") + @register("de-DE", ".*Herzlichen.*Gl�ckwunsch.*Geburtstag.*") @register("en-US", ".*Happy.*birthday.*") def st_birthday(self, speech, language): if language == 'de-DE': @@ -154,18 +170,18 @@ def st_birthday(self, speech, language): @register("en-US", ".*Why.*I.*World.*") def st_why_on_world(self, speech, language): if language == 'de-DE': - self.say("Das weiß ich nicht.") + self.say("Das wei� ich nicht.") self.say("Ehrlich gesagt, frage ich mich das schon lange!") else: self.say("I don't know that.") self.say("Ask my self this for a long time!") self.complete_request() - @register("de-DE", ".*Ich bin müde.*") + @register("de-DE", ".*Ich bin m�de.*") @register("en-US", ".*I.*so.*tired.*") def st_so_tired(self, speech, language): if language == 'de-DE': - self.say("Ich hoffe, Du fährst nicht gerade Auto!") + self.say("Ich hoffe, Du f�hrst nicht gerade Auto!") else: self.say("I hope you are not driving a car right now!") self.complete_request()