From 450a9270baa5af3e03df15668444c08b2f5dc5b2 Mon Sep 17 00:00:00 2001
From: Maksim Sukharev <antreesy.web@gmail.com>
Date: Wed, 27 Sep 2023 13:33:46 +0200
Subject: [PATCH 1/6] partially revert a0f8a993, enable mixin for 1-1
 conversations only

Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
---
 src/components/TopBar/TopBar.vue | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/components/TopBar/TopBar.vue b/src/components/TopBar/TopBar.vue
index ffaa256ffda..71e5b779893 100644
--- a/src/components/TopBar/TopBar.vue
+++ b/src/components/TopBar/TopBar.vue
@@ -23,7 +23,7 @@
 	<div class="top-bar" :class="{ 'in-call': isInCall }">
 		<ConversationIcon :key="conversation.token"
 			class="conversation-icon"
-			:offline="isPeerOffline"
+			:offline="isPeerInactive"
 			:item="conversation"
 			:disable-menu="isAvatarMenuDisabled"
 			:hide-favorite="false"
@@ -33,7 +33,7 @@
 			class="conversation-header"
 			@click="openConversationSettings">
 			<div class="conversation-header__text"
-				:class="{'conversation-header__text--offline': isPeerOffline}">
+				:class="{'conversation-header__text--offline': isPeerInactive}">
 				<p class="title">
 					{{ conversation.displayName }}
 				</p>
@@ -164,7 +164,7 @@ import TopBarMediaControls from './TopBarMediaControls.vue'
 import TopBarMenu from './TopBarMenu.vue'
 
 import { CONVERSATION } from '../../constants.js'
-import isInLobby from '../../mixins/isInLobby.js'
+import getParticipants from '../../mixins/getParticipants.js'
 import BrowserStorage from '../../services/BrowserStorage.js'
 import { getStatusMessage } from '../../utils/userStatus.js'
 import { localCallParticipantModel, localMediaModel } from '../../utils/webrtc/index.js'
@@ -195,7 +195,7 @@ export default {
 
 	mixins: [
 		richEditor,
-		isInLobby,
+		getParticipants,
 	],
 
 	props: {
@@ -272,7 +272,7 @@ export default {
 		/**
 		 * Online status of the peer in one to one conversation.
 		 */
-		isPeerOffline() {
+		isPeerInactive() {
 			// Only compute this in one-to-one conversations
 			if (!this.isOneToOneConversation) {
 				return undefined
@@ -343,6 +343,18 @@ export default {
 				this.notifyUnreadMessages(null)
 			}
 		},
+
+		isOneToOneConversation: {
+			immediate: true,
+			// Group conversations have mixin in RightSidebar, so should work only for one-to-one
+			handler(newValue) {
+				if (newValue) {
+					this.initialiseGetParticipantsMixin()
+				} else {
+					this.stopGetParticipantsMixin()
+				}
+			},
+		},
 	},
 
 	mounted() {

From cc6a7c564e35b8844bdaa94c2c9fcf96bf95b4dd Mon Sep 17 00:00:00 2001
From: Maksim Sukharev <antreesy.web@gmail.com>
Date: Wed, 27 Sep 2023 16:25:50 +0200
Subject: [PATCH 2/6] replace single-used AuthorAvatar component with
 AvatarWrapper

Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
---
 .../AvatarWrapper/AvatarWrapper.vue           |  54 ++++++--
 .../MessagesGroup/AuthorAvatar.vue            | 117 ------------------
 .../MessagesGroup/MessagesGroup.spec.js       |  26 ++--
 .../MessagesGroup/MessagesGroup.vue           |  23 +++-
 4 files changed, 72 insertions(+), 148 deletions(-)
 delete mode 100644 src/components/MessagesList/MessagesGroup/AuthorAvatar.vue

diff --git a/src/components/AvatarWrapper/AvatarWrapper.vue b/src/components/AvatarWrapper/AvatarWrapper.vue
index 6f9957f78b9..196be555bd4 100644
--- a/src/components/AvatarWrapper/AvatarWrapper.vue
+++ b/src/components/AvatarWrapper/AvatarWrapper.vue
@@ -2,8 +2,9 @@
   - @copyright Copyright (c) 2020 Marco Ambrosini <marcoambrosini@icloud.com>
   -
   - @author Marco Ambrosini <marcoambrosini@icloud.com>
+  - @author Maksim Sukharev <antreesy.web@gmail.com>
   -
-  - @license GNU AGPL version 3 or any later version
+  - @license AGPL-3.0-or-later
   -
   - This program is free software: you can redistribute it and/or modify
   - it under the terms of the GNU Affero General Public License as
@@ -20,14 +21,7 @@
 -->
 
 <template>
-	<div class="avatar-wrapper"
-		:class="{
-			'avatar-wrapper--offline': offline,
-			'avatar-wrapper--small': small,
-			'avatar-wrapper--condensed': condensed,
-			'avatar-wrapper--highlighted': highlighted,
-		}"
-		:style="{'--condensed-overlap': condensedOverlap}">
+	<div class="avatar-wrapper" :class="avatarClass" :style="{'--condensed-overlap': condensedOverlap}">
 		<div v-if="iconClass"
 			class="icon"
 			:class="[`avatar-${size}px`, iconClass]" />
@@ -36,6 +30,11 @@
 			:class="`avatar-${size}px`">
 			{{ firstLetterOfGuestName }}
 		</div>
+		<div v-else-if="isBot"
+			class="bot"
+			:class="`avatar-${size}px`">
+			{{ '>_' }}
+		</div>
 		<NcAvatar v-else
 			:key="id"
 			:user="id"
@@ -54,6 +53,8 @@
 <script>
 import NcAvatar from '@nextcloud/vue/dist/Components/NcAvatar.js'
 
+import { ATTENDEE } from '../../constants.js'
+
 export default {
 
 	name: 'AvatarWrapper',
@@ -79,6 +80,10 @@ export default {
 			type: Boolean,
 			default: false,
 		},
+		medium: {
+			type: Boolean,
+			default: false,
+		},
 		condensed: {
 			type: Boolean,
 			default: false,
@@ -122,19 +127,37 @@ export default {
 	},
 	computed: {
 		size() {
-			return this.small ? 22 : 44
+			return this.small ? 22 : this.medium ? 32 : 44
 		},
 		// Determines which icon is displayed
 		iconClass() {
-			if (!this.source || this.source === 'users' || this.isGuest || this.isDeletedUser) {
+			if (!this.source || this.isUser || this.isBot || this.isGuest || this.isDeletedUser) {
 				return ''
 			}
 			if (this.source === 'emails') {
 				return 'icon-mail'
 			}
+			if (this.source === 'bots' && this.id === 'changelog') {
+				return 'icon-changelog'
+			}
 			// source: groups, circles
 			return 'icon-contacts'
 		},
+		avatarClass() {
+			return {
+				'avatar-wrapper--offline': this.offline,
+				'avatar-wrapper--small': this.small,
+				'avatar-wrapper--medium': this.medium,
+				'avatar-wrapper--condensed': this.condensed,
+				'avatar-wrapper--highlighted': this.highlighted,
+			}
+		},
+		isUser() {
+			return this.source === 'users' || this.source === ATTENDEE.ACTOR_TYPE.BRIDGED
+		},
+		isBot() {
+			return this.source === 'bots' && this.id !== 'changelog'
+		},
 		isGuest() {
 			return this.source === 'guests'
 		},
@@ -161,7 +184,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import '../../assets/avatar.scss';
+@import '../../assets/avatar';
 
 .avatar-wrapper {
 	height: 44px;
@@ -176,6 +199,13 @@ export default {
 		@include avatar-mixin(22px);
 	}
 
+	&--medium {
+		height: 32px;
+		width: 32px;
+		border-radius: 32px;
+		@include avatar-mixin(32px);
+	}
+
 	&--condensed {
 		width: unset;
 		height: unset;
diff --git a/src/components/MessagesList/MessagesGroup/AuthorAvatar.vue b/src/components/MessagesList/MessagesGroup/AuthorAvatar.vue
deleted file mode 100644
index 26645bb4f77..00000000000
--- a/src/components/MessagesList/MessagesGroup/AuthorAvatar.vue
+++ /dev/null
@@ -1,117 +0,0 @@
-<!--
-  - @copyright Copyright (c) 2019 Joas Schilling <coding@schilljs.com>
-  -
-  - @author Joas Schilling <coding@schilljs.com>
-  -
-  - @license GNU AGPL version 3 or any later version
-  -
-  - This program is free software: you can redistribute it and/or modify
-  - it under the terms of the GNU Affero General Public License as
-  - published by the Free Software Foundation, either version 3 of the
-  - License, or (at your option) any later version.
-  -
-  - This program is distributed in the hope that it will be useful,
-  - but WITHOUT ANY WARRANTY; without even the implied warranty of
-  - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  - GNU Affero General Public License for more details.
-  -
-  - You should have received a copy of the GNU Affero General Public License
-  - along with this program. If not, see <http://www.gnu.org/licenses/>.
--->
-
-<template>
-	<NcAvatar v-if="isUser"
-		:disable-tooltip="true"
-		class="messages__avatar__icon"
-		:user="authorId"
-		:show-user-status="false"
-		:disable-menu="disableMenu"
-		:menu-container="menuContainer"
-		menu-position="left"
-		:display-name="displayName" />
-	<div v-else-if="isDeletedUser"
-		class="avatar-32px guest">
-		X
-	</div>
-	<div v-else-if="isGuest"
-		class="avatar-32px guest">
-		{{ firstLetterOfGuestName }}
-	</div>
-	<div v-else-if="isChangelog"
-		class="avatar-32px icon icon-changelog" />
-	<div v-else
-		class="avatar-32px bot">
-		&gt;_
-	</div>
-</template>
-
-<script>
-import NcAvatar from '@nextcloud/vue/dist/Components/NcAvatar.js'
-
-import { ATTENDEE } from '../../../constants.js'
-
-export default {
-	name: 'AuthorAvatar',
-	components: {
-		NcAvatar,
-	},
-	props: {
-		authorType: {
-			type: String,
-			required: true,
-		},
-		authorId: {
-			type: String,
-			required: true,
-		},
-		displayName: {
-			type: String,
-			required: true,
-		},
-	},
-
-	computed: {
-		isChangelog() {
-			return this.authorType === 'bots' && this.authorId === 'changelog'
-		},
-		isUser() {
-			return this.authorType === 'users' || this.authorType === ATTENDEE.ACTOR_TYPE.BRIDGED
-		},
-		isDeletedUser() {
-			return this.authorType === 'deleted_users'
-		},
-		isGuest() {
-			return this.authorType === 'guests'
-		},
-
-		firstLetterOfGuestName() {
-			const customName = this.displayName !== t('spreed', 'Guest') ? this.displayName : '?'
-			return customName.charAt(0)
-		},
-
-		menuContainer() {
-			return this.$store.getters.getMainContainerSelector()
-		},
-
-		disableMenu() {
-			// NcAvatarMenu doesn't work on Desktop
-			// See: https://github.com/nextcloud/talk-desktop/issues/34
-			if (IS_DESKTOP) {
-				return true
-			}
-			// disable the menu if accessing the conversation as guest
-			// or the message sender is a bridged user
-			return this.$store.getters.getActorType() === 'guests' || this.authorType === ATTENDEE.ACTOR_TYPE.BRIDGED
-		},
-	},
-}
-</script>
-
-<style lang="scss" scoped>
-@import '../../../assets/avatar';
-
-// size of avatars of chat message authors
-$author-avatar-size: 32px;
-@include avatar-mixin($author-avatar-size);
-
-</style>
diff --git a/src/components/MessagesList/MessagesGroup/MessagesGroup.spec.js b/src/components/MessagesList/MessagesGroup/MessagesGroup.spec.js
index bc00b2f4cf0..893bbf9e532 100644
--- a/src/components/MessagesList/MessagesGroup/MessagesGroup.spec.js
+++ b/src/components/MessagesList/MessagesGroup/MessagesGroup.spec.js
@@ -82,10 +82,10 @@ describe('MessagesGroup.vue', () => {
 			},
 		})
 
-		const avatarEl = wrapper.findComponent({ name: 'AuthorAvatar' })
-		expect(avatarEl.attributes('authortype')).toBe(ATTENDEE.ACTOR_TYPE.USERS)
-		expect(avatarEl.attributes('authorid')).toBe('actor-1')
-		expect(avatarEl.attributes('displayname')).toBe('actor one')
+		const avatarEl = wrapper.findComponent({ name: 'AvatarWrapper' })
+		expect(avatarEl.attributes('source')).toBe(ATTENDEE.ACTOR_TYPE.USERS)
+		expect(avatarEl.attributes('id')).toBe('actor-1')
+		expect(avatarEl.attributes('name')).toBe('actor one')
 
 		const authorEl = wrapper.find('.messages__author')
 		expect(authorEl.text()).toBe('actor one')
@@ -155,7 +155,7 @@ describe('MessagesGroup.vue', () => {
 			},
 		})
 
-		const avatarEl = wrapper.findComponent({ name: 'AuthorAvatar' })
+		const avatarEl = wrapper.findComponent({ name: 'AvatarWrapper' })
 		expect(avatarEl.exists()).toBe(false)
 
 		const messagesEl = wrapper.findAllComponents({ name: 'Message' })
@@ -225,10 +225,10 @@ describe('MessagesGroup.vue', () => {
 			},
 		})
 
-		const avatarEl = wrapper.findComponent({ name: 'AuthorAvatar' })
-		expect(avatarEl.attributes('authortype')).toBe(ATTENDEE.ACTOR_TYPE.GUESTS)
-		expect(avatarEl.attributes('authorid')).toBe('actor-1')
-		expect(avatarEl.attributes('displayname')).toBe('guest-one-display-name')
+		const avatarEl = wrapper.findComponent({ name: 'AvatarWrapper' })
+		expect(avatarEl.attributes('source')).toBe(ATTENDEE.ACTOR_TYPE.GUESTS)
+		expect(avatarEl.attributes('id')).toBe('actor-1')
+		expect(avatarEl.attributes('name')).toBe('guest-one-display-name')
 
 		const authorEl = wrapper.find('.messages__author')
 		expect(authorEl.text()).toBe('guest-one-display-name')
@@ -280,10 +280,10 @@ describe('MessagesGroup.vue', () => {
 			},
 		})
 
-		const avatarEl = wrapper.findComponent({ name: 'AuthorAvatar' })
-		expect(avatarEl.attributes('authortype')).toBe(ATTENDEE.ACTOR_TYPE.USERS)
-		expect(avatarEl.attributes('authorid')).toBe('actor-1')
-		expect(avatarEl.attributes('displayname')).toBe('Deleted user')
+		const avatarEl = wrapper.findComponent({ name: 'AvatarWrapper' })
+		expect(avatarEl.attributes('source')).toBe(ATTENDEE.ACTOR_TYPE.USERS)
+		expect(avatarEl.attributes('id')).toBe('actor-1')
+		expect(avatarEl.attributes('name')).toBe('Deleted user')
 
 		const authorEl = wrapper.find('.messages__author')
 		expect(authorEl.text()).toBe('Deleted user')
diff --git a/src/components/MessagesList/MessagesGroup/MessagesGroup.vue b/src/components/MessagesList/MessagesGroup/MessagesGroup.vue
index 0a1a71ba8b0..476ff0a2533 100644
--- a/src/components/MessagesList/MessagesGroup/MessagesGroup.vue
+++ b/src/components/MessagesList/MessagesGroup/MessagesGroup.vue
@@ -3,7 +3,7 @@
   -
   - @author Marco Ambrosini <marcoambrosini@icloud.com>
   -
-  - @license GNU AGPL version 3 or any later version
+  - @license AGPL-3.0-or-later
   -
   - This program is free software: you can redistribute it and/or modify
   - it under the terms of the GNU Affero General Public License as
@@ -22,9 +22,12 @@
 <template>
 	<div class="wrapper">
 		<div class="messages__avatar">
-			<AuthorAvatar :author-type="actorType"
-				:author-id="actorId"
-				:display-name="actorDisplayName" />
+			<AvatarWrapper :id="actorId"
+				:name="actorDisplayName"
+				:source="actorType"
+				:disable-menu="disableMenu"
+				disable-tooltip
+				medium />
 		</div>
 		<ul class="messages">
 			<li class="messages__author" aria-level="4">
@@ -44,7 +47,7 @@
 </template>
 
 <script>
-import AuthorAvatar from './AuthorAvatar.vue'
+import AvatarWrapper from '../../AvatarWrapper/AvatarWrapper.vue'
 import Message from './Message/Message.vue'
 
 import { ATTENDEE } from '../../../constants.js'
@@ -54,7 +57,7 @@ export default {
 	name: 'MessagesGroup',
 
 	components: {
-		AuthorAvatar,
+		AvatarWrapper,
 		Message,
 	},
 	inheritAttrs: false,
@@ -128,6 +131,12 @@ export default {
 
 			return displayName
 		},
+
+		disableMenu() {
+			// disable the menu if accessing the conversation as guest
+			// or the message sender is a bridged user
+			return this.$store.getters.getActorType() === 'guests' || this.actorType === ATTENDEE.ACTOR_TYPE.BRIDGED
+		},
 	},
 
 	methods: {
@@ -151,6 +160,7 @@ export default {
 	display: flex;
 	margin: auto;
 	padding: 0;
+
 	&:focus {
 		background-color: rgba(47, 47, 47, 0.068);
 	}
@@ -163,6 +173,7 @@ export default {
 	flex-direction: column;
 	width: 100%;
 	min-width: 0;
+
 	&__avatar {
 		position: sticky;
 		top: 0;

From ec3ac59f783a9e28404d76036d203f2d1a2eac1a Mon Sep 17 00:00:00 2001
From: Maksim Sukharev <antreesy.web@gmail.com>
Date: Wed, 27 Sep 2023 17:35:47 +0200
Subject: [PATCH 3/6] show user online status in participant suggestions

Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
---
 .../Participants/ParticipantsList/Participant/Participant.vue   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.vue b/src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.vue
index 14bc05eb2d7..0fca74be25e 100644
--- a/src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.vue
+++ b/src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.vue
@@ -40,7 +40,7 @@
 			:source="participant.source || participant.actorType"
 			:disable-menu="isSearched"
 			disable-tooltip
-			:show-user-status="showUserStatus && !isSearched"
+			:show-user-status="showUserStatus"
 			:preloaded-user-status="preloadedUserStatus"
 			:highlighted="isSpeakingStatusAvailable && isParticipantSpeaking"
 			:offline="isOffline" />

From 15c6bcc281aa0544191af78920233f1e192cd6c1 Mon Sep 17 00:00:00 2001
From: Maksim Sukharev <antreesy.web@gmail.com>
Date: Wed, 27 Sep 2023 13:39:39 +0200
Subject: [PATCH 4/6] explicitly set the size for ConversationIcon

Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
---
 src/components/ConversationIcon.vue           | 32 +++----------------
 .../ConversationAvatarEditor.vue              |  2 +-
 2 files changed, 5 insertions(+), 29 deletions(-)

diff --git a/src/components/ConversationIcon.vue b/src/components/ConversationIcon.vue
index 3335d4e1e3a..72fdd20c234 100644
--- a/src/components/ConversationIcon.vue
+++ b/src/components/ConversationIcon.vue
@@ -20,8 +20,7 @@
 -->
 
 <template>
-	<div ref="conversation-icon"
-		class="conversation-icon"
+	<div class="conversation-icon"
 		:style="{'--icon-size': `${size}px`}"
 		:class="{'offline': offline}">
 		<div v-if="iconClass"
@@ -130,22 +129,12 @@ export default {
 			default: false,
 		},
 
-		/**
-		 * Passing in true will make this component fill all the available space in its container.
-		 * This is not reactive as it will take the size of the container once mounted.
-		 */
-		isBig: {
-			type: Boolean,
-			default: false,
+		size: {
+			type: Number,
+			default: 44,
 		},
 	},
 
-	data() {
-		return {
-			parentElement: undefined,
-		}
-	},
-
 	computed: {
 		showCall() {
 			return !this.hideCall && this.item.hasCall
@@ -217,14 +206,6 @@ export default {
 			return undefined
 		},
 
-		size() {
-			if (this.isBig && this.parentElement) {
-				return Math.min(this.parentElement.clientHeight, this.parentElement.clientWidth)
-			} else {
-				return 44
-			}
-		},
-
 		isOneToOne() {
 			return this.item.type === CONVERSATION.TYPE.ONE_TO_ONE
 		},
@@ -242,11 +223,6 @@ export default {
 			})
 		},
 	},
-
-	mounted() {
-		// Get the size of the parent once the component is mounted
-		this.parentElement = this.$refs['conversation-icon'].parentElement
-	},
 }
 </script>
 
diff --git a/src/components/ConversationSettings/ConversationAvatarEditor.vue b/src/components/ConversationSettings/ConversationAvatarEditor.vue
index 03e77d22a54..1636c369318 100644
--- a/src/components/ConversationSettings/ConversationAvatarEditor.vue
+++ b/src/components/ConversationSettings/ConversationAvatarEditor.vue
@@ -32,7 +32,7 @@
 				</div>
 				<ConversationIcon v-else-if="!loading"
 					:item="conversation"
-					:is-big="true"
+					:size="180"
 					:show-user-status="false"
 					:disable-menu="true" />
 				<div v-else class="icon-loading" />

From ba60d64b4acab560a18dfd08b43d8b1c99fd9d80 Mon Sep 17 00:00:00 2001
From: Maksim Sukharev <antreesy.web@gmail.com>
Date: Wed, 27 Sep 2023 13:38:12 +0200
Subject: [PATCH 5/6] rewrite default props for ConversationIcon.vue

Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
---
 src/components/ConversationIcon.vue           | 21 +++++++++++--------
 .../ConversationAvatarEditor.vue              |  3 +--
 .../ConversationsList/Conversation.vue        |  5 +----
 src/components/LeftSidebar/LeftSidebar.vue    |  6 +++---
 src/components/RoomSelector.vue               |  5 +----
 src/components/TopBar/TopBar.vue              |  5 +++--
 src/views/Dashboard.vue                       |  5 +----
 7 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/src/components/ConversationIcon.vue b/src/components/ConversationIcon.vue
index 72fdd20c234..1977faaaf39 100644
--- a/src/components/ConversationIcon.vue
+++ b/src/components/ConversationIcon.vue
@@ -44,18 +44,16 @@
 			:disable-menu="disableMenu"
 			:display-name="item.displayName"
 			:preloaded-user-status="preloadedUserStatus"
-			:show-user-status="showUserStatus"
-			:show-user-status-compact="disableMenu"
+			:show-user-status="!hideUserStatus"
+			:show-user-status-compact="!showUserOnlineStatus"
 			:menu-container="menuContainer"
 			menu-position="left"
 			class="conversation-icon__avatar" />
-		<div v-if="showCall"
-			class="overlap-icon">
+		<div v-if="showCall" class="overlap-icon">
 			<VideoIcon :size="20" :fill-color="'#E9322D'" />
 			<span class="hidden-visually">{{ t('spreed', 'Call in progress') }}</span>
 		</div>
-		<div v-else-if="showFavorite"
-			class="overlap-icon">
+		<div v-else-if="showFavorite" class="overlap-icon">
 			<Star :size="20" :fill-color="'#FFCC00'" />
 			<span class="hidden-visually">{{ t('spreed', 'Favorite') }}</span>
 		</div>
@@ -100,13 +98,18 @@ export default {
 		},
 
 		disableMenu: {
+			type: Boolean,
+			default: true,
+		},
+
+		hideUserStatus: {
 			type: Boolean,
 			default: false,
 		},
 
-		showUserStatus: {
+		showUserOnlineStatus: {
 			type: Boolean,
-			default: true,
+			default: false,
 		},
 
 		item: {
@@ -145,7 +148,7 @@ export default {
 		},
 
 		preloadedUserStatus() {
-			if (this.showUserStatus && Object.prototype.hasOwnProperty.call(this.item, 'statusMessage')) {
+			if (!this.hideUserStatus && Object.prototype.hasOwnProperty.call(this.item, 'statusMessage')) {
 				// We preloaded the status
 				return {
 					status: this.item.status || null,
diff --git a/src/components/ConversationSettings/ConversationAvatarEditor.vue b/src/components/ConversationSettings/ConversationAvatarEditor.vue
index 1636c369318..c6b944cab89 100644
--- a/src/components/ConversationSettings/ConversationAvatarEditor.vue
+++ b/src/components/ConversationSettings/ConversationAvatarEditor.vue
@@ -33,8 +33,7 @@
 				<ConversationIcon v-else-if="!loading"
 					:item="conversation"
 					:size="180"
-					:show-user-status="false"
-					:disable-menu="true" />
+					hide-user-status />
 				<div v-else class="icon-loading" />
 			</div>
 			<VueCropper v-show="showCropper"
diff --git a/src/components/LeftSidebar/ConversationsList/Conversation.vue b/src/components/LeftSidebar/ConversationsList/Conversation.vue
index d8789652f88..89cc2ee294c 100644
--- a/src/components/LeftSidebar/ConversationsList/Conversation.vue
+++ b/src/components/LeftSidebar/ConversationsList/Conversation.vue
@@ -32,10 +32,7 @@
 		:counter-type="counterType"
 		@click="onClick">
 		<template #icon>
-			<ConversationIcon :item="item"
-				:hide-favorite="false"
-				:hide-call="false"
-				:disable-menu="true" />
+			<ConversationIcon :item="item" :hide-favorite="false" :hide-call="false" />
 		</template>
 		<template #subtitle>
 			<strong v-if="item.unreadMessages"
diff --git a/src/components/LeftSidebar/LeftSidebar.vue b/src/components/LeftSidebar/LeftSidebar.vue
index cb7f0271a38..0e7f40eb3d0 100644
--- a/src/components/LeftSidebar/LeftSidebar.vue
+++ b/src/components/LeftSidebar/LeftSidebar.vue
@@ -171,7 +171,7 @@
 								:title="item.label"
 								@click="createAndJoinConversation(item)">
 								<template #icon>
-									<ConversationIcon :item="iconData(item)" disable-menu />
+									<ConversationIcon :item="iconData(item)" />
 								</template>
 							</NcListItem>
 						</template>
@@ -187,7 +187,7 @@
 									:title="item.label"
 									@click="createAndJoinConversation(item)">
 									<template #icon>
-										<ConversationIcon :item="iconData(item)" disable-menu />
+										<ConversationIcon :item="iconData(item)" />
 									</template>
 								</NcListItem>
 							</template>
@@ -201,7 +201,7 @@
 									:title="item.label"
 									@click="createAndJoinConversation(item)">
 									<template #icon>
-										<ConversationIcon :item="iconData(item)" disable-menu />
+										<ConversationIcon :item="iconData(item)" />
 									</template>
 								</NcListItem>
 							</template>
diff --git a/src/components/RoomSelector.vue b/src/components/RoomSelector.vue
index 28fb57c778e..c9185aa4b4e 100644
--- a/src/components/RoomSelector.vue
+++ b/src/components/RoomSelector.vue
@@ -46,10 +46,7 @@
 							:key="room.token"
 							:class="{selected: selectedRoom === room.token }"
 							@click="selectedRoom=room.token">
-							<ConversationIcon :item="room"
-								:hide-call="true"
-								:hide-favorite="false"
-								:disable-menu="true" />
+							<ConversationIcon :item="room" :hide-favorite="false" />
 							<span>{{ room.displayName }}</span>
 						</li>
 					</ul>
diff --git a/src/components/TopBar/TopBar.vue b/src/components/TopBar/TopBar.vue
index 71e5b779893..ec6f5c3c320 100644
--- a/src/components/TopBar/TopBar.vue
+++ b/src/components/TopBar/TopBar.vue
@@ -25,7 +25,8 @@
 			class="conversation-icon"
 			:offline="isPeerInactive"
 			:item="conversation"
-			:disable-menu="isAvatarMenuDisabled"
+			:disable-menu="disableMenu"
+			show-user-online-status
 			:hide-favorite="false"
 			:hide-call="false" />
 		<!-- conversation header -->
@@ -300,7 +301,7 @@ export default {
 			return n('spreed', '%n participant in call', '%n participants in call', this.$store.getters.participantsInCall(this.token))
 		},
 
-		isAvatarMenuDisabled() {
+		disableMenu() {
 			// NcAvatarMenu doesn't work on Desktop
 			// See: https://github.com/nextcloud/talk-desktop/issues/34
 			return IS_DESKTOP
diff --git a/src/views/Dashboard.vue b/src/views/Dashboard.vue
index 7076d80e0e2..451e78c203b 100644
--- a/src/views/Dashboard.vue
+++ b/src/views/Dashboard.vue
@@ -33,10 +33,7 @@
 				:sub-text="getSubText(item)"
 				:item="item">
 				<template #avatar>
-					<ConversationIcon :item="item"
-						:hide-favorite="true"
-						:hide-call="false"
-						:disable-menu="true" />
+					<ConversationIcon :item="item" :hide-call="false" />
 				</template>
 			</NcDashboardWidgetItem>
 		</template>

From 2111c38ef12c7ebf9bc792c9a787d55aeeb3ef10 Mon Sep 17 00:00:00 2001
From: Maksim Sukharev <antreesy.web@gmail.com>
Date: Thu, 28 Sep 2023 21:23:30 +0200
Subject: [PATCH 6/6] [stable28] rewrite default props for
 GuestWelcomeWindow.vue

Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
---
 src/components/GuestWelcomeWindow.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/components/GuestWelcomeWindow.vue b/src/components/GuestWelcomeWindow.vue
index 6d489b78694..63e50f2826a 100644
--- a/src/components/GuestWelcomeWindow.vue
+++ b/src/components/GuestWelcomeWindow.vue
@@ -27,9 +27,7 @@
 		size="small">
 		<div class="modal__content">
 			<div class="conversation-information">
-				<ConversationIcon :item="conversation"
-					:show-user-status="false"
-					disable-menu />
+				<ConversationIcon :item="conversation" hide-user-status />
 				<h2>{{ conversationDisplayName }}</h2>
 			</div>
 			<p class="description">