From 2dcd2f58f4ad6016d840094b9c3bf310e462b651 Mon Sep 17 00:00:00 2001 From: Patrick Peng Sun Date: Wed, 31 May 2017 22:47:33 +1000 Subject: [PATCH] revise proc interface to include sessionData --- procDummy.go | 14 +++++++------- procEcho.go | 12 ++++++------ procGetBasicUserInfo.go | 12 ++++++------ procedure.go | 8 ++++---- serveCommand.go | 3 ++- 5 files changed, 25 insertions(+), 24 deletions(-) diff --git a/procDummy.go b/procDummy.go index 523d067..bc237dd 100644 --- a/procDummy.go +++ b/procDummy.go @@ -9,24 +9,24 @@ var procDummy = chatProcedure{ dummyInto, } -func dummyInit() { +func dummyInit(ss *openIDSessionData) { } -func dummyClean() { +func dummyClean(ss *openIDSessionData) { } -func dummyStart(*openIDSessionData, InWechatMsg) { +func dummyStart(ss *openIDSessionData, in InWechatMsg) { } -func dummyServe(*openIDSessionData, InWechatMsg) { +func dummyServe(ss *openIDSessionData, in InWechatMsg) { } -func dummySummary() { +func dummySummary(ss *openIDSessionData) { } -func dummyInto() { +func dummyInto(ss *openIDSessionData) { -} \ No newline at end of file +} diff --git a/procEcho.go b/procEcho.go index 01ce7de..33120cc 100644 --- a/procEcho.go +++ b/procEcho.go @@ -9,24 +9,24 @@ var procEcho = chatProcedure{ echoInto, } -func echoInit() { +func echoInit(ss *openIDSessionData) { } -func echoClean() { +func echoClean(ss *openIDSessionData) { } -func echoStart(*openIDSessionData, InWechatMsg) { +func echoStart(ss *openIDSessionData, in InWechatMsg) { } -func echoServe(*openIDSessionData, InWechatMsg) { +func echoServe(ss *openIDSessionData, in InWechatMsg) { } -func echoSummary() { +func echoSummary(ss *openIDSessionData) { } -func echoInto() { +func echoInto(ss *openIDSessionData) { } diff --git a/procGetBasicUserInfo.go b/procGetBasicUserInfo.go index 00305b5..bc523f3 100644 --- a/procGetBasicUserInfo.go +++ b/procGetBasicUserInfo.go @@ -9,24 +9,24 @@ var procGetBasicUserInfo = chatProcedure{ getBasicUserInfoInto, } -func getBasicUserInfoInit() { +func getBasicUserInfoInit(ss *openIDSessionData) { } -func getBasicUserInfoClean() { +func getBasicUserInfoClean(ss *openIDSessionData) { } -func getBasicUserInfoStart(*openIDSessionData, InWechatMsg) { +func getBasicUserInfoStart(ss *openIDSessionData, in InWechatMsg) { } -func getBasicUserInfoServe(*openIDSessionData, InWechatMsg) { +func getBasicUserInfoServe(ss *openIDSessionData, in InWechatMsg) { } -func getBasicUserInfoSummary() { +func getBasicUserInfoSummary(ss *openIDSessionData) { } -func getBasicUserInfoInto() { +func getBasicUserInfoInto(ss *openIDSessionData) { } diff --git a/procedure.go b/procedure.go index 722b4bf..0d2f44c 100644 --- a/procedure.go +++ b/procedure.go @@ -6,13 +6,13 @@ import ( // a description of type chatProcedure struct { - init func() //house keeping - clean func() //house keeping + init func(*openIDSessionData) //house keeping + clean func(*openIDSessionData) //house keeping start func(*openIDSessionData, InWechatMsg) //for first message serve func(*openIDSessionData, InWechatMsg) //for all subsequent message - summary func() //after all message has been done - intro func() //initial text/video/voice introduction + summary func(*openIDSessionData) //after all message has been done + intro func(*openIDSessionData) //initial text/video/voice introduction } //AllProc all procedure that we implemented diff --git a/serveCommand.go b/serveCommand.go index 788c34e..3a90c3f 100644 --- a/serveCommand.go +++ b/serveCommand.go @@ -51,7 +51,8 @@ func cmdVersion(ss *openIDSessionData, in InWechatMsg) (processed bool) { } func cmdEcho(ss *openIDSessionData, in InWechatMsg) (processed bool) { - procEcho.init() + in.immediateResponse("请输入不同类型的微信信息,比如文字,图片,视频,地址,链接,我们将原样回应您") + procEcho.init(ss) procEcho.start(ss, in) return }