Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

www/common/common-messenger.js

@@ -44,6 +44,7 @@ define([
             profile: proxy.profile && proxy.profile.view,
             edPublic: proxy.edPublic,
             curvePublic: proxy.curvePublic,
+            notifications: Util.find(proxy, ['mailboxes', 'notifications', 'channel']),
             avatar: proxy.profile && proxy.profile.avatar
         };
     };
@@ -611,6 +612,15 @@ define([
                             cb();
                         });
                     });
+                } else {
+                    removeFromFriendList(curvePublic, function () {
+                        delete channels[channel.id];
+                        emit('UNFRIEND', {
+                            curvePublic: curvePublic,
+                            fromMe: true
+                        });
+                        cb();
+                    });
                 }
                 channel.wc.bcast(cryptMsg).then(function () {}, function (err) {
                     console.error(err);