From 61168c737c79ffa768ae7adfd2062b337f1795ed Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Sat, 14 Jun 2003 00:55:19 +0000
Subject: [PATCH] Don't double note UserMessage instead specifically note
 tells() which is the only circumstance where we're not getting sent our own
 message back to us.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2654 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 .../threerings/crowd/chat/server/ChatProvider.java    | 10 +++++++---
 .../threerings/crowd/chat/server/SpeakProvider.java   | 11 +++--------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/java/com/threerings/crowd/chat/server/ChatProvider.java b/src/java/com/threerings/crowd/chat/server/ChatProvider.java
index 4fc60ac58..760d0ce09 100644
--- a/src/java/com/threerings/crowd/chat/server/ChatProvider.java
+++ b/src/java/com/threerings/crowd/chat/server/ChatProvider.java
@@ -1,5 +1,5 @@
 //
-// $Id: ChatProvider.java,v 1.19 2003/06/03 21:41:33 ray Exp $
+// $Id: ChatProvider.java,v 1.20 2003/06/14 00:55:19 mdb Exp $
 
 package com.threerings.crowd.chat.server;
 
@@ -125,8 +125,12 @@ public class ChatProvider
     public static void sendTellMessage (
         BodyObject target, String speaker, String bundle, String message)
     {
-        SpeakProvider.sendMessage(target,
-            new UserMessage(message, bundle, speaker, DEFAULT_MODE));
+        UserMessage msg =
+            new UserMessage(message, bundle, speaker, DEFAULT_MODE);
+        SpeakProvider.sendMessage(target, msg);
+
+        // note that the teller "heard" what they said
+        SpeakProvider.noteMessage(speaker, msg);
     }
 
     /** The distributed object manager used by the chat services. */
diff --git a/src/java/com/threerings/crowd/chat/server/SpeakProvider.java b/src/java/com/threerings/crowd/chat/server/SpeakProvider.java
index 4c64563b0..53c022697 100644
--- a/src/java/com/threerings/crowd/chat/server/SpeakProvider.java
+++ b/src/java/com/threerings/crowd/chat/server/SpeakProvider.java
@@ -1,5 +1,5 @@
 //
-// $Id: SpeakProvider.java,v 1.7 2003/06/14 00:47:16 mdb Exp $
+// $Id: SpeakProvider.java,v 1.8 2003/06/14 00:55:19 mdb Exp $
 
 package com.threerings.crowd.chat.server;
 
@@ -219,12 +219,6 @@ public class SpeakProvider
             Log.info("Unable to note listeners [dclass=" + speakObj.getClass() +
                      ", msg=" + msg + "].");
         }
-
-        // if this is a user message, note the message in their history as
-        // well
-        if (msg instanceof UserMessage) {
-            noteMessage(((UserMessage)msg).speaker, msg);
-        }
     }
 
     /**
@@ -243,7 +237,7 @@ public class SpeakProvider
      */
     public static void clearHistory (String username)
     {
-        Log.info("Clearing history for " + username + ".");
+        // Log.info("Clearing history for " + username + ".");
         _histories.remove(username);
     }
 
@@ -258,6 +252,7 @@ public class SpeakProvider
             msg.timestamp = System.currentTimeMillis();
         }
         getHistoryList(username).add(msg);
+        // Log.info("Noted that " + username + " heard " + msg + ".");
     }
 
     /**