Merge branch 'master' into fix/add-new-hide-presentation-flag

.github/contributing.md

@@ -28,12 +28,13 @@ feature request and follow the guidelines below:
 Every code contribution is considered valuable, independent from there size and
 small changes can also be contributed directly via Github:
 
-1. Browse to the desired file via
-   [Github](https://github.com/sualko/cloud_bbb/).
+1. Browse to the desired file via [Github].
 2. Click on the :pencil2: on the top right corner of the file.
 3. Make your changes.
 4. Add a meaning full commit message, prefixed with either `fix:` or `feat:`
-   (e.g. `fix: room recordings`).
+   (e.g. `fix: room recordings`).<br/>
+*type must be one of 'l10n', 'release', 'build', 'ci', 'chore', 'docs', 'feat'
+, 'fix', 'perf', 'refactor', 'revert', 'style', 'test', 'example'*
 5. Submit your changes.
 
 If you want to contribute larger changes, we recommend the following approach
@@ -62,8 +63,7 @@ If you like to sponsor a specific feature, bug fix or the project in general you
 can also contact any maintainer of this application to support open source
 development.
 
-[![ko-fi](https://www.ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/sualko)
-
-[open a new issue]: https://github.com/sualko/cloud_bbb/issues
+[Github]: https://github.com/littleredbutton/cloud_bbb/
+[open a new issue]: https://github.com/littleredbutton/cloud_bbb/issues
 [Conventional Commits]: https://www.conventionalcommits.org
-[Nextclouds Transifex]: https://www.transifex.com/nextcloud/nextcloud/
+[Nextclouds Transifex]: https://app.transifex.com/nextcloud/nextcloud/bbb/

.github/workflows/lint.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-versions: [7.4, 8.0, 8.1]
+        php-versions: [8.0, 8.1, 8.2]
     name: php${{ matrix.php-versions }} lint
     steps:
     - name: Checkout

.github/workflows/php-test.yml

@@ -11,13 +11,11 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-versions: ['7.4', '8']
-        nextcloud-versions: ['stable25', 'stable26', 'stable27']
+        php-versions: ['8.0', '8.1', '8.2']
+        nextcloud-versions: ['stable26', 'stable27', 'stable28', 'stable29', 'stable30']
         exclude:
-          - php-versions: '7.4'
-            nextcloud-versions: 'stable26'
-          - php-versions: '7.4'
-            nextcloud-versions: 'stable27'
+          - php-versions: '8.0'
+            nextcloud-versions: 'stable30'
     name: php${{ matrix.php-versions }} on ${{ matrix.nextcloud-versions }} unit tests
     env:
       CI: true
@@ -47,4 +45,4 @@ jobs:
       run: php -f nextcloud/occ app:enable bbb
     - name: Run tests
       working-directory: nextcloud/apps/bbb
-      run: composer run test
+      run: composer run test

.github/workflows/static.yml

@@ -6,7 +6,11 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
         matrix:
-            ocp-version: [ 'dev-stable27', 'dev-stable26', 'dev-stable25' ]
+            ocp-version: [ "^30", "^29", '^28', '^27', '^26']
+            include:
+              - psrcontainer: "psr/container"
+              - psrcontainer: "psr/container:^1.1.2"
+                ocp-version: '^26'
     name: Nextcloud ${{ matrix.ocp-version }}
     steps:
         - name: Checkout
@@ -21,7 +25,7 @@ jobs:
         - name: Install dependencies
           run: composer i
         - name: Install dependencies
-          run: composer require --dev nextcloud/ocp:${{ matrix.ocp-version }} psr/container symfony/service-contracts
+          run: composer require --dev nextcloud/ocp:${{ matrix.ocp-version }} ${{ matrix.psrcontainer }} symfony/service-contracts
         - name: Run coding standards check
           run: composer run psalm
 

CHANGELOG.md

@@ -6,6 +6,66 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## 2.7.3 (2024-12-03)
+### Added
+
+- missing icon and adapt dialog style to NC30 by @smarinier in [#304](https://github.com/littleredbutton/cloud_bbb/pull/304)
+
+### Changed
+
+- readme, screenshots and project files. by @smarinier in [#300](https://github.com/littleredbutton/cloud_bbb/pull/300)
+- remove NC25 support by @smarinier in [#302](https://github.com/littleredbutton/cloud_bbb/pull/302)
+
+### Fix
+
+- max number of rooms shloud take only owned rooms in account by @smarinier in [#296](https://github.com/littleredbutton/cloud_bbb/pull/296)
+- admin interface displays groups gid instead of displayname by @smarinier in [#295](https://github.com/littleredbutton/cloud_bbb/pull/295)
+- style lint warnings and typescript compiler need upgrade by @smarinier in [#294](https://github.com/littleredbutton/cloud_bbb/pull/294)
+
+### Misc
+
+- psalm github actions by @smarinier in [#298](https://github.com/littleredbutton/cloud_bbb/pull/298)
+- update php versions for tests in github actions by @smarinier in [#297](https://github.com/littleredbutton/cloud_bbb/pull/297)
+- expose app capabilities by @smarinier in [#293](https://github.com/littleredbutton/cloud_bbb/pull/293)
+- make clean-dev and release:build by @smarinier in [#303](https://github.com/littleredbutton/cloud_bbb/pull/303)
+- psalm bump 5.0 by @smarinier in [#301](https://github.com/littleredbutton/cloud_bbb/pull/301)
+- Release/2.7.3 by @smarinier in [#307](https://github.com/littleredbutton/cloud_bbb/pull/307)
+
+## 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

CODE_OF_CONDUCT.md

@@ -55,7 +55,7 @@ further defined and clarified by project maintainers.
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at [email protected]. All
+reported by contacting the project team at [email protected] or web form [contact]. All
 complaints will be reviewed and investigated and will result in a response that
 is deemed necessary and appropriate to the circumstances. The project team is
 obligated to maintain confidentiality with regard to the reporter of an incident.
@@ -71,6 +71,7 @@ This Code of Conduct is adapted from the [Contributor Covenant][homepage], versi
 available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
 
 [homepage]: https://www.contributor-covenant.org
+[contact]: https://www.arawa.fr/contact/
 
 For answers to common questions about this code of conduct, see
-https://www.contributor-covenant.org/faq
+https://www.contributor-covenant.org/faq

Makefile

@@ -62,8 +62,11 @@ clean:
 
 clean-dev:
 	rm -rf node_modules
+	git checkout composer.json
+	git checkout composer.lock
+	rm -rf vendor
 
-pack:
+pack: install-composer-deps
 	mkdir -p archive
 	tar --exclude='./Makefile' --exclude='./webpack*' --exclude='./.*' --exclude='./ts' --exclude='./tests' --exclude='./node_modules' --exclude='./archive' -zcvf ./archive/cloud_bbb.tar.gz . --transform s/^./bbb/
 

README.md

@@ -1,20 +1,18 @@
 # BigBlueButton™ integration for Nextcloud
 
-![Static analysis](https://github.com/sualko/cloud_bbb/workflows/Static%20analysis/badge.svg)
-![PHP Tests](https://github.com/sualko/cloud_bbb/workflows/PHP%20Tests/badge.svg)
-![Lint](https://github.com/sualko/cloud_bbb/workflows/Lint/badge.svg)
-![Downloads](https://img.shields.io/github/downloads/sualko/cloud_bbb/total.svg)
-![GitHub release](https://img.shields.io/github/release/sualko/cloud_bbb.svg)
-
-[![ko-fi](https://www.ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/sualko)
+![Static analysis](https://github.com/littleredbutton/cloud_bbb/workflows/Static%20analysis/badge.svg)
+![PHP Tests](https://github.com/littleredbutton/cloud_bbb/workflows/PHP%20Tests/badge.svg)
+![Lint](https://github.com/littleredbutton/cloud_bbb/workflows/Lint/badge.svg)
+![Downloads](https://img.shields.io/github/downloads/littleredbutton/cloud_bbb/total.svg)
+![GitHub release](https://img.shields.io/github/release/littleredbutton/cloud_bbb.svg)
 
 This app allows to create meetings with an external installation of [BigBlueButton](https://bigbluebutton.org).
 
-:clap: Developer wanted! If you have time it would be awesome if you could help to enhance this application.
+:clap: Contributors are welcome! If you have time it would be awesome if you could help to enhance this application.
 
 __This app uses BigBlueButton and is not endorsed or certified by BigBlueButton Inc. BigBlueButton and the BigBlueButton Logo are trademarks of BigBlueButton Inc.__
 
-![Screenshot configuration](https://github.com/sualko/cloud_bbb/raw/master/docs/screenshot-configuration.png)
+![Screenshot configuration](https://github.com/littleredbutton/cloud_bbb/raw/master/docs/screenshot-configuration.png)
 
 ## :heart_eyes: Features
 This integration provides the following features:
@@ -37,7 +35,7 @@ To install it change into your Nextcloud's apps directory:
 
 Then run:
 
-    git clone https://github.com/sualko/cloud_bbb.git bbb
+    git clone https://github.com/littleredbutton/cloud_bbb.git bbb
 
 Then install the dependencies using:
 
@@ -61,7 +59,7 @@ $ sudo bbb-conf --secret
 Enter these values in the additional settings section on the admin
 configuration page of your Nextcloud instance.
 
-![Screenshot admin section](https://github.com/sualko/cloud_bbb/raw/master/docs/screenshot-admin.png)
+![Screenshot admin section](https://github.com/littleredbutton/cloud_bbb/raw/master/docs/screenshot-admin.png)
 
 ### Manual configuration (for experts)
 If you prefer not to use the web interface for configuration, you will find all
@@ -123,14 +121,11 @@ command (example use: `./occ bbb:clear-avatar-cache`).
 Go to the BigBlueButton section inside your personal settings page and enter a
 room name. That's it. You can now distribute the room url.
 
-### Enter a room from files
-Use the ... menu and select the desired BBB configuration to enter the room.
-Beware that if the room is already running the presentation will **not** be
-updated. Entering a room with a defined presentation works only if link shares
-are enabled and do not require authentication. See [#1](https://github.com/sualko/cloud_bbb/issues/1)
-for details.
+### Share a room
+Edit your room configuration and select groups or users you wish to share your room with. You can define the access level for your shared room (admin, moderator or simple user).
+
 
-![Screenshot file browser](https://github.com/sualko/cloud_bbb/raw/master/docs/screenshot-file-browser.png)
+![Screenshot sharing room](https://github.com/littleredbutton/cloud_bbb/raw/master/docs/screenshot-config-share.png)
 
 ## :notebook: Notes
 - By using the [Link Editor](https://apps.nextcloud.com/apps/files_linkeditor)
@@ -140,7 +135,7 @@ for details.
 - Before installing, make sure your BBB is running correctly
 - If the room doesn't appear in the ... menu of files, a browser/cache reload
   might help
-- To share an audio (mp3) or video (mp4) file with your audience follow these steps (more info in [#148](https://github.com/sualko/cloud_bbb/issues/148#issuecomment-827338650)):
+- To share an audio (mp3) or video (mp4) file with your audience follow these steps (more info in [#148](https://github.com/littleredbutton/cloud_bbb/issues/148#issuecomment-827338650)):
   - create a public share of the exact file
   - copy the location of the share from the share information screen into your clipboard
   - open big blue button, press the plus icon in the lower left corner
@@ -152,22 +147,23 @@ for details.
 Writing such an application is a lot of work and therefore we are specially
 thankful for people and organisations who are sponsoring features or bug fixes:
 
+- [Arawa](https://arawa.fr/) Share moderators and users ([#281]), Bug fixes, UX audit
 - [Medienwerkstatt Minden-Lübbecke e.V.](https://www.medienwerkstatt.org) manage recordings ([#19])
 - [Deutscher Bundesjugendring](https://www.dbjr.de) version [0.4.0], version [0.5.0]
 - [Graz University of Technology](https://www.tugraz.at) form action ([#47]), navigation entry ([#31]), restrictions ([#43], [#53]), circles ([#61])
-- [Arawa](https://www.arawa.fr) UX audit
-- [Niedersächsisches Landesinstitut für schulische Qualitätsentwicklung – Netzwerk Medienberatung](https://nlq.niedersachsen.de/) moderator url, UX improvements
+- [Niedersächsisches Landesinstitut für schulische Qualitätsentwicklung - Netzwerk Medienberatung](https://nlq.niedersachsen.de/) moderator url, UX improvements
 - [Integrierte Gesamtschule Lengede](http://www.igs-lengede.de/) theme, join options
 
 If you are looking for other ways to contribute to this project, you are welcome
 to look at our [contributor guidelines]. Every contribution is valuable :tada:.
 
-[contributor guidelines]: https://github.com/sualko/cloud_bbb/blob/master/.github/contributing.md
-[#19]: https://github.com/sualko/cloud_bbb/issues/19
-[#47]: https://github.com/sualko/cloud_bbb/issues/47
-[#31]: https://github.com/sualko/cloud_bbb/issues/31
-[#43]: https://github.com/sualko/cloud_bbb/issues/43
-[#53]: https://github.com/sualko/cloud_bbb/issues/53
-[#61]: https://github.com/sualko/cloud_bbb/issues/61
-[0.4.0]: https://github.com/sualko/cloud_bbb/releases/tag/v0.4.0
-[0.5.0]: https://github.com/sualko/cloud_bbb/releases/tag/v0.5.0
+[contributor guidelines]: https://github.com/littleredbutton/cloud_bbb/blob/master/.github/contributing.md
+[#19]: https://github.com/littleredbutton/cloud_bbb/issues/19
+[#47]: https://github.com/littleredbutton/cloud_bbb/issues/47
+[#31]: https://github.com/littleredbutton/cloud_bbb/issues/31
+[#43]: https://github.com/littleredbutton/cloud_bbb/issues/43
+[#53]: https://github.com/littleredbutton/cloud_bbb/issues/53
+[#61]: https://github.com/littleredbutton/cloud_bbb/issues/61
+[#281]: https://github.com/littleredbutton/cloud_bbb/pull/281
+[0.4.0]: https://github.com/littleredbutton/cloud_bbb/releases/tag/v0.4.0
+[0.5.0]: https://github.com/littleredbutton/cloud_bbb/releases/tag/v0.5.0

appinfo/info.xml

@@ -14,36 +14,37 @@
 * **Restrictions** Restrict room creation to certain groups
 * **Activities** Get an overview of your room activities
 
-Quick start guide and further information in our [readme](https://github.com/sualko/cloud_bbb).
+Quick start guide and further information in our [readme](https://github.com/littleredbutton/cloud_bbb).
 Do you like this application? Give something back to the open source community and checkout our
-[ways to contribute](https://github.com/sualko/cloud_bbb/blob/master/.github/contributing.md).
+[ways to contribute](https://github.com/littleredbutton/cloud_bbb/blob/master/.github/contributing.md).
 
-Developer wanted! If you have time it would be awesome if you could help to enhance this application.
+Contributors are welcome! If you have time it would be awesome if you could help to enhance this application.
 
 *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.3</version>
     <licence>agpl</licence>
-    <author mail="[email protected]">Klaus Herberth</author>
+    <author mail="[email protected]" homepage="https://arawa.fr/">Arawa</author>
+    <author>Klaus Herberth</author>
     <namespace>BigBlueButton</namespace>
     <types>
         <prevent_group_restriction/>
     </types>
     <category>social</category>
     <category>multimedia</category>
     <category>integration</category>
-    <website>https://github.com/sualko/cloud_bbb/</website>
-    <bugs>https://github.com/sualko/cloud_bbb/issues</bugs>
-    <repository>https://github.com/sualko/cloud_bbb/</repository>
-    <screenshot>https://raw.githubusercontent.com/sualko/cloud_bbb/master/docs/screenshot-file-browser.png</screenshot>
-    <screenshot>https://raw.githubusercontent.com/sualko/cloud_bbb/master/docs/screenshot-configuration.png</screenshot>
-    <screenshot>https://raw.githubusercontent.com/sualko/cloud_bbb/master/docs/screenshot-configuration2.png</screenshot>
-    <screenshot>https://raw.githubusercontent.com/sualko/cloud_bbb/master/docs/screenshot-join.png</screenshot>
+    <website>https://github.com/littleredbutton/cloud_bbb/</website>
+    <bugs>https://github.com/littleredbutton/cloud_bbb/issues</bugs>
+    <repository>https://github.com/littleredbutton/cloud_bbb/</repository>
+    <screenshot>https://raw.githubusercontent.com/littleredbutton/cloud_bbb/master/docs/screenshot-configuration.png</screenshot>
+    <screenshot>https://raw.githubusercontent.com/littleredbutton/cloud_bbb/master/docs/screenshot-configuration2.png</screenshot>
+    <screenshot>https://raw.githubusercontent.com/littleredbutton/cloud_bbb/master/docs/screenshot-join.png</screenshot>
+    <screenshot>https://raw.githubusercontent.com/littleredbutton/cloud_bbb/master/docs/screenshot-config-share.png</screenshot>
     <dependencies>
         <lib>curl</lib>
         <lib>mbstring</lib>
         <lib>SimpleXML</lib>
-        <nextcloud min-version="25" max-version="28"/>
+        <nextcloud min-version="26" max-version="30"/>
     </dependencies>
     <commands>
         <command>OCA\BigBlueButton\Command\ClearAvatarCache</command>

appinfo/routes.php

@@ -14,6 +14,7 @@
 		['name' => 'server#check', 'url' => '/server/check', 'verb' => 'POST'],
 		['name' => 'server#version', 'url' => '/server/version', 'verb' => 'GET'],
 		['name' => 'server#delete_record', 'url' => '/server/record/{recordId}', 'verb' => 'DELETE'],
+		['name' => 'server#publish_record', 'url' => '/server/record/{recordId}/publish', 'verb' => 'POST'],
 		['name' => 'join#index', 'url' => '/b/{token}/{moderatorToken}', 'verb' => 'GET', 'defaults' => ['moderatorToken' => '']],
 		['name' => 'restriction#user', 'url' => '/restrictions/user', 'verb' => 'GET'],
 		['name' => 'hook#meetingEnded', 'url' => '/hook/ended/{token}/{mac}', 'verb' => 'GET'],

composer.json

@@ -1,12 +1,11 @@
 {
-    "name": "sualko/bigbluebutton",
+    "name": "littleredbutton/bigbluebutton",
     "description": "Nextcloud Integration for BigBlueButton",
     "type": "project",
     "license": "AGPL",
     "authors": [
         {
-            "name": "Klaus Herberth",
-            "email": "[email protected]"
+            "name": "Klaus Herberth"
         }
     ],
     "require": {
@@ -18,7 +17,8 @@
         "nextcloud/coding-standard": "^1.0.0",
         "phpstan/phpstan": "^0.12.29",
         "nextcloud/ocp": "^25.0 || ^26.0 || ^27.0",
-        "vimeo/psalm": "^4.5"
+        "vimeo/psalm": "^5.0",
+        "psr/container": "^1.1.2 || ^2.0.2"
     },
     "config": {
         "optimize-autoloader": true,