libervia-web: src/browser/sat_browser/chat.py comparison

comparison src/browser/sat_browser/chat.py @ 684:e876f493dccc

browser_side: follow changes made on quick_frontend for chat states and MUC symbols + minor fixes following the refactorisation: - some MUC handlers are no more needed, the presence handler is enough - move the chat states logic to quick_frontend - display MUC games symbols - remove classes contact_list.ContactsPanel, contact_panel.Occupant and contact_panel.OccupantsList - move buildPresenceStyle and setPresenceStyle to html_tools - fixes games menu callback

author	souliane <souliane@mailoo.org>
date	Wed, 18 Mar 2015 10:17:04 +0100
parents	a90cc8fc9605
children	9877607c719a

comparison

equal deleted inserted replaced

-:801eb94aa869
+:e876f493dccc
 import html_tools
 import libervia_widget
 import base_panel
 import contact_panel
 import editor_widget
-import contact_list
 from constants import Const as C
 import plugin_xep_0085
 import game_tarot
 import game_radiocol
 contacts_style="muc_contact",
 contacts_menus=(C.MENU_JID_CONTEXT),
 contacts_display=('resource',))
 chat_area.add(self.occupants_panel)
 DOM.setAttribute(chat_area.getWidgetTd(self.occupants_panel), "className", "occupantsPanelCell")
+# FIXME: workaround for a pyjamas issue: calling hash on a class method always return a different value if that method is defined directly within the class (with the "def" keyword)
+self.presenceListener = self.onPresenceUpdate
+self.host.addListener('presence', self.presenceListener, [C.PROF_KEY_NONE])
 self._body.add(chat_area)
 self.content = AbsolutePanel()
 self.content.setStyleName('chatContent')
 self.content_scroll = base_panel.ScrollPanelWrapper(self.content)
 chat_area.add(self.content_scroll)
 chat_area.setCellWidth(self.content_scroll, '100%')
 self.vpanel.add(self._body)
 self.vpanel.setCellHeight(self._body, '100%')
 self.addStyleName('chatPanel')
 self.setWidget(self.vpanel)
-self.state_machine = plugin_xep_0085.ChatStateMachine(self.host, unicode(self.target))
+self.chat_state_machine = plugin_xep_0085.ChatStateMachine(self.host, unicode(self.target))
-self._state = None
 self.refresh()
 if type_ == C.CHAT_ONE2ONE:
 self.historyPrint(profile=self.profile)
 @property
 text,
 mess_type=C.MESS_TYPE_GROUPCHAT if self.type == C.CHAT_GROUP else C.MESS_TYPE_CHAT,
 errback=self.host.sendError,
 profile_key=C.PROF_KEY_NONE
 )
-self.state_machine._onEvent("active")
+self.chat_state_machine._onEvent("active")
+def onPresenceUpdate(self, entity, show, priority, statuses, profile):
+"""Update entity's presence status
+@param entity(jid.JID): entity updated
+@param show: availability
+@parap priority: resource's priority
+@param statuses: dict of statuses
+@param profile: %(doc_profile)s
+"""
+assert self.type == C.CHAT_GROUP
+if entity.bare == self.target:
+self.occupants_panel.setPresence(entity, show)
 def onQuit(self):
 libervia_widget.LiberviaWidget.onQuit(self)
 if self.type == C.CHAT_GROUP:
+self.host.removeListener('presence', self.presenceListener)
 self.host.bridge.call('mucLeave', None, unicode(self.target.bare))
 def setUserNick(self, nick):
 """Set the nick of the user, usefull for e.g. change the color of the user"""
 self.nick = nick
-def setPresents(self, nicks):
+def addUser(self, nick):
-"""Set the occupants of a group chat.
-@param nicks (list[unicode]): sorted list of nicknames
-"""
-QuickChat.setPresents(self, nicks)
-self.occupants_panel.setList([jid.JID(u"%s/%s" % (self.target, nick)) for nick in nicks])
-def replaceUser(self, nick, show_info=True):
 """Add user if it is not in the group list"""
-QuickChat.replaceUser(self, nick, show_info)
+QuickChat.addUser(self, nick)
 occupant_jid = jid.JID("%s/%s" % (unicode(self.target), nick))
 self.occupants_panel.addContact(occupant_jid)
-def removeUser(self, nick, show_info=True):
+def removeUser(self, nick):
 """Remove a user from the group list"""
-QuickChat.removeUser(self, nick, show_info)
+QuickChat.removeUser(self, nick)
 occupant_jid = jid.JID("%s/%s" % (unicode(self.target), nick))
 self.occupants_panel.removeContact(occupant_jid)
 def changeUserNick(self, old_nick, new_nick):
 assert self.type == C.CHAT_GROUP
-# FIXME
 # self.occupants_panel.removeOccupant(old_nick)
 # self.occupants_panel.addOccupant(new_nick)
 self.printInfo(_("%(old_nick)s is now known as %(new_nick)s") % {'old_nick': old_nick, 'new_nick': new_nick})
 # def historyPrint(self, size=C.HISTORY_LIMIT_DEFAULT):
 # None is returned, the message is managed
 return
 self.content.add(ChatText(nick, mymess, msg, extra))
 self.content_scroll.scrollToBottom()
-def setState(self, state, nick=None):
+def setTitle(self, title=None, extra=None):
-"""Set the chat state (XEP-0085) of the contact. Leave nick to None
+"""Refresh the title of this Chat dialog
-to set the state for a one2one conversation, or give a nickname or
-C.ALL_OCCUPANTS to set the state of a participant within a MUC.
+@param title (unicode): main title or None to use default
-@param state: the new chat state
+@param extra (dict{unicode: unicode}): extra info
-@param nick: ignored for one2one, otherwise the MUC user nick or C.ALL_OCCUPANTS
+"""
-"""
+if title is None:
-return # FIXME
+title = unicode(self.target.bare)
-if self.type == C.CHAT_GROUP:
+if extra:
-assert(nick)
+extra_title = ' '.join([u'({})'.format(value) for value in extra.values()])
-if nick == C.ALL_OCCUPANTS:
+title = '%s %s' % (title, extra_title)
-occupants = self.occupants_panel.occupants_panel.keys()
+libervia_widget.LiberviaWidget.setTitle(self, title)
-else:
-occupants = [nick] if nick in self.occupants_panel.occupants_panel else []
-for occupant in occupants:
-self.occupants_panel.occupants_panel[occupant].setState(state)
-else:
-self._state = state
-self.refreshTitle()
-self.state_machine.started = not not state  # start to send "composing" state from now
-def refreshTitle(self):
-"""Refresh the title of this Chat dialog"""
-title = unicode(self.target.bare)
-if self._state:
-title += " (%s)".format(self._state)
-self.setTitle(title)
 def setConnected(self, jid_s, resource, availability, priority, statuses):
 """Set connection status
 @param jid_s (unicode): JID userhost as unicode
 """
 assert(jid_s == self.target.bare)
 if self.type != C.CHAT_GROUP:
 return
 box = self.occupants_panel.getOccupantBox(resource)
 if box:
-contact_list.setPresenceStyle(box, availability)
+html_tools.setPresenceStyle(box, availability)
-def updateChatState(self, from_jid, state):
+def setOccupantStates(self, occupant_jid, states):
-#TODO
+"""Set a MUC occupant's states.
-pass
+@param occupant_jid (jid.JID): occupant to update
+@param states (dict{unicode: unicode}): new states
+"""
+self.occupants_panel.getContactBox(occupant_jid).updateStates(states)
+if 'chat_state' in states.keys():  # start/stop sending "composing" state from now
+self.chat_state_machine.started = not not states['chat_state']
+def setContactStates(self, contact_jid, states):
+"""Set a one2one contact's states.
+@param contact_jid (jid.JID): contact
+@param states (dict{unicode: unicode}): new states
+"""
+self.setTitle(extra=states)
+if 'chat_state' in states.keys():  # start/stop sending "composing" state from now
+self.chat_state_machine.started = not not states['chat_state']
 def addGamePanel(self, widget):
 """Insert a game panel to this Chat dialog.
 @param widget (Widget): the game panel

Mercurial > libervia-web

comparison src/browser/sat_browser/chat.py @ 684:e876f493dccc