parent
e16d80d9a2
commit
b14667ae40
2 changed files with 25 additions and 10 deletions
|
@ -193,16 +193,24 @@
|
|||
return;
|
||||
}
|
||||
|
||||
return ConversationController.findOrCreateById(id, 'private').then(function(conversation) {
|
||||
return new Promise(function(resolve, reject) {
|
||||
conversation.save({
|
||||
name: details.name,
|
||||
avatar: details.avatar,
|
||||
color: details.color,
|
||||
active_at: conversation.get('active_at') || Date.now(),
|
||||
}).then(resolve, reject);
|
||||
return ConversationController.findOrCreateById(id, 'private')
|
||||
.then(function(conversation) {
|
||||
return new Promise(function(resolve, reject) {
|
||||
conversation.save({
|
||||
name: details.name,
|
||||
avatar: details.avatar,
|
||||
color: details.color,
|
||||
active_at: conversation.get('active_at') || Date.now(),
|
||||
}).then(resolve, reject);
|
||||
});
|
||||
})
|
||||
.then(ev.confirm)
|
||||
.catch(function(error) {
|
||||
console.log(
|
||||
'onContactReceived error:',
|
||||
error && error.stack ? error.stack : error
|
||||
);
|
||||
});
|
||||
}).then(ev.confirm);
|
||||
}
|
||||
|
||||
function onGroupReceived(ev) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue