Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion docs/constants.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion lib/Chat/Changelog/Manager.php
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
];
Expand Down
2 changes: 1 addition & 1 deletion lib/Controller/RoomController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
*
Expand Down
2 changes: 1 addition & 1 deletion lib/Service/NoteToSelfService.php
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion openapi.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/components/LeftSidebar/LeftSidebar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
<template #icon>
<Note :size="20" />
</template>
{{ t('spreed', 'New personal note') }}
{{ t('spreed', 'Add personal notes') }}
</NcActionButton>

<NcActionButton close-after-click
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
<template #icon>
<Note :size="16" />
</template>
{{ t('spreed', 'Note to self') }}
{{ t('spreed', 'Add to personal notes') }}
</NcActionButton>
<NcActionButton v-if="canForwardMessage"
close-after-click
Expand Down Expand Up @@ -725,10 +725,10 @@ export default {
async forwardToNote() {
try {
await this.$store.dispatch('forwardMessage', { messageToBeForwarded: this.messageObject })
showSuccess(t('spreed', 'Message forwarded to "Note to self"'))
showSuccess(t('spreed', 'Message forwarded to "Personal notes"'))
} catch (error) {
console.error('Error while forwarding message to "Note to self"', error)
showError(t('spreed', 'Error while forwarding message to "Note to self"'))
console.error('Error while forwarding message to "Personal notes"', error)
showError(t('spreed', 'Error while forwarding message to "Personal notes"'))
}
},

Expand Down
6 changes: 3 additions & 3 deletions src/store/messagesStore.js
Original file line number Diff line number Diff line change
Expand Up @@ -1272,7 +1272,7 @@ const actions = {
},

/**
* Forwards message to a conversation. By default , the message is forwarded to Note to self.
* Forwards message to a conversation. By default , the message is forwarded to "Personal notes".
*
* @param {object} context default store context;
* will be forwarded;
Expand All @@ -1283,10 +1283,10 @@ const actions = {
async forwardMessage(context, { targetToken, messageToBeForwarded }) {
const message = cloneDeep(messageToBeForwarded)

// when there is no token provided, the message will be forwarded to the Note to self conversation
// when there is no token provided, the message will be forwarded to the "Personal notes" conversation
if (!targetToken) {
let noteToSelf = context.getters.conversationsList.find(conversation => 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
Expand Down
6 changes: 3 additions & 3 deletions src/store/messagesStore.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -1817,7 +1817,7 @@ describe('messagesStore', () => {
{
token: 'token-self',
type: 6,
displayName: 'Note to self',
displayName: 'Personal notes',
},
{
token: 'token-2',
Expand All @@ -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
Expand All @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions tests/integration/features/bootstrap/FeatureContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 ') {
Expand Down Expand Up @@ -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;
});

Expand Down Expand Up @@ -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;
});

Expand Down
4 changes: 2 additions & 2 deletions tests/integration/features/chat/mentions.feature
Original file line number Diff line number Diff line change
Expand Up @@ -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" |
14 changes: 7 additions & 7 deletions tests/integration/features/chat/note-to-self.feature
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand All @@ -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 |