From f8438b8a4d98057f253d093ea1c97a6f1f9a7437 Mon Sep 17 00:00:00 2001
From: Patrick Peng Sun <patrick@lawipac.com>
Date: Thu, 1 Jun 2017 17:14:09 +1000
Subject: [PATCH] text command branched out for stand alone process

---
 serveCommand.go | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/serveCommand.go b/serveCommand.go
index e24a6ba..eece5c8 100644
--- a/serveCommand.go
+++ b/serveCommand.go
@@ -17,18 +17,23 @@ var commandMap = map[string]commandFunction{
 
 func (ss *openIDSessionData) serveCommand(in InWechatMsg) (processed bool) {
 	if in.header.MsgType == "text" {
-		cmd := in.body.(TextMsg).Content
-		if f, hasFunction := commandMap[cmd]; hasFunction {
-			return f(ss, in)
-		}
-		if cmd == "所有命令" || cmd == "all command" {
-			return allCommand(ss, in)
-		}
+		return ss.serveTextCommand(in)
 	}
 	processed = false
 	return
 }
 
+func (ss *openIDSessionData) serveTextCommand(in InWechatMsg) (processed bool) {
+	cmd := in.body.(TextMsg).Content
+	if f, hasFunction := commandMap[cmd]; hasFunction {
+		return f(ss, in)
+	}
+	if cmd == "所有命令" || cmd == "all command" {
+		return allCommand(ss, in)
+	}
+	return false
+}
+
 func allCommand(ss *openIDSessionData, in InWechatMsg) (processed bool) {
 	processed = true
 	msg := "命令如下:\n"
@@ -38,8 +43,7 @@ func allCommand(ss *openIDSessionData, in InWechatMsg) (processed bool) {
 		msg = msg + fmt.Sprintf("%0d : %s \n", count, k)
 	}
 
-	str, _ := BuildTextMsg(in.header.FromUserName, msg)
-	in.replyXML(str)
+	in.replyText(msg)
 	return
 }