web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix friend requests from the userlist

Browse Source
This commit is contained in:
yflory
2017-12-15 16:19:22 +01:00
parent f292407c6e
commit c18d4297e1
3 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
www/common/sframe-common-outer.js
View File

@@ -307,17 +307,16 @@ define([
});
sframeChan.on('Q_SEND_FRIEND_REQUEST', function (netfluxId, cb) {
Messaging.inviteFromUserlist(Cryptpad, netfluxId);
cb();
Cryptpad.inviteFromUserlist(netfluxId, cb);
});
Cryptpad.onFriendRequest = function (confirmText, cb) {
Cryptpad.messaging.onFriendRequest.reg(function (confirmText, cb) {
sframeChan.query('Q_INCOMING_FRIEND_REQUEST', confirmText, function (err, data) {
cb(data);
});
};
Cryptpad.onFriendComplete = function (data) {
});
Cryptpad.messaging.onFriendComplete.reg(function (data) {
sframeChan.event('EV_FRIEND_REQUEST', data);
};
});
sframeChan.on('Q_GET_FULL_HISTORY', function (data, cb) {
var crypto = Crypto.createEncryptor(secret.keys);