Merge branch 'openimsdk:main' into main

.env

@@ -8,8 +8,8 @@ PROMETHEUS_IMAGE=prom/prometheus:v2.45.6
 ALERTMANAGER_IMAGE=prom/alertmanager:v0.27.0
 GRAFANA_IMAGE=grafana/grafana:11.0.1
 
-OPENIM_WEB_FRONT_IMAGE=openim/openim-web-front:release-v3.5.1
-OPENIM_ADMIN_FRONT_IMAGE=openim/openim-admin-front:release-v1.7
+OPENIM_WEB_FRONT_IMAGE=openim/openim-web-front:release-v3.8.0
+OPENIM_ADMIN_FRONT_IMAGE=openim/openim-admin-front:release-v1.8.0
 
 #FRONT_IMAGE: use aliyun images
 #OPENIM_WEB_FRONT_IMAGE=registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-web-front:release-v3.5.1

internal/rpc/msg/callback.go

@@ -41,6 +41,7 @@ func toCommonCallback(ctx context.Context, msg *pbchat.SendMsgReq, command strin
 		MsgFrom:          msg.MsgData.MsgFrom,
 		ContentType:      msg.MsgData.ContentType,
 		Status:           msg.MsgData.Status,
+		SendTime:         msg.MsgData.SendTime,
 		CreateTime:       msg.MsgData.CreateTime,
 		AtUserIDList:     msg.MsgData.AtUserIDList,
 		SenderFaceURL:    msg.MsgData.SenderFaceURL,

pkg/apistruct/msg.go

@@ -91,7 +91,7 @@ type OANotificationElem struct {
 	NotificationType    int32        `mapstructure:"notificationType"    json:"notificationType"    validate:"required"`
 	Text                string       `mapstructure:"text"                json:"text"                validate:"required"`
 	Url                 string       `mapstructure:"url"                 json:"url"`
-	MixType             int32        `mapstructure:"mixType"             json:"mixType"`
+	MixType             int32        `mapstructure:"mixType"             json:"mixType"             validate:"gte=0,lte=5"`
 	PictureElem         *PictureElem `mapstructure:"pictureElem"         json:"pictureElem"`
 	SoundElem           *SoundElem   `mapstructure:"soundElem"           json:"soundElem"`
 	VideoElem           *VideoElem   `mapstructure:"videoElem"           json:"videoElem"`

pkg/callbackstruct/common.go

@@ -35,6 +35,7 @@ type CommonCallbackReq struct {
 	MsgFrom          int32    `json:"msgFrom"`
 	ContentType      int32    `json:"contentType"`
 	Status           int32    `json:"status"`
+	SendTime         int64    `json:"sendTime"`
 	CreateTime       int64    `json:"createTime"`
 	Content          string   `json:"content"`
 	Seq              uint32   `json:"seq"`

pkg/common/storage/controller/friend.go

@@ -192,6 +192,7 @@ func (f *friendDatabase) BecomeFriends(ctx context.Context, ownerUserID string,
 		if err != nil {
 			return err
 		}
+		cache = cache.DelFriendIDs(ownerUserID).DelMaxFriendVersion(ownerUserID)
 		if len(newMyFriendIDs) > 0 {
 			cache = cache.DelFriendIDs(newMyFriendIDs...)
 			cache = cache.DelFriends(ownerUserID, newMyFriendIDs).DelMaxFriendVersion(newMyFriendIDs...)

pkg/rpcclient/friend.go

@@ -78,8 +78,8 @@ func (f *FriendRpcClient) GetFriendIDs(ctx context.Context, ownerUserID string)
 	return resp.FriendIDs, nil
 }
 
-func (b *FriendRpcClient) IsBlack(ctx context.Context, possibleBlackUserID, userID string) (bool, error) {
-	r, err := b.Client.IsBlack(ctx, &relation.IsBlackReq{UserID1: possibleBlackUserID, UserID2: userID})
+func (f *FriendRpcClient) IsBlack(ctx context.Context, possibleBlackUserID, userID string) (bool, error) {
+	r, err := f.Client.IsBlack(ctx, &relation.IsBlackReq{UserID1: possibleBlackUserID, UserID2: userID})
 	if err != nil {
 		return false, err
 	}