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

[mod] lower indentantion, add a error message when not connected to a jabber server

Browse Source
This commit is contained in:
Laurent Peuch
2017-10-10 15:01:59 +02:00
parent e23bf85f50
commit b8e9666608
1 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
jabber.py
View File

@@ -1787,25 +1787,28 @@ def jabber_cmd_room(data, buffer, args):
context = jabber_search_context(buffer)
server = context["server"]
if server:
buddy = server.search_buddy_list(args, by='alias')
if not server:
weechat.prnt("", "Error: this command needs to be runned in a jabber server buffer, switch to a jabber buffer or use /jabber add|connect for that.")
return weechat.WEECHAT_RC_ERROR
if not buddy:
buddy = server.add_muc(room, nickname)
buddy = server.search_buddy_list(args, by='alias')
if not buddy.chat:
server.add_chat(buddy)
if not buddy:
buddy = server.add_muc(room, nickname)
if autojoin:
autojoins = [r.strip() for r in server.option_string("autojoin").split(',')]
autojoins.append(room)
autojoins = ", ".join(autojoins)
r = weechat.config_option_set(server.options["autojoin"], autojoins, 1)
if not buddy.chat:
server.add_chat(buddy)
weechat.buffer_set(buddy.chat.buffer, "display", "auto")
weechat.buffer_set(buddy.chat.buffer, "nicklist", "1")
weechat.buffer_set(buddy.chat.buffer, "nicklist_display_groups", "1")
weechat.buffer_set(buddy.chat.buffer, "display", "auto")
if autojoin:
autojoins = [r.strip() for r in server.option_string("autojoin").split(',')]
autojoins.append(room)
autojoins = ", ".join(autojoins)
r = weechat.config_option_set(server.options["autojoin"], autojoins, 1)
weechat.buffer_set(buddy.chat.buffer, "display", "auto")
weechat.buffer_set(buddy.chat.buffer, "nicklist", "1")
weechat.buffer_set(buddy.chat.buffer, "nicklist_display_groups", "1")
weechat.buffer_set(buddy.chat.buffer, "display", "auto")
return weechat.WEECHAT_RC_OK