diff --git a/CHANGELOG.md b/CHANGELOG.md index c4c31a6d53f..10211c5473f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -81,13 +81,13 @@ All notable changes to this project will be documented in this file. [#10889](https://github.com/nextcloud/spreed/issues/10889) - Fix uploading files after multiple hours without a page reload [#10877](https://github.com/nextcloud/spreed/issues/10877) -- Don't throw an unhandled exception when mentioning `at-all` in "Note to self" +- Don't throw an unhandled exception when mentioning `at-all` in "Personal notes" [#10881](https://github.com/nextcloud/spreed/issues/10881) - Fix SIP dialout not working after resolving license issue [#10914](https://github.com/nextcloud/spreed/issues/10914) - Fix issues with the session active state [#10876](https://github.com/nextcloud/spreed/issues/10876) -- Clarify that "Note to self" and "Talk Updates" are system generated +- Clarify that "Personal notes" and "Talk Updates" are system generated [#10884](https://github.com/nextcloud/spreed/issues/10884) ## 18.0.0-beta.2 – 2023-11-09 @@ -107,7 +107,7 @@ All notable changes to this project will be documented in this file. ## 18.0.0-beta.1 – 2023-11-02 ### Added -- 🗒️ Note to self +- 🗒️ Personal notes [#2196](https://github.com/nextcloud/spreed/issues/2196) - 🎙️ Show speaker while screensharing [#4478](https://github.com/nextcloud/spreed/issues/4478) diff --git a/docs/constants.md b/docs/constants.md index f76085b3f86..382ff8080bf 100644 --- a/docs/constants.md +++ b/docs/constants.md @@ -8,7 +8,7 @@ * `3` Public * `4` Changelog * `5` Former "One to one" (When a user is deleted from the server or removed from all their conversations, `1` "One to one" rooms are converted to this type) -* `6` Note to self +* `6` Personal notes ### Object types diff --git a/lib/Chat/Changelog/Manager.php b/lib/Chat/Changelog/Manager.php index f9a659b2115..61a60328de5 100644 --- a/lib/Chat/Changelog/Manager.php +++ b/lib/Chat/Changelog/Manager.php @@ -138,7 +138,7 @@ public function getChangelogs(): array { . $this->l->t('- Webhooks are now available to implement bots. See the documentation for more information https://nextcloud-talk.readthedocs.io/en/latest/bot-list/') . "\n" . $this->l->t('- Set a reminder on a chat message to be notified later again'), $this->l->t('## New in Talk %s', ['18']) . "\n" - . $this->l->t('- Use the **Note to self** conversation to take notes and share information between your devices') . "\n" + . $this->l->t('- Use the **Personal notes** conversation to take notes and share information between your devices') . "\n" . $this->l->t('- Captions allow to send a message with a file at the same time') . "\n" . $this->l->t('- Video of the speaker is now visible while sharing the screen and call reactions are animated'), ]; diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php index 1243cedb5a9..e8e2eafe633 100644 --- a/lib/Controller/RoomController.php +++ b/lib/Controller/RoomController.php @@ -391,7 +391,7 @@ public function getSingleRoom(string $token): DataResponse { } /** - * Get the "Note to self" conversation for the user + * Get the "Personal notes" conversation for the user * * It will be automatically created when it is currently missing * diff --git a/lib/Service/NoteToSelfService.php b/lib/Service/NoteToSelfService.php index 58457df227d..08ccf05299a 100644 --- a/lib/Service/NoteToSelfService.php +++ b/lib/Service/NoteToSelfService.php @@ -87,7 +87,7 @@ public function initialCreateNoteToSelfForUser(string $userId): void { protected function createNoteToSelfConversation(IUser $user, string|int $previousValue): Room { $room = $this->roomService->createConversation( Room::TYPE_NOTE_TO_SELF, - $this->l->t('Note to self'), + $this->l->t('Personal notes'), $user, 'note_to_self', $user->getUID() diff --git a/openapi.json b/openapi.json index 4cdc351ee9f..0a66fcb6a74 100644 --- a/openapi.json +++ b/openapi.json @@ -11018,7 +11018,7 @@ "/ocs/v2.php/apps/spreed/api/{apiVersion}/room/note-to-self": { "get": { "operationId": "room-get-note-to-self-conversation", - "summary": "Get the \"Note to self\" conversation for the user", + "summary": "Get the \"Personal notes\" conversation for the user", "description": "It will be automatically created when it is currently missing", "tags": [ "room" diff --git a/src/components/LeftSidebar/LeftSidebar.vue b/src/components/LeftSidebar/LeftSidebar.vue index 15930928df9..e24733647eb 100644 --- a/src/components/LeftSidebar/LeftSidebar.vue +++ b/src/components/LeftSidebar/LeftSidebar.vue @@ -97,7 +97,7 @@ - {{ t('spreed', 'New personal note') }} + {{ t('spreed', 'Add personal notes') }} - {{ t('spreed', 'Note to self') }} + {{ t('spreed', 'Add to personal notes') }} conversation.type === CONVERSATION.TYPE.NOTE_TO_SELF) - // If Note to self doesn't exist, it will be regenerated + // If "Personal notes" doesn't exist, it will be regenerated if (!noteToSelf) { const response = await fetchNoteToSelfConversation() noteToSelf = response.data.ocs.data diff --git a/src/store/messagesStore.spec.js b/src/store/messagesStore.spec.js index 5519670131f..a9e387941fe 100644 --- a/src/store/messagesStore.spec.js +++ b/src/store/messagesStore.spec.js @@ -1817,7 +1817,7 @@ describe('messagesStore', () => { { token: 'token-self', type: 6, - displayName: 'Note to self', + displayName: 'Personal notes', }, { token: 'token-2', @@ -1840,7 +1840,7 @@ describe('messagesStore', () => { // Assert expect(postNewMessage).toHaveBeenCalledWith(messageExpected, { silent: false }) }) - test('forwards a message to Note to self when no token is given ', () => { + test('forwards a message to "Personal notes" when no token is given ', () => { // Arrange targetToken = 'token-self' messageToBeForwarded = message1 @@ -1856,7 +1856,7 @@ describe('messagesStore', () => { expect(postNewMessage).toHaveBeenCalledWith(messageExpected, { silent: false }) }) - test('generates Note to self when it does not exist ', async () => { + test('generates "Personal notes" when it does not exist ', async () => { // Arrange messageToBeForwarded = message1 messageExpected = cloneDeep(message1) diff --git a/tests/integration/features/bootstrap/FeatureContext.php b/tests/integration/features/bootstrap/FeatureContext.php index 126e152587f..79ee8125c61 100644 --- a/tests/integration/features/bootstrap/FeatureContext.php +++ b/tests/integration/features/bootstrap/FeatureContext.php @@ -300,7 +300,7 @@ public function userIsParticipantOfRooms(string $user, string $shouldOrder, stri if ($shouldFilter === '') { $rooms = array_filter($rooms, function ($room) { - // Filter out "Talk updates" and "Note to self" conversations + // Filter out "Talk updates" and "Personal notes" conversations return $room['type'] !== 4 && $room['type'] !== 6; }); } elseif ($shouldFilter === 'note-to-self ') { @@ -340,7 +340,7 @@ public function userListsBreakoutRooms(string $user, string $identifier, int $st $rooms = $this->getDataFromResponse($this->response); $rooms = array_filter($rooms, function ($room) { - // Filter out "Talk updates" and "Note to self" conversations + // Filter out "Talk updates" and "Personal notes" conversations return $room['type'] !== 4 && $room['type'] !== 6; }); @@ -592,7 +592,7 @@ public function userIsParticipantOfRoom(string $user, string $isOrNotParticipant $rooms = $this->getDataFromResponse($this->response); $rooms = array_filter($rooms, function ($room) { - // Filter out "Talk updates" and "Note to self" conversations + // Filter out "Talk updates" and "Personal notes" conversations return $room['type'] !== 4 && $room['type'] !== 6; }); diff --git a/tests/integration/features/chat/mentions.feature b/tests/integration/features/chat/mentions.feature index fcff252362e..83602cae510 100644 --- a/tests/integration/features/chat/mentions.feature +++ b/tests/integration/features/chat/mentions.feature @@ -628,8 +628,8 @@ Feature: chat/mentions And user "participant1" creates note-to-self (v4) And user "participant1" sends message "Test @all" to room "participant1-note-to-self" with 201 And user "participant1" is participant of the following note-to-self rooms (v4) - | id | type | name | - | participant1-note-to-self | 6 | Note to self | + | id | type | name | + | participant1-note-to-self | 6 | Personal notes | Then user "participant1" sees the following messages in room "participant1-note-to-self" with 200 | room | actorType | actorId | actorDisplayName | message | messageParameters | | participant1-note-to-self | users | participant1 | participant1-displayname | Test {mention-call1} | "IGNORE" | diff --git a/tests/integration/features/chat/note-to-self.feature b/tests/integration/features/chat/note-to-self.feature index 3e44131ff03..1bcac8eb3c3 100644 --- a/tests/integration/features/chat/note-to-self.feature +++ b/tests/integration/features/chat/note-to-self.feature @@ -7,8 +7,8 @@ Feature: chat/note-to-self When user "participant1" reset note-to-self preference When user "participant1" creates note-to-self (v4) And user "participant1" is participant of the following note-to-self rooms (v4) - | id | type | name | - | participant1-note-to-self | 6 | Note to self | + | id | type | name | + | participant1-note-to-self | 6 | Personal notes | Then user "participant1" sees the following system messages in room "participant1-note-to-self" with 200 | room | actorType | actorId | actorDisplayName | message | messageParameters | systemMessage | | participant1-note-to-self | users | participant1 | participant1-displayname | You created the conversation | {"actor":{"type":"user","id":"participant1","name":"participant1-displayname"}} | conversation_created | @@ -17,8 +17,8 @@ Feature: chat/note-to-self Scenario: Created automatically when fetching the room list When user "participant1" reset note-to-self preference And user "participant1" is participant of the following note-to-self rooms (v4) - | id | type | name | - | Note to self | 6 | Note to self | - Then user "participant1" sees the following system messages in room "Note to self" with 200 - | room | actorType | actorId | actorDisplayName | message | messageParameters | systemMessage | - | Note to self | guests | system | | System created the conversation | {"actor":{"type":"guest","id":"guest\/system","name":"Guest"}} | conversation_created | + | id | type | name | + | Personal notes | 6 | Personal notes | + Then user "participant1" sees the following system messages in room "Personal notes" with 200 + | room | actorType | actorId | actorDisplayName | message | messageParameters | systemMessage | + | Personal notes | guests | system | | System created the conversation | {"actor":{"type":"guest","id":"guest\/system","name":"Guest"}} | conversation_created |