Parcourir la source

[bugfix][Refs #1] not separated emojis failure to format

B Thibault il y a 8 ans
Parent
commit
9d0a56de71
2 fichiers modifiés avec 2 ajouts et 2 suppressions
  1. 1 1
      cli/ui.js
  2. 1 1
      srv/public/slack.min.js

+ 1 - 1
cli/ui.js

@@ -331,7 +331,7 @@ function makeEmojiDom(emojiCode) {
  * @return {string}
 **/
 function formatEmojis(inputString) {
-    return inputString.replace(/:([^ \t]+):/g, function(returnFailed, emoji) {
+    return inputString.replace(/:([^ \t:]+):/g, function(returnFailed, emoji) {
         var emojiDom = makeEmojiDom(emoji);
         if (emojiDom) {
             var domParent = document.createElement("span");

+ 1 - 1
srv/public/slack.min.js

@@ -17,7 +17,7 @@ var E="#e3e4e6";a.color&&("#"===a.color[0]?E=a.color[0]:"good"===a.color?E="#2fa
 "slackmsg-attachment-footer-text";u.className="slackmsg-attachment-footer-icon";a.footer?(r.innerHTML=V(a.footer),a.footer_icon?u.src=a.footer_icon:u.classList.add("hidden")):(u.classList.add("hidden"),r.classList.add("hidden"));K.className="slackmsg-ts";a.ts?K.innerHTML=U(a.ts):K.classList.add("hidden");f.appendChild(g);f.appendChild(y);l.appendChild(t);l.appendChild(k);n.appendChild(u);n.appendChild(r);n.appendChild(K);c.appendChild(e);c.appendChild(f);c.appendChild(l);c.appendChild(m);c.appendChild(n);
 b.appendChild(d);b.appendChild(c);b&&p.appendChild(b)})}c.appendChild(m);return c}function U(a){"string"!==typeof a&&(a=parseFloat(a));return(new Date(1E3*a)).toLocaleTimeString()}
 function R(a){a:{for(var b=a,d={};!d[b];){if(a=H.a.c[b])if("alias:"==a.substr(0,6))d[b]=!0,b=a.substr(6);else{b=document.createElement("span");b.className="emoji-custom emoji";b.style.backgroundImage="url('"+a+"')";a=b;break a}break}a=b}"string"===typeof a&&"makeEmoji"in window&&(a=window.makeEmoji(a));return"string"===typeof a?null:a}
-function ma(a){return a.replace(/:([^ \t]+):/g,function(b,d){var c=R(d);if(c){var f=document.createElement("span");f.className=b===a?"emoji-medium":"emoji-small";f.appendChild(c);return f.outerHTML}return b})}
+function ma(a){return a.replace(/:([^ \t:]+):/g,function(b,d){var c=R(d);if(c){var f=document.createElement("span");f.className=b===a?"emoji-medium":"emoji-small";f.appendChild(c);return f.outerHTML}return b})}
 function V(a){a=a.split(/\r?\n/g);for(var b=0,d=a.length;b<d;b++){for(var c=a[b],f="",e={},l=!1,g=0,c=c.replace(RegExp("<([@#]?)([^>]*)>","g"),function(a,b,c){c=c.split("|");if("@"===b)c[1]?"@"!==c[1][0]&&(c[1]="@"+c[1]):(a=h(H.a,c[0]),c[1]=a?"@"+a.name:C.C),c[0]="#"+c[0],c[2]="slackmsg-link slackmsg-link-user";else if("#"===b)c[1]?"#"!==c[1][0]&&(c[1]="#"+c[1]):(a=v(H.a,c[0]),c[1]=a?"#"+a.name:C.B),c[0]="#"+c[0],c[2]="slackmsg-link slackmsg-link-chan";else if(-1!==c[0].indexOf("://"))c[1]||(c[1]=
 c[0]),c[2]="slackmsg-link";else return a;return'<a href="'+c[0]+'" class="'+c[2]+'"'+(b?"":' target="_blank"')+">"+c[1]+"</a>"}),c=ma(c),k=c.length,m=function(a,b,c){for(;a[b];){if(" "!=a[b]&&a[b]!=c&&a[b+1]==c)return!0;b++}return!1},n=function(a){return Object.keys(e).length?'<span class="'+Object.keys(a).join(" ")+'">':""};g<k&&(" "===c[g]||"\t"===c[g]);)g++;"&gt;"===c.substr(g,4)&&(l=!0,g+=4);for(;g<k;g++){var p=c[g];if("<"===p){do f+=c[g++];while(">"!==c[g-1]);g--}else if(!e["slackmsg-style-bold"]&&
 "*"===p&&c[g+1]&&m(c,g,p))Object.keys(e).length&&(f+="</span>"),e["slackmsg-style-bold"]=!0,f+=n(e);else if(!e["slackmsg-style-strike"]&&"~"===p&&c[g+1]&&m(c,g,p))Object.keys(e).length&&(f+="</span>"),e["slackmsg-style-strike"]=!0,f+=n(e);else if(!e["slackmsg-style-code"]&&"`"===p&&c[g+1]&&m(c,g,p))Object.keys(e).length&&(f+="</span>"),e["slackmsg-style-code"]=!0,f+=n(e);else if(!e["slackmsg-style-italic"]&&"_"===p&&c[g+1]&&m(c,g,p))Object.keys(e).length&&(f+="</span>"),e["slackmsg-style-italic"]=