chat clean

shared/chat/blocking/block-buttons-state.tsx

@@ -28,11 +28,13 @@ const gregorItemsToBlockButtons = (
 
 type Store = T.Immutable<{
   blockButtonsMap: ReadonlyMap<T.RPCGen.TeamID, T.Chat.BlockButtonsInfo>
+  loadGeneration: number
   loaded: boolean
 }>
 
 const makeInitialStore = (): Store => ({
   blockButtonsMap: new Map(),
+  loadGeneration: 0,
   loaded: false,
 })
 
@@ -46,8 +48,11 @@ type State = Store & {
   }
 }
 
-let loadPromise: Promise<void> | undefined
-let loadGeneration = 0
+// Promises can't live in immer-managed state, so this stays module-level. It's
+// paired with the store's loadGeneration: resetState clears this AND bumps the
+// generation so a load in flight at reset time can't win the race and write
+// into the fresh state after it resolves.
+let activeLoadPromise: Promise<void> | undefined
 
 export const useBlockButtonsState = Z.createZustand<State>('block-buttons', (set, get) => {
   const setFromGregorItems: State['dispatch']['updateFromGregorItems'] = items => {
@@ -59,39 +64,41 @@ export const useBlockButtonsState = Z.createZustand<State>('block-buttons', (set
 
   const dispatch: State['dispatch'] = {
     load: () => {
-      if (get().loaded || loadPromise) {
+      if (get().loaded || activeLoadPromise) {
         return
       }
-      const generation = loadGeneration
+      const generation = get().loadGeneration
       const request = (async () => {
         try {
           const state = await T.RPCGen.gregorGetStateRpcPromise()
-          if (generation === loadGeneration) {
+          if (generation === get().loadGeneration) {
             setFromGregorItems(state.items)
           }
         } catch (error) {
           logger.warn('Failed to load block button state', error)
         }
       })()
-      loadPromise = request
+      activeLoadPromise = request
       ignorePromise(
         request.finally(() => {
-          if (loadPromise === request) {
-            loadPromise = undefined
+          if (activeLoadPromise === request) {
+            activeLoadPromise = undefined
           }
         })
       )
     },
     resetState: () => {
-      loadGeneration++
-      loadPromise = undefined
+      activeLoadPromise = undefined
       set(s => ({
         ...makeInitialStore(),
         dispatch: s.dispatch,
+        loadGeneration: s.loadGeneration + 1,
       }))
     },
     updateFromGregorItems: items => {
-      loadGeneration++
+      set(s => {
+        s.loadGeneration++
+      })
       setFromGregorItems(items)
     },
   }

shared/chat/blocking/invitation-to-block.tsx

@@ -11,7 +11,9 @@ import {useBlockButtonsInfo} from './block-buttons-state'
 import {
   useConversationThreadID,
   useConversationThreadSelector,
+  useThreadMeta,
 } from '../conversation/thread-context'
+import {useConversationParticipants} from '../conversation/data-hooks'
 
 const dismissBlockButtons = (teamID: T.RPCGen.TeamID) => {
   const f = async () => {
@@ -29,17 +31,16 @@ const dismissBlockButtons = (teamID: T.RPCGen.TeamID) => {
 const BlockButtons = () => {
   const navigateAppend = C.Router2.navigateAppend
   const conversationIDKey = useConversationThreadID()
-  const {messageMap, messageOrdinals, participantInfo, team, teamID, tlfname} =
-    useConversationThreadSelector(
-      C.useShallow(s => ({
-        messageMap: s.messageMap,
-        messageOrdinals: s.messageOrdinals,
-        participantInfo: s.participants,
-        team: s.meta.teamname,
-        teamID: s.meta.teamID,
-        tlfname: s.meta.tlfname,
-      }))
-    )
+  const {messageMap, messageOrdinals} = useConversationThreadSelector(
+    C.useShallow(s => ({
+      messageMap: s.messageMap,
+      messageOrdinals: s.messageOrdinals,
+    }))
+  )
+  const {team, teamID, tlfname} = useThreadMeta(
+    C.useShallow(m => ({team: m.teamname, teamID: m.teamID, tlfname: m.tlfname}))
+  )
+  const participantInfo = useConversationParticipants(conversationIDKey)
   const blockButtonInfo = useBlockButtonsInfo(teamID)
   const currentUser = useCurrentUserState(s => s.username)
   const hasOwnMessage =

shared/chat/conversation/bot/install.tsx

@@ -14,7 +14,7 @@ import {useFeaturedBot} from '@/util/featured-bots'
 import {RPCError} from '@/util/errors'
 import logger from '@/logger'
 import {useBotSettings} from './settings'
-import {getInboxConversationMeta, metasReceived, participantInfoReceived} from '@/chat/inbox/metadata'
+import {metasReceived, participantInfoReceived} from '@/chat/inbox/metadata'
 import {useConversationMeta} from '../data-hooks'
 
 const RestrictedItem = '---RESTRICTED---'
@@ -42,8 +42,7 @@ export const useRefreshBotMembershipOnSuccess = (
           preview => {
             participantInfoReceived(
               conversationIDKey,
-              ChatCommon.uiParticipantsToParticipantInfo(preview.conv.participants ?? []),
-              getInboxConversationMeta(conversationIDKey)
+              ChatCommon.uiParticipantsToParticipantInfo(preview.conv.participants ?? [])
             )
             onSuccess()
           },

shared/chat/conversation/bottom-banner.tsx

@@ -8,10 +8,8 @@ import {assertionToDisplay} from '@/common-adapters/usernames'
 import {useUsersState} from '@/stores/users'
 import {useFollowerState} from '@/stores/followers'
 import {showShareActionSheet} from '@/util/platform-specific'
-import {
-  useConversationThreadID,
-  useConversationThreadSelector,
-} from './thread-context'
+import {useConversationThreadID, useThreadMeta} from './thread-context'
+import {useConversationParticipants} from './data-hooks'
 
 type Store = T.Immutable<{
   inviteBannerDismissed: Set<T.Chat.ConversationIDKey>
@@ -48,7 +46,8 @@ const installMessage = `I sent you encrypted messages on Keybase. You can instal
 
 const Invite = (props: {onDismiss: () => void}) => {
   const linkUrlProps = Kb.useClickURL('https://keybase.io/app')
-  const participantInfo = useConversationThreadSelector(s => s.participants)
+  const conversationIDKey = useConversationThreadID()
+  const participantInfo = useConversationParticipants(conversationIDKey)
   const participantInfoAll = participantInfo.all
   const users = participantInfoAll.filter(p => p.includes('@'))
 
@@ -145,9 +144,8 @@ const BannerContainerInner = function BannerContainerInner(props: {
       dismissed: s.inviteBannerDismissed.has(conversationIDKey),
     }))
   )
-  const {meta, participantInfo} = useConversationThreadSelector(
-    C.useShallow(s => ({meta: s.meta, participantInfo: s.participants}))
-  )
+  const meta = useThreadMeta(C.useShallow(m => ({isEmpty: m.isEmpty, teamType: m.teamType})))
+  const participantInfo = useConversationParticipants(conversationIDKey)
   if (meta.teamType !== 'adhoc') {
     return null
   }

shared/chat/conversation/container.tsx

@@ -8,7 +8,7 @@ import Rekey from './rekey/container'
 import type {ThreadSearchRouteProps} from './thread-search-route'
 import type * as T from '@/constants/types'
 import {BadgeHeaderUpdater} from './header-area'
-import {LiveConversationThreadProvider, useConversationThreadID, useConversationThreadSelector} from './thread-context'
+import {LiveConversationThreadProvider, useConversationThreadID, useThreadMeta} from './thread-context'
 
 type Props = ThreadSearchRouteProps & {
   conversationIDKey?: T.Chat.ConversationIDKey
@@ -26,7 +26,13 @@ const Conversation = function Conversation(props: Props) {
 
 const ConversationInner = function ConversationInner() {
   const conversationIDKey = useConversationThreadID()
-  const meta = useConversationThreadSelector(s => s.meta)
+  const meta = useThreadMeta(
+    C.useShallow(m => ({
+      membershipType: m.membershipType,
+      rekeyers: m.rekeyers,
+      trustedState: m.trustedState,
+    }))
+  )
   const type = (() => {
     switch (conversationIDKey) {
       case Chat.noConversationIDKey:

shared/chat/conversation/data-hooks.tsx

@@ -1,5 +1,4 @@
 import * as C from '@/constants'
-import * as Common from '@/constants/chat/common'
 import * as Message from '@/constants/chat/message'
 import * as Meta from '@/constants/chat/meta'
 import * as React from 'react'
@@ -9,13 +8,13 @@ import {useEngineActionListener} from '@/engine/action-listener'
 import {ignorePromise} from '@/constants/utils'
 import {useCurrentUserState} from '@/stores/current-user'
 import {useConfigState} from '@/stores/config'
-import {uint8ArrayToString} from '@/util/uint8array'
 import logger from '@/logger'
 import {loadThreadNonblock, markConversationRead} from './thread-rpc'
 import {setConversationOrangeLine} from './orange-line-context'
+import {getExplodingModeFromGregorItems} from './thread-load'
 
 const emptyConversationMeta = Meta.makeConversationMeta()
-const emptyParticipantInfo: T.Chat.ParticipantInfo = {
+export const emptyParticipantInfo: T.Chat.ParticipantInfo = {
   all: [],
   contactName: new Map(),
   name: [],
@@ -129,28 +128,6 @@ export const useConversationMeta = (conversationIDKey: T.Chat.ConversationIDKey)
 export const useConversationParticipants = (conversationIDKey: T.Chat.ConversationIDKey) =>
   useConversationMetadata(conversationIDKey).participants
 
-const getExplodingModeFromGregorItems = (
-  conversationIDKey: T.Chat.ConversationIDKey,
-  items: ReadonlyArray<{item: T.RPCGen.Gregor1.Item}>
-) => {
-  const explodingItems = items.filter(i => i.item.category.startsWith(Common.explodingModeGregorKeyPrefix))
-  if (!explodingItems.length) {
-    return 0
-  }
-  const category = `${Common.explodingModeGregorKeyPrefix}${conversationIDKey}`
-  const item = explodingItems.find(i => i.item.category === category)
-  if (!item) {
-    return undefined
-  }
-  const secondsString = uint8ArrayToString(item.item.body)
-  const seconds = parseInt(secondsString, 10)
-  if (isNaN(seconds)) {
-    logger.warn(`Got dirty exploding mode ${secondsString} for category ${category}`)
-    return undefined
-  }
-  return seconds
-}
-
 export const useConversationExplodingMode = (conversationIDKey: T.Chat.ConversationIDKey) =>
   useConfigState(state => getExplodingModeFromGregorItems(conversationIDKey, state.gregorPushState) ?? 0)
 
@@ -161,31 +138,22 @@ const parseThreadMessages = (conversationIDKey: T.Chat.ConversationIDKey, thread
   if (!thread) {
     return emptyMessages
   }
-  try {
-    const {username, deviceName} = useCurrentUserState.getState()
-    let lastOrdinal = T.Chat.numberToOrdinal(0)
-    const getLastOrdinal = () => lastOrdinal
-    const uiMessages = JSON.parse(thread) as T.RPCChat.UIMessages
-    return (uiMessages.messages ?? []).reduce<Array<T.Chat.Message>>((arr, uiMessage) => {
-      const message = Message.uiMessageToMessage(
-        conversationIDKey,
-        uiMessage,
-        username,
-        getLastOrdinal,
-        deviceName
-      )
-      if (message) {
-        arr.push(message)
-        if (T.Chat.ordinalToNumber(message.ordinal) > T.Chat.ordinalToNumber(lastOrdinal)) {
-          lastOrdinal = message.ordinal
-        }
+  const {username, deviceName} = useCurrentUserState.getState()
+  let lastOrdinal = T.Chat.numberToOrdinal(0)
+  const getLastOrdinal = () => lastOrdinal
+  const {messages} = Message.parseUIMessagesJSON(
+    conversationIDKey,
+    thread,
+    username,
+    deviceName,
+    getLastOrdinal,
+    message => {
+      if (T.Chat.ordinalToNumber(message.ordinal) > T.Chat.ordinalToNumber(lastOrdinal)) {
+        lastOrdinal = message.ordinal
       }
-      return arr
-    }, [])
-  } catch (error) {
-    logger.warn(`parseThreadMessages: failed for ${conversationIDKey}: ${String(error)}`)
-    return emptyMessages
-  }
+    }
+  )
+  return messages
 }
 
 const loadConversationMessagesAroundMessageID = async (

shared/chat/conversation/error.tsx

@@ -1,8 +1,8 @@
 import * as Kb from '@/common-adapters'
-import {useConversationThreadSelector} from './thread-context'
+import {useThreadMeta} from './thread-context'
 
 const ConversationError = () => {
-  const text = useConversationThreadSelector(s => s.meta.snippet) ?? ''
+  const text = useThreadMeta(m => m.snippet) ?? ''
   return (
     <Kb.Box2 direction="vertical" fullWidth={true} padding="medium" gap="small">
       <Kb.Text type="Header">There was an error loading this conversation.</Kb.Text>

shared/chat/conversation/info-panel/bot.tsx

@@ -9,7 +9,7 @@ import {useUsersState} from '@/stores/users'
 import {useChatTeam, useChatTeamMembers} from '../team-hooks'
 import logger from '@/logger'
 import {useBotSettings} from '../bot/settings'
-import {getInboxConversationMeta, participantInfoReceived} from '@/chat/inbox/metadata'
+import {participantInfoReceived} from '@/chat/inbox/metadata'
 import {useConversationMetadata} from '../data-hooks'
 
 type AddToChannelProps = {
@@ -74,8 +74,7 @@ const AddToChannel = (props: AddToChannelProps) => {
                 preview => {
                   participantInfoReceived(
                     conversationIDKey,
-                    ChatCommon.uiParticipantsToParticipantInfo(preview.conv.participants ?? []),
-                    getInboxConversationMeta(conversationIDKey)
+                    ChatCommon.uiParticipantsToParticipantInfo(preview.conv.participants ?? [])
                   )
                 },
                 () => {}
@@ -237,8 +236,7 @@ const BotTab = (props: Props) => {
       preview => {
         participantInfoReceived(
           conversationIDKey,
-          ChatCommon.uiParticipantsToParticipantInfo(preview.conv.participants ?? []),
-          getInboxConversationMeta(conversationIDKey)
+          ChatCommon.uiParticipantsToParticipantInfo(preview.conv.participants ?? [])
         )
       },
       () => {}
@@ -262,8 +260,7 @@ const BotTab = (props: Props) => {
       preview => {
         participantInfoReceived(
           conversationIDKey,
-          ChatCommon.uiParticipantsToParticipantInfo(preview.conv.participants ?? []),
-          getInboxConversationMeta(conversationIDKey)
+          ChatCommon.uiParticipantsToParticipantInfo(preview.conv.participants ?? [])
         )
       },
       () => {}

shared/chat/conversation/input-area/container.tsx

@@ -5,16 +5,16 @@ import Normal from './normal'
 import Preview from './preview'
 import ThreadSearch from '../search'
 import {useThreadSearchRoute} from '../thread-search-route'
-import {useConversationThreadID, useConversationThreadSelector} from '../thread-context'
+import {useConversationThreadID, useThreadMeta} from '../thread-context'
 
 const InputAreaContainer = () => {
   const conversationIDKey = useConversationThreadID()
   const showThreadSearch = !!useThreadSearchRoute()
-  const {membershipType, resetParticipants, wasFinalizedBy} = useConversationThreadSelector(
-    C.useShallow(s => ({
-      membershipType: s.meta.membershipType,
-      resetParticipants: s.meta.resetParticipants,
-      wasFinalizedBy: s.meta.wasFinalizedBy,
+  const {membershipType, resetParticipants, wasFinalizedBy} = useThreadMeta(
+    C.useShallow(m => ({
+      membershipType: m.membershipType,
+      resetParticipants: m.resetParticipants,
+      wasFinalizedBy: m.wasFinalizedBy,
     }))
   )
 

shared/chat/conversation/input-area/input-state.test.tsx

@@ -17,20 +17,6 @@ jest.mock('@react-navigation/native', () => ({
   useRoute: () => ({name: 'chatConversation', params: mockRouteParams}),
 }))
 
-jest.mock('@/chat/inbox/rows-state', () => ({
-  flushInboxRowUpdates: jest.fn(),
-  getInboxRowTrustedState: jest.fn(() => undefined),
-  queueInboxRowUpdate: jest.fn(),
-  setInboxRowTrustedState: jest.fn(),
-  syncInboxRowBadgeState: jest.fn(),
-  syncInboxRowsFromLayout: jest.fn(),
-  syncInboxRowsFromMetaAndParticipants: jest.fn(),
-  syncInboxRowsFromMetas: jest.fn(),
-  syncInboxRowsFromParticipantMap: jest.fn(),
-  syncInboxRowsFromParticipants: jest.fn(),
-  updateInboxRowTyping: jest.fn(),
-}))
-
 const convID = T.Chat.conversationIDToKey(new Uint8Array([1, 2, 3, 4]))
 const otherConvID = T.Chat.conversationIDToKey(new Uint8Array([5, 6, 7, 8]))