blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-06 04:15:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/tuoyun' into tuoyun

Browse Source
This commit is contained in:
Gordon 2022-04-21 16:47:10 +08:00
commit 67010e20d7
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/rpc/msg/work_moments_notification.go
View File

@ -11,7 +11,7 @@ import (
) )
func WorkMomentSendNotification(operationID, sendID, recvID string, notificationMsg *pbOffice.WorkMomentNotificationMsg) { func WorkMomentSendNotification(operationID, sendID, recvID string, notificationMsg *pbOffice.WorkMomentNotificationMsg) {
log.NewInfo(operationID, utils.GetSelfFuncName(), recvID) log.NewInfo(operationID, utils.GetSelfFuncName(), sendID, recvID, notificationMsg)
WorkMomentNotification(operationID, sendID, recvID, notificationMsg) WorkMomentNotification(operationID, sendID, recvID, notificationMsg)
} }
@ -29,7 +29,7 @@ func WorkMomentNotification(operationID, sendID, recvID string, m proto.Message)
RecvID: recvID, RecvID: recvID,
MsgFrom: constant.UserMsgType, MsgFrom: constant.UserMsgType,
ContentType: constant.WorkMomentNotification, ContentType: constant.WorkMomentNotification,
SessionType: constant.UserMsgType, SessionType: constant.SingleChatType,
OperationID: operationID, OperationID: operationID,
} }
n.Content, err = proto.Marshal(m) n.Content, err = proto.Marshal(m)

6
pkg/base_info/work_moments_struct.go
View File

@ -50,13 +50,13 @@ type WorkMoment struct {
Content string `json:"content"` Content string `json:"content"`
LikeUserList []*WorkMomentUser `json:"likeUsers"` LikeUserList []*WorkMomentUser `json:"likeUsers"`
Comments []*Comment `json:"comments"` Comments []*Comment `json:"comments"`
FaceURL string `json:"face_url"` FaceURL string `json:"faceUrl"`
UserName string `json:"user_name"` UserName string `json:"userName"`
//Permission int32 `json:"permission"` //Permission int32 `json:"permission"`
//PermissionUserIDList []string `json:"permissionUserIDList"` //PermissionUserIDList []string `json:"permissionUserIDList"`
//PermissionGroupIDList []string `json:"permissionGroupIDList"` //PermissionGroupIDList []string `json:"permissionGroupIDList"`
AtUserList []*WorkMomentUser `json:"atUsers"` AtUserList []*WorkMomentUser `json:"atUsers"`
CreateTime int32 `json:"createTime,omitempty"` CreateTime int32 `json:"createTime"`
} }
type WorkMomentUser struct { type WorkMomentUser struct {

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

@ -575,7 +575,7 @@ type WorkMoment struct {
AtUserList []*AtUser `bson:"at_user_list"` AtUserList []*AtUser `bson:"at_user_list"`
Comments []*Comment `bson:"comments"` Comments []*Comment `bson:"comments"`
PermissionUserIDList []string `bson:"permission_user_id_list"` PermissionUserIDList []string `bson:"permission_user_id_list"`
Permission int32 `bson:"is_private"` Permission int32 `bson:"permission"`
CreateTime int32 `bson:"create_time"` CreateTime int32 `bson:"create_time"`
} }