Beta417 (#423)

* beta399 * beta400 * beta401 * beta402 * beta403 * beta404 * beta405 * beta406 * beta407 * beta408 * beta409 * beta410 * beta411 * beta412 * beta413 * beta414 * beta415 * beta416 * beta417
Hoshinonyaruko · Jun 8, 2024 · 8311cf9 · 8311cf9
1 parent b42aa26
commit 8311cf9
Show file tree

Hide file tree

Showing 18 changed files with 187 additions and 90 deletions.
diff --git a/Processor/ProcessC2CMessage.go b/Processor/ProcessC2CMessage.go
@@ -154,7 +154,7 @@ func (p *Processors) ProcessC2CMessage(data *dto.WSC2CMessageData) error {
 		// Convert OnebotGroupMessage to map and send
 		privateMsgMap := structToMap(privateMsg)
 		//上报信息到onebotv11应用端(正反ws)
-		p.BroadcastMessageToAll(privateMsgMap)
+		go p.BroadcastMessageToAll(privateMsgMap, p.Apiv2, data)
 		//组合FriendData
 		struserid := strconv.FormatInt(userid64, 10)
 		userdata := structs.FriendData{
@@ -296,7 +296,7 @@ func (p *Processors) ProcessC2CMessage(data *dto.WSC2CMessageData) error {
 		// Convert OnebotGroupMessage to map and send
 		groupMsgMap := structToMap(groupMsg)
 		//上报信息到onebotv11应用端(正反ws)
-		p.BroadcastMessageToAll(groupMsgMap)
+		go p.BroadcastMessageToAll(groupMsgMap, p.Apiv2, data)
 
 		//组合FriendData
 		struserid := strconv.FormatInt(userid64, 10)

diff --git a/Processor/ProcessChannelDirectMessage.go b/Processor/ProcessChannelDirectMessage.go
@@ -171,7 +171,7 @@ func (p *Processors) ProcessChannelDirectMessage(data *dto.WSDirectMessageData)
 		// Convert OnebotGroupMessage to map and send
 		privateMsgMap := structToMap(privateMsg)
 		//上报信息到onebotv11应用端(正反ws)
-		p.BroadcastMessageToAll(privateMsgMap)
+		go p.BroadcastMessageToAll(privateMsgMap, p.Apiv2, data)
 	} else {
 		if !p.Settings.GlobalChannelToGroup {
 			//将频道私信作为普通频道信息
@@ -280,7 +280,7 @@ func (p *Processors) ProcessChannelDirectMessage(data *dto.WSDirectMessageData)
 			// 将 onebotMsg 结构体转换为 map[string]interface{}
 			msgMap := structToMap(onebotMsg)
 			//上报信息到onebotv11应用端(正反ws)
-			p.BroadcastMessageToAll(msgMap)
+			go p.BroadcastMessageToAll(msgMap, p.Apiv2, data)
 		} else {
 			//将频道信息转化为群信息(特殊需求情况下)
 			//将channelid写入bolt,可取出guild_id
@@ -444,7 +444,7 @@ func (p *Processors) ProcessChannelDirectMessage(data *dto.WSDirectMessageData)
 			// Convert OnebotGroupMessage to map and send
 			groupMsgMap := structToMap(groupMsg)
 			//上报信息到onebotv11应用端(正反ws)
-			p.BroadcastMessageToAll(groupMsgMap)
+			go p.BroadcastMessageToAll(groupMsgMap, p.Apiv2, data)
 		}
 
 	}

diff --git a/Processor/ProcessGroupAddBot.go b/Processor/ProcessGroupAddBot.go
@@ -125,11 +125,11 @@ func (p *Processors) ProcessGroupAddBot(data *dto.GroupAddBotEvent) error {
 	}
 	groupMsgMap := structToMap(Request)
 	//上报信息到onebotv11应用端(正反ws)
-	p.BroadcastMessageToAll(groupMsgMap)
+	go p.BroadcastMessageToAll(groupMsgMap, p.Apiv2, data)
 
 	groupMsgMap = structToMap(Notice)
 	//上报信息到onebotv11应用端(正反ws)
-	p.BroadcastMessageToAll(groupMsgMap)
+	go p.BroadcastMessageToAll(groupMsgMap, p.Apiv2, data)
 
 	// 转换appid
 	AppIDString := strconv.FormatUint(p.Settings.AppID, 10)

diff --git a/Processor/ProcessGroupDelBot.go b/Processor/ProcessGroupDelBot.go
@@ -72,6 +72,6 @@ func (p *Processors) ProcessGroupDelBot(data *dto.GroupAddBotEvent) error {
 	}
 	groupMsgMap := structToMap(Notice)
 	//上报信息到onebotv11应用端(正反ws)
-	p.BroadcastMessageToAll(groupMsgMap)
+	go p.BroadcastMessageToAll(groupMsgMap, p.Apiv2, data)
 	return nil
 }
diff --git a/Processor/ProcessGroupMessage.go b/Processor/ProcessGroupMessage.go
@@ -188,6 +188,6 @@ func (p *Processors) ProcessGroupMessage(data *dto.WSGroupATMessageData) error {
 	// Convert OnebotGroupMessage to map and send
 	groupMsgMap := structToMap(groupMsg)
 	//上报信息到onebotv11应用端(正反ws)
-	p.BroadcastMessageToAll(groupMsgMap)
+	go p.BroadcastMessageToAll(groupMsgMap, p.Apiv2, data)
 	return nil
 }
diff --git a/Processor/ProcessGroupMsgReceive.go b/Processor/ProcessGroupMsgReceive.go
@@ -93,7 +93,7 @@ func (p *Processors) ProcessGroupMsgRecive(data *dto.GroupMsgReceiveEvent) error
 		noticeMap := structToMap(notice)
 
 		//上报信息到onebotv11应用端(正反ws)
-		p.BroadcastMessageToAll(noticeMap)
+		go p.BroadcastMessageToAll(noticeMap, p.Apiv2, data)
 
 		// 转换appid
 		AppIDString := strconv.FormatUint(p.Settings.AppID, 10)
@@ -205,7 +205,7 @@ func (p *Processors) ProcessGroupMsgRecive(data *dto.GroupMsgReceiveEvent) error
 			// Convert OnebotGroupMessage to map and send
 			groupMsgMap := structToMap(groupMsg)
 			//上报信息到onebotv11应用端(正反ws)
-			p.BroadcastMessageToAll(groupMsgMap)
+			go p.BroadcastMessageToAll(groupMsgMap, p.Apiv2, data)
 
 			// 转换appid
 			AppIDString := strconv.FormatUint(p.Settings.AppID, 10)

diff --git a/Processor/ProcessGroupMsgReject.go b/Processor/ProcessGroupMsgReject.go
@@ -94,7 +94,7 @@ func (p *Processors) ProcessGroupMsgReject(data *dto.GroupMsgRejectEvent) error
 		noticeMap := structToMap(notice)
 
 		//上报信息到onebotv11应用端(正反ws)
-		p.BroadcastMessageToAll(noticeMap)
+		go p.BroadcastMessageToAll(noticeMap, p.Apiv2, data)
 
 		// 转换appid
 		AppIDString := strconv.FormatUint(p.Settings.AppID, 10)
@@ -206,7 +206,7 @@ func (p *Processors) ProcessGroupMsgReject(data *dto.GroupMsgRejectEvent) error
 			// Convert OnebotGroupMessage to map and send
 			groupMsgMap := structToMap(groupMsg)
 			//上报信息到onebotv11应用端(正反ws)
-			p.BroadcastMessageToAll(groupMsgMap)
+			go p.BroadcastMessageToAll(groupMsgMap, p.Apiv2, data)
 
 			// 转换appid
 			AppIDString := strconv.FormatUint(p.Settings.AppID, 10)

diff --git a/Processor/ProcessGuildATMessage.go b/Processor/ProcessGuildATMessage.go
@@ -132,7 +132,7 @@ func (p *Processors) ProcessGuildATMessage(data *dto.WSATMessageData) error {
 		msgMap := structToMap(onebotMsg)
 
 		//上报信息到onebotv11应用端(正反ws)
-		p.BroadcastMessageToAll(msgMap)
+		go p.BroadcastMessageToAll(msgMap, p.Apiv2, data)
 	} else {
 		// GlobalChannelToGroup为true时的处理逻辑
 		//将频道转化为一个群
@@ -298,7 +298,7 @@ func (p *Processors) ProcessGuildATMessage(data *dto.WSATMessageData) error {
 		// Convert OnebotGroupMessage to map and send
 		groupMsgMap := structToMap(groupMsg)
 		//上报信息到onebotv11应用端(正反ws)
-		p.BroadcastMessageToAll(groupMsgMap)
+		go p.BroadcastMessageToAll(groupMsgMap, p.Apiv2, data)
 
 	}
 

diff --git a/Processor/ProcessGuildNormalMessage.go b/Processor/ProcessGuildNormalMessage.go
@@ -131,7 +131,7 @@ func (p *Processors) ProcessGuildNormalMessage(data *dto.WSMessageData) error {
 		msgMap := structToMap(onebotMsg)
 
 		//上报信息到onebotv11应用端(正反ws)
-		p.BroadcastMessageToAll(msgMap)
+		go p.BroadcastMessageToAll(msgMap, p.Apiv2, data)
 	} else {
 		// GlobalChannelToGroup为true时的处理逻辑
 		//将频道转化为一个群
@@ -305,7 +305,7 @@ func (p *Processors) ProcessGuildNormalMessage(data *dto.WSMessageData) error {
 		groupMsgMap := structToMap(groupMsg)
 
 		//上报信息到onebotv11应用端(正反ws)
-		p.BroadcastMessageToAll(groupMsgMap)
+		go p.BroadcastMessageToAll(groupMsgMap, p.Apiv2, data)
 	}
 
 	return nil

diff --git a/Processor/ProcessInlineSearch.go b/Processor/ProcessInlineSearch.go
@@ -107,7 +107,7 @@ func (p *Processors) ProcessInlineSearch(data *dto.WSInteractionData) error {
 		noticeMap := structToMap(notice)
 
 		//上报信息到onebotv11应用端(正反ws)
-		p.BroadcastMessageToAll(noticeMap)
+		go p.BroadcastMessageToAll(noticeMap, p.Apiv2, data)
 
 		// 转换appid
 		AppIDString := strconv.FormatUint(p.Settings.AppID, 10)
@@ -221,7 +221,7 @@ func (p *Processors) ProcessInlineSearch(data *dto.WSInteractionData) error {
 			// Convert OnebotGroupMessage to map and send
 			groupMsgMap := structToMap(groupMsg)
 			//上报信息到onebotv11应用端(正反ws)
-			p.BroadcastMessageToAll(groupMsgMap)
+			go p.BroadcastMessageToAll(groupMsgMap, p.Apiv2, data)
 
 			// 转换appid
 			AppIDString := strconv.FormatUint(p.Settings.AppID, 10)
@@ -300,7 +300,7 @@ func (p *Processors) ProcessInlineSearch(data *dto.WSInteractionData) error {
 			// Convert OnebotGroupMessage to map and send
 			privateMsgMap := structToMap(privateMsg)
 			//上报信息到onebotv11应用端(正反ws)
-			p.BroadcastMessageToAll(privateMsgMap)
+			go p.BroadcastMessageToAll(privateMsgMap, p.Apiv2, data)
 
 			// 转换appid
 			AppIDString := strconv.FormatUint(p.Settings.AppID, 10)
@@ -361,7 +361,7 @@ func (p *Processors) ProcessInlineSearch(data *dto.WSInteractionData) error {
 			msgMap := structToMap(onebotMsg)
 
 			//上报信息到onebotv11应用端(正反ws)
-			p.BroadcastMessageToAll(msgMap)
+			go p.BroadcastMessageToAll(msgMap, p.Apiv2, data)
 
 			// TODO: 实现eventid
 		}

diff --git a/Processor/ProcessThreadMessage.go b/Processor/ProcessThreadMessage.go
@@ -137,7 +137,7 @@ func (p *Processors) ProcessThreadMessage(data *dto.WSThreadData) error {
 		msgMap := structToMap(onebotMsg)
 
 		//上报信息到onebotv11应用端(正反ws)
-		p.BroadcastMessageToAll(msgMap)
+		go p.BroadcastMessageToAll(msgMap, p.Apiv2, data)
 
 		return nil
 	} else {
@@ -256,7 +256,7 @@ func (p *Processors) ProcessThreadMessage(data *dto.WSThreadData) error {
 			msgMap := structToMap(onebotMsg)
 
 			//上报信息到onebotv11应用端(正反ws)
-			p.BroadcastMessageToAll(msgMap)
+			go p.BroadcastMessageToAll(msgMap, p.Apiv2, data)
 		} else {
 			//转化为群信息
 			//将频道转化为一个群
@@ -394,7 +394,7 @@ func (p *Processors) ProcessThreadMessage(data *dto.WSThreadData) error {
 			groupMsgMap := structToMap(groupMsg)
 
 			//上报信息到onebotv11应用端(正反ws)
-			p.BroadcastMessageToAll(groupMsgMap)
+			go p.BroadcastMessageToAll(groupMsgMap, p.Apiv2, data)
 
 		}
 	}