LogalDeveloper/owncast
0
Fork 0
Code Activity

Limit message collapsing to 2 minutes between messages

Browse Source
This commit is contained in:
Gabe Kangas
2022-08-15 19:44:29 -07:00
parent 4cd9e22e34
commit 7dc2a1a4bc
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
web/components/chat/ChatContainer/ChatContainer.tsx
View File

@@ -86,8 +86,8 @@ export default function ChatContainer(props: Props) {
showModeratorMenu={isModerator} // Moderators have access to an additional menu showModeratorMenu={isModerator} // Moderators have access to an additional menu
highlightString={usernameToHighlight} // What to highlight in the message highlightString={usernameToHighlight} // What to highlight in the message
sentBySelf={message.user?.id === chatUserId} // The local user sent this message sentBySelf={message.user?.id === chatUserId} // The local user sent this message
sameUserAsLast={isSameUserAsLast(messages, index)} sameUserAsLast={shouldCollapseMessages(messages, index)}
isAuthorModerator={(message as ChatMessage).user.scopes.includes('MODERATOR')} isAuthorModerator={(message as ChatMessage).user.scopes?.includes('MODERATOR')}
key={message.id} key={message.id}
/> />
); );
@@ -159,7 +159,7 @@ export default function ChatContainer(props: Props) {
); );
} }
function isSameUserAsLast(messages: ChatMessage[], index: number): boolean { function shouldCollapseMessages(messages: ChatMessage[], index: number): boolean {
if (messages.length < 2) { if (messages.length < 2) {
return false; return false;
} }
@@ -173,6 +173,17 @@ function isSameUserAsLast(messages: ChatMessage[], index: number): boolean {
return false; return false;
} }
if (!lastMessage.timestamp || !message.timestamp) {
return false;
}
const maxTimestampDelta = 1000 * 60 * 2; // 2 minutes
const lastTimestamp = new Date(lastMessage.timestamp).getTime();
const thisTimestamp = new Date(message.timestamp).getTime();
if (thisTimestamp - lastTimestamp > maxTimestampDelta) {
return false;
}
return id === lastMessage?.user.id; return id === lastMessage?.user.id;
} }