From 5bcf2586305bb9f246497558f46f2fa15f686364 Mon Sep 17 00:00:00 2001
From: yo momma <shutup@oops.wtf>
Date: Fri, 30 Jan 2026 09:52:51 +0000
Subject: Fix: restore hotlinks + cache-bust pichat.js

---
 static/js/pages/chat_init.js     |  13 +++--
 static/js/pichat.butt.js         | 104 +++++++++++++++++++++++++++++++-------
 static/js/pichat.js              | 106 +++++++++++++++++++++++++++++++++------
 static/js/src/text.js            | 104 ++++++++++++++++++++++++++++++++------
 static/js/src/youtube.js         |   2 +-
 template/frontpage copy.st       |   2 +-
 template/frontpage.st            |   2 +-
 template/frontpagePROFILE.st     |   2 +-
 template/frontpage_halloffame.st |   2 +-
 template/fullscreen.st           |   2 +-
 template/fullscreen4.st          |   2 +-
 template/fullscreen5.st          |   2 +-
 template/fullscreen_front.st     |   2 +-
 template/fullscreenphotobooth.st |   2 +-
 template/head.st                 |   2 +-
 template/head_edge.st            |   2 +-
 template/ie_fullscreen.st        |   2 +-
 template/mgmtfull.st             |   2 +-
 template/newlog.st               |   2 +-
 template/rooms/fullscreen.st     |   2 +-
 template/rooms/fullscreen2.st    |   2 +-
 template/rooms/mgmt.st           |   2 +-
 template/rooms/nocss.st          |   2 +-
 template/simplerlog.st           |   2 +-
 24 files changed, 294 insertions(+), 73 deletions(-)

diff --git a/static/js/pages/chat_init.js b/static/js/pages/chat_init.js
index 58dba07..7149291 100644
--- a/static/js/pages/chat_init.js
+++ b/static/js/pages/chat_init.js
@@ -23,9 +23,17 @@
     if (typeof window.Recips === 'undefined') { window.Recips = []; }
 
     var hasMessageList = document.getElementById('messageList') !== null;
+    var hasChatInput = document.getElementById('msgInput') !== null;
+
+    if (hasMessageList && hasChatInput && typeof window.initChat === 'function') { window.initChat(); }
+    if (hasMessageList && hasChatInput && typeof window.initChatMsgs === 'function') { window.initChatMsgs(); }
+
+    // Some room pages render dumps in `.logged-dump` containers without the full chat UI.
+    // In that case, run the log initializer so URLs become hotlinked images.
+    if (!hasChatInput && typeof window.initLog === 'function' && jQuery('.logged-dump .content').length) {
+      window.initLog(window.Recips);
+    }
 
-    if (hasMessageList && typeof window.initChat === 'function') { window.initChat(); }
-    if (hasMessageList && typeof window.initChatMsgs === 'function') { window.initChatMsgs(); }
     if (typeof window.Away !== 'undefined' && typeof window.Away.startTitleUpdater === 'function') { window.Away.startTitleUpdater(); }
 
     if (window.Nick && typeof window.setupUpload === 'function' && typeof window.Room !== 'undefined') {
@@ -33,4 +41,3 @@
     }
   });
 })(jQuery);
-
diff --git a/static/js/pichat.butt.js b/static/js/pichat.butt.js
index 220e873..f0baae5 100755
--- a/static/js/pichat.butt.js
+++ b/static/js/pichat.butt.js
@@ -65,18 +65,68 @@ function normalizeUrl(url) {
 }
 
 URLRegex = /((\b(http\:\/\/|https\:\/\/|ftp\:\/\/)|(www\.))+(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?)/gi;
-PicRegex = /\.(jpg|jpeg|png|gif|bmp)$/i;
+PicRegex = /\.(jpg|jpeg|png|gif|bmp|svg|webp|fid)$/i;
+VideoRegex = /\.(mp4|webm|mov|m4v|gifv)$/i;
+
+function splitTrailingPunctuation(url) {
+  if (!url) return { "url": url, "suffix": "" };
+  var match = url.match(/[)\]\}\.,!\?;:'"]+$/);
+  if (!match) return { "url": url, "suffix": "" };
+  return { "url": url.slice(0, -match[0].length), "suffix": match[0] };
+}
+
+function imgurIdFromUri(uri) {
+  var host = parseDomain(uri.host || "");
+  if (!host || !host.match(/(^|\\.)imgur\\.com$/i)) return null;
+  if (!uri.file) return null;
+
+  var fileLower = uri.file.toLowerCase();
+  if (PicRegex.test(fileLower) || VideoRegex.test(fileLower)) return null;
+
+  if (!uri.file.match(/^[A-Za-z0-9]+$/)) return null;
+  return uri.file;
+}
+
+function imgurCandidateUrls(id) {
+  var base = "https://i.imgur.com/" + id;
+  return [base + ".jpg", base + ".png", base + ".gif", base + ".jpeg"];
+}
+
+function imgurHotlinkFallback(img) {
+  try {
+    var candidates = (img.getAttribute("data-imgur-candidates") || "").split("|");
+    if (!candidates.length || !candidates[0]) return;
+
+    var idx = parseInt(img.getAttribute("data-imgur-idx") || "0", 10);
+    var next = idx + 1;
+    if (next >= candidates.length) {
+      var link = img.parentNode;
+      if (link && link.tagName == "A") {
+        var href = link.getAttribute("href") || "";
+        while (link.firstChild) link.removeChild(link.firstChild);
+        link.appendChild(document.createTextNode(href));
+      }
+      return;
+    }
+
+    img.setAttribute("data-imgur-idx", "" + next);
+    img.src = candidates[next];
+  } catch (e) {}
+}
 
 function getImagesAsArray(text) {
   var imgs = []
   var urls = text.match(URLRegex)
   if (urls === null) return imgs
   for (var i = 0; i<urls.length; i++){
-    var url = urls[i]
-    var normalized = normalizeUrl(url);
-    var urlWithoutParams = normalized.replace(/[?#].*$/i, "");
-    if (PicRegex.test(urlWithoutParams))
-      imgs.push(normalized)
+    var split = splitTrailingPunctuation(urls[i]);
+    var normalized = normalizeUrl(split.url);
+    var uri = parseUri(normalized);
+    var imgurId = imgurIdFromUri(uri);
+    var candidate = imgurId ? imgurCandidateUrls(imgurId)[0] : normalized;
+
+    var urlWithoutParams = candidate.replace(/[?#].*$/i, "");
+    if (PicRegex.test(urlWithoutParams)) imgs.push(candidate)
   }
   return imgs
 }
@@ -89,22 +139,35 @@ function linkify(text) {
 // durty hack to use a global to check this... but otherwise i'd have to rewrite the String.replace function? :/
 var LastMsgContainsImage = false
 function linkReplace(url) {
-    //var urlWithoutParams = url.replace(/\?.*$/i, "");
-    
-    linkUrl = normalizeUrl(url);
-    
-    var uri = parseUri(url)
+    var split = splitTrailingPunctuation(url);
+    linkUrl = normalizeUrl(split.url);
+    var uri = parseUri(linkUrl);
+
+    var imgurId = imgurIdFromUri(uri);
+    if (imgurId) {
+      LastMsgContainsImage = true;
+      var candidates = imgurCandidateUrls(imgurId);
+      var first = candidates[0];
+      return "<a target=\"_blank\" href=\"" + linkUrl + "\">"
+             + "<img src=\"" + first + "\" class=\"imgur-hotlink\" data-imgur-idx=\"0\" data-imgur-candidates=\"" + candidates.join('|') + "\" onerror=\"imgurHotlinkFallback(this)\">"
+             + "</a>" + split.suffix;
+    }
+
     switch(getUriType(uri)) {
       case 'image':
         LastMsgContainsImage = true;
-        return "<a target='_blank' href='" + linkUrl + "'><img src='" + linkUrl + "'></a>"; break;
-      case 'youtube': 
+        return "<a target='_blank' href='" + linkUrl + "'><img src='" + linkUrl + "'></a>" + split.suffix;
+      case 'video':
+        LastMsgContainsImage = true;
+        var videoUrl = linkUrl.replace(/\.gifv([?#].*)?$/i, '.mp4$1');
+        return "<a target=\"_blank\" href=\"" + linkUrl + "\"><video src=\"" + videoUrl + "\" autoplay loop muted controls playsinline></video></a>" + split.suffix;
+      case 'youtube':
         Youtube.startAnimation();
-        return "<a target='_blank' class='youtube' href='" + linkUrl + "'>" +
-               "<img class='youtube-thumb' width='130' height='97' src='"+Youtube.nextThumbUrl(uri.queryKey.v)+"'>" + 
-               "<img class='youtube-controls' src='/static/img/youtube.controls.png'></a>"; break;
+        return "<a target=\"_blank\" class=\"youtube\" href=\"" + linkUrl + "\">" +
+               "<img class=\"youtube-thumb\" width=\"130\" height=\"97\" src=\"" + Youtube.nextThumbUrl(uri.queryKey.v) + "\">" +
+               "<img class=\"youtube-controls\" src=\"/static/img/youtube.controls.png\"></a>" + split.suffix;
       default:
-        return "<a target='_blank' href='" + linkUrl + "'>" + url + "</a>";
+        return "<a target=\"_blank\" href=\"" + linkUrl + "\">" + split.url + "</a>" + split.suffix;
     }
     
 }
@@ -130,7 +193,7 @@ Youtube = {
     var img = $(this);
     // yt thumb url example: https://i.ytimg.com/vi/0123456789A/1.jpg
     var src = img.attr("src") || ""
-    var match = src.match(/\\/vi\\/([^/]{11})\\/(\\d)\\.jpg/i)
+    var match = src.match(/\/vi\/([^/]{11})\/(\d)\.jpg/i)
     if (!match) return
     var v = match[1]
     var num = match[2]
@@ -149,8 +212,11 @@ Youtube = {
 function getUriType(uri){
   if (PicRegex.test(uri.file.toLowerCase()))
     return "image";
+
+  if (VideoRegex.test(uri.file.toLowerCase()))
+    return "video";
     
-  if (parseDomain(uri.host) == "youtube.com" && 'v' in uri.queryKey || uri.anchor.indexOf('v') != -1)
+  if (parseDomain(uri.host) == "youtube.com" && ('v' in uri.queryKey || uri.anchor.indexOf('v') != -1))
     return "youtube";
     
   return "link";
diff --git a/static/js/pichat.js b/static/js/pichat.js
index 2283baf..ad50fae 100755
--- a/static/js/pichat.js
+++ b/static/js/pichat.js
@@ -2114,21 +2114,74 @@ function escapeHtml(txt) {
 
 
 URLRegex = /((\b(http\:\/\/|https\:\/\/|ftp\:\/\/)|(www\.))+(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?)/gi;
-PicRegex = /\.(jpg|jpeg|png|gif|bmp|svg|fid)$/i;
+PicRegex = /\.(jpg|jpeg|png|gif|bmp|svg|webp|fid)$/i;
+VideoRegex = /\.(mp4|webm|mov|m4v|gifv)$/i;
 RecipRegex = /(^|\s)@\w+/g;
 TopicRegex = /(^|\s)#\w+/g;
 
+function splitTrailingPunctuation(url) {
+  if (!url) return { "url": url, "suffix": "" };
+  // Common punctuation that follows pasted links in chat.
+  var match = url.match(/[)\]\}\.,!\?;:'"]+$/);
+  if (!match) return { "url": url, "suffix": "" };
+  return { "url": url.slice(0, -match[0].length), "suffix": match[0] };
+}
+
+function imgurIdFromUri(uri) {
+  var host = (uri.host || "").toLowerCase();
+  if (!host || !host.match(/(^|\.)imgur\.com$/i)) return null;
+  if (!uri.file) return null;
+
+  var fileLower = uri.file.toLowerCase();
+  if (PicRegex.test(fileLower) || VideoRegex.test(fileLower)) return null;
+
+  if (!uri.file.match(/^[A-Za-z0-9]+$/)) return null;
+  return uri.file;
+}
+
+function imgurCandidateUrls(id) {
+  var base = "https://i.imgur.com/" + id;
+  return [base + ".jpg", base + ".png", base + ".gif", base + ".jpeg"];
+}
+
+function imgurHotlinkFallback(img) {
+  try {
+    var candidates = (img.getAttribute("data-imgur-candidates") || "").split("|");
+    if (!candidates.length || !candidates[0]) return;
+
+    var idx = parseInt(img.getAttribute("data-imgur-idx") || "0", 10);
+    var next = idx + 1;
+    if (next >= candidates.length) {
+      var link = img.parentNode;
+      if (link && link.tagName == "A") {
+        var href = link.getAttribute("href") || "";
+        while (link.firstChild) link.removeChild(link.firstChild);
+        link.appendChild(document.createTextNode(href));
+      }
+      return;
+    }
+
+    img.setAttribute("data-imgur-idx", "" + next);
+    img.src = candidates[next];
+  } catch (e) {}
+}
+
 
 function getImagesAsArray(text) {
   var imgs = []
   var urls = text.match(URLRegex)
   if (urls === null) return imgs
   for (var i = 0; i<urls.length; i++){
-    var url = urls[i]
-    var normalized = normalizeUrl(url);
-    var urlWithoutParams = normalized.replace(/[?#].*$/i, "");
-    if (PicRegex.test(urlWithoutParams))
-      imgs.push(normalized)
+    var split = splitTrailingPunctuation(urls[i]);
+    var normalized = normalizeUrl(split.url);
+    var uri = parseUri(normalized);
+
+    // Try to turn common "page" links into direct image URLs (best-effort).
+    var imgurId = imgurIdFromUri(uri);
+    var candidate = imgurId ? imgurCandidateUrls(imgurId)[0] : normalized;
+
+    var urlWithoutParams = candidate.replace(/[?#].*$/i, "");
+    if (PicRegex.test(urlWithoutParams)) imgs.push(candidate)
   }
   return imgs
 }
@@ -2204,25 +2257,43 @@ function imgClickHandler() {
 // durty hack to use a global to check this... but otherwise i'd have to rewrite the String.replace function? :/
 var LastMsgContainsImage = false
 function linkReplace(url) {
-    linkUrl = normalizeUrl(url);
+    var split = splitTrailingPunctuation(url);
+    var hrefUrl = normalizeUrl(split.url);
+    var uri = parseUri(hrefUrl);
+
+    // Best-effort support for Imgur page links (e.g. https://imgur.com/<id>).
+    var imgurId = imgurIdFromUri(uri);
+    if (imgurId) {
+      LastMsgContainsImage = true;
+      var candidates = imgurCandidateUrls(imgurId);
+      var first = candidates[0];
+      return "<a target=\"_blank\" href=\"" + hrefUrl + "\" class=\"img-wrapper\" onclick=\"return imgClickHandler()\">"
+             + "<img src=\"" + first + "\" class=\"unbound imgur-hotlink\" data-imgur-idx=\"0\" data-imgur-candidates=\"" + candidates.join("|") + "\" onerror=\"imgurHotlinkFallback(this)\">"
+             + "</a>" + split.suffix;
+    }
+
+    linkUrl = hrefUrl;
 
-    var uri = parseUri(url)
     var type = getUriType(uri)
     
     if (type == 'image') {
       LastMsgContainsImage = true;
-      return "<a target='_blank' href='" + linkUrl + "' class='img-wrapper' onclick='return imgClickHandler()'><img src='" + linkUrl + "' class='unbound'></a>";
+      return "<a target=\"_blank\" href=\"" + linkUrl + "\" class=\"img-wrapper\" onclick=\"return imgClickHandler()\"><img src=\"" + linkUrl + "\" class=\"unbound\"></a>" + split.suffix;
+    } else if (type == 'video') {
+      LastMsgContainsImage = true;
+      var videoUrl = linkUrl.replace(/\.gifv([?#].*)?$/i, ".mp4$1");
+      return "<a target=\"_blank\" href=\"" + linkUrl + "\" class=\"video-wrapper\" onclick=\"return imgClickHandler()\"><video src=\"" + videoUrl + "\" autoplay loop muted controls playsinline></video></a>" + split.suffix;
     } else if (type == 'youtube') {
       Youtube.startAnimation();
-      return "<a target='_blank' class='youtube' href='" + linkUrl + "'>" +
-             "<img class='youtube-thumb' width='130' height='97' src='"+Youtube.nextThumbUrl(uri.queryKey.v)+"'>" + 
-             "<img class='youtube-controls' src='/static/img/youtube.controls.png'></a>"
+      return "<a target=\"_blank\" class=\"youtube\" href=\"" + linkUrl + "\">" +
+             "<img class=\"youtube-thumb\" width=\"130\" height=\"97\" src=\"" + Youtube.nextThumbUrl(uri.queryKey.v) + "\">" +
+             "<img class=\"youtube-controls\" src=\"/static/img/youtube.controls.png\"></a>" + split.suffix;
     } else if (type == 'midi') {
-      return '<embed src="'+linkUrl+'" autostart="false" loop="false" volume="80" width="150" height="20" style="vertical-align:bottom"> <a href="'+linkUrl+'">'+uri.file+'</a>'
+      return '<embed src="' + linkUrl + '" autostart="false" loop="false" volume="80" width="150" height="20" style="vertical-align:bottom"> <a href="' + linkUrl + '">' + uri.file + '</a>' + split.suffix;
     } else if (type == 'wav') {
-      return '<audio src="'+linkUrl+'" controls volume="80" width="150" height="20" style="vertical-align:bottom"></audio> <a href="'+linkUrl+'">'+uri.file+'</a>'
+      return '<audio src="' + linkUrl + '" controls volume="80" width="150" height="20" style="vertical-align:bottom"></audio> <a href="' + linkUrl + '">' + uri.file + '</a>' + split.suffix;
     } else
-        return "<a target='_blank' href='" + linkUrl + "'>" + url + "</a>";
+        return "<a target=\"_blank\" href=\"" + linkUrl + "\">" + split.url + "</a>" + split.suffix;
     
 }
 
@@ -2230,6 +2301,9 @@ function linkReplace(url) {
 function getUriType(uri){
   if (PicRegex.test(uri.file.toLowerCase()))
     return "image";
+
+  if (VideoRegex.test(uri.file.toLowerCase()))
+    return "video";
   
   var domain = parseDomain(uri.host)
   
@@ -2443,7 +2517,7 @@ Youtube = {
     var img = $(this);
     // yt thumb url example: https://i.ytimg.com/vi/0123456789A/1.jpg
     var src = img.attr("src") || ""
-    var match = src.match(/\\/vi\\/([^/]{11})\\/(\\d)\\.jpg/i)
+    var match = src.match(/\/vi\/([^/]{11})\/(\d)\.jpg/i)
     if (!match) return
     var v = match[1]
     var num = match[2]
diff --git a/static/js/src/text.js b/static/js/src/text.js
index 6fe5c3c..d99efbb 100755
--- a/static/js/src/text.js
+++ b/static/js/src/text.js
@@ -14,21 +14,74 @@ function escapeHtml(txt) {
 
 
 URLRegex = /((\b(http\:\/\/|https\:\/\/|ftp\:\/\/)|(www\.))+(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?)/gi;
-PicRegex = /\.(jpg|jpeg|png|gif|bmp|svg|fid)$/i;
+PicRegex = /\.(jpg|jpeg|png|gif|bmp|svg|webp|fid)$/i;
+VideoRegex = /\.(mp4|webm|mov|m4v|gifv)$/i;
 RecipRegex = /(^|\s)@\w+/g;
 TopicRegex = /(^|\s)#\w+/g;
 
+function splitTrailingPunctuation(url) {
+  if (!url) return { "url": url, "suffix": "" };
+  // Common punctuation that follows pasted links in chat.
+  var match = url.match(/[)\]\}\.,!\?;:'"]+$/);
+  if (!match) return { "url": url, "suffix": "" };
+  return { "url": url.slice(0, -match[0].length), "suffix": match[0] };
+}
+
+function imgurIdFromUri(uri) {
+  var host = (uri.host || "").toLowerCase();
+  if (!host || !host.match(/(^|\.)imgur\.com$/i)) return null;
+  if (!uri.file) return null;
+
+  var fileLower = uri.file.toLowerCase();
+  if (PicRegex.test(fileLower) || VideoRegex.test(fileLower)) return null;
+
+  if (!uri.file.match(/^[A-Za-z0-9]+$/)) return null;
+  return uri.file;
+}
+
+function imgurCandidateUrls(id) {
+  var base = "https://i.imgur.com/" + id;
+  return [base + ".jpg", base + ".png", base + ".gif", base + ".jpeg"];
+}
+
+function imgurHotlinkFallback(img) {
+  try {
+    var candidates = (img.getAttribute("data-imgur-candidates") || "").split("|");
+    if (!candidates.length || !candidates[0]) return;
+
+    var idx = parseInt(img.getAttribute("data-imgur-idx") || "0", 10);
+    var next = idx + 1;
+    if (next >= candidates.length) {
+      var link = img.parentNode;
+      if (link && link.tagName == "A") {
+        var href = link.getAttribute("href") || "";
+        while (link.firstChild) link.removeChild(link.firstChild);
+        link.appendChild(document.createTextNode(href));
+      }
+      return;
+    }
+
+    img.setAttribute("data-imgur-idx", "" + next);
+    img.src = candidates[next];
+  } catch (e) {}
+}
+
 
 function getImagesAsArray(text) {
   var imgs = []
   var urls = text.match(URLRegex)
   if (urls === null) return imgs
   for (var i = 0; i<urls.length; i++){
-    var url = urls[i]
-    var normalized = normalizeUrl(url);
-    var urlWithoutParams = normalized.replace(/[?#].*$/i, "");
-    if (PicRegex.test(urlWithoutParams))
-      imgs.push(normalized)
+    var split = splitTrailingPunctuation(urls[i]);
+    var normalized = normalizeUrl(split.url);
+    var uri = parseUri(normalized);
+
+    // Try to turn common "page" links into direct image URLs (best-effort).
+    var imgurId = imgurIdFromUri(uri);
+    var candidate = imgurId ? imgurCandidateUrls(imgurId)[0] : normalized;
+
+    var urlWithoutParams = candidate.replace(/[?#].*$/i, "");
+    if (PicRegex.test(urlWithoutParams)) imgs.push(candidate)
   }
   return imgs
 }
@@ -104,25 +157,43 @@ function imgClickHandler() {
 // durty hack to use a global to check this... but otherwise i'd have to rewrite the String.replace function? :/
 var LastMsgContainsImage = false
 function linkReplace(url) {
-    linkUrl = normalizeUrl(url);
+    var split = splitTrailingPunctuation(url);
+    var hrefUrl = normalizeUrl(split.url);
+    var uri = parseUri(hrefUrl);
+
+    // Best-effort support for Imgur page links (e.g. https://imgur.com/<id>).
+    var imgurId = imgurIdFromUri(uri);
+    if (imgurId) {
+      LastMsgContainsImage = true;
+      var candidates = imgurCandidateUrls(imgurId);
+      var first = candidates[0];
+      return "<a target=\"_blank\" href=\"" + hrefUrl + "\" class=\"img-wrapper\" onclick=\"return imgClickHandler()\">"
+             + "<img src=\"" + first + "\" class=\"unbound imgur-hotlink\" data-imgur-idx=\"0\" data-imgur-candidates=\"" + candidates.join("|") + "\" onerror=\"imgurHotlinkFallback(this)\">"
+             + "</a>" + split.suffix;
+    }
+
+    linkUrl = hrefUrl;
 
-    var uri = parseUri(url)
     var type = getUriType(uri)
     
     if (type == 'image') {
       LastMsgContainsImage = true;
-      return "<a target='_blank' href='" + linkUrl + "' class='img-wrapper' onclick='return imgClickHandler()'><img src='" + linkUrl + "' class='unbound'></a>";
+      return "<a target=\"_blank\" href=\"" + linkUrl + "\" class=\"img-wrapper\" onclick=\"return imgClickHandler()\"><img src=\"" + linkUrl + "\" class=\"unbound\"></a>" + split.suffix;
+    } else if (type == 'video') {
+      LastMsgContainsImage = true;
+      var videoUrl = linkUrl.replace(/\.gifv([?#].*)?$/i, ".mp4$1");
+      return "<a target=\"_blank\" href=\"" + linkUrl + "\" class=\"video-wrapper\" onclick=\"return imgClickHandler()\"><video src=\"" + videoUrl + "\" autoplay loop muted controls playsinline></video></a>" + split.suffix;
     } else if (type == 'youtube') {
       Youtube.startAnimation();
-      return "<a target='_blank' class='youtube' href='" + linkUrl + "'>" +
-             "<img class='youtube-thumb' width='130' height='97' src='"+Youtube.nextThumbUrl(uri.queryKey.v)+"'>" + 
-             "<img class='youtube-controls' src='/static/img/youtube.controls.png'></a>"
+      return "<a target=\"_blank\" class=\"youtube\" href=\"" + linkUrl + "\">" +
+             "<img class=\"youtube-thumb\" width=\"130\" height=\"97\" src=\"" + Youtube.nextThumbUrl(uri.queryKey.v) + "\">" +
+             "<img class=\"youtube-controls\" src=\"/static/img/youtube.controls.png\"></a>" + split.suffix;
     } else if (type == 'midi') {
-      return '<embed src="'+linkUrl+'" autostart="false" loop="false" volume="80" width="150" height="20" style="vertical-align:bottom"> <a href="'+linkUrl+'">'+uri.file+'</a>'
+      return '<embed src="' + linkUrl + '" autostart="false" loop="false" volume="80" width="150" height="20" style="vertical-align:bottom"> <a href="' + linkUrl + '">' + uri.file + '</a>' + split.suffix;
     } else if (type == 'wav') {
-      return '<audio src="'+linkUrl+'" controls volume="80" width="150" height="20" style="vertical-align:bottom"></audio> <a href="'+linkUrl+'">'+uri.file+'</a>'
+      return '<audio src="' + linkUrl + '" controls volume="80" width="150" height="20" style="vertical-align:bottom"></audio> <a href="' + linkUrl + '">' + uri.file + '</a>' + split.suffix;
     } else
-        return "<a target='_blank' href='" + linkUrl + "'>" + url + "</a>";
+        return "<a target=\"_blank\" href=\"" + linkUrl + "\">" + split.url + "</a>" + split.suffix;
     
 }
 
@@ -130,6 +201,9 @@ function linkReplace(url) {
 function getUriType(uri){
   if (PicRegex.test(uri.file.toLowerCase()))
     return "image";
+
+  if (VideoRegex.test(uri.file.toLowerCase()))
+    return "video";
   
   var domain = parseDomain(uri.host)
   
diff --git a/static/js/src/youtube.js b/static/js/src/youtube.js
index 2b6a977..ccb2cd4 100755
--- a/static/js/src/youtube.js
+++ b/static/js/src/youtube.js
@@ -19,7 +19,7 @@ Youtube = {
     var img = $(this);
     // yt thumb url example: https://i.ytimg.com/vi/0123456789A/1.jpg
     var src = img.attr("src") || ""
-    var match = src.match(/\\/vi\\/([^/]{11})\\/(\\d)\\.jpg/i)
+    var match = src.match(/\/vi\/([^/]{11})\/(\d)\.jpg/i)
     if (!match) return
     var v = match[1]
     var num = match[2]
diff --git a/template/frontpage copy.st b/template/frontpage copy.st
index 304446c..582f3e2 100755
--- a/template/frontpage copy.st	
+++ b/template/frontpage copy.st	
@@ -16,7 +16,7 @@ setTimeout("refreshing()",300000);
     <script type="text/javascript" src="/static/js/jquery-1.4.2.min.js"></script>
     <link rel="shortcut icon" href="/static/favicon.ico">
     <link rel="image_src" href="/static/img/thumbs/heartover.gif" > 
-    <script type="text/javascript" src="/static/js/pichat.js"></script>
+    <script type="text/javascript" src="/static/js/pichat.js?v=20260130"></script>
     <script src="/static/js/jquery.masonry.min.js"type="text/javascript"></script> 
     <script src="/static/js/jquery.isotope.min.js"></script>
     <script>
diff --git a/template/frontpage.st b/template/frontpage.st
index d673fa8..552ef35 100755
--- a/template/frontpage.st
+++ b/template/frontpage.st
@@ -16,7 +16,7 @@ setTimeout("refreshing()",300000);
     <script type="text/javascript" src="/static/js/jquery-1.4.2.min.js"></script>
     <link rel="shortcut icon" href="/static/favicon.ico">
     <link rel="image_src" href="/static/img/thumbs/heartover.gif" > 
-    <script type="text/javascript" src="/static/js/pichat.js"></script>
+    <script type="text/javascript" src="/static/js/pichat.js?v=20260130"></script>
     <script src="/static/js/jquery.masonry.min.js"type="text/javascript"></script> 
     <script src="/static/js/jquery.isotope.min.js"></script>
     <script>
diff --git a/template/frontpagePROFILE.st b/template/frontpagePROFILE.st
index d0fc855..004a790 100755
--- a/template/frontpagePROFILE.st
+++ b/template/frontpagePROFILE.st
@@ -13,7 +13,7 @@
 <script type="text/javascript" src="/static/js/jquery-1.4.2.min.js"></script>
 <link rel="shortcut icon" href="/static/favicon.ico">
 <link rel="image_src" href="/static/img/thumbs/heartover.gif" > 
-<script type="text/javascript" src="/static/js/pichat.js"></script>
+<script type="text/javascript" src="/static/js/pichat.js?v=20260130"></script>
 <link href="/static/css/front.css?v=20260128" media="screen, projection" rel="stylesheet" type="text/css">
 <link href="/static/css/frontpage_profile.css?v=20260129" media="screen, projection" rel="stylesheet" type="text/css">
       <script src="/static/js/jquery.masonry.min.js"type="text/javascript"></script> 
diff --git a/template/frontpage_halloffame.st b/template/frontpage_halloffame.st
index a13a396..5de88b1 100755
--- a/template/frontpage_halloffame.st
+++ b/template/frontpage_halloffame.st
@@ -16,7 +16,7 @@ setTimeout("refreshing()",300000);
     <script type="text/javascript" src="/static/js/jquery-1.4.2.min.js"></script>
     <link rel="shortcut icon" href="/static/favicon.ico">
     <link rel="image_src" href="/static/img/thumbs/heartover.gif" > 
-    <script type="text/javascript" src="/static/js/pichat.js"></script>
+    <script type="text/javascript" src="/static/js/pichat.js?v=20260130"></script>
     <script src="/static/js/jquery.masonry.min.js"type="text/javascript"></script> 
     <script src="/static/js/jquery.isotope.min.js"></script>
     <script>
diff --git a/template/fullscreen.st b/template/fullscreen.st
index 031704c..030ea17 100755
--- a/template/fullscreen.st
+++ b/template/fullscreen.st
@@ -2,7 +2,7 @@
   <head>
 	    <title>dump.fm - fullscreen</title>
 		    <script src="/static/js/jquery-1.4.2.min.js?v=20260126"></script>
-	    <script src="/static/js/pichat.js"></script>
+	    <script src="/static/js/pichat.js?v=20260130"></script>
 	    <script src="/static/js/fullscreen.js?v=20260126"></script>
 	    $if(user_nick)$
 	    $else$
diff --git a/template/fullscreen4.st b/template/fullscreen4.st
index 4b34243..1d1a4e6 100755
--- a/template/fullscreen4.st
+++ b/template/fullscreen4.st
@@ -2,7 +2,7 @@
   <head>
 	    <title>dump.fm - fullscreen</title>
 	    <script src="/static/js/jquery-1.4.2.min.js?v=20260126"></script>
-	    <script src="/static/js/pichat.js"></script>
+	    <script src="/static/js/pichat.js?v=20260130"></script>
 	    <script src="/static/js/fullscreen.js?v=20260126"></script>
     <script>
       var LoggedIn = $if(user_nick)$true$else$false$endif$;
diff --git a/template/fullscreen5.st b/template/fullscreen5.st
index 863655c..d0162d9 100755
--- a/template/fullscreen5.st
+++ b/template/fullscreen5.st
@@ -2,7 +2,7 @@
   <head>
 	    <title>dump.fm - fullscreen</title>
 	    <script src="/static/js/jquery-1.4.2.min.js?v=20260126"></script>
-	    <script src="/static/js/pichat.js"></script>
+	    <script src="/static/js/pichat.js?v=20260130"></script>
 	    <script src="/static/js/fullscreen.js?v=20260126"></script>
     <script>
       var LoggedIn = $if(user_nick)$true$else$false$endif$;
diff --git a/template/fullscreen_front.st b/template/fullscreen_front.st
index e0d48a5..82b1403 100755
--- a/template/fullscreen_front.st
+++ b/template/fullscreen_front.st
@@ -2,7 +2,7 @@
   <head>
     <title>dump.fm - fullscreen</title>
     <script src="/static/js/jquery-1.4.2.min.js?v=20260126"></script>
-    <script src="/static/js/pichat.js"></script>
+    <script src="/static/js/pichat.js?v=20260130"></script>
     <script src="/static/js/fullscreen.js"></script>
     <script>
       var LoggedIn = $if(user_nick)$true$else$false$endif$;
diff --git a/template/fullscreenphotobooth.st b/template/fullscreenphotobooth.st
index 77a6405..6de7ca1 100755
--- a/template/fullscreenphotobooth.st
+++ b/template/fullscreenphotobooth.st
@@ -2,7 +2,7 @@
   <head>
 	    <title>dump.fm - fullscreen</title>
 	    <script src="/static/js/jquery-1.4.2.min.js?v=20260126"></script>
-	    <script src="/static/js/pichat.js"></script>
+	    <script src="/static/js/pichat.js?v=20260130"></script>
 	    <script src="/static/js/fullscreenphotobooth.js?v=20260126"></script>
 	    <script>
 	      var LoggedIn = $if(user_nick)$true$else$false$endif$;
diff --git a/template/head.st b/template/head.st
index dfedf3e..d0fad8c 100755
--- a/template/head.st
+++ b/template/head.st
@@ -5,7 +5,7 @@
 <link rel="shortcut icon" href="/static/favicon.ico">
 <link rel="image_src" href="/static/img/thumbs/heartover.gif" > 
 <!-- <script type="text/javascript" src="/static/js/jquery-ui-1.8.effects.min.js"></script> -->
-<script type="text/javascript" src="/static/js/pichat.js"></script>
+<script type="text/javascript" src="/static/js/pichat.js?v=20260130"></script>
 <link rel="stylesheet" type="text/css" href="/static/css/dump.css">
 <script>
   Domain = "/";
diff --git a/template/head_edge.st b/template/head_edge.st
index dfedf3e..d0fad8c 100755
--- a/template/head_edge.st
+++ b/template/head_edge.st
@@ -5,7 +5,7 @@
 <link rel="shortcut icon" href="/static/favicon.ico">
 <link rel="image_src" href="/static/img/thumbs/heartover.gif" > 
 <!-- <script type="text/javascript" src="/static/js/jquery-ui-1.8.effects.min.js"></script> -->
-<script type="text/javascript" src="/static/js/pichat.js"></script>
+<script type="text/javascript" src="/static/js/pichat.js?v=20260130"></script>
 <link rel="stylesheet" type="text/css" href="/static/css/dump.css">
 <script>
   Domain = "/";
diff --git a/template/ie_fullscreen.st b/template/ie_fullscreen.st
index e165d52..480037b 100755
--- a/template/ie_fullscreen.st
+++ b/template/ie_fullscreen.st
@@ -2,7 +2,7 @@
   <head>
     <title>dump.fm - fullscreen</title>
     <script src="/static/js/jquery-1.4.2.min.js?v=20260126"></script>
-    <script src="/static/js/pichat.js"></script>
+    <script src="/static/js/pichat.js?v=20260130"></script>
     <script src="/static/js/fullscreen.js"></script>
     <script>
       var DoPrint = true;
diff --git a/template/mgmtfull.st b/template/mgmtfull.st
index ed42558..5ec3faa 100755
--- a/template/mgmtfull.st
+++ b/template/mgmtfull.st
@@ -2,7 +2,7 @@
   <head>
 	    <title>dump.fm</title>
 	    <script src="/static/js/jquery-1.4.2.min.js?v=20260126"></script>
-	    <script src="/static/js/pichat.js"></script>
+	    <script src="/static/js/pichat.js?v=20260130"></script>
 	    <script src="/static/js/fullscreenmgmt.js?v=20260126"></script>
 	    <script>
 	      var LoggedIn = $if(user_nick)$true$else$false$endif$;
diff --git a/template/newlog.st b/template/newlog.st
index 13c63d2..52a8c8c 100755
--- a/template/newlog.st
+++ b/template/newlog.st
@@ -13,7 +13,7 @@
 <script type="text/javascript" src="/static/js/jquery-1.4.2.min.js"></script>
 <link rel="shortcut icon" href="/static/favicon.ico">
 <link rel="image_src" href="/static/img/thumbs/heartover.gif" > 
-<script type="text/javascript" src="/static/js/pichat.js"></script>
+<script type="text/javascript" src="/static/js/pichat.js?v=20260130"></script>
 <link href="/static/css/front.css?v=20260128" media="screen, projection" rel="stylesheet" type="text/css">
 <link href="/static/css/newlog.css?v=20260129" media="screen, projection" rel="stylesheet" type="text/css">
 
diff --git a/template/rooms/fullscreen.st b/template/rooms/fullscreen.st
index 3a75db0..004684f 100755
--- a/template/rooms/fullscreen.st
+++ b/template/rooms/fullscreen.st
@@ -2,7 +2,7 @@
   <head>
     <title>dump.fm - fullscreen</title>
     <script src="/static/js/jquery-1.4.2.min.js?v=20260126"></script>
-    <script src="/static/js/pichat.js"></script>
+    <script src="/static/js/pichat.js?v=20260130"></script>
     <script src="/static/js/fullscreen.js?v=20260126"></script>
     <script>
       var LoggedIn = $if(user_nick)$true$else$false$endif$;
diff --git a/template/rooms/fullscreen2.st b/template/rooms/fullscreen2.st
index 3a75db0..004684f 100755
--- a/template/rooms/fullscreen2.st
+++ b/template/rooms/fullscreen2.st
@@ -2,7 +2,7 @@
   <head>
     <title>dump.fm - fullscreen</title>
     <script src="/static/js/jquery-1.4.2.min.js?v=20260126"></script>
-    <script src="/static/js/pichat.js"></script>
+    <script src="/static/js/pichat.js?v=20260130"></script>
     <script src="/static/js/fullscreen.js?v=20260126"></script>
     <script>
       var LoggedIn = $if(user_nick)$true$else$false$endif$;
diff --git a/template/rooms/mgmt.st b/template/rooms/mgmt.st
index 5a1797b..c020d89 100755
--- a/template/rooms/mgmt.st
+++ b/template/rooms/mgmt.st
@@ -21,7 +21,7 @@
 <meta name="description" content="dump.fm - Talk with pictures!" />
 <script type="text/javascript" src="/static/js/jquery-1.4.2.min.js?v=20260126"></script>
 <script type="text/javascript" src="/static/js/jquery-ui-1.8.effects.min.js"></script>
-<script type="text/javascript" src="/static/js/pichat.js"></script>
+<script type="text/javascript" src="/static/js/pichat.js?v=20260130"></script>
 <link rel="stylesheet" type="text/css" href="/static/css/mgmt.css">
 <link rel="stylesheet" type="text/css" href="/static/css/chat_wrapper.css?v=20260129">
 <script>Domain = "/"</script>
diff --git a/template/rooms/nocss.st b/template/rooms/nocss.st
index 0124d72..527a306 100755
--- a/template/rooms/nocss.st
+++ b/template/rooms/nocss.st
@@ -23,7 +23,7 @@
 <link rel="shortcut icon" href="/static/favicon.ico">
 <link rel="image_src" href="/static/img/thumbs/heartover.gif" > 
 <!-- <script type="text/javascript" src="/static/js/jquery-ui-1.8.effects.min.js"></script> -->
-<script type="text/javascript" src="/static/js/pichat.js"></script>
+<script type="text/javascript" src="/static/js/pichat.js?v=20260130"></script>
 <link rel="stylesheet" type="text/css" href="/static/css/chat_wrapper.css?v=20260129">
 
 <script>Domain = "/"</script>
diff --git a/template/simplerlog.st b/template/simplerlog.st
index 9c3e6c4..df9f03b 100755
--- a/template/simplerlog.st
+++ b/template/simplerlog.st
@@ -13,7 +13,7 @@
 <script type="text/javascript" src="/static/js/jquery-1.4.2.min.js"></script>
 <link rel="shortcut icon" href="/static/favicon.ico">
 <link rel="image_src" href="/static/img/thumbs/heartover.gif" > 
-<script type="text/javascript" src="/static/js/pichat.js"></script>
+<script type="text/javascript" src="/static/js/pichat.js?v=20260130"></script>
 <link href="/static/css/front.css?v=20260128" media="screen, projection" rel="stylesheet" type="text/css">
 <link href="/static/css/simplerlog.css?v=20260129" media="screen, projection" rel="stylesheet" type="text/css">
       <script src="/static/js/jquery.masonry.min.js"type="text/javascript"></script> 
-- 
cgit v1.2.3-70-g09d2