diff --git a/go.mod b/go.mod index 5ce26fd44..99374edb5 100644 --- a/go.mod +++ b/go.mod @@ -155,4 +155,5 @@ require ( gopkg.in/ini.v1 v1.67.0 // indirect ) -replace github.com/OpenIMSDK/protocol v0.0.31 => github.com/luhaoling/protocol v0.0.0-20231214080438-af4ace84e027 +replace github.com/OpenIMSDK/protocol => github.com/luhaoling/protocol v0.0.0-20231214085358-66b74ceb5e6d + diff --git a/go.sum b/go.sum index 00bba6445..1546949f1 100644 --- a/go.sum +++ b/go.sum @@ -225,8 +225,8 @@ github.com/lestrrat-go/strftime v1.0.6 h1:CFGsDEt1pOpFNU+TJB0nhz9jl+K0hZSLE205Ah github.com/lestrrat-go/strftime v1.0.6/go.mod h1:f7jQKgV5nnJpYgdEasS+/y7EsTb8ykN2z68n3TtcTaw= github.com/lithammer/shortuuid v3.0.0+incompatible h1:NcD0xWW/MZYXEHa6ITy6kaXN5nwm/V115vj2YXfhS0w= github.com/lithammer/shortuuid v3.0.0+incompatible/go.mod h1:FR74pbAuElzOUuenUHTK2Tciko1/vKuIKS9dSkDrA4w= -github.com/luhaoling/protocol v0.0.0-20231214080438-af4ace84e027 h1:67CwRt48fH8eQz/AlTajKTGthwHyaqXtaWA8Lu9B2sM= -github.com/luhaoling/protocol v0.0.0-20231214080438-af4ace84e027/go.mod h1:F25dFrwrIx3lkNoiuf6FkCfxuwf8L4Z8UIsdTHP/r0Y= +github.com/luhaoling/protocol v0.0.0-20231214085358-66b74ceb5e6d h1:nm04eTkcQ4LMfliuXqRnd+pwpJLTkQM7N3e8Q+gKNmk= +github.com/luhaoling/protocol v0.0.0-20231214085358-66b74ceb5e6d/go.mod h1:F25dFrwrIx3lkNoiuf6FkCfxuwf8L4Z8UIsdTHP/r0Y= github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA= github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= diff --git a/internal/rpc/msg/as_read.go b/internal/rpc/msg/as_read.go index 8e75a6ce8..1bdde5ce5 100644 --- a/internal/rpc/msg/as_read.go +++ b/internal/rpc/msg/as_read.go @@ -360,7 +360,9 @@ func (m *msgServer) getConversationInfo( for conversationID, chatLog := range chatLogs { pbchatLog := &msg.ConversationElem{} msgInfo := &msg.MsgInfo{} - utils2.CopyStructFields(msgInfo, chatLog) + if err := utils2.CopyStructFields(msgInfo, chatLog); err != nil { + return nil, err + } switch chatLog.SessionType { case constant.SingleChatType: if chatLog.SendID == userID {