Merge remote-tracking branch 'upstream/main'

openimsdk · Jul 31, 2023 · b78f98d · b78f98d
2 parents a562dbb + 07ddeeb
commit b78f98d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/internal/conversation_msg/conversation.go b/internal/conversation_msg/conversation.go
@@ -564,6 +564,7 @@ func (c *Conversation) searchLocalMessages(ctx context.Context, searchParam *sdk
 		_ = utils.JsonStringToStruct(v.AttachedInfo, &attachedInfo)
 		temp.AttachedInfoElem = &attachedInfo
 		temp.Ex = v.Ex
+		temp.LocalEx = v.LocalEx
 		err := c.msgHandleByContentType(&temp)
 		if err != nil {
 			// log.Error("", "Parsing data error:", err.Error(), temp)

diff --git a/wasm/indexdb/group_member_model.go b/wasm/indexdb/group_member_model.go
@@ -318,3 +318,18 @@ func (i *LocalGroupMember) SearchGroupMembersDB(ctx context.Context, keyword str
 		}
 	}
 }
+
+func (i *LocalGroupMember) GetUserJoinedGroupIDs(ctx context.Context, userID string) (result []string, err error) {
+	IDList, err := exec.Exec(userID)
+	if err != nil {
+		return nil, err
+	}
+	if v, ok := IDList.(string); ok {
+		err := utils.JsonStringToStruct(v, &result)
+		if err != nil {
+			return nil, err
+		}
+		return result, nil
+	}
+	return nil, exec.ErrType
+}