mirror of
https://github.com/gryf/weechat-xmpp.git
synced 2025-12-19 12:28:12 +01:00
[mod] lower indentantion, add a error message when not connected to a jabber server
This commit is contained in:
33
jabber.py
33
jabber.py
@@ -1787,25 +1787,28 @@ def jabber_cmd_room(data, buffer, args):
|
|||||||
context = jabber_search_context(buffer)
|
context = jabber_search_context(buffer)
|
||||||
server = context["server"]
|
server = context["server"]
|
||||||
|
|
||||||
if server:
|
if not server:
|
||||||
buddy = server.search_buddy_list(args, by='alias')
|
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.search_buddy_list(args, by='alias')
|
||||||
buddy = server.add_muc(room, nickname)
|
|
||||||
|
|
||||||
if not buddy.chat:
|
if not buddy:
|
||||||
server.add_chat(buddy)
|
buddy = server.add_muc(room, nickname)
|
||||||
|
|
||||||
if autojoin:
|
if not buddy.chat:
|
||||||
autojoins = [r.strip() for r in server.option_string("autojoin").split(',')]
|
server.add_chat(buddy)
|
||||||
autojoins.append(room)
|
|
||||||
autojoins = ", ".join(autojoins)
|
|
||||||
r = weechat.config_option_set(server.options["autojoin"], autojoins, 1)
|
|
||||||
|
|
||||||
weechat.buffer_set(buddy.chat.buffer, "display", "auto")
|
if autojoin:
|
||||||
weechat.buffer_set(buddy.chat.buffer, "nicklist", "1")
|
autojoins = [r.strip() for r in server.option_string("autojoin").split(',')]
|
||||||
weechat.buffer_set(buddy.chat.buffer, "nicklist_display_groups", "1")
|
autojoins.append(room)
|
||||||
weechat.buffer_set(buddy.chat.buffer, "display", "auto")
|
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
|
return weechat.WEECHAT_RC_OK
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user