reset self-ping timer on every MUC message

This commit is contained in:
Georg Lukas 2015-06-01 12:56:42 +02:00 committed by mathieui
parent 68b40354cf
commit 4e8cef2a77
No known key found for this signature in database
GPG key ID: C59F84CEEFD616E3

View file

@ -1554,9 +1554,7 @@ class MucTab(ChatTab):
if self is not self.core.current_tab(): if self is not self.core.current_tab():
self.state = 'disconnected' self.state = 'disconnected'
self.joined = False self.joined = False
if self.self_ping_event is not None: self.disable_self_ping_event()
self.core.remove_timed_event(self.self_ping_event)
self.self_ping_event = None
def get_single_line_topic(self): def get_single_line_topic(self):
""" """
@ -1618,6 +1616,10 @@ class MucTab(ChatTab):
in the room anymore in the room anymore
Return True if the message highlighted us. False otherwise. Return True if the message highlighted us. False otherwise.
""" """
# reset self-ping interval
self.enable_self_ping_event()
self.log_message(txt, nickname, time=time, typ=kwargs.get('typ', 1)) self.log_message(txt, nickname, time=time, typ=kwargs.get('typ', 1))
args = dict() args = dict()
for key, value in kwargs.items(): for key, value in kwargs.items():
@ -1674,9 +1676,15 @@ class MucTab(ChatTab):
delay = config.get_by_tabname("self_ping_delay", self.general_jid, default=0) delay = config.get_by_tabname("self_ping_delay", self.general_jid, default=0)
if delay <= 0: # use 0 or some negative value to disable it if delay <= 0: # use 0 or some negative value to disable it
return return
self.disable_self_ping_event()
self.self_ping_event = timed_events.DelayedEvent(delay, self.send_self_ping) self.self_ping_event = timed_events.DelayedEvent(delay, self.send_self_ping)
self.core.add_timed_event(self.self_ping_event) self.core.add_timed_event(self.self_ping_event)
def disable_self_ping_event(self):
if self.self_ping_event is not None:
self.core.remove_timed_event(self.self_ping_event)
self.self_ping_event = None
def send_self_ping(self): def send_self_ping(self):
to = self.name + "/" + self.own_nick to = self.name + "/" + self.own_nick
self.core.xmpp.plugin['xep_0199'].send_ping(jid=to, self.core.xmpp.plugin['xep_0199'].send_ping(jid=to,