server on /join can be omitted, fixed #1525 Also reorganize various functions in common.py and update CHANGELOG

1 files changed, 2 insertions, 10 deletions

diff --git a/src/multiuserchat.py b/src/multiuserchat.py
index 0ac52725..4fb0d389 100644
--- a/src/multiuserchat.py
+++ b/src/multiuserchat.py
@@ -29,16 +29,8 @@ from time import (altzone, gmtime, localtime, strftime, timezone)
 from handler import Handler
 from config import config
 
-def get_stripped_jid(jid):
-    """Return the stripped JID (bare representation)"""
-    if isinstance(jid, basestring):
-        jid = JID(jid)
-    return jid.getStripped()
-
-def is_jid(jid):
-    """Return True if this is a valid JID"""
-    if JID(jid).getNode() != '':
-        return True
+from common import get_stripped_jid
+from common import is_jid
 
 class VcardSender(threading.Thread):
     """