Skip to content

Regression: Fix presence request logic #19527

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sampaiodiego merged 1 commit into from
Nov 13, 2020
Merged

Regression: Fix presence request logic #19527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions client/components/basic/UserStatus.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React, { useEffect, useState } from 'react';
import { StatusBullet } from '@rocket.chat/fuselage';
import { useSafely } from '@rocket.chat/fuselage-hooks';

import { useTranslation } from '../../contexts/TranslationContext';
import { Presence } from '../../lib/presence';
Expand Down Expand Up @@ -34,7 +35,7 @@ export const colors = {
};

export const usePresence = (uid, presence) => {
const [status, setStatus] = useState(presence);
const [status, setStatus] = useSafely(useState(presence));
useEffect(() => {
const handle = ({ status = 'loading' }) => {
setStatus(status);
Expand All @@ -43,7 +44,7 @@ export const usePresence = (uid, presence) => {
return () => {
Presence.stop(uid, handle);
};
}, [uid]);
}, [setStatus, uid]);

return status;
};
Expand Down
12 changes: 7 additions & 5 deletions client/lib/presence.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const getPresence = ((): ((uid: User['_id']) => void) => {
});

currentUids.forEach((uid) => {
emitter.emit(uid, { uid, status: 'offline' });
emitter.emit(uid, { _id: uid, status: 'offline' });
});

currentUids.clear();
Expand Down Expand Up @@ -99,10 +99,12 @@ const listen = (uid: User['_id'], handler: Handler<PresenceUpdate>): void => {
};

const stop = (uid: User['_id'], handler: Handler<PresenceUpdate>): void => {
emitter.off(uid, handler);
emitter.off(uid, update);
emitter.off('reset', handler);
emitter.emit('remove', uid);
setTimeout(() => {
emitter.off(uid, handler);
emitter.off(uid, update);
emitter.off('reset', handler);
emitter.emit('remove', uid);
}, 5000);
};

const reset = (): void => {
Expand Down