diff --git a/lib/Chat/Notifier.php b/lib/Chat/Notifier.php index a48f199aed7..7829f702f23 100644 --- a/lib/Chat/Notifier.php +++ b/lib/Chat/Notifier.php @@ -184,7 +184,7 @@ private function addMentionAllToList(Room $chat, array $list, ?Participant $part * The comment must be a chat message comment. That is, its "objectId" must * be the room ID. * - * The author of the message is notified only if he is still able to participate in the room + * The author of the message is notified only if they are still able to participate in the room * * @param Room $chat * @param IComment $comment diff --git a/lib/Controller/FilesIntegrationController.php b/lib/Controller/FilesIntegrationController.php index f881f0caeae..99cd239ac73 100644 --- a/lib/Controller/FilesIntegrationController.php +++ b/lib/Controller/FilesIntegrationController.php @@ -70,9 +70,9 @@ public function __construct( * In any case, to create or even get the token of the room, the file must * be shared and the user must be the owner of a public share of the file * (like a link share, for example) or have direct access to that file; an - * error is returned otherwise. A user has direct access to a file if she - * has access to it (or to an ancestor) through a user, group, circle or - * room share (but not through a link share, for example), or if she is the + * error is returned otherwise. A user has direct access to a file if they + * have access to it (or to an ancestor) through a user, group, circle or + * room share (but not through a link share, for example), or if they are the * owner of such a file. * * @param string $fileId ID of the file diff --git a/lib/Files/Listener.php b/lib/Files/Listener.php index a8b3a8ddfc8..16b0fbcb27d 100644 --- a/lib/Files/Listener.php +++ b/lib/Files/Listener.php @@ -78,9 +78,9 @@ protected function beforeGuestJoinedRoomEvent(BeforeGuestJoinedRoomEvent $event) * A user has access to the file if the file is publicly accessible (through * a link share, for example) or if the user has direct access to it. * - * A user has direct access to a file if she received the file (or an + * A user has direct access to a file if they received the file (or an * ancestor) through a user, group, circle or room share (but not through a - * link share, for example), or if she is the owner of such a file. + * link share, for example), or if they are the owner of such a file. * * This method should be called before a user joins a room. * diff --git a/lib/PublicShareAuth/Listener.php b/lib/PublicShareAuth/Listener.php index e51ff8acda4..926b688892e 100644 --- a/lib/PublicShareAuth/Listener.php +++ b/lib/PublicShareAuth/Listener.php @@ -29,9 +29,9 @@ * * The rooms to request the password for a share are temporary, short-lived * rooms intended to give the sharer the chance to verify the identity of the - * sharee before granting her access to the share. They are always created by a + * sharee before granting them access to the share. They are always created by a * guest or user (the sharee) who then waits for the sharer (who will be the - * owner of the room) to join and provide her the password. + * owner of the room) to join and provide their the password. * * These rooms are associated to a "share:password" object, and their custom * behaviour is provided by calling the methods of this class as a response to diff --git a/lib/Share/Helper/ShareAPIController.php b/lib/Share/Helper/ShareAPIController.php index 8b215be2c53..ace4d2b7807 100644 --- a/lib/Share/Helper/ShareAPIController.php +++ b/lib/Share/Helper/ShareAPIController.php @@ -121,7 +121,7 @@ private function parseDate(string $expireDate): \DateTime { /** * Returns whether the given user can access the given room share or not. * - * A user can access a room share only if she is a participant of the room. + * A user can access a room share only if they are a participant of the room. * * @param IShare $share * @param string $user diff --git a/lib/Share/RoomShareProvider.php b/lib/Share/RoomShareProvider.php index b53327e94c3..054f25f7776 100644 --- a/lib/Share/RoomShareProvider.php +++ b/lib/Share/RoomShareProvider.php @@ -1061,7 +1061,7 @@ public function getChildren(IShare $parent): array { /** * Delete all shares in a room, or only those from the given user. * - * When a user is given all her shares are removed, both own shares and + * When a user is given all their shares are removed, both own shares and * received shares. * * Not part of IShareProvider API, but needed by the hooks in diff --git a/openapi-full.json b/openapi-full.json index 3a17270c787..1703766614a 100644 --- a/openapi-full.json +++ b/openapi-full.json @@ -7830,7 +7830,7 @@ "get": { "operationId": "files_integration-get-room-by-file-id", "summary": "Get the token of the room associated to the given file id", - "description": "This is the counterpart of self::getRoomByShareToken() for file ids instead of share tokens, although both return the same room token if the given file id and share token refer to the same file.\nIf there is no room associated to the given file id a new room is created; the new room is a public room associated with a \"file\" object with the given file id. Unlike normal rooms in which the owner is the user that created the room these are special rooms without owner (although self joined users with direct access to the file become persistent participants automatically when they join until they explicitly leave or no longer have access to the file).\nIn any case, to create or even get the token of the room, the file must be shared and the user must be the owner of a public share of the file (like a link share, for example) or have direct access to that file; an error is returned otherwise. A user has direct access to a file if she has access to it (or to an ancestor) through a user, group, circle or room share (but not through a link share, for example), or if she is the owner of such a file.", + "description": "This is the counterpart of self::getRoomByShareToken() for file ids instead of share tokens, although both return the same room token if the given file id and share token refer to the same file.\nIf there is no room associated to the given file id a new room is created; the new room is a public room associated with a \"file\" object with the given file id. Unlike normal rooms in which the owner is the user that created the room these are special rooms without owner (although self joined users with direct access to the file become persistent participants automatically when they join until they explicitly leave or no longer have access to the file).\nIn any case, to create or even get the token of the room, the file must be shared and the user must be the owner of a public share of the file (like a link share, for example) or have direct access to that file; an error is returned otherwise. A user has direct access to a file if they have access to it (or to an ancestor) through a user, group, circle or room share (but not through a link share, for example), or if they are the owner of such a file.", "tags": [ "files_integration" ], diff --git a/openapi.json b/openapi.json index 11b00cbcb3e..5ae07189133 100644 --- a/openapi.json +++ b/openapi.json @@ -7717,7 +7717,7 @@ "get": { "operationId": "files_integration-get-room-by-file-id", "summary": "Get the token of the room associated to the given file id", - "description": "This is the counterpart of self::getRoomByShareToken() for file ids instead of share tokens, although both return the same room token if the given file id and share token refer to the same file.\nIf there is no room associated to the given file id a new room is created; the new room is a public room associated with a \"file\" object with the given file id. Unlike normal rooms in which the owner is the user that created the room these are special rooms without owner (although self joined users with direct access to the file become persistent participants automatically when they join until they explicitly leave or no longer have access to the file).\nIn any case, to create or even get the token of the room, the file must be shared and the user must be the owner of a public share of the file (like a link share, for example) or have direct access to that file; an error is returned otherwise. A user has direct access to a file if she has access to it (or to an ancestor) through a user, group, circle or room share (but not through a link share, for example), or if she is the owner of such a file.", + "description": "This is the counterpart of self::getRoomByShareToken() for file ids instead of share tokens, although both return the same room token if the given file id and share token refer to the same file.\nIf there is no room associated to the given file id a new room is created; the new room is a public room associated with a \"file\" object with the given file id. Unlike normal rooms in which the owner is the user that created the room these are special rooms without owner (although self joined users with direct access to the file become persistent participants automatically when they join until they explicitly leave or no longer have access to the file).\nIn any case, to create or even get the token of the room, the file must be shared and the user must be the owner of a public share of the file (like a link share, for example) or have direct access to that file; an error is returned otherwise. A user has direct access to a file if they have access to it (or to an ancestor) through a user, group, circle or room share (but not through a link share, for example), or if they are the owner of such a file.", "tags": [ "files_integration" ], diff --git a/src/services/callsService.js b/src/services/callsService.js index a546a9ed7e0..bd0f72923c5 100644 --- a/src/services/callsService.js +++ b/src/services/callsService.js @@ -28,7 +28,7 @@ import { * @param {number} flags The available PARTICIPANT.CALL_FLAG for this participants * @param {boolean} silent Whether the call should trigger a notifications and * sound for other participants or not - * @param {boolean} recordingConsent Whether the participant gave his consent to be recorded + * @param {boolean} recordingConsent Whether the participant gave their consent to be recorded * @return {number} The actual flags based on the available media */ const joinCall = async function(token, flags, silent, recordingConsent) { diff --git a/src/types/openapi/openapi-full.ts b/src/types/openapi/openapi-full.ts index b9a3b9df1af..d72050272b8 100644 --- a/src/types/openapi/openapi-full.ts +++ b/src/types/openapi/openapi-full.ts @@ -479,7 +479,7 @@ export type paths = { * Get the token of the room associated to the given file id * @description This is the counterpart of self::getRoomByShareToken() for file ids instead of share tokens, although both return the same room token if the given file id and share token refer to the same file. * If there is no room associated to the given file id a new room is created; the new room is a public room associated with a "file" object with the given file id. Unlike normal rooms in which the owner is the user that created the room these are special rooms without owner (although self joined users with direct access to the file become persistent participants automatically when they join until they explicitly leave or no longer have access to the file). - * In any case, to create or even get the token of the room, the file must be shared and the user must be the owner of a public share of the file (like a link share, for example) or have direct access to that file; an error is returned otherwise. A user has direct access to a file if she has access to it (or to an ancestor) through a user, group, circle or room share (but not through a link share, for example), or if she is the owner of such a file. + * In any case, to create or even get the token of the room, the file must be shared and the user must be the owner of a public share of the file (like a link share, for example) or have direct access to that file; an error is returned otherwise. A user has direct access to a file if they have access to it (or to an ancestor) through a user, group, circle or room share (but not through a link share, for example), or if they are the owner of such a file. */ get: operations["files_integration-get-room-by-file-id"]; put?: never; diff --git a/src/types/openapi/openapi.ts b/src/types/openapi/openapi.ts index a369c986d59..3e1a98e26c1 100644 --- a/src/types/openapi/openapi.ts +++ b/src/types/openapi/openapi.ts @@ -479,7 +479,7 @@ export type paths = { * Get the token of the room associated to the given file id * @description This is the counterpart of self::getRoomByShareToken() for file ids instead of share tokens, although both return the same room token if the given file id and share token refer to the same file. * If there is no room associated to the given file id a new room is created; the new room is a public room associated with a "file" object with the given file id. Unlike normal rooms in which the owner is the user that created the room these are special rooms without owner (although self joined users with direct access to the file become persistent participants automatically when they join until they explicitly leave or no longer have access to the file). - * In any case, to create or even get the token of the room, the file must be shared and the user must be the owner of a public share of the file (like a link share, for example) or have direct access to that file; an error is returned otherwise. A user has direct access to a file if she has access to it (or to an ancestor) through a user, group, circle or room share (but not through a link share, for example), or if she is the owner of such a file. + * In any case, to create or even get the token of the room, the file must be shared and the user must be the owner of a public share of the file (like a link share, for example) or have direct access to that file; an error is returned otherwise. A user has direct access to a file if they have access to it (or to an ancestor) through a user, group, circle or room share (but not through a link share, for example), or if they are the owner of such a file. */ get: operations["files_integration-get-room-by-file-id"]; put?: never; diff --git a/src/utils/webrtc/SpeakingWhileMutedWarner.js b/src/utils/webrtc/SpeakingWhileMutedWarner.js index 22a6884b467..10ec071f4b5 100644 --- a/src/utils/webrtc/SpeakingWhileMutedWarner.js +++ b/src/utils/webrtc/SpeakingWhileMutedWarner.js @@ -6,7 +6,7 @@ import { t } from '@nextcloud/l10n' /** - * Helper to warn the user if she is talking while muted. + * Helper to warn the user if they are talking while muted. * * The WebRTC helper emits events when it detects that the user is speaking * while muted; this helper shows a warning to the user based on those diff --git a/src/utils/webrtc/index.js b/src/utils/webrtc/index.js index 05bb4f9a2a8..6ec7275d5ec 100644 --- a/src/utils/webrtc/index.js +++ b/src/utils/webrtc/index.js @@ -141,7 +141,7 @@ let failedToStartCall = null * @param {object} configuration Media to connect with * @param {boolean} silent Whether the call should trigger a notifications and * sound for other participants or not - * @param {boolean} recordingConsent Whether the participant gave his consent to be recorded + * @param {boolean} recordingConsent Whether the participant gave their consent to be recorded */ function startCall(signaling, configuration, silent, recordingConsent) { let flags = PARTICIPANT.CALL_FLAG.IN_CALL @@ -199,7 +199,7 @@ async function signalingJoinConversation(token, sessionId) { * @param {number} flags Bitwise combination of PARTICIPANT.CALL_FLAG * @param {boolean} silent Whether the call should trigger a notifications and * sound for other participants or not - * @param {boolean} recordingConsent Whether the participant gave his consent to be recorded + * @param {boolean} recordingConsent Whether the participant gave their consent to be recorded * @return {Promise} Resolved with the actual flags based on the * available media */ diff --git a/tests/php/Controller/SignalingControllerTest.php b/tests/php/Controller/SignalingControllerTest.php index 834cc68cd55..da617670a87 100644 --- a/tests/php/Controller/SignalingControllerTest.php +++ b/tests/php/Controller/SignalingControllerTest.php @@ -1123,7 +1123,7 @@ public function testBackendPingMixedAndInactive(): void { public function testLeaveRoomWithOldSession(): void { // Make sure that leaving a user with an old session id doesn't remove - // the current user from the room if he re-joined in the meantime. + // the current user from the room if they re-joined in the meantime. $dbConnection = \OCP\Server::get(IDBConnection::class); $dispatcher = \OCP\Server::get(IEventDispatcher::class); /** @var ParticipantService $participantService */