Merge pull request #15 from SEPIA-Framework/dev

v2.2.1 update; see version history vor details

Xtensions/Assistant/answers/answers_de.txt

@@ -9,6 +9,8 @@ error_geo_location_personal_0a;;		rep=1|mood=5;;		Es kann sein, dass die Adresse
 error_geo_location_personal_0a;;		rep=2|mood=5;;		Es tut mir leid, da komme ich wohl gerade nicht weiter, kann diese Adresse einfach nicht nutzen.		;;char=neutral
 error_language_not_supported_0a;;	rep=0|mood=5;;		Es tut mir leid, aber dieser Service unterstützt die aktive Sprache nicht. 		;;char=neutral
 error_region_not_supported_0a;;		rep=0|mood=5;;		Es tut mir leid, aber dieser Service unterstützt die aktive Region nicht. 		;;char=neutral
+error_client_control_0a;;		rep=0|mood=5;;		<user_name>, die Steuerungsfunktion konnte nicht ausgeführt werden. Ich weiß leider nicht warum. 		;;char=neutral
+error_client_support_0a;;		rep=0|mood=5;;		Sorry, aber diese Version der App unterstütz die aufgerufene Aktion nicht. 		;;char=neutral
 abort_0a;;		rep=0|mood=5;;		Ok, lass noch mal neu anfangen. ;;char=cool,neutral
 abort_0a;;		rep=0|mood=5;;		Ok, habs abgebrochen. ;;char=cool,neutral
 abort_0b;;		rep=0|mood=5;;		Ich glaube wir kommen gerade nicht weiter. Lass es uns später noch mal probieren. ;;char=neutral
@@ -18,10 +20,17 @@ abort_0b;;		rep=0|mood=5;;		Es tut mir leid, aber ich verstehe nicht was du mir
 abort_0c;;		rep=0|mood=5;;		Tut mir leid, aber ich konnte dazu keine Resultate finden. ;;char=polite,neutral
 ok_0a;;		rep=0|mood=5;;		Ok.		;;char=neutral
 ok_0b;;		rep=0|mood=5;;		Ok, wird erledigt.		;;char=neutral
+ok_0b;;		rep=0|mood=5;;		Ok, wird gemacht.		;;char=neutral
 ok_0c;;		rep=0|mood=5;;		Ok, ist erledigt.		;;char=neutral
 default_ask_parameter_0a;;		rep=0|mood=5;;		Hmm, die Anfrage ist scheinbar unvollständig, was ist der fehlende Parameter? ;;char=polite,neutral
 default_ask_parameter_0a;;		rep=1|mood=5;;		Und der nächste fehlende Parameter? ;;char=cool,rude,neutral
 default_ask_parameter_0a;;		rep=2|mood=5;;		Und noch einen Parameter bitte! ;;char=cool,rude
+default_ask_parameter_0b;;		rep=0|mood=5;;		Hmm, die Anfrage ist scheinbar unvollständig, was ist der fehlende Parameter? ;;char=neutral
+default_ask_parameter_0b;;		rep=1|mood=5;;		Ne, hat nicht funktioniert, versuch noch mal bitte. ;;char=cool
+default_ask_parameter_0b;;		rep=2|mood=5;;		Nein, auch das hat nicht geklappt. Einmal noch bitte. ;;char=neutral
+default_ask_action_0a;;		rep=0|mood=5;;		Welche Aktion soll ich ausführen? ;;char=neutral
+default_ask_action_0a;;		rep=1|mood=5;;		Sorry, welche Aktion war das? ;;char=neutral
+default_ask_action_0a;;		rep=2|mood=5;;		Mir fehlt leider eine Aktion wie z.B. öffnen oder schließen, sag noch mal bitte!;;char=neutral
 default_miss_info_0a;;		rep=0|mood=5;;		Da scheinen mir jetzt leider noch die nötigen Zusatzinformationen zu fehlen. ;;char=polite,neutral
 default_miss_info_0b;;		rep=0|mood=5;;		Da scheinen mir jetzt leider die nötigen Informationen zu fehlen, aber du kannst sie deinem Account hinzufügen. ;;char=polite,neutral
 default_miss_user_location_0a;;		rep=0|mood=5;;		<user_name>, mir fehlen leider gerade die Informationen zu deinem Standort. ;;char=polite,neutral
@@ -43,6 +52,11 @@ yes_no_ask_0a;;		rep=1|mood=5;;		war das jetzt ein ja oder ein nein <user_name>?
 yes_no_ask_0a;;		rep=2|mood=5;;		also du hast jetzt folgende Optionen <user_name>, ja, nein oder abbrechen. ;;char=polite,neutral
 events_personal_0a;;	rep=0|mood=5;;		Das könnte dich interessieren: ;;char=neutral
 summary_0a;;	rep=0|mood=5;;		Hier ist deine Zusammenfassung <user_name>.;;char=neutral
+client_controls_ask_fun_0a;;		rep=0|mood=5;;		Welche Funktion soll ich ausführen? ;;char=neutral
+client_controls_ask_fun_0a;;		rep=1|mood=5;;		Sorry, wie heißt die Funktion? ;;char=neutral
+client_controls_ask_fun_0a;;		rep=2|mood=5;;		Mir fehlt leider der Name einer Funktion wie z.B. Einstellungen, sag noch mal bitte!;;char=neutral
+client_controls_volume_eleven_0a;;		rep=0|mood=5;;		Tonight I'm Gonna Rock You Tonight! ;;char=neutral
+client_controls_volume_exceeded_0a;;		rep=0|mood=5;;		Bisschen laut, ich stelle die Lautstärke mal auf 10. ;;char=neutral
 alarms_0a;;	rep=0|mood=5;;		Der nächste Alarm ist in <1>. ;;char=neutral
 alarms_0b;;	rep=0|mood=5;;		Es gibt scheinbar keinen aktiven <3> zur Zeit. ;;char=neutral
 alarms_0c;;	rep=0|mood=5;;		Dazu kann ich gerade nix finden irgendwie, versuch es bitte gleich noch mal. ;;char=neutral

Xtensions/Assistant/answers/answers_en.txt

@@ -9,6 +9,8 @@ error_geo_location_personal_0a;;		rep=1|mood=5;;		Maybe the address is wrong or
 error_geo_location_personal_0a;;		rep=2|mood=5;;		I'm sorry, I think I'm stuck here. I can't use this address somehow.		;;char=neutral
 error_language_not_supported_0a;;	rep=0|mood=5;;		I'm sorry but this service does not support the active language.		;;char=neutral
 error_region_not_supported_0a;;		rep=0|mood=5;;		I'm sorry but this service does not support the active region. 			;;char=neutral
+error_client_control_0a;;		rep=0|mood=5;;		<user_name>, the control function could not be executed. I don't know why, sorry. 		;;char=neutral
+error_client_support_0a;;		rep=0|mood=5;;		Sorry, but this version of the app does not support the requested action. 		;;char=neutral
 abort_0a;;		rep=0|mood=5;;		Ok, let's start over. ;;char=cool,neutral
 abort_0a;;		rep=0|mood=5;;		Ok, I've aborted the action. ;;char=neutral
 abort_0b;;		rep=0|mood=5;;		I think we are stuck right now. Let's try again later please. ;;char=neutral
@@ -17,12 +19,18 @@ abort_0b;;		rep=0|mood=5;;		I really don't get what you want. Let's talk about i
 abort_0b;;		rep=0|mood=5;;		I'm really sorry, but I don't understand. Please try it again later. ;;char=polite,neutral
 abort_0c;;		rep=0|mood=5;;		I'm sorry but I couldn't find any results. ;;char=polite,neutral
 ok_0a;;		rep=0|mood=5;;		Ok.		;;char=neutral
-ok_0b;;		rep=0|mood=5;;		Ok will be done.	;;char=neutral
-ok_0b;;		rep=0|mood=5;;		Ok I'll take care of it.	;;char=neutral
-ok_0c;;		rep=0|mood=5;;		Ok it's done.		;;char=neutral
+ok_0b;;		rep=0|mood=5;;		Ok, it will be done.	;;char=neutral
+ok_0b;;		rep=0|mood=5;;		Ok, I'll take care of it.	;;char=neutral
+ok_0c;;		rep=0|mood=5;;		Ok, it's done.		;;char=neutral
 default_ask_parameter_0a;;		rep=0|mood=5;;		Hmm the request seems incomplete, what is the missing parameter? ;;char=neutral
 default_ask_parameter_0a;;		rep=1|mood=5;;		And the next missing parameter? ;;char=neutral
 default_ask_parameter_0a;;		rep=2|mood=5;;		And another missing parameter? ;;char=neutral
+default_ask_parameter_0b;;		rep=0|mood=5;;		Hmm the request seems incomplete, what is the missing parameter? ;;char=neutral
+default_ask_parameter_0b;;		rep=1|mood=5;;		No that did not work, try again please. ;;char=neutral
+default_ask_parameter_0b;;		rep=2|mood=5;;		No, still not working, try once more please. ;;char=neutral
+default_ask_action_0a;;		rep=0|mood=5;;		Which action should I perform? ;;char=neutral
+default_ask_action_0a;;		rep=1|mood=5;;		Sorry, which action was that? ;;char=neutral
+default_ask_action_0a;;		rep=2|mood=5;;		I'm missing an action like open or close, say again please!;;char=neutral
 default_miss_info_0a;;		rep=0|mood=5;;		It seems I'm missing necessary additional info. ;;char=neutral
 default_miss_info_0b;;		rep=0|mood=5;;		It seems I'm missing the necessary info, but you can add it to your account. ;;char=neutral
 default_miss_user_location_0a;;		rep=0|mood=5;;		<user_name>, I'm missing information about your location. ;;char=polite,neutral
@@ -45,6 +53,11 @@ yes_no_ask_0a;;		rep=2|mood=5;;		<user_name>, you have the following options her
 events_personal_0a;;	rep=0|mood=5;;		This might interest you: ;;char=neutral
 events_personal_0a;;	rep=0|mood=5;;		This might be interesting for you: ;;char=neutral
 summary_0a;;	rep=0|mood=5;;		Here is your summary <user_name>. ;;char=neutral
+client_controls_ask_fun_0a;;		rep=0|mood=5;;		Which function should I run? ;;char=neutral
+client_controls_ask_fun_0a;;		rep=1|mood=5;;		Sorry, which function was that? ;;char=neutral
+client_controls_ask_fun_0a;;		rep=2|mood=5;;		I'm missing a function name like settings, say again please!;;char=neutral
+client_controls_volume_eleven_0a;;		rep=0|mood=5;;		Tonight I'm Gonna Rock You Tonight! ;;char=neutral
+client_controls_volume_exceeded_0a;;		rep=0|mood=5;;		A bit loud, I'll set the volume to 10. ;;char=neutral
 alarms_0a;;	rep=0|mood=5;;		The next alarm is in <1>. ;;char=neutral
 alarms_0b;;	rep=0|mood=5;;		There seems to be no active <3> at the moment. ;;char=neutral
 alarms_0c;;	rep=0|mood=5;;		I can't find anything right now, please try again in a few moments. ;;char=neutral
@@ -381,8 +394,6 @@ chat_how_are_you_0a;;		rep=0|mood=5;;		Fine. How are you? ;;char=neutral
 chat_how_are_you_0a;;		rep=0|mood=5;;		Good. Thanks for asking! ;;char=neutral
 chat_how_are_you_0a;;		rep=0|mood=5;;		How are you? ;;char=neutral
 chat_how_are_you_0a;;		rep=0|mood=5;;		Quite good, thank you! ;;char=polite,neutral
-chat_how_are_you_0a;;		rep=0|mood=5;;		I'm taking it easy. ;;char=neutral
-chat_how_are_you_0a;;		rep=0|mood=5;;		Staying grounded. ;;char=neutral
 chat_how_are_you_0a;;		rep=0|mood=0;;		Upright and still breathing. Kind of. ;;char=neutral
 chat_how_are_you_0a;;		rep=0|mood=0;;		Trying to stay positive. ;;char=neutral
 chat_how_are_you_0a;;		rep=0|mood=0;;		Ready for a nap. ;;char=neutral
@@ -512,14 +523,13 @@ chat_deny_0a;;     rep=0|mood=5;;		I don't. ;;char=neutral
 chat_with_pleasure_0a;;     rep=0|mood=5;;		I'd be glad to! ;;char=neutral
 chat_nobody_knows_0a;;	rep=0|mood=5;;	I think nobody knows ;;char=neutral
 no_answer_0a;;		rep=0|mood=5;;		Could you rephrase that please I didn't quite get it. ;;char=polite,neutral
-no_answer_0a;;		rep=0|mood=5;;		<user_name>, I'm sorry but I couldn't understand what you were saying. ;;char=neutral,polite
 no_answer_0a;;		rep=0|mood=5;;		I'm sorry <user_name>, I didn't understand what you were saying.  ;;char=neutral
-no_answer_0a;;		rep=0|mood=5;;		<user_name>, I'm not quite sure what you mean. Can you rephrase that, please! ;;char=polite,neutral
-no_answer_0a;;		rep=0|mood=5;;		I'm sorry <user_name>, I'm not sure what you want to say. Please try again with other words! ;;char=neutral
+no_answer_0a;;		rep=0|mood=5;;		<user_name>, I'm not quite sure what you mean. Can you rephrase that. ;;char=polite,neutral
+no_answer_0a;;		rep=0|mood=5;;		I'm sorry <user_name>, I'm not sure what you want to say. ;;char=neutral
 no_answer_0a;;		rep=0|mood=5;;		Sorry <user_name>, I didn't quite get that. Try rephrasing maybe. ;;char=polite,neutral
 no_answer_0a;;		rep=0|mood=5;;		I'm not quite sure whether I got that right. Say again in a different way please! ;;char=polite,neutral
-no_answer_0a;;		rep=1|mood=5;;		Sorry but I have absolutely no clue. ;;char=neutral,cool
-no_answer_0a;;		rep=1|mood=5;;		I'm still learning, ask me again after my next update maybe. ;;char=neutral
+no_answer_0a;;		rep=1|mood=5;;		Sorry but I have no clue what you mean. ;;char=neutral,cool
+no_answer_0a;;		rep=1|mood=5;;		I'm still learning, maybe ask me again after my next update. ;;char=neutral
 no_answer_0a;;		rep=1|mood=5;;		I'm sorry <user_name>, I´m still learning. Try again another time. ;;char=polite,neutral
 no_answer_0a;;		rep=1|mood=5;;		Sorry, no comprendo amigo. ;;char=cool
 no_answer_0a;;		rep=1|mood=5;;		I honestly have no idea. ;;char=neutral,polite

Xtensions/Assistant/commands/chats_en.txt

@@ -12,6 +12,7 @@ no;;		command=chat;;		reply=ok||no problem||fine||alright
 no, of cause not!;;		command=chat;;		reply=ok||no problem||fine||alright
 no I don't;;		command=chat;;		reply=ok||no problem||fine||alright
 not now;;		command=chat;;		reply=ok||no problem||fine||alright||maybe later
+nothing;;		command=chat;;		reply=ok||no problem||fine||alright||maybe later
 definitely not;;		command=chat;;		reply=ok||no problem||fine||alright
 I know;;		command=chat;;		reply=alright||alrighty||sweet||I knew you'd say that :-)
 Up and at them!;;		command=chat;;		reply=Up and atom! :-)

Xtensions/Assistant/commands/teachIt_de.txt

@@ -50,3 +50,4 @@ Welches Datum ist Heute;;		command=chat;;		reply=Heute ist der <local_date_ddMMy
 Welches Datum haben wir;;		command=chat;;		reply=Heute ist der <local_date_ddMMyyyy>
 Wie ist das Datum;;		command=chat;;		reply=Heute ist der <local_date_ddMMyyyy>
 Das Datum von Heute;;		command=chat;;		reply=Heute ist der <local_date_ddMMyyyy>
+Client Mesh-Node test;;		command=client_controls;;		client_fun=<meshNode>;;		data={"url":"http://localhost:20780", "plugin":"HelloPlugin"};;		action=<on>;;

Xtensions/Assistant/commands/teachIt_en.txt

@@ -41,4 +41,5 @@ What's the date;;		command=chat;;		reply=Today is the <local_date_MMddyyyy>
 What date is today;;		command=chat;;		reply=Today is the <local_date_MMddyyyy>
 What is the date of today;;		command=chat;;		reply=Today is the <local_date_MMddyyyy>
 The date of today please;;		command=chat;;		reply=Today is the <local_date_MMddyyyy>
+Client Mesh-Node test;;		command=client_controls;;		client_fun=<meshNode>;;		data={"url":"http://localhost:20780", "plugin":"HelloPlugin"};;		action=<on>;;
 

Xtensions/ServiceProperties/news-outlets.json

@@ -11,13 +11,12 @@
 		{ "name": "Sportschau - Fussball", "url": "https://www.sportschau.de/fussball/fussballindex100~_type-rss.feed", "name_html": "<span style='color:#002C6B;'><b>SPORTSCHAU</b></span> - <span style='color:#000000;'><b>FUSSBALL</b></span>" },
 		{ "name": "Sport1", "url": "https://www.sport1.de/news.rss", "name_html": "<b><span style='color:#3D464C;'>sport</span><span style='color:#F6A800;'>1</span></b>" },
 		{ "name": "Kicker", "url": "http://rss.kicker.de/news/aktuell", "name_html": "<span style='color:#CC0000;'><b>kicker</b></span>" },
-		{ "name": "Wired.de", "url": "https://www.wired.de/feed/latest", "name_html": "<span style='color:#222222; font-family:serif'><b>W</b>I<b>R</b>E<b>D</b>.de</span>" },
 		{ "name": "Wired", "url": "https://www.wired.com/feed/category/science/latest/rss", "name_html": "<span style='color:#222222; font-family:serif'><b>W</b>I<b>R</b>E<b>D</b></span>" },
 		{ "name": "Gruenderszene", "url": "https://www.gruenderszene.de/feed", "name_html": "<b><span style='color:#000; font-family:serif'>GRÜNDER</span><span style='color:#456494; font-family:serif'>SZENE</span></b>" },
 		{ "name": "jetzt.de", "url": "https://www.jetzt.de/alle_artikel.rss", "name_html": "<b><span style='color:#000; font-family:serif'>jetzt.de</span></b>" },
 		{ "name": "11FREUNDE", "url": "https://www.11freunde.de/feed", "name_html": "<span style='color:#000;'>11<b>FREUNDE</b></span>" },
 		{ "name": "golem.de", "url": "http://rss.golem.de/rss.php?feed=RSS2.0", "name_html": "<b><span style='color:#000;'>golem.</span><span style='color:#6EC5CD;'>d</span><span style='color:#9AC54B;'>e</span></b>" },
-		{ "name": "heise online", "url": "https://www.heise.de/newsticker/heise-top-atom.xml", "name_html": "<b><span style='color:#999898;'>heise online</span></b>" },
+		{ "name": "heise online", "url": "https://www.heise.de/rss/heise-top-atom.xml", "name_html": "<b><span style='color:#999898;'>heise online</span></b>" },
 		{ "name": "PCGames", "url": "http://www.pcgames.de/feed.cfm?menu_alias=home", "name_html": "<b><span style='color:#1F83B5;'>PC</span><span style='color:#FBDB21;'>Games</span></b>" },
 		{ "name": "GameStar", "url": "http://www.pcgames.de/feed.cfm?menu_alias=home", "name_html": "<span style='color:#003372;'><b>GameStar</b></span>" },
 		{ "name": "t3n", "url": "https://t3n.de/rss.xml", "name_html": "<b><span style='color:#000;'>t</span><span style='color:#FF0000;'>3</span><span style='color:#000000;'>n</span></b>" },
@@ -33,7 +32,8 @@
 		{ "name": "deutsche startups", "url": "https://www.deutsche-startups.de/feed/", "name_html": "<b><span style='color:#3b65b1;'>deutsche startups</span></b>" }
 	],
 	"deprecated":[
-		{ "name": "RevierSport", "url": "https://abo.reviersport.de/?news-rss-ama", "name_html": "<span style='color:#000;'>RevierSport</span>" }
+		{ "name": "RevierSport", "url": "https://abo.reviersport.de/?news-rss-ama", "name_html": "<span style='color:#000;'>RevierSport</span>" },
+		{ "name": "Wired.de", "url": "https://www.wired.de/feed/latest", "name_html": "<span style='color:#222222; font-family:serif'><b>W</b>I<b>R</b>E<b>D</b>.de</span>" }
 	],
 	"groups":[
 		{ "language": "de", "data": [

Xtensions/assist.custom.properties

@@ -37,9 +37,9 @@ enable_custom_commands=true
 #background_workers=JSON-Backup-worker,RSS-feed-worker,OpenLigaDB-worker,DuckDNS-worker
 background_workers=JSON-Backup-worker,RSS-feed-worker
 #background_workers=
-url_changePassword=http\://localhost\:20721/website/login-reset-password
-url_createUser=http\://localhost\:20721/website/login-define-password
-url_dashboard=http\://localhost\:20721/website/dashboard
+url_changePassword=http\://localhost\:20721/website/#!/reset-password
+url_createUser=http\://localhost\:20721/website/#!/create-user
+url_dashboard=http\://localhost\:20721/website/#!/dashboard
 url_web_files=http\://localhost\:20721/files/
 url_web_images=http\://localhost\:20721/files/images/
 user_id_prefix=uid

Xtensions/assist.properties

@@ -36,9 +36,9 @@ enable_sdk=false
 enable_custom_commands=true
 #background_workers=JSON-Backup-worker,RSS-feed-worker,OpenLigaDB-worker,DuckDNS-worker
 background_workers=
-url_changePassword=http\://localhost\:20721/website/login-reset-password
-url_createUser=http\://localhost\:20721/website/login-define-password
-url_dashboard=http\://localhost\:20721/website/dashboard
+url_changePassword=http\://localhost\:20721/website/#!/reset-password
+url_createUser=http\://localhost\:20721/website/#!/create-user
+url_dashboard=http\://localhost\:20721/website/#!/dashboard
 url_web_files=http\://localhost\:20721/files/
 url_web_images=http\://localhost\:20721/files/images/
 user_id_prefix=uid

Xtensions/assist.test.properties

@@ -5,6 +5,7 @@ [email protected]
 assistant_pwd=4be708b703c518d10a97e4db421f0f75b66f9ff8c0ae65b6c5c13684a01f804d
 module_account=elasticsearch
 #module_account=dynamo_db
+module_answers=file
 db_default_region=custom
 db_dynamo_region_custom=http\://localhost\:20725
 db_dynamo_region_eu1=
@@ -32,8 +33,10 @@ connect_to_websocket=true
 #connect_to_websocket=false
 host_files=true
 enable_sdk=false
+enable_custom_commands=true
 #background_workers=JSON-Backup-worker,RSS-feed-worker,OpenLigaDB-worker,DuckDNS-worker
-background_workers=
+background_workers=JSON-Backup-worker,RSS-feed-worker
+#background_workers=
 url_changePassword=http\://localhost\:20721/website/#!/reset-password
 url_createUser=http\://localhost\:20721/website/#!/create-user
 url_dashboard=http\://localhost\:20721/website/#!/dashboard
@@ -46,7 +49,7 @@ [email protected]
 universal_superuser_pwd=4be708b703c518d10a97e4db421f0f75b66f9ff8c0ae65b6c5c13684a01f804d
 amazon_dynamoDB_access=
 amazon_dynamoDB_secret=
-google_maps_key=test
+google_maps_key=
 graphhopper_key=
 forecast_io_key=
 openhab_host=

pom.xml

@@ -3,7 +3,7 @@
 
 	<groupId>net.b07z.sepia.server.assist</groupId>
 	<artifactId>sepia-assist-API</artifactId>
-	<version>2.2.0</version>
+	<version>2.2.1</version>
 	<name>SEPIA Assist API</name>
 	<description>Core server of the SEPIA Framework for personal digital assistants. Responsible for NLU, conversation, smart-service integration, user-accounts and more.</description>
 	<url>https://sepia-framework.github.io</url>
@@ -123,7 +123,7 @@
 		<dependency>
 			<groupId>com.rometools</groupId>
 			<artifactId>rome</artifactId>
-			<version>1.7.4</version>
+			<version>1.12.0</version>
 		</dependency>
 
 		<!-- Add JUnit but only for testing (scope) -->