From e876090b9375fb660d97760ecbc3923ac7b9f279 Mon Sep 17 00:00:00 2001
From: Ray Greenwell <ray@threerings.net>
Date: Tue, 16 Sep 2003 21:26:15 +0000
Subject: [PATCH] Cluster chat is still a special case: make a special call to
 the filter method of the chat director prior to sending cluster chat.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2796 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 .../com/threerings/crowd/chat/client/ChatDirector.java     | 4 ++--
 .../threerings/whirled/spot/client/SpotSceneDirector.java  | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/java/com/threerings/crowd/chat/client/ChatDirector.java b/src/java/com/threerings/crowd/chat/client/ChatDirector.java
index a80c5c397..ef060cd0d 100644
--- a/src/java/com/threerings/crowd/chat/client/ChatDirector.java
+++ b/src/java/com/threerings/crowd/chat/client/ChatDirector.java
@@ -1,5 +1,5 @@
 //
-// $Id: ChatDirector.java,v 1.48 2003/09/15 21:11:40 ray Exp $
+// $Id: ChatDirector.java,v 1.49 2003/09/16 21:26:15 ray Exp $
 
 package com.threerings.crowd.chat.client;
 
@@ -576,7 +576,7 @@ public class ChatDirector extends BasicDirector
     /**
      * Run a message through all the currently registered filters.
      */
-    protected String filter (String msg, String otherUser, boolean outgoing)
+    public String filter (String msg, String otherUser, boolean outgoing)
     {
         _filterMessageOp.setMessage(msg, otherUser, outgoing);
         _filters.apply(_filterMessageOp);
diff --git a/src/java/com/threerings/whirled/spot/client/SpotSceneDirector.java b/src/java/com/threerings/whirled/spot/client/SpotSceneDirector.java
index 2aeb7deaf..2aa669a92 100644
--- a/src/java/com/threerings/whirled/spot/client/SpotSceneDirector.java
+++ b/src/java/com/threerings/whirled/spot/client/SpotSceneDirector.java
@@ -1,5 +1,5 @@
 //
-// $Id: SpotSceneDirector.java,v 1.31 2003/08/13 00:11:03 mdb Exp $
+// $Id: SpotSceneDirector.java,v 1.32 2003/09/16 21:26:14 ray Exp $
 
 package com.threerings.whirled.spot.client;
 
@@ -270,7 +270,10 @@ public class SpotSceneDirector extends BasicDirector
             return false;
         }
 
-        _sservice.clusterSpeak(_ctx.getClient(), message, mode);
+        message = _chatdir.filter(message, null, true);
+        if (message != null) {
+            _sservice.clusterSpeak(_ctx.getClient(), message, mode);
+        }
         return true;
     }