msb-public
/
Open-IM-Server
mirror of https://github.com/OpenIMSDK/Open-IM-Server
2
0
Code Issues Projects Releases Wiki Activity

ex msg

Browse Source
test-errcode
wangchuxiao 2 years ago
parent a9edd036e0
commit df78d87ec5
3 changed files with 43 additions and 46 deletions
Show Stats Download Patch File Download Diff File

2
internal/cron_task/clear_msg.go
Unescape View File

@ -54,7 +54,7 @@ func DeleteMongoMsgAndResetRedisSeq(operationID, userID string) error {
if minSeq == 0 { if minSeq == 0 {
return nil return nil
} }
log.NewDebug(operationID, utils.GetSelfFuncName(), "delMsgIDMap: ", delStruct, "minSeq", minSeq) log.NewDebug(operationID, utils.GetSelfFuncName(), "delMsgIDStruct: ", delStruct, "minSeq", minSeq)
err = db.DB.SetUserMinSeq(userID, minSeq) err = db.DB.SetUserMinSeq(userID, minSeq)
return utils.Wrap(err, "") return utils.Wrap(err, "")
} }

85
pkg/common/db/extend_msg_mongo_model.go
Unescape View File

@ -2,19 +2,24 @@ package db
import ( import (
"Open_IM/pkg/common/config" "Open_IM/pkg/common/config"
"Open_IM/pkg/utils"
"context" "context"
"fmt"
"go.mongodb.org/mongo-driver/bson/primitive"
"strconv" "strconv"
"time" "time"
"go.mongodb.org/mongo-driver/bson"
) )
const cExtendMsgSet = "extend_msg_set" const cExtendMsgSet = "extend_msg_set"
type ExtendMsgSet struct { type ExtendMsgSet struct {
ID string `bson:"id" json:"ID"` ID string `bson:"id" json:"ID"`
ExtendMsgs []*ExtendMsg `bson:"extend_msg" json:"extendMsg"` ExtendMsgs []*ExtendMsg `bson:"extend_msgs" json:"extendMsgs"`
LatestUpdateTime int32 `bson:"latest_update_time" json:"latestUpdateTime"` LatestUpdateTime int32 `bson:"latest_update_time" json:"latestUpdateTime"`
AttachedInfo string `bson:"attached_info" json:"attachedInfo"` AttachedInfo *string `bson:"attached_info" json:"attachedInfo"`
Ex string `bson:"ex" json:"ex"` Ex *string `bson:"ex" json:"ex"`
ExtendMsgNum int32 `bson:"extend_msg_num" json:"extendMsgNum"` ExtendMsgNum int32 `bson:"extend_msg_num" json:"extendMsgNum"`
CreateTime int32 `bson:"create_time" json:"createTime"` CreateTime int32 `bson:"create_time" json:"createTime"`
} }
@ -30,31 +35,6 @@ type ExtendMsg struct {
CreateTime int32 `bson:"create_time" json:"createTime"` CreateTime int32 `bson:"create_time" json:"createTime"`
} }
//type Vote struct {
// Content string `bson:"content" json:"content"`
// AttachedInfo string `bson:"attached_info" json:"attachedInfo"`
// Ex string `bson:"ex" json:"ex"`
// Options []*Options `bson:"options" json:"options"`
//}
//
//type Options struct {
// Content string `bson:"content" json:"content"`
// AttachedInfo string `bson:"attached_info" json:"attachedInfo"`
// Ex string `bson:"ex" json:"ex"`
// VoteUserIDList []string `bson:"vote_user_id_list" json:"voteUserIDList"`
//}
//
//type ExtendMsgComment struct {
// UserID string `bson:"user_id" json:"userID"`
// ReplyUserID string `bson:"reply_user_id" json:"replyUserID"`
// ReplyContentID string `bson:"reply_content_id" json:"replyContentID"`
// ContentID string `bson:"content_id" json:"contentID"`
// Content string `bson:"content" json:"content"`
// CreateTime int32 `bson:"create_time" json:"createTime"`
// AttachedInfo string `bson:"attached_info" json:"attachedInfo"`
// Ex string `bson:"ex" json:"ex"`
//}
func GetExtendMsgSetID(ID string, index int32) string { func GetExtendMsgSetID(ID string, index int32) string {
return ID + ":" + strconv.Itoa(int(index)) return ID + ":" + strconv.Itoa(int(index))
} }
@ -66,10 +46,19 @@ func (d *DataBases) CreateExtendMsgSet(set *ExtendMsgSet) error {
return err return err
} }
func (d *DataBases) GetAllExtendMsgSet(ID string) ([]*ExtendMsgSet, error) { func (d *DataBases) GetAllExtendMsgSet(ID string) (sets []*ExtendMsgSet, 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(cExtendMsgSet) c := d.mongoClient.Database(config.Config.Mongo.DBDatabase).Collection(cExtendMsgSet)
regex := fmt.Sprintf("^%s", ID)
cursor, err := c.Find(ctx, bson.M{"uid": primitive.Regex{Pattern: regex}})
if err != nil {
return nil, utils.Wrap(err, "")
}
err = cursor.All(context.Background(), &sets)
if err != nil {
return nil, utils.Wrap(err, fmt.Sprintf("cursor is %s", cursor.Current.String()))
}
return sets, nil
} }
type GetExtendMsgSetOpts struct { type GetExtendMsgSetOpts struct {
@ -77,24 +66,30 @@ type GetExtendMsgSetOpts struct {
} }
func (d *DataBases) GetExtendMsgSet(ID string, index int32, opts *GetExtendMsgSetOpts) (*ExtendMsgSet, error) { func (d *DataBases) GetExtendMsgSet(ID string, index int32, opts *GetExtendMsgSetOpts) (*ExtendMsgSet, 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(cExtendMsgSet) c := d.mongoClient.Database(config.Config.Mongo.DBDatabase).Collection(cExtendMsgSet)
var set ExtendMsgSet
err := c.FindOne(ctx, bson.M{"uid": GetExtendMsgSetID(ID, index)}).Decode(&set)
return &set, err
} }
func (d *DataBases) InsertExtendMsg(ID string, msg *ExtendMsg) error { func (d *DataBases) InsertExtendMsg(ID string, index int32, msg *ExtendMsg) 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(cExtendMsgSet) c := d.mongoClient.Database(config.Config.Mongo.DBDatabase).Collection(cExtendMsgSet)
return nil _, err := c.UpdateOne(ctx, bson.M{"uid": GetExtendMsgSetID(ID, index)}, bson.M{"$set": bson.M{"create_time": utils.GetCurrentTimestampBySecond(), "$inc": bson.M{"extend_msg_num": 1}, "$push": bson.M{"extend_msgs": msg}}})
return err
} }
func (d *DataBases) UpdateOneExtendMsgSet(ID string, index, MsgIndex int32, msg *ExtendMsg, msgSet *ExtendMsgSet) error { func (d *DataBases) UpdateOneExtendMsgSet(ID string, index, MsgIndex int32, msg *ExtendMsg, msgSet *ExtendMsgSet) 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(cExtendMsgSet) c := d.mongoClient.Database(config.Config.Mongo.DBDatabase).Collection(cExtendMsgSet)
return nil _, err := c.UpdateOne(ctx, bson.M{"uid": GetExtendMsgSetID(ID, index)}, bson.M{})
return err
} }
func (d *DataBases) GetExtendMsgList(ID string, index, msgStartIndex, msgEndIndex int32) ([]*ExtendMsgSet, error) { func (d *DataBases) GetExtendMsgList(ID string, index, msgStartIndex, msgEndIndex int32) (extendMsgList []*ExtendMsg, 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(cExtendMsgSet) c := d.mongoClient.Database(config.Config.Mongo.DBDatabase).Collection(cExtendMsgSet)
return nil, nil err = c.FindOne(ctx, bson.M{"uid": GetExtendMsgSetID(ID, index)}).Decode(&extendMsgList)
return extendMsgList, err
} }

2
pkg/utils/strings.go
Unescape View File

@ -96,6 +96,8 @@ func GetConversationIDBySessionType(sourceID string, sessionType int) string {
return "single_" + sourceID return "single_" + sourceID
case constant.GroupChatType: case constant.GroupChatType:
return "group_" + sourceID return "group_" + sourceID
case constant.SuperGroupChatType:
return "super_group_" + sourceID
case constant.NotificationChatType: case constant.NotificationChatType:
return "notification_" + sourceID return "notification_" + sourceID
} }

Write Preview
Loading…
Cancel
Save