Bladeren bron

[bugfix] oopsie skip OTHER persons' messages

B Thibault 8 jaren geleden
bovenliggende
commit
565af2e234
2 gewijzigde bestanden met toevoegingen van 3 en 3 verwijderingen
  1. 1 1
      cli/data.js
  2. 2 2
      srv/public/mimouchat.min.js

+ 1 - 1
cli/data.js

@@ -196,7 +196,7 @@ function onMsgReceived(ctx, chan, msg) {
             if (parseFloat(i["ts"]) <= chan.lastRead) {
                 return;
             }
-            if (i["userId"] === ctx.self.id) {
+            if (i["userId"] !== ctx.self.id) {
                 areNew = true;
                 if (chan instanceof PrivateMessageRoom || (i["text"] && (i["text"].match(selfReg) || isHighlighted(ctx, i["text"])))) {
                     if (HIGHLIGHTED_CHANS.indexOf(chan) === -1) {

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

@@ -18,7 +18,7 @@ a.toLocaleTimeString():a.toLocaleString()},xa:function(a,b){return a+"/"+b},c:{f
 G.fr.Ca=function(a,b){return"par "+a.getName()+" le "+G.fr.P(b)};G.en={Ab:"Unknown member",zb:"Unknown channel",Za:"New message",message:"Message",Ya:"Network",$a:"(only visible to you)",A:"Starred",l:"Channels",ka:"Members",eb:"Direct messages",gb:"Share your GPS location",ok:"Ok",Sa:"Cancel",P:function(a){"string"!==typeof a&&(a=parseFloat(a));var b=new Date,c=new Date;a=new Date(a);b.setHours(0,0,0,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()},xa:function(a,b){return a+"/"+b},c:{fileUploadCancel:"Cancel",neterror:"Cannot connect to chat !",ctxMenuSettings:"Settings",ctxMenuLogout:"Logout",settingTitle:"Settings","setting-menu-services":"Services","settings-services-title":"Services","setting-menu-display":"Display","settings-display-title":"Display","setting-menu-privacy":"Privacy","settings-privacy-title":"Privacy",settingCommit:"Apply","settings-serviceAddButton":"Add a service","settings-serviceListEmpty":"You don't have any service yet. Please add a service to continue.",
 "settings-serviceAddConfirm":"Next"}};G.en.ab=function(a){return 0===a?"No pinned messages":a+(1===a?" pinned message":" pinned messages")};G.en.hb=function(a){return 0===a?"No users in this room":a+(1===a?" user":" users")};G.en.F=function(a){return"(edited "+G.en.P(a)+")"};G.en.Ca=function(a,b){return"by "+a.getName()+" on "+G.en.P(b)};var za=function(){function a(a){this.text="";this.g=a}function b(b,c,d){this.Y=c;this.f=null;this.j=[];this.a=d||"";this.sa="<"===this.a;this.Aa="*"===this.a;this.ra="_"===this.a;this.ta="~"===this.a||"-"===this.a;this.h=">"===this.a||"&gt;"===this.a;this.G=":"===this.a;this.Da="`"===this.a;this.Oa="```"===this.a;this.Ea="\n"===this.a;this.qa=void 0!==d&&-1!==m.B.indexOf(d);this.g=b;this.ua=null;this.b=this.Ea||this.qa?c+d.length-1:!1;this.qa&&(this.f=new a(this),this.j.push(this.f),this.f.text=d)}
-function c(a){return"A"<=a&&"Z">=a||"a"<=a&&"z">=a||"0"<=a&&"9">=a||-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(a)}function d(a){a=a||h;for(var c=0,e=a.j.length;c<e;c++){var n=
+function c(a){return"A"<=a&&"Z">=a||"a"<=a&&"z">=a||"0"<=a&&"9">=a||-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(a)}function d(a){a=a||h;for(var c=0,e=a.j.length;c<e;c++){var n=
 a.j[c];if(n instanceof b)if(n.b){if(n=d(n))return n}else return n}return null}function e(a,c){a.g instanceof b&&(a.g.j.splice(a.g.j.indexOf(a)+(c?1:0)),a.g.f=a.g.j[a.g.j.length-1],e(a.g,!0))}function f(a){return a}function g(a){return{link:a,text:a,Va:!1}}var k,h,m={B:[],aa:f,oa:f,ja:g};b.prototype.Ga=function(){return this.Aa&&!!this.b||this.g instanceof b&&this.g.Ga()};b.prototype.Ja=function(){return this.ra&&!!this.b||this.g instanceof b&&this.g.Ja()};b.prototype.Ka=function(){return this.ta&&
 !!this.b||this.g instanceof b&&this.g.Ka()};b.prototype.ea=function(){return this.G&&!!this.b||this.g instanceof b&&this.g.ea()};b.prototype.Ia=function(){return this.qa&&!!this.b||this.g instanceof b&&this.g.Ia()};b.prototype.Ha=function(){return this.Da&&!!this.b||this.g instanceof b&&this.g.Ha()};b.prototype.da=function(){return this.Oa&&!!this.b||this.g instanceof b&&this.g.da()};b.prototype.La=function(){for(var a=0,c=this.j.length;a<c;a++)if(this.j[a]instanceof b&&(!this.j[a].b||this.j[a].La()))return!0;
 return!1};b.prototype.Ma=function(a){if("<"===this.a&&">"===k[a])return!0;var b=c(k[a-1]);if(!this.h&&k.substr(a,this.a.length)===this.a){if(!b&&(this.Aa||this.ra||this.ta))return!1;if(this.f&&this.La())return this.f.Pa();if(this.jb())return!0}return"\n"===k[a]&&this.h?!0:!1};b.prototype.jb=function(){for(var a=this;a;){for(var c=0,d=a.j.length;c<d;c++)if(a.j[c]instanceof b||a.j[c].text.length)return!0;a=a.ua}return!1};b.prototype.Pa=function(){var a=new b(this.g,this.Y,this.a);a.ua=this;this.f&&
@@ -99,7 +99,7 @@ Rb.prototype.update=function(a){var b=Date.now();a.v&&(this.b=a.v);if(a["static"
 1))});if(a.live){for(h in a.live)(c=this.a[h])?ka(c,a.live[h],b):c=this.a[h]=new Y(h,250,a.live[h],b);for(var k in a.live){var h=D(this.context,k);(c=h.l[k])?(this.a[k].a.length&&(c.S=Math.max(c.S,ma(this.a[k]).o)),c.fa||(Sb(h,c,a.live[k]),P&&a.live[P.id]&&sb())):C.b=0}}a["static"]&&gb();var m=!1;a.typing&&this.context.a.forEach(function(c){var d=m,e=a.typing,f=!1;if(c.u)for(var g in c.u)e[g]||(delete c.u[g],f=!0);if(e)for(g in e)if(c.l[g]){c.u[g]||(c.u[g]={});for(var h in e[g])c.u[g][h]||(f=!0),
 c.u[g][h]=b}m=d|f},this);(a["static"]||m)&&nb();a.config&&(Kb=new Tb(a.config),Ub()&&Gb.yb(!1).display(Gb.vb.J),Jb(Vb()));if(O&&P&&a["static"]&&a["static"][O.a.id]&&a["static"][O.a.id].channels&&a["static"][O.a.id].channels)for(k=a["static"][O.a.id].channels,h=0,c=k.length;h<c;h++)if(k[h].id===P.id){sb();break}};
 setInterval(function(){var a=!1,b=Date.now();ua(function(c){var d=!1,e;for(e in c.u){var f=!0,g;for(g in c.u[e])c.u[e][g]+3E3<b?(delete c.u[e][g],d=!0):f=!1;f&&(delete c.u[e],d=!0)}d&&(a=!0)});a&&nb()},1E3);
-function Sb(a,b,c){if(b!==P||!window.hasFocus){var d=new RegExp("<@"+a.self.id),e=!1,f=!1,g=!1;c.forEach(function(c){if(!(parseFloat(c.ts)<=b.C)&&c.userId===a.self.id){f=!0;var h;if(!(h=b instanceof t)&&(h=c.text)&&!(h=c.text.match(d)))a:{h=a.self.T.B;for(var k=0,n=h.length;k<n;k++)if(-1!==c.text.indexOf(h[k])){h=!0;break a}h=!1}h&&(-1===T.indexOf(b)&&(g=!0,T.push(b)),e=!0)}});if(f){lb();if(c=document.getElementById("room_"+b.id))c.classList.add("unread"),e&&c.classList.add("unreadHi");g&&!window.hasFocus&&
+function Sb(a,b,c){if(b!==P||!window.hasFocus){var d=new RegExp("<@"+a.self.id),e=!1,f=!1,g=!1;c.forEach(function(c){if(!(parseFloat(c.ts)<=b.C)&&c.userId!==a.self.id){f=!0;var h;if(!(h=b instanceof t)&&(h=c.text)&&!(h=c.text.match(d)))a:{h=a.self.T.B;for(var k=0,n=h.length;k<n;k++)if(-1!==c.text.indexOf(h[k])){h=!0;break a}h=!1}h&&(-1===T.indexOf(b)&&(g=!0,T.push(b)),e=!0)}});if(f){lb();if(c=document.getElementById("room_"+b.id))c.classList.add("unread"),e&&c.classList.add("unreadHi");g&&!window.hasFocus&&
 xb()}}}function tb(){var a=P,b=T.indexOf(a);if(a.S>a.C){var c=C.a[a.id];c&&(c=c.a[c.a.length-1])&&(N(new M("POST","api/markread?room="+a.id+"&id="+c.id+"&ts="+c.o)),a.C=c.o)}0<=b&&(T.splice(b,1),lb());a=document.getElementById("room_"+a.id);a.classList.remove("unread");a.classList.remove("unreadHi")}C=new Rb;var mb=function(){function a(a,c){c.sort(function(){return Math.random()-.5});for(var d=0,e=20;e<m-40;e+=l)for(var f=0;f+l<=n;f+=l)g(a,c[d],e,f),d++,d===c.length&&(c.sort(b),d=0)}function b(a,b){return a.R?b.R?Math.random()-.5:-1:1}function c(a,b){for(var e=0,f=a.length;e<f;e++)if(void 0===a[e].R){d(a[e].src,function(d){a[e].R=d;c(a,b)});return}var g=[];a.forEach(function(a){a.R&&g.push(a.R)});b(g)}function d(a,b){N(Fa(Da(Ca(new M(a),function(a,c,d){if(d){var e=new Image;e.onload=function(){var a=
 document.createElement("canvas");a.height=a.width=A;a=a.getContext("2d");a.drawImage(e,0,0,A,A);var a=a.getImageData(0,0,A,A),c=0,d;for(d=0;d<a.width*a.height*4;d+=4)a.data[d]=a.data[d+1]=a.data[d+2]=(a.data[d]+a.data[d+1]+a.data[d+2])/3,a.data[d+3]=50,c+=a.data[d];if(50>c/(a.height*a.width))for(d=0;d<a.width*a.height*4;d+=4)a.data[d]=a.data[d+1]=a.data[d+2]=255-a.data[d];b(a)};e.onerror=function(){b(null)};e.src=window.URL.createObjectURL(d)}else b(null)}),function(){b(null)}),"blob"))}function e(){var a=
 h.createLinearGradient(0,0,0,n);a.addColorStop(0,"#4D394B");a.addColorStop(1,"#201820");h.fillStyle=a;h.fillRect(0,0,m,n);return h.getImageData(0,0,m,n)}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 g(a,b,c,d){var e=Math.floor(d);a=[a.data[e*m*4+0],a.data[e*m*4+1],a.data[e*m*4+2]];h.fillStyle="#"+(1.1*a[0]<<16|1.1*a[1]<<8|1.1*a[2]).toString(16);