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

Merge from dev to master #959

Merged
joan merged 3 commits from test into master 2022-05-02 10:44:25 +00:00
Conversation 0 Commits 3 Files Changed 1 +3 -1
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 269f156e4a - Show all commits

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

@ -46,7 +46,7 @@ module.exports = Self => {
const {data} = await Self.getUserStatus(recipient.name);
if (data) {
if (data.status === 'offline') {
if (data.status === 'offline' || data.status === 'busy') {
// Send message to department room
const workerDepartment = await models.WorkerDepartment.findById(recipientId, {
include: {
@ -58,6 +58,8 @@ module.exports = Self => {
if (channelName)
return Self.send(ctx, `#${channelName}`, `@${recipient.name} ➔ ${message}`);
else
return Self.send(ctx, `@${recipient.name}`, message);
} else
return Self.send(ctx, `@${recipient.name}`, message);
}