From 95ec99daf0d20ec39311f7bbaac4f384e3596a47 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Wed, 12 Jul 2023 21:33:11 +0800 Subject: [PATCH] fix bug ContentType is wrong range for Check --- pkg/common/constant/constant.go | 27 ++++++++++++++------------- pkg/proto/sdkws/sdkws.go | 6 +++--- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/pkg/common/constant/constant.go b/pkg/common/constant/constant.go index 72cc34af8..f1abdcf64 100644 --- a/pkg/common/constant/constant.go +++ b/pkg/common/constant/constant.go @@ -4,19 +4,20 @@ const ( ///ContentType //UserRelated - Text = 101 - Picture = 102 - Voice = 103 - Video = 104 - File = 105 - AtText = 106 - Merger = 107 - Card = 108 - Location = 109 - Custom = 110 - Revoke = 111 - Typing = 113 - Quote = 114 + ContentTypeBegin = 100 + Text = 101 + Picture = 102 + Voice = 103 + Video = 104 + File = 105 + AtText = 106 + Merger = 107 + Card = 108 + Location = 109 + Custom = 110 + Revoke = 111 + Typing = 113 + Quote = 114 AdvancedText = 117 diff --git a/pkg/proto/sdkws/sdkws.go b/pkg/proto/sdkws/sdkws.go index 094cb823b..19bf7f968 100644 --- a/pkg/proto/sdkws/sdkws.go +++ b/pkg/proto/sdkws/sdkws.go @@ -12,10 +12,10 @@ func (x *MsgData) Check() error { if x.Content == nil { return errs.ErrArgs.Wrap("content is empty") } - if x.ContentType < 101 || x.ContentType > 203 { - return errs.ErrArgs.Wrap("content is empty") + if x.ContentType <= constant.ContentTypeBegin || x.ContentType >= constant.NotificationEnd { + return errs.ErrArgs.Wrap("content type is invalid") } - if x.SessionType < 1 || x.SessionType > 4 { + if x.SessionType < constant.SingleChatType || x.SessionType > constant.NotificationChatType { return errs.ErrArgs.Wrap("sessionType is invalid") } if x.SessionType == constant.SingleChatType || x.SessionType == constant.NotificationChatType {