cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-29 08:11:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4952 from CHOMPStation2/upstream-merge-13741

Browse Source 
[MIRROR] Fixes Communicator Threads
This commit is contained in:
Razgriz
2022-09-22 20:03:19 -07:00
committed by GitHub
parent 8f20bc823e 4f175a6f66
commit f0506e0ce9
1 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tgui/packages/tgui/interfaces/Communicator.tsx
+21 -13
View File
@@ -600,7 +600,7 @@ type MessagingTabData = {
// THREAD
targetAddressName: string;
targetAddress: string;
imList: { im: string }[];
imList: { address: string; to_address: string; im: string }[];
};
/* Messaging */
@@ -718,11 +718,16 @@ const MessagingThreadTab = (props, context) => {
'height': '95%',
'overflow-y': 'auto',
}}>
{imList.map((im, i) => (
<Box key={i} className={IsIMOurs(im, targetAddress) ? 'ClassicMessage_Sent' : 'ClassicMessage_Received'}>
{IsIMOurs(im, targetAddress) ? 'You' : 'Them'}: {im.im}
</Box>
))}
{imList.map(
(im, i) =>
(im.to_address === targetAddress || im.address === targetAddress) && (
<Box
key={i}
className={IsIMOurs(im, targetAddress) ? 'ClassicMessage_Sent' : 'ClassicMessage_Received'}>
{IsIMOurs(im, targetAddress) ? 'You' : 'Them'}: {im.im}
</Box>
)
)}
</Section>
<Button icon="comment" onClick={() => act('message', { 'message': targetAddress })} content="Message" />
</Section>
@@ -758,13 +763,16 @@ const MessagingThreadTab = (props, context) => {
'height': '95%',
'overflow-y': 'auto',
}}>
{imList.map((im, i, filterArr) => (
<Box textAlign={IsIMOurs(im, targetAddress) ? 'right' : 'left'} mb={1} key={i}>
<Box maxWidth="75%" className={findClassMessage(im, targetAddress, i - 1, filterArr)} inline>
{decodeHtmlEntities(im.im)}
</Box>
</Box>
))}
{imList.map(
(im, i, filterArr) =>
(im.to_address === targetAddress || im.address === targetAddress) && (
<Box textAlign={IsIMOurs(im, targetAddress) ? 'right' : 'left'} mb={1} key={i}>
<Box maxWidth="75%" className={findClassMessage(im, targetAddress, i - 1, filterArr)} inline>
{decodeHtmlEntities(im.im)}
</Box>
</Box>
)
)}
</Section>
<Button icon="comment" onClick={() => act('message', { 'message': targetAddress })} content="Message" />
</Section>