From 7a59bb69f4955ccc371d35fce8eb1b12f228df1b Mon Sep 17 00:00:00 2001
From: Andrew Simachev <andrew.simachev@gmail.com>
Date: Mon, 19 May 2025 10:15:44 +0200
Subject: [PATCH] JS-7079: fix

---
 src/ts/interface/common.ts      | 1 +
 src/ts/lib/util/subscription.ts | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/ts/interface/common.ts b/src/ts/interface/common.ts
index c28ccf4a81..032f8a2d7b 100644
--- a/src/ts/interface/common.ts
+++ b/src/ts/interface/common.ts
@@ -335,6 +335,7 @@ export interface SearchSubscribeParam {
 	ignoreHidden: boolean;
 	ignoreDeleted: boolean;
 	ignoreArchived: boolean;
+	ignoreChat: boolean;
 	skipLayoutFormat: I.ObjectLayout[];
 	noDeps: boolean;
 };
diff --git a/src/ts/lib/util/subscription.ts b/src/ts/lib/util/subscription.ts
index 9b6911becd..ce1e671991 100644
--- a/src/ts/lib/util/subscription.ts
+++ b/src/ts/lib/util/subscription.ts
@@ -50,12 +50,12 @@ class UtilSubscription {
 
 	defaultFilters (param: any) {
 		const { config } = S.Common;
-		const { ignoreHidden, ignoreDeleted, ignoreArchived } = param;
+		const { ignoreHidden, ignoreDeleted, ignoreArchived, ignoreChat } = param;
 		const filters = U.Common.objectCopy(param.filters || []);
 		
 		let skipLayouts = [];
 
-		if (!config.experimental) {
+		if (ignoreChat) {
 			skipLayouts = skipLayouts.concat([ I.ObjectLayout.Chat, I.ObjectLayout.ChatOld ]);
 		};
 
@@ -115,6 +115,7 @@ class UtilSubscription {
 			ignoreHidden: true,
 			ignoreDeleted: true,
 			ignoreArchived: true,
+			ignoreChat: true,
 			noDeps: false,
 			afterId: '',
 			beforeId: '',
@@ -277,6 +278,7 @@ class UtilSubscription {
 			ignoreHidden: true,
 			ignoreDeleted: true,
 			ignoreArchived: true,
+			ignoreChat: true,
 			skipLayoutFormat: null,
 		}, param);
 
@@ -446,6 +448,7 @@ class UtilSubscription {
 				ignoreDeleted: true,
 				ignoreHidden: false,
 				ignoreArchived: false,
+				ignoreChat: false,
 				onSubscribe: () => {
 					S.Record.getRecords(J.Constant.subId.type).forEach(it => S.Record.typeKeyMapSet(it.spaceId, it.uniqueKey, it.id));
 				}