Test4 (#30)

* Compiled main.go and pushed changes * test * 适配了频道私聊,用bolt数据库取代ini * 适配了nonebot2 * add license * add a lot * trss support * add action * add action * add action * fixbug * add wss * bugfix * fix action * fix action again * fa * fix * add a lot * add ws server token * bugifx * fixat * bugfix * bugfix * test * test2 * add url service * add url service * bugfix * fix * fix * fix * bug fix * fix * test
Hoshinonyaruko · Nov 2, 2023 · 6efe96d · 6efe96d
1 parent f695de7
commit 6efe96d
Show file tree

Hide file tree

Showing 113 changed files with 904 additions and 346 deletions.
diff --git a/Processor/ProcessC2CMessage.go b/Processor/ProcessC2CMessage.go
@@ -10,6 +10,7 @@ import (
 	"github.com/hoshinonyaruko/gensokyo/echo"
 	"github.com/hoshinonyaruko/gensokyo/handlers"
 	"github.com/hoshinonyaruko/gensokyo/idmap"
+	"github.com/hoshinonyaruko/gensokyo/mylog"
 	"github.com/tencent-connect/botgo/dto"
 	"github.com/tencent-connect/botgo/websocket/client"
 )
@@ -103,13 +104,13 @@ func (p *Processors) ProcessC2CMessage(data *dto.WSC2CMessageData) error {
 		//映射str的userid到int
 		userid64, err := idmap.StoreIDv2(data.Author.ID)
 		if err != nil {
-			log.Printf("Error storing ID: %v", err)
+			mylog.Printf("Error storing ID: %v", err)
 			return nil
 		}
 		//映射str的messageID到int
 		messageID64, err := idmap.StoreIDv2(data.ID)
 		if err != nil {
-			log.Printf("Error storing ID: %v", err)
+			mylog.Printf("Error storing ID: %v", err)
 			return nil
 		}
 		messageID := int(messageID64)

diff --git a/Processor/ProcessChannelDirectMessage.go b/Processor/ProcessChannelDirectMessage.go
@@ -11,6 +11,7 @@ import (
 	"github.com/hoshinonyaruko/gensokyo/echo"
 	"github.com/hoshinonyaruko/gensokyo/handlers"
 	"github.com/hoshinonyaruko/gensokyo/idmap"
+	"github.com/hoshinonyaruko/gensokyo/mylog"
 
 	"github.com/tencent-connect/botgo/dto"
 	"github.com/tencent-connect/botgo/websocket/client"
@@ -47,7 +48,7 @@ func (p *Processors) ProcessChannelDirectMessage(data *dto.WSDirectMessageData)
 		//将channelid写入数据库,可取出guild_id
 		ChannelID64, err := idmap.StoreIDv2(data.ChannelID)
 		if err != nil {
-			log.Printf("Error storing ID: %v", err)
+			mylog.Printf("Error storing ID: %v", err)
 			return nil
 		}
 		//转成int再互转
@@ -123,7 +124,7 @@ func (p *Processors) ProcessChannelDirectMessage(data *dto.WSDirectMessageData)
 			//映射str的userid到int
 			userid64, err := idmap.StoreIDv2(data.Author.ID)
 			if err != nil {
-				log.Printf("Error storing ID: %v", err)
+				mylog.Printf("Error storing ID: %v", err)
 				return nil
 			}
 			//OnebotChannelMessage
@@ -189,7 +190,7 @@ func (p *Processors) ProcessChannelDirectMessage(data *dto.WSDirectMessageData)
 			//将channelid写入bolt,可取出guild_id
 			ChannelID64, err := idmap.StoreIDv2(data.ChannelID)
 			if err != nil {
-				log.Printf("Error storing ID: %v", err)
+				mylog.Printf("Error storing ID: %v", err)
 				return nil
 			}
 			//转成int再互转 适用于群场景私聊
@@ -203,14 +204,14 @@ func (p *Processors) ProcessChannelDirectMessage(data *dto.WSDirectMessageData)
 			//映射str的userid到int
 			userid64, err := idmap.StoreIDv2(data.Author.ID)
 			if err != nil {
-				log.Printf("Error storing ID: %v", err)
+				mylog.Printf("Error storing ID: %v", err)
 				return nil
 			}
 			//userid := int(userid64)
 			//映射str的messageID到int
 			messageID64, err := idmap.StoreIDv2(data.ID)
 			if err != nil {
-				log.Printf("Error storing ID: %v", err)
+				mylog.Printf("Error storing ID: %v", err)
 				return nil
 			}
 			messageID := int(messageID64)

diff --git a/Processor/ProcessGroupMessage.go b/Processor/ProcessGroupMessage.go
@@ -3,14 +3,14 @@ package Processor
 
 import (
 	"fmt"
-	"log"
 	"strconv"
 	"time"
 
 	"github.com/hoshinonyaruko/gensokyo/config"
 	"github.com/hoshinonyaruko/gensokyo/echo"
 	"github.com/hoshinonyaruko/gensokyo/handlers"
 	"github.com/hoshinonyaruko/gensokyo/idmap"
+	"github.com/hoshinonyaruko/gensokyo/mylog"
 
 	"github.com/tencent-connect/botgo/dto"
 	"github.com/tencent-connect/botgo/websocket/client"
@@ -39,14 +39,14 @@ func (p *Processors) ProcessGroupMessage(data *dto.WSGroupATMessageData) error {
 	// 映射str的userid到int
 	userid64, err := idmap.StoreIDv2(data.Author.ID)
 	if err != nil {
-		log.Printf("Error storing ID: %v", err)
+		mylog.Printf("Error storing ID: %v", err)
 		return nil
 	}
 
 	//映射str的messageID到int
 	messageID64, err := idmap.StoreIDv2(data.ID)
 	if err != nil {
-		log.Printf("Error storing ID: %v", err)
+		mylog.Printf("Error storing ID: %v", err)
 		return nil
 	}
 	messageID := int(messageID64)

diff --git a/Processor/ProcessGuildATMessage.go b/Processor/ProcessGuildATMessage.go
@@ -3,14 +3,14 @@ package Processor
 
 import (
 	"fmt"
-	"log"
 	"strconv"
 	"time"
 
 	"github.com/hoshinonyaruko/gensokyo/config"
 	"github.com/hoshinonyaruko/gensokyo/echo"
 	"github.com/hoshinonyaruko/gensokyo/handlers"
 	"github.com/hoshinonyaruko/gensokyo/idmap"
+	"github.com/hoshinonyaruko/gensokyo/mylog"
 
 	"github.com/tencent-connect/botgo/dto"
 	"github.com/tencent-connect/botgo/websocket/client"
@@ -35,7 +35,7 @@ func (p *Processors) ProcessGuildATMessage(data *dto.WSATMessageData) error {
 		//映射str的userid到int
 		userid64, err := idmap.StoreIDv2(data.Author.ID)
 		if err != nil {
-			log.Printf("Error storing ID: %v", err)
+			mylog.Printf("Error storing ID: %v", err)
 			return nil
 		}
 		// 如果在Array模式下, 则处理Message为Segment格式
@@ -109,7 +109,7 @@ func (p *Processors) ProcessGuildATMessage(data *dto.WSATMessageData) error {
 		//将channelid写入ini,可取出guild_id
 		ChannelID64, err := idmap.StoreIDv2(data.ChannelID)
 		if err != nil {
-			log.Printf("Error storing ID: %v", err)
+			mylog.Printf("Error storing ID: %v", err)
 			return nil
 		}
 		//转成int再互转
@@ -123,14 +123,14 @@ func (p *Processors) ProcessGuildATMessage(data *dto.WSATMessageData) error {
 		//映射str的userid到int
 		userid64, err := idmap.StoreIDv2(data.Author.ID)
 		if err != nil {
-			log.Printf("Error storing ID: %v", err)
+			mylog.Printf("Error storing ID: %v", err)
 			return nil
 		}
 		//userid := int(userid64)
 		//映射str的messageID到int
 		messageID64, err := idmap.StoreIDv2(data.ID)
 		if err != nil {
-			log.Printf("Error storing ID: %v", err)
+			mylog.Printf("Error storing ID: %v", err)
 			return nil
 		}
 		messageID := int(messageID64)

diff --git a/Processor/ProcessGuildNormalMessage.go b/Processor/ProcessGuildNormalMessage.go
@@ -3,14 +3,14 @@ package Processor
 
 import (
 	"fmt"
-	"log"
 	"strconv"
 	"time"
 
 	"github.com/hoshinonyaruko/gensokyo/config"
 	"github.com/hoshinonyaruko/gensokyo/echo"
 	"github.com/hoshinonyaruko/gensokyo/handlers"
 	"github.com/hoshinonyaruko/gensokyo/idmap"
+	"github.com/hoshinonyaruko/gensokyo/mylog"
 	"github.com/tencent-connect/botgo/dto"
 	"github.com/tencent-connect/botgo/websocket/client"
 )
@@ -34,7 +34,7 @@ func (p *Processors) ProcessGuildNormalMessage(data *dto.WSMessageData) error {
 		//映射str的userid到int
 		userid64, err := idmap.StoreIDv2(data.Author.ID)
 		if err != nil {
-			log.Printf("Error storing ID: %v", err)
+			mylog.Printf("Error storing ID: %v", err)
 			return nil
 		}
 		// 如果在Array模式下, 则处理Message为Segment格式
@@ -108,7 +108,7 @@ func (p *Processors) ProcessGuildNormalMessage(data *dto.WSMessageData) error {
 		//将channelid写入ini,可取出guild_id
 		ChannelID64, err := idmap.StoreIDv2(data.ChannelID)
 		if err != nil {
-			log.Printf("Error storing ID: %v", err)
+			mylog.Printf("Error storing ID: %v", err)
 			return nil
 		}
 		//转成int再互转
@@ -122,14 +122,14 @@ func (p *Processors) ProcessGuildNormalMessage(data *dto.WSMessageData) error {
 		//映射str的userid到int
 		userid64, err := idmap.StoreIDv2(data.Author.ID)
 		if err != nil {
-			log.Printf("Error storing ID: %v", err)
+			mylog.Printf("Error storing ID: %v", err)
 			return nil
 		}
 		//userid := int(userid64)
 		//映射str的messageID到int
 		messageID64, err := idmap.StoreIDv2(data.ID)
 		if err != nil {
-			log.Printf("Error storing ID: %v", err)
+			mylog.Printf("Error storing ID: %v", err)
 			return nil
 		}
 		messageID := int(messageID64)

diff --git a/Processor/Processor.go b/Processor/Processor.go
@@ -11,6 +11,7 @@ import (
 	"github.com/hashicorp/go-multierror"
 	"github.com/hoshinonyaruko/gensokyo/callapi"
 	"github.com/hoshinonyaruko/gensokyo/config"
+	"github.com/hoshinonyaruko/gensokyo/mylog"
 	"github.com/hoshinonyaruko/gensokyo/wsclient"
 	"github.com/tencent-connect/botgo/dto"
 	"github.com/tencent-connect/botgo/openapi"
@@ -140,7 +141,7 @@ func (p *Processors) ProcessInlineSearch(data *dto.WSInteractionData) error {
 // 	context.Background(), dm, toCreate,
 // )
 // if err != nil {
-// 	log.Println("Error sending default reply:", err)
+// 	mylog.Println("Error sending default reply:", err)
 // 	return nil
 // }
 
@@ -157,15 +158,15 @@ func PrintStructWithFieldNames(v interface{}) {
 
 	// 确保我们传入的是一个结构体
 	if typ.Kind() != reflect.Struct {
-		fmt.Println("Input is not a struct")
+		mylog.Println("Input is not a struct")
 		return
 	}
 
 	// 迭代所有的字段并打印字段名和值
 	for i := 0; i < typ.NumField(); i++ {
 		field := typ.Field(i)
 		value := val.Field(i)
-		fmt.Printf("%s: %v\n", field.Name, value.Interface())
+		mylog.Printf("%s: %v\n", field.Name, value.Interface())
 	}
 }
 

diff --git a/botgo/README.md b/botgo/README.md
@@ -39,7 +39,7 @@ func main() {
 
     // 监听哪类事件就需要实现哪类的 handler，定义：websocket/event_handler.go
     var atMessage websocket.ATMessageEventHandler = func(event *dto.WSPayload, data *dto.WSATMessageData) error {
-        fmt.Println(event, data)
+        log.Println(event, data)
         return nil
     }
     intent := websocket.RegisterHandlers(atMessage)

diff --git a/botgo/event/register_test.go b/botgo/event/register_test.go
@@ -1,7 +1,7 @@
 package event
 
 import (
-	"fmt"
+	"log"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -22,7 +22,7 @@ func TestRegisterHandlers(t *testing.T) {
 	t.Run(
 		"test intent", func(t *testing.T) {
 			i := RegisterHandlers(guild, message, audio)
-			fmt.Println(i)
+			log.Println(i)
 			assert.Equal(t, dto.IntentGuildMessages, i&dto.IntentGuildMessages)
 			assert.Equal(t, dto.IntentGuilds, i&dto.IntentGuilds)
 			assert.Equal(t, dto.IntentAudio, i&dto.IntentAudio)

diff --git a/botgo/examples/apitest/message_test.go b/botgo/examples/apitest/message_test.go
@@ -1,7 +1,7 @@
 package apitest
 
 import (
-	"fmt"
+	"log"
 	"testing"
 
 	"github.com/tencent-connect/botgo/dto/keyboard"
@@ -85,7 +85,7 @@ func TestMessage(t *testing.T) {
 			}
 
 			message, err := api.Message(ctx, testChannelID, index[0])
-			fmt.Println(message)
+			log.Println(message)
 		},
 	)
 }

diff --git a/botgo/examples/receive-and-send/forum.go b/botgo/examples/receive-and-send/forum.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"fmt"
+	"log"
 
 	"github.com/tencent-connect/botgo/dto"
 	"github.com/tencent-connect/botgo/event"
@@ -10,7 +10,7 @@ import (
 // ThreadEventHandler 论坛主贴事件
 func ThreadEventHandler() event.ThreadEventHandler {
 	return func(event *dto.WSPayload, data *dto.WSThreadData) error {
-		fmt.Println(event, data)
+		log.Println(event, data)
 		return nil
 	}
 }
diff --git a/botgo/examples/receive-and-send/main.go b/botgo/examples/receive-and-send/main.go
@@ -108,47 +108,47 @@ func ATMessageEventHandler() event.ATMessageEventHandler {
 // GuildEventHandler 处理频道事件
 func GuildEventHandler() event.GuildEventHandler {
 	return func(event *dto.WSPayload, data *dto.WSGuildData) error {
-		fmt.Println(data)
+		log.Println(data)
 		return nil
 	}
 }
 
 // ChannelEventHandler 处理子频道事件
 func ChannelEventHandler() event.ChannelEventHandler {
 	return func(event *dto.WSPayload, data *dto.WSChannelData) error {
-		fmt.Println(data)
+		log.Println(data)
 		return nil
 	}
 }
 
 // MemberEventHandler 处理成员变更事件
 func MemberEventHandler() event.GuildMemberEventHandler {
 	return func(event *dto.WSPayload, data *dto.WSGuildMemberData) error {
-		fmt.Println(data)
+		log.Println(data)
 		return nil
 	}
 }
 
 // DirectMessageHandler 处理私信事件
 func DirectMessageHandler() event.DirectMessageEventHandler {
 	return func(event *dto.WSPayload, data *dto.WSDirectMessageData) error {
-		fmt.Println(data)
+		log.Println(data)
 		return nil
 	}
 }
 
 // CreateMessageHandler 处理消息事件
 func CreateMessageHandler() event.MessageEventHandler {
 	return func(event *dto.WSPayload, data *dto.WSMessageData) error {
-		fmt.Println(data)
+		log.Println(data)
 		return nil
 	}
 }
 
 // InteractionHandler 处理内联交互事件
 func InteractionHandler() event.InteractionEventHandler {
 	return func(event *dto.WSPayload, data *dto.WSInteractionData) error {
-		fmt.Println(data)
+		log.Println(data)
 		return processor.ProcessInlineSearch(data)
 	}
 }