Skip to content

Commit

Permalink
Merge pull request #13345 from nextcloud/feat/13343/wave-emoji-reaction
Browse files Browse the repository at this point in the history
feat(reactions): Add πŸ‘‹ and πŸ”₯ call reactions
  • Loading branch information
nickvergessen authored Sep 19, 2024
2 parents d49530a + 22693b9 commit 1c9bb14
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 3 deletions.
Binary file added img/emojis/Fire.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/emojis/Wave.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion lib/Capabilities.php
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ public function getCapabilities(): array {
'breakout-rooms' => $this->talkConfig->isBreakoutRoomsEnabled(),
'recording' => $this->talkConfig->isRecordingEnabled(),
'recording-consent' => $this->talkConfig->recordingConsentRequired(),
'supported-reactions' => ['❀️', 'πŸŽ‰', 'πŸ‘', 'πŸ‘', 'πŸ‘Ž', 'πŸ˜‚', '🀩', 'πŸ€”', '😲', 'πŸ˜₯'],
'supported-reactions' => ['❀️', 'πŸŽ‰', 'πŸ‘', 'πŸ‘‹', 'πŸ‘', 'πŸ‘Ž', 'πŸ”₯', 'πŸ˜‚', '🀩', 'πŸ€”', '😲', 'πŸ˜₯'],
// 'predefined-backgrounds' => list<string>,
'can-upload-background' => false,
'sip-enabled' => $this->talkConfig->isSIPConfigured(),
Expand Down
2 changes: 2 additions & 0 deletions src/components/CallView/shared/ReactionToaster.vue
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,10 @@ const reactions = {
'❀️': 'Heart.gif',
'πŸŽ‰': 'Party.gif',
'πŸ‘': 'Clap.gif',
'πŸ‘‹': 'Wave.gif',
'πŸ‘': 'Thumbs-up.gif',
'πŸ‘Ž': 'Thumbs-down.gif',
'πŸ”₯': 'Fire.gif',
'πŸ˜‚': 'Joy.gif',
'🀩': 'Star-struck.gif',
'πŸ€”': 'Thinking-face.gif',
Expand Down
4 changes: 2 additions & 2 deletions tests/php/CapabilitiesTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ public function testGetCapabilitiesGuest(): void {
'breakout-rooms' => false,
'recording' => false,
'recording-consent' => 0,
'supported-reactions' => ['❀️', 'πŸŽ‰', 'πŸ‘', 'πŸ‘', 'πŸ‘Ž', 'πŸ˜‚', '🀩', 'πŸ€”', '😲', 'πŸ˜₯'],
'supported-reactions' => ['❀️', 'πŸŽ‰', 'πŸ‘', 'πŸ‘‹', 'πŸ‘', 'πŸ‘Ž', 'πŸ”₯', 'πŸ˜‚', '🀩', 'πŸ€”', '😲', 'πŸ˜₯'],
'can-upload-background' => false,
'sip-enabled' => false,
'sip-dialout-enabled' => false,
Expand Down Expand Up @@ -247,7 +247,7 @@ public function testGetCapabilitiesUserAllowed(bool $isNotAllowed, bool $canCrea
'breakout-rooms' => true,
'recording' => false,
'recording-consent' => 0,
'supported-reactions' => ['❀️', 'πŸŽ‰', 'πŸ‘', 'πŸ‘', 'πŸ‘Ž', 'πŸ˜‚', '🀩', 'πŸ€”', '😲', 'πŸ˜₯'],
'supported-reactions' => ['❀️', 'πŸŽ‰', 'πŸ‘', 'πŸ‘‹', 'πŸ‘', 'πŸ‘Ž', 'πŸ”₯', 'πŸ˜‚', '🀩', 'πŸ€”', '😲', 'πŸ˜₯'],
'can-upload-background' => $canUpload,
'sip-enabled' => false,
'sip-dialout-enabled' => false,
Expand Down

0 comments on commit 1c9bb14

Please sign in to comment.