Skip to content
Merged
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions apps/meteor/app/apps/server/bridges/users.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { Random } from '@rocket.chat/random';
import { checkUsernameAvailability } from '../../../lib/server/functions/checkUsernameAvailability';
import { deleteUser } from '../../../lib/server/functions/deleteUser';
import { getUserCreatedByApp } from '../../../lib/server/functions/getUserCreatedByApp';
import { setStatusText } from '../../../lib/server/functions/setStatusText';
import { setUserActiveStatus } from '../../../lib/server/functions/setUserActiveStatus';
import { setUserAvatar } from '../../../lib/server/functions/setUserAvatar';
import { notifyOnUserChange, notifyOnUserChangeById } from '../../../lib/server/lib/notifyListener';
Expand Down Expand Up @@ -131,16 +132,27 @@ export class AppUserBridge extends UserBridge {
return true;
}

const { status } = fields;
delete fields.status;
const { status, statusText, ...updateFields } = fields;

if (status) {
await Presence.setStatus(user.id, status as UserStatus, fields.statusText);
await Presence.setStatus(user.id, status as UserStatus, statusText);
} else if (typeof statusText === 'string') {
await setStatusText(
{
_id: user.id,
username: user.username,
name: user.name,
status: user.status as UserStatus,
roles: user.roles,
statusText: user.statusText,
},
statusText,
);
}

await Users.updateOne({ _id: user.id }, { $set: fields as any });
await Users.updateOne({ _id: user.id }, { $set: updateFields as any });

void notifyOnUserChange({ clientAction: 'updated', id: user.id, diff: fields });
void notifyOnUserChange({ clientAction: 'updated', id: user.id, diff: updateFields });

return true;
}
Expand Down
Loading