feat: support multi users (group chat) better

whatwewant · Feb 18, 2023 · 08d83ac · 08d83ac
1 parent bac1d5c
commit 08d83ac
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 11 deletions.
diff --git a/go.mod b/go.mod
@@ -3,11 +3,11 @@ module github.com/go-zoox/chatgpt-for-chatbot-feishu
 go 1.19
 
 require (
-	github.com/go-zoox/chatbot-feishu v1.0.2
-	github.com/go-zoox/chatgpt-client v1.0.6
+	github.com/go-zoox/chatbot-feishu v1.0.4
+	github.com/go-zoox/chatgpt-client v1.0.9
 	github.com/go-zoox/cli v1.0.10
 	github.com/go-zoox/core-utils v1.2.6
-	github.com/go-zoox/feishu v1.2.7
+	github.com/go-zoox/feishu v1.3.3
 	github.com/go-zoox/logger v1.4.0
 	github.com/go-zoox/retry v1.0.3
 )

diff --git a/go.sum b/go.sum
@@ -39,10 +39,10 @@ github.com/go-yaml/yaml v2.1.0+incompatible/go.mod h1:w2MrLa16VYP0jy6N7M5kHaCkaL
 github.com/go-zoox/chalk v1.0.1/go.mod h1:z5+qvE9nEJI5uT4px2tyoFa/xxkqf3CUo22KmXLKbNI=
 github.com/go-zoox/chalk v1.0.2 h1:DCWft37fogmvqF37JdbGSLg28L/tQeA8u0lMvb62KOg=
 github.com/go-zoox/chalk v1.0.2/go.mod h1:z5+qvE9nEJI5uT4px2tyoFa/xxkqf3CUo22KmXLKbNI=
-github.com/go-zoox/chatbot-feishu v1.0.2 h1:nIqXOk4mjyintd8/DTlp+sWcFzHGX3pUUJn5sfwrV+0=
-github.com/go-zoox/chatbot-feishu v1.0.2/go.mod h1:P6mYWk4kf6lC+/GSxIYBvZWzcK3mjiE2Iet6Tw9acJ4=
-github.com/go-zoox/chatgpt-client v1.0.6 h1:NCqOgZUl2Fwiw1qGl40/5BmJR9k7eM+qrmTNWIfm+qc=
-github.com/go-zoox/chatgpt-client v1.0.6/go.mod h1:d4Ji6YkOZF2HZv/dhoeXPSIJ7n92QVYiI3kT0RmdTms=
+github.com/go-zoox/chatbot-feishu v1.0.4 h1:pm3gRK/zTqbDQGWnBNSbFpI6klxCJDGnVldWkgNPlSY=
+github.com/go-zoox/chatbot-feishu v1.0.4/go.mod h1:X+lL/7uG5B8Sii21woLCs84PU+h98gktJHZIyX81OMU=
+github.com/go-zoox/chatgpt-client v1.0.9 h1:DrVIDoRO8NTJlewa9AITeZAg/sRuHSMvcer6SAJSWVs=
+github.com/go-zoox/chatgpt-client v1.0.9/go.mod h1:d4Ji6YkOZF2HZv/dhoeXPSIJ7n92QVYiI3kT0RmdTms=
 github.com/go-zoox/cli v1.0.10 h1:guifbeAJHjhW6m5P+CXQ3ubVO0dqIEq/jhArNUC0930=
 github.com/go-zoox/cli v1.0.10/go.mod h1:e26mNwc/G1eM6TjoBs2/0PRZTj7NZtoO0WZDXtg82iY=
 github.com/go-zoox/compress v1.0.1 h1:EyNxo5NscMLua5fvUdiGSF+BwhuTfMeyppu7OwKAW7Q=
@@ -76,8 +76,8 @@ github.com/go-zoox/encoding v1.2.1 h1:38rQRsfL1f1YHZaqsPaGcNMkPnzatnPlYiHioUh9F4
 github.com/go-zoox/encoding v1.2.1/go.mod h1:NdcM7Ln73oVW3vJgx3MH4fJknCcdQfq+NgJ0tuCo7tU=
 github.com/go-zoox/errors v1.0.2 h1:1NLMoEVlDU1+qrvvPj+rrJXOvQPdeZ3DekVBFrI5PFY=
 github.com/go-zoox/errors v1.0.2/go.mod h1:HJ5NKQb9cu3IbI0Jayw7xZiblLBEIglpaIOMxvQnWnk=
-github.com/go-zoox/feishu v1.2.7 h1:8UqvdSJ/AxRXQaXfos2O8Nic+I2C/kncZOums3zBBQc=
-github.com/go-zoox/feishu v1.2.7/go.mod h1:meRzoMvC8jWlPlwYfKgQNABSU+5nnPlhtLODt6t0pJY=
+github.com/go-zoox/feishu v1.3.3 h1:3/wUNjJhrL8p5p0JO1HmMPk0OYRdNBqyWzdhf96pX7Y=
+github.com/go-zoox/feishu v1.3.3/go.mod h1:meRzoMvC8jWlPlwYfKgQNABSU+5nnPlhtLODt6t0pJY=
 github.com/go-zoox/fetch v1.3.5/go.mod h1:AkS6v/DlotjmUs+7qJsoFGFkpROr9LVtiKYb000v3Kw=
 github.com/go-zoox/fetch v1.4.4/go.mod h1:WExVnds3HZ1A6jJu9KuqtICfkJpvUdR4uONUnw9TG+0=
 github.com/go-zoox/fetch v1.7.4 h1:kNcqBldXSB40dToLYveuNFSqtkMbd2U0ZrYmPQGmo9E=

diff --git a/main.go b/main.go
@@ -45,6 +45,11 @@ func main() {
 				Usage:   "enable token verification if you need",
 				EnvVars: []string{"VERIFICATION_TOKEN"},
 			},
+			&cli.StringFlag{
+				Name:    "report-url",
+				Usage:   "Set error report url",
+				EnvVars: []string{"REPORT_URL"},
+			},
 		},
 	})
 
@@ -56,6 +61,7 @@ func main() {
 			AppSecret:         ctx.String("app-secret"),
 			EncryptKey:        ctx.String("encrypt-key"),
 			VerificationToken: ctx.String("verification-token"),
+			ReportURL:         ctx.String("report-url"),
 		})
 	})
 

diff --git a/server.go b/server.go
@@ -24,6 +24,8 @@ type FeishuBotConfig struct {
 	AppSecret         string
 	EncryptKey        string
 	VerificationToken string
+	//
+	ReportURL string
 }
 
 func ServeFeishuBot(cfg *FeishuBotConfig) error {
@@ -100,17 +102,23 @@ func ServeFeishuBot(cfg *FeishuBotConfig) error {
 
 				var answer []byte
 				err = retry.Retry(func() error {
-					conversation, err := client.GetOrCreateConversation(request.ChatID(), &chatgpt.ConversationConfig{})
+					conversation, err := client.GetOrCreateConversation(request.ChatID(), &chatgpt.ConversationConfig{
+						MaxMessages: 50,
+					})
 					if err != nil {
 						return fmt.Errorf("failed to get or create conversation by ChatID %s", request.ChatID())
 					}
 
-					answer, err = conversation.Ask([]byte(question))
+					answer, err = conversation.Ask([]byte(question), &chatgpt.ConversationAskConfig{
+						User: request.Sender().SenderID.UserID,
+					})
 					if err != nil {
 						logger.Errorf("failed to request answer: %v", err)
 						return fmt.Errorf("failed to request answer: %v", err)
 					}
 
+					fmt.Println("ask 2222:", string(answer), err)
+
 					return nil
 				}, 5, 3*time.Second)
 				if err != nil {