From 0748ec28f50bd691c910e062ab0c5623d4e9aa66 Mon Sep 17 00:00:00 2001
From: "psyc://psyced.org/~lynX" <@>
Date: Sat, 20 Aug 2011 08:55:58 +0200
Subject: [PATCH] evil probe

---
 CHANGESTODO         |  2 ++
 world/net/usercmd.i | 12 +++++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/CHANGESTODO b/CHANGESTODO
index a53834b..ba6631f 100644
--- a/CHANGESTODO
+++ b/CHANGESTODO
@@ -184,6 +184,8 @@ problems that should disappear when we move away from _nick's:
 - IRC shows "*** k kindly asks for your friendship." for remote
   friendship requests. eh! where's the uniform!?
 - remote /topic shows wrong nick
++ allow newbies to use /nick and switch to a different newbie name?
+  (also, forbid +alias from being used by newbies?)
 
 > PRESENCE STATUS
 + all _status_person need to be upgraded to _status_presence with
diff --git a/world/net/usercmd.i b/world/net/usercmd.i
index 1057027..c7b4b5c 100644
--- a/world/net/usercmd.i
+++ b/world/net/usercmd.i
@@ -2455,9 +2455,15 @@ friend(rm, entity, ni, trustee) {
 		// normally auto-acknowledge this request
 		sendmsg(entity, "_request_friendship_implied",
 			0, ([ "_nick": MYNICK, "_degree_availability": availability ]) );
-		sendmsg(entity, "_request_status_person",
-			0, ([ "_nick": MYNICK ]) );
-		// did i just say something about symmetry?
+		// don't know how this hack got here but it drives some
+		// jabber servers nuts as you are not supposed to probe
+		// people that you aren't subscribed to, yet
+		//sendmsg(entity, "_request_status_person",
+		//	0, ([ "_nick": MYNICK ]) );
+		// we should instead ensure we are always sending our presence
+		// status once a subscription is completed.. FIXME
+		// or we just scrap it all and redo context subscription
+		// strictly as suggested by the new specs.. sigh
 #ifdef TRY_THIS
 		// currently friend() only gets called from
 		// online commands. so we skip the if