Catch errors when uploading white avatar (#3119)

flarum · Oct 25, 2021 · a661376 · a661376
1 parent 5a1bf08
commit a661376
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/js/src/common/models/User.js b/js/src/common/models/User.js
@@ -89,8 +89,18 @@ Object.assign(User.prototype, {
     const user = this;
 
     image.onload = function () {
-      const colorThief = new ColorThief();
-      user.avatarColor = colorThief.getColor(this);
+      try {
+        const colorThief = new ColorThief();
+        user.avatarColor = colorThief.getColor(this);
+      } catch (e) {
+        // Completely white avatars throw errors due to a glitch in color thief
+        // See https://github.com/lokesh/color-thief/issues/40
+        if (e instanceof TypeError) {
+          user.avatarColor = [255, 255, 255];
+        } else {
+          throw e;
+        }
+      }
       user.freshness = new Date();
       m.redraw();
     };