Improvements after code review

Signed-off-by: Vitor Mattos <vitor@php.rio>
nextcloud · May 5, 2023 · 7e9a768 · 7e9a768
1 parent 744ec4c
commit 7e9a768
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/docs/constants.md b/docs/constants.md
@@ -77,8 +77,8 @@
 * `1` Read status is private
 
 ### Participant typing privacy
-* `0` Make visible the typing status
-* `1` Hide the typing status
+* `0` Typing status is public
+* `1` Typing status is private
 
 ### Attendee types
 * `users` - Logged-in users

diff --git a/lib/Controller/SettingsController.php b/lib/Controller/SettingsController.php
@@ -114,11 +114,7 @@ protected function validateUserSetting(string $setting, $value): bool {
 			return false;
 		}
 
-		if ($setting === 'typing_privacy') {
-			return $value === '1' || $value === '0';
-		}
-
-		if ($setting === 'read_status_privacy') {
+		if ($setting === 'typing_privacy' || $setting === 'read_status_privacy') {
 			return (int) $value === Participant::PRIVACY_PUBLIC ||
 				(int) $value === Participant::PRIVACY_PRIVATE;
 		}

diff --git a/lib/TInitialState.php b/lib/TInitialState.php
@@ -197,7 +197,7 @@ protected function publishInitialStateForGuest(): void {
 
 		$this->initialState->provideInitialState(
 			'typing_privacy',
-			'0'
+			Participant::PRIVACY_PUBLIC
 		);
 
 		$this->initialState->provideInitialState(

diff --git a/tests/integration/features/chat-2/typing-privacy.feature b/tests/integration/features/chat-2/typing-privacy.feature
@@ -2,10 +2,10 @@ Feature: chat-2/typing-privacy
   Background:
     Given user "participant1" exists
   Scenario: User toggles the typing privacy
-    # Hide
+    # Private
     When user "participant1" sets setting "typing_privacy" to "1" with 200 (v1)
     Then user "participant1" has capability "spreed=>config=>chat=>typing-privacy" set to "1"
 
-    # Visible
+    # Public
     When user "participant1" sets setting "typing_privacy" to "0" with 200 (v1)
     Then user "participant1" has capability "spreed=>config=>chat=>typing-privacy" set to "0"