1
0
B Thibault 8 жил өмнө
parent
commit
f41ab59305

+ 4 - 5
cli/config.js

@@ -6,7 +6,7 @@ var CONFIG;
 function Config(configData) {
     this.deviceId = null;
 
-    this.services = [];
+    this.services = {};
 
     // Load global configurations
     for (var i =0, nbConfig = configData.length; i < nbConfig; i++)
@@ -16,9 +16,8 @@ function Config(configData) {
 
 Config.prototype.mergeConfig = function(configData) {
     if (configData["services"])
-        configData["services"].forEach(function(i) {
-            if (this.services.indexOf(i) === -1)
-                this.services.push(i);
-        }, this);
+        for (var i in configData["services"]) {
+            this.services[i] = configData["services"][i];
+        }
 };
 

+ 15 - 10
cli/dom.js

@@ -23,9 +23,10 @@ function createTypingDisplay() {
 
 /**
  * @param {Room} chan
+ * @param {string|undefined} alternateChanName
  * @return {Element}
 **/
-function createChanListItem(chan) {
+function createChanListItem(chan, alternateChanName) {
     var dom = document.createElement("li")
         ,link = document.createElement("a");
 
@@ -39,7 +40,7 @@ function createChanListItem(chan) {
     }
     if (SELECTED_ROOM === chan)
         dom.classList.add(R.klass.selected);
-    link.textContent = chan.name;
+    link.textContent = alternateChanName || chan.name;
     dom.appendChild(createTypingDisplay());
     dom.appendChild(link);
     if (chan.lastMsg > chan.lastRead) {
@@ -66,16 +67,17 @@ var createChanListHeader = (function() {
 
 /**
  * @param {PrivateMessageRoom} ims
+ * @param {string|undefined} alternateChanName
  * @return {Element}
 **/
-function createImsListItem(ims) {
+function createImsListItem(ims, alternateChanName) {
     var dom = document.createElement("li")
         ,link = document.createElement("a");
 
     dom.id = "room_" +ims.id;
     link.href = '#' +ims.id;
     dom.className = R.klass.chatList.entry + " " +R.klass.chatList.typeDirect;
-    link.textContent = ims.user.name;
+    link.textContent = alternateChanName || ims.user.name;
     dom.appendChild(createTypingDisplay());
     dom.appendChild(link);
 
@@ -239,19 +241,22 @@ function doCreateMessageDom(msg, skipAttachment) {
 function createMessageGroupDom(user, userName) {
     var dom = document.createElement("div")
         ,authorBlock = document.createElement("div")
-        ,authorName = document.createElement("span");
+        ,authorName = document.createElement("span")
+        ,authorImg = document.createElement("img");
 
-    dom.authorImg = document.createElement("img")
-    dom.authorImg.className = R.klass.msg.authorAvatar;
+    dom.authorImgWrapper = document.createElement("span")
+    dom.authorImgWrapper.className = R.klass.msg.authorAvatarWrapper;
+    authorImg.className = R.klass.msg.authorAvatar;
     authorName.className = R.klass.msg.authorname;
     if (user) {
         authorName.textContent = user.name;
-        dom.authorImg.src = user.getSmallIcon();
+        authorImg.src = user.getSmallIcon();
     } else {
         authorName.textContent = userName || "?";
-        dom.authorImg.src = "";
+        authorImg.src = "";
     }
-    authorBlock.appendChild(dom.authorImg);
+    dom.authorImgWrapper.appendChild(authorImg);
+    authorBlock.appendChild(dom.authorImgWrapper);
     authorBlock.appendChild(authorName);
     authorBlock.className = R.klass.msg.author;
     dom.className = R.klass.msg.authorGroup;

+ 1 - 0
cli/emojiBar.js

@@ -13,6 +13,7 @@ var EMOJI_BAR = (function() {
         emojiDetailName = document.createElement("span"),
         /** @type {function((string|null))|undefined} */
         emojiSelectedHandler,
+        /** @type {ChatContext} */
         context,
 
     /** @type {function():boolean} */

+ 16 - 1
cli/lang/en.js

@@ -38,9 +38,24 @@ lang["en"] = {
         return dateObj.toLocaleString();
     },
 
+    chanName: function(serviceName, chanName) {
+        return serviceName +'/' +chanName;
+    },
+
     dom: {
         "fileUploadCancel": "Cancel",
-        "neterror": "Cannot connect to chat !"
+        "neterror": "Cannot connect to chat !",
+
+        "setting-menu-services": "services",
+        "settings-services-title": "services",
+        "setting-menu-display": "Display",
+        "settings-display-title": "Display",
+        "setting-menu-privacy": "Privacy",
+        "settings-privacy-title": "Privacy",
+
+        "settings-serviceAddButton": "Add a service",
+        "settings-serviceListEmpty": "You don't have any service yet. Please add a service to continue.",
+        "settings-serviceAddConfirm": "Next"
     }
 };
 

+ 16 - 1
cli/lang/fr.js

@@ -38,9 +38,24 @@ lang["fr"] = {
         return dateObj.toLocaleString();
     },
 
+    chanName: function(serviceName, chanName) {
+        return serviceName +'/' +chanName;
+    },
+
     dom: {
         "fileUploadCancel": "Annuler",
-        "neterror": "Impossible de se connecter au chat !"
+        "neterror": "Impossible de se connecter au chat !",
+
+        "setting-menu-services": "services",
+        "settings-services-title": "services",
+        "setting-menu-display": "Affichage",
+        "settings-display-title": "Affichage",
+        "setting-menu-privacy": "Vie privée",
+        "settings-privacy-title": "Vie privée",
+
+        "settings-serviceAddButton": "Ajouter un service",
+        "settings-serviceListEmpty": "Vous n'avez pas encore ajouté de service. Ajouter un service pour continuer.",
+        "settings-serviceAddConfirm": "Suivant"
     }
 };
 

+ 8 - 0
cli/resources.js

@@ -27,6 +27,13 @@ var R = {
             wrapper: "settings",
             menu: {
                 list: "settingMenuItems"
+            },
+            services: {
+                addButton: "settings-serviceAddButton",
+                addSection: "settings-serviceAddSection",
+
+                serviceProviderList: "settings-serviceAddServiceList",
+                serviceAddConfirm: "settings-serviceAddConfirm"
             }
         },
         favicon: "linkFavicon"
@@ -93,6 +100,7 @@ var R = {
             author: "slackmsg-author",
             authorname: "slackmsg-author-name",
             authorAvatar: "slackmsg-author-img",
+            authorAvatarWrapper: "slackmsg-author-img-wrapper",
             authorMessages: "slackmsg-author-messages",
             msg: "slackmsg-msg",
             editedStatus: "edited",

+ 23 - 11
cli/ui.js

@@ -26,20 +26,30 @@ function onContextUpdated() {
         starred = [],
         channels = [],
         privs = [],
-        priv = [];
+        priv = [],
+        chanNames = {};
 
     sortedChans.sort(function(a, b) {
         if (a[0] !== b[0]) {
             return a[0] - b[0];
         }
-        return DATA.context.getChannel(a).name.localeCompare(DATA.context.getChannel(b).name);
+        var aChanCtx = DATA.context.getChannelContext(a).getChatContext(),
+            bChanCtx = DATA.context.getChannelContext(b).getChatContext(),
+            aChan = aChanCtx.channels[a],
+            bChan = bChanCtx.channels[b];
+        if (aChan.name === bChan.name) {
+            chanNames[aChan.id] = locale.chanName(aChanCtx.team.name, aChan.name);
+            chanNames[bChan.id] = locale.chanName(bChanCtx.team.name, bChan.name);
+            return aChanCtx.team.name.localeCompare(bChanCtx.team.name);
+        }
+        return aChan.name.localeCompare(bChan.name);
     });
     sortedChans.forEach(function(chanId) {
         var chan = DATA.context.getChannel(chanId),
             chanListItem;
         if (chan instanceof PrivateMessageRoom) {
             if (!chan.user.deleted) {
-                if ((chanListItem = createImsListItem(chan))) {
+                if ((chanListItem = createImsListItem(chan, chanNames[chan.id]))) {
                     if (chan.starred)
                         starred.push(chanListItem);
                     else
@@ -48,7 +58,7 @@ function onContextUpdated() {
             }
             //FIXME else remove
         } else {
-            if ((chanListItem = createChanListItem(chan))) {
+            if ((chanListItem = createChanListItem(chan, chanNames[chan.id]))) {
                 if (chan.starred)
                     starred.push(chanListItem);
                 else if (chan.isPrivate)
@@ -385,6 +395,7 @@ function onRoomUpdated() {
     content.appendChild(chatFrag);
     //TODO scroll lock
     content.scrollTop = content.scrollHeight -content.clientHeight;
+    updateAuthorAvatarImsOffset();
     if (window.hasFocus)
         markRoomAsRead(SELECTED_ROOM);
 }
@@ -400,12 +411,11 @@ function onMsgClicked(target, msg) {
             onReplyingToUpdated();
         }
     } else if (target.classList.contains(R.klass.msg.hover.reaction)) {
-        EMOJI_BAR.spawn(document.body, {
-                selectedRoomId: SELECTED_ROOM.id,
-                msgId: msg.id
-            }, function(emoji) {
-                if (emoji)
-                    addReaction(this.selectedRoomId, this.msgId, emoji);
+        var currentRoomId = SELECTED_ROOM.id,
+            currentMsgId = msg.id;
+        EMOJI_BAR.spawn(document.body, SELECTED_CONTEXT, function(emoji) {
+            if (emoji)
+                addReaction(currentRoomId, currentMsgId, emoji);
         });
     } else if (target.classList.contains(R.klass.msg.hover.edit)) {
         if (REPLYING_TO) {
@@ -514,12 +524,14 @@ function updateAuthorAvatarImsOffset() {
         chatTop = chatDom.getBoundingClientRect().top;
 
     MSG_GROUPS.forEach(function(group) {
-        var imgDom = group.authorImg,
+        var imgDom = group.authorImgWrapper,
             imgSize = imgDom.clientHeight,
             domRect = group.getBoundingClientRect(),
             _top = 0;
 
         imgDom.style.top = Math.max(0, Math.min(chatTop -domRect.top, domRect.height -imgSize -(imgSize /2))) +"px";
+        imgDom.dataset["debugval"] = chatTop -domRect.top;
+        imgDom.dataset["debugmax"] = domRect.height -imgSize -(imgSize /2);
     });
 }
 

+ 1 - 1
cli/uiMessage.js

@@ -9,7 +9,7 @@
  * @param {number|undefined} now
 **/
 function UiRoomHistory(room, keepMessages, evts, now) {
-    RoomHistory.call(this, room, keepMessages, evts, now);
+    RoomHistory.call(this, room, keepMessages, 0, evts, now);
 }
 UiRoomHistory.prototype = Object.create(RoomHistory.prototype);
 UiRoomHistory.prototype.constructor = UiRoomHistory;

+ 14 - 0
cli/uiSettings.js

@@ -18,6 +18,8 @@ var Settings = (function() {
         if (currentPage) {
             document.getElementById(R.id.settings.wrapper).classList.remove("display-" +currentPage);
             document.getElementById("setting-menu-" +currentPage).classList.remove(R.klass.selected);
+
+            document.getElementById(R.id.settings.services.addSection).classList.remove(R.klass.hidden);
         }
         document.getElementById(R.id.settings.wrapper).classList.add("display-" +page);
         document.getElementById("setting-menu-" +page).classList.add(R.klass.selected);
@@ -37,6 +39,18 @@ var Settings = (function() {
         }
     });
 
+    document.getElementById(R.id.settings.services.addButton).addEventListener("click", function(e) {
+        e.preventDefault();
+        document.getElementById(R.id.settings.services.addSection).classList.remove(R.klass.hidden);
+        return false;
+    });
+
+    document.getElementById(R.id.settings.services.serviceAddConfirm).addEventListener("click", function(e) {
+        e.preventDefault();
+        document.location.href = document.getElementById(R.id.settings.services.serviceProviderList).value;
+        return false;
+    });
+
     return {
         /** @type {function(string=)} */
         display: function(page) {

+ 28 - 3
cli/workflow.js

@@ -45,13 +45,37 @@ function initHljs() {
  * @param {function(boolean)} cb
 **/
 function fetchHistory(room, cb) {
-    var xhr = new XMLHttpRequest();
+    var xhr = new XMLHttpRequest(),
+        self = this;
     xhr.open('GET', 'api/hist?room=' +room.id, true);
+    xhr.onreadystatechange = function(e) {
+        if (xhr.readyState === 4) {
+            if (xhr.response) {
+                var resp = xhr.response;
+                try {
+                    resp = JSON.parse(/** @type {string} */ (resp));
+                } catch (e) {}
+                var history = DATA.history[room.id],
+                    updated;
+                if (!history) {
+                    history = DATA.history[room.id] = new UiRoomHistory(room, 250, /** @type {Array} */ (resp), Date.now());
+                    updated = true;
+                } else {
+                    updated = !!history.pushAll(/** @type {Array} */ (resp), Date.now());
+                }
+                if (updated) {
+                    onMsgReceived(DATA.context.getChannelContext(room.id).getChatContext(), room, /** @type {Array} */ (resp));
+                    if (room === SELECTED_ROOM)
+                        onRoomUpdated();
+                }
+            } // TODO ui stop loading
+        }
+    };
     xhr.send(null);
 }
 
 function onConfigUpdated() {
-    if (!CONFIG.services.length) {
+    if (isObjectEmpty(CONFIG.services)) {
         Settings.setClosable(false).display(Settings.pages.services);
     }
 }
@@ -146,7 +170,8 @@ function selectRoom(room) {
     createContextBackground(SELECTED_CONTEXT.getChatContext().team.id, SELECTED_CONTEXT.getChatContext().users, function(imgData) {
         document.getElementById(R.id.context).style.backgroundImage = 'url(' +imgData +')';
     });
-    if (SELECTED_ROOM.lastMsg !== 0 && !DATA.history[SELECTED_ROOM.id])
+    console.log(new Date(SELECTED_ROOM.created));
+    if (!DATA.history[SELECTED_ROOM.id] || !DATA.history[SELECTED_ROOM.id].messages.length < 100)
         fetchHistory(SELECTED_ROOM, function(success) {});
 }
 

+ 109 - 103
srv/public/slack.min.js

@@ -1,104 +1,110 @@
 "use strict";(function(){
-var q;function aa(a){this.id=a;this.version=0}aa.prototype.update=function(a,b){void 0!==a.name&&(this.name=a.name);this.version=Math.max(this.version,b)};function da(a){this.a=a.desc;this.name=a.name;this.type=a.type;this.usage=a.usage;this.R=a.category}function ea(){this.ja={};this.w=[];this.version=0}
-ea.prototype.update=function(a,b){a.emoji_use&&(this.ja=JSON.parse(a.emoji_use));a.highlight_words?this.w=(a.highlight_words||"").split(",").filter(function(a){return""!==a.trim()}):a.highlights&&(this.w=a.highlights);this.version=Math.max(this.version,b)};function fa(){this.b=null;this.l={};this.m={};this.self=null;this.a={version:0,data:{}};this.i={version:0,data:{}};this.s={};this.D=0}
-function ga(a,b,c){var d=d||"";b.team&&(a.b||(a.b=new aa(b.team.id)),a.b.update(b.team,c));if(b.users)for(var e=0,g=b.users.length;e<g;e++){var f=a.m[d+b.users[e].id];f||(f=a.m[d+b.users[e].id]=new ha(b.users[e].id));f.update(b.users[e],c)}if(b.channels)for(e=0,g=b.channels.length;e<g;e++){f=a.l[d+b.channels[e].id];if(!f){var f=a.l,n=d+b.channels[e].id;var h=b.channels[e];h=h.pv?new r(h.id,a.m[h.user]):new u(h.id);f=f[n]=h}f.update(b.channels[e],a,c,d)}b.emojis&&(a.a.data=b.emojis,a.a.version=c);
-if(void 0!==b.commands){a.i.data={};for(e in b.commands)a.i.data[e]=new da(b.commands[e]);a.i.version=c}b.self&&(a.self=a.m[d+b.self.id]||null,b.self.prefs&&(a.self.O||(a.self.O=new ea),a.self.O.update(b.self.prefs,c)));a.D=Math.max(a.D,c)}"undefined"!==typeof module&&(module.H.cb=fa,module.H.eb=aa,module.H.gb=da);function u(a){this.id=a;this.J=!1;this.A=0;this.m={};this.version=0}
-u.prototype.update=function(a,b,c,d){d=d||"";void 0!==a.name&&(this.name=a.name);void 0!==a.is_archived&&(this.Z=a.is_archived);void 0!==a.is_member&&(this.i=a.is_member);void 0!==a.last_read&&(this.A=Math.max(parseFloat(a.last_read),this.A));void 0!==a.last_msg&&(this.I=parseFloat(a.last_msg));void 0!==a.is_private&&(this.b=a.is_private);void 0!==a.is_starred&&(this.J=a.is_starred);if(a.members&&(this.m={},a.members))for(var e=0,g=a.members.length;e<g;e++){var f=b.m[d+a.members[e]];this.m[f.id]=
-f;f.l[this.id]=this}this.version=Math.max(this.version,c)};function r(a,b){u.call(this,a);this.a=b;this.name=this.a.name;this.b=!0;b.oa=this}r.prototype=Object.create(u.prototype);r.prototype.constructor=r;"undefined"!==typeof module&&(module.H.mb=u,module.H.lb=r);function y(a,b){this.G=a.user;this.username=a.username;this.id=a.id||a.ts;this.j=parseFloat(a.ts);this.text="";this.o=[];this.i=this.C=this.J=!1;this.B={};this.version=b;this.update(a,b)}function A(a,b){y.call(this,a,b)}function C(a,b){y.call(this,a,b)}
-y.prototype.update=function(a,b){if(a){if(this.text=a.text||"",a.attachments&&(this.o=a.attachments),this.J=!!a.is_starred,this.C=void 0===a.edited?!1:a.edited,this.i=!!a.removed,a.reactions){var c={};a.reactions.forEach(function(a){c[a.name]=[];a.users.forEach(function(b){c[a.name].push(b)})});this.B=c}}else this.i=!0;this.version=b};function D(a,b,c,d){this.id="string"===typeof a?a:a.id;this.a=[];this.Oa=0;this.i=b;c&&ia(this,c,d)}
-function ia(a,b,c){var d=0;b.forEach(function(a){d=Math.max(this.push(a,c),d)}.bind(a));ja(a)}D.prototype.b=function(a,b){return!0===a.isMeMessage?new A(a,b):!0===a.isNotice?new C(a,b):new y(a,b)};D.prototype.push=function(a,b){for(var c,d=!1,e,g=0,f=this.a.length;g<f;g++)if(c=this.a[g],c.id===a.id){e=c.update(a,b);d=!0;break}d||(c=this.b(a,b),this.a.push(c),e=c.j);for(;this.a.length>this.i;)this.a.shift();return e||0};function ka(a){return a.a[a.a.length-1]}
-function la(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 ja(a){a.a.sort(function(a,c){return a.j-c.j})}A.prototype=Object.create(y.prototype);A.prototype.constructor=A;C.prototype=Object.create(y.prototype);C.prototype.constructor=C;"undefined"!==typeof module&&(module.H={ib:y,hb:A,kb:C,nb:D});function ha(a){this.id=a;this.l={};this.oa=this.O=null;this.version=0}ha.prototype.update=function(a,b){void 0!==a.name&&(this.name=a.name);void 0!==a.deleted&&(this.Ea=a.deleted);void 0!==a.status&&(this.status=a.status);void 0!==a.presence&&(this.a="away"!==a.presence);void 0!==a.isPresent&&(this.a=a.isPresent);a.isBot&&(this.Ua=a.isBot);this.version=Math.max(this.version,b)};"undefined"!==typeof module&&(module.H.fb=ha);function ma(){this.a=[]}ma.prototype.push=function(a){this.a.push(a)};function na(a,b){for(var c=0,d=a.a.length;c<d;c++)if(b===oa(a.a[c]))return a.a[c];return null}function pa(a,b){for(var c=0,d=a.a.length;c<d;c++){var e=a.a[c],g;for(g in e.l)if(!0===b(e.l[g],g))return}}function qa(a){for(var b=E.context,c=0,d=b.a.length;c<d&&!0!==a(b.a[c]);c++);}function H(a,b){for(var c=0,d=a.a.length;c<d;c++)if(a.a[c].l[b])return a.a[c];return null}
-function I(a){for(var b=E.context,c=0,d=b.a.length;c<d;c++){var e=b.a[c].l[a];if(e)return e}return null}function ra(a){for(var b=E.context,c=[],d=0,e=b.a.length;d<e;d++){var g=b.a[d].l,f;for(f in g)a&&!a(g[f],b.a[d],f)||c.push(f)}return c}function J(a){for(var b=E.context,c=0,d=b.a.length;c<d;c++){var e=b.a[c].m[a];if(e)return e}return null}function sa(a){for(var b=E.context,c=0,d=b.a.length;c<d;c++)if(b.a[c].self.id===a)return!0;return!1}"undefined"!==typeof module&&(module.H.jb=ma);var K={},L,ta=[];function ua(){if(!c){for(var a=0,b=navigator.languages.length;a<b;a++)if(K.hasOwnProperty(navigator.languages[a])){var c=navigator.languages[a];break}c||(c="en")}L=K[c];console.log("Loading language pack: "+c);if(L.c)for(var d in L.c)if(c=document.getElementById(d))c.textContent=L.c[d];ta.forEach(function(a){a()})};K.fr={bb:"Utilisateur inconnu",ab:"Channel inconnu",Ja:"Nouveau message",message:"Message",Ia:"Reseau",Ka:"(visible seulement par vous)",J:"Favoris",l:"Discutions",Ma:"Discutions priv\u00e9es",Na:"Partage sa position GPS",ok:"Ok",Fa:"Annuler",X: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()?"hier, "+a.toLocaleTimeString():
-a.toLocaleString()},c:{fileUploadCancel:"Annuler",neterror:"Impossible de se connecter au chat !"}};K.fr.C=function(a){return"(edit&eacute; "+K.fr.X(a)+")"};K.en={bb:"Unknown member",ab:"Unknown channel",Ja:"New message",message:"Message",Ia:"Network",Ka:"(only visible to you)",J:"Starred",l:"Channels",Ma:"Direct messages",Na:"Share your GPS location",ok:"Ok",Fa:"Cancel",X: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()},
-c:{fileUploadCancel:"Cancel",neterror:"Cannot connect to chat !"}};K.en.C=function(a){return"(edited "+K.en.X(a)+")"};var va=function(){function a(a){this.text="";this.g=a}function b(b,c,d){this.U=c;this.f=null;this.h=[];this.a=d||"";this.ea="<"===this.a;this.pa="*"===this.a;this.da="_"===this.a;this.fa="~"===this.a||"-"===this.a;this.i=">"===this.a||"&gt;"===this.a;this.Y=":"===this.a;this.ra="`"===this.a;this.Ca="```"===this.a;this.sa="\n"===this.a;this.ca=void 0!==d&&-1!==m.w.indexOf(d);this.g=b;this.ga=null;this.b=this.sa||this.ca?c+d.length-1:!1;this.ca&&(this.f=new a(this),this.h.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.h.length;c<e;c++){var l=
-a.h[c];if(l instanceof b)if(l.b){if(l=d(l))return l}else return l}return null}function e(a,c){a.g instanceof b&&(a.g.h.splice(a.g.h.indexOf(a)+(c?1:0)),a.g.f=a.g.h[a.g.h.length-1],e(a.g,!0))}function g(a){return a}function f(a){return{link:a,text:a,Ha:!1}}var n,h,m={w:[],W:g,ba:g,$:f};b.prototype.ua=function(){return this.pa&&!!this.b||this.g instanceof b&&this.g.ua()};b.prototype.xa=function(){return this.da&&!!this.b||this.g instanceof b&&this.g.xa()};b.prototype.ya=function(){return this.fa&&!!this.b||
-this.g instanceof b&&this.g.ya()};b.prototype.ma=function(){return this.Y&&!!this.b||this.g instanceof b&&this.g.ma()};b.prototype.wa=function(){return this.ca&&!!this.b||this.g instanceof b&&this.g.wa()};b.prototype.va=function(){return this.ra&&!!this.b||this.g instanceof b&&this.g.va()};b.prototype.la=function(){return this.Ca&&!!this.b||this.g instanceof b&&this.g.la()};b.prototype.za=function(){for(var a=0,c=this.h.length;a<c;a++)if(this.h[a]instanceof b&&(!this.h[a].b||this.h[a].za()))return!0;
-return!1};b.prototype.Aa=function(a){if("<"===this.a&&">"===n[a])return!0;var b=c(n[a-1]);if(!this.i&&n.substr(a,this.a.length)===this.a){if(!b&&(this.pa||this.da||this.fa))return!1;if(this.f&&this.za())return this.f.Da();if(this.Pa())return!0}return"\n"===n[a]&&this.i?!0:!1};b.prototype.Pa=function(){for(var a=this;a;){for(var c=0,d=a.h.length;c<d;c++)if(a.h[c]instanceof b||a.h[c].text.length)return!0;a=a.ga}return!1};b.prototype.Da=function(){var a=new b(this.g,this.U,this.a);a.ga=this;this.f&&
-this.f instanceof b&&(a.f=this.f.Da(),a.h=[a.f]);return a};b.prototype.Qa=function(a){return this.Y&&(" "===n[a]||"\t"===n[a])||(this.Y||this.ea||this.pa||this.da||this.fa||this.ra)&&"\n"===n[a]?!1:!0};b.prototype.Ra=function(b){if(this.ra||this.Y||this.Ca||this.ea)return null;if(!this.f||this.f.b||this.f instanceof a){var d=c(n[b-1]),e=c(n[b+1]);if("```"===n.substr(b,3))return"```";var f=h.na();if(void 0===f||f){if("&gt;"===n.substr(b,4))return"&gt;";if(">"===n[b])return n[b]}if("`"===n[b]&&!d||
-"\n"===n[b]||!(-1===["*","~","-","_"].indexOf(n[b])||!e&&void 0!==n[b+1]&&-1==="*~-_<&".split("").indexOf(n[b+1])||d&&void 0!==n[b-1]&&-1==="*~-_<&".split("").indexOf(n[b-1]))||-1!==[":"].indexOf(n[b])&&e||-1!==["<"].indexOf(n[b]))return n[b];d=0;for(e=m.w.length;d<e;d++)if(f=m.w[d],n.substr(b,f.length)===f)return f}return null};a.prototype.na=function(){if(""!==this.text.trim())return!1};b.prototype.na=function(){for(var a=this.h.length-1;0<=a;a--){var b=this.h[a].na();if(void 0!==b)return b}if(this.sa||
-this.i)return!0};a.prototype.D=function(a){this.text+=n[a];return 1};b.prototype.D=function(c){var d=this.f&&!this.f.b&&this.f.Aa?this.f.Aa(c):null;if(d){var e=this.f.a.length;this.f.ta(c);d instanceof b&&(this.f=d,this.h.push(d));return e}if(!this.f||this.f.b||this.f instanceof a||this.f.Qa(c)){if(d=this.Ra(c))return this.f=new b(this,c,d),this.h.push(this.f),this.f.a.length;if(!this.f||this.f.b)this.f=new a(this),this.h.push(this.f);return this.f.D(c)}d=this.f.U+1;h.ka(this.f.U);this.f=new a(this);
-this.f.D(d-1);this.h.pop();this.h.push(this.f);return d-c};b.prototype.ta=function(a){for(var b=this;b;)b.b=a,b=b.ga};b.prototype.ka=function(a){this.b&&this.b>=a&&(this.b=!1);this.h.forEach(function(c){c instanceof b&&c.ka(a)})};a.prototype.innerHTML=function(){if(this.g.ma()){for(var a=this.g;a&&!a.Y;)a=a.g;if(a){var a=a.a+this.text+a.a,b=m.W(a);return b?b:a}return(a=m.W(this.text))?a:this.text}if(this.g.la()){if("undefined"!==typeof hljs)try{return a=this.text.match(/^\w+/),hljs.configure({useBR:!0,
-tabReplace:"&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"}),a&&hljs.getLanguage(a[0])?hljs.fixMarkup(hljs.highlight(a[0],this.text.substr(a[0].length)).value):hljs.fixMarkup(hljs.highlightAuto(this.text).value)}catch(p){console.error(p)}return this.text.replace(/\n/g,"<br/>")}return m.ba(this.text)};a.prototype.outerHTML=function(){var a="span",b=[],c="";if(this.g.la()){a="pre";b.push("codeblock");var d=this.innerHTML()}else this.g.va()?(b.push("code"),d=this.innerHTML()):(this.g.ea&&(d=m.$(this.text))?(a=
-"a",c=' href="'+d.link+'"',d.Ha||(c+=' target="_blank"'),d=m.ba(d.text)):d=this.innerHTML(),this.g.ua()&&b.push("bold"),this.g.xa()&&b.push("italic"),this.g.ya()&&b.push("strike"),this.g.ma()&&b.push("emoji"),this.g.wa()&&b.push("highlight"));return"<"+a+c+(b.length?' class="'+b.join(" ")+'"':"")+">"+d+"</"+a+">"};b.prototype.outerHTML=function(){var a="";this.i&&(a+='<span class="quote">');this.sa&&(a+="<br/>");this.h.forEach(function(b){a+=b.outerHTML()});this.i&&(a+="</span>");return a};b.prototype.Ba=
-function(a){this.i&&!this.b&&this.ta(a);this.h.forEach(function(c){c instanceof b&&c.Ba(a)})};return function(c,k){k||(k={});m.w=k.w||[];m.W=k.W||g;m.ba=k.ba||g;m.$=k.$||f;n=c;h=new b(this,0);k=0;c=n.length;do{for(;k<c;)k+=h.D(k);h.Ba(n.length);if(k=d()){e(k,!1);h.ka(k.U);var l=new a(k.g);l.D(k.U);k.g.h.push(l);k.g.f=l;k=k.U+1}else k=void 0}while(void 0!==k);return h.outerHTML()}}();"undefined"!==typeof module&&(module.H.u=va);function wa(a,b){this.i=a;this.content=b;this.c=xa(this);this.b=ya(this);this.a=[];this.D=[]}
-function xa(a){var b=document.createElement("div"),c=document.createElement("header"),d=document.createElement("span"),e=document.createElement("span"),g=document.createElement("div"),f=document.createElement("footer");b.a=document.createElement("span");b.b=document.createElement("span");d.textContent=a.i;"string"==typeof a.content?g.innerHTML=a.content:g.appendChild(a.content);c.className=za;d.className=Aa;e.className=Ba;e.textContent="x";c.appendChild(d);c.appendChild(e);b.appendChild(c);g.className=
-Ca;b.appendChild(g);b.b.className=Da;b.b.textContent=L.Fa;b.b.addEventListener("click",function(){M(a,!1)});e.addEventListener("click",function(){M(a,!1)});b.a.addEventListener("click",function(){M(a,!0)});f.appendChild(b.b);b.a.className=Da;b.a.textContent=L.ok;f.appendChild(b.a);f.className=Ea+" "+Fa;b.appendChild(f);b.className=Ga;return b}function M(a,b){(b?a.a:a.D).forEach(function(a){a()});a.close()}
-function ya(a){var b=document.createElement("div");b.className=Ha;b.addEventListener("click",function(){M(this,!1)}.bind(a));return b}function Ia(a,b,c){a.c.a.textContent=b;a.c.b.textContent=c;return a}wa.prototype.aa=function(a){a=a||document.body;a.appendChild(this.b);a.appendChild(this.c);return this};wa.prototype.close=function(){this.c.remove();this.b.remove();return this};function Ja(a,b){a.a.push(b);return a};var Da="button",Ea="button-container",Ga="dialog",Ha="dialog-overlay",za="dialog-title",Aa="dialog-title-label",Ba="dialog-title-close",Ca="dialog-body",Fa="dialog-footer";var Ka=[],La=0;
-function Ma(){var a=document.createDocumentFragment(),b=ra(function(a){return!a.Z&&!1!==a.i}),c=[],d=[],e=[],g=[];b.sort(function(a,b){return a[0]!==b[0]?a[0]-b[0]:I(a).name.localeCompare(I(b).name)});b.forEach(function(a){a=I(a);if(a instanceof r){var b;if(b=!a.a.Ea){var f=document.createElement("li");b=document.createElement("a");f.id="room_"+a.id;b.href="#"+a.id;f.className="slack-context-room slack-ims";b.textContent=a.a.name;f.appendChild(Na());f.appendChild(b);a.a.a||f.classList.add("away");N===
-a&&f.classList.add("selected");a.I>a.A&&(f.classList.add("unread"),f.classList.add("unreadHi"));b=f}b&&(a.J?c.push(f):g.push(f))}else f=document.createElement("li"),b=document.createElement("a"),f.id="room_"+a.id,b.href="#"+a.id,a.b?(f.className="slack-context-room slack-group",f.dataset.count=Object.keys(a.m||{}).length):f.className="slack-context-room slack-channel",N===a&&f.classList.add("selected"),b.textContent=a.name,f.appendChild(Na()),f.appendChild(b),a.I>a.A&&(f.classList.add("unread"),0<=
-O.indexOf(a)&&f.classList.add("unreadHi")),f&&(a.J?c.push(f):a.b?e.push(f):d.push(f))});c.length&&a.appendChild(Oa(L.J));c.forEach(function(b){a.appendChild(b)});d.length&&a.appendChild(Oa(L.l));d.forEach(function(b){a.appendChild(b)});e.forEach(function(b){a.appendChild(b)});g.length&&a.appendChild(Oa(L.Ma));g.forEach(function(b){a.appendChild(b)});document.getElementById("chanList").textContent="";document.getElementById("chanList").appendChild(a);Pa();P();Q&&Qa(Q.b.id,Q.m,function(a){document.getElementById("slackCtx").style.backgroundImage=
-"url("+a+")"})}function Ra(){qa(function(a){var b=a.s,c;for(c in a.self.l)if(!a.self.l[c].Z){var d=document.getElementById("room_"+c);b[c]?d.classList.add("slack-context-typing"):d.classList.remove("slack-context-typing")}for(var e in a.m)(c=a.m[e].oa)&&!c.Z&&(d=document.getElementById("room_"+c.id))&&(b[c.id]?d.classList.add("slack-context-typing"):d.classList.remove("slack-context-typing"))});Sa()}
-function Sa(){var a;document.getElementById("whoistyping").textContent="";if(Q&&N&&(a=Q.s[N.id])){var b=document.createDocumentFragment(),c=!1,d;for(d in a)(a=J(d))?b.appendChild(Ta(a)):c=!0;c&&(E.b=0);document.getElementById("whoistyping").appendChild(b)}}function Ua(a){a?document.body.classList.remove("no-network"):document.body.classList.add("no-network");P()}
-function Va(){var a=N.name||(N.a?N.a.name:void 0);if(!a){var b=[];N.m.forEach(function(a){b.push(a.name)});a=b.join(", ")}document.getElementById("currentRoomTitle").textContent=a;Wa();R();document.getElementById("fileUploadContainer").classList.add("hidden");Xa();T&&(T=null,U());V&&(V=null,U());Sa()}
-function U(){if(T){document.body.classList.add("replyingTo");var a=document.getElementById("replyToContainer"),b=document.createElement("a");b.addEventListener("click",function(){T=null;U()});b.className="replyto-close";b.textContent="x";a.textContent="";a.appendChild(b);a.appendChild(T.L())}else document.body.classList.remove("replyingTo"),document.getElementById("replyToContainer").textContent="";R()}
-function W(){if(V){document.body.classList.add("replyingTo");var a=document.getElementById("replyToContainer"),b=document.createElement("a");b.addEventListener("click",function(){V=null;W()});b.className="replyto-close";b.textContent="x";a.textContent="";a.appendChild(b);a.appendChild(V.L());document.getElementById("msgInput").value=V.text}else document.body.classList.remove("replyingTo"),document.getElementById("replyToContainer").textContent="";R()}
-window.toggleReaction=function(a,b,c){var d=E.a[a],e,g;(d=E.a[a])&&(e=la(d,b))&&(g=H(E.context,a))&&(e.B[c]&&-1!==e.B[c].indexOf(g.self.id)?(d=new XMLHttpRequest,d.open("DELETE","api/reaction?room="+a+"&msg="+b+"&reaction="+encodeURIComponent(c),!0),d.send(null)):Ya(a,b,c))};
-function Za(a){a:{var b={};if(Q){var c;for(c=Q;!b[a];){if(c=c.a.data[a])if("alias:"==c.substr(0,6))b[a]=!0,a=c.substr(6);else{a=document.createElement("span");a.className="emoji-custom emoji";a.style.backgroundImage="url('"+c+"')";break a}break}}}"string"===typeof a&&"makeEmoji"in window&&(a=window.makeEmoji(a));return"string"===typeof a?null:a}function $a(a,b){document.getElementById("linkFavicon").href=a||b?"favicon.png?h="+a+"&m="+b:"favicon_ok.png"}
-function P(){var a=O.length,b="";if(X)b="!"+L.Ia+" - ",document.getElementById("linkFavicon").href="favicon_err.png";else if(a)b="(!"+a+") - ",$a(a,a);else{var c=0;pa(E.context,function(a){a.I>a.A&&c++});c&&(b="("+c+") - ");$a(0,c)}E.context.b&&(b+=E.context.b.name);document.title=b}
-function ab(){if("Notification"in window)if("granted"===Notification.permission){var a=Date.now();if(La+3E4<a){var b=new Notification(L.Ja);La=a;setTimeout(function(){b.close()},5E3)}}else"denied"!==Notification.permission&&Notification.requestPermission()}
-function Wa(){var a=document.createDocumentFragment(),b=N.id,c=null,d=0,e=null,g;Ka=[];E.a[b]&&E.a[b].a.forEach(function(b){if(b.i)b.S();else{var f=b.M(),h=!1;c&&c.G===b.G&&b.G?30>Math.abs(d-b.j)&&!(b instanceof A)?e.classList.add("slackmsg-same-ts"):d=b.j:(d=b.j,h=!0);(!c||c.j<=N.A)&&b.j>N.A?f.classList.add("slackmsg-first-unread"):f.classList.remove("slackmsg-first-unread");if(b instanceof A)e=c=null,d=0,a.appendChild(f),g=null;else{if(h||!g){var h=J(b.G),m=b.username,l=document.createElement("div"),
-k=document.createElement("div"),p=document.createElement("span");l.V=document.createElement("img");l.V.className="slackmsg-author-img";p.className="slackmsg-author-name";h?(p.textContent=h.name,l.V.src="api/avatar?user="+h.id):(p.textContent=m||"?",l.V.src="");k.appendChild(l.V);k.appendChild(p);k.className="slackmsg-author";l.className="slackmsg-authorGroup";l.appendChild(k);l.content=document.createElement("div");l.content.className="slackmsg-author-messages";l.appendChild(l.content);g=l;Ka.push(g);
-a.appendChild(g)}c=b;e=f;g.content.appendChild(f)}}});b=document.getElementById("chatWindow");b.textContent="";b.appendChild(a);b.scrollTop=b.scrollHeight-b.clientHeight;window.hasFocus&&Xa()}
-function bb(a,b){a.classList.contains("slackmsg-hover-reply")?(V&&(V=null,W()),T!==b&&(T=b,U())):a.classList.contains("slackmsg-hover-reaction")?cb.aa(document.body,{Za:N.id,Wa:b.id},function(a){a&&Ya(this.Za,this.Wa,a)}):a.classList.contains("slackmsg-hover-edit")?(T&&(T=null,U()),V!==b&&(V=b,W())):a.classList.contains("slackmsg-hover-remove")&&(T&&(T=null,U()),V&&(V=null,W()),db(b))}
-function eb(a){function b(a,b){for(b=b||a.target;b!==a.currentTarget&&b;){if(b.id&&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");){var d;if(c.parentElement&&c.classList.contains("slackmsg-attachment-actions-item")){var e=c.dataset.attachmentIndex,g=c.dataset.actionIndex;if((d=b(a,c))&&void 0!==e&&void 0!==g){d=d.substr(d.lastIndexOf("_")+1);(a=la(E.a[N.id],d))&&a.o[e]&&a.o[e].actions&&a.o[e].actions[g]&&
-fb(a,a.o[e],a.o[e].actions[g]);break}}if(c.parentElement&&c.parentElement.classList.contains("slackmsg-hover")){if(d=b(a,c))d=d.substr(d.lastIndexOf("_")+1),(a=la(E.a[N.id],d))&&bb(c,a);break}c=c.parentElement}}
-function fb(a,b,c){function d(){var d={actions:[c],attachment_id:b.id,callback_id:b.callback_id,channel_id:e,is_ephemeral:a instanceof C,message_ts:a.id},f=new XMLHttpRequest;f.open("POST","api/attachmentAction?serviceId="+a.G);f.send(JSON.stringify(d))}var e=N.id;c.confirm?Ja(Ia(new wa(c.confirm.title,c.confirm.text),c.confirm.ok_text,c.confirm.dismiss_text),d).aa():d()}function R(){document.getElementById("msgInput").focus()}
-function Pa(){var a=document.location.hash.substr(1),b=I(a);b&&b!==N?gb(b):(a=J(a))&&a.b&&gb(a.b)}function hb(){var a=document.getElementById("chatWindow").getBoundingClientRect().top;Ka.forEach(function(b){var c=b.V,d=c.clientHeight;b=b.getBoundingClientRect();c.style.top=Math.max(0,Math.min(a-b.top,b.height-d-d/2))+"px"})}
-document.addEventListener("DOMContentLoaded",function(){ua();ib();document.getElementById("chatWindow").addEventListener("click",eb);window.addEventListener("hashchange",function(){document.location.hash&&"#"===document.location.hash[0]&&Pa()});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),jb(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();N&&document.getElementById("fileUploadContainer").classList.remove("hidden");return!1});document.getElementById("msgForm").addEventListener("submit",function(a){a.preventDefault();a=document.getElementById("msgInput");N&&a.value&&kb(a.value)&&(a.value="",T&&(T=null,U()),V&&(V=null,U()),document.getElementById("slashList").textContent="");R();return!1});window.addEventListener("blur",function(){window.hasFocus=
-!1});window.addEventListener("focus",function(){window.hasFocus=!0;La=0;N&&Xa();R()});document.getElementById("chatWindow").addEventListener("scroll",hb);var a=0;document.getElementById("msgInput").addEventListener("input",function(){if(N){var b=Date.now();a+3E3<b&&(Q.self.a||N instanceof r)&&(lb(),a=b);var b=[],c=this.value;if("/"===this.value[0]){var d=c.indexOf(" "),e=-1!==d,d=-1===d?c.length:d,c=c.substr(0,d);if(e){var g=mb.Ga(c);g&&b.push(g)}else b=mb.Sa(c);var g=Q?Q.i.data:{};for(n in g){var f=
-g[n];(!e&&f.name.substr(0,d)===c||e&&f.name===c)&&b.push(f)}}b.sort(function(a,b){return a.R.localeCompare(b.R)||a.name.localeCompare(b.name)});var n=document.getElementById("slashList");var d=document.createDocumentFragment();n.textContent="";e=0;for(c=b.length;e<c;e++){g=b[e];if(h!==g.R){var h=g.R;d.appendChild(nb(g.R))}d.appendChild(ob(g))}n.appendChild(d)}});window.hasFocus=!0;(function(){var a=document.getElementById("emojiButton");if("makeEmoji"in window){var c=window.makeEmoji("smile");c?a.innerHTML=
-"<span class='emoji-small'>"+c.outerHTML+"</span>":a.style.backgroundImage='url("smile.svg")';(c=window.makeEmoji("paperclip"))?document.getElementById("attachFile").innerHTML="<span class='emoji-small'>"+c.outerHTML+"</span>":document.getElementById("attachFile").style.backgroundImage='url("public/paperclip.svg")';a.addEventListener("click",function(){Q&&cb.aa(document.body,Q,function(a){a&&(document.getElementById("msgInput").value+=":"+a+":");R()})})}else a.classList.add("hidden")})();pb()});var qb=function(){function a(a){c&&(document.getElementById("settings").classList.remove("display-"+c),document.getElementById("setting-menu-"+c).classList.remove("selected"));document.getElementById("settings").classList.add("display-"+a);document.getElementById("setting-menu-"+a).classList.add("selected");c=a}var b=!1,c=null,d={T:"services",display:"display",ob:"privacy"};document.getElementById("settingMenuItems").addEventListener("click",function(b){for(var c=b.target;b.currentTarget!==c&&c;c=
-c.parentNode)if(c.dataset&&c.dataset.target)for(var e in d)if(d[e]===c.dataset.target){a(d[e]);return}});return{display:function(c){b||(document.getElementById("settings").classList.remove("hidden"),b=!0);a(c||d.T);return this},$a:function(){return this},Xa:d}}();function rb(a){if(void 0!==a.latitude&&void 0!==a.longitude&&-90<=a.latitude&&90>=a.latitude&&-180<=a.longitude&&180>=a.longitude){var b=0,c=function(a,b,c,d){return new Promise(function(e,f){var g=new Image;g.addEventListener("load",function(){d.N=g;e(d)});g.addEventListener("error",function(){console.warn("Error loading tile ",{zoom:a,x:b,y:c});f(g)});g.crossOrigin="anonymous";g.src="https://c.tile.openstreetmap.org/"+a+"/"+b+"/"+c+".png"})},d=document.createElement("canvas"),e=document.createElement("canvas");
-d.height=d.width=e.height=e.width=300;var g=d.getContext("2d"),f=e.getContext("2d"),n=function(a,b,c){a=a*Math.PI/180;b=b*Math.PI/180;c=c*Math.PI/180;return Math.abs(6371E3*Math.acos(Math.pow(Math.sin(a),2)+Math.pow(Math.cos(a),2)*Math.cos(c-b)))},h=function(a,d,e,h){f.fillStyle="#808080";f.fillRect(0,0,300,300);g.fillStyle="#808080";g.fillRect(0,0,300,300);var k=Math.pow(2,a),l=(e+180)/360*k,m=(1-Math.log(Math.tan(d*Math.PI/180)+1/Math.cos(d*Math.PI/180))/Math.PI)/2*k,F=Math.floor(l),ba=Math.floor(m),
-ca=h?100*h/n(180/Math.PI*Math.atan(.5*(Math.exp(Math.PI-2*Math.PI*ba/k)-Math.exp(-(Math.PI-2*Math.PI*ba/k)))),F/k*360-180,(F+1)/k*360-180):0;d=b;for(e=0;3>e;e++)for(h=0;3>h;h++)c(a,F+e-1,ba+h-1,{Ta:e,Va:h,Oa:d}).then(function(a){if(a.Oa===b){f.drawImage(a.N,100*a.Ta,100*a.Va,100,100);a=l-F;var c=m-ba;a=100*a+100;c=100*c+100;g.putImageData(f.getImageData(0,0,300,300),0,0);void 0!==ca&&(g.beginPath(),g.arc(a,c,Math.max(ca,10),0,2*Math.PI,!1),g.lineWidth=2,g.fillStyle="rgba(244, 146, 66, 0.4)",g.strokeStyle=
-"rgba(244, 146, 66, 0.8)",g.stroke(),g.fill());if(void 0===ca||25<ca)g.strokeStyle="rgba(244, 146, 66, 1)",g.beginPath(),g.moveTo(a-5,c-5),g.lineTo(a+5,c+5),g.stroke(),g.moveTo(a+5,c-5),g.lineTo(a-5,c+5),g.stroke()}})},m,l=function(c){c=Math.max(4,Math.min(19,c));m!==c&&(b++,m=c,h(m,Number(a.latitude),Number(a.longitude),Number(a.accuracy)))};l(12);var e=document.createElement("div"),k=document.createElement("div"),p=document.createElement("button"),t=document.createElement("button");e.className=
-"OSM-wrapper";d.className="OSM-canvas";k.className="OSM-controls";t.className="OSM-controls-zoomMin";p.className="OSM-controls-zoomPlus";t.addEventListener("click",function(){l(m-1)});p.addEventListener("click",function(){l(m+1)});k.appendChild(t);k.appendChild(p);e.appendChild(d);e.appendChild(k);return e}};function Na(){var a=document.createElement("span"),b=document.createElement("span"),c=document.createElement("span"),d=document.createElement("span");a.className="typing-container";b.className="typing-dot1";c.className="typing-dot2";d.className="typing-dot3";b.textContent=c.textContent=d.textContent=".";a.appendChild(b);a.appendChild(c);a.appendChild(d);return a}var Oa=function(){var a={};return function(b){var c=a[b];c||(c=a[b]=document.createElement("header"),c.textContent=b);return c}}();
-function sb(a){var b=a.b,c=document.createElement("div"),d=document.createElement("div"),e=document.createElement("ul"),g=document.createElement("li");c.o=document.createElement("ul");c.B=document.createElement("ul");c.j=document.createElement("div");c.qa=document.createElement("div");c.ia=document.createElement("span");c.id=b+"_"+a.id;c.className="slackmsg-item";c.j.className="slackmsg-ts";c.qa.className="slackmsg-msg";c.ia.className="slackmsg-author-name";e.className="slackmsg-hover";g.className=
-"slackmsg-hover-reply";e.appendChild(g);if("makeEmoji"in window){var f=document.createElement("li"),n=window.makeEmoji("arrow_heading_down"),h=window.makeEmoji("smile"),m=window.makeEmoji("pencil2"),b=window.makeEmoji("x");f.className="slackmsg-hover-reaction";h?(f.classList.add("emoji-small"),f.appendChild(h)):f.style.backgroundImage='url("smile.svg")';n?(g.classList.add("emoji-small"),g.appendChild(n)):g.style.backgroundImage='url("repl.svg")';e.appendChild(f);sa(a.G)&&(a=document.createElement("li"),
-a.className="slackmsg-hover-edit",m?a.classList.add("emoji-small"):a.style.backgroundImage='url("edit.svg")',a.appendChild(m),e.appendChild(a),a=document.createElement("li"),a.className="slackmsg-hover-remove",b?a.classList.add("emoji-small"):a.style.backgroundImage='url("remove.svg")',a.appendChild(b),e.appendChild(a))}else g.style.backgroundImage='url("repl.svg")',sa(a.G)&&(a=document.createElement("li"),a.className="slackmsg-hover-edit",a.style.backgroundImage='url("edit.svg")',e.appendChild(a),
-a=document.createElement("li"),a.className="slackmsg-hover-remove",a.style.backgroundImage='url("remove.svg")',e.appendChild(a));d.appendChild(c.ia);d.appendChild(c.qa);d.appendChild(c.j);d.appendChild(c.o);c.C=document.createElement("div");c.C.className="slackmsg-edited";d.appendChild(c.C);d.appendChild(c.B);d.className="slackmsg-content";c.o.className="slackmsg-attachments";c.B.className="slackmsg-reactions";c.appendChild(d);c.appendChild(e);return c}
-function tb(a){var b={good:"#2fa44f",warning:"#de9e31",danger:"#d50200"};if(a){if("#"===a[0])return a;if(b[a])return b[a]}return"#e3e4e6"}
-function ub(a,b,c){var d=document.createElement("li"),e=document.createElement("div"),g=document.createElement("div"),f=document.createElement("a"),n=document.createElement("div"),h=document.createElement("img"),m=document.createElement("a"),l=document.createElement("div"),k=document.createElement("div"),p=document.createElement("div"),t=document.createElement("img"),v=document.createElement("div");d.className="slackmsg-attachment";e.style.borderColor=tb(b.color||"");e.className="slackmsg-attachment-block";
-g.className="slackmsg-attachment-pretext";b.pretext?g.innerHTML=a.u(b.pretext):g.classList.add("hidden");f.target="_blank";b.title?(f.innerHTML=a.u(b.title),b.title_link&&(f.href=b.title_link),f.className="slackmsg-attachment-title"):f.className="hidden slackmsg-attachment-title";m.target="_blank";n.className="slackmsg-author";b.author_name&&(m.innerHTML=a.u(b.author_name),m.href=b.author_link||"",m.className="slackmsg-author-name",h.className="slackmsg-author-img",b.author_icon&&(h.src=b.author_icon,
-n.appendChild(h)),n.appendChild(m));p.className="slackmsg-attachment-thumb";b.thumb_url?(h=document.createElement("img"),h.src=b.thumb_url,p.appendChild(h),e.classList.add("has-thumb"),b.video_html&&(p.dataset.video=b.video_html)):p.classList.add("hidden");l.className="slackmsg-attachment-content";h=a.u(b.text||"");k.className="slackmsg-attachment-text";h&&""!=h?k.innerHTML=h:k.classList.add("hidden");l.appendChild(p);l.appendChild(k);b.geo&&(k=rb(b.geo))&&l.appendChild(k);t.className="slackmsg-attachment-img";
-b.image_url?t.src=b.image_url:t.classList.add("hidden");v.className="slackmsg-attachment-footer";b.footer&&(k=document.createElement("span"),k.className="slackmsg-attachment-footer-text",k.innerHTML=a.u(b.footer),b.footer_icon&&(p=document.createElement("img"),p.src=b.footer_icon,p.className="slackmsg-attachment-footer-icon",v.appendChild(p)),v.appendChild(k));b.ts&&(k=document.createElement("span"),k.className="slackmsg-ts",k.innerHTML=L.X(b.ts),v.appendChild(k));e.appendChild(f);e.appendChild(n);
-e.appendChild(l);e.appendChild(t);if(b.fields&&b.fields.length){var w=document.createElement("ul");e.appendChild(w);w.className="slackmsg-attachment-fields";b.fields.forEach(function(b){var c=b.title||"",d=b.value||"";b=!!b["short"];var e=document.createElement("li"),g=document.createElement("div"),f=document.createElement("div");e.className="field";b||e.classList.add("field-long");g.className="field-title";g.textContent=c;f.className="field-text";f.innerHTML=a.u(d);e.appendChild(g);e.appendChild(f);
-e&&w.appendChild(e)})}if(b.actions&&b.actions.length)for(f=document.createElement("ul"),f.className="slackmsg-attachment-actions "+Ea,e.appendChild(f),n=0,l=b.actions.length;n<l;n++)(t=b.actions[n])&&(t=vb(c,n,t))&&f.appendChild(t);e.appendChild(v);d.appendChild(g);d.appendChild(e);return d}
-function vb(a,b,c){var d=document.createElement("li"),e=tb(c.style);d.textContent=c.text;e!==tb()&&(d.style.color=e);d.style.borderColor=e;d.dataset.attachmentIndex=a;d.dataset.actionIndex=b;d.className="slackmsg-attachment-actions-item "+Da;return d}function Ta(a){var b=document.createElement("li"),c=document.createElement("span");c.textContent=a.name;b.appendChild(Na());b.appendChild(c);return b}
-function nb(a){var b=document.createElement("lh");b.textContent=a;b.className="slack-command-header";return b}
-function ob(a){var b=document.createElement("li"),c=document.createElement("span"),d=document.createElement("span"),e=document.createElement("span");c.textContent=a.name;d.textContent=a.usage;e.textContent=a.a;b.appendChild(c);b.appendChild(d);b.appendChild(e);b.className="slack-command-item";c.className="slack-command-name";d.className="slack-command-usage";e.className="slack-command-desc";return b};var cb=function(){function a(a,b){for(a=a.target;a!==h&&a&&"LI"!==a.nodeName;)a=a.parentElement;a&&"LI"===a.nodeName&&a.id&&"emojibar-"===a.id.substr(0,9)?b(a.id.substr(9)):b(null)}function b(){if(!c())return!1;G&&G(null);return!0}function c(){return h.parentElement?(h.parentElement.removeChild(m),h.parentElement.removeChild(h),!0):!1}function d(a){var b=0;a=void 0===a?t.value:a;if(n()){var c=0,d=window.searchEmojis(a),f=e(d,S.self.O.ja),h;for(l in v)v[l].visible&&(v[l].visible=!1,k.removeChild(v[l].c));
-var l=0;for(h=f.length;l<h;l++){var m=f[l].name,z=v[m];if(!z){var z=v,F=m;var G=m;var m=window.makeEmoji(d[m]),x=document.createElement("span");x.appendChild(m);x.className="emoji-medium";G=g(G,x);z=z[F]=G}z.visible||(z.visible=!0,k.appendChild(z.c));c++}b+=c}l=b;var c=0;for(B in w)w[B].visible&&(w[B].visible=!1,p.removeChild(w[B].c));d=e(S.a.data,S.self.O.ja);var B=0;for(b=d.length;B<b;B++)F=d[B].name,""!==a&&F.substr(0,a.length)!==a||"alias:"===S.a.data[F].substr(0,6)||(f=w[F],f||(f=w,z=h=F,F=S.a.data[F],
-G=document.createElement("span"),m=document.createElement("span"),G.className="emoji emoji-custom",G.style.backgroundImage='url("'+F+'")',m.appendChild(G),m.className="emoji-medium",z=g(z,m),f=f[h]=z),f.visible||(f.visible=!0,p.appendChild(f.c)),c++);return l+c}function e(a,b){var c=[],d;for(d in a){var e={name:d,La:0,count:0};if(a[d].names)for(var f=0,g=a[d].names.length;f<g;f++)e.count+=b[a[d].names[f]]||0;c.push(e)}return c=c.sort(function(a,b){var c=b.count-a.count;return c?c:a.La-b.La})}function g(a,
-b){var c=document.createElement("li");c.appendChild(b);c.className="emojibar-list-item";c.id="emojibar-"+a;return{visible:!1,c:c}}function f(a){var b=document.createElement("img"),c=document.createElement("div");b.src=a;c.appendChild(b);c.className="emojibar-header";return c}function n(){return"searchEmojis"in window}var h=document.createElement("div"),m=document.createElement("div"),l=document.createElement("div"),k=document.createElement("ul"),p=document.createElement("ul"),t=document.createElement("input"),
-v={},w={},x=document.createElement("div"),B=document.createElement("span"),z=document.createElement("span"),G,S;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";l.className="emojibar-emojis";x.className="emojibar-detail";B.className="emojibar-detail-img";z.className="emojibar-detail-name";k.className=p.className="emojibar-list";t.className="emojibar-search";
-x.appendChild(B);x.appendChild(z);l.appendChild(f(window.emojiProviderHeader));l.appendChild(k);l.appendChild(f("emojicustom.png"));l.appendChild(p);h.appendChild(l);h.appendChild(x);h.appendChild(t);t.addEventListener("keyup",function(){d()});h.addEventListener("mousemove",function(b){a(b,function(a){var b=a?v[a]||w[a]:null;b?(B.innerHTML=b.c.outerHTML,z.textContent=":"+a+":"):(B.textContent="",z.textContent="")})});h.addEventListener("click",function(b){a(b,function(a){a&&c()&&G&&G(a)})});return{isSupported:n,
-aa:function(a,b,c){return n()?(S=b,G=c,a.appendChild(m),a.appendChild(h),t.value="",d(),t.focus(),!0):!1},search:d,close:b}}();var E,O=[];function wb(){fa.call(this)}wb.prototype=Object.create(fa.prototype);wb.prototype.constructor=wb;function oa(a){return a.b?a.b.id:null}function xb(){this.b=0;this.context=new ma;this.a={}}
-xb.prototype.update=function(a){var b=Date.now();a.v&&(this.b=a.v);if(a["static"])for(e in a["static"]){var c=na(this.context,e);c||(c=new wb,this.context.push(c));ga(c,a["static"][e],b)}pa(this.context,function(a){a.I===a.A&&(a=O.indexOf(a),-1!==a&&O.splice(a,1))});if(a.live){for(e in a.live)(c=this.a[e])?ia(c,a.live[e],b):c=this.a[e]=new Y(e,250,a.live[e],b);for(var d in a.live){var e=H(this.context,d);(c=e.l[d])?(this.a[d].a.length&&(c.I=Math.max(c.I,ka(this.a[d]).j)),c.Z||(yb(e,c,a.live[d]),N&&
-a.live[N.id]&&Wa())):E.b=0}}a["static"]&&Ma();var g=!1;a.typing&&this.context.a.forEach(function(c){var d=g,e=a.typing,f=!1;if(c.s)for(var l in c.s)e[l]||(delete c.s[l],f=!0);if(e)for(l in e)if(c.l[l]){c.s[l]||(c.s[l]={});for(var k in e[l])c.s[l][k]||(f=!0),c.s[l][k]=b}g=d|f},this);(a["static"]||g)&&Ra();a.config&&(zb=new Ab(a.config),zb.T.length||qb.$a(!1).display(qb.Xa.T))};
-setInterval(function(){var a=!1,b=Date.now();qa(function(c){var d=!1,e;for(e in c.s){var g=!0,f;for(f in c.s[e])c.s[e][f]+3E3<b?(delete c.s[e][f],d=!0):g=!1;g&&(delete c.s[e],d=!0)}d&&(a=!0)});a&&Ra()},1E3);
-function yb(a,b,c){if(b!==N||!window.hasFocus){var d=new RegExp("<@"+a.self.id),e=!1,g=!1,f=!1;c.forEach(function(c){if(!(parseFloat(c.ts)<=b.A)){g=!0;var h;if(!(h=b instanceof r)&&(h=c.text)&&!(h=c.text.match(d)))a:{h=a.self.O.w;for(var m=0,l=h.length;m<l;m++)if(-1!==c.text.indexOf(h[m])){h=!0;break a}h=!1}h&&(-1===O.indexOf(b)&&(f=!0,O.push(b)),e=!0)}});if(g){P();if(c=document.getElementById("room_"+b.id))c.classList.add("unread"),e&&c.classList.add("unreadHi");f&&!window.hasFocus&&ab()}}}
-function Xa(){var a=N,b=O.indexOf(a);if(a.I>a.A){var c=E.a[a.id];if(c&&(c=c.a[c.a.length-1])){var d=new XMLHttpRequest;d.open("POST","api/markread?room="+a.id+"&id="+c.id+"&ts="+c.j,!0);d.send(null);a.A=c.j}}0<=b&&(O.splice(b,1),P());a=document.getElementById("room_"+a.id);a.classList.remove("unread");a.classList.remove("unreadHi")}E=new xb;var Qa=function(){function a(a,c){c.sort(function(){return Math.random()-.5});for(var d=0,e=20;e<m-40;e+=k)for(var g=0;g+k<=l;g+=k)f(a,c[d],e,g),d++,d===c.length&&(c.sort(b),d=0)}function b(a,b){return a.N?b.N?Math.random()-.5:-1:1}function c(a,b){for(var e=0,g=a.length;e<g;e++)if(void 0===a[e].N){d(a[e].src,function(d){a[e].N=d;c(a,b)});return}var f=[];a.forEach(function(a){a.N&&f.push(a.N)});b(f)}function d(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=v;c=c.getContext("2d");c.drawImage(a,0,0,v,v);var c=c.getImageData(0,0,v,v),d=0,e;for(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.onerror=function(){b(null)};a.src=window.URL.createObjectURL(c.response)}else b(null)};
-c.open("GET",a,!0);c.send(null)}function e(){var a=h.createLinearGradient(0,0,0,l);a.addColorStop(0,"#4D394B");a.addColorStop(1,"#201820");h.fillStyle=a;h.fillRect(0,0,m,l);return h.getImageData(0,0,m,l)}function g(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 f(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);h.beginPath();h.moveTo(c+k/2,d+p);h.lineTo(c-p+k,d+k/2);h.lineTo(c+k/2,d-p+k);h.lineTo(c+p,d+k/2);h.closePath();h.fill();h.putImageData(g(h.getImageData(c+p,d+p,t,t),b),c+p,d+p)}var n=document.createElement("canvas"),h=n.getContext("2d"),m=n.width=250,l=n.height=290,k=(m-40)/3,p=.1*k,t=Math.floor(k-2*p),v=.5*t,w={},x={},B={};return function(b,d,g){if(w[b])g(w[b]);else if(B[b])x[b]?x[b].push(g):x[b]=[g];else{var f=e(),h=[];B[b]=!0;x[b]?x[b].push(g):
-x[b]=[g];for(var k in d)d[k].Ea||d[k].Ua||h.push({src:"api/avatar?user="+d[k].id});c(h,function(c){a(f,c);w[b]=n.toDataURL();x[b].forEach(function(a){a(w[b])})})}}}();var X=0,N=null,Q=null,T=null,V=null;function ib(){var a=new XMLHttpRequest;a.timeout=6E4;a.onreadystatechange=function(){if(4===a.readyState){var b=document.createElement("script");b.innerHTML=a.response;b.language="text/javascript";document.head.innerHTML+='<link href="hljs-androidstudio.css" rel="stylesheet"/>';document.body.appendChild(b)}};a.open("GET","highlight.pack.js",!0);a.send(null)}function Bb(){var a=new XMLHttpRequest;a.open("GET","api/hist?room="+N.id,!0);a.send(null)}
-function Cb(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,Ua(!0));c=b.response;try{c=JSON.parse(c)}catch(e){c=null}}else X?(X+=Math.floor((X||5)/2),X=Math.min(60,X)):(X=5,Ua(!1));a(d,c)}else X&&(X=0,Ua(!0)),Cb(a)};b.open("GET","api?v="+E.b,!0);b.send(null)}function lb(){var a=new XMLHttpRequest;a.open("POST","api/typing?room="+N.id,!0);a.send(null)}
-function Db(a,b){a?(b&&E.update(b),pb()):setTimeout(pb,1E3*X)}function pb(){Cb(Db)}function gb(a){N&&document.getElementById("room_"+N.id).classList.remove("selected");document.getElementById("room_"+a.id).classList.add("selected");document.body.classList.remove("no-room-selected");N=a;Q=H(E.context,a.id);Va();Qa(Q.b.id,Q.m,function(a){document.getElementById("slackCtx").style.backgroundImage="url("+a+")"});N.I&&!E.a[N.id]&&Bb()}
-function jb(a,b,c){var d=N;new FileReader;var e=new FormData,g=new XMLHttpRequest;e.append("file",b);e.append("filename",a);g.onreadystatechange=function(){4===g.readyState&&(204===g.status?c(null):c(g.statusText))};g.open("POST","api/file?room="+d.id);g.send(e)}
-function Eb(a,b,c){var d=new XMLHttpRequest;b="api/msg?room="+a.id+"&text="+encodeURIComponent(b);c&&(b+="&attachments="+encodeURIComponent(JSON.stringify([{fallback:c.text,author_name:J(c.G).name,text:c.text,footer:a.b?L.message:a.name,ts:c.j}])));d.open("POST",b,!0);d.send(null)}
-function kb(a){if(V){var b=new XMLHttpRequest;b.open("PUT","api/msg?room="+N.id+"&ts="+V.id+"&text="+encodeURIComponent(a),!0);b.send(null);return!0}if("/"===a[0]){var c=a.indexOf(" "),b=a.substr(0,-1===c?void 0:c);a=-1===c?"":a.substr(c);var c=Q,d=mb.Ga(b);return d?(d.exec(c,N,a.trim()),!0):c&&(b=c.i.data[b])?(c=new XMLHttpRequest,c.open("POST","api/cmd?room="+N.id+"&cmd="+encodeURIComponent(b.name.substr(1))+"&args="+encodeURIComponent(a.trim()),!0),c.send(null),!0):!1}Eb(N,a,T);return!0}
-function db(a){var b=new XMLHttpRequest;b.open("DELETE","api/msg?room="+N.id+"&ts="+a.id,!0);b.send(null)}function Ya(a,b,c){var d=new XMLHttpRequest;d.open("POST","api/reaction?room="+a+"&msg="+b+"&reaction="+encodeURIComponent(c),!0);d.send(null)};function Y(a,b,c,d){D.call(this,a,b,c,d)}Y.prototype=Object.create(D.prototype);Y.prototype.constructor=Y;Y.prototype.b=function(a,b){return!0===a.isMeMessage?new Fb(this.id,a,b):!0===a.isNotice?new Gb(this.id,a,b):new Hb(this.id,a,b)};
-var Z=function(){function a(a,d){return va(d,{w:a.context.self.O.w,W:function(a){":"===a[0]&&":"===a[a.length-1]&&(a=a.substr(1,a.length-2));if(a=Za(a)){var b=document.createElement("span");b.className="emoji-small";b.appendChild(a);return b.outerHTML}return null},$:function(c){return b(a,c)}})}function b(a,b){var c=b.indexOf("|");if(-1===c)var d=b;else{d=b.substr(0,c);var f=b.substr(c+1)}if("@"===d[0])if(d=oa(a.context)+"|"+d.substr(1),f=J(d))a=!0,d="#"+f.oa.id,f="@"+f.name;else return null;else if("#"===
-d[0])if(d=oa(a.context)+"|"+d.substr(1),f=I(d))a=!0,d="#"+d,f="#"+f.name;else return null;else{if(!d.match(/^(https?|mailto):\/\//i))return null;a=!1}return{link:d,text:f||d,Ha:a}}return{F:function(a){a.P=!0;return a},S:function(a){a.c&&a.c.parentElement&&(a.c.remove(),delete a.c);return a},M:function(a){a.c?a.P&&(a.P=!1,a.K()):a.ha().K();return a.c},K:function(b){var c=J(b.G);b.c.j.innerHTML=L.X(b.j);b.c.qa.innerHTML=a(b,b.text);b.c.ia.textContent=c?c.name:b.username||"?";for(var c=document.createDocumentFragment(),
-e=0,g=b.o.length;e<g;e++){var f=b.o[e];f&&(f=ub(b,f,e))&&c.appendChild(f)}b.c.o.textContent="";b.c.o.appendChild(c);c=b.b;e=document.createDocumentFragment();if(b.B)for(var n in b.B){var g=c,f=b.id,h=n,m=b.B[n],l=Za(h);if(l){for(var k=document.createElement("li"),p=document.createElement("a"),t=document.createElement("span"),v=document.createElement("span"),w=[],x=0,B=m.length;x<B;x++){var z=J(m[x]);z&&w.push(z.name)}w.sort();v.textContent=w.join(", ");t.appendChild(l);t.className="emoji-small";p.href=
-"javascript:toggleReaction('"+g+"', '"+f+"', '"+h+"')";p.appendChild(t);p.appendChild(v);k.className="slackmsg-reaction-item";k.appendChild(p);g=k}else console.warn("Reaction id not found: "+h),g=null;g&&e.appendChild(g)}b.c.B.textContent="";b.c.B.appendChild(e);b.C&&(b.c.C.innerHTML=L.C(b.C),b.c.classList.add("edited"));return b},L:function(a){return a.c.cloneNode(!0)},u:function(b,d){return a(b,d)}}}();
-function Fb(a,b,c){y.call(this,b,c);this.context=H(E.context,a);this.b=a;this.c=Z.c;this.P=Z.P}Fb.prototype=Object.create(A.prototype);q=Fb.prototype;q.constructor=Fb;q.F=function(){return Z.F(this)};q.u=function(a){return Z.u(this,a)};q.S=function(){return Z.S(this)};q.M=function(){return Z.M(this)};q.ha=function(){this.c=sb(this);this.c.classList.add("slackmsg-me_message");return this};q.L=function(){return Z.L(this)};q.K=function(){Z.K(this);return this};
-q.update=function(a,b){A.prototype.update.call(this,a,b);this.F()};function Hb(a,b,c){y.call(this,b,c);this.context=H(E.context,a);this.b=a;this.c=Z.c;this.P=Z.P}Hb.prototype=Object.create(y.prototype);q=Hb.prototype;q.constructor=Hb;q.F=function(){return Z.F(this)};q.u=function(a){return Z.u(this,a)};q.S=function(){return Z.S(this)};q.M=function(){return Z.M(this)};q.ha=function(){this.c=sb(this);return this};q.L=function(){return Z.L(this)};q.K=function(){Z.K(this);return this};
-q.update=function(a,b){y.prototype.update.call(this,a,b);this.F();if(a=this.text.match(/^<?https:\/\/www\.openstreetmap\.org\/\?mlat=(-?[0-9\.]+)(&amp;|&)mlon=(-?[0-9\.]+)(&amp;|&)macc=([0-9\.]+)[^\s]*/))this.text=this.text.substr(0,a.index)+this.text.substr(a.index+a[0].length).trim(),this.o.unshift({color:"#008000",text:a[0],footer:"Open Street Map",footer_icon:"https://www.openstreetmap.org/assets/favicon-32x32-36d06d8a01933075bc7093c9631cffd02d49b03b659f767340f256bb6839d990.png",geo:{latitude:a[1],
-longitude:a[3],accuracy:a[5]}})};function Gb(a,b,c){y.call(this,b,c);this.context=H(E.context,a);this.b=a;this.a=null;this.P=!0}Gb.prototype=Object.create(C.prototype);q=Gb.prototype;q.constructor=Gb;q.F=function(){return Z.F(this)};q.u=function(a){return Z.u(this,a)};q.S=function(){this.a&&this.a.parentElement&&(this.a.remove(),delete this.a);this.c&&delete this.c;return this};q.M=function(){Z.M(this);return this.a};q.L=function(){return this.a.cloneNode(!0)};
-q.ha=function(){this.c=sb(this);this.a=document.createElement("span");this.c.classList.add("slackmsg-notice");this.a.className="slackmsg-notice";this.a.textContent=L.Ka;this.a.appendChild(this.c);return this};q.K=function(){Z.K(this);return this};q.update=function(a,b){C.prototype.update.call(this,a,b);this.F()};var zb;function Ab(a){this.T=[];for(var b=0,c=a.length;b<c;b++)null===a[b].service&&null===a[b].device&&Ib(this,JSON.parse(a[b].config))}function Ib(a,b){b.services&&b.services.forEach(function(a){-1===this.T.indexOf(a)&&this.T.push(a)},a)};var mb=function(){var a=[];return{Ga:function(b){for(var c=0,d=a.length;c<d;c++)if(-1!==a[c].names.indexOf(b))return a[c];return null},Sa:function(b){var c=[];a.forEach(function(a){for(var d=0,g=a.names.length;d<g;d++)if(a.names[d].substr(0,b.length)===b){c.push(a);break}});return c},Ya:function(b){b.R="client";b.exec=b.exec.bind(b);a.push(b)}}}();function Jb(){return new Promise(function(a,b){"geolocation"in window.navigator?navigator.geolocation.getCurrentPosition(function(c){c?a(c):b("denied")}):b("geolocation not available")})}
-ta.push(function(){mb.Ya({name:"/sherlock",names:["/sherlock","/sharelock"],usage:"",description:L.Na,exec:function(a,b){Jb().then(function(a){var c=a.coords.latitude,e=a.coords.longitude;Eb(b,"https://www.openstreetmap.org/?mlat="+c+"&mlon="+e+"&macc="+a.coords.accuracy+"#map=17/"+c+"/"+e)}).catch(function(a){console.error("Error: ",a)})}})});
-})();
+2017-08-31 19:48:41
+Full thread dump OpenJDK 64-Bit Server VM (25.131-b11 mixed mode):
+
+"SIGINT handler" #11 daemon prio=9 os_prio=0 tid=0x00007f850400a800 nid=0x57e9 waiting for monitor entry [0x00007f85186d4000]
+   java.lang.Thread.State: BLOCKED (on object monitor)
+	at java.lang.Shutdown.halt(Shutdown.java:139)
+	- waiting to lock <0x00000000facc4f30> (a java.lang.Shutdown$Lock)
+	at java.lang.Shutdown.exit(Shutdown.java:194)
+	- locked <0x00000000facc4f20> (a java.lang.Shutdown$Lock)
+	at java.lang.Terminator$1.handle(Terminator.java:52)
+	at sun.misc.Signal$1.run(Signal.java:212)
+	at java.lang.Thread.run(Thread.java:748)
+
+"SIGINT handler" #10 daemon prio=9 os_prio=0 tid=0x00007f8504009000 nid=0x57e7 runnable [0x00007f852c188000]
+   java.lang.Thread.State: RUNNABLE
+	at java.lang.Shutdown.halt0(Native Method)
+	at java.lang.Shutdown.halt(Shutdown.java:139)
+	- locked <0x00000000facc4f30> (a java.lang.Shutdown$Lock)
+	at java.lang.Shutdown.exit(Shutdown.java:213)
+	- locked <0x00000000facbd638> (a java.lang.Class for java.lang.Shutdown)
+	at java.lang.Terminator$1.handle(Terminator.java:52)
+	at sun.misc.Signal$1.run(Signal.java:212)
+	at java.lang.Thread.run(Thread.java:748)
+
+"jscompiler" #9 daemon prio=5 os_prio=0 tid=0x00007f8528361000 nid=0x57e2 runnable [0x00007f84fbffc000]
+   java.lang.Thread.State: RUNNABLE
+	at java.util.zip.ZipFile.read(Native Method)
+	at java.util.zip.ZipFile.access$1400(ZipFile.java:60)
+	at java.util.zip.ZipFile$ZipFileInputStream.read(ZipFile.java:717)
+	- locked <0x00000000fac0d9f8> (a java.util.jar.JarFile)
+	at java.util.zip.ZipFile$ZipFileInflaterInputStream.fill(ZipFile.java:419)
+	at java.util.zip.InflaterInputStream.read(InflaterInputStream.java:158)
+	at sun.misc.Resource.getBytes(Resource.java:124)
+	at java.net.URLClassLoader.defineClass(URLClassLoader.java:462)
+	at java.net.URLClassLoader.access$100(URLClassLoader.java:73)
+	at java.net.URLClassLoader$1.run(URLClassLoader.java:368)
+	at java.net.URLClassLoader$1.run(URLClassLoader.java:362)
+	at java.security.AccessController.doPrivileged(Native Method)
+	at java.net.URLClassLoader.findClass(URLClassLoader.java:361)
+	at java.lang.ClassLoader.loadClass(ClassLoader.java:424)
+	- locked <0x00000000f854a218> (a java.lang.Object)
+	at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:335)
+	at java.lang.ClassLoader.loadClass(ClassLoader.java:357)
+	at com.google.javascript.jscomp.PassConfig.makeTypeInference(PassConfig.java:174)
+	at com.google.javascript.jscomp.DefaultPassConfig$45$1.process(DefaultPassConfig.java:1705)
+	at com.google.javascript.jscomp.PhaseOptimizer$NamedPass.process(PhaseOptimizer.java:298)
+	at com.google.javascript.jscomp.PhaseOptimizer.process(PhaseOptimizer.java:232)
+	at com.google.javascript.jscomp.Compiler.check(Compiler.java:1114)
+	at com.google.javascript.jscomp.Compiler.performChecksAndTranspilation(Compiler.java:914)
+	at com.google.javascript.jscomp.Compiler.access$000(Compiler.java:95)
+	at com.google.javascript.jscomp.Compiler$3.call(Compiler.java:848)
+	at com.google.javascript.jscomp.Compiler$3.call(Compiler.java:845)
+	at com.google.javascript.jscomp.CompilerExecutor$2.call(CompilerExecutor.java:93)
+	at java.util.concurrent.FutureTask.run(FutureTask.java:266)
+	at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)
+	at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)
+	at java.lang.Thread.run(Thread.java:748)
+
+"Service Thread" #7 daemon prio=9 os_prio=0 tid=0x00007f85280e2000 nid=0x57e0 runnable [0x0000000000000000]
+   java.lang.Thread.State: RUNNABLE
+
+"C1 CompilerThread1" #6 daemon prio=9 os_prio=0 tid=0x00007f85280d7000 nid=0x57df runnable [0x0000000000000000]
+   java.lang.Thread.State: RUNNABLE
+
+"C2 CompilerThread0" #5 daemon prio=9 os_prio=0 tid=0x00007f85280d4800 nid=0x57de runnable [0x0000000000000000]
+   java.lang.Thread.State: RUNNABLE
+
+"Signal Dispatcher" #4 daemon prio=9 os_prio=0 tid=0x00007f85280d3000 nid=0x57dd waiting on condition [0x0000000000000000]
+   java.lang.Thread.State: RUNNABLE
+
+"Finalizer" #3 daemon prio=8 os_prio=0 tid=0x00007f85280a0000 nid=0x57dc in Object.wait() [0x00007f852c992000]
+   java.lang.Thread.State: WAITING (on object monitor)
+	at java.lang.Object.wait(Native Method)
+	- waiting on <0x00000000fac305b8> (a java.lang.ref.ReferenceQueue$Lock)
+	at java.lang.ref.ReferenceQueue.remove(ReferenceQueue.java:143)
+	- locked <0x00000000fac305b8> (a java.lang.ref.ReferenceQueue$Lock)
+	at java.lang.ref.ReferenceQueue.remove(ReferenceQueue.java:164)
+	at java.lang.ref.Finalizer$FinalizerThread.run(Finalizer.java:209)
+
+"Reference Handler" #2 daemon prio=10 os_prio=0 tid=0x00007f852809b800 nid=0x57db in Object.wait() [0x00007f852ca93000]
+   java.lang.Thread.State: WAITING (on object monitor)
+	at java.lang.Object.wait(Native Method)
+	- waiting on <0x00000000fac30770> (a java.lang.ref.Reference$Lock)
+	at java.lang.Object.wait(Object.java:502)
+	at java.lang.ref.Reference.tryHandlePending(Reference.java:191)
+	- locked <0x00000000fac30770> (a java.lang.ref.Reference$Lock)
+	at java.lang.ref.Reference$ReferenceHandler.run(Reference.java:153)
+
+"main" #1 prio=5 os_prio=0 tid=0x00007f8528009800 nid=0x57d9 waiting on condition [0x00007f85306af000]
+   java.lang.Thread.State: WAITING (parking)
+	at sun.misc.Unsafe.park(Native Method)
+	- parking to wait for  <0x00000000fb62b360> (a java.util.concurrent.FutureTask)
+	at java.util.concurrent.locks.LockSupport.park(LockSupport.java:175)
+	at java.util.concurrent.FutureTask.awaitDone(FutureTask.java:429)
+	at java.util.concurrent.FutureTask.get(FutureTask.java:191)
+	at com.google.javascript.jscomp.CompilerExecutor.runInCompilerThread(CompilerExecutor.java:111)
+	at com.google.javascript.jscomp.Compiler.runInCompilerThread(Compiler.java:902)
+	at com.google.javascript.jscomp.Compiler.stage1Passes(Compiler.java:844)
+	at com.google.javascript.jscomp.AbstractCommandLineRunner.performFullCompilation(AbstractCommandLineRunner.java:1197)
+	at com.google.javascript.jscomp.AbstractCommandLineRunner.doRun(AbstractCommandLineRunner.java:1130)
+	at com.google.javascript.jscomp.AbstractCommandLineRunner.run(AbstractCommandLineRunner.java:501)
+	at com.google.javascript.jscomp.CommandLineRunner.main(CommandLineRunner.java:1908)
+
+"VM Thread" os_prio=0 tid=0x00007f8528094000 nid=0x57da runnable 
+
+"VM Periodic Task Thread" os_prio=0 tid=0x00007f85280e5000 nid=0x57e1 waiting on condition 
+
+JNI global references: 89
+

+ 12 - 7
srv/public/style.css

@@ -57,7 +57,7 @@ body { display: flex; margin: 0; padding: 0; font-family: Lato, sans-serif; heig
 .slackmsg-authorGroup .slackmsg-item .slackmsg-author-name { display: none; }
 .slackmsg-authorGroup > .slackmsg-author { position: absolute; }
 .slackmsg-authorGroup > .slackmsg-author * { vertical-align: top; }
-.slackmsg-authorGroup > .slackmsg-author .slackmsg-author-img { position: relative; top: 0; }
+.slackmsg-authorGroup > .slackmsg-author .slackmsg-author-img-wrapper { position: relative; display: inline-block; top: 0; }
 .slackmsg-authorGroup > .slackmsg-author-messages { padding: 18px 0 0 36px; }
 .slackmsg-authorGroup, .slackmsg-me_message { padding: 10px; }
 .slackmsg-authorGroup .slackmsg-item { padding: 4px 10px; }
@@ -67,7 +67,8 @@ body { display: flex; margin: 0; padding: 0; font-family: Lato, sans-serif; heig
 .slackmsg-item.slackmsg-first-unread::before { display: inline-block; position: absolute; right: 0; top: -0.8em; content: "New"; color: rgba(255,135,109,.5); background: white; padding: 0 5px 0 3px; font-style: italic; }
 .slackmsg-content { display: inline-block; }
 .slackmsg-author { display: inline-block; }
-.slackmsg-author-img { max-height: 36px; max-width: 36px; margin-right: 10px; border-radius: 3px; }
+.slackmsg-author-img-wrapper { height: 36px; width: 36px; margin-right: 10px; }
+.slackmsg-author-img { max-height: 36px; max-width: 36px; border-radius: 3px; }
 .slackmsg-author-name { display: inline; font-weight: bold; }
 .slackmsg-msg { display: block; vertical-align: top; }
 .slackmsg-reactions:empty,.slackmsg-attachments:empty { display: none; }
@@ -82,7 +83,7 @@ body { display: flex; margin: 0; padding: 0; font-family: Lato, sans-serif; heig
 .slackmsg-content .slackmsg-notice { display: inline; font-style: italic; margin-right: 15px; }
 
 .slackmsg-same-author:not(.slackmsg-me_message) { padding: 2px 10px; }
-.slackmsg-same-author > .slackmsg-author-img { display: none; }
+.slackmsg-same-author > .slackmsg-author-img-wrapper { display: none; }
 .slackmsg-same-author > .slackmsg-content > .slackmsg-author-name { display: none; }
 .slackmsg-same-author:not(.slackmsg-me_message) .slackmsg-content { margin-left: 46px; }
 .slackmsg-same-ts .slackmsg-ts { display: none; }
@@ -102,7 +103,7 @@ body { display: flex; margin: 0; padding: 0; font-family: Lato, sans-serif; heig
 .slackmsg-item.slackmsg-me_message .slackmsg-author-name { position: static; display: inline; }
 .slackmsg-item.slackmsg-me_message .slackmsg-author-name::before { content: "* "; }
 .slackmsg-item.slackmsg-me_message .slackmsg-msg { margin: 0 0 0 1em; display: inline; }
-.slackmsg-item.slackmsg-me_message .slackmsg-author-img { display: none; }
+.slackmsg-item.slackmsg-me_message .slackmsg-author-img-wrapper { display: none; }
 .slackmsg-item.slackmsg-me_message .slackmsg-ts { display: block; }
 
 .slackmsg-item .bold { font-weight: bold; }
@@ -183,10 +184,11 @@ body { display: flex; margin: 0; padding: 0; font-family: Lato, sans-serif; heig
 
 .OSM-wrapper { position: relative; }
 .OSM-wrapper .OSM-controls { position: absolute; top: 10px; left: 5px; }
-.OSM-wrapper .OSM-controls button { display: inline-block; height: 25px; width: 25px; padding: 0; margin: 0 5px; }
-.OSM-wrapper .OSM-controls-zoomMin { }
-.OSM-wrapper .OSM-controls-zoomPlus { }
+.OSM-wrapper .OSM-controls button { display: inline-block; height: 25px; width: 25px; padding: 0; margin: 0 5px; background: no-repeat center center; }
+.OSM-wrapper .OSM-controls-zoomMin { background-image: url("zoomout.svg"); }
+.OSM-wrapper .OSM-controls-zoomPlus { background-image: url("zoomin.svg"); }
 
+.error-block { background: red; color: white; }
 .full-width { display: block; width: 100%; }
 
 .maci-wrapper { position: fixed; z-index: 5000; top: 50%; left: 50%; transform: translate(-50%, -50%); margin: auto; }
@@ -199,6 +201,9 @@ body { display: flex; margin: 0; padding: 0; font-family: Lato, sans-serif; heig
 .maci-setting.display-display .settings-display { display: block; }
 .maci-setting.display-privacy .settings-privacy { display: block; }
 
+.settings-service-list-empty { display: none; }
+.settings-service-list:empty +.settings-service-list-empty { display: block; }
+
 @media screen and (max-width: 500px) {
     .maci-wrapper { position: fixed; z-index: 5000; top: 50%; left: 0; width: 100%; transform: translate(0, -50%); }
 }

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
srv/public/zoomin.svg


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
srv/public/zoomout.svg


+ 26 - 1
srv/src/controller/accountController.js

@@ -1,7 +1,9 @@
 /* jshint esversion: 6 */
 
 const config = require('../../config.js'),
-        accountManager = require('../models/accounts.js').accountManager;
+        Slack = require('../slack.js').Slack,
+        accountManager = require('../models/accounts.js').accountManager,
+        accountConfigManager = require('../models/accountConfig.js').accountConfigManager;
 
 module.exports.AccountController = {
     onRequest: function(req, res, srv) {
@@ -11,6 +13,29 @@ module.exports.AccountController = {
             accountManager.save(req.account, () => {});
             res.writeHeader("204", "No Content");
             res.end();
+        } else if (req.urlObj.urlParts[1] === "addservice") {
+            switch (req.urlObj.urlParts[2]) {
+                case "slack":
+                    Slack.getOauthToken(req.urlObj.queryTokens.code, (teamName, teamId, token) => {
+                        if (token) {
+                            req.account.edit().addService("Slack", teamName, teamId, token);
+                            accountManager.save(req.account);
+                            accountConfigManager.defaultForAccount(req.account.id, (accConfig) => {
+                                accConfig.edit().config.addService("Slack", teamName, teamId);
+                                accountConfigManager.save(accConfig);
+                            });
+                        }
+                        res.writeHeader("302", {
+                            Location: config.rootUrl
+                        });
+                        res.end();
+                    });
+                break;
+
+                default:
+                    srv.execTemplate(require('../template/_404.js'), req, res);
+                break;
+            }
         } else {
             srv.execTemplate(require('../template/_404.js'), req, res);
         }

+ 13 - 4
srv/src/controller/apiController.js

@@ -1,6 +1,8 @@
 /* jshint esversion: 6 */
 
 const config = require("../../config.js"),
+    http = require("http"),
+    https = require("https"),
     sessionManager = require("../session.js").SessionManager,
     accountConfigManager = require("../models/accountConfig.js").accountConfigManager;
 
@@ -29,17 +31,24 @@ module.exports.ApiController = {
         if (req.urlObj.match(["api", "hist"])) {
             if (!req.urlObj.queryTokens.room) {
                 res.writeHeader("400", "Bad request");
+                sessionManager.saveSession(req.session);
+                res.end();
             } else {
                 let ctx = res.chatContext.getChannelContext(req.urlObj.queryTokens.room[0]);
                 if (ctx) {
-                    ctx.fetchHistory(ctx.getChatContext().channels[req.urlObj.queryTokens.room[0]]);
-                    res.writeHeader("204", "No Content");
+                    ctx.fetchHistory(ctx.getChatContext().channels[req.urlObj.queryTokens.room[0]], (hist) => {
+                        var histArray = [];
+                        hist.forEach((i) => {
+                            histArray.push(i.toStatic());
+                        });
+                        res.writeHeader(200, {"Content-Type":"application/json"});
+                        res.end(JSON.stringify(histArray));
+                    });
                 } else {
                     res.writeHeader("404", "Channel not found");
+                    res.end();
                 }
             }
-            sessionManager.saveSession(req.session);
-            res.end();
         } else if (req.urlObj.match(["api", "typing"])) {
             if (!req.urlObj.queryTokens.room) {
                 res.writeHeader("400", "Bad request");

+ 34 - 8
srv/src/database.js

@@ -52,10 +52,23 @@ Database.prototype.createAllTables = function(factories, i, cb) {
 };
 
 Database.prototype.query = function(table, fields, cb) {
-    var args = [];
-    for (var i in fields)
-        args.push(fields[i]);
-    this.db.all("SELECT * FROM `" +table +"` WHERE `" +Object.keys(fields).join("`=? AND") +"`=?", args, (err, rows) => {
+    var args = [],
+        query = "SELECT * FROM `" +table +"` WHERE ",
+        first = true;
+
+    for (var i in fields) {
+        if (!first) {
+            query += "AND ";
+        }
+        first = false;
+        if (fields[i]) {
+            query += '`' +i +'`=?';
+            args.push(fields[i]);
+        } else {
+            query += '`' +i +'` IS NULL ';
+        }
+    }
+    this.db.all(query, args, (err, rows) => {
         if (err) {
             console.warn(err);
             cb(err, null);
@@ -66,10 +79,23 @@ Database.prototype.query = function(table, fields, cb) {
 };
 
 Database.prototype.queryFirst = function(table, fields, cb) {
-    var args = [];
-    for (var i in fields)
-        args.push(fields[i]);
-    this.db.get("SELECT * FROM `" +table +"` WHERE `" +Object.keys(fields).join("`=? AND") +"`=?", args, (err, row) => {
+    var args = [],
+        query = "SELECT * FROM `" +table +"` WHERE ",
+        first = true;
+
+    for (var i in fields) {
+        if (!first) {
+            query += "AND ";
+        }
+        first = false;
+        if (fields[i]) {
+            query += '`' +i +'`=?';
+            args.push(fields[i]);
+        } else {
+            query += '`' +i +'` IS NULL ';
+        }
+    }
+    this.db.get(query, args, (err, row) => {
         if (err) {
             console.warn(err);
             cb(err, null);

+ 11 - 1
srv/src/httpServ.js

@@ -108,7 +108,17 @@ Server.prototype.execRequest = function(req, res) {
         var apiSuccess = false;
 
         res.chatContext = new MultiChatManager();
-        res.chatContext.push(slackManager.lazyGet(req.session, req.reqT));
+        var services = req.account.getServices();
+        for (var serviceId in services) {
+            switch (services[serviceId].type) {
+                case "Slack":
+                    res.chatContext.push(slackManager.lazyGet(serviceId, services[serviceId].oauthParam, req.reqT));
+                break;
+
+                default:
+                    console.error("Unknown service type for ", services[serviceId], " with account #" +req.account.id);
+            }
+        }
 
         if (req.urlObj.urlParts[0] === "account") {
             AccountController.onRequest(req, res, this);

+ 19 - 4
srv/src/message.js

@@ -168,14 +168,17 @@ Message.prototype.hasReactionForUser = function(reaction, userId) {
  * @constructor
  * @param {Room|string} room or roomId
  * @param {number} keepMessages number of messages to keep in memory
+ * @param {number} maxAge number of messages to keep in memory
  * @param {Array|undefined} evts
  * @param {number|undefined} now
 **/
-function RoomHistory(room, keepMessages, evts, now) {
+function RoomHistory(room, keepMessages, maxAge, evts, now) {
     /** @type {string} */
     this.id = typeof room === "string" ? room : room.id;
     /** @type {Array.<Message>} */
     this.messages = [];
+    /** @type {number} */
+    this.maxAge = maxAge;
     /** @type number */
     this.v = 0;
 
@@ -233,9 +236,21 @@ RoomHistory.prototype.push = function(e, t) {
         this.messages.push(msgObj);
         ts = msgObj.ts;
     }
+    this.cleanOld(t);
+    return ts || 0;
+};
+
+RoomHistory.prototype.cleanOld = function(t) {
     while (this.messages.length > this.keepMessages)
         this.messages.shift();
-    return ts || 0;
+    if (this.maxAge) {
+        for (var i =0; i < this.messages.length; i++) {
+            if (this.messages[i].version < t -this.maxAge) {
+                this.messages.splice(i--, 1);
+            }
+        }
+    }
+    console.log("Remaining after clean: " +this.messages.length +' messages');
 };
 
 RoomHistory.prototype.lastMessage = function() {
@@ -247,7 +262,7 @@ RoomHistory.prototype.lastMessage = function() {
  * @param {string} userId
  * @param {string} msgId
  * @param {number} ts
- * @return {Message|null}
+ * @return {Message|null} WARNING if null, you *should* fetch new message and append it
 **/
 RoomHistory.prototype.addReaction = function(reaction, userId, msgId, ts) {
     var msg = this.getMessageById(msgId);
@@ -261,7 +276,7 @@ RoomHistory.prototype.addReaction = function(reaction, userId, msgId, ts) {
  * @param {string} userId
  * @param {string} msgId
  * @param {number} ts
- * @return {Message|null}
+ * @return {Message|null} WARNING if null, you *should* fetch new message and append it
 **/
 RoomHistory.prototype.removeReaction = function(reaction, userId, msgId, ts) {
     var msg = this.getMessageById(msgId);

+ 22 - 4
srv/src/models/accountConfig.js

@@ -5,6 +5,13 @@ const TABLE_NAME = "accountConfig";
 function AccountConfigManager() {
 }
 
+AccountConfigManager.prototype.defaultForAccount = function(id, cb) {
+    var self = this;
+    db.database.queryFirst(TABLE_NAME, { accountId: id, serviceId: null, deviceId: null }, (err, result) => {
+        cb(result ? self.fromDb(result) : null);
+    });
+};
+
 AccountConfigManager.prototype.fromAccountId = function(id, cb) {
     var self = this;
     db.database.query(TABLE_NAME, { accountId: id }, (err, result) => {
@@ -44,6 +51,12 @@ AccountConfigManager.prototype.newConfigFor = function(account) {
     return conf;
 };
 
+AccountConfig.prototype.addService = function(serviceType, serviceName, serviceId) {
+    if (!this.services[serviceType])
+        this.services[serviceType] = {};
+    this.services[serviceType][serviceId] = serviceName;
+};
+
 AccountConfigManager.prototype.fromId = function(id, cb) {
     var self = this;
     db.database.queryFirst(TABLE_NAME, { id: id }, (err, result) => {
@@ -108,17 +121,17 @@ AccountConfigManager.prototype.save = function(account, cb) {
         db.database.insert(TABLE_NAME, data, (newId) => {
             account.id = newId;
             account.dirty = false;
-            cb(account);
+            if (cb) cb(account);
         });
     } else if (account.dirty) {
         // update
         db.database.update(TABLE_NAME, account.id, account.toDb(), () => {
             account.dirty = false;
-            cb(account);
+            if (cb) cb(account);
         });
     } else {
         // not changed
-        cb(account);
+        if (cb) cb(account);
     }
 };
 
@@ -130,8 +143,13 @@ AccountConfigWrapper.prototype.expose = function() {
     };
 };
 
+AccountConfigWrapper.prototype.edit = function() {
+    this.dirty = true;
+    return this;
+};
+
 function AccountConfig() {
-    this.services = [];
+    this.services = {};
 }
 
 AccountConfig.prototype.toDb = function() {

+ 30 - 4
srv/src/models/accounts.js

@@ -48,6 +48,7 @@ function Account(dbResult) {
 
     this.certificates;
     this.cguReadAndAccepted;
+    this.services;
     this.dirty;
 
     //TODO permanent login token array
@@ -60,6 +61,7 @@ function Account(dbResult) {
 
         this.certificates = dbResult.certificates;
         this.cguReadAndAccepted = !!dbResult.cguReadAndAccepted;
+        this.services = JSON.parse(dbResult.services);
         this.dirty = false;
     } else {
         this.id = null;
@@ -70,6 +72,7 @@ function Account(dbResult) {
 
         this.createCertificate();
         this.cguReadAndAccepted = false;
+        this.services = [];
         this.dirty = true;
     }
 }
@@ -81,6 +84,7 @@ Account.prototype.toDb = function() {
         ,authSlackUserEmailAndTeam: this.authSlackUserEmailAndTeam
         ,certificates: this.certificates
         ,cguReadAndAccepted: this.cguReadAndAccepted ? 1 : 0
+        ,services: JSON.stringify(this.services)
         //TODO permanent login token array
     };
 };
@@ -90,6 +94,27 @@ Account.prototype.createCertificate = function() {
     this.certificates = null;
 };
 
+Account.prototype.addService = function(serviceType, serviceName, serviceId, oauthParam) {
+    this.services.push([serviceType, serviceName, serviceId, oauthParam]);
+};
+
+Account.prototype.getServices = function() {
+    var services = {};
+    this.services.forEach((i) => {
+        services[i[2]] = {
+            type: i[0],
+            name: i[1],
+            oauthParam: i[3]
+        };
+    });
+    return services;
+};
+
+Account.prototype.edit = function() {
+    this.dirty = true;
+    return this;
+};
+
 AccountManager.prototype.createAccount = function() {
     return new Account();
 };
@@ -102,16 +127,16 @@ AccountManager.prototype.save = function(account, cb) {
         db.database.insert(TABLE_NAME, data, (newId) => {
             account.id = newId;
             account.dirty = false;
-            cb(account);
+            if (cb) cb(account);
         });
     } else if (account.dirty) {
         // update
         db.database.update(TABLE_NAME, account.id, account.toDb(), () => {
             account.dirty = false;
-            cb(account);
+            if (cb) cb(account);
         });
     } else {
-        cb(account);
+        if (cb) cb(account);
     }
 };
 
@@ -125,7 +150,8 @@ module.exports.createTable = function(dbObject, cb) {
         +"`authFacebookUserId` STRING UNIQUE,"
         +"`authSlackUserEmailAndTeam` STRING UNIQUE,"
         +"`certificates` STRING,"
-        +"`cguReadAndAccepted` BOOLEAN NOT NULL DEFAULT FALSE"
+        +"`cguReadAndAccepted` BOOLEAN NOT NULL DEFAULT FALSE,"
+        +"`services` STRING NOT NULL"
         +')', cb);
     //TODO permanent login token array
 };

+ 1 - 1
srv/src/multichatManager.js

@@ -74,7 +74,7 @@ ChatSystem.prototype.openUploadFileStream = function(chan, contentType, callback
  * Async fetch history
  * @param {Room} chan
 **/
-ChatSystem.prototype.fetchHistory = function(chan) {};
+ChatSystem.prototype.fetchHistory = function(chan, cb) {};
 
 /**
  * @param {Room} chan

+ 26 - 29
srv/src/slack.js

@@ -40,6 +40,7 @@ const SLACK_ENDPOINT = "https://slack.com/api/"
         }
     }
     ,HISTORY_LENGTH = 35
+    ,HISTORY_MAX_AGE = 10// * 60 * 1000
 
     ,UPDATE_LIVE = [
         "message"
@@ -55,9 +56,8 @@ const SLACK_ENDPOINT = "https://slack.com/api/"
 /**
  * @implements {ChatSystem}
 **/
-function Slack(sess, manager) {
-    this.token = sess.slackToken;
-    this.sessId = sess.id;
+function Slack(slackToken, manager) {
+    this.token = slackToken;
     this.manager = manager;
     this.rtm = null;
     this.rtmId = 1;
@@ -182,7 +182,7 @@ Slack.prototype.getLiveUpdates = function(knownVersion) {
 Slack.prototype.unstackPendingMessages = function() {
     for (var i = this.pendingMessages.length -1; i >= 0; i--) {
         this.onMessage(this.pendingMessages[0], Date.now());
-        this.pendingMessages.unshift();
+        this.pendingMessages.shift();
     }
 };
 
@@ -216,16 +216,16 @@ Slack.prototype.onMessage = function(msg, t) {
                 ,channel = this.data.channels[channelId]
                 ,histo = this.history[channelId];
             // FIXME remove typing for user
-            if (histo) {
-                var lastMsg = histo.push(msg, t);
-                if (lastMsg)
-                    this.data.liveV = t;
-                histo.resort();
-                if (channel)
-                    channel.setLastMsg(lastMsg, t);
-            } else if (channel) {
-                this.fetchHistory(channel);
+            if (!histo) {
+                histo = this.history[channelId] = new SlackHistory(channel.remoteId, channelId, this.data.team.id +'|', HISTORY_LENGTH);
+                histo.isNew = true;
             }
+            var lastMsg = histo.push(msg, t);
+            if (lastMsg)
+                this.data.liveV = t;
+            histo.resort();
+            if (channel)
+                channel.setLastMsg(lastMsg, t);
         }
     } else {
         this.pendingMessages.push(msg);
@@ -335,15 +335,15 @@ Slack.getUserId = function(code, redirectUri, cb) {
     });
 };
 
-Slack.getOauthToken = function(code, redirectUri, cb) {
+Slack.getOauthToken = function(code, cb) {
     httpsRequest(SLACK_ENDPOINT+GETAPI.oauth
         +"?client_id=" +config.services.Slack.clientId
         +"&client_secret=" +config.services.Slack.clientSecret
-        +"&redirect_uri=" +redirectUri
+        +"&redirect_uri=" +encodeURIComponent(config.rootUrl +"account/addservice/slack")
         +"&code=" +code,
     (status, resp) => {
         if (status === 200 && resp.ok) {
-            cb(resp["access_token"]);
+            cb(resp["team_name"], resp["team_id"] +resp["user_id"], resp["access_token"]);
         } else {
             cb(null);
         }
@@ -598,7 +598,7 @@ Slack.prototype.editMsg = function(channel, msgId, text) {
 /**
  * @param {SlackChan|SlackGroup|SlackIms} target
 **/
-Slack.prototype.fetchHistory = function(target) {
+Slack.prototype.fetchHistory = function(target, cb) {
     var _this = this
         ,baseUrl = ""
         ,targetId = target.remoteId;
@@ -615,20 +615,17 @@ Slack.prototype.fetchHistory = function(target) {
         +"&channel=" +targetId
         +"&count=" +HISTORY_LENGTH,
     (status, resp) => {
+        var history = [];
         if (status === 200 && resp && resp.ok) {
-            var history = _this.history[target.id]
-                ,now = Date.now();
-            if (!history) {
-                history = _this.history[target.id] = new SlackHistory(target.remoteId, target.id, this.data.team.id +'|', HISTORY_LENGTH);
-                history.isNew = true;
-            }
-            var now = Date.now()
-                ,lastTs = history.pushAll(resp.messages, now);
-
-            if (lastTs)
-                this.data.liveV = now;
-            target.setLastMsg(lastTs, now);
+            var histo = this.history[target.id];
+            if (!histo)
+                histo = this.history[target.id] = new SlackHistory(target.remoteId, target.id, this.data.team.id +'|', HISTORY_LENGTH, HISTORY_MAX_AGE);
+            resp.messages.forEach((respMsg) => {
+                respMsg["id"] = respMsg["ts"];
+                history.push(histo.messageFactory(histo.prepareMessage(respMsg)));
+            });
         }
+        cb(history);
     });
 };
 

+ 1 - 0
srv/src/slackData.js

@@ -268,6 +268,7 @@ SlackData.prototype.userFactory = function(userData) {
 };
 
 SlackData.prototype.roomFactory = function(roomData) {
+    roomData["created"] = roomData["created"] ? parseFloat(roomData["created"]) * 1000 : undefined;
     return new SlackChan(this.team.id +'|', roomData["id"], false);
 };
 

+ 41 - 25
srv/src/slackHistory.js

@@ -10,11 +10,12 @@ const Message = require('./message.js').Message
  * @param {Room|string} room or roomId
  * @param {string} idPrefix
  * @param {number} keepMessages number of messages to keep in memory
+ * @param {number} maxAge number of messages to keep in memory
  * @param {Array=} evts
  * @param {number=} now
 **/
-function SlackHistory(remoteId, room, idPrefix, keepMessages, evts, now) {
-    RoomHistory.call(this, room, keepMessages, evts, now);
+function SlackHistory(remoteId, room, idPrefix, keepMessages, maxAge, evts, now) {
+    RoomHistory.call(this, room, keepMessages, maxAge, evts, now);
 
     /** @const @type {string} */
     this.remoteId = remoteId;
@@ -25,6 +26,22 @@ function SlackHistory(remoteId, room, idPrefix, keepMessages, evts, now) {
 SlackHistory.prototype = Object.create(RoomHistory.prototype);
 SlackHistory.prototype.constructor = SlackHistory;
 
+SlackHistory.prototype.prepareMessage = function(ev, targetId) {
+    if (ev) {
+        if (ev["edited"] && ev["edited"]["ts"])
+            ev["edited"] = Math.round(parseFloat(ev["edited"]["ts"]) * 1000);
+        if (ev["ts"])
+            ev["ts"] = parseFloat(ev["ts"]) * 1000;
+        if (!ev["id"])
+            ev["id"] = targetId;
+        if (ev["attachments"] && ev["attachments"].length)
+            ev["attachments"].forEach((a) => {
+                a.ts *= 1000;
+            });
+    }
+    return ev;
+}
+
 SlackHistory.prototype.messageFactory = function(ev, ts) {
     if (!ev["user"])
         ev["user"] = ev["bot_id"];
@@ -43,6 +60,8 @@ SlackHistory.prototype.messageFactory = function(ev, ts) {
 };
 
 /**
+ * @param {Object} ev
+ * @param {number} t
  * @return {number} ts
 **/
 SlackHistory.prototype.push = function(ev, t) {
@@ -65,39 +84,36 @@ SlackHistory.prototype.push = function(ev, t) {
                 targetId = ev["deleted_ts"];
             modifArg = null;
         }
-        if (modifArg) {
-            if (modifArg["edited"])
-                modifArg["edited"] = Math.round(parseFloat(modifArg["edited"]["ts"]) * 1000);
-            if (modifArg["ts"])
-                modifArg["ts"] = parseFloat(modifArg["ts"]) * 1000;
-            if (!modifArg["id"])
-                modifArg["id"] = targetId;
-            if (modifArg["attachments"] && modifArg["attachments"].length)
-                modifArg["attachments"].forEach((a) => {
-                    a.ts *= 1000;
-                });
-        }
-        for (var i =0, nbMsg = this.messages.length; i < nbMsg; i++) {
-            msg = this.messages[i];
-            if (msg.id === targetId) {
-                msg.update(modifArg, t);
-                exists = true;
-                break;
+        var msg = this.getMessageById(targetId);
+        if (msg) {
+            msg.update(this.prepareMessage(modifArg), t);
+            exists = true;
+        } else {
+            this.prepareMessage(ev["previous_message"], targetId);
+            this.prepareMessage(ev["message"], targetId);
+            var msgSource = ev["previous_message"] || ev["message"];
+            if (msgSource) {
+                msg = this.messageFactory(msgSource, t);
+                msg.update(ev["message"] || ev, t);
+            } else {
+                msg = this.messageFactory(this.prepareMessage(ev, targetId), t);
             }
-        }
-        if (!exists) {
-            msg = this.messageFactory(ev, t);
             this.messages.push(msg);
         }
     } else if (ev["type"] === "reaction_added") {
         msg = this.addReaction(ev["reaction"], this.idPrefix +ev["user"], ev["item"]["ts"], t);
+        if (!msg) {
+            //FIXME fetch ev.item.channel / ev.item.ts
+        }
     } else if (ev["type"] === "reaction_removed") {
         msg = this.removeReaction(ev["reaction"], this.idPrefix +ev["user"], ev["item"]["ts"], t);
+        if (!msg) {
+            //FIXME fetch ev.item.channel / ev.item.ts
+        }
     } else {
         return 0;
     }
-    while (this.messages.length > this.keepMessages)
-        this.messages.shift();
+    this.cleanOld(t);
     return msg ? msg.ts : 0;
 };
 

+ 4 - 4
srv/src/slackManager.js

@@ -37,15 +37,15 @@ SlackManager.prototype.getScope = function() {
     ];
 };
 
-SlackManager.prototype.lazyGet = function(sess, reqT) {
-    var key = "SLACK_" +sess.sessId
-        ,val = this.cache.get(key);
+SlackManager.prototype.lazyGet = function(servId, slackToken, reqT) {
+    var key = "SLACK_" +servId,
+        val = this.cache.get(key);
     if (val) {
         this.cache.put(key, val, INACTIVE_DELAY, function(key, val) {
             instance.removed(key, val);
         });
     } else {
-        val = new Slack(sess, this);
+        val = new Slack(slackToken, this);
         this.cache.put(key, val, INACTIVE_DELAY, function(key, val) {
             instance.removed(key, val);
             val.close();

+ 15 - 3
srv/src/template/index.js

@@ -18,6 +18,9 @@ module.exports.exec = function(req, res) {
         else
             return require('./_403.js').exec(req, res);
     }
+    var serviceProviderOptionList = "";
+    for (var serviceName in config.services)
+        serviceProviderOptionList += `<option value="${config.services[serviceName].connectLink}">${serviceName}</option>`;
     return {
         status: 200
         ,body: templates.header("Mimou", ["style.css", "emojione_v2.3.sprites.css"], ['<link href="favicon_err.png" type="image/png" rel="icon" id="linkFavicon" />'])
@@ -44,13 +47,22 @@ module.exports.exec = function(req, res) {
                   </aside>
                   <div class="settingContent">
                       <section class="settings-services">
-                          <h1>Services</h1>
+                          <h1 id="settings-services-title"></h1>
+                          <div class="button-container"><button id="settings-serviceAddButton"></button></div>
+                          <div class="hidden" id="settings-serviceAddSection">
+                              <select id="settings-serviceAddServiceList">`
+                              +serviceProviderOptionList
+                              +`</select>
+                              <div class="button-container"><button id="settings-serviceAddConfirm"></button></div>
+                          </div>
+                          <ul class="settings-service-list" id="settings-serviceList"></ul>
+                          <div class="settings-service-list-empty error-block" id="settings-serviceListEmpty"></div>
                       </section>
                       <section class="settings-display">
-                          <h1>Display</h1>
+                          <h1 id="settings-display-title"></h1>
                       </section>
                       <section class="settings-privacy">
-                          <h1>Privacy</h1>
+                          <h1 id="settings-privacy-title"></h1>
                       </section>
                   </div>
               </div>

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно