Merge branch 'master' of https://github.com/JamesIves/dc-metro-google…

…-home
JamesIves · Feb 24, 2019 · fed85bd · fed85bd
2 parents 16e0678 + 73db6c7
commit fed85bd
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/DC-Metro.zip b/DC-Metro.zip
diff --git a/functions/.prettierrc.json b/functions/.prettierrc.json
@@ -3,5 +3,5 @@
   "trailingComma": "es5",
   "bracketSpacing": false,
   "arrowParens": "always",
-  "parser": "babylon"
+  "parser": "babel"
 }
diff --git a/functions/src/index.ts b/functions/src/index.ts
@@ -454,6 +454,17 @@ app.intent(
   }
 );
 
+/**
+ * DiagFlow intent for the different help command.
+ */
+app.intent('help_intent', async (conv: any) => {
+  conv.ask(new Suggestions(['Train Commands', 'Bus Commands', 'Feedback']));
+
+  return conv.ask(
+    `I'm able to tell you when the next train or bus is arriving at a station or stop in the Washington DC area. To find out how to use my commands please say 'Train Commands' or 'Bus Commands.`
+  );
+});
+
 /**
  * DiagFlow intent for cancel commands.
  */
@@ -475,7 +486,11 @@ app.intent('default_welcome_intent', (conv) => {
         : hours >= 18
         ? 'Evening'
         : 'Morning'
-    }, welcome to DC Metro! I'm able to tell you when the next train or bus is arriving at a station or stop in the Washington DC area. To find out how to use my commands please say 'Train Commands' or 'Bus Commands'.`
+    }, ${
+      conv.user.last.seen
+        ? 'welcome back to DC Metro! If you need help at all just ask.'
+        : `welcome to DC Metro! I'm able to tell you when the next train or bus is arriving at a station or stop in the Washington DC area. To find out how to use my commands please say 'Train Commands' or 'Bus Commands.`
+    }`
   );
 });