From 1b8efa17b01822d462128cbd8c65cc5b7aa7b420 Mon Sep 17 00:00:00 2001
From: "psyc://psyced.org/~lynX" <@>
Date: Fri, 10 Apr 2009 05:02:35 +0200
Subject: [PATCH] don't get upset by _message_video

---
 world/net/person.c            | 5 +++++
 world/net/place/archetype.gen | 4 ++--
 world/net/user.c              | 6 ++++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/world/net/person.c b/world/net/person.c
index c4d4224..eec58b2 100644
--- a/world/net/person.c
+++ b/world/net/person.c
@@ -1318,6 +1318,11 @@ case "_message_echo":
 case "_message_public":
 			// avoid treating this as _message here
 			break;
+case "_message_video":
+case "_message_audio":
+			// not being displayed to users other than psyc clients
+			data = 0;
+			break;
 case "_message":
 			// this is only visible in person.c, not user.c
 			// therefore probably useless
diff --git a/world/net/place/archetype.gen b/world/net/place/archetype.gen
index 72e0d4e..44a5b24 100644
--- a/world/net/place/archetype.gen
+++ b/world/net/place/archetype.gen
@@ -1414,8 +1414,8 @@ msg(source, mc, data, mapping vars) {
 			return 0;
 		}
 		// ist das die nette antwort auf /m channel ?
-		// vorsicht aber mit _message_public_question
-		if (!abbrev("_message_public", mc)) mc = "_message_public";
+		if (mc == "_message_private") mc = "_message_public";
+		// vorsicht mit _message_public_question und _message_video
 	}
 	/* if the source is not a member of the room and was allowed 
 	 * because of qAllowExternal* we probably should use the rooms
diff --git a/world/net/user.c b/world/net/user.c
index f18fce2..a2e132d 100644
--- a/world/net/user.c
+++ b/world/net/user.c
@@ -615,6 +615,12 @@ case "_jabber_iq_set":
 case "_jabber":
 		P1(("%O got %O", ME, mc))
 		break;
+case "_message_video":
+case "_message_audio":  
+		// not being displayed to users other than psyc clients
+		if (v("scheme") != "psyc") return 1;
+		data = "";	// temporary for @welcome history
+		break;
 case "_message_private_question":
 		variant = "_ask" + variant;
 		m_delete(vars, "_action");