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

Reset chatstate correctly if contact goes offline

This commit is contained in:
Philipp Hörist 2018-10-11 00:11:03 +02:00
parent bae95858aa
commit c81711fdf0
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,29 +74,37 @@ class Chatstate:
return return
full_jid = stanza.getFrom() full_jid = stanza.getFrom()
jid = full_jid.getStripped()
if self._con.get_own_jid().bareMatch(full_jid): if self._con.get_own_jid().bareMatch(full_jid):
return return
contact = app.contacts.get_contact_from_full_jid( contact = app.contacts.get_gc_contact(
self._account, str(full_jid)) self._account, full_jid.getStripped(), full_jid.getResource())
if contact is None or contact.is_gc_contact: if contact is None:
contact = app.contacts.get_contact_from_full_jid(
self._account, str(full_jid))
if contact is None:
return return
if contact.chatstate is None: if contact.chatstate is None:
return return
if contact.is_gc_contact:
jid = contact.get_full_jid()
else:
jid = contact.jid
contact.chatstate = None contact.chatstate = None
self._chatstates.pop(contact.jid, None) self._chatstates.pop(jid, None)
self._last_mouse_activity.pop(contact.jid, None) self._last_mouse_activity.pop(jid, None)
self._last_keyboard_activity.pop(jid, None)
log.info('Reset chatstate for %s', jid) log.info('Reset chatstate for %s', jid)
app.nec.push_outgoing_event( app.nec.push_outgoing_event(
NetworkEvent('chatstate-received', NetworkEvent('chatstate-received',
account=self._account, account=self._account,
jid=jid)) contact=contact))
def delegate(self, event: Any) -> None: def delegate(self, event: Any) -> None:
if self._con.get_own_jid().bareMatch(event.jid) or event.sent: if self._con.get_own_jid().bareMatch(event.jid) or event.sent:
@ -133,10 +141,12 @@ class Chatstate:
return GLib.SOURCE_CONTINUE return GLib.SOURCE_CONTINUE
now = time.time() now = time.time()
for jid, time_ in self._last_mouse_activity.items(): for jid in list(self._last_mouse_activity.keys()):
time_ = self._last_mouse_activity[jid]
current_state = self._chatstates.get(jid) current_state = self._chatstates.get(jid)
if current_state is None: if current_state is None:
self._last_mouse_activity.pop(jid, None) self._last_mouse_activity.pop(jid, None)
self._last_keyboard_activity.pop(jid, None)
continue continue
if current_state in (State.GONE, State.INACTIVE): if current_state in (State.GONE, State.INACTIVE):
@ -162,6 +172,7 @@ class Chatstate:
contact = contact.as_contact() contact = contact.as_contact()
else: else:
self._last_mouse_activity.pop(jid, None) self._last_mouse_activity.pop(jid, None)
self._last_keyboard_activity.pop(jid, None)
continue continue
self.set_chatstate(contact, new_chatstate) self.set_chatstate(contact, new_chatstate)
@ -205,6 +216,7 @@ class Chatstate:
chatstate=str(State.GONE))) chatstate=str(State.GONE)))
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)
return return
if not contact.is_groupchat(): if not contact.is_groupchat():