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

4 files changed, 25 insertions, 6 deletions

diff --git a/data/default_config.cfg b/data/default_config.cfg
index c7cef3d5..cbae24c3 100644
--- a/data/default_config.cfg
+++ b/data/default_config.cfg
@@ -1,3 +1,7 @@
+# This is the default config for the XMPP client Poezio.
+# Comments should be on their own line and NOT at the end
+# of a meaningful line.
+
 [Poezio]
 
 # the server. Make sure the server you're using accepts anonymous authentification
@@ -23,6 +27,8 @@ jid =
 password = 
 
 # the rooms you will join automatically on startup, with associated nickname or not
+# format : room@server.tld/nickname:room2@server.tld/nickname2
+# default_nick will be used if "/nickname" is not specified
 rooms = poezio@conference.codingteam.net:discussion@kikoo.louiz.org
 
 # PROXY
@@ -58,9 +64,15 @@ highlight_on =
 #     if the user involved has talked since the last n seconds
 # The quit messages will be hidden only if hide_exit_join is 0
 # if the value is incorrect, -1 is assumed
-hide_exit_join = -1	 # all quit and join notices will be displayed
-hide_status_change = 120 # status changes won't be displayed unless
-			 # the user talked since less than 2 minutes
+# Default settings are :
+# - all quit and join notices will be displayed
+# - status changes won't be displayed unless
+#   the user talked since less than 2 minutes
+
+hide_exit_join = -1
+
+hide_status_change = 120
+
 
 # the full path to the photo (avatar) you want to use
 # it should be less than 16Ko
@@ -91,10 +103,10 @@ logfile = logs
 full_name = 
 
 # your personnal website
-website = http://codingteam.net/project/poezio
+website = http://poezio.eu
 
 # your e-mail address
 email = 
 
 # anything you want to say about you
-comment = I am using Poezio, it's a cool Jabber client. Check it out at http://codingteam.net/project/poezio.
\ No newline at end of file
+comment = I am using Poezio, it's a cool XMPP (Jabber) client. Check it out at http://poezio.eu
\ No newline at end of file
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