From 08e0ae424d8681b93886462147d84945b883a0b2 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Thu, 14 Sep 2017 18:13:03 +0200
Subject: [PATCH 01/12] log errors in less compilation

---
 www/common/LessLoader.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/www/common/LessLoader.js b/www/common/LessLoader.js
index a4c01c0bf..d09413aa7 100644
--- a/www/common/LessLoader.js
+++ b/www/common/LessLoader.js
@@ -118,6 +118,7 @@ define([
             }
             console.log('CACHE MISS ' + url);
             ((/\.less([\?\#].*)?$/.test(url)) ? loadLess : loadCSS)(url, function (err, css) {
+                if (err) { console.log(err); }
                 var output = fixAllURLs(css, url);
                 cachePut(url, output);
                 inject(output, url);

From f9d27d2783db72147b0b3916ee5b166e10ccbbda Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 18 Sep 2017 15:09:01 +0200
Subject: [PATCH 02/12] WIP secure contacts

---
 customize.dist/src/less2/main.less |   1 +
 www/contacts/app-contacts.less     | 256 +++++++++++++++++++++++++++++
 www/contacts/index.html            |  18 +-
 www/contacts/inner.html            |  18 +-
 www/contacts/inner.js              | 122 +++++++++++++-
 www/contacts/main.js               |  99 ++++++-----
 www/contacts/main.less             | 248 ----------------------------
 7 files changed, 436 insertions(+), 326 deletions(-)
 create mode 100644 www/contacts/app-contacts.less
 delete mode 100644 www/contacts/main.less

diff --git a/customize.dist/src/less2/main.less b/customize.dist/src/less2/main.less
index 1fcd30815..d2020c97b 100644
--- a/customize.dist/src/less2/main.less
+++ b/customize.dist/src/less2/main.less
@@ -27,4 +27,5 @@ body.cp-app-code { @import "../../../code/app-code.less"; }
 body.cp-app-slide { @import "../../../slide/app-slide.less"; }
 body.cp-app-file { @import "../../../file/app-file.less"; }
 body.cp-app-filepicker { @import "../../../filepicker/app-filepicker.less"; }
+body.cp-app-contacts {   @import "../../../contacts/app-contacts.less";    }
 
diff --git a/www/contacts/app-contacts.less b/www/contacts/app-contacts.less
new file mode 100644
index 000000000..791b2fa66
--- /dev/null
+++ b/www/contacts/app-contacts.less
@@ -0,0 +1,256 @@
+@import (once) "../../customize/src/less2/include/browser.less";
+@import (once) "../../customize/src/less2/include/toolbar.less";
+@import (once) "../../customize/src/less2/include/markdown.less";
+@import (once) '../../customize/src/less2/include/fileupload.less';
+@import (once) '../../customize/src/less2/include/alertify.less';
+//@import (once) '../../customize/src/less/mixins.less';
+//@import (once) '../../customize/src/less/variables.less";
+
+@import (once) '../../customize/src/less2/include/avatar.less';
+
+
+.toolbar_main();
+.fileupload_main();
+.alertify_main();
+
+// body
+&.cp-app-contacts {
+    @keyframes example {
+        0% {
+            background: rgba(0,0,0,0.1);
+        }
+        50% {
+            background: rgba(0,0,0,0.3);
+        }
+        100% {
+            background: rgba(0,0,0,0.1);
+        }
+    }
+
+    display: flex;
+    flex-flow: column;
+
+    background-color: red !important;
+    @button-border: 2px;
+    @bg-color: @colortheme_friends-bg;
+    @color: @colortheme_friends-color;
+    #app {
+        flex: 1;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        min-height: 0;
+        &.ready {
+            background-size: cover;
+            background-position: center;
+        }
+    }
+
+    #toolbar {
+        display: flex; // We need this to remove a 3px border at the bottom of the toolbar
+    }
+
+    .cryptpad-toolbar {
+        padding: 0px;
+        display: inline-block;
+    }
+
+    #friendList {
+        width: 350px;
+        height: 100%;
+        background-color: lighten(@bg-color, 10%);
+        overflow-y: auto;
+        .friend {
+            background: rgba(0,0,0,0.1);
+            padding: 5px;
+            margin: 10px;
+            cursor: pointer;
+            &:hover {
+                background-color: rgba(0,0,0,0.3);
+            }
+            &.notify {
+                animation: example 2s ease-in-out infinite;
+            }
+        }
+    }
+
+    #friendList .friend, #messaging .avatar {
+        .avatar_main(30px);
+        &.avatar {
+            display: flex;
+        }
+        cursor: pointer;
+        color: @color;
+        media-tag {
+            img {
+                color: #000;
+            }
+        }
+        media-tag, .default {
+            margin-right: 5px;
+        }
+        .status {
+            width: 5px;
+            display: inline-block;
+            position: absolute;
+            right: 0;
+            top: 0;
+            bottom: 0;
+            opacity: 0.7;
+            background-color: #777;
+            &.online {
+                background-color: green;
+            }
+            &.offline {
+                background-color: red;
+            }
+        }
+    }
+
+    #friendList {
+        .friend {
+            position: relative;
+        }
+        .remove {
+            cursor: pointer;
+            width: 20px;
+            &:hover {
+                color: darken(@color, 20%);
+            }
+        }
+    }
+
+    .placeholder (@color: #bbb) {
+        &::-webkit-input-placeholder { /* WebKit, Blink, Edge */
+            color: @color;
+        }
+        &:-moz-placeholder { /* Mozilla Firefox 4 to 18 */
+            color: @color;
+            opacity:  1;
+        }
+        &::-moz-placeholder { /* Mozilla Firefox 19+ */
+            color: @color;
+            opacity:  1;
+        }
+        &:-ms-input-placeholder { /* Internet Explorer 10-11 */
+            color: @color;
+        }
+        &::-ms-input-placeholder { /* Microsoft Edge */
+            color: @color;
+        }
+    }
+
+    #messaging {
+        flex: 1;
+        height: 100%;
+        background-color: lighten(@bg-color, 20%);
+        min-width: 0;
+
+        .info {
+            padding: 20px;
+        }
+        .header {
+            background-color: lighten(@bg-color, 15%);
+            padding: 0;
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            height: 50px;
+
+            .hover () {
+                height: 100%;
+                line-height: 30px;
+                padding: 10px;
+                &:hover {
+                    background-color: rgba(50,50,50,0.3);
+                }
+            }
+
+            .avatar,
+            .right-col {
+                 flex:1 1 auto;
+            }
+            .remove-history {
+                .hover;
+            }
+            .avatar {
+                margin: 10px;
+            }
+            .more-history {
+                //display: none;
+                .hover;
+                &.faded {
+                    color: darken(@bg-color, 5%);
+                }
+            }
+        }
+        .chat {
+            height: 100%;
+            display: flex;
+            flex-flow: column;
+            .messages {
+                padding: 0 20px;
+                margin: 10px 0;
+                flex: 1;
+                overflow-x: auto;
+                .message {
+                    & > div {
+                        padding: 0 10px;
+                    }
+                    .content {
+                        overflow: hidden;
+                        word-wrap: break-word;
+                        &> * {
+                            margin: 0;
+                        }
+                    }
+                    .date {
+                        display: none;
+                        font-style: italic;
+                    }
+                    .sender {
+                        margin-top: 10px;
+                        font-weight: bold;
+                        background-color: rgba(0,0,0,0.1);
+                    }
+                }
+            }
+        }
+        .input {
+            background-color: lighten(@bg-color, 15%);
+            height: auto;
+            min-height: 50px;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            padding: 0 75px;
+            textarea {
+                margin: 5px 0;
+                padding: 0 10px;
+                border: none;
+                height: 50px;
+                flex: 1;
+                background-color: darken(@bg-color, 10%);
+                color: @color;
+                resize: none;
+                line-height: 50px;
+                overflow-y: auto;
+                .placeholder(#bbb);
+                &[disabled=true] {
+                    .placeholder(#999);
+                }
+                &:placeholder-shown { line-height: 50px; }
+            }
+            button {
+                height: 50px;
+                border-radius: 0;
+                border: none;
+                background-color: darken(@bg-color, 15%);
+                &:hover {
+                    background-color: darken(@bg-color, 20%);
+                }
+            }
+        }
+    }
+}
+
diff --git a/www/contacts/index.html b/www/contacts/index.html
index a72a3c60b..e3f7eacc4 100644
--- a/www/contacts/index.html
+++ b/www/contacts/index.html
@@ -1,16 +1,17 @@
 <!DOCTYPE html>
-<html class="cp pad">
+<html>
 <head>
     <title>CryptPad</title>
     <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <script async data-bootload="/customize/template.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
+    <meta name="referrer" content="no-referrer" />
+    <script async data-bootload="main.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
     <style>
         html, body {
             margin: 0px;
             padding: 0px;
         }
-        #pad-iframe {
+        #sbox-iframe {
             position:fixed;
             top:0px;
             left:0px;
@@ -23,8 +24,15 @@
             padding:0;
             overflow:hidden;
         }
+        #sbox-filePicker-iframe {
+            position: fixed;
+            top:0; left:0;
+            bottom:0; right:0;
+            width:100%;
+            height: 100%;
+            border: 0;
+        }
     </style>
 </head>
 <body>
-    <iframe id="pad-iframe"></iframe><script src="/common/noscriptfix.js"></script>
-
+<iframe id="sbox-iframe">
diff --git a/www/contacts/inner.html b/www/contacts/inner.html
index 5bbe09483..dc67d4390 100644
--- a/www/contacts/inner.html
+++ b/www/contacts/inner.html
@@ -1,17 +1,11 @@
 <!DOCTYPE html>
-<html>
+<html class="cp-app-noscroll">
 <head>
     <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
-    <script src="/bower_components/jquery/dist/jquery.min.js"></script>
-    <script async data-bootload="/contacts/inner.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
-    <style>.loading-hidden, .loading-hidden * {display: none !important;}</style>
+    <script async data-bootload="/contacts/inner.js" data-main="/common/sframe-boot.js?ver=1.4" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
+    <style>
+        .loading-hidden { display: none; }
+    </style>
 </head>
-<body class="loading-hidden">
-    <div id="toolbar" class="toolbar-container"></div>
-    <div id="app">
-        <div id="friendList"></div>
-        <div id="messaging"></div>
-    </div>
-</body>
-</html>
+<body class="cp-app-contacts">
 
diff --git a/www/contacts/inner.js b/www/contacts/inner.js
index aee04ded1..741205243 100644
--- a/www/contacts/inner.js
+++ b/www/contacts/inner.js
@@ -1,13 +1,117 @@
 define([
     'jquery',
-    'less!/bower_components/components-font-awesome/css/font-awesome.min.css',
+    '/bower_components/chainpad-crypto/crypto.js',
+    '/common/toolbar3.js',
+    '/bower_components/chainpad-json-validator/json-ot.js',
+    '/common/cryptpad-common.js',
+    '/bower_components/nthen/index.js',
+    '/common/sframe-common.js',
+    '/common/hyperscript.js',
+    '/contacts/messenger-ui.js',
+
     'css!/bower_components/bootstrap/dist/css/bootstrap.min.css',
-    'less!/contacts/main.less',
-    'less!/customize/src/less/toolbar.less',
-], function ($) {
-    $('.loading-hidden').removeClass('loading-hidden');
-    // dirty hack to get rid the flash of the lock background
-    setTimeout(function () {
-        $('#app').addClass('ready');
-    }, 100);
+    'less!/bower_components/components-font-awesome/css/font-awesome.min.css',
+    'less!/customize/src/less2/main.less',
+], function (
+    $,
+    Crypto,
+    Toolbar,
+    JsonOT,
+    Cryptpad,
+    nThen,
+    SFCommon,
+    h,
+    UI
+    )
+{
+    var Messages = Cryptpad.Messages;
+    var APP = {};
+    var onConnectError = function () {
+        Cryptpad.errorLoadingScreen(Messages.websocketError);
+    };
+
+    var common;
+    var sFrameChan;
+    nThen(function (waitFor) {
+        $(waitFor(Cryptpad.addLoadingScreen));
+        SFCommon.create(waitFor(function (c) { APP.common = common = c; }));
+    }).nThen(function (waitFor) {
+        sFrameChan = common.getSframeChannel();
+        sFrameChan.onReady(waitFor());
+    }).nThen(function (/*waitFor*/) {
+        Cryptpad.onError(function (info) {
+            if (info && info.type === "store") {
+                onConnectError();
+            }
+        });
+
+        var toolbarElement = h('div#toolbar.cp-toolbar-container');
+
+        document.body.appendChild(toolbarElement);
+
+        var messaging = h('div#messaging', [
+            h('div.info', [
+                h('h2', Messages.contacts_info1),
+                h('ul', [
+                    h('li', Messages.contacts_info2),
+                    h('li', Messages.contacts_info3),
+                ])
+            ])
+        ]);
+
+        var friendList = h('div#friendList');
+
+        var appElement = h('div#app', [
+            friendList,
+            messaging,
+        ]);
+
+        document.body.appendChild(appElement);
+
+        var displayed = ['useradmin', 'newpad', 'limit', 'pageTitle'];
+        var configTb = {
+            displayed: displayed,
+            common: Cryptpad,
+            sfCommon: common,
+            $container: $(toolbarElement),
+            network: Cryptpad.getNetwork(),
+            pageTitle: Messages.contacts_title,
+            metadataMgr: common.getMetadataMgr(),
+        };
+        var toolbar = APP.toolbar = Toolbar.create(configTb);
+        toolbar = toolbar; // FIXME;
+
+var stub = function () {
+    var p;
+    var t = function(){
+        console.error('called with arguments', Cryptpad.slice(arguments));
+        return p;
+    };
+    p = new Proxy(t, {
+        set: function (o, k, v) {
+            console.error('setting %s to %s', k, v);
+            o[k] = v;
+            return true;
+        }, get: function (o, k) {
+            console.error('getting %s', k);
+            return typeof(o[k]) !== 'undefined'? o[k]: p;
+        }
+    });
+    return p;
+};
+
+        var messengerStub = stub();
+        UI.create(messengerStub, $(friendList), $(messaging));
+
+        Cryptpad.removeLoadingScreen();
+/*
+        sFrameChan.query('Q_HEY_BUDDY', null, function (err, data) {
+            if (!data) { return; }
+            if (data.error) {
+                Cryptpad.warn(data.error);
+            } else {
+                Cryptpad.log(data.response);
+            }
+        });*/
+    });
 });
diff --git a/www/contacts/main.js b/www/contacts/main.js
index 7e73bbb23..3107a9005 100644
--- a/www/contacts/main.js
+++ b/www/contacts/main.js
@@ -1,62 +1,57 @@
+// Load #1, load as little as possible because we are in a race to get the loading screen up.
 define([
-    'jquery',
-    '/bower_components/chainpad-crypto/crypto.js',
-    '/common/toolbar2.js',
-    '/common/cryptpad-common.js',
-
-    '/common/common-messenger.js',
-    '/contacts/messenger-ui.js',
     '/bower_components/nthen/index.js',
-
-    'less!/bower_components/components-font-awesome/css/font-awesome.min.css',
-    'less!/customize/src/less/cryptpad.less',
-], function ($, Crypto, Toolbar, Cryptpad, Messenger, UI, Nthen) {
-    var Messages = Cryptpad.Messages;
-    var APP = window.APP = {
-        Cryptpad: Cryptpad
+    '/api/config',
+    'jquery',
+    '/common/requireconfig.js',
+    '/common/sframe-common-outer.js'
+], function (nThen, ApiConfig, $, RequireConfig, SFCommonO) {
+    var requireConfig = RequireConfig();
+    var addRpc = function (sFrameChan, Cryptpad) {
+        Cryptpad = Cryptpad;
+
+        // protocols must still be declared in sframe-protocol.js
+        /*
+        sFrameChan.on('Q_HEY_BUDDY', function (data, cb) {
+            cb({
+                error: null,
+                response: "HEY BUDDY",
+            });
+        });
+        */
     };
 
-    Nthen(function (waitFor) {
+    // Loaded in load #2
+    nThen(function (waitFor) {
         $(waitFor());
     }).nThen(function (waitFor) {
-        Cryptpad.ready(waitFor(Cryptpad.reportAppUsage));
-    }).nThen(function () {
-        Cryptpad.addLoadingScreen();
-
-        var ifrw = $('#pad-iframe')[0].contentWindow;
-        var $iframe = $('#pad-iframe').contents();
-        var $list = $iframe.find('#friendList');
-        var $messages = $iframe.find('#messaging');
-        var $bar = $iframe.find('.toolbar-container');
-
-        var displayed = ['useradmin', 'newpad', 'limit', 'pageTitle'];
-
-        var configTb = {
-            displayed: displayed,
-            ifrw: ifrw,
-            common: Cryptpad,
-            $container: $bar,
-            network: Cryptpad.getNetwork(),
-            pageTitle: Messages.contacts_title,
+        var req = {
+            cfg: requireConfig,
+            req: [ '/common/loading.js' ],
+            pfx: window.location.origin
         };
-        var toolbar = APP.toolbar = Toolbar.create(configTb);
-        toolbar.$rightside.html(''); // Remove the drawer if we don't use it to hide the toolbar
-
-        Cryptpad.getProxy().on('disconnect', function () {
-            Cryptpad.alert(Messages.common_connectionLost, undefined, true);
-        });
-        Cryptpad.getProxy().on('reconnect', function (uid) {
-            console.error('reconnecting: ', uid);
-            Cryptpad.findOKButton().click();
+        window.rc = requireConfig;
+        window.apiconf = ApiConfig;
+        $('#sbox-iframe').attr('src',
+            ApiConfig.httpSafeOrigin + '/contacts/inner.html?' + requireConfig.urlArgs +
+                '#' + encodeURIComponent(JSON.stringify(req)));
+
+        // This is a cheap trick to avoid loading sframe-channel in parallel with the
+        // loading screen setup.
+        var done = waitFor();
+        var onMsg = function (msg) {
+            var data = JSON.parse(msg.data);
+            if (data.q !== 'READY') { return; }
+            window.removeEventListener('message', onMsg);
+            var _done = done;
+            done = function () { };
+            _done();
+        };
+        window.addEventListener('message', onMsg);
+    }).nThen(function (/*waitFor*/) {
+        SFCommonO.start({
+            noRealtime: true,
+            addRpc: addRpc,
         });
-
-        var $infoBlock = $('<div>', {'class': 'info'}).appendTo($messages);
-        $('<h2>').text(Messages.contacts_info1).appendTo($infoBlock);
-        var $ul = $('<ul>').appendTo($infoBlock);
-        $('<li>').text(Messages.contacts_info2).appendTo($ul);
-        $('<li>').text(Messages.contacts_info3).appendTo($ul);
-
-        var messenger = window.messenger = Messenger.messenger(Cryptpad);
-        UI.create(messenger, $list, $messages);
     });
 });
diff --git a/www/contacts/main.less b/www/contacts/main.less
deleted file mode 100644
index 4d4c6bee1..000000000
--- a/www/contacts/main.less
+++ /dev/null
@@ -1,248 +0,0 @@
-@import "/customize/src/less/variables.less";
-@import "/customize/src/less/mixins.less";
-
-@button-border: 2px;
-@bg-color: @toolbar-friends-bg;
-@color: @toolbar-friends-color;
-
-html, body {
-    margin: 0px;
-    height: 100%;
-}
-
-#toolbar {
-    display: flex; // We need this to remove a 3px border at the bottom of the toolbar
-}
-
-body {
-    display: flex;
-    flex-flow: column;
-}
-#app {
-    flex: 1;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    min-height: 0;
-}
-
-#app.ready {
-    //background: url('/customize/bg3.jpg') no-repeat center center;
-    background-size: cover;
-    background-position: center;
-}
-.cryptpad-toolbar {
-    padding: 0px;
-    display: inline-block;
-}
-
-
-@keyframes example {
-    0% {
-        background: rgba(0,0,0,0.1);
-    }
-    50% {
-        background: rgba(0,0,0,0.3);
-    }
-    100% {
-        background: rgba(0,0,0,0.1);
-    }
-}
-#friendList {
-    width: 350px;
-    height: 100%;
-    background-color: lighten(@bg-color, 10%);
-    overflow-y: auto;
-    .friend {
-        background: rgba(0,0,0,0.1);
-        padding: 5px;
-        margin: 10px;
-        cursor: pointer;
-        &:hover {
-            background-color: rgba(0,0,0,0.3);
-        }
-        &.notify {
-            animation: example 2s ease-in-out infinite;
-        }
-    }
-}
-
-#friendList .friend, #messaging .avatar {
-    .avatar(30px);
-    &.avatar {
-        display: flex;
-    }
-    cursor: pointer;
-    color: @color;
-    media-tag {
-        img {
-            color: #000;
-        }
-    }
-    media-tag, .default {
-        margin-right: 5px;
-    }
-    .status {
-        width: 5px;
-        display: inline-block;
-        position: absolute;
-        right: 0;
-        top: 0;
-        bottom: 0;
-        opacity: 0.7;
-        background-color: #777;
-        &.online {
-            background-color: green;
-        }
-        &.offline {
-            background-color: red;
-        }
-    }
-}
-
-#friendList {
-    .friend {
-        position: relative;
-    }
-    .remove {
-        cursor: pointer;
-        width: 20px;
-        &:hover {
-            color: darken(@color, 20%);
-        }
-    }
-}
-
-.placeholder (@color: #bbb) {
-    &::-webkit-input-placeholder { /* WebKit, Blink, Edge */
-        color: @color;
-    }
-    &:-moz-placeholder { /* Mozilla Firefox 4 to 18 */
-        color: @color;
-        opacity:  1;
-    }
-    &::-moz-placeholder { /* Mozilla Firefox 19+ */
-        color: @color;
-        opacity:  1;
-    }
-    &:-ms-input-placeholder { /* Internet Explorer 10-11 */
-        color: @color;
-    }
-    &::-ms-input-placeholder { /* Microsoft Edge */
-        color: @color;
-    }
-}
-
-#messaging {
-    flex: 1;
-    height: 100%;
-    background-color: lighten(@bg-color, 20%);
-    min-width: 0;
-
-    .info {
-        padding: 20px;
-    }
-    .header {
-        background-color: lighten(@bg-color, 15%);
-        padding: 0;
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        height: 50px;
-
-        .hover () {
-            height: 100%;
-            line-height: 30px;
-            padding: 10px;
-            &:hover {
-                background-color: rgba(50,50,50,0.3);
-            }
-        }
-
-        .avatar,
-        .right-col {
-             flex:1 1 auto;
-        }
-        .remove-history {
-            .hover;
-        }
-        .avatar {
-            margin: 10px;
-        }
-        .more-history {
-            //display: none;
-            .hover;
-            &.faded {
-                color: darken(@bg-color, 5%);
-            }
-        }
-    }
-    .chat {
-        height: 100%;
-        display: flex;
-        flex-flow: column;
-        .messages {
-            padding: 0 20px;
-            margin: 10px 0;
-            flex: 1;
-            overflow-x: auto;
-            .message {
-                & > div {
-                    padding: 0 10px;
-                }
-                .content {
-                    overflow: hidden;
-                    word-wrap: break-word;
-                    &> * {
-                        margin: 0;
-                    }
-                }
-                .date {
-                    display: none;
-                    font-style: italic;
-                }
-                .sender {
-                    margin-top: 10px;
-                    font-weight: bold;
-                    background-color: rgba(0,0,0,0.1);
-                }
-            }
-        }
-    }
-    .input {
-        background-color: lighten(@bg-color, 15%);
-        height: auto;
-        min-height: 50px;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        padding: 0 75px;
-        textarea {
-            margin: 5px 0;
-            padding: 0 10px;
-            border: none;
-            height: 50px;
-            flex: 1;
-            background-color: darken(@bg-color, 10%);
-            color: @color;
-            resize: none;
-            line-height: 50px;
-            overflow-y: auto;
-            .placeholder(#bbb);
-            &[disabled=true] {
-                .placeholder(#999);
-            }
-            &:placeholder-shown { line-height: 50px; }
-        }
-        button {
-            height: 50px;
-            border-radius: 0;
-            border: none;
-            background-color: darken(@bg-color, 15%);
-            &:hover {
-                background-color: darken(@bg-color, 20%);
-            }
-        }
-    }
-}
-

From 94c392b79fdf6c8eed31e0216de24943e412b0f7 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 2 Oct 2017 18:57:17 +0200
Subject: [PATCH 03/12] secure messaging

---
 www/common/sframe-common-outer.js    | 106 ++++-
 www/common/sframe-messenger-inner.js | 117 +++++
 www/common/sframe-messenger-outer.js | 677 +++++++++++++++++++++++++++
 www/common/sframe-protocol.js        |  17 +
 www/contacts/inner.js                |  30 +-
 www/contacts/main.js                 |  15 +-
 www/contacts/messenger-ui.js         |   1 -
 7 files changed, 925 insertions(+), 38 deletions(-)
 create mode 100644 www/common/sframe-messenger-inner.js
 create mode 100644 www/common/sframe-messenger-outer.js

diff --git a/www/common/sframe-common-outer.js b/www/common/sframe-common-outer.js
index 00bd0e0ea..fa441b9e1 100644
--- a/www/common/sframe-common-outer.js
+++ b/www/common/sframe-common-outer.js
@@ -17,6 +17,7 @@ define([
         var Cryptget;
         var sframeChan;
         var FilePicker;
+        var Messenger;
 
         nThen(function (waitFor) {
             // Load #2, the loading screen is up so grab whatever you need...
@@ -27,13 +28,15 @@ define([
                 '/common/cryptget.js',
                 '/common/sframe-channel.js',
                 '/filepicker/main.js',
+                '/common/common-messenger.js',
             ], waitFor(function (_CpNfOuter, _Cryptpad, _Crypto, _Cryptget, SFrameChannel,
-            _FilePicker) {
+            _FilePicker, _Messenger) {
                 CpNfOuter = _CpNfOuter;
                 Cryptpad = _Cryptpad;
                 Crypto = _Crypto;
                 Cryptget = _Cryptget;
                 FilePicker = _FilePicker;
+                Messenger = _Messenger;
 
                 if (localStorage.CRYPTPAD_URLARGS !== ApiConfig.requireConf.urlArgs) {
                     console.log("New version, flushing cache");
@@ -374,6 +377,107 @@ define([
                 cfg.addRpc(sframeChan, Cryptpad);
             }
 
+            if (cfg.messaging) {
+                var messenger = Messenger.messenger(Cryptpad);
+
+                sframeChan.on('Q_CONTACTS_GET_FRIEND_LIST', function (data, cb) {
+                    messenger.getFriendList(function (e, keys) {
+                        cb({
+                            error: e,
+                            data: keys,
+                        });
+                    });
+                });
+                sframeChan.on('Q_CONTACTS_GET_MY_INFO', function (data, cb) {
+                    messenger.getMyInfo(function (e, info) {
+                        cb({
+                            error: e,
+                            data: info,
+                        });
+                    });
+                });
+                sframeChan.on('Q_CONTACTS_GET_FRIEND_INFO', function (curvePublic, cb) {
+                    console.error(curvePublic);
+                    messenger.getFriendInfo(curvePublic, function (e, info) {
+                        cb({
+                            error: e,
+                            data: info,
+                        });
+                    });
+                });
+
+                sframeChan.on('Q_CONTACTS_OPEN_FRIEND_CHANNEL', function (curvePublic, cb) {
+                    messenger.openFriendChannel(curvePublic, function (e, data) {
+                        cb({ error: e, });
+                    });
+                });
+
+                sframeChan.on('Q_CONTACTS_GET_STATUS', function (curvePublic, cb) {
+                    messenger.getStatus(curvePublic, function (e, online) {
+                        cb({
+                            error: e,
+                            data: online,
+                        });
+                    });
+                });
+
+                sframeChan.on('Q_CONTACTS_GET_MORE_HISTORY', function (opt, cb) {
+                    messenger.getMoreHistory(opt.curvePublic, opt.sig, opt.count, function (e, history) {
+                        cb({
+                            error: e,
+                            data: history,
+                        });
+                    });
+                });
+
+                sframeChan.on('Q_CONTACTS_SEND_MESSAGE', function (opt, cb) {
+                    messenger.sendMessage(opt.curvePublic, opt.content, function (e) {
+                        cb({
+                            error: e,
+                        });
+                    });
+                });
+                sframeChan.on('Q_CONTACTS_SET_CHANNEL_HEAD', function (opt, cb) {
+                    messenger.setChannelHead(opt.curvePublic, opt.sig, function (e) {
+                        cb({
+                            error: e
+                        });
+                    });
+                });
+
+                messenger.on('message', function (message) {
+                    sframeChan.event('EV_CONTACTS_MESSAGE', message);
+                });
+                messenger.on('join', function (curvePublic, channel) {
+                    sframeChan.event('EV_CONTACTS_JOIN', {
+                        curvePublic: curvePublic,
+                        channel: channel,
+                    });
+                });
+                messenger.on('leave', function (curvePublic, channel) {
+                    sframeChan.event('EV_CONTACTS_LEAVE', {
+                        curvePublic: curvePublic,
+                        channel: channel,
+                    });
+                });
+                messenger.on('update', function (info, curvePublic) {
+                    sframeChan.event('EV_CONTACTS_UPDATE', {
+                        curvePublic: curvePublic,
+                        info: info,
+                    });
+                });
+                messenger.on('friend', function (curvePublic) {
+                    sframeChan.event('EV_CONTACTS_FRIEND', {
+                        curvePublic: curvePublic,
+                    });
+                });
+                messenger.on('unfriend', function (curvePublic) {
+                    sframeChan.event('EV_CONTACTS_UNFRIEND', {
+                        curvePublic: curvePublic,
+                    });
+                });
+            }
+
             sframeChan.ready();
 
             Cryptpad.reportAppUsage();
diff --git a/www/common/sframe-messenger-inner.js b/www/common/sframe-messenger-inner.js
new file mode 100644
index 000000000..5d20b6f38
--- /dev/null
+++ b/www/common/sframe-messenger-inner.js
@@ -0,0 +1,117 @@
+define([], function () {
+    var MI = {};
+
+    MI.create = function (sFrameChan) {
+        var messenger = {};
+
+        var _handlers = {
+            message: [],
+            join: [],
+            leave: [],
+            update: [],
+            friend: [],
+            unfriend: []
+        };
+
+        messenger.on = function (key, f) {
+            if (!_handlers[key]) { throw new Error('invalid event'); }
+            _handlers[key].push(f);
+        };
+
+        sFrameChan.on('EV_CONTACTS_MESSAGE', function (err, data) {
+            //if (err || data.error) { return void console.error(err || data.error); }
+            _handlers.message.forEach(function (f) {
+                f(err || data.error, data);
+            });
+        });
+        sFrameChan.on('EV_CONTACTS_JOIN', function (err, data) {
+            if (err || data.error) { return void console.error(err || data.error); }
+            _handlers.join.forEach(function (f) {
+                f(data.curvePublic, data.channel)
+            });
+        });
+        sFrameChan.on('EV_CONTACTS_LEAVE', function (err, data) {
+            if (err || data.error) { return void console.error(err || data.error); }
+            _handlers.leave.forEach(function (f) {
+                f(data.curvePublic, data.channel);
+            });
+        });
+        sFrameChan.on('EV_CONTACTS_UPDATE', function (err, data) {
+            if (err || data.error) { return void console.error(err || data.error); }
+            _handlers.update.forEach(function (f) {
+                f(data.info, data.curvePublic);
+            });
+        });
+        sFrameChan.on('EV_CONTACTS_FRIEND', function (err, data) {
+            if (err || data.error) { return void console.error(err || data.error); }
+            _handlers.friend.forEach(function (f) {
+                f(data.curvePublic);
+            });
+        });
+        sFrameChan.on('EV_CONTACTS_UNFRIEND', function (err, data) {
+            if (err || data.error) { return void console.error(err || data.error); }
+            _handlers.unfriend.forEach(function (f) {
+                f(data.curvePublic);
+            });
+        });
+
+        /*** QUERIES ***/
+        messenger.getFriendList = function (cb) {
+            sFrameChan.query('Q_CONTACTS_GET_FRIEND_LIST', null, function (err, data) {
+                console.error('GET FRIEND LIST');
+                cb(err || data.error, data.data);
+            });
+        };
+        messenger.getMyInfo = function (cb) {
+            sFrameChan.query('Q_CONTACTS_GET_MY_INFO', null, function (err, data) {
+                cb(err || data.error, data.data);
+            });
+        };
+        messenger.getFriendInfo = function (curvePublic, cb) {
+            sFrameChan.query('Q_CONTACTS_GET_FRIEND_INFO', curvePublic, function (err, data) {
+                cb(err || data.error, data.data);
+                //cb({ error: err, data: data, });
+            });
+        };
+        messenger.openFriendChannel = function (curvePublic, cb) {
+            sFrameChan.query('Q_CONTACTS_OPEN_FRIEND_CHANNEL', curvePublic, function (err, data) {
+                cb(err || data.error);
+            });
+        };
+        messenger.getStatus = function (curvePublic, cb) {
+            sFrameChan.query('Q_CONTACTS_GET_STATUS', curvePublic, function (err, data) {
+                cb(err || data.error, data.data);
+            });
+        };
+
+        messenger.getMoreHistory = function (curvePublic, sig, count, cb) {
+            sFrameChan.query('Q_CONTACTS_GET_MORE_HISTORY', {
+                curvePublic: curvePublic,
+                sig: sig,
+                count: count
+            }, function (err, data) {
+                cb(err || data.error, data.data);
+            });
+        };
+        messenger.sendMessage = function (curvePublic, content, cb) {
+            sFrameChan.query('Q_CONTACTS_SEND_MESSAGE', {
+                content: content,
+                curvePublic: curvePublic,
+            }, function (err, data) {
+                cb(err || data.error);
+            });
+        };
+        messenger.setChannelHead = function (curvePublic, sig, cb) {
+            sFrameChan.query('Q_CONTACTS_SET_CHANNEL_HEAD', {
+                curvePublic: curvePublic,
+                sig: sig,
+            }, function (e, data) {
+                cb(e || data.error);
+            });
+        };
+
+        return messenger;
+    };
+
+    return MI;
+});
diff --git a/www/common/sframe-messenger-outer.js b/www/common/sframe-messenger-outer.js
new file mode 100644
index 000000000..476e60b52
--- /dev/null
+++ b/www/common/sframe-messenger-outer.js
@@ -0,0 +1,677 @@
+define([
+    'jquery',
+    '/bower_components/chainpad-crypto/crypto.js',
+    '/common/curve.js',
+    '/common/common-hash.js',
+], function ($, Crypto, Curve, Hash) {
+    'use strict';
+    var Msg = {
+        inputs: [],
+    };
+
+    var Types = {
+        message: 'MSG',
+        update: 'UPDATE',
+        unfriend: 'UNFRIEND',
+        mapId: 'MAP_ID',
+        mapIdAck: 'MAP_ID_ACK'
+    };
+
+    var clone = function (o) {
+        return JSON.parse(JSON.stringify(o));
+    };
+
+    // TODO
+    // - mute a channel (hide notifications or don't open it?)
+    var createData = Msg.createData = function (proxy, hash) {
+        return {
+            channel: hash || Hash.createChannelId(),
+            displayName: proxy['cryptpad.username'],
+            profile: proxy.profile && proxy.profile.view,
+            edPublic: proxy.edPublic,
+            curvePublic: proxy.curvePublic,
+            avatar: proxy.profile && proxy.profile.avatar
+        };
+    };
+
+    var getFriend = function (proxy, pubkey) {
+        if (pubkey === proxy.curvePublic) {
+            var data = createData(proxy);
+            delete data.channel;
+            return data;
+        }
+        return proxy.friends ? proxy.friends[pubkey] : undefined;
+    };
+
+    var getFriendList = Msg.getFriendList = function (proxy) {
+        if (!proxy.friends) { proxy.friends = {}; }
+        return proxy.friends;
+    };
+
+    var eachFriend = function (friends, cb) {
+        Object.keys(friends).forEach(function (id) {
+            if (id === 'me') { return; }
+            cb(friends[id], id, friends);
+        });
+    };
+
+    Msg.getFriendChannelsList = function (proxy) {
+        var list = [];
+        eachFriend(proxy, function (friend) {
+            list.push(friend.channel);
+        });
+        return list;
+    };
+
+    var msgAlreadyKnown = function (channel, sig) {
+        return channel.messages.some(function (message) {
+            return message[0] === sig;
+        });
+    };
+
+    Msg.messenger = function (common) {
+        var messenger = {
+            handlers: {
+                message: [],
+                join: [],
+                leave: [],
+                update: [],
+                friend: [],
+                unfriend: [],
+            },
+            range_requests: {},
+        };
+
+        var eachHandler = function (type, g) {
+            messenger.handlers[type].forEach(g);
+        };
+
+        messenger.on = function (type, f) {
+            var stack = messenger.handlers[type];
+            if (!Array.isArray(stack)) {
+                return void console.error('unsupported message type');
+            }
+            if (typeof(f) !== 'function') {
+                return void console.error('expected function');
+            }
+            stack.push(f);
+        };
+
+        var channels = messenger.channels = {};
+
+        var joining = {};
+
+        // declare common variables
+        var network = common.getNetwork();
+        var proxy = common.getProxy();
+        var realtime = common.getRealtime();
+        Msg.hk = network.historyKeeper;
+        var friends = getFriendList(proxy);
+
+        var getChannel = function (curvePublic) {
+            var friend = friends[curvePublic];
+            if (!friend) { return; }
+            var chanId = friend.channel;
+            if (!chanId) { return; }
+            return channels[chanId];
+        };
+
+        var initRangeRequest = function (txid, curvePublic, sig, cb) {
+            messenger.range_requests[txid] = {
+                messages: [],
+                cb: cb,
+                curvePublic: curvePublic,
+                sig: sig,
+            };
+        };
+
+        var getRangeRequest = function (txid) {
+            return messenger.range_requests[txid];
+        };
+
+        var deleteRangeRequest = function (txid) {
+            delete messenger.range_requests[txid];
+        };
+
+        messenger.getMoreHistory = function (curvePublic, hash, count, cb) {
+            if (typeof(cb) !== 'function') { return; }
+
+            if (typeof(hash) !== 'string') {
+                // FIXME hash is not necessarily defined.
+                // What does this mean?
+                console.error("not sure what to do here");
+                return;
+            }
+
+            var chan = getChannel(curvePublic);
+            if (typeof(chan) === 'undefined') {
+                console.error("chan is undefined. we're going to have a problem here");
+                return;
+            }
+
+            var txid = common.uid();
+            initRangeRequest(txid, curvePublic, hash, cb);
+            var msg = [ 'GET_HISTORY_RANGE', chan.id, {
+                    from: hash,
+                    count: count,
+                    txid: txid,
+                }
+            ];
+
+            network.sendto(network.historyKeeper, JSON.stringify(msg)).then(function () {
+            }, function (err) {
+                throw new Error(err);
+            });
+        };
+
+        var getCurveForChannel = function (id) {
+            var channel = channels[id];
+            if (!channel) { return; }
+            return channel.curve;
+        };
+
+        messenger.getChannelHead = function (curvePublic, cb) {
+            var friend = friends[curvePublic];
+            if (!friend) { return void cb('NO_SUCH_FRIEND'); }
+            cb(void 0, friend.lastKnownHash);
+        };
+
+        messenger.setChannelHead = function (curvePublic, hash, cb) {
+            var friend = friends[curvePublic];
+            if (!friend) { return void cb('NO_SUCH_FRIEND'); }
+            friend.lastKnownHash = hash;
+            cb();
+        };
+
+        // Id message allows us to map a netfluxId with a public curve key
+        var onIdMessage = function (msg, sender) {
+            var channel;
+            var isId = Object.keys(channels).some(function (chanId) {
+                if (channels[chanId].userList.indexOf(sender) !== -1) {
+                    channel = channels[chanId];
+                    return true;
+                }
+            });
+
+            if (!isId) { return; }
+
+            var decryptedMsg = channel.encryptor.decrypt(msg);
+
+            if (decryptedMsg === null) {
+                return void console.error("Failed to decrypt message");
+            }
+
+            if (!decryptedMsg) {
+                console.error('decrypted message was falsey but not null');
+                return;
+            }
+
+            var parsed;
+            try {
+                parsed = JSON.parse(decryptedMsg);
+            } catch (e) {
+                console.error(decryptedMsg);
+                return;
+            }
+            if (parsed[0] !== Types.mapId && parsed[0] !== Types.mapIdAck) { return; }
+
+            // check that the responding peer's encrypted netflux id matches
+            // the sender field. This is to prevent replay attacks.
+            if (parsed[2] !== sender || !parsed[1]) { return; }
+            channel.mapId[sender] = parsed[1];
+            eachHandler('join', function (f) {
+                f(parsed[1], channel.id);
+            });
+
+            if (parsed[0] !== Types.mapId) { return; } // Don't send your key if it's already an ACK
+            // Answer with your own key
+            var rMsg = [Types.mapIdAck, proxy.curvePublic, channel.wc.myID];
+            var rMsgStr = JSON.stringify(rMsg);
+            var cryptMsg = channel.encryptor.encrypt(rMsgStr);
+            network.sendto(sender, cryptMsg);
+        };
+
+        var orderMessages = function (curvePublic, new_messages /*, sig */) {
+            var channel = getChannel(curvePublic);
+            var messages = channel.messages;
+
+            // TODO improve performance, guarantee correct ordering
+            new_messages.reverse().forEach(function (msg) {
+                messages.unshift(msg);
+            });
+        };
+
+        var removeFromFriendList = function (curvePublic, cb) {
+            if (!proxy.friends) { return; }
+            var friends = proxy.friends;
+            delete friends[curvePublic];
+            common.whenRealtimeSyncs(realtime, cb);
+        };
+
+        var pushMsg = function (channel, cryptMsg) {
+            var msg = channel.encryptor.decrypt(cryptMsg);
+            var sig = cryptMsg.slice(0, 64);
+            if (msgAlreadyKnown(channel, sig)) { return; }
+
+            var parsedMsg = JSON.parse(msg);
+            var curvePublic;
+            if (parsedMsg[0] === Types.message) {
+                // TODO validate messages here
+                var res = {
+                    type: parsedMsg[0],
+                    sig: sig,
+                    author: parsedMsg[1],
+                    time: parsedMsg[2],
+                    text: parsedMsg[3],
+                    // this makes debugging a whole lot easier
+                    curve: getCurveForChannel(channel.id),
+                };
+
+                channel.messages.push(res);
+                eachHandler('message', function (f) {
+                    f(res);
+                });
+
+                return true;
+            }
+            if (parsedMsg[0] === Types.update) {
+                if (parsedMsg[1] === proxy.curvePublic) { return; }
+                curvePublic = parsedMsg[1];
+                var newdata = parsedMsg[3];
+                var data = getFriend(proxy, parsedMsg[1]);
+                var types = [];
+                Object.keys(newdata).forEach(function (k) {
+                    if (data[k] !== newdata[k]) {
+                        types.push(k);
+                        data[k] = newdata[k];
+                    }
+                });
+
+                eachHandler('update', function (f) {
+                    f(clone(newdata), curvePublic);
+                });
+                return;
+            }
+            if (parsedMsg[0] === Types.unfriend) {
+                curvePublic = parsedMsg[1];
+                delete friends[curvePublic];
+
+                removeFromFriendList(parsedMsg[1], function () {
+                    channel.wc.leave(Types.unfriend);
+                    eachHandler('unfriend', function (f) {
+                        f(curvePublic);
+                    });
+                });
+                return;
+            }
+        };
+
+        /*  Broadcast a display name, profile, or avatar change to all contacts
+        */
+
+        // TODO send event...
+        messenger.updateMyData = function () {
+            var friends = getFriendList(proxy);
+            var mySyncData = friends.me;
+            var myData = createData(proxy);
+            if (!mySyncData || mySyncData.displayName !== myData.displayName
+                 || mySyncData.profile !== myData.profile
+                 || mySyncData.avatar !== myData.avatar) {
+                delete myData.channel;
+                Object.keys(channels).forEach(function (chan) {
+                    var channel = channels[chan];
+
+                    if (!channel) {
+                        return void console.error('NO_SUCH_CHANNEL');
+                    }
+
+
+                    var msg = [Types.update, myData.curvePublic, +new Date(), myData];
+                    var msgStr = JSON.stringify(msg);
+                    var cryptMsg = channel.encryptor.encrypt(msgStr);
+                    channel.wc.bcast(cryptMsg).then(function () {
+                        // TODO send event
+                        //channel.refresh();
+                    }, function (err) {
+                        console.error(err);
+                    });
+                });
+                eachHandler('update', function (f) {
+                    f(myData, myData.curvePublic);
+                });
+                friends.me = myData;
+            }
+        };
+
+        var onChannelReady = function (chanId) {
+            var cb = joining[chanId];
+            if (typeof(cb) !== 'function') {
+                return void console.error('channel ready without callback');
+            }
+            delete joining[chanId];
+            return cb();
+        };
+
+        var onDirectMessage = function (common, msg, sender) {
+            if (sender !== Msg.hk) { return void onIdMessage(msg, sender); }
+            var parsed = JSON.parse(msg);
+
+            if (/HISTORY_RANGE/.test(parsed[0])) {
+                //console.log(parsed);
+                var txid = parsed[1];
+                var req = getRangeRequest(txid);
+                var type = parsed[0];
+                if (!req) {
+                    return void console.error("received response to unknown request");
+                }
+
+                if (type === 'HISTORY_RANGE') {
+                    req.messages.push(parsed[2]);
+                } else if (type === 'HISTORY_RANGE_END') {
+                    // process all the messages (decrypt)
+                    var curvePublic = req.curvePublic;
+                    var channel = getChannel(curvePublic);
+
+                    var decrypted = req.messages.map(function (msg) {
+                        if (msg[2] !== 'MSG') { return; }
+                        try {
+                            return {
+                                d: JSON.parse(channel.encryptor.decrypt(msg[4])),
+                                sig: msg[4].slice(0, 64),
+                            };
+                        } catch (e) {
+                            console.log('failed to decrypt');
+                            return null;
+                        }
+                    }).filter(function (decrypted) {
+                        return decrypted;
+                    }).map(function (O) {
+                        return {
+                            type: O.d[0],
+                            sig: O.sig,
+                            author: O.d[1],
+                            time: O.d[2],
+                            text: O.d[3],
+                            curve: curvePublic,
+                        };
+                    });
+
+                    orderMessages(curvePublic, decrypted, req.sig);
+                    req.cb(void 0, decrypted);
+                    return deleteRangeRequest(txid);
+                } else {
+                    console.log(parsed);
+                }
+                return;
+            }
+
+            if ((parsed.validateKey || parsed.owners) && parsed.channel) {
+                return;
+            }
+            if (parsed.state && parsed.state === 1 && parsed.channel) {
+                if (channels[parsed.channel]) {
+                    // parsed.channel is Ready
+                    // channel[parsed.channel].ready();
+                    channels[parsed.channel].ready = true;
+                    onChannelReady(parsed.channel);
+                    var updateTypes = channels[parsed.channel].updateOnReady;
+                    if (updateTypes) {
+
+                        //channels[parsed.channel].updateUI(updateTypes);
+                    }
+                }
+                return;
+            }
+            var chan = parsed[3];
+            if (!chan || !channels[chan]) { return; }
+            pushMsg(channels[chan], parsed[4]);
+        };
+
+        var onMessage = function (msg, sender, chan) {
+            if (!channels[chan.id]) { return; }
+
+            var isMessage = pushMsg(channels[chan.id], msg);
+            if (isMessage) {
+                if (channels[chan.id].wc.myID !== sender) {
+                    // Don't notify for your own messages
+                    //channels[chan.id].notify();
+                }
+                //channels[chan.id].refresh();
+                // TODO emit message event
+            }
+        };
+
+        // listen for messages...
+        network.on('message', function(msg, sender) {
+            onDirectMessage(common, msg, sender);
+        });
+
+        messenger.removeFriend = function (curvePublic, cb) {
+            if (typeof(cb) !== 'function') { throw new Error('NO_CALLBACK'); }
+            var data = getFriend(proxy, curvePublic);
+
+            if (!data) {
+                // friend is not valid
+                console.error('friend is not valid');
+                return;
+            }
+
+            var channel = channels[data.channel];
+            if (!channel) {
+                return void cb("NO_SUCH_CHANNEL");
+            }
+
+            if (!network.webChannels.some(function (wc) {
+                return wc.id === channel.id;
+            })) {
+                console.error('bad channel: ', curvePublic);
+            }
+
+            var msg = [Types.unfriend, proxy.curvePublic, +new Date()];
+            var msgStr = JSON.stringify(msg);
+            var cryptMsg = channel.encryptor.encrypt(msgStr);
+
+            // TODO emit remove_friend event?
+            try {
+                channel.wc.bcast(cryptMsg).then(function () {
+                    delete friends[curvePublic];
+                    delete channels[curvePublic];
+                    common.whenRealtimeSyncs(realtime, function () {
+                        cb();
+                    });
+                }, function (err) {
+                    console.error(err);
+                    cb(err);
+                });
+            } catch (e) {
+                cb(e);
+            }
+        };
+
+        var getChannelMessagesSince = function (chan, data, keys) {
+            console.log('Fetching [%s] messages since [%s]', data.curvePublic, data.lastKnownHash || '');
+            var cfg = {
+                validateKey: keys.validateKey,
+                owners: [proxy.edPublic, data.edPublic],
+                lastKnownHash: data.lastKnownHash
+            };
+            var msg = ['GET_HISTORY', chan.id, cfg];
+            network.sendto(network.historyKeeper, JSON.stringify(msg))
+              .then($.noop, function (err) {
+                throw new Error(err);
+            });
+        };
+
+        var openFriendChannel = function (data, f) {
+            var keys = Curve.deriveKeys(data.curvePublic, proxy.curvePrivate);
+            var encryptor = Curve.createEncryptor(keys);
+            network.join(data.channel).then(function (chan) {
+                var channel = channels[data.channel] = {
+                    id: data.channel,
+                    sending: false,
+                    friendEd: f,
+                    keys: keys,
+                    curve: data.curvePublic,
+                    encryptor: encryptor,
+                    messages: [],
+                    wc: chan,
+                    userList: [],
+                    mapId: {},
+                    send: function (payload, cb) {
+                        if (!network.webChannels.some(function (wc) {
+                            if (wc.id === channel.wc.id) { return true; }
+                        })) {
+                            return void cb('NO_SUCH_CHANNEL');
+                        }
+
+                        var msg = [Types.message, proxy.curvePublic, +new Date(), payload];
+                        var msgStr = JSON.stringify(msg);
+                        var cryptMsg = channel.encryptor.encrypt(msgStr);
+
+                        channel.wc.bcast(cryptMsg).then(function () {
+                            pushMsg(channel, cryptMsg);
+                            cb();
+                        }, function (err) {
+                            cb(err);
+                        });
+                    }
+                };
+                chan.on('message', function (msg, sender) {
+                    onMessage(msg, sender, chan);
+                });
+
+                var onJoining = function (peer) {
+                    if (peer === Msg.hk) { return; }
+                    if (channel.userList.indexOf(peer) !== -1) { return; }
+
+                    channel.userList.push(peer);
+                    var msg = [Types.mapId, proxy.curvePublic, chan.myID];
+                    var msgStr = JSON.stringify(msg);
+                    var cryptMsg = channel.encryptor.encrypt(msgStr);
+                    network.sendto(peer, cryptMsg);
+                };
+                chan.members.forEach(function (peer) {
+                    if (peer === Msg.hk) { return; }
+                    if (channel.userList.indexOf(peer) !== -1) { return; }
+                    channel.userList.push(peer);
+                });
+                chan.on('join', onJoining);
+                chan.on('leave', function (peer) {
+                    var curvePublic = channel.mapId[peer];
+                    var i = channel.userList.indexOf(peer);
+                    while (i !== -1) {
+                        channel.userList.splice(i, 1);
+                        i = channel.userList.indexOf(peer);
+                    }
+                    // update status
+                    if (!curvePublic) { return; }
+                    eachHandler('leave', function (f) {
+                        f(curvePublic, channel.id);
+                    });
+                });
+
+                // FIXME don't subscribe to the channel implicitly
+                getChannelMessagesSince(chan, data, keys);
+            }, function (err) {
+                console.error(err);
+            });
+        };
+
+        messenger.getFriendList = function (cb) {
+            var friends = proxy.friends;
+            if (!friends) { return void cb(void 0, []); }
+
+            cb(void 0, Object.keys(proxy.friends).filter(function (k) {
+                return k !== 'me';
+            }));
+        };
+
+        messenger.openFriendChannel = function (curvePublic, cb) {
+            if (typeof(curvePublic) !== 'string') { return void cb('INVALID_ID'); }
+            if (typeof(cb) !== 'function') { throw new Error('expected callback'); }
+
+            var friend = clone(friends[curvePublic]);
+            if (typeof(friend) !== 'object') {
+                return void cb('NO_FRIEND_DATA');
+            }
+            var channel = friend.channel;
+            if (!channel) { return void cb('E_NO_CHANNEL'); }
+            joining[channel] = cb;
+            openFriendChannel(friend, curvePublic);
+        };
+
+        messenger.sendMessage = function (curvePublic, payload, cb) {
+            var channel = getChannel(curvePublic);
+            if (!channel) { return void cb('NO_CHANNEL'); }
+            if (!network.webChannels.some(function (wc) {
+                if (wc.id === channel.wc.id) { return true; }
+            })) {
+                return void cb('NO_SUCH_CHANNEL');
+            }
+
+            var msg = [Types.message, proxy.curvePublic, +new Date(), payload];
+            var msgStr = JSON.stringify(msg);
+            var cryptMsg = channel.encryptor.encrypt(msgStr);
+
+            channel.wc.bcast(cryptMsg).then(function () {
+                pushMsg(channel, cryptMsg);
+                cb();
+            }, function (err) {
+                cb(err);
+            });
+        };
+
+        messenger.getStatus = function (curvePublic, cb) {
+            var channel = getChannel(curvePublic);
+            if (!channel) { return void cb('NO_SUCH_CHANNEL'); }
+            var online = channel.userList.some(function (nId) {
+                return channel.mapId[nId] === curvePublic;
+            });
+            cb(void 0, online);
+        };
+
+        messenger.getFriendInfo = function (curvePublic, cb) {
+            setTimeout(function () {
+                var friend = friends[curvePublic];
+                if (!friend) { return void cb('NO_SUCH_FRIEND'); }
+                // this clone will be redundant when ui uses postmessage
+                cb(void 0, clone(friend));
+            });
+        };
+
+        messenger.getMyInfo = function (cb) {
+            cb(void 0, {
+                curvePublic: proxy.curvePublic,
+                displayName: common.getDisplayName(),
+            });
+        };
+
+        // TODO listen for changes to your friend list
+        // emit 'update' events for clients
+
+        //var update = function (curvePublic
+        proxy.on('change', ['friends'], function (o, n, p) {
+            var curvePublic;
+            if (o === undefined) {
+                // new friend added
+                curvePublic = p.slice(-1)[0];
+                eachHandler('friend', function (f) {
+                    f(curvePublic, clone(n));
+                });
+                return;
+            }
+
+            console.error(o, n, p);
+        }).on('remove', ['friends'], function (o, p) {
+            eachHandler('unfriend', function (f) {
+                f(p[1]); // TODO
+            });
+        });
+
+        Object.freeze(messenger);
+
+        return messenger;
+    };
+
+    return Msg;
+});
diff --git a/www/common/sframe-protocol.js b/www/common/sframe-protocol.js
index cab662df0..c21bb5bce 100644
--- a/www/common/sframe-protocol.js
+++ b/www/common/sframe-protocol.js
@@ -130,4 +130,21 @@ define({
 
     // Put one or more entries to the cache which will go in localStorage.
     'EV_CACHE_PUT': true,
+
+    // Contacts
+    'EV_CONTACTS_MESSAGE': true,
+    'EV_CONTACTS_JOIN': true,
+    'EV_CONTACTS_LEAVE': true,
+    'EV_CONTACTS_UPDATE': true,
+    'EV_CONTACTS_FRIEND': true,
+    'EV_CONTACTS_UNFRIEND': true,
+    'Q_CONTACTS_GET_FRIEND_LIST': true,
+    'Q_CONTACTS_GET_MY_INFO': true,
+    'Q_CONTACTS_GET_FRIEND_INFO': true,
+    'Q_CONTACTS_OPEN_FRIEND_CHANNEL': true,
+    'Q_CONTACTS_GET_STATUS': true,
+    'Q_CONTACTS_GET_MORE_HISTORY': true,
+    'Q_CONTACTS_SEND_MESSAGE': true,
+    'Q_CONTACTS_SET_CHANNEL_HEAD': true,
+
 });
diff --git a/www/contacts/inner.js b/www/contacts/inner.js
index 741205243..6ec607eeb 100644
--- a/www/contacts/inner.js
+++ b/www/contacts/inner.js
@@ -8,6 +8,7 @@ define([
     '/common/sframe-common.js',
     '/common/hyperscript.js',
     '/contacts/messenger-ui.js',
+    '/common/sframe-messenger-inner.js',
 
     'css!/bower_components/bootstrap/dist/css/bootstrap.min.css',
     'less!/bower_components/components-font-awesome/css/font-awesome.min.css',
@@ -21,7 +22,8 @@ define([
     nThen,
     SFCommon,
     h,
-    UI
+    UI,
+    Messenger
     )
 {
     var Messages = Cryptpad.Messages;
@@ -78,32 +80,14 @@ define([
             pageTitle: Messages.contacts_title,
             metadataMgr: common.getMetadataMgr(),
         };
-        var toolbar = APP.toolbar = Toolbar.create(configTb);
-        toolbar = toolbar; // FIXME;
+        APP.toolbar = Toolbar.create(configTb);
 
-var stub = function () {
-    var p;
-    var t = function(){
-        console.error('called with arguments', Cryptpad.slice(arguments));
-        return p;
-    };
-    p = new Proxy(t, {
-        set: function (o, k, v) {
-            console.error('setting %s to %s', k, v);
-            o[k] = v;
-            return true;
-        }, get: function (o, k) {
-            console.error('getting %s', k);
-            return typeof(o[k]) !== 'undefined'? o[k]: p;
-        }
-    });
-    return p;
-};
+        var messenger = Messenger.create(sFrameChan);
 
-        var messengerStub = stub();
-        UI.create(messengerStub, $(friendList), $(messaging));
+        UI.create(messenger, $(friendList), $(messaging));
 
         Cryptpad.removeLoadingScreen();
+
 /*
         sFrameChan.query('Q_HEY_BUDDY', null, function (err, data) {
             if (!data) { return; }
diff --git a/www/contacts/main.js b/www/contacts/main.js
index 3107a9005..544e3ef9c 100644
--- a/www/contacts/main.js
+++ b/www/contacts/main.js
@@ -7,19 +7,8 @@ define([
     '/common/sframe-common-outer.js'
 ], function (nThen, ApiConfig, $, RequireConfig, SFCommonO) {
     var requireConfig = RequireConfig();
-    var addRpc = function (sFrameChan, Cryptpad) {
-        Cryptpad = Cryptpad;
 
-        // protocols must still be declared in sframe-protocol.js
-        /*
-        sFrameChan.on('Q_HEY_BUDDY', function (data, cb) {
-            cb({
-                error: null,
-                response: "HEY BUDDY",
-            });
-        });
-        */
-    };
+    var messenger;
 
     // Loaded in load #2
     nThen(function (waitFor) {
@@ -51,7 +40,7 @@ define([
     }).nThen(function (/*waitFor*/) {
         SFCommonO.start({
             noRealtime: true,
-            addRpc: addRpc,
+            messaging: true,
         });
     });
 });
diff --git a/www/contacts/messenger-ui.js b/www/contacts/messenger-ui.js
index 0119bcd7c..920a76c16 100644
--- a/www/contacts/messenger-ui.js
+++ b/www/contacts/messenger-ui.js
@@ -510,7 +510,6 @@ define([
                 }
             };
             ready();
-
             keys.forEach(function (curvePublic) {
                 connectToFriend(curvePublic, ready);
             });

From 6c7b135f91a335d1a9e5aa0266fffc4287397c92 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 2 Oct 2017 18:58:18 +0200
Subject: [PATCH 04/12] lint compliance

---
 www/common/sframe-common-outer.js    | 2 +-
 www/common/sframe-messenger-inner.js | 2 +-
 www/contacts/main.js                 | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/www/common/sframe-common-outer.js b/www/common/sframe-common-outer.js
index fa441b9e1..f524b9bdf 100644
--- a/www/common/sframe-common-outer.js
+++ b/www/common/sframe-common-outer.js
@@ -407,7 +407,7 @@ define([
                 });
 
                 sframeChan.on('Q_CONTACTS_OPEN_FRIEND_CHANNEL', function (curvePublic, cb) {
-                    messenger.openFriendChannel(curvePublic, function (e, data) {
+                    messenger.openFriendChannel(curvePublic, function (e) {
                         cb({ error: e, });
                     });
                 });
diff --git a/www/common/sframe-messenger-inner.js b/www/common/sframe-messenger-inner.js
index 5d20b6f38..0511f8423 100644
--- a/www/common/sframe-messenger-inner.js
+++ b/www/common/sframe-messenger-inner.js
@@ -27,7 +27,7 @@ define([], function () {
         sFrameChan.on('EV_CONTACTS_JOIN', function (err, data) {
             if (err || data.error) { return void console.error(err || data.error); }
             _handlers.join.forEach(function (f) {
-                f(data.curvePublic, data.channel)
+                f(data.curvePublic, data.channel);
             });
         });
         sFrameChan.on('EV_CONTACTS_LEAVE', function (err, data) {
diff --git a/www/contacts/main.js b/www/contacts/main.js
index 544e3ef9c..f99e7d472 100644
--- a/www/contacts/main.js
+++ b/www/contacts/main.js
@@ -8,8 +8,6 @@ define([
 ], function (nThen, ApiConfig, $, RequireConfig, SFCommonO) {
     var requireConfig = RequireConfig();
 
-    var messenger;
-
     // Loaded in load #2
     nThen(function (waitFor) {
         $(waitFor());

From 09c0a473e26a0c88f8f9920fa86be1f882207dc6 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Tue, 3 Oct 2017 14:08:40 +0200
Subject: [PATCH 05/12] fix function signatures

---
 www/common/sframe-common-outer.js    |  1 -
 www/common/sframe-messenger-inner.js | 21 +++++++--------------
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/www/common/sframe-common-outer.js b/www/common/sframe-common-outer.js
index 52f82294c..322a1c73a 100644
--- a/www/common/sframe-common-outer.js
+++ b/www/common/sframe-common-outer.js
@@ -447,7 +447,6 @@ define([
                     });
                 });
                 sframeChan.on('Q_CONTACTS_GET_FRIEND_INFO', function (curvePublic, cb) {
-                    console.error(curvePublic);
                     messenger.getFriendInfo(curvePublic, function (e, info) {
                         cb({
                             error: e,
diff --git a/www/common/sframe-messenger-inner.js b/www/common/sframe-messenger-inner.js
index 0511f8423..c0dced050 100644
--- a/www/common/sframe-messenger-inner.js
+++ b/www/common/sframe-messenger-inner.js
@@ -18,38 +18,32 @@ define([], function () {
             _handlers[key].push(f);
         };
 
-        sFrameChan.on('EV_CONTACTS_MESSAGE', function (err, data) {
-            //if (err || data.error) { return void console.error(err || data.error); }
+        sFrameChan.on('EV_CONTACTS_MESSAGE', function (data) {
             _handlers.message.forEach(function (f) {
-                f(err || data.error, data);
+                f(data);
             });
         });
-        sFrameChan.on('EV_CONTACTS_JOIN', function (err, data) {
-            if (err || data.error) { return void console.error(err || data.error); }
+        sFrameChan.on('EV_CONTACTS_JOIN', function (data) {
             _handlers.join.forEach(function (f) {
                 f(data.curvePublic, data.channel);
             });
         });
-        sFrameChan.on('EV_CONTACTS_LEAVE', function (err, data) {
-            if (err || data.error) { return void console.error(err || data.error); }
+        sFrameChan.on('EV_CONTACTS_LEAVE', function (data) {
             _handlers.leave.forEach(function (f) {
                 f(data.curvePublic, data.channel);
             });
         });
-        sFrameChan.on('EV_CONTACTS_UPDATE', function (err, data) {
-            if (err || data.error) { return void console.error(err || data.error); }
+        sFrameChan.on('EV_CONTACTS_UPDATE', function (data) {
             _handlers.update.forEach(function (f) {
                 f(data.info, data.curvePublic);
             });
         });
-        sFrameChan.on('EV_CONTACTS_FRIEND', function (err, data) {
-            if (err || data.error) { return void console.error(err || data.error); }
+        sFrameChan.on('EV_CONTACTS_FRIEND', function (data) {
             _handlers.friend.forEach(function (f) {
                 f(data.curvePublic);
             });
         });
-        sFrameChan.on('EV_CONTACTS_UNFRIEND', function (err, data) {
-            if (err || data.error) { return void console.error(err || data.error); }
+        sFrameChan.on('EV_CONTACTS_UNFRIEND', function (data) {
             _handlers.unfriend.forEach(function (f) {
                 f(data.curvePublic);
             });
@@ -58,7 +52,6 @@ define([], function () {
         /*** QUERIES ***/
         messenger.getFriendList = function (cb) {
             sFrameChan.query('Q_CONTACTS_GET_FRIEND_LIST', null, function (err, data) {
-                console.error('GET FRIEND LIST');
                 cb(err || data.error, data.data);
             });
         };

From f90742603e3d6a464b5d0919497fd68bb187840b Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Tue, 3 Oct 2017 17:53:28 +0200
Subject: [PATCH 06/12] style fixes

---
 www/contacts/app-contacts.less | 11 ++++++++---
 www/contacts/inner.js          |  3 ++-
 www/contacts/messenger-ui.js   | 12 ++++++------
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/www/contacts/app-contacts.less b/www/contacts/app-contacts.less
index 791b2fa66..3c40bc59e 100644
--- a/www/contacts/app-contacts.less
+++ b/www/contacts/app-contacts.less
@@ -65,6 +65,11 @@
             padding: 5px;
             margin: 10px;
             cursor: pointer;
+            .right-col {
+                margin-left: 5px;
+                display: flex;
+                flex-flow: column;
+            }
             &:hover {
                 background-color: rgba(0,0,0,0.3);
             }
@@ -74,9 +79,9 @@
         }
     }
 
-    #friendList .friend, #messaging .avatar {
+    #friendList .friend, #messaging .cp-avatar {
         .avatar_main(30px);
-        &.avatar {
+        &.cp-avatar {
             display: flex;
         }
         cursor: pointer;
@@ -173,7 +178,7 @@
             .remove-history {
                 .hover;
             }
-            .avatar {
+            .cp-avatar {
                 margin: 10px;
             }
             .more-history {
diff --git a/www/contacts/inner.js b/www/contacts/inner.js
index 6ec607eeb..15146a565 100644
--- a/www/contacts/inner.js
+++ b/www/contacts/inner.js
@@ -81,10 +81,11 @@ define([
             metadataMgr: common.getMetadataMgr(),
         };
         APP.toolbar = Toolbar.create(configTb);
+        APP.toolbar.$rightside.hide();
 
         var messenger = Messenger.create(sFrameChan);
 
-        UI.create(messenger, $(friendList), $(messaging));
+        UI.create(messenger, $(friendList), $(messaging), common);
 
         Cryptpad.removeLoadingScreen();
 
diff --git a/www/contacts/messenger-ui.js b/www/contacts/messenger-ui.js
index 920a76c16..4862e623b 100644
--- a/www/contacts/messenger-ui.js
+++ b/www/contacts/messenger-ui.js
@@ -35,7 +35,7 @@ define([
         };
     };
 
-    UI.create = function (messenger, $userlist, $messages) {
+    UI.create = function (messenger, $userlist, $messages, common) {
         var state = window.state = {
             active: '',
         };
@@ -168,7 +168,7 @@ define([
                 });
             });
 
-            var avatar = h('div.avatar');
+            var avatar = h('div.cp-avatar');
             var header = h('div.header', [
                 avatar,
                 moreHistory,
@@ -190,11 +190,11 @@ define([
             if (data.avatar && avatars[data.avatar]) {
                 $avatar.append(avatars[data.avatar]).append(rightCol);
             } else {
-                Cryptpad.displayAvatar($avatar, data.avatar, data.displayName, function ($img) {
+                common.displayAvatar($avatar, data.avatar, data.displayName, function ($img) {
                     if (data.avatar && $img) {
                         avatars[data.avatar] = $img[0].outerHTML;
                     }
-                    $avatar.append(rightCol);
+                    $(rightCol).insertAfter($avatar);
                 });
             }
 
@@ -325,7 +325,7 @@ define([
 
         markup.friend = function (data) {
             var curvePublic = data.curvePublic;
-            var friend = h('div.friend.avatar', {
+            var friend = h('div.friend.cp-avatar', {
                 'data-key': curvePublic,
             });
 
@@ -365,7 +365,7 @@ define([
                 $friend.append(avatars[data.avatar]);
                 $friend.append(rightCol);
             } else {
-                Cryptpad.displayAvatar($friend, data.avatar, data.displayName, function ($img) {
+                common.displayAvatar($friend, data.avatar, data.displayName, function ($img) {
                     if (data.avatar && $img) {
                         avatars[data.avatar] = $img[0].outerHTML;
                     }

From f15ec4efe913ad502c4a44347e04010507167a7d Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Tue, 3 Oct 2017 18:05:28 +0200
Subject: [PATCH 07/12] add tagging to whiteboard and file apps

---
 www/file/app-file.less             | 2 ++
 www/file/inner.js                  | 3 ++-
 www/whiteboard/app-whiteboard.less | 2 ++
 www/whiteboard/inner.js            | 1 +
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/www/file/app-file.less b/www/file/app-file.less
index 1e4825414..e2065d00f 100644
--- a/www/file/app-file.less
+++ b/www/file/app-file.less
@@ -3,10 +3,12 @@
 @import (once) "../../customize/src/less2/include/markdown.less";
 @import (once) '../../customize/src/less2/include/fileupload.less';
 @import (once) '../../customize/src/less2/include/alertify.less';
+@import (once) '../../customize/src/less2/include/tokenfield.less';
 
 .toolbar_main();
 .fileupload_main();
 .alertify_main();
+.tokenfield_main();
 
 @button-border: 2px;
 
diff --git a/www/file/inner.js b/www/file/inner.js
index a71c4a7f5..55e7487a1 100644
--- a/www/file/inner.js
+++ b/www/file/inner.js
@@ -137,7 +137,8 @@ define([
                             }))
                             .append(common.createButton('forget', true, {}, function () {
                                 // not sure what to do here
-                            }));
+                            }))
+                            .append(common.createButton('hashtag', true));
                             rightsideDisplayed = true;
                         }
 
diff --git a/www/whiteboard/app-whiteboard.less b/www/whiteboard/app-whiteboard.less
index 848fd994c..b2bd789fc 100644
--- a/www/whiteboard/app-whiteboard.less
+++ b/www/whiteboard/app-whiteboard.less
@@ -4,10 +4,12 @@
 @import (once) '../../customize/src/less2/include/fileupload.less';
 @import (once) '../../customize/src/less2/include/alertify.less';
 @import (once) '../../customize/src/less2/include/tools.less';
+@import (once) '../../customize/src/less2/include/tokenfield.less';
 
 .toolbar_main();
 .fileupload_main();
 .alertify_main();
+.tokenfield_main();
 
 // body
 &.cp-app-whiteboard {
diff --git a/www/whiteboard/inner.js b/www/whiteboard/inner.js
index cd14ef9f3..972063b2e 100644
--- a/www/whiteboard/inner.js
+++ b/www/whiteboard/inner.js
@@ -409,6 +409,7 @@ define([
                 setEditable(false);
             });
             $rightside.append($forget);
+            common.createButton('hashtag', true).appendTo($rightside);
 
             if (!readOnly) {
                 makeColorButton($rightside);

From b8ce149db6ebffaa6684ef66bfbe21a490ee5c91 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Tue, 3 Oct 2017 18:36:34 +0200
Subject: [PATCH 08/12] add hint about tag usage

---
 customize.dist/translations/messages.js | 4 +++-
 www/common/common-interface.js          | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js
index fc7c204d9..de0646352 100644
--- a/customize.dist/translations/messages.js
+++ b/customize.dist/translations/messages.js
@@ -160,7 +160,9 @@ define(function () {
     out.or = 'or';
 
     out.tags_title = "Tags";
-    out.tags_add = "Update this pad's tags";
+    out.tags_add = "Update this page's tags";
+    out.tags_searchHint = "Find files by their tags by searching in your CryptDrive";
+
     out.tags_duplicate = "Duplicate tag: {0}";
 
     out.slideOptionsText = "Options";
diff --git a/www/common/common-interface.js b/www/common/common-interface.js
index f85aec474..fee97a837 100644
--- a/www/common/common-interface.js
+++ b/www/common/common-interface.js
@@ -177,7 +177,10 @@ define([
         var input = dialog.textInput();
 
         var tagger = dialog.frame([
-            dialog.message(Messages.tags_add),
+            dialog.message([
+                Messages.tags_add,
+                h('p', Messages.tags_searchHint)
+            ]),
             input,
             dialog.nav(),
         ]);

From e2f53eaddbc3aa6f19657081939fa72da2818af8 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Tue, 3 Oct 2017 18:39:03 +0200
Subject: [PATCH 09/12] add loading screen tip about hashtags

---
 customize.dist/translations/messages.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js
index de0646352..a5a72066b 100644
--- a/customize.dist/translations/messages.js
+++ b/customize.dist/translations/messages.js
@@ -725,6 +725,7 @@ define(function () {
     out.tips.drive = "Logged in users can organize their files in their CryptDrive, accessible from the CryptPad icon at the top left of all pads.";
     out.tips.profile = "Registered users can create a profile from the user menu in the top right.";
     out.tips.avatars = "You can upload an avatar in your profile. People will see it when you collaborate in a pad.";
+    out.tips.tags = "You can hashtag pads, and then search by tag in your CryptDrive.";
 
     out.feedback_about = "If you're reading this, you were probably curious why CryptPad is requesting web pages when you perform certain actions";
     out.feedback_privacy = "We care about your privacy, and at the same time we want CryptPad to be very easy to use.  We use this file to figure out which UI features matter to our users, by requesting it along with a parameter specifying which action was taken.";

From ceb8ff18bde6ad68570d16ec81b7c0fa6e51cf83 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 4 Oct 2017 15:51:44 +0200
Subject: [PATCH 10/12] Fix ghost icon in drive

---
 www/drive/inner.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/www/drive/inner.js b/www/drive/inner.js
index f8ed897ed..2ef3932cf 100644
--- a/www/drive/inner.js
+++ b/www/drive/inner.js
@@ -1465,11 +1465,11 @@ define([
                     APP.newFolder = info.newPath;
                     refresh();
                 };
-                $block.find('a.cp-app-drive-toolbar-new-folder, li.cp-app-drive-toolbar-new-folder')
+                $block.find('a.cp-app-drive-new-folder, li.cp-app-drive-new-folder')
                     .click(function () {
                     filesOp.addFolder(currentPath, null, onCreated);
                 });
-                $block.find('a.cp-app-drive-toolbar-new-upload, li.cp-app-drive-toolbar-new-upload')
+                $block.find('a.cp-app-drive-new-upload, li.cp-app-drive-new-upload')
                     .click(function () {
                     var $input = $('<input>', {
                         'type': 'file',
@@ -1484,7 +1484,7 @@ define([
                     $input.click();
                 });
             }
-            $block.find('a.cp-app-drive-toolbar-new-doc, li.cp-app-drive-toolbar-new-doc')
+            $block.find('a.cp-app-drive-new-doc, li.cp-app-drive-new-doc')
                 .click(function () {
                 var type = $(this).attr('data-type') || 'pad';
                 var path = filesOp.isPathIn(currentPath, [TRASH]) ? '' : currentPath;
@@ -1504,20 +1504,20 @@ define([
             if (isInRoot) {
                 options.push({
                     tag: 'a',
-                    attributes: {'class': 'cp-app-drive-toolbar-new-older'},
+                    attributes: {'class': 'cp-app-drive-new-older'},
                     content: $('<div>').append($folderIcon.clone()).html() + Messages.fm_folder
                 });
                 options.push({tag: 'hr'});
                 options.push({
                     tag: 'a',
-                    attributes: {'class': 'cp-app-drive-toolbar-new-upload'},
+                    attributes: {'class': 'cp-app-drive-new-upload'},
                     content: $('<div>').append(getIcon('file')).html() + Messages.uploadButton
                 });
                 options.push({tag: 'hr'});
             }
             getNewPadTypes().forEach(function (type) {
                 var attributes = {
-                    'class': 'cp-app-drive-toolbar-new-doc',
+                    'class': 'cp-app-drive-new-doc',
                     'data-type': type,
                     'href': '#'
                 };

From 5304dc319fd48df04aa181d735a497fd9e6b608b Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 4 Oct 2017 15:55:57 +0200
Subject: [PATCH 11/12] Enable redirection to the previous page after
 registration

---
 www/register/main.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/www/register/main.js b/www/register/main.js
index 1b7103cac..7de37e8bf 100644
--- a/www/register/main.js
+++ b/www/register/main.js
@@ -85,8 +85,6 @@ define([
             Cryptpad.whenRealtimeSyncs(result.realtime, function () {
                 Cryptpad.login(result.userHash, result.userName, function () {
                     registering = false;
-                    /*
-                    FIXME: migration and readme not working if not redirected to drive
                     if (sessionStorage.redirectTo) {
                         var h = sessionStorage.redirectTo;
                         var parser = document.createElement('a');
@@ -97,7 +95,6 @@ define([
                             return;
                         }
                     }
-                    */
                     window.location.href = '/drive/';
                 });
             });

From a90c078e8469a2a76a3627a6dc9de3214e7e76dc Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Thu, 5 Oct 2017 10:21:59 +0200
Subject: [PATCH 12/12] correct reference to undefined

---
 www/drive/inner.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/drive/inner.js b/www/drive/inner.js
index f8ed897ed..ca8d06b9c 100644
--- a/www/drive/inner.js
+++ b/www/drive/inner.js
@@ -1265,7 +1265,7 @@ define([
                 $element.contextmenu(openTrashContextMenu);
                 $element.data('context', $trashContextMenu);
             }
-            var isNewFolder = APP.newFolder && filesOp.comparePath(newPath, module.newFolder);
+            var isNewFolder = APP.newFolder && filesOp.comparePath(newPath, APP.newFolder);
             if (isNewFolder) {
                 appStatus.onReady(function () {
                     window.setTimeout(function () { displayRenameInput($element, newPath); }, 0);