diff options
| author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2021-05-06 13:42:11 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-06 13:42:11 +0300 |
| commit | 75e01a467a57b6d29b30936987030e8d8730810c (patch) | |
| tree | 3ba363cd2c037e8923524f6409ca97633afaa841 | |
| parent | f42b5830662b3327fb79b69a119520a6de520e78 (diff) | |
| parent | 58b333cee54998c8e93d0608d03c3ad0d837bd0a (diff) | |
Merge pull request #5569 from nextcloud/backport/5533/stable21.1
[stable21.1] Fix sorting of users that are online with user status offline
| -rw-r--r-- | src/components/RightSidebar/Participants/CurrentParticipants/CurrentParticipants.vue | 9 | ||||
| -rw-r--r-- | src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.vue | 7 |
2 files changed, 13 insertions, 3 deletions
diff --git a/src/components/RightSidebar/Participants/CurrentParticipants/CurrentParticipants.vue b/src/components/RightSidebar/Participants/CurrentParticipants/CurrentParticipants.vue index 97797426a..cd163554d 100644 --- a/src/components/RightSidebar/Participants/CurrentParticipants/CurrentParticipants.vue +++ b/src/components/RightSidebar/Participants/CurrentParticipants/CurrentParticipants.vue @@ -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 diff --git a/src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.vue b/src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.vue index b1017c6be..e8ff85bb0 100644 --- a/src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.vue +++ b/src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.vue @@ -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 |