From d9d182f7baa9eccbb654b8f3b569ed8ef910c76a Mon Sep 17 00:00:00 2001
From: Aileen Nowak <aileen@ghost.org>
Date: Tue, 11 Apr 2017 18:40:17 +0700
Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20Blog=20icon=20improvements=20(#8?=
 =?UTF-8?q?260)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

refs #7688

- blog icon error message
- change default favicon to 60px
---
 .../server/middleware/validation/blog-icon.js |  14 +++++++-------
 core/server/public/favicon.ico                | Bin 15086 -> 34494 bytes
 core/server/translations/en.json              |   6 +-----
 .../functional/routes/api/upload_icon_spec.js |   4 ++--
 .../unit/middleware/serve-favicon_spec.js     |   2 +-
 .../fixtures/images/favicon_32x_single.ico    | Bin 4286 -> 0 bytes
 .../fixtures/images/favicon_64x_single.ico    | Bin 0 -> 16958 bytes
 .../fixtures/images/favicon_multi_sizes.ico   | Bin 15086 -> 34494 bytes
 8 files changed, 11 insertions(+), 15 deletions(-)
 mode change 100644 => 100755 core/server/public/favicon.ico
 delete mode 100755 core/test/utils/fixtures/images/favicon_32x_single.ico
 create mode 100755 core/test/utils/fixtures/images/favicon_64x_single.ico
 mode change 100644 => 100755 core/test/utils/fixtures/images/favicon_multi_sizes.ico

diff --git a/core/server/middleware/validation/blog-icon.js b/core/server/middleware/validation/blog-icon.js
index e1a2be58ea..bf5aa132fd 100644
--- a/core/server/middleware/validation/blog-icon.js
+++ b/core/server/middleware/validation/blog-icon.js
@@ -61,7 +61,7 @@ module.exports = function blogIcon() {
 
         // CASE: file should not be larger than 100kb
         if (!validIconSize(req.file.size)) {
-            return next(new errors.RequestEntityTooLargeError({message: i18n.t('errors.api.icons.fileSizeTooLarge', {extensions: iconExtensions})}));
+            return next(new errors.ValidationError({message: i18n.t('errors.api.icons.invalidFile', {extensions: iconExtensions})}));
         }
 
         return getIconDimensions(req.file).then(function (dimensions) {
@@ -70,18 +70,18 @@ module.exports = function blogIcon() {
 
             // CASE: file needs to be a square
             if (req.file.dimensions.width !== req.file.dimensions.height) {
-                return next(new errors.ValidationError({message: i18n.t('errors.api.icons.iconNotSquare', {extensions: iconExtensions})}));
+                return next(new errors.ValidationError({message: i18n.t('errors.api.icons.invalidFile', {extensions: iconExtensions})}));
             }
 
-            // CASE: icon needs to be bigger than 32px
-            // .ico files can contain multiple sizes, we need at least a minimum of 32px (16px is ok, as long as 32px are present as well)
-            if (req.file.dimensions.width < 32) {
-                return next(new errors.ValidationError({message: i18n.t('errors.api.icons.fileTooSmall', {extensions: iconExtensions})}));
+            // CASE: icon needs to be bigger than 60px
+            // .ico files can contain multiple sizes, we need at least a minimum of 60px (16px is ok, as long as 60px are present as well)
+            if (req.file.dimensions.width <= 60) {
+                return next(new errors.ValidationError({message: i18n.t('errors.api.icons.invalidFile', {extensions: iconExtensions})}));
             }
 
             // CASE: icon needs to be smaller than 1000px
             if (req.file.dimensions.width > 1000) {
-                return next(new errors.ValidationError({message: i18n.t('errors.api.icons.fileTooLarge', {extensions: iconExtensions})}));
+                return next(new errors.ValidationError({message: i18n.t('errors.api.icons.invalidFile', {extensions: iconExtensions})}));
             }
 
             next();
diff --git a/core/server/public/favicon.ico b/core/server/public/favicon.ico
old mode 100644
new mode 100755
index c24e3c410330d199710adb42c6a1f624ef87c013..a60606aa2fa02c59421b61a74594e3e9a0f3bd58
GIT binary patch
literal 34494
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

literal 15086
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
A_5c6?

diff --git a/core/server/translations/en.json b/core/server/translations/en.json
index 06809d34a1..7e16c86f3d 100644
--- a/core/server/translations/en.json
+++ b/core/server/translations/en.json
@@ -371,11 +371,7 @@
             },
             "icons": {
                 "missingFile": "Please select an icon.",
-                "fileSizeTooLarge": "Please select an icon file smaller than 100kb.",
-                "iconNotSquare": "The icon needs to be a square.",
-                "fileTooLarge": "Please select an icon file smaller than 1000px.",
-                "fileTooSmall": "Please select an icon file larger than 32px.",
-                "invalidFile": "Please select a valid icon file.",
+                "invalidFile": "Blog icon must be a square .ico or .png file between 60px – 1,000px, under 100kb.",
                 "couldNotGetSize": "Couldn/'t get icon dimensions"
             },
             "users": {
diff --git a/core/test/functional/routes/api/upload_icon_spec.js b/core/test/functional/routes/api/upload_icon_spec.js
index 5397682711..2de1b7d46b 100644
--- a/core/test/functional/routes/api/upload_icon_spec.js
+++ b/core/test/functional/routes/api/upload_icon_spec.js
@@ -73,7 +73,7 @@ describe('Upload Icon API', function () {
             request.post(testUtils.API.getApiQuery('uploads/icon'))
                 .set('Authorization', 'Bearer ' + accesstoken)
                 .expect('Content-Type', /json/)
-                .attach('uploadimage', path.join(__dirname, '/../../../utils/fixtures/images/favicon_32x_single.ico'))
+                .attach('uploadimage', path.join(__dirname, '/../../../utils/fixtures/images/favicon_64x_single.ico'))
                 .expect(200)
                 .end(function (err, res) {
                     if (err) {
@@ -151,7 +151,7 @@ describe('Upload Icon API', function () {
                 .set('Authorization', 'Bearer ' + accesstoken)
                 .expect('Content-Type', /json/)
                 .attach('uploadimage', path.join(__dirname, '/../../../utils/fixtures/images/favicon_size_too_large.png'))
-                .expect(413)
+                .expect(422)
                 .end(function (err) {
                     if (err) {
                         return done(err);
diff --git a/core/test/unit/middleware/serve-favicon_spec.js b/core/test/unit/middleware/serve-favicon_spec.js
index 5db57193a0..5384884142 100644
--- a/core/test/unit/middleware/serve-favicon_spec.js
+++ b/core/test/unit/middleware/serve-favicon_spec.js
@@ -118,7 +118,7 @@ describe('Serve Favicon', function () {
                         statusCode.should.eql(200);
                     },
                     end: function (body) {
-                        body.length.should.eql(15086);
+                        body.length.should.eql(34494);
                         done();
                     }
                 };
diff --git a/core/test/utils/fixtures/images/favicon_32x_single.ico b/core/test/utils/fixtures/images/favicon_32x_single.ico
deleted file mode 100755
index a5f1611c14b7c962dfd997030932e4318ff3f4d7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4286
zcmc&&&rcIk5MJ@1A_q@Bh|!{841z`4?Y5=R0{;XTm75pi&4cmc!8B-MypSjc6b~kN
zFwq!|iAI5do(&g68X-MPIg>6t=iA+R`*_(`egw-SA2aj4neUt35J<7CBlH!ITlj9x
zoU*K#Wm%U9L|H`w_#IAD^NHiJ_VZ`Q(#h_!-P`37!~w&FHhGlbMf)@bJ2kbQj-?zs
zQL&TVqAqwR?$c|X$31gOgcm%q19r*SJr&wb0BS$ie8;uggPiY~=b9t)9KplWd*>I<
zmC~tDgJ<>>^?AKkc2srS$=gXK%IVY<p~9gWP&wrFc)eGx&2xz|-MM^!2+?(HdM=5C
zlB<01>^AOIa8DGc-f^zP;C*ID?@*B@|2kM&`X%(Uxw$E(CMV<^a&Y>=Y&~t<Wz#(#
zxQ}a&x+d2@e=N#b<fg+qJ4VOfL-wI2Y;0^qO3%%G_wLa@PkGeAtgZ)5$<b^s@ByE5
zu1a`)#NE4lM@+w*+=drZ&&7>vBfdZNj8YCx@53x>vYzUvdvb3>V}_o&4*K{G?}l<?
z&3(Iwo`%%xB~8HB_H*WX#p1%eSYNO13kx)>>+QAP+S-cx(b^S<S)*Upf5tq;5J}1z
zK3}WVcI6e-gjroL^kQH3i;j=R9*Fnv-tG&S4gI6_`*TUb$Wsn*tw!~Zb5k$RaUa)e
z4DV9prvp1Mr|!etexgCMkF*RJApX<G4`OxYkHiY)0CULS%)FKww{P7P%gevLd(7(E
z&}85lIX6Z84DWQR)vDBaH9aNUF>BHdd7F9y<S7DNQ;hn%CJlmQZSAj|!|z}|nDz8D
zO;x`@cl9vwY+TIEeyfWoj~_~n(d#4P>zB`7|HRXA$(udWqR>ysN5JFN{UUmdbB10`
zvq<$J!`+*|bCCPGg9A>PAc_Hyt1$7~dit@G59UpC8ei_}>=@&jM#syY9i^6&&9UKP
zt}-}~QJxz)Lwz67JwpY(*Hnl6a4}nfH$DTl#amO@0XmHUyxQVtyw9Kf85p~CbzUqD
s6|!a8!Tk?=xWlB~O&%>R{&T~7)v}JwTGr9~_%}g=4!mZ`bCtaR0nsGKm;e9(

diff --git a/core/test/utils/fixtures/images/favicon_64x_single.ico b/core/test/utils/fixtures/images/favicon_64x_single.ico
new file mode 100755
index 0000000000000000000000000000000000000000..5a6625acbce3c52ed6ec274ad6a542f43b873de8
GIT binary patch
literal 16958
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

literal 0
HcmV?d00001

diff --git a/core/test/utils/fixtures/images/favicon_multi_sizes.ico b/core/test/utils/fixtures/images/favicon_multi_sizes.ico
old mode 100644
new mode 100755
index c24e3c410330d199710adb42c6a1f624ef87c013..a60606aa2fa02c59421b61a74594e3e9a0f3bd58
GIT binary patch
literal 34494
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

literal 15086
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
A_5c6?