skorotkiewicz/gamja
1
0
Fork 0
Code Issues Pull requests 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
Download patch file Download diff file Expand all files Collapse all files

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