B Thibault 8 år sedan
förälder
incheckning
86b24529f2
3 ändrade filer med 10 tillägg och 10 borttagningar
  1. 5 5
      cli/data.js
  2. 4 4
      srv/public/slack.min.js
  3. 1 1
      srv/src/slackData.js

+ 5 - 5
cli/data.js

@@ -17,13 +17,13 @@ function SlackWrapper() {
 }
 
 SlackWrapper.prototype.update = function(data) {
-    if (data.v)
-        this.lastServerVersion = data.v;
-    if (data.static) {
-        this.context.updateStatic(data.static);
+    if (data["v"])
+        this.lastServerVersion = data["v"];
+    if (data["static"]) {
+        this.context.updateStatic(data["static"]);
         onContextUpdated();
     }
-    if (data.live) {
+    if (data["live"]) {
         console.log("updated LIVE");
     }
     console.log(this);

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

@@ -1,7 +1,7 @@
 function e(b,a){this.id=b.id;this.name=b.name;this.a={};if(b.members)for(var d=0,c=b.members.length;d<c;d++){var f=h(a,b.members[d]);this.a[f.id]=f;f.c[this.id]=this}}function k(b,a){var d=[];this.id=a.id;this.a={};for(var c=0,f=a.members.length;c<f;c++){var g=h(b,a.members[c]);this.a[a.members[c]]=g;g.c[this.id]=this;d.push(g.name)}this.name=d.join(", ")}function l(b,a){this.id=a.id;this.b=b}function m(b){this.id=b.id;this.name=b.name;this.status=b.status;this.c={};this.a=null}
-function n(b){this.id=b.id;this.name=b.name;this.c={};this.a=null}function p(){this.c={};this.b={};this.h={};this.a={};this.g=null;this.f={}}function h(b,a){return b.a[a]||b.f[a]||null}"undefined"!==typeof module&&(module.m.l=p);function q(){var b=document.createDocumentFragment(),a=r.a.g?Object.keys(r.a.g.c):[];a.sort(function(b,c){return b[0]!==c[0]?b[0]-c[0]:(r.a.c[b]||r.a.b[b]).name.localeCompare((r.a.c[c]||r.a.b[c]).name)});a.forEach(function(a){a=r.a.c[a]||r.a.b[a];var c=document.createElement("li");c.id=a.id;c.className="slack-context-room";c.textContent=a.name;c&&b.appendChild(c)});a=r.a.a?Object.keys(r.a.a):[];a.sort(function(b,a){return r.a.a[b].name.localeCompare(r.a.a[a].name)});a.forEach(function(a){a=r.a.a[a].a;
+function n(b){this.id=b.id;this.name=b.name;this.c={};this.a=null}function p(){this.c={};this.b={};this.g={};this.a={};this.f=null;this.h={}}function h(b,a){return b.a[a]||b.h[a]||null}"undefined"!==typeof module&&(module.j.i=p);function q(){var b=document.createDocumentFragment(),a=r.a.f?Object.keys(r.a.f.c):[];a.sort(function(b,c){return b[0]!==c[0]?b[0]-c[0]:(r.a.c[b]||r.a.b[b]).name.localeCompare((r.a.c[c]||r.a.b[c]).name)});a.forEach(function(a){a=r.a.c[a]||r.a.b[a];var c=document.createElement("li");c.id=a.id;c.className="slack-context-room";c.textContent=a.name;c&&b.appendChild(c)});a=r.a.a?Object.keys(r.a.a):[];a.sort(function(b,a){return r.a.a[b].name.localeCompare(r.a.a[a].name)});a.forEach(function(a){a=r.a.a[a].a;
 var c=document.createElement("li");c.id=a.id;c.className="slack-context-room";c.textContent=a.b.name;c&&b.appendChild(c)});document.getElementById("chanList").textContent="";document.getElementById("chanList").appendChild(b)}
-function t(b){for(;b.target!==b.currentTarget&&b.target;){if(b.target.classList.contains("slack-context-room")){if((b=r.a.c[b.target.id]||r.a.h[b.target.id]||r.a.b[b.target.id])&&b!==u){u&&document.getElementById(u.id).classList.remove("selected");document.getElementById(b.id).classList.add("selected");document.body.classList.remove("no-room-selected");u=b;b=void 0;var a=u.name||(u.b?u.b.name:void 0);if(!a){a=[];for(b in u.a)a.push(u.a[b].name);a=a.join(", ")}document.getElementById("currentRoomTitle").textContent=
+function t(b){for(;b.target!==b.currentTarget&&b.target;){if(b.target.classList.contains("slack-context-room")){if((b=r.a.c[b.target.id]||r.a.g[b.target.id]||r.a.b[b.target.id])&&b!==u){u&&document.getElementById(u.id).classList.remove("selected");document.getElementById(b.id).classList.add("selected");document.body.classList.remove("no-room-selected");u=b;b=void 0;var a=u.name||(u.b?u.b.name:void 0);if(!a){a=[];for(b in u.a)a.push(u.a[b].name);a=a.join(", ")}document.getElementById("currentRoomTitle").textContent=
 a}break}b.target=b.target.parentElement}}document.addEventListener("DOMContentLoaded",function(){document.getElementById("chatList").addEventListener("click",t);v()});var r;function w(){this.b=0;this.a=new p}
-w.prototype.update=function(b){b.j&&(this.b=b.j);if(b.i){for(var a=this.a,d=b.i,c=0,f=d.bots.length;c<f;c++)a.f[d.f[c].id]=new n(d.bots[c]);c=0;for(f=d.users.length;c<f;c++)a.a[d.users[c].id]=new m(d.users[c]);c=0;for(f=d.ims.length;c<f;c++){var g=h(a,d.ims[c].user);g&&(g.a=new l(g,d.ims[c]),a.h[g.a.id]=g.a)}c=0;for(f=d.channels.length;c<f;c++)a.c[d.channels[c].id]=new e(d.channels[c],a);c=0;for(f=d.groups.length;c<f;c++)a.b[d.groups[c].id]=new k(a,d.groups[c]);a.g=h(a,d.self.id);q()}b.o&&console.log("updated LIVE");
-console.log(this)};r=new w;var x=5,u=null;function y(b){var a=new XMLHttpRequest;a.timeout=6E4;a.onreadystatechange=function(){if(4===a.readyState)if(a.status){var d=null,c=2===Math.floor(a.status/100);if(c){x=5;d=a.response;try{d=JSON.parse(d)}catch(f){d=null}}else x+=Math.floor(x/2),x=Math.min(60,x);b(c,d)}else y(b),x=5};a.open("GET","api?v="+r.b,!0);a.send(null)}function z(b,a){b?(a&&r.update(a),v()):setTimeout(v,1E3*x)}function v(){y(z)};
+w.prototype.update=function(b){b.v&&(this.b=b.v);if(b["static"]){for(var a=this.a,d=b["static"],c=0,f=d.bots.length;c<f;c++)a.h[d.bots[c].id]=new n(d.bots[c]);c=0;for(f=d.users.length;c<f;c++)a.a[d.users[c].id]=new m(d.users[c]);c=0;for(f=d.ims.length;c<f;c++){var g=h(a,d.ims[c].user);g&&(g.a=new l(g,d.ims[c]),a.g[g.a.id]=g.a)}c=0;for(f=d.channels.length;c<f;c++)a.c[d.channels[c].id]=new e(d.channels[c],a);c=0;for(f=d.groups.length;c<f;c++)a.b[d.groups[c].id]=new k(a,d.groups[c]);a.f=h(a,d.self.id);
+q()}b.live&&console.log("updated LIVE");console.log(this)};r=new w;var x=5,u=null;function y(b){var a=new XMLHttpRequest;a.timeout=6E4;a.onreadystatechange=function(){if(4===a.readyState)if(a.status){var d=null,c=2===Math.floor(a.status/100);if(c){x=5;d=a.response;try{d=JSON.parse(d)}catch(f){d=null}}else x+=Math.floor(x/2),x=Math.min(60,x);b(c,d)}else y(b),x=5};a.open("GET","api?v="+r.b,!0);a.send(null)}function z(b,a){b?(a&&r.update(a),v()):setTimeout(v,1E3*x)}function v(){y(z)};

+ 1 - 1
srv/src/slackData.js

@@ -391,7 +391,7 @@ SlackBot.prototype.toStatic = function() {
 **/
 SlackData.prototype.updateStatic = function(data) {
     for (var i =0, nbBots = data["bots"].length; i < nbBots; i++)
-        this.bots[data.bots[i].id] = new SlackBot(data["bots"][i]);
+        this.bots[data["bots"][i].id] = new SlackBot(data["bots"][i]);
     for (var i =0, nbUsers = data["users"].length; i < nbUsers; i++)
         this.users[data["users"][i].id] = new SlackUser(data["users"][i]);
     for (var i =0, nbIms = data["ims"].length; i < nbIms; i++) {