Skip to content
Open
Show file tree
Hide file tree
Changes from 9 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Environment variable `VERSION` to change the displayed version in the footer ([#3300], [#3302])
- System-wide default welcome message ([#3301])
- Popover to show dial-in number and pin during a running meeting ([#1143], [#1810])

### Fixed

Expand Down Expand Up @@ -661,6 +662,7 @@ You can find the changelog for older versions there [here](https://github.com/TH
[#1120]: https://github.com/THM-Health/PILOS/pull/1120
[#1126]: https://github.com/THM-Health/PILOS/pull/1126
[#1133]: https://github.com/THM-Health/PILOS/pull/1133
[#1143]: https://github.com/THM-Health/PILOS/issues/1143
[#1150]: https://github.com/THM-Health/PILOS/issues/1150
[#1159]: https://github.com/THM-Health/PILOS/pull/1159
[#1166]: https://github.com/THM-Health/PILOS/pull/1166
Expand Down Expand Up @@ -731,6 +733,7 @@ You can find the changelog for older versions there [here](https://github.com/TH
[#1795]: https://github.com/THM-Health/PILOS/pull/1795
[#1801]: https://github.com/THM-Health/PILOS/pull/1801
[#1802]: https://github.com/THM-Health/PILOS/pull/1802
[#1810]: https://github.com/THM-Health/PILOS/pull/1810
[#1811]: https://github.com/THM-Health/PILOS/pull/1811
[#1824]: https://github.com/THM-Health/PILOS/issues/1824
[#1825]: https://github.com/THM-Health/PILOS/pull/1825
Expand Down
4 changes: 4 additions & 0 deletions app/Http/Resources/LastMeetingResource.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ public function toArray($request)
'usage' => $this->when($this->end == null, [
'participant_count' => $this->room->participant_count,
]),
'dial_in' => $this->when($this->end == null, [
'number' => $this->dial_number,
'pin' => $this->voice_bridge,
]),
'server_connection_issues' => $this->end == null && $this->server->error_count > 0,
];
}
Expand Down
12 changes: 11 additions & 1 deletion app/Services/RoomService.php
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,10 @@ public function start(): MeetingService
$meetingService = new MeetingService($meeting);

Log::info('Starting new meeting for room {room} on server {server}', ['room' => $this->room->getLogLabel(), 'server' => $server->getLogLabel()]);
if (! $meetingService->start()) {

$createMeetingResponse = $meetingService->start();

if (! $createMeetingResponse) {
// Creating Meeting failed, remove meeting
$meeting->forceDelete();

Expand All @@ -103,6 +106,13 @@ public function start(): MeetingService
// but the api call has not been completed yet therefore the meeting will not be found on the server
// and the server poller will mark the meeting as ended immediately
$meeting->start = date('Y-m-d H:i:s');

// Store dial-in number and voice-bridge (pin) if valid
if (! in_array($createMeetingResponse->getDialNumber(), config('bigbluebutton.invalid_dial_numbers'))) {
$meeting->dial_number = $createMeetingResponse->getDialNumber();
$meeting->voice_bridge = $createMeetingResponse->getVoiceBridge();
}

$meeting->save();

// Change latest meeting or the room to newly created meeting
Expand Down
2 changes: 1 addition & 1 deletion config/bigbluebutton.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
'room_refresh_rate' => (int) env('ROOM_REFRESH_RATE', 30),
'server_online_threshold' => (int) env('BBB_SERVER_ONLINE_THRESHOLD', 3),
'server_offline_threshold' => (int) env('BBB_SERVER_OFFLINE_THRESHOLD', 3),

'invalid_dial_numbers' => explode(',', env('BBB_INVALID_DIAL_NUMBERS', '0,613-555-1212,613-555-1234,0000')),
'load_new_meeting_min_user_count' => (int) env('BBB_LOAD_MIN_USER_COUNT', 15),
'load_new_meeting_min_user_interval' => (int) env('BBB_LOAD_MIN_USER_INTERVAL', 15),

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?php

declare(strict_types=1);

use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

return new class extends Migration
{
/**
* Run the migrations.
*/
public function up(): void
{
Schema::table('meetings', function (Blueprint $table) {
$table->string('dial_number')->nullable();
$table->integer('voice_bridge')->nullable();
});
}

/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::table('meetings', function (Blueprint $table) {
$table->dropColumn('dial_number');
$table->dropColumn('voice_bridge');
});
}
};
10 changes: 10 additions & 0 deletions lang/en/rooms.php
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,16 @@
'room_link_copied' => 'The personalized room link for :firstname :lastname was copied to your clipboard.',
'title' => 'Personalized room links',
],
'phone' => [
'call' => 'Call',
'join_by_phone' => 'Join by phone',
'note' => 'This phone number and pin is only valid for the duration of the meeting',
'number' => 'Phone number',
'pin' => 'Pin',
'qrcode' => 'QR-Code',
'scan_qr_code' => 'Scan this QR code with your smartphone to join the meeting by phone',
'title' => 'Phone number and Pin',
],
'placeholder_name' => 'John Doe',
'recording_accept' => 'I consent to the recording.',
'recording_attendance_accept' => 'I consent to the attendance logging.',
Expand Down
59 changes: 33 additions & 26 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@
"primeicons": "^7.0.0",
"primelocale": "^2.4.0",
"primevue": "^4.5.5",
"qrcode": "^1.5.4",
"tailwindcss": "^4.1.14",
"tailwindcss-primeui": "^0.6.1",
"ua-parser-js": "^1.0.41",
Expand Down
Loading
Loading