ailistener

commit bc8f4b51cbcb2ff1da69103c09e7bb571c6176ee
parent 998a07be7058c77cb9bce94e5ebe76fd5b3d373b
Author: MTRNord <mtrnord1@gmail.com>
Date:   Thu, 28 Jun 2018 20:58:45 +0200

Try to do it differently

Diffstat:
M
.idea/usage.statistics.xml
 | 
12
++++++------
M
pkg/dflow/dflow.go
 | 
15
+++------------
M
pkg/webhook/webhook.go
 | 
14
++------------

3 files changed, 11 insertions(+), 30 deletions(-)
diff --git a/.idea/usage.statistics.xml b/.idea/usage.statistics.xml
@@ -38,24 +38,24 @@
     <session id="958628364">
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="go" value="122" />
-          <entry key="txt" value="124" />
+          <entry key="go" value="132" />
+          <entry key="txt" value="141" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="Go" value="122" />
-          <entry key="PLAIN_TEXT" value="124" />
+          <entry key="Go" value="132" />
+          <entry key="PLAIN_TEXT" value="141" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
-          <entry key="go" value="8" />
+          <entry key="go" value="10" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
-          <entry key="Go" value="8" />
+          <entry key="Go" value="10" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.go.postfix.template.usages.trigger" />
diff --git a/pkg/dflow/dflow.go b/pkg/dflow/dflow.go
@@ -1,31 +1,22 @@
 package dflow
 
 import (
-	dflow "cloud.google.com/go/dialogflow/apiv2"
-	"context"
-	"github.com/OpenHomeAuto/AiListener/pkg/util"
-	"google.golang.org/api/option"
 	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
 )
 
 var projectID = "projects/homeautomation-e931b"
 
-func DoSignIn(session string) (*dialogflowpb.DetectIntentResponse, error) {
-	ctx := context.Background()
-	c, err := dflow.NewSessionsClient(ctx, option.WithCredentialsFile(*util.ServiceAccountFilePath))
-	if err != nil {
-		return nil, err
-	}
+func DoSignIn(session string) *dialogflowpb.DetectIntentRequest {
 	req := &dialogflowpb.DetectIntentRequest{
 		Session: session,
 		QueryInput: &dialogflowpb.QueryInput{
 			Input: &dialogflowpb.QueryInput_Event{
 				Event: &dialogflowpb.EventInput{
-					Name:         "ask_for_sign_in",
+					Name:         "actions_intent_SIGN_IN",
 					LanguageCode: "de",
 				},
 			},
 		},
 	}
-	return c.DetectIntent(ctx, req)
+	return req
 }
diff --git a/pkg/webhook/webhook.go b/pkg/webhook/webhook.go
@@ -99,20 +99,10 @@ func MessagesEndPoint(rw http.ResponseWriter, req *http.Request) {
 
 	log.Println(dfr.QueryResult)
 
-	resp, err := dflow.DoSignIn(dfr.Session)
-	if err != nil {
-		log.Println(err)
-		rw.WriteHeader(http.StatusBadRequest)
-		return
-	}
-	log.Println(resp.QueryResult)
-
+	resp := dflow.DoSignIn(dfr.Session)
 	// Do things with the context you just retrieved
 	dff := &df.Fulfillment{
-		FulfillmentMessages: df.Messages{
-			df.ForGoogle(df.SingleSimpleResponse("hello", "hello")),
-			{RichMessage: df.Text{Text: []string{"hello"}}},
-		},
+		FollowupEventInput: resp,
 	}
 	rw.Header().Set("Content-Type", "application/json")
 	rw.WriteHeader(http.StatusOK)