From 67cf4c79135bf6deada8393313525a632d5156ea Mon Sep 17 00:00:00 2001 From: souliane Date: Wed, 13 Jan 2016 13:07:36 +0100 Subject: [PATCH] plugin XEP-0045: raise a special error when the room has already been joined --- src/plugins/plugin_xep_0045.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/plugins/plugin_xep_0045.py b/src/plugins/plugin_xep_0045.py index 7626b302..d358665c 100755 --- a/src/plugins/plugin_xep_0045.py +++ b/src/plugins/plugin_xep_0045.py @@ -60,6 +60,9 @@ class UnknownRoom(Exception): pass +class AlreadyJoinedRoom(Exception): + pass + class NotReadyYet(Exception): pass @@ -363,7 +366,7 @@ class XEP_0045(object): return _errDeferred() if room_jid in self.clients[profile].joined_rooms: log.warning(_(u'%(profile)s is already in room %(room_jid)s') % {'profile': profile, 'room_jid': room_jid.userhost()}) - return _errDeferred() + return _errDeferred(AlreadyJoinedRoom, D_(u"The room has already been joined")) log.info(_(u"[%(profile)s] is joining room %(room)s with nick %(nick)s") % {'profile': profile, 'room': room_jid.userhost(), 'nick': nick}) if "history" in options: