Преглед на файлове

[add][Closes #6] Attachment display
[add][Refs #9] some prettify

B Thibault преди 8 години
родител
ревизия
3a6de8b8c1
променени са 8 файла, в които са добавени 74 реда и са изтрити 29 реда
  1. 14 0
      cli/resources.js
  2. 34 15
      cli/ui.js
  3. 10 9
      srv/public/slack.min.js
  4. 4 0
      srv/public/style.css
  5. 6 2
      srv/src/httpServ.js
  6. 1 1
      srv/src/session.js
  7. 2 1
      srv/src/slack.js
  8. 3 1
      srv/src/url.js

+ 14 - 0
cli/resources.js

@@ -57,6 +57,20 @@ var R = {
             ,linkuser: "slackmsg-link-user"
             ,linkchan: "slackmsg-link-chan"
 
+            ,attachment: {
+                container: "slackmsg-attachment"
+                ,list: "slackmsg-attachments"
+
+                ,pretext: "slackmsg-attachment-pretext"
+                ,title: "slackmsg-attachment-title"
+                ,text: "slackmsg-attachment-text"
+                ,thumbImg: "slackmsg-attachment-thumb"
+                ,img: "slackmsg-attachment-img"
+                ,footer: "slackmsg-attachment-footer"
+                ,footerText: "slackmsg-attachment-footer-text"
+                ,footerIcon: "slackmsg-attachment-footer-icon"
+            }
+
             ,style: {
                 bold: "slackmsg-style-bold"
                 ,code: "slackmsg-style-code"

+ 34 - 15
cli/ui.js

@@ -152,6 +152,7 @@ function doCreateMessageDom(channelId, msg, skipAttachment) {
     dom.appendChild(text);
     dom.appendChild(ts);
     dom.appendChild(attachments);
+    attachments.className = R.klass.msg.attachment.list;
     if (skipAttachment !== true && msg.raw["attachments"]) {
         msg.raw["attachments"].forEach(function(attachment) {
             var domAttachment = createAttachmentDom(channelId, msg, attachment);
@@ -320,6 +321,7 @@ function createAttachmentDom(channelId, msg, attachment) {
         ,footerTs = document.createElement("span")
     ;
 
+    rootDom.className = R.klass.msg.attachment.container;
     //Color
     var color = "#e3e4e6";
     if (attachment["color"]) {
@@ -332,71 +334,88 @@ function createAttachmentDom(channelId, msg, attachment) {
         else if (attachment["color"] === "danger")
             color = "#d50200";
     }
+    attachmentBlock.style.borderColor = color;
 
     //Pretext
+    pretext.className = R.klass.msg.attachment.pretext;
     if (attachment["pretext"]) {
         pretext.innerHTML = formatSlackText(attachment["pretext"]);
+    } else {
+        pretext.classList.add(R.klass.hidden);
     }
 
     //Title
+    titleBlock.target = "_blank";
     if (attachment["title"]) {
         titleBlock.innerHTML = formatSlackText(attachment["title"]);
         if (attachment["title_link"]) {
             titleBlock.href = attachment["title_link"];
         }
+        titleBlock.className = R.klass.msg.attachment.title;
+
     } else {
-        titleBlock.className = R.klass.hidden;
+        titleBlock.className = R.klass.hidden + " " +R.klass.msg.attachment.title;
     }
 
     //Author
     authorName.target = "_blank";
+    authorBlock.className = R.klass.msg.author;
     if (attachment["author_name"]) {
         authorName.innerHTML = formatSlackText(attachment["author_name"]);
-        authorName.href = attachment["author_link"];
+        authorName.href = attachment["author_link"] || "";
+        authorName.className = R.klass.msg.authorname;
+        authorImg.className = R.klass.msg.authorAvatar;
         if (attachment["author_icon"])
             authorImg.src = attachment["author_icon"];
         else
-            authorImg.className = R.klass.hidden;
+            authorImg.classList.add(R.klass.hidden);
     } else {
-        authorBlock.className = R.klass.hidden;
+        authorBlock.classList.add(R.klass.hidden);
     }
 
     //Text
     textDom.innerHTML = formatSlackText(attachment["text"] || "");
+    textDom.klassName = R.klass.msg.attachment.text;
 
+    // Img (small one)
+    thumbImgDom.className = R.klass.msg.attachment.thumbImg;
     if (attachment["thumb_url"])
         thumbImgDom.src = attachment["thumb_url"];
     else
-        thumbImgDom.className = R.klass.hidden;
+        thumbImgDom.classList.add(R.klass.hidden);
 
     //Img (the big one)
-    if (attachment["image_url"]) {
+    imgDom.className = R.klass.msg.attachment.img;
+    if (attachment["image_url"])
         imgDom.src = attachment["image_url"];
-    } else {
-        imgDom.className = R.klass.hidden;
-    }
+    else
+        imgDom.classList.add(R.klass.hidden);
 
     //Footer
+    footerBlock.className = R.klass.msg.attachment.footer;
+    footerText.className = R.klass.msg.attachment.footerText;
+    footerIcon.className = R.klass.msg.attachment.footerIcon;
     if (attachment["footer"]) {
         footerText.innerHTML = formatSlackText(attachment["footer"]);
         if (attachment["footer_icon"])
             footerIcon.src = attachment["footer_icon"];
         else
-            footerIcon.className = R.klass.hidden;
+            footerIcon.classList.add(R.klass.hidden);
     } else {
-        footerText.className = R.klass.hidden;
-        footerIcon.className = R.klass.hidden;
+        footerIcon.classList.add(R.klass.hidden);
+        footerText.classList.add(R.klass.hidden);
     }
+
+    //Ts
+    footerTs.className = R.klass.msg.ts;
     if (attachment["ts"])
         footerTs.textContent = new Date(parseFloat(attachment["ts"])).toString();
     else
-        footerTs.className = R.klass.hidden;
-    console.log(attachment);
+        footerTs.classList.add(R.klass.hidden);
 
     // TODO Field [ {title, value, short } ]
     // TODO actions (button stuff)
 
-    attachmentBlock.style.borderColor = color;
     authorBlock.appendChild(authorImg);
     authorBlock.appendChild(authorName);
     textBlock.appendChild(textDom);

+ 10 - 9
srv/public/slack.min.js

@@ -1,20 +1,21 @@
 function h(a){this.id=a.id;this.name=a.name}function l(a,b){this.id=a.id;this.name=a.name;this.b=parseFloat(a.last_read);this.a={};if(a.members)for(var e=0,c=a.members.length;e<c;e++){var f=t(b,a.members[e]);this.a[f.id]=f;f.f[this.id]=this}}function u(a,b){var e=[];this.id=b.id;this.a={};for(var c=0,f=b.members.length;c<f;c++){var d=t(a,b.members[c]);this.a[b.members[c]]=d;d.f[this.id]=this;e.push(d.name)}this.name=e.join(", ");this.b=parseFloat(b.last_read)}
 function v(a,b){this.id=b.id;this.c=a;this.b=parseFloat(b.last_read)}function w(a){this.id=a.id;this.name=a.name;this.status=a.status;this.b={B:a.profile.image_24,C:a.profile.image_32,l:a.profile.image_48,s:a.profile.image_72,A:a.profile.image_192,F:a.profile.image_512};this.f={};this.a=null}function x(a){this.id=a.id;this.name=a.name;this.b={D:a.icons.image_36,l:a.icons.image_48,s:a.icons.image_72};this.f={};this.a=null}
-function z(){this.i=null;this.f={};this.b={};this.g={};this.a={};this.c=null;this.h={}}function t(a,b){return a.a[b]||a.h[b]||null}function B(a,b){return a.f[b]||a.g[b]||a.b[b]||null}"undefined"!==typeof module&&(module.o.u=z);function C(a){this.g=a.user;this.b=parseFloat(a.ts);this.type=a.type;this.c=a.subtype;this.a=a}function G(a,b,e){this.id="string"===typeof a?a:a.id;this.a=[];this.b=b;e&&H(this,e)}function H(a,b){var e=0;b.forEach(function(a){e=Math.max(this.push(a),e)}.bind(a));I(a)}G.prototype.push=function(a){for(var b=parseFloat(a.ts),e=0,c=this.a.length;e<c;e++)if(this.a[e].b===b)return b;for(this.a.push(new C(a));this.a.length>this.b;)this.a.shift();return b};
+function A(){this.i=null;this.f={};this.b={};this.g={};this.a={};this.c=null;this.h={}}function t(a,b){return a.a[b]||a.h[b]||null}function D(a,b){return a.f[b]||a.g[b]||a.b[b]||null}"undefined"!==typeof module&&(module.o.u=A);function E(a){this.g=a.user;this.b=parseFloat(a.ts);this.type=a.type;this.c=a.subtype;this.a=a}function G(a,b,e){this.id="string"===typeof a?a:a.id;this.a=[];this.b=b;e&&H(this,e)}function H(a,b){var e=0;b.forEach(function(a){e=Math.max(this.push(a),e)}.bind(a));I(a)}G.prototype.push=function(a){for(var b=parseFloat(a.ts),e=0,c=this.a.length;e<c;e++)if(this.a[e].b===b)return b;for(this.a.push(new E(a));this.a.length>this.b;)this.a.shift();return b};
 function I(a){a.a.sort(function(a,e){return a.b-e.b})}"undefined"!==typeof module&&(module.o.w=G);var J=null;
 function K(){var a=document.createDocumentFragment(),b=L.a.c?Object.keys(L.a.c.f):[];b.sort(function(a,b){return a[0]!==b[0]?a[0]-b[0]:(L.a.f[a]||L.a.b[a]).name.localeCompare((L.a.f[b]||L.a.b[b]).name)});b.forEach(function(b){b=L.a.f[b]||L.a.b[b];var c=document.createElement("li");c.id=b.id;"D"===b.id[0]?c.className="slack-context-room slack-ims":"G"===b.id[0]?c.className="slack-context-room slack-group":"C"===b.id[0]&&(c.className="slack-context-room slack-channel");c.textContent=b.name;c&&a.appendChild(c)});
 b=L.a.a?Object.keys(L.a.a):[];b.sort(function(a,b){return L.a.a[a].name.localeCompare(L.a.a[b].name)});b.forEach(function(b){b=L.a.a[b].a;var c=document.createElement("li");c.id=b.id;c.className="slack-context-room";c.textContent=b.c.name;c&&a.appendChild(c)});document.getElementById("chanList").textContent="";document.getElementById("chanList").appendChild(a)}function M(a){a?document.body.classList.remove("no-network"):document.body.classList.add("no-network")}
 function N(){if(J){document.body.classList.add("replyingTo");var a=document.getElementById("replyToContainer"),b=document.createElement("a");b.addEventListener("click",function(){J=null;N()});b.className="replyto-close";b.textContent="x";a.textContent="";a.appendChild(b);a.appendChild(O("reply_"+P.id,J,!0))}else document.body.classList.remove("replyingTo")}
 function Q(a,b,e){var c=document.createElement("div"),f=document.createElement("div"),d=document.createElement("div"),k=document.createElement("div"),g=document.createElement("img"),n=document.createElement("span"),p=document.createElement("ul"),r=document.createElement("li"),m=document.createElement("ul"),q=b.a.user?L.a.a[b.a.user]:L.a.h[b.a.bot_id];c.id=a+"_"+b.b;c.className="slackmsg-item";f.className="slackmsg-ts";d.className="slackmsg-msg";k.className="slackmsg-author";g.className="slackmsg-author-img";
-n.className="slackmsg-author-name";p.className="slackmsg-hover";r.className="slackmsg-hover-reply";f.textContent=(new Date(1E3*b.b)).toLocaleTimeString();d.innerHTML=R(b.a.text||"");n.textContent=q?q.name:b.a.username||"?";q||b.a.username||(d.textContent=b.a.subtype||JSON.stringify(b.a));g.src=q?q.b.l:"";k.appendChild(g);k.appendChild(n);p.appendChild(r);c.appendChild(k);c.appendChild(d);c.appendChild(f);c.appendChild(m);!0!==e&&b.a.attachments&&b.a.attachments.forEach(function(a){var b=document.createElement("li"),
-c=document.createElement("div"),e=document.createElement("div"),d=document.createElement("a"),f=document.createElement("div"),g=document.createElement("img"),k=document.createElement("a"),D=document.createElement("div"),n=document.createElement("div"),p=document.createElement("img"),q=document.createElement("img"),r=document.createElement("div"),A=document.createElement("img"),E=document.createElement("span"),F=document.createElement("span"),y="#e3e4e6";a.color&&("#"===a.color[0]?y=a.color[0]:"good"===
-a.color?y="#2fa44f":"warning"===a.color?y="#de9e31":"danger"===a.color&&(y="#d50200"));a.pretext&&(e.innerHTML=R(a.pretext));a.title?(d.innerHTML=R(a.title),a.title_link&&(d.href=a.title_link)):d.className="hidden";k.target="_blank";a.author_name?(k.innerHTML=R(a.author_name),k.href=a.author_link,a.author_icon?g.src=a.author_icon:g.className="hidden"):f.className="hidden";n.innerHTML=R(a.text||"");a.thumb_url?p.src=a.thumb_url:p.className="hidden";a.image_url?q.src=a.image_url:q.className="hidden";
-a.footer?(E.innerHTML=R(a.footer),a.footer_icon?A.src=a.footer_icon:A.className="hidden"):(E.className="hidden",A.className="hidden");a.ts?F.textContent=(new Date(parseFloat(a.ts))).toString():F.className="hidden";console.log(a);c.style.borderColor=y;f.appendChild(g);f.appendChild(k);D.appendChild(n);D.appendChild(p);r.appendChild(A);r.appendChild(E);r.appendChild(F);c.appendChild(d);c.appendChild(f);c.appendChild(D);c.appendChild(q);c.appendChild(r);b.appendChild(e);b.appendChild(c);console.log(a);
-b&&m.appendChild(b)});c.appendChild(p);return c}
+n.className="slackmsg-author-name";p.className="slackmsg-hover";r.className="slackmsg-hover-reply";f.textContent=(new Date(1E3*b.b)).toLocaleTimeString();d.innerHTML=R(b.a.text||"");n.textContent=q?q.name:b.a.username||"?";q||b.a.username||(d.textContent=b.a.subtype||JSON.stringify(b.a));g.src=q?q.b.l:"";k.appendChild(g);k.appendChild(n);p.appendChild(r);c.appendChild(k);c.appendChild(d);c.appendChild(f);c.appendChild(m);m.className="slackmsg-attachments";!0!==e&&b.a.attachments&&b.a.attachments.forEach(function(a){var b=
+document.createElement("li"),c=document.createElement("div"),e=document.createElement("div"),d=document.createElement("a"),f=document.createElement("div"),g=document.createElement("img"),k=document.createElement("a"),F=document.createElement("div"),n=document.createElement("div"),p=document.createElement("img"),q=document.createElement("img"),r=document.createElement("div"),y=document.createElement("img"),B=document.createElement("span"),C=document.createElement("span");b.className="slackmsg-attachment";
+var z="#e3e4e6";a.color&&("#"===a.color[0]?z=a.color[0]:"good"===a.color?z="#2fa44f":"warning"===a.color?z="#de9e31":"danger"===a.color&&(z="#d50200"));c.style.borderColor=z;e.className="slackmsg-attachment-pretext";a.pretext?e.innerHTML=R(a.pretext):e.classList.add("hidden");d.target="_blank";a.title?(d.innerHTML=R(a.title),a.title_link&&(d.href=a.title_link),d.className="slackmsg-attachment-title"):d.className="hidden slackmsg-attachment-title";k.target="_blank";f.className="slackmsg-author";a.author_name?
+(k.innerHTML=R(a.author_name),k.href=a.author_link||"",k.className="slackmsg-author-name",g.className="slackmsg-author-img",a.author_icon?g.src=a.author_icon:g.classList.add("hidden")):f.classList.add("hidden");n.innerHTML=R(a.text||"");n.a="slackmsg-attachment-text";p.className="slackmsg-attachment-thumb";a.thumb_url?p.src=a.thumb_url:p.classList.add("hidden");q.className="slackmsg-attachment-img";a.image_url?q.src=a.image_url:q.classList.add("hidden");r.className="slackmsg-attachment-footer";B.className=
+"slackmsg-attachment-footer-text";y.className="slackmsg-attachment-footer-icon";a.footer?(B.innerHTML=R(a.footer),a.footer_icon?y.src=a.footer_icon:y.classList.add("hidden")):(y.classList.add("hidden"),B.classList.add("hidden"));C.className="slackmsg-ts";a.ts?C.textContent=(new Date(parseFloat(a.ts))).toString():C.classList.add("hidden");f.appendChild(g);f.appendChild(k);F.appendChild(n);F.appendChild(p);r.appendChild(y);r.appendChild(B);r.appendChild(C);c.appendChild(d);c.appendChild(f);c.appendChild(F);
+c.appendChild(q);c.appendChild(r);b.appendChild(e);b.appendChild(c);console.log(a);b&&m.appendChild(b)});c.appendChild(p);return c}
 function R(a){a=a.split(/\r?\n/g);for(var b=0,e=a.length;b<e;b++){for(var c=a[b],f="",d={},k=!1,g=0,n=c.length,p=function(a,b,c){for(;a[b];){if(" "!=a[b]&&a[b]!=c&&a[b+1]==c)return!0;b++}return!1},r=function(a){return Object.keys(d).length?'<span class="'+Object.keys(a).join(" ")+'">':""};g<n&&(" "===c[g]||"\t"===c[g]);)g++;"&gt;"===c.substr(g,4)&&(k=!0,g+=4);for(;g<n;g++){var m=c[g];if(!d["slackmsg-style-bold"]&&"*"===m&&c[g+1]&&p(c,g,m))Object.keys(d).length&&(f+="</span>"),d["slackmsg-style-bold"]=
 !0,f+=r(d);else if(!d["slackmsg-style-strike"]&&"~"===m&&c[g+1]&&p(c,g,m))Object.keys(d).length&&(f+="</span>"),d["slackmsg-style-strike"]=!0,f+=r(d);else if(!d["slackmsg-style-code"]&&"`"===m&&c[g+1]&&p(c,g,m))Object.keys(d).length&&(f+="</span>"),d["slackmsg-style-code"]=!0,f+=r(d);else if(!d["slackmsg-style-italic"]&&"_"===m&&c[g+1]&&p(c,g,m))Object.keys(d).length&&(f+="</span>"),d["slackmsg-style-italic"]=!0,f+=r(d);else{var q=!1,f=f+m;do{if(d["slackmsg-style-bold"]&&"*"!==m&&"*"===c[g+1])delete d["slackmsg-style-bold"],
 q=!0;else if(d["slackmsg-style-strike"]&&"~"!==m&&"~"===c[g+1])delete d["slackmsg-style-strike"],q=!0;else if(d["slackmsg-style-code"]&&"`"!==m&&"`"===c[g+1])delete d["slackmsg-style-code"],q=!0;else if(d["slackmsg-style-italic"]&&"_"!==m&&"_"===c[g+1])delete d["slackmsg-style-italic"],q=!0;else break;m=c[++g]}while(g<n);q&&(f+="</span>"+r(d))}}d&&(f+="</span>");f=f.replace(RegExp("<([@#]?)([^>]*)>","g"),function(a,b,c){c=c.split("|");if("@"===b)c[1]?"@"!==c[1][0]&&(c[1]="@"+c[1]):(a=t(L.a,c[0]),
-c[1]=a?"@"+a.name:"Unknown member"),c[0]="#"+c[0],c[2]="slackmsg-link slackmsg-link-user";else if("#"===b)c[1]?"#"!==c[1][0]&&(c[1]="#"+c[1]):(a=B(L.a,c[0]),c[1]=a?"#"+a.name:"Unknown channel"),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>"});a[b]=k?'<span class="slackmsg-style-quote">'+f+"</span>":f}return a.join("<br/>")}
+c[1]=a?"@"+a.name:"Unknown member"),c[0]="#"+c[0],c[2]="slackmsg-link slackmsg-link-user";else if("#"===b)c[1]?"#"!==c[1][0]&&(c[1]="#"+c[1]):(a=D(L.a,c[0]),c[1]=a?"#"+a.name:"Unknown channel"),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>"});a[b]=k?'<span class="slackmsg-style-quote">'+f+"</span>":f}return a.join("<br/>")}
 function O(a,b,e){"me_message"===b.c?(a=Q(a,b,e),a.classList.add("slackmsg-me_message")):a=Q(a,b,e);return a}function S(){var a=0,b=0,e,c;for(c in T)T.hasOwnProperty(c)&&(a+=T[c].m,b+=T[c].j);b&&(e="(!"+b);a&&(e=(e?e+" - ":"(")+a);e=e?e+(") "+L.a.i.name):L.a.i.name;document.title=e}
 function U(){var a=document.createDocumentFragment(),b=P.id;document.getElementById("chatWindow").textContent="";L.b[b]&&L.b[b].a.forEach(function(c){"message"===c.type&&(c=O(b,c),a.appendChild(c))});var e=document.getElementById("chatWindow");e.appendChild(a);e.scrollTop=e.scrollHeight-e.clientHeight}
 function aa(a){for(;a.target!==a.currentTarget&&a.target;){if(a.target.classList.contains("slack-context-room")){if((a=L.a.f[a.target.id]||L.a.g[a.target.id]||L.a.b[a.target.id])&&a!==P){P&&document.getElementById(P.id).classList.remove("selected");document.getElementById(a.id).classList.add("selected");document.body.classList.remove("no-room-selected");P=a;a=void 0;var b=P.name||(P.c?P.c.name:void 0);if(!b){b=[];for(a in P.a)b.push(P.a[a].name);b=b.join(", ")}document.getElementById("currentRoomTitle").textContent=
@@ -24,6 +25,6 @@ document.addEventListener("DOMContentLoaded",function(){document.getElementById(
 function(a){a.preventDefault();a=document.getElementById("fileUploadInput");var b=a.value;b&&(b=b.substr(b.lastIndexOf("\\")+1),ca(b,a.files[0],function(a){var b=document.getElementById("fileUploadError");a?(b.textContent=a,b.classList.remove("hidden")):(b.classList.add("hidden"),document.getElementById("fileUploadInput").value="",document.getElementById("fileUploadContainer").classList.add("hidden"))}));return!1});document.getElementById("attachFile").addEventListener("click",function(a){a.preventDefault();
 P&&document.getElementById("fileUploadContainer").classList.remove("hidden");return!1});document.getElementById("msgForm").addEventListener("submit",function(a){a.preventDefault();a=document.getElementById("msgInput");if(P&&a.value){var b=P,e=J,c=new XMLHttpRequest,f="api/msg?room="+b.id+"&text="+encodeURIComponent(a.value);if(e){var d=t(L.a,e.g),k="Message";"C"===b.id[0]?k="Channel message":"D"===b.id[0]?k="Direct message":"G"===b.id[0]&&(k="Group message");f+="&attachments="+encodeURIComponent(JSON.stringify([{fallback:e.a.text||
 "",author_name:"<@"+d.id+"|"+d.name+">",author_icon:d.b.l,text:e.a.text||"",footer:k,ts:e.b}]))}c.open("POST",f,!0);c.send(null);a.value="";J&&(J=null,N())}V();return!1});window.addEventListener("blur",function(){window.hasFocus=!1});window.addEventListener("focus",function(){window.hasFocus=!0;P&&W();V()});window.hasFocus=!0;X()});var L,T={};function da(a,b){if(a&&(a!==P||!window.hasFocus)){var e=new RegExp("<@"+L.a.c.id),c=!1;T[a.id]||(T[a.id]={j:0,m:0});b.forEach(function(b){"message"===b.type&&("D"===a.id[0]||b.text.match(e)?(T[a.id].j++,c=!0):T[a.id].m++)});S();document.getElementById(a.id).classList.add("unread");c&&document.getElementById(a.id).classList.add("unreadHi")}}function W(){var a=P;T[a.id]&&(T[a.id]={j:0,m:0},S());a=document.getElementById(a.id);a.classList.remove("unread");a.classList.remove("unreadHi")}
-L=new function(){this.c=0;this.a=new z;this.b={}};var Y=0,P=null;function Z(a){var b=new XMLHttpRequest;b.timeout=6E4;b.onreadystatechange=function(){if(4===b.readyState)if(b.status){var e=null,c=2===Math.floor(b.status/100);if(c){Y&&(Y=0,M(!0));e=b.response;try{e=JSON.parse(e)}catch(f){e=null}}else Y?(Y+=Math.floor((Y||5)/2),Y=Math.min(60,Y)):(Y=5,M(!1));a(c,e)}else Y&&(Y=0,M(!0)),Z(a)};b.open("GET","api?v="+L.c,!0);b.send(null)}
+L=new function(){this.c=0;this.a=new A;this.b={}};var Y=0,P=null;function Z(a){var b=new XMLHttpRequest;b.timeout=6E4;b.onreadystatechange=function(){if(4===b.readyState)if(b.status){var e=null,c=2===Math.floor(b.status/100);if(c){Y&&(Y=0,M(!0));e=b.response;try{e=JSON.parse(e)}catch(f){e=null}}else Y?(Y+=Math.floor((Y||5)/2),Y=Math.min(60,Y)):(Y=5,M(!1));a(c,e)}else Y&&(Y=0,M(!0)),Z(a)};b.open("GET","api?v="+L.c,!0);b.send(null)}
 function ea(a,b){if(a){if(b){var e=L;b.v&&(e.c=b.v);if(b["static"]){for(var c=e.a,f=b["static"],d=0,k=f.bots.length;d<k;d++)c.h[f.bots[d].id]=new x(f.bots[d]);d=0;for(k=f.users.length;d<k;d++)c.a[f.users[d].id]=new w(f.users[d]);d=0;for(k=f.ims.length;d<k;d++){var g=t(c,f.ims[d].user);g&&(g.a=new v(g,f.ims[d]),c.g[g.a.id]=g.a)}d=0;for(k=f.channels.length;d<k;d++)c.f[f.channels[d].id]=new l(f.channels[d],c);d=0;for(k=f.groups.length;d<k;d++)c.b[f.groups[d].id]=new u(c,f.groups[d]);c.i=new h(f.team);
-c.c=t(c,f.self.id);K()}if(b.live){for(var n in b.live)(c=e.b[n])?H(c,b.live[n]):e.b[n]=new G(n,250,b.live[n]);for(var p in b.live)da(B(e.a,p),b.live[p]),P&&b.live[P.id]&&U()}}X()}else setTimeout(X,1E3*Y)}function X(){Z(ea)}function ca(a,b,e){var c=P;new FileReader;var f=new FormData,d=new XMLHttpRequest;f.append("file",b);f.append("filename",a);d.onreadystatechange=function(){4===d.readyState&&(204===d.status?e(null):e(d.statusText))};d.open("POST","api/file?room="+c.id);d.send(f)};
+c.c=t(c,f.self.id);K()}if(b.live){for(var n in b.live)(c=e.b[n])?H(c,b.live[n]):e.b[n]=new G(n,250,b.live[n]);for(var p in b.live)da(D(e.a,p),b.live[p]),P&&b.live[P.id]&&U()}}X()}else setTimeout(X,1E3*Y)}function X(){Z(ea)}function ca(a,b,e){var c=P;new FileReader;var f=new FormData,d=new XMLHttpRequest;f.append("file",b);f.append("filename",a);d.onreadystatechange=function(){4===d.readyState&&(204===d.status?e(null):e(d.statusText))};d.open("POST","api/file?room="+c.id);d.send(f)};

+ 4 - 0
srv/public/style.css

@@ -69,6 +69,10 @@ body {
 .slackmsg-style-code { background: #FFF6B4; color: red; font-weight: normal; font-style: normal; text-decoration: none; }
 .slackmsg-style-quote { border-left: 3px solid #e3e4e6; padding-left: 10px; }
 
+.slackmsg-attachments { list-style: none; }
+.slackmsg-attachment .slackmsg-author-img { max-height: 18px; max-width: 18px; vertical-align: middle; margin-right: 5px; }
+.slackmsg-attachment-img { max-height: 200px; max-width: 400px; }
+
 .attach-file-icon { height: 1.5em; vertical-align: bottom; }
 .msgform { width: 100%; }
 .msgform-input { width: calc(100% - 175px); margin-left: 15px; }

+ 6 - 2
srv/src/httpServ.js

@@ -65,7 +65,7 @@ function redirectToSlackAuth(res) {
         Location: "https://slack.com/oauth/authorize"
         +"?client_id=" +config.clientId
         +"&scope=" +slackManager.getScope().join(",")
-        +"&redirect=" +config.rootUrl
+        +"&redirect_uri=" +config.rootUrl
     });
     res.end();
 }
@@ -78,7 +78,7 @@ Server.prototype.onRequest = function(req, res) {
 
     if (!req.session || !req.session.slackToken) {
         if (req.urlObj.queryTokens.code) {
-            Slack.getOauthToken(req.urlObj.queryTokens.code, (token) => {
+            Slack.getOauthToken(req.urlObj.queryTokens.code, config.rootUrl, (token) => {
                 if (token) {
                     req.session = sessionManager.lazyForRequest(req);
                     req.session.setSlackToken(req.reqT, token);
@@ -104,6 +104,7 @@ Server.prototype.onRequest = function(req, res) {
         sessionManager.saveSession(req.session);
         return; // async pipe will close when finished
     } else {
+        // Api / dynamic content
         var apiSuccess = false;
 
         res.slack = slackManager.lazyGet(req.session);
@@ -192,6 +193,9 @@ Server.prototype.onRequest = function(req, res) {
                 sessionManager.saveSession(req.session);
             });
         } else {
+            console.log(JSON.stringify(req.session));
+            console.log(JSON.stringify(req.urlObj));
+            console.log(JSON.stringify(req.cookies));
             res.writeHeader("404", "Not Found");
             res.end();
         }

+ 1 - 1
srv/src/session.js

@@ -5,7 +5,7 @@ function SessionManager() {
     this.sessions = Cache.create();
 }
 
-SessionManager.defaultTtl = 60 * 60 * 24;
+SessionManager.defaultTtl = 60 * 60 * 24; // keep sessions 24h
 
 function Session(reqT, sessId) {
     this.sessId = sessId;

+ 2 - 1
srv/src/slack.js

@@ -203,10 +203,11 @@ Slack.prototype.closeIfInnactive = function() {
 Slack.prototype.close = function() {
 };
 
-Slack.getOauthToken = function(code, cb) {
+Slack.getOauthToken = function(code, redirectUri, cb) {
     httpsRequest(SLACK_ENDPOINT+GETAPI.oauth
         +"?client_id=" +config.clientId
         +"&client_secret=" +config.clientSecret
+        +"&redirect_uri=" +redirectUri
         +"&code=" +code,
     (status, resp) => {
         if (status === 200 && resp.ok) {

+ 3 - 1
srv/src/url.js

@@ -42,7 +42,9 @@ function Url(url) {
                 ,stat: fs.statSync("public/" +this.urlParts[0])
             };
         }
-    } catch (e) {}
+    } catch (e) {
+        // Not a public/ file
+    }
 }
 
 Url.prototype.isPublic = function() {