1 files changed, 7 insertions, 4 deletions
diff --git a/public/assets/js/util/format.js b/public/assets/js/util/format.js
index 00cc94c..272efaf 100644
--- a/public/assets/js/util/format.js
+++ b/public/assets/js/util/format.js
@@ -176,12 +176,15 @@ function tidy_urls (s, short_urls) {
     if (line.indexOf("<") !== -1) {
       return line
     }
-    return line.replace(/https?:\/\/[^ ]+/g, function(str){
-      if (short_urls) {
-        return '<a href="' + str + '" target="_blank">[' + get_domain(str) + ']</a>'
+    return line.replace(/https?:\/\/[^ ]+/g, function(url){
+      if (url.match(/(gif|jpe?g|png)\?.*$/) {
+        return '<a href="' + url + '" target="_blank"><img src="' + url + '"></a>'
+      }
+      else if (short_urls) {
+        return '<a href="' + url + '" target="_blank">[' + get_domain(url) + ']</a>'
       }
       else {
-        return '<a href="' + str + '" target="_blank">' + str + '</a>'
+        return '<a href="' + url + '" target="_blank">' + str + '</a>'
       }
     });