pep/poezio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'self-ping' into HEAD

Browse source 
Conflicts:
	src/tabs/muctab.py
This commit is contained in:
Florent Le Coz 2015-05-16 20:42:30 +02:00
commit 0d1ea0d8c3
3 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/ping.py
View file

@ -31,8 +31,6 @@ import time
class Plugin(BasePlugin): class Plugin(BasePlugin):
def init(self): def init(self):
self.core.xmpp.register_plugin('xep_0199')
self.core.xmpp.plugin['xep_0115'].update_caps()
self.api.add_command('ping', self.command_ping, self.api.add_command('ping', self.command_ping,
usage='<jid>', usage='<jid>',
help='Send an XMPP ping to jid (see XEP-0199).', help='Send an XMPP ping to jid (see XEP-0199).',

12
src/tabs/muctab.py
View file

@ -66,6 +66,8 @@ class MucTab(ChatTab):
self.topic = '' self.topic = ''
self.topic_from = '' self.topic_from = ''
self.remote_wants_chatstates = True self.remote_wants_chatstates = True
# Self ping event, so we can cancel it when we leave the room
self.self_ping_event = None
# We send active, composing and paused states to the MUC because # We send active, composing and paused states to the MUC because
# the chatstate may or may not be filtered by the MUC, # the chatstate may or may not be filtered by the MUC,
# that’s not our problem. # that’s not our problem.
@ -1152,6 +1154,9 @@ class MucTab(ChatTab):
self.core.current_tab().input.refresh() self.core.current_tab().input.refresh()
self.core.doupdate() self.core.doupdate()
self.core.enable_private_tabs(self.name) self.core.enable_private_tabs(self.name)
# Enable the self ping event, to regularly check if we
# are still in the room.
self.enable_self_ping_event()
else: else:
change_nick = '303' in status_codes change_nick = '303' in status_codes
kick = '307' in status_codes and typ == 'unavailable' kick = '307' in status_codes and typ == 'unavailable'
@ -1545,6 +1550,9 @@ 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.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):
""" """
@ -1694,3 +1702,7 @@ class MucTab(ChatTab):
nick_alias = re.sub('_*$', '', nick_alias) nick_alias = re.sub('_*$', '', nick_alias)
color = config.get_by_tabname(nick_alias, 'muc_colors') color = config.get_by_tabname(nick_alias, 'muc_colors')
return color return color
def on_self_ping_failed(self, iq):
self.command_part("the MUC server is not responding")
self.core.refresh_window()

1
src/timed_events.py
View file

@ -35,7 +35,6 @@ class DelayedEvent(object):
""" """
self.callback = callback self.callback = callback
self.args = args self.args = args
self.repetive = False
self.delay = delay self.delay = delay
# An asyncio handler, as returned by call_later() or call_at() # An asyncio handler, as returned by call_later() or call_at()
self.handler = None self.handler = None