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

Enable friend requests from secure pads

Browse Source
This commit is contained in:
yflory
2017-08-28 16:21:05 +02:00
parent 147d88d845
commit 88cb4fd83c
7 changed files with 82 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -134,7 +134,8 @@ define([
var confirmMsg = common.Messages._getKey('contacts_request', [
common.fixHTML(msgData.displayName)
]);
common.confirm(confirmMsg, todo, null, true);
common.onFriendRequest(confirmMsg, todo);
//common.confirm(confirmMsg, todo, null, true);
return;
}
if (msg[0] === "FRIEND_REQ_OK") {
@@ -144,9 +145,15 @@ define([
// FIXME clarify this function's name
addToFriendList(common, msgData, function (err) {
if (err) {
return void common.log(common.Messages.contacts_addError);
return void Cryptpad.onFriendComplete({
logText: common.Messages.contacts_addError,
netfluxId: sender
});
}
common.log(common.Messages.contacts_added);
Cryptpad.onFriendComplete({
logText: common.Messages.contacts_added,
netfluxId: sender
});
var msg = ["FRIEND_REQ_ACK", chan];
var msgStr = Crypto.encrypt(JSON.stringify(msg), key);
network.sendto(sender, msgStr);
@@ -156,7 +163,10 @@ define([
if (msg[0] === "FRIEND_REQ_NOK") {
var i = pendingRequests.indexOf(sender);
if (i !== -1) { pendingRequests.splice(i, 1); }
common.log(common.Messages.contacts_rejected);
Cryptpad.onFriendComplete({
logText: common.Messages.contacts_rejected,
netfluxId: sender
});
common.changeDisplayName(proxy[common.displayNameKey]);
return;
}
@@ -165,9 +175,15 @@ define([
if (!data) { return; }
addToFriendList(common, data, function (err) {
if (err) {
return void common.log(common.Messages.contacts_addError);
return void Cryptpad.onFriendComplete({
logText: common.Messages.contacts_addError,
netfluxId: sender
});
}
common.log(common.Messages.contacts_added);
Cryptpad.onFriendComplete({
logText: common.Messages.contacts_added,
netfluxId: sender
});
});
return;
}