Skip to content

Use room avatar as the conversation icon #4872

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
danxuliu wants to merge 15 commits into from
Closed

Use room avatar as the conversation icon #4872

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
55591ba
Add basic implementation of IAvatar for rooms
danxuliu Dec 10, 2020
9318c0e
Add integration tests for conversation avatars
danxuliu Dec 10, 2020
d0dfe4f
Add default avatars for one-to-one conversations
danxuliu Dec 29, 2020
18d292a
Add avatar id and version fields to conversations
danxuliu Dec 30, 2020
21e5b66
Update avatar information in database when the avatar is set or removed
danxuliu Dec 30, 2020
760e6a5
Return avatar id and version with the rest of the conversation data
danxuliu Dec 30, 2020
fee29cf
Notify external signaling server when avatar changes
danxuliu Dec 30, 2020
949b3aa
Add integration test step to send requests as the logged in user
danxuliu Dec 30, 2020
954b92e
Update one-to-one conversation avatars when the user avatar changes
danxuliu Dec 30, 2020
b909674
Add system message when the avatar of a conversation is changed
danxuliu Dec 30, 2020
d46e295
Add capability for room avatars
danxuliu Dec 30, 2020
37c62f5
Replace generic avatar system with specific Talk endpoints
danxuliu Dec 30, 2020
7332d60
fixup! Add system message when the avatar of a conversation is changed
danxuliu Dec 31, 2020
b153efc
Set icon based on the avatar id
danxuliu Dec 30, 2020
27c23ce
Get avatar image for non-icon room avatars
danxuliu Dec 31, 2020
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
Prev Previous commit
Next Next commit
Return avatar id and version with the rest of the conversation data 
Signed-off-by: Daniel Calviño Sánchez <[email protected]>
  • Loading branch information
@danxuliu
danxuliu committed Dec 31, 2020
commit 760e6a57cb456c93d483c315bd5c87d1222b4625
2 changes: 2 additions & 0 deletions docs/conversation.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@
`name` | string | * | Name of the conversation (can also be empty)
`displayName` | string | * | `name` if non empty, otherwise it falls back to a list of participants
`description` | string | v3 | Description of the conversation (can also be empty)
`avatarId` | string | v3 | The type of the avatar ("custom", "user", "icon-public", "icon-contacts", "icon-mail", "icon-password", "icon-changelog", "icon-file")
`avatarVersion` | int | v3 | The version of the avatar
`participantType` | int | * | Permissions level of the current user
`attendeeId` | int | v3 | Unique attendee id
`attendeePin` | string | v3 | Unique dial-in authentication code for this user, when the conversation has SIP enabled (see `sipEnabled` attribute)
Expand Down
4 changes: 4 additions & 0 deletions lib/Controller/RoomController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,6 +584,8 @@ protected function formatRoomV2andV3(Room $room, ?Participant $currentParticipan
'canEnableSIP' => false,
'attendeePin' => '',
'description' => '',
'avatarId' => '',
'avatarVersion' => 0,
'lastCommonReadMessage' => 0,
'listable' => Room::LISTABLE_NONE,
]);
Expand Down Expand Up @@ -658,6 +660,8 @@ protected function formatRoomV2andV3(Room $room, ?Participant $currentParticipan
'actorId' => $attendee->getActorId(),
'attendeeId' => $attendee->getId(),
'description' => $room->getDescription(),
'avatarId' => $room->getAvatarId(),
'avatarVersion' => $room->getAvatarVersion(),
'listable' => $room->getListable(),
]);

Expand Down
6 changes: 6 additions & 0 deletions tests/integration/features/bootstrap/FeatureContext.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,12 @@ private function assertRooms($rooms, TableNode $formData) {
if (isset($expectedRoom['description'])) {
$data['description'] = $room['description'];
}
if (isset($expectedRoom['avatarId'])) {
$data['avatarId'] = $room['avatarId'];
}
if (isset($expectedRoom['avatarVersion'])) {
$data['avatarVersion'] = $room['avatarVersion'];
}
if (isset($expectedRoom['type'])) {
$data['type'] = (string) $room['type'];
}
Expand Down
71 changes: 71 additions & 0 deletions tests/integration/features/conversation/avatar.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,3 +460,74 @@ Feature: avatar
And user "owner" sets avatar for room "group room" from file "data/green-square-256.png"
When user "owner" gets avatar for room "group room" with size "128"
Then last avatar is a custom avatar of size "128" and color "#00FF00"



Scenario: room list returns the default avatar after room creation
When user "owner" creates room "public room"
| roomType | 3 |
| roomName | room |
And user "owner" adds "moderator" to room "public room" with 200
And user "owner" promotes "moderator" in room "public room" with 200
And user "owner" adds "invited user" to room "public room" with 200
And user "not invited but joined user" joins room "public room" with 200
Then user "owner" is participant of the following rooms (v3)
| avatarId | avatarVersion |
| icon-public | 1 |
And user "moderator" is participant of the following rooms (v3)
| avatarId | avatarVersion |
| icon-public | 1 |
And user "invited user" is participant of the following rooms (v3)
| avatarId | avatarVersion |
| icon-public | 1 |
And user "not invited but joined user" is participant of the following rooms (v3)
| avatarId | avatarVersion |
| icon-public | 1 |

Scenario: room list returns a custom avatar after avatar is set
Given user "owner" creates room "public room"
| roomType | 3 |
| roomName | room |
And user "owner" adds "moderator" to room "public room" with 200
And user "owner" promotes "moderator" in room "public room" with 200
And user "owner" adds "invited user" to room "public room" with 200
And user "not invited but joined user" joins room "public room" with 200
When user "owner" sets avatar for room "public room" from file "data/green-square-256.png"
Then user "owner" is participant of the following rooms (v3)
| avatarId | avatarVersion |
| custom | 2 |
And user "moderator" is participant of the following rooms (v3)
| avatarId | avatarVersion |
| custom | 2 |
And user "invited user" is participant of the following rooms (v3)
| avatarId | avatarVersion |
| custom | 2 |
And user "not invited but joined user" is participant of the following rooms (v3)
| avatarId | avatarVersion |
| custom | 2 |

Scenario: room list returns a default avatar after avatar is deleted
Given user "owner" creates room "public room"
| roomType | 3 |
| roomName | room |
And user "owner" adds "moderator" to room "public room" with 200
And user "owner" promotes "moderator" in room "public room" with 200
And user "owner" adds "invited user" to room "public room" with 200
And user "not invited but joined user" joins room "public room" with 200
And user "owner" sets avatar for room "public room" from file "data/green-square-256.png"
And user "owner" is participant of the following rooms (v3)
| avatarId | avatarVersion |
| custom | 2 |
When user "owner" deletes avatar for room "public room"
Then user "owner" is participant of the following rooms (v3)
| avatarId | avatarVersion |
| icon-public | 3 |
And user "moderator" is participant of the following rooms (v3)
| avatarId | avatarVersion |
| icon-public | 3 |
And user "invited user" is participant of the following rooms (v3)
| avatarId | avatarVersion |
| icon-public | 3 |
And user "not invited but joined user" is participant of the following rooms (v3)
| avatarId | avatarVersion |
| icon-public | 3 |