From 795dae9aa2fc9f3938bd79f1f154d5e55eb9065c Mon Sep 17 00:00:00 2001
From: Maurizio Porrato <maurizio.porrato@gmail.com>
Date: Sun, 5 Sep 2010 18:16:00 +0200
Subject: [PATCH] More fixes to the crosslink "last" command

---
 twisted/plugins/frncrosslink.py | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/twisted/plugins/frncrosslink.py b/twisted/plugins/frncrosslink.py
index 5a4126d..0b13bfd 100755
--- a/twisted/plugins/frncrosslink.py
+++ b/twisted/plugins/frncrosslink.py
@@ -76,10 +76,6 @@ class FRNCrosslinkClient(FRNClient):
                         self.sendMultiLineTextMessage(client, cl)
                 elif cmd == "last":
                     ml = []
-                    if talking is None:
-                        ml.append("No client talking now")
-                    else:
-                        ml.append("%s is talking now" % talking.user.ON)
                     ml.append("Last active talkers (most recent first):")
                     for n in lastMessages:
                         ml.append(n)
@@ -97,21 +93,20 @@ class FRNCrosslinkClient(FRNClient):
         global talking, lastMessages
         self.txReq = False
         self.txOk = False
-        if talking is not None: # FIXME: This is not the right place
-            l = talking.user.ON
-            if len(lastMessages) > 0:
-                if lastMessages[0] == l:
-                    l = None
-            if l is not None:
-                lastMessages.insert(0, l)
-                lastMessages = lastMessages[:5]
         talking = None
         self.stopTransmission()
 
     def audioFrameReceived(self, from_id, frames):
-        global clients, talking
+        global clients, talking, lastMessages
         if talking is None or talking == self:
             talking = self
+            talkingUser = self.clients[from_id-1]['on']
+            if len(lastMessages) > 0:
+                if lastMessages[0] == talkingUser:
+                    talkingUser = None
+            if talkingUser is not None:
+                lastMessages.insert(0, talkingUser)
+                lastMessages = lastMessages[:5]
             for _, _, _, factory in clients:
                 conn = factory.connection
                 if conn != self: