|
@@ -161,17 +161,17 @@ const upload = require('multer')({ dest: uploadPath })
|
|
console.log('NEW MSG', msg.text, msg.chat.title, msg.owner.login)
|
|
console.log('NEW MSG', msg.text, msg.chat.title, msg.owner.login)
|
|
for (let [id,{user, socket}] of Object.entries(sockets)){
|
|
for (let [id,{user, socket}] of Object.entries(sockets)){
|
|
if (user.chats.some(chat => chat._id.toString() === msg.chat._id.toString())){
|
|
if (user.chats.some(chat => chat._id.toString() === msg.chat._id.toString())){
|
|
- const {_id, createdAt, text, chat, media, replyTo, forwarded, owner} = msg
|
|
|
|
|
|
+ let {_id, createdAt, text, chat, media, replyTo, forwarded, owner} = msg
|
|
await chat;
|
|
await chat;
|
|
await media;
|
|
await media;
|
|
await replyTo;
|
|
await replyTo;
|
|
await forwarded;
|
|
await forwarded;
|
|
- await owner;
|
|
|
|
|
|
+ owner = await owner;
|
|
socket.emit('msg', {_id, createdAt, text, chat: chat && {_id: chat._id, title: chat.title},
|
|
socket.emit('msg', {_id, createdAt, text, chat: chat && {_id: chat._id, title: chat.title},
|
|
media: media && {_id: media._id, url: media.url},
|
|
media: media && {_id: media._id, url: media.url},
|
|
replyTo: replyTo && {_id: replyTo._id, text: replyTo.text},
|
|
replyTo: replyTo && {_id: replyTo._id, text: replyTo.text},
|
|
- forwarded: forwarded && {_id: forwarded._id, text: forwarded.text,
|
|
|
|
- owner: {_id: owner_id, login: owner.login, nick: owner.nick}}})
|
|
|
|
|
|
+ forwarded: forwarded && {_id: forwarded._id, text: forwarded.text},
|
|
|
|
+ owner: {_id: owner._id, login: owner.login, nick: owner.nick}})
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|