Skip to content

Improve previews for guests + GIF support #4472

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

Merged
PVince81 merged 5 commits into from
Oct 29, 2020
Merged

Improve previews for guests + GIF support #4472

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7083bbc
Chat previews now expanded with aspect ratio
PVince81 Oct 26, 2020
805b1cf
Add size to system message from shared file
PVince81 Oct 26, 2020
549d890
Direct preview for GIFs + guest mode previews
PVince81 Oct 26, 2020
591cacd
Make max GIF size configurable
PVince81 Oct 26, 2020
7c26560
Use max-height for images
PVince81 Oct 28, 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
Add size to system message from shared file 
Signed-off-by: Vincent Petry <[email protected]>
  • Loading branch information
@PVince81
PVince81 committed Oct 28, 2020
commit 805b1cfc93cfc60247a26fcbece61ffe6804cb61
3 changes: 3 additions & 0 deletions lib/Chat/Parser/SystemMessage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,7 @@ protected function getFileFromShare(Participant $participant, string $shareId):
$share = $this->shareProvider->getShareById($shareId);
$node = $share->getNode();
$name = $node->getName();
$size = $node->getSize();
$path = $name;

if (!$participant->isGuest()) {
Expand All @@ -349,6 +350,7 @@ protected function getFileFromShare(Participant $participant, string $shareId):
$fullPath = $userNode->getPath();
$pathSegments = explode('/', $fullPath, 4);
$name = $userNode->getName();
$size = $userNode->getSize();
$path = $pathSegments[3] ?? $path;
}
} else {
Expand All @@ -370,6 +372,7 @@ protected function getFileFromShare(Participant $participant, string $shareId):
'type' => 'file',
'id' => (string) $node->getId(),
'name' => $name,
'size' => $size,
'path' => $path,
'link' => $url,
'mimetype' => $node->getMimeType(),
Expand Down
15 changes: 15 additions & 0 deletions tests/php/Chat/Parser/SystemMessageTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,6 +433,9 @@ public function testGetFileFromShareForGuest() {
$node->expects($this->once())
->method('getMimeType')
->willReturn('text/plain');
$node->expects($this->once())
->method('getSize')
->willReturn(65530);

$share = $this->createMock(IShare::class);
$share->expects($this->once())
Expand Down Expand Up @@ -469,6 +472,7 @@ public function testGetFileFromShareForGuest() {
'type' => 'file',
'id' => '54',
'name' => 'name',
'size' => 65530,
'path' => 'name',
'link' => 'absolute-link',
'mimetype' => 'text/plain',
Expand All @@ -490,6 +494,9 @@ public function testGetFileFromShareForOwner() {
$node->expects($this->once())
->method('getMimeType')
->willReturn('httpd/unix-directory');
$node->expects($this->once())
->method('getSize')
->willReturn(65520);

$share = $this->createMock(IShare::class);
$share->expects($this->once())
Expand Down Expand Up @@ -529,6 +536,7 @@ public function testGetFileFromShareForOwner() {
'type' => 'file',
'id' => '54',
'name' => 'name',
'size' => 65520,
'path' => 'path/to/file/name',
'link' => 'absolute-link-owner',
'mimetype' => 'httpd/unix-directory',
Expand All @@ -547,6 +555,9 @@ public function testGetFileFromShareForRecipient() {
$node->expects($this->once())
->method('getMimeType')
->willReturn('application/octet-stream');
$node->expects($this->once())
->method('getSize')
->willReturn(65510);

$share = $this->createMock(IShare::class);
$share->expects($this->once())
Expand All @@ -573,6 +584,9 @@ public function testGetFileFromShareForRecipient() {
$file->expects($this->once())
->method('getPath')
->willReturn('/user/files/Shared/different');
$file->expects($this->once())
->method('getSize')
->willReturn(65515);

$userFolder = $this->createMock(Folder::class);
$userFolder->expects($this->once())
Expand Down Expand Up @@ -602,6 +616,7 @@ public function testGetFileFromShareForRecipient() {
'type' => 'file',
'id' => '54',
'name' => 'different',
'size' => 65515,
'path' => 'Shared/different',
'link' => 'absolute-link-owner',
'mimetype' => 'application/octet-stream',
Expand Down