merge: update release-v3.8 with main changes. (#2708)

IM/open-im-server

Fork 0

mirror of https://github.com/openimsdk/open-im-server.git synced 2026-05-11 20:45:57 +08:00

Browse Source

* chore: revert tool pkg version. (#2476)

* feat: update go mod pkg to latest.

* revert tool pkg version.

* feat: update grafana template (#2484)

* feat: update web front images (#2487)

* fix: import del cache (#2492)

* fix:update recive name to same (#2493)

* fix: fix-validate message. (#2499)

* h (#2501)

* refactor: refactor workflows structure. (#2511)

* refactor: refactor workflows contents.

* add tool workflows.

* update field.

* fix: remove chat error.

* Fix err.

* fix error.

* remove cn comment.

* update workflows files.

* update infra config.

* move workflows.

* fix: solve uncorrect outdated msg get. (#2513)

* refactor: refactor workflows contents.

* add tool workflows.

* update field.

* fix: remove chat error.

* Fix err.

* fix error.

* remove cn comment.

* update workflows files.

* update infra config.

* move workflows.

* feat: update bot.

* fix: solve uncorrect outdated msg get.

* update get docIDs logic.

* update

* update skip logic.

* fix

* update.

* feat: update issue translator in workflows (#2521)

* refactor: refactor workflows contents.

* add tool workflows.

* update field.

* fix: remove chat error.

* Fix err.

* fix error.

* remove cn comment.

* update workflows files.

* update infra config.

* move workflows.

* feat: update bot.

* fix: solve uncorrect outdated msg get.

* update get docIDs logic.

* update

* update skip logic.

* fix

* update.

* feat: update issue translator.

* fix: pass getMinioImageThumbnailKey error. (#2532)

* refactor: refactor workflows contents.

* add tool workflows.

* update field.

* fix: remove chat error.

* Fix err.

* fix error.

* remove cn comment.

* update workflows files.

* update infra config.

* move workflows.

* feat: update bot.

* fix: solve uncorrect outdated msg get.

* update get docIDs logic.

* update

* update skip logic.

* fix

* update.

* feat: update issue translator.

* fix: pass getMinioImageThumbnailKey error.

* docs: update CLA comments contents. (#2534)

* refactor: refactor workflows contents.

* add tool workflows.

* update field.

* fix: remove chat error.

* Fix err.

* fix error.

* remove cn comment.

* update workflows files.

* update infra config.

* move workflows.

* feat: update bot.

* fix: solve uncorrect outdated msg get.

* update get docIDs logic.

* update

* update skip logic.

* fix

* update.

* docs: update CLA comments contents.

* update workflow file.

* fix: the log key value is not aligned (#2527)

* fix: GroupApplicationAcceptedNotification

* fix: NotificationUserInfoUpdate

* cicd: robot automated Change

* fix: component

* fix: getConversationInfo

* feat: cron task

* fix: minio config url recognition error

* update gomake version

* fix: seq conversion bug

* fix: redis pipe exec

* fix: ImportFriends

* fix: A large number of logs keysAndValues length is not even

---------

Co-authored-by: withchao <withchao@users.noreply.github.com>

* fix 细节 (#2525)

1、统一结构体方法 receiver，都用 pointer
2、使用 errors.Is 来做错误判断
3、修复单词拼写的错误

* Fix config (#2541)

* feat: remove double quotation marks

* feat: test

* feat: default close prometheus

* Fix: solve conversation blocking in private chat when non friendship. (#2542)

* refactor: refactor workflows contents.

* add tool workflows.

* update field.

* fix: remove chat error.

* Fix err.

* fix error.

* remove cn comment.

* update workflows files.

* update infra config.

* move workflows.

* feat: update bot.

* fix: solve uncorrect outdated msg get.

* update get docIDs logic.

* update

* update skip logic.

* fix

* update.

* fix: update contribute cla.

* fix: solve conversations bug.

* fix:get msg error (#2494)

* fix:mgo delete err (#2496)

* fix:doPut error (#2495)

* feat: update set conversation logic. (#2544)

* refactor: refactor workflows contents.

* add tool workflows.

* update field.

* fix: remove chat error.

* Fix err.

* fix error.

* remove cn comment.

* update workflows files.

* update infra config.

* move workflows.

* feat: update bot.

* fix: solve uncorrect outdated msg get.

* update get docIDs logic.

* update

* update skip logic.

* fix

* update.

* feat: update set conversation logic.

* content format.

* update setConversation logic.

* update conversation logic.

* update logic.

* Groupmsg (#2548)

* feat: add EnableHistoryForNewMembers

* feat: change name

* refactor: move first create conversation

* fix: set min seq

* feat: implement `SetGroupInfoEX` interface. (#2552)

* refactor: refactor workflows contents.

* add tool workflows.

* update field.

* fix: remove chat error.

* Fix err.

* fix error.

* remove cn comment.

* update workflows files.

* update infra config.

* move workflows.

* feat: update bot.

* fix: solve uncorrect outdated msg get.

* update get docIDs logic.

* update

* update skip logic.

* fix

* update.

* feat: implement `SetGroupInfoEX` interface.

* remove null interface.

* update router.

* fix: set min seq (#2556)

* fix:log

* fix: set min seq

* Fix push (#2559)

* fix:log

* fix: add log

* fix: del return

* fix: push config

* feat: add push err log and extend push wait time

* feat: group config

* feat: add log in write binary msg

* feat: Modify Prometheus data scraping ports and reserve port space.

* feat: change group rpc num

* feat: change log

* fix: remove quotation mark

* fix: read seq is written to mongo, online status redis cluster is supported (#2558)

* fix: GroupApplicationAcceptedNotification

* fix: NotificationUserInfoUpdate

* cicd: robot automated Change

* fix: component

* fix: getConversationInfo

* feat: cron task

* fix: minio config url recognition error

* update gomake version

* fix: seq conversion bug

* fix: redis pipe exec

* fix: ImportFriends

* fix: A large number of logs keysAndValues length is not even

* feat: mark read aggregate write

* feat: online status supports redis cluster

* merge

* read seq is written to mongo

---------

Co-authored-by: withchao <withchao@users.noreply.github.com>

* fix: invitation to join group notification opuser is null (#2562)

* fix: GroupApplicationAcceptedNotification

* fix: NotificationUserInfoUpdate

* cicd: robot automated Change

* fix: component

* fix: getConversationInfo

* feat: cron task

* fix: minio config url recognition error

* update gomake version

* fix: seq conversion bug

* fix: redis pipe exec

* fix: ImportFriends

* fix: A large number of logs keysAndValues length is not even

* feat: mark read aggregate write

* feat: online status supports redis cluster

* merge

* read seq is written to mongo

* fix: invitation to join group notification

---------

Co-authored-by: withchao <withchao@users.noreply.github.com>

* Fix set convsation (#2564)

* fix: set conversation unequal check

* fix: check update list

* fix: delay deleteObject func. (#2566)

* refactor: refactor workflows contents.

* add tool workflows.

* update field.

* fix: remove chat error.

* Fix err.

* fix error.

* remove cn comment.

* update workflows files.

* update infra config.

* move workflows.

* feat: update bot.

* fix: solve uncorrect outdated msg get.

* update get docIDs logic.

* update

* update skip logic.

* fix

* update.

* fix: delay deleteObject func.

* remove unused content.

* fix: memory queue optimization (#2568)

* fix: GroupApplicationAcceptedNotification

* fix: NotificationUserInfoUpdate

* cicd: robot automated Change

* fix: component

* fix: getConversationInfo

* feat: cron task

* fix: minio config url recognition error

* update gomake version

* fix: seq conversion bug

* fix: redis pipe exec

* fix: ImportFriends

* fix: A large number of logs keysAndValues length is not even

* feat: mark read aggregate write

* feat: online status supports redis cluster

* merge

* read seq is written to mongo

* fix: invitation to join group notification

* fix: friend op_user_id

* feat: optimizing asynchronous context

* feat: optimizing memamq size

---------

Co-authored-by: withchao <withchao@users.noreply.github.com>

* fix: fill opUser in invite tips (#2578)

* fix: fill opUser in invite tips

* fix: del code

* feat: update group notification when set to null. (#2590)

* refactor: refactor workflows contents.

* add tool workflows.

* update field.

* fix: remove chat error.

* Fix err.

* fix error.

* remove cn comment.

* update workflows files.

* update infra config.

* move workflows.

* feat: update bot.

* fix: solve uncorrect outdated msg get.

* update get docIDs logic.

* update

* update skip logic.

* fix

* update.

* fix: delay deleteObject func.

* remove unused content.

* feat: update group notification when set to null.

* update log standard.

* feat: add long time push msg in prometheus (#2584)

* feat: add long time push msg in prometheus

* fix: log print

* fix: go mod

* fix: log msg

* fix: log init

* feat: push msg

* feat: go mod ,remove cgo package

* feat: remove error log

* feat: test dummy push

* feat:redis pool config

* feat: push to kafka log

* feat: supports getting messages based on session ID and seq (#2582)

* fix: GroupApplicationAcceptedNotification

* fix: NotificationUserInfoUpdate

* cicd: robot automated Change

* fix: component

* fix: getConversationInfo

* feat: cron task

* fix: minio config url recognition error

* update gomake version

* fix: seq conversion bug

* fix: redis pipe exec

* fix: ImportFriends

* fix: A large number of logs keysAndValues length is not even

* feat: mark read aggregate write

* feat: online status supports redis cluster

* merge

* read seq is written to mongo

* fix: invitation to join group notification

* fix: friend op_user_id

* feat: optimizing asynchronous context

* feat: optimizing memamq size

* feat: add GetSeqMessage

* feat: GroupApplicationAgreeMemberEnterNotification

* feat: go.mod

* feat: join group notification and get seq

---------

Co-authored-by: withchao <withchao@users.noreply.github.com>

* feat: implement request batch count limit. (#2591)

* refactor: refactor workflows contents.

* add tool workflows.

* update field.

* fix: remove chat error.

* Fix err.

* fix error.

* remove cn comment.

* update workflows files.

* update infra config.

* move workflows.

* feat: update bot.

* fix: solve uncorrect outdated msg get.

* update get docIDs logic.

* update

* update skip logic.

* fix

* update.

* fix: delay deleteObject func.

* remove unused content.

* update log type.

* feat: implement request batch count limit.

* update

* fix: getting messages based on session ID and seq (#2595)

* fix: GroupApplicationAcceptedNotification

* fix: NotificationUserInfoUpdate

* cicd: robot automated Change

* fix: component

* fix: getConversationInfo

* feat: cron task

* fix: minio config url recognition error

* update gomake version

* fix: seq conversion bug

* fix: redis pipe exec

* fix: ImportFriends

* fix: A large number of logs keysAndValues length is not even

* feat: mark read aggregate write

* feat: online status supports redis cluster

* merge

* read seq is written to mongo

* fix: invitation to join group notification

* fix: friend op_user_id

* feat: optimizing asynchronous context

* feat: optimizing memamq size

* feat: add GetSeqMessage

* feat: GroupApplicationAgreeMemberEnterNotification

* feat: go.mod

* feat: join group notification and get seq

---------

Co-authored-by: withchao <withchao@users.noreply.github.com>

* feat: avoid pulling messages from sessions with a large number of max seq values of 0 (#2602)

* fix: GroupApplicationAcceptedNotification

* fix: NotificationUserInfoUpdate

* cicd: robot automated Change

* fix: component

* fix: getConversationInfo

* feat: cron task

* fix: minio config url recognition error

* update gomake version

* fix: seq conversion bug

* fix: redis pipe exec

* fix: ImportFriends

* fix: A large number of logs keysAndValues length is not even

* feat: mark read aggregate write

* feat: online status supports redis cluster

* merge

* read seq is written to mongo

* fix: invitation to join group notification

* fix: friend op_user_id

* feat: optimizing asynchronous context

* feat: optimizing memamq size

* feat: add GetSeqMessage

* feat: GroupApplicationAgreeMemberEnterNotification

* feat: go.mod

* feat: join group notification and get seq

* feat: avoid pulling messages from sessions with a large number of max seq values of 0

---------

Co-authored-by: withchao <withchao@users.noreply.github.com>

* refactor: improve db structure in `storage/controller` (#2604)

* refactor: refactor workflows contents.

* add tool workflows.

* update field.

* fix: remove chat error.

* Fix err.

* fix error.

* remove cn comment.

* update workflows files.

* update infra config.

* move workflows.

* feat: update bot.

* fix: solve uncorrect outdated msg get.

* update get docIDs logic.

* update

* update skip logic.

* fix

* update.

* fix: delay deleteObject func.

* remove unused content.

* update log type.

* feat: implement request batch count limit.

* update

* refactor: improve db structure in `storage/controller`

* feat: implement offline push using kafka (#2600)

* refactor: refactor workflows contents.

* add tool workflows.

* update field.

* fix: remove chat error.

* Fix err.

* fix error.

* remove cn comment.

* update workflows files.

* update infra config.

* move workflows.

* feat: update bot.

* fix: solve uncorrect outdated msg get.

* update get docIDs logic.

* update

* update skip logic.

* fix

* update.

* fix: delay deleteObject func.

* remove unused content.

* update log type.

* feat: implement request batch count limit.

* update

* feat: implement offline push.

* feat: implement batch Push spilt

* update go mod

* feat: implement kafka producer and consumer.

* update format,

* add PushMQ log.

* feat: update Handler logic.

* update MQ logic.

* update

* fix: update OfflinePushConsumerHandler.

* feat: API supports gzip (#2609)

* fix: GroupApplicationAcceptedNotification

* fix: NotificationUserInfoUpdate

* cicd: robot automated Change

* fix: component

* fix: getConversationInfo

* feat: cron task

* fix: minio config url recognition error

* update gomake version

* fix: seq conversion bug

* fix: redis pipe exec

* fix: ImportFriends

* fix: A large number of logs keysAndValues length is not even

* feat: mark read aggregate write

* feat: online status supports redis cluster

* merge

* read seq is written to mongo

* fix: invitation to join group notification

* fix: friend op_user_id

* feat: optimizing asynchronous context

* feat: optimizing memamq size

* feat: add GetSeqMessage

* feat: GroupApplicationAgreeMemberEnterNotification

* feat: go.mod

* feat: join group notification and get seq

* feat: avoid pulling messages from sessions with a large number of max seq values of 0

* feat: API supports gzip

---------

Co-authored-by: withchao <withchao@users.noreply.github.com>

* Fix err (#2608)

* refactor: refactor workflows contents.

* add tool workflows.

* update field.

* fix: remove chat error.

* Fix err.

* fix error.

* remove cn comment.

* update workflows files.

* update infra config.

* move workflows.

* feat: update bot.

* fix: solve uncorrect outdated msg get.

* update get docIDs logic.

* update

* update skip logic.

* fix

* update.

* fix: delay deleteObject func.

* remove unused content.

* update log type.

* feat: implement request batch count limit.

* update

* feat: add rocksTimeout

* feat: wrap logs

* feat: add logs

* feat: listen config

* feat: enable listen TIME_WAIT port

* feat: add logs

* feat: cache batch

* chore: enable fullUserCache

* feat: push rpc num

* feat: push err

* feat: with operationID

* feat: sleep

* feat: change 1s

* feat: change log

* feat: implement Getbatch in rpcCache.

* feat: print getOnline cost

* feat: change log

* feat: change kafka and push config

* feat: del interface

* feat: fix err

* feat: change config

* feat: go mod

* feat: change config

* feat: add sleep in push

* feat: warn logs

* feat: logs

* feat: change port

* feat: start config

* feat: remove port reuse

* feat: prometheus config

* feat: add long time send msg to grafana

* feat: init

* feat: implement offline push.

* feat: batch get user online

* feat: implement batch Push spilt

* update go mod

* Revert "feat: change port"

This reverts commit 06d5e944

* feat: change port

* feat: change config

* feat: implement kafka producer and consumer.

* update format,

* add PushMQ log.

* feat: get all online users and init push

* feat: lock in online cache

* feat: config

* fix: init online status

* fix: add logs

* fix: userIDs

* fix: add logs

* feat: update Handler logic.

* update MQ logic.

* update

* fix: method name

* fix: update OfflinePushConsumerHandler.

* fix: prommetrics

* fix: add logs

* fix: ctx

* fix: log

* fix: config

* feat: change port

* fix: atomic online cache status

---------

Co-authored-by: Monet Lee <monet_lee@163.com>

* feature: add GetConversationsHasReadAndMaxSeq interface to the WebSocket API. (#2611)

* fix: lru lock (#2613)

* fix: lru lock

* fix: nil pointer error on close (#2618)

* fix: GroupApplicationAcceptedNotification

* fix: NotificationUserInfoUpdate

* cicd: robot automated Change

* fix: component

* fix: getConversationInfo

* feat: cron task

* fix: minio config url recognition error

* update gomake version

* fix: seq conversion bug

* fix: redis pipe exec

* fix: ImportFriends

* fix: A large number of logs keysAndValues length is not even

* feat: mark read aggregate write

* feat: online status supports redis cluster

* merge

* read seq is written to mongo

* fix: invitation to join group notification

* fix: friend op_user_id

* feat: optimizing asynchronous context

* feat: optimizing memamq size

* feat: add GetSeqMessage

* feat: GroupApplicationAgreeMemberEnterNotification

* feat: go.mod

* feat: join group notification and get seq

* feat: avoid pulling messages from sessions with a large number of max seq values of 0

* feat: API supports gzip

* go.mod

* fix: nil pointer error on close

---------

Co-authored-by: withchao <withchao@users.noreply.github.com>

* feat: create group can push notification (#2617)

* fix: blockage caused by listen error (#2620)

* fix: GroupApplicationAcceptedNotification

* fix: NotificationUserInfoUpdate

* cicd: robot automated Change

* fix: component

* fix: getConversationInfo

* feat: cron task

* fix: minio config url recognition error

* update gomake version

* fix: seq conversion bug

* fix: redis pipe exec

* fix: ImportFriends

* fix: A large number of logs keysAndValues length is not even

* feat: mark read aggregate write

* feat: online status supports redis cluster

* merge

* read seq is written to mongo

* fix: invitation to join group notification

* fix: friend op_user_id

* feat: optimizing asynchronous context

* feat: optimizing memamq size

* feat: add GetSeqMessage

* feat: GroupApplicationAgreeMemberEnterNotification

* feat: go.mod

* feat: join group notification and get seq

* feat: avoid pulling messages from sessions with a large number of max seq values of 0

* feat: API supports gzip

* go.mod

* fix: nil pointer error on close

* fix: listen error

---------

Co-authored-by: withchao <withchao@users.noreply.github.com>

* fix: go.mod (#2621)

* fix: GroupApplicationAcceptedNotification

* fix: NotificationUserInfoUpdate

* cicd: robot automated Change

* fix: component

* fix: getConversationInfo

* feat: cron task

* fix: minio config url recognition error

* update gomake version

* fix: seq conversion bug

* fix: redis pipe exec

* fix: ImportFriends

* fix: A large number of logs keysAndValues length is not even

* feat: mark read aggregate write

* feat: online status supports redis cluster

* merge

* read seq is written to mongo

* fix: invitation to join group notification

* fix: friend op_user_id

* feat: optimizing asynchronous context

* feat: optimizing memamq size

* feat: add GetSeqMessage

* feat: GroupApplicationAgreeMemberEnterNotification

* feat: go.mod

* feat: join group notification and get seq

* feat: avoid pulling messages from sessions with a large number of max seq values of 0

* feat: API supports gzip

* go.mod

* fix: nil pointer error on close

* fix: listen error

* update go.mod

---------

Co-authored-by: withchao <withchao@users.noreply.github.com>

* feat: improve searchMsg implement. (#2614)

* refactor: refactor workflows contents.

* add tool workflows.

* update field.

* fix: remove chat error.

* Fix err.

* fix error.

* remove cn comment.

* update workflows files.

* update infra config.

* move workflows.

* feat: update bot.

* fix: solve uncorrect outdated msg get.

* update get docIDs logic.

* update

* update skip logic.

* fix

* update.

* fix: delay deleteObject func.

* remove unused content.

* update log type.

* feat: implement request batch count limit.

* update

* remove unused script.

* feat: improve searchMsg implement.

* update mongo config.

* Fix lock (#2622)

* fix:log

* fix: lock

* fix: update setGroupInfoEX field name. (#2625)

* refactor: refactor workflows contents.

* add tool workflows.

* update field.

* fix: remove chat error.

* Fix err.

* fix error.

* remove cn comment.

* update workflows files.

* update infra config.

* move workflows.

* feat: update bot.

* fix: solve uncorrect outdated msg get.

* update get docIDs logic.

* update

* update skip logic.

* fix

* update.

* fix: delay deleteObject func.

* remove unused content.

* update log type.

* feat: implement request batch count limit.

* update

* fix: update setGroupInfoEX field name.

* fix: update setGroupInfoEX field name (#2626)

* refactor: refactor workflows contents.

* add tool workflows.

* update field.

* fix: remove chat error.

* Fix err.

* fix error.

* remove cn comment.

* update workflows files.

* update infra config.

* move workflows.

* feat: update bot.

* fix: solve uncorrect outdated msg get.

* update get docIDs logic.

* update

* update skip logic.

* fix

* update.

* fix: delay deleteObject func.

* remove unused content.

* update log type.

* feat: implement request batch count limit.

* update

* fix: update setGroupInfoEX field name.

* fix: update setGroupInfoEX field name

* feat: msg gateway add log (#2631)

* fix: GroupApplicationAcceptedNotification

* fix: NotificationUserInfoUpdate

* cicd: robot automated Change

* fix: component

* fix: getConversationInfo

* feat: cron task

* fix: minio config url recognition error

* update gomake version

* fix: seq conversion bug

* fix: redis pipe exec

* fix: ImportFriends

* fix: A large number of logs keysAndValues length is not even

* feat: mark read aggregate write

* feat: online status supports redis cluster

* merge

* read seq is written to mongo

* fix: invitation to join group notification

* fix: friend op_user_id

* feat: optimizing asynchronous context

* feat: optimizing memamq size

* feat: add GetSeqMessage

* feat: GroupApplicationAgreeMemberEnterNotification

* feat: go.mod

* feat: join group notification and get seq

* feat: avoid pulling messages from sessions with a large number of max seq values of 0

* feat: API supports gzip

* go.mod

* fix: nil pointer error on close

* fix: listen error

* update go.mod

* feat: add log

---------

Co-authored-by: withchao <withchao@users.noreply.github.com>

* fix: update setGroupInfoEx func name and field. (#2634)

* refactor: refactor workflows contents.

* add tool workflows.

* update field.

* fix: remove chat error.

* Fix err.

* fix error.

* remove cn comment.

* update workflows files.

* update infra config.

* move workflows.

* feat: update bot.

* fix: solve uncorrect outdated msg get.

* update get docIDs logic.

* update

* update skip logic.

* fix

* update.

* fix: delay deleteObject func.

* remove unused content.

* update log type.

* feat: implement request batch count limit.

* update

* fix: update setGroupInfoEx func name and field.

* refactor: update groupinfoEx field.

* refactor: update database name in mongodb.yml

* add groupName Condition

* fix: fix setConversations req fill. (#2645)

* refactor: refactor workflows contents.

* add tool workflows.

* update field.

* fix: remove chat error.

* Fix err.

* fix error.

* remove cn comment.

* update workflows files.

* update infra config.

* move workflows.

* feat: update bot.

* fix: solve uncorrect outdated msg get.

* update get docIDs logic.

* update

* update skip logic.

* fix

* update.

* fix: delay deleteObject func.

* remove unused content.

* update log type.

* feat: implement request batch count limit.

* update

* fix: fix setConversations req fill.

* fix: GetMsgBySeqs boundary issues (#2647)

* fix: GroupApplicationAcceptedNotification

* fix: NotificationUserInfoUpdate

* cicd: robot automated Change

* fix: component

* fix: getConversationInfo

* feat: cron task

* fix: minio config url recognition error

* update gomake version

* fix: seq conversion bug

* fix: redis pipe exec

* fix: ImportFriends

* fix: A large number of logs keysAndValues length is not even

* feat: mark read aggregate write

* feat: online status supports redis cluster

* merge

* read seq is written to mongo

* fix: invitation to join group notification

* fix: friend op_user_id

* feat: optimizing asynchronous context

* feat: optimizing memamq size

* feat: add GetSeqMessage

* feat: GroupApplicationAgreeMemberEnterNotification

* feat: go.mod

* feat: join group notification and get seq

* feat: avoid pulling messages from sessions with a large number of max seq values of 0

* feat: API supports gzip

* go.mod

* fix: nil pointer error on close

* fix: listen error

* update go.mod

* feat: add log

* fix: token parse token value

* fix: GetMsgBySeqs boundary issues

---------

Co-authored-by: withchao <withchao@users.noreply.github.com>

* fix: the attribute version is obsolete, remove it (#2644)

* refactor: update Userregister request field. (#2650)

* Test Workflow (#2640)

* feat: cicd

* fix: cicd

* fix: kick group member callback (#2643)

* fix: kill group member callback

* fix: change port

* fix: route (#2654)

* feat: add GetSpecifiedBlacks interface. (#2656)

* Upgrade the Google Firebase version. (#2638)

* Fix token (#2653)

* fix: kick token

* fix: change config

* feat: get not notify conversationIDs (#2658)

* feat: get not notify conversationIDs

* feat: api

* fix: database

* fix: change name

* feat: GetPinnedConversationIDs (#2660)

* feat: GetPinnedConversationIDs

* feat: api

* Upgrade the FCM SDK to version 4, and use the SendEach method instead of the SendAll method. (#2633)

Co-authored-by: Monet Lee <monet_lee@163.com>

* feat: implement GetSpecifiedUserGroupRequestInfo interface. (#2661)

* feat: implement GetSpecifiedUserGroupRequestInfo interface.

* update mongo config.

* feat: provide the interface required by js sdk (#2664)

* fix: redis support acquisition time

* fix: GetActiveConversation

* feat: jssdk GetConversations, GetActiveConversation

* feat: improve get admin role memberIDs implement. (#2666)

* feat: implement GetSpecifiedUserGroupRequestInfo interface.

* update mongo config.

* feat: improve get admin role memberIDs implement.

* remove unused contents.

* remove todo implement.

* fix: fix update groupName invalid. (#2673)

* refactor: change platform to platformID (#2670)

* feat: don`t return nil data (#2675)

Co-authored-by: Monet Lee <monet_lee@163.com>

* refactor: update fields type in userStatus and check registered. (#2676)

* fix: usertoken auth. (#2677)

* refactor: update fields type in userStatus and check registered.

* fix: usertoken auth.

* update contents.

* update content.

* update

* fix

* update pb file.

* feat: add friend agree after callback (#2680)

* fix: sn not sort (#2682)

* fix: GroupApplicationAcceptedNotification

* fix: NotificationUserInfoUpdate

* cicd: robot automated Change

* fix: component

* fix: getConversationInfo

* feat: cron task

* fix: minio config url recognition error

* update gomake version

* fix: seq conversion bug

* fix: redis pipe exec

* fix: ImportFriends

* fix: A large number of logs keysAndValues length is not even

* feat: mark read aggregate write

* feat: online status supports redis cluster

* merge

* read seq is written to mongo

* fix: invitation to join group notification

* fix: friend op_user_id

* feat: optimizing asynchronous context

* feat: optimizing memamq size

* feat: add GetSeqMessage

* feat: GroupApplicationAgreeMemberEnterNotification

* feat: go.mod

* feat: join group notification and get seq

* feat: avoid pulling messages from sessions with a large number of max seq values of 0

* feat: API supports gzip

* go.mod

* fix: nil pointer error on close

* fix: listen error

* update go.mod

* feat: add log

* fix: token parse token value

* fix: GetMsgBySeqs boundary issues

* fix: sn_ not sort

---------

Co-authored-by: withchao <withchao@users.noreply.github.com>

* refactor: add GetAdminToken interface. (#2684)

* refactor: add GetAdminToken interface.

* update config.

* fix: admin token (#2686)

* fix: update workflows logic. (#2688)

* refactor: add GetAdminToken interface.

* update config.

* update workflows logic.

* fix: admin token (#2687)

* update the front image (#2692)

* update the front image

* update version

* feat: improve publish docker image workflows (#2697)

* refactor: add GetAdminToken interface.

* update config.

* update workflows logic.

* feat: improve publish docker image workflows

* update condition logic.

* fix: update load file logic. (#2700)

* refactor: add GetAdminToken interface.

* update config.

* update workflows logic.

* feat: improve publish docker image workflows

* update condition logic.

* fix: update load file logic.

* feat: Msg filter (#2703)

* feat: msg filter

---------

Co-authored-by: Monet Lee <monet_lee@163.com>
Co-authored-by: icey-yu <119291641+icey-yu@users.noreply.github.com>
Co-authored-by: Kevin Lee <59052025+lgz5689@users.noreply.github.com>
Co-authored-by: qinguoyi <1532979219@qq.com>
Co-authored-by: chao <48119764+withchao@users.noreply.github.com>
Co-authored-by: withchao <withchao@users.noreply.github.com>
Co-authored-by: Mew151 <dgqypl@gmail.com>
Co-authored-by: 蔡相跃 <caixiangyue007@gmail.com>
Co-authored-by: 暴走的大猩猩 <Hz_testing@163.com>
Co-authored-by: Libo <zhaolibo1989@foxmail.com>
Co-authored-by: skiffer-git <72860476+skiffer-git@users.noreply.github.com>

This commit is contained in:

OpenIM-Gordon

2024-10-12 16:11:43 +08:00

committed by

GitHub

parent 3ecde781bb

commit 6f49519053

202 changed files with 6617 additions and 6091 deletions

									
										pkg/msgprocessor/conversation.go
									
		+9
		-63
	
												View File
												
				@@ -39,7 +39,9 @@ func GetNotificationConversationIDByMsg(msg *sdkws.MsgData) string {

					case constant.ReadGroupChatType:

						return "n_" + msg.GroupID

					case constant.NotificationChatType:

						return "n_" + msg.SendID + "_" + msg.RecvID

						l := []string{msg.SendID, msg.RecvID}

						sort.Strings(l)

						return "n_" + strings.Join(l, "_")

					}

					return ""

				}

				@@ -55,21 +57,11 @@ func GetChatConversationIDByMsg(msg *sdkws.MsgData) string {

					case constant.ReadGroupChatType:

						return "sg_" + msg.GroupID

					case constant.NotificationChatType:

						return "sn_" + msg.SendID + "_" + msg.RecvID

					}

					return ""

				}

				func GenConversationUniqueKey(msg *sdkws.MsgData) string {

					switch msg.SessionType {

					case constant.SingleChatType, constant.NotificationChatType:

						l := []string{msg.SendID, msg.RecvID}

						sort.Strings(l)

						return strings.Join(l, "_")

					case constant.ReadGroupChatType:

						return msg.GroupID

						return "sn_" + strings.Join(l, "_")

					}

					return ""

				}

				@@ -94,10 +86,12 @@ func GetConversationIDByMsg(msg *sdkws.MsgData) string {

						}

						return "sg_" + msg.GroupID // super group chat

					case constant.NotificationChatType:

						l := []string{msg.SendID, msg.RecvID}

						sort.Strings(l)

						if !options.IsNotNotification() {

							return "n_" + msg.SendID + "_" + msg.RecvID // super group chat

							return "n_" + strings.Join(l, "_")

						}

						return "sn_" + msg.SendID + "_" + msg.RecvID // server notification chat

						return "sn_" + strings.Join(l, "_")

					}

					return ""

				}

				@@ -120,30 +114,6 @@ func GetConversationIDBySessionType(sessionType int, ids ...string) string {

					return ""

				}

				func GetNotificationConversationIDByConversationID(conversationID string) string {

					l := strings.Split(conversationID, "_")

					if len(l) > 1 {

						l[0] = "n"

						return strings.Join(l, "_")

					}

					return ""

				}

				func GetNotificationConversationID(sessionType int, ids ...string) string {

					sort.Strings(ids)

					if len(ids) > 2 || len(ids) < 1 {

						return ""

					}

					switch sessionType {

					case constant.SingleChatType:

						return "n_" + strings.Join(ids, "_") // single chat

					case constant.ReadGroupChatType:

						return "n_" + ids[0] // super group chat

					}

					return ""

				}

				func IsNotification(conversationID string) bool {

					return strings.HasPrefix(conversationID, "n_")

				}

				@@ -152,30 +122,6 @@ func IsNotificationByMsg(msg *sdkws.MsgData) bool {

					return !Options(msg.Options).IsNotNotification()

				}

				func ParseConversationID(msg *sdkws.MsgData) (isNotification bool, conversationID string) {

					options := Options(msg.Options)

					switch msg.SessionType {

					case constant.SingleChatType:

						l := []string{msg.SendID, msg.RecvID}

						sort.Strings(l)

						if !options.IsNotNotification() {

							return true, "n_" + strings.Join(l, "_")

						}

						return false, "si_" + strings.Join(l, "_") // single chat

					case constant.ReadGroupChatType:

						if !options.IsNotNotification() {

							return true, "n_" + msg.GroupID // super group chat

						}

						return false, "sg_" + msg.GroupID // super group chat

					case constant.NotificationChatType:

						if !options.IsNotNotification() {

							return true, "n_" + msg.SendID + "_" + msg.RecvID // super group chat

						}

						return false, "sn_" + msg.SendID + "_" + msg.RecvID // server notification chat

					}

					return false, ""

				}

				type MsgBySeq []*sdkws.MsgData

				func (s MsgBySeq) Len() int {

									
										pkg/msgprocessor/conversation_test.go
									
		-334
	
												View File
											
				@@ -1,334 +0,0 @@

				// Copyright © 2023 OpenIM. All rights reserved.

				//

				// Licensed under the Apache License, Version 2.0 (the "License");

				// you may not use this file except in compliance with the License.

				// You may obtain a copy of the License at

				//

				//     http://www.apache.org/licenses/LICENSE-2.0

				//

				// Unless required by applicable law or agreed to in writing, software

				// distributed under the License is distributed on an "AS IS" BASIS,

				// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

				// See the License for the specific language governing permissions and

				// limitations under the License.

				package msgprocessor

				import (

					"testing"

					"github.com/openimsdk/protocol/sdkws"

					"google.golang.org/protobuf/proto"

				)

				func TestGetNotificationConversationIDByMsg(t *testing.T) {

					type args struct {

						msg *sdkws.MsgData

					}

					tests := []struct {

						name string

						args args

						want string

					}{

						// TODO: Add test cases.

					}

					for _, tt := range tests {

						t.Run(tt.name, func(t *testing.T) {

							if got := GetNotificationConversationIDByMsg(tt.args.msg); got != tt.want {

								t.Errorf("GetNotificationConversationIDByMsg() = %v, want %v", got, tt.want)

							}

						})

					}

				}

				func TestGetChatConversationIDByMsg(t *testing.T) {

					type args struct {

						msg *sdkws.MsgData

					}

					tests := []struct {

						name string

						args args

						want string

					}{

						// TODO: Add test cases.

					}

					for _, tt := range tests {

						t.Run(tt.name, func(t *testing.T) {

							if got := GetChatConversationIDByMsg(tt.args.msg); got != tt.want {

								t.Errorf("GetChatConversationIDByMsg() = %v, want %v", got, tt.want)

							}

						})

					}

				}

				func TestGenConversationUniqueKey(t *testing.T) {

					type args struct {

						msg *sdkws.MsgData

					}

					tests := []struct {

						name string

						args args

						want string

					}{

						// TODO: Add test cases.

					}

					for _, tt := range tests {

						t.Run(tt.name, func(t *testing.T) {

							if got := GenConversationUniqueKey(tt.args.msg); got != tt.want {

								t.Errorf("GenConversationUniqueKey() = %v, want %v", got, tt.want)

							}

						})

					}

				}

				func TestGetConversationIDByMsg(t *testing.T) {

					type args struct {

						msg *sdkws.MsgData

					}

					tests := []struct {

						name string

						args args

						want string

					}{

						// TODO: Add test cases.

					}

					for _, tt := range tests {

						t.Run(tt.name, func(t *testing.T) {

							if got := GetConversationIDByMsg(tt.args.msg); got != tt.want {

								t.Errorf("GetConversationIDByMsg() = %v, want %v", got, tt.want)

							}

						})

					}

				}

				func TestGetConversationIDBySessionType(t *testing.T) {

					type args struct {

						sessionType int

						ids         []string

					}

					tests := []struct {

						name string

						args args

						want string

					}{

						// TODO: Add test cases.

					}

					for _, tt := range tests {

						t.Run(tt.name, func(t *testing.T) {

							if got := GetConversationIDBySessionType(tt.args.sessionType, tt.args.ids...); got != tt.want {

								t.Errorf("GetConversationIDBySessionType() = %v, want %v", got, tt.want)

							}

						})

					}

				}

				func TestGetNotificationConversationIDByConversationID(t *testing.T) {

					type args struct {

						conversationID string

					}

					tests := []struct {

						name string

						args args

						want string

					}{

						// TODO: Add test cases.

					}

					for _, tt := range tests {

						t.Run(tt.name, func(t *testing.T) {

							if got := GetNotificationConversationIDByConversationID(tt.args.conversationID); got != tt.want {

								t.Errorf("GetNotificationConversationIDByConversationID() = %v, want %v", got, tt.want)

							}

						})

					}

				}

				func TestGetNotificationConversationID(t *testing.T) {

					type args struct {

						sessionType int

						ids         []string

					}

					tests := []struct {

						name string

						args args

						want string

					}{

						// TODO: Add test cases.

					}

					for _, tt := range tests {

						t.Run(tt.name, func(t *testing.T) {

							if got := GetNotificationConversationID(tt.args.sessionType, tt.args.ids...); got != tt.want {

								t.Errorf("GetNotificationConversationID() = %v, want %v", got, tt.want)

							}

						})

					}

				}

				func TestIsNotification(t *testing.T) {

					type args struct {

						conversationID string

					}

					tests := []struct {

						name string

						args args

						want bool

					}{

						// TODO: Add test cases.

					}

					for _, tt := range tests {

						t.Run(tt.name, func(t *testing.T) {

							if got := IsNotification(tt.args.conversationID); got != tt.want {

								t.Errorf("IsNotification() = %v, want %v", got, tt.want)

							}

						})

					}

				}

				func TestIsNotificationByMsg(t *testing.T) {

					type args struct {

						msg *sdkws.MsgData

					}

					tests := []struct {

						name string

						args args

						want bool

					}{

						// TODO: Add test cases.

					}

					for _, tt := range tests {

						t.Run(tt.name, func(t *testing.T) {

							if got := IsNotificationByMsg(tt.args.msg); got != tt.want {

								t.Errorf("IsNotificationByMsg() = %v, want %v", got, tt.want)

							}

						})

					}

				}

				func TestParseConversationID(t *testing.T) {

					type args struct {

						msg *sdkws.MsgData

					}

					tests := []struct {

						name               string

						args               args

						wantIsNotification bool

						wantConversationID string

					}{

						// TODO: Add test cases.

					}

					for _, tt := range tests {

						t.Run(tt.name, func(t *testing.T) {

							gotIsNotification, gotConversationID := ParseConversationID(tt.args.msg)

							if gotIsNotification != tt.wantIsNotification {

								t.Errorf("ParseConversationID() gotIsNotification = %v, want %v", gotIsNotification, tt.wantIsNotification)

							}

							if gotConversationID != tt.wantConversationID {

								t.Errorf("ParseConversationID() gotConversationID = %v, want %v", gotConversationID, tt.wantConversationID)

							}

						})

					}

				}

				func TestMsgBySeq_Len(t *testing.T) {

					tests := []struct {

						name string

						s    MsgBySeq

						want int

					}{

						// TODO: Add test cases.

					}

					for _, tt := range tests {

						t.Run(tt.name, func(t *testing.T) {

							if got := tt.s.Len(); got != tt.want {

								t.Errorf("MsgBySeq.Len() = %v, want %v", got, tt.want)

							}

						})

					}

				}

				func TestMsgBySeq_Less(t *testing.T) {

					type args struct {

						i int

						j int

					}

					tests := []struct {

						name string

						s    MsgBySeq

						args args

						want bool

					}{

						// TODO: Add test cases.

					}

					for _, tt := range tests {

						t.Run(tt.name, func(t *testing.T) {

							if got := tt.s.Less(tt.args.i, tt.args.j); got != tt.want {

								t.Errorf("MsgBySeq.Less() = %v, want %v", got, tt.want)

							}

						})

					}

				}

				func TestMsgBySeq_Swap(t *testing.T) {

					type args struct {

						i int

						j int

					}

					tests := []struct {

						name string

						s    MsgBySeq

						args args

					}{

						// TODO: Add test cases.

					}

					for _, tt := range tests {

						t.Run(tt.name, func(t *testing.T) {

							tt.s.Swap(tt.args.i, tt.args.j)

						})

					}

				}

				func TestPb2String(t *testing.T) {

					type args struct {

						pb proto.Message

					}

					tests := []struct {

						name    string

						args    args

						want    string

						wantErr bool

					}{

						// TODO: Add test cases.

					}

					for _, tt := range tests {

						t.Run(tt.name, func(t *testing.T) {

							got, err := Pb2String(tt.args.pb)

							if (err != nil) != tt.wantErr {

								t.Errorf("Pb2String() error = %v, wantErr %v", err, tt.wantErr)

								return

							}

							if got != tt.want {

								t.Errorf("Pb2String() = %v, want %v", got, tt.want)

							}

						})

					}

				}

				func TestString2Pb(t *testing.T) {

					type args struct {

						s  string

						pb proto.Message

					}

					tests := []struct {

						name    string

						args    args

						wantErr bool

					}{

						// TODO: Add test cases.

					}

					for _, tt := range tests {

						t.Run(tt.name, func(t *testing.T) {

							if err := String2Pb(tt.args.s, tt.args.pb); (err != nil) != tt.wantErr {

								t.Errorf("String2Pb() error = %v, wantErr %v", err, tt.wantErr)

							}

						})

					}

				}