Merge pull request #4207 from nextcloud/bugfix/noid/online-greater-status

Online > User type

src/components/NewMessageForm/AdvancedInput/AdvancedInput.vue

@@ -50,7 +50,7 @@
 
 			<span class="mention-suggestion">
 				<span>{{ scope.item.label }}</span>
-				<em v-if="isNotAvailable(scope.item)"
+				<em v-if="getStatusMessage(scope.item)"
 					class="user-status">
 					{{ getStatusMessage(scope.item) }}
 				</em>

src/components/RightSidebar/Participants/CurrentParticipants/CurrentParticipants.vue

@@ -117,14 +117,6 @@ export default {
 		 * @returns {number}
 		 */
 		sortParticipants(participant1, participant2) {
-			const moderatorTypes = [PARTICIPANT.TYPE.OWNER, PARTICIPANT.TYPE.MODERATOR, PARTICIPANT.TYPE.GUEST_MODERATOR]
-			const moderator1 = moderatorTypes.indexOf(participant1.participantType) !== -1
-			const moderator2 = moderatorTypes.indexOf(participant2.participantType) !== -1
-
-			if (moderator1 !== moderator2) {
-				return moderator1 ? -1 : 1
-			}
-
 			let session1 = participant1.sessionId
 			let session2 = participant2.sessionId
 			if (participant1.status === 'offline') {
@@ -141,6 +133,14 @@ export default {
 				return -1
 			}
 
+			const moderatorTypes = [PARTICIPANT.TYPE.OWNER, PARTICIPANT.TYPE.MODERATOR, PARTICIPANT.TYPE.GUEST_MODERATOR]
+			const moderator1 = moderatorTypes.indexOf(participant1.participantType) !== -1
+			const moderator2 = moderatorTypes.indexOf(participant2.participantType) !== -1
+
+			if (moderator1 !== moderator2) {
+				return moderator1 ? -1 : 1
+			}
+
 			const participant1Away = this.isNotAvailable(participant1)
 			const participant2Away = this.isNotAvailable(participant2)
 			if (participant1Away !== participant2Away) {

src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.vue

@@ -42,7 +42,7 @@
 				<span v-if="showModeratorLabel" class="participant-row__moderator-indicator">({{ t('spreed', 'moderator') }})</span>
 				<span v-if="isGuest" class="participant-row__guest-indicator">({{ t('spreed', 'guest') }})</span>
 			</div>
-			<div v-if="isNotAvailable(participant)"
+			<div v-if="getStatusMessage(participant)"
 				class="participant-row__status">
 				<span>{{ getStatusMessage(participant) }}</span>
 			</div>

src/mixins/userStatus.js

@@ -23,10 +23,6 @@
 const userStatus = {
 	methods: {
 		getStatusMessage(userData) {
-			if (!this.isNotAvailable(userData)) {
-				return ''
-			}
-
 			let status = ''
 			if (userData.statusIcon) {
 				status = userData.statusIcon + ' '
@@ -36,7 +32,7 @@ const userStatus = {
 				status += userData.statusMessage
 			} else if (userData.status === 'dnd') {
 				status += t('spreed', 'Do not disturb')
-			} else {
+			} else if (userData.status === 'away') {
 				status += t('spreed', 'Away')
 			}