Beta391

.github/workflows/cross_compile.yml

@@ -95,9 +95,24 @@ jobs:
         CGO_ENABLED: 0
       run: |
         if [ "$GOOS" = "windows" ]; then
-          go build -o output/gensokyo-${{ matrix.os }}-${{ matrix.goarch }}.exe
+          go build -ldflags="-s -w" -o output/gensokyo-${{ matrix.os }}-${{ matrix.goarch }}.exe
         else
-          go build -o output/gensokyo-${{ matrix.os }}-${{ matrix.goarch }}
+          go build -ldflags="-s -w" -o output/gensokyo-${{ matrix.os }}-${{ matrix.goarch }}
+        fi
+
+    - name: Compress executable files with UPX (except for gensokyo-android-arm64)
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y upx
+        if [[ "${{ matrix.os }}" == *"windows"* ]]; then
+          FILENAME="output/gensokyo-${{ matrix.os }}-${{ matrix.goarch }}.exe"
+        else
+          FILENAME="output/gensokyo-${{ matrix.os }}-${{ matrix.goarch }}"
+        fi
+        if [[ "${{ matrix.os }}" == "android" && "${{ matrix.goarch }}" == "arm64" ]]; then
+          echo "Skipping UPX compression for $FILENAME"
+        else
+          upx --best --lzma "$FILENAME"
         fi
 
     - name: Upload artifacts

Processor/ProcessC2CMessage.go

@@ -12,6 +12,7 @@ import (
 	"github.com/hoshinonyaruko/gensokyo/handlers"
 	"github.com/hoshinonyaruko/gensokyo/idmap"
 	"github.com/hoshinonyaruko/gensokyo/mylog"
+	"github.com/hoshinonyaruko/gensokyo/structs"
 	"github.com/tencent-connect/botgo/dto"
 	"github.com/tencent-connect/botgo/websocket/client"
 )
@@ -34,7 +35,10 @@ func (p *Processors) ProcessC2CMessage(data *dto.WSC2CMessageData) error {
 
 		//转换appidstring
 		AppIDString := strconv.FormatUint(p.Settings.AppID, 10)
-		echostr := AppIDString + "_" + strconv.FormatInt(s, 10)
+		// 获取当前时间的13位毫秒级时间戳
+		currentTimeMillis := time.Now().UnixNano() / 1e6
+		// 构造echostr，包括AppID，原始的s变量和当前时间戳
+		echostr := fmt.Sprintf("%s_%d_%d", AppIDString, s, currentTimeMillis)
 		var userid64 int64
 		var err error
 		if config.GetIdmapPro() {
@@ -93,13 +97,21 @@ func (p *Processors) ProcessC2CMessage(data *dto.WSC2CMessageData) error {
 		} else {
 			IsBindedUserId = idmap.CheckValuev2(userid64)
 		}
+
+		var selfid64 int64
+		if config.GetUseUin() {
+			selfid64 = config.GetUinint64()
+		} else {
+			selfid64 = int64(p.Settings.AppID)
+		}
+
 		privateMsg := OnebotPrivateMessage{
 			RawMessage:  messageText,
 			Message:     segmentedMessages,
 			MessageID:   messageID,
 			MessageType: "private",
 			PostType:    "message",
-			SelfID:      int64(p.Settings.AppID),
+			SelfID:      selfid64,
 			UserID:      userid64,
 			Sender: PrivateSender{
 				Nickname: "", //这个不支持,但加机器人好友,会收到一个事件,可以对应储存获取,用idmaps可以做到.
@@ -143,13 +155,24 @@ func (p *Processors) ProcessC2CMessage(data *dto.WSC2CMessageData) error {
 		privateMsgMap := structToMap(privateMsg)
 		//上报信息到onebotv11应用端(正反ws)
 		p.BroadcastMessageToAll(privateMsgMap)
+		//组合FriendData
+		struserid := strconv.FormatInt(userid64, 10)
+		userdata := structs.FriendData{
+			Nickname: "",
+			Remark:   "",
+			UserID:   struserid,
+		}
+		//缓存私信好友列表
+		idmap.StoreUserInfo(data.Author.ID, userdata)
 	} else {
 		//将私聊信息转化为群信息(特殊需求情况下)
 
 		//转换appid
 		AppIDString := strconv.FormatUint(p.Settings.AppID, 10)
-		//构造echo
-		echostr := AppIDString + "_" + strconv.FormatInt(s, 10)
+		// 获取当前时间的13位毫秒级时间戳
+		currentTimeMillis := time.Now().UnixNano() / 1e6
+		// 构造echostr，包括AppID，原始的s变量和当前时间戳
+		echostr := fmt.Sprintf("%s_%d_%d", AppIDString, s, currentTimeMillis)
 		//把userid作为群号
 		//映射str的userid到int
 		var userid64 int64
@@ -190,14 +213,22 @@ func (p *Processors) ProcessC2CMessage(data *dto.WSC2CMessageData) error {
 		messageID := int(messageID64)
 		//todo 判断array模式 然后对Message处理成array格式
 		IsBindedUserId := idmap.CheckValue(data.Author.ID, userid64)
+
+		var selfid64 int64
+		if config.GetUseUin() {
+			selfid64 = config.GetUinint64()
+		} else {
+			selfid64 = int64(p.Settings.AppID)
+		}
+
 		groupMsg := OnebotGroupMessage{
 			RawMessage:  messageText,
 			Message:     messageText,
 			MessageID:   messageID,
 			GroupID:     userid64,
 			MessageType: "group",
 			PostType:    "message",
-			SelfID:      int64(p.Settings.AppID),
+			SelfID:      selfid64,
 			UserID:      userid64,
 			Sender: Sender{
 				UserID: userid64,
@@ -262,6 +293,17 @@ func (p *Processors) ProcessC2CMessage(data *dto.WSC2CMessageData) error {
 		groupMsgMap := structToMap(groupMsg)
 		//上报信息到onebotv11应用端(正反ws)
 		p.BroadcastMessageToAll(groupMsgMap)
+
+		//组合FriendData
+		struserid := strconv.FormatInt(userid64, 10)
+		userdata := structs.FriendData{
+			Nickname: "",
+			Remark:   "",
+			UserID:   struserid,
+		}
+		//缓存私信好友列表
+		idmap.StoreUserInfo(data.Author.ID, userdata)
 	}
+
 	return nil
 }

Processor/ProcessChannelDirectMessage.go

@@ -35,7 +35,10 @@ func (p *Processors) ProcessChannelDirectMessage(data *dto.WSDirectMessageData)
 
 		//转换appidstring
 		AppIDString := strconv.FormatUint(p.Settings.AppID, 10)
-		echostr := AppIDString + "_" + strconv.FormatInt(s, 10)
+		// 获取当前时间的13位毫秒级时间戳
+		currentTimeMillis := time.Now().UnixNano() / 1e6
+		// 构造echostr，包括AppID，原始的s变量和当前时间戳
+		echostr := fmt.Sprintf("%s_%d_%d", AppIDString, s, currentTimeMillis)
 
 		var userid64 int64
 		var ChannelID64 int64
@@ -117,13 +120,20 @@ func (p *Processors) ProcessChannelDirectMessage(data *dto.WSDirectMessageData)
 			IsBindedUserId = idmap.CheckValuev2(userid64)
 		}
 
+		var selfid64 int64
+		if config.GetUseUin() {
+			selfid64 = config.GetUinint64()
+		} else {
+			selfid64 = int64(p.Settings.AppID)
+		}
+
 		privateMsg := OnebotPrivateMessage{
 			RawMessage:  messageText,
 			Message:     segmentedMessages,
 			MessageID:   messageID,
 			MessageType: "private",
 			PostType:    "message",
-			SelfID:      int64(p.Settings.AppID),
+			SelfID:      selfid64,
 			UserID:      userid64,
 			Sender: PrivateSender{
 				Nickname: data.Member.Nick,
@@ -183,14 +193,22 @@ func (p *Processors) ProcessChannelDirectMessage(data *dto.WSDirectMessageData)
 			p.HandleFrameworkCommand(messageText, data, "guild_private")
 			//转换appid
 			AppIDString := strconv.FormatUint(p.Settings.AppID, 10)
-			//构造echo
-			echostr := AppIDString + "_" + strconv.FormatInt(s, 10)
+			// 获取当前时间的13位毫秒级时间戳
+			currentTimeMillis := time.Now().UnixNano() / 1e6
+			// 构造echostr，包括AppID，原始的s变量和当前时间戳
+			echostr := fmt.Sprintf("%s_%d_%d", AppIDString, s, currentTimeMillis)
 			//映射str的userid到int
 			userid64, err := idmap.StoreIDv2(data.Author.ID)
 			if err != nil {
 				mylog.Printf("Error storing ID: %v", err)
 				return nil
 			}
+			var selfid64 int64
+			if config.GetUseUin() {
+				selfid64 = config.GetUinint64()
+			} else {
+				selfid64 = int64(p.Settings.AppID)
+			}
 			//OnebotChannelMessage
 			onebotMsg := OnebotChannelMessage{
 				ChannelID:   data.ChannelID,
@@ -200,7 +218,7 @@ func (p *Processors) ProcessChannelDirectMessage(data *dto.WSDirectMessageData)
 				MessageID:   data.ID,
 				MessageType: "guild",
 				PostType:    "message",
-				SelfID:      int64(p.Settings.AppID),
+				SelfID:      selfid64,
 				UserID:      userid64,
 				SelfTinyID:  "",
 				Sender: Sender{
@@ -271,16 +289,16 @@ func (p *Processors) ProcessChannelDirectMessage(data *dto.WSDirectMessageData)
 			var err error
 			if config.GetIdmapPro() {
 				//将真实id转为int userid64
-				_, _, err = idmap.StoreIDv2Pro(data.ChannelID, data.Author.ID)
+				ChannelID64, userid64, err = idmap.StoreIDv2Pro(data.ChannelID, data.Author.ID)
 				if err != nil {
 					mylog.Fatalf("Error storing ID: %v", err)
 				}
 				//将真实id转为int userid64
-				userid64, err = idmap.StoreIDv2(data.Author.ID)
+				_, err = idmap.StoreIDv2(data.Author.ID)
 				if err != nil {
 					mylog.Fatalf("Error storing ID: %v", err)
 				}
-				ChannelID64, err = idmap.StoreIDv2(data.ChannelID)
+				_, err = idmap.StoreIDv2(data.ChannelID)
 				if err != nil {
 					mylog.Printf("Error storing ID: %v", err)
 					return nil
@@ -319,8 +337,10 @@ func (p *Processors) ProcessChannelDirectMessage(data *dto.WSDirectMessageData)
 			p.HandleFrameworkCommand(messageText, data, "guild_private")
 			//转换appid
 			AppIDString := strconv.FormatUint(p.Settings.AppID, 10)
-			//构造echo
-			echostr := AppIDString + "_" + strconv.FormatInt(s, 10)
+			// 获取当前时间的13位毫秒级时间戳
+			currentTimeMillis := time.Now().UnixNano() / 1e6
+			// 构造echostr，包括AppID，原始的s变量和当前时间戳
+			echostr := fmt.Sprintf("%s_%d_%d", AppIDString, s, currentTimeMillis)
 
 			//userid := int(userid64)
 			//映射str的messageID到int
@@ -341,14 +361,22 @@ func (p *Processors) ProcessChannelDirectMessage(data *dto.WSDirectMessageData)
 			} else {
 				IsBindedUserId = idmap.CheckValuev2(userid64)
 			}
+
+			var selfid64 int64
+			if config.GetUseUin() {
+				selfid64 = config.GetUinint64()
+			} else {
+				selfid64 = int64(p.Settings.AppID)
+			}
+
 			groupMsg := OnebotGroupMessage{
 				RawMessage:  messageText,
 				Message:     segmentedMessages,
 				MessageID:   messageID,
 				GroupID:     ChannelID64,
 				MessageType: "group",
 				PostType:    "message",
-				SelfID:      int64(p.Settings.AppID),
+				SelfID:      selfid64,
 				UserID:      userid64,
 				Sender: Sender{
 					Nickname: data.Member.Nick,

Processor/ProcessGroupAddBot.go

@@ -7,6 +7,7 @@ import (
 
 	"github.com/hoshinonyaruko/gensokyo/callapi"
 	"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"
@@ -93,15 +94,21 @@ func (p *Processors) ProcessGroupAddBot(data *dto.GroupAddBotEvent) error {
 		mylog.Printf("Invalid type for timestamp: %T", v)
 		return nil
 	}
-
-	mylog.Printf("Bot被[%v]邀请进入群[%v]", userid64, GroupID64)
+
+	var selfid64 int64
+	if config.GetUseUin() {
+		selfid64 = config.GetUinint64()
+	} else {
+		selfid64 = int64(p.Settings.AppID)
+	}
+
 	Request = GroupRequestEvent{
 		Comment:     "",
 		Flag:        "",
 		GroupID:     GroupID64,
 		PostType:    "request",
 		RequestType: "group",
-		SelfID:      int64(config.GetAppID()),
+		SelfID:      selfid64,
 		SubType:     "invite",
 		Time:        timestampInt64,
 		UserID:      userid64,
@@ -111,7 +118,7 @@ func (p *Processors) ProcessGroupAddBot(data *dto.GroupAddBotEvent) error {
 		NoticeType: "group_increase",
 		OperatorID: 0,
 		PostType:   "notice",
-		SelfID:     int64(config.GetAppID()),
+		SelfID:     selfid64,
 		SubType:    "invite",
 		Time:       timestampInt64,
 		UserID:     userid64,
@@ -124,6 +131,14 @@ func (p *Processors) ProcessGroupAddBot(data *dto.GroupAddBotEvent) error {
 	//上报信息到onebotv11应用端(正反ws)
 	p.BroadcastMessageToAll(groupMsgMap)
 
+	// 转换appid
+	AppIDString := strconv.FormatUint(p.Settings.AppID, 10)
+
+	// 储存和群号相关的eventid
+	echo.AddEvnetID(AppIDString, GroupID64, data.ID)
+
+	mylog.Printf("Bot被[%v]邀请进入群[%v]eventid[%v]", userid64, GroupID64, data.ID)
+
 	// 调用GetSelfIntroduce函数
 	intros := config.GetSelfIntroduce()
 

Processor/ProcessGroupDelBot.go

@@ -2,6 +2,7 @@
 package Processor
 
 import (
+	"fmt"
 	"strconv"
 
 	"github.com/hoshinonyaruko/gensokyo/config"
@@ -50,12 +51,21 @@ func (p *Processors) ProcessGroupDelBot(data *dto.GroupAddBotEvent) error {
 		return nil
 	}
 	mylog.Printf("Bot被[%v]从群[%v]移出", userid64, GroupID64)
+	//从数据库删除群数据(仅删除类型缓存,再次加入会刷新)
+	idmap.DeleteConfigv2(fmt.Sprint(GroupID64), "type")
+
+	var selfid64 int64
+	if config.GetUseUin() {
+		selfid64 = config.GetUinint64()
+	} else {
+		selfid64 = int64(p.Settings.AppID)
+	}
 	Notice = GroupNoticeEvent{
 		GroupID:    GroupID64,
 		NoticeType: "group_decrease",
 		OperatorID: 0,
 		PostType:   "notice",
-		SelfID:     int64(config.GetAppID()),
+		SelfID:     selfid64,
 		SubType:    "kick_me",
 		Time:       timestampInt64,
 		UserID:     userid64,