chipmunkmc/gamja
1
0
Fork 0
mirror of https://codeberg.org/emersion/gamja.git synced 2025-02-26 15:54:03 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move isBouncer props to server state

Browse source 
Avoids having to pass this around.
This commit is contained in:
Simon Ser 2021-12-07 13:16:07 +01:00
parent f81c564d23
commit f3d38859d3
5 changed files with 11 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
components/app.js
View file

@ -1591,14 +1591,10 @@ export default class App extends Component {
} }
let activeBuffer = null, activeServer = null, activeBouncerNetwork = null; let activeBuffer = null, activeServer = null, activeBouncerNetwork = null;
let 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);
activeServer = this.state.servers.get(activeBuffer.server); activeServer = this.state.servers.get(activeBuffer.server);
let activeClient = this.clients.get(activeBuffer.server);
isBouncer = activeClient && activeClient.enabledCaps["soju.im/bouncer-networks"];
let bouncerNetID = activeServer.bouncerNetID; let bouncerNetID = activeServer.bouncerNetID;
if (bouncerNetID) { if (bouncerNetID) {
activeBouncerNetwork = this.state.bouncerNetworks.get(bouncerNetID); activeBouncerNetwork = this.state.bouncerNetworks.get(bouncerNetID);
@ -1634,7 +1630,6 @@ export default class App extends Component {
buffer=${activeBuffer} buffer=${activeBuffer}
server=${activeServer} server=${activeServer}
user=${activeUser} user=${activeUser}
isBouncer=${isBouncer}
bouncerNetwork=${activeBouncerNetwork} bouncerNetwork=${activeBouncerNetwork}
onChannelClick=${this.handleChannelClick} onChannelClick=${this.handleChannelClick}
onClose=${() => this.close(activeBuffer)} onClose=${() => this.close(activeBuffer)}
@ -1716,7 +1711,7 @@ export default class App extends Component {
`; `;
} }
dialog = html` dialog = html`
<${Dialog} title="Login to ${getServerName(activeServer, activeBouncerNetwork, isBouncer)}" onDismiss=${this.dismissDialog}> <${Dialog} title="Login to ${getServerName(activeServer, activeBouncerNetwork)}" onDismiss=${this.dismissDialog}>
${dialogBody} ${dialogBody}
</> </>
`; `;
@ -1730,7 +1725,7 @@ export default class App extends Component {
`; `;
} }
dialog = html` dialog = html`
<${Dialog} title="Register a new ${getServerName(activeServer, activeBouncerNetwork, isBouncer)} account" onDismiss=${this.dismissDialog}> <${Dialog} title="Register a new ${getServerName(activeServer, activeBouncerNetwork)} account" onDismiss=${this.dismissDialog}>
${dialogBody} ${dialogBody}
</> </>
`; `;
@ -1744,7 +1739,7 @@ export default class App extends Component {
`; `;
} }
dialog = html` dialog = html`
<${Dialog} title="Verify ${getServerName(activeServer, activeBouncerNetwork, isBouncer)} account" onDismiss=${this.dismissDialog}> <${Dialog} title="Verify ${getServerName(activeServer, activeBouncerNetwork)} account" onDismiss=${this.dismissDialog}>
${dialogBody} ${dialogBody}
</> </>
`; `;
@ -1779,7 +1774,6 @@ export default class App extends Component {
buffers=${this.state.buffers} buffers=${this.state.buffers}
servers=${this.state.servers} servers=${this.state.servers}
bouncerNetworks=${this.state.bouncerNetworks} bouncerNetworks=${this.state.bouncerNetworks}
isBouncer=${isBouncer}
activeBuffer=${this.state.activeBuffer} activeBuffer=${this.state.activeBuffer}
onBufferClick=${this.handleBufferListClick} onBufferClick=${this.handleBufferListClick}
onBufferClose=${this.handleBufferListClose} onBufferClose=${this.handleBufferListClose}
@ -1803,7 +1797,6 @@ export default class App extends Component {
<${Buffer} <${Buffer}
buffer=${activeBuffer} buffer=${activeBuffer}
server=${activeServer} server=${activeServer}
isBouncer=${isBouncer}
bouncerNetwork=${activeBouncerNetwork} bouncerNetwork=${activeBouncerNetwork}
onChannelClick=${this.handleChannelClick} onChannelClick=${this.handleChannelClick}
onNickClick=${this.handleNickClick} onNickClick=${this.handleNickClick}

4
components/buffer-header.js
View file

@ -86,7 +86,7 @@ export default function BufferHeader(props) {
>Join channel</button> >Join channel</button>
`; `;
if (props.isBouncer) { if (props.server.isBouncer) {
if (props.server.bouncerNetID) { if (props.server.bouncerNetID) {
if (fullyConnected) { if (fullyConnected) {
actions.push(joinButton); actions.push(joinButton);
@ -221,7 +221,7 @@ export default function BufferHeader(props) {
let name = props.buffer.name; let name = props.buffer.name;
if (props.buffer.type == BufferType.SERVER) { if (props.buffer.type == BufferType.SERVER) {
name = getServerName(props.server, props.bouncerNetwork, props.isBouncer); name = getServerName(props.server, props.bouncerNetwork);
} }
return html` return html`

3
components/buffer-list.js
View file

@ -16,7 +16,7 @@ function BufferItem(props) {
let name = props.buffer.name; let name = props.buffer.name;
if (props.buffer.type == BufferType.SERVER) { if (props.buffer.type == BufferType.SERVER) {
name = getServerName(props.server, props.bouncerNetwork, props.isBouncer); name = getServerName(props.server, props.bouncerNetwork);
} }
let classes = ["type-" + props.buffer.type]; let classes = ["type-" + props.buffer.type];
@ -54,7 +54,6 @@ export default function BufferList(props) {
key=${buf.id} key=${buf.id}
buffer=${buf} buffer=${buf}
server=${server} server=${server}
isBouncer=${props.isBouncer}
bouncerNetwork=${bouncerNetwork} bouncerNetwork=${bouncerNetwork}
onClick=${() => props.onBufferClick(buf)} onClick=${() => props.onBufferClick(buf)}
onClose=${() => props.onBufferClose(buf)} onClose=${() => props.onBufferClose(buf)}

2
components/buffer.js
View file

@ -570,7 +570,7 @@ export default class Buffer extends Component {
if (buf.type == BufferType.SERVER) { if (buf.type == BufferType.SERVER) {
children.push(html`<${NotificationNagger}/>`); children.push(html`<${NotificationNagger}/>`);
} }
if (buf.type == BufferType.SERVER && this.props.isBouncer && !server.bouncerNetID) { if (buf.type == BufferType.SERVER && server.isBouncer && !server.bouncerNetID) {
children.push(html`<${ProtocolHandlerNagger} bouncerName=${serverName}/>`); children.push(html`<${ProtocolHandlerNagger} bouncerName=${serverName}/>`);
} }
if (buf.type == BufferType.SERVER && server.status == ServerStatus.REGISTERED && server.supportsSASLPlain && !server.account) { if (buf.type == BufferType.SERVER && server.status == ServerStatus.REGISTERED && server.supportsSASLPlain && !server.account) {

6
state.js
View file

@ -63,7 +63,7 @@ export function getMessageURL(buf, msg) {
} }
} }
export function getServerName(server, bouncerNetwork, isBouncer) { export function getServerName(server, bouncerNetwork) {
let netName = server.name; let netName = server.name;
if (bouncerNetwork && bouncerNetwork.name && bouncerNetwork.name !== bouncerNetwork.host) { if (bouncerNetwork && bouncerNetwork.name && bouncerNetwork.name !== bouncerNetwork.host) {
@ -78,7 +78,7 @@ export function getServerName(server, bouncerNetwork, isBouncer) {
if (bouncerNetwork) { if (bouncerNetwork) {
return bouncerNetwork.name || bouncerNetwork.host || "server"; return bouncerNetwork.name || bouncerNetwork.host || "server";
} else if (isBouncer) { } else if (server.isBouncer) {
return "bouncer"; return "bouncer";
} else { } else {
return "server"; return "server";
@ -261,6 +261,7 @@ export const State = {
supportsAccountRegistration: false, supportsAccountRegistration: false,
reliableUserAccounts: false, reliableUserAccounts: false,
statusMsg: null, // from ISUPPORT STATUSMSG statusMsg: null, // from ISUPPORT STATUSMSG
isBouncer: false,
bouncerNetID: null, bouncerNetID: null,
}); });
return [id, { servers }]; return [id, { servers }];
@ -360,6 +361,7 @@ export const State = {
return updateServer({ return updateServer({
supportsSASLPlain: client.supportsSASL("PLAIN"), supportsSASLPlain: client.supportsSASL("PLAIN"),
supportsAccountRegistration: !!client.enabledCaps["draft/account-registration"], supportsAccountRegistration: !!client.enabledCaps["draft/account-registration"],
isBouncer: !!client.enabledCaps["soju.im/bouncer-networks"],
}); });
case irc.RPL_LOGGEDIN: case irc.RPL_LOGGEDIN:
return updateServer({ account: msg.params[2] }); return updateServer({ account: msg.params[2] });