From 3e48f15b1763908d9ae438346aee9aebb7d7c911 Mon Sep 17 00:00:00 2001 From: Gabor Adam Toth Date: Wed, 24 Feb 2010 06:10:19 +0100 Subject: [PATCH] /status url fix for user channels --- world/net/place/archetype.gen | 7 ++++++- world/net/place/threads.c | 4 ---- world/net/place/userthreads.c | 3 +-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/world/net/place/archetype.gen b/world/net/place/archetype.gen index 262deac..c39758a 100644 --- a/world/net/place/archetype.gen +++ b/world/net/place/archetype.gen @@ -2029,7 +2029,7 @@ showStatus(verbosity, al, person, mc, data, vars) { // problem with POST over https apparently.. (HTTP_URL) # endif - + "/@"+ MYNICK +" "+ + + "/"+ pathName() +" "+ # endif # ifdef SIP_PATH // "sip:#"+ MYLOWERNICK +"@"+ SERVER_HOST +" "+ @@ -2126,6 +2126,11 @@ psycName() { return "@"+MYLOWERNICK; } +pathName() { + ASSERT("pathName", stringp(MYNICK), MYNICK) + return "@"+MYNICK; +} + // inheritance hooks leave(source, mc, data, vars) { return 1; } enter(source, mc, data, vars) { // mayEnter? diff --git a/world/net/place/threads.c b/world/net/place/threads.c index f4c28d8..5f62e15 100644 --- a/world/net/place/threads.c +++ b/world/net/place/threads.c @@ -631,10 +631,6 @@ numEntries() { return sizeof(_thread); } -pathName() { - return psycName(); -} - // old stuff #if 0 diff --git a/world/net/place/userthreads.c b/world/net/place/userthreads.c index 3e49712..c46e191 100644 --- a/world/net/place/userthreads.c +++ b/world/net/place/userthreads.c @@ -212,10 +212,9 @@ qHistoryGlimpse() { } psycName() { - ASSERT("psycName", stringp(MYNICK), MYNICK) return MYLOWERNICK; } pathName() { - return regreplace(psycName(), "#", "/", 1); + return regreplace(MYNICK, "#", "/", 1); }