fix the hide_join_exit and hide_status_change options not working, also don't send the vcard if we are not using anonymous auth

3 files changed, 8 insertions, 1 deletions

diff --git a/src/multiuserchat.py b/src/multiuserchat.py
index a54874a7..fec1d0d3 100644
--- a/src/multiuserchat.py
+++ b/src/multiuserchat.py
@@ -140,7 +140,8 @@ class MultiUserChat(object):
             else:
                 nick = config.get('default_nick', 'poezio')
             self.handler.emit('join-room', room=roomname, nick=nick)
-        self.vcard_sender.start()
+        if config.get('jid', '') == '': # Don't send the vcard if we're not anonymous
+            self.vcard_sender.start()   # because the user ALREADY has one on the server
 
     def send_message(self, room, message):
         mes = Message(to=room)
diff --git a/src/room.py b/src/room.py
index f210aa4c..bcd302a8 100644
--- a/src/room.py
+++ b/src/room.py
@@ -65,6 +65,8 @@ class Room(object):
         in the room anymore
         """
         user = self.get_user_by_name(nickname) if nickname is not None else None
+        if user:
+            user.set_last_talked(datetime.now())
         time = time if time is not None else datetime.now()
         color = None
         if nickname is not None:
diff --git a/src/user.py b/src/user.py
index 6f0f3328..6dc87c73 100644
--- a/src/user.py
+++ b/src/user.py
@@ -52,10 +52,14 @@ class User(object):
         Return True if the user talked since the last s seconds
         """
         from common import debug
+        debug('anus===========\n')
         if self.last_talked is None:
+            debug('return False1\n')
             return False
         delta = timedelta(0, t)
         debug("Last talk: %s\nDelai:%s\nDelta:%s\n" % (str(self.last_talked), str(t), str(delta)))
         if datetime.now() - delta > self.last_talked:
+            debug('return False2\n')
             return False
+        debug('return True')
         return True