From b82dbb416c0c50a1664091dccf016cf91be84bab Mon Sep 17 00:00:00 2001
From: Nathan Curtis <nathan@threerings.net>
Date: Fri, 11 Apr 2008 17:03:24 +0000
Subject: [PATCH] Modify requestTell() to accept an optional localFeedback
 parameter, defaulting to ChatCodes.PLACE_CHAT_TYPE that gets used for any
 feedback generated from the tell process.  This will allow chat systems that
 display tells in a custom way (tabs) to distinguish tell-related feedback
 from other feedback.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4996 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 .../threerings/crowd/chat/client/ChatDirector.as    | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/as/com/threerings/crowd/chat/client/ChatDirector.as b/src/as/com/threerings/crowd/chat/client/ChatDirector.as
index 104c5783c..294902279 100644
--- a/src/as/com/threerings/crowd/chat/client/ChatDirector.as
+++ b/src/as/com/threerings/crowd/chat/client/ChatDirector.as
@@ -441,8 +441,11 @@ public class ChatDirector extends BasicDirector
      * @param target the username of the user to which the tell message should be delivered.
      * @param msg the contents of the tell message.
      * @param rl an optional result listener if you'd like to be notified of success or failure.
+     * @param feedbackLocaltype this local type will be used for both TellFeedbackMessages, and 
+     *                          regular feedback that is dispatched for away/idle messages.
      */
-    public function requestTell (target :Name, msg :String, rl :ResultListener) :void
+    public function requestTell (target :Name, msg :String, rl :ResultListener, 
+        feedbackLocaltype :String = ChatCodes.PLACE_CHAT_TYPE) :void
     {
         // make sure they can say what they want to say
         var message :String = filter(msg, target, true);
@@ -458,13 +461,13 @@ public class ChatDirector extends BasicDirector
                 "m.tell_failed", MessageBundle.taint(target), reason);
             var tfm :TellFeedbackMessage = new TellFeedbackMessage(target, msg, true);
             tfm.bundle = _bundle;
-            dispatchMessage(tfm, ChatCodes.PLACE_CHAT_TYPE);
+            dispatchMessage(tfm, feedbackLocaltype);
             if (rl != null) {
                 rl.requestFailed(null);
             }
         };
         var success :Function = function (idleTime :Long, awayMessage :String) :void {
-            dispatchMessage(new TellFeedbackMessage(target, message), ChatCodes.PLACE_CHAT_TYPE);
+            dispatchMessage(new TellFeedbackMessage(target, message), feedbackLocaltype);
             addChatter(target);
             if (rl != null) {
                 rl.requestCompleted(target);
@@ -476,7 +479,7 @@ public class ChatDirector extends BasicDirector
                 if (awayMessage != null) {
                     var msg :String = MessageBundle.tcompose(
                         "m.recipient_afk", target, awayMessage);
-                    displayFeedback(_bundle, msg);
+                    displaySystem(_bundle, msg, SystemMessage.FEEDBACK, feedbackLocaltype);
                 }
             }
 
@@ -489,7 +492,7 @@ public class ChatDirector extends BasicDirector
                 var rmsg :String = MessageBundle.compose(
                     "m.recipient_idle", MessageBundle.taint(target),
                     TimeUtil.getTimeOrderString(idle, TimeUtil.MINUTE));
-                displayFeedback(_bundle, rmsg);
+                displaySystem(_bundle, rmsg, SystemMessage.FEEDBACK, feedbackLocaltype);
             }
         };
         _cservice.tell(_cctx.getClient(), target, message, new TellAdapter(failure, success));