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

Beta74 #212

Merged
merged 3 commits into from
Dec 4, 2023
Merged

Beta74 #212

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1d4dc28
beta74
Hoshinonyaruko Dec 4, 2023
a765fad
beta74
Hoshinonyaruko Dec 4, 2023
2460fe5
Merge branch 'main' into beta74
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
5 changes: 3 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 @@ -79,7 +79,7 @@ func handleSendGroupMsg(client callapi.Client, api openapi.OpenAPI, apiv2 openap
mylog.Printf("GetLazyMessagesId: %v", messageID)
if messageID != "" {
//尝试发送栈内信息
SendStackMessages(apiv2)
SendStackMessages(apiv2, messageID)
}
}
if messageID == "" {
Expand Down Expand Up @@ -737,7 +737,7 @@ func uploadMedia(ctx context.Context, groupID string, richMediaMessage *dto.Rich
}

// 发送栈中的消息
func SendStackMessages(apiv2 openapi.OpenAPI) {
func SendStackMessages(apiv2 openapi.OpenAPI, messageid string) {
count := config.GetAtoPCount()
pairs := echo.PopGlobalStackMulti(count)
for _, pair := range pairs {
Expand All @@ -746,6 +746,7 @@ func SendStackMessages(apiv2 openapi.OpenAPI) {
msgseq := echo.GetMappingSeq(messageID)
echo.AddMappingSeq(messageID, msgseq+1)
pair.GroupMessage.MsgSeq = msgseq + 1
pair.GroupMessage.MsgID = messageid
ret, err := apiv2.PostGroupMessage(context.TODO(), pair.Group, pair.GroupMessage)
if err != nil {
mylog.Printf("发送组合消息失败: %v", err)
Expand Down
Loading