From e9d5dbbe7218a67dfbf6e29ed8844002c50bf0c0 Mon Sep 17 00:00:00 2001
From: "psyc://psyced.org/~lynX" <@>
Date: Sat, 27 Feb 2010 11:34:19 +0100
Subject: [PATCH] -

---
 world/net/library.i           | 2 +-
 world/net/place/userthreads.c | 4 ++--
 world/net/psyc/library.i      | 5 +++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/world/net/library.i b/world/net/library.i
index 34ac854..ef79a46 100644
--- a/world/net/library.i
+++ b/world/net/library.i
@@ -41,7 +41,7 @@ mapping confmap = ([]);
 mapping systemQ;
 
 // protos
-//string legal_name(string n);
+//string legal_name(string n, int isPlace);
 //string legal_mailto(string a);
 int psyc_sendmsg(mixed target, string method, mixed data, mapping vars,
 	        int showingLog, mixed source, array(mixed) uniform);
diff --git a/world/net/place/userthreads.c b/world/net/place/userthreads.c
index e62e3d3..d51a974 100644
--- a/world/net/place/userthreads.c
+++ b/world/net/place/userthreads.c
@@ -79,7 +79,7 @@ _request_add(source, mc, data, vars, b) {
     }
 
     unless (ni && p && (p->qFriend(target) || p->qFollower(target))) {
-	sendmsg(source, "_error_add",
+	sendmsg(source, "_error_request_add", // FIXMC
 		"Error: [_person] is not a friend or follower.", ([ "_person": vars["_person"]]));
 	return 1;
     }
@@ -102,7 +102,7 @@ _request_remove(source, mc, data, vars, b) {
     object target = summon_person(vars["_person"], NET_PATH "user") || vars["_person"];
 
     unless (p && (qMember(target) || p->qFriend(target) || p->qFollower(target))) {
-	sendmsg(source, "_error_add",
+	sendmsg(source, "_error_request_remove", // FIXMC
 		"Can't remove: [_person] is not a friend or follower.", ([ "_person": vars["_person"]]));
 	return 1;
     }
diff --git a/world/net/psyc/library.i b/world/net/psyc/library.i
index 46f551c..dedb30a 100644
--- a/world/net/psyc/library.i
+++ b/world/net/psyc/library.i
@@ -136,10 +136,11 @@ object find_psyc_object(array(mixed) u) {
 		case '~':
 #ifdef _flag_enable_module_microblogging
 			if (u[UChannel]) {
-			    t = lower_case(r + "#" + u[UChannel]);
+			    t = lower_case(r +"#"+ u[UChannel]);
 			    r = PLACE_PATH + t;
 			    if (o = find_object(r)) break;
-			    unless (t = legal_name(t)) break;
+			    unless (t = legal_name(t, 1)) break;
+			    // untreated catch? interesting..
 			    catch(o = r -> load(t));
 			}
 #endif