Skip to content

[Hotfix] - Don't show notification leave seat when it's not necessary #442

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
eddsaura merged 2 commits into from
May 4, 2022
Merged

[Hotfix] - Don't show notification leave seat when it's not necessary #442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
56e45e1
Check seats with timeout
eddsaura May 3, 2022
7d0c626
Copies
eddsaura May 4, 2022
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
4 changes: 2 additions & 2 deletions frontend/locales/ca/fishbowl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
"12": "Desembre"
},
"full": "Complet",
"join": "Unir-se",
"leave": "Sortir",
"join": "Unir-se a la conversa",
"leave": "Sortir de la conversa",
"unmute": "Activar",
"mute": "Silenciar",
"sameAsSystem": "Mateix que el sistema",
Expand Down
4 changes: 2 additions & 2 deletions frontend/locales/en/fishbowl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
"12": "December"
},
"full": "Full",
"join": "Join",
"leave": "Leave",
"join": "Join the conversation",
"leave": "Leave the conversation",
"unmute": "Unmute",
"mute": "Mute",
"sameAsSystem": "Same as system",
Expand Down
4 changes: 2 additions & 2 deletions frontend/locales/es/fishbowl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
"12": "Diciembre"
},
"full": "Lleno",
"join": "Unirse",
"leave": "Salir",
"join": "Unirse a la conversación",
"leave": "Salir de la conversación",
"unmute": "Activar",
"mute": "Silenciar",
"sameAsSystem": "Mismo que el sistema",
Expand Down
4 changes: 2 additions & 2 deletions frontend/locales/fr/fishbowl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@
"lastMinute": "Dernière minute",
"endFishbowl": "Terminer le fishbowl",
"full": "Plein",
"join": "Rejoindre",
"leave": "Quitter",
"join": "Rejoindre la conversation",
"leave": "Quitter la conversation",
"sameAsSystem": "Suivre le système",
"settings": "Paramètres",
"timesUp": "Le temps est écoulé",
Expand Down
4 changes: 2 additions & 2 deletions frontend/locales/id/fishbowl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
"10": "Oktober"
},
"full": "Penuh",
"join": "Gabung",
"leave": "Tinggalkan",
"join": "Gabung pembicaraan",
"leave": "Tinggalkan pembicaraan",
"unmute": "Tidak bisukan",
"sameAsSystem": "Sama dengan sistem",
"mute": "Bisukan",
Expand Down
22 changes: 13 additions & 9 deletions frontend/src/contexts/StooaManager.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import { INTRODUCE_FISHBOWL, NO_INTRO_RUN_FISHBOWL } from '@/lib/gql/Fishbowl';
import { isTimeLessThanNMinutes, isTimeUp } from '@/lib/helpers';
import { useStateValue } from '@/contexts/AppContext';
import useEventListener from '@/hooks/useEventListener';
import seatsRepository from '@/jitsi/Seats';

import { toast } from 'react-toastify';

Expand Down Expand Up @@ -74,16 +75,19 @@ const StooaProvider = ({ data, isModerator, children }) => {

useEventListener(NOTIFICATION, ({ detail: { type, seats, message } }) => {
if (seats.includes(myUserId)) {
const delay = type === USER_MUST_LEAVE ? 8000 : 0;
const delay = type === USER_MUST_LEAVE ? 5000 : 0;
const autoClose = type === USER_MUST_LEAVE ? 15000 : 0;
toast(t(message), {
icon: '⚠️',
toastId: 'must-leave',
type: 'warning',
position: 'bottom-center',
delay,
autoClose
});
setTimeout(() => {
if (seatsRepository.getIds().length === 5) {
toast(t(message), {
icon: '⚠️',
toastId: 'must-leave',
type: 'warning',
position: 'bottom-center',
autoClose
});
}
}, delay);
}
});

Expand Down