@@ -15,13 +15,15 @@ type ChannelRouteScreenProps = {
1515 selectedPostId : string | null ;
1616 targetMessageId : string | null ;
1717 targetReplyId : string | null ;
18+ targetThreadRootId : string | null ;
1819} ;
1920
2021export function ChannelRouteScreen ( {
2122 channelId,
2223 selectedPostId,
2324 targetMessageId,
2425 targetReplyId,
26+ targetThreadRootId,
2527} : ChannelRouteScreenProps ) {
2628 const { closeForumPost, goForumPost } = useAppNavigation ( ) ;
2729 const channelsQuery = useChannelsQuery ( ) ;
@@ -30,42 +32,61 @@ export function ChannelRouteScreen({
3032 const channels = channelsQuery . data ?? [ ] ;
3133 const activeChannel =
3234 channels . find ( ( channel ) => channel . id === channelId ) ?? null ;
33- const [ targetMessageEvent , setTargetMessageEvent ] =
34- React . useState < RelayEvent | null > ( ( ) =>
35- getCachedSearchHitEvent ( targetMessageId ) ,
36- ) ;
35+ const [ targetMessageEvents , setTargetMessageEvents ] = React . useState <
36+ RelayEvent [ ]
37+ > ( ( ) => {
38+ const cachedTarget = getCachedSearchHitEvent ( targetMessageId ) ;
39+ return cachedTarget ? [ cachedTarget ] : [ ] ;
40+ } ) ;
3741
3842 React . useEffect ( ( ) => {
3943 let isCancelled = false ;
4044
4145 if ( ! targetMessageId || selectedPostId ) {
42- setTargetMessageEvent ( null ) ;
46+ setTargetMessageEvents ( [ ] ) ;
4347 return ( ) => {
4448 isCancelled = true ;
4549 } ;
4650 }
4751
48- setTargetMessageEvent ( getCachedSearchHitEvent ( targetMessageId ) ) ;
49- void getEventById ( targetMessageId )
50- . then ( ( event ) => {
51- if ( ! isCancelled ) {
52- setTargetMessageEvent ( event ) ;
52+ const cachedTarget = getCachedSearchHitEvent ( targetMessageId ) ;
53+ setTargetMessageEvents ( cachedTarget ? [ cachedTarget ] : [ ] ) ;
54+
55+ const eventIds = [
56+ targetMessageId ,
57+ targetThreadRootId && targetThreadRootId !== targetMessageId
58+ ? targetThreadRootId
59+ : null ,
60+ ] . filter ( ( eventId ) : eventId is string => eventId !== null ) ;
61+
62+ void Promise . all (
63+ eventIds . map ( async ( eventId ) => {
64+ try {
65+ return await getEventById ( eventId ) ;
66+ } catch ( error ) {
67+ console . error ( "Failed to load route event" , eventId , error ) ;
68+ return null ;
5369 }
54- } )
55- . catch ( ( error ) => {
56- if ( ! isCancelled ) {
57- console . error (
58- "Failed to load route target event" ,
59- targetMessageId ,
60- error ,
70+ } ) ,
71+ ) . then ( ( events ) => {
72+ if ( ! isCancelled ) {
73+ setTargetMessageEvents ( ( currentEvents ) => {
74+ const fetchedEvents = events . filter (
75+ ( event ) : event is RelayEvent => event !== null ,
6176 ) ;
62- }
63- } ) ;
77+ const eventsById = new Map < string , RelayEvent > ( ) ;
78+ for ( const event of [ ...currentEvents , ...fetchedEvents ] ) {
79+ eventsById . set ( event . id , event ) ;
80+ }
81+ return Array . from ( eventsById . values ( ) ) ;
82+ } ) ;
83+ }
84+ } ) ;
6485
6586 return ( ) => {
6687 isCancelled = true ;
6788 } ;
68- } , [ selectedPostId , targetMessageId ] ) ;
89+ } , [ selectedPostId , targetMessageId , targetThreadRootId ] ) ;
6990
7091 if ( channelsQuery . isPending && ! activeChannel ) {
7192 return (
@@ -89,7 +110,7 @@ export function ChannelRouteScreen({
89110 } }
90111 selectedForumPostId = { selectedPostId }
91112 targetForumReplyId = { targetReplyId }
92- targetMessageEvent = { targetMessageEvent }
113+ targetMessageEvents = { targetMessageEvents }
93114 targetMessageId = { targetMessageId }
94115 />
95116 ) ;
0 commit comments