fix: stayActiveMessageTask

deanxv · Mar 7, 2024 · fbfc18c · fbfc18c
1 parent e3726f7
commit fbfc18c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/common/constants.go b/common/constants.go
@@ -16,7 +16,7 @@ var OnlyOpenaiApi = os.Getenv("ONLY_OPENAI_API")
 
 var DebugEnabled = os.Getenv("DEBUG") == "true"
 
-var Version = "v4.3.7" // this hard coding will be replaced automatically when building, no need to manually change
+var Version = "v4.3.8" // this hard coding will be replaced automatically when building, no need to manually change
 
 const (
 	RequestIdKey = "X-Request-Id"

diff --git a/discord/discord.go b/discord/discord.go
@@ -445,7 +445,7 @@ func SendMessage(c *gin.Context, channelID, cozeBotId, message string) (*discord
 
 	if len(UserAuthorizations) == 0 {
 		//SetChannelDeleteTimer(channelID, 5*time.Second)
-		common.LogError(c.Request.Context(), fmt.Sprintf("无可用的 user_auth"))
+		common.LogError(ctx, fmt.Sprintf("无可用的 user_auth"))
 
 		// tg发送通知
 		if telegram.NotifyTelegramBotToken != "" && telegram.TgBot != nil {

diff --git a/discord/sendmessage.go b/discord/sendmessage.go
@@ -2,6 +2,7 @@ package discord
 
 import (
 	"bytes"
+	"context"
 	"coze-discord-proxy/common"
 	"encoding/json"
 	"fmt"
@@ -14,20 +15,27 @@ import (
 
 // 用户端发送消息 注意 此为临时解决方案 后续会优化代码
 func SendMsgByAuthorization(c *gin.Context, userAuth, content, channelId string) (string, error) {
+	var ctx context.Context
+	if c == nil {
+		ctx = context.Background()
+	} else {
+		ctx = c.Request.Context()
+	}
+
 	postUrl := "https://discord.com/api/v9/channels/%s/messages"
 
 	// 构造请求体
 	requestBody, err := json.Marshal(map[string]interface{}{
 		"content": content,
 	})
 	if err != nil {
-		common.LogError(c.Request.Context(), fmt.Sprintf("Error encoding request body:%s", err))
+		common.LogError(ctx, fmt.Sprintf("Error encoding request body:%s", err))
 		return "", err
 	}
 
 	req, err := http.NewRequest("POST", fmt.Sprintf(postUrl, channelId), bytes.NewBuffer(requestBody))
 	if err != nil {
-		common.LogError(c.Request.Context(), fmt.Sprintf("Error creating request:%s", err))
+		common.LogError(ctx, fmt.Sprintf("Error creating request:%s", err))
 		return "", err
 	}
 
@@ -56,7 +64,7 @@ func SendMsgByAuthorization(c *gin.Context, userAuth, content, channelId string)
 
 	resp, err := client.Do(req)
 	if err != nil {
-		common.LogError(c.Request.Context(), fmt.Sprintf("Error sending request:%s", err))
+		common.LogError(ctx, fmt.Sprintf("Error sending request:%s", err))
 		return "", err
 	}
 	defer resp.Body.Close()
@@ -87,14 +95,14 @@ func SendMsgByAuthorization(c *gin.Context, userAuth, content, channelId string)
 		if errMessage, ok := result["message"].(string); ok {
 			if strings.Contains(errMessage, "401: Unauthorized") ||
 				strings.Contains(errMessage, "You need to verify your account in order to perform this action.") {
-				common.LogWarn(c.Request.Context(), fmt.Sprintf("USER_AUTHORIZATION:%s EXPIRED", userAuth))
+				common.LogWarn(ctx, fmt.Sprintf("USER_AUTHORIZATION:%s EXPIRED", userAuth))
 				return "", &common.DiscordUnauthorizedError{
 					ErrCode: 401,
 					Message: "discord 鉴权未通过",
 				}
 			}
 		}
-		common.LogError(c.Request.Context(), fmt.Sprintf("user_auth:%s result:%s", userAuth, bodyString))
+		common.LogError(ctx, fmt.Sprintf("user_auth:%s result:%s", userAuth, bodyString))
 		return "", fmt.Errorf("/api/v9/channels/%s/messages response err", channelId)
 	} else {
 		return id, nil