diff options
| author | Joas Schilling <coding@schilljs.com> | 2020-09-23 10:04:23 +0300 |
|---|---|---|
| committer | Joas Schilling <coding@schilljs.com> | 2020-09-23 10:04:23 +0300 |
| commit | d1328200cd16e45902cedb028b672b6e7bc3d312 (patch) | |
| tree | 681799c3f0856c5c8ec851d153c51f25a496b187 /src | |
| parent | 54a790d375db1b57c982de86d5e48eee395a2dc4 (diff) | |
Always show the status messages
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'src')
3 files changed, 3 insertions, 7 deletions
diff --git a/src/components/NewMessageForm/AdvancedInput/AdvancedInput.vue b/src/components/NewMessageForm/AdvancedInput/AdvancedInput.vue index ba53884b9..aef9ac933 100644 --- a/src/components/NewMessageForm/AdvancedInput/AdvancedInput.vue +++ b/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> diff --git a/src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.vue b/src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.vue index eaccda594..1226829af 100644 --- a/src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.vue +++ b/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> diff --git a/src/mixins/userStatus.js b/src/mixins/userStatus.js index 0cd7e22a2..461ed197d 100644 --- a/src/mixins/userStatus.js +++ b/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') } |