dnrops
/
cryptpad
mirror of https://github.com/xwiki-labs/cryptpad
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pin the chat channels

This commit is contained in:
yflory 2017-07-10 10:39:57 +02:00
parent c096872467
commit 1c531ccd47
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
www/common/common-messaging.js
View File

@ -50,6 +50,15 @@ define([
return proxy.friends || {};
};
Msg.getFriendChannelsList = function (common) {
var friends = getFriendList(common);
var list = [];
Object.keys(friends).forEach(function (key) {
list.push(friends[key].channel);
});
return list;
};
// Messaging tools
var avatars = {};
@ -332,7 +341,9 @@ define([
if (friends[pubKey]) { return void cb("E_EXISTS"); }
friends[pubKey] = data;
common.whenRealtimeSyncs(common.getRealtime(), cb);
common.whenRealtimeSyncs(common.getRealtime(), function () {
common.pinPads([data.channel], cb);
});
common.changeDisplayName(proxy[common.displayNameKey]);
};

6
www/common/cryptpad-common.js
View File

@ -116,6 +116,7 @@ define([
common.inviteFromUserlist = Messaging.inviteFromUserlist;
common.createOwnedChannel = Messaging.createOwnedChannel;
common.getFriendList = Messaging.getFriendList;
common.getFriendChannelsList = Messaging.getFriendChannelsList;
common.getFriendListUI = Messaging.getFriendListUI;
common.createData = Messaging.createData;
@ -751,6 +752,11 @@ define([
if (avatarChan) { list.push(avatarChan); }
}
if (getProxy().friends) {
var fList = common.getFriendChannelsList(common);
list = list.concat(fList);
}
list.push(common.base64ToHex(userChannel));
list.sort();