TeaSpeak/TeaWeb
TeaSpeak/TeaWeb
1
0
Fork 0
Code Issues 1 Pull requests Activity

Some minor updates

Browse source
This commit is contained in:
WolverinDEV 2020-12-17 11:55:53 +01:00 • committed by WolverinDEV
parent 0d1193031d
commit 363bde8cbd
4 changed files with 24 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
shared/js/ConnectionHandler.ts
View file

@ -500,17 +500,14 @@ export class ConnectionHandler {
case DisconnectReason.CONNECT_FAILURE: case DisconnectReason.CONNECT_FAILURE:
if(this._reconnect_attempt) { if(this._reconnect_attempt) {
auto_reconnect = true; 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; break;
} }
if(data) if(data) {
log.error(LogCategory.CLIENT, tr("Could not connect to remote host! Extra data: %o"), 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); log.error(LogCategory.CLIENT, tr("Could not connect to remote host!"), data);
}
if(__build.target === "client" || !dns.resolve_address_ipv4) { if(__build.target === "client" || !dns.resolve_address_ipv4) {
createErrorModal( createErrorModal(
@ -542,10 +539,12 @@ export class ConnectionHandler {
this._certificate_modal.open(); this._certificate_modal.open();
}); });
} }
this.log.log(EventType.CONNECTION_FAILED, { serverAddress: { this.log.log(EventType.CONNECTION_FAILED, {
server_hostname: this.serverConnection.remote_address().host, serverAddress: {
server_port: this.serverConnection.remote_address().port server_hostname: this.serverConnection.remote_address().host,
} }); server_port: this.serverConnection.remote_address().port
}
});
this.sound.play(Sound.CONNECTION_REFUSED); this.sound.play(Sound.CONNECTION_REFUSED);
break; break;
case DisconnectReason.HANDSHAKE_FAILED: case DisconnectReason.HANDSHAKE_FAILED:

12
shared/js/permission/PermissionManager.ts
View file

@ -72,6 +72,18 @@ export class PermissionValue {
valueOr(fallback: number) { valueOr(fallback: number) {
return this.hasValue() ? this.value : fallback; 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 { export class NeededPermissionValue extends PermissionValue {

6
shared/js/ui/frames/video/Controller.ts
View file

@ -700,10 +700,10 @@ class ChannelVideoController {
this.events.fire_react("notify_subscribe_info", { this.events.fire_react("notify_subscribe_info", {
info: { info: {
totalSubscriptions: subscriptionsCamera + subscriptionsScreen, totalSubscriptions: subscriptionsCamera + subscriptionsScreen,
maxSubscriptions: permissionMaxStreams.valueOr(undefined), maxSubscriptions: permissionMaxStreams.valueNormalOr(undefined),
subscribeLimits: { subscribeLimits: {
screen: permissionMaxScreenStreams.valueOr(undefined), screen: permissionMaxScreenStreams.valueNormalOr(undefined),
camera: permissionMaxCameraStreams.valueOr(undefined) camera: permissionMaxCameraStreams.valueNormalOr(undefined)
}, },
subscribedStreams: { subscribedStreams: {
camera: subscriptionsCamera, camera: subscriptionsCamera,

4
shared/js/ui/modal/ModalCreateChannel.ts
View file

@ -705,10 +705,6 @@ function applyAudioListener(connection: ConnectionHandler, properties: ChannelPr
} }
let codecs = tag.find(".voice_codec option"); 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(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)); 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) { tag.find(".voice_codec").change(function (this: HTMLSelectElement) {