lint compliance

This commit is contained in:
yflory 2020-02-05 13:33:32 +01:00
parent 653d58433e
commit 2ee38ccc42
9 changed files with 127 additions and 147 deletions

View File

@ -53,10 +53,18 @@ define([
return list; return list;
}; };
Msg.declineFriendRequest = function (store, data, cb) {
store.mailbox.sendTo('DECLINE_FRIEND_REQUEST', {}, {
channel: data.notifications,
curvePublic: data.curvePublic
}, function (obj) {
cb(obj);
});
};
Msg.acceptFriendRequest = function (store, data, cb) { Msg.acceptFriendRequest = function (store, data, cb) {
var friend = getFriend(store.proxy, data.curvePublic) || {}; var friend = getFriend(store.proxy, data.curvePublic) || {};
var myData = createData(store.proxy, friend.channel || data.channel); var myData = createData(store.proxy, friend.channel || data.channel);
store.mailbox.sendTo('ACCEPT_FRIEND_REQUEST', myData, { store.mailbox.sendTo('ACCEPT_FRIEND_REQUEST', { user: myData }, {
channel: data.notifications, channel: data.notifications,
curvePublic: data.curvePublic curvePublic: data.curvePublic
}, function (obj) { }, function (obj) {
@ -110,7 +118,7 @@ define([
var proxy = store.proxy; var proxy = store.proxy;
var friend = proxy.friends[curvePublic]; var friend = proxy.friends[curvePublic];
if (!friend) { return void cb({error: 'ENOENT'}); } if (!friend) { return void cb({error: 'ENOENT'}); }
if (!friend.notifications || !friend.channel) { return void cb({error: 'EINVAL'}); } if (!friend.notifications) { return void cb({error: 'EINVAL'}); }
store.mailbox.sendTo('UNFRIEND', { store.mailbox.sendTo('UNFRIEND', {
curvePublic: proxy.curvePublic curvePublic: proxy.curvePublic

View File

@ -212,15 +212,7 @@ define([
common.mailbox.sendTo("RM_OWNER", { common.mailbox.sendTo("RM_OWNER", {
channel: channel, channel: channel,
title: data.title, title: data.title,
pending: pending, pending: pending
user: {
displayName: user.name,
avatar: user.avatar,
profile: user.profile,
notifications: user.notifications,
curvePublic: user.curvePublic,
edPublic: priv.edPublic
}
}, { }, {
channel: friend.notifications, channel: friend.notifications,
curvePublic: friend.curvePublic curvePublic: friend.curvePublic
@ -363,15 +355,7 @@ define([
channel: channel, channel: channel,
href: data.href, href: data.href,
password: data.password, password: data.password,
title: data.title, title: data.title
user: {
displayName: user.name,
avatar: user.avatar,
profile: user.profile,
notifications: user.notifications,
curvePublic: user.curvePublic,
edPublic: priv.edPublic
}
}, { }, {
channel: friend.notifications, channel: friend.notifications,
curvePublic: friend.curvePublic curvePublic: friend.curvePublic
@ -4335,7 +4319,8 @@ define([
UIElements.displayFriendRequestModal = function (common, data) { UIElements.displayFriendRequestModal = function (common, data) {
var msg = data.content.msg; var msg = data.content.msg;
var text = Messages._getKey('contacts_request', [Util.fixHTML(msg.content.displayName)]); var userData = msg.content.user;
var text = Messages._getKey('contacts_request', [Util.fixHTML(userData.displayName)]);
var todo = function (yes) { var todo = function (yes) {
common.getSframeChannel().query("Q_ANSWER_FRIEND_REQUEST", { common.getSframeChannel().query("Q_ANSWER_FRIEND_REQUEST", {
@ -4362,7 +4347,6 @@ define([
UIElements.displayAddOwnerModal = function (common, data) { UIElements.displayAddOwnerModal = function (common, data) {
var priv = common.getMetadataMgr().getPrivateData(); var priv = common.getMetadataMgr().getPrivateData();
var user = common.getMetadataMgr().getUserData();
var sframeChan = common.getSframeChannel(); var sframeChan = common.getSframeChannel();
var msg = data.content.msg; var msg = data.content.msg;
@ -4397,15 +4381,7 @@ define([
href: msg.content.href, href: msg.content.href,
password: msg.content.password, password: msg.content.password,
title: msg.content.title, title: msg.content.title,
answer: yes, answer: yes
user: {
displayName: user.name,
avatar: user.avatar,
profile: user.profile,
notifications: user.notifications,
curvePublic: user.curvePublic,
edPublic: priv.edPublic
}
}, { }, {
channel: msg.content.user.notifications, channel: msg.content.user.notifications,
curvePublic: msg.content.user.curvePublic curvePublic: msg.content.user.curvePublic
@ -4486,7 +4462,6 @@ define([
}; };
UIElements.displayAddTeamOwnerModal = function (common, data) { UIElements.displayAddTeamOwnerModal = function (common, data) {
var priv = common.getMetadataMgr().getPrivateData(); var priv = common.getMetadataMgr().getPrivateData();
var user = common.getMetadataMgr().getUserData();
var sframeChan = common.getSframeChannel(); var sframeChan = common.getSframeChannel();
var msg = data.content.msg; var msg = data.content.msg;
@ -4503,15 +4478,7 @@ define([
common.mailbox.sendTo("ADD_OWNER_ANSWER", { common.mailbox.sendTo("ADD_OWNER_ANSWER", {
teamChannel: msg.content.teamChannel, teamChannel: msg.content.teamChannel,
title: msg.content.title, title: msg.content.title,
answer: yes, answer: yes
user: {
displayName: user.name,
avatar: user.avatar,
profile: user.profile,
notifications: user.notifications,
curvePublic: user.curvePublic,
edPublic: priv.edPublic
}
}, { }, {
channel: msg.content.user.notifications, channel: msg.content.user.notifications,
curvePublic: msg.content.user.curvePublic curvePublic: msg.content.user.curvePublic
@ -4627,8 +4594,6 @@ define([
}; };
UIElements.displayInviteTeamModal = function (common, data) { UIElements.displayInviteTeamModal = function (common, data) {
var priv = common.getMetadataMgr().getPrivateData();
var user = common.getMetadataMgr().getUserData();
var msg = data.content.msg; var msg = data.content.msg;
var name = Util.fixHTML(msg.content.user.displayName) || Messages.anonymous; var name = Util.fixHTML(msg.content.user.displayName) || Messages.anonymous;
@ -4649,15 +4614,7 @@ define([
common.mailbox.sendTo("INVITE_TO_TEAM_ANSWER", { common.mailbox.sendTo("INVITE_TO_TEAM_ANSWER", {
answer: yes, answer: yes,
teamChannel: msg.content.team.channel, teamChannel: msg.content.team.channel,
teamName: teamName, teamName: teamName
user: {
displayName: user.name,
avatar: user.avatar,
profile: user.profile,
notifications: user.notifications,
curvePublic: user.curvePublic,
edPublic: priv.edPublic
}
}, { }, {
channel: msg.content.user.notifications, channel: msg.content.user.notifications,
curvePublic: msg.content.user.curvePublic curvePublic: msg.content.user.curvePublic

View File

@ -29,7 +29,9 @@ define([
handlers['FRIEND_REQUEST'] = function (common, data) { handlers['FRIEND_REQUEST'] = function (common, data) {
var content = data.content; var content = data.content;
var msg = content.msg; var msg = content.msg;
var name = Util.fixHTML(msg.content.displayName) || Messages.anonymous; var userData = msg.content.user || msg.content;
var name = Util.fixHTML(userData.displayName) || Messages.anonymous;
msg.content = { user: userData };
// Display the notification // Display the notification
content.getFormatText = function () { content.getFormatText = function () {
@ -37,7 +39,7 @@ define([
}; };
// Check authenticity // Check authenticity
if (msg.author !== msg.content.curvePublic) { return; } if (msg.author !== userData.curvePublic) { return; }
// if not archived, add handlers // if not archived, add handlers
if (!content.archived) { if (!content.archived) {
@ -51,7 +53,11 @@ define([
handlers['FRIEND_REQUEST_ACCEPTED'] = function (common, data) { handlers['FRIEND_REQUEST_ACCEPTED'] = function (common, data) {
var content = data.content; var content = data.content;
var msg = content.msg; var msg = content.msg;
var name = Util.fixHTML(msg.content.name) || Messages.anonymous; var userData = typeof(msg.content.user) === "object" ? msg.content.user : {
displayName: msg.content.name,
curvePublic: msg.content.user
};
var name = Util.fixHTML(userData.displayName) || Messages.anonymous;
content.getFormatText = function () { content.getFormatText = function () {
return Messages._getKey('friendRequest_accepted', [name]); return Messages._getKey('friendRequest_accepted', [name]);
}; };
@ -63,7 +69,11 @@ define([
handlers['FRIEND_REQUEST_DECLINED'] = function (common, data) { handlers['FRIEND_REQUEST_DECLINED'] = function (common, data) {
var content = data.content; var content = data.content;
var msg = content.msg; var msg = content.msg;
var name = Util.fixHTML(msg.content.name) || Messages.anonymous; var userData = typeof(msg.content.user) === "object" ? msg.content.user : {
displayName: msg.content.name,
curvePublic: msg.content.user
};
var name = Util.fixHTML(userData.displayName) || Messages.anonymous;
content.getFormatText = function () { content.getFormatText = function () {
return Messages._getKey('friendRequest_declined', [name]); return Messages._getKey('friendRequest_declined', [name]);
}; };

View File

@ -1267,15 +1267,15 @@ define([
// If we accept the request, add the friend to the list // If we accept the request, add the friend to the list
if (value) { if (value) {
Messaging.acceptFriendRequest(store, msg.content, function (obj) { Messaging.acceptFriendRequest(store, msg.content.user, function (obj) {
if (obj && obj.error) { return void cb(obj); } if (obj && obj.error) { return void cb(obj); }
Messaging.addToFriendList({ Messaging.addToFriendList({
proxy: store.proxy, proxy: store.proxy,
realtime: store.realtime, realtime: store.realtime,
pinPads: function (data, cb) { Store.pinPads(null, data, cb); }, pinPads: function (data, cb) { Store.pinPads(null, data, cb); },
}, msg.content, function (err) { }, msg.content.user, function (err) {
if (store.messenger) { if (store.messenger) {
store.messenger.onFriendAdded(msg.content); store.messenger.onFriendAdded(msg.content.user);
} }
broadcast([], "UPDATE_METADATA"); broadcast([], "UPDATE_METADATA");
if (err) { return void cb({error: err}); } if (err) { return void cb({error: err}); }
@ -1285,12 +1285,7 @@ define([
return; return;
} }
// Otherwise, just remove the notification // Otherwise, just remove the notification
store.mailbox.sendTo('DECLINE_FRIEND_REQUEST', { Messaging.declineFriendRequest(store, msg.content.user, function (obj) {
displayName: store.proxy['cryptpad.username']
}, {
channel: msg.content.notifications,
curvePublic: msg.content.curvePublic
}, function (obj) {
broadcast([], "UPDATE_METADATA"); broadcast([], "UPDATE_METADATA");
cb(obj); cb(obj);
}); });
@ -1312,8 +1307,9 @@ define([
store.proxy.friends_pending[data.curvePublic] = +new Date(); store.proxy.friends_pending[data.curvePublic] = +new Date();
broadcast([], "UPDATE_METADATA"); broadcast([], "UPDATE_METADATA");
var myData = Messaging.createData(store.proxy); store.mailbox.sendTo('FRIEND_REQUEST', {
store.mailbox.sendTo('FRIEND_REQUEST', myData, { user: Messaging.createData(store.proxy)
}, {
channel: data.notifications, channel: data.notifications,
curvePublic: data.curvePublic curvePublic: data.curvePublic
}, function (obj) { }, function (obj) {
@ -1649,11 +1645,8 @@ define([
// If send is true, send the request to the owner. // If send is true, send the request to the owner.
if (owner) { if (owner) {
if (data.send) { if (data.send) {
var myData = Messaging.createData(store.proxy);
delete myData.channel;
store.mailbox.sendTo('REQUEST_PAD_ACCESS', { store.mailbox.sendTo('REQUEST_PAD_ACCESS', {
channel: data.channel, channel: data.channel
user: myData
}, { }, {
channel: owner.notifications, channel: owner.notifications,
curvePublic: owner.curvePublic curvePublic: owner.curvePublic
@ -1687,13 +1680,10 @@ define([
} }
})) { return void cb({error: 'ENOTFOUND'}); } })) { return void cb({error: 'ENOTFOUND'}); }
var myData = Messaging.createData(store.proxy);
delete myData.channel;
store.mailbox.sendTo("GIVE_PAD_ACCESS", { store.mailbox.sendTo("GIVE_PAD_ACCESS", {
channel: channel, channel: channel,
href: href, href: href,
title: title, title: title
user: myData
}, { }, {
channel: data.user.notifications, channel: data.user.notifications,
curvePublic: data.user.curvePublic curvePublic: data.user.curvePublic
@ -1727,13 +1717,11 @@ define([
} }
// Tell all the owners that the pad was deleted from the server // Tell all the owners that the pad was deleted from the server
var curvePublic = store.proxy.curvePublic; var curvePublic = store.proxy.curvePublic;
var myData = Messaging.createData(store.proxy, false);
m.forEach(function (obj) { m.forEach(function (obj) {
var mb = JSON.parse(obj); var mb = JSON.parse(obj);
if (mb.curvePublic === curvePublic) { return; } if (mb.curvePublic === curvePublic) { return; }
store.mailbox.sendTo('OWNED_PAD_REMOVED', { store.mailbox.sendTo('OWNED_PAD_REMOVED', {
channel: channel, channel: channel
user: myData
}, { }, {
channel: mb.notifications, channel: mb.notifications,
curvePublic: mb.curvePublic curvePublic: mb.curvePublic

View File

@ -4,6 +4,7 @@ define([
'/common/common-util.js', '/common/common-util.js',
], function (Messaging, Hash, Util) { ], function (Messaging, Hash, Util) {
// Random timeout between 10 and 30 times your sync time (lag + chainpad sync)
var getRandomTimeout = function (ctx) { var getRandomTimeout = function (ctx) {
var lag = ctx.store.realtime.getLag().lag || 0; var lag = ctx.store.realtime.getLag().lag || 0;
return (Math.max(0, lag) + 300) * 20 * (0.5 + Math.random()); return (Math.max(0, lag) + 300) * 20 * (0.5 + Math.random());
@ -22,9 +23,11 @@ define([
// Store the friend request displayed to avoid duplicates // Store the friend request displayed to avoid duplicates
var friendRequest = {}; var friendRequest = {};
handlers['FRIEND_REQUEST'] = function (ctx, box, data, cb) { handlers['FRIEND_REQUEST'] = function (ctx, box, data, cb) {
// Old format: data was stored directly in "content"
var userData = data.msg.content.user || data.msg.content;
// Check if the request is valid (send by the correct user) // Check if the request is valid (send by the correct user)
if (data.msg.author !== data.msg.content.curvePublic) { if (data.msg.author !== userData.curvePublic) {
return void cb(true); return void cb(true);
} }
@ -40,7 +43,8 @@ define([
if (Messaging.getFriend(ctx.store.proxy, data.msg.author) || if (Messaging.getFriend(ctx.store.proxy, data.msg.author) ||
ctx.store.proxy.friends_pending[data.msg.author]) { ctx.store.proxy.friends_pending[data.msg.author]) {
delete ctx.store.proxy.friends_pending[data.msg.author]; delete ctx.store.proxy.friends_pending[data.msg.author];
Messaging.acceptFriendRequest(ctx.store, data.msg.content, function (obj) {
Messaging.acceptFriendRequest(ctx.store, userData, function (obj) {
if (obj && obj.error) { if (obj && obj.error) {
return void cb(); return void cb();
} }
@ -48,10 +52,10 @@ define([
proxy: ctx.store.proxy, proxy: ctx.store.proxy,
realtime: ctx.store.realtime, realtime: ctx.store.realtime,
pinPads: ctx.pinPads pinPads: ctx.pinPads
}, data.msg.content, function (err) { }, userData, function (err) {
if (err) { console.error(err); } if (err) { return void console.error(err); }
if (ctx.store.messenger) { if (ctx.store.messenger) {
ctx.store.messenger.onFriendAdded(data.msg.content); ctx.store.messenger.onFriendAdded(userData);
} }
}); });
ctx.updateMetadata(); ctx.updateMetadata();
@ -63,96 +67,110 @@ define([
cb(); cb();
}; };
removeHandlers['FRIEND_REQUEST'] = function (ctx, box, data) { removeHandlers['FRIEND_REQUEST'] = function (ctx, box, data) {
if (friendRequest[data.content.curvePublic]) { var userData = data.content.user || data.content;
delete friendRequest[data.content.curvePublic]; if (friendRequest[userData.curvePublic]) {
delete friendRequest[userData.curvePublic];
} }
}; };
// The DECLINE and ACCEPT messages act on the contacts data
// They are processed with a random timeout to avoid having
// multiple workers trying to add or remove the contacts at
// the same time. Once processed, they are dismissed.
// We must dismiss them and send another message to our own
// mailbox for the UI part otherwise it would automatically
// accept or decline future requests from the same user
// until the message is manually dismissed.
var friendRequestDeclined = {}; var friendRequestDeclined = {};
handlers['DECLINE_FRIEND_REQUEST'] = function (ctx, box, data, cb) { handlers['DECLINE_FRIEND_REQUEST'] = function (ctx, box, data, cb) {
setTimeout(function () { // Old format: data was stored directly in "content"
// Our friend request was declined. var userData = data.msg.content.user || data.msg.content;
if (!ctx.store.proxy.friends_pending[data.msg.author]) { return; } if (!userData.curvePublic) { userData.curvePublic = data.msg.author; }
// Our friend request was declined.
setTimeout(function () {
// Only dismissed once in the timeout to make sure we won't lose
// the data if we close the worker before adding the friend
cb(true);
// Make sure we really sent it
if (!ctx.store.proxy.friends_pending[data.msg.author]) { return; }
// Remove the pending message and display the "declined" state in the UI // Remove the pending message and display the "declined" state in the UI
delete ctx.store.proxy.friends_pending[data.msg.author]; delete ctx.store.proxy.friends_pending[data.msg.author];
ctx.updateMetadata(); ctx.updateMetadata();
if (friendRequestDeclined[data.msg.author]) { return; } if (friendRequestDeclined[data.msg.author]) { return; }
friendRequestDeclined[data.msg.author] = true;
box.sendMessage({ box.sendMessage({
type: 'FRIEND_REQUEST_DECLINED', type: 'FRIEND_REQUEST_DECLINED',
content: { content: { user: userData }
user: data.msg.author, }, function () {});
name: data.msg.content.displayName
}
}, function () {
if (friendRequestDeclined[data.msg.author]) {
// TODO remove our message because another one was sent first?
}
friendRequestDeclined[data.msg.author] = true;
});
}, getRandomTimeout(ctx)); }, getRandomTimeout(ctx));
cb(true);
}; };
// UI for declined friend request
handlers['FRIEND_REQUEST_DECLINED'] = function (ctx, box, data, cb) { handlers['FRIEND_REQUEST_DECLINED'] = function (ctx, box, data, cb) {
ctx.updateMetadata(); ctx.updateMetadata();
if (friendRequestDeclined[data.msg.content.user]) { return void cb(true); } var curve = data.msg.content.user.curvePublic || data.msg.content.user;
friendRequestDeclined[data.msg.content.user] = true; if (friendRequestDeclined[curve]) { return void cb(true); }
friendRequestDeclined[curve] = true;
cb(); cb();
}; };
removeHandlers['FRIEND_REQUEST_DECLINED'] = function (ctx, box, data) { removeHandlers['FRIEND_REQUEST_DECLINED'] = function (ctx, box, data) {
if (friendRequestDeclined[data.content.user]) { var curve = data.content.user.curvePublic || data.content.user;
delete friendRequestDeclined[data.content.user]; if (friendRequestDeclined[curve]) { delete friendRequestDeclined[curve]; }
}
}; };
var friendRequestAccepted = {}; var friendRequestAccepted = {};
handlers['ACCEPT_FRIEND_REQUEST'] = function (ctx, box, data, cb) { handlers['ACCEPT_FRIEND_REQUEST'] = function (ctx, box, data, cb) {
// Old format: data was stored directly in "content"
var userData = data.msg.content.user || data.msg.content;
// Our friend request was accepted. // Our friend request was accepted.
setTimeout(function () { setTimeout(function () {
// Only dismissed once in the timeout to make sure we won't lose
// the data if we close the worker before adding the friend
cb(true);
// Make sure we really sent it // Make sure we really sent it
if (!ctx.store.proxy.friends_pending[data.msg.author]) { return; } if (!ctx.store.proxy.friends_pending[data.msg.author]) { return; }
// Remove the pending state. It will also us to send a new request in case of error
delete ctx.store.proxy.friends_pending[data.msg.author];
// And add the friend // And add the friend
Messaging.addToFriendList({ Messaging.addToFriendList({
proxy: ctx.store.proxy, proxy: ctx.store.proxy,
realtime: ctx.store.realtime, realtime: ctx.store.realtime,
pinPads: ctx.pinPads pinPads: ctx.pinPads
}, data.msg.content, function (err) { }, userData, function (err) {
if (err) { console.error(err); } if (err) { return void console.error(err); }
delete ctx.store.proxy.friends_pending[data.msg.author]; // Load the chat if contacts app loaded
if (ctx.store.messenger) { if (ctx.store.messenger) { ctx.store.messenger.onFriendAdded(userData); }
ctx.store.messenger.onFriendAdded(data.msg.content); // Update the userlist
}
ctx.updateMetadata(); ctx.updateMetadata();
// If you have a profile page open, update it // If you have a profile page open, update it
if (ctx.store.modules['profile']) { ctx.store.modules['profile'].update(); } if (ctx.store.modules['profile']) { ctx.store.modules['profile'].update(); }
if (friendRequestAccepted[data.msg.author]) { return; }
// Display the "accepted" state in the UI // Display the "accepted" state in the UI
if (friendRequestAccepted[data.msg.author]) { return; }
friendRequestAccepted[data.msg.author] = true;
box.sendMessage({ box.sendMessage({
type: 'FRIEND_REQUEST_ACCEPTED', type: 'FRIEND_REQUEST_ACCEPTED',
content: { content: { user: userData }
user: data.msg.author, }, function () {});
name: data.msg.content.displayName
}
}, function () {
if (friendRequestAccepted[data.msg.author]) {
// TODO remove our message because another one was sent first?
}
friendRequestAccepted[data.msg.author] = true;
});
}); });
}, getRandomTimeout(ctx)); }, getRandomTimeout(ctx));
cb(true);
}; };
// UI for accepted friend request
handlers['FRIEND_REQUEST_ACCEPTED'] = function (ctx, box, data, cb) { handlers['FRIEND_REQUEST_ACCEPTED'] = function (ctx, box, data, cb) {
ctx.updateMetadata(); ctx.updateMetadata();
if (friendRequestAccepted[data.msg.content.user]) { return void cb(true); } var curve = data.msg.content.user.curvePublic || data.msg.content.user;
friendRequestAccepted[data.msg.content.user] = true; if (friendRequestAccepted[curve]) { return void cb(true); }
friendRequestAccepted[curve] = true;
cb(); cb();
}; };
removeHandlers['FRIEND_REQUEST_ACCEPTED'] = function (ctx, box, data) { removeHandlers['FRIEND_REQUEST_ACCEPTED'] = function (ctx, box, data) {
if (friendRequestAccepted[data.content.user]) { var curve = data.content.user.curvePublic || data.content.user;
delete friendRequestAccepted[data.content.user]; if (friendRequestAccepted[curve]) { delete friendRequestAccepted[curve]; }
}
}; };
handlers['UNFRIEND'] = function (ctx, box, data, cb) { handlers['UNFRIEND'] = function (ctx, box, data, cb) {

View File

@ -2,11 +2,12 @@ define([
'/common/common-util.js', '/common/common-util.js',
'/common/common-hash.js', '/common/common-hash.js',
'/common/common-realtime.js', '/common/common-realtime.js',
'/common/common-messaging.js',
'/common/notify.js', '/common/notify.js',
'/common/outer/mailbox-handlers.js', '/common/outer/mailbox-handlers.js',
'/bower_components/chainpad-netflux/chainpad-netflux.js', '/bower_components/chainpad-netflux/chainpad-netflux.js',
'/bower_components/chainpad-crypto/crypto.js', '/bower_components/chainpad-crypto/crypto.js',
], function (Util, Hash, Realtime, Notify, Handlers, CpNetflux, Crypto) { ], function (Util, Hash, Realtime, Messaging, Notify, Handlers, CpNetflux, Crypto) {
var Mailbox = {}; var Mailbox = {};
var TYPES = [ var TYPES = [
@ -96,6 +97,12 @@ proxy.mailboxes = {
var crypto = Crypto.Mailbox.createEncryptor(keys); var crypto = Crypto.Mailbox.createEncryptor(keys);
// Always send your data
if (typeof(msg) === "object" && !msg.user) {
var myData = Messaging.createData(ctx.store.proxy, false);
msg.user = myData;
}
var text = JSON.stringify({ var text = JSON.stringify({
type: type, type: type,
content: msg content: msg
@ -187,6 +194,11 @@ proxy.mailboxes = {
history: [], // All the hashes loaded from the server in corretc order history: [], // All the hashes loaded from the server in corretc order
content: {}, // Content of the messages that should be displayed content: {}, // Content of the messages that should be displayed
sendMessage: function (msg) { // To send a message to our box sendMessage: function (msg) { // To send a message to our box
// Always send your data
if (typeof(msg) === "object" && !msg.user) {
var myData = Messaging.createData(ctx.store.proxy, false);
msg.user = myData;
}
try { try {
msg = JSON.stringify(msg); msg = JSON.stringify(msg);
} catch (e) { } catch (e) {

View File

@ -909,13 +909,11 @@ define([
})); }));
}).nThen(function (waitFor) { }).nThen(function (waitFor) {
// Send mailbox to offer ownership // Send mailbox to offer ownership
var myData = Messaging.createData(ctx.store.proxy, false);
ctx.store.mailbox.sendTo("ADD_OWNER", { ctx.store.mailbox.sendTo("ADD_OWNER", {
teamChannel: teamData.channel, teamChannel: teamData.channel,
chatChannel: Util.find(teamData, ['keys', 'chat', 'channel']), chatChannel: Util.find(teamData, ['keys', 'chat', 'channel']),
rosterChannel: Util.find(teamData, ['keys', 'roster', 'channel']), rosterChannel: Util.find(teamData, ['keys', 'roster', 'channel']),
title: teamData.metadata.name, title: teamData.metadata.name
user: myData
}, { }, {
channel: user.notifications, channel: user.notifications,
curvePublic: user.curvePublic curvePublic: user.curvePublic
@ -969,12 +967,10 @@ define([
})); }));
}).nThen(function (waitFor) { }).nThen(function (waitFor) {
// Send mailbox to offer ownership // Send mailbox to offer ownership
var myData = Messaging.createData(ctx.store.proxy, false);
ctx.store.mailbox.sendTo("RM_OWNER", { ctx.store.mailbox.sendTo("RM_OWNER", {
teamChannel: teamData.channel, teamChannel: teamData.channel,
title: teamData.metadata.name, title: teamData.metadata.name,
pending: isPendingOwner, pending: isPendingOwner
user: myData
}, { }, {
channel: user.notifications, channel: user.notifications,
curvePublic: user.curvePublic curvePublic: user.curvePublic
@ -1104,11 +1100,9 @@ define([
if (!team) { return void cb ({error: 'ENOENT'}); } if (!team) { return void cb ({error: 'ENOENT'}); }
// Send mailbox to offer ownership // Send mailbox to offer ownership
var myData = Messaging.createData(ctx.store.proxy, false);
ctx.store.mailbox.sendTo("TEAM_EDIT_RIGHTS", { ctx.store.mailbox.sendTo("TEAM_EDIT_RIGHTS", {
state: state, state: state,
teamData: getInviteData(ctx, teamId, state), teamData: getInviteData(ctx, teamId, state)
user: myData
}, { }, {
channel: user.notifications, channel: user.notifications,
curvePublic: user.curvePublic curvePublic: user.curvePublic
@ -1175,7 +1169,6 @@ define([
team.roster.add(obj, function (err) { team.roster.add(obj, function (err) {
if (err && err !== 'NO_CHANGE') { return void cb({error: err}); } if (err && err !== 'NO_CHANGE') { return void cb({error: err}); }
ctx.store.mailbox.sendTo('INVITE_TO_TEAM', { ctx.store.mailbox.sendTo('INVITE_TO_TEAM', {
user: Messaging.createData(ctx.store.proxy, false),
team: getInviteData(ctx, teamId) team: getInviteData(ctx, teamId)
}, { }, {
channel: user.notifications, channel: user.notifications,
@ -1202,7 +1195,6 @@ define([
if (!userData || !userData.notifications) { return cb(); } if (!userData || !userData.notifications) { return cb(); }
ctx.store.mailbox.sendTo('KICKED_FROM_TEAM', { ctx.store.mailbox.sendTo('KICKED_FROM_TEAM', {
pending: data.pending, pending: data.pending,
user: Messaging.createData(ctx.store.proxy, false),
teamChannel: getInviteData(ctx, teamId).channel, teamChannel: getInviteData(ctx, teamId).channel,
teamName: getInviteData(ctx, teamId).metadata.name teamName: getInviteData(ctx, teamId).metadata.name
}, { }, {

View File

@ -55,9 +55,7 @@ define([
var createElement = mailbox.createElement = function (data) { var createElement = mailbox.createElement = function (data) {
var notif; var notif;
var avatar; var avatar;
var type = Util.find(data, ['content', 'msg', 'type']); var userData = Util.find(data, ['content', 'msg', 'content', 'user']);
var userData = ['FRIEND_REQUEST'].indexOf(type) !== -1 ? Util.find(data, ['content', 'msg', 'content'])
: Util.find(data, ['content', 'msg', 'content', 'user']);
if (userData && typeof(userData) === "object" && userData.profile) { if (userData && typeof(userData) === "object" && userData.profile) {
avatar = h('span.cp-avatar'); avatar = h('span.cp-avatar');
Common.displayAvatar($(avatar), userData.avatar, userData.displayName || userData.name); Common.displayAvatar($(avatar), userData.avatar, userData.displayName || userData.name);
@ -65,9 +63,6 @@ define([
e.stopPropagation(); e.stopPropagation();
Common.openURL(Hash.hashToHref(userData.profile, 'profile')); Common.openURL(Hash.hashToHref(userData.profile, 'profile'));
}); });
} else {
console.warn(data);
} }
notif = h('div.cp-notification', { notif = h('div.cp-notification', {
'data-hash': data.content.hash 'data-hash': data.content.hash

View File

@ -736,9 +736,9 @@ define([
}); });
framework._.sfCommon.isPadStored(function (err, val) { framework._.sfCommon.isPadStored(function (err, val) {
//if (!val) { return; } if (!val) { return; }
var b64images = $inner.find('img[src^="data:image"]:not(.cke_reset)'); var b64images = $inner.find('img[src^="data:image"]:not(.cke_reset)');
if (true || b64images.length && framework._.sfCommon.isLoggedIn()) { if (b64images.length && framework._.sfCommon.isLoggedIn()) {
var no = h('button.cp-corner-cancel', Messages.cancel); var no = h('button.cp-corner-cancel', Messages.cancel);
var yes = h('button.cp-corner-primary', Messages.ok); var yes = h('button.cp-corner-primary', Messages.ok);
var actions = h('div', [no, yes]); var actions = h('div', [no, yes]);