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.

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

Beta487 #492

Merged
merged 43 commits into from
Aug 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
a6ebe57
beta447
Hoshinonyaruko Jun 29, 2024
1d63fae
beta448
Hoshinonyaruko Jul 1, 2024
cd34627
beta449
Hoshinonyaruko Jul 4, 2024
b790b29
beta450
Hoshinonyaruko Jul 4, 2024
7a9b56a
beta451
Hoshinonyaruko Jul 4, 2024
e17d0d4
beta452
Hoshinonyaruko Jul 4, 2024
1318175
beta453
Hoshinonyaruko Jul 4, 2024
b7f291c
beta454
Hoshinonyaruko Jul 4, 2024
f921895
beta455
Hoshinonyaruko Jul 9, 2024
24108c6
btea455
Hoshinonyaruko Jul 9, 2024
7cdc968
beta456
Hoshinonyaruko Jul 9, 2024
b5d784e
beta457
Hoshinonyaruko Jul 9, 2024
61e4001
beta458
Hoshinonyaruko Jul 9, 2024
6d4116a
beta460
Hoshinonyaruko Jul 9, 2024
2c1f1b7
beta460
Hoshinonyaruko Jul 11, 2024
5c312cd
beta461
Hoshinonyaruko Jul 12, 2024
58304eb
beta462
Hoshinonyaruko Jul 13, 2024
7e7c9f3
beta463
Hoshinonyaruko Jul 15, 2024
188f250
beta464
Hoshinonyaruko Jul 15, 2024
af0296d
beta465
Hoshinonyaruko Jul 18, 2024
500135c
beta467
Hoshinonyaruko Jul 21, 2024
c1a588c
beta468
Hoshinonyaruko Jul 21, 2024
1df8e15
beta469
Hoshinonyaruko Jul 21, 2024
f57ab7b
beta470
Hoshinonyaruko Jul 26, 2024
cd21ad9
beta471
Hoshinonyaruko Aug 1, 2024
6039272
beta472
Hoshinonyaruko Aug 1, 2024
c45b450
beta473
Hoshinonyaruko Aug 1, 2024
f89d6c5
beta473
Hoshinonyaruko Aug 3, 2024
b54fdee
beta475
Hoshinonyaruko Aug 5, 2024
a30a697
beta476
Hoshinonyaruko Aug 8, 2024
ab805cc
beta478
Hoshinonyaruko Aug 8, 2024
6debefd
beta479
Hoshinonyaruko Aug 17, 2024
9cc7e5d
beta479
Hoshinonyaruko Aug 17, 2024
c0fe93c
beta480
Hoshinonyaruko Aug 18, 2024
91cf223
beta481
Hoshinonyaruko Aug 18, 2024
a3aa6c1
beta482
Hoshinonyaruko Aug 18, 2024
0917e56
beta483
Hoshinonyaruko Aug 19, 2024
dd1f774
beta484
Hoshinonyaruko Aug 19, 2024
1c87d61
beta485
Hoshinonyaruko Aug 20, 2024
aac474a
beta486
Hoshinonyaruko Aug 20, 2024
2604eb7
beta486
Hoshinonyaruko Aug 20, 2024
76377be
beta487
Hoshinonyaruko Aug 20, 2024
dcf5432
Merge branch 'main' into beta487
Hoshinonyaruko Aug 20, 2024
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
2 changes: 1 addition & 1 deletion Processor/ProcessC2CMessage.go
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ func (p *Processors) ProcessC2CMessage(data *dto.WSC2CMessageData) error {
echo.AddMsgIDv3(AppIDString, data.Author.ID, data.ID)

//储存当前群或频道号的类型
idmap.WriteConfigv2(data.Author.ID, "type", "group_private")
//idmap.WriteConfigv2(data.Author.ID, "type", "group_private")

//懒message_id池
echo.AddLazyMessageId(data.Author.ID, data.ID, time.Now())
Expand Down
2 changes: 1 addition & 1 deletion Processor/ProcessGroupMessage.go
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ func (p *Processors) ProcessGroupMessage(data *dto.WSGroupATMessageData) error {
echo.AddMsgID(AppIDString, s, data.ID)
echo.AddMsgType(AppIDString, s, "group")
//储存当前群或频道号的类型
idmap.WriteConfigv2(data.GroupID, "type", "group")
//idmap.WriteConfigv2(data.GroupID, "type", "group")
//懒message_id池
echo.AddLazyMessageId(data.GroupID, data.ID, time.Now())
//懒message_id池
Expand Down
34 changes: 16 additions & 18 deletions handlers/send_group_msg.go
Original file line number Diff line number Diff line change
Expand Up @@ -99,12 +99,8 @@ func HandleSendGroupMsg(client callapi.Client, api openapi.OpenAPI, apiv2 openap
var retmsg string

if len(message.Params.GroupID.(string)) == 32 {
idInt64, err = idmap.GenerateRowID(message.Params.GroupID.(string), 9)
// 临时的
msgType = "group"
} else if message.Params.UserID != nil && len(message.Params.UserID.(string)) == 32 {
idInt64, err = idmap.GenerateRowID(message.Params.UserID.(string), 9)
// 临时的
msgType = "group_private"
} else {
if message.Params.GroupID != "" {
Expand All @@ -114,21 +110,23 @@ func HandleSendGroupMsg(client callapi.Client, api openapi.OpenAPI, apiv2 openap
}
}

//设置递归 对直接向gsk发送action时有效果
if msgType == "" {
messageCopy := message
if err != nil {
mylog.Printf("错误:无法转换 ID %v\n", err)
} else {
// 递归3次
echo.AddMapping(idInt64, 4)
// 递归调用handleSendGroupMsg,使用设置的消息类型
echo.AddMsgType(config.GetAppIDStr(), idInt64, "group_private")
retmsg, _ = HandleSendGroupMsg(client, api, apiv2, messageCopy)
if message.Params.GroupID != nil && len(message.Params.GroupID.(string)) != 32 {
//设置递归 对直接向gsk发送action时有效果
if msgType == "" {
messageCopy := message
if err != nil {
mylog.Printf("错误:无法转换 ID %v\n", err)
} else {
// 递归3次
echo.AddMapping(idInt64, 4)
// 递归调用handleSendGroupMsg,使用设置的消息类型
echo.AddMsgType(config.GetAppIDStr(), idInt64, "group_private")
retmsg, _ = HandleSendGroupMsg(client, api, apiv2, messageCopy)
}
} else if echo.GetMapping(idInt64) <= 0 {
// 特殊值代表不递归
echo.AddMapping(idInt64, 10)
}
} else if echo.GetMapping(idInt64) <= 0 {
// 特殊值代表不递归
echo.AddMapping(idInt64, 10)
}

switch msgType {
Expand Down
Loading