From 7d76ff1511dff440a4ae30ed2487dbd51c9b7585 Mon Sep 17 00:00:00 2001
From: hchiam <hchiam@users.noreply.github.com>
Date: Tue, 15 Oct 2019 15:02:29 -0400
Subject: [PATCH] 4.0.2: fix #35 feedback form auto-fill (and detect screen)

---
 index.js     | 25 ++++++++-----------------
 package.json |  2 +-
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/index.js b/index.js
index a013627..539700d 100644
--- a/index.js
+++ b/index.js
@@ -11,29 +11,20 @@ const v = 4; // also edit the intents "-1.0 No/Bye" and "1.0 Default Welcome Int
 // make this the only global variable for the complex parsing
 var codeVariables = [];
 
-function hasScreenOutput(request) {
-  if (request !== undefined) {
-    let requestPayload = request.body.originalDetectIntentRequest.payload;
-    if (requestPayload.surface && requestPayload.surface.capabilities && requestPayload.surface.capabilities[0]) {
-      for (let i=0; i<requestPayload.surface.capabilities.length; i++) {
-        if (requestPayload.surface.capabilities[i].name == 'actions.capability.SCREEN_OUTPUT') {
-          return true;
-        }
-      }
-    }
-  }
-  return false;
+function hasScreenOutput(conv) {
+  const hasScreen = conv.surface.capabilities.has('actions.capability.SCREEN_OUTPUT');
+  return hasScreen;
 }
 
 app.intent('0.1 Default Fallback Intent - yes - suggestion', function suggestionPrefill(conv) {
     let suggestion = conv.contexts.get('suggest').parameters.suggestion;
-    //let hasScreen = hasScreenOutput(request);
+    let hasScreen = hasScreenOutput(conv);
 
-    //if (hasScreen) {
-      //conv.ask(`Thanks! Right now, I can't open a link for you hands-free. But here's a link to a feedback form pre-filled for you:`);
-    //} else {
+    if (hasScreen) {
+      conv.ask(`Thanks! Right now, I can't open a link for you hands-free. But here's a link to a feedback form pre-filled for you:`);
+    } else {
       conv.ask(`Sorry! Right now, I can't open a link for you hands-free. If you use a device with a screen, you'll see a button to go to a feedback form.`);
-    //}
+    }
 
     conv.ask(new BasicCard({
       title: `Send feedback`,
diff --git a/package.json b/package.json
index 9075674..860e940 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "dialogflowFirebaseFulfillment",
   "description": "This is Code Tutor's fulfillment using Cloud Functions for Firebase",
-  "version": "4.0.1",
+  "version": "4.0.2",
   "private": true,
   "license": "Apache Version 2.0",
   "author": "Howard Chiam (unless someone forked this project)",