blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-05-17 09:44:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode

Browse Source
This commit is contained in:
wangchuxiao 2023-03-03 19:44:49 +08:00
commit 2ca3f4673b
3 changed files with 8 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/apistruct/msg.go
View File

@ -75,12 +75,12 @@ type ModifyMessageReactionExtensionsResp struct {
} `json:"data"` } `json:"data"`
} }
type OperateMessageListReactionExtensionsReq struct { //type OperateMessageListReactionExtensionsReq struct {
OperationID string `json:"operationID" binding:"required"` // OperationID string `json:"operationID" binding:"required"`
SourceID string `json:"sourceID" binding:"required"` // SourceID string `json:"sourceID" binding:"required"`
SessionType string `json:"sessionType" binding:"required"` // SessionType string `json:"sessionType" binding:"required"`
MessageReactionKeyList []*msg.GetMessageListReactionExtensionsReq_MessageReactionKey `json:"messageReactionKeyList" binding:"required"` // MessageReactionKeyList []*msg.GetMessageListReactionExtensionsReq_MessageReactionKey `json:"messageReactionKeyList" binding:"required"`
} //}
type OperateMessageListReactionExtensionsResp struct { type OperateMessageListReactionExtensionsResp struct {
CommResp CommResp
@ -94,7 +94,7 @@ type SetMessageReactionExtensionsCallbackReq ModifyMessageReactionExtensionsReq
type SetMessageReactionExtensionsCallbackResp ModifyMessageReactionExtensionsResp type SetMessageReactionExtensionsCallbackResp ModifyMessageReactionExtensionsResp
type GetMessageListReactionExtensionsReq OperateMessageListReactionExtensionsReq //type GetMessageListReactionExtensionsReq OperateMessageListReactionExtensionsReq
type GetMessageListReactionExtensionsResp struct { type GetMessageListReactionExtensionsResp struct {
CommResp CommResp

58
pkg/apistruct/user.go
View File

@ -1,58 +0,0 @@
package apistruct
import (
sdkws "OpenIM/pkg/proto/sdkws"
)
type GetUsersInfoReq struct {
OperationID string `json:"operationID" binding:"required"`
UserIDList []string `json:"userIDList" binding:"required"`
}
type GetUsersInfoResp struct {
CommResp
UserInfoList []*sdkws.PublicUserInfo `json:"-"`
Data []map[string]interface{} `json:"data" swaggerignore:"true"`
}
type UpdateSelfUserInfoReq struct {
ApiUserInfo
OperationID string `json:"operationID" binding:"required"`
}
type SetGlobalRecvMessageOptReq struct {
OperationID string `json:"operationID" binding:"required"`
GlobalRecvMsgOpt *int32 `json:"globalRecvMsgOpt" binding:"omitempty,oneof=0 1 2"`
}
type SetGlobalRecvMessageOptResp struct {
CommResp
}
type UpdateUserInfoResp struct {
CommResp
}
type GetSelfUserInfoReq struct {
OperationID string `json:"operationID" binding:"required"`
UserID string `json:"userID" binding:"required"`
}
type GetSelfUserInfoResp struct {
CommResp
UserInfo *sdkws.UserInfo `json:"-"`
Data map[string]interface{} `json:"data" swaggerignore:"true"`
}
type GetFriendIDListFromCacheReq struct {
OperationID string `json:"operationID" binding:"required"`
}
type GetFriendIDListFromCacheResp struct {
CommResp
UserIDList []string `json:"userIDList" binding:"required"`
}
type GetBlackIDListFromCacheReq struct {
OperationID string `json:"operationID" binding:"required"`
}
type GetBlackIDListFromCacheResp struct {
CommResp
UserIDList []string `json:"userIDList" binding:"required"`
}

3
pkg/common/db/unrelation/super_group.go
View File

@ -1,14 +1,12 @@
package unrelation package unrelation
import ( import (
"OpenIM/pkg/common/config"
"OpenIM/pkg/common/db/table/unrelation" "OpenIM/pkg/common/db/table/unrelation"
"OpenIM/pkg/utils" "OpenIM/pkg/utils"
"context" "context"
"go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/bson"
"go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo"
"go.mongodb.org/mongo-driver/mongo/options" "go.mongodb.org/mongo-driver/mongo/options"
"go.mongodb.org/mongo-driver/mongo/readconcern"
) )
func NewSuperGroupMongoDriver(database *mongo.Database) unrelation.SuperGroupModelInterface { func NewSuperGroupMongoDriver(database *mongo.Database) unrelation.SuperGroupModelInterface {
@ -75,6 +73,7 @@ func (s *SuperGroupMongoDriver) AddUserToSuperGroup(ctx context.Context, groupID
return utils.Wrap(err, "transaction failed") return utils.Wrap(err, "transaction failed")
} }
} }
return nil
} }
func (s *SuperGroupMongoDriver) RemoverUserFromSuperGroup(ctx context.Context, groupID string, userIDs []string) error { func (s *SuperGroupMongoDriver) RemoverUserFromSuperGroup(ctx context.Context, groupID string, userIDs []string) error {