merge v3dev into main (#504)

* statistics user register * refactor: router change * minio init * UserRegisterCount * push use local conn * refactor: user pb update * remove online push close grpc conn * refactor: user pb update * refactor:pb file * msgs statistics * msgs statistics * revoke userID * refactor: errcode update * active user * active user * active user * refactor: errcode update * feat: conn update token * active user * active user * feat: conn update token * active user * feat: conn update token * feat: conn update token * feat: conn update token * add tx_oss cos * active user * active user * group create * group create * feat: group notification show to conversation * feat: group notification show to conversation * group active * user active * sendNotificationWithName * withname * privateChat * a2r call option * grpc with detail return error * change log error * chain unary interceptor * api nil slice map * fix sync has read * fix: text update * fix: update add model * set conversations update * set privateChat * fix: content update * remove unuse rpc * msgDestruct * cron use rpc mw * set IsMsgDestruct * msg destruct * msgDestruct * s3 minio, cos, oss support * feat: add implement of GetUsersOnlineStatus, #472 (#477) * s3 minio, cos, oss support * s3 route * remove extendMsg code * s3 route * remove unuse code * s3 pb * s3 pb * s3 pb * s3 presigned put * s3 presigned test * s3 presigned test * s3 presigned test * s3 presigned test * s3 presigned test * s3 presigned test * s3 presigned test * s3 presigned test * Update .gitignore (#482) * s3 debug log * s3 debug log * cron add log and fix cron * add log * cron * s3 config * fix kick user bug * s3 cos * add kick log * s3 cos test * s3 cos test * s3 cos test * kick user log * kickuserlog * s3 cos copy * s3 cos copy * s3 url * s3 url * s3 AccessURL * log * s3 InitiateMultipartUpload add ExpireTime --------- Co-authored-by: withchao <993506633@qq.com> Co-authored-by: wangchuxiao <wangchuxiao97@outlook.com> Co-authored-by: BanTanger <88583317+BanTanger@users.noreply.github.com> Co-authored-by: withchao <48119764+withchao@users.noreply.github.com> Co-authored-by: Alan <68671759+hanzhixiao@users.noreply.github.com>
2026-05-14 05:56:00 +08:00 · 2023-07-12 15:31:24 +08:00
parent 5467887e1c
commit 454bf97e3f
123 changed files with 7377 additions and 10288 deletions
@@ -32,6 +32,9 @@ message Conversation{
  int32 burnDuration = 12;
  int64 minSeq = 13;
  int64 maxSeq = 14;
+  int64 msgDestructTime = 15;
+  int64 latestMsgDestructTime = 16;
+  bool isMsgDestruct = 17;
 }

 message ConversationReq{
@@ -48,15 +51,8 @@ message ConversationReq{
  OpenIMServer.protobuf.Int64Value minSeq = 11;
  OpenIMServer.protobuf.Int64Value maxSeq = 12;
  OpenIMServer.protobuf.Int32Value groupAtType = 13;
-}
-
-message ModifyConversationFieldReq{
-  repeated string userIDList = 1;
-  int32 FieldType = 2;
-  Conversation conversation = 3;
-}
-
-message ModifyConversationFieldResp{
+  OpenIMServer.protobuf.Int64Value msgDestructTime = 14;
+  OpenIMServer.protobuf.BoolValue isMsgDestruct = 15;
 }

 message SetConversationReq{
@@ -66,15 +62,6 @@ message SetConversationReq{
 message SetConversationResp{
 }

-message SetRecvMsgOptReq {
-  string ownerUserID = 1;
-  string conversationID = 2;
-  int32 recvMsgOpt = 3;
-}
-
-message SetRecvMsgOptResp {
-}
-
 message GetConversationReq{
  string conversationID = 1;
  string ownerUserID = 2;
@@ -101,13 +88,6 @@ message GetAllConversationsResp{
  repeated Conversation conversations = 2;
 }

-message BatchSetConversationsReq{
-  repeated Conversation conversations = 1;
-  string ownerUserID = 2;
-}
-
-message BatchSetConversationsResp{
-}

 message GetRecvMsgNotNotifyUserIDsReq {
  string groupID = 1;
@@ -177,13 +157,10 @@ message GetConversationsByConversationIDResp {
 }

 service conversation {
-  rpc ModifyConversationField(ModifyConversationFieldReq)returns(ModifyConversationFieldResp);
  rpc GetConversation(GetConversationReq)returns(GetConversationResp);
  rpc GetAllConversations(GetAllConversationsReq)returns(GetAllConversationsResp);
  rpc GetConversations(GetConversationsReq)returns(GetConversationsResp);
-  rpc BatchSetConversations(BatchSetConversationsReq)returns(BatchSetConversationsResp);
  rpc SetConversation(SetConversationReq)returns(SetConversationResp);
-  rpc SetRecvMsgOpt(SetRecvMsgOptReq)returns(SetRecvMsgOptResp);
  rpc GetRecvMsgNotNotifyUserIDs(GetRecvMsgNotNotifyUserIDsReq) returns (GetRecvMsgNotNotifyUserIDsResp);
  rpc CreateSingleChatConversations(CreateSingleChatConversationsReq) returns (CreateSingleChatConversationsResp);
  rpc CreateGroupChatConversations(CreateGroupChatConversationsReq) returns (CreateGroupChatConversationsResp);