Merge 668a711dfa into d6bb7130ff

Signed-off-by: Nextcloud bot <bot@nextcloud.com>

CHANGELOG.md

@@ -6,6 +6,41 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## 2.7.2 (2024-10-08)
+### Misc
+- rebuild frontend client
+- update dependencies
+- update translations
+
+## 2.7.1 (2024-09-18)
+### Misc
+- fix composer install in build script
+- remove deprecated simple-git import
+
+## 2.7.0 (2024-09-15)
+### Added
+- sharing rooms with moderators and users
+- manage view of rooms for moderators and users
+- videos for all users and moderators
+- sharing rooms with moderators and users
+- manage view of rooms for moderators and users
+- videos for all users and moderators
+- videos for all users and moderators
+- sharing rooms with moderators and users
+- manage view of rooms for moderators and users
+- list all shared rooms for users and moderators
+
+### Fixed
+- no clone action for non-admin
+- bug with name of shared groups
+- don't use backticks
+- add missing translations
+- use querybuilder for user comparison
+
+### Misc
+- respect tabs
+- disabled checkbox
+
 ## 2.6.0 (2024-04-28)
 ### Added
 - add Search Provider

README.md

@@ -79,6 +79,7 @@ Key                               | Description
 `app.shortener`                   | Value of your shortener service. Should start with `https://` and contain `{token}`.
 `avatar.path`                     | Absolute path to an optional avatar cache directory.
 `avatar.url`                      | URL which serves `avatar.path` to be used as avatar cache.
+`avatar.enabled`                  | Set to `false` if you want to disable the use of Nextcloud avatars in BBB rooms.
 
 ### Avatar cache (v2.2+)
 The generation of avatars puts a high load on your Nextcloud instance, since the
@@ -113,8 +114,8 @@ For additional security, we recommend to disable directory listing, symlinks and
 any language interpreter such as php for the cache directory.
 
 Cached avatars are usually deleted as soon as the meeting ends. In cases the BBB
-server shuts down unexpected, we provide the `bbb:clear-avatar-cache` occ
+server shuts down unexpected or you set `avatar.enabled` to `false` (via gui or manually) while a meeting was running, 
-command (example use: `./occ bbb:clear-avatar-cache`).
+we provide the `bbb:clear-avatar-cache` occ command (example use: `./occ bbb:clear-avatar-cache`).
 
 
 ## :bowtie: User guide

appinfo/info.xml

@@ -22,7 +22,7 @@ Developer wanted! If you have time it would be awesome if you could help to enha
 
 *This app integrates BigBlueButton and is not endorsed or certified by BigBlueButton Inc. BigBlueButton and the BigBlueButton Logo are trademarks of BigBlueButton Inc.*
     ]]></description>
-    <version>2.6.0</version>
+    <version>2.7.2</version>
     <licence>agpl</licence>
     <author mail="klaus@jsxc.org">Klaus Herberth</author>
     <namespace>BigBlueButton</namespace>

l10n/ar.js

@@ -26,12 +26,12 @@ OC.L10N.register(
     "Room not found" : "الغرفة غير موجودة",
     "The room could not be found. Maybe it was deleted?" : "الغرفة غير موجودة. هل يمكن أن تكون محذوفة؟",
     "Back to %s" : "العودة إلى %s",
-    "Get your API URL and secret by executing \"sudo bbb-conf --secret\" on your BigBlueButton server." : "تحصّل على API URL و كلمة السر بإعطاء الأمر \"sudo bbb-conf --secret\" على خادوم BBB.",
+    "Get your API URL and secret by executing \"sudo bbb-conf --secret\" on your BigBlueButton server." : "تحصّل على API URL و كلمة المرور بإعطاء الأمر \"sudo bbb-conf --secret\" على خادوم BBB.",
     "API URL" : "عنوان واجهة برمجة التطبيقات API URL",
-    "API secret" : "كلمة السر لواجهة برمجة التطبيقات API secret",
+    "API secret" : "كلمة المرور لواجهة برمجة التطبيقات API secret",
     "Save" : "حفظ",
     "Show room manager in app navigation instead of settings page." : "عرض مدير الغرفة في صفحةتصفح التطبيق بدلأً عن صفحة الإعدادات.",
-    "Use Nextcloud theme in BigBlueButton." : "ثيمة نكست كلاود في \"بيغ بلو بوتون\" BBB",
+    "Use Nextcloud theme in BigBlueButton." : "سمة نكست كلاود في \"بيغ بلو بوتون\" BBB",
     "Default Room Settings" : "الإعدادات التلقائية للغرفة",
     "Below you can change some default values, which are used to create a new room." : "يُمكنك أدناه تعديل بعض القيم التلقائية التي تستخدم عند إنشاء غرفة جديدة.",
     "Perform media check before usage" : "قم باختيار الوسائط media قبل الاستعمال",
@@ -47,8 +47,8 @@ OC.L10N.register(
     "Please enter your name!" : "أدخِل اسمك من فضلك!",
     "The name must be at least 3 characters long." : "الاسم يجب ألّا يقل عن 3 حروف.",
     "You have to provide the correct password to join the meeting." : "يجب أن تُدخَل كلمة المرور الصحيحة ليمكنك المشاركة في الاجتماع.",
-    "Display name" : "الاسم المعروض",
+    "Display name" : "اسم العرض",
-    "Password" : "كلمة السر",
+    "Password" : "كلمة المرور",
     "Join" : "إنضم",
     "Have an account? Log in." : "عندك حساب؟ أُدخُل.",
     "Hello %s" : "أهلاً %s",

l10n/ar.json

@@ -24,12 +24,12 @@
     "Room not found" : "الغرفة غير موجودة",
     "The room could not be found. Maybe it was deleted?" : "الغرفة غير موجودة. هل يمكن أن تكون محذوفة؟",
     "Back to %s" : "العودة إلى %s",
-    "Get your API URL and secret by executing \"sudo bbb-conf --secret\" on your BigBlueButton server." : "تحصّل على API URL و كلمة السر بإعطاء الأمر \"sudo bbb-conf --secret\" على خادوم BBB.",
+    "Get your API URL and secret by executing \"sudo bbb-conf --secret\" on your BigBlueButton server." : "تحصّل على API URL و كلمة المرور بإعطاء الأمر \"sudo bbb-conf --secret\" على خادوم BBB.",
     "API URL" : "عنوان واجهة برمجة التطبيقات API URL",
-    "API secret" : "كلمة السر لواجهة برمجة التطبيقات API secret",
+    "API secret" : "كلمة المرور لواجهة برمجة التطبيقات API secret",
     "Save" : "حفظ",
     "Show room manager in app navigation instead of settings page." : "عرض مدير الغرفة في صفحةتصفح التطبيق بدلأً عن صفحة الإعدادات.",
-    "Use Nextcloud theme in BigBlueButton." : "ثيمة نكست كلاود في \"بيغ بلو بوتون\" BBB",
+    "Use Nextcloud theme in BigBlueButton." : "سمة نكست كلاود في \"بيغ بلو بوتون\" BBB",
     "Default Room Settings" : "الإعدادات التلقائية للغرفة",
     "Below you can change some default values, which are used to create a new room." : "يُمكنك أدناه تعديل بعض القيم التلقائية التي تستخدم عند إنشاء غرفة جديدة.",
     "Perform media check before usage" : "قم باختيار الوسائط media قبل الاستعمال",
@@ -45,8 +45,8 @@
     "Please enter your name!" : "أدخِل اسمك من فضلك!",
     "The name must be at least 3 characters long." : "الاسم يجب ألّا يقل عن 3 حروف.",
     "You have to provide the correct password to join the meeting." : "يجب أن تُدخَل كلمة المرور الصحيحة ليمكنك المشاركة في الاجتماع.",
-    "Display name" : "الاسم المعروض",
+    "Display name" : "اسم العرض",
-    "Password" : "كلمة السر",
+    "Password" : "كلمة المرور",
     "Join" : "إنضم",
     "Have an account? Log in." : "عندك حساب؟ أُدخُل.",
     "Hello %s" : "أهلاً %s",

l10n/ast.js

@@ -45,11 +45,13 @@ OC.L10N.register(
     "Room URL" : "URL de la sala",
     "Welcome" : "Afáyate",
     "Participant limit" : "Llende de participantes",
+    "Sharing" : "Compartición",
     "Every participant is moderator" : "Tolos participantes son llendadores",
     "Miscellaneous" : "Miscelanea",
     "Clean layout" : "Distribución llimpia",
     "Room name" : "Nome de la sala",
     "Create" : "Crear",
+    "Published" : "Espublizóse",
     "Open recording" : "Abrir la grabación",
     "Copy to clipboard" : "Copiar nel cartafueyu",
     "_%n participant_::_%n participants_" : ["%n participante","%n participantes"],

l10n/ast.json

@@ -43,11 +43,13 @@
     "Room URL" : "URL de la sala",
     "Welcome" : "Afáyate",
     "Participant limit" : "Llende de participantes",
+    "Sharing" : "Compartición",
     "Every participant is moderator" : "Tolos participantes son llendadores",
     "Miscellaneous" : "Miscelanea",
     "Clean layout" : "Distribución llimpia",
     "Room name" : "Nome de la sala",
     "Create" : "Crear",
+    "Published" : "Espublizóse",
     "Open recording" : "Abrir la grabación",
     "Copy to clipboard" : "Copiar nel cartafueyu",
     "_%n participant_::_%n participants_" : ["%n participante","%n participantes"],

l10n/az.js

@@ -8,7 +8,9 @@ OC.L10N.register(
     "Group" : "Qrup",
     "Name" : "Ad",
     "Edit" : "Dəyişiklik et",
+    "Sharing" : "Paylaşılır",
     "Create" : "Yarat",
+    "Published" : "Nəşr edilmiş",
     "Delete" : "Sil",
     "Error" : "Səhv",
     "Loading" : "Loading",

l10n/az.json

@@ -6,7 +6,9 @@
     "Group" : "Qrup",
     "Name" : "Ad",
     "Edit" : "Dəyişiklik et",
+    "Sharing" : "Paylaşılır",
     "Create" : "Yarat",
+    "Published" : "Nəşr edilmiş",
     "Delete" : "Sil",
     "Error" : "Səhv",
     "Loading" : "Loading",

l10n/bg.js

@@ -114,6 +114,7 @@ OC.L10N.register(
     "Delete?" : "Изтриване?",
     "Could not delete record" : "Записът не можа да се изтрие",
     "Server error" : "Сървърна грешка",
+    "Start" : "Начало",
     "Loading" : "Зареждане",
     "You are not allowed to change this option, because this room is shared with you." : "Нямате право да променяте тази опция, защото тази стая е споделена с вас.",
     "Max. rooms" : "Макс. стаи",

l10n/bg.json

@@ -112,6 +112,7 @@
     "Delete?" : "Изтриване?",
     "Could not delete record" : "Записът не можа да се изтрие",
     "Server error" : "Сървърна грешка",
+    "Start" : "Начало",
     "Loading" : "Зареждане",
     "You are not allowed to change this option, because this room is shared with you." : "Нямате право да променяте тази опция, защото тази стая е споделена с вас.",
     "Max. rooms" : "Макс. стаи",

l10n/cs.js

@@ -58,6 +58,7 @@ OC.L10N.register(
     "No matches" : "Žádné shody",
     "admin" : "správce",
     "moderator" : "moderátor",
+    "user" : "uživatel",
     "Name" : "Název",
     "Access" : "Přístup",
     "Max" : "Nejvýše",
@@ -71,6 +72,7 @@ OC.L10N.register(
     "This message is shown to all users in the chat area after they joined." : "Tato zpráva je zobrazena všem uživatelům v chatu, poté co se připojí.",
     "Sets a limit on the number of participants for this room. Zero means there is no limit." : "Nastaví limit na počet účastníků pro tuto místnost. Nula znamená bez omezení.",
     "If enabled, the moderator is able to start the recording." : "Pokud je zapnuto, moderátor může spustit nahrávání.",
+    "Explanation of the different concepts that constitute access options :<br>- Public: Anyone who has the link can join.- <br>Internal: Only Nextcloud users can join.- <br>Password: Only guests who have the password can join..- <br>Waiting room: A moderator must accept each guest before they can join.- <br>Restricted : Only selected users and groups can access this room." : "Vysvětlení různých pojmů, které tvoří možnosti přístupu :<br>- Veřejné: Kdokoli kdo má dokaz se může přidat.- <br>Interní: Připojit se mohou pouze uživatelé z Nextcloud.- <br>Heslo: Připojit se mohou pouze hosté, kteří mají heslo.- <br>Čekací místnost: Než se host bude moci připojit je třeba, aby každého zvlášť přijal moderátor.- <br>Omezené : K této místnosti budou mít přístup pouze vybraní uživatelé a skupiny.",
     "A moderator is able to manage all participants in a meeting including kicking, muting or selecting a presenter. Users with the role moderator are also able to close a meeting or change the default settings." : "Moderátor může spravovat všechny účastníky schůzky, včetně odpojení, ztlumení nebo výběru prezentujícího. Uživatelé s rolí moderátor také mohou schůzku ukončit nebo měnit výchozí nastavení.",
     "If enabled, normal users have to wait until a moderator is in the room." : "Pokud je zapnuto, běžní uživatelé budou muset počkat, než se do místnosti přihlásí moderátor.",
     "If enabled, a moderator URL is generated which allows access with moderator permission." : "Po povolení bude vygenerován moderátorský URL umožňující přístup s moderátorskými právy.",
@@ -114,7 +116,10 @@ OC.L10N.register(
     "Delete?" : "Smazat?",
     "Could not delete record" : "Záznam se nedaří smazat",
     "Server error" : "Chyba serveru",
+    "Could not modify publishing state" : "Nepodařilo se změnit stav zvěřejnění",
+    "Open room" : "Otevřít místnost",
     "Start" : "Spustit",
+    "Clone room" : "Klonovat místnost",
     "Loading" : "Načítání",
     "You are not allowed to change this option, because this room is shared with you." : "Nemáte oprávnění měnit tuto volbu, protože tato místnost je vám jen nasdílena.",
     "Max. rooms" : "Nejvýše místností",

l10n/cs.json

@@ -56,6 +56,7 @@
     "No matches" : "Žádné shody",
     "admin" : "správce",
     "moderator" : "moderátor",
+    "user" : "uživatel",
     "Name" : "Název",
     "Access" : "Přístup",
     "Max" : "Nejvýše",
@@ -69,6 +70,7 @@
     "This message is shown to all users in the chat area after they joined." : "Tato zpráva je zobrazena všem uživatelům v chatu, poté co se připojí.",
     "Sets a limit on the number of participants for this room. Zero means there is no limit." : "Nastaví limit na počet účastníků pro tuto místnost. Nula znamená bez omezení.",
     "If enabled, the moderator is able to start the recording." : "Pokud je zapnuto, moderátor může spustit nahrávání.",
+    "Explanation of the different concepts that constitute access options :<br>- Public: Anyone who has the link can join.- <br>Internal: Only Nextcloud users can join.- <br>Password: Only guests who have the password can join..- <br>Waiting room: A moderator must accept each guest before they can join.- <br>Restricted : Only selected users and groups can access this room." : "Vysvětlení různých pojmů, které tvoří možnosti přístupu :<br>- Veřejné: Kdokoli kdo má dokaz se může přidat.- <br>Interní: Připojit se mohou pouze uživatelé z Nextcloud.- <br>Heslo: Připojit se mohou pouze hosté, kteří mají heslo.- <br>Čekací místnost: Než se host bude moci připojit je třeba, aby každého zvlášť přijal moderátor.- <br>Omezené : K této místnosti budou mít přístup pouze vybraní uživatelé a skupiny.",
     "A moderator is able to manage all participants in a meeting including kicking, muting or selecting a presenter. Users with the role moderator are also able to close a meeting or change the default settings." : "Moderátor může spravovat všechny účastníky schůzky, včetně odpojení, ztlumení nebo výběru prezentujícího. Uživatelé s rolí moderátor také mohou schůzku ukončit nebo měnit výchozí nastavení.",
     "If enabled, normal users have to wait until a moderator is in the room." : "Pokud je zapnuto, běžní uživatelé budou muset počkat, než se do místnosti přihlásí moderátor.",
     "If enabled, a moderator URL is generated which allows access with moderator permission." : "Po povolení bude vygenerován moderátorský URL umožňující přístup s moderátorskými právy.",
@@ -112,7 +114,10 @@
     "Delete?" : "Smazat?",
     "Could not delete record" : "Záznam se nedaří smazat",
     "Server error" : "Chyba serveru",
+    "Could not modify publishing state" : "Nepodařilo se změnit stav zvěřejnění",
+    "Open room" : "Otevřít místnost",
     "Start" : "Spustit",
+    "Clone room" : "Klonovat místnost",
     "Loading" : "Načítání",
     "You are not allowed to change this option, because this room is shared with you." : "Nemáte oprávnění měnit tuto volbu, protože tato místnost je vám jen nasdílena.",
     "Max. rooms" : "Nejvýše místností",

l10n/de.js

@@ -58,6 +58,7 @@ OC.L10N.register(
     "No matches" : "Keine Übereinstimmungen",
     "admin" : "Administrator",
     "moderator" : "Moderator",
+    "user" : "Benutzer",
     "Name" : "Name",
     "Access" : "Zugriff",
     "Max" : "Max",
@@ -115,6 +116,10 @@ OC.L10N.register(
     "Delete?" : "Löschen?",
     "Could not delete record" : "Aufnahme konnte nicht gelöscht werden",
     "Server error" : "Serverfehler",
+    "Could not modify publishing state" : "Der Veröffentlichungsstatus konnte nicht geändert werden",
+    "Open room" : "Raum öffnen",
+    "Start" : "Start",
+    "Clone room" : "Raum duplizieren",
     "Loading" : "Lade",
     "You are not allowed to change this option, because this room is shared with you." : "Du bist nicht berechtigt, diese Einstellung zu ändern, da dieser Raum mit dir geteilt wurde.",
     "Max. rooms" : "Max. Räume",

l10n/de.json

@@ -56,6 +56,7 @@
     "No matches" : "Keine Übereinstimmungen",
     "admin" : "Administrator",
     "moderator" : "Moderator",
+    "user" : "Benutzer",
     "Name" : "Name",
     "Access" : "Zugriff",
     "Max" : "Max",
@@ -113,6 +114,10 @@
     "Delete?" : "Löschen?",
     "Could not delete record" : "Aufnahme konnte nicht gelöscht werden",
     "Server error" : "Serverfehler",
+    "Could not modify publishing state" : "Der Veröffentlichungsstatus konnte nicht geändert werden",
+    "Open room" : "Raum öffnen",
+    "Start" : "Start",
+    "Clone room" : "Raum duplizieren",
     "Loading" : "Lade",
     "You are not allowed to change this option, because this room is shared with you." : "Du bist nicht berechtigt, diese Einstellung zu ändern, da dieser Raum mit dir geteilt wurde.",
     "Max. rooms" : "Max. Räume",

l10n/fr.js

@@ -71,7 +71,7 @@ OC.L10N.register(
     "Descriptive name of this room." : "Nom descriptif de cette salle.",
     "This message is shown to all users in the chat area after they joined." : "Ce message est affiché à tous les utilisateurs de l’espace de discussion après qu’ils l’ont rejoint.",
     "Sets a limit on the number of participants for this room. Zero means there is no limit." : "Fixe une limite au nombre de participants pour cette salle. Zéro signifie qu’il n’y a pas de limite.",
-    "If enabled, the moderator is able to start the recording." : "Si activé, le modérateur peut démarrer l'enregistrement.",
+    "If enabled, the moderator is able to start the recording." : "Si activé, le modérateur peut lancer l'enregistrement.",
     "Explanation of the different concepts that constitute access options :<br>- Public: Anyone who has the link can join.- <br>Internal: Only Nextcloud users can join.- <br>Password: Only guests who have the password can join..- <br>Waiting room: A moderator must accept each guest before they can join.- <br>Restricted : Only selected users and groups can access this room." : "Explication des différents concepts qui constituent les options d’accès :<br>- Public : Toute personne possédant le lien peut rejoindre la conversation.- <br>Interne : Seuls les utilisateurs Nextcloud peuvent rejoindre la conversation.- <br>Mot de passe : Seuls les invités possédant le mot de passe peuvent rejoindre la conversation..- <br>Salle d’attente : Un modérateur doit accepter chaque invité avant qu’il ne puisse rejoindre la conversation.- <br>Restreint : Seuls les utilisateurs et groupes sélectionnés peuvent accéder à cette conversation.",
     "A moderator is able to manage all participants in a meeting including kicking, muting or selecting a presenter. Users with the role moderator are also able to close a meeting or change the default settings." : "Un modérateur est en mesure de gérer tous les participants d'une réunion, incluant leur éjection de la salle, leur mise en sourdine ou la désignation d'un présentateur. Les utilisateurs ayant le rôle de modérateur peuvent également mettre fin à une réunion ou modifier les paramètres par défaut.",
     "If enabled, normal users have to wait until a moderator is in the room." : "Si activé, les utilisateurs devront attendre qu'un modérateur rejoigne la salle.",

l10n/fr.json

@@ -69,7 +69,7 @@
     "Descriptive name of this room." : "Nom descriptif de cette salle.",
     "This message is shown to all users in the chat area after they joined." : "Ce message est affiché à tous les utilisateurs de l’espace de discussion après qu’ils l’ont rejoint.",
     "Sets a limit on the number of participants for this room. Zero means there is no limit." : "Fixe une limite au nombre de participants pour cette salle. Zéro signifie qu’il n’y a pas de limite.",
-    "If enabled, the moderator is able to start the recording." : "Si activé, le modérateur peut démarrer l'enregistrement.",
+    "If enabled, the moderator is able to start the recording." : "Si activé, le modérateur peut lancer l'enregistrement.",
     "Explanation of the different concepts that constitute access options :<br>- Public: Anyone who has the link can join.- <br>Internal: Only Nextcloud users can join.- <br>Password: Only guests who have the password can join..- <br>Waiting room: A moderator must accept each guest before they can join.- <br>Restricted : Only selected users and groups can access this room." : "Explication des différents concepts qui constituent les options d’accès :<br>- Public : Toute personne possédant le lien peut rejoindre la conversation.- <br>Interne : Seuls les utilisateurs Nextcloud peuvent rejoindre la conversation.- <br>Mot de passe : Seuls les invités possédant le mot de passe peuvent rejoindre la conversation..- <br>Salle d’attente : Un modérateur doit accepter chaque invité avant qu’il ne puisse rejoindre la conversation.- <br>Restreint : Seuls les utilisateurs et groupes sélectionnés peuvent accéder à cette conversation.",
     "A moderator is able to manage all participants in a meeting including kicking, muting or selecting a presenter. Users with the role moderator are also able to close a meeting or change the default settings." : "Un modérateur est en mesure de gérer tous les participants d'une réunion, incluant leur éjection de la salle, leur mise en sourdine ou la désignation d'un présentateur. Les utilisateurs ayant le rôle de modérateur peuvent également mettre fin à une réunion ou modifier les paramètres par défaut.",
     "If enabled, normal users have to wait until a moderator is in the room." : "Si activé, les utilisateurs devront attendre qu'un modérateur rejoigne la salle.",

l10n/gl.js

@@ -30,7 +30,7 @@ OC.L10N.register(
     "API URL" : "URL da API",
     "API secret" : "Segredo da API",
     "Save" : "Gardar",
-    "Show room manager in app navigation instead of settings page." : "Amosar o xestor de sala na navegación da aplicación no canto de na páxina de axustes.",
+    "Show room manager in app navigation instead of settings page." : "Amosar o xestor de sala na navegación da aplicación en troques de na páxina de axustes.",
     "Use Nextcloud theme in BigBlueButton." : "Usar o tema Nextcloud en BigBlueButton.",
     "Default Room Settings" : "Axustes predeterminados da sala",
     "Below you can change some default values, which are used to create a new room." : "A continuación pode cambiar algúns valores predeterminados, que se usan para crear unha nova sala.",
@@ -133,8 +133,8 @@ OC.L10N.register(
     "API URL is invalid" : "O URL da API é incorrecto",
     "API secret is invalid" : "O segredo da API é incorrecto",
     "URL has to start with HTTPS" : "O URL ten que comezar con HTTPS",
-    "URL has to contain the {token} placeholder" : "O URL ten que conter o marcador de posición {token}",
+    "URL has to contain the {token} placeholder" : "O URL ten que conter o marcador de substitución {token}",
-    "URL has to start with https:// and contain {token}. Additionally the {user} placeholder can be used." : "O URL ten que comezar con https:// e conter {token}. Ademais pódese usar o marcador de posición de {user}.",
+    "URL has to start with https:// and contain {token}. Additionally the {user} placeholder can be used." : "O URL ten que comezar con https:// e conter {token}. Ademais pódese usar o marcador de substitución de {user}.",
     "The file \"{filename}\" was uploaded to your room." : "O ficheiro «{filename}» foi enviado á súa sala.",
     "The file \"{filename}\" could not be uploaded to your room." : "Non foi posíbel enviar o ficheiro «{filename}» á súa sala.",
     "The file \"{filename}\" could not be uploaded to your room. Maybe your BigBlueButton server does not support this action." : "Non foi posíbel enviar o ficheiro «{filename}» á súa sala. Quizais o seu servidor BigBlueButton non admita esta acción.",

l10n/gl.json

@@ -28,7 +28,7 @@
     "API URL" : "URL da API",
     "API secret" : "Segredo da API",
     "Save" : "Gardar",
-    "Show room manager in app navigation instead of settings page." : "Amosar o xestor de sala na navegación da aplicación no canto de na páxina de axustes.",
+    "Show room manager in app navigation instead of settings page." : "Amosar o xestor de sala na navegación da aplicación en troques de na páxina de axustes.",
     "Use Nextcloud theme in BigBlueButton." : "Usar o tema Nextcloud en BigBlueButton.",
     "Default Room Settings" : "Axustes predeterminados da sala",
     "Below you can change some default values, which are used to create a new room." : "A continuación pode cambiar algúns valores predeterminados, que se usan para crear unha nova sala.",
@@ -131,8 +131,8 @@
     "API URL is invalid" : "O URL da API é incorrecto",
     "API secret is invalid" : "O segredo da API é incorrecto",
     "URL has to start with HTTPS" : "O URL ten que comezar con HTTPS",
-    "URL has to contain the {token} placeholder" : "O URL ten que conter o marcador de posición {token}",
+    "URL has to contain the {token} placeholder" : "O URL ten que conter o marcador de substitución {token}",
-    "URL has to start with https:// and contain {token}. Additionally the {user} placeholder can be used." : "O URL ten que comezar con https:// e conter {token}. Ademais pódese usar o marcador de posición de {user}.",
+    "URL has to start with https:// and contain {token}. Additionally the {user} placeholder can be used." : "O URL ten que comezar con https:// e conter {token}. Ademais pódese usar o marcador de substitución de {user}.",
     "The file \"{filename}\" was uploaded to your room." : "O ficheiro «{filename}» foi enviado á súa sala.",
     "The file \"{filename}\" could not be uploaded to your room." : "Non foi posíbel enviar o ficheiro «{filename}» á súa sala.",
     "The file \"{filename}\" could not be uploaded to your room. Maybe your BigBlueButton server does not support this action." : "Non foi posíbel enviar o ficheiro «{filename}» á súa sala. Quizais o seu servidor BigBlueButton non admita esta acción.",

l10n/lv.js

@@ -9,7 +9,7 @@ OC.L10N.register(
     "Community" : "Kopiena",
     "Please enter your name!" : "Ludzu ieraksties savu vārdu@",
     "The name must be at least 3 characters long." : "Vārdam jābūt vismaz 3 rakstzīmes garam.",
-    "Display name" : "Ekrāna vārds",
+    "Display name" : "Attēlojamais vārds",
     "Password" : "Parole",
     "Join" : "Pievienoties",
     "Hello %s" : "Sveiki, %s",

l10n/lv.json

@@ -7,7 +7,7 @@
     "Community" : "Kopiena",
     "Please enter your name!" : "Ludzu ieraksties savu vārdu@",
     "The name must be at least 3 characters long." : "Vārdam jābūt vismaz 3 rakstzīmes garam.",
-    "Display name" : "Ekrāna vārds",
+    "Display name" : "Attēlojamais vārds",
     "Password" : "Parole",
     "Join" : "Pievienoties",
     "Hello %s" : "Sveiki, %s",

l10n/pt_BR.js

@@ -58,6 +58,7 @@ OC.L10N.register(
     "No matches" : "Sem correspondência",
     "admin" : "admin",
     "moderator" : "moderador",
+    "user" : "usuário",
     "Name" : "Nome",
     "Access" : "Acesso",
     "Max" : "Máx",
@@ -115,7 +116,10 @@ OC.L10N.register(
     "Delete?" : "Excluir?",
     "Could not delete record" : "Não foi possível excluir a gravação",
     "Server error" : "Erro no servidor",
+    "Could not modify publishing state" : "Não foi possível modificar o estado de publicação",
+    "Open room" : "Abrir sala",
     "Start" : "Iniciar",
+    "Clone room" : "Clonar sala",
     "Loading" : "Carregando",
     "You are not allowed to change this option, because this room is shared with you." : "Você não tem permissão para alterar esta opção, porque esta sala é compartilhada com você.",
     "Max. rooms" : "Máximo de salas",

l10n/pt_BR.json

@@ -56,6 +56,7 @@
     "No matches" : "Sem correspondência",
     "admin" : "admin",
     "moderator" : "moderador",
+    "user" : "usuário",
     "Name" : "Nome",
     "Access" : "Acesso",
     "Max" : "Máx",
@@ -113,7 +114,10 @@
     "Delete?" : "Excluir?",
     "Could not delete record" : "Não foi possível excluir a gravação",
     "Server error" : "Erro no servidor",
+    "Could not modify publishing state" : "Não foi possível modificar o estado de publicação",
+    "Open room" : "Abrir sala",
     "Start" : "Iniciar",
+    "Clone room" : "Clonar sala",
     "Loading" : "Carregando",
     "You are not allowed to change this option, because this room is shared with you." : "Você não tem permissão para alterar esta opção, porque esta sala é compartilhada com você.",
     "Max. rooms" : "Máximo de salas",

l10n/ru.js

@@ -58,6 +58,7 @@ OC.L10N.register(
     "No matches" : "Совпадений не найдено",
     "admin" : "администратор",
     "moderator" : "модератор",
+    "user" : "пользователь",
     "Name" : "Название",
     "Access" : "Доступ",
     "Max" : "Макс",
@@ -71,6 +72,7 @@ OC.L10N.register(
     "This message is shown to all users in the chat area after they joined." : "Это сообщение показывается всем пользователям в чате после того, как они присоединились к нему.",
     "Sets a limit on the number of participants for this room. Zero means there is no limit." : "Устанавливает ограничение на количество участников для этой комнаты. Ноль означает отсутствие ограничения.",
     "If enabled, the moderator is able to start the recording." : "Если эта функция включена, модератор сможет начать запись.",
+    "Explanation of the different concepts that constitute access options :<br>- Public: Anyone who has the link can join.- <br>Internal: Only Nextcloud users can join.- <br>Password: Only guests who have the password can join..- <br>Waiting room: A moderator must accept each guest before they can join.- <br>Restricted : Only selected users and groups can access this room." : "Объяснение различных концепций, составляющих параметры доступа:<br> - Публичный: присоединиться может любой, у кого есть ссылка. - <br>Внутренний: присоединиться могут только пользователи Nextcloud. - <br> Пароль: присоединиться могут только гости, у которых есть пароль. - <br> Комната ожидания: модератор должен принять каждого гостя, прежде чем он сможет присоединиться. - <br> Ограниченный: доступ к этой комнате могут получить только выбранные пользователи и группы.",
     "A moderator is able to manage all participants in a meeting including kicking, muting or selecting a presenter. Users with the role moderator are also able to close a meeting or change the default settings." : "Модератор может управлять всеми участниками встречи, включая удаление, отключение звука или выбор ведущего. Пользователи с правами модератора также могут прекращать встречу или изменять настройки по умолчанию.",
     "If enabled, normal users have to wait until a moderator is in the room." : "Если эта функция включена, обычные пользователи должны ожидать модератора, пока он не появится в комнате.",
     "If enabled, a moderator URL is generated which allows access with moderator permission." : "Если включено, генерируется URL-адрес модератора, он позволяет получить доступ с правами модератора.",
@@ -114,7 +116,10 @@ OC.L10N.register(
     "Delete?" : "Удалить?",
     "Could not delete record" : "Не возможно удалить запись.",
     "Server error" : "Ошибка сервера",
+    "Could not modify publishing state" : "Не удалось изменить состояние публикации.",
+    "Open room" : "Открытая комната",
     "Start" : "Начало",
+    "Clone room" : "Клонировать комнату",
     "Loading" : "Загружается",
     "You are not allowed to change this option, because this room is shared with you." : "Вы не можете изменить эту опцию, потому что эта комната находится в совместном пользовании с вами.",
     "Max. rooms" : "Макс. количество комнат",

l10n/ru.json

@@ -56,6 +56,7 @@
     "No matches" : "Совпадений не найдено",
     "admin" : "администратор",
     "moderator" : "модератор",
+    "user" : "пользователь",
     "Name" : "Название",
     "Access" : "Доступ",
     "Max" : "Макс",
@@ -69,6 +70,7 @@
     "This message is shown to all users in the chat area after they joined." : "Это сообщение показывается всем пользователям в чате после того, как они присоединились к нему.",
     "Sets a limit on the number of participants for this room. Zero means there is no limit." : "Устанавливает ограничение на количество участников для этой комнаты. Ноль означает отсутствие ограничения.",
     "If enabled, the moderator is able to start the recording." : "Если эта функция включена, модератор сможет начать запись.",
+    "Explanation of the different concepts that constitute access options :<br>- Public: Anyone who has the link can join.- <br>Internal: Only Nextcloud users can join.- <br>Password: Only guests who have the password can join..- <br>Waiting room: A moderator must accept each guest before they can join.- <br>Restricted : Only selected users and groups can access this room." : "Объяснение различных концепций, составляющих параметры доступа:<br> - Публичный: присоединиться может любой, у кого есть ссылка. - <br>Внутренний: присоединиться могут только пользователи Nextcloud. - <br> Пароль: присоединиться могут только гости, у которых есть пароль. - <br> Комната ожидания: модератор должен принять каждого гостя, прежде чем он сможет присоединиться. - <br> Ограниченный: доступ к этой комнате могут получить только выбранные пользователи и группы.",
     "A moderator is able to manage all participants in a meeting including kicking, muting or selecting a presenter. Users with the role moderator are also able to close a meeting or change the default settings." : "Модератор может управлять всеми участниками встречи, включая удаление, отключение звука или выбор ведущего. Пользователи с правами модератора также могут прекращать встречу или изменять настройки по умолчанию.",
     "If enabled, normal users have to wait until a moderator is in the room." : "Если эта функция включена, обычные пользователи должны ожидать модератора, пока он не появится в комнате.",
     "If enabled, a moderator URL is generated which allows access with moderator permission." : "Если включено, генерируется URL-адрес модератора, он позволяет получить доступ с правами модератора.",
@@ -112,7 +114,10 @@
     "Delete?" : "Удалить?",
     "Could not delete record" : "Не возможно удалить запись.",
     "Server error" : "Ошибка сервера",
+    "Could not modify publishing state" : "Не удалось изменить состояние публикации.",
+    "Open room" : "Открытая комната",
     "Start" : "Начало",
+    "Clone room" : "Клонировать комнату",
     "Loading" : "Загружается",
     "You are not allowed to change this option, because this room is shared with you." : "Вы не можете изменить эту опцию, потому что эта комната находится в совместном пользовании с вами.",
     "Max. rooms" : "Макс. количество комнат",

l10n/sc.js

@@ -65,7 +65,7 @@ OC.L10N.register(
     "Edit" : "Modìfica",
     "Descriptive name of this room." : "Nùmene descritivu de custa istantza.",
     "This message is shown to all users in the chat area after they joined." : "Custu messàgiu si mustrat a totu is utentes in sa tzarrada a pustis chi intrant.",
-    "Sets a limit on the number of participants for this room. Zero means there is no limit." : "Impostat unu lìmite in su mùmeru de partetzipantes in custa istantza. Zero bolet nàrrere ca non ddoe at lìmites.",
+    "Sets a limit on the number of participants for this room. Zero means there is no limit." : "Cunfigurat unu lìmite in su nùmeru de partetzipantes in custa istantza. Zero bolet nàrrere ca non ddoe at lìmites.",
     "If enabled, the moderator is able to start the recording." : "Si est ativadu, chie mòderat at a pòdere cumintzare sa registratzione.",
     "A moderator is able to manage all participants in a meeting including kicking, muting or selecting a presenter. Users with the role moderator are also able to close a meeting or change the default settings." : "Sa persone chi mòderat podet gestire totu is partetzipantes de un'addòbiu, e fintzas bogare, pònnere a sa muda o seletzionare a sa persone chi presentat. Su de moderare permitit puru de serrare un'addòbiu o mudare is cunfiguratziones predefinidas.",
     "If enabled, normal users have to wait until a moderator is in the room." : "Si est ativadu, is utentes normales depent aspetare finas a cando ddoe siat una persone moderadore in s'istantza.",

l10n/sc.json

@@ -63,7 +63,7 @@
     "Edit" : "Modìfica",
     "Descriptive name of this room." : "Nùmene descritivu de custa istantza.",
     "This message is shown to all users in the chat area after they joined." : "Custu messàgiu si mustrat a totu is utentes in sa tzarrada a pustis chi intrant.",
-    "Sets a limit on the number of participants for this room. Zero means there is no limit." : "Impostat unu lìmite in su mùmeru de partetzipantes in custa istantza. Zero bolet nàrrere ca non ddoe at lìmites.",
+    "Sets a limit on the number of participants for this room. Zero means there is no limit." : "Cunfigurat unu lìmite in su nùmeru de partetzipantes in custa istantza. Zero bolet nàrrere ca non ddoe at lìmites.",
     "If enabled, the moderator is able to start the recording." : "Si est ativadu, chie mòderat at a pòdere cumintzare sa registratzione.",
     "A moderator is able to manage all participants in a meeting including kicking, muting or selecting a presenter. Users with the role moderator are also able to close a meeting or change the default settings." : "Sa persone chi mòderat podet gestire totu is partetzipantes de un'addòbiu, e fintzas bogare, pònnere a sa muda o seletzionare a sa persone chi presentat. Su de moderare permitit puru de serrare un'addòbiu o mudare is cunfiguratziones predefinidas.",
     "If enabled, normal users have to wait until a moderator is in the room." : "Si est ativadu, is utentes normales depent aspetare finas a cando ddoe siat una persone moderadore in s'istantza.",

l10n/sr.js

@@ -58,6 +58,7 @@ OC.L10N.register(
     "No matches" : "Нема подударања",
     "admin" : "админ",
     "moderator" : "модератор",
+    "user" : "корисник",
     "Name" : "Име",
     "Access" : "Приступ",
     "Max" : "Максимално",
@@ -115,7 +116,10 @@ OC.L10N.register(
     "Delete?" : "Да обришем?",
     "Could not delete record" : "Снимак није могао да се обрише",
     "Server error" : "Грешка на серверу",
+    "Could not modify publishing state" : "Није могло да се измени стање објаве",
+    "Open room" : "Отвори собу",
     "Start" : "Почетак",
+    "Clone room" : "Клонирај собу",
     "Loading" : "Учитавам",
     "You are not allowed to change this option, because this room is shared with you." : "Није вам дозвољено да измените ову опцију јер се ова соба дели са вама.",
     "Max. rooms" : "Макс. бр. соба",

l10n/sr.json

@@ -56,6 +56,7 @@
     "No matches" : "Нема подударања",
     "admin" : "админ",
     "moderator" : "модератор",
+    "user" : "корисник",
     "Name" : "Име",
     "Access" : "Приступ",
     "Max" : "Максимално",
@@ -113,7 +114,10 @@
     "Delete?" : "Да обришем?",
     "Could not delete record" : "Снимак није могао да се обрише",
     "Server error" : "Грешка на серверу",
+    "Could not modify publishing state" : "Није могло да се измени стање објаве",
+    "Open room" : "Отвори собу",
     "Start" : "Почетак",
+    "Clone room" : "Клонирај собу",
     "Loading" : "Учитавам",
     "You are not allowed to change this option, because this room is shared with you." : "Није вам дозвољено да измените ову опцију јер се ова соба дели са вама.",
     "Max. rooms" : "Макс. бр. соба",

lib/BigBlueButton/API.php

@@ -131,11 +131,13 @@ class API {
 		}
 
 		if ($uid) {
-			$avatarUrl = $this->avatarRepository->getAvatarUrl($room, $uid);
-
 			$joinMeetingParams->setUserID($uid);
+
+			if ($this->config->getAppValue('bbb', 'avatar.enabled', 'true') === 'true') {
+				$avatarUrl = $this->avatarRepository->getAvatarUrl($room, $uid);
 				$joinMeetingParams->setAvatarURL($avatarUrl);
 			}
+		}
 
 		return $this->getServer()->getJoinMeetingURL($joinMeetingParams);
 	}

lib/Controller/HookController.php

@@ -7,6 +7,7 @@ use OCA\BigBlueButton\Db\Room;
 use OCA\BigBlueButton\Event\MeetingEndedEvent;
 use OCA\BigBlueButton\Event\RecordingReadyEvent;
 use OCA\BigBlueButton\Service\RoomService;
+use OCP\IConfig;
 use OCP\AppFramework\Controller;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\IRequest;
@@ -27,18 +28,23 @@ class HookController extends Controller {
 	/** @var IEventDispatcher */
 	private $eventDispatcher;
 
+	/** @var IConfig */
+	private $config;
+
 	public function __construct(
 		string $appName,
 		IRequest $request,
 		RoomService $service,
 		AvatarRepository $avatarRepository,
-		IEventDispatcher $eventDispatcher
+		IEventDispatcher $eventDispatcher,
+		IConfig $config
 	) {
 		parent::__construct($appName, $request);
 
 		$this->service = $service;
 		$this->avatarRepository = $avatarRepository;
 		$this->eventDispatcher = $eventDispatcher;
+		$this->config = $config;
 	}
 
 	public function setToken(string $token): void {
@@ -65,7 +71,9 @@ class HookController extends Controller {
 
 		$this->service->updateRunning($room->getId(), false);
 
+		if ($this->config->getAppValue('bbb', 'avatar.enabled', 'true') === 'true') {
 			$this->avatarRepository->clearRoom($room->uid);
+		}		
 
 		$this->eventDispatcher->dispatch(MeetingEndedEvent::class, new MeetingEndedEvent($room, $recordingmarks));
 	}

lib/Settings/Admin.php

@@ -30,6 +30,7 @@ class Admin implements ISettings {
 			'join.theme' => $this->config->getAppValue('bbb', 'join.theme') === 'true' ? 'checked' : '',
 			'app.shortener' => $this->config->getAppValue('bbb', 'app.shortener'),
 			'join.mediaCheck' => $this->config->getAppValue('bbb', 'join.mediaCheck', 'true') === 'true' ? 'checked' : '',
+			'avatar.enabled' => $this->config->getAppValue('bbb', 'avatar.enabled', 'true') === 'true' ? 'checked' : '',
 		];
 
 		return new TemplateResponse('bbb', 'admin', $parameters);

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@sualko/cloud_bbb",
 	"description": "Nextcloud Integration for BigBlueButton",
-	"version": "2.6.0",
+	"version": "2.7.2",
 	"author": "Klaus Herberth <klaus@jsxc.org>",
 	"bugs": {
 		"url": "https://github.com/sualko/cloud_bbb/issues"

scripts/build-release.js

@@ -70,17 +70,19 @@ async function createRelease(appId) {
 
 	const execa = (await import('execa')).execaCommand;
 
-	await execa('yarn', ['composer:install:dev']);
+	const composerDev = await execa('composer install');
+	console.log(composerDev.stdout, composerDev.stderr);
 	console.log('✔ composer dev dependencies installed'.green);
 
-	await execa('yarn', ['lint']);
+	await execa('yarn lint');
 	console.log('✔ linters are happy'.green);
 
-	await execa('yarn', ['composer:install']);
+	const composerNoDev = await execa('composer install --no-dev');
+	console.log(composerNoDev.stdout, composerNoDev.stderr);
 	console.log('✔ composer dependencies installed'.green);
 
-	await execa('yarn', ['build']);
+	await execa('yarn build');
-	console.log('✔ scripts built'.green);
+	console.log('✔ webpack done'.green);
 
 	await updateChangelog();
 
@@ -89,7 +91,7 @@ async function createRelease(appId) {
 	await createGPGSignature(filePath);
 	await createGPGArmorSignature(filePath);
 
-	await execa('yarn', ['composer:install:dev']);
+	await execa('composer install');
 	console.log('✔ composer dev dependencies installed'.green);
 }
 

scripts/imports/changelog.js

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
 const fs = require('fs');
 const path = require('path');
-const simpleGit = require('simple-git/promise');
+const simpleGit = require('simple-git');
 const inquirer = require('inquirer');
 
 const git = simpleGit();

scripts/publish-release.js

@@ -250,7 +250,7 @@ async function run() {
 	await pull();
 	console.log('✔ pulled latest changes'.green);
 
-	await execa('yarn', ['composer:install:dev']);
+	await execa('yarn composer:install:dev');
 	console.log('✔ composer dev dependencies installed'.green);
 
 	await notAlreadyTagged();

templates/admin.php

@@ -29,6 +29,11 @@ script('bbb', 'restrictions');
             <label for="bbb-join-theme"><?php p($l->t('Use Nextcloud theme in BigBlueButton.')); ?></label>
         </p>
 
+        <p>
+            <input type="checkbox" name="avatar.enabled" id="bbb-avatar-enabled" class="checkbox bbb-setting" value="1" <?php p($_['avatar.enabled']); ?> />
+            <label for="bbb-avatar-enabled"><?php p($l->t('Use Nextcloud avatars in BBB rooms.')); ?></label>
+        </p>
+
         <h3><?php p($l->t('Default Room Settings')); ?></h3>
         <p><?php p($l->t('Below you can change some default values, which are used to create a new room.')); ?></p>
 

yarn.lock

@@ -2420,9 +2420,9 @@ camelcase@^5.3.1:
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
 caniuse-lite@^1.0.30001317:
-  version "1.0.30001425"
+  version "1.0.30001667"
-  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001425.tgz"
+  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001667.tgz"
-  integrity sha512-/pzFv0OmNG6W0ym80P3NtapU0QEiDS3VuYAZMGoLLqiC7f6FJFe1MjpQDREGApeenD9wloeytmVDj+JLXPC6qw==
+  integrity sha512-7LTwJjcRkzKFmtqGsibMeuXmvFDfZq/nzIjnmgCGzKKRVzjD72selLDK1oPF/Oxzmt4fNcPvTDvGqSDG4tCALw==
 
 caseless@~0.12.0:
   version "0.12.0"