diff --git a/lib/components/chat-mention-provider.react.js b/lib/components/chat-mention-provider.react.js --- a/lib/components/chat-mention-provider.react.js +++ b/lib/components/chat-mention-provider.react.js @@ -71,7 +71,7 @@ ); } -function getChatMentionCandidates(threadInfos: { +function getChatMentionCandidates(resolvedThreadInfos: { +[id: string]: ResolvedThreadInfo, }): { chatMentionCandidatesObj: ChatMentionCandidatesObj, @@ -84,32 +84,36 @@ } = {}; const visitedGenesisThreads = new Set(); const communityThreadIDForGenesisThreads: { [string]: string } = {}; - for (const currentThreadID in threadInfos) { - const currentThreadInfo = threadInfos[currentThreadID]; - const { community: currentThreadCommunity } = currentThreadInfo; + for (const currentThreadID in resolvedThreadInfos) { + const currentResolvedThreadInfo = resolvedThreadInfos[currentThreadID]; + const { community: currentThreadCommunity } = currentResolvedThreadInfo; if (!currentThreadCommunity) { if (!result[currentThreadID]) { - result[currentThreadID] = { [currentThreadID]: currentThreadInfo }; + result[currentThreadID] = { + [currentThreadID]: currentResolvedThreadInfo, + }; } continue; } if (!result[currentThreadCommunity]) { result[currentThreadCommunity] = {}; result[currentThreadCommunity][currentThreadCommunity] = - threadInfos[currentThreadCommunity]; + resolvedThreadInfos[currentThreadCommunity]; } // Handle GENESIS community case: mentioning inside GENESIS should only // show chats and threads inside the top level that is below GENESIS. - if (threadInfos[currentThreadCommunity].type === threadTypes.GENESIS) { + if ( + resolvedThreadInfos[currentThreadCommunity].type === threadTypes.GENESIS + ) { if (visitedGenesisThreads.has(currentThreadID)) { continue; } - const threadTraversePath = [currentThreadInfo]; + const threadTraversePath = [currentResolvedThreadInfo]; visitedGenesisThreads.add(currentThreadID); - let currentlySelectedThreadID = currentThreadInfo.parentThreadID; + let currentlySelectedThreadID = currentResolvedThreadInfo.parentThreadID; while (currentlySelectedThreadID) { const currentlySelectedThreadInfo = - threadInfos[currentlySelectedThreadID]; + resolvedThreadInfos[currentlySelectedThreadID]; if ( visitedGenesisThreads.has(currentlySelectedThreadID) || !currentlySelectedThreadInfo || @@ -125,7 +129,7 @@ threadTraversePath[threadTraversePath.length - 1]; let lastThreadInTraversePathParentID; if (lastThreadInTraversePath.parentThreadID) { - lastThreadInTraversePathParentID = threadInfos[ + lastThreadInTraversePathParentID = resolvedThreadInfos[ lastThreadInTraversePath.parentThreadID ] ? lastThreadInTraversePath.parentThreadID @@ -134,7 +138,7 @@ lastThreadInTraversePathParentID = lastThreadInTraversePath.id; } if ( - threadInfos[lastThreadInTraversePathParentID].type === + resolvedThreadInfos[lastThreadInTraversePathParentID].type === threadTypes.GENESIS ) { if (!result[lastThreadInTraversePath.id]) { @@ -172,7 +176,7 @@ } continue; } - result[currentThreadCommunity][currentThreadID] = currentThreadInfo; + result[currentThreadCommunity][currentThreadID] = currentResolvedThreadInfo; } return { chatMentionCandidatesObj: result,