1
0
Эх сурвалжийг харах

[bugfix] Treat closed groups as archived

B Thibault 8 жил өмнө
parent
commit
375d240a6b

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

@@ -49,8 +49,8 @@ c.open("GET",a,!0);c.send(null)}function d(){var a=g.createLinearGradient(0,0,0,
 "#"+(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;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)}
+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",
 "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}

+ 1 - 1
srv/src/slackData.js

@@ -163,7 +163,7 @@ SlackGroup.prototype.update = function(slack, groupData) {
     this.name = memberNames.join(", ");
     this.created = groupData["created"];
     this.creator = slack.getMember(groupData["creator"]);
-    this.archived = groupData["is_archived"];
+    this.archived = groupData["is_archived"] || groupData["is_open"] === false;
     this.lastRead = parseFloat(groupData["last_read"]);
     if (groupData["topic"]) {
         this.topic = groupData["topic"]["value"];