Mercurial > libervia-web
diff libervia.py @ 125:f9d63624699f
radio collective integration, first draft
author | Goffi <goffi@goffi.org> |
---|---|
date | Thu, 05 Jan 2012 00:22:03 +0100 |
parents | 397a88b340f3 |
children | adecb2566b53 |
line wrap: on
line diff
--- a/libervia.py Mon Dec 12 22:26:55 2011 +0100 +++ b/libervia.py Thu Jan 05 00:22:03 2012 +0100 @@ -78,7 +78,7 @@ LiberviaJsonProxy.__init__(self, "/json_api", ["getContacts", "addContact", "sendMessage", "sendMblog", "getMblogNodes", "getProfileJid", "getHistory", "getPresenceStatus", "joinMUC", "getRoomsJoined", "launchTarotGame", "getTarotCardsPaths", "tarotGameReady", "tarotGameContratChoosed", - "tarotGamePlayCards", "getWaitingSub", "subscription", "delContact", "updateContact", "getCardCache"]) + "tarotGamePlayCards", "launchRadioCollective", "getWaitingSub", "subscription", "delContact", "updateContact", "getCardCache"]) class BridgeSignals(LiberviaJsonProxy): def __init__(self, host): @@ -320,26 +320,26 @@ if (not self.whoami or self.whoami.bare != _entity.bare): self.contact_panel.setConnected(_entity.bare, _entity.resource, show, priority, statuses) - def _roomJoinedCb(self, room_id, room_service, room_nicks, user_nick): - _target = JID("%s@%s" % (room_id,room_service)) + def _roomJoinedCb(self, room_jid, room_nicks, user_nick): + _target = JID(room_jid) self.room_list.add(_target) chat_panel = panels.ChatPanel(self, _target, type='group') chat_panel.setUserNick(user_nick) - if room_id.startswith('sat_tarot_'): #XXX: it's not really beautiful, but it works :) + if room_jid.node.startswith('sat_tarot_'): #XXX: it's not really beautiful, but it works :) self.addTab(chat_panel, "Tarot") else: self.addTab(chat_panel, _target.node) chat_panel.setPresents(room_nicks) chat_panel.historyPrint() - def _roomUserJoinedCb(self, room_id, room_service, user_nick, user_data): + def _roomUserJoinedCb(self, room_jid, user_nick, user_data): for lib_wid in self.libervia_widgets: - if isinstance(lib_wid,panels.ChatPanel) and lib_wid.type == 'group' and lib_wid.target.bare == "%s@%s" % (room_id, room_service): + if isinstance(lib_wid,panels.ChatPanel) and lib_wid.type == 'group' and lib_wid.target.bare == room_jid.bare: lib_wid.userJoined(user_nick, user_data) - def _roomUserLeftCb(self, room_id, room_service, user_nick, user_data): + def _roomUserLeftCb(self, room_jid, user_nick, user_data): for lib_wid in self.libervia_widgets: - if isinstance(lib_wid,panels.ChatPanel) and lib_wid.type == 'group' and lib_wid.target.bare == "%s@%s" % (room_id, room_service): + if isinstance(lib_wid,panels.ChatPanel) and lib_wid.type == 'group' and lib_wid.target.bare == room_jid.bare: lib_wid.userLeft(user_nick, user_data) def _tarotGameStartedCb(self, room_jid, referee, players):