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

Merge branch 'v2.3.0release'

Browse Source
This commit is contained in:
wangchuxiao 2023-02-20 16:14:11 +08:00
commit beb9a37649
5 changed files with 365 additions and 362 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/api/manage/management_chat.go
View File

@ -157,6 +157,8 @@ func ManagementSendMsg(c *gin.Context) {
data = CustomElem{} data = CustomElem{}
case constant.CustomOnlineOnly: case constant.CustomOnlineOnly:
data = CustomElem{} data = CustomElem{}
case constant.AtText:
data = AtElem{}
//case constant.HasReadReceipt: //case constant.HasReadReceipt:
//case constant.Typing: //case constant.Typing:
//case constant.Quote: //case constant.Quote:

8
internal/rpc/msg/extend_msg.go
View File

@ -291,11 +291,11 @@ func (rpc *rpcChat) AddMessageReactionExtensions(ctx context.Context, req *msg.A
if callbackResp.ActionCode != constant.ActionAllow || callbackResp.ErrCode != 0 { if callbackResp.ActionCode != constant.ActionAllow || callbackResp.ErrCode != 0 {
rResp.ErrCode = int32(callbackResp.ErrCode) rResp.ErrCode = int32(callbackResp.ErrCode)
rResp.ErrMsg = callbackResp.ErrMsg rResp.ErrMsg = callbackResp.ErrMsg
for _, value := range req.ReactionExtensionList { for _, value := range callbackResp.ResultReactionExtensionList {
temp := new(msg.KeyValueResp) temp := new(msg.KeyValueResp)
temp.KeyValue = value temp.KeyValue = value.KeyValue
temp.ErrMsg = callbackResp.ErrMsg temp.ErrMsg = value.ErrMsg
temp.ErrCode = 100 temp.ErrCode = value.ErrCode
rResp.Result = append(rResp.Result, temp) rResp.Result = append(rResp.Result, temp)
} }
return &rResp, nil return &rResp, nil

6
pkg/common/db/mongoModel.go
View File

@ -273,7 +273,7 @@ func (d *DataBases) GetMsgBySeqList(uid string, seqList []uint32, operationID st
func (d *DataBases) GetUserMsgListByIndex(ID string, index int64) (*UserChat, error) { func (d *DataBases) GetUserMsgListByIndex(ID string, index int64) (*UserChat, error) {
ctx, _ := context.WithTimeout(context.Background(), time.Duration(config.Config.Mongo.DBTimeout)*time.Second) ctx, _ := context.WithTimeout(context.Background(), time.Duration(config.Config.Mongo.DBTimeout)*time.Second)
c := d.mongoClient.Database(config.Config.Mongo.DBDatabase).Collection(cChat) c := d.mongoClient.Database(config.Config.Mongo.DBDatabase).Collection(cChat)
regex := fmt.Sprintf("^%s", ID) regex := fmt.Sprintf("^%s:", ID)
findOpts := options.Find().SetLimit(1).SetSkip(index).SetSort(bson.M{"uid": 1}) findOpts := options.Find().SetLimit(1).SetSkip(index).SetSort(bson.M{"uid": 1})
var msgs []UserChat var msgs []UserChat
//primitive.Regex{Pattern: regex} //primitive.Regex{Pattern: regex}
@ -330,7 +330,7 @@ func (d *DataBases) ReplaceMsgToBlankByIndex(suffixID string, index int) (replac
func (d *DataBases) GetNewestMsg(ID string) (msg *open_im_sdk.MsgData, err error) { func (d *DataBases) GetNewestMsg(ID string) (msg *open_im_sdk.MsgData, err error) {
ctx, _ := context.WithTimeout(context.Background(), time.Duration(config.Config.Mongo.DBTimeout)*time.Second) ctx, _ := context.WithTimeout(context.Background(), time.Duration(config.Config.Mongo.DBTimeout)*time.Second)
c := d.mongoClient.Database(config.Config.Mongo.DBDatabase).Collection(cChat) c := d.mongoClient.Database(config.Config.Mongo.DBDatabase).Collection(cChat)
regex := fmt.Sprintf("^%s", ID) regex := fmt.Sprintf("^%s:", ID)
findOpts := options.Find().SetLimit(1).SetSort(bson.M{"uid": -1}) findOpts := options.Find().SetLimit(1).SetSort(bson.M{"uid": -1})
var userChats []UserChat var userChats []UserChat
cursor, err := c.Find(ctx, bson.M{"uid": bson.M{"$regex": regex}}, findOpts) cursor, err := c.Find(ctx, bson.M{"uid": bson.M{"$regex": regex}}, findOpts)
@ -358,7 +358,7 @@ func (d *DataBases) GetNewestMsg(ID string) (msg *open_im_sdk.MsgData, err error
func (d *DataBases) GetOldestMsg(ID string) (msg *open_im_sdk.MsgData, err error) { func (d *DataBases) GetOldestMsg(ID string) (msg *open_im_sdk.MsgData, err error) {
ctx, _ := context.WithTimeout(context.Background(), time.Duration(config.Config.Mongo.DBTimeout)*time.Second) ctx, _ := context.WithTimeout(context.Background(), time.Duration(config.Config.Mongo.DBTimeout)*time.Second)
c := d.mongoClient.Database(config.Config.Mongo.DBDatabase).Collection(cChat) c := d.mongoClient.Database(config.Config.Mongo.DBDatabase).Collection(cChat)
regex := fmt.Sprintf("^%s", ID) regex := fmt.Sprintf("^%s:", ID)
findOpts := options.Find().SetLimit(1).SetSort(bson.M{"uid": 1}) findOpts := options.Find().SetLimit(1).SetSort(bson.M{"uid": 1})
var userChats []UserChat var userChats []UserChat
cursor, err := c.Find(ctx, bson.M{"uid": bson.M{"$regex": regex}}, findOpts) cursor, err := c.Find(ctx, bson.M{"uid": bson.M{"$regex": regex}}, findOpts)

704
pkg/proto/sdk_ws/ws.pb.go
View File

File diff suppressed because it is too large Load Diff

7
pkg/proto/sdk_ws/ws.proto
View File

@ -266,9 +266,10 @@ message MsgData {
bytes msgDataList = 21; bytes msgDataList = 21;
string attachedInfo = 22; string attachedInfo = 22;
string ex = 23; string ex = 23;
bool isReact = 24;
bool isExternalExtensions = 25; bool isReact = 40;
int64 msgFirstModifyTime = 26; bool isExternalExtensions = 41;
int64 msgFirstModifyTime = 42;
} }
message OfflinePushInfo{ message OfflinePushInfo{