Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Beta77 #216

Merged
merged 4 commits into from
Dec 4, 2023
Merged

Beta77 #216

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1374e67
beta77
Hoshinonyaruko Dec 4, 2023
ddd33c3
beta77
Hoshinonyaruko Dec 4, 2023
43c88a3
beta77
Hoshinonyaruko Dec 4, 2023
edaa74b
Merge branch 'main' into beta77
Hoshinonyaruko Dec 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions handlers/send_group_msg.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,8 @@ func handleSendGroupMsg(client callapi.Client, api openapi.OpenAPI, apiv2 openap
}
message.Params.GroupID = originalGroupID
if SSM {
mylog.Printf("正在使用Msgid:%v 补发之前失败的主动信息,请注意AtoP不要设置超过3,否则可能会影响正常信息发送", messageID)
mylog.Printf("originalGroupID:%v ", originalGroupID)
//mylog.Printf("正在使用Msgid:%v 补发之前失败的主动信息,请注意AtoP不要设置超过3,否则可能会影响正常信息发送", messageID)
//mylog.Printf("originalGroupID:%v ", originalGroupID)
SendStackMessages(apiv2, messageID, originalGroupID)
}
mylog.Println("群组发信息messageText:", messageText)
Expand Down Expand Up @@ -744,8 +744,10 @@ func uploadMedia(ctx context.Context, groupID string, richMediaMessage *dto.Rich
// 发送栈中的消息
func SendStackMessages(apiv2 openapi.OpenAPI, messageid string, originalGroupID string) {
count := config.GetAtoPCount()
mylog.Printf("取出数量: %v", count)
pairs := echo.PopGlobalStackMulti(count)
for _, pair := range pairs {
mylog.Printf("%v: %v", pair.Group, originalGroupID)
if pair.Group == originalGroupID {
// 发送消息
messageID := pair.GroupMessage.MsgID
Expand Down