Some images may not have size passed

yue · Mar 18, 2019 · ec6e836 · ec6e836
1 parent c9e7a0b
commit ec6e836
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/lib/service/slack/slack-file.js b/lib/service/slack/slack-file.js
@@ -17,8 +17,12 @@ class SlackFile extends File {
         this.image = imageStore.weyUrlFromImagePath(imagePath)
         this.isImageCached = true
       }
-      this.imageWidth = Math.min(f.original_w, 360)
-      this.imageHeight = f.original_h * this.imageWidth / f.original_w
+      if (f.original_w) {
+        this.imageWidth = Math.min(f.original_w, 360)
+        this.imageHeight = f.original_h * this.imageWidth / f.original_w
+      } else {
+        this.imageWidth = 360
+      }
     }
   }
 }

diff --git a/lib/view/chat/message.html b/lib/view/chat/message.html
@@ -66,7 +66,7 @@
         {{/if}}
         {{#if image}}
         <div class="image">
-          <a href="{{imageUrl}}"><img width="{{imageWidth}}" height="{{imageHeight}}" src="{{image}}"/></a>
+          <a href="{{imageUrl}}"><img width="{{imageWidth}}"{{#if imageHeight}} height="{{imageHeight}}"{{/if}} src="{{image}}"/></a>
         </div>
         {{/if}}
       </div>