CringeStudios/gamja
5
0
Fork 1
mirror of https://codeberg.org/emersion/gamja synced 2025-03-15 00:47:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Display bouncer network status

Browse Source
This commit is contained in:
Simon Ser 2021-03-10 11:48:58 +01:00
parent 6524dc5dd2
commit 1b21f5f076
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/app.js
View File

@ -1099,7 +1099,7 @@ export default class App extends Component {
} }
render() { render() {
var activeBuffer = null, activeNetwork = null; var activeBuffer = null, activeNetwork = null, activeBouncerNetwork = null;
var isBouncer = false; var isBouncer = false;
if (this.state.buffers.get(this.state.activeBuffer)) { if (this.state.buffers.get(this.state.activeBuffer)) {
activeBuffer = this.state.buffers.get(this.state.activeBuffer); activeBuffer = this.state.buffers.get(this.state.activeBuffer);
@ -1107,6 +1107,11 @@ export default class App extends Component {
var activeClient = this.clients.get(activeBuffer.network); var activeClient = this.clients.get(activeBuffer.network);
isBouncer = activeClient && activeClient.enabledCaps["soju.im/bouncer-networks"]; isBouncer = activeClient && activeClient.enabledCaps["soju.im/bouncer-networks"];
var bouncerNetID = activeNetwork.isupport.get("BOUNCER_NETID");
if (bouncerNetID) {
activeBouncerNetwork = this.state.bouncerNetworks.get(bouncerNetID);
}
} }
if (!activeNetwork || (activeNetwork.status !== NetworkStatus.REGISTERED && !activeBuffer)) { if (!activeNetwork || (activeNetwork.status !== NetworkStatus.REGISTERED && !activeBuffer)) {
@ -1132,6 +1137,7 @@ export default class App extends Component {
buffer=${activeBuffer} buffer=${activeBuffer}
network=${activeNetwork} network=${activeNetwork}
isBouncer=${isBouncer} isBouncer=${isBouncer}
bouncerNetwork=${activeBouncerNetwork}
onClose=${() => this.close(activeBuffer)} onClose=${() => this.close(activeBuffer)}
onJoin=${() => this.handleJoinClick(activeBuffer.network)} onJoin=${() => this.handleJoinClick(activeBuffer.network)}
onAddNetwork=${this.handleAddNetworkClick} onAddNetwork=${this.handleAddNetworkClick}

14
components/buffer-header.js
View File

@ -50,8 +50,22 @@ export default function BufferHeader(props) {
description = "Logging in..."; description = "Logging in...";
break; break;
case NetworkStatus.REGISTERED: case NetworkStatus.REGISTERED:
if (props.bouncerNetwork) {
switch (props.bouncerNetwork.state) {
case "disconnected":
description = "Bouncer disconnected from network";
break;
case "connecting":
description = "Bouncer connecting to network...";
break;
case "connected":
description = `Connected to ${props.bouncerNetwork.host}`;
break;
}
} else {
var serverInfo = props.buffer.serverInfo; var serverInfo = props.buffer.serverInfo;
description = `Connected to ${serverInfo.name}`; description = `Connected to ${serverInfo.name}`;
}
break; break;
} }
} else if (props.buffer.topic) { } else if (props.buffer.topic) {