copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Send active instead of gone as last chatstate 

- Also attempt to fix #9446
This commit is contained in:
Philipp Hörist 2018-12-19 13:47:47 +01:00
parent 6ed2094b67
commit f93797e26d
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gajim/common/modules/chatstates.py
View File

@ -171,6 +171,11 @@ class Chatstate:
if contact is not None: if contact is not None:
contact = contact.as_contact() contact = contact.as_contact()
else: else:
# Contact not found, maybe we left the group chat
# or the contact was removed from the roster
log.info(
'Contact %s not found, reset chatstate', jid)
self._chatstates.pop(jid, None)
self._last_mouse_activity.pop(jid, None) self._last_mouse_activity.pop(jid, None)
self._last_keyboard_activity.pop(jid, None) self._last_keyboard_activity.pop(jid, None)
continue continue
@ -206,14 +211,21 @@ class Chatstate:
current_state = self._chatstates.get(contact.jid) current_state = self._chatstates.get(contact.jid)
setting = app.config.get('outgoing_chat_state_notifications') setting = app.config.get('outgoing_chat_state_notifications')
if setting == 'disabled': if setting == 'disabled':
# Send a last 'gone' state after user disabled chatstates # Send a last 'active' state after user disabled chatstates
if current_state is not None: if current_state is not None:
log.info('Send: %-10s - %s', State.GONE, contact.jid) log.info('Send: %-10s - %s', State.ACTIVE, contact.jid)
event_attrs = {'account': self._account,
'jid': contact.jid,
'chatstate': str(State.ACTIVE)}
if contact.is_groupchat():
app.nec.push_outgoing_event( app.nec.push_outgoing_event(
MessageOutgoingEvent(None, GcMessageOutgoingEvent(None, **event_attrs))
account=self._account, else:
jid=contact.jid, app.nec.push_outgoing_event(
chatstate=str(State.GONE))) MessageOutgoingEvent(None, **event_attrs))
self._chatstates.pop(contact.jid, None) self._chatstates.pop(contact.jid, None)
self._last_mouse_activity.pop(contact.jid, None) self._last_mouse_activity.pop(contact.jid, None)
self._last_keyboard_activity.pop(contact.jid, None) self._last_keyboard_activity.pop(contact.jid, None)