From 086e500b8edc295338377170f57940571c626102 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 6 Feb 2020 13:58:27 +0100
Subject: [PATCH 01/57] Fix hidden hash error with password change

---
 www/common/common-hash.js        |  4 +++-
 www/common/common-ui-elements.js | 19 ++++++++++++++-----
 www/common/cryptpad-common.js    |  7 +++++--
 www/common/drive-ui.js           |  8 +++-----
 4 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/www/common/common-hash.js b/www/common/common-hash.js
index ad32e65c8..b60ab3306 100644
--- a/www/common/common-hash.js
+++ b/www/common/common-hash.js
@@ -62,7 +62,9 @@ var factory = function (Util, Crypto, Nacl) {
     };
 
     Hash.getHiddenHashFromKeys = function (type, secret, opts) {
-        var mode = ((secret.keys && secret.keys.editKeyStr) || secret.key) ? 'edit/' : 'view/';
+        opts = opts || {};
+        var canEdit = (secret.keys && secret.keys.editKeyStr) || secret.key;
+        var mode = (!opts.view && canEdit) ? 'edit/' : 'view/';
         var pass = secret.password ? 'p/' : '';
 
         if (secret.keys && secret.keys.fileKeyStr) { mode = ''; }
diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index d106702b5..977f8963d 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -638,17 +638,26 @@ define([
                                                                 : Messages.properties_passwordSuccessFile;
                                     return void UI.alert(alertMsg, undefined, {force: true});
                                 }
-                                // If we didn't have a password, we have to add the /p/
-                                // If we had a password and we changed it to a new one, we just have to reload
-                                // If we had a password and we removed it, we have to remove the /p/
+
+                                // Pad password changed: update the href
+                                // Use hidden hash if needed (we're an owner of this pad so we know it is stored)
+                                var useUnsafe = Util.find(priv, ['settings', 'security', 'unsafeLinks']);
+                                var href = data.href || data.roHref;
+                                if (!useUnsafe) {
+                                    var newParsed = Hash.parsePadUrl(href);
+                                    var newSecret = Hash.getSecrets(newParsed.type, newParsed.hash, newPass);
+                                    var newHash = Hash.getHiddenHashFromKeys(parsed.type, newSecret, {});
+                                    href = Hash.hashToHref(newHash, parsed.type);
+                                }
+
                                 if (data.warning) {
                                     return void UI.alert(Messages.properties_passwordWarning, function () {
-                                        common.gotoURL(hasPassword && newPass ? undefined : (data.href || data.roHref));
+                                        common.gotoURL(href);
                                     }, {force: true});
                                 }
                                 return void UI.alert(Messages.properties_passwordSuccess, function () {
                                     if (!isSharedFolder) {
-                                        common.gotoURL(hasPassword && newPass ? undefined : (data.href || data.roHref));
+                                        common.gotoURL(href);
                                     }
                                 }, {force: true});
                             });
diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js
index 0aa75f561..393fafa8b 100644
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -1041,7 +1041,7 @@ define([
                 warning: warning,
                 hash: newHash,
                 href: newHref,
-                roHref: newRoHref
+                roHref: newRoHref,
             });
         });
     };
@@ -2121,7 +2121,10 @@ define([
                 var parsedNew = Hash.parsePadUrl(newHref);
                 if (parsedOld.hashData && parsedNew.hashData &&
                     parsedOld.getUrl() !== parsedNew.getUrl()) {
-                    if (!parsedOld.hashData.key) { oldHref = newHref; return; }
+                    if (parsedOld.hashData.version !== 3 && !parsedOld.hashData.key) {
+                        oldHref = newHref;
+                        return;
+                    }
                     // If different, reload
                     document.location.reload();
                     return;
diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index a19ba9be1..ff15e091f 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -1044,11 +1044,9 @@ define([
             // Get hidden hash
             var parsed = Hash.parsePadUrl(href);
             var secret = Hash.getSecrets(parsed.type, parsed.hash, data.password);
-            if (isRo && secret.keys && secret.keys.editKeyStr) {
-                delete secret.keys.editKeyStr;
-                delete secret.key;
-            }
-            var hash = Hash.getHiddenHashFromKeys(parsed.type, secret);
+            var opts = {};
+            if (isRo) { opts.view = true; }
+            var hash = Hash.getHiddenHashFromKeys(parsed.type, secret, opts);
             var hiddenHref = Hash.hashToHref(hash, parsed.type);
             window.open(APP.origin + hiddenHref);
         };

From 12a45377e711af8c15db8ed593f3bc6ef7e84a67 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 6 Feb 2020 15:35:58 +0100
Subject: [PATCH 02/57] Fix password change issues with read-only pads or from
 the drive

---
 www/common/common-ui-elements.js  | 46 ++++++++++++++++++++-----------
 www/common/cryptpad-common.js     |  3 ++
 www/common/sframe-common-outer.js |  4 +--
 3 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 977f8963d..4916517e6 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -547,21 +547,27 @@ define([
 
             if (!data.noPassword) {
                 var hasPassword = data.password;
+                var $pwLabel = $('<label>', {'for': 'cp-app-prop-password'}).text(Messages.creation_passwordValue)
+                                .hide().appendTo($d);
+                var password = UI.passwordInput({
+                    id: 'cp-app-prop-password',
+                    readonly: 'readonly'
+                });
+                var $password = $(password).hide();
+                var $pwInput = $password.find('.cp-password-input');
+                $pwInput.val(data.password).click(function () {
+                    $pwInput[0].select();
+                });
+                $d.append(password);
+
                 if (hasPassword) {
-                    $('<label>', {'for': 'cp-app-prop-password'}).text(Messages.creation_passwordValue)
-                        .appendTo($d);
-                    var password = UI.passwordInput({
-                        id: 'cp-app-prop-password',
-                        readonly: 'readonly'
-                    });
-                    var $pwInput = $(password).find('.cp-password-input');
-                    $pwInput.val(data.password).click(function () {
-                        $pwInput[0].select();
-                    });
-                    $d.append(password);
+                    $pwLabel.show();
+                    $password.css('display', 'flex');
                 }
 
-                if (!data.noEditPassword && owned) { // FIXME SHEET fix password change for sheets
+                // In the properties, we should have the edit href if we know it.
+                // We should know it because the pad is stored, but it's better to check...
+                if (!data.noEditPassword && owned && data.href) { // FIXME SHEET fix password change for sheets
                     var sframeChan = common.getSframeChannel();
 
                     var isOO = parsed.type === 'sheet';
@@ -621,7 +627,7 @@ define([
 
                             sframeChan.query(q, {
                                 teamId: typeof(owned) !== "boolean" ? owned : undefined,
-                                href: data.href || data.roHref,
+                                href: data.href,
                                 password: newPass
                             }, function (err, data) {
                                 $(passwordOk).text(Messages.properties_changePasswordButton);
@@ -631,8 +637,16 @@ define([
                                     return void UI.alert(Messages.properties_passwordError);
                                 }
                                 UI.findOKButton().click();
-                                if (isFile) {
-                                    onProgress.stop();
+
+                                $pwLabel.show();
+                                $password.css('display', 'flex');
+                                $pwInput.val(newPass);
+
+                                // If the current document is a file or if we're changing the password from a drive,
+                                // we don't have to reload the page at the end.
+                                // Tell the user the password change was successful and abort
+                                if (isFile || priv.app !== parsed.type) {
+                                    if (onProgress && onProgress.stop) { onProgress.stop(); }
                                     $(passwordOk).text(Messages.properties_changePasswordButton);
                                     var alertMsg = data.warning ? Messages.properties_passwordWarningFile
                                                                 : Messages.properties_passwordSuccessFile;
@@ -642,7 +656,7 @@ define([
                                 // Pad password changed: update the href
                                 // Use hidden hash if needed (we're an owner of this pad so we know it is stored)
                                 var useUnsafe = Util.find(priv, ['settings', 'security', 'unsafeLinks']);
-                                var href = data.href || data.roHref;
+                                var href = (priv.readOnly && data.roHref) ? data.roHref : data.href;
                                 if (!useUnsafe) {
                                     var newParsed = Hash.parsePadUrl(href);
                                     var newSecret = Hash.getSecrets(newParsed.type, newParsed.hash, newPass);
diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js
index 393fafa8b..2b7c51d90 100644
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -1037,6 +1037,7 @@ define([
                 }, waitFor());
             }
         }).nThen(function () {
+            common.drive.onChange.fire({path: ['drive', Constants.storageKey]});
             cb({
                 warning: warning,
                 hash: newHash,
@@ -1170,6 +1171,7 @@ define([
                 channel: newSecret.channel
             }, waitFor());
         }).nThen(function () {
+            common.drive.onChange.fire({path: ['drive', Constants.storageKey]});
             cb({
                 warning: warning,
                 hash: newHash,
@@ -1404,6 +1406,7 @@ define([
                 }, waitFor());
             }));
         }).nThen(function () {
+            common.drive.onChange.fire({path: ['drive', Constants.storageKey]});
             cb({
                 warning: warning,
                 hash: newHash,
diff --git a/www/common/sframe-common-outer.js b/www/common/sframe-common-outer.js
index 75f8afb9b..fa9afaed8 100644
--- a/www/common/sframe-common-outer.js
+++ b/www/common/sframe-common-outer.js
@@ -1125,12 +1125,12 @@ define([
             });
 
             sframeChan.on('Q_OO_PASSWORD_CHANGE', function (data, cb) {
-                data.href = data.href || currentPad.href;
+                data.href = data.href;
                 Cryptpad.changeOOPassword(data, cb);
             });
 
             sframeChan.on('Q_PAD_PASSWORD_CHANGE', function (data, cb) {
-                data.href = data.href || currentPad.href;
+                data.href = data.href;
                 Cryptpad.changePadPassword(Cryptget, Crypto, data, cb);
             });
 

From 331054870f827493b6f739eacc7314d339f5dbe2 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 6 Feb 2020 16:06:09 +0100
Subject: [PATCH 03/57] Better sidebar layout for mobile

---
 .../src/less2/include/sidebar-layout.less     | 21 ++++++++++++++++++-
 www/settings/app-settings.less                |  6 ++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/customize.dist/src/less2/include/sidebar-layout.less b/customize.dist/src/less2/include/sidebar-layout.less
index 59ea22c76..5525f0fb8 100644
--- a/customize.dist/src/less2/include/sidebar-layout.less
+++ b/customize.dist/src/less2/include/sidebar-layout.less
@@ -1,6 +1,7 @@
 @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";
+@import (reference) "/customize/src/less2/include/browser.less";
 
 @sidebar_button-width: 400px;
 
@@ -73,6 +74,7 @@
             padding: 5px 20px;
             color: @rightside-color;
             overflow: auto;
+            padding-bottom: 200px;
 
             // Following rules are only in settings
             .cp-sidebarlayout-element {
@@ -96,7 +98,7 @@
                     }
                 }
                 margin-bottom: 20px;
-            .buttons_main();
+                .buttons_main();
             }
             [type="text"], [type="password"], button {
                 vertical-align: middle;
@@ -107,6 +109,7 @@
             .cp-sidebarlayout-input-block {
                 display: inline-flex;
                 width: @sidebar_button-width;
+                max-width: 100%;
                 input {
                     flex: 1;
                     //border-radius: 0.25em 0 0 0.25em;
@@ -118,6 +121,7 @@
                     //border: 1px solid #adadad;
                     border-left: 0px;
                     height: @variables_input-height;
+                    margin: 0 !important;
                 }
             }
             &>div {
@@ -162,6 +166,21 @@
             }
 */
         }
+        @media screen and (max-width: @browser_media-medium-screen) {
+            flex-flow: column;
+            overflow: auto;
+            #cp-sidebarlayout-leftside {
+                width: 100%;
+                .cp-sidebarlayout-categories {
+                    .cp-sidebarlayout-category {
+                        margin: 0;
+                    }
+                }
+            }
+            #cp-sidebarlayout-rightside {
+                overflow: unset;
+            }
+        }
     }
 }
 
diff --git a/www/settings/app-settings.less b/www/settings/app-settings.less
index b6cd22fc1..251b7097c 100644
--- a/www/settings/app-settings.less
+++ b/www/settings/app-settings.less
@@ -121,8 +121,13 @@
                 border: 1px solid black;
             }
             .cp-settings-language-selector {
+                #cp-language-selector {
+                    display: inline;
+                }
                 button.btn {
                     width: @sidebar_button-width;
+                    max-width: 100%;
+                    margin: 0 !important;
                     background-color: @colortheme_sidebar-button-alt-bg;
                     border-color: #adadad;
                     color: black;
@@ -149,6 +154,7 @@
             .cp-settings-info-block {
                 [type="text"] {
                     width: @sidebar_button-width;
+                    max-width: 100%;
                 }
             }
 

From 9e60c8eb93c22ad716034544e8e15e8dda6081a2 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 6 Feb 2020 17:42:54 +0100
Subject: [PATCH 04/57] Show more than 5 entries in the upload table

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

diff --git a/customize.dist/src/less2/include/fileupload.less b/customize.dist/src/less2/include/fileupload.less
index ebe93399b..91117fedd 100644
--- a/customize.dist/src/less2/include/fileupload.less
+++ b/customize.dist/src/less2/include/fileupload.less
@@ -17,6 +17,8 @@
         z-index: 1000000; //Z file upload table container
         display: none;
         color: darken(@colortheme_drive-bg, 10%);
+        max-height: 180px;
+        overflow-y: auto;
 
         @media screen and (max-width: @browser_media-medium-screen) {
             left: 5vw; right: 5vw; bottom: 5vw;
@@ -26,6 +28,9 @@
             display: flex;
             background-color: darken(@colortheme_modal-bg, 10%);
             font-weight: bold;
+            position: sticky;
+            top: 0;
+            z-index: 1;
             .cp-fileupload-header-title {
                 padding: 0.25em 0.5em;
                 flex-grow: 1;
diff --git a/www/common/sframe-common-file.js b/www/common/sframe-common-file.js
index c7ca340a6..09f501df7 100644
--- a/www/common/sframe-common-file.js
+++ b/www/common/sframe-common-file.js
@@ -227,7 +227,7 @@ define([
             var $tr = $('<tr>', {id: id}).appendTo($table);
             var $lines = $table.find('tr[id]');
             if ($lines.length > 5) {
-                $lines.slice(0, $lines.length - 5).remove();
+                //$lines.slice(0, $lines.length - 5).remove();
             }
 
             var $cancel = $('<span>', {'class': 'cp-fileupload-table-cancel-button fa fa-times'}).click(function () {

From 0efbc77370e13b1619a05b964202ec2191f2289a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Thu, 6 Feb 2020 17:27:16 +0000
Subject: [PATCH 05/57] add max-width to settings

---
 customize.dist/src/less2/include/sidebar-layout.less | 1 +
 1 file changed, 1 insertion(+)

diff --git a/customize.dist/src/less2/include/sidebar-layout.less b/customize.dist/src/less2/include/sidebar-layout.less
index 5525f0fb8..6e4017acc 100644
--- a/customize.dist/src/less2/include/sidebar-layout.less
+++ b/customize.dist/src/less2/include/sidebar-layout.less
@@ -97,6 +97,7 @@
                         margin-left: 10px;
                     }
                 }
+                max-width: 650px;
                 margin-bottom: 20px;
                 .buttons_main();
             }

From 9ba786df4c7ebbc0f47f5f60a1b7ac129faf154c Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 6 Feb 2020 18:32:05 +0100
Subject: [PATCH 06/57] Fix avatar in notification history

---
 www/notifications/inner.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/www/notifications/inner.js b/www/notifications/inner.js
index 2e89c5078..0cc4ad87e 100644
--- a/www/notifications/inner.js
+++ b/www/notifications/inner.js
@@ -101,7 +101,11 @@ define([
                 var time = new Date(data.content.time);
                 $(el).find(".cp-notification-content").append(h("span.notification-time", time.toLocaleString()));
                 $(el).addClass("cp-app-notification-archived");
-                $(el).toggle(!isDataUnread);
+                if (isDataUnread) {
+                    $(el).hide();
+                } else {
+                    $(el).css('display', 'flex');
+                }
                 $(notifsList).append(el);
             }
         };
@@ -140,7 +144,7 @@ define([
                 addNotification(data, el);
             },
             onViewed: function (data) {
-                $('.cp-app-notification-archived[data-hash="' + data.hash + '"]').show();
+                $('.cp-app-notification-archived[data-hash="' + data.hash + '"]').css('display', 'flex');
             }
         });
 

From d9f2c90c259829c8582faa72ce0eb0bfea4eeda1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Fri, 7 Feb 2020 09:40:17 +0000
Subject: [PATCH 07/57] fix color of expiration warning in sheets

---
 customize.dist/src/less2/include/colortheme.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/customize.dist/src/less2/include/colortheme.less b/customize.dist/src/less2/include/colortheme.less
index 05a46c25d..709afa7c8 100644
--- a/customize.dist/src/less2/include/colortheme.less
+++ b/customize.dist/src/less2/include/colortheme.less
@@ -135,7 +135,7 @@
 
 @colortheme_oocell-bg: #40865c;
 @colortheme_oocell-color: #FFF;
-@colortheme_oocell-warn: #cd2532;
+@colortheme_oocell-warn: #ffbcc0;
 
 @colortheme_kanban-bg: #8C4;
 @colortheme_kanban-color: #000;

From 961f475dcd16eb365fc4672f5a90a1d6791d6bb7 Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Fri, 7 Feb 2020 11:55:56 +0100
Subject: [PATCH 08/57] Translated using Weblate (Catalan)

Currently translated at 51.5% (616 of 1197 strings)

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

diff --git a/www/common/translations/messages.ca.json b/www/common/translations/messages.ca.json
index 536f4b1bc..d840a0acc 100644
--- a/www/common/translations/messages.ca.json
+++ b/www/common/translations/messages.ca.json
@@ -299,7 +299,7 @@
     "contacts_confirmRemoveHistory": "De debò voleu suprimir permanentment el vostre historial de xat? Les dades no es podran restaurar",
     "contacts_removeHistoryServerError": "Hi ha hagut un error mentre es suprimia el vostre historial del xat. Torneu-ho a provar",
     "contacts_fetchHistory": "Recupera l'historial antic",
-    "contacts_friends": "Amistats",
+    "contacts_friends": "Contactes",
     "contacts_rooms": "Sales",
     "contacts_leaveRoom": "Deixa aquesta sala",
     "contacts_online": "En aquesta sala hi ha una altra persona en línia",
@@ -585,5 +585,37 @@
     "upload_mustLogin": "Cal que inicieu la sessió per carregar un fitxer",
     "upload_up": "Carrega",
     "download_button": "Desxifra i descarrega",
-    "download_mt_button": "Descarrega"
+    "download_mt_button": "Descarrega",
+    "home_ngi": "Guanyador del premi NGI",
+    "home_host_agpl": "CryptPad es distribueix sota els termes de la llicència de programari AGPL3",
+    "home_host": "Aquesta és una instància comunitària independent de CryptPad. El codi font està disponible<a href=\"https://github.com/xwiki-labs/cryptpad\" target=\"_blank\" rel=\"noreferrer noopener\">a GitHub</a>.",
+    "home_product": "CryptPad és una alternativa, respectuosa amb la privacitat, a les utilitats d'oficina i els serveis al núvol. Tot el contingut desat a CryptPad es xifra abans de ser enviat, això vol dir que ningú pot accedir a les vostres dades sense que li doneu les claus (fins i tot nosaltres).",
+    "mdToolbar_toc": "Taula de continguts",
+    "mdToolbar_code": "Codi",
+    "mdToolbar_check": "Llista de tasques",
+    "mdToolbar_list": "Llista de vinyetes",
+    "mdToolbar_nlist": "Llista ordenada",
+    "mdToolbar_quote": "Cita",
+    "mdToolbar_link": "Enllaç",
+    "mdToolbar_heading": "Capçalera",
+    "mdToolbar_strikethrough": "Tatxat",
+    "mdToolbar_italic": "Cursiva",
+    "mdToolbar_bold": "Negreta",
+    "mdToolbar_tutorial": "https://ca.wikipedia.org/wiki/Markdown",
+    "mdToolbar_help": "Suport",
+    "mdToolbar_defaultText": "El vostre text",
+    "mdToolbar_button": "Mostra o amaga la barra d'eines de Markdown",
+    "pad_base64": "Aquest document conté imatges emmagatzemades de forma ineficient. Aquestes imatges augmenten significativament la mida del document al CryptDrive i fa que la càrrega sigui més lenta. Podeu migrar les imatges a un format diferent perquè es guardin per separat al CryptDrive. Voleu migrar ara aquestes imatges?",
+    "todo_markAsIncompleteTitle": "Marca la tasca com incompleta",
+    "pad_hideToolbar": "Amaga la barra d'eines",
+    "pad_showToolbar": "Mostra la barra d'eines",
+    "todo_removeTaskTitle": "Elimina la tasca del llistat",
+    "todo_markAsCompleteTitle": "Marca la tasca com a completada",
+    "todo_newTodoNameTitle": "Afegiu la tasca al llistat",
+    "todo_newTodoNamePlaceholder": "Descriviu la tasca...",
+    "todo_title": "CryptTasques",
+    "download_step2": "Desxifrant",
+    "download_step1": "Descarregant",
+    "download_dl": "Descarrega",
+    "download_resourceNotAvailable": "El recurs sol·licitat no estava disponible... Premeu Esc per continuar."
 }

From 164e5d63d2774f70486297b69e5d1b8bfb6fb598 Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Fri, 7 Feb 2020 11:55:57 +0100
Subject: [PATCH 09/57] Translated using Weblate (French)

Currently translated at 100.0% (1204 of 1204 strings)

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

diff --git a/www/common/translations/messages.fr.json b/www/common/translations/messages.fr.json
index f2a9408a6..694b218d6 100644
--- a/www/common/translations/messages.fr.json
+++ b/www/common/translations/messages.fr.json
@@ -522,8 +522,8 @@
     "settings_creationSkipFalse": "Afficher",
     "settings_templateSkip": "Passer la fenêtre de choix d'un modèle",
     "settings_templateSkipHint": "Quand vous créez un nouveau pad, et si vous possédez des modèles pour ce type de pad, une fenêtre peut apparaître pour demander si vous souhaitez importer un modèle. Ici vous pouvez choisir de ne jamais montrer cette fenêtre et donc de ne jamais utiliser de modèle.",
-    "settings_ownDriveTitle": "Activer les dernières fonctionnalités du compte",
-    "settings_ownDriveHint": "Pour des raisons techniques, les comptes utilisateurs les plus anciens n'ont pas accès à toutes les fonctionnalités. Une mise à niveau gratuite permet de préparer votre CryptDrive pour les nouveautés à venir sans perturber vos activités habituelles.",
+    "settings_ownDriveTitle": "Mise à jour du compte",
+    "settings_ownDriveHint": "Les comptes plus anciens n'ont pas accès aux dernières fonctionnalités, pour des raisons techniques. Une mise à niveau gratuite permet d'activer les fonctionnalités actuelles et de préparer votre CryptDrive pour les futures mises à jour.",
     "settings_ownDriveButton": "Mettre à niveau votre compte",
     "settings_ownDriveConfirm": "La mise à niveau peut prendre du temps. Vous devrez vous reconnecter sur tous vos appareils. Voulez-vous continuer ?",
     "settings_ownDrivePending": "Votre compte est en train d'être mis à jour. Veuillez ne pas fermer ou recharger cette page avant que le traitement soit terminé.",
@@ -1293,5 +1293,12 @@
     "oo_sheetMigration_anonymousEditor": "L'édition de cette feuille de calcul est désactivée pour les utilisateurs anonymes jusqu'à ce qu'elle soit mise à jour par un utilisateur enregistré.",
     "imprint": "Mentions légales",
     "isContact": "{0} est dans vos contacts",
-    "isNotContact": "{0} n'est <b>pas</b> dans vos contacts"
+    "isNotContact": "{0} n'est <b>pas</b> dans vos contacts",
+    "settings_safeLinksHint": "CryptPad inclut dans ses liens les clés permettant de décrypter vos pads. Toute personne ayant accès à votre historique de navigation peut potentiellement lire vos données. Cela inclut les extensions de navigateur intrusives et les navigateurs qui synchronisent votre historique entre les appareils. L'activation des \"liens sécurisés\" empêche les clés d'entrer dans votre historique de navigation ou d'être affichées dans votre barre d'adresse quand cela est possible. Nous vous recommandons vivement d'activer cette fonction et d'utiliser le menu {0} Partager.",
+    "profile_login": "Vous devez vous connecter pour ajouter cet utilisateur à vos contacts",
+    "dontShowAgain": "Ne plus demander",
+    "safeLinks_error": "Le lien utilisé ne permet pas d'ouvrir ce document",
+    "settings_safeLinksCheckbox": "Activer les liens sécurisés",
+    "settings_safeLinksTitle": "Liens Sécurisés",
+    "settings_cat_security": "Confidentialité"
 }

From 4cf834fb229ee4f835cccfa564a2de7399d0dda1 Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Fri, 7 Feb 2020 11:55:57 +0100
Subject: [PATCH 10/57] Translated using Weblate (English)

Currently translated at 100.0% (1204 of 1204 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1204 of 1204 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1203 of 1203 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1202 of 1202 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1201 of 1201 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1200 of 1200 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1199 of 1199 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1198 of 1198 strings)

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

diff --git a/www/common/translations/messages.json b/www/common/translations/messages.json
index 596d61468..76e72cc2e 100644
--- a/www/common/translations/messages.json
+++ b/www/common/translations/messages.json
@@ -535,8 +535,8 @@
     "settings_creationSkipFalse": "Display",
     "settings_templateSkip": "Skip the template selection modal",
     "settings_templateSkipHint": "When you create a new empty pad, if you have stored templates for this type of pad, a modal appears to ask if you want to use a template. Here you can choose to never show this modal and so to never use a template.",
-    "settings_ownDriveTitle": "Enable latest account features",
-    "settings_ownDriveHint": "For technical reasons, older accounts do not have access to all of our latest features. A free upgrade to a new account will prepare your CryptDrive for upcoming features without disrupting your usual activities.",
+    "settings_ownDriveTitle": "Update Account",
+    "settings_ownDriveHint": "Older accounts do not have access to the latest features, due to technical reasons. A free update will enable current features, and prepare your CryptDrive for future updates.",
     "settings_ownDriveButton": "Upgrade your account",
     "settings_ownDriveConfirm": "Upgrading your account may take some time. You will need to log back in on all your devices. Are you sure?",
     "settings_ownDrivePending": "Your account is being upgraded. Please do not close or reload this page until the process has completed.",
@@ -1293,5 +1293,12 @@
     "oo_sheetMigration_loading": "Upgrading your spreadsheet to the latest version",
     "oo_sheetMigration_complete": "Updated version available, press OK to reload.",
     "oo_sheetMigration_anonymousEditor": "Editing this spreadsheet is disabled for anonymous users until it is upgraded to the latest version by a registered user.",
-    "imprint": "Legal notice"
+    "imprint": "Legal notice",
+    "settings_cat_security": "Confidentiality",
+    "settings_safeLinksTitle": "Safe Links",
+    "settings_safeLinksCheckbox": "Enable safe links",
+    "safeLinks_error": "This link does not give you access to the document",
+    "dontShowAgain": "Don't show again",
+    "profile_login": "You need to log in to add this user to your contacts",
+    "settings_safeLinksHint": "CryptPad includes the keys to decrypt your pads in their links. Anyone with access to your browsing history can potentially read your data. This includes intrusive browser extensions and browsers that sync your history across devices. Enabling \"safe links\" prevents the keys from entering your browsing history or being displayed in your address bar whenever possible. We strongly recommend that you enable this feature and use the {0} Share menu."
 }

From f9b101dcd92987bfa0f8422d7b79387818136c92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Fri, 7 Feb 2020 10:59:50 +0000
Subject: [PATCH 11/57] use the same key to say 'don't show again'

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

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 4916517e6..feec4f243 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -3753,7 +3753,7 @@ define([
         ]);
 
         var settings = h('div.cp-creation-remember', [
-            UI.createCheckbox('cp-creation-remember', Messages.creation_saveSettings, false),
+            UI.createCheckbox('cp-creation-remember', Messages.dontShowAgain, false),
             createHelper('/settings/#creation', Messages.creation_settings),
             h('div.cp-creation-remember-help.cp-creation-slider', [
                 h('span.fa.fa-exclamation-circle.cp-creation-warning'),

From fede44c8e5cd36635ed4e2a4281fc2e5250d4bed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Fri, 7 Feb 2020 11:04:51 +0000
Subject: [PATCH 12/57] remove XXXs related to translation keys

---
 www/common/common-interface.js | 2 +-
 www/profile/inner.js           | 2 +-
 www/settings/inner.js          | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/www/common/common-interface.js b/www/common/common-interface.js
index f08a9aa72..14dd675e6 100644
--- a/www/common/common-interface.js
+++ b/www/common/common-interface.js
@@ -1064,7 +1064,7 @@ define([
 
         var dontShowAgain = h('div.cp-corner-dontshow', [
             h('span.fa.fa-times'),
-            Messages.dontShowAgain || "Don't show again" // XXX
+            Messages.dontShowAgain
         ]);
 
         var popup = h('div.cp-corner-container', [
diff --git a/www/profile/inner.js b/www/profile/inner.js
index 773b21206..9626c7734 100644
--- a/www/profile/inner.js
+++ b/www/profile/inner.js
@@ -575,7 +575,7 @@ define([
             var register = h('button.cp-corner-primary', Messages.login_register);
             var cancel = h('button.cp-corner-cancel', Messages.cancel);
             var actions = h('div', [cancel, register, login]);
-            var modal = UI.cornerPopup(Messages.profile_login || "You need to log in to add this user to your contacts", actions, '', {alt: true}); // XXX
+            var modal = UI.cornerPopup(Messages.profile_login, actions, '', {alt: true});
             $(register).click(function () {
                 common.setLoginRedirect(function () {
                     common.gotoURL('/register/');
diff --git a/www/settings/inner.js b/www/settings/inner.js
index 3279bd89b..b44c23cb5 100644
--- a/www/settings/inner.js
+++ b/www/settings/inner.js
@@ -570,7 +570,6 @@ define([
     // Security
 
     makeBlock('safe-links', function (cb) {
-        // XXX settings_safeLinksTitle, settings_safeLinksHint, settings_safeLinksCheckbox
 
         var $cbox = $(UI.createCheckbox('cp-settings-safe-links',
                                    Messages.settings_safeLinksCheckbox,

From ea5c6defe660b6ea3bfe699a349390752a473eb2 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Fri, 7 Feb 2020 13:36:54 +0100
Subject: [PATCH 13/57] Fix import mediatag to the drive

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

diff --git a/www/common/sframe-common.js b/www/common/sframe-common.js
index a651bfa31..1a713494c 100644
--- a/www/common/sframe-common.js
+++ b/www/common/sframe-common.js
@@ -142,7 +142,13 @@ define([
         if (!$mt || !$mt.is('media-tag')) { return; }
         var chanStr = $mt.attr('src');
         var keyStr = $mt.attr('data-crypto-key');
-        var channel = chanStr.replace(/\/blob\/[0-9a-f]{2}\//i, '');
+        // Remove origin
+        var a = document.createElement('a');
+        a.href = chanStr;
+        var src = a.pathname;
+        // Get channel id
+        var channel = src.replace(/\/blob\/[0-9a-f]{2}\//i, '');
+        // Get key
         var key = keyStr.replace(/cryptpad:/i, '');
         var metadata = $mt[0]._mediaObject._blob.metadata;
         ctx.sframeChan.query('Q_IMPORT_MEDIATAG', {

From 7d0dbe5d093b2bb9a0a33c31eab773867879158a Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Fri, 7 Feb 2020 14:10:50 +0100
Subject: [PATCH 14/57] Remove XXX

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

diff --git a/www/settings/inner.js b/www/settings/inner.js
index b44c23cb5..683a3e222 100644
--- a/www/settings/inner.js
+++ b/www/settings/inner.js
@@ -56,7 +56,7 @@ define([
             'cp-settings-migrate',
             'cp-settings-delete'
         ],
-        'security': [ // XXX
+        'security': [
             'cp-settings-logout-everywhere',
             'cp-settings-autostore',
             'cp-settings-safe-links',

From 49294fc0c32a6e217a8eb8c6355b7cabe2366245 Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Fri, 7 Feb 2020 17:25:22 +0100
Subject: [PATCH 15/57] Translated using Weblate (English)

Currently translated at 100.0% (1204 of 1204 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 76e72cc2e..d3fbd1c65 100644
--- a/www/common/translations/messages.json
+++ b/www/common/translations/messages.json
@@ -936,7 +936,7 @@
     "feedback_about": "If you're reading this, you were probably curious why CryptPad is requesting web pages when you perform certain actions",
     "feedback_privacy": "We care about your privacy, and at the same time we want CryptPad to be very easy to use.  We use this file to figure out which UI features matter to our users, by requesting it along with a parameter specifying which action was taken.",
     "feedback_optout": "If you would like to opt out, visit <a href='/settings/'>your user settings page</a>, where you'll find a checkbox to enable or disable user feedback",
-    "creation_404": "This pad not longer exists. Use the following form to create a new pad.",
+    "creation_404": "This pad no longer exists. Use the following form to create a new pad.",
     "creation_ownedTitle": "Type of pad",
     "creation_owned": "Owned pad",
     "creation_ownedTrue": "Owned pad",

From 1332f33a1a79da6afb7bdb981a404c76996c6b67 Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Fri, 7 Feb 2020 17:25:22 +0100
Subject: [PATCH 16/57] Translated using Weblate (French)

Currently translated at 100.0% (1204 of 1204 strings)

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

diff --git a/www/common/translations/messages.fr.json b/www/common/translations/messages.fr.json
index 694b218d6..79740780a 100644
--- a/www/common/translations/messages.fr.json
+++ b/www/common/translations/messages.fr.json
@@ -1294,7 +1294,7 @@
     "imprint": "Mentions légales",
     "isContact": "{0} est dans vos contacts",
     "isNotContact": "{0} n'est <b>pas</b> dans vos contacts",
-    "settings_safeLinksHint": "CryptPad inclut dans ses liens les clés permettant de décrypter vos pads. Toute personne ayant accès à votre historique de navigation peut potentiellement lire vos données. Cela inclut les extensions de navigateur intrusives et les navigateurs qui synchronisent votre historique entre les appareils. L'activation des \"liens sécurisés\" empêche les clés d'entrer dans votre historique de navigation ou d'être affichées dans votre barre d'adresse quand cela est possible. Nous vous recommandons vivement d'activer cette fonction et d'utiliser le menu {0} Partager.",
+    "settings_safeLinksHint": "CryptPad inclut dans ses liens les clés permettant de déchiffrer vos pads. Toute personne ayant accès à votre historique de navigation peut potentiellement lire vos données. Cela inclut les extensions de navigateur intrusives et les navigateurs qui synchronisent votre historique entre les appareils. L'activation des \"liens sécurisés\" empêche les clés d'entrer dans votre historique de navigation ou d'être affichées dans votre barre d'adresse quand cela est possible. Nous vous recommandons vivement d'activer cette fonction et d'utiliser le menu {0} Partager.",
     "profile_login": "Vous devez vous connecter pour ajouter cet utilisateur à vos contacts",
     "dontShowAgain": "Ne plus demander",
     "safeLinks_error": "Le lien utilisé ne permet pas d'ouvrir ce document",

From f23649c1ce9b34342b48d79920ef88a16ff9c16b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Fri, 7 Feb 2020 16:28:29 +0000
Subject: [PATCH 17/57] remove obsolete keys

---
 www/common/translations/messages.json | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/www/common/translations/messages.json b/www/common/translations/messages.json
index d3fbd1c65..c3ac1e275 100644
--- a/www/common/translations/messages.json
+++ b/www/common/translations/messages.json
@@ -184,7 +184,6 @@
     "okButton": "OK (enter)",
     "cancel": "Cancel",
     "cancelButton": "Cancel (esc)",
-    "doNotAskAgain": "Don't ask me again (Esc)",
     "show_help_button": "Show help",
     "hide_help_button": "Hide help",
     "help_button": "Help",
@@ -956,7 +955,6 @@
     "creation_noTemplate": "No template",
     "creation_newTemplate": "New template",
     "creation_create": "Create",
-    "creation_saveSettings": "Don't show this again",
     "creation_settings": "View more settings",
     "creation_rememberHelp": "Visit your Settings page to reset this preference",
     "creation_owners": "Owners",
@@ -1028,7 +1026,6 @@
     "crowdfunding_popup_text": "<h3>We need your help!</h3>To ensure that CryptPad is actively developed, consider supporting the project via the <a href=\"https://opencollective.com/cryptpad\">OpenCollective page</a>, where you can see our <b>Roadmap</b> and <b>Funding goals</b>.",
     "crowdfunding_popup_yes": "Go to OpenCollective",
     "crowdfunding_popup_no": "Not now",
-    "crowdfunding_popup_never": "Don't ask me again",
     "survey": "CryptPad survey",
     "markdown_toc": "Contents",
     "fm_expirablePad": "Expires: {0}",

From 802034616c3144d167fe46d8abb63c0b1907fd72 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Fri, 7 Feb 2020 12:53:12 -0500
Subject: [PATCH 18/57] centralize historykeeper-rpc interaction in rpc methods

---
 lib/commands/channel.js  | 87 +++++++++++++++++++++++++++++++++++-----
 lib/commands/metadata.js | 16 ++++++--
 lib/commands/pin-rpc.js  |  5 +--
 lib/historyKeeper.js     | 76 ++---------------------------------
 lib/rpc.js               |  2 +-
 5 files changed, 96 insertions(+), 90 deletions(-)

diff --git a/lib/commands/channel.js b/lib/commands/channel.js
index bbb83b45a..88404a9b2 100644
--- a/lib/commands/channel.js
+++ b/lib/commands/channel.js
@@ -6,7 +6,7 @@ const nThen = require("nthen");
 const Core = require("./core");
 const Metadata = require("./metadata");
 
-Channel.clearOwnedChannel = function (Env, safeKey, channelId, cb) {
+Channel.clearOwnedChannel = function (Env, safeKey, channelId, cb, Server) {
     if (typeof(channelId) !== 'string' || channelId.length !== 32) {
         return cb('INVALID_ARGUMENTS');
     }
@@ -20,19 +20,46 @@ Channel.clearOwnedChannel = function (Env, safeKey, channelId, cb) {
             return void cb('INSUFFICIENT_PERMISSIONS');
         }
         return void Env.msgStore.clearChannel(channelId, function (e) {
-            cb(e);
+            if (e) { return void cb(e); }
+            cb();
+
+            const channel_cache = Env.historyKeeper.channel_cache;
+
+            const clear = function () {
+                // delete the channel cache because it will have been invalidated
+                delete channel_cache[channelId];
+            };
+
+            nThen(function (w) {
+                Server.getChannelUserList(channelId).forEach(function (userId) {
+                    Server.send(userId, [
+                        0,
+                        Env.historyKeeper.id,
+                        'MSG',
+                        userId,
+                        JSON.stringify({
+                            error: 'ECLEARED',
+                            channel: channelId
+                        })
+                    ], w());
+                });
+            }).nThen(function () {
+                clear();
+            }).orTimeout(function () {
+                Env.Log.warn("ON_CHANNEL_CLEARED_TIMEOUT", channelId);
+                clear();
+            }, 30000);
         });
     });
 };
 
-Channel.removeOwnedChannel = function (Env, safeKey, channelId, cb) {
+Channel.removeOwnedChannel = function (Env, safeKey, channelId, cb, Server) {
     if (typeof(channelId) !== 'string' || !Core.isValidId(channelId)) {
         return cb('INVALID_ARGUMENTS');
     }
     var unsafeKey = Util.unescapeKeyCharacters(safeKey);
 
     if (Env.blobStore.isFileId(channelId)) {
-        //var safeKey = Util.escapeKeyCharacters(unsafeKey);
         var blobId = channelId;
 
         return void nThen(function (w) {
@@ -89,6 +116,45 @@ Channel.removeOwnedChannel = function (Env, safeKey, channelId, cb) {
                 return void cb(e);
             }
             cb(void 0, 'OK');
+
+            const channel_cache = Env.historyKeeper.channel_cache;
+            const metadata_cache = Env.historyKeeper.metadata_cache;
+
+            const clear = function () {
+                delete channel_cache[channelId];
+                Server.clearChannel(channelId);
+                delete metadata_cache[channelId];
+            };
+
+            // an owner of a channel deleted it
+            nThen(function (w) {
+                // close the channel in the store
+                Env.msgStore.closeChannel(channelId, w());
+            }).nThen(function (w) {
+                // Server.channelBroadcast would be better
+                // but we can't trust it to track even one callback,
+                // let alone many in parallel.
+                // so we simulate it on this side to avoid race conditions
+                Server.getChannelUserList(channelId).forEach(function (userId) {
+                    Server.send(userId, [
+                        0,
+                        Env.historyKeeper.id,
+                        "MSG",
+                        userId,
+                        JSON.stringify({
+                            error: 'EDELETED',
+                            channel: channelId,
+                        })
+                    ], w());
+                });
+            }).nThen(function () {
+                // clear the channel's data from memory
+                // once you've sent everyone a notice that the channel has been deleted
+                clear();
+            }).orTimeout(function () {
+                Env.Log.warn('ON_CHANNEL_DELETED_TIMEOUT', channelId);
+                clear();
+            }, 30000);
         });
     });
 };
@@ -121,6 +187,8 @@ Channel.trimHistory = function (Env, safeKey, data, cb) {
             // clear historyKeeper's cache for this channel
             Env.historyKeeper.channelClose(channelId);
             cb(void 0, 'OK');
+            delete Env.historyKeeper.channel_cache[channelId];
+            delete Env.historyKeeper.metadata_cache[channelId];
         });
     });
 };
@@ -160,7 +228,7 @@ Channel.isNewChannel = function (Env, channel, cb) {
 
     Otherwise behaves the same as sending to a channel
 */
-Channel.writePrivateMessage = function (Env, args, cb, Server) { // XXX odd signature
+Channel.writePrivateMessage = function (Env, args, cb, Server) {
     var channelId = args[0];
     var msg = args[1];
 
@@ -197,11 +265,10 @@ Channel.writePrivateMessage = function (Env, args, cb, Server) { // XXX odd sign
     // if the message isn't valid it won't be stored.
     Env.historyKeeper.channelMessage(Server, channelStruct, fullMessage);
 
-    // call back with the message and the target channel.
-    // historyKeeper will take care of broadcasting it if anyone is in the channel
-    cb(void 0, {
-        channel: channelId,
-        message: fullMessage
+    Server.getChannelUserList(channelId).forEach(function (userId) {
+        Server.send(userId, fullMessage);
     });
+
+    cb();
 };
 
diff --git a/lib/commands/metadata.js b/lib/commands/metadata.js
index 09cf1f1d6..41aea9888 100644
--- a/lib/commands/metadata.js
+++ b/lib/commands/metadata.js
@@ -12,8 +12,7 @@ Data.getMetadata = function (Env, channel, cb/* , Server */) {
     if (!Core.isValidId(channel)) { return void cb('INVALID_CHAN'); }
     if (channel.length !== 32) { return cb("INVALID_CHAN_LENGTH"); }
 
-    // XXX get metadata from the server cache if it is available
-    // Server isn't always passed, though...
+    // FIXME get metadata from the server cache if it is available
     batchMetadata(channel, cb, function (done) {
         var ref = {};
         var lineHandler = Meta.createLineHandler(ref, Env.Log.error);
@@ -37,7 +36,7 @@ Data.getMetadata = function (Env, channel, cb/* , Server */) {
     }
 */
 var queueMetadata = WriteQueue();
-Data.setMetadata = function (Env, safeKey, data, cb) {
+Data.setMetadata = function (Env, safeKey, data, cb, Server) {
     var unsafeKey = Util.unescapeKeyCharacters(safeKey);
 
     var channel = data.channel;
@@ -108,8 +107,19 @@ Data.setMetadata = function (Env, safeKey, data, cb) {
                     cb(e);
                     return void next();
                 }
+
                 cb(void 0, metadata);
                 next();
+
+                const metadata_cache = Env.historyKeeper.metadata_cache;
+                const channel_cache = Env.historyKeeper.channel_cache;
+
+                metadata_cache[channel] = metadata;
+
+                var index = Util.find(channel_cache, [channel, 'index']);
+                if (index && typeof(index) === 'object') { index.metadata = metadata; }
+
+                Server.channelBroadcast(channel, JSON.stringify(metadata), Env.historyKeeper.id);
             });
         });
     });
diff --git a/lib/commands/pin-rpc.js b/lib/commands/pin-rpc.js
index 2478910a7..d4bb96b71 100644
--- a/lib/commands/pin-rpc.js
+++ b/lib/commands/pin-rpc.js
@@ -205,7 +205,6 @@ Pinning.removePins = function (Env, safeKey, cb) {
 };
 
 Pinning.trimPins = function (Env, safeKey, cb) {
-    // XXX trim to latest pin checkpoint
     cb("NOT_IMPLEMENTED");
 };
 
@@ -453,10 +452,10 @@ Pinning.loadChannelPins = function (Env) {
 
 Pinning.isChannelPinned = function (Env, channel, cb) {
     Env.evPinnedPadsReady.reg(() => {
-        if (Env.pinnedPads[channel] && Object.keys(Env.pinnedPads[channel]).length) {
+        if (Env.pinnedPads[channel] && Object.keys(Env.pinnedPads[channel]).length) { // FIXME 'Object.keys' here is overkill. We only need to know that it isn't empty
             cb(void 0, true);
         } else {
-            delete Env.pinnedPads[channel]; // XXX WAT
+            delete Env.pinnedPads[channel];
             cb(void 0, false);
         }
     });
diff --git a/lib/historyKeeper.js b/lib/historyKeeper.js
index ff7b531e9..9c859f1fb 100644
--- a/lib/historyKeeper.js
+++ b/lib/historyKeeper.js
@@ -644,48 +644,6 @@ module.exports.create = function (cfg, cb) {
         });
     };
 
-
-    /*  onChannelCleared
-        * broadcasts to all clients in a channel if that channel is deleted
-    */
-    const onChannelCleared = function (Server, channel) {
-        Server.channelBroadcast(channel, {
-            error: 'ECLEARED',
-            channel: channel
-        }, HISTORY_KEEPER_ID);
-    };
-
-    // When a channel is removed from datastore, broadcast a message to all its connected users
-    const onChannelDeleted = function (Server, channel) {
-        store.closeChannel(channel, function () {
-            Server.channelBroadcast(channel, {
-                error: 'EDELETED',
-                channel: channel
-            }, HISTORY_KEEPER_ID);
-        });
-
-        delete channel_cache[channel];
-        Server.clearChannel(channel);
-        delete metadata_cache[channel];
-    };
-    // Check if the selected channel is expired
-    // If it is, remove it from memory and broadcast a message to its members
-
-    const onChannelMetadataChanged = function (Server, channel, metadata) {
-        if (!(channel && metadata_cache[channel] && typeof (metadata) === "object")) { return; }
-        Log.silly('SET_METADATA_CACHE', {
-            channel: channel,
-            metadata: JSON.stringify(metadata),
-        });
-
-        metadata_cache[channel] = metadata;
-
-        if (channel_cache[channel] && channel_cache[channel].index) {
-            channel_cache[channel].index.metadata = metadata;
-        }
-        Server.channelBroadcast(channel, metadata, HISTORY_KEEPER_ID);
-    };
-
     const handleGetHistory = function (Server, seq, userId, parsed) {
         // parsed[1] is the channel id
         // parsed[2] is a validation key or an object containing metadata (optionnal)
@@ -892,37 +850,6 @@ module.exports.create = function (cfg, cb) {
                     Server.send(userId, [0, HISTORY_KEEPER_ID, 'MSG', userId, JSON.stringify([parsed[0], 'ERROR', err])]); 
                     return;
                 }
-                var msg = rpc_call[0].slice();
-                if (msg[3] === 'REMOVE_OWNED_CHANNEL') {
-                    onChannelDeleted(Server, msg[4]);
-                }
-                if (msg[3] === 'CLEAR_OWNED_CHANNEL') {
-                    onChannelCleared(Server, msg[4]);
-                }
-
-                if (msg[3] === 'SET_METADATA') { // or whatever we call the RPC????
-                    // make sure we update our cache of metadata
-                    // or at least invalidate it and force other mechanisms to recompute its state
-                    // 'output' could be the new state as computed by rpc
-                    onChannelMetadataChanged(Server, msg[4].channel, output[1]);
-                }
-
-                // unauthenticated RPC calls have a different message format
-                if (msg[0] === "WRITE_PRIVATE_MESSAGE" && output && output.channel) {
-                    // clients don't validate messages sent by the historyKeeper
-                    // so this broadcast needs to come from a different id
-                    // we pass 'null' to indicate that it's not coming from a real user
-                    // to ensure that they know not to trust this message
-                    Server.getChannelUserList(output.channel).forEach(function (userId) {
-                        Server.send(userId, output.message);
-                    });
-
-                    // rpc and anonRpc expect their responses to be of a certain length
-                    // and we've already used the output of the rpc call, so overwrite it
-                    output = [null, null, null];
-                }
-
-                // finally, send a response to the client that sent the RPC
                 Server.send(userId, [0, HISTORY_KEEPER_ID, 'MSG', userId, JSON.stringify([parsed[0]].concat(output))]);
             });
         } catch (e) {
@@ -967,6 +894,9 @@ module.exports.create = function (cfg, cb) {
     };
 
     cfg.historyKeeper = {
+        metadata_cache: metadata_cache,
+        channel_cache: channel_cache,
+
         id: HISTORY_KEEPER_ID,
 
         channelMessage: function (Server, channel, msgStruct) {
diff --git a/lib/rpc.js b/lib/rpc.js
index 96b678856..60b186563 100644
--- a/lib/rpc.js
+++ b/lib/rpc.js
@@ -60,6 +60,7 @@ const AUTHENTICATED_USER_TARGETED = {
     WRITE_LOGIN_BLOCK: Block.writeLoginBlock,
     REMOVE_LOGIN_BLOCK: Block.removeLoginBlock,
     ADMIN: Admin.command,
+    SET_METADATA: Metadata.setMetadata,
 };
 
 const AUTHENTICATED_USER_SCOPED = {
@@ -70,7 +71,6 @@ const AUTHENTICATED_USER_SCOPED = {
     EXPIRE_SESSION: Core.expireSessionAsync,
     REMOVE_PINS: Pinning.removePins,
     TRIM_PINS: Pinning.trimPins,
-    SET_METADATA: Metadata.setMetadata,
     COOKIE: Core.haveACookie,
 };
 

From 7000be0e705b2dfe71100cbadfe59b51a772bb1e Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Fri, 7 Feb 2020 18:58:57 -0500
Subject: [PATCH 19/57] clean up historykeeper

---
 lib/api.js           |  96 ++---
 lib/historyKeeper.js | 950 +++----------------------------------------
 lib/hk-util.js       | 902 +++++++++++++++++++++++++++++++++++++++-
 3 files changed, 988 insertions(+), 960 deletions(-)

diff --git a/lib/api.js b/lib/api.js
index bbfefa4b8..c13f8c7c8 100644
--- a/lib/api.js
+++ b/lib/api.js
@@ -1,75 +1,45 @@
 /* jshint esversion: 6 */
-const nThen = require("nthen");
 const WebSocketServer = require('ws').Server;
 const NetfluxSrv = require('chainpad-server');
 
 module.exports.create = function (config) {
-    const wsConfig = {
-        server: config.httpServer,
-    };
+    // asynchronously create a historyKeeper and RPC together
+    require('./historyKeeper.js').create(config, function (err, historyKeeper) {
+        if (err) { throw err; }
 
-    nThen(function (w) {
-        require('../storage/file').create(config, w(function (_store) {
-            config.store = _store;
-        }));
-    }).nThen(function (w) {
-        // XXX embed this in historyKeeper
-        require("../storage/tasks").create(config, w(function (e, tasks) {
-            if (e) {
-                throw e;
-            }
-            config.tasks = tasks;
-            if (config.disableIntegratedTasks) { return; }
+        var log = config.log;
 
-            config.intervals = config.intervals || {};
-            config.intervals.taskExpiration = setInterval(function () {
-                tasks.runAll(function (err) {
-                    if (err) {
-                        // either TASK_CONCURRENCY or an error with tasks.list
-                        // in either case it is already logged.
-                    }
-                });
-            }, 1000 * 60 * 5); // run every five minutes
-        }));
-    }).nThen(function () {
-        // asynchronously create a historyKeeper and RPC together
-        require('./historyKeeper.js').create(config, function (err, historyKeeper) {
-            if (err) { throw err; }
-
-            var log = config.log;
-
-            // spawn ws server and attach netflux event handlers
-            NetfluxSrv.create(new WebSocketServer(wsConfig))
-                .on('channelClose', historyKeeper.channelClose)
-                .on('channelMessage', historyKeeper.channelMessage)
-                .on('channelOpen', historyKeeper.channelOpen)
-                .on('sessionClose', function (userId, reason) {
-                    if (['BAD_MESSAGE', 'SOCKET_ERROR', 'SEND_MESSAGE_FAIL_2'].indexOf(reason) !== -1) {
-                        return void log.error('SESSION_CLOSE_WITH_ERROR', {
-                            userId: userId,
-                            reason: reason,
-                        });
-                    }
-                    log.verbose('SESSION_CLOSE_ROUTINE', {
+        // spawn ws server and attach netflux event handlers
+        NetfluxSrv.create(new WebSocketServer({ server: config.httpServer}))
+            .on('channelClose', historyKeeper.channelClose)
+            .on('channelMessage', historyKeeper.channelMessage)
+            .on('channelOpen', historyKeeper.channelOpen)
+            .on('sessionClose', function (userId, reason) {
+                if (['BAD_MESSAGE', 'SOCKET_ERROR', 'SEND_MESSAGE_FAIL_2'].indexOf(reason) !== -1) {
+                    return void log.error('SESSION_CLOSE_WITH_ERROR', {
                         userId: userId,
                         reason: reason,
                     });
-                })
-                .on('error', function (error, label, info) {
-                    if (!error) { return; }
-                    /* labels:
-                        SEND_MESSAGE_FAIL, SEND_MESSAGE_FAIL_2, FAIL_TO_DISCONNECT,
-                        FAIL_TO_TERMINATE, HANDLE_CHANNEL_LEAVE, NETFLUX_BAD_MESSAGE,
-                        NETFLUX_WEBSOCKET_ERROR
-                    */
-                    log.error(label, {
-                        code: error.code,
-                        message: error.message,
-                        stack: error.stack,
-                        info: info,
-                    });
-                })
-                .register(historyKeeper.id, historyKeeper.directMessage);
-        });
+                }
+                log.verbose('SESSION_CLOSE_ROUTINE', {
+                    userId: userId,
+                    reason: reason,
+                });
+            })
+            .on('error', function (error, label, info) {
+                if (!error) { return; }
+                /* labels:
+                    SEND_MESSAGE_FAIL, SEND_MESSAGE_FAIL_2, FAIL_TO_DISCONNECT,
+                    FAIL_TO_TERMINATE, HANDLE_CHANNEL_LEAVE, NETFLUX_BAD_MESSAGE,
+                    NETFLUX_WEBSOCKET_ERROR
+                */
+                log.error(label, {
+                    code: error.code,
+                    message: error.message,
+                    stack: error.stack,
+                    info: info,
+                });
+            })
+            .register(historyKeeper.id, historyKeeper.directMessage);
     });
 };
diff --git a/lib/historyKeeper.js b/lib/historyKeeper.js
index 9c859f1fb..dd80d0b53 100644
--- a/lib/historyKeeper.js
+++ b/lib/historyKeeper.js
@@ -1,920 +1,54 @@
 /* jshint esversion: 6 */
-/* global Buffer */
 
 const nThen = require('nthen');
-const Nacl = require('tweetnacl/nacl-fast');
 const Crypto = require('crypto');
-const Once = require("./once");
-const Meta = require("./metadata");
 const WriteQueue = require("./write-queue");
 const BatchRead = require("./batch-read");
-
 const RPC = require("./rpc");
+const HK = require("./hk-util.js");
 
-const Extras = require("./hk-util.js");
-const STANDARD_CHANNEL_LENGTH = Extras.STANDARD_CHANNEL_LENGTH;
-const EPHEMERAL_CHANNEL_LENGTH = Extras.EPHEMERAL_CHANNEL_LENGTH;
-
-let Log;
-const now = function () { return (new Date()).getTime(); };
-const ONE_DAY = 1000 * 60 * 60 * 24; // one day in milliseconds
-
-const getHash = Extras.getHash;
-
-const tryParse = function (str) {
-    try {
-        return JSON.parse(str);
-    } catch (err) {
-        Log.error('HK_PARSE_ERROR', err);
-    }
-};
-
-/*  sliceCpIndex
-    returns a list of all checkpoints which might be relevant for a client connecting to a session
-
-    * if there are two or fewer checkpoints, return everything you have
-    * if there are more than two
-      * return at least two
-      * plus any more which were received within the last 100 messages
-
-    This is important because the additional history is what prevents
-    clients from forking on checkpoints and dropping forked history.
-
-*/
-const sliceCpIndex = function (cpIndex, line) {
-    // Remove "old" checkpoints (cp sent before 100 messages ago)
-    const minLine = Math.max(0, (line - 100));
-    let start = cpIndex.slice(0, -2);
-    const end = cpIndex.slice(-2);
-    start = start.filter(function (obj) {
-        return obj.line > minLine;
-    });
-    return start.concat(end);
-};
-
-const isMetadataMessage = function (parsed) {
-    return Boolean(parsed && parsed.channel);
-};
-
-// validateKeyStrings supplied by clients must decode to 32-byte Uint8Arrays
-const isValidValidateKeyString = function (key) {
-    try {
-        return typeof(key) === 'string' &&
-            Nacl.util.decodeBase64(key).length === Nacl.sign.publicKeyLength;
-    } catch (e) {
-        return false;
-    }
-};
-
-var CHECKPOINT_PATTERN = /^cp\|(([A-Za-z0-9+\/=]+)\|)?/;
-
-module.exports.create = function (cfg, cb) {
-    var rpc;
-    const tasks = cfg.tasks;
-    const store = cfg.store;
-    Log = cfg.log;
+module.exports.create = function (config, cb) {
+    const Log = config.log;
 
     Log.silly('HK_LOADING', 'LOADING HISTORY_KEEPER MODULE');
 
-    const metadata_cache = {};
-    const channel_cache = {};
-    const HISTORY_KEEPER_ID = Crypto.randomBytes(8).toString('hex');
-
-    Log.verbose('HK_ID', 'History keeper ID: ' + HISTORY_KEEPER_ID);
-
-    /*  computeIndex
-        can call back with an error or a computed index which includes:
-            * cpIndex:
-                * array including any checkpoints pushed within the last 100 messages
-                * processed by 'sliceCpIndex(cpIndex, line)'
-            * offsetByHash:
-                * a map containing message offsets by their hash
-                * this is for every message in history, so it could be very large...
-                    * except we remove offsets from the map if they occur before the oldest relevant checkpoint
-            * size: in bytes
-            * metadata:
-                * validationKey
-                * expiration time
-                * owners
-                * ??? (anything else we might add in the future)
-            * line
-                * the number of messages in history
-                * including the initial metadata line, if it exists
-
-    */
-    const computeIndex = function (channelName, cb) {
-        const cpIndex = [];
-        let messageBuf = [];
-        let metadata;
-        let i = 0;
-
-        const ref = {};
-
-        const CB = Once(cb);
+    // TODO populate Env with everything that you use from config
+    // so that you can stop passing around your raw config
+    // and more easily share state between historyKeeper and rpc
+    const Env = {
+        Log: Log,
+        // tasks
+        // store
+        id: Crypto.randomBytes(8).toString('hex'),
 
-        const offsetByHash = {};
-        let size = 0;
-        nThen(function (w) {
-            // iterate over all messages in the channel log
-            // old channels can contain metadata as the first message of the log
-            // remember metadata the first time you encounter it
-            // otherwise index important messages in the log
-            store.readMessagesBin(channelName, 0, (msgObj, readMore) => {
-                let msg;
-                // keep an eye out for the metadata line if you haven't already seen it
-                // but only check for metadata on the first line
-                if (!i && !metadata && msgObj.buff.indexOf('{') === 0) {
-                    i++; // always increment the message counter
-                    msg = tryParse(msgObj.buff.toString('utf8'));
-                    if (typeof msg === "undefined") { return readMore(); }
-
-                    // validate that the current line really is metadata before storing it as such
-                    if (isMetadataMessage(msg)) {
-                        metadata = msg;
-                        return readMore();
-                    }
-                }
-                i++;
-                if (msgObj.buff.indexOf('cp|') > -1) {
-                    msg = msg || tryParse(msgObj.buff.toString('utf8'));
-                    if (typeof msg === "undefined") { return readMore(); }
-                    // cache the offsets of checkpoints if they can be parsed
-                    if (msg[2] === 'MSG' && msg[4].indexOf('cp|') === 0) {
-                        cpIndex.push({
-                            offset: msgObj.offset,
-                            line: i
-                        });
-                        // we only want to store messages since the latest checkpoint
-                        // so clear the buffer every time you see a new one
-                        messageBuf = [];
-                    }
-                }
-                // if it's not metadata or a checkpoint then it should be a regular message
-                // store it in the buffer
-                messageBuf.push(msgObj);
-                return readMore();
-            }, w((err) => {
-                if (err && err.code !== 'ENOENT') {
-                    w.abort();
-                    return void CB(err);
-                }
-
-                // once indexing is complete you should have a buffer of messages since the latest checkpoint
-                // map the 'hash' of each message to its byte offset in the log, to be used for reconnecting clients
-                messageBuf.forEach((msgObj) => {
-                    const msg = tryParse(msgObj.buff.toString('utf8'));
-                    if (typeof msg === "undefined") { return; }
-                    if (msg[0] === 0 && msg[2] === 'MSG' && typeof(msg[4]) === 'string') {
-                        // msgObj.offset is API guaranteed by our storage module
-                        // it should always be a valid positive integer
-                        offsetByHash[getHash(msg[4], Log)] = msgObj.offset;
-                    }
-                    // There is a trailing \n at the end of the file
-                    size = msgObj.offset + msgObj.buff.length + 1;
-                });
-            }));
-        }).nThen(function (w) {
-            // create a function which will iterate over amendments to the metadata
-            const handler = Meta.createLineHandler(ref, Log.error);
-
-            // initialize the accumulator in case there was a foundational metadata line in the log content
-            if (metadata) { handler(void 0, metadata); }
-
-            // iterate over the dedicated metadata log (if it exists)
-            // proceed even in the event of a stream error on the metadata log
-            store.readDedicatedMetadata(channelName, handler, w(function (err) {
-                if (err) {
-                    return void Log.error("DEDICATED_METADATA_ERROR", err);
-                }
-            }));
-        }).nThen(function () {
-            // when all is done, cache the metadata in memory
-            if (ref.index) { // but don't bother if no metadata was found...
-                metadata = metadata_cache[channelName] = ref.meta;
-            }
-            // and return the computed index
-            CB(null, {
-                // Only keep the checkpoints included in the last 100 messages
-                cpIndex: sliceCpIndex(cpIndex, i),
-                offsetByHash: offsetByHash,
-                size: size,
-                metadata: metadata,
-                line: i
-            });
-        });
+        metadata_cache: {},
+        channel_cache: {},
+        queueStorage: WriteQueue(),
+        batchIndexReads: BatchRead("HK_GET_INDEX"),
     };
 
-    /*  getIndex
-        calls back with an error if anything goes wrong
-        or with a cached index for a channel if it exists
-            (along with metadata)
-        otherwise it calls back with the index computed by 'computeIndex'
-
-        as an added bonus:
-        if the channel exists but its index does not then it caches the index
-    */
-    const batchIndexReads = BatchRead("HK_GET_INDEX");
-    const getIndex = (channelName, cb) => {
-        const chan = channel_cache[channelName];
-
-        // if there is a channel in memory and it has an index cached, return it
-        if (chan && chan.index) {
-            // enforce async behaviour
-            return void setTimeout(function () {
-                cb(undefined, chan.index);
-            });
-        }
-
-        batchIndexReads(channelName, cb, function (done) {
-            computeIndex(channelName, (err, ret) => {
-                // this is most likely an unrecoverable filesystem error
-                if (err) { return void done(err); }
-                // cache the computed result if possible
-                if (chan) { chan.index = ret; }
-                // return
-                done(void 0, ret);
-            });
-        });
-    };
-
-    /*  storeMessage
-        * channel id
-        * the message to store
-        * whether the message is a checkpoint
-        * optionally the hash of the message
-            * it's not always used, but we guard against it
-
-
-        * async but doesn't have a callback
-        * source of a race condition whereby:
-          * two messaages can be inserted
-          * two offsets can be computed using the total size of all the messages
-          * but the offsets don't correspond to the actual location of the newlines
-            * because the two actions were performed like ABba...
-        * the fix is to use callbacks and implement queueing for writes
-          * to guarantee that offset computation is always atomic with writes
-    */
-    const queueStorage = WriteQueue();
-
-    const storeMessage = function (channel, msg, isCp, optionalMessageHash) {
-        const id = channel.id;
-
-        queueStorage(id, function (next) {
-            const msgBin = Buffer.from(msg + '\n', 'utf8');
-            // Store the message first, and update the index only once it's stored.
-            // store.messageBin can be async so updating the index first may
-            // result in a wrong cpIndex
-            nThen((waitFor) => {
-                store.messageBin(id, msgBin, waitFor(function (err) {
-                    if (err) {
-                        waitFor.abort();
-                        Log.error("HK_STORE_MESSAGE_ERROR", err.message);
+    config.historyKeeper = {
+        metadata_cache: Env.metadata_cache,
+        channel_cache: Env.channel_cache,
 
-                        // this error is critical, but there's not much we can do at the moment
-                        // proceed with more messages, but they'll probably fail too
-                        // at least you won't have a memory leak
-
-                        // TODO make it possible to respond to clients with errors so they know
-                        // their message wasn't stored
-                        return void next();
-                    }
-                }));
-            }).nThen((waitFor) => {
-                getIndex(id, waitFor((err, index) => {
-                    if (err) {
-                        Log.warn("HK_STORE_MESSAGE_INDEX", err.stack);
-                        // non-critical, we'll be able to get the channel index later
-                        return void next();
-                    }
-                    if (typeof (index.line) === "number") { index.line++; }
-                    if (isCp) {
-                        index.cpIndex = sliceCpIndex(index.cpIndex, index.line || 0);
-                        for (let k in index.offsetByHash) {
-                            if (index.offsetByHash[k] < index.cpIndex[0]) {
-                                delete index.offsetByHash[k];
-                            }
-                        }
-                        index.cpIndex.push({
-                            offset: index.size,
-                            line: ((index.line || 0) + 1)
-                        });
-                    }
-                    if (optionalMessageHash) { index.offsetByHash[optionalMessageHash] = index.size; }
-                    index.size += msgBin.length;
-
-                    // handle the next element in the queue
-                    next();
-                }));
-            });
-        });
-    };
-
-    /*  expireChannel is here to clean up channels that should have been removed
-        but for some reason are still present
-    */
-    const expireChannel = function (channel) {
-        return void store.archiveChannel(channel, function (err) {
-            Log.info("ARCHIVAL_CHANNEL_BY_HISTORY_KEEPER_EXPIRATION", {
-                channelId: channel,
-                status: err? String(err): "SUCCESS",
-            });
-        });
-    };
-
-    /*  dropChannel
-        * cleans up memory structures which are managed entirely by the historyKeeper
-    */
-    const dropChannel = function (chanName) {
-        delete metadata_cache[chanName];
-        delete channel_cache[chanName];
-    };
-
-    /*  checkExpired
-        * synchronously returns true or undefined to indicate whether the channel is expired
-          * according to its metadata
-        * has some side effects:
-          * closes the channel via the store.closeChannel API
-            * and then broadcasts to all channel members that the channel has expired
-          * removes the channel from the netflux-server's in-memory cache
-          * removes the channel metadata from history keeper's in-memory cache
-
-        FIXME the boolean nature of this API should be separated from its side effects
-    */
-    const checkExpired = function (Server, channel) {
-        if (!(channel && channel.length === STANDARD_CHANNEL_LENGTH)) { return false; }
-        let metadata = metadata_cache[channel];
-        if (!(metadata && typeof(metadata.expire) === 'number')) { return false; }
-
-        // the number of milliseconds ago the channel should have expired
-        let pastDue = (+new Date()) - metadata.expire;
-
-        // less than zero means that it hasn't expired yet
-        if (pastDue < 0) { return false; }
-
-        // if it should have expired more than a day ago...
-        // there may have been a problem with scheduling tasks
-        // or the scheduled tasks may not be running
-        // so trigger a removal from here
-        if (pastDue >= ONE_DAY) { expireChannel(channel); }
-
-        // close the channel
-        store.closeChannel(channel, function () {
-            Server.channelBroadcast(channel, {
-                error: 'EEXPIRED',
-                channel: channel
-            }, HISTORY_KEEPER_ID);
-            dropChannel(channel);
-        });
-
-        // return true to indicate that it has expired
-        return true;
-    };
-
-    /*  onChannelMessage
-        Determine what we should store when a message a broadcasted to a channel"
-
-        * ignores ephemeral channels
-        * ignores messages sent to expired channels
-        * rejects duplicated checkpoints
-        * validates messages to channels that have validation keys
-        * caches the id of the last saved checkpoint
-        * adds timestamps to incoming messages
-        * writes messages to the store
-    */
-    const onChannelMessage = function (Server, channel, msgStruct) {
-        // TODO our usage of 'channel' here looks prone to errors
-        // we only use it for its 'id', but it can contain other stuff
-        // also, we're using this RPC from both the RPC and Netflux-server
-        // we should probably just change this to expect a channel id directly
-
-        // don't store messages if the channel id indicates that it's an ephemeral message
-        if (!channel.id || channel.id.length === EPHEMERAL_CHANNEL_LENGTH) { return; }
-
-        const isCp = /^cp\|/.test(msgStruct[4]);
-        let id;
-        if (isCp) {
-            // id becomes either null or an array or results...
-            id = CHECKPOINT_PATTERN.exec(msgStruct[4]);
-            if (Array.isArray(id) && id[2] && id[2] === channel.lastSavedCp) {
-                // Reject duplicate checkpoints
-                return;
-            }
-        }
-
-        let metadata;
-        nThen(function (w) {
-            // getIndex (and therefore the latest metadata)
-            getIndex(channel.id, w(function (err, index) {
-                if (err) {
-                    w.abort();
-                    return void Log.error('CHANNEL_MESSAGE_ERROR', err);
-                }
-
-                if (!index.metadata) {
-                    // if there's no channel metadata then it can't be an expiring channel
-                    // nor can we possibly validate it
-                    return;
-                }
-
-                metadata = index.metadata;
-
-                // don't write messages to expired channels
-                if (checkExpired(Server, channel)) { return void w.abort(); }
-
-                // if there's no validateKey present skip to the next block
-                if (!metadata.validateKey) { return; }
-
-                // trim the checkpoint indicator off the message if it's present
-                let signedMsg = (isCp) ? msgStruct[4].replace(CHECKPOINT_PATTERN, '') : msgStruct[4];
-                // convert the message from a base64 string into a Uint8Array
-
-                // FIXME this can fail and the client won't notice
-                signedMsg = Nacl.util.decodeBase64(signedMsg);
-
-                // FIXME this can blow up
-                // TODO check that that won't cause any problems other than not being able to append...
-                const validateKey = Nacl.util.decodeBase64(metadata.validateKey);
-                // validate the message
-                const validated = Nacl.sign.open(signedMsg, validateKey);
-                if (!validated) {
-                    // don't go any further if the message fails validation
-                    w.abort();
-                    Log.info("HK_SIGNED_MESSAGE_REJECTED", 'Channel '+channel.id);
-                    return;
-                }
-            }));
-        }).nThen(function () {
-            // do checkpoint stuff...
-
-            // 1. get the checkpoint id
-            // 2. reject duplicate checkpoints
-
-            if (isCp) {
-                // if the message is a checkpoint we will have already validated
-                // that it isn't a duplicate. remember its id so that we can
-                // repeat this process for the next incoming checkpoint
-
-                // WARNING: the fact that we only check the most recent checkpoints
-                // is a potential source of bugs if one editor has high latency and
-                // pushes a duplicate of an earlier checkpoint than the latest which
-                // has been pushed by editors with low latency
-                // FIXME
-                if (Array.isArray(id) && id[2]) {
-                    // Store new checkpoint hash
-                    channel.lastSavedCp = id[2];
-                }
-            }
-
-            // add the time to the message
-            msgStruct.push(now());
-
-            // storeMessage
-            storeMessage(channel, JSON.stringify(msgStruct), isCp, getHash(msgStruct[4], Log));
-        });
-    };
-
-    /*  getHistoryOffset
-        returns a number representing the byte offset from the start of the log
-        for whatever history you're seeking.
-
-        query by providing a 'lastKnownHash',
-            which is really just a string of the first 64 characters of an encrypted message.
-        OR by -1 which indicates that we want the full history (byte offset 0)
-        OR nothing, which indicates that you want whatever messages the historyKeeper deems relevant
-            (typically the last few checkpoints)
-
-        this function embeds a lot of the history keeper's logic:
-
-        0. if you passed -1 as the lastKnownHash it means you want the complete history
-          * I'm not sure why you'd need to call this function if you know it will return 0 in this case...
-          * it has a side-effect of filling the index cache if it's empty
-        1. if you provided a lastKnownHash and that message does not exist in the history:
-          * either the client has made a mistake or the history they knew about no longer exists
-          * call back with EINVAL
-        2. if you did not provide a lastKnownHash
-          * and there are fewer than two checkpoints:
-            * return 0 (read from the start of the file)
-          * and there are two or more checkpoints:
-            * return the offset of the earliest checkpoint which 'sliceCpIndex' considers relevant
-        3. if you did provide a lastKnownHash
-          * read through the log until you find the hash that you're looking for
-          * call back with either the byte offset of the message that you found OR
-          * -1 if you didn't find it
-
-    */
-    const getHistoryOffset = (channelName, lastKnownHash, cb) => {
-        // lastKnownhash === -1 means we want the complete history
-        if (lastKnownHash === -1) { return void cb(null, 0); }
-        let offset = -1;
-        nThen((waitFor) => {
-            getIndex(channelName, waitFor((err, index) => {
-                if (err) { waitFor.abort(); return void cb(err); }
-
-                // check if the "hash" the client is requesting exists in the index
-                const lkh = index.offsetByHash[lastKnownHash];
-                // we evict old hashes from the index as new checkpoints are discovered.
-                // if someone connects and asks for a hash that is no longer relevant,
-                // we tell them it's an invalid request. This is because of the semantics of "GET_HISTORY"
-                // which is only ever used when connecting or reconnecting in typical uses of history...
-                // this assumption should hold for uses by chainpad, but perhaps not for other uses cases.
-                // EXCEPT: other cases don't use checkpoints!
-                // clients that are told that their request is invalid should just make another request
-                // without specifying the hash, and just trust the server to give them the relevant data.
-                // QUESTION: does this mean mailboxes are causing the server to store too much stuff in memory?
-                if (lastKnownHash && typeof(lkh) !== "number") {
-                    waitFor.abort();
-                    return void cb(new Error('EINVAL'));
-                }
-
-                // Since last 2 checkpoints
-                if (!lastKnownHash) {
-                    waitFor.abort();
-                    // Less than 2 checkpoints in the history: return everything
-                    if (index.cpIndex.length < 2) { return void cb(null, 0); }
-                    // Otherwise return the second last checkpoint's index
-                    return void cb(null, index.cpIndex[0].offset);
-                    /* LATER...
-                        in practice, two checkpoints can be very close together
-                        we have measures to avoid duplicate checkpoints, but editors
-                        can produce nearby checkpoints which are slightly different,
-                        and slip past these protections. To be really careful, we can
-                        seek past nearby checkpoints by some number of patches so as
-                        to ensure that all editors have sufficient knowledge of history
-                        to reconcile their differences. */
-                }
-
-                offset = lkh;
-            }));
-        }).nThen((waitFor) => {
-            // if offset is less than zero then presumably the channel has no messages
-            // returning falls through to the next block and therefore returns -1
-            if (offset !== -1) { return; }
-
-            // do a lookup from the index
-            // FIXME maybe we don't need this anymore?
-            // otherwise we have a non-negative offset and we can start to read from there
-            store.readMessagesBin(channelName, 0, (msgObj, readMore, abort) => {
-                // tryParse return a parsed message or undefined
-                const msg = tryParse(msgObj.buff.toString('utf8'));
-                // if it was undefined then go onto the next message
-                if (typeof msg === "undefined") { return readMore(); }
-                if (typeof(msg[4]) !== 'string' || lastKnownHash !== getHash(msg[4], Log)) {
-                    return void readMore();
-                }
-                offset = msgObj.offset;
-                abort();
-            }, waitFor(function (err) {
-                if (err) { waitFor.abort(); return void cb(err); }
-            }));
-        }).nThen(() => {
-            cb(null, offset);
-        });
-    };
-
-    /*  getHistoryAsync
-        * finds the appropriate byte offset from which to begin reading using 'getHistoryOffset'
-        * streams through the rest of the messages, safely parsing them and returning the parsed content to the handler
-        * calls back when it has reached the end of the log
-
-        Used by:
-        * GET_HISTORY
-
-    */
-    const getHistoryAsync = (channelName, lastKnownHash, beforeHash, handler, cb) => {
-        let offset = -1;
-        nThen((waitFor) => {
-            getHistoryOffset(channelName, lastKnownHash, waitFor((err, os) => {
-                if (err) {
-                    waitFor.abort();
-                    return void cb(err);
-                }
-                offset = os;
-            }));
-        }).nThen((waitFor) => {
-            if (offset === -1) { return void cb(new Error("could not find offset")); }
-            const start = (beforeHash) ? 0 : offset;
-            store.readMessagesBin(channelName, start, (msgObj, readMore, abort) => {
-                if (beforeHash && msgObj.offset >= offset) { return void abort(); }
-                var parsed = tryParse(msgObj.buff.toString('utf8'));
-                if (!parsed) { return void readMore(); }
-                handler(parsed, readMore);
-            }, waitFor(function (err) {
-                return void cb(err);
-            }));
-        });
-    };
-
-    /*  getOlderHistory
-        * allows clients to query for all messages until a known hash is read
-        * stores all messages in history as they are read
-          * can therefore be very expensive for memory
-          * should probably be converted to a streaming interface
-
-        Used by:
-        * GET_HISTORY_RANGE
-    */
-    const getOlderHistory = function (channelName, oldestKnownHash, cb) {
-        var messageBuffer = [];
-        var found = false;
-        store.getMessages(channelName, function (msgStr) {
-            if (found) { return; }
-
-            let parsed = tryParse(msgStr);
-            if (typeof parsed === "undefined") { return; }
-
-            // identify classic metadata messages by their inclusion of a channel.
-            // and don't send metadata, since:
-            // 1. the user won't be interested in it
-            // 2. this metadata is potentially incomplete/incorrect
-            if (isMetadataMessage(parsed)) { return; }
-
-            var content = parsed[4];
-            if (typeof(content) !== 'string') { return; }
-
-            var hash = getHash(content, Log);
-            if (hash === oldestKnownHash) {
-                found = true;
-            }
-            messageBuffer.push(parsed);
-        }, function (err) {
-            if (err) {
-                Log.error("HK_GET_OLDER_HISTORY", err);
-            }
-            cb(messageBuffer);
-        });
-    };
-
-    const handleGetHistory = function (Server, seq, userId, parsed) {
-        // parsed[1] is the channel id
-        // parsed[2] is a validation key or an object containing metadata (optionnal)
-        // parsed[3] is the last known hash (optionnal)
-
-        Server.send(userId, [seq, 'ACK']);
-        var channelName = parsed[1];
-        var config = parsed[2];
-        var metadata = {};
-        var lastKnownHash;
-
-        // clients can optionally pass a map of attributes
-        // if the channel already exists this map will be ignored
-        // otherwise it will be stored as the initial metadata state for the channel
-        if (config && typeof config === "object" && !Array.isArray(parsed[2])) {
-            lastKnownHash = config.lastKnownHash;
-            metadata = config.metadata || {};
-            if (metadata.expire) {
-                metadata.expire = +metadata.expire * 1000 + (+new Date());
-            }
-        }
-        metadata.channel = channelName;
-        metadata.created = +new Date();
-
-        // if the user sends us an invalid key, we won't be able to validate their messages
-        // so they'll never get written to the log anyway. Let's just drop their message
-        // on the floor instead of doing a bunch of extra work
-        // TODO send them an error message so they know something is wrong
-        if (metadata.validateKey && !isValidValidateKeyString(metadata.validateKey)) {
-            return void Log.error('HK_INVALID_KEY', metadata.validateKey);
-        }
-
-        nThen(function (waitFor) {
-            var w = waitFor();
-
-            /*  unless this is a young channel, we will serve all messages from an offset
-                this will not include the channel metadata, so we need to explicitly fetch that.
-                unfortunately, we can't just serve it blindly, since then young channels will
-                send the metadata twice, so let's do a quick check of what we're going to serve...
-            */
-            getIndex(channelName, waitFor((err, index) => {
-                /*  if there's an error here, it should be encountered
-                    and handled by the next nThen block.
-                    so, let's just fall through...
-                */
-                if (err) { return w(); }
-
-
-                // it's possible that the channel doesn't have metadata
-                // but in that case there's no point in checking if the channel expired
-                // or in trying to send metadata, so just skip this block
-                if (!index || !index.metadata) { return void w(); }
-                // And then check if the channel is expired. If it is, send the error and abort
-                // FIXME this is hard to read because 'checkExpired' has side effects
-                if (checkExpired(Server, channelName)) { return void waitFor.abort(); }
-                // always send metadata with GET_HISTORY requests
-                Server.send(userId, [0, HISTORY_KEEPER_ID, 'MSG', userId, JSON.stringify(index.metadata)], w);
-            }));
-        }).nThen(() => {
-            let msgCount = 0;
-
-            // TODO compute lastKnownHash in a manner such that it will always skip past the metadata line?
-            getHistoryAsync(channelName, lastKnownHash, false, (msg, readMore) => {
-                msgCount++;
-                // avoid sending the metadata message a second time
-                if (isMetadataMessage(msg) && metadata_cache[channelName]) { return readMore(); }
-                Server.send(userId, [0, HISTORY_KEEPER_ID, 'MSG', userId, JSON.stringify(msg)], readMore);
-            }, (err) => {
-                if (err && err.code !== 'ENOENT') {
-                    if (err.message !== 'EINVAL') { Log.error("HK_GET_HISTORY", err); }
-                    const parsedMsg = {error:err.message, channel: channelName};
-                    Server.send(userId, [0, HISTORY_KEEPER_ID, 'MSG', userId, JSON.stringify(parsedMsg)]);
-                    return;
-                }
-
-                const chan = channel_cache[channelName];
-
-                if (msgCount === 0 && !metadata_cache[channelName] && Server.channelContainsUser(channelName, userId)) {
-                    metadata_cache[channelName] = metadata;
-
-                    // the index will have already been constructed and cached at this point
-                    // but it will not have detected any metadata because it hasn't been written yet
-                    // this means that the cache starts off as invalid, so we have to correct it
-                    if (chan && chan.index) { chan.index.metadata = metadata; }
-
-                    // new channels will always have their metadata written to a dedicated metadata log
-                    // but any lines after the first which are not amendments in a particular format will be ignored.
-                    // Thus we should be safe from race conditions here if just write metadata to the log as below...
-                    // TODO validate this logic
-                    // otherwise maybe we need to check that the metadata log is empty as well
-                    store.writeMetadata(channelName, JSON.stringify(metadata), function (err) {
-                        if (err) {
-                            // FIXME tell the user that there was a channel error?
-                            return void Log.error('HK_WRITE_METADATA', {
-                                channel: channelName,
-                                error: err,
-                            });
-                        }
-                    });
-
-                    // write tasks
-                    if(tasks && metadata.expire && typeof(metadata.expire) === 'number') {
-                        // the fun part...
-                        // the user has said they want this pad to expire at some point
-                        tasks.write(metadata.expire, "EXPIRE", [ channelName ], function (err) {
-                            if (err) {
-                                // if there is an error, we don't want to crash the whole server...
-                                // just log it, and if there's a problem you'll be able to fix it
-                                // at a later date with the provided information
-                                Log.error('HK_CREATE_EXPIRE_TASK', err);
-                                Log.info('HK_INVALID_EXPIRE_TASK', JSON.stringify([metadata.expire, 'EXPIRE', channelName]));
-                            }
-                        });
-                    }
-                    Server.send(userId, [0, HISTORY_KEEPER_ID, 'MSG', userId, JSON.stringify(metadata)]);
-                }
-
-                // End of history message:
-                let parsedMsg = {state: 1, channel: channelName};
-
-                Server.send(userId, [0, HISTORY_KEEPER_ID, 'MSG', userId, JSON.stringify(parsedMsg)]);
-            });
-        });
-    };
-
-    const handleGetHistoryRange = function (Server, seq, userId, parsed) {
-        var channelName = parsed[1];
-        var map = parsed[2];
-
-        if (!(map && typeof(map) === 'object')) {
-            return void Server.send(userId, [seq, 'ERROR', 'INVALID_ARGS', HISTORY_KEEPER_ID]);
-        }
-
-        var oldestKnownHash = map.from;
-        var desiredMessages = map.count;
-        var desiredCheckpoint = map.cpCount;
-        var txid = map.txid;
-        if (typeof(desiredMessages) !== 'number' && typeof(desiredCheckpoint) !== 'number') {
-            return void Server.send(userId, [seq, 'ERROR', 'UNSPECIFIED_COUNT', HISTORY_KEEPER_ID]);
-        }
-
-        if (!txid) {
-            return void Server.send(userId, [seq, 'ERROR', 'NO_TXID', HISTORY_KEEPER_ID]);
-        }
-
-        Server.send(userId, [seq, 'ACK']);
-        return void getOlderHistory(channelName, oldestKnownHash, function (messages) {
-            var toSend = [];
-            if (typeof (desiredMessages) === "number") {
-                toSend = messages.slice(-desiredMessages);
-            } else {
-                let cpCount = 0;
-                for (var i = messages.length - 1; i >= 0; i--) {
-                    if (/^cp\|/.test(messages[i][4]) && i !== (messages.length - 1)) {
-                        cpCount++;
-                    }
-                    toSend.unshift(messages[i]);
-                    if (cpCount >= desiredCheckpoint) { break; }
-                }
-            }
-            toSend.forEach(function (msg) {
-                Server.send(userId, [0, HISTORY_KEEPER_ID, 'MSG', userId,
-                    JSON.stringify(['HISTORY_RANGE', txid, msg])]);
-            });
-
-            Server.send(userId, [0, HISTORY_KEEPER_ID, 'MSG', userId,
-                JSON.stringify(['HISTORY_RANGE_END', txid, channelName])
-            ]);
-        });
-    };
-
-    const handleGetFullHistory = function (Server, seq, userId, parsed) {
-        // parsed[1] is the channel id
-        // parsed[2] is a validation key (optionnal)
-        // parsed[3] is the last known hash (optionnal)
-
-        Server.send(userId, [seq, 'ACK']);
-
-        // FIXME should we send metadata here too?
-        // none of the clientside code which uses this API needs metadata, but it won't hurt to send it (2019-08-22)
-        return void getHistoryAsync(parsed[1], -1, false, (msg, readMore) => {
-            Server.send(userId, [0, HISTORY_KEEPER_ID, 'MSG', userId, JSON.stringify(['FULL_HISTORY', msg])], readMore);
-        }, (err) => {
-            let parsedMsg = ['FULL_HISTORY_END', parsed[1]];
-            if (err) {
-                Log.error('HK_GET_FULL_HISTORY', err.stack);
-                parsedMsg = ['ERROR', parsed[1], err.message];
-            }
-            Server.send(userId, [0, HISTORY_KEEPER_ID, 'MSG', userId, JSON.stringify(parsedMsg)]);
-        });
-    };
-
-    const handleRPC = function (Server, seq, userId, parsed) {
-        if (typeof(rpc) !== 'function') { return; }
-
-        /* RPC Calls...  */
-        var rpc_call = parsed.slice(1);
-
-        Server.send(userId, [seq, 'ACK']);
-        try {
-            // slice off the sequence number and pass in the rest of the message
-            rpc(Server, rpc_call, function (err, output) {
-                if (err) {
-                    Server.send(userId, [0, HISTORY_KEEPER_ID, 'MSG', userId, JSON.stringify([parsed[0], 'ERROR', err])]); 
-                    return;
-                }
-                Server.send(userId, [0, HISTORY_KEEPER_ID, 'MSG', userId, JSON.stringify([parsed[0]].concat(output))]);
-            });
-        } catch (e) {
-            // if anything throws in the middle, send an error
-            Server.send(userId, [0, HISTORY_KEEPER_ID, 'MSG', userId, JSON.stringify([parsed[0], 'ERROR', 'SERVER_ERROR'])]);
-        }
-    };
-
-    const directMessageCommands = {
-        GET_HISTORY: handleGetHistory,
-        GET_HISTORY_RANGE: handleGetHistoryRange,
-        GET_FULL_HISTORY: handleGetFullHistory,
-    };
-
-    /*  onDirectMessage
-        * exported for use by the netflux-server
-        * parses and handles all direct messages directed to the history keeper
-          * check if it's expired and execute all the associated side-effects
-          * routes queries to the appropriate handlers
-    */
-    const onDirectMessage = function (Server, seq, userId, json) {
-        Log.silly('HK_MESSAGE', json);
-
-        let parsed;
-        try {
-            parsed = JSON.parse(json[2]);
-        } catch (err) {
-            Log.error("HK_PARSE_CLIENT_MESSAGE", json);
-            return;
-        }
-
-        // If the requested history is for an expired channel, abort
-        // Note the if we don't have the keys for that channel in metadata_cache, we'll
-        // have to abort later (once we know the expiration time)
-        if (checkExpired(Server, parsed[1])) { return; }
-
-        // look up the appropriate command in the map of commands or fall back to RPC
-        var command = directMessageCommands[parsed[0]] || handleRPC;
-
-        // run the command with the standard function signature
-        command(Server, seq, userId, parsed);
-    };
-
-    cfg.historyKeeper = {
-        metadata_cache: metadata_cache,
-        channel_cache: channel_cache,
-
-        id: HISTORY_KEEPER_ID,
+        id: Env.id,
 
         channelMessage: function (Server, channel, msgStruct) {
             // netflux-server emits 'channelMessage' events whenever someone broadcasts to a channel
             // historyKeeper stores these messages if the channel id indicates that they are
             // a channel type with permanent history
-            onChannelMessage(Server, channel, msgStruct);
+            HK.onChannelMessage(Env, Server, channel, msgStruct);
         },
         channelClose: function (channelName) {
             // netflux-server emits 'channelClose' events whenever everyone leaves a channel
             // we drop cached metadata and indexes at the same time
-            dropChannel(channelName);
+            HK.dropChannel(Env, channelName);
         },
         channelOpen: function (Server, channelName, userId) {
-            channel_cache[channelName] = {};
+            Env.channel_cache[channelName] = {};
             Server.send(userId, [
                 0,
-                HISTORY_KEEPER_ID,
+                Env.id,
                 'JOIN',
                 channelName
             ]);
@@ -922,14 +56,42 @@ module.exports.create = function (cfg, cb) {
         directMessage: function (Server, seq, userId, json) {
             // netflux-server allows you to register an id with a handler
             // this handler is invoked every time someone sends a message to that id
-            onDirectMessage(Server, seq, userId, json);
+            HK.onDirectMessage(Env, Server, seq, userId, json);
         },
     };
 
-    RPC.create(cfg, function (err, _rpc) {
-        if (err) { throw err; }
+    Log.verbose('HK_ID', 'History keeper ID: ' + Env.id);
+
+    nThen(function (w) {
+        require('../storage/file').create(config, w(function (_store) {
+            config.store = _store;
+            Env.store = _store;
+        }));
+    }).nThen(function (w) {
+        require("../storage/tasks").create(config, w(function (e, tasks) {
+            if (e) {
+                throw e;
+            }
+            Env.tasks = tasks;
+            config.tasks = tasks;
+            if (config.disableIntegratedTasks) { return; }
 
-        rpc = _rpc;
-        cb(void 0, cfg.historyKeeper);
+            config.intervals = config.intervals || {};
+            config.intervals.taskExpiration = setInterval(function () {
+                tasks.runAll(function (err) {
+                    if (err) {
+                        // either TASK_CONCURRENCY or an error with tasks.list
+                        // in either case it is already logged.
+                    }
+                });
+            }, 1000 * 60 * 5); // run every five minutes
+        }));
+    }).nThen(function () {
+        RPC.create(config, function (err, _rpc) {
+            if (err) { throw err; }
+
+            Env.rpc = _rpc;
+            cb(void 0, config.historyKeeper);
+        });
     });
 };
diff --git a/lib/hk-util.js b/lib/hk-util.js
index aaa861054..0fc196fe3 100644
--- a/lib/hk-util.js
+++ b/lib/hk-util.js
@@ -1,5 +1,15 @@
+/* jshint esversion: 6 */
+/* global Buffer */
 var HK = module.exports;
 
+const nThen = require('nthen');
+const Once = require("./once");
+const Meta = require("./metadata");
+const Nacl = require('tweetnacl/nacl-fast');
+
+const now = function () { return (new Date()).getTime(); };
+const ONE_DAY = 1000 * 60 * 60 * 24; // one day in milliseconds
+
 /*  getHash
     * this function slices off the leading portion of a message which is
       most likely unique
@@ -12,7 +22,7 @@ var HK = module.exports;
       * can't be easily migrated
     * don't break it!
 */
-HK.getHash = function (msg, Log) {
+const getHash = HK.getHash = function (msg, Log) {
     if (typeof(msg) !== 'string') {
         if (Log) {
             Log.warn('HK_GET_HASH', 'getHash() called on ' + typeof(msg) + ': ' + msg);
@@ -24,10 +34,896 @@ HK.getHash = function (msg, Log) {
 
 // historyKeeper should explicitly store any channel
 // with a 32 character id
-HK.STANDARD_CHANNEL_LENGTH = 32;
+const STANDARD_CHANNEL_LENGTH = HK.STANDARD_CHANNEL_LENGTH = 32;
 
 // historyKeeper should not store messages sent to any channel
 // with a 34 character id
-HK.EPHEMERAL_CHANNEL_LENGTH = 34;
+const EPHEMERAL_CHANNEL_LENGTH = HK.EPHEMERAL_CHANNEL_LENGTH = 34;
+
+const tryParse = function (Env, str) {
+    try {
+        return JSON.parse(str);
+    } catch (err) {
+        Env.Log.error('HK_PARSE_ERROR', err); // XXX
+    }
+};
+
+/*  sliceCpIndex
+    returns a list of all checkpoints which might be relevant for a client connecting to a session
+
+    * if there are two or fewer checkpoints, return everything you have
+    * if there are more than two
+      * return at least two
+      * plus any more which were received within the last 100 messages
+
+    This is important because the additional history is what prevents
+    clients from forking on checkpoints and dropping forked history.
+
+*/
+const sliceCpIndex = function (cpIndex, line) {
+    // Remove "old" checkpoints (cp sent before 100 messages ago)
+    const minLine = Math.max(0, (line - 100));
+    let start = cpIndex.slice(0, -2);
+    const end = cpIndex.slice(-2);
+    start = start.filter(function (obj) {
+        return obj.line > minLine;
+    });
+    return start.concat(end);
+};
+
+const isMetadataMessage = function (parsed) {
+    return Boolean(parsed && parsed.channel);
+};
+
+// validateKeyStrings supplied by clients must decode to 32-byte Uint8Arrays
+const isValidValidateKeyString = function (key) {
+    try {
+        return typeof(key) === 'string' &&
+            Nacl.util.decodeBase64(key).length === Nacl.sign.publicKeyLength;
+    } catch (e) {
+        return false;
+    }
+};
+
+var CHECKPOINT_PATTERN = /^cp\|(([A-Za-z0-9+\/=]+)\|)?/;
+
+/*  expireChannel is here to clean up channels that should have been removed
+    but for some reason are still present
+*/
+const expireChannel = function (Env, channel) {
+    return void Env.store.archiveChannel(channel, function (err) {
+        Env.Log.info("ARCHIVAL_CHANNEL_BY_HISTORY_KEEPER_EXPIRATION", {
+            channelId: channel,
+            status: err? String(err): "SUCCESS",
+        });
+    });
+};
+
+/*  dropChannel
+    * cleans up memory structures which are managed entirely by the historyKeeper
+*/
+const dropChannel = HK.dropChannel = function (Env, chanName) {
+    delete Env.metadata_cache[chanName];
+    delete Env.channel_cache[chanName];
+};
+
+/*  checkExpired
+    * synchronously returns true or undefined to indicate whether the channel is expired
+      * according to its metadata
+    * has some side effects:
+      * closes the channel via the store.closeChannel API
+        * and then broadcasts to all channel members that the channel has expired
+      * removes the channel from the netflux-server's in-memory cache
+      * removes the channel metadata from history keeper's in-memory cache
+
+    FIXME the boolean nature of this API should be separated from its side effects
+*/
+const checkExpired = function (Env, Server, channel) {
+    const store = Env.store;
+    const metadata_cache = Env.metadata_cache;
+
+    if (!(channel && channel.length === STANDARD_CHANNEL_LENGTH)) { return false; }
+    let metadata = metadata_cache[channel];
+    if (!(metadata && typeof(metadata.expire) === 'number')) { return false; }
+
+    // the number of milliseconds ago the channel should have expired
+    let pastDue = (+new Date()) - metadata.expire;
+
+    // less than zero means that it hasn't expired yet
+    if (pastDue < 0) { return false; }
+
+    // if it should have expired more than a day ago...
+    // there may have been a problem with scheduling tasks
+    // or the scheduled tasks may not be running
+    // so trigger a removal from here
+    if (pastDue >= ONE_DAY) { expireChannel(Env, channel); }
+
+    // close the channel
+    store.closeChannel(channel, function () {
+        Server.channelBroadcast(channel, {
+            error: 'EEXPIRED',
+            channel: channel
+        }, Env.id);
+        dropChannel(channel);
+    });
+
+    // return true to indicate that it has expired
+    return true;
+};
+
+/*  computeIndex
+    can call back with an error or a computed index which includes:
+        * cpIndex:
+            * array including any checkpoints pushed within the last 100 messages
+            * processed by 'sliceCpIndex(cpIndex, line)'
+        * offsetByHash:
+            * a map containing message offsets by their hash
+            * this is for every message in history, so it could be very large...
+                * except we remove offsets from the map if they occur before the oldest relevant checkpoint
+        * size: in bytes
+        * metadata:
+            * validationKey
+            * expiration time
+            * owners
+            * ??? (anything else we might add in the future)
+        * line
+            * the number of messages in history
+            * including the initial metadata line, if it exists
+
+*/
+const computeIndex = function (Env, channelName, cb) {
+    const store = Env.store;
+    const Log = Env.Log;
+
+    const cpIndex = [];
+    let messageBuf = [];
+    let metadata;
+    let i = 0;
+
+    const ref = {};
+
+    const CB = Once(cb);
+
+    const offsetByHash = {};
+    let size = 0;
+    nThen(function (w) {
+        // iterate over all messages in the channel log
+        // old channels can contain metadata as the first message of the log
+        // remember metadata the first time you encounter it
+        // otherwise index important messages in the log
+        store.readMessagesBin(channelName, 0, (msgObj, readMore) => {
+            let msg;
+            // keep an eye out for the metadata line if you haven't already seen it
+            // but only check for metadata on the first line
+            if (!i && !metadata && msgObj.buff.indexOf('{') === 0) {
+                i++; // always increment the message counter
+                msg = tryParse(Env, msgObj.buff.toString('utf8'));
+                if (typeof msg === "undefined") { return readMore(); }
+
+                // validate that the current line really is metadata before storing it as such
+                if (isMetadataMessage(msg)) {
+                    metadata = msg;
+                    return readMore();
+                }
+            }
+            i++;
+            if (msgObj.buff.indexOf('cp|') > -1) {
+                msg = msg || tryParse(Env, msgObj.buff.toString('utf8'));
+                if (typeof msg === "undefined") { return readMore(); }
+                // cache the offsets of checkpoints if they can be parsed
+                if (msg[2] === 'MSG' && msg[4].indexOf('cp|') === 0) {
+                    cpIndex.push({
+                        offset: msgObj.offset,
+                        line: i
+                    });
+                    // we only want to store messages since the latest checkpoint
+                    // so clear the buffer every time you see a new one
+                    messageBuf = [];
+                }
+            }
+            // if it's not metadata or a checkpoint then it should be a regular message
+            // store it in the buffer
+            messageBuf.push(msgObj);
+            return readMore();
+        }, w((err) => {
+            if (err && err.code !== 'ENOENT') {
+                w.abort();
+                return void CB(err);
+            }
+
+            // once indexing is complete you should have a buffer of messages since the latest checkpoint
+            // map the 'hash' of each message to its byte offset in the log, to be used for reconnecting clients
+            messageBuf.forEach((msgObj) => {
+                const msg = tryParse(Env, msgObj.buff.toString('utf8'));
+                if (typeof msg === "undefined") { return; }
+                if (msg[0] === 0 && msg[2] === 'MSG' && typeof(msg[4]) === 'string') {
+                    // msgObj.offset is API guaranteed by our storage module
+                    // it should always be a valid positive integer
+                    offsetByHash[getHash(msg[4], Log)] = msgObj.offset;
+                }
+                // There is a trailing \n at the end of the file
+                size = msgObj.offset + msgObj.buff.length + 1;
+            });
+        }));
+    }).nThen(function (w) {
+        // create a function which will iterate over amendments to the metadata
+        const handler = Meta.createLineHandler(ref, Log.error);
+
+        // initialize the accumulator in case there was a foundational metadata line in the log content
+        if (metadata) { handler(void 0, metadata); }
+
+        // iterate over the dedicated metadata log (if it exists)
+        // proceed even in the event of a stream error on the metadata log
+        store.readDedicatedMetadata(channelName, handler, w(function (err) {
+            if (err) {
+                return void Log.error("DEDICATED_METADATA_ERROR", err);
+            }
+        }));
+    }).nThen(function () {
+        // when all is done, cache the metadata in memory
+        if (ref.index) { // but don't bother if no metadata was found...
+            metadata = Env.metadata_cache[channelName] = ref.meta;
+        }
+        // and return the computed index
+        CB(null, {
+            // Only keep the checkpoints included in the last 100 messages
+            cpIndex: sliceCpIndex(cpIndex, i),
+            offsetByHash: offsetByHash,
+            size: size,
+            metadata: metadata,
+            line: i
+        });
+    });
+};
+
+/*  getIndex
+    calls back with an error if anything goes wrong
+    or with a cached index for a channel if it exists
+        (along with metadata)
+    otherwise it calls back with the index computed by 'computeIndex'
+
+    as an added bonus:
+    if the channel exists but its index does not then it caches the index
+*/
+const getIndex = (Env, channelName, cb) => {
+    const channel_cache = Env.channel_cache;
+
+    const chan = channel_cache[channelName];
+
+    // if there is a channel in memory and it has an index cached, return it
+    if (chan && chan.index) {
+        // enforce async behaviour
+        return void setTimeout(function () {
+            cb(undefined, chan.index);
+        });
+    }
+
+    Env.batchIndexReads(channelName, cb, function (done) {
+        computeIndex(Env, channelName, (err, ret) => {
+            // this is most likely an unrecoverable filesystem error
+            if (err) { return void done(err); }
+            // cache the computed result if possible
+            if (chan) { chan.index = ret; }
+            // return
+            done(void 0, ret);
+        });
+    });
+};
+
+/*  storeMessage
+    * channel id
+    * the message to store
+    * whether the message is a checkpoint
+    * optionally the hash of the message
+        * it's not always used, but we guard against it
+
+
+    * async but doesn't have a callback
+    * source of a race condition whereby:
+      * two messaages can be inserted
+      * two offsets can be computed using the total size of all the messages
+      * but the offsets don't correspond to the actual location of the newlines
+        * because the two actions were performed like ABba...
+    * the fix is to use callbacks and implement queueing for writes
+      * to guarantee that offset computation is always atomic with writes
+*/
+const storeMessage = function (Env, channel, msg, isCp, optionalMessageHash) {
+    const id = channel.id;
+    const Log = Env.Log;
+
+    Env.queueStorage(id, function (next) {
+        const msgBin = Buffer.from(msg + '\n', 'utf8');
+        // Store the message first, and update the index only once it's stored.
+        // store.messageBin can be async so updating the index first may
+        // result in a wrong cpIndex
+        nThen((waitFor) => {
+            Env.store.messageBin(id, msgBin, waitFor(function (err) {
+                if (err) {
+                    waitFor.abort();
+                    Log.error("HK_STORE_MESSAGE_ERROR", err.message);
+
+                    // this error is critical, but there's not much we can do at the moment
+                    // proceed with more messages, but they'll probably fail too
+                    // at least you won't have a memory leak
+
+                    // TODO make it possible to respond to clients with errors so they know
+                    // their message wasn't stored
+                    return void next();
+                }
+            }));
+        }).nThen((waitFor) => {
+            getIndex(Env, id, waitFor((err, index) => {
+                if (err) {
+                    Log.warn("HK_STORE_MESSAGE_INDEX", err.stack);
+                    // non-critical, we'll be able to get the channel index later
+                    return void next();
+                }
+                if (typeof (index.line) === "number") { index.line++; }
+                if (isCp) {
+                    index.cpIndex = sliceCpIndex(index.cpIndex, index.line || 0);
+                    for (let k in index.offsetByHash) {
+                        if (index.offsetByHash[k] < index.cpIndex[0]) {
+                            delete index.offsetByHash[k];
+                        }
+                    }
+                    index.cpIndex.push({
+                        offset: index.size,
+                        line: ((index.line || 0) + 1)
+                    });
+                }
+                if (optionalMessageHash) { index.offsetByHash[optionalMessageHash] = index.size; }
+                index.size += msgBin.length;
+
+                // handle the next element in the queue
+                next();
+            }));
+        });
+    });
+};
+
+
+/*  getHistoryOffset
+    returns a number representing the byte offset from the start of the log
+    for whatever history you're seeking.
+
+    query by providing a 'lastKnownHash',
+        which is really just a string of the first 64 characters of an encrypted message.
+    OR by -1 which indicates that we want the full history (byte offset 0)
+    OR nothing, which indicates that you want whatever messages the historyKeeper deems relevant
+        (typically the last few checkpoints)
+
+    this function embeds a lot of the history keeper's logic:
+
+    0. if you passed -1 as the lastKnownHash it means you want the complete history
+      * I'm not sure why you'd need to call this function if you know it will return 0 in this case...
+      * it has a side-effect of filling the index cache if it's empty
+    1. if you provided a lastKnownHash and that message does not exist in the history:
+      * either the client has made a mistake or the history they knew about no longer exists
+      * call back with EINVAL
+    2. if you did not provide a lastKnownHash
+      * and there are fewer than two checkpoints:
+        * return 0 (read from the start of the file)
+      * and there are two or more checkpoints:
+        * return the offset of the earliest checkpoint which 'sliceCpIndex' considers relevant
+    3. if you did provide a lastKnownHash
+      * read through the log until you find the hash that you're looking for
+      * call back with either the byte offset of the message that you found OR
+      * -1 if you didn't find it
+
+*/
+const getHistoryOffset = (Env, channelName, lastKnownHash, cb) => {
+    const store = Env.store;
+    const Log = Env.Log;
+
+    // lastKnownhash === -1 means we want the complete history
+    if (lastKnownHash === -1) { return void cb(null, 0); }
+    let offset = -1;
+    nThen((waitFor) => {
+        getIndex(Env, channelName, waitFor((err, index) => {
+            if (err) { waitFor.abort(); return void cb(err); }
+
+            // check if the "hash" the client is requesting exists in the index
+            const lkh = index.offsetByHash[lastKnownHash];
+            // we evict old hashes from the index as new checkpoints are discovered.
+            // if someone connects and asks for a hash that is no longer relevant,
+            // we tell them it's an invalid request. This is because of the semantics of "GET_HISTORY"
+            // which is only ever used when connecting or reconnecting in typical uses of history...
+            // this assumption should hold for uses by chainpad, but perhaps not for other uses cases.
+            // EXCEPT: other cases don't use checkpoints!
+            // clients that are told that their request is invalid should just make another request
+            // without specifying the hash, and just trust the server to give them the relevant data.
+            // QUESTION: does this mean mailboxes are causing the server to store too much stuff in memory?
+            if (lastKnownHash && typeof(lkh) !== "number") {
+                waitFor.abort();
+                return void cb(new Error('EINVAL'));
+            }
+
+            // Since last 2 checkpoints
+            if (!lastKnownHash) {
+                waitFor.abort();
+                // Less than 2 checkpoints in the history: return everything
+                if (index.cpIndex.length < 2) { return void cb(null, 0); }
+                // Otherwise return the second last checkpoint's index
+                return void cb(null, index.cpIndex[0].offset);
+                /* LATER...
+                    in practice, two checkpoints can be very close together
+                    we have measures to avoid duplicate checkpoints, but editors
+                    can produce nearby checkpoints which are slightly different,
+                    and slip past these protections. To be really careful, we can
+                    seek past nearby checkpoints by some number of patches so as
+                    to ensure that all editors have sufficient knowledge of history
+                    to reconcile their differences. */
+            }
+
+            offset = lkh;
+        }));
+    }).nThen((waitFor) => {
+        // if offset is less than zero then presumably the channel has no messages
+        // returning falls through to the next block and therefore returns -1
+        if (offset !== -1) { return; }
+
+        // do a lookup from the index
+        // FIXME maybe we don't need this anymore?
+        // otherwise we have a non-negative offset and we can start to read from there
+        store.readMessagesBin(channelName, 0, (msgObj, readMore, abort) => {
+            // tryParse return a parsed message or undefined
+            const msg = tryParse(Env, msgObj.buff.toString('utf8'));
+            // if it was undefined then go onto the next message
+            if (typeof msg === "undefined") { return readMore(); }
+            if (typeof(msg[4]) !== 'string' || lastKnownHash !== getHash(msg[4], Log)) {
+                return void readMore();
+            }
+            offset = msgObj.offset;
+            abort();
+        }, waitFor(function (err) {
+            if (err) { waitFor.abort(); return void cb(err); }
+        }));
+    }).nThen(() => {
+        cb(null, offset);
+    });
+};
+
+/*  getHistoryAsync
+    * finds the appropriate byte offset from which to begin reading using 'getHistoryOffset'
+    * streams through the rest of the messages, safely parsing them and returning the parsed content to the handler
+    * calls back when it has reached the end of the log
+
+    Used by:
+    * GET_HISTORY
+
+*/
+const getHistoryAsync = (Env, channelName, lastKnownHash, beforeHash, handler, cb) => {
+    const store = Env.store;
+
+    let offset = -1;
+    nThen((waitFor) => {
+        getHistoryOffset(Env, channelName, lastKnownHash, waitFor((err, os) => {
+            if (err) {
+                waitFor.abort();
+                return void cb(err);
+            }
+            offset = os;
+        }));
+    }).nThen((waitFor) => {
+        if (offset === -1) { return void cb(new Error("could not find offset")); }
+        const start = (beforeHash) ? 0 : offset;
+        store.readMessagesBin(channelName, start, (msgObj, readMore, abort) => {
+            if (beforeHash && msgObj.offset >= offset) { return void abort(); }
+            var parsed = tryParse(Env, msgObj.buff.toString('utf8'));
+            if (!parsed) { return void readMore(); }
+            handler(parsed, readMore);
+        }, waitFor(function (err) {
+            return void cb(err);
+        }));
+    });
+};
+
+/*  getOlderHistory
+    * allows clients to query for all messages until a known hash is read
+    * stores all messages in history as they are read
+      * can therefore be very expensive for memory
+      * should probably be converted to a streaming interface
+
+    Used by:
+    * GET_HISTORY_RANGE
+*/
+const getOlderHistory = function (Env, channelName, oldestKnownHash, cb) {
+    const store = Env.store;
+    const Log = Env.Log;
+    var messageBuffer = [];
+    var found = false;
+    store.getMessages(channelName, function (msgStr) {
+        if (found) { return; }
+
+        let parsed = tryParse(Env, msgStr);
+        if (typeof parsed === "undefined") { return; }
+
+        // identify classic metadata messages by their inclusion of a channel.
+        // and don't send metadata, since:
+        // 1. the user won't be interested in it
+        // 2. this metadata is potentially incomplete/incorrect
+        if (isMetadataMessage(parsed)) { return; }
+
+        var content = parsed[4];
+        if (typeof(content) !== 'string') { return; }
+
+        var hash = getHash(content, Log);
+        if (hash === oldestKnownHash) {
+            found = true;
+        }
+        messageBuffer.push(parsed);
+    }, function (err) {
+        if (err) {
+            Log.error("HK_GET_OLDER_HISTORY", err);
+        }
+        cb(messageBuffer);
+    });
+};
+
+const handleRPC = function (Env, Server, seq, userId, parsed) {
+    const HISTORY_KEEPER_ID = Env.id;
+
+    /* RPC Calls...  */
+    var rpc_call = parsed.slice(1);
+
+    Server.send(userId, [seq, 'ACK']);
+    try {
+        // slice off the sequence number and pass in the rest of the message
+        Env.rpc(Server, rpc_call, function (err, output) {
+            if (err) {
+                Server.send(userId, [0, HISTORY_KEEPER_ID, 'MSG', userId, JSON.stringify([parsed[0], 'ERROR', err])]); 
+                return;
+            }
+            Server.send(userId, [0, HISTORY_KEEPER_ID, 'MSG', userId, JSON.stringify([parsed[0]].concat(output))]);
+        });
+    } catch (e) {
+        // if anything throws in the middle, send an error
+        Server.send(userId, [0, HISTORY_KEEPER_ID, 'MSG', userId, JSON.stringify([parsed[0], 'ERROR', 'SERVER_ERROR'])]);
+    }
+};
+
+const handleGetHistory = function (Env, Server, seq, userId, parsed) {
+    const store = Env.store;
+    const tasks = Env.tasks;
+    const metadata_cache = Env.metadata_cache;
+    const channel_cache = Env.channel_cache;
+    const HISTORY_KEEPER_ID = Env.id;
+    const Log = Env.Log;
+
+    // parsed[1] is the channel id
+    // parsed[2] is a validation key or an object containing metadata (optionnal)
+    // parsed[3] is the last known hash (optionnal)
+
+    Server.send(userId, [seq, 'ACK']);
+    var channelName = parsed[1];
+    var config = parsed[2];
+    var metadata = {};
+    var lastKnownHash;
+
+    // clients can optionally pass a map of attributes
+    // if the channel already exists this map will be ignored
+    // otherwise it will be stored as the initial metadata state for the channel
+    if (config && typeof config === "object" && !Array.isArray(parsed[2])) {
+        lastKnownHash = config.lastKnownHash;
+        metadata = config.metadata || {};
+        if (metadata.expire) {
+            metadata.expire = +metadata.expire * 1000 + (+new Date());
+        }
+    }
+    metadata.channel = channelName;
+    metadata.created = +new Date();
+
+    // if the user sends us an invalid key, we won't be able to validate their messages
+    // so they'll never get written to the log anyway. Let's just drop their message
+    // on the floor instead of doing a bunch of extra work
+    // TODO send them an error message so they know something is wrong
+    if (metadata.validateKey && !isValidValidateKeyString(metadata.validateKey)) {
+        return void Log.error('HK_INVALID_KEY', metadata.validateKey);
+    }
+
+    nThen(function (waitFor) {
+        var w = waitFor();
+
+        /*  unless this is a young channel, we will serve all messages from an offset
+            this will not include the channel metadata, so we need to explicitly fetch that.
+            unfortunately, we can't just serve it blindly, since then young channels will
+            send the metadata twice, so let's do a quick check of what we're going to serve...
+        */
+        getIndex(Env, channelName, waitFor((err, index) => {
+            /*  if there's an error here, it should be encountered
+                and handled by the next nThen block.
+                so, let's just fall through...
+            */
+            if (err) { return w(); }
+
+
+            // it's possible that the channel doesn't have metadata
+            // but in that case there's no point in checking if the channel expired
+            // or in trying to send metadata, so just skip this block
+            if (!index || !index.metadata) { return void w(); }
+            // And then check if the channel is expired. If it is, send the error and abort
+            // FIXME this is hard to read because 'checkExpired' has side effects
+            if (checkExpired(Env, Server, channelName)) { return void waitFor.abort(); }
+            // always send metadata with GET_HISTORY requests
+            Server.send(userId, [0, HISTORY_KEEPER_ID, 'MSG', userId, JSON.stringify(index.metadata)], w);
+        }));
+    }).nThen(() => {
+        let msgCount = 0;
+
+        // TODO compute lastKnownHash in a manner such that it will always skip past the metadata line?
+        getHistoryAsync(Env, channelName, lastKnownHash, false, (msg, readMore) => {
+            msgCount++;
+            // avoid sending the metadata message a second time
+            if (isMetadataMessage(msg) && metadata_cache[channelName]) { return readMore(); }
+            Server.send(userId, [0, HISTORY_KEEPER_ID, 'MSG', userId, JSON.stringify(msg)], readMore);
+        }, (err) => {
+            if (err && err.code !== 'ENOENT') {
+                if (err.message !== 'EINVAL') { Log.error("HK_GET_HISTORY", err); }
+                const parsedMsg = {error:err.message, channel: channelName};
+                Server.send(userId, [0, HISTORY_KEEPER_ID, 'MSG', userId, JSON.stringify(parsedMsg)]);
+                return;
+            }
+
+            const chan = channel_cache[channelName];
+
+            if (msgCount === 0 && !metadata_cache[channelName] && Server.channelContainsUser(channelName, userId)) {
+                metadata_cache[channelName] = metadata;
+
+                // the index will have already been constructed and cached at this point
+                // but it will not have detected any metadata because it hasn't been written yet
+                // this means that the cache starts off as invalid, so we have to correct it
+                if (chan && chan.index) { chan.index.metadata = metadata; }
+
+                // new channels will always have their metadata written to a dedicated metadata log
+                // but any lines after the first which are not amendments in a particular format will be ignored.
+                // Thus we should be safe from race conditions here if just write metadata to the log as below...
+                // TODO validate this logic
+                // otherwise maybe we need to check that the metadata log is empty as well
+                store.writeMetadata(channelName, JSON.stringify(metadata), function (err) {
+                    if (err) {
+                        // FIXME tell the user that there was a channel error?
+                        return void Log.error('HK_WRITE_METADATA', {
+                            channel: channelName,
+                            error: err,
+                        });
+                    }
+                });
+
+                // write tasks
+                if(metadata.expire && typeof(metadata.expire) === 'number') {
+                    // the fun part...
+                    // the user has said they want this pad to expire at some point
+                    tasks.write(metadata.expire, "EXPIRE", [ channelName ], function (err) {
+                        if (err) {
+                            // if there is an error, we don't want to crash the whole server...
+                            // just log it, and if there's a problem you'll be able to fix it
+                            // at a later date with the provided information
+                            Log.error('HK_CREATE_EXPIRE_TASK', err);
+                            Log.info('HK_INVALID_EXPIRE_TASK', JSON.stringify([metadata.expire, 'EXPIRE', channelName]));
+                        }
+                    });
+                }
+                Server.send(userId, [0, HISTORY_KEEPER_ID, 'MSG', userId, JSON.stringify(metadata)]);
+            }
+
+            // End of history message:
+            let parsedMsg = {state: 1, channel: channelName};
+
+            Server.send(userId, [0, HISTORY_KEEPER_ID, 'MSG', userId, JSON.stringify(parsedMsg)]);
+        });
+    });
+};
+
+const handleGetHistoryRange = function (Env, Server, seq, userId, parsed) {
+    var channelName = parsed[1];
+    var map = parsed[2];
+    const HISTORY_KEEPER_ID = Env.id;
+
+    if (!(map && typeof(map) === 'object')) {
+        return void Server.send(userId, [seq, 'ERROR', 'INVALID_ARGS', HISTORY_KEEPER_ID]);
+    }
+
+    var oldestKnownHash = map.from;
+    var desiredMessages = map.count;
+    var desiredCheckpoint = map.cpCount;
+    var txid = map.txid;
+    if (typeof(desiredMessages) !== 'number' && typeof(desiredCheckpoint) !== 'number') {
+        return void Server.send(userId, [seq, 'ERROR', 'UNSPECIFIED_COUNT', HISTORY_KEEPER_ID]);
+    }
+
+    if (!txid) {
+        return void Server.send(userId, [seq, 'ERROR', 'NO_TXID', HISTORY_KEEPER_ID]);
+    }
+
+    Server.send(userId, [seq, 'ACK']);
+    return void getOlderHistory(Env, channelName, oldestKnownHash, function (messages) {
+        var toSend = [];
+        if (typeof (desiredMessages) === "number") {
+            toSend = messages.slice(-desiredMessages);
+        } else {
+            let cpCount = 0;
+            for (var i = messages.length - 1; i >= 0; i--) {
+                if (/^cp\|/.test(messages[i][4]) && i !== (messages.length - 1)) {
+                    cpCount++;
+                }
+                toSend.unshift(messages[i]);
+                if (cpCount >= desiredCheckpoint) { break; }
+            }
+        }
+        toSend.forEach(function (msg) {
+            Server.send(userId, [0, HISTORY_KEEPER_ID, 'MSG', userId,
+                JSON.stringify(['HISTORY_RANGE', txid, msg])]);
+        });
+
+        Server.send(userId, [0, HISTORY_KEEPER_ID, 'MSG', userId,
+            JSON.stringify(['HISTORY_RANGE_END', txid, channelName])
+        ]);
+    });
+};
+
+const handleGetFullHistory = function (Env, Server, seq, userId, parsed) {
+    const HISTORY_KEEPER_ID = Env.id;
+    const Log = Env.Log;
+
+    // parsed[1] is the channel id
+    // parsed[2] is a validation key (optionnal)
+    // parsed[3] is the last known hash (optionnal)
+
+    Server.send(userId, [seq, 'ACK']);
+
+    // FIXME should we send metadata here too?
+    // none of the clientside code which uses this API needs metadata, but it won't hurt to send it (2019-08-22)
+    return void getHistoryAsync(Env, parsed[1], -1, false, (msg, readMore) => {
+        Server.send(userId, [0, HISTORY_KEEPER_ID, 'MSG', userId, JSON.stringify(['FULL_HISTORY', msg])], readMore);
+    }, (err) => {
+        let parsedMsg = ['FULL_HISTORY_END', parsed[1]];
+        if (err) {
+            Log.error('HK_GET_FULL_HISTORY', err.stack);
+            parsedMsg = ['ERROR', parsed[1], err.message];
+        }
+        Server.send(userId, [0, HISTORY_KEEPER_ID, 'MSG', userId, JSON.stringify(parsedMsg)]);
+    });
+};
+
+const directMessageCommands = {
+    GET_HISTORY: handleGetHistory,
+    GET_HISTORY_RANGE: handleGetHistoryRange,
+    GET_FULL_HISTORY: handleGetFullHistory,
+};
+
+/*  onDirectMessage
+    * exported for use by the netflux-server
+    * parses and handles all direct messages directed to the history keeper
+      * check if it's expired and execute all the associated side-effects
+      * routes queries to the appropriate handlers
+*/
+HK.onDirectMessage = function (Env, Server, seq, userId, json) {
+    const Log = Env.Log;
+    Log.silly('HK_MESSAGE', json);
+
+    let parsed;
+    try {
+        parsed = JSON.parse(json[2]);
+    } catch (err) {
+        Log.error("HK_PARSE_CLIENT_MESSAGE", json);
+        return;
+    }
+
+    // If the requested history is for an expired channel, abort
+    // Note the if we don't have the keys for that channel in metadata_cache, we'll
+    // have to abort later (once we know the expiration time)
+    if (checkExpired(Env, Server, parsed[1])) { return; }
+
+    // look up the appropriate command in the map of commands or fall back to RPC
+    var command = directMessageCommands[parsed[0]] || handleRPC;
+
+    // run the command with the standard function signature
+    command(Env, Server, seq, userId, parsed);
+};
+
+/*  onChannelMessage
+    Determine what we should store when a message a broadcasted to a channel"
+
+    * ignores ephemeral channels
+    * ignores messages sent to expired channels
+    * rejects duplicated checkpoints
+    * validates messages to channels that have validation keys
+    * caches the id of the last saved checkpoint
+    * adds timestamps to incoming messages
+    * writes messages to the store
+*/
+HK.onChannelMessage = function (Env, Server, channel, msgStruct) {
+    const Log = Env.Log;
+
+    // TODO our usage of 'channel' here looks prone to errors
+    // we only use it for its 'id', but it can contain other stuff
+    // also, we're using this RPC from both the RPC and Netflux-server
+    // we should probably just change this to expect a channel id directly
+
+    // don't store messages if the channel id indicates that it's an ephemeral message
+    if (!channel.id || channel.id.length === EPHEMERAL_CHANNEL_LENGTH) { return; }
+
+    const isCp = /^cp\|/.test(msgStruct[4]);
+    let id;
+    if (isCp) {
+        // id becomes either null or an array or results...
+        id = CHECKPOINT_PATTERN.exec(msgStruct[4]);
+        if (Array.isArray(id) && id[2] && id[2] === channel.lastSavedCp) {
+            // Reject duplicate checkpoints
+            return;
+        }
+    }
+
+    let metadata;
+    nThen(function (w) {
+        // getIndex (and therefore the latest metadata)
+        getIndex(Env, channel.id, w(function (err, index) {
+            if (err) {
+                w.abort();
+                return void Log.error('CHANNEL_MESSAGE_ERROR', err);
+            }
+
+            if (!index.metadata) {
+                // if there's no channel metadata then it can't be an expiring channel
+                // nor can we possibly validate it
+                return;
+            }
+
+            metadata = index.metadata;
+
+            // don't write messages to expired channels
+            if (checkExpired(Env, Server, channel)) { return void w.abort(); }
+
+            // if there's no validateKey present skip to the next block
+            if (!metadata.validateKey) { return; }
+
+            // trim the checkpoint indicator off the message if it's present
+            let signedMsg = (isCp) ? msgStruct[4].replace(CHECKPOINT_PATTERN, '') : msgStruct[4];
+            // convert the message from a base64 string into a Uint8Array
+
+            // FIXME this can fail and the client won't notice
+            signedMsg = Nacl.util.decodeBase64(signedMsg);
+
+            // FIXME this can blow up
+            // TODO check that that won't cause any problems other than not being able to append...
+            const validateKey = Nacl.util.decodeBase64(metadata.validateKey);
+            // validate the message
+            const validated = Nacl.sign.open(signedMsg, validateKey);
+            if (!validated) {
+                // don't go any further if the message fails validation
+                w.abort();
+                Log.info("HK_SIGNED_MESSAGE_REJECTED", 'Channel '+channel.id);
+                return;
+            }
+        }));
+    }).nThen(function () {
+        // do checkpoint stuff...
+
+        // 1. get the checkpoint id
+        // 2. reject duplicate checkpoints
+
+        if (isCp) {
+            // if the message is a checkpoint we will have already validated
+            // that it isn't a duplicate. remember its id so that we can
+            // repeat this process for the next incoming checkpoint
+
+            // WARNING: the fact that we only check the most recent checkpoints
+            // is a potential source of bugs if one editor has high latency and
+            // pushes a duplicate of an earlier checkpoint than the latest which
+            // has been pushed by editors with low latency
+            // FIXME
+            if (Array.isArray(id) && id[2]) {
+                // Store new checkpoint hash
+                channel.lastSavedCp = id[2];
+            }
+        }
+
+        // add the time to the message
+        msgStruct.push(now());
+
+        // storeMessage
+        storeMessage(Env, channel, JSON.stringify(msgStruct), isCp, getHash(msgStruct[4], Log));
+    });
+};
 
 

From 4d2538c79684ec9a17944d1c09f265648f710dcb Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 10 Feb 2020 10:46:20 +0100
Subject: [PATCH 20/57] Make hidden hashes disabled by default

---
 www/common/common-ui-elements.js  | 2 +-
 www/common/drive-ui.js            | 2 +-
 www/common/sframe-common-outer.js | 4 ++--
 www/settings/inner.js             | 5 +++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index feec4f243..9e8448c6f 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -657,7 +657,7 @@ define([
                                 // Use hidden hash if needed (we're an owner of this pad so we know it is stored)
                                 var useUnsafe = Util.find(priv, ['settings', 'security', 'unsafeLinks']);
                                 var href = (priv.readOnly && data.roHref) ? data.roHref : data.href;
-                                if (!useUnsafe) {
+                                if (useUnsafe === false) {
                                     var newParsed = Hash.parsePadUrl(href);
                                     var newSecret = Hash.getSecrets(newParsed.type, newParsed.hash, newPass);
                                     var newHash = Hash.getHiddenHashFromKeys(parsed.type, newSecret, {});
diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index ff15e091f..51f3c015d 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -1037,7 +1037,7 @@ define([
             var href = isRo ? data.roHref : (data.href || data.roHref);
             var priv = metadataMgr.getPrivateData();
             var useUnsafe = Util.find(priv, ['settings', 'security', 'unsafeLinks']);
-            if (useUnsafe) {
+            if (useUnsafe !== false) { // true of undefined: use unsafe links
                 return void window.open(APP.origin + href);
             }
 
diff --git a/www/common/sframe-common-outer.js b/www/common/sframe-common-outer.js
index fa9afaed8..a7af0f6b6 100644
--- a/www/common/sframe-common-outer.js
+++ b/www/common/sframe-common-outer.js
@@ -646,7 +646,7 @@ define([
                         var opts = parsed.getOptions();
                         var hash = Utils.Hash.getHiddenHashFromKeys(parsed.type, secret, opts);
                         var useUnsafe = Utils.Util.find(settings, ['security', 'unsafeLinks']);
-                        if (!useUnsafe && window.history && window.history.replaceState) {
+                        if (useUnsafe === false && window.history && window.history.replaceState) {
                             if (!/^#/.test(hash)) { hash = '#' + hash; }
                             window.history.replaceState({}, window.document.title, hash);
                         }
@@ -684,7 +684,7 @@ define([
                         var opts = parsed.getOptions();
                         var hash = Utils.Hash.getHiddenHashFromKeys(parsed.type, secret, opts);
                         var useUnsafe = Utils.Util.find(settings, ['security', 'unsafeLinks']);
-                        if (!useUnsafe && window.history && window.history.replaceState) {
+                        if (useUnsafe === false && window.history && window.history.replaceState) {
                             if (!/^#/.test(hash)) { hash = '#' + hash; }
                             window.history.replaceState({}, window.document.title, hash);
                         }
diff --git a/www/settings/inner.js b/www/settings/inner.js
index 683a3e222..7de5b7752 100644
--- a/www/settings/inner.js
+++ b/www/settings/inner.js
@@ -573,10 +573,11 @@ define([
 
         var $cbox = $(UI.createCheckbox('cp-settings-safe-links',
                                    Messages.settings_safeLinksCheckbox,
-                                   true, { label: {class: 'noTitle'} }));
+                                   false, { label: {class: 'noTitle'} }));
 
         var spinner = UI.makeSpinner($cbox);
 
+        // Checkbox: "Enable safe links"
         var $checkbox = $cbox.find('input').on('change', function () {
             spinner.spin();
             var val = !$checkbox.is(':checked');
@@ -587,7 +588,7 @@ define([
 
         common.getAttribute(['security', 'unsafeLinks'], function (e, val) {
             if (e) { return void console.error(e); }
-            if (!val) {
+            if (val === false) {
                 $checkbox.attr('checked', 'checked');
             }
         });

From 961cb8e427906d4a50cba6cf6a012b210680434d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Mon, 10 Feb 2020 10:07:16 +0000
Subject: [PATCH 21/57] apply max-width only to settings

---
 customize.dist/src/less2/include/sidebar-layout.less | 1 -
 www/settings/app-settings.less                       | 6 ++++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/customize.dist/src/less2/include/sidebar-layout.less b/customize.dist/src/less2/include/sidebar-layout.less
index 6e4017acc..5525f0fb8 100644
--- a/customize.dist/src/less2/include/sidebar-layout.less
+++ b/customize.dist/src/less2/include/sidebar-layout.less
@@ -97,7 +97,6 @@
                         margin-left: 10px;
                     }
                 }
-                max-width: 650px;
                 margin-bottom: 20px;
                 .buttons_main();
             }
diff --git a/www/settings/app-settings.less b/www/settings/app-settings.less
index 251b7097c..e7c7cd5fb 100644
--- a/www/settings/app-settings.less
+++ b/www/settings/app-settings.less
@@ -17,6 +17,12 @@
     flex-flow: column;
     font: @colortheme_app-font;
 
+    .cp-sidebarlayout-element {
+        &[class*="cp-settings"] {
+            max-width: 650px;
+        }
+    }
+
     #cp-export-container {
         font-size: 16px;
         display: flex;

From 6c23afdcc6e9624a86f5d5414f6d9482aef5fd65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Mon, 10 Feb 2020 10:16:17 +0000
Subject: [PATCH 22/57] fix max-width

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

diff --git a/www/settings/app-settings.less b/www/settings/app-settings.less
index e7c7cd5fb..091fd8263 100644
--- a/www/settings/app-settings.less
+++ b/www/settings/app-settings.less
@@ -18,9 +18,7 @@
     font: @colortheme_app-font;
 
     .cp-sidebarlayout-element {
-        &[class*="cp-settings"] {
-            max-width: 650px;
-        }
+        max-width: 650px;
     }
 
     #cp-export-container {

From 243abc3e535b94522280774ca3fd412516fc9581 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 10 Feb 2020 11:16:44 +0100
Subject: [PATCH 23/57] Change default settings for hidden hash

---
 www/common/outer/async-store.js | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/www/common/outer/async-store.js b/www/common/outer/async-store.js
index c544754ba..d3b1dce6e 100644
--- a/www/common/outer/async-store.js
+++ b/www/common/outer/async-store.js
@@ -32,6 +32,16 @@ define([
              NetConfig, AppConfig,
              Crypto, ChainPad, CpNetflux, Listmap, nThen, Saferphore) {
 
+    // Default settings for new users
+    var NEW_USER_SETTINGS = {
+        drive: {
+            hideDuplicate: true
+        },
+        general: {
+            allowUserFeedback: true // XXX corner popup in settings?
+        }
+    };
+
     var create = function () {
         var Store = window.Cryptpad_Store = {};
         var postMessage = function () {};
@@ -2270,7 +2280,7 @@ define([
                 if (!store.loggedIn) { return void cb(); }
                 Store.pinPads(null, data, cb);
             };
-            if (!proxy.settings) { proxy.settings = {}; }
+            if (!proxy.settings) { proxy.settings = NEW_USER_SETTINGS; }
             if (!proxy.friends_pending) { proxy.friends_pending = {}; }
             var manager = store.manager = ProxyManager.create(proxy.drive, {
                 onSync: function (cb) { onSync(null, cb); },
@@ -2355,13 +2365,7 @@ define([
                     }
                 }
 
-                if (!proxy.settings || !proxy.settings.general ||
-                        typeof(proxy.settings.general.allowUserFeedback) !== 'boolean') {
-                    proxy.settings = proxy.settings || {};
-                    proxy.settings.general = proxy.settings.general || {};
-                    proxy.settings.general.allowUserFeedback = true;
-                }
-                returned.feedback = proxy.settings.general.allowUserFeedback;
+                returned.feedback = Util.find(proxy, ['settings', 'general', 'allowUserFeedback']);
                 Feedback.init(returned.feedback);
 
                 if (typeof(cb) === 'function') { cb(returned); }

From 7ca92526e77270d59cb7000fbd3d56b797682c66 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 10 Feb 2020 11:17:01 +0100
Subject: [PATCH 24/57] Remove 'Owned pads' category from the drive

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

diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index 51f3c015d..8bf50bb3b 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -587,7 +587,7 @@ define([
         var displayedCategories = [ROOT, TRASH, SEARCH, RECENT];
 
         // PCS enabled: display owned pads
-        if (AppConfig.displayCreationScreen) { displayedCategories.push(OWNED); }
+        //if (AppConfig.displayCreationScreen) { displayedCategories.push(OWNED); }
         // Templates enabled: display template category
         if (AppConfig.enableTemplates) { displayedCategories.push(TEMPLATE); }
         // Tags used: display Tags category

From fbd8700a18065e0b08f4369007bd37a73a429fbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Mon, 10 Feb 2020 10:58:17 +0000
Subject: [PATCH 25/57] fix highlighting of support messages

---
 www/admin/app-admin.less | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/www/admin/app-admin.less b/www/admin/app-admin.less
index eb2a8c0f8..84532c6c5 100644
--- a/www/admin/app-admin.less
+++ b/www/admin/app-admin.less
@@ -27,12 +27,15 @@
     .cp-support-list-actions {
         margin: 10px 0px 10px 2px;
     }
-    .cp-support-list-message {
-        &:last-child:not(.cp-support-fromadmin)  {
-            color: @colortheme_cp-red;
-            background-color: lighten(@colortheme_cp-red, 25%);
-            .cp-support-showdata {
-                background-color: lighten(@colortheme_cp-red, 30%);
+
+    .cp-support-list-ticket:not(.cp-support-list-closed) {
+        .cp-support-list-message {
+            &:last-child:not(.cp-support-fromadmin)  {
+                color: @colortheme_cp-red;
+                background-color: lighten(@colortheme_cp-red, 25%);
+                .cp-support-showdata {
+                    background-color: lighten(@colortheme_cp-red, 30%);
+                }
             }
         }
     }

From 09076f39ffa441a53545822e038c851252a35a6a Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 10 Feb 2020 12:01:00 +0100
Subject: [PATCH 26/57] Fix and reenable folder to SF conversion

---
 www/common/drive-ui.js      |  7 ++-----
 www/common/proxy-manager.js | 25 ++++++++++++++++++-------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index 8bf50bb3b..78510b6dd 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -1204,8 +1204,6 @@ define([
                             hide.push('collapseall');
                         }
                         containsFolder = true;
-                        hide.push('share'); // XXX CONVERT
-                        hide.push('savelocal'); // XXX CONVERT
                         hide.push('openro');
                         hide.push('openincode');
                         hide.push('properties');
@@ -4054,8 +4052,7 @@ define([
 
                 if (manager.isFolder(el) && !manager.isSharedFolder(el)) { // Folder
                     // if folder is inside SF
-                    return UI.warn('ERROR: Temporarily disabled'); // XXX CONVERT
-                    /*if (manager.isInSharedFolder(paths[0].path)) {
+                    if (manager.isInSharedFolder(paths[0].path)) {
                         return void UI.alert(Messages.convertFolderToSF_SFParent);
                     }
                     // if folder already contains SF
@@ -4085,7 +4082,7 @@ define([
                             var owned = Util.isChecked($(convertContent).find('#cp-upload-owned'));
                             manager.convertFolderToSharedFolder(paths[0].path, owned, password, refresh);
                         });
-                    }*/
+                    }
                 } else { // File
                     var sf = manager.isSharedFolder(el);
                     data = sf ? manager.getSharedFolderData(el) : manager.getFileData(el);
diff --git a/www/common/proxy-manager.js b/www/common/proxy-manager.js
index 67ce14816..2fa3751f7 100644
--- a/www/common/proxy-manager.js
+++ b/www/common/proxy-manager.js
@@ -587,14 +587,10 @@ define([
 
     // convert a folder to a Shared Folder
     var _convertFolderToSharedFolder = function (Env, data, cb) {
-        return void cb({
-            error: 'DISABLED'
-        }); // XXX CONVERT
-        /*var path = data.path;
+        var path = data.path;
         var folderElement = Env.user.userObject.find(path);
         // don't try to convert top-level elements (trash, root, etc) to shared-folders
-        // TODO also validate that you're in root (not templates, etc)
-        if (data.path.length <= 1) {
+        if (path.length <= 1 || path[0] !== UserObject.ROOT) {
             return void cb({
                 error: 'E_INVAL_PATH',
             });
@@ -664,6 +660,21 @@ define([
                 newPath: newPath,
                 copy: false,
             }, waitFor());
+        }).nThen(function (waitFor) {
+            // Move the owned pads from the old folder to root
+            var paths = [];
+            Object.keys(folderElement).forEach(function (el) {
+                if (!Env.user.userObject.isFile(folderElement[el])) { return; }
+                var data = Env.user.userObject.getFileData(folderElement[el]);
+                if (!data || !_ownedByMe(Env, data.owners)) { return; }
+                // This is an owned pad: move it to ROOT before deleting the initial folder
+                paths.push(path.concat(el));
+            });
+            _move(Env, {
+                paths: paths,
+                newPath: [UserObject.ROOT],
+                copy: false,
+            }, waitFor());
         }).nThen(function () {
             // migrate metadata
             var sharedFolderElement = Env.user.proxy[UserObject.SHARED_FOLDERS][SFId];
@@ -680,7 +691,7 @@ define([
             Env.user.userObject.delete([path], function () {
                 cb();
             });
-        });*/
+        });
     };
 
     // Delete permanently some pads or folders

From 8afb0255c14a2131ebe5a3fc5785790edea1dc7d Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 10 Feb 2020 13:27:07 +0100
Subject: [PATCH 27/57] Fix team creation

---
 lib/historyKeeper.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/historyKeeper.js b/lib/historyKeeper.js
index ff7b531e9..7a10d9f42 100644
--- a/lib/historyKeeper.js
+++ b/lib/historyKeeper.js
@@ -908,13 +908,13 @@ module.exports.create = function (cfg, cb) {
                 }
 
                 // unauthenticated RPC calls have a different message format
-                if (msg[0] === "WRITE_PRIVATE_MESSAGE" && output && output.channel) {
+                if (msg[0] === "WRITE_PRIVATE_MESSAGE" && Array.isArray(output) && output[1] && output[1].channel) {
                     // clients don't validate messages sent by the historyKeeper
                     // so this broadcast needs to come from a different id
                     // we pass 'null' to indicate that it's not coming from a real user
                     // to ensure that they know not to trust this message
-                    Server.getChannelUserList(output.channel).forEach(function (userId) {
-                        Server.send(userId, output.message);
+                    Server.getChannelUserList(output[1].channel).forEach(function (userId) {
+                        Server.send(userId, output[1].message);
                     });
 
                     // rpc and anonRpc expect their responses to be of a certain length

From 7f22da0f574651cab03da11b4e3c9ffa2fc540e6 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 10 Feb 2020 08:07:29 -0500
Subject: [PATCH 28/57] fix use of incorrect key format in admin-rpc

---
 lib/commands/admin-rpc.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/commands/admin-rpc.js b/lib/commands/admin-rpc.js
index 3c328611b..a3bb071ad 100644
--- a/lib/commands/admin-rpc.js
+++ b/lib/commands/admin-rpc.js
@@ -2,7 +2,7 @@
 const BatchRead = require("../batch-read");
 const nThen = require("nthen");
 const getFolderSize = require("get-folder-size");
-const Util = require("../common-util");
+//const Util = require("../common-util");
 
 var Fs = require("fs");
 
@@ -94,8 +94,8 @@ var getDiskUsage = function (Env, cb) {
 
 Admin.command = function (Env, safeKey, data, cb, Server) {
     var admins = Env.admins;
-    var unsafeKey = Util.unescapeKeyCharacters(safeKey);
-    if (admins.indexOf(unsafeKey) === -1) {
+    //var unsafeKey = Util.unescapeKeyCharacters(safeKey);
+    if (admins.indexOf(safeKey) === -1) {
         return void cb("FORBIDDEN");
     }
 

From d0f8458dd25b20d39de531f9b4fa1f93216de6df Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 10 Feb 2020 14:43:22 +0100
Subject: [PATCH 29/57] Fix openincode in anon shared folders

---
 www/common/drive-ui.js | 28 +++++++++++++++++-----------
 www/drive/inner.js     |  4 ++++
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index 78510b6dd..e9610fae5 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -1175,13 +1175,9 @@ define([
                         } else if ($element.is('.cp-app-drive-element-noreadonly')) {
                             hide.push('openro'); // Remove open 'view' mode
                         }
-                        // if it's not a plain text file
-                        // XXX: there is a bug with this code in anon shared folder, so we disable it
-                        if (APP.loggedIn || !APP.newSharedFolder) {
-                            var metadata = manager.getFileData(manager.find(path));
-                            if (!metadata || !Util.isPlainTextFile(metadata.fileType, metadata.title)) {
-                                hide.push('openincode');
-                            }
+                        var metadata = manager.getFileData(manager.find(path));
+                        if (!metadata || !Util.isPlainTextFile(metadata.fileType, metadata.title)) {
+                            hide.push('openincode');
                         }
                     } else if ($element.is('.cp-app-drive-element-sharedf')) {
                         if (containsFolder) {
@@ -3237,21 +3233,23 @@ define([
             var path = currentPath.slice(1);
             var root = Util.find(data, path);
 
+            var realPath = [ROOT, SHARED_FOLDER].concat(path);
+
             if (manager.hasSubfolder(root)) { $list.append($folderHeader); }
             // display sub directories
             var keys = Object.keys(root);
-            var sortedFolders = sortElements(true, currentPath, keys, null, !getSortFolderDesc());
-            var sortedFiles = sortElements(false, currentPath, keys, APP.store[SORT_FILE_BY], !getSortFileDesc());
+            var sortedFolders = sortElements(true, realPath, keys, null, !getSortFolderDesc());
+            var sortedFiles = sortElements(false, realPath, keys, APP.store[SORT_FILE_BY], !getSortFileDesc());
             sortedFolders.forEach(function (key) {
                 if (manager.isFile(root[key])) { return; }
-                var $element = createElement(currentPath, key, root, true);
+                var $element = createElement(realPath, key, root, true);
                 $element.appendTo($list);
             });
             if (manager.hasFile(root)) { $list.append($fileHeader); }
             // display files
             sortedFiles.forEach(function (key) {
                 if (manager.isFolder(root[key])) { return; }
-                var $element = createElement(currentPath, key, root, false);
+                var $element = createElement(realPath, key, root, false);
                 if (!$element) { return; }
                 $element.appendTo($list);
             });
@@ -3973,6 +3971,14 @@ define([
                     common.sessionStorage.put(Constants.newPadTeamKey, APP.team, waitFor());
                 }).nThen(function () {
                     common.openURL('/code/');
+                    // We need to restore sessionStorage for the next time we want to create a pad from this tab
+                    // NOTE: the 100ms timeout is to fix a race condition in firefox where sessionStorage
+                    //       would be deleted before the new tab was created
+                    setTimeout(function () {
+                        common.sessionStorage.put(Constants.newPadFileData, '', function () {});
+                        common.sessionStorage.put(Constants.newPadPathKey, '', function () {});
+                        common.sessionStorage.put(Constants.newPadTeamKey, '', function () {});
+                    }, 100);
                 });
             }
 
diff --git a/www/drive/inner.js b/www/drive/inner.js
index a5325a651..f5251f284 100644
--- a/www/drive/inner.js
+++ b/www/drive/inner.js
@@ -96,7 +96,11 @@ define([
     var updateObject = function (sframeChan, obj, cb) {
         sframeChan.query('Q_DRIVE_GETOBJECT', null, function (err, newObj) {
             copyObjectValue(obj, newObj);
+            // If anon shared folder, make a virtual drive containing this folder
             if (!APP.loggedIn && APP.newSharedFolder) {
+                obj.drive.root = {
+                    sf: APP.newSharedFolder
+                };
                 obj.drive.sharedFolders = obj.drive.sharedFolders || {};
                 obj.drive.sharedFolders[APP.newSharedFolder] = {
                     href: APP.anonSFHref,

From 830c401f50db417ddd6bf9423011ed6e04e635e1 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 10 Feb 2020 14:54:35 +0100
Subject: [PATCH 30/57] Remove invalid option in context menu

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

diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index e9610fae5..01025b6a1 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -1200,6 +1200,7 @@ define([
                             hide.push('collapseall');
                         }
                         containsFolder = true;
+                        hide.push('savelocal');
                         hide.push('openro');
                         hide.push('openincode');
                         hide.push('properties');

From 68a77885d4762839c89d098b29db8539b699088c Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 10 Feb 2020 09:03:16 -0500
Subject: [PATCH 31/57] suppress some routine server logs

---
 lib/api.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/api.js b/lib/api.js
index c13f8c7c8..bd5c99629 100644
--- a/lib/api.js
+++ b/lib/api.js
@@ -16,11 +16,14 @@ module.exports.create = function (config) {
             .on('channelOpen', historyKeeper.channelOpen)
             .on('sessionClose', function (userId, reason) {
                 if (['BAD_MESSAGE', 'SOCKET_ERROR', 'SEND_MESSAGE_FAIL_2'].indexOf(reason) !== -1) {
+                    if (reason && reason.code === 'ECONNRESET') { return; }
                     return void log.error('SESSION_CLOSE_WITH_ERROR', {
                         userId: userId,
                         reason: reason,
                     });
                 }
+
+                if (reason && reason === 'SOCKET_CLOSED') { return; }
                 log.verbose('SESSION_CLOSE_ROUTINE', {
                     userId: userId,
                     reason: reason,

From b69261d1190e6695da84aea59fc7eb742572c26e Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 10 Feb 2020 15:10:36 +0100
Subject: [PATCH 32/57] Display the share modal after folder conversion to sf

---
 www/common/drive-ui.js      | 95 ++++++++++++++++++++++---------------
 www/common/proxy-manager.js |  4 +-
 2 files changed, 59 insertions(+), 40 deletions(-)

diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index 01025b6a1..e86fa3351 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -1936,6 +1936,44 @@ define([
         };
         var getIcon = UI.getIcon;
 
+        var createShareButton = function (id, $container) {
+            var $shareBlock = $('<button>', {
+                'class': 'cp-toolbar-share-button',
+                title: Messages.shareButton
+            });
+            $sharedIcon.clone().appendTo($shareBlock);
+            $('<span>').text(Messages.shareButton).appendTo($shareBlock);
+            var data = manager.getSharedFolderData(id);
+            var parsed = (data.href && data.href.indexOf('#') !== -1) ? Hash.parsePadUrl(data.href) : {};
+            var roParsed = Hash.parsePadUrl(data.roHref) || {};
+            if (!parsed.hash && !roParsed.hash) { return void console.error("Invalid href: "+(data.href || data.roHref)); }
+            var friends = common.getFriends();
+            var ro = folders[id] && folders[id].version >= 2;
+            var modal = UIElements.createShareModal({
+                teamId: APP.team,
+                origin: APP.origin,
+                pathname: "/drive/",
+                friends: friends,
+                title: data.title,
+                password: data.password,
+                sharedFolder: true,
+                common: common,
+                hashes: {
+                    editHash: parsed.hash,
+                    viewHash: ro && roParsed.hash,
+                }
+            });
+            // If we're a viewer and this is an old shared folder (no read-only mode), we
+            // can't share the read-only URL and we don't have access to the edit one.
+            // We should hide the share button.
+            if (!modal) { return; }
+            $shareBlock.click(function () {
+                UI.openCustomModal(modal);
+            });
+            $container.append($shareBlock);
+            return $shareBlock;
+        };
+
         // Create the "li" element corresponding to the file/folder located in "path"
         var createElement = function (path, elPath, root, isFolder) {
             // Forbid drag&drop inside the trash
@@ -2016,6 +2054,15 @@ define([
                 });
                 delete APP.newFolder;
             }
+
+            if (isSharedFolder && APP.convertedFolder === element) {
+                setTimeout(function () {
+                    var $fakeButton = createShareButton(element, $('<div>'));
+                    if (!$fakeButton) { return; }
+                    $fakeButton.click();
+                }, 100);
+            }
+
             return $element;
         };
 
@@ -2553,43 +2600,6 @@ define([
             $container.append($block);
         };
 
-        var createShareButton = function (id, $container) {
-            var $shareBlock = $('<button>', {
-                'class': 'cp-toolbar-share-button',
-                title: Messages.shareButton
-            });
-            $sharedIcon.clone().appendTo($shareBlock);
-            $('<span>').text(Messages.shareButton).appendTo($shareBlock);
-            var data = manager.getSharedFolderData(id);
-            var parsed = (data.href && data.href.indexOf('#') !== -1) ? Hash.parsePadUrl(data.href) : {};
-            var roParsed = Hash.parsePadUrl(data.roHref) || {};
-            if (!parsed.hash && !roParsed.hash) { return void console.error("Invalid href: "+(data.href || data.roHref)); }
-            var friends = common.getFriends();
-            var ro = folders[id] && folders[id].version >= 2;
-            var modal = UIElements.createShareModal({
-                teamId: APP.team,
-                origin: APP.origin,
-                pathname: "/drive/",
-                friends: friends,
-                title: data.title,
-                password: data.password,
-                sharedFolder: true,
-                common: common,
-                hashes: {
-                    editHash: parsed.hash,
-                    viewHash: ro && roParsed.hash,
-                }
-            });
-            // If we're a viewer and this is an old shared folder (no read-only mode), we
-            // can't share the read-only URL and we don't have access to the edit one.
-            // We should hide the share button.
-            if (!modal) { return; }
-            $shareBlock.click(function () {
-                UI.openCustomModal(modal);
-            });
-            $container.append($shareBlock);
-        };
-
         var SORT_FOLDER_DESC = 'sortFoldersDesc';
         var SORT_FILE_BY = 'sortFilesBy';
         var SORT_FILE_DESC = 'sortFilesDesc';
@@ -3485,6 +3495,9 @@ define([
             } else {
                 $content.scrollTop(s);
             }
+
+            delete APP.convertedFolder;
+
             appStatus.ready(true);
         };
         var displayDirectory = APP.displayDirectory = function (path, force) {
@@ -4087,10 +4100,14 @@ define([
                             if (!res) { return; }
                             var password = $(convertContent).find('#cp-upload-password').val() || undefined;
                             var owned = Util.isChecked($(convertContent).find('#cp-upload-owned'));
-                            manager.convertFolderToSharedFolder(paths[0].path, owned, password, refresh);
+                            manager.convertFolderToSharedFolder(paths[0].path, owned, password, function (err, obj) {
+                                if (err || obj && obj.error) { return void console.error(err || obj.error); }
+                                if (obj && obj.fId) { APP.convertedFolder = obj.fId; }
+                                refresh();
+                            });
                         });
                     }
-                } else { // File
+                } else { // File or shared folder
                     var sf = manager.isSharedFolder(el);
                     data = sf ? manager.getSharedFolderData(el) : manager.getFileData(el);
                     parsed = (data.href && data.href.indexOf('#') !== -1) ? Hash.parsePadUrl(data.href) : {};
diff --git a/www/common/proxy-manager.js b/www/common/proxy-manager.js
index 2fa3751f7..83e10c50c 100644
--- a/www/common/proxy-manager.js
+++ b/www/common/proxy-manager.js
@@ -689,7 +689,9 @@ define([
 
             // remove folder
             Env.user.userObject.delete([path], function () {
-                cb();
+                cb({
+                    fId: SFId
+                });
             });
         });
     };

From a328dc6c08ac41221094de423b0b446ab216e8cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Mon, 10 Feb 2020 14:20:14 +0000
Subject: [PATCH 33/57] fix text input color in team chat

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

diff --git a/www/teams/app-team.less b/www/teams/app-team.less
index 177efbd0e..eb49ec21f 100644
--- a/www/teams/app-team.less
+++ b/www/teams/app-team.less
@@ -42,6 +42,12 @@
                 .cp-app-contacts-container {
                     height: 100%;
                 }
+                .cp-app-contacts-input {
+                    textarea {
+                        border: 0px;
+                        color: white;
+                    }
+                }
             }
             & > .cp-team-drive {
                 display: flex;

From 40b144f87bddc935b51706d97ba670ca84720d51 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 10 Feb 2020 15:24:27 +0100
Subject: [PATCH 34/57] remove XXX

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

diff --git a/www/common/outer/async-store.js b/www/common/outer/async-store.js
index d3b1dce6e..39b3cba58 100644
--- a/www/common/outer/async-store.js
+++ b/www/common/outer/async-store.js
@@ -38,7 +38,7 @@ define([
             hideDuplicate: true
         },
         general: {
-            allowUserFeedback: true // XXX corner popup in settings?
+            allowUserFeedback: true
         }
     };
 

From 57be3248508a8c749aa6868d4eff322049c7d97b Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 10 Feb 2020 10:01:02 -0500
Subject: [PATCH 35/57] remove some XXX notes

---
 lib/hk-util.js            | 2 +-
 lib/rpc.js                | 2 +-
 scripts/tests/test-rpc.js | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/hk-util.js b/lib/hk-util.js
index 0fc196fe3..69832a544 100644
--- a/lib/hk-util.js
+++ b/lib/hk-util.js
@@ -44,7 +44,7 @@ const tryParse = function (Env, str) {
     try {
         return JSON.parse(str);
     } catch (err) {
-        Env.Log.error('HK_PARSE_ERROR', err); // XXX
+        Env.Log.error('HK_PARSE_ERROR', err);
     }
 };
 
diff --git a/lib/rpc.js b/lib/rpc.js
index 60b186563..1ade85d23 100644
--- a/lib/rpc.js
+++ b/lib/rpc.js
@@ -19,7 +19,7 @@ const Store = require("../storage/file");
 const BlobStore = require("../storage/blob");
 
 const UNAUTHENTICATED_CALLS = {
-    GET_FILE_SIZE: Pinning.getFileSize, // XXX TEST
+    GET_FILE_SIZE: Pinning.getFileSize,
     GET_MULTIPLE_FILE_SIZE: Pinning.getMultipleFileSize,
     GET_DELETED_PADS: Pinning.getDeletedPads,
     IS_CHANNEL_PINNED: Pinning.isChannelPinned,
diff --git a/scripts/tests/test-rpc.js b/scripts/tests/test-rpc.js
index f32a8ee60..07f30bc46 100644
--- a/scripts/tests/test-rpc.js
+++ b/scripts/tests/test-rpc.js
@@ -160,8 +160,8 @@ var createUser = function (config, cb) {
             wc.leave();
         }));
     }).nThen(function (w) {
-        // give the server time to write your mailbox data before checking that it's correct
-        // XXX chainpad-server sends an ACK before the channel has actually been created
+        // FIXME give the server time to write your mailbox data before checking that it's correct
+        // chainpad-server sends an ACK before the channel has actually been created
         // causing you to think that everything is good.
         // without this timeout the GET_METADATA rpc occasionally returns before
         // the metadata has actually been written to the disk.

From 3d2538c3cad38c2aa67ae6738b1a549f216c2bf4 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 10 Feb 2020 16:13:29 +0100
Subject: [PATCH 36/57] Fix narrow sidebar in teams

---
 customize.dist/src/less2/include/sidebar-layout.less | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/customize.dist/src/less2/include/sidebar-layout.less b/customize.dist/src/less2/include/sidebar-layout.less
index 5525f0fb8..7961e1bee 100644
--- a/customize.dist/src/less2/include/sidebar-layout.less
+++ b/customize.dist/src/less2/include/sidebar-layout.less
@@ -170,10 +170,14 @@
             flex-flow: column;
             overflow: auto;
             #cp-sidebarlayout-leftside {
-                width: 100%;
+                width: 100% !important; // Override "narrow" mode
+                padding-bottom: 20px;
                 .cp-sidebarlayout-categories {
                     .cp-sidebarlayout-category {
                         margin: 0;
+                        span.cp-sidebar-layout-category-name {
+                            display: inline !important; // override "narrow" mode
+                        }
                     }
                 }
             }

From 63a36df39b86a943aa9ca1259fcc8792e1021fba Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 10 Feb 2020 11:07:46 -0500
Subject: [PATCH 37/57] push the pending upload table below the file upload
 dialog

---
 customize.dist/src/less2/include/fileupload.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/customize.dist/src/less2/include/fileupload.less b/customize.dist/src/less2/include/fileupload.less
index 91117fedd..8fb1c8857 100644
--- a/customize.dist/src/less2/include/fileupload.less
+++ b/customize.dist/src/less2/include/fileupload.less
@@ -14,7 +14,7 @@
         right: 10vw;
         bottom: 10vh;
         box-sizing: border-box;
-        z-index: 1000000; //Z file upload table container
+        z-index: 100000; //Z file upload table container
         display: none;
         color: darken(@colortheme_drive-bg, 10%);
         max-height: 180px;

From 1231cacef16d6c7642ad0db1ca47d7276ea482a7 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 10 Feb 2020 11:21:04 -0500
Subject: [PATCH 38/57] remove XXX

---
 lib/commands/pin-rpc.js | 2 +-
 lib/commands/quota.js   | 3 ++-
 lib/rpc.js              | 4 +++-
 storage/file.js         | 4 ++--
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/lib/commands/pin-rpc.js b/lib/commands/pin-rpc.js
index d4bb96b71..e490f713d 100644
--- a/lib/commands/pin-rpc.js
+++ b/lib/commands/pin-rpc.js
@@ -23,7 +23,7 @@ var sumChannelSizes = function (sizes) {
         .reduce(function (a, b) { return a + b; }, 0);
 };
 
-// XXX it's possible for this to respond before the server has had a chance
+// FIXME it's possible for this to respond before the server has had a chance
 // to fetch the limits. Maybe we should respond with an error...
 // or wait until we actually know the limits before responding
 var getLimit = Pinning.getLimit = function (Env, publicKey, cb) {
diff --git a/lib/commands/quota.js b/lib/commands/quota.js
index 654802f35..74c4eca44 100644
--- a/lib/commands/quota.js
+++ b/lib/commands/quota.js
@@ -81,7 +81,8 @@ Quota.updateCachedLimits = function (Env, cb) {
 
     req.on('error', function (e) {
         Quota.applyCustomLimits(Env);
-        if (!Env.domain) { return cb(); } // XXX
+        // FIXME this is always falsey. Maybe we just suppress errors?
+        if (!Env.domain) { return cb(); }
         cb(e);
     });
 
diff --git a/lib/rpc.js b/lib/rpc.js
index 1ade85d23..23597eb5b 100644
--- a/lib/rpc.js
+++ b/lib/rpc.js
@@ -232,7 +232,9 @@ RPC.create = function (config, cb) {
         myDomain: config.myDomain,
         mySubdomain: config.mySubdomain,
         customLimits: config.customLimits,
-        domain: config.domain // XXX
+        // FIXME this attribute isn't in the default conf
+        // but it is referenced in Quota
+        domain: config.domain
     };
 
     Env.defaultStorageLimit = typeof(config.defaultStorageLimit) === 'number' && config.defaultStorageLimit > 0?
diff --git a/storage/file.js b/storage/file.js
index 92e8cceee..cb29d7fab 100644
--- a/storage/file.js
+++ b/storage/file.js
@@ -1123,7 +1123,7 @@ module.exports.create = function (conf, cb) {
             // iterate over the messages in a log
             readMessagesBin: (channelName, start, asyncMsgHandler, cb) => {
                 if (!isValidChannelId(channelName)) { return void cb(new Error('EINVAL')); }
-// XXX there is a race condition here
+// FIXME there is a race condition here
 // historyKeeper reads the file to find the byte offset of the first interesting message
 // then calls this function again to read from that point.
 // If this task is in the queue already when the file is read again
@@ -1143,7 +1143,7 @@ module.exports.create = function (conf, cb) {
             // remove a channel and its associated metadata log if present
             removeChannel: function (channelName, cb) {
                 if (!isValidChannelId(channelName)) { return void cb(new Error('EINVAL')); }
-// XXX there's another race condition here...
+// FIXME there's another race condition here...
 // when a remove and an append are scheduled in that order
 // the remove will delete the channel's metadata (including its validateKey)
 // then the append will recreate the channel and insert a message.

From bf7f2e5bcd2f3f0aef0fd1960c6c8ad51e3c004f Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 10 Feb 2020 17:25:50 +0100
Subject: [PATCH 39/57] Fix upload table horizontal scrollbar + add autoscroll

---
 www/common/sframe-common-file.js | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/www/common/sframe-common-file.js b/www/common/sframe-common-file.js
index 09f501df7..3d12f81ac 100644
--- a/www/common/sframe-common-file.js
+++ b/www/common/sframe-common-file.js
@@ -53,11 +53,17 @@ define([
 
         var $table = File.$table = $('<table>', { id: 'cp-fileupload-table' });
 
+        var hover = false;
         var createTableContainer = function ($body) {
             File.$container = $('<div>', { id: 'cp-fileupload' }).append(tableHeader).append($table).appendTo($body);
             $('.cp-fileupload-header-close').click(function () {
                 File.$container.fadeOut();
             });
+            File.$container.mouseenter(function () {
+                hover = true;
+            }).mouseleave(function () {
+                hover = false;
+            });
             return File.$container;
         };
 
@@ -209,6 +215,11 @@ define([
             window.setTimeout(function () { File.$container.show(); });
             var file = queue.queue.shift();
             if (file.dl) { return void file.dl(file); }
+            if (file.$line && file.$line[0] && !hover) {
+                var line = file.$line[0];
+                line.scrollIntoView(false);
+            }
+            delete file.$line;
             upload(file);
         };
         queue.push = function (obj) {
@@ -224,7 +235,7 @@ define([
             $('<div>', {'class':'cp-fileupload-table-progressbar'}).appendTo($progressContainer);
             $('<span>', {'class':'cp-fileupload-table-progress-value'}).text(Messages.upload_pending).appendTo($progressContainer);
 
-            var $tr = $('<tr>', {id: id}).appendTo($table);
+            var $tr = obj.$line = $('<tr>', {id: id}).appendTo($table);
             var $lines = $table.find('tr[id]');
             if ($lines.length > 5) {
                 //$lines.slice(0, $lines.length - 5).remove();
@@ -257,6 +268,15 @@ define([
             // cancel
             $('<td>', {'class': 'cp-fileupload-table-cancel'}).append($cancel).appendTo($tr);
 
+            var tw = $table.width();
+            var cw = File.$container.prop('clientWidth');
+            var diff = tw - cw;
+            if (diff && diff > 0) {
+                $table.css('margin-right', diff+'px');
+            } else {
+                $table.css('margin-right', '');
+            }
+
             queue.next();
         };
 

From a86469206e7d74ee3c6bb546bea8f86c03006c48 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 10 Feb 2020 17:37:48 +0100
Subject: [PATCH 40/57] Fix horizontal scrollbar again

---
 www/common/sframe-common-file.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/www/common/sframe-common-file.js b/www/common/sframe-common-file.js
index 3d12f81ac..2fd4e61de 100644
--- a/www/common/sframe-common-file.js
+++ b/www/common/sframe-common-file.js
@@ -273,8 +273,6 @@ define([
             var diff = tw - cw;
             if (diff && diff > 0) {
                 $table.css('margin-right', diff+'px');
-            } else {
-                $table.css('margin-right', '');
             }
 
             queue.next();

From bc2febfb8b5df34ef020544e511381c8baa12922 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 10 Feb 2020 11:47:55 -0500
Subject: [PATCH 41/57] bump version, drop flow dependency, use newer
 chainpad-server

---
 package-lock.json | 96 ++++++++++++++++++++++-------------------------
 package.json      |  4 +-
 2 files changed, 46 insertions(+), 54 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8be1c779c..d4a119d75 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "cryptpad",
-  "version": "3.10.0",
+  "version": "3.11.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -99,9 +99,9 @@
       "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg="
     },
     "chainpad-crypto": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/chainpad-crypto/-/chainpad-crypto-0.2.2.tgz",
-      "integrity": "sha512-7MJ7qPz/C4sJPsDhPMjdSRmliOCPoRO0XM1vUomcgXA6HINlW+if9AAt/H4q154nYhZ/b57njgC6cWgd/RDidg==",
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/chainpad-crypto/-/chainpad-crypto-0.2.4.tgz",
+      "integrity": "sha512-fWbVyeAv35vf/dkkQaefASlJcEfpEvfRI23Mtn+/TBBry7+LYNuJMXJiovVY35pfyw2+trKh1Py5Asg9vrmaVg==",
       "requires": {
         "tweetnacl": "git://github.com/dchest/tweetnacl-js.git#v0.12.2"
       },
@@ -113,9 +113,9 @@
       }
     },
     "chainpad-server": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/chainpad-server/-/chainpad-server-4.0.1.tgz",
-      "integrity": "sha512-duV57hO0o2cKaOwwWdDeO3hgN2thAqoQENrjozhamGrUjF9bFiNW2cq3Dg3HjOY6yeMNIGgj0jMuLJjTSERKhQ==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/chainpad-server/-/chainpad-server-4.0.2.tgz",
+      "integrity": "sha512-9NrFsATd70uAdksxsCZBIJ/SiREmJ6QLYTNaeFLH/nJpeZ2b7wblVGABCj3JYWvngdEZ7Umc+afbWH8sUmtgeQ==",
       "requires": {
         "nthen": "0.1.8",
         "pull-stream": "^3.6.9",
@@ -160,9 +160,9 @@
       "dev": true
     },
     "commander": {
-      "version": "2.20.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz",
-      "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==",
+      "version": "2.20.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
       "dev": true
     },
     "concat-map": {
@@ -240,9 +240,9 @@
       }
     },
     "dom-serializer": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.1.tgz",
-      "integrity": "sha512-sK3ujri04WyjwQXVoK4PU3y8ula1stq10GJZpqHIUgoGZdsGzAGu65BnU3d08aTVSvO7mGPZUc0wTEDL+qGE0Q==",
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
+      "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
       "dev": true,
       "requires": {
         "domelementtype": "^2.0.1",
@@ -397,15 +397,9 @@
       }
     },
     "flatten": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz",
-      "integrity": "sha1-2uRqnXj74lKSJYzB54CkHZXAN4I=",
-      "dev": true
-    },
-    "flow-bin": {
-      "version": "0.59.0",
-      "resolved": "https://registry.npmjs.org/flow-bin/-/flow-bin-0.59.0.tgz",
-      "integrity": "sha512-yJDRffvby5mCTkbwOdXwiGDjeea8Z+BPVuP53/tHqHIZC+KtQD790zopVf7mHk65v+wRn+TZ7tkRSNA9oDmyLg==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.3.tgz",
+      "integrity": "sha512-dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg==",
       "dev": true
     },
     "forwarded": {
@@ -449,9 +443,9 @@
       }
     },
     "glob": {
-      "version": "7.1.4",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
-      "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
+      "version": "7.1.6",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
       "dev": true,
       "requires": {
         "fs.realpath": "^1.0.0",
@@ -477,9 +471,9 @@
       }
     },
     "graceful-fs": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz",
-      "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q=="
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz",
+      "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ=="
     },
     "has-ansi": {
       "version": "2.0.0",
@@ -592,9 +586,9 @@
       "dev": true
     },
     "jshint": {
-      "version": "2.10.2",
-      "resolved": "https://registry.npmjs.org/jshint/-/jshint-2.10.2.tgz",
-      "integrity": "sha512-e7KZgCSXMJxznE/4WULzybCMNXNAd/bf5TSrvVEq78Q/K8ZwFpmBqQeDtNiHc3l49nV4E/+YeHU/JZjSUIrLAA==",
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/jshint/-/jshint-2.11.0.tgz",
+      "integrity": "sha512-ooaD/hrBPhu35xXW4gn+o3SOuzht73gdBuffgJzrZBJZPGgGiiTvJEgTyxFvBO2nz0+X1G6etF8SzUODTlLY6Q==",
       "dev": true,
       "requires": {
         "cli": "~1.0.0",
@@ -634,9 +628,9 @@
           "dev": true
         },
         "readable-stream": {
-          "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
           "dev": true,
           "requires": {
             "core-util-is": "~1.0.0",
@@ -765,16 +759,16 @@
       "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ=="
     },
     "mime-db": {
-      "version": "1.40.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
-      "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="
+      "version": "1.43.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz",
+      "integrity": "sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ=="
     },
     "mime-types": {
-      "version": "2.1.24",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz",
-      "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==",
+      "version": "2.1.26",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz",
+      "integrity": "sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ==",
       "requires": {
-        "mime-db": "1.40.0"
+        "mime-db": "1.43.0"
       }
     },
     "minimatch": {
@@ -847,9 +841,9 @@
       "dev": true
     },
     "pako": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.10.tgz",
-      "integrity": "sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==",
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
+      "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
       "dev": true
     },
     "parseurl": {
@@ -1304,19 +1298,19 @@
       }
     },
     "xml2js": {
-      "version": "0.4.19",
-      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz",
-      "integrity": "sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==",
+      "version": "0.4.23",
+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
+      "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
       "dev": true,
       "requires": {
         "sax": ">=0.6.0",
-        "xmlbuilder": "~9.0.1"
+        "xmlbuilder": "~11.0.0"
       }
     },
     "xmlbuilder": {
-      "version": "9.0.7",
-      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
-      "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=",
+      "version": "11.0.1",
+      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
+      "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==",
       "dev": true
     }
   }
diff --git a/package.json b/package.json
index ddd98c911..81be1c7f8 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "cryptpad",
   "description": "realtime collaborative visual editor with zero knowlege server",
-  "version": "3.10.0",
+  "version": "3.11.0",
   "license": "AGPL-3.0+",
   "repository": {
     "type": "git",
@@ -27,7 +27,6 @@
     "ws": "^3.3.1"
   },
   "devDependencies": {
-    "flow-bin": "^0.59.0",
     "jshint": "^2.10.2",
     "less": "2.7.1",
     "lesshint": "^4.5.0",
@@ -42,7 +41,6 @@
     "lint:js": "jshint --config .jshintrc --exclude-path .jshintignore .",
     "lint:server": "jshint --config .jshintrc lib",
     "lint:less": "./node_modules/lesshint/bin/lesshint -c ./.lesshintrc ./customize.dist/src/less2/",
-    "flow": "./node_modules/.bin/flow",
     "test": "node scripts/TestSelenium.js",
     "test-rpc": "cd scripts/tests && node test-rpc",
     "template": "cd customize.dist/src && for page in ../index.html ../privacy.html ../terms.html ../about.html ../contact.html ../what-is-cryptpad.html ../features.html ../../www/login/index.html ../../www/register/index.html ../../www/user/index.html;do echo $page; cp template.html $page; done;",

From 532333d42734d6f6cb4b52ac48efc1a65cdd563f Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 10 Feb 2020 17:58:39 +0100
Subject: [PATCH 42/57] Fix keyboard shortcut in confirm

---
 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 14dd675e6..aad7eaede 100644
--- a/www/common/common-interface.js
+++ b/www/common/common-interface.js
@@ -587,7 +587,7 @@ define([
             $ok.click();
         }, function () {
             $cancel.click();
-        }, ok);
+        });
 
         document.body.appendChild(frame);
         setTimeout(function () {

From 67a837349b1edfddc49367488c476b76892c668c Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Sun, 9 Feb 2020 16:56:15 +0100
Subject: [PATCH 43/57] Update translation files

Updated by "Cleanup translation files" hook in Weblate.

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

diff --git a/www/common/translations/messages.ca.json b/www/common/translations/messages.ca.json
index d840a0acc..b22340b05 100644
--- a/www/common/translations/messages.ca.json
+++ b/www/common/translations/messages.ca.json
@@ -181,7 +181,6 @@
     "okButton": "D'acord (Enter)",
     "cancel": "Cancel·la",
     "cancelButton": "Cancel·la (Esc)",
-    "doNotAskAgain": "No ho preguntis més (Esc)",
     "show_help_button": "Mostra l'ajuda",
     "hide_help_button": "Amaga l'ajuda",
     "help_button": "Ajuda",

From d372f436d887ffa687db51d7db229c0bc4c412e3 Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Sun, 9 Feb 2020 16:56:15 +0100
Subject: [PATCH 44/57] Update translation files

Updated by "Cleanup translation files" hook in Weblate.

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

diff --git a/www/common/translations/messages.el.json b/www/common/translations/messages.el.json
index e5fbf232e..5f3f455c1 100644
--- a/www/common/translations/messages.el.json
+++ b/www/common/translations/messages.el.json
@@ -151,7 +151,6 @@
     "okButton": "OK (enter)",
     "cancel": "Ακύρωση",
     "cancelButton": "Ακύρωση (esc)",
-    "doNotAskAgain": "Να μην ρωτηθώ ξανά (Esc)",
     "historyText": "Ιστορικό",
     "historyButton": "Εμφάνιση ιστορικού του εγγράφου",
     "history_next": "Μετάβαση στην επόμενη έκδοση",

From b73ef31a2c7b8dfc3e583554b711c971a718a173 Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Sun, 9 Feb 2020 16:56:16 +0100
Subject: [PATCH 45/57] Update translation files

Updated by "Cleanup translation files" hook in Weblate.

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

diff --git a/www/common/translations/messages.es.json b/www/common/translations/messages.es.json
index d7c0f707f..046291dc3 100644
--- a/www/common/translations/messages.es.json
+++ b/www/common/translations/messages.es.json
@@ -479,7 +479,6 @@
     "slide_invalidLess": "Estilo personalizado no válido",
     "fileShare": "Copiar link",
     "ok": "OK",
-    "doNotAskAgain": "No preguntar nuevamente (Esc)",
     "show_help_button": "Mostrar ayuda",
     "hide_help_button": "Esconder ayuda",
     "help_button": "Ayuda",

From 9c6109799e28d9619b892b1ec6921c487a0db389 Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Sun, 9 Feb 2020 16:56:16 +0100
Subject: [PATCH 46/57] Update translation files

Updated by "Cleanup translation files" hook in Weblate.

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

diff --git a/www/common/translations/messages.fi.json b/www/common/translations/messages.fi.json
index 3a22c53b3..2743d44a8 100644
--- a/www/common/translations/messages.fi.json
+++ b/www/common/translations/messages.fi.json
@@ -184,7 +184,6 @@
     "okButton": "OK (Enter)",
     "cancel": "Keskeytä",
     "cancelButton": "Keskeytä (Esc)",
-    "doNotAskAgain": "Älä kysy uudestaan (Esc)",
     "show_help_button": "Näytä ohje",
     "hide_help_button": "Piilota ohje",
     "help_button": "Ohje",

From ac39a97a0f337c9ecd15a75a064f693b07897f16 Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Sun, 9 Feb 2020 16:56:16 +0100
Subject: [PATCH 47/57] Update translation files

Updated by "Cleanup translation files" hook in Weblate.

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

diff --git a/www/common/translations/messages.fr.json b/www/common/translations/messages.fr.json
index 79740780a..5756527c0 100644
--- a/www/common/translations/messages.fr.json
+++ b/www/common/translations/messages.fr.json
@@ -181,7 +181,6 @@
     "okButton": "OK (Entrée)",
     "cancel": "Annuler",
     "cancelButton": "Annuler (Échap)",
-    "doNotAskAgain": "Ne plus demander (Échap)",
     "show_help_button": "Afficher l'aide",
     "hide_help_button": "Cacher l'aide",
     "help_button": "Aide",
@@ -938,7 +937,6 @@
     "creation_noTemplate": "Pas de modèle",
     "creation_newTemplate": "Nouveau modèle",
     "creation_create": "Créer",
-    "creation_saveSettings": "Ne plus me demander",
     "creation_settings": "Voir davantage de préférences",
     "creation_rememberHelp": "Ouvrez votre page de Préférences pour voir ce formulaire à nouveau",
     "creation_owners": "Propriétaires",
@@ -1006,7 +1004,6 @@
     "crowdfunding_popup_text": "<h3>Aider CryptPad</h3>Pour vous assurer que CryptPad soit activement développé, nous vous invitons à supporter le projet via la <a href=\"https://opencollective.com/cryptpad\">page OpenCollective</a>, où vous pouvez trouver notre <b>Roadmap</b> et nos <b>objectifs de financement</b>.",
     "crowdfunding_popup_yes": "Voir la page",
     "crowdfunding_popup_no": "Pas maintenant",
-    "crowdfunding_popup_never": "Ne plus demander",
     "survey": "Enquête CryptPad",
     "markdown_toc": "Sommaire",
     "debug_getGraph": "Obtenir le code permettant de générer un graphe de ce document",

From be929ecc8ff9e0497f15a0ee5b78f658ff8bb235 Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Sun, 9 Feb 2020 16:56:16 +0100
Subject: [PATCH 48/57] Update translation files

Updated by "Cleanup translation files" hook in Weblate.

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

diff --git a/www/common/translations/messages.it.json b/www/common/translations/messages.it.json
index 2a8211f03..89b596fcc 100644
--- a/www/common/translations/messages.it.json
+++ b/www/common/translations/messages.it.json
@@ -181,7 +181,6 @@
     "okButton": "OK (Enter)",
     "cancel": "Cancella",
     "cancelButton": "Cancella (Esc)",
-    "doNotAskAgain": "Non chiedere più (Esc)",
     "show_help_button": "Mostra l'aiuto",
     "hide_help_button": "Nascondi l'aiuto",
     "help_button": "Aiuto",

From 80ae86cda3cfbd8d2dcd803643dda7dbac827e6d Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Sun, 9 Feb 2020 16:56:16 +0100
Subject: [PATCH 49/57] Update translation files

Updated by "Cleanup translation files" hook in Weblate.

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

diff --git a/www/common/translations/messages.nb.json b/www/common/translations/messages.nb.json
index 9d5cd285f..d8dde2774 100644
--- a/www/common/translations/messages.nb.json
+++ b/www/common/translations/messages.nb.json
@@ -193,7 +193,6 @@
     "crowdfunding_button": "Støtt CryptPad",
     "crowdfunding_popup_yes": "Gå til OpenCollective",
     "crowdfunding_popup_no": "Ikke nå",
-    "crowdfunding_popup_never": "Ikke spør igjen takk",
     "markdown_toc": "Innhold",
     "fm_expirablePad": "Denne paden vill utgå på dato den {0}",
     "admin_authError": "Kun admin-tilgang",

From 985ed2505d120282d6ad4d7368d45b7455ed5b4d Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Sun, 9 Feb 2020 16:56:17 +0100
Subject: [PATCH 50/57] Translated using Weblate (German)

Currently translated at 100.0% (1201 of 1201 strings)

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

Update translation files

Updated by "Cleanup translation files" hook in Weblate.

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

diff --git a/www/common/translations/messages.de.json b/www/common/translations/messages.de.json
index e8bee9ae3..54fe6705e 100644
--- a/www/common/translations/messages.de.json
+++ b/www/common/translations/messages.de.json
@@ -179,7 +179,6 @@
     "okButton": "OK (Enter)",
     "cancel": "Abbrechen",
     "cancelButton": "Abbrechen (Esc)",
-    "doNotAskAgain": "Nicht mehr fragen (Esc)",
     "show_help_button": "Hilfe anzeigen",
     "hide_help_button": "Hilfe verbergen",
     "help_button": "Hilfe",
@@ -515,8 +514,8 @@
     "settings_creationSkipFalse": "Anzeigen",
     "settings_templateSkip": "Wahl der Vorlage überspringen",
     "settings_templateSkipHint": "Wenn du ein neues Pad erstellst und passende Vorlagen vorhanden sind, erscheint ein Dialog zur Auswahl einer Vorlage. Hier kannst du diesen Dialog überspringen und somit keine Vorlage verwenden.",
-    "settings_ownDriveTitle": "Aktiviere die neuesten Funktionen für dein Konto",
-    "settings_ownDriveHint": "Aus technischen Gründen sind nicht alle neue Funktionen für ältere Konten verfügbar. Ein kostenloses Upgrade wird dein CryptDrive für zukünftige Funktionen vorbereiten, ohne deine Arbeit zu stören.",
+    "settings_ownDriveTitle": "Account aktualisieren",
+    "settings_ownDriveHint": "Aus technischen Gründen sind nicht alle neue Funktionen für ältere Konten verfügbar. Eine kostenlose Aktualisierung wird die neuen Funktionen aktivieren und dein CryptDrive für zukünftige Aktualisierungen vorbereiten.",
     "settings_ownDriveButton": "Upgrade deines Kontos",
     "settings_ownDriveConfirm": "Das Upgrade deines Kontos kann einige Zeit dauern. Du wirst dich auf allen Geräten neu einloggen müssen. Bist du sicher?",
     "settings_ownDrivePending": "Das Upgrade deines Kontos läuft. Bitte schließe die Seite nicht und lade sie nicht neu, bis dieser Vorgang abgeschlossen ist.",
@@ -911,7 +910,7 @@
     "feedback_about": "Wenn du das liest, fragst du dich wahrscheinlich, weshalb dein Browser bei der der Ausführung mancher Aktionen Anfragen an Webseiten sendet",
     "feedback_privacy": "Wir respektieren deine Datenschutz, aber gleichzeitig wollen wir, dass die Benutzung von CryptPad sehr leicht ist. Deshalb wollen wir erfahren, welche Funktion am wichtigsten für unsere Benutzer ist, indem wir diese mit einer genauen Parameterbeschreibung anfordern.",
     "feedback_optout": "Wenn du das nicht möchtest, kannst du es in <a href='/settings/'>deinen Einstellungen</a> deaktivieren",
-    "creation_404": "Dieses Pad existiert nicht mehr. Benutze das folgende Formular, um ein neues Pad zu gestalten.",
+    "creation_404": "Dieses Pad existiert nicht mehr. Benutze das folgende Formular, um ein neues Pad zu erstellen.",
     "creation_ownedTitle": "Pad-Typ",
     "creation_owned": "Eigenes Pad",
     "creation_ownedTrue": "Eigenes Pad",
@@ -931,7 +930,6 @@
     "creation_noTemplate": "Keine Vorlage",
     "creation_newTemplate": "Neue Vorlage",
     "creation_create": "Erstellen",
-    "creation_saveSettings": "Dieses Dialog nicht mehr anzeigen",
     "creation_settings": "Mehr Einstellungen anzeigen",
     "creation_rememberHelp": "Gehe zu deinen Einstellungen, um diese Auswahl zurückzusetzen",
     "creation_owners": "Eigentümer",
@@ -998,7 +996,6 @@
     "crowdfunding_popup_text": "<h3>Wir brauchen deine Hilfe!</h3>Um sicherzustellen, dass CryptPad weiter aktiv entwickelt wird, unterstütze bitte das Projekt über die <a href=\"https://opencollective.com/cryptpad\">OpenCollective Seite</a>, wo du unsere <b>Roadmap</b> und <b>Funding-Ziele</b> lesen kannst.",
     "crowdfunding_popup_yes": "OpenCollective besuchen",
     "crowdfunding_popup_no": "Nicht jetzt",
-    "crowdfunding_popup_never": "Nicht mehr darum bitten",
     "invalidHashError": "Das angeforderte Dokument hat eine ungültige URL.",
     "oo_cantUpload": "Das Hochladen von Dateien ist nicht erlaubt, während andere Nutzer anwesend sind.",
     "oo_uploaded": "Das Hochladen wurde abgeschlossen. Klicke auf OK zum Neuladen der Seite oder auf Abbrechen zum Fortfahren im schreibgeschützten Modus.",
@@ -1099,7 +1096,7 @@
     "support_formMessage": "Gib deine Nachricht ein...",
     "support_cat_tickets": "Vorhandene Tickets",
     "support_listTitle": "Support-Tickets",
-    "support_listHint": "Hier ist die Liste der an die Administratoren gesendeten Tickets und der dazugehörigen Antworten. Ein geschlossenes Ticket kann nicht wieder geöffnet werden, du kannst jedoch ein neues Ticket eröffnen. Du kannst geschlossene Tickets ausblenden, aber sie werden weiterhin für die Administratoren sichtbar sein.",
+    "support_listHint": "Hier ist die Liste der an die Administratoren gesendeten Tickets und der dazugehörigen Antworten. Ein geschlossenes Ticket kann nicht wieder geöffnet werden, aber du kannst ein neues Ticket eröffnen. Du kannst geschlossene Tickets ausblenden.",
     "support_answer": "Antworten",
     "support_close": "Ticket schließen",
     "support_remove": "Ticket entfernen",
@@ -1293,5 +1290,12 @@
     "oo_sheetMigration_anonymousEditor": "Die Bearbeitung dieser Tabelle ist für anonyme Benutzer deaktiviert, bis sie von einem registrierten Benutzer auf die neueste Version aktualisiert wird.",
     "imprint": "Impressum",
     "isContact": "{0} ist einer deiner Kontakte",
-    "isNotContact": "{0} ist <b>nicht</b> einer deiner Kontakte"
+    "isNotContact": "{0} ist <b>nicht</b> einer deiner Kontakte",
+    "settings_cat_security": "Vertraulichkeit",
+    "settings_safeLinksHint": "CryptPad fügt den Pad-Links die Schlüssel zum Entschlüsseln der Inhalte hinzu. Jeder, der Zugriff auf den Browserverlauf hat, kann möglicherweise die Daten lesen. Dazu gehören Browsererweiterungen und Browser, die den Verlauf geräteübergreifend synchronisieren. Die Aktivierung von \"sicheren Links\" verhindert, dass die Schlüssel in den Browserverlauf gelangen oder in der Adressleiste angezeigt werden, wann immer dies möglich ist. Wir empfehlen dringend, diese Funktion zu aktivieren und das Menü {0} Teilen zu verwenden.",
+    "dontShowAgain": "Nicht mehr anzeigen",
+    "profile_login": "Du musst dich einloggen, um diesen Benutzer zu deinen Kontakten hinzuzufügen",
+    "safeLinks_error": "Dieser Link gibt dir keinen Zugriff auf das Dokument",
+    "settings_safeLinksCheckbox": "Sichere Links aktivieren",
+    "settings_safeLinksTitle": "Sichere Links"
 }

From fbf1e287e9554a8b1331e9ebe5e28bff9c323185 Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Sun, 9 Feb 2020 16:56:17 +0100
Subject: [PATCH 51/57] Update translation files

Updated by "Cleanup translation files" hook in Weblate.

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

diff --git a/www/common/translations/messages.pt-br.json b/www/common/translations/messages.pt-br.json
index 59b70b275..5eb330666 100644
--- a/www/common/translations/messages.pt-br.json
+++ b/www/common/translations/messages.pt-br.json
@@ -409,7 +409,6 @@
     "fileEmbedScript": "",
     "fileEmbedTag": "",
     "ok": "",
-    "doNotAskAgain": "",
     "show_help_button": "",
     "hide_help_button": "",
     "help_button": "",

From 8f060906263af50e032edfa6ab6b7a4a7c374b0f Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Sun, 9 Feb 2020 16:56:17 +0100
Subject: [PATCH 52/57] Update translation files

Updated by "Cleanup translation files" hook in Weblate.

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

diff --git a/www/common/translations/messages.ro.json b/www/common/translations/messages.ro.json
index 56eab943a..c4510dadb 100644
--- a/www/common/translations/messages.ro.json
+++ b/www/common/translations/messages.ro.json
@@ -395,7 +395,6 @@
     "fileEmbedTitle": "Include fișierul într-o pagină externă",
     "fileEmbedTag": "După care plasează această etichetă Media oriunde pe pagina unde vrei sa o plasezi",
     "ok": "Ok",
-    "doNotAskAgain": "Nu mă întreba din nou (Esc)",
     "show_help_button": "Arată ajutorul",
     "hide_help_button": "Maschează ajutorul",
     "help_button": "Ajutor",

From 4f9d0d71f990e86e3fb8745b5a595992d7805aea Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Sun, 9 Feb 2020 16:56:17 +0100
Subject: [PATCH 53/57] Update translation files

Updated by "Cleanup translation files" hook in Weblate.

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

diff --git a/www/common/translations/messages.ru.json b/www/common/translations/messages.ru.json
index 66cce1d63..77c0ff60b 100644
--- a/www/common/translations/messages.ru.json
+++ b/www/common/translations/messages.ru.json
@@ -175,7 +175,6 @@
     "okButton": "OK (Enter)",
     "cancel": "Отмена",
     "cancelButton": "Отмена (Esc)",
-    "doNotAskAgain": "Не спрашивать снова (Esc)",
     "show_help_button": "Показать справку",
     "hide_help_button": "Скрыть справку",
     "help_button": "Справка",
@@ -299,7 +298,6 @@
     "fm_removeSeveralPermanentlyDialog": "Вы уверены, что хотите навсегда удалить {0} элементов из вашего Хранилища?",
     "crowdfunding_button": "Поддержите CryptPad",
     "crowdfunding_popup_no": "Не сейчас",
-    "crowdfunding_popup_never": "Не спрашивать меня снова",
     "markdown_toc": "Содержимое",
     "fm_expirablePad": "Этот блокнот истечет {0}",
     "fileEmbedTitle": "Встроить файл во внешнюю страницу",

From 44de8a41a1de6e16106c3f7d409726236aa87e77 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 10 Feb 2020 18:33:59 +0100
Subject: [PATCH 54/57] Improve confirm modal keydown listeners

---
 www/common/common-interface.js | 3 ++-
 www/common/drive-ui.js         | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/www/common/common-interface.js b/www/common/common-interface.js
index aad7eaede..b9869ba67 100644
--- a/www/common/common-interface.js
+++ b/www/common/common-interface.js
@@ -70,6 +70,7 @@ define([
                     if (typeof(yes) === 'function') { yes(e); }
                     break;
             }
+            $(el || window).off('keydown', handler);
         };
 
         $(el || window).keydown(handler);
@@ -587,7 +588,7 @@ define([
             $ok.click();
         }, function () {
             $cancel.click();
-        });
+        }, frame);
 
         document.body.appendChild(frame);
         setTimeout(function () {
diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index e86fa3351..ce5a76e73 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -3345,7 +3345,9 @@ define([
                 // in history mode we want to focus the version number input
                 if (!history.isHistoryMode && !APP.mobile()) {
                     var st = $tree.scrollTop() || 0;
-                    $tree.find('#cp-app-drive-tree-search-input').focus();
+                    if (!$('.alertify').length) {
+                        $tree.find('#cp-app-drive-tree-search-input').focus();
+                    }
                     $tree.scrollTop(st);
                 }
                 $tree.find('#cp-app-drive-tree-search-input')[0].selectionStart = getSearchCursor();

From 1be01c07eee3431218d0b40a58164f60fec6df31 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 10 Feb 2020 13:04:58 -0500
Subject: [PATCH 55/57] fix bad copypaste in the example nginx file

---
 docs/example.nginx.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/example.nginx.conf b/docs/example.nginx.conf
index bef853d26..6d45b8198 100644
--- a/docs/example.nginx.conf
+++ b/docs/example.nginx.conf
@@ -106,7 +106,7 @@ server {
     if ($uri ~ ^\/common\/onlyoffice\/.*\/index\.html.*$) { set $unsafe 1; }
 
     # everything except the sandbox domain is a privileged scope, as they might be used to handle keys
-    if ($host != sandbox.cryptpad.info) { set $unsafe 0; }
+    if ($host != $sandbox_domain) { set $unsafe 0; }
 
     # privileged contexts allow a few more rights than unprivileged contexts, though limits are still applied
     if ($unsafe) {

From 9cac465b0813405c06e67dd574fb92e5a824f956 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 10 Feb 2020 15:39:57 -0500
Subject: [PATCH 56/57] add missing font-awesome share icon to the safe link
 hint

---
 www/settings/inner.js | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/www/settings/inner.js b/www/settings/inner.js
index 7de5b7752..23ee3e45e 100644
--- a/www/settings/inner.js
+++ b/www/settings/inner.js
@@ -117,6 +117,18 @@ define([
 
     var create = {};
 
+    var SPECIAL_HINTS_HANDLER = {
+        safeLinks: function () {
+            return $('<span>', {'class': 'cp-sidebarlayout-description'})
+                .html(Messages._getKey('settings_safeLinksHint', ['<span class="fa fa-shhare-alt"></span>']));
+        },
+    };
+
+    var DEFAULT_HINT_HANDLER = function (safeKey) {
+        return $('<span>', {'class': 'cp-sidebarlayout-description'})
+            .text(Messages['settings_'+safeKey+'Hint'] || 'Coming soon...');
+    };
+
     var makeBlock = function (key, getter, full) {
         var safeKey = key.replace(/-([a-z])/g, function (g) { return g[1].toUpperCase(); });
 
@@ -124,8 +136,14 @@ define([
             var $div = $('<div>', {'class': 'cp-settings-' + key + ' cp-sidebarlayout-element'});
             if (full) {
                 $('<label>').text(Messages['settings_'+safeKey+'Title'] || key).appendTo($div);
-                $('<span>', {'class': 'cp-sidebarlayout-description'})
-                    .text(Messages['settings_'+safeKey+'Hint'] || 'Coming soon...').appendTo($div);
+
+                // if this block's hint needs a special renderer, then create it in SPECIAL_HINTS_HANLDER
+                // otherwise the default will be used
+                var hintFunction = (typeof(SPECIAL_HINTS_HANDLER[safeKey]) === 'function')?
+                    SPECIAL_HINTS_HANDLER[safeKey]:
+                    DEFAULT_HINT_HANDLER;
+
+                hintFunction(safeKey).appendTo($div);
             }
             getter(function (content) {
                 $div.append(content);

From 93abdff397e0b2e301b70e66fd2a7347f560958f Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 10 Feb 2020 15:40:55 -0500
Subject: [PATCH 57/57] set codename 'LabradorDuck' for 3.11.0

---
 customize.dist/pages.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/customize.dist/pages.js b/customize.dist/pages.js
index fc3ee6175..4b62ff785 100644
--- a/customize.dist/pages.js
+++ b/customize.dist/pages.js
@@ -107,7 +107,7 @@ define([
                     ])*/
                 ])
             ]),
-            h('div.cp-version-footer', "CryptPad v3.10.0 (Kouprey)")
+            h('div.cp-version-footer', "CryptPad v3.11.0 (LabradorDuck)")
         ]);
     };