Skip to content

Commit 99fb3ad

Browse files
stacyharperflashcode
authored andcommitted
soju.py 0.5.1: Drop obsolete -temp server add argument
This instead delete the network first. This way the server config is updated correctly when reconnecting to the bouncer. This also include a minor fix, to skip empty config entries as sasl_password. This caused a minor warning.
1 parent acf9d8a commit 99fb3ad

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

python/soju.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import weechat
77
import datetime
88

9-
weechat.register("soju", "soju", "0.5.0", "AGPL3", "soju bouncer integration", "", "")
9+
weechat.register("soju", "soju", "0.5.1", "AGPL3", "soju bouncer integration", "", "")
1010

1111
BOUNCER_CAP = "soju.im/bouncer-networks"
1212

@@ -95,12 +95,15 @@ def handle_bouncer_msg(data, signal, signal_data):
9595
net_name = "".join(ch if check_char(ch) else "_" for ch in net_name)
9696

9797
addr = weechat.config_string(weechat.config_get("irc.server." + server_name + ".addresses"))
98+
99+
if weechat.config_get("irc.server." + net_name + ".addresses"):
100+
weechat.command(weechat.buffer_search("core", "weechat"), "/server del " + net_name)
101+
98102
add_server = [
99103
"/server",
100104
"add",
101105
net_name,
102106
addr,
103-
"-temp",
104107
]
105108

106109
if weechat_version >= 0x04000000:
@@ -118,6 +121,8 @@ def handle_bouncer_msg(data, signal, signal_data):
118121

119122
for k in ["password", "sasl_mechanism", "sasl_password"]:
120123
v = weechat.config_string(weechat.config_get("irc.server." + server_name + "." + k))
124+
if not v:
125+
continue
121126
add_server.append("-" + k + "=" + v)
122127

123128
weechat.command(weechat.buffer_search("core", "weechat"), " ".join(add_server))

0 commit comments

Comments
 (0)