gryf/weechat-xmpp
1
0
Fork 0
mirror of https://github.com/gryf/weechat-xmpp.git synced 2025-12-19 12:28:12 +01:00
Code Issues Projects Releases Wiki Activity

Applied patch from @sleduc

Browse Source
This commit is contained in:
Erwan Dupard
2017-08-25 15:35:39 +02:00
committed by Laurent Peuch
parent 1a33e93d56
commit b26da9eb10
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
jabber.py
View File

@@ -539,7 +539,6 @@ class Server:
for room in rooms: for room in rooms:
weechat.prnt("", "Joining '%s'" % room) weechat.prnt("", "Joining '%s'" % room)
jabber_cmd_room(None, self.buffer, "%s" % room) jabber_cmd_room(None, self.buffer, "%s" % room)
# setting initial presence # setting initial presence
priority = weechat.config_integer(self.options['priority']) priority = weechat.config_integer(self.options['priority'])
self.set_presence(show="",priority=priority) self.set_presence(show="",priority=priority)
@@ -1736,10 +1735,15 @@ def jabber_cmd_room(data, buffer, args):
if args: if args:
argv = args.split() argv = args.split()
room = argv[0] room = argv[0]
autojoin = "-autojoin" in argv
if len(argv) == 1: if len(argv) == 1:
nickname = None nickname = None
elif len(argv) == 2:
nickname = argv[1] if argv[1] != "-autojoin" else None
autojoin = argv[1] == "-autojoin"
else: else:
nickname = argv[1] nickname = argv[1]
autojoin = argv[2]
context = jabber_search_context(buffer) context = jabber_search_context(buffer)
server = context["server"] server = context["server"]
if server: if server:
@@ -1748,14 +1752,11 @@ def jabber_cmd_room(data, buffer, args):
buddy = server.add_muc(room, nickname) buddy = server.add_muc(room, nickname)
if not buddy.chat: if not buddy.chat:
server.add_chat(buddy) server.add_chat(buddy)
if "-autojoin" in argv: if autojoin:
autojoins = [r.strip() for r in server.option_string("autojoin").split(',')] autojoins = [r.strip() for r in server.option_string("autojoin").split(',')]
autojoins.append(room) autojoins.append(room)
autojoins = ", ".join(autojoins) autojoins = ", ".join(autojoins)
server.options['autojoin'] = autojoins r = weechat.config_option_set(server.options["autojoin"], autojoins, 1)
# TODO: Needs help here #PLS #TotallyLost (It doesn't want to work)
r = weechat.config_write_option(jabber_config_file, server.options['autojoin'])
weechat.prnt("", "Response: %s" % server.option_string("autojoin"))
weechat.buffer_set(buddy.chat.buffer, "display", "auto") weechat.buffer_set(buddy.chat.buffer, "display", "auto")
weechat.buffer_set(buddy.chat.buffer, "nicklist", "1") weechat.buffer_set(buddy.chat.buffer, "nicklist", "1")
weechat.buffer_set(buddy.chat.buffer, "nicklist_display_groups", "1") weechat.buffer_set(buddy.chat.buffer, "nicklist_display_groups", "1")