verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 51 Releases Wiki Activity

4858-chat_realTime #1313

Merged
vicent merged 11 commits from 4858-chat_realTime into dev 2023-03-24 10:12:25 +00:00
Conversation 0 Commits 11 Files Changed 6 +12 -10
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d1f0ae3865 - Show all commits

3
back/methods/chat/sendCheckingPresence.js
View File

@ -38,6 +38,9 @@ module.exports = Self => {
if (!recipient) if (!recipient)
throw new Error(`Could not send message "${message}" to worker id ${recipientId} from user ${userId}`); throw new Error(`Could not send message "${message}" to worker id ${recipientId} from user ${userId}`);
if (process.env.NODE_ENV == 'test')
message = `[Test:Environment to user ${userId}] ` + message;
const chat = await models.Chat.create({ const chat = await models.Chat.create({
senderFk: sender.id, senderFk: sender.id,
recipient: `@${recipient.name}`, recipient: `@${recipient.name}`,

13
back/methods/chat/sendQueued.js
View File

@ -19,12 +19,11 @@ module.exports = Self => {
const chats = await models.Chat.find({ const chats = await models.Chat.find({
where: { where: {
status: { status: {
neq: { nin: [
and: [
'sent', 'sent',
'sending' 'sending'
] ]
}
}, },
attempts: {lt: 3} attempts: {lt: 3}
} }
@ -34,16 +33,16 @@ module.exports = Self => {
if (chat.checkUserStatus) { if (chat.checkUserStatus) {
try { try {
await Self.sendCheckingUserStatus(chat); await Self.sendCheckingUserStatus(chat);
await updateChat(chat, 'sent'); await Self.updateChat(chat, 'sent');
} catch (error) { } catch (error) {
await updateChat(chat, 'error', error); await Self.updateChat(chat, 'error', error);
} }
} else { } else {
try { try {
await Self.sendMessage(chat.senderFk, chat.recipient, chat.message); await Self.sendMessage(chat.senderFk, chat.recipient, chat.message);
await updateChat(chat, 'sent'); await Self.updateChat(chat, 'sent');
} catch (error) { } catch (error) {
await updateChat(chat, 'error', error); await Self.updateChat(chat, 'error', error);
} }
} }
} }