From 88d115cc86113f5fcf07719842f2db5d6ce90505 Mon Sep 17 00:00:00 2001 From: MiaoWoo Date: Sun, 26 Oct 2025 20:15:37 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E5=8F=AA=E5=9C=A8=E8=B8=A2=E5=87=BA?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E8=A7=A3=E6=9E=90=E6=93=8D=E4=BD=9C=E5=91=98?= =?UTF-8?q?=20=E4=BB=A5=E5=85=8D=E8=A7=A6=E5=8F=91=E5=88=B7=E6=96=B0?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E9=80=80=E7=BE=A4=E4=BA=BA=E5=91=98=E7=BC=93?= =?UTF-8?q?=E5=AD=98=E6=95=B0=E6=8D=AE=E4=B8=A2=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/event/group.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/client/event/group.go b/client/event/group.go index cb2d2e1..844f772 100644 --- a/client/event/group.go +++ b/client/event/group.go @@ -240,8 +240,10 @@ func ParseMemberIncreaseEvent(event *message.GroupChange) *GroupMemberIncrease { } func (g *GroupMemberDecrease) ResolveUin(f func(uid string, groupUin ...uint32) uint32) { - g.OperatorUin = f(g.OperatorUID, g.GroupUin) g.UserUin = f(g.UserUID, g.GroupUin) + if g.IsKicked() { + g.OperatorUin = f(g.OperatorUID, g.GroupUin) + } } func ParseMemberDecreaseEvent(event *message.GroupChange) *GroupMemberDecrease { From e68b11d71d66228b127ace9afa00b2e8308e67fa Mon Sep 17 00:00:00 2001 From: MiaoWoo Date: Thu, 30 Oct 2025 11:22:25 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E8=A7=A3=E9=99=A4=E7=BE=A4=E7=A6=81=E8=A8=80=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/packets/oidb/set_group_global_mute.go | 3 ++- client/packets/pb/service/oidb/OidbSvcTrpcTcp0x89A_0.pb.go | 2 +- client/packets/pb/service/oidb/OidbSvcTrpcTcp0x89A_0.proto | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/client/packets/oidb/set_group_global_mute.go b/client/packets/oidb/set_group_global_mute.go index 6b90b4e..98fe1f1 100644 --- a/client/packets/oidb/set_group_global_mute.go +++ b/client/packets/oidb/set_group_global_mute.go @@ -4,6 +4,7 @@ import ( "math" "github.com/LagrangeDev/LagrangeGo/client/packets/pb/service/oidb" + "github.com/LagrangeDev/LagrangeGo/internal/proto" ) func BuildSetGroupGlobalMuteReq(groupUin uint32, isMute bool) (*Packet, error) { @@ -13,7 +14,7 @@ func BuildSetGroupGlobalMuteReq(groupUin uint32, isMute bool) (*Packet, error) { } body := &oidb.OidbSvcTrpcTcp0X89A_0{ GroupUin: groupUin, - State: &oidb.OidbSvcTrpcTcp0X89A_0State{S: s}, + State: &oidb.OidbSvcTrpcTcp0X89A_0State{S: proto.Uint32(s)}, } return BuildOidbPacket(0x89A, 0, body, false, false) } diff --git a/client/packets/pb/service/oidb/OidbSvcTrpcTcp0x89A_0.pb.go b/client/packets/pb/service/oidb/OidbSvcTrpcTcp0x89A_0.pb.go index c4b5efd..a0c2286 100644 --- a/client/packets/pb/service/oidb/OidbSvcTrpcTcp0x89A_0.pb.go +++ b/client/packets/pb/service/oidb/OidbSvcTrpcTcp0x89A_0.pb.go @@ -15,7 +15,7 @@ type OidbSvcTrpcTcp0X89A_0 struct { } type OidbSvcTrpcTcp0X89A_0State struct { - S uint32 `protobuf:"varint,17,opt"` + S proto.Option[uint32] `protobuf:"varint,17,opt"` _ [0]func() } diff --git a/client/packets/pb/service/oidb/OidbSvcTrpcTcp0x89A_0.proto b/client/packets/pb/service/oidb/OidbSvcTrpcTcp0x89A_0.proto index e7e4359..918a6ec 100644 --- a/client/packets/pb/service/oidb/OidbSvcTrpcTcp0x89A_0.proto +++ b/client/packets/pb/service/oidb/OidbSvcTrpcTcp0x89A_0.proto @@ -9,7 +9,7 @@ message OidbSvcTrpcTcp0x89A_0 { } message OidbSvcTrpcTcp0x89A_0State { - uint32 S = 17; + optional uint32 S = 17; } message OidbSvcTrpcTcp0x89A_0Response {