Mercurial > libervia-web
comparison src/browser/sat_browser/menu.py @ 686:90a5a5af2550
browser_side: let the backend check for the validity of MUC JIDs that come from a user input
author | souliane <souliane@mailoo.org> |
---|---|
date | Fri, 27 Mar 2015 00:15:42 +0100 |
parents | 9877607c719a |
children | 76a67d04c63e |
comparison
equal
deleted
inserted
replaced
685:9877607c719a | 686:90a5a5af2550 |
---|---|
76 def onJoinRoom(self): | 76 def onJoinRoom(self): |
77 | 77 |
78 def invite(room_jid, contacts): | 78 def invite(room_jid, contacts): |
79 for contact in contacts: | 79 for contact in contacts: |
80 self.host.bridge.call('inviteMUC', None, unicode(contact), unicode(room_jid)) | 80 self.host.bridge.call('inviteMUC', None, unicode(contact), unicode(room_jid)) |
81 | |
81 def join(room_jid, contacts): | 82 def join(room_jid, contacts): |
82 if self.host.whoami: | 83 if self.host.whoami: |
83 nick = self.host.whoami.node | 84 nick = self.host.whoami.node |
84 contact_list = self.host.contact_list | 85 contact_list = self.host.contact_list |
85 if room_jid is None or room_jid not in contact_list.getSpecials(C.CONTACT_SPECIAL_GROUP): | 86 if room_jid is None or room_jid not in contact_list.getSpecials(C.CONTACT_SPECIAL_GROUP): |
86 room_jid_s = unicode(room_jid) if room_jid else '' | 87 room_jid_s = unicode(room_jid) if room_jid else '' |
87 self.host.bridge.call('joinMUC', lambda room_jid: invite(room_jid, contacts), room_jid_s, nick) | 88 self.host.bridge.joinMUC(room_jid_s, nick, profile=C.PROF_KEY_NONE, callback=lambda room_jid: invite(room_jid, contacts), errback=self.host.showFailureRoomInvalid) |
88 else: | 89 else: |
89 self.host.displayWidget(chat.Chat, room_jid, type_="group", new_tab=room_jid) | 90 self.host.displayWidget(chat.Chat, room_jid, type_="group", new_tab=room_jid) |
90 invite(room_jid, contacts) | 91 invite(room_jid, contacts) |
91 | 92 |
92 dialog.RoomAndContactsChooser(self.host, join, ok_button="Join", visible=(True, False)) | 93 dialog.RoomAndContactsChooser(self.host, join, ok_button="Join", visible=(True, False)) |
94 | |
93 | 95 |
94 # Help menu | 96 # Help menu |
95 | 97 |
96 def onSocialContract(self): | 98 def onSocialContract(self): |
97 _frame = Frame('contrat_social.html') | 99 _frame = Frame('contrat_social.html') |