merge v3dev into main (#504)

* statistics user register * refactor: router change * minio init * UserRegisterCount * push use local conn * refactor: user pb update * remove online push close grpc conn * refactor: user pb update * refactor:pb file * msgs statistics * msgs statistics * revoke userID * refactor: errcode update * active user * active user * active user * refactor: errcode update * feat: conn update token * active user * active user * feat: conn update token * active user * feat: conn update token * feat: conn update token * feat: conn update token * add tx_oss cos * active user * active user * group create * group create * feat: group notification show to conversation * feat: group notification show to conversation * group active * user active * sendNotificationWithName * withname * privateChat * a2r call option * grpc with detail return error * change log error * chain unary interceptor * api nil slice map * fix sync has read * fix: text update * fix: update add model * set conversations update * set privateChat * fix: content update * remove unuse rpc * msgDestruct * cron use rpc mw * set IsMsgDestruct * msg destruct * msgDestruct * s3 minio, cos, oss support * feat: add implement of GetUsersOnlineStatus, #472 (#477) * s3 minio, cos, oss support * s3 route * remove extendMsg code * s3 route * remove unuse code * s3 pb * s3 pb * s3 pb * s3 presigned put * s3 presigned test * s3 presigned test * s3 presigned test * s3 presigned test * s3 presigned test * s3 presigned test * s3 presigned test * s3 presigned test * Update .gitignore (#482) * s3 debug log * s3 debug log * cron add log and fix cron * add log * cron * s3 config * fix kick user bug * s3 cos * add kick log * s3 cos test * s3 cos test * s3 cos test * kick user log * kickuserlog * s3 cos copy * s3 cos copy * s3 url * s3 url * s3 AccessURL * log * s3 InitiateMultipartUpload add ExpireTime --------- Co-authored-by: withchao <993506633@qq.com> Co-authored-by: wangchuxiao <wangchuxiao97@outlook.com> Co-authored-by: BanTanger <88583317+BanTanger@users.noreply.github.com> Co-authored-by: withchao <48119764+withchao@users.noreply.github.com> Co-authored-by: Alan <68671759+hanzhixiao@users.noreply.github.com>
2026-04-28 14:29:19 +08:00 · 2023-07-12 15:31:24 +08:00
parent 5467887e1c
commit 454bf97e3f
123 changed files with 7377 additions and 10288 deletions
@@ -15,7 +15,6 @@
 package callbackstruct

 import (
-	"github.com/OpenIMSDK/Open-IM-Server/pkg/proto/msg"
 	sdkws "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws"
 )

@@ -80,71 +79,3 @@ type CallbackMsgModifyCommandResp struct {
 	AttachedInfo     *string                `json:"attachedInfo"`
 	Ex               *string                `json:"ex"`
 }
-type CallbackBeforeSetMessageReactionExtReq struct {
-	OperationID           string `json:"operationID"`
-	CallbackCommand       `json:"callbackCommand"`
-	ConversationID        string                     `json:"conversationID"`
-	OpUserID              string                     `json:"opUserID"`
-	SessionType           int32                      `json:"sessionType"`
-	ReactionExtensionList map[string]*sdkws.KeyValue `json:"reactionExtensionList"`
-	ClientMsgID           string                     `json:"clientMsgID"`
-	IsReact               bool                       `json:"isReact"`
-	IsExternalExtensions  bool                       `json:"isExternalExtensions"`
-	MsgFirstModifyTime    int64                      `json:"msgFirstModifyTime"`
-}
-type CallbackBeforeSetMessageReactionExtResp struct {
-	CommonCallbackResp
-	ResultReactionExtensionList []*msg.KeyValueResp `json:"resultReactionExtensionList"`
-	MsgFirstModifyTime          int64               `json:"msgFirstModifyTime"`
-}
-type CallbackDeleteMessageReactionExtReq struct {
-	CallbackCommand       `json:"callbackCommand"`
-	OperationID           string            `json:"operationID"`
-	ConversationID        string            `json:"conversationID"`
-	OpUserID              string            `json:"opUserID"`
-	SessionType           int32             `json:"sessionType"`
-	ReactionExtensionList []*sdkws.KeyValue `json:"reactionExtensionList"`
-	ClientMsgID           string            `json:"clientMsgID"`
-	IsExternalExtensions  bool              `json:"isExternalExtensions"`
-	MsgFirstModifyTime    int64             `json:"msgFirstModifyTime"`
-}
-type CallbackDeleteMessageReactionExtResp struct {
-	CommonCallbackResp
-	ResultReactionExtensionList []*msg.KeyValueResp `json:"resultReactionExtensionList"`
-	MsgFirstModifyTime          int64               `json:"msgFirstModifyTime"`
-}
-
-type CallbackGetMessageListReactionExtReq struct {
-	OperationID     string `json:"operationID"`
-	CallbackCommand `json:"callbackCommand"`
-	ConversationID  string   `json:"conversationID"`
-	OpUserID        string   `json:"opUserID"`
-	SessionType     int32    `json:"sessionType"`
-	TypeKeyList     []string `json:"typeKeyList"`
-	//MessageKeyList  []*msg.GetMessageListReactionExtensionsReq_MessageReactionKey `json:"messageKeyList"`
-}
-
-type CallbackGetMessageListReactionExtResp struct {
-	CommonCallbackResp
-	MessageResultList []*msg.SingleMessageExtensionResult `json:"messageResultList"`
-}
-
-type CallbackAddMessageReactionExtReq struct {
-	OperationID           string `json:"operationID"`
-	CallbackCommand       `json:"callbackCommand"`
-	ConversationID        string                     `json:"conversationID"`
-	OpUserID              string                     `json:"opUserID"`
-	SessionType           int32                      `json:"sessionType"`
-	ReactionExtensionList map[string]*sdkws.KeyValue `json:"reactionExtensionList"`
-	ClientMsgID           string                     `json:"clientMsgID"`
-	IsReact               bool                       `json:"isReact"`
-	IsExternalExtensions  bool                       `json:"isExternalExtensions"`
-	MsgFirstModifyTime    int64                      `json:"msgFirstModifyTime"`
-}
-
-type CallbackAddMessageReactionExtResp struct {
-	CommonCallbackResp
-	ResultReactionExtensionList []*msg.KeyValueResp `json:"resultReactionExtensionList"`
-	IsReact                     bool                `json:"isReact"`
-	MsgFirstModifyTime          int64               `json:"msgFirstModifyTime"`
-}