Skip to content

Commit 299b616

Browse files
mo3etmo3et
authored
refactor: optimize conversation notification structure. (#622)
* refactor: optimize conversation notification structure. * optmize donotification structure in conversation. * remove unnecessary contents. * update log level and unnecessary wrap. * fix: update uncorrect contents.
1 parent 8c141a5 commit 299b616

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+300
-944
lines changed

‎cmd/gordon_main.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ func main() {
200200
}
201201

202202
//
203-
//funcation main() {
203+
//func main() {
204204
// testClientNum := 100
205205
// intervalSleep := 2
206206
// imIP := "43.128.5.63"
@@ -226,7 +226,7 @@ func main() {
226226
//
227227
//}
228228

229-
//funcation printCallerNameAndLine() string {
229+
//func printCallerNameAndLine() string {
230230
// pc, _, line, _ := runtime.Caller(2)
231231
// return runtime.FuncForPC(pc).Name() + "()@" + strconv.Itoa(line) + ": "
232232
//}

‎cmd/sk_main.go

+6-5
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,17 @@ package main
1616

1717
import (
1818
"errors"
19+
"time"
20+
1921
"github.com/openimsdk/openim-sdk-core/v3/pkg/db"
2022
"github.com/openimsdk/openim-sdk-core/v3/pkg/utils"
2123
"github.com/openimsdk/openim-sdk-core/v3/test"
2224
"github.com/openimsdk/tools/log"
23-
"time"
2425
)
2526

2627
var allDB []*db.DataBase
2728

28-
//funcation TestDB(loginUserID string) {
29+
//func TestDB(loginUserID string) {
2930
// operationID := utils.OperationIDGenerator()
3031
// dbUser, err := db.NewDataBase(loginUserID, "/data/test/Open-IM-Server/db/sdk/", operationID)
3132
// if err != nil {
@@ -97,7 +98,7 @@ func main() {
9798
strMyUidx := "3370431052"
9899
tokenx := test.RunGetToken(strMyUidx)
99100
//tokenx := "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJVSUQiOiI3MDcwMDgxNTMiLCJQbGF0Zm9ybSI6IkFuZHJvaWQiLCJleHAiOjE5NjY0MTJ1XjJZGWj5fB3mqC7p6ytxSarvxZfsABwIjoxNjUxMDU1MDU2fQ.aWvmJ_sQxXmT5nKwiM5QsF9-tfkldzOYZtRD3nrUuko"
100-
//go funcation() {
101+
//go func() {
101102
// time.Sleep(2 * time.Second)
102103
// test.InOutLogou()
103104
//}()
@@ -158,7 +159,7 @@ func main() {
158159
}
159160

160161
//
161-
//funcation main() {
162+
//func main() {
162163
// testClientNum := 100
163164
// intervalSleep := 2
164165
// imIP := "43.128.5.63"
@@ -184,7 +185,7 @@ func main() {
184185
//
185186
//}
186187

187-
//funcation printCallerNameAndLine() string {
188+
//func printCallerNameAndLine() string {
188189
// pc, _, line, _ := runtime.Caller(2)
189190
// return runtime.FuncForPC(pc).Name() + "()@" + strconv.Itoa(line) + ": "
190191
//}

‎internal/conversation_msg/conversation.go

+11-10
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ package conversation_msg
1717
import (
1818
"context"
1919
"errors"
20+
"sort"
21+
"strings"
22+
"time"
23+
2024
_ "github.com/openimsdk/openim-sdk-core/v3/internal/common"
2125
"github.com/openimsdk/openim-sdk-core/v3/internal/util"
2226
"github.com/openimsdk/openim-sdk-core/v3/pkg/common"
@@ -28,9 +32,6 @@ import (
2832
"github.com/openimsdk/openim-sdk-core/v3/pkg/utils"
2933
"github.com/openimsdk/openim-sdk-core/v3/sdk_struct"
3034
"github.com/openimsdk/tools/utils/datautil"
31-
"sort"
32-
"strings"
33-
"time"
3435

3536
"github.com/jinzhu/copier"
3637

@@ -247,7 +248,7 @@ func (c *Conversation) typingStatusUpdate(ctx context.Context, recvID, msgTip st
247248

248249
}
249250

250-
// funcation (c *Conversation) markMessageAsReadByConID(callback open_im_sdk_callback.Base, msgIDList sdk.MarkMessageAsReadByConIDParams, conversationID, operationID string) {
251+
// func (c *Conversation) markMessageAsReadByConID(callback open_im_sdk_callback.Base, msgIDList sdk.MarkMessageAsReadByConIDParams, conversationID, operationID string) {
251252
// var localMessage db.LocalChatLog
252253
// var newMessageIDList []string
253254
// messages, err := c.db.GetMultipleMessage(msgIDList)
@@ -561,7 +562,7 @@ func (c *Conversation) delMsgBySeqSplit(seqList []uint32) error {
561562
}
562563

563564
// old WS method
564-
//funcation (c *Conversation) deleteMessageFromSvr(callback open_im_sdk_callback.Base, s *sdk_struct.MsgStruct, operationID string) {
565+
//func (c *Conversation) deleteMessageFromSvr(callback open_im_sdk_callback.Base, s *sdk_struct.MsgStruct, operationID string) {
565566
// seq, err := c.db.GetMsgSeqByClientMsgID(s.ClientMsgID)
566567
// common.CheckDBErrCallback(callback, err, operationID)
567568
// if seq == 0 {
@@ -879,7 +880,7 @@ func (c *Conversation) getMessageListReactionExtensions(ctx context.Context, con
879880

880881
}
881882

882-
// funcation (c *Conversation) getMessageListSomeReactionExtensions(callback open_im_sdk_callback.Base, messageList []*sdk_struct.MsgStruct, keyList []string, operationID string) server_api_params.GetMessageListReactionExtensionsResp {
883+
// func (c *Conversation) getMessageListSomeReactionExtensions(callback open_im_sdk_callback.Base, messageList []*sdk_struct.MsgStruct, keyList []string, operationID string) server_api_params.GetMessageListReactionExtensionsResp {
883884
// if len(messageList) == 0 {
884885
// common.CheckAnyErrCallback(callback, 201, errors.New("message list is null"), operationID)
885886
// }
@@ -936,7 +937,7 @@ func (c *Conversation) getMessageListReactionExtensions(ctx context.Context, con
936937
// return result
937938
// }
938939
//
939-
// funcation (c *Conversation) setTypeKeyInfo(callback open_im_sdk_callback.Base, s *sdk_struct.MsgStruct, typeKey, ex string, isCanRepeat bool, operationID string) []*server_api_params.ExtensionResult {
940+
// func (c *Conversation) setTypeKeyInfo(callback open_im_sdk_callback.Base, s *sdk_struct.MsgStruct, typeKey, ex string, isCanRepeat bool, operationID string) []*server_api_params.ExtensionResult {
940941
// message, err := c.db.GetMessageController(s)
941942
// common.CheckDBErrCallback(callback, err, operationID)
942943
// if message.Status != constant.MsgStatusSendSuccess {
@@ -1074,7 +1075,7 @@ func (c *Conversation) getMessageListReactionExtensions(ctx context.Context, con
10741075
// return apiResp.ApiResult.Result
10751076
// }
10761077
//
1077-
// funcation getIndexTypeKey(typeKey string, index int) string {
1078+
// func getIndexTypeKey(typeKey string, index int) string {
10781079
// return typeKey + "$" + utils.IntToString(index)
10791080
// }
10801081
func getPrefixTypeKey(typeKey string) string {
@@ -1085,7 +1086,7 @@ func getPrefixTypeKey(typeKey string) string {
10851086
return ""
10861087
}
10871088

1088-
//funcation (c *Conversation) getTypeKeyListInfo(callback open_im_sdk_callback.Base, s *sdk_struct.MsgStruct, keyList []string, operationID string) (result []*sdk.SingleTypeKeyInfoSum) {
1089+
//func (c *Conversation) getTypeKeyListInfo(callback open_im_sdk_callback.Base, s *sdk_struct.MsgStruct, keyList []string, operationID string) (result []*sdk.SingleTypeKeyInfoSum) {
10891090
// message, err := c.db.GetMessageController(s)
10901091
// common.CheckDBErrCallback(callback, err, operationID)
10911092
// if message.Status != constant.MsgStatusSendSuccess {
@@ -1126,7 +1127,7 @@ func getPrefixTypeKey(typeKey string) string {
11261127
// return result
11271128
//}
11281129
//
1129-
//funcation (c *Conversation) getAllTypeKeyInfo(callback open_im_sdk_callback.Base, s *sdk_struct.MsgStruct, operationID string) (result []*sdk.SingleTypeKeyInfoSum) {
1130+
//func (c *Conversation) getAllTypeKeyInfo(callback open_im_sdk_callback.Base, s *sdk_struct.MsgStruct, operationID string) (result []*sdk.SingleTypeKeyInfoSum) {
11301131
// message, err := c.db.GetMessageController(s)
11311132
// common.CheckDBErrCallback(callback, err, operationID)
11321133
// if message.Status != constant.MsgStatusSendSuccess {

‎internal/conversation_msg/conversation_msg.go

+25-23
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import (
1919
"encoding/json"
2020
"errors"
2121
"math"
22+
"sync"
2223

2324
"github.com/openimsdk/openim-sdk-core/v3/internal/business"
2425
"github.com/openimsdk/openim-sdk-core/v3/internal/cache"
@@ -61,28 +62,29 @@ var SearchContentType = []int{constant.Text, constant.AtText, constant.File}
6162

6263
type Conversation struct {
6364
*interaction.LongConnMgr
64-
conversationSyncer *syncer.Syncer[*model_struct.LocalConversation, pbConversation.GetOwnerConversationResp, string]
65-
db db_interface.DataBase
66-
ConversationListener func() open_im_sdk_callback.OnConversationListener
67-
msgListener func() open_im_sdk_callback.OnAdvancedMsgListener
68-
msgKvListener func() open_im_sdk_callback.OnMessageKvInfoListener
69-
batchMsgListener func() open_im_sdk_callback.OnBatchMsgListener
70-
recvCH chan common.Cmd2Value
71-
loginUserID string
72-
platformID int32
73-
DataDir string
74-
friend *friend.Friend
75-
group *group.Group
76-
user *user.User
77-
file *file.File
78-
business *business.Business
79-
messageController *MessageController
80-
cache *cache.Cache[string, *model_struct.LocalConversation]
81-
full *full.Full
82-
maxSeqRecorder MaxSeqRecorder
83-
IsExternalExtensions bool
84-
msgOffset int
85-
progress int
65+
conversationSyncer *syncer.Syncer[*model_struct.LocalConversation, pbConversation.GetOwnerConversationResp, string]
66+
db db_interface.DataBase
67+
ConversationListener func() open_im_sdk_callback.OnConversationListener
68+
msgListener func() open_im_sdk_callback.OnAdvancedMsgListener
69+
msgKvListener func() open_im_sdk_callback.OnMessageKvInfoListener
70+
batchMsgListener func() open_im_sdk_callback.OnBatchMsgListener
71+
recvCH chan common.Cmd2Value
72+
loginUserID string
73+
platformID int32
74+
DataDir string
75+
friend *friend.Friend
76+
group *group.Group
77+
user *user.User
78+
file *file.File
79+
business *business.Business
80+
messageController *MessageController
81+
cache *cache.Cache[string, *model_struct.LocalConversation]
82+
full *full.Full
83+
maxSeqRecorder MaxSeqRecorder
84+
IsExternalExtensions bool
85+
msgOffset int
86+
progress int
87+
conversationSyncMutex sync.Mutex
8688

8789
startTime time.Time
8890

@@ -973,7 +975,7 @@ func (c *Conversation) msgHandleByContentType(msg *sdk_struct.MsgStruct) (err er
973975
}
974976
msg.Content = ""
975977

976-
return utils.Wrap(err, "")
978+
return errs.Wrap(err)
977979
}
978980

979981
func (c *Conversation) updateConversation(lc *model_struct.LocalConversation, cs map[string]*model_struct.LocalConversation) {

0 commit comments

Comments
 (0)