Merge pull request #68 from zhs007/v0.6

v0.6.2

base/basedef.go

@@ -1,7 +1,7 @@
 package chatbotbase
 
 // VERSION - charlescore version
-const VERSION = "0.6.1"
+const VERSION = "0.6.2"
 
 // BigMsgLength -if msg length >= BigMsgLength, the message is big message
 const BigMsgLength = 4*1024*1024 - 1024

cmdlist.go

@@ -78,7 +78,11 @@ func (cmds *CommondsList) MultiParseInChat(chat *chatbotpb.ChatMsg) ([]*CommandD
 		}
 	}
 
-	return lstcmds, chatbotbase.ErrCmdNoCmd
+	if len(lstcmds) <= 0 {
+		return nil, chatbotbase.ErrCmdEmptyCmd
+	}
+
+	return lstcmds, nil
 }
 
 // ParseInChat - parse in chat

plugins/cmd/cmd.go

@@ -7,6 +7,7 @@ import (
 	chatbot "github.com/zhs007/chatbot"
 	chatbotbase "github.com/zhs007/chatbot/base"
 	chatbotpb "github.com/zhs007/chatbot/chatbotpb"
+	"go.uber.org/zap"
 )
 
 type cmdPlugin struct {
@@ -61,15 +62,20 @@ func (cp *cmdPlugin) OnMessage(ctx context.Context, serv *chatbot.Serv, chat *ch
 		if err != chatbotbase.ErrCmdNoCmd &&
 			err != chatbotbase.ErrCmdEmptyCmd {
 
+			chatbotbase.Error("cmdPlugin.OnMessage:MultiParseInChat",
+				zap.Error(err))
+
 			return nil, err
 		}
 
 		return nil, chatbotbase.ErrPluginItsNotMine
 	}
 
+	rlst := []*chatbotpb.ChatMsg{}
+
 	for _, v := range lst {
 		if v.Cmd != "" {
-			isend, lst, err := serv.Cmds.RunInChat(ctx, v.Cmd, serv, v.Params, chat, ui, ud, scs)
+			isend, clst, err := serv.Cmds.RunInChat(ctx, v.Cmd, serv, v.Params, chat, ui, ud, scs)
 			if err != nil {
 				if err != chatbotbase.ErrCmdNoCmd {
 					return nil, err
@@ -83,7 +89,7 @@ func (cp *cmdPlugin) OnMessage(ctx context.Context, serv *chatbot.Serv, chat *ch
 			}
 			// cp.activeCmd =
 
-			return lst, nil
+			rlst = append(rlst, clst...)
 		}
 	}
 
@@ -137,7 +143,7 @@ func (cp *cmdPlugin) OnMessage(ctx context.Context, serv *chatbot.Serv, chat *ch
 	// 	return lst, nil
 	// }
 
-	return nil, nil
+	return rlst, nil
 }
 
 // OnStart - on start

utils_test.go

@@ -45,6 +45,10 @@ func Test_SplitMultiCommandString(t *testing.T) {
 	}
 
 	arrok := []strarr{
+		strarr{
+			src:  "reqtask techinasia -m jobs",
+			dest: []string{"reqtask techinasia -m jobs"},
+		},
 		strarr{
 			src:  "reqtask techinasia -m jobs\n\r\n\n\r\n",
 			dest: []string{"reqtask techinasia -m jobs"},