From 2de03e7220dba18bef590bf9aafd21d081e85249 Mon Sep 17 00:00:00 2001
From: "psyc://psyced.org/~lynX" <@>
Date: Sun, 8 Nov 2009 20:04:56 +0100
Subject: [PATCH] client _examine was falling thru to _HTML

---
 CHANGESTODO         | 3 ++-
 world/net/person.c  | 4 ++++
 world/net/user.c    | 8 +++++---
 world/net/usercmd.i | 1 +
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/CHANGESTODO b/CHANGESTODO
index 8251242..cbfdb1f 100644
--- a/CHANGESTODO
+++ b/CHANGESTODO
@@ -3985,4 +3985,5 @@ usercmd
 	doesn't provide _availability (just provides _mood for example)
 -	tycho: Availability degree is not checked by server and can
 	be negative, like -5.
-
+user
+-	psyc client _examine was falling thru to _HTML output, added return;
diff --git a/world/net/person.c b/world/net/person.c
index 8068d2d..309260e 100644
--- a/world/net/person.c
+++ b/world/net/person.c
@@ -1345,6 +1345,10 @@ case "_request_execute":
 				// this should be renamed into _context but
 				// that cannot be done before _context is
 				// renamed into _channel .. hehe
+				//
+				// also this would be the perfect place to
+				// make a distinction between _focus and _group
+				// if we wanted to.. actually, no, we want _context
 				if (stringp(t = vars["_focus"]
 					     || vars["_group"])) {
 					// check if the uniform is one of
diff --git a/world/net/user.c b/world/net/user.c
index 595f2fa..6d5abe9 100644
--- a/world/net/user.c
+++ b/world/net/user.c
@@ -793,6 +793,7 @@ case "_status_description_place":
 				     "_source_relay": source,
 				    "_uniform_style": vars["_uniform_style"]
 			]) + vars);
+			return 1;
 		    case "_HTML":
 			// client wants HTML
 			if (v("locations")[0]) sendmsg(v("locations")[0],
@@ -802,6 +803,7 @@ case "_status_description_place":
 				     "_source_relay": source,
 				    "_uniform_style": vars["_uniform_style"]
 			]));
+			return 1;
 		    case "_surf":
 			// we're doing a /surf, so stop here
 			return 1;
@@ -814,7 +816,7 @@ case "_status_description_place":
 		// hmmm.. well, that's how psyc to client happens here
 		mc = "_list"+ mc[7..];
 		w(mc+"_on", data, ([		// used by irc whois..
-		   "_source_relay": source,
+		   "_source_relay": source, "_tag_reply": t,
 		   "_nick" : vars["_nick"] || vars["_nick_place"],
 		   "_name_public" : vars["_name_public"] || "",
 		   "_action_motto" : vars["_action_motto"] || "",
@@ -822,8 +824,8 @@ case "_status_description_place":
 		]));
 		listDescription(vars, 1);
 		w(mc+"_off", 0, ([
-		     "_source_relay": source,
-		     "_nick" : vars["_nick"] ]));
+		   "_source_relay": source, "_tag_reply": t,
+		   "_nick" : vars["_nick"] ]));
 		return 1;
 case "_status_place_members_none_automatic":
 		if (beQuiet != -1) {
diff --git a/world/net/usercmd.i b/world/net/usercmd.i
index b3bff73..21058b5 100644
--- a/world/net/usercmd.i
+++ b/world/net/usercmd.i
@@ -1631,6 +1631,7 @@ case "_leave":
 			     , 1, vars["_flag"]);
 		return 1;
 case "_invite":
+		// _focus has been taken care of beforehand in person.c
 		if (t = vars["_person"]) {
 			unless (place) return w("_error_status_place_none",
 			  "You aren't in a room");