1 files changed, 13 insertions, 13 deletions

diff --git a/Presence/Chat.hs b/Presence/Chat.hs
index 172c5242..b7343b5a 100644
--- a/Presence/Chat.hs
+++ b/Presence/Chat.hs
@@ -76,6 +76,7 @@ newtype RoomHandle = RH (TVar (Maybe ChatTransaction))
 
 data JoinedRoom k = JoinedRoom
     { joinedRoom :: Room k
+    , joinedNick :: Text
     , roomHandle :: RoomHandle
     , roomTransactions :: TChan ChatTransaction
     }
@@ -110,29 +111,28 @@ joinRoom k room jid nick = do
     v <- newTVar (Just $ ChatTransaction no jid nick [Join])
     modifyTVar' (roomDesiredTransaction room) $ Map.insert k v
     c <- dupTChan (roomChan room)
-    return $ JoinedRoom room (RH v) c
+    return $ JoinedRoom room nick (RH v) c
 
-partRoom :: JoinedRoom k -> Maybe Text -> Text -> STM ()
-partRoom (JoinedRoom room (RH v) c) jid nick = do
+partRoom :: JoinedRoom k -> Maybe Text -> STM ()
+partRoom (JoinedRoom room nick (RH v) c) jid = do
     writeTVar v Nothing -- Cancel pending chat.
-    sendChat (JoinedRoom room (RH v) c) jid nick [Part]
+    sendChat (JoinedRoom room nick (RH v) c) jid [Part]
     return ()
 
-sendChat :: JoinedRoom k -> Maybe Text -> Text -> [ChatEvent] -> STM Bool
-sendChat (JoinedRoom room (RH v) _) jid nick chat = do
+sendChat :: JoinedRoom k -> Maybe Text -> [ChatEvent] -> STM Bool
+sendChat (JoinedRoom room nick (RH v) _) jid chat = do
     mpending <- readTVar v
+    no <- readTVar $ roomFutureSeqNo room
     case mpending of
-        Nothing -> do
-            no <- readTVar $ roomFutureSeqNo room
+        Just (ChatTransaction no' _ _ _) | no' >= no -> return False
+        _ -> do
             writeTVar v (Just $ ChatTransaction no jid nick chat)
             return True
-        Just pending -> do
-            return False
 
 -- | Blocks until a transaction occurs.  Optionally, a failed transaction will
 -- be automatically renewed.
 readRoom :: Ord k => k -> JoinedRoom k -> STM (Bool, ChatTransaction)
-readRoom k (JoinedRoom room (RH v) c) = do
+readRoom k (JoinedRoom room _ (RH v) c) = do
     mpending <- readTVar v
     final <- readTChan c
     case mpending of
@@ -198,7 +198,7 @@ roomCommit room k t = do
             modifyTVar' (roomFutureSeqNo room) succ
             writeTChan (roomChan room) t
     v <- validateTransaction room k t
-    trace ("roomCommit " ++ show v) $ return ()
+    trace ("roomCommit " ++ show v ++ " " ++ show t) $ return ()
     case v of
         Valid Outside Inside -> do
             modifyTVar' (roomMembers room) $ Map.insert (chatSender t) PerMember
@@ -209,7 +209,7 @@ roomCommit room k t = do
             modifyTVar' (roomMembers room) $ Map.delete (chatSender t)
             fin
         Valid _ _ -> fin
-        _ -> return ()
+        bad -> trace ("validateTransaction: " ++ show bad) $ return ()
 
 roomPending :: Ord k => Room k -> STM (Map k ChatTransaction)
 roomPending room = do