@corva/chat-core 0.1.7 → 0.1.8

package/dist/index.d.ts

@@ -497,10 +497,6 @@ interface TypingEventData {
     isTyping: boolean;
     roomId: string;
 }
-interface ReadyServerData {
-    _id: string;
-    name?: string;
-}
 interface ReadyChannelData {
     _id: string;
     channel_type: string;
@@ -518,7 +514,7 @@ interface RevoltSocketEventHandlers {
     onAuthenticated?: () => void;
     onDisconnected?: () => void;
     onInvalidSession?: () => void;
-    onReady?: (channels: ReadyChannelData[], channelUnreads?: ChannelUnread[], servers?: ReadyServerData[]) => void;
+    onReady?: (channels: ReadyChannelData[], channelUnreads?: ChannelUnread[]) => void;
     onMessage?: (message: Message) => void;
     onMessageUpdate?: (messageId: string, channelId: string, data: {
         content?: string;
@@ -1179,6 +1175,7 @@ interface CorvaRevoltAuthResponse {
     revolt_channel_id: string;
     revolt_channel_server_id?: string;
     revolt_channel_company_id?: number;
+    revolt_channel_joined?: boolean;
     revolt_chat_channels?: AssetChatChannel[];
     chat_used?: boolean | null;
 }
@@ -1250,8 +1247,11 @@ interface AssetChatSession {
     channelId: string;
     serverId: string | null;
     companyId: number | null;
+    joined: boolean;
 }
-declare function getAssetChatSession(assetId: string, assetType: ChatAssetType): Promise<AssetChatSession>;
+declare function getAssetChatSession(assetId: string, assetType: ChatAssetType, { join }?: {
+    join?: boolean;
+}): Promise<AssetChatSession>;
 declare function getAssetChatChannel(assetId: string, assetType: ChatAssetType): Promise<string>;
 
 type StoredCorvaUser = CorvaUser | CorvaAPIUser;
@@ -1308,9 +1308,7 @@ interface ExternalChannel {
 interface AuthStore {
     user: User | null;
     serverId: string | null;
-    corvaCompanyId: number | null;
     externalChannels: Record<string, ExternalChannel>;
-    serverNames: string[] | null;
     isConnected: boolean;
     hasEverConnected: boolean;
     connectionGaveUp: boolean;
@@ -1321,7 +1319,6 @@ interface AuthStore {
     setHasEverConnected: (hasConnected: boolean) => void;
     addAssetChatChannel: (channel: AssetChatChannel) => void;
     setChannelServer: (channelId: string, serverId: string | null, companyId: number | null) => void;
-    setServerNames: (names: string[]) => void;
     markChatUsed: () => void;
     login: (credentials: LoginCredentials) => Promise<{
         success: boolean;
@@ -1341,7 +1338,6 @@ interface AuthStore {
 declare function keepChatUsed(current: boolean | null, incoming: boolean | null | undefined): boolean | null;
 declare const authStore: zustand_vanilla.StoreApi<AuthStore>;
 declare const getExternalChannel: (roomId: string | null | undefined) => ExternalChannel | null;
-declare const waitForServerNames: (timeoutMs: number) => Promise<string[] | null>;
 declare const isExternalServerChannel: (roomId: string | null | undefined) => boolean;
 /** @public */
 declare const resetAuthStore: () => void;
@@ -1528,7 +1524,7 @@ declare const resetUIStore: () => void;
 interface JoinRequired {
     assetId: string;
     assetType: ChatAssetType;
-    companyId: number;
+    companyId: number | null;
     companyName: string | null;
 }
 type LockedAsset = ChatAsset & {
@@ -1716,7 +1712,7 @@ declare const createSocketEventHandlers: (config: SocketEventHandlersConfig) =>
     onConnected: () => void;
     onAuthenticated: () => void;
     onDisconnected: () => void;
-    onReady: (channels: ReadyChannelData[], channelUnreads?: ChannelUnread[], servers?: ReadyServerData[]) => void;
+    onReady: (channels: ReadyChannelData[], channelUnreads?: ChannelUnread[]) => void;
     onChannelAck: (channelId: string, messageId: string) => void;
     onMessage: (message: Message) => void;
     onRoomChange: (roomId: string, change: unknown) => void;
@@ -1738,4 +1734,4 @@ declare const createSocketEventHandlers: (config: SocketEventHandlersConfig) =>
 
 declare const installUnreadWatcher: () => void;
 
-export { ALERT_SEVERITY, ASSET_API_FIELDS, ASSET_CHAT_PREFIXES, ASSET_NOUN, type AckScheduler, type AlertData, type AlertSeverity, type AlertWirePayload, type AppCommentAttachment, type AppCommentData, type AppCommentWirePayload, type AppStateAdapter, type AskCorvaData, type AskCorvaWirePayload, type AssetChatChannel, type AssetChatSession, type AssetStore, type Attachment, type AuthStore, CHANNEL_NAME_MAX_LENGTH, CHANNEL_TYPES, CORVA_MESSAGE_TYPES, CORVA_SYS_PREFIX, type ChannelAsset, type ChannelContentFilter, type ChannelContentFilterStore, type ChannelContentFilters, type ChannelNameValidation, type ChannelNotificationPreference, type ChannelNotificationSetting, type ChannelUnread, type ChatAsset, type ChatAssetIdentity, type ChatAssetType, type ChatDates, type ChatHost, type ChatNotifier, type ChatPlatform, type CorvaAPIUser, type CorvaApiAdapter, type CorvaRevoltAuthResponse, type CorvaSystemMessage, type CorvaUser, type CorvaUserService, DATE_SEPARATOR_LABELS, DEFAULT_CHANNEL_CONTENT_FILTER, DEFAULT_CHANNEL_CONTENT_FILTERS, DEFAULT_CHANNEL_PREFERENCE, DEFAULT_FAVORITE_ROOMS_SETTINGS, DEFAULT_HIDDEN_ROOMS_SETTINGS, DEFAULT_NOTIFICATION_PREFERENCES, DEFAULT_NOTIFICATION_SETTINGS, DEFAULT_ROOM_LIST_ORDER, DIRECT_MESSAGE_PLACEHOLDER, type ExternalChannel, type FavoriteRoomsSettings, type FavoriteRoomsStore, type FeedItemData, type FeedWirePayload, type FileAttachment, type FilterEntityWindow, type ForwardWirePayload, type ForwardedFrom, GENERAL_CHAT_NAME, type HiddenRoomsSettings, type HttpClient, type HttpClientConfig, HttpError, type HttpRequestInit, type HttpResponseLike, type JoinRequired, type KeyValueStorage, type LocatorContext, type LoginCredentials, MAX_ATTACHMENT_SIZE_BYTES, MAX_ATTACHMENT_SIZE_MB, MAX_NAVIGATION_HISTORY, MENTION_REPLACE_PATTERN, MENTION_SPLIT_PATTERN, MUTE_PRESET_OPTIONS, type MemberStore, type Message, type MessageCache, type MessageFormData, type MessageStore, NOTIFICATION_DESTINATIONS, NOTIFICATION_SETTING_ALL, NOTIFICATION_SETTING_MENTIONS, NOTIFICATION_SETTING_NOTHING, type NavigationEntry, type NavigationHistoryStore, type NotificationDestination, type NotificationPreferences, type NotificationSettings, type NotificationStore, PAUSE_INDEFINITELY, PAUSE_PRESETS, PAUSE_PRESET_OPTIONS, type PausePreset, type PausePresetOption, REVOLT_SYSTEM_USER_ID, ROOM_LIST_ORDER, type ReadyChannelData, type ReadyServerData, type RevoltAPIInstance, type RevoltChannel, type RevoltIncomingMessagePayload, type RevoltLoginResponse, type RevoltMessage, type RevoltMessageResponse, type RevoltSocketConfig, type RevoltSocketEventHandlers, type RevoltSocketInstance, type RevoltUploadResponse, type RevoltUserResponse, type Room, type RoomListOrder, type RoomStore, type RoomType, SESSION_STORAGE_KEY, SIDEBAR_SECTIONS, SIDEBAR_TABS, SOFT_DELETE_MARKER, SYSTEM_MESSAGE_TEXTS, type SaveSessionParams, type SelectableAssetType, type SessionData, SessionManager, type SharedFile, type SharedRefs, type SidebarSectionKey, type SidebarTabKey, type SocketCloseEventLike, type SocketEventHandlersConfig, type StoredChannelPreference, type Subscription, type TracesViewportRequest, type TypingManager, type UIStore, type UploadAndSendResult, type UploadFile, type UploadedFile, type User, type UserStatus, type ViewportDeepLink, type ViewportIndexCurve, type ViewportMode, WEBSOCKET_CONNECTING, WEBSOCKET_OPEN, type WebSocketLike, type WireSeverity, addMessage, addOrUpdateSubscription, alertMessageAsText, assetStore, authStore, buildAppCommentMessageContent, buildAskCorvaMessageContent, buildFinalMessage, buildForwardMessageContent, buildGroupChannelName, canDeleteMessage, canEditMessage, channelContentFilterStore, channelToAsset, chatToastStore, clearLastOpenedRoom, compareByActivity, compareByName, compareByRecencyDesc, configureChat, configureChatStorage, createAckScheduler, createCorvaUserService, createDMSubscription, createGroupSubscription, createHttpClient, createLatestWinsQueue, createMemoryStorage, createMessageCache, createRevoltAPI, createRevoltSocket, createRoomTaskQueue, createSocketEventHandlers, createSoftDeletedMessage, createTypingManager, deriveAllowedChatAsset, enrichWithCorvaData, ensureChatSession, extractTimestampFromULID, failOptimisticMessage, favoriteRoomsStore, findGeneralRoom, formatAssetChatName, getAppCommentAttachments, getAssetChatChannel, getAssetChatSession, getAssetTypeFromDisplayName, getChatHost, getChatStorage, getCorvaUserFields, getExternalChannel, getLastOpenedRoom, getMessageTimestamp, getPauseUntil, getReactionCount, getRoomDisplayName, getSystemMessageWithCorvaNames, getUserDisplayName, getUserSecondaryText, handleUnauthorized, hasReactions, hasUserReacted, initChat, installUnreadWatcher, isAlertMessage, isAppCommentMessage, isAskCorvaMessage, isChannelMuted, isChatAssetTypeAllowed, isChatStorageConfigured, isCurrentRoomSelection, isDeepEqual, isDefaultChannelPreference, isDisallowedAssetChatRoom, isDmGroup, isExternalServerChannel, isForwardedMessage, isGeneralRoom, isNotificationsPaused, isPauseActive, isSoftDeletedMessage, isSystemMessage, isUnread, isUserOnline, isValidPausePreset, isVisibleUnread, keepChatUsed, loadUntilFound, memberStore, messageStore, navigationHistoryStore, notificationStore, onChatStorageConfigured, parseCorvaSystemMessage, prepareRoomSelection, removeMessageFromList, removeSubscription, resetAssetStore, resetAuthStore, resetChannelContentFilterStore, resetChatAssetPermissionsSnapshot, resetChatHost, resetFavoriteRoomsStore, resetMemberStore, resetMessageStore, resetNavigationHistoryStore, resetNotificationStore, resetRoomStore, resetUIStore, roomStore, saveLastChatActivity, saveLastOpenedRoom, searchMessages, searchRooms, searchUsers, selectCanGoBack, selectCanGoForward, setAllowedChatAssetTypes, settleOptimisticMessage, sharedRefs, sortChannels, sortDMs, sortMessagesByTime, sortUsersByStatus, stripPlatformMentions, uiStore, updateMessageInList, uploadAndSend, validateChannelName, waitForNextPaint, waitForServerNames, wasRecentlyActive, withChannelPreferenceDefaults };
+export { ALERT_SEVERITY, ASSET_API_FIELDS, ASSET_CHAT_PREFIXES, ASSET_NOUN, type AckScheduler, type AlertData, type AlertSeverity, type AlertWirePayload, type AppCommentAttachment, type AppCommentData, type AppCommentWirePayload, type AppStateAdapter, type AskCorvaData, type AskCorvaWirePayload, type AssetChatChannel, type AssetChatSession, type AssetStore, type Attachment, type AuthStore, CHANNEL_NAME_MAX_LENGTH, CHANNEL_TYPES, CORVA_MESSAGE_TYPES, CORVA_SYS_PREFIX, type ChannelAsset, type ChannelContentFilter, type ChannelContentFilterStore, type ChannelContentFilters, type ChannelNameValidation, type ChannelNotificationPreference, type ChannelNotificationSetting, type ChannelUnread, type ChatAsset, type ChatAssetIdentity, type ChatAssetType, type ChatDates, type ChatHost, type ChatNotifier, type ChatPlatform, type CorvaAPIUser, type CorvaApiAdapter, type CorvaRevoltAuthResponse, type CorvaSystemMessage, type CorvaUser, type CorvaUserService, DATE_SEPARATOR_LABELS, DEFAULT_CHANNEL_CONTENT_FILTER, DEFAULT_CHANNEL_CONTENT_FILTERS, DEFAULT_CHANNEL_PREFERENCE, DEFAULT_FAVORITE_ROOMS_SETTINGS, DEFAULT_HIDDEN_ROOMS_SETTINGS, DEFAULT_NOTIFICATION_PREFERENCES, DEFAULT_NOTIFICATION_SETTINGS, DEFAULT_ROOM_LIST_ORDER, DIRECT_MESSAGE_PLACEHOLDER, type ExternalChannel, type FavoriteRoomsSettings, type FavoriteRoomsStore, type FeedItemData, type FeedWirePayload, type FileAttachment, type FilterEntityWindow, type ForwardWirePayload, type ForwardedFrom, GENERAL_CHAT_NAME, type HiddenRoomsSettings, type HttpClient, type HttpClientConfig, HttpError, type HttpRequestInit, type HttpResponseLike, type JoinRequired, type KeyValueStorage, type LocatorContext, type LoginCredentials, MAX_ATTACHMENT_SIZE_BYTES, MAX_ATTACHMENT_SIZE_MB, MAX_NAVIGATION_HISTORY, MENTION_REPLACE_PATTERN, MENTION_SPLIT_PATTERN, MUTE_PRESET_OPTIONS, type MemberStore, type Message, type MessageCache, type MessageFormData, type MessageStore, NOTIFICATION_DESTINATIONS, NOTIFICATION_SETTING_ALL, NOTIFICATION_SETTING_MENTIONS, NOTIFICATION_SETTING_NOTHING, type NavigationEntry, type NavigationHistoryStore, type NotificationDestination, type NotificationPreferences, type NotificationSettings, type NotificationStore, PAUSE_INDEFINITELY, PAUSE_PRESETS, PAUSE_PRESET_OPTIONS, type PausePreset, type PausePresetOption, REVOLT_SYSTEM_USER_ID, ROOM_LIST_ORDER, type ReadyChannelData, type RevoltAPIInstance, type RevoltChannel, type RevoltIncomingMessagePayload, type RevoltLoginResponse, type RevoltMessage, type RevoltMessageResponse, type RevoltSocketConfig, type RevoltSocketEventHandlers, type RevoltSocketInstance, type RevoltUploadResponse, type RevoltUserResponse, type Room, type RoomListOrder, type RoomStore, type RoomType, SESSION_STORAGE_KEY, SIDEBAR_SECTIONS, SIDEBAR_TABS, SOFT_DELETE_MARKER, SYSTEM_MESSAGE_TEXTS, type SaveSessionParams, type SelectableAssetType, type SessionData, SessionManager, type SharedFile, type SharedRefs, type SidebarSectionKey, type SidebarTabKey, type SocketCloseEventLike, type SocketEventHandlersConfig, type StoredChannelPreference, type Subscription, type TracesViewportRequest, type TypingManager, type UIStore, type UploadAndSendResult, type UploadFile, type UploadedFile, type User, type UserStatus, type ViewportDeepLink, type ViewportIndexCurve, type ViewportMode, WEBSOCKET_CONNECTING, WEBSOCKET_OPEN, type WebSocketLike, type WireSeverity, addMessage, addOrUpdateSubscription, alertMessageAsText, assetStore, authStore, buildAppCommentMessageContent, buildAskCorvaMessageContent, buildFinalMessage, buildForwardMessageContent, buildGroupChannelName, canDeleteMessage, canEditMessage, channelContentFilterStore, channelToAsset, chatToastStore, clearLastOpenedRoom, compareByActivity, compareByName, compareByRecencyDesc, configureChat, configureChatStorage, createAckScheduler, createCorvaUserService, createDMSubscription, createGroupSubscription, createHttpClient, createLatestWinsQueue, createMemoryStorage, createMessageCache, createRevoltAPI, createRevoltSocket, createRoomTaskQueue, createSocketEventHandlers, createSoftDeletedMessage, createTypingManager, deriveAllowedChatAsset, enrichWithCorvaData, ensureChatSession, extractTimestampFromULID, failOptimisticMessage, favoriteRoomsStore, findGeneralRoom, formatAssetChatName, getAppCommentAttachments, getAssetChatChannel, getAssetChatSession, getAssetTypeFromDisplayName, getChatHost, getChatStorage, getCorvaUserFields, getExternalChannel, getLastOpenedRoom, getMessageTimestamp, getPauseUntil, getReactionCount, getRoomDisplayName, getSystemMessageWithCorvaNames, getUserDisplayName, getUserSecondaryText, handleUnauthorized, hasReactions, hasUserReacted, initChat, installUnreadWatcher, isAlertMessage, isAppCommentMessage, isAskCorvaMessage, isChannelMuted, isChatAssetTypeAllowed, isChatStorageConfigured, isCurrentRoomSelection, isDeepEqual, isDefaultChannelPreference, isDisallowedAssetChatRoom, isDmGroup, isExternalServerChannel, isForwardedMessage, isGeneralRoom, isNotificationsPaused, isPauseActive, isSoftDeletedMessage, isSystemMessage, isUnread, isUserOnline, isValidPausePreset, isVisibleUnread, keepChatUsed, loadUntilFound, memberStore, messageStore, navigationHistoryStore, notificationStore, onChatStorageConfigured, parseCorvaSystemMessage, prepareRoomSelection, removeMessageFromList, removeSubscription, resetAssetStore, resetAuthStore, resetChannelContentFilterStore, resetChatAssetPermissionsSnapshot, resetChatHost, resetFavoriteRoomsStore, resetMemberStore, resetMessageStore, resetNavigationHistoryStore, resetNotificationStore, resetRoomStore, resetUIStore, roomStore, saveLastChatActivity, saveLastOpenedRoom, searchMessages, searchRooms, searchUsers, selectCanGoBack, selectCanGoForward, setAllowedChatAssetTypes, settleOptimisticMessage, sharedRefs, sortChannels, sortDMs, sortMessagesByTime, sortUsersByStatus, stripPlatformMentions, uiStore, updateMessageInList, uploadAndSend, validateChannelName, waitForNextPaint, wasRecentlyActive, withChannelPreferenceDefaults };

package/dist/index.js

@@ -2091,7 +2091,7 @@ function createEventRouter(userCache2, sessionToken, autumnUrl, handlers, getMem
           break;
         case "Ready": {
           const readyEvent = message;
-          handlers.onReady?.(readyEvent.channels, readyEvent.channel_unreads, readyEvent.servers);
+          handlers.onReady?.(readyEvent.channels, readyEvent.channel_unreads);
           break;
         }
         case "Message":
@@ -2988,11 +2988,11 @@ var ASSET_ID_PARAM = {
   frac_fleet: "frac_fleet_id",
   intervention_unit: "intervention_unit_id"
 };
-async function getAssetChatSession(assetId, assetType) {
+async function getAssetChatSession(assetId, assetType, { join = false } = {}) {
   if (!assetId || Number.isNaN(Number(assetId))) {
     throw new Error("Asset ID is required");
   }
-  const body = { [ASSET_ID_PARAM[assetType]]: Number(assetId) };
+  const body = { [ASSET_ID_PARAM[assetType]]: Number(assetId), ...join && { join: true } };
   const response = await getChatHost().corvaApi.post(
     "/v2/integration/revolt_chat_sessions",
     body
@@ -3003,7 +3003,8 @@ async function getAssetChatSession(assetId, assetType) {
   return {
     channelId: response.revolt_channel_id,
     serverId: response.revolt_channel_server_id ?? null,
-    companyId: response.revolt_channel_company_id ?? null
+    companyId: response.revolt_channel_company_id ?? null,
+    joined: response.revolt_channel_joined ?? true
   };
 }
 async function getAssetChatChannel(assetId, assetType) {
@@ -3606,7 +3607,6 @@ var ASSET_RESOURCE = {
   intervention_unit: "intervention_units"
 };
 var ownerRequests = /* @__PURE__ */ new Map();
-var joinedThisSession = /* @__PURE__ */ new Set();
 async function fetchAssetOwnerCompany(assetId, assetType) {
   const response = await getChatHost().corvaApi.get(
     `/v2/${ASSET_RESOURCE[assetType]}/${assetId}`,
@@ -3628,55 +3628,45 @@ function getAssetOwnerCompany(assetId, assetType) {
   ownerRequests.set(key, request);
   return request;
 }
-var normalizeName = (name) => name.trim().toLowerCase();
-function isOnCompanyServer(serverNames, companyName) {
-  if (!companyName) return false;
-  const target = normalizeName(companyName);
-  return serverNames.some((name) => normalizeName(name) === target);
-}
-var joinedKey = (revoltUserId) => `corva_chat_joined_companies_${revoltUserId}`;
-function readJoinedCompanies(revoltUserId) {
-  try {
-    const raw = getChatStorage().getItem(joinedKey(revoltUserId));
-    const parsed = raw ? JSON.parse(raw) : [];
-    return Array.isArray(parsed) ? parsed.filter((id) => typeof id === "number") : [];
-  } catch {
-    return [];
-  }
-}
-function hasJoinedCompany(revoltUserId, companyId) {
-  return joinedThisSession.has(`${revoltUserId}:${companyId}`) || readJoinedCompanies(revoltUserId).includes(companyId);
-}
-function markCompanyJoined(revoltUserId, companyId) {
-  joinedThisSession.add(`${revoltUserId}:${companyId}`);
-  const joined = readJoinedCompanies(revoltUserId);
-  if (joined.includes(companyId)) return;
-  try {
-    getChatStorage().setItem(joinedKey(revoltUserId), JSON.stringify([...joined, companyId]));
-  } catch (error) {
-    console.error("Failed to save joined company:", error);
-  }
-}
 function resetAssetOwnerCompanies() {
   ownerRequests.clear();
-  joinedThisSession.clear();
 }
 
 // src/store/stores/assetStore.ts
-var SERVER_NAMES_WAIT_MS = 5e3;
 var joinApprovedAssets = /* @__PURE__ */ new Set();
-async function getJoinRequired(assetId, assetType) {
-  const { corvaCompanyId, user } = authStore.getState();
-  if (!user?._id) return null;
-  if (joinApprovedAssets.has(`${assetType}:${assetId}`)) return null;
-  const owner = await getAssetOwnerCompany(assetId, assetType);
-  if (owner.id === corvaCompanyId || hasJoinedCompany(user._id, owner.id)) return null;
-  const serverNames = await waitForServerNames(SERVER_NAMES_WAIT_MS);
-  if (serverNames && isOnCompanyServer(serverNames, owner.name)) {
-    markCompanyJoined(user._id, owner.id);
+var assetKey = (assetType, assetId) => `${assetType}:${assetId}`;
+var isJoinUnderway = (assetType, assetId) => joinApprovedAssets.has(assetKey(assetType, assetId)) || assetStore.getState().currentAssetId === assetId && !!assetStore.getState().assetChatId;
+async function toJoinRequired(assetId, assetType, session) {
+  const owner = await getAssetOwnerCompany(assetId, assetType).catch(() => null);
+  return {
+    assetId,
+    assetType,
+    companyId: session.companyId ?? owner?.id ?? null,
+    companyName: owner?.name ?? null
+  };
+}
+async function fetchJoinedAssetChatId(assetId, assetType) {
+  let session;
+  try {
+    session = await getAssetChatSession(assetId, assetType);
+  } catch (e) {
+    console.error("Failed to fetch asset chat channel:", e);
+    return null;
+  }
+  if (!session.joined) {
+    const joinRequired = await toJoinRequired(assetId, assetType, session);
+    const isCurrent = assetStore.getState().currentAssetId === assetId;
+    if (isCurrent && !isJoinUnderway(assetType, assetId)) assetStore.setState({ joinRequired });
     return null;
   }
-  return { assetId, assetType, companyId: owner.id, companyName: owner.name };
+  const chatId = session.channelId;
+  registerChannelServer(session);
+  registerAssetChatChannel(chatId, assetId, assetType);
+  assetStore.setState((state) => ({
+    assetChatId: chatId,
+    knownAssetChatIds: new Set(Array.from(state.knownAssetChatIds).concat(chatId))
+  }));
+  return chatId;
 }
 var registerAssetChatChannel = (channelId, assetId, assetType) => {
   const id = Number(assetId);
@@ -3746,20 +3736,23 @@ var assetStore = createStore()((set, get) => ({
     });
     const isStale = () => get().currentAssetId !== assetId;
     try {
-      const joinRequired = await getJoinRequired(assetId, assetType);
+      const join = joinApprovedAssets.has(assetKey(assetType, assetId));
+      const session = await getAssetChatSession(assetId, assetType, { join });
       if (isStale()) return;
-      if (joinRequired) {
+      if (!session.joined) {
+        if (join) throw new Error("Could not join this chat");
+        const joinRequired = await toJoinRequired(assetId, assetType, session);
+        if (isStale() || isJoinUnderway(assetType, assetId)) return;
         set({ joinRequired });
         uiStore.setState({ isLoading: false });
         return;
       }
-      const session = await getAssetChatSession(assetId, assetType);
-      if (isStale()) return;
       const chatId = session.channelId;
       registerChannelServer(session);
       registerAssetChatChannel(chatId, assetId, assetType);
       set({
         assetChatId: chatId,
+        joinRequired: null,
         knownAssetChatIds: new Set(Array.from(currentState.knownAssetChatIds).concat(chatId))
       });
       uiStore.setState({ isLoading: false });
@@ -3801,9 +3794,8 @@ var assetStore = createStore()((set, get) => ({
   },
   joinAssetChat: async () => {
     const { joinRequired } = get();
-    const userId = authStore.getState().user?._id;
-    if (!joinRequired || !userId) return;
-    const approvalKey = `${joinRequired.assetType}:${joinRequired.assetId}`;
+    if (!joinRequired) return;
+    const approvalKey = assetKey(joinRequired.assetType, joinRequired.assetId);
     joinApprovedAssets.add(approvalKey);
     set({ joinRequired: null });
     const { currentAssetName, currentAssetStatus } = get();
@@ -3814,46 +3806,21 @@ var assetStore = createStore()((set, get) => ({
         currentAssetName ?? void 0,
         currentAssetStatus ?? void 0
       );
-      if (get().assetChatId) markCompanyJoined(userId, joinRequired.companyId);
     } finally {
       joinApprovedAssets.delete(approvalKey);
     }
   },
   ensureAssetChatSubscription: async () => {
-    const { currentAssetId, currentAssetType } = get();
+    const { currentAssetId, currentAssetType, joinRequired: pendingJoin } = get();
     if (!currentAssetId || !currentAssetType) return null;
     if (!isChatAssetTypeAllowed(currentAssetType)) return null;
+    if (pendingJoin?.assetId === currentAssetId) return null;
     const cached = inFlightByAsset.get(currentAssetId);
     if (cached) return cached;
     const promise = (async () => {
       try {
-        let chatId = get().assetChatId;
-        if (!chatId) {
-          let joinRequired;
-          try {
-            joinRequired = await getJoinRequired(currentAssetId, currentAssetType);
-          } catch (e) {
-            console.error("Failed to check asset chat access:", e);
-            return null;
-          }
-          if (joinRequired) {
-            if (get().currentAssetId === currentAssetId) set({ joinRequired });
-            return null;
-          }
-          try {
-            const session = await getAssetChatSession(currentAssetId, currentAssetType);
-            chatId = session.channelId;
-            registerChannelServer(session);
-            registerAssetChatChannel(chatId, currentAssetId, currentAssetType);
-            set({
-              assetChatId: chatId,
-              knownAssetChatIds: new Set(Array.from(get().knownAssetChatIds).concat(chatId))
-            });
-          } catch (e) {
-            console.error("Failed to fetch asset chat channel:", e);
-            return null;
-          }
-        }
+        const chatId = get().assetChatId ?? await fetchJoinedAssetChatId(currentAssetId, currentAssetType);
+        if (!chatId) return null;
         const existing = roomStore.getState().subscriptions.find((s) => s.rid === chatId);
         if (existing) return existing;
         const { api } = sharedRefs;
@@ -4678,9 +4645,7 @@ onChatStorageConfigured(() => uiStore.setState(loadAttentionBudget()));
 var getInitialState6 = () => ({
   user: null,
   serverId: null,
-  corvaCompanyId: null,
   externalChannels: {},
-  serverNames: null,
   isConnected: false,
   hasEverConnected: false,
   connectionGaveUp: false,
@@ -4710,7 +4675,6 @@ var authStore = createStore()((set, get) => ({
     if (previous?.serverId === serverId && previous.companyId === companyId) return state;
     return { externalChannels: { ...rest, [channelId]: { serverId, companyId } } };
   }),
-  setServerNames: (names) => set({ serverNames: names }),
   markChatUsed: () => {
     if (get().chatUsed === true) return;
     set({ chatUsed: true });
@@ -4880,22 +4844,6 @@ var authStore = createStore()((set, get) => ({
   isSocketConnected: () => !!sharedRefs.socket?.isConnected()
 }));
 var getExternalChannel = (roomId) => roomId && authStore.getState().externalChannels[roomId] || null;
-var waitForServerNames = (timeoutMs) => {
-  const current = authStore.getState().serverNames;
-  if (current) return Promise.resolve(current);
-  return new Promise((resolve) => {
-    const timer = setTimeout(() => {
-      unsubscribe();
-      resolve(null);
-    }, timeoutMs);
-    const unsubscribe = authStore.subscribe((state) => {
-      if (!state.serverNames) return;
-      clearTimeout(timer);
-      unsubscribe();
-      resolve(state.serverNames);
-    });
-  });
-};
 var isExternalServerChannel = (roomId) => !!getExternalChannel(roomId);
 var resetAuthStore = () => authStore.setState(getInitialState6());
 
@@ -5371,11 +5319,8 @@ var createSocketEventHandlers = (config) => {
     onDisconnected: () => {
       authStore.setState({ isConnected: false });
     },
-    onReady: (channels, channelUnreads, servers) => {
+    onReady: (channels, channelUnreads) => {
       if (!authStore.getState().user?._id) return;
-      authStore.getState().setServerNames(
-        (servers ?? []).map((server) => server.name).filter((name) => !!name)
-      );
       const channelLastMsg = /* @__PURE__ */ new Map();
       channels.forEach((ch) => {
         if (ch.last_message_id) {
@@ -5963,9 +5908,6 @@ async function handleUnauthorized() {
 function ensureChatSession(corvaUser) {
   lastCorvaUser = corvaUser;
   initChat();
-  if (authStore.getState().corvaCompanyId !== corvaUser.company_id) {
-    authStore.setState({ corvaCompanyId: corvaUser.company_id ?? null });
-  }
   sharedRefs.api?.setUnauthorizedHandler(() => {
     handleUnauthorized().catch((error) => console.error("Chat re-authentication failed", error));
   });
@@ -5989,6 +5931,6 @@ function ensureChatSession(corvaUser) {
   return inFlight;
 }
 
-export { ALERT_SEVERITY, ASSET_API_FIELDS, ASSET_CHAT_PREFIXES, ASSET_NOUN, CHANNEL_NAME_MAX_LENGTH, CHANNEL_TYPES, CORVA_MESSAGE_TYPES, CORVA_SYS_PREFIX, DATE_SEPARATOR_LABELS, DEFAULT_CHANNEL_CONTENT_FILTER, DEFAULT_CHANNEL_CONTENT_FILTERS, DEFAULT_CHANNEL_PREFERENCE, DEFAULT_FAVORITE_ROOMS_SETTINGS, DEFAULT_HIDDEN_ROOMS_SETTINGS, DEFAULT_NOTIFICATION_PREFERENCES, DEFAULT_NOTIFICATION_SETTINGS, DEFAULT_ROOM_LIST_ORDER, DIRECT_MESSAGE_PLACEHOLDER, GENERAL_CHAT_NAME, HttpError, MAX_ATTACHMENT_SIZE_BYTES, MAX_ATTACHMENT_SIZE_MB, MAX_NAVIGATION_HISTORY, MENTION_REPLACE_PATTERN, MENTION_SPLIT_PATTERN, MUTE_PRESET_OPTIONS, NOTIFICATION_DESTINATIONS, NOTIFICATION_SETTING_ALL, NOTIFICATION_SETTING_MENTIONS, NOTIFICATION_SETTING_NOTHING, PAUSE_INDEFINITELY, PAUSE_PRESETS, PAUSE_PRESET_OPTIONS, REVOLT_SYSTEM_USER_ID, ROOM_LIST_ORDER, SESSION_STORAGE_KEY, SIDEBAR_SECTIONS, SIDEBAR_TABS, SOFT_DELETE_MARKER, SYSTEM_MESSAGE_TEXTS, SessionManager, WEBSOCKET_CONNECTING, WEBSOCKET_OPEN, addMessage, addOrUpdateSubscription, alertMessageAsText, assetStore, authStore, buildAppCommentMessageContent, buildAskCorvaMessageContent, buildFinalMessage, buildForwardMessageContent, buildGroupChannelName, canDeleteMessage, canEditMessage, channelContentFilterStore, channelToAsset, chatToastStore, clearLastOpenedRoom, compareByActivity, compareByName, compareByRecencyDesc, configureChat, configureChatStorage, createAckScheduler, createCorvaUserService, createDMSubscription, createGroupSubscription, createHttpClient, createLatestWinsQueue, createMemoryStorage, createMessageCache, createRevoltAPI, createRevoltSocket, createRoomTaskQueue, createSocketEventHandlers, createSoftDeletedMessage, createTypingManager, deriveAllowedChatAsset, enrichWithCorvaData, ensureChatSession, extractTimestampFromULID, failOptimisticMessage, favoriteRoomsStore, findGeneralRoom, formatAssetChatName, getAppCommentAttachments, getAssetChatChannel, getAssetChatSession, getAssetTypeFromDisplayName, getChatHost, getChatStorage, getCorvaUserFields, getExternalChannel, getLastOpenedRoom, getMessageTimestamp, getPauseUntil, getReactionCount, getRoomDisplayName, getSystemMessageWithCorvaNames, getUserDisplayName, getUserSecondaryText, handleUnauthorized, hasReactions, hasUserReacted, initChat, installUnreadWatcher, isAlertMessage, isAppCommentMessage, isAskCorvaMessage, isChannelMuted, isChatAssetTypeAllowed, isChatStorageConfigured, isCurrentRoomSelection, isDeepEqual, isDefaultChannelPreference, isDisallowedAssetChatRoom, isDmGroup, isExternalServerChannel, isForwardedMessage, isGeneralRoom, isNotificationsPaused, isPauseActive, isSoftDeletedMessage, isSystemMessage, isUnread, isUserOnline, isValidPausePreset, isVisibleUnread, keepChatUsed, loadUntilFound, memberStore, messageStore, navigationHistoryStore, notificationStore, onChatStorageConfigured, parseCorvaSystemMessage, prepareRoomSelection, removeMessageFromList, removeSubscription, resetAssetStore, resetAuthStore, resetChannelContentFilterStore, resetChatAssetPermissionsSnapshot, resetChatHost, resetFavoriteRoomsStore, resetMemberStore, resetMessageStore, resetNavigationHistoryStore, resetNotificationStore, resetRoomStore, resetUIStore, roomStore, saveLastChatActivity, saveLastOpenedRoom, searchMessages, searchRooms, searchUsers, selectCanGoBack, selectCanGoForward, setAllowedChatAssetTypes, settleOptimisticMessage, sharedRefs, sortChannels, sortDMs, sortMessagesByTime, sortUsersByStatus, stripPlatformMentions, uiStore, updateMessageInList, uploadAndSend, validateChannelName, waitForNextPaint, waitForServerNames, wasRecentlyActive, withChannelPreferenceDefaults };
+export { ALERT_SEVERITY, ASSET_API_FIELDS, ASSET_CHAT_PREFIXES, ASSET_NOUN, CHANNEL_NAME_MAX_LENGTH, CHANNEL_TYPES, CORVA_MESSAGE_TYPES, CORVA_SYS_PREFIX, DATE_SEPARATOR_LABELS, DEFAULT_CHANNEL_CONTENT_FILTER, DEFAULT_CHANNEL_CONTENT_FILTERS, DEFAULT_CHANNEL_PREFERENCE, DEFAULT_FAVORITE_ROOMS_SETTINGS, DEFAULT_HIDDEN_ROOMS_SETTINGS, DEFAULT_NOTIFICATION_PREFERENCES, DEFAULT_NOTIFICATION_SETTINGS, DEFAULT_ROOM_LIST_ORDER, DIRECT_MESSAGE_PLACEHOLDER, GENERAL_CHAT_NAME, HttpError, MAX_ATTACHMENT_SIZE_BYTES, MAX_ATTACHMENT_SIZE_MB, MAX_NAVIGATION_HISTORY, MENTION_REPLACE_PATTERN, MENTION_SPLIT_PATTERN, MUTE_PRESET_OPTIONS, NOTIFICATION_DESTINATIONS, NOTIFICATION_SETTING_ALL, NOTIFICATION_SETTING_MENTIONS, NOTIFICATION_SETTING_NOTHING, PAUSE_INDEFINITELY, PAUSE_PRESETS, PAUSE_PRESET_OPTIONS, REVOLT_SYSTEM_USER_ID, ROOM_LIST_ORDER, SESSION_STORAGE_KEY, SIDEBAR_SECTIONS, SIDEBAR_TABS, SOFT_DELETE_MARKER, SYSTEM_MESSAGE_TEXTS, SessionManager, WEBSOCKET_CONNECTING, WEBSOCKET_OPEN, addMessage, addOrUpdateSubscription, alertMessageAsText, assetStore, authStore, buildAppCommentMessageContent, buildAskCorvaMessageContent, buildFinalMessage, buildForwardMessageContent, buildGroupChannelName, canDeleteMessage, canEditMessage, channelContentFilterStore, channelToAsset, chatToastStore, clearLastOpenedRoom, compareByActivity, compareByName, compareByRecencyDesc, configureChat, configureChatStorage, createAckScheduler, createCorvaUserService, createDMSubscription, createGroupSubscription, createHttpClient, createLatestWinsQueue, createMemoryStorage, createMessageCache, createRevoltAPI, createRevoltSocket, createRoomTaskQueue, createSocketEventHandlers, createSoftDeletedMessage, createTypingManager, deriveAllowedChatAsset, enrichWithCorvaData, ensureChatSession, extractTimestampFromULID, failOptimisticMessage, favoriteRoomsStore, findGeneralRoom, formatAssetChatName, getAppCommentAttachments, getAssetChatChannel, getAssetChatSession, getAssetTypeFromDisplayName, getChatHost, getChatStorage, getCorvaUserFields, getExternalChannel, getLastOpenedRoom, getMessageTimestamp, getPauseUntil, getReactionCount, getRoomDisplayName, getSystemMessageWithCorvaNames, getUserDisplayName, getUserSecondaryText, handleUnauthorized, hasReactions, hasUserReacted, initChat, installUnreadWatcher, isAlertMessage, isAppCommentMessage, isAskCorvaMessage, isChannelMuted, isChatAssetTypeAllowed, isChatStorageConfigured, isCurrentRoomSelection, isDeepEqual, isDefaultChannelPreference, isDisallowedAssetChatRoom, isDmGroup, isExternalServerChannel, isForwardedMessage, isGeneralRoom, isNotificationsPaused, isPauseActive, isSoftDeletedMessage, isSystemMessage, isUnread, isUserOnline, isValidPausePreset, isVisibleUnread, keepChatUsed, loadUntilFound, memberStore, messageStore, navigationHistoryStore, notificationStore, onChatStorageConfigured, parseCorvaSystemMessage, prepareRoomSelection, removeMessageFromList, removeSubscription, resetAssetStore, resetAuthStore, resetChannelContentFilterStore, resetChatAssetPermissionsSnapshot, resetChatHost, resetFavoriteRoomsStore, resetMemberStore, resetMessageStore, resetNavigationHistoryStore, resetNotificationStore, resetRoomStore, resetUIStore, roomStore, saveLastChatActivity, saveLastOpenedRoom, searchMessages, searchRooms, searchUsers, selectCanGoBack, selectCanGoForward, setAllowedChatAssetTypes, settleOptimisticMessage, sharedRefs, sortChannels, sortDMs, sortMessagesByTime, sortUsersByStatus, stripPlatformMentions, uiStore, updateMessageInList, uploadAndSend, validateChannelName, waitForNextPaint, wasRecentlyActive, withChannelPreferenceDefaults };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map