From 7b3760356daaf8329002a6b585f02aa39d7a62ff Mon Sep 17 00:00:00 2001
From: Vincent Petry <vincent@nextcloud.com>
Date: Wed, 16 Dec 2020 11:04:37 +0100
Subject: [PATCH 1/3] Updated wording and interaction for conversation
 accessibility

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
---
 docs/chat.md                                  |   6 +-
 lib/Chat/Parser/SystemMessage.php             |  18 ++--
 .../ConversationSettings/ListableSettings.vue | 102 +++++++++++-------
 tests/php/Chat/Parser/SystemMessageTest.php   |  12 +--
 4 files changed, 84 insertions(+), 54 deletions(-)

diff --git a/docs/chat.md b/docs/chat.md
index d03cdac17..aa5510c42 100644
--- a/docs/chat.md
+++ b/docs/chat.md
@@ -161,9 +161,9 @@ Base endpoint is: `/ocs/v2.php/apps/spreed/api/v1`
 * `call_ended` - Call with {user1}, {user2}, {user3}, {user4} and {user5} (Duration 30:23)
 * `read_only_off` - {actor} unlocked the conversation
 * `read_only` - {actor} locked the conversation
-* `listable_none` - {actor} made the conversation visible for nobody
-* `listable_users` - {actor} made the conversation visible for regular users
-* `listable_all` - {actor} made the conversation visible for everone which includes users and guests
+* `listable_none` - {actor} made the conversation accessible to participants
+* `listable_users` - {actor} made the conversation accessible to regular users
+* `listable_all` - {actor} made the conversation accessible to everone which includes users and guests
 * `lobby_timer_reached` - The conversation is now open to everyone
 * `lobby_none` - {actor} opened the conversation to everyone
 * `lobby_non_moderators` - {actor} restricted the conversation to moderators
diff --git a/lib/Chat/Parser/SystemMessage.php b/lib/Chat/Parser/SystemMessage.php
index 9633b957e..ba3bd9291 100644
--- a/lib/Chat/Parser/SystemMessage.php
+++ b/lib/Chat/Parser/SystemMessage.php
@@ -166,25 +166,25 @@ class SystemMessage {
 				$parsedMessage = $this->l->t('An administrator locked the conversation');
 			}
 		} elseif ($message === 'listable_none') {
-			$parsedMessage = $this->l->t('{actor} made the conversation invisible');
+			$parsedMessage = $this->l->t('{actor} made the conversation accessible to participants');
 			if ($currentUserIsActor) {
-				$parsedMessage = $this->l->t('You made the conversation invisible');
+				$parsedMessage = $this->l->t('You made the conversation accessible to participants');
 			} elseif ($cliIsActor) {
-				$parsedMessage = $this->l->t('An administrator made the conversation invisible');
+				$parsedMessage = $this->l->t('An administrator made the conversation accessible to participants');
 			}
 		} elseif ($message === 'listable_users') {
-			$parsedMessage = $this->l->t('{actor} made the conversation visible for registered users only');
+			$parsedMessage = $this->l->t('{actor} made the conversation accessible to registered users only');
 			if ($currentUserIsActor) {
-				$parsedMessage = $this->l->t('You made the conversation visible for registered users only');
+				$parsedMessage = $this->l->t('You made the conversation accessible to registered users only');
 			} elseif ($cliIsActor) {
-				$parsedMessage = $this->l->t('An administrator made the visible for registered users only');
+				$parsedMessage = $this->l->t('An administrator made the accessible to registered users only');
 			}
 		} elseif ($message === 'listable_all') {
-			$parsedMessage = $this->l->t('{actor} made the conversation visible for everyone');
+			$parsedMessage = $this->l->t('{actor} made the conversation accessible to everyone');
 			if ($currentUserIsActor) {
-				$parsedMessage = $this->l->t('You made the conversation visible for everyone');
+				$parsedMessage = $this->l->t('You made the conversation accessible to everyone');
 			} elseif ($cliIsActor) {
-				$parsedMessage = $this->l->t('An administrator made the conversation visible for everyone');
+				$parsedMessage = $this->l->t('An administrator made the conversation accessible to everyone');
 			}
 		} elseif ($message === 'lobby_timer_reached') {
 			$parsedMessage = $this->l->t('The conversation is now open to everyone');
diff --git a/src/components/ConversationSettings/ListableSettings.vue b/src/components/ConversationSettings/ListableSettings.vue
index cd11dbcdb..d44fb7a5a 100644
--- a/src/components/ConversationSettings/ListableSettings.vue
+++ b/src/components/ConversationSettings/ListableSettings.vue
@@ -21,42 +21,42 @@
 
 <template>
 	<div class="app-settings-subsection">
-		<div id="moderation_settings_listable_conversation_hint" class="app-settings-section__hint">
-			{{ t('spreed', 'Defines who can find this conversation without being invited') }}
-		</div>
 		<div>
-			<Multiselect
-				v-model="listable"
-				class="listable-options-select"
-				:options="listableOptions"
-				:placeholder="t('spreed', 'Visible for')"
-				label="label"
-				track-by="value"
+			<input id="listable_settings_registered_users_checkbox"
+				aria-describedby="listable_settings_listable_conversation_hint"
+				type="checkbox"
+				class="checkbox"
+				name="listable_settings_registered_users_checkbox"
+				:checked="listable !== LISTABLE.NONE"
 				:disabled="isListableLoading"
-				aria-describedby="moderation_settings_listable_conversation_hint"
-				@input="saveListable" />
+				@change="toggleListableUsers">
+			<label for="listable_settings_registered_users_checkbox">{{ t('spreed', 'Make conversation accessible to registered users') }}</label>
+		</div>
+		<div v-if="listable !== LISTABLE.NONE" class="indent">
+			<div id="moderation_settings_listable_conversation_hint" class="app-settings-section__hint">
+				{{ t('spreed', 'This conversation will be shown in search results') }}
+			</div>
+			<div v-if="listable !== LISTABLE.NONE && isGuestAppEnabled">
+				<input id="listable_settings_guestapp_users_checkbox"
+					type="checkbox"
+					class="checkbox"
+					name="listable_settings_guestapp_users_checkbox"
+					:checked="listable === LISTABLE.ALL"
+					:disabled="isListableLoading"
+					@change="toggleListableGuests">
+				<label for="listable_settings_guestapp_users_checkbox">{{ t('spreed', 'Also make it accessible to guest app users') }}</label>
+			</div>
 		</div>
 	</div>
 </template>
 
 <script>
-import Multiselect from '@nextcloud/vue/dist/Components/Multiselect'
 import { showError, showSuccess } from '@nextcloud/dialogs'
 import { CONVERSATION } from '../../constants'
 
-const listableOptions = [
-	{ value: CONVERSATION.LISTABLE.NONE, label: t('spreed', 'Visible for no one') },
-	{ value: CONVERSATION.LISTABLE.USERS, label: t('spreed', 'Visible for registered users only') },
-	{ value: CONVERSATION.LISTABLE.ALL, label: t('spreed', 'Visible for everyone') },
-]
-
 export default {
 	name: 'ListableSettings',
 
-	components: {
-		Multiselect,
-	},
-
 	props: {
 		token: {
 			type: String,
@@ -71,9 +71,10 @@ export default {
 
 	data() {
 		return {
-			isListableLoading: false,
-			listableOptions,
 			listable: null,
+			isListableLoading: false,
+			lastNotification: null,
+			LISTABLE: CONVERSATION.LISTABLE,
 		}
 	},
 
@@ -81,6 +82,11 @@ export default {
 		conversation() {
 			return this.$store.getters.conversation(this.token) || this.$store.getters.dummyConversation
 		},
+
+		isGuestAppEnabled() {
+			// TODO: how ?
+			return true
+		},
 	},
 
 	watch: {
@@ -97,30 +103,50 @@ export default {
 		}
 	},
 
+	beforeDestroy() {
+		if (this.lastNotification) {
+			this.lastNotification.hideToast()
+			this.lastNotification = null
+		}
+	},
+
 	methods: {
+		async toggleListableUsers(event) {
+			await this.saveListable(event.target.checked ? this.LISTABLE.USERS : this.LISTABLE.NONE)
+		},
+
+		async toggleListableGuests(input) {
+			await this.saveListable(event.target.checked ? this.LISTABLE.ALL : this.LISTABLE.USERS)
+		},
+
 		async saveListable(listable) {
-			this.$emit('input', listable.value)
+			this.$emit('input', listable)
 			if (!this.token) {
-				this.listable = listable.value
+				this.listable = listable
 				return
 			}
 			this.isListableLoading = true
 			try {
 				await this.$store.dispatch('setListable', {
 					token: this.token,
-					listable: listable.value,
+					listable: listable,
 				})
 
-				if (listable.value === CONVERSATION.LISTABLE.NONE) {
-					showSuccess(t('spreed', 'You made the conversation invisible'))
-				} else if (listable.value === CONVERSATION.LISTABLE.USERS) {
-					showSuccess(t('spreed', 'You made the conversation visible for registered users only'))
-				} else if (listable.value === CONVERSATION.LISTABLE.ALL) {
-					showSuccess(t('spreed', 'You made the conversation visible for everyone'))
+				if (this.lastNotification) {
+					this.lastNotification.hideToast()
+					this.lastNotification = null
 				}
+				if (listable === CONVERSATION.LISTABLE.NONE) {
+					this.lastNotification = showSuccess(t('spreed', 'You made the conversation accessible to participants'))
+				} else if (listable === CONVERSATION.LISTABLE.USERS) {
+					this.lastNotification = showSuccess(t('spreed', 'You made the conversation accessible to registered users only'))
+				} else if (listable === CONVERSATION.LISTABLE.ALL) {
+					this.lastNotification = showSuccess(t('spreed', 'You made the conversation accessible to everyone'))
+				}
+				this.listable = listable
 			} catch (e) {
-				console.error('Error occurred when updating the conversation visibility', e)
-				showError(t('spreed', 'Error occurred when updating the conversation visibility'))
+				console.error('Error occurred when updating the conversation accessibility', e)
+				showError(t('spreed', 'Error occurred when updating the conversation accessibility'))
 				this.listable = this.conversation.listable
 			}
 			this.isListableLoading = false
@@ -133,4 +159,8 @@ export default {
 .listable-options-select {
 	width: 100%;
 }
+
+.indent {
+	margin-left: 26px;
+}
 </style>
diff --git a/tests/php/Chat/Parser/SystemMessageTest.php b/tests/php/Chat/Parser/SystemMessageTest.php
index 772f60b40..36d668283 100644
--- a/tests/php/Chat/Parser/SystemMessageTest.php
+++ b/tests/php/Chat/Parser/SystemMessageTest.php
@@ -332,27 +332,27 @@ class SystemMessageTest extends TestCase {
 				['actor' => ['id' => 'actor', 'type' => 'user']],
 			],
 			['listable_none', [], 'recipient',
-				'{actor} made the conversation invisible',
+				'{actor} made the conversation accessible to participants',
 				['actor' => ['id' => 'actor', 'type' => 'user']],
 			],
 			['listable_none', [], 'actor',
-				'You made the conversation invisible',
+				'You made the conversation accessible to participants',
 				['actor' => ['id' => 'actor', 'type' => 'user']],
 			],
 			['listable_users', [], 'recipient',
-				'{actor} made the conversation visible for registered users only',
+				'{actor} made the conversation accessible to registered users only',
 				['actor' => ['id' => 'actor', 'type' => 'user']],
 			],
 			['listable_users', [], 'actor',
-				'You made the conversation visible for registered users only',
+				'You made the conversation accessible to registered users only',
 				['actor' => ['id' => 'actor', 'type' => 'user']],
 			],
 			['listable_all', [], 'recipient',
-				'{actor} made the conversation visible for everyone',
+				'{actor} made the conversation accessible to everyone',
 				['actor' => ['id' => 'actor', 'type' => 'user']],
 			],
 			['listable_all', [], 'actor',
-				'You made the conversation visible for everyone',
+				'You made the conversation accessible to everyone',
 				['actor' => ['id' => 'actor', 'type' => 'user']],
 			],
 		];

From 8f79234c42d8048a9a1d5e2d0c18426781d37cef Mon Sep 17 00:00:00 2001
From: Vincent Petry <vincent@nextcloud.com>
Date: Wed, 16 Dec 2020 16:19:09 +0100
Subject: [PATCH 2/3] Detect guests app in listable settings dialog

Expose whether the guests app (guests accounts) are enabled in initial
state.
Hide the guests checkbox if the app is disabled.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
---
 lib/TInitialState.php                                    | 5 +++++
 src/components/ConversationSettings/ListableSettings.vue | 9 +++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/lib/TInitialState.php b/lib/TInitialState.php
index b07046267..d9b2a1619 100644
--- a/lib/TInitialState.php
+++ b/lib/TInitialState.php
@@ -87,6 +87,11 @@ trait TInitialState {
 			$appManager->isEnabledForUser('circles', $user)
 		);
 
+		$this->initialStateService->provideInitialState(
+			'talk', 'guests_accounts_enabled',
+			$appManager->isEnabledForUser('guests', $user)
+		);
+
 		$this->initialStateService->provideInitialState(
 			'talk', 'read_status_privacy',
 			$this->talkConfig->getUserReadPrivacy($user->getUID())
diff --git a/src/components/ConversationSettings/ListableSettings.vue b/src/components/ConversationSettings/ListableSettings.vue
index d44fb7a5a..ae653bae0 100644
--- a/src/components/ConversationSettings/ListableSettings.vue
+++ b/src/components/ConversationSettings/ListableSettings.vue
@@ -36,7 +36,7 @@
 			<div id="moderation_settings_listable_conversation_hint" class="app-settings-section__hint">
 				{{ t('spreed', 'This conversation will be shown in search results') }}
 			</div>
-			<div v-if="listable !== LISTABLE.NONE && isGuestAppEnabled">
+			<div v-if="listable !== LISTABLE.NONE && isGuestsAccountsEnabled">
 				<input id="listable_settings_guestapp_users_checkbox"
 					type="checkbox"
 					class="checkbox"
@@ -53,6 +53,7 @@
 <script>
 import { showError, showSuccess } from '@nextcloud/dialogs'
 import { CONVERSATION } from '../../constants'
+import { loadState } from '@nextcloud/initial-state'
 
 export default {
 	name: 'ListableSettings',
@@ -74,6 +75,7 @@ export default {
 			listable: null,
 			isListableLoading: false,
 			lastNotification: null,
+			isGuestsAccountsEnabled: loadState('talk', 'guests_accounts_enabled'),
 			LISTABLE: CONVERSATION.LISTABLE,
 		}
 	},
@@ -82,11 +84,6 @@ export default {
 		conversation() {
 			return this.$store.getters.conversation(this.token) || this.$store.getters.dummyConversation
 		},
-
-		isGuestAppEnabled() {
-			// TODO: how ?
-			return true
-		},
 	},
 
 	watch: {

From bd27c5adf15e055cecbd8efb8a650b3c13d6b4c0 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Thu, 14 Jan 2021 10:54:48 +0100
Subject: [PATCH 3/3] Update wording to open and limited conversation

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 docs/chat.md                                   |  6 +++---
 lib/Chat/Parser/SystemMessage.php              | 18 +++++++++---------
 .../ConversationSettings/ListableSettings.vue  | 14 +++++++-------
 tests/php/Chat/Parser/SystemMessageTest.php    | 12 ++++++------
 4 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/docs/chat.md b/docs/chat.md
index aa5510c42..f9b336ff6 100644
--- a/docs/chat.md
+++ b/docs/chat.md
@@ -161,9 +161,9 @@ Base endpoint is: `/ocs/v2.php/apps/spreed/api/v1`
 * `call_ended` - Call with {user1}, {user2}, {user3}, {user4} and {user5} (Duration 30:23)
 * `read_only_off` - {actor} unlocked the conversation
 * `read_only` - {actor} locked the conversation
-* `listable_none` - {actor} made the conversation accessible to participants
-* `listable_users` - {actor} made the conversation accessible to regular users
-* `listable_all` - {actor} made the conversation accessible to everone which includes users and guests
+* `listable_none` - {actor} limited the conversation to the current participants
+* `listable_users` - {actor} opened the conversation accessible to registered users
+* `listable_all` - {actor} opened the conversation accessible to registered and guest app users
 * `lobby_timer_reached` - The conversation is now open to everyone
 * `lobby_none` - {actor} opened the conversation to everyone
 * `lobby_non_moderators` - {actor} restricted the conversation to moderators
diff --git a/lib/Chat/Parser/SystemMessage.php b/lib/Chat/Parser/SystemMessage.php
index ba3bd9291..74acd0688 100644
--- a/lib/Chat/Parser/SystemMessage.php
+++ b/lib/Chat/Parser/SystemMessage.php
@@ -166,25 +166,25 @@ class SystemMessage {
 				$parsedMessage = $this->l->t('An administrator locked the conversation');
 			}
 		} elseif ($message === 'listable_none') {
-			$parsedMessage = $this->l->t('{actor} made the conversation accessible to participants');
+			$parsedMessage = $this->l->t('{actor} limited the conversation to the current participants');
 			if ($currentUserIsActor) {
-				$parsedMessage = $this->l->t('You made the conversation accessible to participants');
+				$parsedMessage = $this->l->t('You limited the conversation to the current participants');
 			} elseif ($cliIsActor) {
-				$parsedMessage = $this->l->t('An administrator made the conversation accessible to participants');
+				$parsedMessage = $this->l->t('An administrator limited the conversation to the current participants');
 			}
 		} elseif ($message === 'listable_users') {
-			$parsedMessage = $this->l->t('{actor} made the conversation accessible to registered users only');
+			$parsedMessage = $this->l->t('{actor} opened the conversation to registered users');
 			if ($currentUserIsActor) {
-				$parsedMessage = $this->l->t('You made the conversation accessible to registered users only');
+				$parsedMessage = $this->l->t('You opened the conversation to registered users');
 			} elseif ($cliIsActor) {
-				$parsedMessage = $this->l->t('An administrator made the accessible to registered users only');
+				$parsedMessage = $this->l->t('An administrator opened the conversation to registered users');
 			}
 		} elseif ($message === 'listable_all') {
-			$parsedMessage = $this->l->t('{actor} made the conversation accessible to everyone');
+			$parsedMessage = $this->l->t('{actor} opened the conversation to registered and guest app users');
 			if ($currentUserIsActor) {
-				$parsedMessage = $this->l->t('You made the conversation accessible to everyone');
+				$parsedMessage = $this->l->t('You opened the conversation to registered and guest app users');
 			} elseif ($cliIsActor) {
-				$parsedMessage = $this->l->t('An administrator made the conversation accessible to everyone');
+				$parsedMessage = $this->l->t('An administrator opened the conversation to registered and guest app users');
 			}
 		} elseif ($message === 'lobby_timer_reached') {
 			$parsedMessage = $this->l->t('The conversation is now open to everyone');
diff --git a/src/components/ConversationSettings/ListableSettings.vue b/src/components/ConversationSettings/ListableSettings.vue
index ae653bae0..b4785a6ea 100644
--- a/src/components/ConversationSettings/ListableSettings.vue
+++ b/src/components/ConversationSettings/ListableSettings.vue
@@ -30,7 +30,7 @@
 				:checked="listable !== LISTABLE.NONE"
 				:disabled="isListableLoading"
 				@change="toggleListableUsers">
-			<label for="listable_settings_registered_users_checkbox">{{ t('spreed', 'Make conversation accessible to registered users') }}</label>
+			<label for="listable_settings_registered_users_checkbox">{{ t('spreed', 'Open conversation to registered users') }}</label>
 		</div>
 		<div v-if="listable !== LISTABLE.NONE" class="indent">
 			<div id="moderation_settings_listable_conversation_hint" class="app-settings-section__hint">
@@ -44,7 +44,7 @@
 					:checked="listable === LISTABLE.ALL"
 					:disabled="isListableLoading"
 					@change="toggleListableGuests">
-				<label for="listable_settings_guestapp_users_checkbox">{{ t('spreed', 'Also make it accessible to guest app users') }}</label>
+				<label for="listable_settings_guestapp_users_checkbox">{{ t('spreed', 'Also open to guest app users') }}</label>
 			</div>
 		</div>
 	</div>
@@ -134,16 +134,16 @@ export default {
 					this.lastNotification = null
 				}
 				if (listable === CONVERSATION.LISTABLE.NONE) {
-					this.lastNotification = showSuccess(t('spreed', 'You made the conversation accessible to participants'))
+					this.lastNotification = showSuccess(t('spreed', 'You limited the conversation to the current participants'))
 				} else if (listable === CONVERSATION.LISTABLE.USERS) {
-					this.lastNotification = showSuccess(t('spreed', 'You made the conversation accessible to registered users only'))
+					this.lastNotification = showSuccess(t('spreed', 'You opened the conversation to registered users'))
 				} else if (listable === CONVERSATION.LISTABLE.ALL) {
-					this.lastNotification = showSuccess(t('spreed', 'You made the conversation accessible to everyone'))
+					this.lastNotification = showSuccess(t('spreed', 'You opened the conversation to registered and guest app users'))
 				}
 				this.listable = listable
 			} catch (e) {
-				console.error('Error occurred when updating the conversation accessibility', e)
-				showError(t('spreed', 'Error occurred when updating the conversation accessibility'))
+				console.error('Error occurred when opening or limiting the conversation', e)
+				showError(t('spreed', 'Error occurred when opening or limiting the conversation'))
 				this.listable = this.conversation.listable
 			}
 			this.isListableLoading = false
diff --git a/tests/php/Chat/Parser/SystemMessageTest.php b/tests/php/Chat/Parser/SystemMessageTest.php
index 36d668283..b857a0000 100644
--- a/tests/php/Chat/Parser/SystemMessageTest.php
+++ b/tests/php/Chat/Parser/SystemMessageTest.php
@@ -332,27 +332,27 @@ class SystemMessageTest extends TestCase {
 				['actor' => ['id' => 'actor', 'type' => 'user']],
 			],
 			['listable_none', [], 'recipient',
-				'{actor} made the conversation accessible to participants',
+				'{actor} limited the conversation to the current participants',
 				['actor' => ['id' => 'actor', 'type' => 'user']],
 			],
 			['listable_none', [], 'actor',
-				'You made the conversation accessible to participants',
+				'You limited the conversation to the current participants',
 				['actor' => ['id' => 'actor', 'type' => 'user']],
 			],
 			['listable_users', [], 'recipient',
-				'{actor} made the conversation accessible to registered users only',
+				'{actor} opened the conversation to registered users',
 				['actor' => ['id' => 'actor', 'type' => 'user']],
 			],
 			['listable_users', [], 'actor',
-				'You made the conversation accessible to registered users only',
+				'You opened the conversation to registered users',
 				['actor' => ['id' => 'actor', 'type' => 'user']],
 			],
 			['listable_all', [], 'recipient',
-				'{actor} made the conversation accessible to everyone',
+				'{actor} opened the conversation to registered and guest app users',
 				['actor' => ['id' => 'actor', 'type' => 'user']],
 			],
 			['listable_all', [], 'actor',
-				'You made the conversation accessible to everyone',
+				'You opened the conversation to registered and guest app users',
 				['actor' => ['id' => 'actor', 'type' => 'user']],
 			],
 		];