Merge branch 'feature-nxdev' of https://gitea.nxsir.cn/code/IM into feature-nxdev

2026-03-18 21:48:47 +08:00
parent d1db5e6490 eb8455e141
commit 536b360127
14 changed files with 291 additions and 95 deletions
@@ -146,7 +146,8 @@ namespace IM_API.Services

        public async Task MakeConversationAsync(int userAId, int userBId, ChatType chatType)
        {
-            var userAcExist = await _context.Conversations.AnyAsync(x => x.UserId == userAId && x.TargetId == userBId);
+            var userAcExist = await _context.Conversations.AnyAsync(
+                x => x.UserId == userAId && x.TargetId == userBId && x.ChatType == chatType);
            if (userAcExist) return;
            var streamKey = chatType == ChatType.PRIVATE ? 
                StreamKeyBuilder.Private(userAId, userBId) : StreamKeyBuilder.Group(userBId);