Some minor updates
This commit is contained in:
parent
eb94db0773
commit
41f9facf31
4 changed files with 24 additions and 17 deletions
|
@ -500,17 +500,14 @@ export class ConnectionHandler {
|
|||
case DisconnectReason.CONNECT_FAILURE:
|
||||
if(this._reconnect_attempt) {
|
||||
auto_reconnect = true;
|
||||
this.log.log(EventType.CONNECTION_FAILED, { serverAddress: {
|
||||
server_port: this.channelTree.server.remote_address.port,
|
||||
server_hostname: this.channelTree.server.remote_address.host
|
||||
} });
|
||||
break;
|
||||
}
|
||||
|
||||
if(data)
|
||||
if(data) {
|
||||
log.error(LogCategory.CLIENT, tr("Could not connect to remote host! Extra data: %o"), data);
|
||||
else
|
||||
} else {
|
||||
log.error(LogCategory.CLIENT, tr("Could not connect to remote host!"), data);
|
||||
}
|
||||
|
||||
if(__build.target === "client" || !dns.resolve_address_ipv4) {
|
||||
createErrorModal(
|
||||
|
@ -542,10 +539,12 @@ export class ConnectionHandler {
|
|||
this._certificate_modal.open();
|
||||
});
|
||||
}
|
||||
this.log.log(EventType.CONNECTION_FAILED, { serverAddress: {
|
||||
server_hostname: this.serverConnection.remote_address().host,
|
||||
server_port: this.serverConnection.remote_address().port
|
||||
} });
|
||||
this.log.log(EventType.CONNECTION_FAILED, {
|
||||
serverAddress: {
|
||||
server_hostname: this.serverConnection.remote_address().host,
|
||||
server_port: this.serverConnection.remote_address().port
|
||||
}
|
||||
});
|
||||
this.sound.play(Sound.CONNECTION_REFUSED);
|
||||
break;
|
||||
case DisconnectReason.HANDSHAKE_FAILED:
|
||||
|
|
|
@ -72,6 +72,18 @@ export class PermissionValue {
|
|||
valueOr(fallback: number) {
|
||||
return this.hasValue() ? this.value : fallback;
|
||||
}
|
||||
|
||||
valueNormalOr(fallback: number) {
|
||||
if(this.hasValue()) {
|
||||
if(this.value === -1) {
|
||||
return Number.MAX_SAFE_INTEGER;
|
||||
}
|
||||
|
||||
return this.value;
|
||||
} else {
|
||||
return fallback;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
export class NeededPermissionValue extends PermissionValue {
|
||||
|
|
|
@ -700,10 +700,10 @@ class ChannelVideoController {
|
|||
this.events.fire_react("notify_subscribe_info", {
|
||||
info: {
|
||||
totalSubscriptions: subscriptionsCamera + subscriptionsScreen,
|
||||
maxSubscriptions: permissionMaxStreams.valueOr(undefined),
|
||||
maxSubscriptions: permissionMaxStreams.valueNormalOr(undefined),
|
||||
subscribeLimits: {
|
||||
screen: permissionMaxScreenStreams.valueOr(undefined),
|
||||
camera: permissionMaxCameraStreams.valueOr(undefined)
|
||||
screen: permissionMaxScreenStreams.valueNormalOr(undefined),
|
||||
camera: permissionMaxCameraStreams.valueNormalOr(undefined)
|
||||
},
|
||||
subscribedStreams: {
|
||||
camera: subscriptionsCamera,
|
||||
|
|
|
@ -705,10 +705,6 @@ function applyAudioListener(connection: ConnectionHandler, properties: ChannelPr
|
|||
}
|
||||
|
||||
let codecs = tag.find(".voice_codec option");
|
||||
codecs.eq(0).prop("disabled", !connection.permissions.neededPermission(PermissionType.B_CHANNEL_CREATE_MODIFY_WITH_CODEC_SPEEX8).granted(1));
|
||||
codecs.eq(1).prop("disabled", !connection.permissions.neededPermission(PermissionType.B_CHANNEL_CREATE_MODIFY_WITH_CODEC_SPEEX16).granted(1));
|
||||
codecs.eq(2).prop("disabled", !connection.permissions.neededPermission(PermissionType.B_CHANNEL_CREATE_MODIFY_WITH_CODEC_SPEEX32).granted(1));
|
||||
codecs.eq(3).prop("disabled", !connection.permissions.neededPermission(PermissionType.B_CHANNEL_CREATE_MODIFY_WITH_CODEC_CELTMONO48).granted(1));
|
||||
codecs.eq(4).prop("disabled", !connection.permissions.neededPermission(PermissionType.B_CHANNEL_CREATE_MODIFY_WITH_CODEC_OPUSVOICE).granted(1));
|
||||
codecs.eq(5).prop("disabled", !connection.permissions.neededPermission(PermissionType.B_CHANNEL_CREATE_MODIFY_WITH_CODEC_OPUSMUSIC).granted(1));
|
||||
tag.find(".voice_codec").change(function (this: HTMLSelectElement) {
|
||||
|
|
Loading…
Add table
Reference in a new issue