A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.
feat(voice): open voice popouts in the browser (#2400)
Hampus7bd021cd5ce3
diff --git a/fluxer_app/src/features/i18n/locales/ar/messages.po b/fluxer_app/src/features/i18n/locales/ar/messages.poindex ae3818491..ee2f364f2 100644--- a/fluxer_app/src/features/i18n/locales/ar/messages.po+++ b/fluxer_app/src/features/i18n/locales/ar/messages.po@@ -404,7 +404,7 @@ msgstr "{count, plural, one {# مجتمع مشترك} other {# مجتمعات مmsgid "{count, plural, one {# other} other {# others}}"msgstr "{count, plural, one {# آخر} other {# آخرين}}"-#: src/features/voice/components/VoiceCallView.tsx:497+#: src/features/voice/components/VoiceCallView.tsx:495msgid "{count, plural, one {# participant in call} other {# participants in call}}"msgstr "{count, plural, one {# مشارك في المكالمة} other {# مشاركين في المكالمة}}"diff --git a/fluxer_app/src/features/i18n/locales/bg/messages.po b/fluxer_app/src/features/i18n/locales/bg/messages.poindex dffcbabb2..25fab1978 100644--- a/fluxer_app/src/features/i18n/locales/bg/messages.po+++ b/fluxer_app/src/features/i18n/locales/bg/messages.po@@ -404,7 +404,7 @@ msgstr "{count, plural, one {# обща общност} other {# общи общmsgid "{count, plural, one {# other} other {# others}}"msgstr "{count, plural, one {# друг} other {# други}}"-#: src/features/voice/components/VoiceCallView.tsx:497+#: src/features/voice/components/VoiceCallView.tsx:495msgid "{count, plural, one {# participant in call} other {# participants in call}}"msgstr "{count, plural, one {# участник в разговора} other {# участници в разговора}}"diff --git a/fluxer_app/src/features/i18n/locales/cs/messages.po b/fluxer_app/src/features/i18n/locales/cs/messages.poindex 0dad227ae..397a26228 100644--- a/fluxer_app/src/features/i18n/locales/cs/messages.po+++ b/fluxer_app/src/features/i18n/locales/cs/messages.po@@ -404,7 +404,7 @@ msgstr "{count, plural, one {# společná komunita} other {# společné komunitymsgid "{count, plural, one {# other} other {# others}}"msgstr "{count, plural, one {# další} few {# další} many {# dalších} other {# dalších}}"-#: src/features/voice/components/VoiceCallView.tsx:497+#: src/features/voice/components/VoiceCallView.tsx:495msgid "{count, plural, one {# participant in call} other {# participants in call}}"msgstr "{count, plural, one {# účastník hovoru} few {# účastníci hovoru} many {# účastníka hovoru} other {# účastníků hovoru}}"diff --git a/fluxer_app/src/features/i18n/locales/da/messages.po b/fluxer_app/src/features/i18n/locales/da/messages.poindex 33889c14f..d757602b2 100644--- a/fluxer_app/src/features/i18n/locales/da/messages.po+++ b/fluxer_app/src/features/i18n/locales/da/messages.po@@ -404,7 +404,7 @@ msgstr "{count, plural, one {# fælles fællesskab} other {# fælles fællesskabmsgid "{count, plural, one {# other} other {# others}}"msgstr "{count, plural, one {# anden} other {# andre}}"-#: src/features/voice/components/VoiceCallView.tsx:497+#: src/features/voice/components/VoiceCallView.tsx:495msgid "{count, plural, one {# participant in call} other {# participants in call}}"msgstr "{count, plural, one {# deltager i opkald} other {# deltagere i opkald}}"diff --git a/fluxer_app/src/features/i18n/locales/de/messages.po b/fluxer_app/src/features/i18n/locales/de/messages.poindex 3e088dab6..90a0d9c26 100644--- a/fluxer_app/src/features/i18n/locales/de/messages.po+++ b/fluxer_app/src/features/i18n/locales/de/messages.po@@ -404,7 +404,7 @@ msgstr "{count, plural, one {# gemeinsame Community} other {# gemeinsame Communimsgid "{count, plural, one {# other} other {# others}}"msgstr "{count, plural, one {# andere} other {# andere}}"-#: src/features/voice/components/VoiceCallView.tsx:497+#: src/features/voice/components/VoiceCallView.tsx:495msgid "{count, plural, one {# participant in call} other {# participants in call}}"msgstr "{count, plural, one {# Teilnehmer im Anruf} other {#Teilnehmer im Anruf}}"diff --git a/fluxer_app/src/features/i18n/locales/el/messages.po b/fluxer_app/src/features/i18n/locales/el/messages.poindex f7dae521d..7885d59bd 100644--- a/fluxer_app/src/features/i18n/locales/el/messages.po+++ b/fluxer_app/src/features/i18n/locales/el/messages.po@@ -404,7 +404,7 @@ msgstr "{count, plural, one {# κοινή κοινότητα} other {# κοινmsgid "{count, plural, one {# other} other {# others}}"msgstr "{count, plural, one {# άλλος} other {# άλλοι}}"-#: src/features/voice/components/VoiceCallView.tsx:497+#: src/features/voice/components/VoiceCallView.tsx:495msgid "{count, plural, one {# participant in call} other {# participants in call}}"msgstr "{count, plural, one {# συμμετέχων στην κλήση} other {# συμμετέχοντες στην κλήση}}"diff --git a/fluxer_app/src/features/i18n/locales/en-GB/messages.po b/fluxer_app/src/features/i18n/locales/en-GB/messages.poindex 9f0491bd9..b6627e459 100644--- a/fluxer_app/src/features/i18n/locales/en-GB/messages.po+++ b/fluxer_app/src/features/i18n/locales/en-GB/messages.po@@ -404,7 +404,7 @@ msgstr "{count, plural, one {# mutual community} other {# mutual communities}}"msgid "{count, plural, one {# other} other {# others}}"msgstr "{count, plural, one {# other} other {# others}}"-#: src/features/voice/components/VoiceCallView.tsx:497+#: src/features/voice/components/VoiceCallView.tsx:495msgid "{count, plural, one {# participant in call} other {# participants in call}}"msgstr "{count, plural, one {# participant in call} other {# participants in call}}"diff --git a/fluxer_app/src/features/i18n/locales/en-US/messages.po b/fluxer_app/src/features/i18n/locales/en-US/messages.poindex 0da58ac52..1fde342e6 100644--- a/fluxer_app/src/features/i18n/locales/en-US/messages.po+++ b/fluxer_app/src/features/i18n/locales/en-US/messages.po@@ -405,7 +405,7 @@ msgstr "{count, plural, one {# mutual community} other {# mutual communities}}"msgid "{count, plural, one {# other} other {# others}}"msgstr "{count, plural, one {# other} other {# others}}"-#: src/features/voice/components/VoiceCallView.tsx:497+#: src/features/voice/components/VoiceCallView.tsx:495msgid "{count, plural, one {# participant in call} other {# participants in call}}"msgstr "{count, plural, one {# participant in call} other {# participants in call}}"diff --git a/fluxer_app/src/features/i18n/locales/es-419/messages.po b/fluxer_app/src/features/i18n/locales/es-419/messages.poindex 41400a72e..17f551288 100644--- a/fluxer_app/src/features/i18n/locales/es-419/messages.po+++ b/fluxer_app/src/features/i18n/locales/es-419/messages.po@@ -404,7 +404,7 @@ msgstr "{count, plural, one {# comunidad en común} other {# comunidades en commsgid "{count, plural, one {# other} other {# others}}"msgstr "{count, plural, one {# más} other {# más}}"-#: src/features/voice/components/VoiceCallView.tsx:497+#: src/features/voice/components/VoiceCallView.tsx:495msgid "{count, plural, one {# participant in call} other {# participants in call}}"msgstr "{count, plural, one {# participante en la llamada} other {# participantes en la llamada}}"diff --git a/fluxer_app/src/features/i18n/locales/es-ES/messages.po b/fluxer_app/src/features/i18n/locales/es-ES/messages.poindex fe85bf448..d3d85b14c 100644--- a/fluxer_app/src/features/i18n/locales/es-ES/messages.po+++ b/fluxer_app/src/features/i18n/locales/es-ES/messages.po@@ -404,7 +404,7 @@ msgstr "{count, plural, one {# comunidad en común} other {# comunidades en commsgid "{count, plural, one {# other} other {# others}}"msgstr "{count, plural, one {# más} other {# más}}"-#: src/features/voice/components/VoiceCallView.tsx:497+#: src/features/voice/components/VoiceCallView.tsx:495msgid "{count, plural, one {# participant in call} other {# participants in call}}"msgstr "{count, plural, one {# participante en la llamada} other {# participantes en la llamada}}"diff --git a/fluxer_app/src/features/i18n/locales/fi/messages.po b/fluxer_app/src/features/i18n/locales/fi/messages.poindex 783620bf1..18259506f 100644--- a/fluxer_app/src/features/i18n/locales/fi/messages.po+++ b/fluxer_app/src/features/i18n/locales/fi/messages.po@@ -404,7 +404,7 @@ msgstr "{count, plural, one {# yhteinen yhteisö} other {# yhteistä yhteisöä}msgid "{count, plural, one {# other} other {# others}}"msgstr "{count, plural, one {# muu} other {# muuta}}"-#: src/features/voice/components/VoiceCallView.tsx:497+#: src/features/voice/components/VoiceCallView.tsx:495msgid "{count, plural, one {# participant in call} other {# participants in call}}"msgstr "{count, plural, one {# osallistuja puhelussa} other {# osallistujaa puhelussa}}"diff --git a/fluxer_app/src/features/i18n/locales/fr/messages.po b/fluxer_app/src/features/i18n/locales/fr/messages.poindex 26bf0e0d1..4b5472aa8 100644--- a/fluxer_app/src/features/i18n/locales/fr/messages.po+++ b/fluxer_app/src/features/i18n/locales/fr/messages.po@@ -404,7 +404,7 @@ msgstr "{count, plural, one {# communauté en commun} other {# communautés en cmsgid "{count, plural, one {# other} other {# others}}"msgstr "{count, plural, one {# autre} other {# autres}}"-#: src/features/voice/components/VoiceCallView.tsx:497+#: src/features/voice/components/VoiceCallView.tsx:495msgid "{count, plural, one {# participant in call} other {# participants in call}}"msgstr "{count, plural, one {# participant à l'appel} other {# participants à l'appel}}"diff --git a/fluxer_app/src/features/i18n/locales/he/messages.po b/fluxer_app/src/features/i18n/locales/he/messages.poindex 5256cd047..22b15a4af 100644--- a/fluxer_app/src/features/i18n/locales/he/messages.po+++ b/fluxer_app/src/features/i18n/locales/he/messages.po@@ -404,7 +404,7 @@ msgstr "{count, plural, one {# קהילה משותפת} other {# קהילות מmsgid "{count, plural, one {# other} other {# others}}"msgstr "{count, plural, one {# אחר} other {# אחרים}}"-#: src/features/voice/components/VoiceCallView.tsx:497+#: src/features/voice/components/VoiceCallView.tsx:495msgid "{count, plural, one {# participant in call} other {# participants in call}}"msgstr "{count, plural, one {# משתתף בשיחה} other {# משתתפים בשיחה}}"diff --git a/fluxer_app/src/features/i18n/locales/hi/messages.po b/fluxer_app/src/features/i18n/locales/hi/messages.poindex 2f53a78d7..74ee3f329 100644--- a/fluxer_app/src/features/i18n/locales/hi/messages.po+++ b/fluxer_app/src/features/i18n/locales/hi/messages.po@@ -404,7 +404,7 @@ msgstr "{count, plural, one {# साझा समुदाय} other {# साmsgid "{count, plural, one {# other} other {# others}}"msgstr "{count, plural, one {# अन्य} other {# अन्य}}"-#: src/features/voice/components/VoiceCallView.tsx:497+#: src/features/voice/components/VoiceCallView.tsx:495msgid "{count, plural, one {# participant in call} other {# participants in call}}"msgstr "{count, plural, one {# प्रतिभागी कॉल में है} other {# प्रतिभागी कॉल में हैं}}"diff --git a/fluxer_app/src/features/i18n/locales/hr/messages.po b/fluxer_app/src/features/i18n/locales/hr/messages.poindex ec6324c63..ba9809bd7 100644--- a/fluxer_app/src/features/i18n/locales/hr/messages.po+++ b/fluxer_app/src/features/i18n/locales/hr/messages.po@@ -404,7 +404,7 @@ msgstr "{count, plural, one {# zajednička zajednica} other {# zajedničke zajedmsgid "{count, plural, one {# other} other {# others}}"msgstr "{count, plural, one {# drugi} other {# ostalih}}"-#: src/features/voice/components/VoiceCallView.tsx:497+#: src/features/voice/components/VoiceCallView.tsx:495msgid "{count, plural, one {# participant in call} other {# participants in call}}"msgstr "{count, plural, one {# sudionik u pozivu} few {# sudionika u pozivu} other {# sudionika u pozivu}}"diff --git a/fluxer_app/src/features/i18n/locales/hu/messages.po b/fluxer_app/src/features/i18n/locales/hu/messages.poindex 170061501..720f1515a 100644--- a/fluxer_app/src/features/i18n/locales/hu/messages.po+++ b/fluxer_app/src/features/i18n/locales/hu/messages.po@@ -404,7 +404,7 @@ msgstr "{count, plural, one {# közös közösség} other {# közös közösségmsgid "{count, plural, one {# other} other {# others}}"msgstr "{count, plural, one {# másik} other {# többiek}}"-#: src/features/voice/components/VoiceCallView.tsx:497+#: src/features/voice/components/VoiceCallView.tsx:495msgid "{count, plural, one {# participant in call} other {# participants in call}}"msgstr "{count, plural, one {# résztvevő a hívásban} other {# résztvevő a hívásban}}"diff --git a/fluxer_app/src/features/i18n/locales/id/messages.po b/fluxer_app/src/features/i18n/locales/id/messages.poindex 1ecad4ce4..5a9915552 100644--- a/fluxer_app/src/features/i18n/locales/id/messages.po+++ b/fluxer_app/src/features/i18n/locales/id/messages.po@@ -404,7 +404,7 @@ msgstr "{count, plural, one {# komunitas bersama} other {# komunitas bersama}}"msgid "{count, plural, one {# other} other {# others}}"msgstr "{count, plural, one {# lainnya} other {# lainnya}}"-#: src/features/voice/components/VoiceCallView.tsx:497+#: src/features/voice/components/VoiceCallView.tsx:495msgid "{count, plural, one {# participant in call} other {# participants in call}}"msgstr "{count, plural, one {# peserta dalam panggilan} other {# peserta dalam panggilan}}"diff --git a/fluxer_app/src/features/i18n/locales/it/messages.po b/fluxer_app/src/features/i18n/locales/it/messages.poindex 4fcd380a6..8e64abca9 100644--- a/fluxer_app/src/features/i18n/locales/it/messages.po+++ b/fluxer_app/src/features/i18n/locales/it/messages.po@@ -404,7 +404,7 @@ msgstr "{count, plural, one {# community in comune} other {# community in comunemsgid "{count, plural, one {# other} other {# others}}"msgstr "{count, plural, one {# altro} other {# altri}}"-#: src/features/voice/components/VoiceCallView.tsx:497+#: src/features/voice/components/VoiceCallView.tsx:495msgid "{count, plural, one {# participant in call} other {# participants in call}}"msgstr "{count, plural, one {# partecipante alla chiamata} other {# partecipanti alla chiamata}}"diff --git a/fluxer_app/src/features/i18n/locales/ja/messages.po b/fluxer_app/src/features/i18n/locales/ja/messages.poindex 739ce0ea5..78c5eb7e5 100644--- a/fluxer_app/src/features/i18n/locales/ja/messages.po+++ b/fluxer_app/src/features/i18n/locales/ja/messages.po@@ -404,7 +404,7 @@ msgstr "{count, plural, one {#つの共通コミュニティ} other {#つの共msgid "{count, plural, one {# other} other {# others}}"msgstr "{count, plural, one {#人} other {#人}}"-#: src/features/voice/components/VoiceCallView.tsx:497+#: src/features/voice/components/VoiceCallView.tsx:495msgid "{count, plural, one {# participant in call} other {# participants in call}}"msgstr "{count, plural, one {#人が通話中} other {#人が通話中}}"diff --git a/fluxer_app/src/features/i18n/locales/ko/messages.po b/fluxer_app/src/features/i18n/locales/ko/messages.poindex ebd3b74fc..60cada83b 100644--- a/fluxer_app/src/features/i18n/locales/ko/messages.po+++ b/fluxer_app/src/features/i18n/locales/ko/messages.po@@ -404,7 +404,7 @@ msgstr "{count, plural, one {#개의 공통 커뮤니티} other {#개의 공통msgid "{count, plural, one {# other} other {# others}}"msgstr "{count, plural, one {#명 외} other {#명 외}}"-#: src/features/voice/components/VoiceCallView.tsx:497+#: src/features/voice/components/VoiceCallView.tsx:495msgid "{count, plural, one {# participant in call} other {# participants in call}}"msgstr "{count, plural, one {#명 통화 중} other {#명 통화 중}}"diff --git a/fluxer_app/src/features/i18n/locales/lt/messages.po b/fluxer_app/src/features/i18n/locales/lt/messages.poindex 1396f4c49..74d679cb8 100644--- a/fluxer_app/src/features/i18n/locales/lt/messages.po+++ b/fluxer_app/src/features/i18n/locales/lt/messages.po@@ -404,7 +404,7 @@ msgstr "{count, plural, one {# bendra bendruomenė} other {# bendros bendruomenmsgid "{count, plural, one {# other} other {# others}}"msgstr "{count, plural, one {# kitas} other {# kiti}}"-#: src/features/voice/components/VoiceCallView.tsx:497+#: src/features/voice/components/VoiceCallView.tsx:495msgid "{count, plural, one {# participant in call} other {# participants in call}}"msgstr "{count, plural, one {# dalyvis skambutyje} other {# dalyviai skambutyje}}"diff --git a/fluxer_app/src/features/i18n/locales/nl/messages.po b/fluxer_app/src/features/i18n/locales/nl/messages.poindex 191c94e7b..a13a810f6 100644--- a/fluxer_app/src/features/i18n/locales/nl/messages.po+++ b/fluxer_app/src/features/i18n/locales/nl/messages.po@@ -404,7 +404,7 @@ msgstr "{count, plural, one {# gemeenschappelijke community} other {# gemeenschamsgid "{count, plural, one {# other} other {# others}}"msgstr "{count, plural, one {# ander} other {# anderen}}"-#: src/features/voice/components/VoiceCallView.tsx:497+#: src/features/voice/components/VoiceCallView.tsx:495msgid "{count, plural, one {# participant in call} other {# participants in call}}"msgstr "{count, plural, one {# deelnemer aan gesprek} other {# deelnemers aan gesprek}}"diff --git a/fluxer_app/src/features/i18n/locales/no/messages.po b/fluxer_app/src/features/i18n/locales/no/messages.poindex 561fdd421..32660907e 100644--- a/fluxer_app/src/features/i18n/locales/no/messages.po+++ b/fluxer_app/src/features/i18n/locales/no/messages.po@@ -404,7 +404,7 @@ msgstr "{count, plural, one {# felles fellesskap} other {# felles fellesskap}}"msgid "{count, plural, one {# other} other {# others}}"msgstr "{count, plural, one {# annen} other {# andre}}"-#: src/features/voice/components/VoiceCallView.tsx:497+#: src/features/voice/components/VoiceCallView.tsx:495msgid "{count, plural, one {# participant in call} other {# participants in call}}"msgstr "{count, plural, one {# deltaker i samtalen} other {# deltakere i samtalen}}"diff --git a/fluxer_app/src/features/i18n/locales/pl/messages.po b/fluxer_app/src/features/i18n/locales/pl/messages.poindex f6fcdee12..fd541908d 100644--- a/fluxer_app/src/features/i18n/locales/pl/messages.po+++ b/fluxer_app/src/features/i18n/locales/pl/messages.po@@ -404,7 +404,7 @@ msgstr "{count, plural, one {# wspólna społeczność} few {# wspólne społeczmsgid "{count, plural, one {# other} other {# others}}"msgstr "{count, plural, one {# inna osoba} few {# inne osoby} many {# innych osób} other {# innych osób}}"-#: src/features/voice/components/VoiceCallView.tsx:497+#: src/features/voice/components/VoiceCallView.tsx:495msgid "{count, plural, one {# participant in call} other {# participants in call}}"msgstr "{count, plural, one {# uczestnik w rozmowie} few {# uczestników w rozmowie} many {# uczestników w rozmowie} other {# uczestnika w rozmowie}}"diff --git a/fluxer_app/src/features/i18n/locales/pt-BR/messages.po b/fluxer_app/src/features/i18n/locales/pt-BR/messages.poindex 43055fde5..9dcb61f76 100644--- a/fluxer_app/src/features/i18n/locales/pt-BR/messages.po+++ b/fluxer_app/src/features/i18n/locales/pt-BR/messages.po@@ -404,7 +404,7 @@ msgstr "{count, plural, one {# comunidade em comum} other {# comunidades em comumsgid "{count, plural, one {# other} other {# others}}"msgstr "{count, plural, one {# outro} other {# outros}}"-#: src/features/voice/components/VoiceCallView.tsx:497+#: src/features/voice/components/VoiceCallView.tsx:495msgid "{count, plural, one {# participant in call} other {# participants in call}}"msgstr "{count, plural, one {# participante na chamada} other {# participantes na chamada}}"diff --git a/fluxer_app/src/features/i18n/locales/ro/messages.po b/fluxer_app/src/features/i18n/locales/ro/messages.poindex 80b2c62ee..7ec7232d4 100644--- a/fluxer_app/src/features/i18n/locales/ro/messages.po+++ b/fluxer_app/src/features/i18n/locales/ro/messages.po@@ -404,7 +404,7 @@ msgstr "{count, plural, one {# comunitate comună} other {# comunități comune}msgid "{count, plural, one {# other} other {# others}}"msgstr "{count, plural, one {# altul} other {# alții}}"-#: src/features/voice/components/VoiceCallView.tsx:497+#: src/features/voice/components/VoiceCallView.tsx:495msgid "{count, plural, one {# participant in call} other {# participants in call}}"msgstr "{count, plural, one {# participant în apel} other {# participanți în apel}}"diff --git a/fluxer_app/src/features/i18n/locales/ru/messages.po b/fluxer_app/src/features/i18n/locales/ru/messages.poindex 37d596267..b084b9298 100644--- a/fluxer_app/src/features/i18n/locales/ru/messages.po+++ b/fluxer_app/src/features/i18n/locales/ru/messages.po@@ -404,7 +404,7 @@ msgstr "{count, plural, one {# общее сообщество} few {# общиmsgid "{count, plural, one {# other} other {# others}}"msgstr "{count, plural, one {# другой} other {# других}}"-#: src/features/voice/components/VoiceCallView.tsx:497+#: src/features/voice/components/VoiceCallView.tsx:495msgid "{count, plural, one {# participant in call} other {# participants in call}}"msgstr "{count, plural, one {# участник звонка} few {# участника звонка} many {# участников звонка} other {# участника звонка}}"diff --git a/fluxer_app/src/features/i18n/locales/sv-SE/messages.po b/fluxer_app/src/features/i18n/locales/sv-SE/messages.poindex 17cfcd370..e65e4b4d9 100644--- a/fluxer_app/src/features/i18n/locales/sv-SE/messages.po+++ b/fluxer_app/src/features/i18n/locales/sv-SE/messages.po@@ -404,7 +404,7 @@ msgstr "{count, plural, one {# gemensam community} other {# gemensamma communitimsgid "{count, plural, one {# other} other {# others}}"msgstr "{count, plural, one {# annan} other {# andra}}"-#: src/features/voice/components/VoiceCallView.tsx:497+#: src/features/voice/components/VoiceCallView.tsx:495msgid "{count, plural, one {# participant in call} other {# participants in call}}"msgstr "{count, plural, one {# deltagare i samtalet} other {# deltagare i samtalet}}"diff --git a/fluxer_app/src/features/i18n/locales/th/messages.po b/fluxer_app/src/features/i18n/locales/th/messages.poindex 26cbc4ab4..37ceea78e 100644--- a/fluxer_app/src/features/i18n/locales/th/messages.po+++ b/fluxer_app/src/features/i18n/locales/th/messages.po@@ -404,7 +404,7 @@ msgstr "{count, plural, one {# ชุมชนร่วมกัน} other {#msgid "{count, plural, one {# other} other {# others}}"msgstr "{count, plural, one {# คนอื่น} other {# คนอื่น}}"-#: src/features/voice/components/VoiceCallView.tsx:497+#: src/features/voice/components/VoiceCallView.tsx:495msgid "{count, plural, one {# participant in call} other {# participants in call}}"msgstr "{count, plural, one {# คนในสาย} other {# คนในสาย}}"diff --git a/fluxer_app/src/features/i18n/locales/tr/messages.po b/fluxer_app/src/features/i18n/locales/tr/messages.poindex b4ddd0359..47ba4bb41 100644--- a/fluxer_app/src/features/i18n/locales/tr/messages.po+++ b/fluxer_app/src/features/i18n/locales/tr/messages.po@@ -404,7 +404,7 @@ msgstr "{count, plural, one {# ortak topluluk} other {# ortak topluluk}}"msgid "{count, plural, one {# other} other {# others}}"msgstr "{count, plural, one {# diğer} other {# diğerleri}}"-#: src/features/voice/components/VoiceCallView.tsx:497+#: src/features/voice/components/VoiceCallView.tsx:495msgid "{count, plural, one {# participant in call} other {# participants in call}}"msgstr "{count, plural, one {# katılımcı aramada} other {# katılımcı aramada}}"diff --git a/fluxer_app/src/features/i18n/locales/uk/messages.po b/fluxer_app/src/features/i18n/locales/uk/messages.poindex 5cabd008f..b1bd4d175 100644--- a/fluxer_app/src/features/i18n/locales/uk/messages.po+++ b/fluxer_app/src/features/i18n/locales/uk/messages.po@@ -404,7 +404,7 @@ msgstr "{count, plural, one {# спільна спільнота} few {# спіmsgid "{count, plural, one {# other} other {# others}}"msgstr "{count, plural, one {# інший} few {# інших} many {# інших} other {# інших}}"-#: src/features/voice/components/VoiceCallView.tsx:497+#: src/features/voice/components/VoiceCallView.tsx:495msgid "{count, plural, one {# participant in call} other {# participants in call}}"msgstr "{count, plural, one {# учасник у дзвінку} few {# учасники у дзвінку} many {# учасників у дзвінку} other {# учасника у дзвінку}}"diff --git a/fluxer_app/src/features/i18n/locales/vi/messages.po b/fluxer_app/src/features/i18n/locales/vi/messages.poindex cd6f523d7..36a209ce7 100644--- a/fluxer_app/src/features/i18n/locales/vi/messages.po+++ b/fluxer_app/src/features/i18n/locales/vi/messages.po@@ -404,7 +404,7 @@ msgstr "{count, plural, one {# cộng đồng chung} other {# cộng đồng chumsgid "{count, plural, one {# other} other {# others}}"msgstr "{count, plural, one {# người khác} other {# người khác}}"-#: src/features/voice/components/VoiceCallView.tsx:497+#: src/features/voice/components/VoiceCallView.tsx:495msgid "{count, plural, one {# participant in call} other {# participants in call}}"msgstr "{count, plural, one {# người tham gia cuộc gọi} other {# người tham gia cuộc gọi}}"diff --git a/fluxer_app/src/features/i18n/locales/zh-CN/messages.po b/fluxer_app/src/features/i18n/locales/zh-CN/messages.poindex 65cff7419..c3c9ea283 100644--- a/fluxer_app/src/features/i18n/locales/zh-CN/messages.po+++ b/fluxer_app/src/features/i18n/locales/zh-CN/messages.po@@ -404,7 +404,7 @@ msgstr "{count, plural, one {#个共同社区} other {#个共同社区}}"msgid "{count, plural, one {# other} other {# others}}"msgstr "{count, plural, one {# 位其他用户} other {# 位其他用户}}"-#: src/features/voice/components/VoiceCallView.tsx:497+#: src/features/voice/components/VoiceCallView.tsx:495msgid "{count, plural, one {# participant in call} other {# participants in call}}"msgstr "{count, plural, one {# 位参与者正在通话中} other {# 位参与者正在通话中}}"diff --git a/fluxer_app/src/features/i18n/locales/zh-TW/messages.po b/fluxer_app/src/features/i18n/locales/zh-TW/messages.poindex 923d9cd53..4925ef96a 100644--- a/fluxer_app/src/features/i18n/locales/zh-TW/messages.po+++ b/fluxer_app/src/features/i18n/locales/zh-TW/messages.po@@ -404,7 +404,7 @@ msgstr "{count, plural, one {# 個共同社群} other {# 個共同社群}}"msgid "{count, plural, one {# other} other {# others}}"msgstr "{count, plural, one {# 位} other {# 位}}"-#: src/features/voice/components/VoiceCallView.tsx:497+#: src/features/voice/components/VoiceCallView.tsx:495msgid "{count, plural, one {# participant in call} other {# participants in call}}"msgstr "{count, plural, one {# 位參與者在通話中} other {# 位參與者在通話中}}"diff --git a/fluxer_app/src/features/voice/components/VoiceCallView.tsx b/fluxer_app/src/features/voice/components/VoiceCallView.tsxindex 8b92ab83b..e49f938ad 100644--- a/fluxer_app/src/features/voice/components/VoiceCallView.tsx+++ b/fluxer_app/src/features/voice/components/VoiceCallView.tsx@@ -382,16 +382,14 @@ const VoiceCallViewInner = observer(void toggleVoiceCallAppFullscreen();}, [toggleVoiceCallAppFullscreen]);const handlePopOutCall = useCallback(() => {- void (async () => {- if (isVoiceCallAppFullscreen) {- await exitVoiceCallAppFullscreen();- }- PopoutWindowManager.openCallPopout({- channelId: channel.id,- guildId: channel.guildId ?? null,- title: channel.name ?? i18n._(VOICE_CALL_DESCRIPTOR),- });- })();+ const didOpen = PopoutWindowManager.openCallPopout({+ channelId: channel.id,+ guildId: channel.guildId ?? null,+ title: channel.name ?? i18n._(VOICE_CALL_DESCRIPTOR),+ });+ if (didOpen && isVoiceCallAppFullscreen) {+ void exitVoiceCallAppFullscreen();+ }}, [channel.guildId, channel.id, channel.name, exitVoiceCallAppFullscreen, i18n, isVoiceCallAppFullscreen]);const fullscreenButtonLabel = isVoiceCallAppFullscreen? i18n._(EXIT_FULLSCREEN_DESCRIPTOR)diff --git a/fluxer_app/src/features/voice/components/compact_voice_call_view/CompactVoiceCallViewInner.tsx b/fluxer_app/src/features/voice/components/compact_voice_call_view/CompactVoiceCallViewInner.tsxindex 581a319f4..a9774aeb5 100644--- a/fluxer_app/src/features/voice/components/compact_voice_call_view/CompactVoiceCallViewInner.tsx+++ b/fluxer_app/src/features/voice/components/compact_voice_call_view/CompactVoiceCallViewInner.tsx@@ -215,16 +215,14 @@ export const CompactVoiceCallViewInner: React.FC<CompactVoiceCallViewProps> = obreturn BoldIcon;}, [isVoiceCallAppFullscreen]);const handlePopOutCall = useCallback(() => {- void (async () => {- if (isVoiceCallAppFullscreen) {- await exitVoiceCallAppFullscreen();- }- PopoutWindowManager.openCallPopout({- channelId: channel.id,- guildId: channel.guildId ?? null,- title: channel.name ?? i18n._(VOICE_CALL_TITLE_DESCRIPTOR),- });- })();+ const didOpen = PopoutWindowManager.openCallPopout({+ channelId: channel.id,+ guildId: channel.guildId ?? null,+ title: channel.name ?? i18n._(VOICE_CALL_TITLE_DESCRIPTOR),+ });+ if (didOpen && isVoiceCallAppFullscreen) {+ void exitVoiceCallAppFullscreen();+ }}, [channel.guildId, channel.id, channel.name, exitVoiceCallAppFullscreen, i18n, isVoiceCallAppFullscreen]);useEffect(() => {if (fullscreenRequestNonce == null) return;diff --git a/fluxer_app/src/features/voice/components/popout/PopoutTitlebar.tsx b/fluxer_app/src/features/voice/components/popout/PopoutTitlebar.tsxindex af53d885e..c5b5f067c 100644--- a/fluxer_app/src/features/voice/components/popout/PopoutTitlebar.tsx+++ b/fluxer_app/src/features/voice/components/popout/PopoutTitlebar.tsx@@ -34,7 +34,7 @@ interface PopoutTitlebarProps {title: string;showTitle?: boolean;isAlwaysOnTop: boolean;- onToggleAlwaysOnTop: () => void;+ onToggleAlwaysOnTop?: () => void;onRestore: () => void;onClose: () => void;}@@ -66,19 +66,21 @@ export const PopoutTitlebar: React.FC<PopoutTitlebarProps> = ({</span>)}<div role="group" className={styles.actions} data-flx="voice.popout-titlebar.actions">- <FocusRing offset={-2} data-flx="voice.popout-titlebar.focus-ring.pin">- <button- type="button"- className={clsx(nativeTitlebarStyles.controlButton, isAlwaysOnTop && styles.actionButtonActive)}- onClick={onToggleAlwaysOnTop}- aria-pressed={isAlwaysOnTop}- aria-label={pinLabel}- title={pinLabel}- data-flx="voice.popout-titlebar.control-button.toggle-always-on-top"- >- <PinIcon weight="bold" data-flx="voice.popout-titlebar.pin-icon" />- </button>- </FocusRing>+ {onToggleAlwaysOnTop && (+ <FocusRing offset={-2} data-flx="voice.popout-titlebar.focus-ring.pin">+ <button+ type="button"+ className={clsx(nativeTitlebarStyles.controlButton, isAlwaysOnTop && styles.actionButtonActive)}+ onClick={onToggleAlwaysOnTop}+ aria-pressed={isAlwaysOnTop}+ aria-label={pinLabel}+ title={pinLabel}+ data-flx="voice.popout-titlebar.control-button.toggle-always-on-top"+ >+ <PinIcon weight="bold" data-flx="voice.popout-titlebar.pin-icon" />+ </button>+ </FocusRing>+ )}<FocusRing offset={-2} data-flx="voice.popout-titlebar.focus-ring.restore"><buttontype="button"diff --git a/fluxer_app/src/features/voice/components/popout/PopoutWindow.tsx b/fluxer_app/src/features/voice/components/popout/PopoutWindow.tsxindex ed6c6ba6c..541862bb5 100644--- a/fluxer_app/src/features/voice/components/popout/PopoutWindow.tsx+++ b/fluxer_app/src/features/voice/components/popout/PopoutWindow.tsx@@ -26,21 +26,23 @@ const logger = new Logger('PopoutWindow');interface PopoutWindowProps {windowKey: string;+ windowGeneration: number;title: string;showTitlebarTitle?: boolean;width: number;height: number;isAlwaysOnTop: boolean;- onToggleAlwaysOnTop: () => void;+ onToggleAlwaysOnTop?: () => void;onRestore: () => void;- onClosed: () => void;- onWindowOpened?: (childWindow: Window) => void;+ onClosed: (windowGeneration: number) => void;+ onWindowOpened?: (childWindow: Window, windowGeneration: number) => void;children: React.ReactNode;}interface PopoutChildState {childWindow: Window;container: HTMLElement;+ windowGeneration: number;}interface PopoutWindowOverlayTreeProps {@@ -70,6 +72,7 @@ function prepareChildDocument(childWindow: Window, title: string): HTMLElement {export const PopoutWindow: React.FC<PopoutWindowProps> = ({windowKey,+ windowGeneration,title,showTitlebarTitle = true,width,@@ -93,7 +96,7 @@ export const PopoutWindow: React.FC<PopoutWindowProps> = ({const childWindow = window.open('about:blank', windowKey, features);if (!childWindow) {logger.warn('Failed to open popout window', {windowKey});- onClosedRef.current();+ onClosedRef.current(windowGeneration);return;}const container = prepareChildDocument(childWindow, initialTitleRef.current);@@ -103,12 +106,12 @@ export const PopoutWindow: React.FC<PopoutWindowProps> = ({const handlePageHide = (): void => {if (closed) return;closed = true;- onClosedRef.current();+ onClosedRef.current(windowGeneration);};childWindow.addEventListener('pagehide', handlePageHide);childWindow.focus();- onWindowOpenedRef.current?.(childWindow);- setChildState({childWindow, container});+ onWindowOpenedRef.current?.(childWindow, windowGeneration);+ setChildState({childWindow, container, windowGeneration});return () => {disconnectThemeObserver();disconnectStylesheetObserver();@@ -118,7 +121,7 @@ export const PopoutWindow: React.FC<PopoutWindowProps> = ({childWindow.close();}};- }, [windowKey]);+ }, [windowGeneration, windowKey]);useEffect(() => {if (!childState || childState.childWindow.closed) return;childState.childWindow.document.title = title;@@ -163,11 +166,11 @@ export const PopoutWindow: React.FC<PopoutWindowProps> = ({}, [childState]);const handleCloseClick = useCallback(() => {if (!childState || childState.childWindow.closed) {- onClosedRef.current();+ onClosedRef.current(childState?.windowGeneration ?? windowGeneration);return;}childState.childWindow.close();- }, [childState]);+ }, [childState, windowGeneration]);if (!childState) {return null;}diff --git a/fluxer_app/src/features/voice/components/popout/VoicePopoutHost.module.css b/fluxer_app/src/features/voice/components/popout/VoicePopoutHost.module.cssindex 1c8611c25..99fa15058 100644--- a/fluxer_app/src/features/voice/components/popout/VoicePopoutHost.module.css+++ b/fluxer_app/src/features/voice/components/popout/VoicePopoutHost.module.css@@ -14,3 +14,24 @@flex: 1 1 auto;min-height: 0;}++.standaloneUserContent {+ display: flex;+ flex: 1 1 auto;+ min-height: 0;+ align-items: center;+ justify-content: center;+ flex-direction: column;+ gap: 16px;+ color: var(--text-primary);+}++.standaloneUserName {+ max-width: min(80%, 480px);+ overflow: hidden;+ font-size: 20px;+ font-weight: 600;+ line-height: 24px;+ text-overflow: ellipsis;+ white-space: nowrap;+}diff --git a/fluxer_app/src/features/voice/components/popout/VoicePopoutHost.tsx b/fluxer_app/src/features/voice/components/popout/VoicePopoutHost.tsxindex 09d825930..cd3519acf 100644--- a/fluxer_app/src/features/voice/components/popout/VoicePopoutHost.tsx+++ b/fluxer_app/src/features/voice/components/popout/VoicePopoutHost.tsx@@ -1,10 +1,10 @@// SPDX-License-Identifier: AGPL-3.0-or-laterimport Channels from '@app/features/channel/state/Channels';+import {createNamedLoadableComponent} from '@app/features/platform/components/loadable/LoadableComponent';import {PopoutWindow} from '@app/features/voice/components/popout/PopoutWindow';import styles from '@app/features/voice/components/popout/VoicePopoutHost.module.css';import {VoicePopoutScopeContext} from '@app/features/voice/components/popout/VoicePopoutScopeContext';-import {VoiceTilePopoutContent} from '@app/features/voice/components/popout/VoiceTilePopoutContent';import {useVoiceEngineConnectionState} from '@app/features/voice/components/useVoiceEngineConnectionState';import {VoiceCallView} from '@app/features/voice/components/VoiceCallView';import {@@ -12,12 +12,14 @@ import {VoiceEngineConnectionState,} from '@app/features/voice/engine/VoiceConnectionStateMachine';import PopoutWindowManager, {+ isVoicePopoutAlwaysOnTopSupported,VOICE_CALL_POPOUT_DEFAULT_HEIGHT,VOICE_CALL_POPOUT_DEFAULT_WIDTH,VOICE_TILE_POPOUT_DEFAULT_HEIGHT,VOICE_TILE_POPOUT_DEFAULT_WIDTH,type VoiceCallPopoutDescriptor,type VoicePopoutDescriptor,+ type VoiceTilePopoutDescriptor,} from '@app/features/voice/state/PopoutWindowManager';import {VOICE_CALL_DESCRIPTOR} from '@app/features/voice/utils/VoiceMessageDescriptors';import {useLingui} from '@lingui/react/macro';@@ -25,6 +27,12 @@ import {observer} from 'mobx-react-lite';import type React from 'react';import {useCallback, useEffect} from 'react';+const VoiceTilePopoutContent = createNamedLoadableComponent<{descriptor: VoiceTilePopoutDescriptor}>({+ displayName: 'VoiceTilePopoutContent',+ load: async () =>+ (await import('@app/features/voice/components/popout/VoiceTilePopoutContent')).VoiceTilePopoutContent,+});+const VoiceCallPopoutContent = observer(function VoiceCallPopoutContent({descriptor,}: {@@ -33,8 +41,8 @@ const VoiceCallPopoutContent = observer(function VoiceCallPopoutContent({const channel = Channels.getChannel(descriptor.channelId);useEffect(() => {if (channel) return;- PopoutWindowManager.close(descriptor.key);- }, [channel, descriptor.key]);+ PopoutWindowManager.close(descriptor.key, descriptor.generation);+ }, [channel, descriptor.generation, descriptor.key]);if (!channel) return null;return (<div className={styles.callContent} data-flx="voice.voice-popout-host.call-content">@@ -49,18 +57,21 @@ const VoicePopoutWindowRenderer = observer(function VoicePopoutWindowRenderer({descriptor: VoicePopoutDescriptor;}) {const key = descriptor.key;- const handleClosed = useCallback(() => {- PopoutWindowManager.handleWindowClosed(key);- }, [key]);+ const handleClosed = useCallback(+ (windowGeneration: number) => {+ PopoutWindowManager.handleWindowClosed(key, windowGeneration);+ },+ [key],+ );const handleRestore = useCallback(() => {- PopoutWindowManager.close(key);- }, [key]);+ PopoutWindowManager.close(key, descriptor.generation);+ }, [descriptor.generation, key]);const handleToggleAlwaysOnTop = useCallback(() => {PopoutWindowManager.toggleAlwaysOnTop(key);}, [key]);const handleWindowOpened = useCallback(- (childWindow: Window) => {- PopoutWindowManager.attachWindow(key, childWindow);+ (childWindow: Window, windowGeneration: number) => {+ PopoutWindowManager.attachWindow(key, windowGeneration, childWindow);},[key],);@@ -71,12 +82,13 @@ const VoicePopoutWindowRenderer = observer(function VoicePopoutWindowRenderer({return (<PopoutWindowwindowKey={key}+ windowGeneration={descriptor.generation}title={title}showTitlebarTitle={!isCallPopout}width={isCallPopout ? VOICE_CALL_POPOUT_DEFAULT_WIDTH : VOICE_TILE_POPOUT_DEFAULT_WIDTH}height={isCallPopout ? VOICE_CALL_POPOUT_DEFAULT_HEIGHT : VOICE_TILE_POPOUT_DEFAULT_HEIGHT}isAlwaysOnTop={PopoutWindowManager.isAlwaysOnTop(key)}- onToggleAlwaysOnTop={handleToggleAlwaysOnTop}+ onToggleAlwaysOnTop={isVoicePopoutAlwaysOnTopSupported() ? handleToggleAlwaysOnTop : undefined}onRestore={handleRestore}onClosed={handleClosed}onWindowOpened={handleWindowOpened}@@ -102,17 +114,20 @@ const VoicePopoutWindowRenderer = observer(function VoicePopoutWindowRenderer({export const VoicePopoutHost: React.FC = observer(function VoicePopoutHost() {const connectionState = asVoiceEngineConnectionState(useVoiceEngineConnectionState());const hasOpenPopouts = PopoutWindowManager.openPopoutCount > 0;+ const hasConnectionBoundPopouts = PopoutWindowManager.openPopouts.some(+ (descriptor) => descriptor.kind === 'call' || descriptor.source !== 'user',+ );useEffect(() => {if (connectionState !== VoiceEngineConnectionState.Disconnected) return;- if (!hasOpenPopouts) return;- PopoutWindowManager.closeAll();- }, [connectionState, hasOpenPopouts]);+ if (!hasConnectionBoundPopouts) return;+ PopoutWindowManager.closeConnectionBoundPopouts();+ }, [connectionState, hasConnectionBoundPopouts]);if (!hasOpenPopouts) return null;return (<>{PopoutWindowManager.openPopouts.map((descriptor) => (<VoicePopoutWindowRenderer- key={descriptor.key}+ key={`${descriptor.key}:${descriptor.generation}`}descriptor={descriptor}data-flx="voice.voice-popout-host.voice-popout-window-renderer"/>diff --git a/fluxer_app/src/features/voice/components/popout/VoiceTilePopoutContent.tsx b/fluxer_app/src/features/voice/components/popout/VoiceTilePopoutContent.tsxindex 3ab9ec858..03854c4a3 100644--- a/fluxer_app/src/features/voice/components/popout/VoiceTilePopoutContent.tsx+++ b/fluxer_app/src/features/voice/components/popout/VoiceTilePopoutContent.tsx@@ -1,18 +1,16 @@// SPDX-License-Identifier: AGPL-3.0-or-later+import {Avatar} from '@app/features/ui/components/Avatar';+import Users from '@app/features/user/state/Users';import styles from '@app/features/voice/components/popout/VoicePopoutHost.module.css';import {VoiceParticipantTile} from '@app/features/voice/components/VoiceParticipantTile';+import {useMaybeVoiceRoom} from '@app/features/voice/components/VoiceRoomContext';import MediaEngine, {useMediaEngineVersion} from '@app/features/voice/engine/MediaEngineFacade';import ScreenSharePublicationMigration from '@app/features/voice/engine/ScreenSharePublicationMigration';import {useStoreVersion} from '@app/features/voice/engine/Store';import {VoiceTrackSource} from '@app/features/voice/engine/VoiceTrackSource';import PopoutWindowManager, {type VoiceTilePopoutDescriptor} from '@app/features/voice/state/PopoutWindowManager';-import {- isTrackReference,- type TrackReferenceOrPlaceholder,- useMaybeRoomContext,- useTracks,-} from '@livekit/components-react';+import {isTrackReference, type TrackReferenceOrPlaceholder, useTracks} from '@livekit/components-react';import {type Room, RoomEvent, type Track} from 'livekit-client';import {observer} from 'mobx-react-lite';import type React from 'react';@@ -21,8 +19,49 @@ import {useEffect, useMemo} from 'react';const CAMERA_SOURCE = VoiceTrackSource.Camera as Track.Source;const SCREEN_SHARE_SOURCE = VoiceTrackSource.ScreenShare as Track.Source;-function getDescriptorTrackSource(descriptor: VoiceTilePopoutDescriptor): Track.Source {- return descriptor.source === 'screen_share' ? SCREEN_SHARE_SOURCE : CAMERA_SOURCE;+function unsupportedVoiceTilePopoutSource(source: never): never {+ throw new Error(`Unsupported voice tile popout source: ${String(source)}`);+}++function getDescriptorTrackSource(descriptor: VoiceTilePopoutDescriptor): Track.Source | null {+ switch (descriptor.source) {+ case 'user':+ return null;+ case 'camera':+ return CAMERA_SOURCE;+ case 'screen_share':+ return SCREEN_SHARE_SOURCE;+ default:+ return unsupportedVoiceTilePopoutSource(descriptor.source);+ }+}++function isVoiceTilePopoutTargetLive(+ descriptor: VoiceTilePopoutDescriptor,+ trackRef: TrackReferenceOrPlaceholder | null,+): boolean {+ if (descriptor.source === 'user') return true;+ const voiceState = MediaEngine.getVoiceStateByConnectionId(descriptor.connectionId);+ if (voiceState && voiceState.user_id !== descriptor.userId) return false;+ const connectionParticipant = MediaEngine.getParticipantByUserIdAndConnectionId(+ descriptor.userId,+ descriptor.connectionId,+ );+ const targetSource = getDescriptorTrackSource(descriptor);+ const hasMatchingLiveKitTrack = Boolean(+ trackRef &&+ isTrackReference(trackRef) &&+ trackRef.participant.identity === descriptor.participantIdentity &&+ trackRef.source === targetSource,+ );+ switch (descriptor.source) {+ case 'camera':+ return Boolean(connectionParticipant?.isCameraEnabled || hasMatchingLiveKitTrack || voiceState?.self_video);+ case 'screen_share':+ return Boolean(connectionParticipant?.isScreenShareEnabled || hasMatchingLiveKitTrack || voiceState?.self_stream);+ default:+ return unsupportedVoiceTilePopoutSource(descriptor.source);+ }}function useTilePopoutLiveKitTrackRef(@@ -51,6 +90,7 @@ function useTilePopoutLiveKitTrackRef(const screenSharePublicationMigrationVersion = ScreenSharePublicationMigration.version;return useMemo(() => {const targetSource = getDescriptorTrackSource(descriptor);+ if (targetSource === null) return null;const matchingTrackRefs = tracks.filter((trackRef) =>trackRef.participant.identity === descriptor.participantIdentity && trackRef.source === targetSource,@@ -77,18 +117,12 @@ const VoiceTilePopoutContentBase = observer(function VoiceTilePopoutContentBase(trackRef,}: VoiceTilePopoutContentBaseProps) {useMediaEngineVersion();- const connectionParticipant = MediaEngine.getParticipantByUserIdAndConnectionId(- descriptor.userId,- descriptor.connectionId,- );- const isTrackLive =- descriptor.source === 'camera'- ? Boolean(connectionParticipant?.isCameraEnabled)- : Boolean(connectionParticipant?.isScreenShareEnabled);+ const isTrackLive = isVoiceTilePopoutTargetLive(descriptor, trackRef);+ const standaloneUser = descriptor.source === 'user' && !trackRef ? Users.getUser(descriptor.userId) : undefined;useEffect(() => {if (isTrackLive) return;- PopoutWindowManager.close(descriptor.key);- }, [isTrackLive, descriptor.key]);+ PopoutWindowManager.close(descriptor.key, descriptor.generation);+ }, [isTrackLive, descriptor.generation, descriptor.key]);return (<div className={styles.tileContent} data-flx="voice.voice-tile-popout-content.tile-content">{trackRef && (@@ -101,6 +135,25 @@ const VoiceTilePopoutContentBase = observer(function VoiceTilePopoutContentBase(data-flx="voice.voice-tile-popout-content.voice-participant-tile"/>)}+ {standaloneUser && (+ <div+ className={styles.standaloneUserContent}+ data-flx="voice.popout.voice-tile-popout-content.voice-tile-popout-content-base.standalone-user-content"+ >+ <Avatar+ user={standaloneUser}+ size={128}+ guildId={descriptor.guildId}+ data-flx="voice.popout.voice-tile-popout-content.voice-tile-popout-content-base.avatar"+ />+ <div+ className={styles.standaloneUserName}+ data-flx="voice.popout.voice-tile-popout-content.voice-tile-popout-content-base.standalone-user-name"+ >+ {descriptor.title}+ </div>+ </div>+ )}</div>);});@@ -124,7 +177,7 @@ const VoiceTilePopoutContentWithLiveKit = observer(function VoiceTilePopoutConteexport const VoiceTilePopoutContent: React.FC<{descriptor: VoiceTilePopoutDescriptor}> = observer(function VoiceTilePopoutContent({descriptor}) {- const room = useMaybeRoomContext() ?? null;+ const room = useMaybeVoiceRoom() ?? null;if (!room) {return (<VoiceTilePopoutContentBasediff --git a/fluxer_app/src/features/voice/state/PopoutWindowManager.test.ts b/fluxer_app/src/features/voice/state/PopoutWindowManager.test.tsnew file mode 100644index 000000000..fdf968b26--- /dev/null+++ b/fluxer_app/src/features/voice/state/PopoutWindowManager.test.ts@@ -0,0 +1,180 @@+// @vitest-environment happy-dom+// SPDX-License-Identifier: AGPL-3.0-or-later++import PopoutWindowManager, {+ getVoiceCallPopoutKey,+ getVoiceTilePopoutKey,+ type VoiceTilePopoutSource,+} from '@app/features/voice/state/PopoutWindowManager';+import {afterEach, beforeEach, describe, expect, test, vi} from 'vitest';++interface PendingAlwaysOnTopCall {+ key: string;+ flag: boolean;+ resolve: () => void;+ reject: (error: Error) => void;+}++let pendingAlwaysOnTopCalls: Array<PendingAlwaysOnTopCall> = [];++function installElectronApi(): void {+ pendingAlwaysOnTopCalls = [];+ (window as unknown as {electron: unknown}).electron = {+ popoutFocus: () => Promise.resolve(true),+ popoutSetAlwaysOnTop: (key: string, flag: boolean) =>+ new Promise<boolean>((resolve, reject) => {+ pendingAlwaysOnTopCalls.push({key, flag, resolve: () => resolve(true), reject});+ }),+ };+}++function openCallPopout(channelId: string): string {+ expect(PopoutWindowManager.openCallPopout({channelId, guildId: null, title: channelId})).toBe(true);+ return getVoiceCallPopoutKey(channelId);+}++function openTilePopout(participantIdentity: string, source: VoiceTilePopoutSource): string {+ expect(+ PopoutWindowManager.openTilePopout({+ participantIdentity,+ source,+ userId: 'user-1',+ connectionId: 'connection-1',+ channelId: 'channel-1',+ guildId: null,+ title: participantIdentity,+ }),+ ).toBe(true);+ return getVoiceTilePopoutKey(participantIdentity, source);+}++function generationOf(key: string): number {+ const descriptor = PopoutWindowManager.popouts[key];+ if (!descriptor) throw new Error(`Expected popout ${key} to be open`);+ return descriptor.generation;+}++beforeEach(() => {+ installElectronApi();+ PopoutWindowManager.closeAll();+});++afterEach(() => {+ PopoutWindowManager.closeAll();+ delete (window as unknown as {electron?: unknown}).electron;+});++describe('popout generations', () => {+ test('allocates a fresh generation every time a key is reopened', () => {+ const key = openCallPopout('channel-a');+ const firstGeneration = generationOf(key);+ PopoutWindowManager.close(key, firstGeneration);+ openCallPopout('channel-a');+ expect(generationOf(key)).not.toBe(firstGeneration);+ });++ test('ignores handleWindowClosed from a superseded window', () => {+ const key = openCallPopout('channel-a');+ const firstGeneration = generationOf(key);+ PopoutWindowManager.close(key, firstGeneration);+ openCallPopout('channel-a');+ const secondGeneration = generationOf(key);+ PopoutWindowManager.handleWindowClosed(key, firstGeneration);+ expect(PopoutWindowManager.isOpen(key)).toBe(true);+ PopoutWindowManager.handleWindowClosed(key, secondGeneration);+ expect(PopoutWindowManager.isOpen(key)).toBe(false);+ });++ test('ignores close from a superseded window', () => {+ const key = openCallPopout('channel-a');+ const firstGeneration = generationOf(key);+ PopoutWindowManager.close(key, firstGeneration);+ openCallPopout('channel-a');+ PopoutWindowManager.close(key, firstGeneration);+ expect(PopoutWindowManager.isOpen(key)).toBe(true);+ });++ test('ignores attachWindow from a superseded window', () => {+ const key = openCallPopout('channel-a');+ const staleGeneration = generationOf(key);+ PopoutWindowManager.close(key, staleGeneration);+ openCallPopout('channel-a');+ const staleChildWindow = {closed: false, focus: vi.fn(), close: vi.fn()};+ PopoutWindowManager.attachWindow(key, staleGeneration, staleChildWindow);+ PopoutWindowManager.close(key);+ expect(staleChildWindow.close).not.toHaveBeenCalled();+ });++ test('closes the child window attached for the current generation', () => {+ const key = openCallPopout('channel-a');+ const childWindow = {closed: false, focus: vi.fn(), close: vi.fn()};+ PopoutWindowManager.attachWindow(key, generationOf(key), childWindow);+ PopoutWindowManager.close(key);+ expect(childWindow.close).toHaveBeenCalledTimes(1);+ });+});++describe('always on top', () => {+ test('commits the pinned state only after the desktop call resolves', async () => {+ const key = openCallPopout('channel-a');+ PopoutWindowManager.setAlwaysOnTop(key, true);+ expect(pendingAlwaysOnTopCalls).toHaveLength(1);+ expect(PopoutWindowManager.isAlwaysOnTop(key)).toBe(false);+ pendingAlwaysOnTopCalls[0]?.resolve();+ await vi.waitFor(() => expect(PopoutWindowManager.isAlwaysOnTop(key)).toBe(true));+ });++ test('leaves the pinned state untouched when the desktop call rejects', async () => {+ const key = openCallPopout('channel-a');+ PopoutWindowManager.setAlwaysOnTop(key, true);+ pendingAlwaysOnTopCalls[0]?.reject(new Error('popout pin failed'));+ await vi.waitFor(() => expect(pendingAlwaysOnTopCalls).toHaveLength(1));+ expect(PopoutWindowManager.isAlwaysOnTop(key)).toBe(false);+ });++ test('serializes concurrent toggles and applies the last requested value', async () => {+ const key = openCallPopout('channel-a');+ PopoutWindowManager.setAlwaysOnTop(key, true);+ PopoutWindowManager.setAlwaysOnTop(key, false);+ expect(pendingAlwaysOnTopCalls).toHaveLength(1);+ expect(pendingAlwaysOnTopCalls[0]?.flag).toBe(true);+ pendingAlwaysOnTopCalls[0]?.resolve();+ await vi.waitFor(() => expect(pendingAlwaysOnTopCalls).toHaveLength(2));+ expect(pendingAlwaysOnTopCalls[1]?.flag).toBe(false);+ pendingAlwaysOnTopCalls[1]?.resolve();+ await vi.waitFor(() => expect(PopoutWindowManager.isAlwaysOnTop(key)).toBe(false));+ });++ test('toggles against the pending desired value rather than the committed one', () => {+ const key = openCallPopout('channel-a');+ PopoutWindowManager.toggleAlwaysOnTop(key);+ expect(pendingAlwaysOnTopCalls[0]?.flag).toBe(true);+ PopoutWindowManager.toggleAlwaysOnTop(key);+ expect(pendingAlwaysOnTopCalls).toHaveLength(1);+ PopoutWindowManager.toggleAlwaysOnTop(key);+ expect(pendingAlwaysOnTopCalls).toHaveLength(1);+ });++ test('drops in-flight operations when the popout is removed', async () => {+ const key = openCallPopout('channel-a');+ PopoutWindowManager.setAlwaysOnTop(key, true);+ PopoutWindowManager.close(key);+ pendingAlwaysOnTopCalls[0]?.resolve();+ await vi.waitFor(() => expect(pendingAlwaysOnTopCalls).toHaveLength(1));+ expect(PopoutWindowManager.isAlwaysOnTop(key)).toBe(false);+ });+});++describe('closeConnectionBoundPopouts', () => {+ test('keeps standalone user popouts and closes track-bound ones', () => {+ const callKey = openCallPopout('channel-a');+ const cameraKey = openTilePopout('participant-1', 'camera');+ const screenShareKey = openTilePopout('participant-1', 'screen_share');+ const userKey = openTilePopout('participant-2', 'user');+ PopoutWindowManager.closeConnectionBoundPopouts();+ expect(PopoutWindowManager.isOpen(callKey)).toBe(false);+ expect(PopoutWindowManager.isOpen(cameraKey)).toBe(false);+ expect(PopoutWindowManager.isOpen(screenShareKey)).toBe(false);+ expect(PopoutWindowManager.isOpen(userKey)).toBe(true);+ });+});diff --git a/fluxer_app/src/features/voice/state/PopoutWindowManager.ts b/fluxer_app/src/features/voice/state/PopoutWindowManager.tsindex 230348ff9..fe2a1cab1 100644--- a/fluxer_app/src/features/voice/state/PopoutWindowManager.ts+++ b/fluxer_app/src/features/voice/state/PopoutWindowManager.ts@@ -18,6 +18,7 @@ export type VoiceTilePopoutSource = 'user' | 'camera' | 'screen_share';export interface VoiceTilePopoutDescriptor {kind: 'tile';key: string;+ generation: number;participantIdentity: string;source: VoiceTilePopoutSource;userId: string;@@ -30,6 +31,7 @@ export interface VoiceTilePopoutDescriptor {export interface VoiceCallPopoutDescriptor {kind: 'call';key: string;+ generation: number;channelId: string;guildId: string | null;title: string;@@ -47,8 +49,12 @@ export function getVoiceCallPopoutKey(channelId: string): string {export function isVoicePopoutSupported(): boolean {const electronApi = getElectronAPI();- if (!electronApi) return false;- return typeof electronApi.popoutSetAlwaysOnTop === 'function';+ if (electronApi) return typeof electronApi.popoutSetAlwaysOnTop === 'function';+ return typeof window !== 'undefined' && typeof window.open === 'function';+}++export function isVoicePopoutAlwaysOnTopSupported(): boolean {+ return typeof getElectronAPI()?.popoutSetAlwaysOnTop === 'function';}interface PopoutChildWindow {@@ -57,13 +63,28 @@ interface PopoutChildWindow {close: () => void;}+interface AlwaysOnTopOperationState {+ readonly descriptor: VoicePopoutDescriptor;+ desired: boolean;+}+class PopoutWindowManagerStore {popouts: Record<string, VoicePopoutDescriptor> = {};alwaysOnTopKeys: Record<string, true> = {};private readonly childWindows = new Map<string, PopoutChildWindow>();+ private readonly alwaysOnTopOperations = new Map<string, AlwaysOnTopOperationState>();+ private nextPopoutGeneration = 1;constructor() {- makeAutoObservable(this, {}, {autoBind: true});+ makeAutoObservable<this, 'alwaysOnTopOperations' | 'childWindows' | 'nextPopoutGeneration'>(+ this,+ {+ alwaysOnTopOperations: false,+ childWindows: false,+ nextPopoutGeneration: false,+ },+ {autoBind: true},+ );}get openPopouts(): Array<VoicePopoutDescriptor> {@@ -101,18 +122,18 @@ class PopoutWindowManagerStore {return this.alwaysOnTopKeys[key] === true;}- openTilePopout(options: Omit<VoiceTilePopoutDescriptor, 'kind' | 'key'>): boolean {+ openTilePopout(options: Omit<VoiceTilePopoutDescriptor, 'kind' | 'key' | 'generation'>): boolean {const key = getVoiceTilePopoutKey(options.participantIdentity, options.source);- return this.register({kind: 'tile', key, ...options});+ return this.register({kind: 'tile', key, generation: this.allocatePopoutGeneration(), ...options});}- openCallPopout(options: Omit<VoiceCallPopoutDescriptor, 'kind' | 'key'>): boolean {+ openCallPopout(options: Omit<VoiceCallPopoutDescriptor, 'kind' | 'key' | 'generation'>): boolean {const existingCallPopout = this.callPopout;const key = getVoiceCallPopoutKey(options.channelId);if (existingCallPopout && existingCallPopout.key !== key) {this.close(existingCallPopout.key);}- return this.register({kind: 'call', key, ...options});+ return this.register({kind: 'call', key, generation: this.allocatePopoutGeneration(), ...options});}focus(key: string): void {@@ -127,8 +148,8 @@ class PopoutWindowManagerStore {}}- attachWindow(key: string, childWindow: PopoutChildWindow | null): void {- if (!this.isOpen(key)) return;+ attachWindow(key: string, generation: number, childWindow: PopoutChildWindow | null): void {+ if (!this.isCurrentPopout(key, generation)) return;if (childWindow === null) {this.childWindows.delete(key);return;@@ -137,32 +158,39 @@ class PopoutWindowManagerStore {}setAlwaysOnTop(key: string, flag: boolean): void {- if (!this.isOpen(key)) return;- const electronApi = getElectronAPI();- void electronApi?.popoutSetAlwaysOnTop?.(key, flag).catch((error) => {- logger.warn('Failed to toggle popout always-on-top', {key, flag, error});- });- runInAction(() => {- if (flag) {- this.alwaysOnTopKeys = {...this.alwaysOnTopKeys, [key]: true};- } else {- const next = {...this.alwaysOnTopKeys};- delete next[key];- this.alwaysOnTopKeys = next;- }- });+ const descriptor = this.popouts[key];+ if (!descriptor) return;+ if (!isVoicePopoutAlwaysOnTopSupported()) {+ logger.warn('Ignored always-on-top request: desktop popout API unavailable', {key, flag});+ return;+ }+ const currentOperation = this.alwaysOnTopOperations.get(key);+ if (currentOperation?.descriptor === descriptor) {+ currentOperation.desired = flag;+ return;+ }+ const operationState: AlwaysOnTopOperationState = {descriptor, desired: flag};+ this.alwaysOnTopOperations.set(key, operationState);+ void this.applyAlwaysOnTopOperation(key, operationState);}toggleAlwaysOnTop(key: string): void {- this.setAlwaysOnTop(key, !this.isAlwaysOnTop(key));+ const descriptor = this.popouts[key];+ if (!descriptor) return;+ const currentOperation = this.alwaysOnTopOperations.get(key);+ const currentFlag =+ currentOperation?.descriptor === descriptor ? currentOperation.desired : this.isAlwaysOnTop(key);+ this.setAlwaysOnTop(key, !currentFlag);}- handleWindowClosed(key: string): void {+ handleWindowClosed(key: string, generation: number): void {+ if (!this.isCurrentPopout(key, generation)) return;this.childWindows.delete(key);this.remove(key);}- close(key: string): void {+ close(key: string, generation?: number): void {+ if (generation !== undefined && !this.isCurrentPopout(key, generation)) return;const childWindow = this.childWindows.get(key);this.childWindows.delete(key);this.remove(key);@@ -177,6 +205,13 @@ class PopoutWindowManagerStore {}}+ closeConnectionBoundPopouts(): void {+ for (const descriptor of this.openPopouts) {+ if (descriptor.kind === 'tile' && descriptor.source === 'user') continue;+ this.close(descriptor.key);+ }+ }+private register(descriptor: VoicePopoutDescriptor): boolean {if (this.isOpen(descriptor.key)) {this.focus(descriptor.key);@@ -190,14 +225,83 @@ class PopoutWindowManagerStore {logger.warn('Ignored popout request: popout capacity reached', {key: descriptor.key});return false;}+ if (!getElectronAPI()) {+ const width = descriptor.kind === 'call' ? VOICE_CALL_POPOUT_DEFAULT_WIDTH : VOICE_TILE_POPOUT_DEFAULT_WIDTH;+ const height = descriptor.kind === 'call' ? VOICE_CALL_POPOUT_DEFAULT_HEIGHT : VOICE_TILE_POPOUT_DEFAULT_HEIGHT;+ const childWindow = window.open('about:blank', descriptor.key, `width=${width},height=${height}`);+ if (!childWindow) {+ logger.warn('Failed to open browser popout window', {key: descriptor.key});+ return false;+ }+ this.childWindows.set(descriptor.key, childWindow);+ }runInAction(() => {this.popouts = {...this.popouts, [descriptor.key]: descriptor};});return true;}+ private allocatePopoutGeneration(): number {+ const generation = this.nextPopoutGeneration;+ if (!Number.isSafeInteger(generation)) {+ throw new Error('Voice popout generation exhausted');+ }+ this.nextPopoutGeneration += 1;+ return generation;+ }++ private isCurrentPopout(key: string, generation: number): boolean {+ return this.popouts[key]?.generation === generation;+ }++ private async applyAlwaysOnTopOperation(key: string, operationState: AlwaysOnTopOperationState): Promise<void> {+ while (this.alwaysOnTopOperations.get(key) === operationState) {+ const {descriptor} = operationState;+ if (!this.isCurrentPopout(key, descriptor.generation)) return;+ const flag = operationState.desired;+ const operation = getElectronAPI()?.popoutSetAlwaysOnTop?.(key, flag);+ if (!operation) {+ this.alwaysOnTopOperations.delete(key);+ return;+ }+ try {+ await operation;+ } catch (error) {+ if (+ this.alwaysOnTopOperations.get(key) !== operationState ||+ !this.isCurrentPopout(key, descriptor.generation)+ ) {+ return;+ }+ logger.warn('Failed to toggle popout always-on-top', {key, flag, error});+ if (operationState.desired === flag) {+ this.alwaysOnTopOperations.delete(key);+ return;+ }+ continue;+ }+ if (this.alwaysOnTopOperations.get(key) !== operationState || !this.isCurrentPopout(key, descriptor.generation)) {+ return;+ }+ runInAction(() => {+ if (flag) {+ this.alwaysOnTopKeys = {...this.alwaysOnTopKeys, [key]: true};+ } else {+ const next = {...this.alwaysOnTopKeys};+ delete next[key];+ this.alwaysOnTopKeys = next;+ }+ });+ if (operationState.desired === flag) {+ this.alwaysOnTopOperations.delete(key);+ return;+ }+ }+ }+private remove(key: string): void {if (!this.isOpen(key)) return;+ this.alwaysOnTopOperations.delete(key);runInAction(() => {const nextPopouts = {...this.popouts};delete nextPopouts[key];