From bbf2e3a9aef2c7e742af0d3751118feac0523fc2 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Fri, 6 Dec 2019 16:10:19 +0100
Subject: [PATCH 001/129] Mute and unmute users

---
 .../src/less2/include/mediatag.less           |  7 ++
 .../src/less2/include/messenger.less          |  4 ++
 www/code/app-code.less                        |  7 ++
 www/common/media-tag.js                       |  2 -
 www/common/messenger-ui.js                    | 64 ++++++++++++++++---
 www/common/outer/messenger.js                 | 32 ++++++++++
 6 files changed, 106 insertions(+), 10 deletions(-)

diff --git a/customize.dist/src/less2/include/mediatag.less b/customize.dist/src/less2/include/mediatag.less
index 704fd71bd..f8255aab3 100644
--- a/customize.dist/src/less2/include/mediatag.less
+++ b/customize.dist/src/less2/include/mediatag.less
@@ -7,6 +7,13 @@
         text-align: center;
     }
 
+    media-tag:empty {
+        width: 100px;
+        height: 100px;
+        display: inline-block;
+        border: 1px solid #BBB;
+    }
+
     media-tag img {
         flex: 1;
         max-height: 100% !important;
diff --git a/customize.dist/src/less2/include/messenger.less b/customize.dist/src/less2/include/messenger.less
index 7f4f7c342..4b89b967d 100644
--- a/customize.dist/src/less2/include/messenger.less
+++ b/customize.dist/src/less2/include/messenger.less
@@ -121,6 +121,10 @@
                     }
                 }
             }
+            .cp-app-contacts-muted-button {
+                display: none;
+                order: 3;
+            }
         }
     }
     #cp-app-contacts-container.cp-app-contacts-inapp {
diff --git a/www/code/app-code.less b/www/code/app-code.less
index f07ef534d..219143a34 100644
--- a/www/code/app-code.less
+++ b/www/code/app-code.less
@@ -98,6 +98,13 @@
                 max-height: 90vh;
             }
         }
+        media-tag:empty {
+            width: 100px;
+            height: 100px;
+            display: inline-block;
+            border: 1px solid #BBB;
+        }
+
         .markdown_main();
         .cp-app-code-preview-empty {
             display: none;
diff --git a/www/common/media-tag.js b/www/common/media-tag.js
index a2beb3b4a..27683c54e 100644
--- a/www/common/media-tag.js
+++ b/www/common/media-tag.js
@@ -435,8 +435,6 @@
             return mediaObject;
         }
 
-        mediaObject.tag.innerHTML = '<img style="width: 100px; height: 100px;">';
-
         // Download the encrypted blob
         download(src, function (err, u8Encrypted) {
             if (err) {
diff --git a/www/common/messenger-ui.js b/www/common/messenger-ui.js
index 1979bae66..7c437969b 100644
--- a/www/common/messenger-ui.js
+++ b/www/common/messenger-ui.js
@@ -3,9 +3,10 @@ define([
     '/customize/messages.js',
     '/common/common-util.js',
     '/common/common-interface.js',
+    '/common/common-ui-elements.js',
     '/common/hyperscript.js',
     '/common/diffMarked.js',
-], function ($, Messages, Util, UI, h, DiffMd) {
+], function ($, Messages, Util, UI, UIElements, h, DiffMd) {
     'use strict';
 
     var debug = console.log;
@@ -67,8 +68,9 @@ define([
                 h('div.cp-app-contacts-category-content')
             ]),
             h('div.cp-app-contacts-friends.cp-app-contacts-category', [
-                h('div.cp-app-contacts-category-content'),
+                h('div.cp-app-contacts-category-content.cp-contacts-friends'),
                 h('h2.cp-app-contacts-category-title', Messages.contacts_friends),
+                h('button.cp-app-contacts-muted-button', Messages.contacts_manageMuted || 'MANAGE MUTED') // XXX
             ]),
             h('div.cp-app-contacts-rooms.cp-app-contacts-category', [
                 h('div.cp-app-contacts-category-content'),
@@ -486,6 +488,15 @@ define([
             }
         };
 
+        var muteUser = function (data) {
+            execCommand('MUTE_USER', {
+                curvePublic: data.curvePublic,
+                name: data.displayName || data.name,
+                avatar: data.avatar
+            }, function (e /*, removed */) {
+                if (e) { return void console.error(e); }
+            });
+        };
         var removeFriend = function (curvePublic) {
             execCommand('REMOVE_FRIEND', curvePublic, function (e /*, removed */) {
                 if (e) { return void console.error(e); }
@@ -529,13 +540,16 @@ define([
                 if (!channel.isFriendChat) { return; }
                 var curvePublic = channel.curvePublic;
                 var friend = contactsData[curvePublic] || friendData;
-                UI.confirm(Messages._getKey('contacts_confirmRemove', [
-                    Util.fixHTML(friend.name)
-                ]), function (yes) {
+                var muteBox = UI.createCheckbox('cp-contacts-mute', Messages.contacts_mute, false);
+                var content = h('div', [
+                    h('p', Messages._getKey('contacts_confirmRemove', [Util.fixHTML(friend.name)])),
+                    muteBox
+                ]);
+                UI.confirm(content, function (yes) {
                     if (!yes) { return; }
-                    removeFriend(curvePublic, function (e) {
-                        if (e) { return void console.error(e); }
-                    });
+                    var mute = Util.isChecked($(content).find('#cp-contacts-mute'));
+                    muteUser(friend);
+                    removeFriend(curvePublic);
                     // TODO remove friend from userlist ui
                     // FIXME seems to trigger EJOINED from netflux-websocket (from server);
                     // (tried to join a channel in which you were already present)
@@ -806,6 +820,40 @@ define([
                 rooms.forEach(initializeRoom);
             });
 
+            execCommand('GET_MUTED_USERS', null, function (err, muted) {
+                if (err) { return void console.error(err); }
+
+                if (!muted || Object.keys(muted).length === 0) { return; }
+
+                var $button = $userlist.find('.cp-app-contacts-muted-button');
+                var rows = Object.keys(muted).map(function (curve) {
+                    var data = muted[curve];
+                    var avatar = h('div.cp-avatar');
+                    var button = h('td', h('i.fa.fa-times', {title: Messages.contacts_unmute}));
+                    UIElements.displayAvatar(common, $(avatar), data.avatar, data.name);
+                    $(button).click(function () {
+                        execCommand('UNMUTE_USER', {
+                            curvePublic: curve,
+                        }, function (e /*, removed */) {
+                            if (e) { return void console.error(e); }
+                            $(button).closest('tr').remove();
+                        });
+                    });
+                    return h('tr', [
+                        h('td', avatar),
+                        h('td', data.name),
+                        button
+                    ]);
+                });
+                var content = h('div', [
+                    h('p', Messages.contacts_mutedUsers),
+                    h('table', rows)
+                ]);
+                $button.click(function () {
+                    UI.alert(content);
+                }).show();
+            });
+
             $container.removeClass('cp-app-contacts-initializing');
         };
 
diff --git a/www/common/outer/messenger.js b/www/common/outer/messenger.js
index d0e200deb..90884198e 100644
--- a/www/common/outer/messenger.js
+++ b/www/common/outer/messenger.js
@@ -458,6 +458,29 @@ define([
         }
     };
 
+    var muteUser = function (ctx, data, _cb) {
+        var cb = Util.once(Util.mkAsync(_cb));
+        var proxy = ctx.store.proxy;
+        var muted = proxy.mutedUsers = proxy.mutedUsers || {};
+        if (muted[data.curvePublic]) { return void cb(); }
+        muted[data.curvePublic] = data;
+        cb();
+    };
+    var unmuteUser = function (ctx, curvePublic, _cb) {
+        var cb = Util.once(Util.mkAsync(_cb));
+        var proxy = ctx.store.proxy;
+        var muted = proxy.mutedUsers = proxy.mutedUsers || {};
+        delete muted[curvePublic];
+        cb();
+    };
+    var getMutedUsers = function (ctx, cb) {
+        var proxy = ctx.store.proxy;
+        if (cb) {
+            return void cb(proxy.mutedUsers || {});
+        }
+        return proxy.mutedUsers || {};
+    };
+
     var openChannel = function (ctx, data) {
         var proxy = ctx.store.proxy;
         var network = ctx.store.network;
@@ -990,6 +1013,9 @@ define([
             if (cmd === 'GET_ROOMS') {
                 return void getRooms(ctx, data, cb);
             }
+            if (cmd === 'GET_MUTED_USERS') {
+                return void getMutedUsers(ctx, cb);
+            }
             if (cmd === 'GET_USERLIST') {
                 return void getUserList(ctx, data, cb);
             }
@@ -1002,6 +1028,12 @@ define([
             if (cmd === 'REMOVE_FRIEND') {
                 return void removeFriend(ctx, data, cb);
             }
+            if (cmd === 'MUTE_USER') {
+                return void muteUser(ctx, data, cb);
+            }
+            if (cmd === 'UNMUTE_USER') {
+                return void unmuteUser(ctx, data, cb);
+            }
             if (cmd === 'GET_STATUS') {
                 return void getStatus(ctx, data, cb);
             }

From 11ddb96422d7ce6b675046a88a84eafcbfec80b7 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 10 Dec 2019 13:07:57 +0100
Subject: [PATCH 002/129] Mute friends: dismiss notifications and fix UI issues

---
 www/common/common-interface.js       |  1 +
 www/common/common-messaging.js       |  1 +
 www/common/common-ui-elements.js     | 37 +++++++++++++++++--
 www/common/messenger-ui.js           | 53 +++++++++++++++++-----------
 www/common/outer/async-store.js      |  4 +++
 www/common/outer/mailbox-handlers.js | 34 ++++++++++++++++++
 www/common/outer/messenger.js        | 40 +++++++++++++++------
 7 files changed, 136 insertions(+), 34 deletions(-)

diff --git a/www/common/common-interface.js b/www/common/common-interface.js
index 8efc7397a..3c758a88b 100644
--- a/www/common/common-interface.js
+++ b/www/common/common-interface.js
@@ -580,6 +580,7 @@ define([
         }];
         var modal = dialog.customModal(content, {buttons: buttons});
         UI.openCustomModal(modal);
+        return modal;
     };
 
     UI.log = function (msg) {
diff --git a/www/common/common-messaging.js b/www/common/common-messaging.js
index 91322f526..feb3d79d3 100644
--- a/www/common/common-messaging.js
+++ b/www/common/common-messaging.js
@@ -84,6 +84,7 @@ define([
         var myData = createData(store.proxy, false);
         if (store.proxy.friends) {
             store.proxy.friends.me = myData;
+            delete store.proxy.friends.me.channel;
         }
         if (store.modules['team']) {
             store.modules['team'].updateMyData(myData);
diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index eb8bb21a2..992428899 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -3803,10 +3803,20 @@ define([
             });
         };
 
+        var modal;
+        var mute = UIElements.createMuteButton(common, msg.content, function () {
+            // Mute = auto-reject friend request
+            var $modal = modal && $(modal) && $(modal).closest('div.alertify');
+            if ($modal && $modal.length && $modal[0].closeModal) {
+                $modal[0].closeModal(function () {});
+            }
+            return void todo(false); // XXX false is reject. We can also "dismiss"...
+        });
         var content = h('div.cp-share-modal', [
-            setHTML(h('p'), text)
+            setHTML(h('p'), text),
+            h('p', mute)
         ]);
-        UI.proposal(content, todo);
+        modal = UI.proposal(content, todo);
     };
 
     UIElements.displayAddOwnerModal = function (common, data) {
@@ -4148,5 +4158,28 @@ define([
         UI.proposal(div, todo);
     };
 
+    UIElements.createMuteButton = function (common, data, cb) {
+        cb = cb || function () {};
+        var button = h('i.fa.fa-bell-slash-o', {
+            title: Messages.notifications_muteUserTitle
+        });
+        var module = common.makeUniversal('messenger');
+        $(button).click(function () {
+            UI.confirm(Messages.notifications_muteUserConfirm, function (yes) {
+                if (!yes) { return; }
+                module.execCommand('MUTE_USER', {
+                    curvePublic: data.curvePublic,
+                    name: data.displayName || data.name,
+                    avatar: data.avatar
+                }, function (e) {
+                    cb(e);
+                    if (e) { return void UI.warn(Messages.error); }
+                    UI.log(Messages.success);
+                });
+            });
+        });
+        return button;
+    };
+
     return UIElements;
 });
diff --git a/www/common/messenger-ui.js b/www/common/messenger-ui.js
index 7c437969b..9ce795f4e 100644
--- a/www/common/messenger-ui.js
+++ b/www/common/messenger-ui.js
@@ -186,7 +186,7 @@ define([
         markup.message = function (msg) {
             if (msg.type !== 'MSG') { return; }
             var curvePublic = msg.author;
-            var name = typeof msg.name !== "undefined" ?
+            var name = (typeof msg.name !== "undefined" || !contactsData[msg.author]) ?
                             (msg.name || Messages.anonymous) :
                             contactsData[msg.author].displayName;
             var d = msg.time ? new Date(msg.time) : undefined;
@@ -548,7 +548,7 @@ define([
                 UI.confirm(content, function (yes) {
                     if (!yes) { return; }
                     var mute = Util.isChecked($(content).find('#cp-contacts-mute'));
-                    muteUser(friend);
+                    if (mute) { muteUser(friend); }
                     removeFriend(curvePublic);
                     // TODO remove friend from userlist ui
                     // FIXME seems to trigger EJOINED from netflux-websocket (from server);
@@ -806,37 +806,27 @@ define([
         // var onJoinRoom
         // var onLeaveRoom
 
-
-        var ready = false;
-        var onMessengerReady = function () {
-            if (isApp) { return; }
-            if (ready) { return; }
-            ready = true;
-
-            execCommand('GET_ROOMS', null, function (err, rooms) {
-                if (err) { return void console.error(err); }
-
-                debug('rooms: ' + JSON.stringify(rooms));
-                rooms.forEach(initializeRoom);
-            });
-
+        var updateMutedList = function () {
             execCommand('GET_MUTED_USERS', null, function (err, muted) {
                 if (err) { return void console.error(err); }
 
-                if (!muted || Object.keys(muted).length === 0) { return; }
-
                 var $button = $userlist.find('.cp-app-contacts-muted-button');
+
+                if (!muted || Object.keys(muted).length === 0) {
+                    $button.hide();
+                    return;
+                }
+
                 var rows = Object.keys(muted).map(function (curve) {
                     var data = muted[curve];
                     var avatar = h('div.cp-avatar');
                     var button = h('td', h('i.fa.fa-times', {title: Messages.contacts_unmute}));
                     UIElements.displayAvatar(common, $(avatar), data.avatar, data.name);
                     $(button).click(function () {
-                        execCommand('UNMUTE_USER', {
-                            curvePublic: curve,
-                        }, function (e /*, removed */) {
+                        execCommand('UNMUTE_USER', curve, function (e, data) {
                             if (e) { return void console.error(e); }
                             $(button).closest('tr').remove();
+                            if (!data) { $button.hide(); }
                         });
                     });
                     return h('tr', [
@@ -849,10 +839,27 @@ define([
                     h('p', Messages.contacts_mutedUsers),
                     h('table', rows)
                 ]);
+                $button.off('click');
                 $button.click(function () {
                     UI.alert(content);
                 }).show();
             });
+        };
+
+        var ready = false;
+        var onMessengerReady = function () {
+            if (isApp) { return; }
+            if (ready) { return; }
+            ready = true;
+
+            execCommand('GET_ROOMS', null, function (err, rooms) {
+                if (err) { return void console.error(err); }
+
+                debug('rooms: ' + JSON.stringify(rooms));
+                rooms.forEach(initializeRoom);
+            });
+
+            updateMutedList();
 
             $container.removeClass('cp-app-contacts-initializing');
         };
@@ -930,6 +937,10 @@ define([
                 onUpdateData(data);
                 return;
             }
+            if (cmd === 'UPDATE_MUTED') {
+                updateMutedList();
+                return;
+            }
             if (cmd === 'MESSAGE') {
                 onMessage(data);
                 return;
diff --git a/www/common/outer/async-store.js b/www/common/outer/async-store.js
index 0cf362e5d..0a44dfc76 100644
--- a/www/common/outer/async-store.js
+++ b/www/common/outer/async-store.js
@@ -1253,6 +1253,10 @@ define([
             if (friend) { return void cb({error: 'ALREADY_FRIEND'}); }
             if (!data.notifications || !data.curvePublic) { return void cb({error: 'INVALID_USER'}); }
 
+            // Unmute this user when we send them a friend request
+            var muted = store.proxy.mutedUsers || {};
+            delete muted[data.curvePublic];
+
             store.proxy.friends_pending = store.proxy.friends_pending || {};
 
             var twoDaysAgo = +new Date() - (2 * 24 * 3600 * 1000);
diff --git a/www/common/outer/mailbox-handlers.js b/www/common/outer/mailbox-handlers.js
index 00f990eb3..6e10cd5a2 100644
--- a/www/common/outer/mailbox-handlers.js
+++ b/www/common/outer/mailbox-handlers.js
@@ -12,6 +12,13 @@ define([
     var handlers = {};
     var removeHandlers = {};
 
+    var isMuted = function (ctx, data) {
+        var muted = ctx.store.proxy.mutedUsers || {};
+        var curvePublic = Util.find(data, ['msg', 'author']);
+        if (!curvePublic) { return false; }
+        return Boolean(muted[curvePublic]);
+    };
+
     // Store the friend request displayed to avoid duplicates
     var friendRequest = {};
     handlers['FRIEND_REQUEST'] = function (ctx, box, data, cb) {
@@ -21,6 +28,8 @@ define([
             return void cb(true);
         }
 
+        if (isMuted(ctx, data)) { return void cb(true); }
+
         // Don't show duplicate friend request: if we already have a friend request
         // in memory from the same user, dismiss the new one
         if (friendRequest[data.msg.author]) { return void cb(true); }
@@ -30,10 +39,22 @@ define([
         // If the user is already in our friend list, automatically accept the request
         if (Messaging.getFriend(ctx.store.proxy, data.msg.author) ||
             ctx.store.proxy.friends_pending[data.msg.author]) {
+            delete ctx.store.proxy.friends_pending[data.msg.author];
             Messaging.acceptFriendRequest(ctx.store, data.msg.content, function (obj) {
                 if (obj && obj.error) {
                     return void cb();
                 }
+                Messaging.addToFriendList({
+                    proxy: ctx.store.proxy,
+                    realtime: ctx.store.realtime,
+                    pinPads: ctx.pinPads
+                }, data.msg.content, function (err) {
+                    if (err) { console.error(err); }
+                    if (ctx.store.messenger) {
+                        ctx.store.messenger.onFriendAdded(data.msg.content);
+                    }
+                });
+                ctx.updateMetadata();
                 cb(true);
             });
             return;
@@ -170,6 +191,8 @@ define([
         var content = msg.content;
         // content.name, content.title, content.href, content.password
 
+        if (isMuted(ctx, data)) { return void cb(true); }
+
         var channel = Hash.hrefToHexChannelId(content.href, content.password);
         var parsed = Hash.parsePadUrl(content.href);
         var mode = parsed.hashData && parsed.hashData.mode || 'n/a';
@@ -212,6 +235,9 @@ define([
         supportMessage = true;
         cb();
     };
+    removeHandlers['SUPPORT_MESSAGE'] = function () {
+        supportMessage = false;
+    };
 
     // Incoming edit rights request: add data before sending it to inner
     handlers['REQUEST_PAD_ACCESS'] = function (ctx, box, data, cb) {
@@ -220,6 +246,8 @@ define([
 
         if (msg.author !== content.user.curvePublic) { return void cb(true); }
 
+        if (isMuted(ctx, data)) { return void cb(true); }
+
         var channel = content.channel;
         var res = ctx.store.manager.findChannel(channel);
 
@@ -270,6 +298,9 @@ define([
         var content = msg.content;
 
         if (msg.author !== content.user.curvePublic) { return void cb(true); }
+
+        if (isMuted(ctx, data)) { return void cb(true); }
+
         if (!content.teamChannel && !(content.href && content.title && content.channel)) {
             console.log('Remove invalid notification');
             return void cb(true);
@@ -327,6 +358,9 @@ define([
         var content = msg.content;
 
         if (msg.author !== content.user.curvePublic) { return void cb(true); }
+
+        if (isMuted(ctx, data)) { return void cb(true); }
+
         if (!content.team) {
             console.log('Remove invalid notification');
             return void cb(true);
diff --git a/www/common/outer/messenger.js b/www/common/outer/messenger.js
index 90884198e..5d4c67135 100644
--- a/www/common/outer/messenger.js
+++ b/www/common/outer/messenger.js
@@ -458,12 +458,22 @@ define([
         }
     };
 
+    var getAllClients = function (ctx) {
+        var all = [];
+        Array.prototype.push.apply(all, ctx.friendsClients);
+        Object.keys(ctx.channels).forEach(function (id) {
+            Array.prototype.push.apply(all, ctx.channels[id].clients);
+        });
+        return Util.deduplicateString(all);
+    };
+
     var muteUser = function (ctx, data, _cb) {
         var cb = Util.once(Util.mkAsync(_cb));
         var proxy = ctx.store.proxy;
         var muted = proxy.mutedUsers = proxy.mutedUsers || {};
         if (muted[data.curvePublic]) { return void cb(); }
         muted[data.curvePublic] = data;
+        ctx.emit('UPDATE_MUTED', null, getAllClients(ctx));
         cb();
     };
     var unmuteUser = function (ctx, curvePublic, _cb) {
@@ -471,7 +481,8 @@ define([
         var proxy = ctx.store.proxy;
         var muted = proxy.mutedUsers = proxy.mutedUsers || {};
         delete muted[curvePublic];
-        cb();
+        ctx.emit('UPDATE_MUTED', null, getAllClients(ctx));
+        cb(Object.keys(muted).length);
     };
     var getMutedUsers = function (ctx, cb) {
         var proxy = ctx.store.proxy;
@@ -687,7 +698,14 @@ define([
         nThen(function (waitFor) {
             // Load or get all friends channels
             Object.keys(friends).forEach(function (key) {
-                if (key === 'me') { return; }
+                if (key === 'me') {
+                    // At some point a bug inserted a friend's channel into our "me" data.
+                    // This led to displaying our name instead of our friend's name in the
+                    // contacts app. The following line is here to prevent this issue to happen
+                    // again.
+                    delete friends.me.channel;
+                    return;
+                }
                 var friend = clone(friends[key]);
                 if (typeof(friend) !== 'object') { return; }
                 if (!friend.channel) { return; }
@@ -910,15 +928,6 @@ define([
         });
     };
 
-    var getAllClients = function (ctx) {
-        var all = [];
-        Array.prototype.push.apply(all, ctx.friendsClients);
-        Object.keys(ctx.channels).forEach(function (id) {
-            Array.prototype.push.apply(all, ctx.channels[id].clients);
-        });
-        return Util.deduplicateString(all);
-    };
-
     Msg.init = function (cfg, waitFor, emit) {
         var messenger = {};
         var store = cfg.store;
@@ -934,6 +943,9 @@ define([
             range_requests: {}
         };
 
+        store.proxy.on('change', ['mutedUsers'], function () {
+            ctx.emit('UPDATE_MUTED', null, getAllClients(ctx));
+        });
 
         ctx.store.network.on('message', function(msg, sender) {
             onDirectMessage(ctx, msg, sender);
@@ -965,6 +977,12 @@ define([
             var channel = friend.channel;
             if (!channel) { return; }
 
+            // Already friend? don't load the channel a second time
+            var chanId = friend.channel;
+            var chan = ctx.channels[chanId];
+            if (chan) { return; }
+
+            // Load the channel and add the friend to the contacts app
             loadFriend(ctx, null, friend, function () {
                 emit('FRIEND', {
                     curvePublic: friend.curvePublic,

From aa8dd95310ee8d2c411936d58abe4bd9e4bcd62b Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 11 Dec 2019 13:28:07 +0100
Subject: [PATCH 003/129] Add unfriend, mute and unmute buttons in profile

---
 www/common/common-ui-elements.js |  1 -
 www/common/messenger-ui.js       |  4 +-
 www/common/outer/messenger.js    |  7 ++--
 www/profile/inner.js             | 66 ++++++++++++++++++++++++++++++--
 4 files changed, 68 insertions(+), 10 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 992428899..459f4319d 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -4174,7 +4174,6 @@ define([
                 }, function (e) {
                     cb(e);
                     if (e) { return void UI.warn(Messages.error); }
-                    UI.log(Messages.success);
                 });
             });
         });
diff --git a/www/common/messenger-ui.js b/www/common/messenger-ui.js
index 9ce795f4e..f157f2a08 100644
--- a/www/common/messenger-ui.js
+++ b/www/common/messenger-ui.js
@@ -542,7 +542,7 @@ define([
                 var friend = contactsData[curvePublic] || friendData;
                 var muteBox = UI.createCheckbox('cp-contacts-mute', Messages.contacts_mute, false);
                 var content = h('div', [
-                    h('p', Messages._getKey('contacts_confirmRemove', [Util.fixHTML(friend.name)])),
+                    UI.setHTML(h('p'), Messages._getKey('contacts_confirmRemove', [Util.fixHTML(friend.name)])),
                     muteBox
                 ]);
                 UI.confirm(content, function (yes) {
@@ -553,7 +553,7 @@ define([
                     // TODO remove friend from userlist ui
                     // FIXME seems to trigger EJOINED from netflux-websocket (from server);
                     // (tried to join a channel in which you were already present)
-                }, undefined, true);
+                });
             });
 
             if (friendData.avatar && avatars[friendData.avatar]) {
diff --git a/www/common/outer/messenger.js b/www/common/outer/messenger.js
index 5d4c67135..4d5e42973 100644
--- a/www/common/outer/messenger.js
+++ b/www/common/outer/messenger.js
@@ -428,20 +428,21 @@ define([
         }
 
         var channel = ctx.channels[data.channel];
-        if (!channel) {
-            return void cb({error: "NO_SUCH_CHANNEL"});
-        }
 
         // Unfriend with mailbox
         if (ctx.store.mailbox && data.curvePublic && data.notifications) {
             Messaging.removeFriend(ctx.store, curvePublic, function (obj) {
                 if (obj && obj.error) { return void cb({error:obj.error}); }
+                ctx.updateMetadata();
                 cb(obj);
             });
             return;
         }
 
         // Unfriend with channel
+        if (!channel) {
+            return void cb({error: "NO_SUCH_CHANNEL"});
+        }
         try {
             var msg = [Types.unfriend, proxy.curvePublic, +new Date()];
             var msgStr = JSON.stringify(msg);
diff --git a/www/profile/inner.js b/www/profile/inner.js
index 4635743f6..301fa0808 100644
--- a/www/profile/inner.js
+++ b/www/profile/inner.js
@@ -178,9 +178,6 @@ define([
 
     var addFriendRequest = function ($container) {
         if (!APP.readOnly || !APP.common.isLoggedIn()) { return; }
-        APP.$friend = $('<button>', {
-            'class': 'btn btn-success cp-app-profile-friend-request',
-        });
         APP.$friend = $(h('div.cp-app-profile-friend-container'));
         $container.append(APP.$friend);
     };
@@ -195,9 +192,45 @@ define([
 
         APP.$friend.html('');
 
+        var module = common.makeUniversal('messenger');
+        var name = Util.fixHTML(data.name) || Messages.anonymous;
+
         var friends = common.getMetadataMgr().getPrivateData().friends;
+        // This is a friend: display the "friend" message and an "unfriend" button
         if (friends[data.curvePublic]) {
-            APP.$friend.append(h('p.cp-app-profile-friend', Messages._getKey('profile_friend', [data.name || Messages.anonymous])));
+            // Add friend message
+            APP.$friend.append(h('p.cp-app-profile-friend', Messages._getKey('profile_friend', [name])));
+            if (!friends[data.curvePublic].notifications) { return; }
+            // Add unfriend button
+            var $unfriendButton = $('<button>', {
+                'class': 'btn btn-danger cp-app-profile-friend-request',
+            }).text(Messages.contacts_remove).appendTo(APP.$friend);
+            $unfriendButton.click(function () {
+                // Unfriend confirm + mute checkbox
+                var muteBox = UI.createCheckbox('cp-contacts-mute', Messages.contacts_mute, false);
+                var content = h('div', [
+                    UI.setHTML(h('p'), Messages._getKey('contacts_confirmRemove', [name])),
+                    muteBox
+                ]);
+                UI.confirm(content, function (yes) {
+                    if (!yes) { return; }
+                    // Mute if necessary
+                    var mute = Util.isChecked($(content).find('#cp-contacts-mute'));
+                    if (mute) {
+                        module.execCommand('MUTE_USER', {
+                            curvePublic: data.curvePublic,
+                            name: name,
+                            avatar: data.avatar
+                        }, function (e /*, removed */) {
+                            if (e) { return void console.error(e); }
+                        });
+                    }
+                    // And unfriend
+                    module.execCommand('REMOVE_FRIEND', data.curvePublic, function (e) {
+                        if (e) { return void console.error(e); }
+                    });
+                });
+            });
             return;
         }
 
@@ -215,11 +248,13 @@ define([
             return;
         }
 
+        // Pending friend (we've sent a friend request)
         var pendingFriends = APP.common.getPendingFriends(); // Friend requests sent
         if (pendingFriends[data.curvePublic]) {
             $button.attr('disabled', 'disabled').text(Messages.profile_friendRequestSent);
             return;
         }
+        // This is not a friend yet: we can send a friend request or mute them
         $button.text(Messages._getKey('userlist_addAsFriendTitle', [data.name || Messages.anonymous]))
             .click(function () {
                 APP.common.sendFriendRequest({
@@ -229,6 +264,29 @@ define([
                     $button.attr('disabled', 'disabled').text(Messages.profile_friendRequestSent);
                 });
             });
+
+        // Add mute/unmute buttons
+        var $mute = $(h('div')).appendTo(APP.$friend);
+        module.execCommand('GET_MUTED_USERS', null, function (muted) {
+            if (!muted || typeof(muted) !== "object") { return; }
+            var isMuted = muted[data.curvePublic];
+            if (isMuted) {
+                var $unmuteButton = $('<button>', {
+                    'class': 'btn btn-danger cp-app-profile-friend-request',
+                }).text(Messages.contacts_unmute || 'UNMUTE').appendTo($mute);
+                $unmuteButton.click(function () {
+                    module.execCommand('UNMUTE_USER', data.curvePublic, function (e) {
+                        if (e) { return void console.error(e); }
+                        refreshFriendRequest(data);
+                    });
+                });
+                return;
+            }
+            var button = UIElements.createMuteButton(common, data, function () {
+                refreshFriendRequest(data);
+            });
+            $mute.append(button);
+        });
     };
 
     var displayAvatar = function (val) {

From 32891be320c642fc25f91315f53dac7278d3fcfd Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 11 Dec 2019 16:40:39 +0100
Subject: [PATCH 004/129] Fix export and username prompt

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

diff --git a/www/common/common-interface.js b/www/common/common-interface.js
index 72438fec2..68db40c81 100644
--- a/www/common/common-interface.js
+++ b/www/common/common-interface.js
@@ -461,7 +461,7 @@ define([
         opt = opt || {};
 
         var inputBlock = opt.password ? UI.passwordInput() : dialog.textInput();
-        var input = opt.password ? $(inputBlock).find('input')[0] : inputBlock;
+        var input = $(inputBlock).is('input') ? inputBlock : $(inputBlock).find('input')[0];
         input.value = typeof(def) === 'string'? def: '';
 
         var message;

From 585138aeeede39b67df26379b39edf6b71253768 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 11 Dec 2019 17:18:32 +0100
Subject: [PATCH 005/129] Fix links in profile description

---
 www/profile/inner.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/www/profile/inner.js b/www/profile/inner.js
index 4635743f6..054144342 100644
--- a/www/profile/inner.js
+++ b/www/profile/inner.js
@@ -361,6 +361,17 @@ define([
     var refreshDescription = function (data) {
         var val = Marked(data.description || "");
         APP.$description.html(val);
+        APP.$description.off('click');
+        APP.$description.click(function (e) {
+            if (!e.target) { return; }
+            var $t = $(e.target);
+            if ($t.is('a') || $t.parents('a').length) {
+                e.preventDefault();
+                var $a = $t.is('a') ? $t : $t.parents('a').first();
+                var href = $a.attr('href');
+                common.openUnsafeURL(href);
+            }
+        });
         APP.$descriptionEdit.find('span').text(val === "" ? Messages.profile_addDescription : Messages.profile_editDescription);
         if (!APP.editor) { return; }
         APP.editor.setValue(data.description || "");

From 998e2f81d265caf4c3550086af8fe1907425a8d2 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 12 Dec 2019 15:30:14 +0100
Subject: [PATCH 006/129] Invite to team modal

---
 www/common/common-ui-elements.js | 106 +++++++++++++++++++++----------
 1 file changed, 73 insertions(+), 33 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index d9610c822..411b082e7 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1559,6 +1559,7 @@ define([
 
         var module = config.module || common.makeUniversal('team');
 
+        // Invite contacts
         var $div;
         var refreshButton = function () {
             if (!$div) { return; }
@@ -1572,48 +1573,87 @@ define([
                 $btn.prop('disabled', 'disabled');
             }
         };
-        var list = UIElements.getUserGrid(Messages.team_pickFriends, {
-            common: common,
-            data: config.friends,
-            large: true
-        }, refreshButton);
-        $div = $(list.div);
-        refreshButton();
+        var getContacts = function () {
+            var list = UIElements.getUserGrid(Messages.team_pickFriends, {
+                common: common,
+                data: config.friends,
+                large: true
+            }, refreshButton);
+            var div = h('div.contains-nav');
+            var $div = $(div);
+            $div.append(list.div);
+            var contactsButtons = [{
+                className: 'primary',
+                name: Messages.team_inviteModalButton,
+                onClick: function () {
+                    var $sel = $div.find('.cp-usergrid-user.cp-selected');
+                    var sel = $sel.toArray();
+                    if (!sel.length) { return; }
 
-        var buttons = [{
+                    sel.forEach(function (el) {
+                        var curve = $(el).attr('data-curve');
+                        module.execCommand('INVITE_TO_TEAM', {
+                            teamId: config.teamId,
+                            user: config.friends[curve]
+                        }, function (obj) {
+                            if (obj && obj.error) {
+                                console.error(obj.error);
+                                return UI.warn(Messages.error);
+                            }
+                        });
+                    });
+                },
+                keys: [13]
+            }];
+
+            return {
+                content: div,
+                buttons: contactsButtons
+            };
+        };
+        hasFriends = false;
+        var friendsObject = hasFriends ? getContacts() : noContactsMessage(common);
+        console.log(friendsObject);
+        var friendsList = friendsObject.content;
+        var contactsButtons = friendsObject.buttons;
+        contactsButtons.unshift({
             className: 'cancel',
             name: Messages.cancel,
             onClick: function () {},
             keys: [27]
-        }, {
-            className: 'primary',
-            name: Messages.team_inviteModalButton,
-            onClick: function () {
-                var $sel = $div.find('.cp-usergrid-user.cp-selected');
-                var sel = $sel.toArray();
-                if (!sel.length) { return; }
+        });
 
-                sel.forEach(function (el) {
-                    var curve = $(el).attr('data-curve');
-                    module.execCommand('INVITE_TO_TEAM', {
-                        teamId: config.teamId,
-                        user: config.friends[curve]
-                    }, function (obj) {
-                        if (obj && obj.error) {
-                            console.error(obj.error);
-                            return UI.warn(Messages.error);
-                        }
-                    });
-                });
-            },
-            keys: [13]
-        }];
+        var contactsContent = h('div.cp-share-modal', [
+            friendsList
+        ]);
 
-        var content = h('div', [
-            list.div
+        var frameContacts = UI.dialog.customModal(contactsContent, {
+            buttons: contactsButtons,
+        });
+
+        // Invite from link
+        var linkContent = h('div.cp-share-modal', [
         ]);
+        var linkButtons = [];
+
+        var frameLink = UI.dialog.customModal(linkContent, {
+            buttons: linkButtons,
+        });
+
+        // Create modal
+        var tabs = [{
+            title: Messages.share_contactCategory,
+            icon: "fa fa-address-book",
+            content: frameContacts,
+            active: hasFriends
+        }, {
+            title: Messages.share_linkCategory,
+            icon: "fa fa-link",
+            content: frameLink,
+            active: !hasFriends
+        }];
 
-        var modal = UI.dialog.customModal(content, {buttons: buttons});
+        var modal = UI.dialog.tabs(tabs);
         UI.openCustomModal(modal);
     };
 

From 9673795d65b11196341baf8d07ac1ad29de173d2 Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Thu, 12 Dec 2019 15:09:44 +0000
Subject: [PATCH 007/129] Translated using Weblate (English)

Currently translated at 100.0% (1158 of 1158 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1157 of 1157 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1156 of 1156 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
---
 www/common/translations/messages.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/www/common/translations/messages.json b/www/common/translations/messages.json
index 69d460e86..9a505391c 100644
--- a/www/common/translations/messages.json
+++ b/www/common/translations/messages.json
@@ -1251,5 +1251,8 @@
     "share_linkPasswordAlert": "This item is password protected. When you send the link the recipient will have to enter the password.",
     "share_contactPasswordAlert": "This item is password protected. Because you are sharing it with a CryptPad contact, the recipient will not have to enter the password.",
     "share_embedPasswordAlert": "This item is password protected. When you embed this pad, viewers will be asked for the password.",
-    "passwordFaqLink": "Read more about passwords"
+    "passwordFaqLink": "Read more about passwords",
+    "share_noContactsLoggedIn": "You are not connected with anyone on CryptPad yet. Share the link to your profile for people to send you contact requests.",
+    "share_copyProfileLink": "Copy profile link",
+    "share_noContactsNotLoggedIn": "Log in or register to see your existing contacts and add new ones."
 }

From 1778200b574be5b6ee079c27c68fc660669c351b Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Thu, 12 Dec 2019 15:09:44 +0000
Subject: [PATCH 008/129] Translated using Weblate (French)

Currently translated at 100.0% (1158 of 1158 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
---
 www/common/translations/messages.fr.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/www/common/translations/messages.fr.json b/www/common/translations/messages.fr.json
index 3b3b3cdd4..cac8d471b 100644
--- a/www/common/translations/messages.fr.json
+++ b/www/common/translations/messages.fr.json
@@ -1251,5 +1251,8 @@
     "share_linkPasswordAlert": "Cet élément est protégé par un mot de passe. Quand vous partagez le lien, le destinataire doit saisir le mot de passe.",
     "share_contactPasswordAlert": "Cet élément est protégé par un mot de passe. Quand vous le partagez avec un contact CryptPad, le destinataire n'a pas a saisir le mot de passe.",
     "share_embedPasswordAlert": "Cet élément est protégé par un mot de passe. Quand vous l'intégrez à une page, les visiteurs doivent saisir le mot de passe.",
-    "passwordFaqLink": "En lire plus sur les mots de passe"
+    "passwordFaqLink": "En lire plus sur les mots de passe",
+    "share_noContactsLoggedIn": "Vous n'avez pas encore ajouté de contacts sur CryptPad. Partagez le lien de votre profil pour que l'on vous envoie des demandes de contact.",
+    "share_copyProfileLink": "Copier le lien du profil",
+    "share_noContactsNotLoggedIn": "Connectez-vous ou enregistrez-vous pour voir vos contacts ou en ajouter de nouveaux."
 }

From 13307e40e5def576dc8e48876a247fdee5a4444e Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Thu, 12 Dec 2019 15:09:44 +0000
Subject: [PATCH 009/129] Translated using Weblate (German)

Currently translated at 100.0% (1155 of 1155 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
---
 www/common/translations/messages.de.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/common/translations/messages.de.json b/www/common/translations/messages.de.json
index d2f6c1998..b92c21309 100644
--- a/www/common/translations/messages.de.json
+++ b/www/common/translations/messages.de.json
@@ -1070,7 +1070,7 @@
     "notification_folderShared": "{0} hat einen Ordner mit dir geteilt: <b>{1}</b>",
     "share_selectAll": "Alle auswählen",
     "share_filterFriend": "Nach Namen suchen",
-    "share_linkFriends": "Mit Freunden teilen",
+    "share_linkFriends": "Mit Kontakten teilen",
     "share_withFriends": "Teilen",
     "share_deselectAll": "Alle abwählen",
     "notifications_dismiss": "Verbergen",

From ef05ac440eb165bcca7f8fdd18d3f565cf6e0e6f Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 12 Dec 2019 18:14:17 +0100
Subject: [PATCH 010/129] Invitation link UI

---
 www/common/common-ui-elements.js | 61 ++++++++++++++++++++++++++++++--
 www/common/outer/team.js         | 14 ++++++++
 2 files changed, 72 insertions(+), 3 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 411b082e7..6c53d91af 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1611,9 +1611,7 @@ define([
                 buttons: contactsButtons
             };
         };
-        hasFriends = false;
         var friendsObject = hasFriends ? getContacts() : noContactsMessage(common);
-        console.log(friendsObject);
         var friendsList = friendsObject.content;
         var contactsButtons = friendsObject.buttons;
         contactsButtons.unshift({
@@ -1631,10 +1629,67 @@ define([
             buttons: contactsButtons,
         });
 
+        var linkName, linkPassword, linkMessage;
+        var linKError;
         // Invite from link
         var linkContent = h('div.cp-share-modal', [
+            h('p', 'XXX Invite link description...'), // XXX
+            linkError = h('div.alert.alert-danger', {style : 'display: none;'}),
+            linkName = h('input', {
+                placeholder: 'name...' // XXX
+            }),
+            h('br'),
+            linkPassword = UI.passwordInput({
+                id: 'cp-teams-invite-password',
+                placeholder: 'password...' // XXX
+            }),
+            h('br'),
+            linkMessage = h('textarea', {
+                placeholder: 'note...'
+            })
         ]);
-        var linkButtons = [];
+        var process = function () {
+            $(linkError).text('').hide();
+            var name = $(linkName).val();
+            var pw = $(linkPassword).val();
+            var msg = $(linkMessage).val();
+            if (!name || !name.trim()) {
+                $(linkError).text('empty name...').show(); // XXX
+                return true;
+            }
+            var bytes;
+            nThen(function (waitFor) {
+                // Scrypt
+            }).nThen(function (waitFor) {
+                module.execCommand('CREATE_INVITE_LINK', {
+                    name: name,
+                    password: pw,
+                    message: msg,
+                    // send scrypt result
+                    teamId: config.teamId,
+                }, waitFor(function (obj) {
+                    if (obj && obj.error) {
+                        waitFor.abort();
+                        return void $(linkError).text('ERROR '+obj.error).show(); // XXX
+                    }
+                    // Display result here
+                }));
+            });
+            return true;
+        };
+        var linkButtons = [{
+            className: 'cancel',
+            name: Messages.cancel,
+            onClick: function () {},
+            keys: [27]
+        }, {
+            className: 'primary',
+            name: 'CREATE LINK', // XXX
+            onClick: function () {
+                return process();
+            },
+            keys: [13]
+        }];
 
         var frameLink = UI.dialog.customModal(linkContent, {
             buttons: linkButtons,
diff --git a/www/common/outer/team.js b/www/common/outer/team.js
index 62fc1b45b..eef9e05cc 100644
--- a/www/common/outer/team.js
+++ b/www/common/outer/team.js
@@ -1259,6 +1259,17 @@ define([
         ctx.store.messenger.openTeamChat(team.getChatData(), onUpdate, cId, cb);
     };
 
+    var createInviteLink = function (ctx, data, cId, cb) {
+        var team = ctx.teams[data.teamId];
+        // var roster = team.roster;
+        // var name = data.name;
+        // var password = data.password;
+        // var msg = data.message;
+        cb({
+            error: 'NOT_IMPLEMENTED'
+        });
+    };
+
     Team.init = function (cfg, waitFor, emit) {
         var team = {};
         var store = cfg.store;
@@ -1412,6 +1423,9 @@ define([
             if (cmd === 'GET_EDITABLE_FOLDERS') {
                 return void getEditableFolders(ctx, data, clientId, cb);
             }
+            if (cmd === 'CREATE_INVITE_LINK') {
+                return void createInviteLink(ctx, data, clientId, cb);
+            }
         };
 
         return team;

From fa8096fc76eb3945c3db73c07422c94914e39c3b Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 12 Dec 2019 18:16:42 +0100
Subject: [PATCH 011/129] lint compliance

---
 www/common/common-ui-elements.js | 6 ++++--
 www/common/outer/team.js         | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 6c53d91af..648448248 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1630,7 +1630,7 @@ define([
         });
 
         var linkName, linkPassword, linkMessage;
-        var linKError;
+        var linkError;
         // Invite from link
         var linkContent = h('div.cp-share-modal', [
             h('p', 'XXX Invite link description...'), // XXX
@@ -1658,8 +1658,10 @@ define([
                 return true;
             }
             var bytes;
-            nThen(function (waitFor) {
+            NThen(function (waitFor) {
                 // Scrypt
+                waitFor()(); // jshint
+                bytes = bytes;
             }).nThen(function (waitFor) {
                 module.execCommand('CREATE_INVITE_LINK', {
                     name: name,
diff --git a/www/common/outer/team.js b/www/common/outer/team.js
index eef9e05cc..e48e5d313 100644
--- a/www/common/outer/team.js
+++ b/www/common/outer/team.js
@@ -1261,6 +1261,7 @@ define([
 
     var createInviteLink = function (ctx, data, cId, cb) {
         var team = ctx.teams[data.teamId];
+        team = team;
         // var roster = team.roster;
         // var name = data.name;
         // var password = data.password;

From 9391698f540377b297f852fd6d8162144ead5b88 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Fri, 13 Dec 2019 11:59:14 +0100
Subject: [PATCH 012/129] Add scrypt and spinner to the link creation process

---
 www/common/common-hash.js        | 12 +++--
 www/common/common-ui-elements.js | 92 +++++++++++++++++++++++++-------
 www/common/outer/team.js         | 15 ++++--
 3 files changed, 92 insertions(+), 27 deletions(-)

diff --git a/www/common/common-hash.js b/www/common/common-hash.js
index 98330367f..4ed1193e3 100644
--- a/www/common/common-hash.js
+++ b/www/common/common-hash.js
@@ -231,10 +231,14 @@ Version 1
         }
         if (['invite'].indexOf(type) !== -1) {
             parsed.type = 'invite';
-            if (hashArr[1] && hashArr[1] === '1') {
-                parsed.version = 1;
-                parsed.channel = hashArr[2];
-                parsed.pubkey = hashArr[3].replace(/-/g, '/');
+            if (hashArr[1] && hashArr[1] === '2') {
+                parsed.version = 2;
+                parsed.app = hashArr[2];
+                parsed.mode = hashArr[3];
+                parsed.key = hashArr[4];
+
+                options = hashArr.slice(5);
+                parsed.password = options.indexOf('p') !== -1;
                 return parsed;
             }
             return parsed;
diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 648448248..2fa3fb308 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -14,11 +14,14 @@ define([
     '/customize/application_config.js',
     '/customize/pages.js',
     '/bower_components/nthen/index.js',
+
+    '/bower_components/scrypt-async/scrypt-async.js',
     'css!/customize/fonts/cptools/style.css',
     '/bower_components/croppie/croppie.min.js',
     'css!/bower_components/croppie/croppie.css',
 ], function ($, Config, Util, Hash, Language, UI, Constants, Feedback, h, MediaTag, Clipboard,
              Messages, AppConfig, Pages, NThen) {
+    var Scrypt = window.scrypt;
     var UIElements = {};
 
     // Configure MediaTags to use our local viewer
@@ -1557,6 +1560,8 @@ define([
         var team = privateData.teams[config.teamId];
         if (!team) { return void UI.warn(Messages.error); }
 
+        var origin = privateData.origin;
+
         var module = config.module || common.makeUniversal('team');
 
         // Invite contacts
@@ -1629,52 +1634,91 @@ define([
             buttons: contactsButtons,
         });
 
-        var linkName, linkPassword, linkMessage;
-        var linkError;
+        var linkName, linkPassword, linkMessage, linkError, linkSpinText;
+        var linkForm, linkSpin, linkResult;
         // Invite from link
         var linkContent = h('div.cp-share-modal', [
             h('p', 'XXX Invite link description...'), // XXX
             linkError = h('div.alert.alert-danger', {style : 'display: none;'}),
-            linkName = h('input', {
-                placeholder: 'name...' // XXX
-            }),
-            h('br'),
-            linkPassword = UI.passwordInput({
-                id: 'cp-teams-invite-password',
-                placeholder: 'password...' // XXX
-            }),
-            h('br'),
-            linkMessage = h('textarea', {
-                placeholder: 'note...'
-            })
+            linkForm = h('div.cp-teams-invite-form', [
+                linkName = h('input', {
+                    placeholder: 'name...' // XXX
+                }),
+                h('br'),
+                linkPassword = UI.passwordInput({
+                    id: 'cp-teams-invite-password',
+                    placeholder: 'password...' // XXX
+                }),
+                h('br'),
+                linkMessage = h('textarea', {
+                    placeholder: 'note...'
+                })
+            ]),
+            linkSpin = h('div', {
+                style: 'display: none;'
+            }, [
+                h('i.fa.fa-spinner.fa-spin'),
+                linkSpinText = h('span', 'Scrypt...') // XXX
+            ]),
+            linkResult = h('div', {
+                style: 'display: none;'
+            }, h('textarea', {
+                readonly: 'readonly'
+            }))
         ]);
+        var $linkContent = $(linkContent);
+        var href;
         var process = function () {
+            var $nav = $linkContent.closest('.alertify').find('nav');
             $(linkError).text('').hide();
             var name = $(linkName).val();
             var pw = $(linkPassword).val();
             var msg = $(linkMessage).val();
+            var hash = Hash.createRandomHash('invite', pw);
+            var hashData = Hash.parseTypeHash('invite', hash);
+            href = origin + '/teams/#' + hash;
+            console.log(hashData);
             if (!name || !name.trim()) {
                 $(linkError).text('empty name...').show(); // XXX
                 return true;
             }
-            var bytes;
+            var bytes64;
             NThen(function (waitFor) {
+                $(linkForm).hide();
+                $(linkSpin).show();
+                $nav.find('button.cp-teams-invite-create').prop('disabled', 'disabled');
+                setTimeout(waitFor(), 150);
+            }).nThen(function (waitFor) {
                 // Scrypt
-                waitFor()(); // jshint
-                bytes = bytes;
+                Scrypt(hashData.key,
+                    (pw || '') + (AppConfig.loginSalt || ''), // salt
+                    8, // memoryCost (n)
+                    1024, // block size parameter (r)
+                    192, // dkLen
+                    200, // interruptStep
+                    waitFor(function (_bytes) {
+                        bytes64 = _bytes;
+                    }),
+                    'base64'); // format, could be 'base64'
             }).nThen(function (waitFor) {
+                $(linkSpinText).text('Add invite link to team'); // XXX
                 module.execCommand('CREATE_INVITE_LINK', {
                     name: name,
                     password: pw,
                     message: msg,
-                    // send scrypt result
+                    bytes64: bytes64,
+                    href: href,
                     teamId: config.teamId,
                 }, waitFor(function (obj) {
                     if (obj && obj.error) {
                         waitFor.abort();
+                        $(linkSpin).hide();
                         return void $(linkError).text('ERROR '+obj.error).show(); // XXX
                     }
                     // Display result here
+                    $(linkSpin).hide();
+                    $(linkResult).show().find('textarea').text(href);
+                    $nav.find('button.cp-teams-invite-copy').prop('disabled', '');
                 }));
             });
             return true;
@@ -1685,17 +1729,27 @@ define([
             onClick: function () {},
             keys: [27]
         }, {
-            className: 'primary',
+            className: 'primary cp-teams-invite-create',
             name: 'CREATE LINK', // XXX
             onClick: function () {
                 return process();
             },
             keys: [13]
+        }, {
+            className: 'primary cp-teams-invite-copy',
+            name: 'COPY LINK', // XXX
+            onClick: function () {
+                if (!href) { return; }
+                var success = Clipboard.copy(href);
+                if (success) { UI.log(Messages.shareSuccess); }
+            },
+            keys: []
         }];
 
         var frameLink = UI.dialog.customModal(linkContent, {
             buttons: linkButtons,
         });
+        $(frameLink).find('.cp-teams-invite-copy').prop('disabled', 'disabled');
 
         // Create modal
         var tabs = [{
diff --git a/www/common/outer/team.js b/www/common/outer/team.js
index e48e5d313..3bb86cd4b 100644
--- a/www/common/outer/team.js
+++ b/www/common/outer/team.js
@@ -1262,13 +1262,20 @@ define([
     var createInviteLink = function (ctx, data, cId, cb) {
         var team = ctx.teams[data.teamId];
         team = team;
-        // var roster = team.roster;
-        // var name = data.name;
-        // var password = data.password;
-        // var msg = data.message;
+        /*
+        var roster = team.roster;
+        var name = data.name;
+        var password = data.password;
+        var msg = data.message;
+        var href = data.href;
+        var bytes64 = data.bytes64;
+        */
+        return void cb();
+        /*
         cb({
             error: 'NOT_IMPLEMENTED'
         });
+        */
     };
 
     Team.init = function (cfg, waitFor, emit) {

From be9dce674f2730549c76f58d15e69493ded41dc3 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Fri, 13 Dec 2019 17:03:24 +0100
Subject: [PATCH 013/129] Open and Scrypt invitation link

---
 www/common/application_config_internal.js |   2 +-
 www/common/common-ui-elements.js          |   5 +-
 www/common/outer/team.js                  |  19 +++-
 www/teams/inner.js                        | 111 +++++++++++++++++++++-
 www/teams/main.js                         |  13 +++
 5 files changed, 143 insertions(+), 7 deletions(-)

diff --git a/www/common/application_config_internal.js b/www/common/application_config_internal.js
index 72897680c..d4c1954e4 100644
--- a/www/common/application_config_internal.js
+++ b/www/common/application_config_internal.js
@@ -20,7 +20,7 @@ define(function() {
      * users and these users will be redirected to the login page if they still try to access
      * the app
      */
-    config.registeredOnlyTypes = ['teams', 'file', 'contacts', 'oodoc', 'ooslide', 'sheet', 'notifications'];
+    config.registeredOnlyTypes = ['file', 'contacts', 'oodoc', 'ooslide', 'sheet', 'notifications'];
 
     /* CryptPad is available is multiple languages, but only English and French are maintained
      * by the developers. The other languages may be outdated, and any missing string for a langauge
diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 2fa3fb308..c67181574 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1651,7 +1651,7 @@ define([
                 }),
                 h('br'),
                 linkMessage = h('textarea', {
-                    placeholder: 'note...'
+                    placeholder: 'note...' // XXX
                 })
             ]),
             linkSpin = h('div', {
@@ -1677,7 +1677,6 @@ define([
             var hash = Hash.createRandomHash('invite', pw);
             var hashData = Hash.parseTypeHash('invite', hash);
             href = origin + '/teams/#' + hash;
-            console.log(hashData);
             if (!name || !name.trim()) {
                 $(linkError).text('empty name...').show(); // XXX
                 return true;
@@ -1707,7 +1706,7 @@ define([
                     password: pw,
                     message: msg,
                     bytes64: bytes64,
-                    href: href,
+                    hash: hash,
                     teamId: config.teamId,
                 }, waitFor(function (obj) {
                     if (obj && obj.error) {
diff --git a/www/common/outer/team.js b/www/common/outer/team.js
index 3bb86cd4b..884c92598 100644
--- a/www/common/outer/team.js
+++ b/www/common/outer/team.js
@@ -1267,7 +1267,7 @@ define([
         var name = data.name;
         var password = data.password;
         var msg = data.message;
-        var href = data.href;
+        var hash = data.hash;
         var bytes64 = data.bytes64;
         */
         return void cb();
@@ -1277,6 +1277,20 @@ define([
         });
         */
     };
+    var getLinkData = function (ctx, data, cId, cb) {
+        /*
+        var password = data.password;
+        var hash = data.hash;
+        var bytes64 = data.bytes64;
+        */
+        return void cb();
+        /*
+        cb({
+            error: 'NOT_IMPLEMENTED'
+        });
+        */
+    };
+
 
     Team.init = function (cfg, waitFor, emit) {
         var team = {};
@@ -1434,6 +1448,9 @@ define([
             if (cmd === 'CREATE_INVITE_LINK') {
                 return void createInviteLink(ctx, data, clientId, cb);
             }
+            if (cmd === 'GET_LINK_DATA') {
+                return void getLinkData(ctx, data, clientId, cb);
+            }
         };
 
         return team;
diff --git a/www/teams/inner.js b/www/teams/inner.js
index 4ba4cf2f4..626f5ddcd 100644
--- a/www/teams/inner.js
+++ b/www/teams/inner.js
@@ -17,6 +17,7 @@ define([
     '/common/messenger-ui.js',
     '/customize/messages.js',
 
+    '/bower_components/scrypt-async/scrypt-async.min.js',
     'css!/bower_components/bootstrap/dist/css/bootstrap.min.css',
     'css!/bower_components/components-font-awesome/css/font-awesome.min.css',
     'less!/teams/app-team.less',
@@ -42,6 +43,7 @@ define([
     var APP = {};
     var driveAPP = {};
     //var SHARED_FOLDER_NAME = Messages.fm_sharedFolderName;
+    var Scrypt = window.scrypt;
 
     var copyObjectValue = function (objRef, objToCopy) {
         for (var k in objRef) { delete objRef[k]; }
@@ -137,6 +139,9 @@ define([
         'general': [
             'cp-team-info',
         ],
+        'link': [
+            'cp-team-link',
+        ],
     };
     var teamCategories = {
         'back': {
@@ -179,8 +184,10 @@ define([
         var $categories = $('<div>', {'class': 'cp-sidebarlayout-categories'})
                             .appendTo(APP.$leftside);
 
+        var hash = common.getMetadataMgr().getPrivateData().teamInviteHash;
+
         var categories = team ? teamCategories : mainCategories;
-        var active = team ? 'drive' : 'list';
+        var active = team ? 'drive' : (hash ? 'link' : 'list');
 
         if (team && APP.team) {
             var $category = $('<div>', {'class': 'cp-sidebarlayout-category cp-team-cat-header'}).appendTo($categories);
@@ -1012,6 +1019,90 @@ define([
         ]);
     }, true);
 
+    makeBlock('link', function (common, cb) {
+        // XXX get team data first or login first?
+        if (!driveAPP.loggedIn) {
+            var anonLogin, anonRegister;
+            var anonContent = h('div', [
+                h('p', "You've been invited to a team. Only registered users can join a team. Login or register..."), // XXX
+                h('div', [
+                    anonLogin = h('button.btn.btn-primary', Messages.login_login),
+                    anonRegister = h('button.btn.btn-secondary', Messages.login_register),
+                ])
+            ]);
+            $(anonLogin).click(function () {
+                common.setLoginRedirect(function () {
+                    common.gotoURL('/login/');
+                });
+            });
+            $(anonRegister).click(function () {
+                common.setLoginRedirect(function () {
+                    common.gotoURL('/register/');
+                });
+            });
+            return void cb(anonContent);
+        }
+        var hash = common.getMetadataMgr().getPrivateData().teamInviteHash;
+        var hashData = Hash.parseTypeHash('invite', hash);
+        var password = hashData.password;
+
+        var div;
+
+        var process = function (pw) {
+            var $div = $(div);
+            $div.empty();
+            var bytes64;
+            nThen(function (waitFor) {
+                $div.append(h('div', [
+                    h('i.fa.fa-spin.fa-spinner'),
+                    h('span', 'Scrypt...') // XXX
+                ]));
+                setTimeout(waitFor(), 150);
+            }).nThen(function (waitFor) {
+                Scrypt(hashData.key,
+                    (pw || '') + (AppConfig.loginSalt || ''), // salt
+                    8, // memoryCost (n)
+                    1024, // block size parameter (r)
+                    192, // dkLen
+                    200, // interruptStep
+                    waitFor(function (_bytes) {
+                        bytes64 = _bytes;
+                    }),  
+                    'base64'); // format, could be 'base64'
+            }).nThen(function (waitFor) {
+                APP.module.execCommand('GET_LINK_DATA', {
+                    bytes64: bytes64,
+                    hash: hash,
+                    pw: pw,
+                }, waitFor(function () {
+                    $div.empty();
+                    // TODO
+                    // Accept/decline/decide later UI
+                }));
+            });
+        };
+
+        var content = [];
+        if (password) {
+            // XXX XXX
+            content.push(h('p', "You've been invited to join a CryptPad Team, but the person who created the invitation protected it with a secret passphrase that they expect you to know."));
+            content.push(h('p', "Entering the correct phrase will decrypt the team's info and allow you to accept or decline the invitation."));
+            var pwInput = UI.passwordInput();
+            content.push(pwInput);
+            var submitPw = h('button.btn.btn-secondary', Messages.password_submit);
+            $(submitPw).click(function () {
+                var val = $(pwInput).find('input').val();
+                if (!val) { return; }
+                process(val);
+            });
+            content.push(submitPw);
+        }
+        div = h('div', content);
+        cb(div);
+
+        if (!password) { process(); }
+    });
+
     var redrawTeam = function (common) {
         if (!APP.team) { return; }
         var teamId = APP.team;
@@ -1053,7 +1144,7 @@ define([
             readOnly = driveAPP.readOnly = metadataMgr.getPrivateData().readOnly;
 
             driveAPP.loggedIn = common.isLoggedIn();
-            if (!driveAPP.loggedIn) { throw new Error('NOT_LOGGED_IN'); }
+            //if (!driveAPP.loggedIn) { throw new Error('NOT_LOGGED_IN'); }
 
             common.setTabTitle(Messages.type.teams);
 
@@ -1103,6 +1194,22 @@ define([
                 onEvent: onEvent
             });
 
+            var hash = privateData.teamInviteHash;
+            if (!hash && !driveAPP.loggedIn) {
+                UI.alert(Messages.mustLogin, function () {
+                    common.setLoginRedirect(function () {
+                        common.gotoURL('/login/');
+                    });
+                }, {forefront: true});
+                return;
+            }
+            if (!hash) {
+                delete mainCategories.link;
+            } else if (!driveAPP.loggedIn) {
+                delete mainCategories.list;
+                delete mainCategories.create;
+            }
+
             $('body').css('display', '');
             loadMain(common);
 
diff --git a/www/teams/main.js b/www/teams/main.js
index f12308207..559e90c7c 100644
--- a/www/teams/main.js
+++ b/www/teams/main.js
@@ -37,6 +37,7 @@ define([
         window.addEventListener('message', onMsg);
     }).nThen(function (/*waitFor*/) {
         var teamId;
+        var hash = window.location.hash.slice(1);
         var addRpc = function (sframeChan, Cryptpad) {
             sframeChan.on('Q_SET_TEAM', function (data, cb) {
                 teamId = data;
@@ -86,11 +87,23 @@ define([
                 }
             });
         };
+        var getSecrets = function (Cryptpad, Utils, cb) {
+            var Hash = Utils.Hash;
+            var hash = Hash.createRandomHash('profile');
+            var secret = Hash.getSecrets('team', hash);
+            cb(null, secret);
+        };
+        var addData = function (meta) {
+            if (!hash) { return; }
+            meta.teamInviteHash = hash;
+        };
         SFCommonO.start({
+            getSecrets: getSecrets,
             noHash: true,
             noRealtime: true,
             //driveEvents: true,
             addRpc: addRpc,
+            addData: addData,
             isDrive: true, // Used for history...
         });
     });

From e8c1eb9f1119b9d17c64440012b97270ad21d338 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Fri, 13 Dec 2019 18:22:14 +0100
Subject: [PATCH 014/129] Improve mute/unmute process

---
 .../src/less2/include/messenger.less          |   3 +
 .../src/less2/include/sidebar-layout.less     |   3 +
 www/common/common-ui-elements.js              |  34 +-----
 www/common/messenger-ui.js                    |  47 +++++---
 www/common/outer/async-store.js               |   4 -
 www/contacts/app-contacts.less                |  12 ++
 www/profile/app-profile.less                  |  10 ++
 www/profile/inner.js                          | 104 +++++++++++-------
 8 files changed, 124 insertions(+), 93 deletions(-)

diff --git a/customize.dist/src/less2/include/messenger.less b/customize.dist/src/less2/include/messenger.less
index 4b89b967d..43f20eda9 100644
--- a/customize.dist/src/less2/include/messenger.less
+++ b/customize.dist/src/less2/include/messenger.less
@@ -78,6 +78,9 @@
                 .cp-app-contacts-name {
                     white-space: nowrap;
                 }
+                .cp-app-contacts-icons {
+                    text-align: right;
+                }
             }
             &:hover {
                 background-color: rgba(0,0,0,0.3);
diff --git a/customize.dist/src/less2/include/sidebar-layout.less b/customize.dist/src/less2/include/sidebar-layout.less
index 24228cfaf..b8c272bad 100644
--- a/customize.dist/src/less2/include/sidebar-layout.less
+++ b/customize.dist/src/less2/include/sidebar-layout.less
@@ -126,6 +126,9 @@
                 background-color: @button-bg;
                 border-color: darken(@button-bg, 10%);
                 color: white;
+                .fa {
+                    margin-right: 0.2em;
+                }
                 &:hover {
                     background-color: darken(@button-bg, 10%);
                 }
diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 459f4319d..6450ced47 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -3803,20 +3803,10 @@ define([
             });
         };
 
-        var modal;
-        var mute = UIElements.createMuteButton(common, msg.content, function () {
-            // Mute = auto-reject friend request
-            var $modal = modal && $(modal) && $(modal).closest('div.alertify');
-            if ($modal && $modal.length && $modal[0].closeModal) {
-                $modal[0].closeModal(function () {});
-            }
-            return void todo(false); // XXX false is reject. We can also "dismiss"...
-        });
         var content = h('div.cp-share-modal', [
             setHTML(h('p'), text),
-            h('p', mute)
         ]);
-        modal = UI.proposal(content, todo);
+        UI.proposal(content, todo);
     };
 
     UIElements.displayAddOwnerModal = function (common, data) {
@@ -4158,27 +4148,5 @@ define([
         UI.proposal(div, todo);
     };
 
-    UIElements.createMuteButton = function (common, data, cb) {
-        cb = cb || function () {};
-        var button = h('i.fa.fa-bell-slash-o', {
-            title: Messages.notifications_muteUserTitle
-        });
-        var module = common.makeUniversal('messenger');
-        $(button).click(function () {
-            UI.confirm(Messages.notifications_muteUserConfirm, function (yes) {
-                if (!yes) { return; }
-                module.execCommand('MUTE_USER', {
-                    curvePublic: data.curvePublic,
-                    name: data.displayName || data.name,
-                    avatar: data.avatar
-                }, function (e) {
-                    cb(e);
-                    if (e) { return void UI.warn(Messages.error); }
-                });
-            });
-        });
-        return button;
-    };
-
     return UIElements;
 });
diff --git a/www/common/messenger-ui.js b/www/common/messenger-ui.js
index f157f2a08..41304151e 100644
--- a/www/common/messenger-ui.js
+++ b/www/common/messenger-ui.js
@@ -70,7 +70,7 @@ define([
             h('div.cp-app-contacts-friends.cp-app-contacts-category', [
                 h('div.cp-app-contacts-category-content.cp-contacts-friends'),
                 h('h2.cp-app-contacts-category-title', Messages.contacts_friends),
-                h('button.cp-app-contacts-muted-button', Messages.contacts_manageMuted || 'MANAGE MUTED') // XXX
+                h('button.btn.btn-secondary.cp-app-contacts-muted-button', Messages.contacts_manageMuted || 'MANAGE MUTED') // XXX
             ]),
             h('div.cp-app-contacts-rooms.cp-app-contacts-category', [
                 h('div.cp-app-contacts-category-content'),
@@ -510,6 +510,9 @@ define([
                 title: room.name
             });
 
+            var mute = h('span.cp-app-contacts-remove.fa.fa-bell-slash-o.cp-mute-icon', {
+                title: Messages.contacts_mute || 'mute'
+            });
             var remove = h('span.cp-app-contacts-remove.fa.fa-user-times', {
                 title: Messages.contacts_remove
             });
@@ -522,8 +525,11 @@ define([
             });
             var rightCol = h('span.cp-app-contacts-right-col', [
                 h('span.cp-app-contacts-name', [room.name]),
-                room.isFriendChat ? remove :
-                    (room.isPadChat || room.isTeamChat) ? undefined : leaveRoom,
+                h('span.cp-app-contacts-icons', [
+                    room.isFriendChat ? mute : undefined,
+                    room.isFriendChat ? remove :
+                        (room.isPadChat || room.isTeamChat) ? undefined : leaveRoom,
+                ])
             ]);
 
             var friendData = room.isFriendChat ? userlist[0] : {};
@@ -534,21 +540,27 @@ define([
                 if (friendData.profile) { window.open(origin + '/profile/#' + friendData.profile); }
             });
 
+            $(mute).click(function (e) {
+                e.stopPropagation();
+                var channel = state.channels[id];
+                if (!channel.isFriendChat) { return; }
+                var curvePublic = channel.curvePublic;
+                var friend = contactsData[curvePublic] || friendData;
+                $(mute).hide();
+                muteUser(friend);
+            });
+
             $(remove).click(function (e) {
                 e.stopPropagation();
                 var channel = state.channels[id];
                 if (!channel.isFriendChat) { return; }
                 var curvePublic = channel.curvePublic;
                 var friend = contactsData[curvePublic] || friendData;
-                var muteBox = UI.createCheckbox('cp-contacts-mute', Messages.contacts_mute, false);
                 var content = h('div', [
                     UI.setHTML(h('p'), Messages._getKey('contacts_confirmRemove', [Util.fixHTML(friend.name)])),
-                    muteBox
                 ]);
                 UI.confirm(content, function (yes) {
                     if (!yes) { return; }
-                    var mute = Util.isChecked($(content).find('#cp-contacts-mute'));
-                    if (mute) { muteUser(friend); }
                     removeFriend(curvePublic);
                     // TODO remove friend from userlist ui
                     // FIXME seems to trigger EJOINED from netflux-websocket (from server);
@@ -819,25 +831,30 @@ define([
 
                 var rows = Object.keys(muted).map(function (curve) {
                     var data = muted[curve];
-                    var avatar = h('div.cp-avatar');
-                    var button = h('td', h('i.fa.fa-times', {title: Messages.contacts_unmute}));
+                    var avatar = h('span.cp-avatar');
+                    var button = h('button.btn.btn-secondary', [
+                        h('i.fa.fa-ban'),
+                        Messages.contacts_unmute || 'unmute'
+                    ]);
                     UIElements.displayAvatar(common, $(avatar), data.avatar, data.name);
                     $(button).click(function () {
                         execCommand('UNMUTE_USER', curve, function (e, data) {
                             if (e) { return void console.error(e); }
-                            $(button).closest('tr').remove();
+                            $(button).closest('div').remove();
                             if (!data) { $button.hide(); }
+                            $('.cp-app-contacts-friend[data-user="'+curve+'"]')
+                                .find('.cp-mute-icon').show();
                         });
                     });
-                    return h('tr', [
-                        h('td', avatar),
-                        h('td', data.name),
+                    return h('div.cp-contacts-muted-user', [
+                        h('span', avatar),
+                        h('span', data.name),
                         button
                     ]);
                 });
                 var content = h('div', [
-                    h('p', Messages.contacts_mutedUsers),
-                    h('table', rows)
+                    h('h4', Messages.contacts_mutedUsers || 'Muted users...'),
+                    h('div.cp-contacts-muted-table', rows)
                 ]);
                 $button.off('click');
                 $button.click(function () {
diff --git a/www/common/outer/async-store.js b/www/common/outer/async-store.js
index 0a44dfc76..0cf362e5d 100644
--- a/www/common/outer/async-store.js
+++ b/www/common/outer/async-store.js
@@ -1253,10 +1253,6 @@ define([
             if (friend) { return void cb({error: 'ALREADY_FRIEND'}); }
             if (!data.notifications || !data.curvePublic) { return void cb({error: 'INVALID_USER'}); }
 
-            // Unmute this user when we send them a friend request
-            var muted = store.proxy.mutedUsers || {};
-            delete muted[data.curvePublic];
-
             store.proxy.friends_pending = store.proxy.friends_pending || {};
 
             var twoDaysAgo = +new Date() - (2 * 24 * 3600 * 1000);
diff --git a/www/contacts/app-contacts.less b/www/contacts/app-contacts.less
index 32753f136..99b927b6c 100644
--- a/www/contacts/app-contacts.less
+++ b/www/contacts/app-contacts.less
@@ -1,5 +1,6 @@
 @import (reference) '../../customize/src/less2/include/framework.less';
 @import (reference) '../../customize/src/less2/include/messenger.less';
+@import (reference) '../../customize/src/less2/include/avatar.less';
 
 // body
 &.cp-app-contacts {
@@ -17,6 +18,17 @@
         display: flex; // We need this to remove a 3px border at the bottom of the toolbar
     }
 
+    .cp-contacts-muted-table {
+        .avatar_main(50px);
+        .cp-contacts-muted-user {
+            display: flex;
+            align-items: center;
+            span:nth-child(2) {
+                flex: 1;
+            }
+        }
+    }
+
     .messenger_main();
 }
 
diff --git a/www/profile/app-profile.less b/www/profile/app-profile.less
index 1284f31c4..5305a2612 100644
--- a/www/profile/app-profile.less
+++ b/www/profile/app-profile.less
@@ -10,6 +10,8 @@
     );
     .sidebar-layout_main();
 
+    @cp-profile-is-your-friend: #777;
+
     display: flex;
     flex-flow: column;
     #cp-app-profile-header {
@@ -112,6 +114,14 @@
         }
     }
 
+    .cp-app-profile-friend {
+        display: flex;
+        align-items: center;
+        color: @cp-profile-is-your-friend;
+        .fa {
+            margin-right: 0.2em;
+        }
+    }
     .cp-app-profile-friend-request {
         flex: 0;
         width: 400px;
diff --git a/www/profile/inner.js b/www/profile/inner.js
index 301fa0808..ef1431e97 100644
--- a/www/profile/inner.js
+++ b/www/profile/inner.js
@@ -199,49 +199,40 @@ define([
         // This is a friend: display the "friend" message and an "unfriend" button
         if (friends[data.curvePublic]) {
             // Add friend message
-            APP.$friend.append(h('p.cp-app-profile-friend', Messages._getKey('profile_friend', [name])));
+            APP.$friend.append(h('p.cp-app-profile-friend', [
+                h('i.fa.fa-address-book'),
+                Messages._getKey('profile_friend', [name])
+            ]));
             if (!friends[data.curvePublic].notifications) { return; }
             // Add unfriend button
-            var $unfriendButton = $('<button>', {
-                'class': 'btn btn-danger cp-app-profile-friend-request',
-            }).text(Messages.contacts_remove).appendTo(APP.$friend);
-            $unfriendButton.click(function () {
-                // Unfriend confirm + mute checkbox
-                var muteBox = UI.createCheckbox('cp-contacts-mute', Messages.contacts_mute, false);
+            var unfriendButton = h('button.btn.btn-primary.cp-app-profile-friend-request', [
+                h('i.fa.fa-user-times'),
+                Messages.contacts_remove
+            ]);
+            $(unfriendButton).click(function () {
+                // Unfriend confirm
                 var content = h('div', [
-                    UI.setHTML(h('p'), Messages._getKey('contacts_confirmRemove', [name])),
-                    muteBox
+                    UI.setHTML(h('p'), Messages._getKey('contacts_confirmRemove', [name]))
                 ]);
                 UI.confirm(content, function (yes) {
                     if (!yes) { return; }
-                    // Mute if necessary
-                    var mute = Util.isChecked($(content).find('#cp-contacts-mute'));
-                    if (mute) {
-                        module.execCommand('MUTE_USER', {
-                            curvePublic: data.curvePublic,
-                            name: name,
-                            avatar: data.avatar
-                        }, function (e /*, removed */) {
-                            if (e) { return void console.error(e); }
-                        });
-                    }
-                    // And unfriend
                     module.execCommand('REMOVE_FRIEND', data.curvePublic, function (e) {
                         if (e) { return void console.error(e); }
                     });
                 });
-            });
+            }).appendTo(APP.$friend);
             return;
         }
 
-        var $button = $('<button>', {
-            'class': 'btn btn-success cp-app-profile-friend-request',
-        }).appendTo(APP.$friend);
+        var button = h('button.btn.btn-success.cp-app-profile-friend-request', [
+            h('i.fa.fa-user-plus'),
+        ]);
+        var $button = $(button).appendTo(APP.$friend);
 
         // If this curve has sent us a friend request, we should not be able to sent it to them
         var friendRequests = common.getFriendRequests();
         if (friendRequests[data.curvePublic]) {
-            $button.html(Messages._getKey('friendRequest_received', [data.name || Messages.anonymous]))
+            $button.append(Messages._getKey('friendRequest_received', [data.name || Messages.anonymous]))
                 .click(function () {
                 UIElements.displayFriendRequestModal(common, friendRequests[data.curvePublic]);
             });
@@ -251,41 +242,70 @@ define([
         // Pending friend (we've sent a friend request)
         var pendingFriends = APP.common.getPendingFriends(); // Friend requests sent
         if (pendingFriends[data.curvePublic]) {
-            $button.attr('disabled', 'disabled').text(Messages.profile_friendRequestSent);
+            $button.attr('disabled', 'disabled').append(Messages.profile_friendRequestSent);
             return;
         }
-        // This is not a friend yet: we can send a friend request or mute them
+        // This is not a friend yet: we can send a friend request
         $button.text(Messages._getKey('userlist_addAsFriendTitle', [data.name || Messages.anonymous]))
             .click(function () {
                 APP.common.sendFriendRequest({
                     curvePublic: data.curvePublic,
                     notifications: data.notifications
                 }, function () {
-                    $button.attr('disabled', 'disabled').text(Messages.profile_friendRequestSent);
+                    $button.attr('disabled', 'disabled').append(Messages.profile_friendRequestSent);
                 });
             });
+    };
+
+    var addMuteButton = function ($container) {
+        if (!APP.readOnly || !APP.common.isLoggedIn()) { return; }
+        APP.$mute = $(h('div.cp-app-profile-mute-container'));
+        $container.append(APP.$mute);
+    };
+    var refreshMute = function (data) {
+        if (!APP.$mute) { return; }
+
+        var me = common.getMetadataMgr().getUserData().curvePublic;
+        if (data.curvePublic === me) {
+            APP.$mute.remove();
+            return;
+        }
+
 
         // Add mute/unmute buttons
-        var $mute = $(h('div')).appendTo(APP.$friend);
+        var $mute = APP.$mute;
+        var module = common.makeUniversal('messenger');
         module.execCommand('GET_MUTED_USERS', null, function (muted) {
             if (!muted || typeof(muted) !== "object") { return; }
+            $mute.html('');
             var isMuted = muted[data.curvePublic];
             if (isMuted) {
-                var $unmuteButton = $('<button>', {
-                    'class': 'btn btn-danger cp-app-profile-friend-request',
-                }).text(Messages.contacts_unmute || 'UNMUTE').appendTo($mute);
-                $unmuteButton.click(function () {
+                var unmuteButton = h('button.btn.btn-secondary.cp-app-profile-friend-request', [
+                    h('i.fa.fa-ban'),
+                    Messages.contacts_unmute || 'unmute'
+                ]);
+                $(unmuteButton).click(function () {
                     module.execCommand('UNMUTE_USER', data.curvePublic, function (e) {
-                        if (e) { return void console.error(e); }
-                        refreshFriendRequest(data);
+                        if (e) { return void UI.warn(Messages.error); }
+                        refreshMute(data);
                     });
-                });
+                }).appendTo($mute);
                 return;
             }
-            var button = UIElements.createMuteButton(common, data, function () {
-                refreshFriendRequest(data);
-            });
-            $mute.append(button);
+            var muteButton = h('button.btn.btn-danger.cp-app-profile-friend-request', [
+                h('i.fa.fa-ban'),
+                Messages.contacts_mute || 'mute'
+            ]);
+            $(muteButton).click(function () {
+                module.execCommand('MUTE_USER', {
+                    curvePublic: data.curvePublic,
+                    name: data.displayName || data.name,
+                    avatar: data.avatar
+                }, function (e) {
+                    if (e) { return void UI.warn(Messages.error); }
+                    refreshMute(data);
+                });
+            }).appendTo($mute);
         });
     };
 
@@ -443,6 +463,7 @@ define([
             addDisplayName($rightside);
             addLink($rightside);
             addFriendRequest($rightside);
+            addMuteButton($rightside);
             addDescription(APP.$rightside);
             addViewButton(APP.$rightside);
             APP.initialized = true;
@@ -456,6 +477,7 @@ define([
         refreshLink(data);
         refreshDescription(data);
         refreshFriendRequest(data);
+        refreshMute(data);
     };
 
     var createToolbar = function () {

From fb8be19657ba383f0ebf6d30f42ef6ea03eaf228 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Fri, 13 Dec 2019 18:43:30 +0100
Subject: [PATCH 015/129] Fix buttons UI in contacts

---
 .../src/less2/include/alertify.less           |  96 +---------------
 customize.dist/src/less2/include/buttons.less | 107 ++++++++++++++++++
 www/common/messenger-ui.js                    |  19 +++-
 www/contacts/app-contacts.less                |   6 +
 4 files changed, 131 insertions(+), 97 deletions(-)
 create mode 100644 customize.dist/src/less2/include/buttons.less

diff --git a/customize.dist/src/less2/include/alertify.less b/customize.dist/src/less2/include/alertify.less
index 9cd904c45..d207369ed 100644
--- a/customize.dist/src/less2/include/alertify.less
+++ b/customize.dist/src/less2/include/alertify.less
@@ -3,6 +3,7 @@
 @import (reference) "./variables.less";
 @import (reference) "./avatar.less";
 @import (reference) "./tools.less";
+@import (reference) "./buttons.less";
 
 .alertify_main() {
     --LessLoader_require: LessLoader_currentFile();
@@ -260,100 +261,7 @@
                 }
             }
 
-            button:not(.btn):not(.pure-button):not(.md-button):not(.mdl-button) {
-
-                background-color: @colortheme_alertify-cancel;
-                box-sizing: border-box;
-                position: relative;
-                outline: 0;
-                display: inline-block;
-                align-items: center;
-                padding: 0 6px;
-                margin: 6px 8px;
-                line-height: 36px;
-                min-height: 36px;
-                white-space: nowrap;
-                min-width: 88px;
-                text-align: center;
-                text-transform: uppercase;
-                font-size: 14px;
-                text-decoration: none;
-                cursor: pointer;
-                border-radius: 0;
-
-                color: @alertify-btn-fg;
-                border: 1px solid @alertify-btn-fg;
-
-                &.no-margin {
-                    margin: 0;
-                }
-
-                &:hover, &:active {
-                    background-color: @alertify-light-bg;
-                }
-
-                &.safe, &.danger {
-                    color: @colortheme_old-base;
-                    white-space: normal;
-                    font-weight: bold;
-                }
-                &.danger {
-                    background-color: @colortheme_alertify-red;
-                    border-color: @colortheme_alertify-red-border;
-                    color: @colortheme_alertify-red-color;
-                    &:hover, &:active {
-                        background-color: contrast(@colortheme_modal-bg, darken(@colortheme_alertify-red, 10%), lighten(@colortheme_alertify-red, 10%));
-                    }
-                }
-
-                &.safe {
-                    background-color: @colortheme_alertify-green;
-                    border-color: @colortheme_alertify-green-border;
-                    color: @colortheme_alertify-green-color;
-                    &:hover, &:active {
-                        background-color: contrast(@colortheme_modal-bg, darken(@colortheme_alertify-green, 10%), lighten(@colortheme_alertify-green, 10%));
-                    }
-                }
-
-                &.primary {
-                    background-color: @colortheme_alertify-primary;
-                    color: @colortheme_alertify-primary-text;
-                    border-color: @colortheme_alertify-primary-border;
-                    font-weight: bold;
-                    &:hover, &:active {
-                        background-color: contrast(@colortheme_modal-bg, darken(@colortheme_alertify-primary, 10%), lighten(@colortheme_alertify-primary, 10%));
-                    }
-                }
-
-                &.cancel {
-                    border-color: @colortheme_alertify-cancel-border;
-                    color: @colortheme_alertify-cancel-border;
-                    &:hover, &:hover {
-                        background-color: fade(@colortheme_alertify-cancel-border, 25%);
-                    }
-                }
-
-
-
-                &:focus {
-                    //border: 1px dotted @alertify-base;
-                    box-shadow: 0px 0px 5px @colortheme_alertify-primary;
-                    outline: none;
-                }
-                &::-moz-focus-inner {
-                    border: 0;
-                }
-
-                &:disabled {
-                    cursor: not-allowed !important;
-                    background-color: @colortheme_alertify-disabled;
-                    color: @colortheme_alertify-disabled-text;
-                    border-color: @colortheme_alertify-disabled-border;
-                    &:hover, &:active {
-                        background-color: @colortheme_alertify-disabled;
-                    }
-                }
-            }
+            .buttons_main();
 
             nav {
                 padding: @alertify_padding-base;
diff --git a/customize.dist/src/less2/include/buttons.less b/customize.dist/src/less2/include/buttons.less
new file mode 100644
index 000000000..f2f07663d
--- /dev/null
+++ b/customize.dist/src/less2/include/buttons.less
@@ -0,0 +1,107 @@
+@import (reference) "./colortheme-all.less";
+
+.buttons_main() {
+    @alertify-fore: @colortheme_modal-fg;
+    @alertify-btn-fg: @alertify-fore;
+    @alertify-light-bg: fade(@alertify-fore, 25%);
+
+    button:not(.btn):not(.pure-button):not(.md-button):not(.mdl-button) {
+
+        background-color: @colortheme_alertify-cancel;
+        box-sizing: border-box;
+        position: relative;
+        outline: 0;
+        display: inline-block;
+        align-items: center;
+        padding: 0 6px;
+        margin: 6px 8px;
+        line-height: 36px;
+        min-height: 36px;
+        white-space: nowrap;
+        min-width: 88px;
+        text-align: center;
+        text-transform: uppercase;
+        font-size: 14px;
+        text-decoration: none;
+        cursor: pointer;
+        border-radius: 0;
+
+        .fa {
+            margin-right: 0.2em;
+        }
+
+        color: @alertify-btn-fg;
+        border: 1px solid @alertify-btn-fg;
+
+        &.no-margin {
+            margin: 0;
+        }
+
+        &:hover, &:active {
+            background-color: lighten(@alertify-fore, 35%);
+        }
+
+        &.safe, &.danger {
+            color: @colortheme_old-base;
+            white-space: normal;
+            font-weight: bold;
+        }
+        &.danger {
+            background-color: @colortheme_alertify-red;
+            border-color: @colortheme_alertify-red-border;
+            color: @colortheme_alertify-red-color;
+            &:hover, &:active {
+                background-color: contrast(@colortheme_modal-bg, darken(@colortheme_alertify-red, 10%), lighten(@colortheme_alertify-red, 10%));
+            }
+        }
+
+        &.safe {
+            background-color: @colortheme_alertify-green;
+            border-color: @colortheme_alertify-green-border;
+            color: @colortheme_alertify-green-color;
+            &:hover, &:active {
+                background-color: contrast(@colortheme_modal-bg, darken(@colortheme_alertify-green, 10%), lighten(@colortheme_alertify-green, 10%));
+            }
+        }
+
+        &.primary {
+            background-color: @colortheme_alertify-primary;
+            color: @colortheme_alertify-primary-text;
+            border-color: @colortheme_alertify-primary-border;
+            font-weight: bold;
+            &:hover, &:active {
+                background-color: contrast(@colortheme_modal-bg, darken(@colortheme_alertify-primary, 10%), lighten(@colortheme_alertify-primary, 10%));
+            }
+        }
+
+        &.cancel {
+            border-color: @colortheme_alertify-cancel-border;
+            color: @colortheme_alertify-cancel-border;
+            &:hover, &:hover {
+                background-color: fade(@colortheme_alertify-cancel-border, 25%);
+            }
+        }
+
+
+
+        &:focus {
+            //border: 1px dotted @alertify-base;
+            box-shadow: 0px 0px 5px @colortheme_alertify-primary;
+            outline: none;
+        }
+        &::-moz-focus-inner {
+            border: 0;
+        }
+
+        &:disabled {
+            cursor: not-allowed !important;
+            background-color: @colortheme_alertify-disabled;
+            color: @colortheme_alertify-disabled-text;
+            border-color: @colortheme_alertify-disabled-border;
+            &:hover, &:active {
+                background-color: @colortheme_alertify-disabled;
+            }
+        }
+    }
+
+}
diff --git a/www/common/messenger-ui.js b/www/common/messenger-ui.js
index 41304151e..7e568a658 100644
--- a/www/common/messenger-ui.js
+++ b/www/common/messenger-ui.js
@@ -14,6 +14,8 @@ define([
 
     var MessengerUI = {};
 
+    var mutedUsers = {};
+
     var dataQuery = function (id) {
         return '[data-key="' + id + '"]';
     };
@@ -70,7 +72,7 @@ define([
             h('div.cp-app-contacts-friends.cp-app-contacts-category', [
                 h('div.cp-app-contacts-category-content.cp-contacts-friends'),
                 h('h2.cp-app-contacts-category-title', Messages.contacts_friends),
-                h('button.btn.btn-secondary.cp-app-contacts-muted-button', Messages.contacts_manageMuted || 'MANAGE MUTED') // XXX
+                h('button.cp-app-contacts-muted-button', Messages.contacts_manageMuted || 'MANAGE MUTED') // XXX
             ]),
             h('div.cp-app-contacts-rooms.cp-app-contacts-category', [
                 h('div.cp-app-contacts-category-content'),
@@ -510,8 +512,16 @@ define([
                 title: room.name
             });
 
+
+            var curve;
+            if (room.isFriendChat) {
+                var __channel = state.channels[id];
+                curve = __channel.curvePublic;
+            }
+
             var mute = h('span.cp-app-contacts-remove.fa.fa-bell-slash-o.cp-mute-icon', {
-                title: Messages.contacts_mute || 'mute'
+                title: Messages.contacts_mute || 'mute',
+                style: (curve && mutedUsers[curve]) ? 'display: none;' : undefined
             });
             var remove = h('span.cp-app-contacts-remove.fa.fa-user-times', {
                 title: Messages.contacts_remove
@@ -821,6 +831,7 @@ define([
         var updateMutedList = function () {
             execCommand('GET_MUTED_USERS', null, function (err, muted) {
                 if (err) { return void console.error(err); }
+                mutedUsers = muted;
 
                 var $button = $userlist.find('.cp-app-contacts-muted-button');
 
@@ -830,9 +841,11 @@ define([
                 }
 
                 var rows = Object.keys(muted).map(function (curve) {
+                    $('.cp-app-contacts-friend[data-user="'+curve+'"]')
+                        .find('.cp-mute-icon').hide();
                     var data = muted[curve];
                     var avatar = h('span.cp-avatar');
-                    var button = h('button.btn.btn-secondary', [
+                    var button = h('button', [
                         h('i.fa.fa-ban'),
                         Messages.contacts_unmute || 'unmute'
                     ]);
diff --git a/www/contacts/app-contacts.less b/www/contacts/app-contacts.less
index 99b927b6c..88a93ae9d 100644
--- a/www/contacts/app-contacts.less
+++ b/www/contacts/app-contacts.less
@@ -1,6 +1,7 @@
 @import (reference) '../../customize/src/less2/include/framework.less';
 @import (reference) '../../customize/src/less2/include/messenger.less';
 @import (reference) '../../customize/src/less2/include/avatar.less';
+@import (reference) '../../customize/src/less2/include/buttons.less';
 
 // body
 &.cp-app-contacts {
@@ -18,6 +19,9 @@
         display: flex; // We need this to remove a 3px border at the bottom of the toolbar
     }
 
+    .cp-app-contacts-friends {
+        .buttons_main();
+    }
     .cp-contacts-muted-table {
         .avatar_main(50px);
         .cp-contacts-muted-user {
@@ -29,6 +33,8 @@
         }
     }
 
+
+
     .messenger_main();
 }
 

From 7a5bfe8245090609a64545498b8d94928a4673b7 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Fri, 13 Dec 2019 18:27:48 -0500
Subject: [PATCH 016/129] pw => password, /common/invitation.js scaffolding

---
 www/common/invitation.js | 73 ++++++++++++++++++++++++++++++++++++++++
 www/teams/inner.js       |  8 +++--
 2 files changed, 79 insertions(+), 2 deletions(-)
 create mode 100644 www/common/invitation.js

diff --git a/www/common/invitation.js b/www/common/invitation.js
new file mode 100644
index 000000000..4126d30f3
--- /dev/null
+++ b/www/common/invitation.js
@@ -0,0 +1,73 @@
+(function () {
+var factory = function (/* Util, Cred, nThen */) {
+    var Invite = {};
+
+    /* XXX ansuz
+        inner invitation components
+
+        * create an invitation link
+          * derive secrets from a v2 link and password
+            * split hash into two preseeds
+            * preseed1 => preview hash
+            * scrypt(scrypt_seed) => b64_bytes
+        * preview an invitation link
+          * get preview hash from invitation link
+        * decrypt an invitation link
+          * (slowly) get b64_bytes from hash
+
+    */
+
+    Invite.deriveSeeds = function (key) {
+        var seeds = {};
+
+        var scrypt_seed;
+        var preview_secrets;
+        var preview_channel;
+        var preview_cryptKey;
+        (function () {
+            var b64_seed = hashData.key;
+            if (typeof(b64_seed) !== 'string') {
+                return console.error('invite seed is not a string');
+            }
+
+            var u8_seed = Nacl.util.decodeBase64(b64_seed);
+            var step1 = Nacl.hash(u8_seed);
+            seeds.scrypt = Nacl.util.encodeBase64(step1.subarray(0, 32));
+
+            var preview_hash = '#/2/invite/view/' +
+                Nacl.util.encodeBase64(step1.subarray(32, 50)).replace('/', '-')
+                + '/';
+
+            preview_secrets = Hash.getSecrets('pad', preview_hash);
+        }());
+        return seeds;
+    };
+
+    // seed => bytes64
+    Invite.deriveBytes = function (scrypt_seed, cb) {
+        // XXX do scrypt stuff...
+
+    };
+
+    Invite.derivePreviewHash = function (preview_seed) {
+
+    };
+
+    return Invite;
+};
+    if (typeof(module) !== 'undefined' && module.exports) {
+        module.exports = factory(
+            require("../common-util"),
+            require("../common-credential.js"),
+            require("nthen")
+        );
+    } else if ((typeof(define) !== 'undefined' && define !== null) && (define.amd !== null)) {
+        define([
+            '/common/common-util.js',
+            '/common/common-credential.js',
+            '/bower_components/nthen/index.js',
+        ], function (Util, Cred, nThen) {
+            return factory(Util, nThen);
+        });
+    }
+}());
diff --git a/www/teams/inner.js b/www/teams/inner.js
index 626f5ddcd..6b8fb35e7 100644
--- a/www/teams/inner.js
+++ b/www/teams/inner.js
@@ -15,6 +15,7 @@ define([
     '/common/hyperscript.js',
     '/customize/application_config.js',
     '/common/messenger-ui.js',
+    '/common/invitation.js',
     '/customize/messages.js',
 
     '/bower_components/scrypt-async/scrypt-async.min.js',
@@ -38,6 +39,7 @@ define([
     h,
     AppConfig,
     MessengerUI,
+    InviteInner,
     Messages)
 {
     var APP = {};
@@ -1045,6 +1047,7 @@ define([
         var hash = common.getMetadataMgr().getPrivateData().teamInviteHash;
         var hashData = Hash.parseTypeHash('invite', hash);
         var password = hashData.password;
+        var seeds = InviteInner.deriveSeeds(hashData.key);
 
         var div;
 
@@ -1059,7 +1062,8 @@ define([
                 ]));
                 setTimeout(waitFor(), 150);
             }).nThen(function (waitFor) {
-                Scrypt(hashData.key,
+                // XXX ansuz InviteInner.deriveBytes
+                Scrypt(seeds.scrypt,
                     (pw || '') + (AppConfig.loginSalt || ''), // salt
                     8, // memoryCost (n)
                     1024, // block size parameter (r)
@@ -1073,7 +1077,7 @@ define([
                 APP.module.execCommand('GET_LINK_DATA', {
                     bytes64: bytes64,
                     hash: hash,
-                    pw: pw,
+                    password: pw,
                 }, waitFor(function () {
                     $div.empty();
                     // TODO

From 4a83103f521d145110eda27eceb7b8aa7eb56371 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Fri, 13 Dec 2019 18:38:05 -0500
Subject: [PATCH 017/129] WIP invitation API

---
 www/common/common-ui-elements.js |  2 +-
 www/common/invitation.js         | 21 +++++++-----
 www/common/outer/invitation.js   | 57 +++++++++++++++++++++++---------
 www/common/outer/team.js         |  6 +++-
 4 files changed, 61 insertions(+), 25 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index c67181574..27fd67dca 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1650,7 +1650,7 @@ define([
                     placeholder: 'password...' // XXX
                 }),
                 h('br'),
-                linkMessage = h('textarea', {
+                linkMessage = h('textarea', { // XXX ansuz hitting enter submits...
                     placeholder: 'note...' // XXX
                 })
             ]),
diff --git a/www/common/invitation.js b/www/common/invitation.js
index 4126d30f3..0bad771de 100644
--- a/www/common/invitation.js
+++ b/www/common/invitation.js
@@ -1,5 +1,5 @@
 (function () {
-var factory = function (/* Util, Cred, nThen */) {
+var factory = function (Hash, Nacl/*, Util, Cred, nThen */) {
     var Invite = {};
 
     /* XXX ansuz
@@ -20,12 +20,13 @@ var factory = function (/* Util, Cred, nThen */) {
     Invite.deriveSeeds = function (key) {
         var seeds = {};
 
-        var scrypt_seed;
-        var preview_secrets;
+/*
         var preview_channel;
         var preview_cryptKey;
+*/
+        var preview_secrets;
         (function () {
-            var b64_seed = hashData.key;
+            var b64_seed = key;
             if (typeof(b64_seed) !== 'string') {
                 return console.error('invite seed is not a string');
             }
@@ -46,28 +47,32 @@ var factory = function (/* Util, Cred, nThen */) {
     // seed => bytes64
     Invite.deriveBytes = function (scrypt_seed, cb) {
         // XXX do scrypt stuff...
-
+        cb = cb;
     };
 
     Invite.derivePreviewHash = function (preview_seed) {
-
+        preview_seed = preview_seed;
     };
 
     return Invite;
 };
     if (typeof(module) !== 'undefined' && module.exports) {
         module.exports = factory(
+            require("../common-hash"),
+            require("tweetnacl/nacl-fast"),
             require("../common-util"),
             require("../common-credential.js"),
             require("nthen")
         );
     } else if ((typeof(define) !== 'undefined' && define !== null) && (define.amd !== null)) {
         define([
+            '/common/common-hash.js',
             '/common/common-util.js',
             '/common/common-credential.js',
             '/bower_components/nthen/index.js',
-        ], function (Util, Cred, nThen) {
-            return factory(Util, nThen);
+            '/bower_components/tweetnacl/nacl-fast.min.js',
+        ], function (Hash, Util, Cred, nThen) {
+            return factory(Hash, window.nacl, Util, Cred, nThen);
         });
     }
 }());
diff --git a/www/common/outer/invitation.js b/www/common/outer/invitation.js
index c6199bf4c..baf44e677 100644
--- a/www/common/outer/invitation.js
+++ b/www/common/outer/invitation.js
@@ -3,23 +3,50 @@ var factory = function (Util, Cred, nThen) {
     nThen = nThen; // XXX
     var Invite = {};
 
-/* 
-    TODO key derivation
-
-    scrypt(seed, passwd) => {
-        curve: {
-            private,
-            public,
-        },
-        ed: {
-            private,
-            public,
-        }
-        cryptKey,
-        channel
-    }
+/*  INPUTS
+
+    * password (for scrypt)
+    * message (personal note)
+    * link hash
+    * bytes64 (scrypt output)
+    * preview_hash
+
+*/
+
+
+/*  DERIVATIONS
+
+    * components corresponding to www/common/invitation.js
+    * preview_hash => components
+      * channel
+      * cryptKey
+    * b64_bytes
+      * curvePrivate => curvePublic
+      * edSeed => edPrivate => edPublic
+
 */
 
+
+/*  IO / FUNCTIONALITY
+
+    * creator
+      * generate a random signKey (prevent writes to preview channel)
+      * encrypt and upload the preview content
+        * via CryptGet
+        * owned by:
+          * the ephemeral edPublic
+          * the invite creator
+      * create a roster entry for the invitation
+        * with encrypted notes for the creator
+    * redeemer
+      * get the preview content
+      * redeem the invite
+        * add yourself to the roster
+        * add the team to your proxy-manager
+
+*/
+
+
     var BYTES_REQUIRED = 256;
 
     Invite.deriveKeys = function (seed, passwd, cb) {
diff --git a/www/common/outer/team.js b/www/common/outer/team.js
index 884c92598..8217f030e 100644
--- a/www/common/outer/team.js
+++ b/www/common/outer/team.js
@@ -10,6 +10,7 @@ define([
     '/common/outer/roster.js',
     '/common/common-messaging.js',
     '/common/common-feedback.js',
+    '/common/outer/invitation.js',
 
     '/bower_components/chainpad-listmap/chainpad-listmap.js',
     '/bower_components/chainpad-crypto/crypto.js',
@@ -19,7 +20,7 @@ define([
     '/bower_components/saferphore/index.js',
     '/bower_components/tweetnacl/nacl-fast.min.js',
 ], function (Util, Hash, Constants, Realtime,
-             ProxyManager, UserObject, SF, Roster, Messaging, Feedback,
+             ProxyManager, UserObject, SF, Roster, Messaging, Feedback, Invite,
              Listmap, Crypto, CpNetflux, ChainPad, nThen, Saferphore) {
     var Team = {};
 
@@ -1259,7 +1260,9 @@ define([
         ctx.store.messenger.openTeamChat(team.getChatData(), onUpdate, cId, cb);
     };
 
+    // XXX ansuz
     var createInviteLink = function (ctx, data, cId, cb) {
+        Invite = Invite;
         var team = ctx.teams[data.teamId];
         team = team;
         /*
@@ -1277,6 +1280,7 @@ define([
         });
         */
     };
+    // XXX ansuz
     var getLinkData = function (ctx, data, cId, cb) {
         /*
         var password = data.password;

From 9e08a97d72f4bfb15618c887381c81e423d1d1e5 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 16 Dec 2019 12:51:12 +0100
Subject: [PATCH 018/129] Alertify buttons and inputs added to sidebar layout

---
 .../src/less2/include/alertify.less           | 26 ++++++--------
 customize.dist/src/less2/include/buttons.less | 35 +++++++++++++------
 .../src/less2/include/sidebar-layout.less     | 15 ++++++--
 www/profile/app-profile.less                  | 15 ++------
 4 files changed, 51 insertions(+), 40 deletions(-)

diff --git a/customize.dist/src/less2/include/alertify.less b/customize.dist/src/less2/include/alertify.less
index d207369ed..80675b65a 100644
--- a/customize.dist/src/less2/include/alertify.less
+++ b/customize.dist/src/less2/include/alertify.less
@@ -219,21 +219,6 @@
             ::-ms-input-placeholder { /* Microsoft Edge */
                 color: @cryptpad_color_grey;
             }
-            input:not(.form-control), textarea {
-                background-color: @alertify-input-fg;
-                color: @cryptpad_text_col;
-                border: 1px solid @alertify-input-bg;
-                margin-bottom: 15px;
-                width: 100%;
-                font-size: 100%;
-                padding: @alertify_padding-base;
-                &[readonly] {
-                    background-color: @alertify-light-bg;
-                    color: @cryptpad_text_col;
-                    border-color: @alertify-input-fg;
-                }
-            }
-
             span.cp-password-container {
                 display: flex;
                 align-items: center;
@@ -262,6 +247,17 @@
             }
 
             .buttons_main();
+            input:not(.form-control), textarea {
+                margin-bottom: 15px;
+            }
+
+            button {
+                display: inline-block;
+                position: relative;
+                margin: 6px 8px;
+                min-height: 36px;
+                min-width: 88px;
+            }
 
             nav {
                 padding: @alertify_padding-base;
diff --git a/customize.dist/src/less2/include/buttons.less b/customize.dist/src/less2/include/buttons.less
index f2f07663d..10b759fd4 100644
--- a/customize.dist/src/less2/include/buttons.less
+++ b/customize.dist/src/less2/include/buttons.less
@@ -1,24 +1,37 @@
 @import (reference) "./colortheme-all.less";
+@import (reference) "./variables.less";
 
 .buttons_main() {
     @alertify-fore: @colortheme_modal-fg;
     @alertify-btn-fg: @alertify-fore;
     @alertify-light-bg: fade(@alertify-fore, 25%);
+    @alertify_padding-base: @variables_padding;
+    @alertify-input-bg: @colortheme_modal-input;
+    @alertify-input-fg: @colortheme_modal-input-fg;
+
+    input:not(.form-control), textarea {
+        background-color: @alertify-input-fg;
+        color: @cryptpad_text_col;
+        border: 1px solid @alertify-input-bg;
+        width: 100%;
+        font-size: 100%;
+        padding: @alertify_padding-base;
+        &[readonly] {
+            background-color: @alertify-light-bg;
+            color: @cryptpad_text_col;
+            border-color: @alertify-input-fg;
+        }
+    }
 
-    button:not(.btn):not(.pure-button):not(.md-button):not(.mdl-button) {
+    button:not(.pure-button):not(.md-button):not(.mdl-button) {
 
         background-color: @colortheme_alertify-cancel;
         box-sizing: border-box;
-        position: relative;
         outline: 0;
-        display: inline-block;
         align-items: center;
         padding: 0 6px;
-        margin: 6px 8px;
         line-height: 36px;
-        min-height: 36px;
         white-space: nowrap;
-        min-width: 88px;
         text-align: center;
         text-transform: uppercase;
         font-size: 14px;
@@ -41,12 +54,12 @@
             background-color: lighten(@alertify-fore, 35%);
         }
 
-        &.safe, &.danger {
+        &.safe, &.danger, &.btn-safe, &.btn-danger {
             color: @colortheme_old-base;
             white-space: normal;
             font-weight: bold;
         }
-        &.danger {
+        &.danger, &.btn-danger {
             background-color: @colortheme_alertify-red;
             border-color: @colortheme_alertify-red-border;
             color: @colortheme_alertify-red-color;
@@ -55,7 +68,7 @@
             }
         }
 
-        &.safe {
+        &.safe, &.btn-safe {
             background-color: @colortheme_alertify-green;
             border-color: @colortheme_alertify-green-border;
             color: @colortheme_alertify-green-color;
@@ -64,7 +77,7 @@
             }
         }
 
-        &.primary {
+        &.primary, &.btn-primary {
             background-color: @colortheme_alertify-primary;
             color: @colortheme_alertify-primary-text;
             border-color: @colortheme_alertify-primary-border;
@@ -74,7 +87,7 @@
             }
         }
 
-        &.cancel {
+        &.cancel, &.btn-cancel {
             border-color: @colortheme_alertify-cancel-border;
             color: @colortheme_alertify-cancel-border;
             &:hover, &:hover {
diff --git a/customize.dist/src/less2/include/sidebar-layout.less b/customize.dist/src/less2/include/sidebar-layout.less
index b8c272bad..42de195d0 100644
--- a/customize.dist/src/less2/include/sidebar-layout.less
+++ b/customize.dist/src/less2/include/sidebar-layout.less
@@ -1,5 +1,6 @@
 @import (reference) "/customize/src/less2/include/colortheme-all.less";
 @import (reference) "/customize/src/less2/include/leftside-menu.less";
+@import (reference) "/customize/src/less2/include/buttons.less";
 
 @sidebar_button-width: 400px;
 
@@ -98,6 +99,7 @@
             }
             [type="text"], [type="password"], button {
                 vertical-align: middle;
+                min-width: 40px;
                 height: 40px;
                 box-sizing: border-box;
             }
@@ -106,12 +108,12 @@
                 width: @sidebar_button-width;
                 input {
                     flex: 1;
-                    border-radius: 0.25em 0 0 0.25em;
+                    //border-radius: 0.25em 0 0 0.25em;
                     border: 1px solid #adadad;
                     border-right: 0px;
                 }
                 button {
-                    border-radius: 0 0.25em 0.25em 0;
+                    //border-radius: 0 0.25em 0.25em 0;
                     //border: 1px solid #adadad;
                     border-left: 0px;
                 }
@@ -119,6 +121,14 @@
             &>div {
                 margin: 10px 0;
             }
+            .buttons_main();
+            button.btn {
+                margin: 0 5px 0 0;
+            }
+            span.cp-password-container {
+                margin-bottom: 1px;
+            }
+/*
             button.btn {
                 @button-bg: @colortheme_sidebar-button-bg;
                 @button-red-bg: @colortheme_sidebar-button-red-bg;
@@ -149,6 +159,7 @@
                     }
                 }
             }
+*/
         }
     }
 }
diff --git a/www/profile/app-profile.less b/www/profile/app-profile.less
index 5305a2612..ddd49dbbb 100644
--- a/www/profile/app-profile.less
+++ b/www/profile/app-profile.less
@@ -66,8 +66,9 @@
             }
         }
         button {
+            min-width: 40px;
             height: 40px;
-            margin: 5px;
+            margin: 5px !important;
         }
     }
     .cp-app-profile-resizer {
@@ -110,7 +111,7 @@
             display: none;
         }
         & > button:empty {
-            margin-left: 25px;
+            margin-left: 25px !important;
         }
     }
 
@@ -136,9 +137,6 @@
         margin-bottom: 20px;
         float: right;
         margin-left: 5px;
-        &> span {
-            margin-left: 10px;
-        }
     }
     #cp-app-profile-description {
         position: relative;
@@ -176,13 +174,6 @@
                 line-height: inherit;
             }
         }
-        .cp-app-profile-description-edit {
-            & > button {
-                span {
-                    margin-left: 10px;
-                }
-            }
-        }
     }
     #cp-app-profile-create {
         height: 100%;

From 0ee6fcb6bcda77b49bf1e3534f2a6600f7e56b57 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 16 Dec 2019 13:09:52 +0100
Subject: [PATCH 019/129] Add unmute contacts button

---
 .../src/less2/include/messenger.less          |  1 +
 www/common/messenger-ui.js                    | 35 +++++++++++++++++--
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/customize.dist/src/less2/include/messenger.less b/customize.dist/src/less2/include/messenger.less
index 43f20eda9..0845f496e 100644
--- a/customize.dist/src/less2/include/messenger.less
+++ b/customize.dist/src/less2/include/messenger.less
@@ -92,6 +92,7 @@
         .cp-app-contacts-remove {
             cursor: pointer;
             width: 20px;
+            text-align: center;
             &:hover {
                 color: darken(@color, 20%);
             }
diff --git a/www/common/messenger-ui.js b/www/common/messenger-ui.js
index 7e568a658..941eb86e1 100644
--- a/www/common/messenger-ui.js
+++ b/www/common/messenger-ui.js
@@ -490,6 +490,18 @@ define([
             }
         };
 
+        var unmuteUser = function (curve) {
+            execCommand('UNMUTE_USER', curve, function (e, data) {
+                if (e) { return void console.error(e); }
+                var $button = $('.cp-contacts-muted-user').find('button[data-user="'+curve+'"]');
+                $button.closest('div').remove();
+                if (!data) { $button.hide(); }
+                $('.cp-app-contacts-friend[data-user="'+curve+'"]')
+                    .find('.cp-unmute-icon').show();
+                $('.cp-app-contacts-friend[data-user="'+curve+'"]')
+                    .find('.cp-mute-icon').show();
+            });
+        };
         var muteUser = function (data) {
             execCommand('MUTE_USER', {
                 curvePublic: data.curvePublic,
@@ -519,7 +531,11 @@ define([
                 curve = __channel.curvePublic;
             }
 
-            var mute = h('span.cp-app-contacts-remove.fa.fa-bell-slash-o.cp-mute-icon', {
+            var unmute = h('span.cp-app-contacts-remove.fa.fa-bell.cp-unmute-icon', {
+                title: Messages.contacts_unmute || 'unmute',
+                style: (curve && mutedUsers[curve]) ? undefined : 'display: none;'
+            });
+            var mute = h('span.cp-app-contacts-remove.fa.fa-bell-slash.cp-mute-icon', {
                 title: Messages.contacts_mute || 'mute',
                 style: (curve && mutedUsers[curve]) ? 'display: none;' : undefined
             });
@@ -537,6 +553,7 @@ define([
                 h('span.cp-app-contacts-name', [room.name]),
                 h('span.cp-app-contacts-icons', [
                     room.isFriendChat ? mute : undefined,
+                    room.isFriendChat ? unmute : undefined,
                     room.isFriendChat ? remove :
                         (room.isPadChat || room.isTeamChat) ? undefined : leaveRoom,
                 ])
@@ -550,6 +567,16 @@ define([
                 if (friendData.profile) { window.open(origin + '/profile/#' + friendData.profile); }
             });
 
+            $(unmute).click(function (e) {
+                e.stopPropagation();
+                var channel = state.channels[id];
+                if (!channel.isFriendChat) { return; }
+                var curvePublic = channel.curvePublic;
+                $(mute).show();
+                $(unmute).hide();
+                unmuteUser(curvePublic);
+            });
+
             $(mute).click(function (e) {
                 e.stopPropagation();
                 var channel = state.channels[id];
@@ -557,6 +584,7 @@ define([
                 var curvePublic = channel.curvePublic;
                 var friend = contactsData[curvePublic] || friendData;
                 $(mute).hide();
+                $(unmute).show();
                 muteUser(friend);
             });
 
@@ -845,12 +873,15 @@ define([
                         .find('.cp-mute-icon').hide();
                     var data = muted[curve];
                     var avatar = h('span.cp-avatar');
-                    var button = h('button', [
+                    var button = h('button', {
+                        'data-user': curve
+                    }, [
                         h('i.fa.fa-ban'),
                         Messages.contacts_unmute || 'unmute'
                     ]);
                     UIElements.displayAvatar(common, $(avatar), data.avatar, data.name);
                     $(button).click(function () {
+                        unmuteUser(curve, button);
                         execCommand('UNMUTE_USER', curve, function (e, data) {
                             if (e) { return void console.error(e); }
                             $(button).closest('div').remove();

From ac5100b3b2f8871738f6812d872c8bf1c44d3b53 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 16 Dec 2019 13:57:49 +0100
Subject: [PATCH 020/129] Update mute icon in profile

---
 www/profile/inner.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/profile/inner.js b/www/profile/inner.js
index ef1431e97..e0c624190 100644
--- a/www/profile/inner.js
+++ b/www/profile/inner.js
@@ -281,7 +281,7 @@ define([
             var isMuted = muted[data.curvePublic];
             if (isMuted) {
                 var unmuteButton = h('button.btn.btn-secondary.cp-app-profile-friend-request', [
-                    h('i.fa.fa-ban'),
+                    h('i.fa.fa-bell'),
                     Messages.contacts_unmute || 'unmute'
                 ]);
                 $(unmuteButton).click(function () {
@@ -293,7 +293,7 @@ define([
                 return;
             }
             var muteButton = h('button.btn.btn-danger.cp-app-profile-friend-request', [
-                h('i.fa.fa-ban'),
+                h('i.fa.fa-bell-slash'),
                 Messages.contacts_mute || 'mute'
             ]);
             $(muteButton).click(function () {

From f64c11dc3a92048240cff475b4dc73ae7b017ca1 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 16 Dec 2019 14:12:33 +0100
Subject: [PATCH 021/129] Fix profile app

---
 www/profile/app-profile.less | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/www/profile/app-profile.less b/www/profile/app-profile.less
index ddd49dbbb..e35653ef4 100644
--- a/www/profile/app-profile.less
+++ b/www/profile/app-profile.less
@@ -14,6 +14,11 @@
 
     display: flex;
     flex-flow: column;
+
+    #cp-sidebarlayout-leftside {
+        display: none !important;
+    }
+
     #cp-app-profile-header {
         display: flex;
         #cp-app-profile-rightside {
@@ -182,5 +187,8 @@
         align-items: center;
         justify-content: center;
     }
+    .cp-app-profile-mute-container {
+        margin-top: 5px;
+    }
 }
 

From b5193914e38e2b5727be9baf44cb7db365641681 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 16 Dec 2019 14:17:40 +0100
Subject: [PATCH 022/129] Add mute info in the profile app

---
 www/profile/app-profile.less | 4 ++++
 www/profile/inner.js         | 1 +
 2 files changed, 5 insertions(+)

diff --git a/www/profile/app-profile.less b/www/profile/app-profile.less
index 5305a2612..29e9bd644 100644
--- a/www/profile/app-profile.less
+++ b/www/profile/app-profile.less
@@ -191,5 +191,9 @@
         align-items: center;
         justify-content: center;
     }
+    .cp-app-profile-mute-container p {
+        margin-top: 5px;
+        font-size: 13px;
+    }
 }
 
diff --git a/www/profile/inner.js b/www/profile/inner.js
index e0c624190..51f13fb3a 100644
--- a/www/profile/inner.js
+++ b/www/profile/inner.js
@@ -306,6 +306,7 @@ define([
                     refreshMute(data);
                 });
             }).appendTo($mute);
+            $(h('p', Messages.contacts_muteInfo)).appendTo($mute);
         });
     };
 

From df938c141b523166a649842b3131aad254512f0f Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Mon, 16 Dec 2019 13:42:18 +0000
Subject: [PATCH 023/129] Translated using Weblate (English)

Currently translated at 100.0% (1163 of 1163 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1163 of 1163 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1162 of 1162 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1161 of 1161 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1160 of 1160 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1159 of 1159 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
---
 www/common/translations/messages.json | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/www/common/translations/messages.json b/www/common/translations/messages.json
index 9a505391c..8f6638f58 100644
--- a/www/common/translations/messages.json
+++ b/www/common/translations/messages.json
@@ -1254,5 +1254,10 @@
     "passwordFaqLink": "Read more about passwords",
     "share_noContactsLoggedIn": "You are not connected with anyone on CryptPad yet. Share the link to your profile for people to send you contact requests.",
     "share_copyProfileLink": "Copy profile link",
-    "share_noContactsNotLoggedIn": "Log in or register to see your existing contacts and add new ones."
+    "share_noContactsNotLoggedIn": "Log in or register to see your existing contacts and add new ones.",
+    "contacts_mute": "Mute",
+    "contacts_unmute": "Unmute",
+    "contacts_manageMuted": "Manage muted",
+    "contacts_mutedUsers": "Muted accounts",
+    "contacts_muteInfo": "You will not receive any notifications or messages from muted users.<br>They will not know you have muted them. "
 }

From 92f78afb0126a3cadec55a3f8632a5cbb50438ac Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Mon, 16 Dec 2019 13:42:18 +0000
Subject: [PATCH 024/129] Translated using Weblate (Finnish)

Currently translated at 2.7% (31 of 1158 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fi/
---
 www/common/translations/messages.fi.json | 35 ++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/www/common/translations/messages.fi.json b/www/common/translations/messages.fi.json
index 2c63c0851..fb9a12fde 100644
--- a/www/common/translations/messages.fi.json
+++ b/www/common/translations/messages.fi.json
@@ -1,2 +1,37 @@
 {
+    "type": {
+        "pad": "Teksti",
+        "code": "Koodi",
+        "poll": "Kysely",
+        "kanban": "Kanban",
+        "slide": "Esitys",
+        "drive": "CryptDrive",
+        "whiteboard": "Tussitaulu",
+        "file": "Tiedosto",
+        "media": "Media",
+        "todo": "Tehtävälista",
+        "contacts": "Yhteystiedot",
+        "sheet": "Taulukko (Beta)",
+        "teams": "Teams"
+    },
+    "button_newpad": "Uusi Teksti-padi",
+    "button_newcode": "Uusi Koodi-padi",
+    "button_newpoll": "Uusi Kysely",
+    "button_newslide": "Uusi Esitys",
+    "button_newwhiteboard": "Uusi Tussitaulu",
+    "button_newkanban": "Uusi Kanban",
+    "button_newsheet": "Uusi Taulukko",
+    "common_connectionLost": "<b>Yhteys palvelimelle katkennut</b><br>Sovellus on vain luku-tilassa, kunnes yhteys palaa.",
+    "websocketError": "Yhdistäminen websocket-palvelimelle epäonnistui...",
+    "typeError": "Tämä padi ei ole yhteensopiva valitun sovelluksen kanssa",
+    "onLogout": "Olet kirjautunut ulos, {0}klikkaa tästä{1} kirjautuaksesi sisään tai paina <em>Esc-näppäintä</em> käyttääksesi padia vain luku-tilassa.",
+    "wrongApp": "Reaaliaikaisen sisällön näyttäminen selaimessa epäonnistui. Ole hyvä ja yritä sivun lataamista uudelleen.",
+    "padNotPinned": "Tämä padi vanhenee kolmen kuukauden käyttämättömyyden jälkeen, {0}kirjaudu sisään{1} tai [2}rekisteröidy{3} säilyttääksesi sen.",
+    "padNotPinnedVariable": "Tämä padi vanhenee {4} päivän käyttämättömyyden jälkeen, {0}kirjaudu sisään{1} tai {2}rekisteröidy{3} säilyttääksesi sen.",
+    "anonymousStoreDisabled": "Tämän CryptPad-instanssin ylläpitäjä on estänyt anonyymien käyttäjien pääsyn tallennustilaan. Kirjaudu sisään käyttääksesi CryptDrivea.",
+    "expiredError": "Tämä padi on vanhentunut, eikä se ole enää saatavilla.",
+    "deletedError": "Tämä padi on poistettu omistajansa toimesta, eikä se ole enää saatavilla.",
+    "inactiveError": "Tämä padi on poistettu käyttämättömyyden vuoksi. Paina Esc-näppäintä luodaksesi uuden padin.",
+    "chainpadError": "Sisältöä päivitettäessä tapahtui vakava virhe. Tämä sivu on vain luku-tilassa, jotta tekemäsi muutokset eivät katoaisi.<br>Paina <em>Esc-näppäintä</em> jatkaaksesi padin katselua vain luku-tilassa, tai lataa sivu uudelleen yrittääksesi muokkaamista.",
+    "invalidHashError": "Pyytämäsi dokumentin URL-osoite on virheellinen."
 }

From d3718679c0de1e138afeedfa5d02a4341dd2d607 Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Mon, 16 Dec 2019 13:42:18 +0000
Subject: [PATCH 025/129] Translated using Weblate (French)

Currently translated at 99.6% (1158 of 1163 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
---
 www/common/translations/messages.fr.json | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/www/common/translations/messages.fr.json b/www/common/translations/messages.fr.json
index cac8d471b..7f0533dbc 100644
--- a/www/common/translations/messages.fr.json
+++ b/www/common/translations/messages.fr.json
@@ -1254,5 +1254,10 @@
     "passwordFaqLink": "En lire plus sur les mots de passe",
     "share_noContactsLoggedIn": "Vous n'avez pas encore ajouté de contacts sur CryptPad. Partagez le lien de votre profil pour que l'on vous envoie des demandes de contact.",
     "share_copyProfileLink": "Copier le lien du profil",
-    "share_noContactsNotLoggedIn": "Connectez-vous ou enregistrez-vous pour voir vos contacts ou en ajouter de nouveaux."
+    "share_noContactsNotLoggedIn": "Connectez-vous ou enregistrez-vous pour voir vos contacts ou en ajouter de nouveaux.",
+    "contacts_mute": "Masquer",
+    "contacts_unmute": "Réafficher",
+    "contacts_manageMuted": "Comptes masqués",
+    "contacts_mutedUsers": "Comptes masqués",
+    "contacts_muteInfo": "Vous ne receverez plus de notifications ou de messages si vous masquez ce compte.<br>L'utilisateur ne sera pas informé que vous l'avez masqué. "
 }

From 89e08704e544cd4ea725289dcb1f889a58df5ff6 Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Mon, 16 Dec 2019 13:42:19 +0000
Subject: [PATCH 026/129] Translated using Weblate (German)

Currently translated at 100.0% (1158 of 1158 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
---
 www/common/translations/messages.de.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/www/common/translations/messages.de.json b/www/common/translations/messages.de.json
index b92c21309..aac7f9e03 100644
--- a/www/common/translations/messages.de.json
+++ b/www/common/translations/messages.de.json
@@ -1251,5 +1251,8 @@
     "share_linkPasswordAlert": "Dieses Element ist passwortgeschützt. Wenn du diesen Link teilst, muss der Empfänger das Passwort eingeben.",
     "share_contactPasswordAlert": "Dieses Element ist passwortgeschützt. Weil du es mit einem CryptPad-Kontakt teilst, muss der Empfänger das Passwort nicht eingeben.",
     "share_embedPasswordAlert": "Dieses Element ist passwortgeschützt. Wenn du dieses Pad einbettest, werden Betrachter nach dem Passwort gefragt.",
-    "passwordFaqLink": "Mehr über Passwörter erfahren"
+    "passwordFaqLink": "Mehr über Passwörter erfahren",
+    "share_noContactsLoggedIn": "Du hast noch keine Kontakte bei CryptPad. Teile den Link zu deinem Profil, damit andere dir Kontaktanfragen senden können.",
+    "share_copyProfileLink": "Profil-Link kopieren",
+    "share_noContactsNotLoggedIn": "Logge dich ein oder registriere dich, um deine Kontakte zu sehen und neue hinzuzufügen."
 }

From 27638e7f638220fb086b6731cd3a209b6c5e3af2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Mon, 16 Dec 2019 14:25:15 +0000
Subject: [PATCH 027/129] button colors in pad creation settings

---
 www/settings/app-settings.less | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/www/settings/app-settings.less b/www/settings/app-settings.less
index 185b22741..8024aa086 100644
--- a/www/settings/app-settings.less
+++ b/www/settings/app-settings.less
@@ -184,12 +184,12 @@
                     &:checked {
                         & + label {
                             font-weight: bold;
-                            background-color: lighten(@colortheme_loading-bg, 20%);
+                            background-color: @colortheme_logo-2;
                             cursor: default;
-                            border: 1px solid #c1158e;
+                            border: 1px solid @colortheme_logo-2;
                             color: @colortheme_loading-color;
                             &:hover {
-                                background-color: lighten(@colortheme_loading-bg, 20%);
+                                background-color: @colortheme_logo-2;
                             }
                         }
                     }
@@ -203,10 +203,11 @@
                     height: 50px;
                     padding: 5px;
                     margin: 0 20px;
-                    border: 1px solid black;
+                    color: @colortheme_logo-2;
+                    border: 1px solid @colortheme_logo-2;
                     cursor: pointer;
                     &:hover {
-                        background-color: lighten(@colortheme_loading-bg, 10%);
+                        background-color: lighten(@colortheme_logo-2, 35%);
                     }
                 }
                 .fa {

From 042cfffbe80a55297d1f6ab78c33cec04bf18012 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 16 Dec 2019 09:38:36 -0500
Subject: [PATCH 028/129] use APIs instead of creating invitations inline

---
 www/common/invitation.js | 88 ++++++++++++++++------------------------
 www/teams/inner.js       | 17 ++------
 2 files changed, 40 insertions(+), 65 deletions(-)

diff --git a/www/common/invitation.js b/www/common/invitation.js
index 0bad771de..72655c60a 100644
--- a/www/common/invitation.js
+++ b/www/common/invitation.js
@@ -1,78 +1,62 @@
 (function () {
-var factory = function (Hash, Nacl/*, Util, Cred, nThen */) {
+var factory = function (Hash, Nacl, Scrypt/*, Util, Cred, nThen */) {
     var Invite = {};
 
-    /* XXX ansuz
-        inner invitation components
+    Invite.deriveSeeds = function (seed) {
+        // take the hash of the provided seed
+        var u8_seed = Nacl.hash(Nacl.util.decodeBase64(seed));
 
-        * create an invitation link
-          * derive secrets from a v2 link and password
-            * split hash into two preseeds
-            * preseed1 => preview hash
-            * scrypt(scrypt_seed) => b64_bytes
-        * preview an invitation link
-          * get preview hash from invitation link
-        * decrypt an invitation link
-          * (slowly) get b64_bytes from hash
+        // hash the first half again for scrypt's input
+        var subseed1 = Nacl.hash(u8_seed.subarray(0, 32));
+        // hash the remainder for the invite content
+        var subseed2 = Nacl.hash(u8_seed.subarray(32));
 
-    */
-
-    Invite.deriveSeeds = function (key) {
-        var seeds = {};
-
-/*
-        var preview_channel;
-        var preview_cryptKey;
-*/
-        var preview_secrets;
-        (function () {
-            var b64_seed = key;
-            if (typeof(b64_seed) !== 'string') {
-                return console.error('invite seed is not a string');
-            }
-
-            var u8_seed = Nacl.util.decodeBase64(b64_seed);
-            var step1 = Nacl.hash(u8_seed);
-            seeds.scrypt = Nacl.util.encodeBase64(step1.subarray(0, 32));
-
-            var preview_hash = '#/2/invite/view/' +
-                Nacl.util.encodeBase64(step1.subarray(32, 50)).replace('/', '-')
-                + '/';
+        return {
+            scrypt: Nacl.util.encodeBase64(subseed1),
+            preview: Nacl.util.encodeBase64(subseed2),
+        };
+    };
 
-            preview_secrets = Hash.getSecrets('pad', preview_hash);
-        }());
-        return seeds;
+    Invite.derivePreviewHash = function (seeds) {
+        return '#/2/invite/view/' +
+            Nacl.util.encodeBase64(seeds.preview.slice(0, 18)).replace('/', '-')
+            + '/';
     };
 
-    // seed => bytes64
-    Invite.deriveBytes = function (scrypt_seed, cb) {
-        // XXX do scrypt stuff...
-        cb = cb;
+    Invite.derivePreviewSecrets = function (seeds) {
+        return Hash.getSecrets('pad', Invite.derivePreviewHash(seeds));
     };
 
-    Invite.derivePreviewHash = function (preview_seed) {
-        preview_seed = preview_seed;
+    Invite.deriveSalt = function (password, instance_salt) {
+        return (password || '') + (instance_salt || '');
     };
 
+    // seed => bytes64
+    Invite.deriveBytes = function (scrypt_seed, salt, cb) {
+        Scrypt(scrypt_seed,
+            salt,
+            8, // memoryCost (n)
+            1024, // block size parameter (r)
+            192, // dkLen
+            200, // interruptStep
+            cb,
+            'base64'); // format, could be 'base64'
+    };
     return Invite;
 };
     if (typeof(module) !== 'undefined' && module.exports) {
         module.exports = factory(
             require("../common-hash"),
             require("tweetnacl/nacl-fast"),
-            require("../common-util"),
-            require("../common-credential.js"),
-            require("nthen")
+            require("scrypt-async")
         );
     } else if ((typeof(define) !== 'undefined' && define !== null) && (define.amd !== null)) {
         define([
             '/common/common-hash.js',
-            '/common/common-util.js',
-            '/common/common-credential.js',
-            '/bower_components/nthen/index.js',
             '/bower_components/tweetnacl/nacl-fast.min.js',
-        ], function (Hash, Util, Cred, nThen) {
-            return factory(Hash, window.nacl, Util, Cred, nThen);
+            '/bower_components/scrypt_async/scrypt-async.min.js',
+        ], function (Hash /*, Nacl, Scrypt */) {
+            return factory(Hash, window.nacl, window.Scrypt);
         });
     }
 }());
diff --git a/www/teams/inner.js b/www/teams/inner.js
index 6b8fb35e7..07f27b09f 100644
--- a/www/teams/inner.js
+++ b/www/teams/inner.js
@@ -18,7 +18,6 @@ define([
     '/common/invitation.js',
     '/customize/messages.js',
 
-    '/bower_components/scrypt-async/scrypt-async.min.js',
     'css!/bower_components/bootstrap/dist/css/bootstrap.min.css',
     'css!/bower_components/components-font-awesome/css/font-awesome.min.css',
     'less!/teams/app-team.less',
@@ -45,7 +44,6 @@ define([
     var APP = {};
     var driveAPP = {};
     //var SHARED_FOLDER_NAME = Messages.fm_sharedFolderName;
-    var Scrypt = window.scrypt;
 
     var copyObjectValue = function (objRef, objToCopy) {
         for (var k in objRef) { delete objRef[k]; }
@@ -1062,17 +1060,10 @@ define([
                 ]));
                 setTimeout(waitFor(), 150);
             }).nThen(function (waitFor) {
-                // XXX ansuz InviteInner.deriveBytes
-                Scrypt(seeds.scrypt,
-                    (pw || '') + (AppConfig.loginSalt || ''), // salt
-                    8, // memoryCost (n)
-                    1024, // block size parameter (r)
-                    192, // dkLen
-                    200, // interruptStep
-                    waitFor(function (_bytes) {
-                        bytes64 = _bytes;
-                    }),  
-                    'base64'); // format, could be 'base64'
+                var salt = InviteInner.deriveSalt(pw, AppConfig.loginSalt);
+                InviteInner.deriveBytes(seeds.scrypt, salt, waitFor(function (bytes) {
+                    bytes64 = bytes;
+                }));
             }).nThen(function (waitFor) {
                 APP.module.execCommand('GET_LINK_DATA', {
                     bytes64: bytes64,

From 1af0dfb0655fa9718e78d37a820610e762dafcde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Mon, 16 Dec 2019 14:42:18 +0000
Subject: [PATCH 029/129] fix expiration time padding

---
 www/settings/app-settings.less | 1 +
 1 file changed, 1 insertion(+)

diff --git a/www/settings/app-settings.less b/www/settings/app-settings.less
index 8024aa086..30ff869a0 100644
--- a/www/settings/app-settings.less
+++ b/www/settings/app-settings.less
@@ -236,6 +236,7 @@
                     }
                     input {
                         width: 70px;
+                        padding: 0 5px;
                     }
                     select {
                         width: 100px;

From cfb6318b868cdd90e97b4cb709bb2cbcebed6b42 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 16 Dec 2019 16:06:22 +0100
Subject: [PATCH 030/129] Team invitation link, add alert

---
 .../src/less2/include/alertify.less           |  4 +++
 .../src/less2/include/modals-ui-elements.less | 12 +++++++
 www/common/common-ui-elements.js              | 32 +++++++++++++++++--
 3 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/customize.dist/src/less2/include/alertify.less b/customize.dist/src/less2/include/alertify.less
index 4bd5e298b..0a589a9de 100644
--- a/customize.dist/src/less2/include/alertify.less
+++ b/customize.dist/src/less2/include/alertify.less
@@ -71,6 +71,10 @@
         z-index: 100000; // alertify container
         font: @colortheme_app-font;
 
+        .cp-inline-alert-text {
+            flex: 1;
+        }
+
         &.forefront {
             z-index: @max-z-index; // alertify max forefront
         }
diff --git a/customize.dist/src/less2/include/modals-ui-elements.less b/customize.dist/src/less2/include/modals-ui-elements.less
index 21707eab8..24e5d725f 100644
--- a/customize.dist/src/less2/include/modals-ui-elements.less
+++ b/customize.dist/src/less2/include/modals-ui-elements.less
@@ -28,4 +28,16 @@
     .cp-app-prop-content {
         color: @cryptpad_text_col;
     }
+
+    .cp-teams-invite-block {
+        display: flex;
+        align-items: center;
+        margin-bottom: 5px;
+        span {
+            flex: 1;
+        }
+    }
+    .cp-teams-invite-alert {
+        margin-top: 15px;
+    }
 }
diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 27fd67dca..44717f635 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1636,7 +1636,9 @@ define([
 
         var linkName, linkPassword, linkMessage, linkError, linkSpinText;
         var linkForm, linkSpin, linkResult;
+        var linkWarning;
         // Invite from link
+        var dismissButton = h('span.fa.fa-times');
         var linkContent = h('div.cp-share-modal', [
             h('p', 'XXX Invite link description...'), // XXX
             linkError = h('div.alert.alert-danger', {style : 'display: none;'}),
@@ -1645,11 +1647,21 @@ define([
                     placeholder: 'name...' // XXX
                 }),
                 h('br'),
+                h('div.cp-teams-invite-block', [
+                    h('span', 'password protection...'), // XXX
+                    h('a.cp-teams-help.fa.fa-question-circle', {
+                        href: origin + '/faq.html#security-pad_password',
+                        target: "_blank",
+                        'data-tippy-placement': "right"
+                    })
+                ]), // XXX
                 linkPassword = UI.passwordInput({
                     id: 'cp-teams-invite-password',
                     placeholder: 'password...' // XXX
                 }),
-                h('br'),
+                h('div.cp-teams-invite-block',
+                    h('span', 'add a note') // XXX
+                ),
                 linkMessage = h('textarea', { // XXX ansuz hitting enter submits...
                     placeholder: 'note...' // XXX
                 })
@@ -1664,8 +1676,24 @@ define([
                 style: 'display: none;'
             }, h('textarea', {
                 readonly: 'readonly'
-            }))
+            })),
+            linkWarning = h('div.cp-teams-invite-alert.alert.alert-warning.dismissable', {
+                style: "display: none;"
+            }, [
+                h('span.cp-inline-alert-text', 'Warning...'),
+                dismissButton
+            ]) // XXX
         ]);
+        var localStore = window.cryptpadStore;
+        localStore.get('hide-alert-teamInvite', function (val) {
+            if (val === '1') { return; }
+            $(linkWarning).show();
+
+            $(dismissButton).on('click', function () {
+                localStore.put('hide-alert-teamInvite', '1');
+                $(linkWarning).remove();
+            });
+        });
         var $linkContent = $(linkContent);
         var href;
         var process = function () {

From af463c2de9d12967868d2b72d6e3412227c8eca3 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 16 Dec 2019 10:22:22 -0500
Subject: [PATCH 031/129] use the same APIs when creating invites as you do
 when redeeming them

---
 www/common/common-ui-elements.js | 23 ++++++-------
 www/common/invitation.js         | 12 +++++++
 www/teams/inner.js               | 55 +++++++++++++++++++++-----------
 3 files changed, 59 insertions(+), 31 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 27fd67dca..1dc44329a 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -14,14 +14,14 @@ define([
     '/customize/application_config.js',
     '/customize/pages.js',
     '/bower_components/nthen/index.js',
+    '/common/invitation.js',
 
     '/bower_components/scrypt-async/scrypt-async.js',
     'css!/customize/fonts/cptools/style.css',
     '/bower_components/croppie/croppie.min.js',
     'css!/bower_components/croppie/croppie.css',
 ], function ($, Config, Util, Hash, Language, UI, Constants, Feedback, h, MediaTag, Clipboard,
-             Messages, AppConfig, Pages, NThen) {
-    var Scrypt = window.scrypt;
+             Messages, AppConfig, Pages, NThen, InviteInner) {
     var UIElements = {};
 
     // Configure MediaTags to use our local viewer
@@ -1681,6 +1681,10 @@ define([
                 $(linkError).text('empty name...').show(); // XXX
                 return true;
             }
+
+            var seeds = InviteInner.deriveSeeds(hashData.key);
+            var salt = InviteInner.deriveSalt(pw, AppConfig.loginSalt);
+
             var bytes64;
             NThen(function (waitFor) {
                 $(linkForm).hide();
@@ -1688,17 +1692,9 @@ define([
                 $nav.find('button.cp-teams-invite-create').prop('disabled', 'disabled');
                 setTimeout(waitFor(), 150);
             }).nThen(function (waitFor) {
-                // Scrypt
-                Scrypt(hashData.key,
-                    (pw || '') + (AppConfig.loginSalt || ''), // salt
-                    8, // memoryCost (n)
-                    1024, // block size parameter (r)
-                    192, // dkLen
-                    200, // interruptStep
-                    waitFor(function (_bytes) {
-                        bytes64 = _bytes;
-                    }),
-                    'base64'); // format, could be 'base64'
+                InviteInner.deriveBytes(seeds.scrypt, salt, waitFor(function (_bytes) {
+                    bytes64 = _bytes;
+                }));
             }).nThen(function (waitFor) {
                 $(linkSpinText).text('Add invite link to team'); // XXX
                 module.execCommand('CREATE_INVITE_LINK', {
@@ -1708,6 +1704,7 @@ define([
                     bytes64: bytes64,
                     hash: hash,
                     teamId: config.teamId,
+                    seeds: seeds,
                 }, waitFor(function (obj) {
                     if (obj && obj.error) {
                         waitFor.abort();
diff --git a/www/common/invitation.js b/www/common/invitation.js
index 72655c60a..e26a39597 100644
--- a/www/common/invitation.js
+++ b/www/common/invitation.js
@@ -42,6 +42,18 @@ var factory = function (Hash, Nacl, Scrypt/*, Util, Cred, nThen */) {
             cb,
             'base64'); // format, could be 'base64'
     };
+
+    Invite.getPreviewContent = function (seeds, cb) {
+        var secrets = Invite.derivePreviewSecrets(seeds);
+        secrets = secrets;
+        cb("NOT_IMPLEMENTED"); // XXX cryptget
+    };
+
+    // XXX remember to pin invites...
+    Invite.setPreviewContent = function (seeds, cb) {
+        cb = cb;
+    };
+
     return Invite;
 };
     if (typeof(module) !== 'undefined' && module.exports) {
diff --git a/www/teams/inner.js b/www/teams/inner.js
index 07f27b09f..21883609d 100644
--- a/www/teams/inner.js
+++ b/www/teams/inner.js
@@ -1053,26 +1053,45 @@ define([
             var $div = $(div);
             $div.empty();
             var bytes64;
+
             nThen(function (waitFor) {
-                $div.append(h('div', [
-                    h('i.fa.fa-spin.fa-spinner'),
-                    h('span', 'Scrypt...') // XXX
-                ]));
-                setTimeout(waitFor(), 150);
+                // XXX show something while we're waiting for the invite preview content
+                waitFor = waitFor;
             }).nThen(function (waitFor) {
-                var salt = InviteInner.deriveSalt(pw, AppConfig.loginSalt);
-                InviteInner.deriveBytes(seeds.scrypt, salt, waitFor(function (bytes) {
-                    bytes64 = bytes;
-                }));
-            }).nThen(function (waitFor) {
-                APP.module.execCommand('GET_LINK_DATA', {
-                    bytes64: bytes64,
-                    hash: hash,
-                    password: pw,
-                }, waitFor(function () {
-                    $div.empty();
-                    // TODO
-                    // Accept/decline/decide later UI
+                InviteInner.getPreviewContent(seeds, waitFor(function (err, json) {
+                    json = json; // XXX {message: "", author: "", ???}
+                    if (err) {
+                        // XXX handle errors
+                    }
+                    // XXX show invite preview content
+
+                    var button = h('button', 'XXX');
+                    button.onclick = function () {
+                        nThen(function (waitFor) {
+                            $div.append(h('div', [
+                                h('i.fa.fa-spin.fa-spinner'),
+                                h('span', 'Scrypt...') // XXX
+                            ]));
+                            setTimeout(waitFor(), 150);
+                        }).nThen(function (waitFor) {
+                            var salt = InviteInner.deriveSalt(pw, AppConfig.loginSalt);
+                            InviteInner.deriveBytes(seeds.scrypt, salt, waitFor(function (bytes) {
+                                bytes64 = bytes;
+                            }));
+                        }).nThen(function (waitFor) {
+                            APP.module.execCommand('GET_LINK_DATA', {
+                                bytes64: bytes64,
+                                hash: hash,
+                                password: pw,
+                            }, waitFor(function () {
+                                $div.empty();
+                                // TODO
+                                // Accept/decline/decide later UI
+                            }));
+                        });
+                    };
+
+                    $div.append(button);
                 }));
             });
         };

From 00b0499db529986636df8e58d5c09027f4f8af53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Mon, 16 Dec 2019 16:03:56 +0000
Subject: [PATCH 032/129] add translation keys

---
 www/common/common-ui-elements.js | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 44717f635..e5a7bb660 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1640,15 +1640,14 @@ define([
         // Invite from link
         var dismissButton = h('span.fa.fa-times');
         var linkContent = h('div.cp-share-modal', [
-            h('p', 'XXX Invite link description...'), // XXX
-            linkError = h('div.alert.alert-danger', {style : 'display: none;'}),
+            h('p', Messages.team_inviteLinkTitle ), // XXX
             linkForm = h('div.cp-teams-invite-form', [
                 linkName = h('input', {
-                    placeholder: 'name...' // XXX
+                    placeholder:  Messages.team_inviteLinkTempName // XXX
                 }),
                 h('br'),
                 h('div.cp-teams-invite-block', [
-                    h('span', 'password protection...'), // XXX
+                    h('span', Messages.team_inviteLinkSetPassword), // XXX
                     h('a.cp-teams-help.fa.fa-question-circle', {
                         href: origin + '/faq.html#security-pad_password',
                         target: "_blank",
@@ -1657,20 +1656,19 @@ define([
                 ]), // XXX
                 linkPassword = UI.passwordInput({
                     id: 'cp-teams-invite-password',
-                    placeholder: 'password...' // XXX
+                    placeholder: Messages.login_password // XXX
                 }),
                 h('div.cp-teams-invite-block',
-                    h('span', 'add a note') // XXX
+                    h('span', Messages.team_inviteLinkNote) // XXX
                 ),
-                linkMessage = h('textarea', { // XXX ansuz hitting enter submits...
-                    placeholder: 'note...' // XXX
+                    placeholder: Messages.team_inviteLinkNoteMsg, // XXX
                 })
             ]),
             linkSpin = h('div', {
                 style: 'display: none;'
             }, [
                 h('i.fa.fa-spinner.fa-spin'),
-                linkSpinText = h('span', 'Scrypt...') // XXX
+                linkSpinText = h('span', Messages.team_inviteLinkLoading) // XXX
             ]),
             linkResult = h('div', {
                 style: 'display: none;'
@@ -1680,7 +1678,7 @@ define([
             linkWarning = h('div.cp-teams-invite-alert.alert.alert-warning.dismissable', {
                 style: "display: none;"
             }, [
-                h('span.cp-inline-alert-text', 'Warning...'),
+                h('span.cp-inline-alert-text', Messages.team_inviteLinkWarning),
                 dismissButton
             ]) // XXX
         ]);
@@ -1706,7 +1704,7 @@ define([
             var hashData = Hash.parseTypeHash('invite', hash);
             href = origin + '/teams/#' + hash;
             if (!name || !name.trim()) {
-                $(linkError).text('empty name...').show(); // XXX
+                $(linkError).text(Messages.team_inviteLinkErrorName).show(); // XXX
                 return true;
             }
             var bytes64;

From 8b333a8147a9bbbe7c1269bfc2d64c0f27138657 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Mon, 16 Dec 2019 16:05:06 +0000
Subject: [PATCH 033/129] size message textarea and remove resize

---
 customize.dist/src/less2/include/modals-ui-elements.less | 3 +++
 www/common/common-ui-elements.js                         | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/customize.dist/src/less2/include/modals-ui-elements.less b/customize.dist/src/less2/include/modals-ui-elements.less
index 24e5d725f..6db976283 100644
--- a/customize.dist/src/less2/include/modals-ui-elements.less
+++ b/customize.dist/src/less2/include/modals-ui-elements.less
@@ -37,6 +37,9 @@
             flex: 1;
         }
     }
+    .cp-teams-invite-message {
+        resize: none;
+    }
     .cp-teams-invite-alert {
         margin-top: 15px;
     }
diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index e5a7bb660..ef82df83b 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1661,7 +1661,9 @@ define([
                 h('div.cp-teams-invite-block',
                     h('span', Messages.team_inviteLinkNote) // XXX
                 ),
+                linkMessage = h('textarea.cp-teams-invite-message', { // XXX ansuz hitting enter submits...
                     placeholder: Messages.team_inviteLinkNoteMsg, // XXX
+                    rows: 3
                 })
             ]),
             linkSpin = h('div', {

From fccd1d5cc0b557d7fc5ed7b3399366a5146924ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Mon, 16 Dec 2019 16:05:41 +0000
Subject: [PATCH 034/129] resize spinner

---
 customize.dist/src/less2/include/modals-ui-elements.less | 5 +++++
 www/common/common-ui-elements.js                         | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/customize.dist/src/less2/include/modals-ui-elements.less b/customize.dist/src/less2/include/modals-ui-elements.less
index 6db976283..71f076d3f 100644
--- a/customize.dist/src/less2/include/modals-ui-elements.less
+++ b/customize.dist/src/less2/include/modals-ui-elements.less
@@ -42,5 +42,10 @@
     }
     .cp-teams-invite-alert {
         margin-top: 15px;
+    .cp-teams-invite-spinner {
+        font-size: 1.2em;
+        .fa {
+            margin-right: 10px;;
+        }
     }
 }
diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index ef82df83b..4ad2cb5c4 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1666,7 +1666,7 @@ define([
                     rows: 3
                 })
             ]),
-            linkSpin = h('div', {
+            linkSpin = h('div.cp-teams-invite-spinner', {
                 style: 'display: none;'
             }, [
                 h('i.fa.fa-spinner.fa-spin'),

From 4173bf168f3f28d93cb6d4d086daf3f79b16064d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Mon, 16 Dec 2019 16:05:59 +0000
Subject: [PATCH 035/129] alert margins

---
 customize.dist/src/less2/include/modals-ui-elements.less | 4 +++-
 www/common/common-ui-elements.js                         | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/customize.dist/src/less2/include/modals-ui-elements.less b/customize.dist/src/less2/include/modals-ui-elements.less
index 71f076d3f..cf51f6342 100644
--- a/customize.dist/src/less2/include/modals-ui-elements.less
+++ b/customize.dist/src/less2/include/modals-ui-elements.less
@@ -29,6 +29,7 @@
         color: @cryptpad_text_col;
     }
 
+    // teams invite modal 
     .cp-teams-invite-block {
         display: flex;
         align-items: center;
@@ -41,7 +42,8 @@
         resize: none;
     }
     .cp-teams-invite-alert {
-        margin-top: 15px;
+        margin-top: 10px;
+    }
     .cp-teams-invite-spinner {
         font-size: 1.2em;
         .fa {
diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 4ad2cb5c4..b7a491714 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1677,6 +1677,7 @@ define([
             }, h('textarea', {
                 readonly: 'readonly'
             })),
+            linkError = h('div.alert.alert-danger.cp-teams-invite-alert', {style : 'display: none;'}),
             linkWarning = h('div.cp-teams-invite-alert.alert.alert-warning.dismissable', {
                 style: "display: none;"
             }, [

From 4626d036cbea1a6f6379a07b4cf40b05c8658c13 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 16 Dec 2019 17:12:58 +0100
Subject: [PATCH 036/129] Cryptget in common/invitation

---
 www/common/invitation.js | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/www/common/invitation.js b/www/common/invitation.js
index e26a39597..9bf840e15 100644
--- a/www/common/invitation.js
+++ b/www/common/invitation.js
@@ -1,5 +1,5 @@
 (function () {
-var factory = function (Hash, Nacl, Scrypt/*, Util, Cred, nThen */) {
+var factory = function (Hash, Crypt, Nacl, Scrypt/*, Util, Cred, nThen */) {
     var Invite = {};
 
     Invite.deriveSeeds = function (seed) {
@@ -44,14 +44,30 @@ var factory = function (Hash, Nacl, Scrypt/*, Util, Cred, nThen */) {
     };
 
     Invite.getPreviewContent = function (seeds, cb) {
+        /*
         var secrets = Invite.derivePreviewSecrets(seeds);
         secrets = secrets;
-        cb("NOT_IMPLEMENTED"); // XXX cryptget
+        */
+        var hash = Invite.derivePreviewHash(seeds);
+        Crypt.get(hash, function (err, val) {
+            if (err) { return void cb(err); }
+            try {
+                cb(void 0, JSON.parse(val));
+            } catch (e) {
+                console.error(e);
+                cb(e);
+            }
+        });
+//        cb("NOT_IMPLEMENTED"); // XXX cryptget
     };
 
     // XXX remember to pin invites...
     Invite.setPreviewContent = function (seeds, cb) {
-        cb = cb;
+        var hash = Invite.derivePreviewHash(seeds);
+        Crypt.put(hash, '', function (err) { // value?
+            cb(err);
+        });
+        //cb = cb;
     };
 
     return Invite;
@@ -59,16 +75,18 @@ var factory = function (Hash, Nacl, Scrypt/*, Util, Cred, nThen */) {
     if (typeof(module) !== 'undefined' && module.exports) {
         module.exports = factory(
             require("../common-hash"),
+            require("../cryptget"), // XXX npm cryptget?
             require("tweetnacl/nacl-fast"),
             require("scrypt-async")
         );
     } else if ((typeof(define) !== 'undefined' && define !== null) && (define.amd !== null)) {
         define([
             '/common/common-hash.js',
+            '/common/cryptget.js',
             '/bower_components/tweetnacl/nacl-fast.min.js',
             '/bower_components/scrypt_async/scrypt-async.min.js',
-        ], function (Hash /*, Nacl, Scrypt */) {
-            return factory(Hash, window.nacl, window.Scrypt);
+        ], function (Hash, Crypt /*, Nacl, Scrypt */) {
+            return factory(Hash, Crypt, window.nacl, window.Scrypt);
         });
     }
 }());

From b332c97db9a02416fde1ba78c9575b654389fbaa Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Mon, 16 Dec 2019 16:40:21 +0000
Subject: [PATCH 037/129] Translated using Weblate (English)

Currently translated at 100.0% (1171 of 1171 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1170 of 1170 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1169 of 1169 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1168 of 1168 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1167 of 1167 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1166 of 1166 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1165 of 1165 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1164 of 1164 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
---
 www/common/translations/messages.json | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/www/common/translations/messages.json b/www/common/translations/messages.json
index 8f6638f58..1d1e3e1c1 100644
--- a/www/common/translations/messages.json
+++ b/www/common/translations/messages.json
@@ -1259,5 +1259,13 @@
     "contacts_unmute": "Unmute",
     "contacts_manageMuted": "Manage muted",
     "contacts_mutedUsers": "Muted accounts",
-    "contacts_muteInfo": "You will not receive any notifications or messages from muted users.<br>They will not know you have muted them. "
+    "contacts_muteInfo": "You will not receive any notifications or messages from muted users.<br>They will not know you have muted them. ",
+    "team_inviteLinkTitle": "Create a personalized invitation to this team",
+    "team_inviteLinkTempName": "temporary name (visible in pending invitations list)",
+    "team_inviteLinkSetPassword": "Protect the link with a password (recommended)",
+    "team_inviteLinkNote": "Add a personal message",
+    "team_inviteLinkNoteMsg": "This message will be shown before the recipient decides whether to join this team.",
+    "team_inviteLinkLoading": "Generating your link",
+    "team_inviteLinkWarning": "The first person to access this link will be able to join this team and view its contents. Share it carefully.",
+    "team_inviteLinkErrorName": "Please give this invitation a name"
 }

From 6d4bfe4dfdbec51908483c197c4575ec83240e19 Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Mon, 16 Dec 2019 16:40:21 +0000
Subject: [PATCH 038/129] Translated using Weblate (French)

Currently translated at 100.0% (1171 of 1171 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
---
 www/common/translations/messages.fr.json | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/www/common/translations/messages.fr.json b/www/common/translations/messages.fr.json
index 7f0533dbc..7ba175962 100644
--- a/www/common/translations/messages.fr.json
+++ b/www/common/translations/messages.fr.json
@@ -1259,5 +1259,13 @@
     "contacts_unmute": "Réafficher",
     "contacts_manageMuted": "Comptes masqués",
     "contacts_mutedUsers": "Comptes masqués",
-    "contacts_muteInfo": "Vous ne receverez plus de notifications ou de messages si vous masquez ce compte.<br>L'utilisateur ne sera pas informé que vous l'avez masqué. "
+    "contacts_muteInfo": "Vous ne receverez plus de notifications ou de messages si vous masquez ce compte.<br>L'utilisateur ne sera pas informé que vous l'avez masqué. ",
+    "team_inviteLinkTitle": "Créer une invitation personnalisée à cette équipe",
+    "team_inviteLinkTempName": "Nom temporaire (apparaît dans la liste des invitations en cours)",
+    "team_inviteLinkSetPassword": "Protégez le lien avec un mot de passe (recommandé)",
+    "team_inviteLinkNote": "Ajoutez un message personnalisé",
+    "team_inviteLinkNoteMsg": "Ce message sera affiché avant que le destinataire décide de rejoindre cette équipe.",
+    "team_inviteLinkLoading": "Lien en cours de création",
+    "team_inviteLinkWarning": "La première personne qui accédera à ce lien pourra devenir membre de l'équipe et voir son contenu. Partagez le avec prudence.",
+    "team_inviteLinkErrorName": "Merci de donner un nom à cette invitation"
 }

From daf5017bda090544efc91c562041b20076a33281 Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Mon, 16 Dec 2019 16:40:21 +0000
Subject: [PATCH 039/129] Translated using Weblate (German)

Currently translated at 98.9% (1158 of 1171 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
---
 www/common/translations/messages.de.json | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/www/common/translations/messages.de.json b/www/common/translations/messages.de.json
index aac7f9e03..8eba3e0f7 100644
--- a/www/common/translations/messages.de.json
+++ b/www/common/translations/messages.de.json
@@ -1254,5 +1254,10 @@
     "passwordFaqLink": "Mehr über Passwörter erfahren",
     "share_noContactsLoggedIn": "Du hast noch keine Kontakte bei CryptPad. Teile den Link zu deinem Profil, damit andere dir Kontaktanfragen senden können.",
     "share_copyProfileLink": "Profil-Link kopieren",
-    "share_noContactsNotLoggedIn": "Logge dich ein oder registriere dich, um deine Kontakte zu sehen und neue hinzuzufügen."
+    "share_noContactsNotLoggedIn": "Logge dich ein oder registriere dich, um deine Kontakte zu sehen und neue hinzuzufügen.",
+    "contacts_mute": "",
+    "contacts_unmute": "",
+    "contacts_manageMuted": "",
+    "contacts_mutedUsers": "",
+    "contacts_muteInfo": ""
 }

From c21a45fbde01c02f0bbcd09c7b4d2768285972a1 Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Mon, 16 Dec 2019 16:51:03 +0000
Subject: [PATCH 040/129] Translated using Weblate (English)

Currently translated at 100.0% (1173 of 1173 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1172 of 1172 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
---
 www/common/translations/messages.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/www/common/translations/messages.json b/www/common/translations/messages.json
index 1d1e3e1c1..4dfb5143b 100644
--- a/www/common/translations/messages.json
+++ b/www/common/translations/messages.json
@@ -1267,5 +1267,7 @@
     "team_inviteLinkNoteMsg": "This message will be shown before the recipient decides whether to join this team.",
     "team_inviteLinkLoading": "Generating your link",
     "team_inviteLinkWarning": "The first person to access this link will be able to join this team and view its contents. Share it carefully.",
-    "team_inviteLinkErrorName": "Please give this invitation a name"
+    "team_inviteLinkErrorName": "Please give this invitation a name",
+    "team_inviteLinkCreate": "CREATE LINK",
+    "team_inviteLinkCopy": "COPY LINK"
 }

From 5a55bcde3da258fde7a2e4c0a0e851247829b124 Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Mon, 16 Dec 2019 16:51:03 +0000
Subject: [PATCH 041/129] Translated using Weblate (French)

Currently translated at 100.0% (1173 of 1173 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
---
 www/common/translations/messages.fr.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/www/common/translations/messages.fr.json b/www/common/translations/messages.fr.json
index 7ba175962..aa8065bee 100644
--- a/www/common/translations/messages.fr.json
+++ b/www/common/translations/messages.fr.json
@@ -1267,5 +1267,7 @@
     "team_inviteLinkNoteMsg": "Ce message sera affiché avant que le destinataire décide de rejoindre cette équipe.",
     "team_inviteLinkLoading": "Lien en cours de création",
     "team_inviteLinkWarning": "La première personne qui accédera à ce lien pourra devenir membre de l'équipe et voir son contenu. Partagez le avec prudence.",
-    "team_inviteLinkErrorName": "Merci de donner un nom à cette invitation"
+    "team_inviteLinkErrorName": "Merci de donner un nom à cette invitation",
+    "team_inviteLinkCreate": "CRÉER LIEN",
+    "team_inviteLinkCopy": "COPIER LIEN"
 }

From 71da3ed7231eb3012e959fabd916b4b69e338cf7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Mon, 16 Dec 2019 16:51:53 +0000
Subject: [PATCH 042/129] add button keys

---
 customize.dist/src/less2/include/modals-ui-elements.less | 2 +-
 www/common/common-ui-elements.js                         | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/customize.dist/src/less2/include/modals-ui-elements.less b/customize.dist/src/less2/include/modals-ui-elements.less
index cf51f6342..79964e888 100644
--- a/customize.dist/src/less2/include/modals-ui-elements.less
+++ b/customize.dist/src/less2/include/modals-ui-elements.less
@@ -29,7 +29,7 @@
         color: @cryptpad_text_col;
     }
 
-    // teams invite modal 
+    // teams invite modal
     .cp-teams-invite-block {
         display: flex;
         align-items: center;
diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 0bf990412..366931b24 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1725,7 +1725,7 @@ define([
                     bytes64 = _bytes;
                 }));
             }).nThen(function (waitFor) {
-                $(linkSpinText).text('Add invite link to team'); // XXX
+                $(linkSpinText).text(Messages.team_inviteLinkAdding); // XXX
                 module.execCommand('CREATE_INVITE_LINK', {
                     name: name,
                     password: pw,
@@ -1755,14 +1755,14 @@ define([
             keys: [27]
         }, {
             className: 'primary cp-teams-invite-create',
-            name: 'CREATE LINK', // XXX
+            name: Messages.team_inviteLinkCreate, // XXX
             onClick: function () {
                 return process();
             },
             keys: [13]
         }, {
             className: 'primary cp-teams-invite-copy',
-            name: 'COPY LINK', // XXX
+            name: Messages.team_inviteLinkCopy, // XXX
             onClick: function () {
                 if (!href) { return; }
                 var success = Clipboard.copy(href);

From af6b77a2ff69f341dd3d64a84fe5f30c856b7898 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 16 Dec 2019 11:59:12 -0500
Subject: [PATCH 043/129] fix script errors

---
 www/common/invitation.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/common/invitation.js b/www/common/invitation.js
index e26a39597..9ce1ec67e 100644
--- a/www/common/invitation.js
+++ b/www/common/invitation.js
@@ -66,9 +66,9 @@ var factory = function (Hash, Nacl, Scrypt/*, Util, Cred, nThen */) {
         define([
             '/common/common-hash.js',
             '/bower_components/tweetnacl/nacl-fast.min.js',
-            '/bower_components/scrypt_async/scrypt-async.min.js',
+            '/bower_components/scrypt-async/scrypt-async.min.js',
         ], function (Hash /*, Nacl, Scrypt */) {
-            return factory(Hash, window.nacl, window.Scrypt);
+            return factory(Hash, window.nacl, window.scrypt);
         });
     }
 }());

From 0716014eef8ee1d53be1b8992f5605dfd3f8eb08 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 16 Dec 2019 18:36:34 +0100
Subject: [PATCH 044/129] Refactoring joining team from link

---
 www/common/invitation.js |  12 ++-
 www/teams/inner.js       | 179 ++++++++++++++++++++++-----------------
 2 files changed, 114 insertions(+), 77 deletions(-)

diff --git a/www/common/invitation.js b/www/common/invitation.js
index 9bf840e15..7c92d83c6 100644
--- a/www/common/invitation.js
+++ b/www/common/invitation.js
@@ -44,6 +44,16 @@ var factory = function (Hash, Crypt, Nacl, Scrypt/*, Util, Cred, nThen */) {
     };
 
     Invite.getPreviewContent = function (seeds, cb) {
+        setTimeout(function () {
+            cb(void 0, {
+                author: {
+                    displayName: 'Bob',
+                    curvePublic: 'pewpewpew'
+                },
+                team: 'CryptPad',
+                message: 'Hello bob'
+            });
+        });
         /*
         var secrets = Invite.derivePreviewSecrets(seeds);
         secrets = secrets;
@@ -84,7 +94,7 @@ var factory = function (Hash, Crypt, Nacl, Scrypt/*, Util, Cred, nThen */) {
             '/common/common-hash.js',
             '/common/cryptget.js',
             '/bower_components/tweetnacl/nacl-fast.min.js',
-            '/bower_components/scrypt_async/scrypt-async.min.js',
+            '/bower_components/scrypt-async/scrypt-async.min.js',
         ], function (Hash, Crypt /*, Nacl, Scrypt */) {
             return factory(Hash, Crypt, window.nacl, window.Scrypt);
         });
diff --git a/www/teams/inner.js b/www/teams/inner.js
index 21883609d..91a839501 100644
--- a/www/teams/inner.js
+++ b/www/teams/inner.js
@@ -1019,17 +1019,96 @@ define([
         ]);
     }, true);
 
+    var displayUser = function (common, data) {
+        var friends = common.getMetadataMgr().getPrivateData().friends;
+        var verified = false;
+        if (friends[data.curvePublic]) { verified = true; }
+        var avatar = h('span.cp-teams-invite-from-avatar.cp-avatar');
+        UIElements.displayAvatar(common, $(avatar), data.avatar, data.displayName);
+        return h('div.cp-teams-invite-from-author', [
+            avatar,
+            h('span.cp-teams-invite-from-name', data.displayName)
+        ]);
+    };
+
     makeBlock('link', function (common, cb) {
-        // XXX get team data first or login first?
-        if (!driveAPP.loggedIn) {
+        var hash = common.getMetadataMgr().getPrivateData().teamInviteHash;
+        var hashData = Hash.parseTypeHash('invite', hash);
+        var password = hashData.password;
+        var seeds = InviteInner.deriveSeeds(hashData.key);
+
+        var div = h('div', [
+            h('i.fa.fa-spin.fa-spinner')
+        ]);
+        var $div = $(div);
+        cb([
+            h('h2', 'Team invitation'), // XXX
+            div
+        ]);
+        var inviteDiv = h('div');
+        var $inviteDiv = $(inviteDiv);
+
+        var process = function (pw) {
+            $inviteDiv.empty();
+            var bytes64;
+
+
+            var button = h('button', 'XXX');
+            button.onclick = function () {
+                nThen(function (waitFor) {
+                    $inviteDiv.append(h('div', [
+                        h('i.fa.fa-spin.fa-spinner'),
+                        h('span', 'Scrypt...') // XXX
+                    ]));
+                    setTimeout(waitFor(), 150);
+                }).nThen(function (waitFor) {
+                    var salt = InviteInner.deriveSalt(pw, AppConfig.loginSalt);
+                    InviteInner.deriveBytes(seeds.scrypt, salt, waitFor(function (bytes) {
+                        bytes64 = bytes;
+                    }));
+                }).nThen(function (waitFor) {
+                    APP.module.execCommand('GET_LINK_DATA', {
+                        bytes64: bytes64,
+                        hash: hash,
+                        password: pw,
+                    }, waitFor(function () {
+                        $div.empty();
+                        // TODO
+                        // Accept/decline/decide later UI
+                    }));
+                });
+            };
+
+            $inviteDiv.append(button);
+        };
+
+        nThen(function (waitFor) {
+            InviteInner.getPreviewContent(seeds, waitFor(function (err, json) {
+                if (err) {
+                    // XXX handle errors
+                }
+                json = json; // XXX {message: "", author: "", ???}
+                $div.empty();
+                $div.append(h('div.cp-teams-invite-from', [
+                    'From', // XXX
+                    displayUser(common, json.author)
+                ]));
+                $div.append(UI.setHTML(h('p.cp-teams-invite-to'), 'Bob has invited you to join the team <b>CryptPad</b>')); // XXX
+                $div.append(h('div.cp-teams-invite-message', [
+                    UI.dialog.selectableArea(json.message || '')
+                ]));
+            }));
+        }).nThen(function (waitFor) {
+            // If you're logged in, move on to the next nThen
+            if (driveAPP.loggedIn) { return; }
+
+            // If you're not logged in, display the login buttons
             var anonLogin, anonRegister;
-            var anonContent = h('div', [
-                h('p', "You've been invited to a team. Only registered users can join a team. Login or register..."), // XXX
-                h('div', [
-                    anonLogin = h('button.btn.btn-primary', Messages.login_login),
-                    anonRegister = h('button.btn.btn-secondary', Messages.login_register),
-                ])
-            ]);
+            $div.append(h('p', 'Please log in or register to accept this invitation...')); // XXX
+            $div.append(h('div', [
+                anonLogin = h('button.btn.btn-primary', Messages.login_login),
+                anonRegister = h('button.btn.btn-secondary', Messages.login_register),
+            ]));
             $(anonLogin).click(function () {
                 common.setLoginRedirect(function () {
                     common.gotoURL('/login/');
@@ -1040,81 +1119,29 @@ define([
                     common.gotoURL('/register/');
                 });
             });
-            return void cb(anonContent);
-        }
-        var hash = common.getMetadataMgr().getPrivateData().teamInviteHash;
-        var hashData = Hash.parseTypeHash('invite', hash);
-        var password = hashData.password;
-        var seeds = InviteInner.deriveSeeds(hashData.key);
-
-        var div;
-
-        var process = function (pw) {
-            var $div = $(div);
-            $div.empty();
-            var bytes64;
-
-            nThen(function (waitFor) {
-                // XXX show something while we're waiting for the invite preview content
-                waitFor = waitFor;
-            }).nThen(function (waitFor) {
-                InviteInner.getPreviewContent(seeds, waitFor(function (err, json) {
-                    json = json; // XXX {message: "", author: "", ???}
-                    if (err) {
-                        // XXX handle errors
-                    }
-                    // XXX show invite preview content
-
-                    var button = h('button', 'XXX');
-                    button.onclick = function () {
-                        nThen(function (waitFor) {
-                            $div.append(h('div', [
-                                h('i.fa.fa-spin.fa-spinner'),
-                                h('span', 'Scrypt...') // XXX
-                            ]));
-                            setTimeout(waitFor(), 150);
-                        }).nThen(function (waitFor) {
-                            var salt = InviteInner.deriveSalt(pw, AppConfig.loginSalt);
-                            InviteInner.deriveBytes(seeds.scrypt, salt, waitFor(function (bytes) {
-                                bytes64 = bytes;
-                            }));
-                        }).nThen(function (waitFor) {
-                            APP.module.execCommand('GET_LINK_DATA', {
-                                bytes64: bytes64,
-                                hash: hash,
-                                password: pw,
-                            }, waitFor(function () {
-                                $div.empty();
-                                // TODO
-                                // Accept/decline/decide later UI
-                            }));
-                        });
-                    };
-
-                    $div.append(button);
-                }));
-            });
-        };
+            waitFor.abort();
+        }).nThen(function () {
+            $div.append($inviteDiv);
+        }).nThen(function (waitFor) {
+            // If there is no password, move on to the next block
+            if (!password) { return; }
 
-        var content = [];
-        if (password) {
-            // XXX XXX
-            content.push(h('p', "You've been invited to join a CryptPad Team, but the person who created the invitation protected it with a secret passphrase that they expect you to know."));
-            content.push(h('p', "Entering the correct phrase will decrypt the team's info and allow you to accept or decline the invitation."));
+            // If there is a password, display the password prompt
+            $inviteDiv.append(h('p', 'Please enter the invitation password to continue...')); // XXX
             var pwInput = UI.passwordInput();
-            content.push(pwInput);
             var submitPw = h('button.btn.btn-secondary', Messages.password_submit);
             $(submitPw).click(function () {
                 var val = $(pwInput).find('input').val();
                 if (!val) { return; }
                 process(val);
             });
-            content.push(submitPw);
-        }
-        div = h('div', content);
-        cb(div);
-
-        if (!password) { process(); }
+            $inviteDiv.append(pwInput);
+            $inviteDiv.append(submitPw);
+            waitFor.abort();
+        }).nThen(function () {
+            // No password, display the invitation proposal
+            process('');
+        });
     });
 
     var redrawTeam = function (common) {

From 1a521b57c8be2a40c34d04013728f5506508f9cc Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 16 Dec 2019 17:22:30 -0500
Subject: [PATCH 045/129] implement INVITE and ACCEPT roster methods

---
 www/common/outer/roster.js | 117 +++++++++++++++++++++++++++++++++++++
 1 file changed, 117 insertions(+)

diff --git a/www/common/outer/roster.js b/www/common/outer/roster.js
index d5cfc570a..8b038569f 100644
--- a/www/common/outer/roster.js
+++ b/www/common/outer/roster.js
@@ -364,6 +364,98 @@ var factory = function (Util, Hash, CPNetflux, Sortify, nThen, Crypto) {
         return changed;
     };
 
+    commands.INVITE = function (args, author, roster) {
+        // an invitation is created with an ephemeral curve public key
+        // that key is ultimately given to the user you'd like on your team
+        // that user can exploit their possession of the public key to remove
+        // the pending invitation with their actual data.
+        if (!isMap(args)) { throw new Error('INVALID_ARGS'); }
+        if (!roster.internal.initialized) { throw new Error("UNINITIALIED"); }
+        if (typeof(roster.state.members) === 'undefined') {
+            throw new Error("CANNOT+INVITE_TO_UNINITIALIED_ROSTER");
+        }
+
+        var members = roster.state.members;
+
+        Object.keys(args).forEach(function (curve) {
+            if (!isValidId(curve)) {
+                console.log(curve, curve.length);
+                throw new Error("INVALID_CURVE_KEY");
+            }
+            // reject commandws wehere the members are not proper objects
+            if (!isMap(args[curve])) { throw new Error("INVALID_CONTENT"); }
+            if (members[curve]) { throw new Error("ARLEADY_PRESNET"); }
+
+            var data = args[curve];
+            // if no role was provided, assume VIEWER
+            if (typeof(data.role) !== 'string') { data.role = "VIEWER"; }
+
+            // assume that invitations are 'pending' unless stated otherwise
+            if (typeof(data.pending) === 'undefined') { data.pending = true; }
+
+            if (!canAddRole(author, data.role, members)) {
+                throw new Error("INSUFFICIENT_PERMISSIONS");
+            }
+
+            if (typeof(data.displayName) !== 'string' || !data.displayName) { throw new Error("DISPLAYNAME_REQUIRED"); }
+            //if (typeof(data.notifications) !== 'string') { throw new Error("NOTIFICATIONS_REQUIRED"); }
+        });
+
+
+        /*
+            {
+                <ephemeralCurveKey>: {
+                    role: ??? || 'VIEWER',
+                    displayName: '',
+                    pending: true,
+                }
+            }
+        */
+
+        var changed = false;
+
+        Object.keys(args).forEach(function (curve) {
+            changed = true;
+            members[curve] = args[curve];
+        });
+
+        return changed;
+    };
+
+    commands.ACCEPT = function (args, author, roster) {
+        if (!roster.internal.initialized) { throw new Error("UNINITIALIED"); }
+        if (typeof(roster.state.members) === 'undefined') {
+            throw new Error("CANNOT_ADD_TO_UNINITIALIED_ROSTER");
+        }
+
+        // an ACCEPT command replaces a pending invitation's curve key with a new one
+        // after which the invited member can use their actual curve key to describe themselves
+
+        // the author must have been invited already...
+        var members = roster.state.members;
+
+        // so you must already be in the members list
+        if (!isMap(members[author])) { throw new Error("INSUFFICIENT_PERMISSIONS"); }
+        // and your membership must indicate that you are 'pending'
+        if (!members[author].pending) { throw new Errror("ALREADY_PRESENT"); }
+
+        // args should be a string
+        if (typeof(args) !== 'string') { throw new Error("INVALID_ARGS"); }
+        // ...and a valid curve key
+        if (!isValidId(args)) { throw new Error("INVALID_CURVE_KEY"); }
+
+        var curve = args;
+
+        // and the curve key must not already be a member
+        if (typeof(members[curve]) !== 'undefined') { throw new Error("MEMBER_ALREADY_PRESENT"); }
+
+        // copy the new profile from the old one
+        members[curve] = Util.clone(members[author]);
+        // and erase the old one
+        delete members[author];
+        return true;
+    };
+
     var handleCommand = function (content, author, roster) {
         if (!(Array.isArray(content) && typeof(author) === 'string')) {
             throw new Error("INVALID ARGUMENTS");
@@ -671,6 +763,31 @@ var factory = function (Util, Hash, CPNetflux, Sortify, nThen, Crypto) {
             send(['METADATA', data], cb);
         };
 
+        // supports multiple invite
+        roster.invite = function (_data, _cb) {
+            var cb = Util.once(Util.mkAsync(_cb));
+            var state = ref.state;
+            if (!state) { return cb("UNINITIALIZED"); }
+            if (!ref.internal.initialized) { return cb("UNINITIALIZED"); }
+            if (!isMap(_data)) { return void cb("INVALID_ARGUMENTS"); }
+            var data = Util.clone(_data);
+
+            Object.keys(data).forEach(function (curve) {
+                if (!isValidId(curve) || isMap(ref.state.members[curve])) { return delete data[curve]; }
+            });
+
+            send(['INVITE', data], cb);
+        };
+
+        roster.accept = function (_data, _cb) {
+            var cb = Util.once(Util.mkAsync(_cb));
+            if (typeof(_data) !== 'string' || !isValidId(_data)) {
+                return void cb("INVALID_ARGUMENTS");
+            }
+
+            send([ 'ACCEPT', _data ], cb);
+        };
+
         nThen(function (w) {
             // get metadata so we know the owners and validateKey
             anon_rpc.send('GET_METADATA', channel, function (err, data) {

From c82c50c27486dc21f63f5f68914221dfabce902d Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 16 Dec 2019 20:57:19 -0500
Subject: [PATCH 046/129] WIP team invitations

---
 www/common/outer/invitation.js | 146 ++++++++++++++++-----------------
 www/common/outer/roster.js     |   2 +-
 www/common/outer/team.js       |  85 +++++++++++++++++--
 3 files changed, 151 insertions(+), 82 deletions(-)

diff --git a/www/common/outer/invitation.js b/www/common/outer/invitation.js
index baf44e677..f33f93bb1 100644
--- a/www/common/outer/invitation.js
+++ b/www/common/outer/invitation.js
@@ -1,8 +1,76 @@
 (function () {
-var factory = function (Util, Cred, nThen) {
+var factory = function (Util, Cred, nThen, Nacl) {
     nThen = nThen; // XXX
     var Invite = {};
 
+    var encode64 = Nacl.util.encodeBase64;
+    var decode64 = Nacl.util.decode64;
+
+    // ed and curve keys can be random...
+    Invite.generateKeys = function () {
+        var ed = Nacl.sign.keyPair();
+        var curve = Nacl.box.keyPair();
+        return {
+            edPublic: encode64(ed.publicKey),
+            edPrivate: encode64(ed.secretKey),
+            curvePublic: encode64(curve.publicKey),
+            curvePrivate: encode64(curve.secretKey),
+        };
+    };
+
+    var b64ToChannelKeys = function (b64) {
+        var dispense = Cred.dispenser(decode64(b64));
+        return {
+            channel: Util.uint8ArrayToHex(dispense(16)),
+            cryptKey: encode64(dispense(Nacl.secretbox.keyLength)),
+        };
+    };
+
+    // the secret invite values (cryptkey and channel) can be derived
+    // from the link seed and (optional) password
+    Invite.deriveInviteKeys = b64ToChannelKeys;
+
+    // the preview values (cryptkey and channel) are less sensitive than the invite values
+    // as they cannot be leveraged to access any further content on their own
+    // unless the message contains secrets.
+    // derived from the link seed alone.
+    Invite.derivePreviewKeys = b64ToChannelKeys;
+
+    // what the invite link alone will allow you to see
+    Invite.createPreviewContent = function (data, keys, cb) {
+        cb = cb;
+        /*  should include:
+        {
+            message: "", // personal message
+            author: "", // author public key
+            from: "", // author pretty name
+        }
+        */
+    };
+
+    // the remaining data available with the invite link + password
+    Invite.createInviteContent = function (data, keys, cb) {
+        cb = cb;
+        /*  should include:
+        {
+            teamData: {
+                // everything you need to join the team
+
+            },
+            ephemeral: {
+                curve: "", // for the roster
+                ed: "" // for deleting the preview content
+            }
+        }
+        */
+    };
+
+    Invite.createRosterEntry = function (roster, data, cb) {
+        var toInvite = {};
+        toInvite[data.curvePublic] = data.content;
+        roster.invite(toInvite, cb);
+    };
+
 /*  INPUTS
 
     * password (for scrypt)
@@ -13,20 +81,6 @@ var factory = function (Util, Cred, nThen) {
 
 */
 
-
-/*  DERIVATIONS
-
-    * components corresponding to www/common/invitation.js
-    * preview_hash => components
-      * channel
-      * cryptKey
-    * b64_bytes
-      * curvePrivate => curvePublic
-      * edSeed => edPrivate => edPublic
-
-*/
-
-
 /*  IO / FUNCTIONALITY
 
     * creator
@@ -46,77 +100,23 @@ var factory = function (Util, Cred, nThen) {
 
 */
 
-
-    var BYTES_REQUIRED = 256;
-
-    Invite.deriveKeys = function (seed, passwd, cb) {
-        cb = cb; // XXX
-        // TODO validate has cb
-        // TODO onceAsync the cb
-        // TODO cb with err if !(seed && passwd)
-
-        Cred.deriveFromPassphrase(seed, passwd, BYTES_REQUIRED, function (bytes) {
-            var dispense = Cred.dispenser(bytes);
-            dispense = dispense; // XXX
-
-            // edPriv => edPub
-            // curvePriv => curvePub
-            // channel
-            // cryptKey
-        });
-    };
-
-    Invite.createSeed = function () {
-        // XXX
-        // return a seed
-    };
-
-    Invite.create = function (cb) {
-        cb = cb; // XXX
-        // TODO validate has cb
-        // TODO onceAsync the cb
-        // TODO cb with err if !(seed && passwd)
-
-
-
-        // required
-            // password
-            // validateKey
-            // creatorEdPublic
-                // for owner
-        // ephemeral
-            // signingKey
-                // for owner to write invitation
-        // derived
-            // edPriv
-                // edPublic
-                    // for invitee ownership
-            // curvePriv
-                // curvePub
-                    // for acceptance OR
-                    // authenticated decline message via mailbox
-            // channel
-                // for owned deletion
-                // for team pinning
-            // cryptKey
-                // for protecting channel content
-    };
-
     return Invite;
 };
     if (typeof(module) !== 'undefined' && module.exports) {
         module.exports = factory(
             require("../common-util"),
             require("../common-credential.js"),
-            require("nthen")
+            require("nthen"),
+            require("tweetnacl/nacl-fast")
         );
     } else if ((typeof(define) !== 'undefined' && define !== null) && (define.amd !== null)) {
         define([
             '/common/common-util.js',
             '/common/common-credential.js',
             '/bower_components/nthen/index.js',
+            '/bower_components/tweetnacl/nacl-fast.min.js',
         ], function (Util, Cred, nThen) {
-            return factory(Util, nThen);
+            return factory(Util, Cred, nThen, window.nacl);
         });
     }
 }());
diff --git a/www/common/outer/roster.js b/www/common/outer/roster.js
index 8b038569f..214d1ff9b 100644
--- a/www/common/outer/roster.js
+++ b/www/common/outer/roster.js
@@ -437,7 +437,7 @@ var factory = function (Util, Hash, CPNetflux, Sortify, nThen, Crypto) {
         // so you must already be in the members list
         if (!isMap(members[author])) { throw new Error("INSUFFICIENT_PERMISSIONS"); }
         // and your membership must indicate that you are 'pending'
-        if (!members[author].pending) { throw new Errror("ALREADY_PRESENT"); }
+        if (!members[author].pending) { throw new Error("ALREADY_PRESENT"); }
 
         // args should be a string
         if (typeof(args) !== 'string') { throw new Error("INVALID_ARGS"); }
diff --git a/www/common/outer/team.js b/www/common/outer/team.js
index 8217f030e..22daac68c 100644
--- a/www/common/outer/team.js
+++ b/www/common/outer/team.js
@@ -1261,9 +1261,14 @@ define([
     };
 
     // XXX ansuz
-    var createInviteLink = function (ctx, data, cId, cb) {
-        Invite = Invite;
+    var createInviteLink = function (ctx, data, cId, _cb) {
+        var cb = Util.mkAsync(Util.once(_cb));
+
         var team = ctx.teams[data.teamId];
+
+        var seeds = data.seeds; // {scrypt, preview}
+        var bytes64 = data.bytes64;
+
         team = team;
         /*
         var roster = team.roster;
@@ -1271,15 +1276,78 @@ define([
         var password = data.password;
         var msg = data.message;
         var hash = data.hash;
-        var bytes64 = data.bytes64;
         */
-        return void cb();
-        /*
-        cb({
-            error: 'NOT_IMPLEMENTED'
+
+        // derive { channel, cryptKey} for the preview content channel
+        var previewKeys = Invite.derivePreviewKeys(seeds.preview);
+
+        // derive {channel, cryptkey} for the invite content channel
+        var inviteKeys = Invite.deriveInviteKeys(bytes64);
+
+        // randomly generate ephemeral keys for ownership of the above content
+        // and a placeholder in the roster
+        var ephemeralKeys = Invite.generateKeys();
+
+        nThen(function (w) {
+            w = w;
+            // XXX Invite.createPreviewContent
+            // XXX cryptput the preview content
+            /*  PUT
+                {
+                    message: data.message,
+                    // XXX authorName
+                    // XXX authorInfo {
+                        profile,
+                        etc,
+                    }
+                }
+                /// XXX callback if error
+            */
+
+            // Invite.createInviteContent
+            // XXX cryptput the secret team credentials
+            /* PUT
+                {
+                    ephemeralKeys.edPrivate,
+                    ephemeralKeys.curvePrivate,
+                    teamData: {
+                        ...
+                    }
+                }
+                /// XXX callback if error
+            */
+        }).nThen(function (w) {
+            Invite.createRosterEntry(team.roster, {
+                curvePublic: ephemeralKeys.curvePublic,
+                content: {
+                    displayName: data.name,
+                    pending: true,
+                    inviteChannel: inviteKeys.channel, // XXX keep this channel pinned until the invite is accepted
+                    previewChannel: previewKeys.channel, // XXX keep this channel pinned until the invite is accepted
+
+                    // XXX encrypt the following data for your own curvePublic
+                    // XXX and implement UI for interacting with it
+                      // remind yourself of the password used
+                      // bypass scrypt with bytes64 to revover other keys
+                    // { password, bytes64, hash}
+                }
+            }, w(function (err) {
+                if (err) {
+                    w.abort();
+                    cb(err);
+                }
+            }));
+        }).nThen(function () {
+            // call back empty if everything worked
+            cb();
+            /*
+            cb({
+                error: 'NOT_IMPLEMENTED'
+            });
+            */
         });
-        */
     };
+
     // XXX ansuz
     var getLinkData = function (ctx, data, cId, cb) {
         /*
@@ -1455,6 +1523,7 @@ define([
             if (cmd === 'GET_LINK_DATA') {
                 return void getLinkData(ctx, data, clientId, cb);
             }
+            // XXX ansuz
         };
 
         return team;

From e38d6d1093dda7007670558e18b81941b8017366 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 17 Dec 2019 10:29:02 +0100
Subject: [PATCH 047/129] Fix link generation

---
 www/common/outer/invitation.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/common/outer/invitation.js b/www/common/outer/invitation.js
index f33f93bb1..4b0844c7f 100644
--- a/www/common/outer/invitation.js
+++ b/www/common/outer/invitation.js
@@ -4,7 +4,7 @@ var factory = function (Util, Cred, nThen, Nacl) {
     var Invite = {};
 
     var encode64 = Nacl.util.encodeBase64;
-    var decode64 = Nacl.util.decode64;
+    var decode64 = Nacl.util.decodeBase64;
 
     // ed and curve keys can be random...
     Invite.generateKeys = function () {

From 5a055233c0afa27c80615a5a3d32b03650f6b264 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 17 Dec 2019 10:57:13 +0100
Subject: [PATCH 048/129] Fix cryptget inner

---
 server.js                          |  2 +-
 www/common/cryptget.js             |  2 +-
 www/common/invitation.js           |  4 ++--
 www/common/outer/network-config.js | 11 ++++++++---
 www/teams/inner.js                 |  7 +++++--
 5 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/server.js b/server.js
index 26238384b..ca98795f2 100644
--- a/server.js
+++ b/server.js
@@ -214,7 +214,7 @@ app.get('/api/config', function(req, res){
             // FIXME don't send websocketURL if websocketPath is provided. deprecated.
             websocketURL:'ws' + ((useSecureWebsockets) ? 's' : '') + '://' + host + ':' +
                 websocketPort + '/cryptpad_websocket',
-            httpUnsafeOrigin: config.httpUnsafeOrigin,
+            httpUnsafeOrigin: config.httpUnsafeOrigin.replace(/^ /, ''),
             adminEmail: config.adminEmail,
             adminKeys: admins,
             inactiveTime: config.inactiveTime,
diff --git a/www/common/cryptget.js b/www/common/cryptget.js
index f99a28a6c..39c43f857 100644
--- a/www/common/cryptget.js
+++ b/www/common/cryptget.js
@@ -33,7 +33,7 @@ define([
         var secret = Hash.getSecrets('pad', hash, opt.password);
         if (!secret.keys) { secret.keys = secret.key; } // support old hashses
         var config = {
-            websocketURL: NetConfig.getWebsocketURL(),
+            websocketURL: NetConfig.getWebsocketURL(opt.origin),
             channel: secret.channel,
             validateKey: secret.keys.validateKey || undefined,
             crypto: Crypto.createEncryptor(secret.keys),
diff --git a/www/common/invitation.js b/www/common/invitation.js
index 882eadffe..d73d5dd53 100644
--- a/www/common/invitation.js
+++ b/www/common/invitation.js
@@ -43,7 +43,7 @@ var factory = function (Hash, Crypt, Nacl, Scrypt/*, Util, Cred, nThen */) {
             'base64'); // format, could be 'base64'
     };
 
-    Invite.getPreviewContent = function (seeds, cb) {
+    Invite.getPreviewContent = function (seeds, cryptgetOpts, cb) {
         setTimeout(function () {
             cb(void 0, {
                 author: {
@@ -67,7 +67,7 @@ var factory = function (Hash, Crypt, Nacl, Scrypt/*, Util, Cred, nThen */) {
                 console.error(e);
                 cb(e);
             }
-        });
+        }, cryptgetOpts);
 //        cb("NOT_IMPLEMENTED"); // XXX cryptget
     };
 
diff --git a/www/common/outer/network-config.js b/www/common/outer/network-config.js
index 09b34ae0e..e310fe48b 100644
--- a/www/common/outer/network-config.js
+++ b/www/common/outer/network-config.js
@@ -3,13 +3,18 @@ define([
 ], function (ApiConfig) {
     var Config = {};
 
-    Config.getWebsocketURL = function () {
+    Config.getWebsocketURL = function (origin) {
         if (!ApiConfig.websocketPath) { return ApiConfig.websocketURL; }
         var path = ApiConfig.websocketPath;
         if (/^ws{1,2}:\/\//.test(path)) { return path; }
 
-        var protocol = window.location.protocol.replace(/http/, 'ws');
-        var host = window.location.host;
+        var l = window.location;
+        if (origin && window && window.document) {
+            var l = document.createElement("a");
+            l.href = origin;
+        }
+        var protocol = l.protocol.replace(/http/, 'ws');
+        var host = l.host;
         var url = protocol + '//' + host + path;
 
         return url;
diff --git a/www/teams/inner.js b/www/teams/inner.js
index 91a839501..16ef22adb 100644
--- a/www/teams/inner.js
+++ b/www/teams/inner.js
@@ -1032,7 +1032,8 @@ define([
     };
 
     makeBlock('link', function (common, cb) {
-        var hash = common.getMetadataMgr().getPrivateData().teamInviteHash;
+        var privateData = common.getMetadataMgr().getPrivateData();
+        var hash = privateData.teamInviteHash;
         var hashData = Hash.parseTypeHash('invite', hash);
         var password = hashData.password;
         var seeds = InviteInner.deriveSeeds(hashData.key);
@@ -1083,7 +1084,9 @@ define([
         };
 
         nThen(function (waitFor) {
-            InviteInner.getPreviewContent(seeds, waitFor(function (err, json) {
+            InviteInner.getPreviewContent(seeds, {
+                origin: privateData.origin
+            }, waitFor(function (err, json) {
                 if (err) {
                     // XXX handle errors
                 }

From 35dbfe0bb57891bfadc60b936eb74e09925f207e Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 17 Dec 2019 11:12:18 +0100
Subject: [PATCH 049/129] Pin the invitation link channels

---
 www/common/outer/team.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/www/common/outer/team.js b/www/common/outer/team.js
index 22daac68c..966c30a53 100644
--- a/www/common/outer/team.js
+++ b/www/common/outer/team.js
@@ -138,6 +138,15 @@ define([
         if (membersChannel) { list.push(membersChannel); }
         if (mailboxChannel) { list.push(mailboxChannel); }
 
+        var state = store.roster.getState();
+        if (state.members) {
+            Object.keys(state.members).forEach(function (curve) {
+                var m = state.members[curve];
+                if (m.inviteChannel) { list.push(m.inviteChannel); }
+                if (m.previewChannel) { list.push(m.previewChannel); }
+            });
+        }
+
         list.sort();
         return list;
     };
@@ -1317,6 +1326,9 @@ define([
                 /// XXX callback if error
             */
         }).nThen(function (w) {
+            team.pin([inviteKeys.channel, previewKeys.channel], function (obj) {
+                if (obj && obj.error) { console.error(obj.error); }
+            });
             Invite.createRosterEntry(team.roster, {
                 curvePublic: ephemeralKeys.curvePublic,
                 content: {

From 6a712a7b5232fbe2c9cd7f1a6797e1eb6dc173c3 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 17 Dec 2019 11:24:49 +0100
Subject: [PATCH 050/129] View pending invitation links and remove them (if
 admin)

---
 www/teams/inner.js | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/www/teams/inner.js b/www/teams/inner.js
index 16ef22adb..4d8cb6bfc 100644
--- a/www/teams/inner.js
+++ b/www/teams/inner.js
@@ -763,10 +763,19 @@ define([
         });
         var pending = Object.keys(roster).filter(function (k) {
             if (!roster[k].pending) { return; }
+            if (roster[k].inviteChannel) { return; }
             return roster[k].role === "MEMBER" || roster[k].role === "VIEWER" || !roster[k].role;
         }).map(function (k) {
             return makeMember(common, roster[k], me);
         });
+        var links = Object.keys(roster).filter(function (k) {
+            if (!roster[k].pending) { return; }
+            if (!roster[k].inviteChannel) { return; }
+            roster[k].curvePublic = k; // XXX "if (!data.curvePublic) { return; }" in makeMember
+            return roster[k].role === "VIEWER" || !roster[k].role;
+        }).map(function (k) {
+            return makeMember(common, roster[k], me);
+        });
 
         var header = h('div.cp-app-team-roster-header');
         var $header = $(header);
@@ -820,6 +829,7 @@ define([
         $header.append(table);
 
         var noPending = pending.length ? '' : '.cp-hidden';
+        var noLinks = links.length ? '' : '.cp-hidden';
 
         return [
             header,
@@ -832,7 +842,9 @@ define([
             h('h3', Messages.team_viewers || 'VIEWERS'),
             h('div', viewers),
             h('h3'+noPending, Messages.team_pending),
-            h('div'+noPending, pending)
+            h('div'+noPending, pending),
+            h('h3'+noLinks, Messages.team_links),
+            h('div'+noLinks, links)
         ];
     };
     makeBlock('roster', function (common, cb) {

From 4f8ca40d36319b403c63bfa9301781722fe97dd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Tue, 17 Dec 2019 10:30:44 +0000
Subject: [PATCH 051/129] hide and show buttons to create/copy link

---
 customize.dist/src/less2/include/modals-ui-elements.less | 3 +++
 www/common/common-ui-elements.js                         | 7 ++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/customize.dist/src/less2/include/modals-ui-elements.less b/customize.dist/src/less2/include/modals-ui-elements.less
index 79964e888..90f0d9272 100644
--- a/customize.dist/src/less2/include/modals-ui-elements.less
+++ b/customize.dist/src/less2/include/modals-ui-elements.less
@@ -50,4 +50,7 @@
             margin-right: 10px;;
         }
     }
+    .cp-teams-invite-create {
+        margin-right: 0px !important; 
+    }
 }
diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 366931b24..a8f47c372 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1718,7 +1718,8 @@ define([
             NThen(function (waitFor) {
                 $(linkForm).hide();
                 $(linkSpin).show();
-                $nav.find('button.cp-teams-invite-create').prop('disabled', 'disabled');
+                $nav.find('button.cp-teams-invite-create').hide();
+                $nav.find('button.cp-teams-invite-copy').show()
                 setTimeout(waitFor(), 150);
             }).nThen(function (waitFor) {
                 InviteInner.deriveBytes(seeds.scrypt, salt, waitFor(function (_bytes) {
@@ -1738,7 +1739,7 @@ define([
                     if (obj && obj.error) {
                         waitFor.abort();
                         $(linkSpin).hide();
-                        return void $(linkError).text('ERROR '+obj.error).show(); // XXX
+                        return void $(linkError).text(Messages.team_inviteLinkError+obj.error).show(); // XXX
                     }
                     // Display result here
                     $(linkSpin).hide();
@@ -1774,7 +1775,7 @@ define([
         var frameLink = UI.dialog.customModal(linkContent, {
             buttons: linkButtons,
         });
-        $(frameLink).find('.cp-teams-invite-copy').prop('disabled', 'disabled');
+        $(frameLink).find('.cp-teams-invite-copy').prop('disabled', 'disabled').hide();
 
         // Create modal
         var tabs = [{

From 51744723296d743a6cbaac868b1eca3876c895e9 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 17 Dec 2019 11:48:23 +0100
Subject: [PATCH 052/129] Fix link generation bug

---
 www/common/invitation.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/www/common/invitation.js b/www/common/invitation.js
index d73d5dd53..d41982bf2 100644
--- a/www/common/invitation.js
+++ b/www/common/invitation.js
@@ -2,8 +2,9 @@
 var factory = function (Hash, Crypt, Nacl, Scrypt/*, Util, Cred, nThen */) {
     var Invite = {};
 
-    Invite.deriveSeeds = function (seed) {
+    Invite.deriveSeeds = function (safeSeed) {
         // take the hash of the provided seed
+        seed = safeSeed.replace(/\-/g, '/');
         var u8_seed = Nacl.hash(Nacl.util.decodeBase64(seed));
 
         // hash the first half again for scrypt's input

From 3aa111d8a80770c2eb86cd5c9e2c790bb8868b8c Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 17 Dec 2019 11:49:32 +0100
Subject: [PATCH 053/129] lint compliance

---
 www/common/invitation.js           | 2 +-
 www/common/outer/network-config.js | 2 +-
 www/common/outer/roster.js         | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/www/common/invitation.js b/www/common/invitation.js
index d41982bf2..b21b2fa0e 100644
--- a/www/common/invitation.js
+++ b/www/common/invitation.js
@@ -4,7 +4,7 @@ var factory = function (Hash, Crypt, Nacl, Scrypt/*, Util, Cred, nThen */) {
 
     Invite.deriveSeeds = function (safeSeed) {
         // take the hash of the provided seed
-        seed = safeSeed.replace(/\-/g, '/');
+        var seed = safeSeed.replace(/\-/g, '/');
         var u8_seed = Nacl.hash(Nacl.util.decodeBase64(seed));
 
         // hash the first half again for scrypt's input
diff --git a/www/common/outer/network-config.js b/www/common/outer/network-config.js
index e310fe48b..300810b97 100644
--- a/www/common/outer/network-config.js
+++ b/www/common/outer/network-config.js
@@ -10,7 +10,7 @@ define([
 
         var l = window.location;
         if (origin && window && window.document) {
-            var l = document.createElement("a");
+            l = document.createElement("a");
             l.href = origin;
         }
         var protocol = l.protocol.replace(/http/, 'ws');
diff --git a/www/common/outer/roster.js b/www/common/outer/roster.js
index 214d1ff9b..6a1def6b9 100644
--- a/www/common/outer/roster.js
+++ b/www/common/outer/roster.js
@@ -775,6 +775,7 @@ var factory = function (Util, Hash, CPNetflux, Sortify, nThen, Crypto) {
             Object.keys(data).forEach(function (curve) {
                 if (!isValidId(curve) || isMap(ref.state.members[curve])) { return delete data[curve]; }
             });
+console.error('SENDING INVITE');
 
             send(['INVITE', data], cb);
         };

From 3cd957a55225c3fd9ecc69866827af95c98d41fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Tue, 17 Dec 2019 10:51:17 +0000
Subject: [PATCH 054/129] fix button margins

---
 customize.dist/src/less2/include/alertify.less           | 4 ++--
 customize.dist/src/less2/include/modals-ui-elements.less | 3 ---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/customize.dist/src/less2/include/alertify.less b/customize.dist/src/less2/include/alertify.less
index 0a589a9de..923561a41 100644
--- a/customize.dist/src/less2/include/alertify.less
+++ b/customize.dist/src/less2/include/alertify.less
@@ -375,8 +375,8 @@
                 text-align: right;
                 button {
                     margin: 0px !important;
-                    &:not(:last-child) {
-                        margin-right: @alertify_padding-base !important;
+                    &:not(:first-child) {
+                        margin-left: @alertify_padding-base !important;
                       }
                 }
             }
diff --git a/customize.dist/src/less2/include/modals-ui-elements.less b/customize.dist/src/less2/include/modals-ui-elements.less
index 90f0d9272..79964e888 100644
--- a/customize.dist/src/less2/include/modals-ui-elements.less
+++ b/customize.dist/src/less2/include/modals-ui-elements.less
@@ -50,7 +50,4 @@
             margin-right: 10px;;
         }
     }
-    .cp-teams-invite-create {
-        margin-right: 0px !important; 
-    }
 }

From d2ea3c42217e671dc2a5c4f1073bb3f9e0c4a034 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Tue, 17 Dec 2019 11:18:38 +0000
Subject: [PATCH 055/129] show form and switch buttons if error

---
 www/common/common-ui-elements.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index a8f47c372..053059a55 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1719,7 +1719,7 @@ define([
                 $(linkForm).hide();
                 $(linkSpin).show();
                 $nav.find('button.cp-teams-invite-create').hide();
-                $nav.find('button.cp-teams-invite-copy').show()
+                $nav.find('button.cp-teams-invite-copy').show();
                 setTimeout(waitFor(), 150);
             }).nThen(function (waitFor) {
                 InviteInner.deriveBytes(seeds.scrypt, salt, waitFor(function (_bytes) {
@@ -1737,8 +1737,11 @@ define([
                     seeds: seeds,
                 }, waitFor(function (obj) {
                     if (obj && obj.error) {
-                        waitFor.abort();
+                        waitFor.abort(); 
                         $(linkSpin).hide();
+                        $(linkForm).show(); // XXX DB: check this is the right place to put things back 
+                        $nav.find('button.cp-teams-invite-create').show();
+                        $nav.find('button.cp-teams-invite-copy').hide();
                         return void $(linkError).text(Messages.team_inviteLinkError+obj.error).show(); // XXX
                     }
                     // Display result here

From 45e74e416c8c5492e995920ed9d49af6428229ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Tue, 17 Dec 2019 14:16:34 +0000
Subject: [PATCH 056/129] style manage muted button

---
 customize.dist/src/less2/include/messenger.less | 5 +++++
 www/common/messenger-ui.js                      | 8 +++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/customize.dist/src/less2/include/messenger.less b/customize.dist/src/less2/include/messenger.less
index 0845f496e..c81686a7c 100644
--- a/customize.dist/src/less2/include/messenger.less
+++ b/customize.dist/src/less2/include/messenger.less
@@ -126,8 +126,13 @@
                 }
             }
             .cp-app-contacts-muted-button {
+                margin: 10px;
+                border: 0;
                 display: none;
                 order: 3;
+                .fa-bell-slash {
+                    margin-right: 10px;
+                }
             }
         }
     }
diff --git a/www/common/messenger-ui.js b/www/common/messenger-ui.js
index 941eb86e1..d84bfcdd1 100644
--- a/www/common/messenger-ui.js
+++ b/www/common/messenger-ui.js
@@ -70,9 +70,11 @@ define([
                 h('div.cp-app-contacts-category-content')
             ]),
             h('div.cp-app-contacts-friends.cp-app-contacts-category', [
-                h('div.cp-app-contacts-category-content.cp-contacts-friends'),
-                h('h2.cp-app-contacts-category-title', Messages.contacts_friends),
-                h('button.cp-app-contacts-muted-button', Messages.contacts_manageMuted || 'MANAGE MUTED') // XXX
+                h('button.cp-app-contacts-muted-button',[
+                    h('i.fa.fa-bell-slash'),
+                    Messages.contacts_manageMuted || 'MANAGE MUTED' // XXX
+                ]), 
+                h('div.cp-app-contacts-category-content.cp-contacts-friends')
             ]),
             h('div.cp-app-contacts-rooms.cp-app-contacts-category', [
                 h('div.cp-app-contacts-category-content'),

From 2dd5f5fc2f89274b1db19ce69554300be0dfccbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Tue, 17 Dec 2019 15:09:57 +0000
Subject: [PATCH 057/129] fix password help icon

---
 customize.dist/src/less2/include/modals-ui-elements.less | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/customize.dist/src/less2/include/modals-ui-elements.less b/customize.dist/src/less2/include/modals-ui-elements.less
index 79964e888..3e1672709 100644
--- a/customize.dist/src/less2/include/modals-ui-elements.less
+++ b/customize.dist/src/less2/include/modals-ui-elements.less
@@ -31,7 +31,7 @@
 
     // teams invite modal
     .cp-teams-invite-block {
-        display: flex;
+        display: inline-flex;
         align-items: center;
         margin-bottom: 5px;
         span {
@@ -50,4 +50,11 @@
             margin-right: 10px;;
         }
     }
+    .cp-teams-help {
+        color: @colortheme_logo-2;
+        margin-left: 10px;
+        &:hover {
+            text-decoration: none;
+        }
+    }
 }

From 0f87052198374e04b678f95155992a3941f778ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Tue, 17 Dec 2019 15:34:53 +0000
Subject: [PATCH 058/129] fix password help icon alignment

---
 customize.dist/src/less2/include/modals-ui-elements.less | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/customize.dist/src/less2/include/modals-ui-elements.less b/customize.dist/src/less2/include/modals-ui-elements.less
index 3e1672709..906e5a630 100644
--- a/customize.dist/src/less2/include/modals-ui-elements.less
+++ b/customize.dist/src/less2/include/modals-ui-elements.less
@@ -31,7 +31,7 @@
 
     // teams invite modal
     .cp-teams-invite-block {
-        display: inline-flex;
+        display: flex;
         align-items: center;
         margin-bottom: 5px;
         span {
@@ -52,7 +52,8 @@
     }
     .cp-teams-help {
         color: @colortheme_logo-2;
-        margin-left: 10px;
+        text-align: center;
+        width: 30px;
         &:hover {
             text-decoration: none;
         }

From 84174dbced59de7780391322a33bda75586324eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Tue, 17 Dec 2019 15:46:38 +0000
Subject: [PATCH 059/129] re-fix password help icon

---
 customize.dist/src/less2/include/modals-ui-elements.less | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/customize.dist/src/less2/include/modals-ui-elements.less b/customize.dist/src/less2/include/modals-ui-elements.less
index 906e5a630..aeff6781d 100644
--- a/customize.dist/src/less2/include/modals-ui-elements.less
+++ b/customize.dist/src/less2/include/modals-ui-elements.less
@@ -34,9 +34,6 @@
         display: flex;
         align-items: center;
         margin-bottom: 5px;
-        span {
-            flex: 1;
-        }
     }
     .cp-teams-invite-message {
         resize: none;
@@ -53,7 +50,7 @@
     .cp-teams-help {
         color: @colortheme_logo-2;
         text-align: center;
-        width: 30px;
+        margin-left: 10px;
         &:hover {
             text-decoration: none;
         }

From 71ac44e23913b635c5a5abc541dada482033c1af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Tue, 17 Dec 2019 15:54:02 +0000
Subject: [PATCH 060/129] move help icon color to alertify styles

---
 customize.dist/src/less2/include/alertify.less           | 6 ++++++
 customize.dist/src/less2/include/modals-ui-elements.less | 5 -----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/customize.dist/src/less2/include/alertify.less b/customize.dist/src/less2/include/alertify.less
index 923561a41..d8b220975 100644
--- a/customize.dist/src/less2/include/alertify.less
+++ b/customize.dist/src/less2/include/alertify.less
@@ -261,6 +261,12 @@
                 }
             }
 
+            .fa-question-circle { // help links to FAQ
+                color: @colortheme_logo-2;
+                &:hover {
+                    text-decoration: none;
+                }
+            }
 
             input[type="checkbox"], input[type="radio"] {
                 width: auto;
diff --git a/customize.dist/src/less2/include/modals-ui-elements.less b/customize.dist/src/less2/include/modals-ui-elements.less
index aeff6781d..289cc4e69 100644
--- a/customize.dist/src/less2/include/modals-ui-elements.less
+++ b/customize.dist/src/less2/include/modals-ui-elements.less
@@ -48,11 +48,6 @@
         }
     }
     .cp-teams-help {
-        color: @colortheme_logo-2;
-        text-align: center;
         margin-left: 10px;
-        &:hover {
-            text-decoration: none;
-        }
     }
 }

From 0b248348eb0126d80d98c93787fd0348c36439d6 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 17 Dec 2019 17:01:15 +0100
Subject: [PATCH 061/129] Fix mute/unmute button in contacts

---
 www/common/messenger-ui.js | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/www/common/messenger-ui.js b/www/common/messenger-ui.js
index 941eb86e1..4d782827b 100644
--- a/www/common/messenger-ui.js
+++ b/www/common/messenger-ui.js
@@ -491,15 +491,8 @@ define([
         };
 
         var unmuteUser = function (curve) {
-            execCommand('UNMUTE_USER', curve, function (e, data) {
+            execCommand('UNMUTE_USER', curve, function (e) {
                 if (e) { return void console.error(e); }
-                var $button = $('.cp-contacts-muted-user').find('button[data-user="'+curve+'"]');
-                $button.closest('div').remove();
-                if (!data) { $button.hide(); }
-                $('.cp-app-contacts-friend[data-user="'+curve+'"]')
-                    .find('.cp-unmute-icon').show();
-                $('.cp-app-contacts-friend[data-user="'+curve+'"]')
-                    .find('.cp-mute-icon').show();
             });
         };
         var muteUser = function (data) {
@@ -567,7 +560,7 @@ define([
                 if (friendData.profile) { window.open(origin + '/profile/#' + friendData.profile); }
             });
 
-            $(unmute).click(function (e) {
+            $(unmute).on('click dblclick', function (e) {
                 e.stopPropagation();
                 var channel = state.channels[id];
                 if (!channel.isFriendChat) { return; }
@@ -577,7 +570,7 @@ define([
                 unmuteUser(curvePublic);
             });
 
-            $(mute).click(function (e) {
+            $(mute).on('click dblclick', function (e) {
                 e.stopPropagation();
                 var channel = state.channels[id];
                 if (!channel.isFriendChat) { return; }
@@ -863,6 +856,10 @@ define([
 
                 var $button = $userlist.find('.cp-app-contacts-muted-button');
 
+                $('.cp-app-contacts-friend[data-user]')
+                    .find('.cp-mute-icon').show();
+                $('.cp-app-contacts-friend[data-user]')
+                    .find('.cp-unmute-icon').hide();
                 if (!muted || Object.keys(muted).length === 0) {
                     $button.hide();
                     return;
@@ -871,6 +868,8 @@ define([
                 var rows = Object.keys(muted).map(function (curve) {
                     $('.cp-app-contacts-friend[data-user="'+curve+'"]')
                         .find('.cp-mute-icon').hide();
+                    $('.cp-app-contacts-friend[data-user="'+curve+'"]')
+                        .find('.cp-unmute-icon').show();
                     var data = muted[curve];
                     var avatar = h('span.cp-avatar');
                     var button = h('button', {

From 4cc2da72226305535f484288eef4b9c49f8e4c8d Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 17 Dec 2019 17:03:56 +0100
Subject: [PATCH 062/129] Fix HTML message displayed as text in profile

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

diff --git a/www/profile/inner.js b/www/profile/inner.js
index fdbf50dd3..e9c142777 100644
--- a/www/profile/inner.js
+++ b/www/profile/inner.js
@@ -306,7 +306,7 @@ define([
                     refreshMute(data);
                 });
             }).appendTo($mute);
-            $(h('p', Messages.contacts_muteInfo)).appendTo($mute);
+            $(UI.setHTML(h('p'), Messages.contacts_muteInfo)).appendTo($mute);
         });
     };
 

From 1588ced325c5397baf5061aa3da4c5dcfbbc7f68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Tue, 17 Dec 2019 16:10:36 +0000
Subject: [PATCH 063/129] add spacing to manage mute modal

---
 .../src/less2/include/modals-ui-elements.less          | 10 ++++++++++
 www/common/messenger-ui.js                             |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/customize.dist/src/less2/include/modals-ui-elements.less b/customize.dist/src/less2/include/modals-ui-elements.less
index 21707eab8..665345ad6 100644
--- a/customize.dist/src/less2/include/modals-ui-elements.less
+++ b/customize.dist/src/less2/include/modals-ui-elements.less
@@ -28,4 +28,14 @@
     .cp-app-prop-content {
         color: @cryptpad_text_col;
     }
+
+    .cp-contacts-muted-user {
+        margin-bottom: 5px;
+        .cp-avatar {
+            margin-right: 10px;
+        }
+        .button {
+            margin-right: 0px; // XXX 
+        }
+    }
 }
diff --git a/www/common/messenger-ui.js b/www/common/messenger-ui.js
index d84bfcdd1..28e6b4e89 100644
--- a/www/common/messenger-ui.js
+++ b/www/common/messenger-ui.js
@@ -878,7 +878,7 @@ define([
                     var button = h('button', {
                         'data-user': curve
                     }, [
-                        h('i.fa.fa-ban'),
+                        h('i.fa.fa-bell'),
                         Messages.contacts_unmute || 'unmute'
                     ]);
                     UIElements.displayAvatar(common, $(avatar), data.avatar, data.name);

From d9ae669015e66b26507a35f908fbebd190102ed3 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 17 Dec 2019 17:18:40 +0100
Subject: [PATCH 064/129] Handle deleted invitation error

---
 www/common/invitation.js | 29 ++++++++++++++++-------------
 www/teams/inner.js       |  7 +++++++
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/www/common/invitation.js b/www/common/invitation.js
index b21b2fa0e..cc85a7016 100644
--- a/www/common/invitation.js
+++ b/www/common/invitation.js
@@ -1,5 +1,5 @@
 (function () {
-var factory = function (Hash, Crypt, Nacl, Scrypt/*, Util, Cred, nThen */) {
+var factory = function (Hash, Util, Crypt, Nacl, Scrypt/*, Cred, nThen */) {
     var Invite = {};
 
     Invite.deriveSeeds = function (safeSeed) {
@@ -44,16 +44,16 @@ var factory = function (Hash, Crypt, Nacl, Scrypt/*, Util, Cred, nThen */) {
             'base64'); // format, could be 'base64'
     };
 
-    Invite.getPreviewContent = function (seeds, cryptgetOpts, cb) {
-        setTimeout(function () {
-            cb(void 0, {
-                author: {
-                    displayName: 'Bob',
-                    curvePublic: 'pewpewpew'
-                },
-                team: 'CryptPad',
-                message: 'Hello bob'
-            });
+    Invite.getPreviewContent = function (seeds, cryptgetOpts, _cb) {
+        var cb = Util.once(Util.mkAsync(_cb));
+        // XXX test data
+        cb(void 0, {
+            author: {
+                displayName: 'Bob',
+                curvePublic: 'pewpewpew'
+            },
+            team: 'CryptPad',
+            message: 'Hello bob'
         });
         /*
         var secrets = Invite.derivePreviewSecrets(seeds);
@@ -62,6 +62,7 @@ var factory = function (Hash, Crypt, Nacl, Scrypt/*, Util, Cred, nThen */) {
         var hash = Invite.derivePreviewHash(seeds);
         Crypt.get(hash, function (err, val) {
             if (err) { return void cb(err); }
+            if (!val) { return void cb('DELETED'); }
             try {
                 cb(void 0, JSON.parse(val));
             } catch (e) {
@@ -86,6 +87,7 @@ var factory = function (Hash, Crypt, Nacl, Scrypt/*, Util, Cred, nThen */) {
     if (typeof(module) !== 'undefined' && module.exports) {
         module.exports = factory(
             require("../common-hash"),
+            require("../common-util"),
             require("../cryptget"), // XXX npm cryptget?
             require("tweetnacl/nacl-fast"),
             require("scrypt-async")
@@ -93,11 +95,12 @@ var factory = function (Hash, Crypt, Nacl, Scrypt/*, Util, Cred, nThen */) {
     } else if ((typeof(define) !== 'undefined' && define !== null) && (define.amd !== null)) {
         define([
             '/common/common-hash.js',
+            '/common/common-util.js',
             '/common/cryptget.js',
             '/bower_components/tweetnacl/nacl-fast.min.js',
             '/bower_components/scrypt-async/scrypt-async.min.js',
-        ], function (Hash, Crypt /*, Nacl, Scrypt */) {
-            return factory(Hash, Crypt, window.nacl, window.scrypt);
+        ], function (Hash, Util, Crypt /*, Nacl, Scrypt */) {
+            return factory(Hash, Util, Crypt, window.nacl, window.scrypt);
         });
     }
 }());
diff --git a/www/teams/inner.js b/www/teams/inner.js
index 4d8cb6bfc..ddb46c5f4 100644
--- a/www/teams/inner.js
+++ b/www/teams/inner.js
@@ -1054,8 +1054,10 @@ define([
             h('i.fa.fa-spin.fa-spinner')
         ]);
         var $div = $(div);
+        var errorBlock;
         cb([
             h('h2', 'Team invitation'), // XXX
+            errorBlock = h('div.alert.alert-danger', {style: 'display: none;'}),
             div
         ]);
         var inviteDiv = h('div');
@@ -1100,6 +1102,11 @@ define([
                 origin: privateData.origin
             }, waitFor(function (err, json) {
                 if (err) {
+                    // err === DELETED: different message?
+                    $(errorBlock).text('ERROR'+err).show(); // XXX
+                    waitFor.abort();
+                    $div.empty();
+                    return;
                     // XXX handle errors
                 }
                 json = json; // XXX {message: "", author: "", ???}

From cf2a6247750ec9c81ed281910b833133267a3b49 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 17 Dec 2019 17:27:41 +0100
Subject: [PATCH 065/129] Add 'Join team' and 'Decline' buttons

---
 www/teams/inner.js | 76 +++++++++++++++++++++++++---------------------
 1 file changed, 42 insertions(+), 34 deletions(-)

diff --git a/www/teams/inner.js b/www/teams/inner.js
index ddb46c5f4..de1e466c1 100644
--- a/www/teams/inner.js
+++ b/www/teams/inner.js
@@ -1060,41 +1060,47 @@ define([
             errorBlock = h('div.alert.alert-danger', {style: 'display: none;'}),
             div
         ]);
-        var inviteDiv = h('div');
+        var declineButton = h('button.btn.btn-danger', Messages.friendRequest_decline);
+        var acceptButton = h('button.btn.btn-primary', 'JOIN TEAM'); // XXX
+        var inviteDiv = h('div', [
+            h('nav', [
+                declineButton,
+                acceptButton
+            ])
+        ]);
         var $inviteDiv = $(inviteDiv);
 
+        $(declineButton).click(function() {
+            
+        });
+
         var process = function (pw) {
             $inviteDiv.empty();
             var bytes64;
 
 
-            var button = h('button', 'XXX');
-            button.onclick = function () {
-                nThen(function (waitFor) {
-                    $inviteDiv.append(h('div', [
-                        h('i.fa.fa-spin.fa-spinner'),
-                        h('span', 'Scrypt...') // XXX
-                    ]));
-                    setTimeout(waitFor(), 150);
-                }).nThen(function (waitFor) {
-                    var salt = InviteInner.deriveSalt(pw, AppConfig.loginSalt);
-                    InviteInner.deriveBytes(seeds.scrypt, salt, waitFor(function (bytes) {
-                        bytes64 = bytes;
-                    }));
-                }).nThen(function (waitFor) {
-                    APP.module.execCommand('GET_LINK_DATA', {
-                        bytes64: bytes64,
-                        hash: hash,
-                        password: pw,
-                    }, waitFor(function () {
-                        $div.empty();
-                        // TODO
-                        // Accept/decline/decide later UI
-                    }));
-                });
-            };
-
-            $inviteDiv.append(button);
+            nThen(function (waitFor) {
+                $inviteDiv.append(h('div', [
+                    h('i.fa.fa-spin.fa-spinner'),
+                    h('span', 'Scrypt...') // XXX
+                ]));
+                setTimeout(waitFor(), 150);
+            }).nThen(function (waitFor) {
+                var salt = InviteInner.deriveSalt(pw, AppConfig.loginSalt);
+                InviteInner.deriveBytes(seeds.scrypt, salt, waitFor(function (bytes) {
+                    bytes64 = bytes;
+                }));
+            }).nThen(function (waitFor) {
+                APP.module.execCommand('GET_LINK_DATA', {
+                    bytes64: bytes64,
+                    hash: hash,
+                    password: pw,
+                }, waitFor(function () {
+                    $div.empty();
+                    // TODO
+                    // Accept/decline/decide later UI
+                }));
+            });
         };
 
         nThen(function (waitFor) {
@@ -1149,20 +1155,22 @@ define([
             if (!password) { return; }
 
             // If there is a password, display the password prompt
-            $inviteDiv.append(h('p', 'Please enter the invitation password to continue...')); // XXX
             var pwInput = UI.passwordInput();
-            var submitPw = h('button.btn.btn-secondary', Messages.password_submit);
-            $(submitPw).click(function () {
+            $(acceptButton).click(function () {
                 var val = $(pwInput).find('input').val();
                 if (!val) { return; }
                 process(val);
             });
-            $inviteDiv.append(pwInput);
-            $inviteDiv.append(submitPw);
+            $inviteDiv.prepend(h('div', [
+                h('p', 'Please enter the invitation password to continue...'),
+                pwInput
+            ])); // XXX
             waitFor.abort();
         }).nThen(function () {
             // No password, display the invitation proposal
-            process('');
+            $(acceptButton).click(function () {
+                process('');
+            });
         });
     });
 

From 43d30081e7a78f6df4d6502bb3c9adf091814fea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Tue, 17 Dec 2019 16:40:02 +0000
Subject: [PATCH 066/129] spacing of buttons in manage mute modal

---
 customize.dist/src/less2/include/messenger.less | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/customize.dist/src/less2/include/messenger.less b/customize.dist/src/less2/include/messenger.less
index 7f4f7c342..0215cd4bc 100644
--- a/customize.dist/src/less2/include/messenger.less
+++ b/customize.dist/src/less2/include/messenger.less
@@ -123,6 +123,19 @@
             }
         }
     }
+
+    .cp-contacts-muted-table {
+        .cp-contacts-muted-user {
+            margin-bottom: 5px;
+            .cp-avatar {
+                margin-right: 10px;
+            }
+            button {
+                margin-right: 0px;
+            }
+        }
+    }
+
     #cp-app-contacts-container.cp-app-contacts-inapp {
         #cp-app-contacts-friendlist {
             display: none;

From 03cf969c41d75e1d8564a1e7ee5ba86787262244 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Tue, 17 Dec 2019 16:50:00 +0000
Subject: [PATCH 067/129] remove hard-coded key

---
 www/common/messenger-ui.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/common/messenger-ui.js b/www/common/messenger-ui.js
index a132dcf00..7643939e5 100644
--- a/www/common/messenger-ui.js
+++ b/www/common/messenger-ui.js
@@ -72,7 +72,7 @@ define([
             h('div.cp-app-contacts-friends.cp-app-contacts-category', [
                 h('button.cp-app-contacts-muted-button',[
                     h('i.fa.fa-bell-slash'),
-                    Messages.contacts_manageMuted || 'MANAGE MUTED' // XXX
+                    Messages.contacts_manageMuted
                 ]), 
                 h('div.cp-app-contacts-category-content.cp-contacts-friends')
             ]),

From 215cabc05332a944ccd5328ded5c44b68f5f9e90 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 17 Dec 2019 17:57:07 +0100
Subject: [PATCH 068/129] Fix sidebar layout buttons in team drive

---
 customize.dist/src/less2/include/sidebar-layout.less |  2 +-
 www/profile/app-profile.less                         |  3 +--
 www/profile/inner.js                                 | 10 +++++-----
 www/teams/inner.js                                   |  3 ++-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/customize.dist/src/less2/include/sidebar-layout.less b/customize.dist/src/less2/include/sidebar-layout.less
index 42de195d0..1f9c92457 100644
--- a/customize.dist/src/less2/include/sidebar-layout.less
+++ b/customize.dist/src/less2/include/sidebar-layout.less
@@ -96,6 +96,7 @@
                     }
                 }
                 margin-bottom: 20px;
+            .buttons_main();
             }
             [type="text"], [type="password"], button {
                 vertical-align: middle;
@@ -121,7 +122,6 @@
             &>div {
                 margin: 10px 0;
             }
-            .buttons_main();
             button.btn {
                 margin: 0 5px 0 0;
             }
diff --git a/www/profile/app-profile.less b/www/profile/app-profile.less
index 9ec06de18..61b3bbbe6 100644
--- a/www/profile/app-profile.less
+++ b/www/profile/app-profile.less
@@ -140,8 +140,7 @@
     }
     .cp-app-profile-viewprofile-button {
         margin-bottom: 20px;
-        float: right;
-        margin-left: 5px;
+        width: 300px;
     }
     #cp-app-profile-description {
         position: relative;
diff --git a/www/profile/inner.js b/www/profile/inner.js
index e9c142777..a1d070313 100644
--- a/www/profile/inner.js
+++ b/www/profile/inner.js
@@ -286,7 +286,7 @@ define([
                 ]);
                 $(unmuteButton).click(function () {
                     module.execCommand('UNMUTE_USER', data.curvePublic, function (e) {
-                        if (e) { return void UI.warn(Messages.error); }
+                        if (e) { console.error(e); return void UI.warn(Messages.error); }
                         refreshMute(data);
                     });
                 }).appendTo($mute);
@@ -302,7 +302,7 @@ define([
                     name: data.displayName || data.name,
                     avatar: data.avatar
                 }, function (e) {
-                    if (e) { return void UI.warn(Messages.error); }
+                    if (e) { console.error(e); return void UI.warn(Messages.error); }
                     refreshMute(data);
                 });
             }).appendTo($mute);
@@ -383,7 +383,7 @@ define([
     };
 
     var addDescription = function ($container) {
-        var $block = $('<div>', {id: DESCRIPTION_ID}).appendTo($container);
+        var $block = $('<div>', {id: DESCRIPTION_ID, class:'cp-sidebarlayout-element'}).appendTo($container);
 
         APP.$description = $('<div>', {'class': 'cp-app-profile-description-rendered'}).appendTo($block);
         APP.$descriptionEdit = $();
@@ -469,7 +469,7 @@ define([
         APP.$container.find('#'+CREATE_ID).remove();
 
         if (!APP.initialized) {
-            var $header = $('<div>', {id: HEADER_ID}).appendTo(APP.$rightside);
+            var $header = $('<div>', {id: HEADER_ID, class:'cp-sidebarlayout-element'}).appendTo(APP.$rightside);
             addAvatar($header);
             var $rightside = $('<div>', {id: HEADER_RIGHT_ID}).appendTo($header);
             addDisplayName($rightside);
@@ -477,7 +477,7 @@ define([
             addFriendRequest($rightside);
             addMuteButton($rightside);
             addDescription(APP.$rightside);
-            addViewButton(APP.$rightside);
+            addViewButton($rightside);
             APP.initialized = true;
             createLeftside();
         }
diff --git a/www/teams/inner.js b/www/teams/inner.js
index 4ba4cf2f4..402c424e3 100644
--- a/www/teams/inner.js
+++ b/www/teams/inner.js
@@ -479,8 +479,9 @@ define([
         refreshCreate(common, cb);
     });
 
-    makeBlock('drive', function (common, cb) {
+    makeBlock('drive', function (common, cb, $div) {
         $('div.cp-team-drive').empty();
+        $div.removeClass('cp-sidebarlayout-element'); // Don't apply buttons and input styles from sidebarlayout
         var content = [
             h('div.cp-app-drive-container', {tabindex:0}, [
                 h('div#cp-app-drive-tree'),

From 89b5e303090721d56261db36c77da6f578770594 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Tue, 17 Dec 2019 19:27:39 -0500
Subject: [PATCH 069/129] more WIP

---
 www/common/cryptget.js         |  12 +-
 www/common/invitation.js       |  48 --------
 www/common/outer/invitation.js |  39 ++-----
 www/common/outer/team.js       | 195 ++++++++++++++++++++++++---------
 www/teams/inner.js             |  10 +-
 5 files changed, 170 insertions(+), 134 deletions(-)

diff --git a/www/common/cryptget.js b/www/common/cryptget.js
index 39c43f857..8a1684dba 100644
--- a/www/common/cryptget.js
+++ b/www/common/cryptget.js
@@ -29,8 +29,15 @@ define([
     };
 
     var makeConfig = function (hash, opt) {
+        var secret;
+        if (typeof(hash) === 'string') {
         // We can't use cryptget with a file or a user so we can use 'pad' as hash type
-        var secret = Hash.getSecrets('pad', hash, opt.password);
+            secret = Hash.getSecrets('pad', hash, opt.password);
+        } else if (typeof(hash) === 'object') {
+            // we may want to just supply options directly
+            // and this is the easiest place to do it
+            secret = hash;
+        }
         if (!secret.keys) { secret.keys = secret.key; } // support old hashses
         var config = {
             websocketURL: NetConfig.getWebsocketURL(opt.origin),
@@ -109,8 +116,9 @@ define([
 
             Realtime.whenRealtimeSyncs(realtime, function () {
                 clearTimeout(to);
+                var doc = realtime.getAuthDoc();
                 realtime.abort();
-                finish(Session, void 0);
+                finish(Session, void 0, doc);
             });
         };
         overwrite(config, opt);
diff --git a/www/common/invitation.js b/www/common/invitation.js
index cc85a7016..d54182dec 100644
--- a/www/common/invitation.js
+++ b/www/common/invitation.js
@@ -18,16 +18,6 @@ var factory = function (Hash, Util, Crypt, Nacl, Scrypt/*, Cred, nThen */) {
         };
     };
 
-    Invite.derivePreviewHash = function (seeds) {
-        return '#/2/invite/view/' +
-            Nacl.util.encodeBase64(seeds.preview.slice(0, 18)).replace('/', '-')
-            + '/';
-    };
-
-    Invite.derivePreviewSecrets = function (seeds) {
-        return Hash.getSecrets('pad', Invite.derivePreviewHash(seeds));
-    };
-
     Invite.deriveSalt = function (password, instance_salt) {
         return (password || '') + (instance_salt || '');
     };
@@ -44,44 +34,6 @@ var factory = function (Hash, Util, Crypt, Nacl, Scrypt/*, Cred, nThen */) {
             'base64'); // format, could be 'base64'
     };
 
-    Invite.getPreviewContent = function (seeds, cryptgetOpts, _cb) {
-        var cb = Util.once(Util.mkAsync(_cb));
-        // XXX test data
-        cb(void 0, {
-            author: {
-                displayName: 'Bob',
-                curvePublic: 'pewpewpew'
-            },
-            team: 'CryptPad',
-            message: 'Hello bob'
-        });
-        /*
-        var secrets = Invite.derivePreviewSecrets(seeds);
-        secrets = secrets;
-        */
-        var hash = Invite.derivePreviewHash(seeds);
-        Crypt.get(hash, function (err, val) {
-            if (err) { return void cb(err); }
-            if (!val) { return void cb('DELETED'); }
-            try {
-                cb(void 0, JSON.parse(val));
-            } catch (e) {
-                console.error(e);
-                cb(e);
-            }
-        }, cryptgetOpts);
-//        cb("NOT_IMPLEMENTED"); // XXX cryptget
-    };
-
-    // XXX remember to pin invites...
-    Invite.setPreviewContent = function (seeds, cb) {
-        var hash = Invite.derivePreviewHash(seeds);
-        Crypt.put(hash, '', function (err) { // value?
-            cb(err);
-        });
-        //cb = cb;
-    };
-
     return Invite;
 };
     if (typeof(module) !== 'undefined' && module.exports) {
diff --git a/www/common/outer/invitation.js b/www/common/outer/invitation.js
index 4b0844c7f..69afc5978 100644
--- a/www/common/outer/invitation.js
+++ b/www/common/outer/invitation.js
@@ -18,11 +18,19 @@ var factory = function (Util, Cred, nThen, Nacl) {
         };
     };
 
+    Invite.generateSignPair = function () {
+        var ed = Nacl.sign.keyPair();
+        return {
+            validateKey: encode64(ed.publicKey),
+            signKey: encode64(ed.secretKey),
+        };
+    };
+
     var b64ToChannelKeys = function (b64) {
         var dispense = Cred.dispenser(decode64(b64));
         return {
             channel: Util.uint8ArrayToHex(dispense(16)),
-            cryptKey: encode64(dispense(Nacl.secretbox.keyLength)),
+            cryptKey: dispense(Nacl.secretbox.keyLength),
         };
     };
 
@@ -36,35 +44,6 @@ var factory = function (Util, Cred, nThen, Nacl) {
     // derived from the link seed alone.
     Invite.derivePreviewKeys = b64ToChannelKeys;
 
-    // what the invite link alone will allow you to see
-    Invite.createPreviewContent = function (data, keys, cb) {
-        cb = cb;
-        /*  should include:
-        {
-            message: "", // personal message
-            author: "", // author public key
-            from: "", // author pretty name
-        }
-        */
-    };
-
-    // the remaining data available with the invite link + password
-    Invite.createInviteContent = function (data, keys, cb) {
-        cb = cb;
-        /*  should include:
-        {
-            teamData: {
-                // everything you need to join the team
-
-            },
-            ephemeral: {
-                curve: "", // for the roster
-                ed: "" // for deleting the preview content
-            }
-        }
-        */
-    };
-
     Invite.createRosterEntry = function (roster, data, cb) {
         var toInvite = {};
         toInvite[data.curvePublic] = data.content;
diff --git a/www/common/outer/team.js b/www/common/outer/team.js
index 966c30a53..b7d390539 100644
--- a/www/common/outer/team.js
+++ b/www/common/outer/team.js
@@ -11,6 +11,7 @@ define([
     '/common/common-messaging.js',
     '/common/common-feedback.js',
     '/common/outer/invitation.js',
+    '/common/cryptget.js',
 
     '/bower_components/chainpad-listmap/chainpad-listmap.js',
     '/bower_components/chainpad-crypto/crypto.js',
@@ -20,7 +21,7 @@ define([
     '/bower_components/saferphore/index.js',
     '/bower_components/tweetnacl/nacl-fast.min.js',
 ], function (Util, Hash, Constants, Realtime,
-             ProxyManager, UserObject, SF, Roster, Messaging, Feedback, Invite,
+             ProxyManager, UserObject, SF, Roster, Messaging, Feedback, Invite, Crypt,
              Listmap, Crypto, CpNetflux, ChainPad, nThen, Saferphore) {
     var Team = {};
 
@@ -1273,17 +1274,25 @@ define([
     var createInviteLink = function (ctx, data, cId, _cb) {
         var cb = Util.mkAsync(Util.once(_cb));
 
+        var teamId = data.teamId;
         var team = ctx.teams[data.teamId];
-
         var seeds = data.seeds; // {scrypt, preview}
         var bytes64 = data.bytes64;
 
-        team = team;
-        /*
         var roster = team.roster;
+
+        var teamName;
+        try {
+            teamName = roster.getState().metadata.name;
+        } catch (err) {
+            return void cb("TEAM_NAME_ERR");
+        }
+
+        var message = data.message;
         var name = data.name;
+
+        /*
         var password = data.password;
-        var msg = data.message;
         var hash = data.hash;
         */
 
@@ -1298,33 +1307,81 @@ define([
         var ephemeralKeys = Invite.generateKeys();
 
         nThen(function (w) {
-            w = w;
-            // XXX Invite.createPreviewContent
-            // XXX cryptput the preview content
-            /*  PUT
-                {
-                    message: data.message,
-                    // XXX authorName
-                    // XXX authorInfo {
-                        profile,
-                        etc,
+
+            var putOpts = {
+                initialState: '{}',
+                network: ctx.store.network,
+            };
+
+            (function () {
+                // a random signing keypair to prevent further writes to the channel
+                // we don't need to remember it cause we're only writing once
+                var sign = Invite.generateSignPair(); // { validateKey, signKey}
+
+                // visible with only the invite link
+                var previewContent = {
+                    teamName: teamName,
+                    message: message,
+                    author: Messaging.createData(ctx.store.proxy, false),
+                    displayName: name,
+                    curvePublic: ephemeralKeys.curvePublic,
+                };
+
+                var cryptput_config = {
+                    channel: previewKeys.channel,
+                    type: 'pad',
+                    version: 2,
+                    keys: { // what would normally be provided by getSecrets
+                        cryptKey: previewKeys.cryptKey,
+                        validateKey: sign.validateKey, // sent to historyKeeper
+                        signKey: sign.signKey, // b64EdPrivate
+                    },
+                };
+
+                Crypt.put(cryptput_config, JSON.stringify(previewContent), w(function (err /*, doc */) {
+                    if (err) {
+                        console.error("CRYPTPUT_ERR", err);
+                        w.abort();
+                        return void cb("SET_PREVIEW_CONTENT");
                     }
-                }
-                /// XXX callback if error
-            */
-
-            // Invite.createInviteContent
-            // XXX cryptput the secret team credentials
-            /* PUT
-                {
-                    ephemeralKeys.edPrivate,
-                    ephemeralKeys.curvePrivate,
-                    teamData: {
-                        ...
+                }), putOpts);
+            }());
+
+            (function () {
+                // a different random signing key so that the server can't correlate these documents
+                // as components of an invite
+                var sign = Invite.generateSignPair(); // { validateKey, signKey}
+
+                // available only with the link and the content
+                var inviteContent = {
+                    teamData: getInviteData(ctx, teamId, false),
+                    ephemeral: {
+                        edPublic: ephemeralKeys.edPublic,
+                        edPrivate: ephemeralKeys.edPrivate,
+                        curvePublic: ephemeralKeys.curvePublic,
+                        curvePrivate: ephemeralKeys.curvePrivate,
+                    },
+                };
+
+                var cryptput_config = {
+                    channel: previewKeys.channel,
+                    type: 'pad',
+                    version: 2,
+                    keys: {
+                        cryptKey: inviteKeys.cryptKey,
+                        validateKey: sign.validateKey,
+                        signKey: sign.signKey,
+                    },
+                };
+
+                Crypt.put(cryptput_config, JSON.stringify(inviteContent), w(function (err /*, doc */) {
+                    if (err) {
+                        console.error("CRYPTPUT_ERR", err);
+                        w.abort();
+                        return void cb("SET_PREVIEW_CONTENT");
                     }
-                }
-                /// XXX callback if error
-            */
+                }), putOpts);
+            }());
         }).nThen(function (w) {
             team.pin([inviteKeys.channel, previewKeys.channel], function (obj) {
                 if (obj && obj.error) { console.error(obj.error); }
@@ -1332,6 +1389,7 @@ define([
             Invite.createRosterEntry(team.roster, {
                 curvePublic: ephemeralKeys.curvePublic,
                 content: {
+                    curvePublic: ephemeralKeys.curvePublic,
                     displayName: data.name,
                     pending: true,
                     inviteChannel: inviteKeys.channel, // XXX keep this channel pinned until the invite is accepted
@@ -1352,27 +1410,64 @@ define([
         }).nThen(function () {
             // call back empty if everything worked
             cb();
-            /*
-            cb({
-                error: 'NOT_IMPLEMENTED'
-            });
-            */
         });
     };
 
-    // XXX ansuz
-    var getLinkData = function (ctx, data, cId, cb) {
-        /*
-        var password = data.password;
-        var hash = data.hash;
+    var getPreviewContent = function (ctx, data, cId, cb) {
+        var seeds = data.seeds;
+        var previewKeys;
+        try {
+            previewKeys = Invite.derivePreviewKeys(seeds.preview);
+        } catch (err) {
+            return void cb("INVALID_SEEDS");
+        }
+        Crypt.get({ // secrets
+            channel: previewKeys.channel,
+            type: 'pad',
+            version: 2,
+            keys: {
+                cryptKey: previewKeys.cryptKey,
+            },
+        }, function (err, val) {
+            if (err) { return void cb(err); }
+            if (!val) { return void cb('DELETED'); }
+
+            var json = Util.tryParse(val);
+            if (!json) { return void cb("parseError"); }
+            console.error("JSON", json);
+            cb(void 0, json);
+        }, { // cryptget opts
+            network: ctx.store.network,
+            initialState: '{}',
+        });
+    };
+
+    var getInviteContent = function (ctx, data, cId, cb) {
         var bytes64 = data.bytes64;
-        */
-        return void cb();
-        /*
-        cb({
-            error: 'NOT_IMPLEMENTED'
+        var previewKeys;
+        try {
+            previewKeys = Invite.deriveInviteKeys(bytes64);
+        } catch (err) {
+            return void cb("INVALID_SEEDS");
+        }
+        Crypt.get({ // secrets
+            channel: previewKeys.channel,
+            type: 'pad',
+            version: 2,
+            keys: {
+                cryptKey: previewKeys.cryptKey,
+            },
+        }, function (err, val) {
+            if (err) { return void cb(err); }
+            if (!val) { return void cb('DELETED'); }
+
+            var json = Util.tryParse(val);
+            if (!json) { return void cb("parseError"); }
+            cb(void 0, json);
+        }, { // cryptget opts
+            network: ctx.store.network,
+            initialState: '{}',
         });
-        */
     };
 
 
@@ -1532,10 +1627,12 @@ define([
             if (cmd === 'CREATE_INVITE_LINK') {
                 return void createInviteLink(ctx, data, clientId, cb);
             }
-            if (cmd === 'GET_LINK_DATA') {
-                return void getLinkData(ctx, data, clientId, cb);
+            if (cmd === 'GET_INVITE_CONTENT') {
+                return void getInviteContent(ctx, data, clientId, cb);
+            }
+            if (cmd === 'GET_PREVIEW_CONTENT') {
+                return void getPreviewContent(ctx, data, clientId, cb);
             }
-            // XXX ansuz
         };
 
         return team;
diff --git a/www/teams/inner.js b/www/teams/inner.js
index de1e466c1..4fea2b25a 100644
--- a/www/teams/inner.js
+++ b/www/teams/inner.js
@@ -1091,7 +1091,7 @@ define([
                     bytes64 = bytes;
                 }));
             }).nThen(function (waitFor) {
-                APP.module.execCommand('GET_LINK_DATA', {
+                APP.module.execCommand('GET_INVITE_CONTENT', {
                     bytes64: bytes64,
                     hash: hash,
                     password: pw,
@@ -1104,10 +1104,11 @@ define([
         };
 
         nThen(function (waitFor) {
-            InviteInner.getPreviewContent(seeds, {
-                origin: privateData.origin
+            APP.module.execCommand("GET_PREVIEW_CONTENT", {
+                seeds: seeds,
             }, waitFor(function (err, json) {
-                if (err) {
+                if (err) { // XXX this is failing with "team is disabled"
+                    // XXX APP.module is not ready yet?
                     // err === DELETED: different message?
                     $(errorBlock).text('ERROR'+err).show(); // XXX
                     waitFor.abort();
@@ -1115,7 +1116,6 @@ define([
                     return;
                     // XXX handle errors
                 }
-                json = json; // XXX {message: "", author: "", ???}
                 $div.empty();
                 $div.append(h('div.cp-teams-invite-from', [
                     'From', // XXX

From fc651747ca6665b16165d0496d3221e755686771 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 18 Dec 2019 10:38:26 +0100
Subject: [PATCH 070/129] Fix error message not displayed when creating a
 invitation link

---
 www/common/common-ui-elements.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 053059a55..d14545368 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1641,6 +1641,7 @@ define([
         var dismissButton = h('span.fa.fa-times');
         var linkContent = h('div.cp-share-modal', [
             h('p', Messages.team_inviteLinkTitle ), // XXX
+            linkError = h('div.alert.alert-danger.cp-teams-invite-alert', {style : 'display: none;'}),
             linkForm = h('div.cp-teams-invite-form', [
                 linkName = h('input', {
                     placeholder:  Messages.team_inviteLinkTempName // XXX
@@ -1677,7 +1678,6 @@ define([
             }, h('textarea', {
                 readonly: 'readonly'
             })),
-            linkError = h('div.alert.alert-danger.cp-teams-invite-alert', {style : 'display: none;'}),
             linkWarning = h('div.cp-teams-invite-alert.alert.alert-warning.dismissable', {
                 style: "display: none;"
             }, [
@@ -1735,14 +1735,14 @@ define([
                     hash: hash,
                     teamId: config.teamId,
                     seeds: seeds,
-                }, waitFor(function (obj) {
-                    if (obj && obj.error) {
+                }, waitFor(function (error) {
+                    if (error) {
                         waitFor.abort(); 
                         $(linkSpin).hide();
                         $(linkForm).show(); // XXX DB: check this is the right place to put things back 
                         $nav.find('button.cp-teams-invite-create').show();
                         $nav.find('button.cp-teams-invite-copy').hide();
-                        return void $(linkError).text(Messages.team_inviteLinkError+obj.error).show(); // XXX
+                        return void $(linkError).text(Messages.team_inviteLinkError+error).show(); // XXX
                     }
                     // Display result here
                     $(linkSpin).hide();

From 3d1b3b5d18d6d15a9ea5ab8a9e9e870a2a5e20f1 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 18 Dec 2019 10:52:20 +0100
Subject: [PATCH 071/129] Fix RPC data

---
 www/common/common-ui-elements.js |  6 +++---
 www/common/outer/team.js         | 26 +++++++++++++-------------
 www/teams/inner.js               | 25 +++++++++++++++++++------
 3 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index d14545368..f61c0a641 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1735,14 +1735,14 @@ define([
                     hash: hash,
                     teamId: config.teamId,
                     seeds: seeds,
-                }, waitFor(function (error) {
-                    if (error) {
+                }, waitFor(function (obj) {
+                    if (obj && obj.error) {
                         waitFor.abort(); 
                         $(linkSpin).hide();
                         $(linkForm).show(); // XXX DB: check this is the right place to put things back 
                         $nav.find('button.cp-teams-invite-create').show();
                         $nav.find('button.cp-teams-invite-copy').hide();
-                        return void $(linkError).text(Messages.team_inviteLinkError+error).show(); // XXX
+                        return void $(linkError).text(Messages.team_inviteLinkError+obj.error).show(); // XXX
                     }
                     // Display result here
                     $(linkSpin).hide();
diff --git a/www/common/outer/team.js b/www/common/outer/team.js
index b7d390539..b91e678a1 100644
--- a/www/common/outer/team.js
+++ b/www/common/outer/team.js
@@ -1285,7 +1285,7 @@ define([
         try {
             teamName = roster.getState().metadata.name;
         } catch (err) {
-            return void cb("TEAM_NAME_ERR");
+            return void cb({ error: "TEAM_NAME_ERR" });
         }
 
         var message = data.message;
@@ -1342,7 +1342,7 @@ define([
                     if (err) {
                         console.error("CRYPTPUT_ERR", err);
                         w.abort();
-                        return void cb("SET_PREVIEW_CONTENT");
+                        return void cb({ error: "SET_PREVIEW_CONTENT" });
                     }
                 }), putOpts);
             }());
@@ -1378,7 +1378,7 @@ define([
                     if (err) {
                         console.error("CRYPTPUT_ERR", err);
                         w.abort();
-                        return void cb("SET_PREVIEW_CONTENT");
+                        return void cb({ error: "SET_PREVIEW_CONTENT" });
                     }
                 }), putOpts);
             }());
@@ -1419,7 +1419,7 @@ define([
         try {
             previewKeys = Invite.derivePreviewKeys(seeds.preview);
         } catch (err) {
-            return void cb("INVALID_SEEDS");
+            return void cb({ error: "INVALID_SEEDS" });
         }
         Crypt.get({ // secrets
             channel: previewKeys.channel,
@@ -1429,13 +1429,13 @@ define([
                 cryptKey: previewKeys.cryptKey,
             },
         }, function (err, val) {
-            if (err) { return void cb(err); }
-            if (!val) { return void cb('DELETED'); }
+            if (err) { return void cb({ error: err }); }
+            if (!val) { return void cb({ error: 'DELETED' }); }
 
             var json = Util.tryParse(val);
-            if (!json) { return void cb("parseError"); }
+            if (!json) { return void cb({ error: "parseError" }); }
             console.error("JSON", json);
-            cb(void 0, json);
+            cb(json);
         }, { // cryptget opts
             network: ctx.store.network,
             initialState: '{}',
@@ -1448,7 +1448,7 @@ define([
         try {
             previewKeys = Invite.deriveInviteKeys(bytes64);
         } catch (err) {
-            return void cb("INVALID_SEEDS");
+            return void cb({ error: "INVALID_SEEDS" });
         }
         Crypt.get({ // secrets
             channel: previewKeys.channel,
@@ -1458,12 +1458,12 @@ define([
                 cryptKey: previewKeys.cryptKey,
             },
         }, function (err, val) {
-            if (err) { return void cb(err); }
-            if (!val) { return void cb('DELETED'); }
+            if (err) { return void cb({error: err}); }
+            if (!val) { return void cb({error: 'DELETED'}); }
 
             var json = Util.tryParse(val);
-            if (!json) { return void cb("parseError"); }
-            cb(void 0, json);
+            if (!json) { return void cb({error: "parseError"}); }
+            cb(json);
         }, { // cryptget opts
             network: ctx.store.network,
             initialState: '{}',
diff --git a/www/teams/inner.js b/www/teams/inner.js
index 4fea2b25a..902fa403b 100644
--- a/www/teams/inner.js
+++ b/www/teams/inner.js
@@ -1079,11 +1079,15 @@ define([
             var bytes64;
 
 
+            var spinnerText;
+            var $spinner;
+            var inviteContent;
             nThen(function (waitFor) {
                 $inviteDiv.append(h('div', [
                     h('i.fa.fa-spin.fa-spinner'),
-                    h('span', 'Scrypt...') // XXX
+                    spinnerText = h('span', 'Scrypt...') // XXX
                 ]));
+                $spinner = $(spinnerText);
                 setTimeout(waitFor(), 150);
             }).nThen(function (waitFor) {
                 var salt = InviteInner.deriveSalt(pw, AppConfig.loginSalt);
@@ -1091,26 +1095,35 @@ define([
                     bytes64 = bytes;
                 }));
             }).nThen(function (waitFor) {
+                $spinner.text('get team data'); // XXX
                 APP.module.execCommand('GET_INVITE_CONTENT', {
                     bytes64: bytes64,
                     hash: hash,
                     password: pw,
-                }, waitFor(function () {
-                    $div.empty();
+                }, waitFor(function (obj) {
+                    if (obj && obj.error) {
+                        // Wrong password or other error...
+                        // XXX if DELETED, password prompt again?
+                        console.error(obj.error);
+                        waitFor.abort();
+                        return;
+                    }
+                    inviteContent = obj;
                     // TODO
                     // Accept/decline/decide later UI
                 }));
+            }).nThen(function (waitFor) {
             });
         };
 
         nThen(function (waitFor) {
             APP.module.execCommand("GET_PREVIEW_CONTENT", {
                 seeds: seeds,
-            }, waitFor(function (err, json) {
-                if (err) { // XXX this is failing with "team is disabled"
+            }, waitFor(function (json) {
+                if (json && jsoN.error) { // XXX this is failing with "team is disabled"
                     // XXX APP.module is not ready yet?
                     // err === DELETED: different message?
-                    $(errorBlock).text('ERROR'+err).show(); // XXX
+                    $(errorBlock).text('ERROR'+json.error).show(); // XXX
                     waitFor.abort();
                     $div.empty();
                     return;

From 3c9199ed42cd7c0feae032575ff248effb04e35e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Wed, 18 Dec 2019 10:35:21 +0000
Subject: [PATCH 072/129] UI for invite accept page

---
 www/teams/app-team.less | 30 ++++++++++++++++++++++++++++++
 www/teams/inner.js      |  8 +++-----
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/www/teams/app-team.less b/www/teams/app-team.less
index a032288d1..06d47f4b6 100644
--- a/www/teams/app-team.less
+++ b/www/teams/app-team.less
@@ -3,6 +3,7 @@
 @import (reference) '../../customize/src/less2/include/messenger.less';
 @import (reference) '../../customize/src/less2/include/sidebar-layout.less';
 @import (reference) "../../customize/src/less2/include/tools.less";
+@import (reference) "../../customize/src/less2/include/colortheme.less";
 
 
 &.cp-app-team {
@@ -188,6 +189,35 @@
                 }
             }
         }
+        .cp-team-link {
+            max-width: 550px;
+            .cp-teams-invite-from {
+                display: flex;
+                margin-bottom: 20px;
+                .cp-teams-invite-from-author {
+                    display: flex;
+                    margin-left: 10px;
+                    .cp-teams-invite-from-avatar { 
+                        .avatar_main(25px);
+                        margin-right: 5px;
+                    }
+                }
+            }
+            .cp-teams-invite-message {
+                background-color: fade(@colortheme_logo-2, 25%);
+                color: @cryptpad_text_col;
+                resize: none;
+                width: 100%;
+                padding: 12px;
+                margin-bottom: 20px;
+            }
+            .cp-teams-invite-password {
+                margin-bottom: 20px;
+            }
+            i.fa.fa-spin.fa-spinner {
+                margin-right: 10px;
+            }
+        }
     }
 
     #cp-teams-roster-dialog {
diff --git a/www/teams/inner.js b/www/teams/inner.js
index de1e466c1..511981a29 100644
--- a/www/teams/inner.js
+++ b/www/teams/inner.js
@@ -1118,13 +1118,11 @@ define([
                 json = json; // XXX {message: "", author: "", ???}
                 $div.empty();
                 $div.append(h('div.cp-teams-invite-from', [
-                    'From', // XXX
+                    'From: ', // XXX
                     displayUser(common, json.author)
                 ]));
                 $div.append(UI.setHTML(h('p.cp-teams-invite-to'), 'Bob has invited you to join the team <b>CryptPad</b>')); // XXX
-                $div.append(h('div.cp-teams-invite-message', [
-                    UI.dialog.selectableArea(json.message || '')
-                ]));
+                $div.append(h('div.cp-teams-invite-message', json.message || ''));
             }));
         }).nThen(function (waitFor) {
             // If you're logged in, move on to the next nThen
@@ -1161,7 +1159,7 @@ define([
                 if (!val) { return; }
                 process(val);
             });
-            $inviteDiv.prepend(h('div', [
+            $inviteDiv.prepend(h('div.cp-teams-invite-password', [
                 h('p', 'Please enter the invitation password to continue...'),
                 pwInput
             ])); // XXX

From 400b39d46ab24810a2cf163ca9444cf97bc7109c Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 18 Dec 2019 11:35:39 +0100
Subject: [PATCH 073/129] Join a team from a link

---
 www/common/cryptget.js     |  2 +-
 www/common/outer/roster.js |  1 +
 www/common/outer/team.js   | 49 ++++++++++++++++++++++++++++++++++----
 www/teams/inner.js         | 16 +++++++++----
 4 files changed, 58 insertions(+), 10 deletions(-)

diff --git a/www/common/cryptget.js b/www/common/cryptget.js
index 8a1684dba..37fc069a5 100644
--- a/www/common/cryptget.js
+++ b/www/common/cryptget.js
@@ -112,7 +112,7 @@ define([
 
             var to = setTimeout(function () {
                 cb(new Error("Timeout"));
-            }, 5000);
+            }, 15000);
 
             Realtime.whenRealtimeSyncs(realtime, function () {
                 clearTimeout(to);
diff --git a/www/common/outer/roster.js b/www/common/outer/roster.js
index 6a1def6b9..8755bbd79 100644
--- a/www/common/outer/roster.js
+++ b/www/common/outer/roster.js
@@ -451,6 +451,7 @@ var factory = function (Util, Hash, CPNetflux, Sortify, nThen, Crypto) {
 
         // copy the new profile from the old one
         members[curve] = Util.clone(members[author]);
+        members[curve].curvePublic = curve;
         // and erase the old one
         delete members[author];
         return true;
diff --git a/www/common/outer/team.js b/www/common/outer/team.js
index b91e678a1..f4aee284a 100644
--- a/www/common/outer/team.js
+++ b/www/common/outer/team.js
@@ -446,6 +446,7 @@ define([
                 // If we've been kicked, don't try to update our data, we'll close everything
                 // in the next nThen part
                 var state = roster.getState();
+                console.error(state);
                 var me = Util.find(ctx, ['store', 'proxy', 'curvePublic']);
                 if (!state.members[me]) { return; }
 
@@ -1364,7 +1365,7 @@ define([
                 };
 
                 var cryptput_config = {
-                    channel: previewKeys.channel,
+                    channel: inviteKeys.channel,
                     type: 'pad',
                     version: 2,
                     keys: {
@@ -1470,6 +1471,46 @@ define([
         });
     };
 
+    var acceptLinkInvitation = function (ctx, data, cId, cb) {
+        var inviteContent;
+        nThen(function (waitFor) {
+            getInviteContent(ctx, data, cId, waitFor(function (obj) {
+                if (obj && obj.error) {
+                    waitFor.abort();
+                    return void cb(obj);
+                }
+                inviteContent = obj;
+            }));
+        }).nThen(function (waitFor) {
+            var rosterData = Util.find(inviteContent, ['teamData', 'keys', 'roster']);
+            var myKeys = inviteContent.ephemeral;
+            var rosterKeys = Crypto.Team.deriveMemberKeys(rosterData.edit, myKeys);
+            Roster.create({
+                network: ctx.store.network,
+                channel: rosterData.channel,
+                keys: rosterKeys,
+                anon_rpc: ctx.store.anon_rpc,
+                lastKnownHash: rosterData.lastKnownHash, // XXX Can we trust this user?
+            }, waitFor(function (err, roster) {
+                if (err) {
+                    waitFor.abort();
+                    console.error(err);
+                    return void cb({error: 'ROSTER_ERROR'});
+                }
+                var myData = Messaging.createData(ctx.store.proxy, false);
+                roster.accept(myData.curvePublic, waitFor(function (err) {
+                    if (err) {
+                        waitFor.abort();
+                        console.error(err);
+                        return void cb({error: 'ACCEPT_ERROR'});
+                    }
+                    roster.stop();
+                }));
+            }));
+        }).nThen(function () {
+            joinTeam(ctx, inviteContent.teamData, cId, cb)
+        });
+    };
 
     Team.init = function (cfg, waitFor, emit) {
         var team = {};
@@ -1627,12 +1668,12 @@ define([
             if (cmd === 'CREATE_INVITE_LINK') {
                 return void createInviteLink(ctx, data, clientId, cb);
             }
-            if (cmd === 'GET_INVITE_CONTENT') {
-                return void getInviteContent(ctx, data, clientId, cb);
-            }
             if (cmd === 'GET_PREVIEW_CONTENT') {
                 return void getPreviewContent(ctx, data, clientId, cb);
             }
+            if (cmd === 'ACCEPT_LINK_INVITATION') {
+                return void acceptLinkInvitation(ctx, data, clientId, cb);
+            }
         };
 
         return team;
diff --git a/www/teams/inner.js b/www/teams/inner.js
index 902fa403b..9e35b1416 100644
--- a/www/teams/inner.js
+++ b/www/teams/inner.js
@@ -1096,7 +1096,7 @@ define([
                 }));
             }).nThen(function (waitFor) {
                 $spinner.text('get team data'); // XXX
-                APP.module.execCommand('GET_INVITE_CONTENT', {
+                APP.module.execCommand('ACCEPT_LINK_INVITATION', {
                     bytes64: bytes64,
                     hash: hash,
                     password: pw,
@@ -1108,19 +1108,25 @@ define([
                         waitFor.abort();
                         return;
                     }
-                    inviteContent = obj;
-                    // TODO
-                    // Accept/decline/decide later UI
+                    // No error: join successful!
+                    var $div = $('div.cp-team-list').empty();
+                    refreshList(common, function (content) {
+                        $div.append(content);
+                        $('div.cp-team-cat-list').click();
+                        // XXX REMOVE INVITATION TAB
+                    });
+
                 }));
             }).nThen(function (waitFor) {
             });
         };
 
         nThen(function (waitFor) {
+            // XXX XXX Check number of teams first!
             APP.module.execCommand("GET_PREVIEW_CONTENT", {
                 seeds: seeds,
             }, waitFor(function (json) {
-                if (json && jsoN.error) { // XXX this is failing with "team is disabled"
+                if (json && json.error) { // XXX this is failing with "team is disabled"
                     // XXX APP.module is not ready yet?
                     // err === DELETED: different message?
                     $(errorBlock).text('ERROR'+json.error).show(); // XXX

From a5f88c505dc549a37db083f162a663e741449034 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 18 Dec 2019 11:37:17 +0100
Subject: [PATCH 074/129] lint compliance

---
 www/common/outer/team.js | 2 +-
 www/teams/inner.js       | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/www/common/outer/team.js b/www/common/outer/team.js
index f4aee284a..81f1f88b0 100644
--- a/www/common/outer/team.js
+++ b/www/common/outer/team.js
@@ -1508,7 +1508,7 @@ define([
                 }));
             }));
         }).nThen(function () {
-            joinTeam(ctx, inviteContent.teamData, cId, cb)
+            joinTeam(ctx, inviteContent.teamData, cId, cb);
         });
     };
 
diff --git a/www/teams/inner.js b/www/teams/inner.js
index 9e35b1416..2b5953d21 100644
--- a/www/teams/inner.js
+++ b/www/teams/inner.js
@@ -1081,7 +1081,6 @@ define([
 
             var spinnerText;
             var $spinner;
-            var inviteContent;
             nThen(function (waitFor) {
                 $inviteDiv.append(h('div', [
                     h('i.fa.fa-spin.fa-spinner'),
@@ -1117,7 +1116,6 @@ define([
                     });
 
                 }));
-            }).nThen(function (waitFor) {
             });
         };
 

From b58901e229769bb94fa220b5b9845506a372ba18 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 18 Dec 2019 12:04:36 +0100
Subject: [PATCH 075/129] Fix link generation

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

diff --git a/www/common/cryptget.js b/www/common/cryptget.js
index 37fc069a5..b03d756e1 100644
--- a/www/common/cryptget.js
+++ b/www/common/cryptget.js
@@ -102,7 +102,7 @@ define([
         opt = opt || {};
 
         var config = makeConfig(hash, opt);
-        var Session = { cb: cb, };
+        var Session = { cb: cb, hasNetwork: Boolean(opt.network) };
 
         config.onReady = function (info) {
             var realtime = Session.session = info.realtime;

From fc8ee58cfb9469ef3d4dc992de61a8a2bb3a6549 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 18 Dec 2019 12:09:37 +0100
Subject: [PATCH 076/129] Fix joinTeam undefined data

---
 www/common/outer/team.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/www/common/outer/team.js b/www/common/outer/team.js
index 81f1f88b0..81fe1b82f 100644
--- a/www/common/outer/team.js
+++ b/www/common/outer/team.js
@@ -1474,6 +1474,7 @@ define([
     var acceptLinkInvitation = function (ctx, data, cId, cb) {
         var inviteContent;
         nThen(function (waitFor) {
+            // Get team keys and ephemeral keys
             getInviteContent(ctx, data, cId, waitFor(function (obj) {
                 if (obj && obj.error) {
                     waitFor.abort();
@@ -1482,6 +1483,7 @@ define([
                 inviteContent = obj;
             }));
         }).nThen(function (waitFor) {
+            // Accept the roster invitation: relplace our ephemeral keys with our user keys
             var rosterData = Util.find(inviteContent, ['teamData', 'keys', 'roster']);
             var myKeys = inviteContent.ephemeral;
             var rosterKeys = Crypto.Team.deriveMemberKeys(rosterData.edit, myKeys);
@@ -1508,7 +1510,10 @@ define([
                 }));
             }));
         }).nThen(function () {
-            joinTeam(ctx, inviteContent.teamData, cId, cb);
+            // Add the team to our list and join...
+            joinTeam(ctx, {
+                team: inviteContent.teamData
+            }, cId, cb);
         });
     };
 

From 404f5fb4da9f61c94c395b8a8fe2ae22b2dc8a50 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 18 Dec 2019 12:29:39 +0100
Subject: [PATCH 077/129] Handle max teams slots with link invitation

---
 www/teams/inner.js | 46 +++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 41 insertions(+), 5 deletions(-)

diff --git a/www/teams/inner.js b/www/teams/inner.js
index 50f4ca3c3..7379ab6cf 100644
--- a/www/teams/inner.js
+++ b/www/teams/inner.js
@@ -435,7 +435,7 @@ define([
             }, isOwner ? Messages.team_maxOwner : Messages._getKey('team_maxTeams', [MAX_TEAMS_SLOTS]));
         };
 
-        if (Object.keys(privateData.teams || {}).length >= 3 || isOwner) {
+        if (Object.keys(privateData.teams || {}).length >= Constants.MAX_TEAMS_SLOTS || isOwner) {
             content.push(getWarningBox());
             return void cb(content);
         }
@@ -478,6 +478,12 @@ define([
                     $spinner.hide();
                     $('div.cp-team-cat-list').click();
                 });
+                var $divLink = $('div.cp-team-link').empty();
+                if ($divLink.length) {
+                    refreshLink(common, function (content) {
+                        $divLink.append(content);
+                    });
+                }
             });
         });
         cb(content);
@@ -1043,23 +1049,33 @@ define([
         ]);
     };
 
-    makeBlock('link', function (common, cb) {
+    var refreshLink = function (common, cb) {
         var privateData = common.getMetadataMgr().getPrivateData();
         var hash = privateData.teamInviteHash;
         var hashData = Hash.parseTypeHash('invite', hash);
         var password = hashData.password;
         var seeds = InviteInner.deriveSeeds(hashData.key);
 
+        if (Object.keys(privateData.teams || {}).length >= Constants.MAX_TEAMS_SLOTS) {
+            return void cb([
+                h('div.alert.alert-danger', {
+                    role: 'alert'
+                }, Messages._getKey('team_maxTeams', [Constants.MAX_TEAMS_SLOTS]))
+            ]);
+        }
+
         var div = h('div', [
             h('i.fa.fa-spin.fa-spinner')
         ]);
         var $div = $(div);
         var errorBlock;
-        cb([
+        var c = [
             h('h2', 'Team invitation'), // XXX
             errorBlock = h('div.alert.alert-danger', {style: 'display: none;'}),
             div
-        ]);
+        ];
+        cb(c);
+
         var declineButton = h('button.btn.btn-danger', Messages.friendRequest_decline);
         var acceptButton = h('button.btn.btn-primary', 'JOIN TEAM'); // XXX
         var inviteDiv = h('div', [
@@ -1112,8 +1128,18 @@ define([
                     refreshList(common, function (content) {
                         $div.append(content);
                         $('div.cp-team-cat-list').click();
-                        // XXX REMOVE INVITATION TAB
+                        var $divLink = $('div.cp-team-link').empty();
+                        if ($divLink.length) {
+                            $divLink.remove();
+                            $('div.cp-team-cat-link').remove();
+                        }
                     });
+                    var $divCreate = $('div.cp-team-create');
+                    if ($divCreate.length) {
+                        refreshCreate(common, function (content) {
+                            $divCreate.empty().append(content);
+                        });
+                    }
 
                 }));
             });
@@ -1187,6 +1213,10 @@ define([
                 process('');
             });
         });
+        return c;
+    };
+    makeBlock('link', function (common, cb) {
+        refreshLink(common, cb);
     });
 
     var redrawTeam = function (common) {
@@ -1306,6 +1336,12 @@ define([
                         $div.empty().append(content);
                     });
                 }
+                var $divLink = $('div.cp-team-link').empty();
+                if ($divLink.length) {
+                    refreshLink(common, function (content) {
+                        $divLink.append(content);
+                    });
+                }
                 var $divCreate = $('div.cp-team-create');
                 if ($divCreate.length) {
                     refreshCreate(common, function (content) {

From efa56e5fbca172e7f3fa40842ee4fccaa3ca2e73 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 18 Dec 2019 12:32:13 +0100
Subject: [PATCH 078/129] lint compliance

---
 www/teams/inner.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/www/teams/inner.js b/www/teams/inner.js
index 7379ab6cf..040d7ffeb 100644
--- a/www/teams/inner.js
+++ b/www/teams/inner.js
@@ -420,6 +420,7 @@ define([
         refreshList(common, cb);
     });
 
+    var refreshLink = function () {}; // placeholder
     var refreshCreate = function (common, cb) {
         var metadataMgr = common.getMetadataMgr();
         var privateData = metadataMgr.getPrivateData();
@@ -1049,7 +1050,7 @@ define([
         ]);
     };
 
-    var refreshLink = function (common, cb) {
+    refreshLink = function (common, cb) {
         var privateData = common.getMetadataMgr().getPrivateData();
         var hash = privateData.teamInviteHash;
         var hashData = Hash.parseTypeHash('invite', hash);

From 8eed376274aac7a388755e1f30d125a6f652908e Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 18 Dec 2019 12:42:24 +0100
Subject: [PATCH 079/129] Fix default category after joining a team

---
 www/common/common-ui-elements.js | 2 +-
 www/teams/inner.js               | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index f61c0a641..c1c8bf2b1 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1701,7 +1701,7 @@ define([
             var $nav = $linkContent.closest('.alertify').find('nav');
             $(linkError).text('').hide();
             var name = $(linkName).val();
-            var pw = $(linkPassword).val();
+            var pw = $(linkPassword).find('input').val();
             var msg = $(linkMessage).val();
             var hash = Hash.createRandomHash('invite', pw);
             var hashData = Hash.parseTypeHash('invite', hash);
diff --git a/www/teams/inner.js b/www/teams/inner.js
index 040d7ffeb..a00c035b7 100644
--- a/www/teams/inner.js
+++ b/www/teams/inner.js
@@ -184,7 +184,7 @@ define([
         var $categories = $('<div>', {'class': 'cp-sidebarlayout-categories'})
                             .appendTo(APP.$leftside);
 
-        var hash = common.getMetadataMgr().getPrivateData().teamInviteHash;
+        var hash = common.getMetadataMgr().getPrivateData().teamInviteHash && mainCategories.link;
 
         var categories = team ? teamCategories : mainCategories;
         var active = team ? 'drive' : (hash ? 'link' : 'list');
@@ -1051,6 +1051,7 @@ define([
     };
 
     refreshLink = function (common, cb) {
+        if (!mainCategories.link) { return; }
         var privateData = common.getMetadataMgr().getPrivateData();
         var hash = privateData.teamInviteHash;
         var hashData = Hash.parseTypeHash('invite', hash);
@@ -1133,6 +1134,7 @@ define([
                         if ($divLink.length) {
                             $divLink.remove();
                             $('div.cp-team-cat-link').remove();
+                            delete mainCategories.link;
                         }
                     });
                     var $divCreate = $('div.cp-team-create');

From a817242fe5a8f58c0a6d6ec2ef26ee189be661bf Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 18 Dec 2019 13:05:01 +0100
Subject: [PATCH 080/129] Fix join team for anon users

---
 www/common/cryptpad-common.js     |  5 +++++
 www/common/outer/async-store.js   |  6 ++++++
 www/common/outer/store-rpc.js     |  2 ++
 www/common/outer/team.js          |  4 ++++
 www/common/sframe-common-outer.js |  4 ++++
 www/teams/inner.js                | 14 ++++++++++++--
 6 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js
index 40db70457..c869967af 100644
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -779,6 +779,11 @@ define([
         postMessage("SEND_FRIEND_REQUEST", data, cb);
     };
 
+    // Team
+    common.anonGetPreviewContent = function (data, cb) {
+        postMessage("ANON_GET_PREVIEW_CONTENT", data, cb);
+    };
+
     // Onlyoffice
     var onlyoffice = common.onlyoffice = {};
     onlyoffice.execCommand = function (data, cb) {
diff --git a/www/common/outer/async-store.js b/www/common/outer/async-store.js
index c5b6f6a42..870a539e7 100644
--- a/www/common/outer/async-store.js
+++ b/www/common/outer/async-store.js
@@ -1273,6 +1273,12 @@ define([
             });
         };
 
+        Store.anonGetPreviewContent = function (clientId, data, cb) {
+            Team.anonGetPreviewContent({
+                store: store
+            }, data, cb);
+        };
+
         // Get hashes for the share button
         // If we can find a stronger hash
         Store.getStrongerHash = function (clientId, data, _cb) {
diff --git a/www/common/outer/store-rpc.js b/www/common/outer/store-rpc.js
index 12b5ff6e5..49250582f 100644
--- a/www/common/outer/store-rpc.js
+++ b/www/common/outer/store-rpc.js
@@ -60,6 +60,8 @@ define([
             // Messaging
             ANSWER_FRIEND_REQUEST: Store.answerFriendRequest,
             SEND_FRIEND_REQUEST: Store.sendFriendRequest,
+            // Team invitation
+            ANON_GET_PREVIEW_CONTENT: Store.anonGetPreviewContent,
             // OnlyOffice
             OO_COMMAND: Store.onlyoffice.execCommand,
             // Cursor
diff --git a/www/common/outer/team.js b/www/common/outer/team.js
index 81fe1b82f..f70fcbf36 100644
--- a/www/common/outer/team.js
+++ b/www/common/outer/team.js
@@ -1684,6 +1684,10 @@ define([
         return team;
     };
 
+    Team.anonGetPreviewContent = function (cfg, data, cb) {
+        getPreviewContent(cfg, data, null, cb);
+    };
+
     return Team;
 });
 
diff --git a/www/common/sframe-common-outer.js b/www/common/sframe-common-outer.js
index 82b9bf2e7..05cafbdec 100644
--- a/www/common/sframe-common-outer.js
+++ b/www/common/sframe-common-outer.js
@@ -675,6 +675,10 @@ define([
                 Cryptpad.messaging.answerFriendRequest(data, cb);
             });
 
+            sframeChan.on('Q_ANON_GET_PREVIEW_CONTENT', function (data, cb) {
+                Cryptpad.anonGetPreviewContent(data, cb);
+            });
+
             // History
             sframeChan.on('Q_GET_FULL_HISTORY', function (data, cb) {
                 var crypto = Crypto.createEncryptor(secret.keys);
diff --git a/www/teams/inner.js b/www/teams/inner.js
index a00c035b7..35fd8a9fb 100644
--- a/www/teams/inner.js
+++ b/www/teams/inner.js
@@ -1149,8 +1149,18 @@ define([
         };
 
         nThen(function (waitFor) {
-            // XXX XXX Check number of teams first!
-            APP.module.execCommand("GET_PREVIEW_CONTENT", {
+            // Get preview content.
+            // Use the team module if we're logged in, or sframeChan if we're not
+            var f = function (data, cb) {
+                if (driveAPP.loggedIn) {
+                    return void APP.module.execCommand('GET_PREVIEW_CONTENT', data, cb);
+                }
+                var sframeChan = common.getSframeChannel();
+                sframeChan.query('Q_ANON_GET_PREVIEW_CONTENT', data, function (err, json) {
+                    cb(json);
+                });
+            };
+            f({
                 seeds: seeds,
             }, waitFor(function (json) {
                 if (json && json.error) { // XXX this is failing with "team is disabled"

From f5482667461b808bab637d68d31917c0631f7ddc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Wed, 18 Dec 2019 12:57:43 +0000
Subject: [PATCH 081/129] add translation keys

---
 www/teams/app-team.less |  2 +-
 www/teams/inner.js      | 28 ++++++++++++++++------------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/www/teams/app-team.less b/www/teams/app-team.less
index 06d47f4b6..f4323041b 100644
--- a/www/teams/app-team.less
+++ b/www/teams/app-team.less
@@ -199,7 +199,7 @@
                     margin-left: 10px;
                     .cp-teams-invite-from-avatar { 
                         .avatar_main(25px);
-                        margin-right: 5px;
+                        margin: 0px 5px;
                     }
                 }
             }
diff --git a/www/teams/inner.js b/www/teams/inner.js
index 35fd8a9fb..dc16e0b30 100644
--- a/www/teams/inner.js
+++ b/www/teams/inner.js
@@ -1072,14 +1072,14 @@ define([
         var $div = $(div);
         var errorBlock;
         var c = [
-            h('h2', 'Team invitation'), // XXX
+            h('h2', Messages.team_inviteTitle || 'Team invitation'), // XXX
             errorBlock = h('div.alert.alert-danger', {style: 'display: none;'}),
             div
         ];
         cb(c);
 
         var declineButton = h('button.btn.btn-danger', Messages.friendRequest_decline);
-        var acceptButton = h('button.btn.btn-primary', 'JOIN TEAM'); // XXX
+        var acceptButton = h('button.btn.btn-primary', Messages.team_inviteJoin || 'JOIN TEAM'); // XXX
         var inviteDiv = h('div', [
             h('nav', [
                 declineButton,
@@ -1102,7 +1102,7 @@ define([
             nThen(function (waitFor) {
                 $inviteDiv.append(h('div', [
                     h('i.fa.fa-spin.fa-spinner'),
-                    spinnerText = h('span', 'Scrypt...') // XXX
+                    spinnerText = h('span', Messages.team_invitePasswordLoading || 'Scrypt...') // XXX
                 ]));
                 $spinner = $(spinnerText);
                 setTimeout(waitFor(), 150);
@@ -1112,7 +1112,7 @@ define([
                     bytes64 = bytes;
                 }));
             }).nThen(function (waitFor) {
-                $spinner.text('get team data'); // XXX
+                $spinner.text(Messages.team_inviteGetData || 'get team data'); // XXX
                 APP.module.execCommand('ACCEPT_LINK_INVITATION', {
                     bytes64: bytes64,
                     hash: hash,
@@ -1166,7 +1166,7 @@ define([
                 if (json && json.error) { // XXX this is failing with "team is disabled"
                     // XXX APP.module is not ready yet?
                     // err === DELETED: different message?
-                    $(errorBlock).text('ERROR'+json.error).show(); // XXX
+                    $(errorBlock).text(Messages.error + json.error).show(); // XXX
                     waitFor.abort();
                     $div.empty();
                     return;
@@ -1174,11 +1174,15 @@ define([
                 }
                 $div.empty();
                 $div.append(h('div.cp-teams-invite-from', [
-                    'From: ', // XXX
+                    Messages.team_inviteFrom || 'From:', // XXX
                     displayUser(common, json.author)
-                ]));
-                $div.append(UI.setHTML(h('p.cp-teams-invite-to'), 'Bob has invited you to join the team <b>CryptPad</b>')); // XXX
-                $div.append(h('div.cp-teams-invite-message', json.message || ''));
+                ]));                
+                $div.append(UI.setHTML(h('p.cp-teams-invite-to'),
+                    Messages._getKey('team_inviteFromMsg',
+                    [json.author.displayName, json.teamName]))); // XXX
+                if (json.message) {
+                    $div.append(h('div.cp-teams-invite-message', json.message));
+                }
             }));
         }).nThen(function (waitFor) {
             // If you're logged in, move on to the next nThen
@@ -1186,7 +1190,7 @@ define([
 
             // If you're not logged in, display the login buttons
             var anonLogin, anonRegister;
-            $div.append(h('p', 'Please log in or register to accept this invitation...')); // XXX
+            $div.append(h('p', Messages.team_invitePleaseLogin || 'Please log in or register to accept this invitation...')); // XXX
             $div.append(h('div', [
                 anonLogin = h('button.btn.btn-primary', Messages.login_login),
                 anonRegister = h('button.btn.btn-secondary', Messages.login_register),
@@ -1216,9 +1220,9 @@ define([
                 process(val);
             });
             $inviteDiv.prepend(h('div.cp-teams-invite-password', [
-                h('p', 'Please enter the invitation password to continue...'),
+                h('p', Messages.team_inviteEnterPassword || 'Please enter the invitation password to continue...'), // XXX
                 pwInput
-            ])); // XXX
+            ])); 
             waitFor.abort();
         }).nThen(function () {
             // No password, display the invitation proposal

From 091ffc607008209438867ac6b66e96a5f5dbaa65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Wed, 18 Dec 2019 13:08:15 +0000
Subject: [PATCH 082/129] fixHTML of user and team names in translation key

---
 www/teams/inner.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/www/teams/inner.js b/www/teams/inner.js
index dc16e0b30..f11a5e26b 100644
--- a/www/teams/inner.js
+++ b/www/teams/inner.js
@@ -1179,7 +1179,8 @@ define([
                 ]));                
                 $div.append(UI.setHTML(h('p.cp-teams-invite-to'),
                     Messages._getKey('team_inviteFromMsg',
-                    [json.author.displayName, json.teamName]))); // XXX
+                    [Util.fixHTML(json.author.displayName), 
+                    Util.fixHTML(json.teamName)]))); // XXX
                 if (json.message) {
                     $div.append(h('div.cp-teams-invite-message', json.message));
                 }

From 1dee40636589a2d548f2371ae9bf5d593576a5d2 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Wed, 18 Dec 2019 08:25:15 -0500
Subject: [PATCH 083/129] bump footer version

---
 customize.dist/pages.js | 2 +-
 package-lock.json       | 2 +-
 package.json            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/customize.dist/pages.js b/customize.dist/pages.js
index 0bb596ec8..281f213f6 100644
--- a/customize.dist/pages.js
+++ b/customize.dist/pages.js
@@ -103,7 +103,7 @@ define([
                     ])*/
                 ])
             ]),
-            h('div.cp-version-footer', "CryptPad v3.7.0 (HimalayanQuail)")
+            h('div.cp-version-footer', "CryptPad v3.8.0 (IsolobodonPortoricensis)")
         ]);
     };
 
diff --git a/package-lock.json b/package-lock.json
index 6643e22c7..08328fcb1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "cryptpad",
-  "version": "3.7.0",
+  "version": "3.8.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index ea1431153..835641d6b 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "cryptpad",
   "description": "realtime collaborative visual editor with zero knowlege server",
-  "version": "3.7.0",
+  "version": "3.8.0",
   "license": "AGPL-3.0+",
   "repository": {
     "type": "git",

From a34aad78ab14e719b0e167552bab20ab7a419162 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 18 Dec 2019 15:12:33 +0100
Subject: [PATCH 084/129] Remove duplicate code

---
 .../src/less2/include/modals-ui-elements.less          | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/customize.dist/src/less2/include/modals-ui-elements.less b/customize.dist/src/less2/include/modals-ui-elements.less
index 665345ad6..21707eab8 100644
--- a/customize.dist/src/less2/include/modals-ui-elements.less
+++ b/customize.dist/src/less2/include/modals-ui-elements.less
@@ -28,14 +28,4 @@
     .cp-app-prop-content {
         color: @cryptpad_text_col;
     }
-
-    .cp-contacts-muted-user {
-        margin-bottom: 5px;
-        .cp-avatar {
-            margin-right: 10px;
-        }
-        .button {
-            margin-right: 0px; // XXX 
-        }
-    }
 }

From 704d42d169ba1fe3cad4860a5ef79af04075522e Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 18 Dec 2019 16:08:22 +0100
Subject: [PATCH 085/129] Fix unsanitized name in profile

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

diff --git a/www/profile/inner.js b/www/profile/inner.js
index a1d070313..099a2d81b 100644
--- a/www/profile/inner.js
+++ b/www/profile/inner.js
@@ -232,7 +232,7 @@ define([
         // If this curve has sent us a friend request, we should not be able to sent it to them
         var friendRequests = common.getFriendRequests();
         if (friendRequests[data.curvePublic]) {
-            $button.append(Messages._getKey('friendRequest_received', [data.name || Messages.anonymous]))
+            $button.append(Messages._getKey('friendRequest_received', [name || Messages.anonymous]))
                 .click(function () {
                 UIElements.displayFriendRequestModal(common, friendRequests[data.curvePublic]);
             });

From 032186cc4cea08fa89450ae42dc4fc6fbf7f2d47 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 18 Dec 2019 16:15:33 +0100
Subject: [PATCH 086/129] Fix unsanitized name in profile again

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

diff --git a/www/profile/inner.js b/www/profile/inner.js
index 099a2d81b..a37991ad9 100644
--- a/www/profile/inner.js
+++ b/www/profile/inner.js
@@ -299,7 +299,7 @@ define([
             $(muteButton).click(function () {
                 module.execCommand('MUTE_USER', {
                     curvePublic: data.curvePublic,
-                    name: data.displayName || data.name,
+                    name: Util.fixHTML(data.displayName || data.name),
                     avatar: data.avatar
                 }, function (e) {
                     if (e) { console.error(e); return void UI.warn(Messages.error); }

From 7db7db262c47f92e542bf9578fb66ad631dd2bea Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 18 Dec 2019 16:36:06 +0100
Subject: [PATCH 087/129] Fix 'enter' key in team invite modal

---
 www/common/common-ui-elements.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 42ee58f93..f91621805 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1685,6 +1685,11 @@ define([
                 dismissButton
             ]) // XXX
         ]);
+        $(linkMessage).keydown(function (e) {
+            if (e.which === 13) {
+                e.stopPropagation();
+            }
+        });
         var localStore = window.cryptpadStore;
         localStore.get('hide-alert-teamInvite', function (val) {
             if (val === '1') { return; }
@@ -1763,7 +1768,7 @@ define([
             onClick: function () {
                 return process();
             },
-            keys: [13]
+            keys: []
         }, {
             className: 'primary cp-teams-invite-copy',
             name: Messages.team_inviteLinkCopy, // XXX

From 1826d05e31f7b27fadc5e9ccab23bd789669f6dd Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 18 Dec 2019 16:58:02 +0100
Subject: [PATCH 088/129] Keep cloned data when accepting team invitation

---
 www/common/outer/roster.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/www/common/outer/roster.js b/www/common/outer/roster.js
index 8755bbd79..6a1def6b9 100644
--- a/www/common/outer/roster.js
+++ b/www/common/outer/roster.js
@@ -451,7 +451,6 @@ var factory = function (Util, Hash, CPNetflux, Sortify, nThen, Crypto) {
 
         // copy the new profile from the old one
         members[curve] = Util.clone(members[author]);
-        members[curve].curvePublic = curve;
         // and erase the old one
         delete members[author];
         return true;

From 32fd1b4971107468f3b042a047922f4efbbb9c63 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 18 Dec 2019 16:59:17 +0100
Subject: [PATCH 089/129] remove debugging console.error

---
 www/common/outer/roster.js | 1 -
 www/common/outer/team.js   | 1 -
 2 files changed, 2 deletions(-)

diff --git a/www/common/outer/roster.js b/www/common/outer/roster.js
index 6a1def6b9..214d1ff9b 100644
--- a/www/common/outer/roster.js
+++ b/www/common/outer/roster.js
@@ -775,7 +775,6 @@ var factory = function (Util, Hash, CPNetflux, Sortify, nThen, Crypto) {
             Object.keys(data).forEach(function (curve) {
                 if (!isValidId(curve) || isMap(ref.state.members[curve])) { return delete data[curve]; }
             });
-console.error('SENDING INVITE');
 
             send(['INVITE', data], cb);
         };
diff --git a/www/common/outer/team.js b/www/common/outer/team.js
index f70fcbf36..588bd9965 100644
--- a/www/common/outer/team.js
+++ b/www/common/outer/team.js
@@ -446,7 +446,6 @@ define([
                 // If we've been kicked, don't try to update our data, we'll close everything
                 // in the next nThen part
                 var state = roster.getState();
-                console.error(state);
                 var me = Util.find(ctx, ['store', 'proxy', 'curvePublic']);
                 if (!state.members[me]) { return; }
 

From 97f322753a8c385705448b2e391b7d3f29e4588b Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 18 Dec 2019 17:12:29 +0100
Subject: [PATCH 090/129] Add owners to invitation channels

---
 www/common/outer/team.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/www/common/outer/team.js b/www/common/outer/team.js
index 588bd9965..09e2cb52d 100644
--- a/www/common/outer/team.js
+++ b/www/common/outer/team.js
@@ -1279,6 +1279,8 @@ define([
         var seeds = data.seeds; // {scrypt, preview}
         var bytes64 = data.bytes64;
 
+        if (!teamId || !team) { return void cb({error: 'EINVAL'}); }
+
         var roster = team.roster;
 
         var teamName;
@@ -1311,12 +1313,16 @@ define([
             var putOpts = {
                 initialState: '{}',
                 network: ctx.store.network,
+                metadata: {
+                    owners: [ctx.store.proxy.edPublic, ephemeralKeys.edPublic]
+                }
             };
 
             (function () {
                 // a random signing keypair to prevent further writes to the channel
                 // we don't need to remember it cause we're only writing once
                 var sign = Invite.generateSignPair(); // { validateKey, signKey}
+                putOpts.metadata.validateKey = sign.validateKey;
 
                 // visible with only the invite link
                 var previewContent = {
@@ -1324,7 +1330,6 @@ define([
                     message: message,
                     author: Messaging.createData(ctx.store.proxy, false),
                     displayName: name,
-                    curvePublic: ephemeralKeys.curvePublic,
                 };
 
                 var cryptput_config = {
@@ -1351,6 +1356,7 @@ define([
                 // a different random signing key so that the server can't correlate these documents
                 // as components of an invite
                 var sign = Invite.generateSignPair(); // { validateKey, signKey}
+                putOpts.metadata.validateKey = sign.validateKey;
 
                 // available only with the link and the content
                 var inviteContent = {

From 6945628cf171c32a94bf732a714715300f8190bf Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 18 Dec 2019 17:45:57 +0100
Subject: [PATCH 091/129] handle error in team outer

---
 www/common/outer/team.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/www/common/outer/team.js b/www/common/outer/team.js
index 09e2cb52d..7c67b22f6 100644
--- a/www/common/outer/team.js
+++ b/www/common/outer/team.js
@@ -1491,13 +1491,16 @@ define([
             // Accept the roster invitation: relplace our ephemeral keys with our user keys
             var rosterData = Util.find(inviteContent, ['teamData', 'keys', 'roster']);
             var myKeys = inviteContent.ephemeral;
+            if (!rosterData || !myKeys) {
+                waitFor.abort();
+                return void cb({error: 'INVALID_INVITE_CONTENT'});
+            }
             var rosterKeys = Crypto.Team.deriveMemberKeys(rosterData.edit, myKeys);
             Roster.create({
                 network: ctx.store.network,
                 channel: rosterData.channel,
                 keys: rosterKeys,
                 anon_rpc: ctx.store.anon_rpc,
-                lastKnownHash: rosterData.lastKnownHash, // XXX Can we trust this user?
             }, waitFor(function (err, roster) {
                 if (err) {
                     waitFor.abort();

From 7008c716054d89783dcd270ad594a1df97ef360c Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 18 Dec 2019 17:46:04 +0100
Subject: [PATCH 092/129] Clean teams inner code

---
 www/teams/inner.js | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/www/teams/inner.js b/www/teams/inner.js
index 3441fe029..18b17551d 100644
--- a/www/teams/inner.js
+++ b/www/teams/inner.js
@@ -779,7 +779,6 @@ define([
         var links = Object.keys(roster).filter(function (k) {
             if (!roster[k].pending) { return; }
             if (!roster[k].inviteChannel) { return; }
-            roster[k].curvePublic = k; // XXX "if (!data.curvePublic) { return; }" in makeMember
             return roster[k].role === "VIEWER" || !roster[k].role;
         }).map(function (k) {
             return makeMember(common, roster[k], me);
@@ -1077,9 +1076,13 @@ define([
             errorBlock = h('div.alert.alert-danger', {style: 'display: none;'}),
             div
         ];
+        // "cb" will put the content into the UI.
+        // We're displaying a spinner while we're cryptgetting the preview content
         cb(c);
 
-        var declineButton = h('button.btn.btn-danger', Messages.friendRequest_decline);
+        var declineButton = h('button.btn.btn-danger', {
+            style: 'display: none;'
+        }, Messages.friendRequest_decline);
         var acceptButton = h('button.btn.btn-primary', Messages.team_inviteJoin || 'JOIN TEAM'); // XXX
         var inviteDiv = h('div', [
             h('nav', [
@@ -1151,19 +1154,8 @@ define([
 
         nThen(function (waitFor) {
             // Get preview content.
-            // Use the team module if we're logged in, or sframeChan if we're not
-            var f = function (data, cb) {
-                if (driveAPP.loggedIn) {
-                    return void APP.module.execCommand('GET_PREVIEW_CONTENT', data, cb);
-                }
-                var sframeChan = common.getSframeChannel();
-                sframeChan.query('Q_ANON_GET_PREVIEW_CONTENT', data, function (err, json) {
-                    cb(json);
-                });
-            };
-            f({
-                seeds: seeds,
-            }, waitFor(function (json) {
+            var sframeChan = common.getSframeChannel();
+            sframeChan.query('Q_ANON_GET_PREVIEW_CONTENT', { seeds: seeds }, waitFor(function (json) {
                 if (json && json.error) { // XXX this is failing with "team is disabled"
                     // XXX APP.module is not ready yet?
                     // err === DELETED: different message?

From 663a1138b425da3f4ec0f00c5e5fe9ab909c3a73 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Wed, 18 Dec 2019 12:01:58 -0500
Subject: [PATCH 093/129] trim leading spaces from domains

---
 server.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server.js b/server.js
index ca98795f2..c47c4e450 100644
--- a/server.js
+++ b/server.js
@@ -214,7 +214,7 @@ app.get('/api/config', function(req, res){
             // FIXME don't send websocketURL if websocketPath is provided. deprecated.
             websocketURL:'ws' + ((useSecureWebsockets) ? 's' : '') + '://' + host + ':' +
                 websocketPort + '/cryptpad_websocket',
-            httpUnsafeOrigin: config.httpUnsafeOrigin.replace(/^ /, ''),
+            httpUnsafeOrigin: config.httpUnsafeOrigin.replace(/^\s*/, ''),
             adminEmail: config.adminEmail,
             adminKeys: admins,
             inactiveTime: config.inactiveTime,

From 6111f1dc365ee90e96cd09542486ddd7b0e9d91f Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Wed, 18 Dec 2019 17:02:23 +0000
Subject: [PATCH 094/129] Translated using Weblate (English)

Currently translated at 100.0% (1182 of 1182 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1181 of 1181 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1180 of 1180 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1179 of 1179 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1178 of 1178 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1177 of 1177 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1176 of 1176 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1175 of 1175 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1174 of 1174 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1174 of 1174 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1173 of 1173 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
---
 www/common/translations/messages.json | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/www/common/translations/messages.json b/www/common/translations/messages.json
index 4dfb5143b..136c89bad 100644
--- a/www/common/translations/messages.json
+++ b/www/common/translations/messages.json
@@ -1267,7 +1267,18 @@
     "team_inviteLinkNoteMsg": "This message will be shown before the recipient decides whether to join this team.",
     "team_inviteLinkLoading": "Generating your link",
     "team_inviteLinkWarning": "The first person to access this link will be able to join this team and view its contents. Share it carefully.",
-    "team_inviteLinkErrorName": "Please give this invitation a name",
-    "team_inviteLinkCreate": "CREATE LINK",
-    "team_inviteLinkCopy": "COPY LINK"
+    "team_inviteLinkErrorName": "Please add a name for the person you're inviting. They can change it later. ",
+    "team_inviteLinkCreate": "Create link",
+    "team_inviteLinkCopy": "Copy link",
+    "Messages": {
+        "team_inviteFrom": "From:"
+    },
+    "team_inviteFromMsg": "{0} has invited you to join the team <b>{1}</b>",
+    "team_invitePleaseLogin": "Please log in or register to accept this invitation.",
+    "team_inviteEnterPassword": "Please enter the invitation password to continue.",
+    "team_invitePasswordLoading": "Decrypting invitation",
+    "team_inviteJoin": "Join team",
+    "team_inviteTitle": "Team invitation",
+    "team_inviteGetData": "Getting team data",
+    "team_cat_link": "Invitation Link"
 }

From 3a8b7783d5df5e2345c467e4b0bc9a460831980b Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Wed, 18 Dec 2019 17:02:23 +0000
Subject: [PATCH 095/129] Translated using Weblate (French)

Currently translated at 100.0% (1182 of 1182 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/

Translated using Weblate (French)

Currently translated at 100.0% (1173 of 1173 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/

Translated using Weblate (French)

Currently translated at 100.0% (1173 of 1173 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
---
 www/common/translations/messages.fr.json | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/www/common/translations/messages.fr.json b/www/common/translations/messages.fr.json
index aa8065bee..9b182c1cc 100644
--- a/www/common/translations/messages.fr.json
+++ b/www/common/translations/messages.fr.json
@@ -1262,12 +1262,23 @@
     "contacts_muteInfo": "Vous ne receverez plus de notifications ou de messages si vous masquez ce compte.<br>L'utilisateur ne sera pas informé que vous l'avez masqué. ",
     "team_inviteLinkTitle": "Créer une invitation personnalisée à cette équipe",
     "team_inviteLinkTempName": "Nom temporaire (apparaît dans la liste des invitations en cours)",
-    "team_inviteLinkSetPassword": "Protégez le lien avec un mot de passe (recommandé)",
-    "team_inviteLinkNote": "Ajoutez un message personnalisé",
+    "team_inviteLinkSetPassword": "Protéger le lien avec un mot de passe (recommandé)",
+    "team_inviteLinkNote": "Ajouter un message personnalisé",
     "team_inviteLinkNoteMsg": "Ce message sera affiché avant que le destinataire décide de rejoindre cette équipe.",
     "team_inviteLinkLoading": "Lien en cours de création",
     "team_inviteLinkWarning": "La première personne qui accédera à ce lien pourra devenir membre de l'équipe et voir son contenu. Partagez le avec prudence.",
-    "team_inviteLinkErrorName": "Merci de donner un nom à cette invitation",
-    "team_inviteLinkCreate": "CRÉER LIEN",
-    "team_inviteLinkCopy": "COPIER LIEN"
+    "team_inviteLinkErrorName": "Merci de remplir un nom de la personne que vous invitez. Ce nom pourra être changé . ",
+    "team_inviteLinkCreate": "Créer le lien",
+    "team_inviteLinkCopy": "Copier le lien",
+    "Messages": {
+        "team_inviteFrom": "De :"
+    },
+    "team_inviteFromMsg": "{0} vous a invité à rejoindre l'équipe <b>{1}</b>",
+    "team_invitePleaseLogin": "Merci de vous inscrire ou de vous connecter pour accepter cette invitation.",
+    "team_inviteEnterPassword": "Entrez le mot de passe pour continuer.",
+    "team_invitePasswordLoading": "Déchiffrement de l'invitation",
+    "team_inviteJoin": "Rejoindre l'équipe",
+    "team_inviteTitle": "Invitation à une équipe",
+    "team_inviteGetData": "Obtention des données de l'équipe",
+    "team_cat_link": "Invitation"
 }

From fc2f8ff01e7f3992865829adeb0eb5c1f4320b37 Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Wed, 18 Dec 2019 17:02:23 +0000
Subject: [PATCH 096/129] Translated using Weblate (German)

Currently translated at 100.0% (1173 of 1173 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
---
 www/common/translations/messages.de.json | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/www/common/translations/messages.de.json b/www/common/translations/messages.de.json
index 8eba3e0f7..000e4cf53 100644
--- a/www/common/translations/messages.de.json
+++ b/www/common/translations/messages.de.json
@@ -1255,9 +1255,19 @@
     "share_noContactsLoggedIn": "Du hast noch keine Kontakte bei CryptPad. Teile den Link zu deinem Profil, damit andere dir Kontaktanfragen senden können.",
     "share_copyProfileLink": "Profil-Link kopieren",
     "share_noContactsNotLoggedIn": "Logge dich ein oder registriere dich, um deine Kontakte zu sehen und neue hinzuzufügen.",
-    "contacts_mute": "",
-    "contacts_unmute": "",
-    "contacts_manageMuted": "",
-    "contacts_mutedUsers": "",
-    "contacts_muteInfo": ""
+    "contacts_mute": "Stummschalten",
+    "contacts_unmute": "Stummschaltung aufheben",
+    "contacts_manageMuted": "Stummschaltungen verwalten",
+    "contacts_mutedUsers": "Stummgeschaltete Accounts",
+    "contacts_muteInfo": "Du erhältst keine Benachrichtigungen oder Mitteilungen von stummgeschalteten Nutzern.<br>Sie werden nicht erfahren, dass du sie stummgeschaltet hast. ",
+    "team_inviteLinkTitle": "Erstelle eine personalisierte Einladung für dieses Team",
+    "team_inviteLinkTempName": "Vorläufiger Name (sichtbar in der Liste ausstehender Einladungen)",
+    "team_inviteLinkSetPassword": "Link mit einem Passwort schützen (empfohlen)",
+    "team_inviteLinkNote": "Persönliche Nachricht hinzufügen",
+    "team_inviteLinkNoteMsg": "Diese Nachricht wird angezeigt, bevor der Empfänger entscheidet, ob er diesem Team beitreten möchte.",
+    "team_inviteLinkLoading": "Dein Link wird generiert",
+    "team_inviteLinkWarning": "Die erste Person, die auf diesen Link zugreift, kann diesem Team beitreten und dessen Inhalte einsehen. Teile ihn sorgfältig.",
+    "team_inviteLinkErrorName": "Bitte gib der Einladung einen Namen",
+    "team_inviteLinkCreate": "Link erstellen",
+    "team_inviteLinkCopy": "Link kopieren"
 }

From 90d8a7a6849929a6ded91e48c7038b8febedb1bc Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Wed, 18 Dec 2019 12:02:26 -0500
Subject: [PATCH 097/129] remove an unused dependency

---
 www/common/common-ui-elements.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index c1c8bf2b1..82cce9d10 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -16,7 +16,6 @@ define([
     '/bower_components/nthen/index.js',
     '/common/invitation.js',
 
-    '/bower_components/scrypt-async/scrypt-async.js',
     'css!/customize/fonts/cptools/style.css',
     '/bower_components/croppie/croppie.min.js',
     'css!/bower_components/croppie/croppie.css',

From f98543bb831efe73be6a6b8c926a58b7e74e60a4 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 18 Dec 2019 18:02:33 +0100
Subject: [PATCH 098/129] Add category icon for link invitation

---
 www/teams/inner.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/www/teams/inner.js b/www/teams/inner.js
index 18b17551d..6525f6f9e 100644
--- a/www/teams/inner.js
+++ b/www/teams/inner.js
@@ -217,6 +217,7 @@ define([
             if (key === 'chat') { $category.append($('<span>', {'class': 'fa fa-comments'})); }
             if (key === 'drive') { $category.append($('<span>', {'class': 'fa fa-hdd-o'})); }
             if (key === 'admin') { $category.append($('<span>', {'class': 'fa fa-cogs'})); }
+            if (key === 'link') { $category.append($('<span>', {'class': 'fa fa-envelope'})); }
 
             if (key === active) {
                 $category.addClass('cp-leftside-active');
@@ -1156,7 +1157,7 @@ define([
             // Get preview content.
             var sframeChan = common.getSframeChannel();
             sframeChan.query('Q_ANON_GET_PREVIEW_CONTENT', { seeds: seeds }, waitFor(function (json) {
-                if (json && json.error) { // XXX this is failing with "team is disabled"
+                if (json && json.error) {
                     // XXX APP.module is not ready yet?
                     // err === DELETED: different message?
                     $(errorBlock).text(Messages.error + json.error).show(); // XXX
@@ -1169,7 +1170,7 @@ define([
                 $div.append(h('div.cp-teams-invite-from', [
                     Messages.team_inviteFrom || 'From:', // XXX
                     displayUser(common, json.author)
-                ]));                
+                ]));
                 $div.append(UI.setHTML(h('p.cp-teams-invite-to'),
                     Messages._getKey('team_inviteFromMsg',
                     [Util.fixHTML(json.author.displayName), 

From 9824136917c2c5bf7c594d3e1cb2196459b6ef54 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Wed, 18 Dec 2019 12:02:42 -0500
Subject: [PATCH 099/129] fix a typo

---
 www/common/outer/roster.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/common/outer/roster.js b/www/common/outer/roster.js
index 8755bbd79..651efd30c 100644
--- a/www/common/outer/roster.js
+++ b/www/common/outer/roster.js
@@ -384,7 +384,7 @@ var factory = function (Util, Hash, CPNetflux, Sortify, nThen, Crypto) {
             }
             // reject commandws wehere the members are not proper objects
             if (!isMap(args[curve])) { throw new Error("INVALID_CONTENT"); }
-            if (members[curve]) { throw new Error("ARLEADY_PRESNET"); }
+            if (members[curve]) { throw new Error("ARLEADY_PRESENT"); }
 
             var data = args[curve];
             // if no role was provided, assume VIEWER

From 25b88afeea3512c1a084c1272e80d63757a1ea8d Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 18 Dec 2019 18:10:33 +0100
Subject: [PATCH 100/129] Fix invitation links

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

diff --git a/www/teams/inner.js b/www/teams/inner.js
index 6525f6f9e..06c739867 100644
--- a/www/teams/inner.js
+++ b/www/teams/inner.js
@@ -1156,7 +1156,7 @@ define([
         nThen(function (waitFor) {
             // Get preview content.
             var sframeChan = common.getSframeChannel();
-            sframeChan.query('Q_ANON_GET_PREVIEW_CONTENT', { seeds: seeds }, waitFor(function (json) {
+            sframeChan.query('Q_ANON_GET_PREVIEW_CONTENT', { seeds: seeds }, waitFor(function (err, json) {
                 if (json && json.error) {
                     // XXX APP.module is not ready yet?
                     // err === DELETED: different message?

From df4664f877a858974f52341895fe8616679ebc82 Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Wed, 18 Dec 2019 17:13:51 +0000
Subject: [PATCH 101/129] Translated using Weblate (English)

Currently translated at 100.0% (1183 of 1183 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
---
 www/common/translations/messages.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/www/common/translations/messages.json b/www/common/translations/messages.json
index 136c89bad..baf270782 100644
--- a/www/common/translations/messages.json
+++ b/www/common/translations/messages.json
@@ -1280,5 +1280,6 @@
     "team_inviteJoin": "Join team",
     "team_inviteTitle": "Team invitation",
     "team_inviteGetData": "Getting team data",
-    "team_cat_link": "Invitation Link"
+    "team_cat_link": "Invitation Link",
+    "team_links": "Invitation Links"
 }

From a6c5ba4013577d9b9fbc35733065fb666ab591a4 Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Wed, 18 Dec 2019 17:13:51 +0000
Subject: [PATCH 102/129] Translated using Weblate (French)

Currently translated at 100.0% (1183 of 1183 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
---
 www/common/translations/messages.fr.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/www/common/translations/messages.fr.json b/www/common/translations/messages.fr.json
index 9b182c1cc..5a2b057b5 100644
--- a/www/common/translations/messages.fr.json
+++ b/www/common/translations/messages.fr.json
@@ -1280,5 +1280,6 @@
     "team_inviteJoin": "Rejoindre l'équipe",
     "team_inviteTitle": "Invitation à une équipe",
     "team_inviteGetData": "Obtention des données de l'équipe",
-    "team_cat_link": "Invitation"
+    "team_cat_link": "Invitation",
+    "team_links": "Liens d'invitation"
 }

From 0b6539893bdc53ac8176a3381b4893778c3667d1 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 18 Dec 2019 18:17:05 +0100
Subject: [PATCH 103/129] Fix missing curvePublic

---
 www/teams/inner.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/www/teams/inner.js b/www/teams/inner.js
index 06c739867..ace3339a3 100644
--- a/www/teams/inner.js
+++ b/www/teams/inner.js
@@ -1041,8 +1041,6 @@ define([
 
     var displayUser = function (common, data) {
         var friends = common.getMetadataMgr().getPrivateData().friends;
-        var verified = false;
-        if (friends[data.curvePublic]) { verified = true; }
         var avatar = h('span.cp-teams-invite-from-avatar.cp-avatar');
         UIElements.displayAvatar(common, $(avatar), data.avatar, data.displayName);
         return h('div.cp-teams-invite-from-author', [

From b402b3c5528afaffa1798686057520e0004eb156 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 18 Dec 2019 18:25:44 +0100
Subject: [PATCH 104/129] Add wrong password handler

---
 www/teams/inner.js | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/www/teams/inner.js b/www/teams/inner.js
index ace3339a3..b5f330074 100644
--- a/www/teams/inner.js
+++ b/www/teams/inner.js
@@ -1040,7 +1040,6 @@ define([
     }, true);
 
     var displayUser = function (common, data) {
-        var friends = common.getMetadataMgr().getPrivateData().friends;
         var avatar = h('span.cp-teams-invite-from-avatar.cp-avatar');
         UIElements.displayAvatar(common, $(avatar), data.avatar, data.displayName);
         return h('div.cp-teams-invite-from-author', [
@@ -1049,7 +1048,7 @@ define([
         ]);
     };
 
-    refreshLink = function (common, cb) {
+    refreshLink = function (common, cb, wrongPassword) {
         if (!mainCategories.link) { return; }
         var privateData = common.getMetadataMgr().getPrivateData();
         var hash = privateData.teamInviteHash;
@@ -1072,7 +1071,9 @@ define([
         var errorBlock;
         var c = [
             h('h2', Messages.team_inviteTitle || 'Team invitation'), // XXX
-            errorBlock = h('div.alert.alert-danger', {style: 'display: none;'}),
+            errorBlock = h('div.alert.alert-danger',
+                                wrongPassword ? undefined : {style: 'display: none;'},
+                                wrongPassword ? Messages.drive_sfPasswordError : undefined),
             div
         ];
         // "cb" will put the content into the UI.
@@ -1126,6 +1127,15 @@ define([
                         // XXX if DELETED, password prompt again?
                         console.error(obj.error);
                         waitFor.abort();
+                        if (obj.error === 'INVALID_INVITE_CONTENT') {
+                            // Wrong password...
+                            var $divLink = $('div.cp-team-link').empty();
+                            if ($divLink.length) {
+                                refreshLink(common, function (content) {
+                                    $divLink.append(content);
+                                }, true);
+                            }
+                        }
                         return;
                     }
                     // No error: join successful!

From a518cbcce78b05b574caf3fa2905ae0ee17b47f8 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 18 Dec 2019 18:26:25 +0100
Subject: [PATCH 105/129] Fix translation keys

---
 www/common/translations/messages.fr.json | 4 +---
 www/common/translations/messages.json    | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/www/common/translations/messages.fr.json b/www/common/translations/messages.fr.json
index 5a2b057b5..7b2d80227 100644
--- a/www/common/translations/messages.fr.json
+++ b/www/common/translations/messages.fr.json
@@ -1270,9 +1270,7 @@
     "team_inviteLinkErrorName": "Merci de remplir un nom de la personne que vous invitez. Ce nom pourra être changé . ",
     "team_inviteLinkCreate": "Créer le lien",
     "team_inviteLinkCopy": "Copier le lien",
-    "Messages": {
-        "team_inviteFrom": "De :"
-    },
+    "team_inviteFrom": "De :",
     "team_inviteFromMsg": "{0} vous a invité à rejoindre l'équipe <b>{1}</b>",
     "team_invitePleaseLogin": "Merci de vous inscrire ou de vous connecter pour accepter cette invitation.",
     "team_inviteEnterPassword": "Entrez le mot de passe pour continuer.",
diff --git a/www/common/translations/messages.json b/www/common/translations/messages.json
index baf270782..1cb538700 100644
--- a/www/common/translations/messages.json
+++ b/www/common/translations/messages.json
@@ -1270,9 +1270,7 @@
     "team_inviteLinkErrorName": "Please add a name for the person you're inviting. They can change it later. ",
     "team_inviteLinkCreate": "Create link",
     "team_inviteLinkCopy": "Copy link",
-    "Messages": {
-        "team_inviteFrom": "From:"
-    },
+    "team_inviteFrom": "From:",
     "team_inviteFromMsg": "{0} has invited you to join the team <b>{1}</b>",
     "team_invitePleaseLogin": "Please log in or register to accept this invitation.",
     "team_inviteEnterPassword": "Please enter the invitation password to continue.",

From 186487cbdab5a14ba5649c3f3b4e7ebd8870ae22 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 18 Dec 2019 18:45:17 +0100
Subject: [PATCH 106/129] Fix cryptput issues

---
 www/common/outer/team.js | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/www/common/outer/team.js b/www/common/outer/team.js
index 7c67b22f6..b2ebf2f40 100644
--- a/www/common/outer/team.js
+++ b/www/common/outer/team.js
@@ -1310,18 +1310,18 @@ define([
 
         nThen(function (w) {
 
-            var putOpts = {
-                initialState: '{}',
-                network: ctx.store.network,
-                metadata: {
-                    owners: [ctx.store.proxy.edPublic, ephemeralKeys.edPublic]
-                }
-            };
 
             (function () {
                 // a random signing keypair to prevent further writes to the channel
                 // we don't need to remember it cause we're only writing once
                 var sign = Invite.generateSignPair(); // { validateKey, signKey}
+                var putOpts = {
+                    initialState: '{}',
+                    network: ctx.store.network,
+                    metadata: {
+                        owners: [ctx.store.proxy.edPublic, ephemeralKeys.edPublic]
+                    }
+                };
                 putOpts.metadata.validateKey = sign.validateKey;
 
                 // visible with only the invite link
@@ -1356,6 +1356,13 @@ define([
                 // a different random signing key so that the server can't correlate these documents
                 // as components of an invite
                 var sign = Invite.generateSignPair(); // { validateKey, signKey}
+                var putOpts = {
+                    initialState: '{}',
+                    network: ctx.store.network,
+                    metadata: {
+                        owners: [ctx.store.proxy.edPublic, ephemeralKeys.edPublic]
+                    }
+                };
                 putOpts.metadata.validateKey = sign.validateKey;
 
                 // available only with the link and the content

From 3cd93b1d527615f8963d0ed8a97044f8a87c667e Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 18 Dec 2019 18:47:08 +0100
Subject: [PATCH 107/129] Fix UI issue

---
 www/teams/app-team.less | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/www/teams/app-team.less b/www/teams/app-team.less
index f4323041b..e65f31279 100644
--- a/www/teams/app-team.less
+++ b/www/teams/app-team.less
@@ -139,6 +139,9 @@
         }
         .cp-team-roster {
             .avatar_main(50px);
+            .cp-hidden {
+                display: none;
+            }
             .cp-app-team-roster-header {
                 button:not(:last-child) {
                     margin-right: 5px;

From e0782d753d9451a664d6f64db61ddbe2f3e09ce3 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 18 Dec 2019 19:10:30 +0100
Subject: [PATCH 108/129] Fix conflicting curvePublic

---
 www/common/outer/team.js | 5 +++--
 www/teams/inner.js       | 6 ++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/www/common/outer/team.js b/www/common/outer/team.js
index b2ebf2f40..ea509d0a0 100644
--- a/www/common/outer/team.js
+++ b/www/common/outer/team.js
@@ -143,8 +143,8 @@ define([
         if (state.members) {
             Object.keys(state.members).forEach(function (curve) {
                 var m = state.members[curve];
-                if (m.inviteChannel) { list.push(m.inviteChannel); }
-                if (m.previewChannel) { list.push(m.previewChannel); }
+                if (m.inviteChannel && m.pending) { list.push(m.inviteChannel); }
+                if (m.previewChannel && m.pending) { list.push(m.previewChannel); }
             });
         }
 
@@ -1485,6 +1485,7 @@ define([
 
     var acceptLinkInvitation = function (ctx, data, cId, cb) {
         var inviteContent;
+        var rosterState;
         nThen(function (waitFor) {
             // Get team keys and ephemeral keys
             getInviteContent(ctx, data, cId, waitFor(function (obj) {
diff --git a/www/teams/inner.js b/www/teams/inner.js
index b5f330074..62ba0b718 100644
--- a/www/teams/inner.js
+++ b/www/teams/inner.js
@@ -748,24 +748,28 @@ define([
         var me = roster[userData.curvePublic] || {};
         var owner = Object.keys(roster).filter(function (k) {
             if (roster[k].pending) { return; }
+            roster[k].curvePublic = k;
             return roster[k].role === "OWNER" || roster[k].pendingOwner;
         }).map(function (k) {
             return makeMember(common, roster[k], me, roster);
         });
         var admins = Object.keys(roster).filter(function (k) {
             if (roster[k].pending) { return; }
+            roster[k].curvePublic = k;
             return roster[k].role === "ADMIN";
         }).map(function (k) {
             return makeMember(common, roster[k], me);
         });
         var members = Object.keys(roster).filter(function (k) {
             if (roster[k].pending) { return; }
+            roster[k].curvePublic = k;
             return roster[k].role === "MEMBER" || !roster[k].role;
         }).map(function (k) {
             return makeMember(common, roster[k], me);
         });
         var viewers = Object.keys(roster).filter(function (k) {
             if (roster[k].pending) { return; }
+            roster[k].curvePublic = k;
             return roster[k].role === "VIEWER";
         }).map(function (k) {
             return makeMember(common, roster[k], me);
@@ -773,6 +777,7 @@ define([
         var pending = Object.keys(roster).filter(function (k) {
             if (!roster[k].pending) { return; }
             if (roster[k].inviteChannel) { return; }
+            roster[k].curvePublic = k;
             return roster[k].role === "MEMBER" || roster[k].role === "VIEWER" || !roster[k].role;
         }).map(function (k) {
             return makeMember(common, roster[k], me);
@@ -780,6 +785,7 @@ define([
         var links = Object.keys(roster).filter(function (k) {
             if (!roster[k].pending) { return; }
             if (!roster[k].inviteChannel) { return; }
+            roster[k].curvePublic = k;
             return roster[k].role === "VIEWER" || !roster[k].role;
         }).map(function (k) {
             return makeMember(common, roster[k], me);

From 9ad2bf2bd6bc95e5c199c804a8454f79c460f6cc Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 18 Dec 2019 19:11:35 +0100
Subject: [PATCH 109/129] lint compliance

---
 www/common/outer/team.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/www/common/outer/team.js b/www/common/outer/team.js
index ea509d0a0..38bb83b4f 100644
--- a/www/common/outer/team.js
+++ b/www/common/outer/team.js
@@ -1485,7 +1485,6 @@ define([
 
     var acceptLinkInvitation = function (ctx, data, cId, cb) {
         var inviteContent;
-        var rosterState;
         nThen(function (waitFor) {
             // Get team keys and ephemeral keys
             getInviteContent(ctx, data, cId, waitFor(function (obj) {

From 167a846cf38072f670ad27784eea778a8534e662 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Wed, 18 Dec 2019 17:59:28 -0500
Subject: [PATCH 110/129] remove unused dependency

---
 www/common/outer/invitation.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/www/common/outer/invitation.js b/www/common/outer/invitation.js
index 69afc5978..603cae3c1 100644
--- a/www/common/outer/invitation.js
+++ b/www/common/outer/invitation.js
@@ -1,6 +1,5 @@
 (function () {
-var factory = function (Util, Cred, nThen, Nacl) {
-    nThen = nThen; // XXX
+var factory = function (Util, Cred, Nacl) {
     var Invite = {};
 
     var encode64 = Nacl.util.encodeBase64;
@@ -92,10 +91,9 @@ var factory = function (Util, Cred, nThen, Nacl) {
         define([
             '/common/common-util.js',
             '/common/common-credential.js',
-            '/bower_components/nthen/index.js',
             '/bower_components/tweetnacl/nacl-fast.min.js',
-        ], function (Util, Cred, nThen) {
-            return factory(Util, Cred, nThen, window.nacl);
+        ], function (Util, Cred) {
+            return factory(Util, Cred, window.nacl);
         });
     }
 }());

From ea7d254d2fddc39c26dbf35205c6b8dbd315715e Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Wed, 18 Dec 2019 18:00:27 -0500
Subject: [PATCH 111/129] remove XXX

---
 www/common/outer/team.js | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/www/common/outer/team.js b/www/common/outer/team.js
index 38bb83b4f..1c28da681 100644
--- a/www/common/outer/team.js
+++ b/www/common/outer/team.js
@@ -1270,7 +1270,6 @@ define([
         ctx.store.messenger.openTeamChat(team.getChatData(), onUpdate, cId, cb);
     };
 
-    // XXX ansuz
     var createInviteLink = function (ctx, data, cId, _cb) {
         var cb = Util.mkAsync(Util.once(_cb));
 
@@ -1405,14 +1404,8 @@ define([
                     curvePublic: ephemeralKeys.curvePublic,
                     displayName: data.name,
                     pending: true,
-                    inviteChannel: inviteKeys.channel, // XXX keep this channel pinned until the invite is accepted
-                    previewChannel: previewKeys.channel, // XXX keep this channel pinned until the invite is accepted
-
-                    // XXX encrypt the following data for your own curvePublic
-                    // XXX and implement UI for interacting with it
-                      // remind yourself of the password used
-                      // bypass scrypt with bytes64 to revover other keys
-                    // { password, bytes64, hash}
+                    inviteChannel: inviteKeys.channel,
+                    previewChannel: previewKeys.channel,
                 }
             }, w(function (err) {
                 if (err) {

From ceb7fc4f6659b05e09092450e8e222005c4ed27c Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Wed, 18 Dec 2019 18:18:14 -0500
Subject: [PATCH 112/129] remove XXX notes which have been addressed

---
 www/common/common-ui-elements.js | 26 +++++++++++++-------------
 www/common/invitation.js         | 10 +++-------
 www/teams/inner.js               | 20 +++++++++-----------
 3 files changed, 25 insertions(+), 31 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index fbdc8eb6c..5f4e0b9eb 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1639,30 +1639,30 @@ define([
         // Invite from link
         var dismissButton = h('span.fa.fa-times');
         var linkContent = h('div.cp-share-modal', [
-            h('p', Messages.team_inviteLinkTitle ), // XXX
+            h('p', Messages.team_inviteLinkTitle ),
             linkError = h('div.alert.alert-danger.cp-teams-invite-alert', {style : 'display: none;'}),
             linkForm = h('div.cp-teams-invite-form', [
                 linkName = h('input', {
-                    placeholder:  Messages.team_inviteLinkTempName // XXX
+                    placeholder:  Messages.team_inviteLinkTempName
                 }),
                 h('br'),
                 h('div.cp-teams-invite-block', [
-                    h('span', Messages.team_inviteLinkSetPassword), // XXX
+                    h('span', Messages.team_inviteLinkSetPassword),
                     h('a.cp-teams-help.fa.fa-question-circle', {
                         href: origin + '/faq.html#security-pad_password',
                         target: "_blank",
                         'data-tippy-placement': "right"
                     })
-                ]), // XXX
+                ]),
                 linkPassword = UI.passwordInput({
                     id: 'cp-teams-invite-password',
-                    placeholder: Messages.login_password // XXX
+                    placeholder: Messages.login_password
                 }),
                 h('div.cp-teams-invite-block',
-                    h('span', Messages.team_inviteLinkNote) // XXX
+                    h('span', Messages.team_inviteLinkNote)
                 ),
-                linkMessage = h('textarea.cp-teams-invite-message', { // XXX ansuz hitting enter submits...
-                    placeholder: Messages.team_inviteLinkNoteMsg, // XXX
+                linkMessage = h('textarea.cp-teams-invite-message', {
+                    placeholder: Messages.team_inviteLinkNoteMsg,
                     rows: 3
                 })
             ]),
@@ -1670,7 +1670,7 @@ define([
                 style: 'display: none;'
             }, [
                 h('i.fa.fa-spinner.fa-spin'),
-                linkSpinText = h('span', Messages.team_inviteLinkLoading) // XXX
+                linkSpinText = h('span', Messages.team_inviteLinkLoading)
             ]),
             linkResult = h('div', {
                 style: 'display: none;'
@@ -1682,7 +1682,7 @@ define([
             }, [
                 h('span.cp-inline-alert-text', Messages.team_inviteLinkWarning),
                 dismissButton
-            ]) // XXX
+            ])
         ]);
         $(linkMessage).keydown(function (e) {
             if (e.which === 13) {
@@ -1711,7 +1711,7 @@ define([
             var hashData = Hash.parseTypeHash('invite', hash);
             href = origin + '/teams/#' + hash;
             if (!name || !name.trim()) {
-                $(linkError).text(Messages.team_inviteLinkErrorName).show(); // XXX
+                $(linkError).text(Messages.team_inviteLinkErrorName).show();
                 return true;
             }
 
@@ -1763,14 +1763,14 @@ define([
             keys: [27]
         }, {
             className: 'primary cp-teams-invite-create',
-            name: Messages.team_inviteLinkCreate, // XXX
+            name: Messages.team_inviteLinkCreate,
             onClick: function () {
                 return process();
             },
             keys: []
         }, {
             className: 'primary cp-teams-invite-copy',
-            name: Messages.team_inviteLinkCopy, // XXX
+            name: Messages.team_inviteLinkCopy,
             onClick: function () {
                 if (!href) { return; }
                 var success = Clipboard.copy(href);
diff --git a/www/common/invitation.js b/www/common/invitation.js
index d54182dec..8ef58c914 100644
--- a/www/common/invitation.js
+++ b/www/common/invitation.js
@@ -1,5 +1,5 @@
 (function () {
-var factory = function (Hash, Util, Crypt, Nacl, Scrypt/*, Cred, nThen */) {
+var factory = function (Util, Nacl, Scrypt) {
     var Invite = {};
 
     Invite.deriveSeeds = function (safeSeed) {
@@ -38,21 +38,17 @@ var factory = function (Hash, Util, Crypt, Nacl, Scrypt/*, Cred, nThen */) {
 };
     if (typeof(module) !== 'undefined' && module.exports) {
         module.exports = factory(
-            require("../common-hash"),
             require("../common-util"),
-            require("../cryptget"), // XXX npm cryptget?
             require("tweetnacl/nacl-fast"),
             require("scrypt-async")
         );
     } else if ((typeof(define) !== 'undefined' && define !== null) && (define.amd !== null)) {
         define([
-            '/common/common-hash.js',
             '/common/common-util.js',
-            '/common/cryptget.js',
             '/bower_components/tweetnacl/nacl-fast.min.js',
             '/bower_components/scrypt-async/scrypt-async.min.js',
-        ], function (Hash, Util, Crypt /*, Nacl, Scrypt */) {
-            return factory(Hash, Util, Crypt, window.nacl, window.scrypt);
+        ], function (Util) {
+            return factory(Util, window.nacl, window.scrypt);
         });
     }
 }());
diff --git a/www/teams/inner.js b/www/teams/inner.js
index 62ba0b718..06f23c39d 100644
--- a/www/teams/inner.js
+++ b/www/teams/inner.js
@@ -1076,7 +1076,7 @@ define([
         var $div = $(div);
         var errorBlock;
         var c = [
-            h('h2', Messages.team_inviteTitle || 'Team invitation'), // XXX
+            h('h2', Messages.team_inviteTitle),
             errorBlock = h('div.alert.alert-danger',
                                 wrongPassword ? undefined : {style: 'display: none;'},
                                 wrongPassword ? Messages.drive_sfPasswordError : undefined),
@@ -1089,7 +1089,7 @@ define([
         var declineButton = h('button.btn.btn-danger', {
             style: 'display: none;'
         }, Messages.friendRequest_decline);
-        var acceptButton = h('button.btn.btn-primary', Messages.team_inviteJoin || 'JOIN TEAM'); // XXX
+        var acceptButton = h('button.btn.btn-primary', Messages.team_inviteJoin);
         var inviteDiv = h('div', [
             h('nav', [
                 declineButton,
@@ -1112,7 +1112,7 @@ define([
             nThen(function (waitFor) {
                 $inviteDiv.append(h('div', [
                     h('i.fa.fa-spin.fa-spinner'),
-                    spinnerText = h('span', Messages.team_invitePasswordLoading || 'Scrypt...') // XXX
+                    spinnerText = h('span', Messages.team_invitePasswordLoading || 'Scrypt...')
                 ]));
                 $spinner = $(spinnerText);
                 setTimeout(waitFor(), 150);
@@ -1122,7 +1122,7 @@ define([
                     bytes64 = bytes;
                 }));
             }).nThen(function (waitFor) {
-                $spinner.text(Messages.team_inviteGetData || 'get team data'); // XXX
+                $spinner.text(Messages.team_inviteGetData);
                 APP.module.execCommand('ACCEPT_LINK_INVITATION', {
                     bytes64: bytes64,
                     hash: hash,
@@ -1172,23 +1172,21 @@ define([
             var sframeChan = common.getSframeChannel();
             sframeChan.query('Q_ANON_GET_PREVIEW_CONTENT', { seeds: seeds }, waitFor(function (err, json) {
                 if (json && json.error) {
-                    // XXX APP.module is not ready yet?
                     // err === DELETED: different message?
                     $(errorBlock).text(Messages.error + json.error).show(); // XXX
                     waitFor.abort();
                     $div.empty();
                     return;
-                    // XXX handle errors
                 }
                 $div.empty();
                 $div.append(h('div.cp-teams-invite-from', [
-                    Messages.team_inviteFrom || 'From:', // XXX
+                    Messages.team_inviteFrom || 'From:',
                     displayUser(common, json.author)
                 ]));
                 $div.append(UI.setHTML(h('p.cp-teams-invite-to'),
                     Messages._getKey('team_inviteFromMsg',
-                    [Util.fixHTML(json.author.displayName), 
-                    Util.fixHTML(json.teamName)]))); // XXX
+                    [Util.fixHTML(json.author.displayName),
+                    Util.fixHTML(json.teamName)])));
                 if (json.message) {
                     $div.append(h('div.cp-teams-invite-message', json.message));
                 }
@@ -1199,7 +1197,7 @@ define([
 
             // If you're not logged in, display the login buttons
             var anonLogin, anonRegister;
-            $div.append(h('p', Messages.team_invitePleaseLogin || 'Please log in or register to accept this invitation...')); // XXX
+            $div.append(h('p', Messages.team_invitePleaseLogin || 'Please log in or register to accept this invitation...'));
             $div.append(h('div', [
                 anonLogin = h('button.btn.btn-primary', Messages.login_login),
                 anonRegister = h('button.btn.btn-secondary', Messages.login_register),
@@ -1229,7 +1227,7 @@ define([
                 process(val);
             });
             $inviteDiv.prepend(h('div.cp-teams-invite-password', [
-                h('p', Messages.team_inviteEnterPassword || 'Please enter the invitation password to continue...'), // XXX
+                h('p', Messages.team_inviteEnterPassword),
                 pwInput
             ])); 
             waitFor.abort();

From dc4feda73836380832a855d785e1d0bfd43a3121 Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Wed, 18 Dec 2019 23:21:38 +0000
Subject: [PATCH 113/129] Translated using Weblate (English)

Currently translated at 100.0% (1183 of 1183 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
---
 www/common/translations/messages.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/common/translations/messages.json b/www/common/translations/messages.json
index 1cb538700..cb5d3c102 100644
--- a/www/common/translations/messages.json
+++ b/www/common/translations/messages.json
@@ -1261,7 +1261,7 @@
     "contacts_mutedUsers": "Muted accounts",
     "contacts_muteInfo": "You will not receive any notifications or messages from muted users.<br>They will not know you have muted them. ",
     "team_inviteLinkTitle": "Create a personalized invitation to this team",
-    "team_inviteLinkTempName": "temporary name (visible in pending invitations list)",
+    "team_inviteLinkTempName": "Temporary name (visible in pending invitations list)",
     "team_inviteLinkSetPassword": "Protect the link with a password (recommended)",
     "team_inviteLinkNote": "Add a personal message",
     "team_inviteLinkNoteMsg": "This message will be shown before the recipient decides whether to join this team.",

From e3fc741402f0ecc723da87d2fd9e5b310e10df97 Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Wed, 18 Dec 2019 23:21:39 +0000
Subject: [PATCH 114/129] Translated using Weblate (German)

Currently translated at 99.9% (1182 of 1183 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
---
 www/common/translations/messages.de.json | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/www/common/translations/messages.de.json b/www/common/translations/messages.de.json
index 000e4cf53..a385d46df 100644
--- a/www/common/translations/messages.de.json
+++ b/www/common/translations/messages.de.json
@@ -1267,7 +1267,17 @@
     "team_inviteLinkNoteMsg": "Diese Nachricht wird angezeigt, bevor der Empfänger entscheidet, ob er diesem Team beitreten möchte.",
     "team_inviteLinkLoading": "Dein Link wird generiert",
     "team_inviteLinkWarning": "Die erste Person, die auf diesen Link zugreift, kann diesem Team beitreten und dessen Inhalte einsehen. Teile ihn sorgfältig.",
-    "team_inviteLinkErrorName": "Bitte gib der Einladung einen Namen",
+    "team_inviteLinkErrorName": "Bitte gib einen Namen für die eingeladene Person ein. Er kann später geändert werden. ",
     "team_inviteLinkCreate": "Link erstellen",
-    "team_inviteLinkCopy": "Link kopieren"
+    "team_inviteLinkCopy": "Link kopieren",
+    "team_inviteFrom": "Von:",
+    "team_inviteFromMsg": "{0} hat dich ins Team <b>{1}</b> eingeladen",
+    "team_invitePleaseLogin": "Bitte logge dich ein oder registriere dich, um diese Einladung anzunehmen.",
+    "team_inviteEnterPassword": "Bitte gib das Passwort für die Einladung ein, um fortzufahren.",
+    "team_invitePasswordLoading": "Einladung wird entschlüsselt",
+    "team_inviteJoin": "Team beitreten",
+    "team_inviteTitle": "Team-Einladung",
+    "team_inviteGetData": "Team-Daten werden abgerufen",
+    "team_cat_link": "Einladungslink",
+    "team_links": "Einladungslinks"
 }

From d2ba3754910f4b52825ed8045070369eb2c3a6e1 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 19 Dec 2019 10:34:08 +0100
Subject: [PATCH 115/129] Improve profile UI

---
 www/common/common-ui-elements.js |  4 ++--
 www/profile/app-profile.less     | 14 ++++++++++----
 www/profile/inner.js             |  4 ++--
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 64ae9dd0d..27458c9f9 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -2073,12 +2073,12 @@ define([
         for (var k in actions) {
             $('<button>', {
                 'data-type': k,
-                'class': 'fa ' + actions[k].icon,
+                'class': 'pure-button fa ' + actions[k].icon,
                 title: Messages['mdToolbar_' + k] || k
             }).click(onClick).appendTo($toolbar);
         }
         $('<button>', {
-            'class': 'fa fa-question cp-markdown-help',
+            'class': 'pure-button fa fa-question cp-markdown-help',
             title: Messages.mdToolbar_help
         }).click(function () {
             var href = Messages.mdToolbar_tutorial;
diff --git a/www/profile/app-profile.less b/www/profile/app-profile.less
index 61b3bbbe6..9371a714a 100644
--- a/www/profile/app-profile.less
+++ b/www/profile/app-profile.less
@@ -25,6 +25,7 @@
             flex: 1;
             display: flex;
             flex-flow: column;
+            align-items: start;
         }
     }
     #cp-app-profile-avatar {
@@ -80,8 +81,6 @@
         text-align: center;
     }
     #cp-app-profile-displayname, #cp-app-profile-link {
-        width: 100%;
-        height: 40px;
         margin: 10px 0;
         input {
             width: 100%;
@@ -114,6 +113,14 @@
         }
         .cp-app-profile-link-code {
             display: none;
+            min-width: 500px;
+            input {
+                flex: 1;
+                min-width: 0;
+            }
+            button {
+                height: 48px !important;
+            }
         }
         & > button:empty {
             margin-left: 25px !important;
@@ -139,8 +146,7 @@
         float: right;
     }
     .cp-app-profile-viewprofile-button {
-        margin-bottom: 20px;
-        width: 300px;
+        margin-bottom: 5px !important;
     }
     #cp-app-profile-description {
         position: relative;
diff --git a/www/profile/inner.js b/www/profile/inner.js
index a37991ad9..d9e874ccb 100644
--- a/www/profile/inner.js
+++ b/www/profile/inner.js
@@ -137,7 +137,7 @@ define([
         }, Messages.profile_addLink);
         APP.$linkEdit = $(button);
         $block.append(button);
-        var save = h('button.btn.btn-success', Messages.settings_save);
+        var save = h('button.btn.btn-primary', Messages.settings_save);
         var text = h('input');
         var code = h('div.cp-app-profile-link-code', [
             text,
@@ -149,7 +149,7 @@ define([
         $block.append(div);
         $(button).click(function () {
             $(text).val(APP.$link.attr('href'));
-            $(code).show();
+            $(code).css('display', 'flex');
             APP.editor.refresh();
             $(button).hide();
         });

From 3bebab57e4d868b15878c3f9224bc4516eea2344 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 19 Dec 2019 10:54:58 +0100
Subject: [PATCH 116/129] Remove XXX

---
 www/common/common-ui-elements.js | 1 -
 www/teams/inner.js               | 2 --
 2 files changed, 3 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 5f4e0b9eb..14d030856 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1730,7 +1730,6 @@ define([
                     bytes64 = _bytes;
                 }));
             }).nThen(function (waitFor) {
-                $(linkSpinText).text(Messages.team_inviteLinkAdding); // XXX
                 module.execCommand('CREATE_INVITE_LINK', {
                     name: name,
                     password: pw,
diff --git a/www/teams/inner.js b/www/teams/inner.js
index 06f23c39d..0bd985442 100644
--- a/www/teams/inner.js
+++ b/www/teams/inner.js
@@ -1130,8 +1130,6 @@ define([
                 }, waitFor(function (obj) {
                     if (obj && obj.error) {
                         // Wrong password or other error...
-                        // XXX if DELETED, password prompt again?
-                        console.error(obj.error);
                         waitFor.abort();
                         if (obj.error === 'INVALID_INVITE_CONTENT') {
                             // Wrong password...

From 675ef603621a140851472899f8651b493d9605dc Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Thu, 19 Dec 2019 10:08:09 +0000
Subject: [PATCH 117/129] Translated using Weblate (English)

Currently translated at 100.0% (1185 of 1185 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1184 of 1184 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
---
 www/common/translations/messages.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/www/common/translations/messages.json b/www/common/translations/messages.json
index cb5d3c102..59fe42b8a 100644
--- a/www/common/translations/messages.json
+++ b/www/common/translations/messages.json
@@ -1279,5 +1279,7 @@
     "team_inviteTitle": "Team invitation",
     "team_inviteGetData": "Getting team data",
     "team_cat_link": "Invitation Link",
-    "team_links": "Invitation Links"
+    "team_links": "Invitation Links",
+    "team_inviteInvalidLinkError": "This invitation link is not valid.",
+    "team_inviteLinkError": "There was an error while creating the link."
 }

From 92c6bbc99af465ed71cc0be167f5ce9996774d75 Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Thu, 19 Dec 2019 10:08:10 +0000
Subject: [PATCH 118/129] Translated using Weblate (French)

Currently translated at 100.0% (1185 of 1185 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
---
 www/common/translations/messages.fr.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/www/common/translations/messages.fr.json b/www/common/translations/messages.fr.json
index 7b2d80227..9f957ea17 100644
--- a/www/common/translations/messages.fr.json
+++ b/www/common/translations/messages.fr.json
@@ -1279,5 +1279,7 @@
     "team_inviteTitle": "Invitation à une équipe",
     "team_inviteGetData": "Obtention des données de l'équipe",
     "team_cat_link": "Invitation",
-    "team_links": "Liens d'invitation"
+    "team_links": "Liens d'invitation",
+    "team_inviteInvalidLinkError": "Ce lien d'invitation n'est pas valide.",
+    "team_inviteLinkError": "Erreur lors de la génération du lien."
 }

From c6e7b5d552d394552741300f10174ca2c0d36e96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Thu, 19 Dec 2019 10:09:39 +0000
Subject: [PATCH 119/129] add translation keys for errors

---
 www/common/common-ui-elements.js | 4 ++--
 www/teams/inner.js               | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 5f4e0b9eb..72a8dde67 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1743,10 +1743,10 @@ define([
                     if (obj && obj.error) {
                         waitFor.abort(); 
                         $(linkSpin).hide();
-                        $(linkForm).show(); // XXX DB: check this is the right place to put things back 
+                        $(linkForm).show();
                         $nav.find('button.cp-teams-invite-create').show();
                         $nav.find('button.cp-teams-invite-copy').hide();
-                        return void $(linkError).text(Messages.team_inviteLinkError+obj.error).show(); // XXX
+                        return void $(linkError).text(Messages.team_inviteLinkError).show();
                     }
                     // Display result here
                     $(linkSpin).hide();
diff --git a/www/teams/inner.js b/www/teams/inner.js
index 06f23c39d..b4e089047 100644
--- a/www/teams/inner.js
+++ b/www/teams/inner.js
@@ -1173,7 +1173,7 @@ define([
             sframeChan.query('Q_ANON_GET_PREVIEW_CONTENT', { seeds: seeds }, waitFor(function (err, json) {
                 if (json && json.error) {
                     // err === DELETED: different message?
-                    $(errorBlock).text(Messages.error + json.error).show(); // XXX
+                    $(errorBlock).text(Messages.team_inviteInvalidLinkError).show();
                     waitFor.abort();
                     $div.empty();
                     return;

From de5feeda134edb6c799361b89f4ba5f3d374458e Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 19 Dec 2019 11:27:41 +0100
Subject: [PATCH 120/129] Remove some tippy titles

---
 www/common/messenger-ui.js | 6 ++++--
 www/teams/inner.js         | 4 +---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/www/common/messenger-ui.js b/www/common/messenger-ui.js
index 7643939e5..5ba92f6a6 100644
--- a/www/common/messenger-ui.js
+++ b/www/common/messenger-ui.js
@@ -516,7 +516,6 @@ define([
             var roomEl = h('div.cp-app-contacts-friend.cp-avatar', {
                 'data-key': id,
                 'data-user': room.isFriendChat ? userlist[0].curvePublic : '',
-                title: room.name
             });
 
 
@@ -889,6 +888,9 @@ define([
                             if (!data) { $button.hide(); }
                             $('.cp-app-contacts-friend[data-user="'+curve+'"]')
                                 .find('.cp-mute-icon').show();
+                            if ($('.cp-contacts-muted-table').find('.cp-contacts-muted-user').length === 0) {
+                                UI.findOKButton().click();
+                            }
                         });
                     });
                     return h('div.cp-contacts-muted-user', [
@@ -898,7 +900,7 @@ define([
                     ]);
                 });
                 var content = h('div', [
-                    h('h4', Messages.contacts_mutedUsers || 'Muted users...'),
+                    h('h4', Messages.contacts_mutedUsers),
                     h('div.cp-contacts-muted-table', rows)
                 ]);
                 $button.off('click');
diff --git a/www/teams/inner.js b/www/teams/inner.js
index 551a966fd..538481e7d 100644
--- a/www/teams/inner.js
+++ b/www/teams/inner.js
@@ -729,9 +729,7 @@ define([
             actions,
             status,
         ];
-        var div = h('div.cp-team-roster-member', {
-            title: data.displayName
-        }, content);
+        var div = h('div.cp-team-roster-member', content);
         if (data.profile) {
             $(div).dblclick(function (e) {
                 e.preventDefault();

From 0dc4a1d8904c9b4b8a4fcf5b45ed5ccc81cd7daa Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 19 Dec 2019 11:38:09 +0100
Subject: [PATCH 121/129] Display error message when using an invalid
 invitation link

---
 www/teams/inner.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/www/teams/inner.js b/www/teams/inner.js
index 538481e7d..07aa91ab5 100644
--- a/www/teams/inner.js
+++ b/www/teams/inner.js
@@ -1167,8 +1167,7 @@ define([
             // Get preview content.
             var sframeChan = common.getSframeChannel();
             sframeChan.query('Q_ANON_GET_PREVIEW_CONTENT', { seeds: seeds }, waitFor(function (err, json) {
-                if (json && json.error) {
-                    // err === DELETED: different message?
+                if (json && (json.error || !Object.keys(json).length)) {
                     $(errorBlock).text(Messages.team_inviteInvalidLinkError).show();
                     waitFor.abort();
                     $div.empty();
@@ -1193,7 +1192,7 @@ define([
 
             // If you're not logged in, display the login buttons
             var anonLogin, anonRegister;
-            $div.append(h('p', Messages.team_invitePleaseLogin || 'Please log in or register to accept this invitation...'));
+            $div.append(h('p', Messages.team_invitePleaseLogin));
             $div.append(h('div', [
                 anonLogin = h('button.btn.btn-primary', Messages.login_login),
                 anonRegister = h('button.btn.btn-secondary', Messages.login_register),

From 5db81f399068d19108031f677ecd0b7caa964ae0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Thu, 19 Dec 2019 10:43:28 +0000
Subject: [PATCH 122/129] add margin to team roster header buttons

---
 www/teams/app-team.less | 1 +
 1 file changed, 1 insertion(+)

diff --git a/www/teams/app-team.less b/www/teams/app-team.less
index e65f31279..177efbd0e 100644
--- a/www/teams/app-team.less
+++ b/www/teams/app-team.less
@@ -143,6 +143,7 @@
                 display: none;
             }
             .cp-app-team-roster-header {
+                margin-bottom: 20px;
                 button:not(:last-child) {
                     margin-right: 5px;
                 }

From aca9ddca061950f8323c36defc950be9d987763a Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 19 Dec 2019 11:45:50 +0100
Subject: [PATCH 123/129] Display error message when trying to use an
 invitation link a second time

---
 www/teams/inner.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/www/teams/inner.js b/www/teams/inner.js
index 07aa91ab5..913ca4ca8 100644
--- a/www/teams/inner.js
+++ b/www/teams/inner.js
@@ -1137,7 +1137,11 @@ define([
                                     $divLink.append(content);
                                 }, true);
                             }
+                            return;
                         }
+                        $(errorBlock).text(Messages.team_inviteInvalidLinkError).show();
+                        $(div).empty();
+                        $inviteDiv.empty();
                         return;
                     }
                     // No error: join successful!

From 4869b4e0c3c888492bc576ede0ae8e9abb100344 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 19 Dec 2019 11:56:20 +0100
Subject: [PATCH 124/129] Delete invitation after using it

---
 www/common/outer/team.js | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/www/common/outer/team.js b/www/common/outer/team.js
index 1c28da681..ef2fabd59 100644
--- a/www/common/outer/team.js
+++ b/www/common/outer/team.js
@@ -1478,6 +1478,7 @@ define([
 
     var acceptLinkInvitation = function (ctx, data, cId, cb) {
         var inviteContent;
+        var rosterState;
         nThen(function (waitFor) {
             // Get team keys and ephemeral keys
             getInviteContent(ctx, data, cId, waitFor(function (obj) {
@@ -1508,6 +1509,8 @@ define([
                     return void cb({error: 'ROSTER_ERROR'});
                 }
                 var myData = Messaging.createData(ctx.store.proxy, false);
+                var state = roster.getState();
+                rosterState = state.members[myKeys.curvePublic];
                 roster.accept(myData.curvePublic, waitFor(function (err) {
                     if (err) {
                         waitFor.abort();
@@ -1518,6 +1521,21 @@ define([
                 }));
             }));
         }).nThen(function () {
+            var tempRpc = {};
+            initRpc(ctx, tempRpc, inviteContent.ephemeral, function (err) {
+                if (err) { return; }
+                var rpc = tempRpc.rpc;
+                if (rosterState.inviteChannel) {
+                    rpc.removeOwnedChannel(rosterState.inviteChannel, function (err) {
+                        if (err) { console.error(err); }
+                    });
+                }
+                if (rosterState.previewChannel) {
+                    rpc.removeOwnedChannel(rosterState.previewChannel, function (err) {
+                        if (err) { console.error(err); }
+                    });
+                }
+            });
             // Add the team to our list and join...
             joinTeam(ctx, {
                 team: inviteContent.teamData

From 361292ff0181a610279bcf83c375dfce23532374 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 19 Dec 2019 15:37:09 +0100
Subject: [PATCH 125/129] Fix button width in profile

---
 www/profile/app-profile.less | 1 -
 1 file changed, 1 deletion(-)

diff --git a/www/profile/app-profile.less b/www/profile/app-profile.less
index 9371a714a..82091fa45 100644
--- a/www/profile/app-profile.less
+++ b/www/profile/app-profile.less
@@ -137,7 +137,6 @@
     }
     .cp-app-profile-friend-request {
         flex: 0;
-        width: 400px;
         margin-top: 10px;
     }
 

From dc470916377ce153dbc7849b1ae97d3bb284d508 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Thu, 19 Dec 2019 14:48:57 +0000
Subject: [PATCH 126/129] outline mute button

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

diff --git a/www/profile/inner.js b/www/profile/inner.js
index d9e874ccb..d5243036c 100644
--- a/www/profile/inner.js
+++ b/www/profile/inner.js
@@ -292,7 +292,7 @@ define([
                 }).appendTo($mute);
                 return;
             }
-            var muteButton = h('button.btn.btn-danger.cp-app-profile-friend-request', [
+            var muteButton = h('button.btn.btn-danger-outline.cp-app-profile-friend-request', [
                 h('i.fa.fa-bell-slash'),
                 Messages.contacts_mute || 'mute'
             ]);

From 826a86c7d6602e71b5bec314362cd44209b05b06 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 19 Dec 2019 16:21:10 +0100
Subject: [PATCH 127/129] Fix joining your own team

---
 www/common/outer/team.js | 13 ++++++++++++-
 www/teams/inner.js       |  1 +
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/www/common/outer/team.js b/www/common/outer/team.js
index ef2fabd59..b7d6e3fb7 100644
--- a/www/common/outer/team.js
+++ b/www/common/outer/team.js
@@ -1489,6 +1489,17 @@ define([
                 inviteContent = obj;
             }));
         }).nThen(function (waitFor) {
+            // Check if you're already a member of this team
+            var chan = Util.find(inviteContent, ['teamData', 'channel']);
+            var myTeams = ctx.store.proxy.teams || {};
+            var isMember = Object.keys(myTeams).some(function (k) {
+                var t = myTeams[k];
+                return t.channel === chan;
+            });
+            if (isMember) {
+                waitFor.abort();
+                return void cb({error: 'ALREADY_MEMBER'});
+            }
             // Accept the roster invitation: relplace our ephemeral keys with our user keys
             var rosterData = Util.find(inviteContent, ['teamData', 'keys', 'roster']);
             var myKeys = inviteContent.ephemeral;
@@ -1512,12 +1523,12 @@ define([
                 var state = roster.getState();
                 rosterState = state.members[myKeys.curvePublic];
                 roster.accept(myData.curvePublic, waitFor(function (err) {
+                    roster.stop();
                     if (err) {
                         waitFor.abort();
                         console.error(err);
                         return void cb({error: 'ACCEPT_ERROR'});
                     }
-                    roster.stop();
                 }));
             }));
         }).nThen(function () {
diff --git a/www/teams/inner.js b/www/teams/inner.js
index 913ca4ca8..fb80caeb2 100644
--- a/www/teams/inner.js
+++ b/www/teams/inner.js
@@ -1127,6 +1127,7 @@ define([
                     password: pw,
                 }, waitFor(function (obj) {
                     if (obj && obj.error) {
+                        console.error(obj.error);
                         // Wrong password or other error...
                         waitFor.abort();
                         if (obj.error === 'INVALID_INVITE_CONTENT') {

From f84a876f27f1abff62f59f2675f6ca8297bf5ce4 Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Thu, 19 Dec 2019 15:37:49 +0000
Subject: [PATCH 128/129] Translated using Weblate (German)

Currently translated at 100.0% (1185 of 1185 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
---
 www/common/translations/messages.de.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/www/common/translations/messages.de.json b/www/common/translations/messages.de.json
index a385d46df..ebc30e63a 100644
--- a/www/common/translations/messages.de.json
+++ b/www/common/translations/messages.de.json
@@ -1279,5 +1279,7 @@
     "team_inviteTitle": "Team-Einladung",
     "team_inviteGetData": "Team-Daten werden abgerufen",
     "team_cat_link": "Einladungslink",
-    "team_links": "Einladungslinks"
+    "team_links": "Einladungslinks",
+    "team_inviteInvalidLinkError": "Dieser Einladungslink ist ungültig.",
+    "team_inviteLinkError": "Bei der Erstellung des Links ist ein Fehler aufgetreten."
 }

From 7d5bdc33bb7b5f8a95634b73d4edb3eebf82aea5 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Thu, 19 Dec 2019 14:52:34 -0500
Subject: [PATCH 129/129] update changelog for v3.8.0

---
 CHANGELOG.md | 49 ++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 48 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a056e5d56..ea5909dab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,51 @@
-# HimalayanQuail (3.7.0)
+# IsolobodonPortoricensis release (3.8.0)
+
+We had some trouble finding an extinct animal whose name started with "I", and we had to resort to using a scientific name.
+Despite this long name, this was a very short release cycle.
+It's the last release of 2019, so we hope you like it!
+
+## Goals
+
+During this release cycle we prioritized the mitigation of some social abuse vectors and the ability to invite users to a team via a link.
+We have more improvements planned for both features, but we wanted to release what we had before the end of the year as our team is taking a little time off to recharge for 2020.
+
+## Update notes
+
+This is a small and simple release. We made a very minor improvement to the server which will require a restart, but everything will still work if you choose not to.
+
+Update from 3.7.0 to 3.8.0 with the following procedure:
+
+1. Take your server down
+2. Get the latest code with `git pull origin master`
+3. Bring your server back up
+
+Or if you've set up your admin interface:
+
+1. Pull the latest code
+2. Click the admin panel's "Flush cache" button
+
+## Features
+
+* We updated a bunch of styles to improve the platform's visual consistency:
+  * prettier buttons
+  * elimination of rounded corners on buttons, text inputs, and password inputs
+* We've fixed the default styles on embedded media while their content is loading
+* The button to add a user as a contact on their profile page now has a more prominent position at the top of the page
+* Users also have the option of muting other people via their profile page.
+  * these users will not know that you've muted them.
+  * you can review the complete list of all the people you've muted on your contacts page
+  * you can mute or unmute from the contacts page as well as their profile
+  * changes to a user's mute status propagate across pages in real-time
+* Some of our Finnish-speaking users have become contributors via our weblate instance (https://weblate.cryptpad.fr/)
+  * we're always looking for more translators to help more people protect their data, so don't hesitate to contact us if you want to help
+* Finally, it's now possible to invite users to a team by creating and sharing a personalized one-time-use link.
+  * team owners and admins can try it out via their teams' "Members" tab
+
+## Bug fixes
+
+* We've fixed a few subtle bugs where various contact status and our one-to-one chat functionality could get into a bad state.
+
+# HimalayanQuail release (3.7.0)
 
 ## Goals