Skip to content

[stable21.1] Fix sorting of users that are online with user status offline #5569

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 1 commit into from
May 6, 2021
Merged

[stable21.1] Fix sorting of users that are online with user status offline #5569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 7 additions & 2 deletions src/components/RightSidebar/Participants/CurrentParticipants/CurrentParticipants.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,14 +130,19 @@ export default {
* @returns {number}
*/
sortParticipants(participant1, participant2) {
let session1 = participant1.sessionId
let session2 = participant2.sessionId
const session1 = participant1.sessionId
const session2 = participant2.sessionId
/**
* For now the user status is not overwriting the online-offline status anymore
* It felt too weird having users appear as offline but they are in the call or chat actively
if (participant1.status === 'offline') {
session1 = '0'
}
if (participant2.status === 'offline') {
session2 = '0'
}
*/

if (session1 === '0') {
if (session2 !== '0') {
return 1
Expand Down
7 changes: 6 additions & 1 deletion src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,12 @@ export default {
},

isOffline() {
return /* this.participant.status === 'offline' || */ this.sessionId === '0'
/**
* For now the user status is not overwriting the online-offline status anymore
* It felt too weird having users appear as offline but they are in the call or chat actively
return this.participant.status === 'offline' || this.sessionId === '0'
*/
return this.sessionId === '0'
},
isGuest() {
return [PARTICIPANT.TYPE.GUEST, PARTICIPANT.TYPE.GUEST_MODERATOR].indexOf(this.participantType) !== -1
Expand Down