Browse Source

[add][Closes #5] Add a connected indicator next to ims list
[add][Fix #5] Tested 8fa37320fc72fa795c38f691bdc8338156d72aca

B Thibault 8 years ago
parent
commit
9ce1310d38
9 changed files with 187 additions and 67 deletions
  1. 24 4
      cli/data.js
  2. 1 0
      cli/resources.js
  3. 13 0
      cli/ui.js
  4. 1 1
      cli/workflow.js
  5. 38 37
      srv/public/slack.min.js
  6. 3 0
      srv/public/style.css
  7. 4 1
      srv/src/httpServ.js
  8. 27 17
      srv/src/slack.js
  9. 76 7
      srv/src/slackData.js

+ 24 - 4
cli/data.js

@@ -19,6 +19,9 @@ function SlackWrapper() {
     /** @type {number} */
     this.lastServerVersion = 0;
 
+    /** @type {number} */
+    this.lastUserVersion = 0;
+
     /** @type {SlackData} */
     this.context = new SlackData(null);
 
@@ -29,10 +32,23 @@ function SlackWrapper() {
 SlackWrapper.prototype.update = function(data) {
     if (data["v"])
         this.lastServerVersion = data["v"];
+    if (data["userV"])
+        this.lastUserVersion = data["userV"];
     if (data["static"]) {
         this.context.updateStatic(data["static"]);
         onContextUpdated();
     }
+    if (data["user"]) {
+        for (var userId in data["user"]) {
+            var member = this.context.getMember(userId);
+            if (member) {
+                member.onUserStream(data["user"][userId]);
+                onMemberChange(member);
+            } else {
+                this.lastUserVersion = this.lastServerVersion = -1;
+            }
+        }
+    }
     if (data["live"]) {
         for (var i in data["live"]) {
             var history = this.history[i];
@@ -43,10 +59,14 @@ SlackWrapper.prototype.update = function(data) {
         }
         for (var roomId in data["live"]) {
             var chan = this.context.getChannel(roomId);
-            if (chan && !chan.archived) {
-                onMsgReceived(chan, data["live"][roomId]);
-                if (SELECTED_ROOM && data["live"][SELECTED_ROOM.id])
-                    onRoomUpdated();
+            if (chan) {
+                if (!chan.archived) {
+                    onMsgReceived(chan, data["live"][roomId]);
+                    if (SELECTED_ROOM && data["live"][SELECTED_ROOM.id])
+                        onRoomUpdated();
+                }
+            } else {
+                this.lastUserVersion = this.lastServerVersion = 0;
             }
         }
     }

+ 1 - 0
cli/resources.js

@@ -32,6 +32,7 @@ var R = {
         ,unread: "unread"
         ,unreadHi: "unreadHi"
         ,replyingTo: "replyingTo"
+        ,presenceAway: "away"
         ,emoji: {
             emoji: "emoji"
             ,small: "emoji-small"

+ 13 - 0
cli/ui.js

@@ -58,6 +58,9 @@ function createImsListItem(ims) {
     dom.className = R.klass.chatList.entry + " " +R.klass.chatList.typeDirect;
     link.textContent = ims.user.name;
     dom.appendChild(link);
+
+    if (!ims.user.presence)
+        dom.classList.add(R.klass.presenceAway);
     return dom;
 }
 
@@ -185,6 +188,16 @@ function onEditingUpdated() {
     }
 }
 
+function onMemberChange(member) {
+    var dom = document.getElementById(member.ims.id);
+    if (dom) {
+        if (member.presence)
+            dom.classList.remove(R.klass.presenceAway);
+        else
+            dom.classList.add(R.klass.presenceAway);
+    }
+}
+
 /**
  * @param {string} chanId
  * @param {string} msgId

+ 1 - 1
cli/workflow.js

@@ -60,7 +60,7 @@ function poll(callback) {
             callback(success, resp);
         }
     };
-    xhr.open('GET', 'api?v=' +SLACK.lastServerVersion, true);
+    xhr.open('GET', 'api?v=' +SLACK.lastServerVersion +'&uv=' +SLACK.lastUserVersion, true);
     xhr.send(null);
 }
 

+ 38 - 37
srv/public/slack.min.js

@@ -1,58 +1,59 @@
-function aa(a){this.id=a;this.a={S:"",U:"",W:"",X:"",L:"",M:"",O:"",Y:""}}function ba(a){this.id=a;this.a={}}function ca(a){this.id=a;this.a={}}function da(a,b){this.id=a;this.f=b}function ea(a){this.id=a;this.a={P:"",R:"",m:"",A:"",N:"",V:""};this.h={};this.c=this.b=null}function fa(){this.b={};this.a=[]}function ga(a,b){a.b=JSON.parse(b.emoji_use);b.highlight_words?a.a=(b.highlight_words||"").split(",").filter(function(a){return""!==a.trim()}):b.highlights&&(a.a=b.highlights)}
-function ha(a){this.id=a;this.a={T:"",m:"",A:""};this.c=this.b=null}function p(){this.f=null;this.h={};this.w={};this.C={};this.b={};this.a=null;this.l={};this.c={}}function q(a,b){return a.b[b]||a.l[b]||null}function y(a,b){return a.h[b]||a.C[b]||a.w[b]||null}"undefined"!==typeof module&&(module.K.Z=p);function ia(a,b){this.i=a.user||a.bot_id;this.h=a.username;this.id=a.ts;this.b=b||parseFloat(a.ts);this.text=a.text||"";this.f=a.attachments||[];this.j=!!a.edited;this.c=a.removed||!1;this.l="me_message"===a.subtype||a.isMeMessage;this.a={};this.version=this.b;var c=this;a.reactions&&a.reactions.forEach(function(a){c.a[a.name]=[];a.users.forEach(function(b){c.a[a.name].push(b)})})}
-function ja(a,b,c){b?(a.text=b.text||"",b.attachments&&(a.f=b.attachments),a.j=!!b.edited,a.c=!!b.removed,b.reactions&&(a.a={},b.reactions.forEach(function(b){a.a[b.name]=[];b.users.forEach(function(c){a.a[b.name].push(c)})}))):a.c=!0;a.version=c}function z(a,b,c){this.id="string"===typeof a?a:a.id;this.a=[];this.b=b;c&&B(this,c)}function ka(a,b,c,d){var f=!1;a.a[b]&&(1===a.a[b].length&&a.a[b][0]===c?(delete a.a[b],f=!0):a.a[b]=a.a[b].filter(function(a){return a!==c?!1:f=!0}));f&&(a.version=d)}
+function aa(a){this.id=a;this.a={S:"",U:"",W:"",X:"",L:"",M:"",O:"",Y:""}}function ba(a){this.id=a;this.a={}}function ca(a){this.id=a;this.a={}}function da(a,b){this.id=a;this.c=b}function ea(a){this.id=a;this.a={P:"",R:"",m:"",A:"",N:"",V:""};this.i={};this.c=this.b=null;this.version=0}function fa(){this.b={};this.a=[]}function ga(a,b){a.b=JSON.parse(b.emoji_use);b.highlight_words?a.a=(b.highlight_words||"").split(",").filter(function(a){return""!==a.trim()}):b.highlights&&(a.a=b.highlights)}
+function ha(a){this.id=a;this.a={T:"",m:"",A:""};this.c=this.b=null;this.version=0;this.f=!1}function p(){this.g=null;this.i={};this.B={};this.b={};this.c={};this.a=null;this.w={};this.f={}}function q(a,b){return a.c[b]||a.w[b]||null}function y(a,b){return a.i[b]||a.b[b]||a.B[b]||null}"undefined"!==typeof module&&(module.K.Z=p);function ia(a,b){this.j=a.user||a.bot_id;this.g=a.username;this.id=a.ts;this.b=b||parseFloat(a.ts);this.text=a.text||"";this.f=a.attachments||[];this.l=!!a.edited;this.c=a.removed||!1;this.i="me_message"===a.subtype||a.isMeMessage;this.a={};this.version=this.b;var c=this;a.reactions&&a.reactions.forEach(function(a){c.a[a.name]=[];a.users.forEach(function(b){c.a[a.name].push(b)})})}
+function ja(a,b,c){b?(a.text=b.text||"",b.attachments&&(a.f=b.attachments),a.l=!!b.edited,a.c=!!b.removed,b.reactions&&(a.a={},b.reactions.forEach(function(b){a.a[b.name]=[];b.users.forEach(function(c){a.a[b.name].push(c)})}))):a.c=!0;a.version=c}function z(a,b,c){this.id="string"===typeof a?a:a.id;this.a=[];this.b=b;c&&B(this,c)}function ka(a,b,c,d){var f=!1;a.a[b]&&(1===a.a[b].length&&a.a[b][0]===c?(delete a.a[b],f=!0):a.a[b]=a.a[b].filter(function(a){return a!==c?!1:f=!0}));f&&(a.version=d)}
 function B(a,b){var c=0;b.forEach(function(a){c=Math.max(this.push(a),c)}.bind(a));la(a)}
 z.prototype.push=function(a){var b=parseFloat(a.ts);if(a.type&&"message"!==a.type)if("reaction_added"===a.type){var c=C(this,a.item.ts);if(c){var d=a.reaction;a=a.user;c.a[d]||(c.a[d]=[]);c.a[d].push(a);c.version=b}}else if("reaction_removed"===a.type)(c=C(this,a.item.ts))&&ka(c,a.reaction,a.user,b);else return 0;else{var c=!1,d=a.ts,f=a;"message_changed"===a.subtype&&a.previous_message?(d=a.previous_message.ts,f=a.message):"message_deleted"===a.subtype&&a.previous_message&&(d=a.previous_message.ts,
-f=null);for(var e=0,l=this.a.length;e<l;e++)if(this.a[e].id===d){ja(this.a[e],f,b);c=!0;break}c||this.a.push(new ia(a,b))}for(;this.a.length>this.b;)this.a.shift();return b};function ma(a){for(var b=D.b[E.id],c=0,d=b.a.length;c<d&&a>=b.a[c].b;c++)if(b.a[c].b===a)return b.a[c];return null}function C(a,b){for(var c=0,d=a.a.length;c<d;c++)if(a.a[c].id==b)return a.a[c];return null}function la(a){a.a.sort(function(a,c){return a.b-c.b})}"undefined"!==typeof module&&(module.K.$=z);var F={},G;function na(){var a;if(!a){for(var b=0,c=navigator.languages.length;b<c;b++)if(F.hasOwnProperty(navigator.languages[b])){a=navigator.languages[b];break}a||(a="en")}G=F[a];console.log("Loading language pack: "+a);if(G.g)for(b in G.g)document.getElementById(b).textContent=G.g[b]};F.fr={J:"Utilisateur inconnu",I:"Channel inconnu",F:"Nouveau message",D:"Reseau",j:"edit&eacute;",u:function(a){"string"!==typeof a&&(a=parseFloat(a));var b=new Date,c=new Date;a=new Date(1E3*a);b.setHours(0);b.setMinutes(0);b.setSeconds(0);b.setMilliseconds(0);c.setTime(b.getTime());c.setDate(c.getDate()-1);return a.getTime()>b.getTime()?a.toLocaleTimeString():a.getTime()>c.getTime()?"hier, "+a.toLocaleTimeString():a.toLocaleString()},g:{fileUploadCancel:"Annuler",neterror:"Impossible de se connecter au chat !"}};F.en={J:"Unknown member",I:"Unknown channel",F:"New message",D:"Network",j:"edited",u:function(a){"string"!==typeof a&&(a=parseFloat(a));var b=new Date,c=new Date;a=new Date(1E3*a);b.setHours(0);b.setMinutes(0);b.setSeconds(0);b.setMilliseconds(0);c.setTime(b.getTime());c.setDate(c.getDate()-1);return a.getTime()>b.getTime()?a.toLocaleTimeString():a.getTime()>c.getTime()?"yesterday, "+a.toLocaleTimeString():a.toLocaleString()},g:{fileUploadCancel:"Cancel",neterror:"Cannot connect to chat !"}};var H=null,I=null,L=0;
-function oa(){var a=document.createDocumentFragment(),b=D.a.a?Object.keys(D.a.a.h):[];b.sort(function(a,b){return a[0]!==b[0]?a[0]-b[0]:y(D.a,a).name.localeCompare(y(D.a,b).name)});b.forEach(function(b){b=y(D.a,b);if(!b.b){var c=document.createElement("li"),f=document.createElement("a");c.id=b.id;f.href="#"+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");f.textContent=
-b.name;c.appendChild(f);c&&a.appendChild(c)}});b=D.a.b?Object.keys(D.a.b):[];b.sort(function(a,b){return D.a.b[a].name.localeCompare(D.a.b[b].name)});b.forEach(function(b){b=q(D.a,b);if(!b.f){b=b.b;var c=document.createElement("li"),f=document.createElement("a");c.id=b.id;f.href="#"+b.id;c.className="slack-context-room slack-ims";f.textContent=b.f.name;c.appendChild(f);c&&a.appendChild(c)}});document.getElementById("chanList").textContent="";document.getElementById("chanList").appendChild(a);M();
-N();pa(function(a){document.getElementById("slackCtx").style.backgroundImage="url("+a+")"})}function O(a){a?document.body.classList.remove("no-network"):document.body.classList.add("no-network");N()}
+f=null);for(var e=0,l=this.a.length;e<l;e++)if(this.a[e].id===d){ja(this.a[e],f,b);c=!0;break}c||this.a.push(new ia(a,b))}for(;this.a.length>this.b;)this.a.shift();return b};function ma(a){for(var b=D.b[E.id],c=0,d=b.a.length;c<d&&a>=b.a[c].b;c++)if(b.a[c].b===a)return b.a[c];return null}function C(a,b){for(var c=0,d=a.a.length;c<d;c++)if(a.a[c].id==b)return a.a[c];return null}function la(a){a.a.sort(function(a,c){return a.b-c.b})}"undefined"!==typeof module&&(module.K.$=z);var F={},G;function na(){var a;if(!a){for(var b=0,c=navigator.languages.length;b<c;b++)if(F.hasOwnProperty(navigator.languages[b])){a=navigator.languages[b];break}a||(a="en")}G=F[a];console.log("Loading language pack: "+a);if(G.h)for(b in G.h)document.getElementById(b).textContent=G.h[b]};F.fr={J:"Utilisateur inconnu",I:"Channel inconnu",F:"Nouveau message",D:"Reseau",l:"edit&eacute;",u:function(a){"string"!==typeof a&&(a=parseFloat(a));var b=new Date,c=new Date;a=new Date(1E3*a);b.setHours(0);b.setMinutes(0);b.setSeconds(0);b.setMilliseconds(0);c.setTime(b.getTime());c.setDate(c.getDate()-1);return a.getTime()>b.getTime()?a.toLocaleTimeString():a.getTime()>c.getTime()?"hier, "+a.toLocaleTimeString():a.toLocaleString()},h:{fileUploadCancel:"Annuler",neterror:"Impossible de se connecter au chat !"}};F.en={J:"Unknown member",I:"Unknown channel",F:"New message",D:"Network",l:"edited",u:function(a){"string"!==typeof a&&(a=parseFloat(a));var b=new Date,c=new Date;a=new Date(1E3*a);b.setHours(0);b.setMinutes(0);b.setSeconds(0);b.setMilliseconds(0);c.setTime(b.getTime());c.setDate(c.getDate()-1);return a.getTime()>b.getTime()?a.toLocaleTimeString():a.getTime()>c.getTime()?"yesterday, "+a.toLocaleTimeString():a.toLocaleString()},h:{fileUploadCancel:"Cancel",neterror:"Cannot connect to chat !"}};var H=null,I=null,L=0;
+function oa(){var a=document.createDocumentFragment(),b=D.a.a?Object.keys(D.a.a.i):[];b.sort(function(a,b){return a[0]!==b[0]?a[0]-b[0]:y(D.a,a).name.localeCompare(y(D.a,b).name)});b.forEach(function(b){b=y(D.a,b);if(!b.b){var c=document.createElement("li"),f=document.createElement("a");c.id=b.id;f.href="#"+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");f.textContent=
+b.name;c.appendChild(f);c&&a.appendChild(c)}});b=D.a.c?Object.keys(D.a.c):[];b.sort(function(a,b){return D.a.c[a].name.localeCompare(D.a.c[b].name)});b.forEach(function(b){b=q(D.a,b);if(!b.g){b=b.b;var c=document.createElement("li"),f=document.createElement("a");c.id=b.id;f.href="#"+b.id;c.className="slack-context-room slack-ims";f.textContent=b.c.name;c.appendChild(f);b.c.f||c.classList.add("away");c&&a.appendChild(c)}});document.getElementById("chanList").textContent="";document.getElementById("chanList").appendChild(a);
+M();N();pa(function(a){document.getElementById("slackCtx").style.backgroundImage="url("+a+")"})}function O(a){a?document.body.classList.remove("no-network"):document.body.classList.add("no-network");N()}
 function P(){if(H){document.body.classList.add("replyingTo");var a=document.getElementById("replyToContainer"),b=document.createElement("a");b.addEventListener("click",function(){H=null;P()});b.className="replyto-close";b.textContent="x";a.textContent="";a.appendChild(b);a.appendChild(Q("reply_"+E.id,H,!0))}else document.body.classList.remove("replyingTo"),document.getElementById("replyToContainer").textContent="";R()}
 function S(){if(I){document.body.classList.add("replyingTo");var a=document.getElementById("replyToContainer"),b=document.createElement("a");b.addEventListener("click",function(){I=null;S()});b.className="replyto-close";b.textContent="x";a.textContent="";a.appendChild(b);a.appendChild(Q("edit_"+E.id,I,!0));document.getElementById("msgInput").value=I.text}else document.body.classList.remove("replyingTo"),document.getElementById("replyToContainer").textContent="";R()}
-function qa(a,b,c,d){var f=T(c);if(f){for(var e=document.createElement("li"),l=document.createElement("a"),g=document.createElement("span"),h=document.createElement("span"),m=[],k=0,n=d.length;k<n;k++){var v=q(D.a,d[k]);v&&m.push(v.name)}m.sort();h.textContent=m.join(", ");g.appendChild(f);g.className="emoji-small";l.href="javascript:toggleReaction('"+a+"', '"+b+"', '"+c+"')";l.appendChild(g);l.appendChild(h);e.className="slackmsg-reaction-item";e.appendChild(l);return e}return null}
+function qa(a,b,c,d){var f=T(c);if(f){for(var e=document.createElement("li"),l=document.createElement("a"),g=document.createElement("span"),h=document.createElement("span"),m=[],k=0,n=d.length;k<n;k++){var u=q(D.a,d[k]);u&&m.push(u.name)}m.sort();h.textContent=m.join(", ");g.appendChild(f);g.className="emoji-small";l.href="javascript:toggleReaction('"+a+"', '"+b+"', '"+c+"')";l.appendChild(g);l.appendChild(h);e.className="slackmsg-reaction-item";e.appendChild(l);return e}return null}
 window.toggleReaction=function(a,b,c){var d=D.b[a];if(d&&(d=C(d,b))){var f=D.a.a.id;d.a[c]&&-1!==d.a[c].indexOf(f)?(d=new XMLHttpRequest,d.open("DELETE","api/reaction?room="+a+"&msg="+b+"&reaction="+encodeURIComponent(c),!0),d.send(null)):U(a,b,c)}};
-function V(a,b,c){var d=document.createElement("div"),f=document.createElement("div"),e=document.createElement("div"),l=document.createElement("div"),g=document.createElement("img"),h=document.createElement("span"),m=document.createElement("ul"),k=document.createElement("li"),n=document.createElement("ul"),v=document.createElement("ul"),r=q(D.a,b.i);d.id=a+"_"+b.b;d.className="slackmsg-item";e.className="slackmsg-ts";l.className="slackmsg-msg";g.className="slackmsg-author-img";h.className="slackmsg-author-name";
-m.className="slackmsg-hover";k.className="slackmsg-hover-reply";e.innerHTML=G.u(b.b);l.innerHTML=W(b.text);h.textContent=r?r.name:b.h||"?";g.src=r?r.a.m:"";m.appendChild(k);if("makeEmoji"in window){var u=document.createElement("li"),w=window.makeEmoji("arrow_heading_down"),x=window.makeEmoji("smile"),A=window.makeEmoji("pencil2"),r=window.makeEmoji("x");u.className="slackmsg-hover-reaction";x?(u.classList.add("emoji-small"),u.appendChild(x)):u.style.backgroundImage='url("smile.svg")';w?(k.classList.add("emoji-small"),
-k.appendChild(w)):k.style.backgroundImage='url("repl.svg")';m.appendChild(u);b.i===D.a.a.id&&(k=document.createElement("li"),k.className="slackmsg-hover-edit",A?k.classList.add("emoji-small"):k.style.backgroundImage='url("edit.svg")',k.appendChild(A),m.appendChild(k),k=document.createElement("li"),k.className="slackmsg-hover-remove",r?k.classList.add("emoji-small"):k.style.backgroundImage='url("remove.svg")',k.appendChild(r),m.appendChild(k))}else k.style.backgroundImage='url("repl.svg")',b.i===D.a.a.id&&
-(k=document.createElement("li"),k.className="slackmsg-hover-edit",k.style.backgroundImage='url("edit.svg")',m.appendChild(k),k=document.createElement("li"),k.className="slackmsg-hover-remove",k.style.backgroundImage='url("remove.svg")',m.appendChild(k));d.appendChild(g);f.appendChild(h);f.appendChild(l);f.appendChild(e);f.appendChild(n);b.j&&(e=document.createElement("div"),e.textContent=G.j,e.className="slackmsg-edited",f.appendChild(e));f.appendChild(v);f.className="slackmsg-content";n.className=
-"slackmsg-attachments";v.className="slackmsg-reactions";if(!0!==c){if(b.a)for(var t in b.a)(c=qa(a,b.id,t,b.a[t]))&&v.appendChild(c);b.f.forEach(function(a){var b=document.createElement("li"),c=document.createElement("div"),d=document.createElement("div"),e=document.createElement("a"),f=document.createElement("div"),g=document.createElement("img"),u=document.createElement("a"),w=document.createElement("div"),h=document.createElement("div"),l=document.createElement("img"),k=document.createElement("img"),
+function V(a,b,c){var d=document.createElement("div"),f=document.createElement("div"),e=document.createElement("div"),l=document.createElement("div"),g=document.createElement("img"),h=document.createElement("span"),m=document.createElement("ul"),k=document.createElement("li"),n=document.createElement("ul"),u=document.createElement("ul"),r=q(D.a,b.j);d.id=a+"_"+b.b;d.className="slackmsg-item";e.className="slackmsg-ts";l.className="slackmsg-msg";g.className="slackmsg-author-img";h.className="slackmsg-author-name";
+m.className="slackmsg-hover";k.className="slackmsg-hover-reply";e.innerHTML=G.u(b.b);l.innerHTML=W(b.text);h.textContent=r?r.name:b.g||"?";g.src=r?r.a.m:"";m.appendChild(k);if("makeEmoji"in window){var w=document.createElement("li"),v=window.makeEmoji("arrow_heading_down"),x=window.makeEmoji("smile"),A=window.makeEmoji("pencil2"),r=window.makeEmoji("x");w.className="slackmsg-hover-reaction";x?(w.classList.add("emoji-small"),w.appendChild(x)):w.style.backgroundImage='url("smile.svg")';v?(k.classList.add("emoji-small"),
+k.appendChild(v)):k.style.backgroundImage='url("repl.svg")';m.appendChild(w);b.j===D.a.a.id&&(k=document.createElement("li"),k.className="slackmsg-hover-edit",A?k.classList.add("emoji-small"):k.style.backgroundImage='url("edit.svg")',k.appendChild(A),m.appendChild(k),k=document.createElement("li"),k.className="slackmsg-hover-remove",r?k.classList.add("emoji-small"):k.style.backgroundImage='url("remove.svg")',k.appendChild(r),m.appendChild(k))}else k.style.backgroundImage='url("repl.svg")',b.j===D.a.a.id&&
+(k=document.createElement("li"),k.className="slackmsg-hover-edit",k.style.backgroundImage='url("edit.svg")',m.appendChild(k),k=document.createElement("li"),k.className="slackmsg-hover-remove",k.style.backgroundImage='url("remove.svg")',m.appendChild(k));d.appendChild(g);f.appendChild(h);f.appendChild(l);f.appendChild(e);f.appendChild(n);b.l&&(e=document.createElement("div"),e.textContent=G.l,e.className="slackmsg-edited",f.appendChild(e));f.appendChild(u);f.className="slackmsg-content";n.className=
+"slackmsg-attachments";u.className="slackmsg-reactions";if(!0!==c){if(b.a)for(var t in b.a)(c=qa(a,b.id,t,b.a[t]))&&u.appendChild(c);b.f.forEach(function(a){var b=document.createElement("li"),c=document.createElement("div"),d=document.createElement("div"),e=document.createElement("a"),f=document.createElement("div"),g=document.createElement("img"),v=document.createElement("a"),h=document.createElement("div"),l=document.createElement("div"),w=document.createElement("img"),k=document.createElement("img"),
 t=document.createElement("div"),x=document.createElement("img"),r=document.createElement("span"),m=document.createElement("span");b.className="slackmsg-attachment";var A="#e3e4e6";a.color&&("#"===a.color[0]?A=a.color[0]:"good"===a.color?A="#2fa44f":"warning"===a.color?A="#de9e31":"danger"===a.color&&(A="#d50200"));c.style.borderColor=A;d.className="slackmsg-attachment-pretext";a.pretext?d.innerHTML=W(a.pretext):d.classList.add("hidden");e.target="_blank";a.title?(e.innerHTML=W(a.title),a.title_link&&
-(e.href=a.title_link),e.className="slackmsg-attachment-title"):e.className="hidden slackmsg-attachment-title";u.target="_blank";f.className="slackmsg-author";a.author_name?(u.innerHTML=W(a.author_name),u.href=a.author_link||"",u.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");h.innerHTML=W(a.text||"");h.a="slackmsg-attachment-text";l.className="slackmsg-attachment-thumb";a.thumb_url?l.src=a.thumb_url:
-l.classList.add("hidden");k.className="slackmsg-attachment-img";a.image_url?k.src=a.image_url:k.classList.add("hidden");t.className="slackmsg-attachment-footer";r.className="slackmsg-attachment-footer-text";x.className="slackmsg-attachment-footer-icon";a.footer?(r.innerHTML=W(a.footer),a.footer_icon?x.src=a.footer_icon:x.classList.add("hidden")):(x.classList.add("hidden"),r.classList.add("hidden"));m.className="slackmsg-ts";a.ts?m.innerHTML=G.u(a.ts):m.classList.add("hidden");f.appendChild(g);f.appendChild(u);
-w.appendChild(h);w.appendChild(l);t.appendChild(x);t.appendChild(r);t.appendChild(m);c.appendChild(e);c.appendChild(f);c.appendChild(w);c.appendChild(k);c.appendChild(t);b.appendChild(d);b.appendChild(c);b&&n.appendChild(b)})}d.appendChild(f);d.appendChild(m);return d}
-function T(a){a:{for(var b=a,c={};!c[b];){if(a=D.a.c[b])if("alias:"==a.substr(0,6))c[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}
+(e.href=a.title_link),e.className="slackmsg-attachment-title"):e.className="hidden slackmsg-attachment-title";v.target="_blank";f.className="slackmsg-author";a.author_name?(v.innerHTML=W(a.author_name),v.href=a.author_link||"",v.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");l.innerHTML=W(a.text||"");l.a="slackmsg-attachment-text";w.className="slackmsg-attachment-thumb";a.thumb_url?w.src=a.thumb_url:
+w.classList.add("hidden");k.className="slackmsg-attachment-img";a.image_url?k.src=a.image_url:k.classList.add("hidden");t.className="slackmsg-attachment-footer";r.className="slackmsg-attachment-footer-text";x.className="slackmsg-attachment-footer-icon";a.footer?(r.innerHTML=W(a.footer),a.footer_icon?x.src=a.footer_icon:x.classList.add("hidden")):(x.classList.add("hidden"),r.classList.add("hidden"));m.className="slackmsg-ts";a.ts?m.innerHTML=G.u(a.ts):m.classList.add("hidden");f.appendChild(g);f.appendChild(v);
+h.appendChild(l);h.appendChild(w);t.appendChild(x);t.appendChild(r);t.appendChild(m);c.appendChild(e);c.appendChild(f);c.appendChild(h);c.appendChild(k);c.appendChild(t);b.appendChild(d);b.appendChild(c);b&&n.appendChild(b)})}d.appendChild(f);d.appendChild(m);return d}
+function T(a){a:{for(var b=a,c={};!c[b];){if(a=D.a.f[b])if("alias:"==a.substr(0,6))c[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 ra(a){return a.replace(/:([^ \t:]+):/g,function(b,c){var d=T(c);if(d){var f=document.createElement("span");f.className=b===a?"emoji-medium":"emoji-small";f.appendChild(d);return f.outerHTML}return b})}
 function W(a){a=a.split(/\r?\n/g);for(var b=0,c=a.length;b<c;b++){for(var d=a[b].trim(),f="",e={},l=!1,g=0,d=d.replace(RegExp("<([@#]?)([^>]*)>","g"),function(a,b,c){c=c.split("|");if("@"===b)c[1]?"@"!==c[1][0]&&(c[1]="@"+c[1]):(a=q(D.a,c[0]),c[1]=a?"@"+a.name:G.J),c[0]="#"+c[0],c[2]="slackmsg-link slackmsg-link-user";else if("#"===b)c[1]?"#"!==c[1][0]&&(c[1]="#"+c[1]):(a=y(D.a,c[0]),c[1]=a?"#"+a.name:G.I),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>"}),d=ra(d),h=d.length,m=function(a,b,c){for(;a[b];){var d=a[b];if(("A"<=d&&"Z">=d||"a"<=d&&"z">=d||"0"<=d&&"9">=d||-1!=="\u00e0\u00e8\u00ec\u00f2\u00f9\u00c0\u00c8\u00cc\u00d2\u00d9\u00e1\u00e9\u00ed\u00f3\u00fa\u00fd\u00c1\u00c9\u00cd\u00d3\u00da\u00dd\u00e2\u00ea\u00ee\u00f4\u00fb\u00c2\u00ca\u00ce\u00d4\u00db\u00e3\u00f1\u00f5\u00c3\u00d1\u00d5\u00e4\u00eb\u00ef\u00f6\u00fc\u00ff\u00c4\u00cb\u00cf\u00d6\u00dc\u0178\u00e7\u00c7\u00df\u00d8\u00f8\u00c5\u00e5\u00c6\u00e6\u0153".indexOf(d))&&
 a[b]!=c&&a[b+1]==c)return!0;b++}return!1},k=function(a){return Object.keys(e).length?'<span class="'+Object.keys(a).join(" ")+'">':""};g<h&&(" "===d[g]||"\t"===d[g]);)g++;"&gt;"===d.substr(g,4)&&(l=!0,g+=4);for(;g<h;g++){var n=d[g];if("<"===n){do f+=d[g++];while(">"!==d[g-1]);g--}else if(!e["slackmsg-style-bold"]&&"*"===n&&d[g+1]&&m(d,g,n))Object.keys(e).length&&(f+="</span>"),e["slackmsg-style-bold"]=!0,f+=k(e);else if(!e["slackmsg-style-strike"]&&"~"===n&&d[g+1]&&m(d,g,n))Object.keys(e).length&&
-(f+="</span>"),e["slackmsg-style-strike"]=!0,f+=k(e);else if(!e["slackmsg-style-code"]&&"`"===n&&d[g+1]&&m(d,g,n))Object.keys(e).length&&(f+="</span>"),e["slackmsg-style-code"]=!0,f+=k(e);else if(!e["slackmsg-style-italic"]&&"_"===n&&d[g+1]&&m(d,g,n))Object.keys(e).length&&(f+="</span>"),e["slackmsg-style-italic"]=!0,f+=k(e);else{var v=!1,f=f+n;do{if(e["slackmsg-style-bold"]&&"*"!==n&&"*"===d[g+1])delete e["slackmsg-style-bold"],v=!0;else if(e["slackmsg-style-strike"]&&"~"!==n&&"~"===d[g+1])delete e["slackmsg-style-strike"],
-v=!0;else if(e["slackmsg-style-code"]&&"`"!==n&&"`"===d[g+1])delete e["slackmsg-style-code"],v=!0;else if(e["slackmsg-style-italic"]&&"_"!==n&&"_"===d[g+1])delete e["slackmsg-style-italic"],v=!0;else break;n=d[++g]}while(g<h);v&&(f+="</span>"+k(e))}}e&&(f+="</span>");a[b]=l?'<span class="slackmsg-style-quote">'+f+"</span>":f}return a.join("<br/>")}function Q(a,b,c){b.l?(a=V(a,b,c),a.classList.add("slackmsg-me_message")):a=V(a,b,c);b.j&&a.classList.add("slackmsg-edited");return a}
-function N(){var a=0,b=0,c="";if(X)c="!"+G.D+" - ",document.getElementById("linkFavicon").href="favicon_err.png";else{for(var d in Y)Y.hasOwnProperty(d)&&(a+=Y[d].B,b+=Y[d].s);b?c="(!"+b+") - ":a&&(c="("+a+") - ");document.getElementById("linkFavicon").href=b||a?"favicon.png?h="+b+"&m="+a:"favicon_ok.png"}c+=D.a.f.name;document.title=c}
+(f+="</span>"),e["slackmsg-style-strike"]=!0,f+=k(e);else if(!e["slackmsg-style-code"]&&"`"===n&&d[g+1]&&m(d,g,n))Object.keys(e).length&&(f+="</span>"),e["slackmsg-style-code"]=!0,f+=k(e);else if(!e["slackmsg-style-italic"]&&"_"===n&&d[g+1]&&m(d,g,n))Object.keys(e).length&&(f+="</span>"),e["slackmsg-style-italic"]=!0,f+=k(e);else{var u=!1,f=f+n;do{if(e["slackmsg-style-bold"]&&"*"!==n&&"*"===d[g+1])delete e["slackmsg-style-bold"],u=!0;else if(e["slackmsg-style-strike"]&&"~"!==n&&"~"===d[g+1])delete e["slackmsg-style-strike"],
+u=!0;else if(e["slackmsg-style-code"]&&"`"!==n&&"`"===d[g+1])delete e["slackmsg-style-code"],u=!0;else if(e["slackmsg-style-italic"]&&"_"!==n&&"_"===d[g+1])delete e["slackmsg-style-italic"],u=!0;else break;n=d[++g]}while(g<h);u&&(f+="</span>"+k(e))}}e&&(f+="</span>");a[b]=l?'<span class="slackmsg-style-quote">'+f+"</span>":f}return a.join("<br/>")}function Q(a,b,c){b.i?(a=V(a,b,c),a.classList.add("slackmsg-me_message")):a=V(a,b,c);b.l&&a.classList.add("slackmsg-edited");return a}
+function N(){var a=0,b=0,c="";if(X)c="!"+G.D+" - ",document.getElementById("linkFavicon").href="favicon_err.png";else{for(var d in Y)Y.hasOwnProperty(d)&&(a+=Y[d].C,b+=Y[d].s);b?c="(!"+b+") - ":a&&(c="("+a+") - ");document.getElementById("linkFavicon").href=b||a?"favicon.png?h="+b+"&m="+a:"favicon_ok.png"}c+=D.a.g.name;document.title=c}
 function sa(){if("Notification"in window)if("granted"===Notification.permission){var a=Date.now();if(L+3E4<a){var b=new Notification(G.F);L=a;setTimeout(function(){b.close()},5E3)}}else"denied"!==Notification.permission&&Notification.requestPermission()}
-function ta(){var a=document.createDocumentFragment(),b=E.id,c=null,d=0,f=null;D.b[b]&&D.b[b].a.forEach(function(e){if(!e.c){var g=Q(b,e);c&&c.i===e.i&&e.i?(g.classList.add("slackmsg-same-author"),30>Math.abs(d-e.b)?f.classList.add("slackmsg-same-ts"):d=e.b):d=e.b;c=e;f=g;a.appendChild(g)}});var e=document.getElementById("chatWindow");e.textContent="";e.appendChild(a);e.scrollTop=e.scrollHeight-e.clientHeight}
+function ta(){var a=document.createDocumentFragment(),b=E.id,c=null,d=0,f=null;D.b[b]&&D.b[b].a.forEach(function(e){if(!e.c){var g=Q(b,e);c&&c.j===e.j&&e.j?(g.classList.add("slackmsg-same-author"),30>Math.abs(d-e.b)?f.classList.add("slackmsg-same-ts"):d=e.b):d=e.b;c=e;f=g;a.appendChild(g)}});var e=document.getElementById("chatWindow");e.textContent="";e.appendChild(a);e.scrollTop=e.scrollHeight-e.clientHeight}
 function ua(a){function b(a,b){for(b=b||a.target;b!==a.currentTarget&&b;){if(b.classList.contains("slackmsg-item"))return b.id;b=b.parentElement}}for(var c=a.target;c!==a.currentTarget&&c&&!c.classList.contains("slackmsg-hover");){if(c.parentElement&&c.parentElement.classList.contains("slackmsg-hover")){if(a=b(a,c)){a=parseFloat(a.split("_")[1]);var d=ma(a);d&&c.classList.contains("slackmsg-hover-reply")?(I&&(I=null,S()),H!==d&&(H=d,P())):d&&c.classList.contains("slackmsg-hover-reaction")?va.H(document.body,
 function(a){a&&U(E.id,d.id,a)}):d&&c.classList.contains("slackmsg-hover-edit")?(H&&(H=null,P()),I!==d&&(I=d,S())):d&&c.classList.contains("slackmsg-hover-remove")&&(H&&(H=null,P()),I&&(I=null,S()),wa(d))}break}c=c.parentElement}}function R(){document.getElementById("msgInput").focus()}function M(){var a=document.location.hash.substr(1),b=y(D.a,a),a=q(D.a,a);b&&b!==E?xa(b):a&&a.b&&xa(a.b)}
 document.addEventListener("DOMContentLoaded",function(){na();document.getElementById("chatWindow").addEventListener("click",ua);window.addEventListener("hashchange",function(){document.location.hash&&"#"===document.location.hash[0]&&M()});document.getElementById("fileUploadCancel").addEventListener("click",function(a){a.preventDefault();document.getElementById("fileUploadError").classList.add("hidden");document.getElementById("fileUploadContainer").classList.add("hidden");document.getElementById("fileUploadInput").value=
 "";return!1});document.getElementById("fileUploadForm").addEventListener("submit",function(a){a.preventDefault();a=document.getElementById("fileUploadInput");var b=a.value;b&&(b=b.substr(b.lastIndexOf("\\")+1),ya(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();E&&document.getElementById("fileUploadContainer").classList.remove("hidden");return!1});document.getElementById("msgForm").addEventListener("submit",function(a){a.preventDefault();a=document.getElementById("msgInput");E&&a.value&&za(a.value)&&(a.value="",H&&(H=null,P()),I&&(I=null,P()));R();return!1});window.addEventListener("blur",function(){window.hasFocus=!1});window.addEventListener("focus",function(){window.hasFocus=
 !0;L=0;E&&Aa();R()});window.hasFocus=!0;(function(){var a=document.getElementById("emojiButton");if("makeEmoji"in window){var b=window.makeEmoji("smile");b?a.innerHTML="<span class='emoji-small'>"+b.outerHTML+"</span>":a.style.backgroundImage='url("smile.svg")';(b=window.makeEmoji("paperclip"))?document.getElementById("attachFile").innerHTML="<span class='emoji-small'>"+b.outerHTML+"</span>":document.getElementById("attachFile").style.backgroundImage='url("public/paperclip.svg")';a.addEventListener("click",
-function(){va.H(document.body,function(a){a&&(document.getElementById("msgInput").value+=":"+a+":");R()})})}else a.classList.add("hidden")})();Z()});var va=function(){function a(a,b){for(var c=a.target;c!==h&&c&&"LI"!==c.nodeName;)c=c.parentElement;c&&"LI"===c.nodeName&&c.id&&"emojibar-"===c.id.substr(0,9)?b(c.id.substr(9)):b(null)}function b(){if(!c())return!1;J&&J(null);return!0}function c(){return h.parentElement?(h.parentElement.removeChild(m),h.parentElement.removeChild(h),!0):!1}function d(a){var b=0,c;a=void 0===a?r.value:a;if(g()){var d=window.searchEmojis(a);c=f(d);for(var h in u)u[h].visible&&(u[h].visible=!1,n.removeChild(u[h].g));
-h=0;for(var k=c.length;h<k;h++){var l=c[h].name,t=u[l];if(!t){var t=u,x=l,K=l,l=window.makeEmoji(d[l]),m=document.createElement("span");m.appendChild(l);m.className="emoji-medium";l=e(K,m);t=t[x]=l}t.visible||(t.visible=!0,n.appendChild(t.g));b++}}for(h in w)w[h].visible&&(w[h].visible=!1,v.removeChild(w[h].g));c=f(D.a.c);h=0;for(k=c.length;h<k;h++)l=c[h].name,""!==a&&l.substr(0,a.length)!==a||"alias:"===D.a.c[l].substr(0,6)||(t=w[l],t||(d=w,x=t=l,l=D.a.c[l],K=document.createElement("span"),m=document.createElement("span"),
-K.className="emoji emoji-custom",K.style.backgroundImage='url("'+l+'")',m.appendChild(K),m.className="emoji-medium",l=e(x,m),t=d[t]=l),t.visible||(t.visible=!0,v.appendChild(t.g)),b++);return b}function f(a){var b=D.a.a.c.b,c=[],d;for(d in a)c.push({name:d,G:0,count:b[d]||0});return c=c.sort(function(a,b){var c=b.count-a.count;return c?c:a.G-b.G})}function e(a,b){var c=document.createElement("li");c.appendChild(b);c.className="emojibar-list-item";c.id="emojibar-"+a;return{visible:!1,g:c}}function l(a){var b=
-document.createElement("img"),c=document.createElement("div");b.src=a;c.appendChild(b);c.className="emojibar-header";return c}function g(){return"searchEmojis"in window}var h=document.createElement("div"),m=document.createElement("div"),k=document.createElement("div"),n=document.createElement("ul"),v=document.createElement("ul"),r=document.createElement("input"),u={},w={},x=document.createElement("div"),A=document.createElement("span"),t=document.createElement("span"),J;m.addEventListener("click",
-function(a){var c=h.getBoundingClientRect();(a.screenY<c.top||a.screenY>c.bottom||a.screenX<c.left||a.screenX>c.right)&&b()});m.className="emojibar-overlay";h.className="emojibar";k.className="emojibar-emojis";x.className="emojibar-detail";A.className="emojibar-detail-img";t.className="emojibar-detail-name";n.className=v.className="emojibar-list";r.className="emojibar-search";x.appendChild(A);x.appendChild(t);k.appendChild(l(window.emojiProviderHeader));k.appendChild(n);k.appendChild(l("emojicustom.png"));
-k.appendChild(v);h.appendChild(k);h.appendChild(x);h.appendChild(r);r.addEventListener("keyup",function(){d()});h.addEventListener("mousemove",function(b){a(b,function(a){var b=a?u[a]||w[a]:null;b?(A.innerHTML=b.g.outerHTML,t.textContent=":"+a+":"):(A.textContent="",t.textContent="")})});h.addEventListener("click",function(b){a(b,function(a){a&&c()&&J&&J(a)})});return{isSupported:g,H:function(a,b){return g()?(J=b,a.appendChild(m),a.appendChild(h),r.value="",d(),r.focus(),!0):!1},search:d,close:b}}();var D,Y={};
-function Ba(a,b){if(a!==E||!window.hasFocus){var c=new RegExp("<@"+D.a.a.id),d=!1,f=!1;Y[a.id]||(Y[a.id]={s:0,B:0});b.forEach(function(b){var e;if(!(e="D"===a.id[0]||b.text.match(c)))a:{b=b.text;e=D.a.a.c.a;for(var g=0,h=e.length;g<h;g++)if(-1!==b.indexOf(e[g])){console.log("Found highlight "+e[g]+" in "+b);e=!0;break a}e=!1}e?(f|=!Y[a.id].s,Y[a.id].s++,d=!0):Y[a.id].B++});N();document.getElementById(a.id).classList.add("unread");d&&document.getElementById(a.id).classList.add("unreadHi");f&&!window.hasFocus&&
-sa()}}function Aa(){var a=E;Y[a.id]&&(Y[a.id]={s:0,B:0},N());a=document.getElementById(a.id);a.classList.remove("unread");a.classList.remove("unreadHi")}D=new function(){this.c=0;this.a=new p;this.b={}};var pa=function(){function a(a,b){b.sort(function(){return Math.random()-.5});for(var c=0,d=20;d<h-40;d+=k)for(var g=0;g+k<=m;g+=k)e(a,b[c],d,g),c++,c===b.length&&(b.sort(function(a,b){return a.o?b.o?Math.random()-.5:-1:1}),c=0)}function b(a,d){for(var e=0,g=a.length;e<g;e++)if(void 0===a[e].o){c(a[e].src,function(c){a[e].o=c;b(a,d)});return}var f=[];a.forEach(function(a){a.o&&f.push(a.o)});d(f)}function c(a,b){var c=new XMLHttpRequest;c.responseType="blob";c.onreadystatechange=function(){if(4===
+function(){va.H(document.body,function(a){a&&(document.getElementById("msgInput").value+=":"+a+":");R()})})}else a.classList.add("hidden")})();Z()});var va=function(){function a(a,b){for(var c=a.target;c!==h&&c&&"LI"!==c.nodeName;)c=c.parentElement;c&&"LI"===c.nodeName&&c.id&&"emojibar-"===c.id.substr(0,9)?b(c.id.substr(9)):b(null)}function b(){if(!c())return!1;J&&J(null);return!0}function c(){return h.parentElement?(h.parentElement.removeChild(m),h.parentElement.removeChild(h),!0):!1}function d(a){var b=0,c;a=void 0===a?r.value:a;if(g()){var d=window.searchEmojis(a);c=f(d);for(var h in w)w[h].visible&&(w[h].visible=!1,n.removeChild(w[h].h));
+h=0;for(var k=c.length;h<k;h++){var l=c[h].name,t=w[l];if(!t){var t=w,x=l,K=l,l=window.makeEmoji(d[l]),m=document.createElement("span");m.appendChild(l);m.className="emoji-medium";l=e(K,m);t=t[x]=l}t.visible||(t.visible=!0,n.appendChild(t.h));b++}}for(h in v)v[h].visible&&(v[h].visible=!1,u.removeChild(v[h].h));c=f(D.a.f);h=0;for(k=c.length;h<k;h++)l=c[h].name,""!==a&&l.substr(0,a.length)!==a||"alias:"===D.a.f[l].substr(0,6)||(t=v[l],t||(d=v,x=t=l,l=D.a.f[l],K=document.createElement("span"),m=document.createElement("span"),
+K.className="emoji emoji-custom",K.style.backgroundImage='url("'+l+'")',m.appendChild(K),m.className="emoji-medium",l=e(x,m),t=d[t]=l),t.visible||(t.visible=!0,u.appendChild(t.h)),b++);return b}function f(a){var b=D.a.a.c.b,c=[],d;for(d in a)c.push({name:d,G:0,count:b[d]||0});return c=c.sort(function(a,b){var c=b.count-a.count;return c?c:a.G-b.G})}function e(a,b){var c=document.createElement("li");c.appendChild(b);c.className="emojibar-list-item";c.id="emojibar-"+a;return{visible:!1,h:c}}function l(a){var b=
+document.createElement("img"),c=document.createElement("div");b.src=a;c.appendChild(b);c.className="emojibar-header";return c}function g(){return"searchEmojis"in window}var h=document.createElement("div"),m=document.createElement("div"),k=document.createElement("div"),n=document.createElement("ul"),u=document.createElement("ul"),r=document.createElement("input"),w={},v={},x=document.createElement("div"),A=document.createElement("span"),t=document.createElement("span"),J;m.addEventListener("click",
+function(a){var c=h.getBoundingClientRect();(a.screenY<c.top||a.screenY>c.bottom||a.screenX<c.left||a.screenX>c.right)&&b()});m.className="emojibar-overlay";h.className="emojibar";k.className="emojibar-emojis";x.className="emojibar-detail";A.className="emojibar-detail-img";t.className="emojibar-detail-name";n.className=u.className="emojibar-list";r.className="emojibar-search";x.appendChild(A);x.appendChild(t);k.appendChild(l(window.emojiProviderHeader));k.appendChild(n);k.appendChild(l("emojicustom.png"));
+k.appendChild(u);h.appendChild(k);h.appendChild(x);h.appendChild(r);r.addEventListener("keyup",function(){d()});h.addEventListener("mousemove",function(b){a(b,function(a){var b=a?w[a]||v[a]:null;b?(A.innerHTML=b.h.outerHTML,t.textContent=":"+a+":"):(A.textContent="",t.textContent="")})});h.addEventListener("click",function(b){a(b,function(a){a&&c()&&J&&J(a)})});return{isSupported:g,H:function(a,b){return g()?(J=b,a.appendChild(m),a.appendChild(h),r.value="",d(),r.focus(),!0):!1},search:d,close:b}}();var D,Y={};
+function Ba(a,b){if(a!==E||!window.hasFocus){var c=new RegExp("<@"+D.a.a.id),d=!1,f=!1;Y[a.id]||(Y[a.id]={s:0,C:0});b.forEach(function(b){var e;if(!(e="D"===a.id[0]||b.text.match(c)))a:{b=b.text;e=D.a.a.c.a;for(var g=0,h=e.length;g<h;g++)if(-1!==b.indexOf(e[g])){console.log("Found highlight "+e[g]+" in "+b);e=!0;break a}e=!1}e?(f|=!Y[a.id].s,Y[a.id].s++,d=!0):Y[a.id].C++});N();document.getElementById(a.id).classList.add("unread");d&&document.getElementById(a.id).classList.add("unreadHi");f&&!window.hasFocus&&
+sa()}}function Aa(){var a=E;Y[a.id]&&(Y[a.id]={s:0,C:0},N());a=document.getElementById(a.id);a.classList.remove("unread");a.classList.remove("unreadHi")}D=new function(){this.f=this.c=0;this.a=new p;this.b={}};var pa=function(){function a(a,b){b.sort(function(){return Math.random()-.5});for(var c=0,d=20;d<h-40;d+=k)for(var f=0;f+k<=m;f+=k)e(a,b[c],d,f),c++,c===b.length&&(b.sort(function(a,b){return a.o?b.o?Math.random()-.5:-1:1}),c=0)}function b(a,d){for(var e=0,f=a.length;e<f;e++)if(void 0===a[e].o){c(a[e].src,function(c){a[e].o=c;b(a,d)});return}var g=[];a.forEach(function(a){a.o&&g.push(a.o)});d(g)}function c(a,b){var c=new XMLHttpRequest;c.responseType="blob";c.onreadystatechange=function(){if(4===
 c.readyState)if(c.response){var a=new Image;a.onload=function(){var c=document.createElement("canvas");c.height=c.width=r;c=c.getContext("2d");c.drawImage(a,0,0,r,r);for(var c=c.getImageData(0,0,r,r),d=0,e=0;e<c.width*c.height*4;e+=4)c.data[e]=c.data[e+1]=c.data[e+2]=(c.data[e]+c.data[e+1]+c.data[e+2])/3,c.data[e+3]=50,d+=c.data[e];if(50>d/(c.height*c.width))for(e=0;e<c.width*c.height*4;e+=4)c.data[e]=c.data[e+1]=c.data[e+2]=255-c.data[e];b(c)};a.src=window.URL.createObjectURL(c.response)}else b(null)};
-c.open("GET",a,!0);c.send(null)}function d(){var a=g.createLinearGradient(0,0,0,m);a.addColorStop(0,"#4D394B");a.addColorStop(1,"#201820");g.fillStyle=a;g.fillRect(0,0,h,m);return g.getImageData(0,0,h,m)}function f(a,b){for(var c=(a.height-b.height)/2,d=0;d<b.height;d++)for(var e=0;e<b.width;e++){var g=b.data[4*(d*b.width+e)]/255,f=4*((d+c)*a.width+e+c);a.data[f]*=g;a.data[f+1]*=g;a.data[f+2]*=g}return a}function e(a,b,c,d){var e=Math.floor(d);a=[a.data[e*h*4+0],a.data[e*h*4+1],a.data[e*h*4+2]];g.fillStyle=
-"#"+(1.1*a[0]<<16|1.1*a[1]<<8|1.1*a[2]).toString(16);g.beginPath();g.moveTo(c+k/2,d+n);g.lineTo(c-n+k,d+k/2);g.lineTo(c+k/2,d-n+k);g.lineTo(c+n,d+k/2);g.closePath();g.fill();g.putImageData(f(g.getImageData(c+n,d+n,v,v),b),c+n,d+n)}var l=document.createElement("canvas"),g=l.getContext("2d"),h=l.width=250,m=l.height=290,k=(h-40)/3,n=.1*k,v=Math.floor(k-2*n),r=.5*v;return function(c){var e=d(),g=[],f;for(f in D.a.b)D.a.b[f].f||g.push({src:"api/avatar?user="+f});b(g,function(b){a(e,b);c(l.toDataURL())})}}();var X=0,E=null;function Ca(a){var b=new XMLHttpRequest;b.timeout=6E4;b.onreadystatechange=function(){if(4===b.readyState)if(b.status){var c=null,d=2===Math.floor(b.status/100);if(d){X&&(X=0,O(!0));c=b.response;try{c=JSON.parse(c)}catch(f){c=null}}else X?(X+=Math.floor((X||5)/2),X=Math.min(60,X)):(X=5,O(!1));a(d,c)}else X&&(X=0,O(!0)),Ca(a)};b.open("GET","api?v="+D.c,!0);b.send(null)}
-function Da(a,b){if(a){if(b){var c=D;b.v&&(c.c=b.v);if(b["static"]){var d=c.a,f=b["static"];if(f.bots)for(var e=0,l=f.bots.length;e<l;e++){var g=d.l[f.bots[e].id];g||(g=d.l[f.bots[e].id]=new ha(f.bots[e].id));var h=f.bots[e];g.f=h.deleted;g.name=h.name;g.a.T=h.icons.image_36;g.a.m=h.icons.image_48;g.a.A=h.icons.image_72}if(f.users)for(e=0,l=f.users.length;e<l;e++)(g=d.b[f.users[e].id])||(g=d.b[f.users[e].id]=new ea(f.users[e].id)),h=f.users[e],g.name=h.name,g.f=h.deleted,g.status=h.status,g.a.P=h.profile.image_24,
-g.a.R=h.profile.image_32,g.a.m=h.profile.image_48,g.a.A=h.profile.image_72,g.a.N=h.profile.image_192,g.a.V=h.profile.image_512;if(f.ims)for(e=0,l=f.ims.length;e<l;e++)if(h=q(d,f.ims[e].user))h.b||(d.C[f.ims[e].id]=h.b=new da(f.ims[e].id,h)),g=h.b,g.c=parseFloat(f.ims[e].last_read),g.b=h.f;if(f.channels)for(e=0,l=f.channels.length;e<l;e++){(g=d.h[f.channels[e].id])||(g=d.h[f.channels[e].id]=new ba(f.channels[e].id));var h=f.channels[e],m=d;g.name=h.name;g.b=h.is_archived;g.c=parseFloat(h.last_read);
-g.a={};if(h.members)for(var k=0,n=h.members.length;k<n;k++){var v=q(m,h.members[k]);g.a[v.id]=v;v.h[g.id]=g}}e=0;for(l=f.groups.length;e<l;e++){(g=d.w[f.groups[e].id])||(g=d.w[f.groups[e].id]=new ca(f.groups[e].id));h=d;m=f.groups[e];k=[];g.a={};n=0;for(v=m.members.length;n<v;n++){var r=q(h,m.members[n]);g.a[m.members[n]]=r;r.h[g.id]=g;k.push(r.name)}g.name=k.join(", ");g.b=m.is_archived||!1===m.is_open;g.c=parseFloat(m.last_read)}f.emojis&&(d.c=f.emojis);d.f||(d.f=new aa(f.team.id));e=d.f;l=f.team;
-e.name=l.name;e.a.S=l.icon.image_34;e.a.U=l.icon.image_44;e.a.W=l.icon.image_68;e.a.X=l.icon.image_88;e.a.L=l.icon.image_102;e.a.M=l.icon.image_132;e.a.O=l.icon.image_230;e.a.Y=l.icon.image_default;f.self&&(d.a=q(d,f.self.id),d.a.c||(d.a.c=new fa),ga(d.a.c,f.self.prefs));oa()}if(b.live){for(var u in b.live)(d=c.b[u])?B(d,b.live[u]):c.b[u]=new z(u,250,b.live[u]);for(var w in b.live)(u=y(c.a,w))&&!u.b&&(Ba(u,b.live[w]),E&&b.live[E.id]&&ta())}}Z()}else setTimeout(Z,1E3*X)}function Z(){Ca(Da)}
-function xa(a){E&&document.getElementById(E.id).classList.remove("selected");document.getElementById(a.id).classList.add("selected");document.body.classList.remove("no-room-selected");E=a;a=E.name||(E.f?E.f.name:void 0);if(!a){a=[];for(var b in E.a)a.push(E.a[b].name);a=a.join(", ")}document.getElementById("currentRoomTitle").textContent=a;ta();R();document.getElementById("fileUploadContainer").classList.add("hidden");Aa();H&&(H=null,P());I&&(I=null,P());E.c&&!D.b[E.id]&&(b=new XMLHttpRequest,b.open("GET",
+c.open("GET",a,!0);c.send(null)}function d(){var a=g.createLinearGradient(0,0,0,m);a.addColorStop(0,"#4D394B");a.addColorStop(1,"#201820");g.fillStyle=a;g.fillRect(0,0,h,m);return g.getImageData(0,0,h,m)}function f(a,b){for(var c=(a.height-b.height)/2,d=0;d<b.height;d++)for(var e=0;e<b.width;e++){var f=b.data[4*(d*b.width+e)]/255,g=4*((d+c)*a.width+e+c);a.data[g]*=f;a.data[g+1]*=f;a.data[g+2]*=f}return a}function e(a,b,c,d){var e=Math.floor(d);a=[a.data[e*h*4+0],a.data[e*h*4+1],a.data[e*h*4+2]];g.fillStyle=
+"#"+(1.1*a[0]<<16|1.1*a[1]<<8|1.1*a[2]).toString(16);g.beginPath();g.moveTo(c+k/2,d+n);g.lineTo(c-n+k,d+k/2);g.lineTo(c+k/2,d-n+k);g.lineTo(c+n,d+k/2);g.closePath();g.fill();g.putImageData(f(g.getImageData(c+n,d+n,u,u),b),c+n,d+n)}var l=document.createElement("canvas"),g=l.getContext("2d"),h=l.width=250,m=l.height=290,k=(h-40)/3,n=.1*k,u=Math.floor(k-2*n),r=.5*u;return function(c){var e=d(),f=[],g;for(g in D.a.c)D.a.c[g].g||f.push({src:"api/avatar?user="+g});b(f,function(b){a(e,b);c(l.toDataURL())})}}();var X=0,E=null;function Ca(a){var b=new XMLHttpRequest;b.timeout=6E4;b.onreadystatechange=function(){if(4===b.readyState)if(b.status){var c=null,d=2===Math.floor(b.status/100);if(d){X&&(X=0,O(!0));c=b.response;try{c=JSON.parse(c)}catch(f){c=null}}else X?(X+=Math.floor((X||5)/2),X=Math.min(60,X)):(X=5,O(!1));a(d,c)}else X&&(X=0,O(!0)),Ca(a)};b.open("GET","api?v="+D.c+"&uv="+D.f,!0);b.send(null)}
+function Da(a,b){if(a){if(b){var c=D;b.v&&(c.c=b.v);b.userV&&(c.f=b.userV);if(b["static"]){var d=c.a,f=b["static"];if(f.bots)for(var e=0,l=f.bots.length;e<l;e++){var g=d.w[f.bots[e].id];g||(g=d.w[f.bots[e].id]=new ha(f.bots[e].id));var h=f.bots[e];g.g=h.deleted;g.name=h.name;g.a.T=h.icons.image_36;g.a.m=h.icons.image_48;g.a.A=h.icons.image_72}if(f.users)for(e=0,l=f.users.length;e<l;e++)(g=d.c[f.users[e].id])||(g=d.c[f.users[e].id]=new ea(f.users[e].id)),h=f.users[e],g.name=h.name,g.g=h.deleted,g.status=
+h.status,void 0!==h.presence&&(g.f="away"!==h.presence),void 0!==h.isPresent&&(g.f=h.isPresent),g.a.P=h.profile.image_24,g.a.R=h.profile.image_32,g.a.m=h.profile.image_48,g.a.A=h.profile.image_72,g.a.N=h.profile.image_192,g.a.V=h.profile.image_512;if(f.ims)for(e=0,l=f.ims.length;e<l;e++)if(h=q(d,f.ims[e].user))h.b||(d.b[f.ims[e].id]=h.b=new da(f.ims[e].id,h)),g=h.b,g.f=parseFloat(f.ims[e].last_read),g.b=h.g;if(f.channels)for(e=0,l=f.channels.length;e<l;e++){(g=d.i[f.channels[e].id])||(g=d.i[f.channels[e].id]=
+new ba(f.channels[e].id));var h=f.channels[e],m=d;g.name=h.name;g.b=h.is_archived;g.f=parseFloat(h.last_read);g.a={};if(h.members)for(var k=0,n=h.members.length;k<n;k++){var u=q(m,h.members[k]);g.a[u.id]=u;u.i[g.id]=g}}e=0;for(l=f.groups.length;e<l;e++){(g=d.B[f.groups[e].id])||(g=d.B[f.groups[e].id]=new ca(f.groups[e].id));h=d;m=f.groups[e];k=[];g.a={};n=0;for(u=m.members.length;n<u;n++){var r=q(h,m.members[n]);g.a[m.members[n]]=r;r.i[g.id]=g;k.push(r.name)}g.name=k.join(", ");g.b=m.is_archived||
+!1===m.is_open;g.f=parseFloat(m.last_read)}f.emojis&&(d.f=f.emojis);d.g||(d.g=new aa(f.team.id));e=d.g;l=f.team;e.name=l.name;e.a.S=l.icon.image_34;e.a.U=l.icon.image_44;e.a.W=l.icon.image_68;e.a.X=l.icon.image_88;e.a.L=l.icon.image_102;e.a.M=l.icon.image_132;e.a.O=l.icon.image_230;e.a.Y=l.icon.image_default;f.self&&(d.a=q(d,f.self.id),d.a.c||(d.a.c=new fa),ga(d.a.c,f.self.prefs));oa()}if(b.user)for(var w in b.user)(d=q(c.a,w))?(f=b.user[w],void 0!==f.presence&&(d.f=f.presence),(f=document.getElementById(d.b.id))&&
+(d.f?f.classList.remove("away"):f.classList.add("away"))):c.f=c.c=-1;if(b.live){for(var v in b.live)(w=c.b[v])?B(w,b.live[v]):c.b[v]=new z(v,250,b.live[v]);for(var x in b.live)(v=y(c.a,x))?v.b||(Ba(v,b.live[x]),E&&b.live[E.id]&&ta()):c.f=c.c=0}}Z()}else setTimeout(Z,1E3*X)}function Z(){Ca(Da)}
+function xa(a){E&&document.getElementById(E.id).classList.remove("selected");document.getElementById(a.id).classList.add("selected");document.body.classList.remove("no-room-selected");E=a;a=E.name||(E.c?E.c.name:void 0);if(!a){a=[];for(var b in E.a)a.push(E.a[b].name);a=a.join(", ")}document.getElementById("currentRoomTitle").textContent=a;ta();R();document.getElementById("fileUploadContainer").classList.add("hidden");Aa();H&&(H=null,P());I&&(I=null,P());E.f&&!D.b[E.id]&&(b=new XMLHttpRequest,b.open("GET",
 "api/hist?room="+E.id,!0),b.send(null))}function ya(a,b,c){var d=E;new FileReader;var f=new FormData,e=new XMLHttpRequest;f.append("file",b);f.append("filename",a);e.onreadystatechange=function(){4===e.readyState&&(204===e.status?c(null):c(e.statusText))};e.open("POST","api/file?room="+d.id);e.send(f)}
 function Ea(a,b){var c=E;if("me"==a){if(H)return!1;var d=new XMLHttpRequest;d.open("POST","api/msg?room="+c.id+"&me&text="+encodeURIComponent(b),!0);d.send(null);return!0}if("shrug"==a)return b.length&&(b+=" "),za(b+"\u00af_(\u30c4)_/\u00af",!0);console.log("Unknown command "+a);return!1}
-function za(a,b){if(I){var c=new XMLHttpRequest;c.open("PUT","api/msg?room="+E.id+"&ts="+I.id+"&text="+encodeURIComponent(a),!0);c.send(null);return!0}if("/"===a[0]&&!0!==b)return c=a.indexOf(" "),Ea(a.substr(1,-1===c?void 0:c-1),(-1===c?"":a.substr(c)).trim());var c=E,d=H,f=new XMLHttpRequest,e="api/msg?room="+c.id+"&text="+encodeURIComponent(a);if(d){var l=q(D.a,d.i),g="Message";"C"===c.id[0]?g="Channel message":"D"===c.id[0]?g="Direct message":"G"===c.id[0]&&(g="Group message");e+="&attachments="+
+function za(a,b){if(I){var c=new XMLHttpRequest;c.open("PUT","api/msg?room="+E.id+"&ts="+I.id+"&text="+encodeURIComponent(a),!0);c.send(null);return!0}if("/"===a[0]&&!0!==b)return c=a.indexOf(" "),Ea(a.substr(1,-1===c?void 0:c-1),(-1===c?"":a.substr(c)).trim());var c=E,d=H,f=new XMLHttpRequest,e="api/msg?room="+c.id+"&text="+encodeURIComponent(a);if(d){var l=q(D.a,d.j),g="Message";"C"===c.id[0]?g="Channel message":"D"===c.id[0]?g="Direct message":"G"===c.id[0]&&(g="Group message");e+="&attachments="+
 encodeURIComponent(JSON.stringify([{fallback:d.text,author_name:"<@"+l.id+"|"+l.name+">",author_icon:l.a.m,text:d.text,footer:g,ts:d.b}]))}f.open("POST",e,!0);f.send(null);return!0}function wa(a){var b=new XMLHttpRequest;b.open("DELETE","api/msg?room="+E.id+"&ts="+a.id,!0);b.send(null)}function U(a,b,c){var d=new XMLHttpRequest;d.open("POST","api/reaction?room="+a+"&msg="+b+"&reaction="+encodeURIComponent(c),!0);d.send(null)};

+ 3 - 0
srv/public/style.css

@@ -5,10 +5,13 @@ body { display: flex; margin: 0; padding: 0; font-family: Lato, sans-serif; }
 .slack-chat-container { display: flex; flex-direction: column; flex: 1; overflow: hidden; padding: 0; }
 
 .slack-context-channellist { padding-left: 0; list-style: none; }
+.slack-context-room { position: relative; }
 .slack-context-room > a { display: block; padding: 3px 0 3px 1.5em; text-decoration: none; color: #AB9BA9; margin-right: 15px; border-top-right-radius: 3px; border-bottom-right-radius: 3px; }
 .slack-context-room > a:hover { background-color: #3e313c; }
 .slack-context-room.selected > a { background-color: #4c9689; color: #fff; border-top-right-radius: 3px; border-bottom-right-radius: 3px; }
 .slack-context-room.slack-ims { font-style: italic; }
+.slack-context-room.slack-ims::before { content: " "; position: absolute; display: inline-block; height: 5px; width: 5px; border: 2px solid green; background: green; top: 0; bottom: 0; margin: auto auto auto 7px; border-radius: 5px; }
+.slack-context-room.slack-ims.away::before { background: transparent; }
 .slack-context-roominfo { position: absolute; display: block; left: 250px; width: 100%; max-width: 300px; top: 0; height: 100%; z-index: 100; background-color: #4D394B; }
 
 .hidden { display: none; }

+ 4 - 1
srv/src/httpServ.js

@@ -259,7 +259,10 @@ Server.prototype.onRequest = function(req, res) {
                 res.end();
             }
         } else if (req.urlObj.match(["api"])) {
-            res.slack.onRequest((req.urlObj.queryTokens.v ? req.urlObj.queryTokens.v[0] : 0) || 0, (slack, newData) => {
+            res.slack.onRequest(
+                (req.urlObj.queryTokens.v ? req.urlObj.queryTokens.v[0] : 0) || 0
+                ,(req.urlObj.queryTokens.uv ? req.urlObj.queryTokens.uv[0] : undefined) || undefined
+                , (slack, newData) => {
                 if (!res.ended) {
                     try {
                         if (!slack.connected) {

+ 27 - 17
srv/src/slack.js

@@ -68,12 +68,12 @@ Slack.prototype.onUserInterract = function(t) {
     this.lastPing = Math.max(t, this.lastPing);
 }
 
-Slack.prototype.onRequest = function(knownVersion, cb) {
+Slack.prototype.onRequest = function(knownVersion, knownUserVersion, cb) {
     this.lastCb = cb;
     if (this.connected === false) {
-        this.connect(knownVersion);
+        this.connect(knownVersion, knownUserVersion);
     } else {
-        this.waitForEvent(knownVersion);
+        this.waitForEvent(knownVersion, knownUserVersion);
     }
 };
 
@@ -96,7 +96,7 @@ function httpsRequest(url, cb) {
     });
 }
 
-Slack.prototype.connect = function(knownVersion) {
+Slack.prototype.connect = function(knownVersion, knownUserVersion) {
     var _this = this;
 
     this.connected = undefined;
@@ -125,7 +125,7 @@ Slack.prototype.connect = function(knownVersion) {
             body.emojis = emojis;
             _this.data.updateStatic(body);
             _this.connectRtm(body.url);
-            _this.waitForEvent(knownVersion);
+            _this.waitForEvent(knownVersion, knownUserVersion);
         });
     });
 };
@@ -139,7 +139,7 @@ Slack.prototype.getEmojis = function(cb) {
     });
 };
 
-Slack.prototype.waitForEvent = function(knownVersion) {
+Slack.prototype.waitForEvent = function(knownVersion, knownUserVersion) {
     var tick = 0
         ,_this = this
         ,interval;
@@ -152,15 +152,25 @@ Slack.prototype.waitForEvent = function(knownVersion) {
         }
         if (_this.connected) {
             var updatedCtx = _this.data.getUpdates(knownVersion)
-                ,updatedLive = _this.getLiveUpdates(knownVersion);
-
+                ,updatedLive = _this.getLiveUpdates(knownVersion)
+                ,updated;
+
+            if (knownUserVersion !== undefined) {
+                var updatedUsers = _this.data.getUserStream(knownUserVersion);
+                if (updatedUsers) {
+                    updated = {
+                        "userV": updatedUsers.version
+                        ,"user": updatedUsers.stream
+                    };
+                }
+            }
             if (updatedCtx || updatedLive) {
-                var updated = {
-                    "static": updatedCtx
-                    ,"live": updatedLive
-                    ,"v": Math.max(_this.data.liveV, _this.data.staticV)
-                    // TODO "typing" stream
-                };
+                updated = updated || {};
+                updated["static"] = updatedCtx;
+                updated["live"] = updatedLive;
+                updated["v"] = Math.max(_this.data.liveV, _this.data.staticV);
+            }
+            if (updated) {
                 clearInterval(interval);
                 _this.lastCb(_this, updated);
                 return;
@@ -196,8 +206,8 @@ Slack.prototype.getLiveUpdates = function(knownVersion) {
     return undefined;
 };
 
-Slack.prototype.onMessage = function(msg) {
-    this.data.onMessage(msg);
+Slack.prototype.onMessage = function(msg, t) {
+    this.data.onMessage(msg, t);
     if ((msg["channel"] || msg["channel_id"] || (msg["item"] && msg["item"]["channel"])) && msg["type"] && UPDATE_LIVE.indexOf(msg["type"]) !== -1) {
         var channelId = msg["channel"] || msg["channel_id"] || msg["item"]["channel"]
             ,histo = this.history[channelId];
@@ -223,7 +233,7 @@ Slack.prototype.connectRtm = function(url, cb) {
             _this.connected = true;
             SLACK_SESSIONS.push(_this);
         }
-        _this.onMessage(JSON.parse(msg));
+        _this.onMessage(JSON.parse(msg), Date.now());
     });
     this.rtm.once("error", function(e) {
         _this.connected = false;

+ 76 - 7
srv/src/slackData.js

@@ -221,6 +221,8 @@ function SlackUser(id) {
     this.realName;
     /** @type {boolean} */
     this.presence;
+    /** @type {boolean} */
+    this.typing = false;
     /** @type {Object.<string, string>} */
     this.icons = {
         image_24: ""
@@ -242,6 +244,8 @@ function SlackUser(id) {
     this.ims = null;
     /** @type {SelfPreferences|null} */
     this.prefs = null;
+    /** @type {number} */
+    this.version = 0;
 }
 
 /**
@@ -252,7 +256,10 @@ SlackUser.prototype.update = function(userData) {
     this.deleted = userData["deleted"];
     this.status = userData["status"];
     this.realName = userData["real_name"] || userData["profile"]["real_name"];
-    this.presence = userData["presence"] !== 'away';
+    if (userData["presence"] !== undefined)
+        this.presence = userData["presence"] !== 'away';
+    if (userData["isPresent"] !== undefined)
+        this.presence = userData["isPresent"];
     this.icons.image_24 = userData["profile"]["image_24"];
     this.icons.image_32 = userData["profile"]["image_32"];
     this.icons.image_48 = userData["profile"]["image_48"];
@@ -264,6 +271,23 @@ SlackUser.prototype.update = function(userData) {
     this.lastName = userData["profile"]["last_name"];
 }
 
+SlackUser.prototype.setPresence = function(presenceStr, t) {
+    this.presence = presenceStr !== 'away';
+    this.version = Math.max(t, this.version);
+}
+
+SlackUser.prototype.getUserStream = function() {
+    var res = {
+        "presence": this.presence
+    };
+    return res;
+}
+
+SlackUser.prototype.onUserStream = function(userStream) {
+    if (userStream["presence"] !== undefined)
+        this.presence = userStream["presence"];
+}
+
 /**
  * @constructor
 **/
@@ -312,6 +336,12 @@ function SlackBot(id) {
     this.ims = null;
     /** @type {SelfPreferences|null} */
     this.prefs = null;
+    /** @type {number} */
+    this.version = 0;
+    /** @type {boolean} */
+    this.presence = false;
+    /** @type {boolean} */
+    this.typing = false;
 }
 
 /** @param {*} botData */
@@ -324,6 +354,18 @@ SlackBot.prototype.update = function(botData) {
     this.icons.image_72 = botData["icons"]["image_72"]
 }
 
+SlackBot.prototype.setPresence = function(presenceStr, t) {
+    this.presence = presenceStr !== 'away';
+    this.version = Math.max(t, this.version);
+}
+
+SlackBot.prototype.getUserStream = function() {
+    var res = {
+        "presence": this.presence
+    };
+    return res;
+}
+
 /**
  * @constructor
 **/
@@ -415,6 +457,7 @@ SlackUser.prototype.toStatic = function() {
         ,"deleted": this.deleted
         ,"status": this.status
         ,"real_name": this.realName
+        ,"isPresent": this.presence
         ,"profile": {
             "email": this.email
             ,"first_name": this.firstName
@@ -599,13 +642,16 @@ SlackData.prototype.buildStatic = function() {
 };
 
 /**
- * @param {Object} msg
- * @return {boolean}
+ * @param {*} msg
+ * @param {number} t
 **/
-SlackData.prototype.onMessage = function(msg) {
-    //TODO
-    return false;
-};
+SlackData.prototype.onMessage = function(msg, t) {
+    if (msg["type"] === "presence_change") {
+        var member = this.users[msg["user"]];
+        if (member)
+            member.setPresence(msg["presence"], t);
+    }
+}
 
 /**
  * @param {number} knownVersion
@@ -615,6 +661,29 @@ SlackData.prototype.getUpdates = function(knownVersion) {
     return (this.staticV > knownVersion) ? this.buildStatic() : undefined;
 };
 
+SlackData.prototype.getUserStream = function(knownVersion) {
+    var res
+        ,v = 0;
+
+    for (var i in this.users) {
+        var user = this.users[i];
+        if (user.version > knownVersion) {
+            res = res || {};
+            res[i] = user.getUserStream();
+            v = Math.max(v, user.version);
+        }
+    }
+    for (var i in this.bots) {
+        var bot = this.bots[i];
+        if (bot.version > knownVersion) {
+            res = res || {};
+            res[i] = bot.getUserStream();
+            v = Math.max(v, user.version);
+        }
+    }
+    return res ? { stream: res, version: v } : undefined;
+};
+
 /** @suppress {undefinedVars,checkTypes} */
 (function() {
     if (typeof module !== "undefined") {