Page MenuHomePhorge
Files F117758622

D2341.1775209945.diff
No OneTemporary
Actions

Authored By
Unknown
Size
12 KB
Referenced Files
None
Subscribers
None

D2341.1775209945.diff
View Options

diff --git a/src/app/Http/Controllers/API/V4/OpenViduController.php b/src/app/Http/Controllers/API/V4/OpenViduController.php
--- a/src/app/Http/Controllers/API/V4/OpenViduController.php
+++ b/src/app/Http/Controllers/API/V4/OpenViduController.php
@@ -309,7 +309,7 @@
// Initialize connection tokens
if ($init) {
// Choose the connection role
- $canPublish = empty($config['nomedia']) && !empty(request()->input('canPublish'));
+ $canPublish = !empty(request()->input('canPublish')) && (empty($config['nomedia']) || $isOwner);
$role = $canPublish ? Room::ROLE_PUBLISHER : Room::ROLE_SUBSCRIBER;
if ($isOwner) {
$role |= Room::ROLE_MODERATOR;
diff --git a/src/resources/js/meet/app.js b/src/resources/js/meet/app.js
--- a/src/resources/js/meet/app.js
+++ b/src/resources/js/meet/app.js
@@ -37,8 +37,6 @@
let microphones = [] // List of user audio devices
let connections = {} // Connected users in the session
- let containerWidth
- let containerHeight
let chatCount = 0
let volumeElement
let publishersContainer
@@ -121,8 +119,16 @@
// avatar: undefined // avatar image
}
- // TODO: Make sure all supported callbacks exist, so we don't have to check
- // their existence everywhere anymore
+ // Make sure all supported callbacks exist, so we don't have to check
+ // their existence everywhere anymore
+ let events = ['Success', 'Error', 'Destroy', 'Dismiss', 'JoinRequest', 'ConnectionChange',
+ 'SessionDataUpdate', 'MediaSetup']
+
+ events.map(event => 'on' + event).forEach(event => {
+ if (!data[event]) {
+ data[event] = () => {}
+ }
+ })
sessionData = data
@@ -228,10 +234,7 @@
// Handle session disconnection events
session.on('sessionDisconnected', event => {
- if (data.onDestroy) {
- data.onDestroy(event)
- }
-
+ data.onDestroy(event)
session = null
resize()
})
@@ -242,9 +245,7 @@
// Connect with the token
session.connect(data.token, data.params)
.then(() => {
- if (data.onSuccess) {
- data.onSuccess()
- }
+ data.onSuccess()
let params = {
connectionId: session.connection.connectionId,
@@ -287,16 +288,13 @@
sessionData.channels = getChannels(data.connections)
// Inform the vue component, so it can update some UI controls
- if (sessionData.channels.length && sessionData.onSessionDataUpdate) {
+ if (sessionData.channels.length) {
sessionData.onSessionDataUpdate(sessionData)
}
})
.catch(error => {
console.error('There was an error connecting to the session: ', error.message);
-
- if (data.onError) {
- data.onError(error)
- }
+ data.onError(error)
})
// Prepare the chat
@@ -606,7 +604,7 @@
case 'signal:joinRequest':
// accept requests from the server only
- if (!connId && sessionData.onJoinRequest) {
+ if (!connId) {
sessionData.onJoinRequest(JSON.parse(signal.data))
}
break
@@ -870,9 +868,7 @@
sessionData.audioActive = publisher.stream.audioActive
sessionData.videoActive = publisher.stream.videoActive
- if (sessionData.onSessionDataUpdate) {
- sessionData.onSessionDataUpdate(sessionData)
- }
+ sessionData.onSessionDataUpdate(sessionData)
})
// Open the media setup dialog
@@ -885,9 +881,7 @@
// It might make sense to not start streaming automatically in any cirmustances,
// display the dialog and wait until user closes it, but this would be
// a bigger refactoring.
- if (sessionData.onMediaSetup) {
- sessionData.onMediaSetup()
- }
+ sessionData.onMediaSetup()
}
} else if (conn) {
handUpdate(conn)
@@ -912,9 +906,7 @@
}
// Inform the vue component, so it can update some UI controls
- if (sessionData.onSessionDataUpdate) {
- sessionData.onSessionDataUpdate(sessionData)
- }
+ sessionData.onSessionDataUpdate(sessionData)
}
/**
@@ -1031,10 +1023,7 @@
}
if (params.isSelf) {
- if (sessionData.onMediaSetup) {
- wrapper.find('.link-setup').removeClass('hidden')
- .click(() => sessionData.onMediaSetup())
- }
+ wrapper.find('.link-setup').removeClass('hidden').click(() => sessionData.onMediaSetup())
} else {
// Enable audio mute button
wrapper.find('.link-audio').removeClass('hidden')
@@ -1306,9 +1295,7 @@
element.find('.action-nickname').remove()
element.find('.action-dismiss').on('click', e => {
- if (sessionData.onDismiss) {
- sessionData.onDismiss(params.connectionId)
- }
+ sessionData.onDismiss(params.connectionId)
})
}
@@ -1325,47 +1312,45 @@
// Don't close the menu on permission change
element.find('.dropdown-menu > label').on('click', e => { e.stopPropagation() })
- if (sessionData.onConnectionChange) {
- element.find('.action-role-publisher input').on('change', e => {
- const enabled = e.target.checked
- let role = connectionRole()
+ element.find('.action-role-publisher input').on('change', e => {
+ const enabled = e.target.checked
+ let role = connectionRole()
- if (enabled) {
- role |= Roles.PUBLISHER
- } else {
- role |= Roles.SUBSCRIBER
- if (role & Roles.PUBLISHER) {
- role ^= Roles.PUBLISHER
- }
+ if (enabled) {
+ role |= Roles.PUBLISHER
+ } else {
+ role |= Roles.SUBSCRIBER
+ if (role & Roles.PUBLISHER) {
+ role ^= Roles.PUBLISHER
}
+ }
- sessionData.onConnectionChange(params.connectionId, { role })
- })
+ sessionData.onConnectionChange(params.connectionId, { role })
+ })
- element.find('.action-role-moderator input').on('change', e => {
- const enabled = e.target.checked
- let role = connectionRole()
+ element.find('.action-role-moderator input').on('change', e => {
+ const enabled = e.target.checked
+ let role = connectionRole()
- if (enabled) {
- role |= Roles.MODERATOR
- } else if (role & Roles.MODERATOR) {
- role ^= Roles.MODERATOR
- }
+ if (enabled) {
+ role |= Roles.MODERATOR
+ } else if (role & Roles.MODERATOR) {
+ role ^= Roles.MODERATOR
+ }
- sessionData.onConnectionChange(params.connectionId, { role })
- })
+ sessionData.onConnectionChange(params.connectionId, { role })
+ })
- element.find('.interpreting select')
- .on('change', e => {
- const language = $(e.target).val()
- sessionData.onConnectionChange(params.connectionId, { language })
- element.find('.meet-nickname').dropdown('hide')
- })
- .on('click', e => {
- // Prevents from closing the dropdown menu on click
- e.stopPropagation()
- })
- }
+ element.find('.interpreting select')
+ .on('change', e => {
+ const language = $(e.target).val()
+ sessionData.onConnectionChange(params.connectionId, { language })
+ element.find('.meet-nickname').dropdown('hide')
+ })
+ .on('click', e => {
+ // Prevents from closing the dropdown menu on click
+ e.stopPropagation()
+ })
return element.get(0)
}
@@ -1374,10 +1359,10 @@
* Window onresize event handler (updates room layout)
*/
function resize() {
- containerWidth = publishersContainer.offsetWidth
- containerHeight = publishersContainer.offsetHeight
+ if (publishersContainer) {
+ updateLayout()
+ }
- updateLayout()
$(container).parent()[window.screen.width <= 768 ? 'addClass' : 'removeClass']('mobile')
}
@@ -1393,9 +1378,25 @@
}
if (!numOfVideos) {
+ subscribersContainer.style.minHeight = 'auto'
return
}
+ let allHeight = container.offsetHeight
+ let scrollHeight = subscribersContainer.scrollHeight
+ let containerWidth = publishersContainer.offsetWidth
+ let containerHeight = publishersContainer.offsetHeight
+ let limit = Math.ceil(allHeight * 0.25) // max subscribers list height
+
+ // Fix subscribers list height
+ if (subscribersContainer.offsetHeight <= scrollHeight) {
+ limit = Math.min(scrollHeight, limit)
+ subscribersContainer.style.minHeight = limit + 'px'
+ containerHeight = allHeight - limit
+ } else {
+ subscribersContainer.style.minHeight = 'auto'
+ }
+
let css, rows, cols, height, padding = 0
// Make the first screen sharing tile big
diff --git a/src/resources/themes/meet.scss b/src/resources/themes/meet.scss
--- a/src/resources/themes/meet.scss
+++ b/src/resources/themes/meet.scss
@@ -295,12 +295,6 @@
flex: 1;
}
}
-
- #meet-publishers:not(:empty) {
- & + #meet-subscribers {
- max-height: 30%;
- }
- }
}
#meet-chat {
diff --git a/src/tests/Feature/Controller/OpenViduTest.php b/src/tests/Feature/Controller/OpenViduTest.php
--- a/src/tests/Feature/Controller/OpenViduTest.php
+++ b/src/tests/Feature/Controller/OpenViduTest.php
@@ -18,14 +18,14 @@
$this->clearMeetEntitlements();
$room = Room::where('name', 'john')->first();
- $room->setSettings(['password' => null, 'locked' => null]);
+ $room->setSettings(['password' => null, 'locked' => null, 'nomedia' => null]);
}
public function tearDown(): void
{
$this->clearMeetEntitlements();
$room = Room::where('name', 'john')->first();
- $room->setSettings(['password' => null, 'locked' => null]);
+ $room->setSettings(['password' => null, 'locked' => null, 'nomedia' => null]);
parent::tearDown();
}
@@ -192,6 +192,23 @@
$post = ['init' => 'init'];
$response = $this->actingAs($john)->post("api/v4/openvidu/rooms/{$room->name}", $post);
$response->assertStatus(200);
+
+ // Test 'nomedia' room option
+ $room->setSettings(['nomedia' => 'true', 'password' => null]);
+
+ $post = ['init' => 'init', 'canPublish' => true];
+ $response = $this->actingAs($john)->post("api/v4/openvidu/rooms/{$room->name}", $post);
+ $response->assertStatus(200);
+
+ $json = $response->json();
+ $this->assertSame(Room::ROLE_PUBLISHER & $json['role'], Room::ROLE_PUBLISHER);
+
+ $post = ['init' => 'init', 'canPublish' => true];
+ $response = $this->actingAs($jack)->post("api/v4/openvidu/rooms/{$room->name}", $post);
+ $response->assertStatus(200);
+
+ $json = $response->json();
+ $this->assertSame(Room::ROLE_PUBLISHER & $json['role'], 0);
}
/**

File Metadata

Mime Type
text/plain
Expires
Fri, Apr 3, 9:52 AM (11 h, 25 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
18823555
Default Alt Text
D2341.1775209945.diff (12 KB)

Event Timeline