From a83cd0a3c3894061a3ed48d84890eb26e68c9fd2 Mon Sep 17 00:00:00 2001
From: James Ives <iam@jamesiv.es>
Date: Sun, 24 Feb 2019 12:12:03 -0500
Subject: [PATCH 1/2] Adding welcome back intent

---
 DC-Metro.zip               | Bin 10728 -> 11701 bytes
 functions/.prettierrc.json |   2 +-
 functions/src/index.ts     |  17 ++++++++++++++++-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/DC-Metro.zip b/DC-Metro.zip
index 31f1a8b4514e7f29e3dc67d8e71688c52a00db3f..f5072696afa9d00d6e36421fb53639a8b673cefe 100644
GIT binary patch
delta 1417
zcmaD6yfvCPz?+#xgn@&DgTc5nVj^!KGmzStIGYJXZ~o6z#Rz89uy{Zi$63oE3`h1p
z2;&k*354Ov^$4tM@<sv4$+Oh>C&#O?ZjR=)0LxCkAS=0fJ>P$b(v1R5jP*bZ{1}jc
z1dyGXSCX1nQmmhmno|%D;pk-*=jX*vJe}8UAmIA_C)W`x4~L4D9A(#6>$0YXhK35;
zsA%wQd*gXq<I(+WevO42HhkFmdDr9LN*ss6T4pQgxW=iZM!6V<RZdB5FAZ6HO`!3>
z7NM)Fbm|Rwr`zpo=Kj?q?Dh9*S&J+$Q;er&;~CMPaoXztCY8Q<Jh{_xb!hs;iOh}#
z&x<Ea*mk~$ZOK!kHBOfkd^NUxp0p;*AWzN7__6pFvA)T9m-}QK&EM`la$0lB1=+oh
zZw}Sp$vX1uh_2iY`Tz5LS<MQjeld%xo$AnQByN9XZ@tUe`s|-phx@i<PR)GzY>Uk|
z`OES)bEa6m*X?@Q<-RBQS*+HrtwGytekWI->sh*2%;8@8r01S<riF%Wdba2Z<Ezi7
zKXhC+`BRn>@qE#L<^XSYjx7elXJr`~7}S{<7*HY=C6HC%fy@R8<;jIy67^@V?9IDv
zAi(gz*59$>9OLo-$<OreZf2G2dm?C<;O(ZmShH(SwPt9X)y-g20j0tx6XpA^+@2h?
zzdHC;!J2mQ(hEAArAZsMMHGk_1t>7z+mf&*MS23?`TFpXc{|rvM!Rpf$xfMezVhU^
z&&}zf$3D+&w_16q`Il*2sO)y0*LPmmtJv@JwC39+v*2UqB;6ld>+WyA+jn{O9DVh9
zPt9_<r+l>1+5OOLU)-;Q*HUg(_o}JAu72|RXS{aQ-7Onfy(S&pD3RdEeQf#)??Xv7
z)mL^ICmnjDo78wHRZ;C_#QOzLla#u$l|DKq$zJ___eas^pcvH^zU&1P#pXL2WSlge
zKWANi#s2pdVap3=eRt$m@;MiN;ZaF_r^kewrU^#^T-WqPy<5(!6k2=Y<tF|)M_ih8
z86(vSZZIubQ{5k<C)dg|^LJsl_uN!@6ZtJ?k6OMceHDJm;?0%=3Kus#&(N67{;KSE
z<-5aS!HeH;IdPx;`aH~Jf~VM?cjl(QR@FW|e(GC%jK9MBdSH~XbI4?Bl{NsQ@CO@O
z6mB*X+6T!-|CuB=3y8QtIKYgyxj-}&p1~&HQ0L$LK`b4T$)Y5x;d&-lXz*?RFByl>
zS1BC=$>SGf4>N=F_%uZ!Nd8@|Yz`8b{8ZT#Ov|bSf$1WZI52%##T!g3s)mE<YE?fl
zeMU73OlzvSgXv<mU@(1B&0P?b*^yJI#AHQvNfuBxpS)33LJuU3?0Zl$MSvb*)RF;|
zW+y+;;86f+JAY_CM+Gp@M41^Fq!D_6tT@rh2I`t%C&Z{rGs%ksxe}A*L<B*4!NMDX
z!u1l9&#7yHxxazj50XHx<m3-x2vva^(o9X#lk+qnX3YX}8DxQ6iOJ_RWWgHW1BE)|
wCg)4bP1e$c7;UL3&GbWI@_kt?xNZGFp?xZo*J$eTi7|*VoCC)4MKzF%0SMF~u>b%7

delta 579
zcmdlQ{UVq*z?+#xgn@&DgQ2g%Ya(wTGmzStIGYJXZ~o6z#Rz89uy{Zi$63oE3`h1p
z2;&k*354Ov^$4tM@<sv4&F;KDVA08cB_%hn=lc&)vQeN3BHAx4IhkEsc=L48Nf3em
zOdtWi$#L3(n^VM9A%Z}ICW}e&Z{8x|2GRdlvLC|em##+WTOrLid5(_YW>;BXxW3Kn
z<U$~>0XaZUaTPPzAE#A>AfgY{%s~Q^rPNKqbdY)wm|m_P2c|hRyuoysMmU(>py3Cm
z88xH8beyI;m|me745t4<`46<DnKXqa|JBk23u|giGrbZ9awUL1lLZUa0foFoC-X>2
zP8QV`Q~)}{k0E>WCmTiv23b}H1`P&euv-kMP;0WkCJ$JzoQ^b;uf*he(z27Kw0XdK
zW0Yp^F$U@t2I^Hu*2-{N5~xrD7%~uh_W<<<OHaP3qXpJi*!)1UfSG||ryRPShh-;=
jC?f2P(UoTERGfTEMQ!qYT@F4G1`!4`HU@?{${@=CauBS|

diff --git a/functions/.prettierrc.json b/functions/.prettierrc.json
index f2b733f..6585007 100644
--- a/functions/.prettierrc.json
+++ b/functions/.prettierrc.json
@@ -3,5 +3,5 @@
   "trailingComma": "es5",
   "bracketSpacing": false,
   "arrowParens": "always",
-  "parser": "babylon"
+  "parser": "babel"
 }
\ No newline at end of file
diff --git a/functions/src/index.ts b/functions/src/index.ts
index b8cf711..bdfda77 100644
--- 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.`
+    }`
   );
 });
 

From b13df913359904ebec9ff6a9e46f51d62f5bb838 Mon Sep 17 00:00:00 2001
From: James Ives <iam@jamesiv.es>
Date: Sun, 24 Feb 2019 12:15:29 -0500
Subject: [PATCH 2/2] Update package.json

---
 functions/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/functions/package.json b/functions/package.json
index a2067bc..e0bebf3 100644
--- a/functions/package.json
+++ b/functions/package.json
@@ -1,7 +1,7 @@
 {
   "name": "dc-metro-google-assistant-action",
   "description": "DC Metro Google Assistant action that will show you the latest train and bus arrival information for your commute.",
-  "version": "1.1.0",
+  "version": "1.2.3",
   "author": "James Ives",
   "license": "MIT",
   "scripts": {