Skip to content
Draft
Show file tree
Hide file tree
Changes from all 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
4 changes: 4 additions & 0 deletions app/Http/Resources/Room.php
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,10 @@ public function getLastMeeting($latestMeeting)
'usage' => $this->when($latestMeeting->end == null, [
'participant_count' => $this->participant_count,
]),
'dial_in' => $this->when($latestMeeting->end == null && ! in_array($latestMeeting->dial_number, config('bigbluebutton.invalid_dial_numbers')), [
'number' => $latestMeeting->dial_number,
'pin' => $latestMeeting->voice_bridge,
]),
'server_connection_issues' => $latestMeeting->end == null && $latestMeeting->server->error_count > 0,
];
}
Expand Down
7 changes: 6 additions & 1 deletion app/Services/RoomService.php
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,10 @@ public function start(bool $agreedToAttendance = false, bool $agreedToRecord = f
$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 @@ -99,6 +102,8 @@ public function start(bool $agreedToAttendance = false, bool $agreedToRecord = f
// 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');
$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 @@ -16,7 +16,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,30 @@
<?php

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');
});
}
};
8 changes: 8 additions & 0 deletions lang/en/rooms.php
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,14 @@
'enabled' => 'You will be notified by your browser when the room starts. Do not close this window/tab.',
],
'only_used_by_authenticated_users' => 'This room can only be used by authenticated users.',
'phone' => [
'join_by_phone' => 'Join by phone',
'title' => 'Phone number and PIN',
'number' => 'Phone number',
'pin' => 'PIN',
'qrcode' => 'QR-Code',
'call' => 'Call',
],
'placeholder_name' => 'John Doe',
'recording_accept' => 'I consent to the recording.',
'recording_attendance_accept' => 'I consent to the attendance logging.',
Expand Down
118 changes: 100 additions & 18 deletions package-lock.json

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

2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
"@vitejs/plugin-vue": "^5.2.1",
"@vueuse/components": "^12.5.0",
"@vueuse/core": "^12.5.0",
"@vueuse/integrations": "^12.5.0",
"autoprefixer": "^10.4.20",
"axe-core": "^4.10.2",
"axios": "^1.7.9",
Expand All @@ -73,6 +74,7 @@
"postcss": "^8.5.1",
"primeicons": "^7.0.0",
"primevue": "^4.2.5",
"qrcode": "^1.5.4",
"sass": "^1.83.4",
"tailwindcss": "^3.4.17",
"tailwindcss-primeui": "^0.4.0",
Expand Down
Loading
Loading