Skip to content

[stable25] Only group messages for 5 minutes #8288

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickvergessen merged 2 commits into from
Nov 7, 2022
Merged

[stable25] Only group messages for 5 minutes #8288

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd850f5
Only group messages for 5 minutes
nickvergessen Nov 4, 2022
6a0cc02
Fix actor type
nickvergessen Nov 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/components/MessagesList/MessagesList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ export default {
return false // No previous message
}

if (message1.actorType === ATTENDEE.ACTOR_TYPE_BOTS // Don't group messages of commands and bots
if (message1.actorType === ATTENDEE.ACTOR_TYPE.BOTS // Don't group messages of commands and bots
&& message1.actorId !== ATTENDEE.CHANGELOG_BOT_ID) { // Apart from the changelog bot
return false
}
Expand All @@ -371,7 +371,13 @@ export default {
return false
}

return !this.messagesHaveDifferentDate(message1, message2) // Posted on the same day
if (this.messagesHaveDifferentDate(message1, message2)) {
// Not posted on the same day
return false
}

// Only group messages within a short period of time, so unrelated messages are not grouped together
return (this.getDateOfMessage(message1).format('X') - this.getDateOfMessage(message2).format('X')) < 300
},

/**
Expand Down