paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-03 21:43:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

emoji: Only resize custom emoji that need it.

Browse Source 
This additional logic to prevent resizing is certain circumstances
(file size, dimensions) is necessary because the pillow gif handling
code seems to be rather flaky with regards to handling gif color
palletes, causing broken gifs after resizing.  The workaround is to
only resize when absolutely necessary (e.g. because the file is larger
than 128x128 or 128KB).

Fixes #10351.
This commit is contained in:
Daniel Bradburn
2019-01-28 21:02:48 +01:00
committed by Tim Abbott
parent a964977960
commit 1e65cdd072
3 changed files with 39 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
zerver/tests/test_upload.py
View File

@@ -2,6 +2,7 @@
from django.conf import settings
from django.test import TestCase
from unittest import skip
from unittest.mock import patch
from zerver.lib.avatar import (
avatar_url,
@@ -1096,17 +1097,32 @@ class EmojiTest(UploadSerializeMixin, ZulipTestCase):
im = Image.open(io.BytesIO(resized_img_data))
self.assertEqual((50, 50), im.size)
# Test for large animated image (128x128)
animated_large_img_data = get_test_image_file('animated_large_img.gif').read()
resized_img_data = resize_emoji(animated_large_img_data, size=50)
im = Image.open(io.BytesIO(resized_img_data))
self.assertEqual((50, 50), im.size)
# Test corrupt image exception
corrupted_img_data = get_test_image_file('corrupt.gif').read()
with self.assertRaises(BadImageError):
resize_emoji(corrupted_img_data)
# Test an image larger than max is resized
with patch('zerver.lib.upload.MAX_EMOJI_GIF_SIZE', 128):
animated_large_img_data = get_test_image_file('animated_large_img.gif').read()
resized_img_data = resize_emoji(animated_large_img_data, size=50)
im = Image.open(io.BytesIO(resized_img_data))
self.assertEqual((50, 50), im.size)
# Test an image file larger than max is resized
with patch('zerver.lib.upload.MAX_EMOJI_GIF_FILE_SIZE_BYTES', 3 * 1024 * 1024):
animated_large_img_data = get_test_image_file('animated_large_img.gif').read()
resized_img_data = resize_emoji(animated_large_img_data, size=50)
im = Image.open(io.BytesIO(resized_img_data))
self.assertEqual((50, 50), im.size)
# Test an image smaller than max and smaller than file size max is not resized
with patch('zerver.lib.upload.MAX_EMOJI_GIF_SIZE', 512):
animated_large_img_data = get_test_image_file('animated_large_img.gif').read()
resized_img_data = resize_emoji(animated_large_img_data, size=50)
im = Image.open(io.BytesIO(resized_img_data))
self.assertEqual((256, 256), im.size)
def tearDown(self) -> None:
destroy_uploads()