ChronosXYZ/psyced
1
0
Fork 0
mirror of https://github.com/ChronosX88/psyced.git synced 2024-11-08 19:41:00 +00:00
Code Issues Projects Releases Wiki Activity

client _examine was falling thru to _HTML

Browse Source
This commit is contained in:
psyc://psyced.org/~lynX 2009-11-08 20:04:56 +01:00
parent c324da0255
commit 2de03e7220
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGESTODO
View File

@ -3985,4 +3985,5 @@ usercmd
doesn't provide _availability (just provides _mood for example) doesn't provide _availability (just provides _mood for example)
- tycho: Availability degree is not checked by server and can - tycho: Availability degree is not checked by server and can
be negative, like -5. be negative, like -5.
user
- psyc client _examine was falling thru to _HTML output, added return;

4
world/net/person.c
View File

@ -1345,6 +1345,10 @@ case "_request_execute":
// this should be renamed into _context but // this should be renamed into _context but
// that cannot be done before _context is // that cannot be done before _context is
// renamed into _channel .. hehe // 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"] if (stringp(t = vars["_focus"]
|| vars["_group"])) { || vars["_group"])) {
// check if the uniform is one of // check if the uniform is one of

8
world/net/user.c
View File

@ -793,6 +793,7 @@ case "_status_description_place":
"_source_relay": source, "_source_relay": source,
"_uniform_style": vars["_uniform_style"] "_uniform_style": vars["_uniform_style"]
]) + vars); ]) + vars);
return 1;
case "_HTML": case "_HTML":
// client wants HTML // client wants HTML
if (v("locations")[0]) sendmsg(v("locations")[0], if (v("locations")[0]) sendmsg(v("locations")[0],
@ -802,6 +803,7 @@ case "_status_description_place":
"_source_relay": source, "_source_relay": source,
"_uniform_style": vars["_uniform_style"] "_uniform_style": vars["_uniform_style"]
])); ]));
return 1;
case "_surf": case "_surf":
// we're doing a /surf, so stop here // we're doing a /surf, so stop here
return 1; return 1;
@ -814,7 +816,7 @@ case "_status_description_place":
// hmmm.. well, that's how psyc to client happens here // hmmm.. well, that's how psyc to client happens here
mc = "_list"+ mc[7..]; mc = "_list"+ mc[7..];
w(mc+"_on", data, ([ // used by irc whois.. w(mc+"_on", data, ([ // used by irc whois..
"_source_relay": source, "_source_relay": source, "_tag_reply": t,
"_nick" : vars["_nick"] || vars["_nick_place"], "_nick" : vars["_nick"] || vars["_nick_place"],
"_name_public" : vars["_name_public"] || "", "_name_public" : vars["_name_public"] || "",
"_action_motto" : vars["_action_motto"] || "", "_action_motto" : vars["_action_motto"] || "",
@ -822,8 +824,8 @@ case "_status_description_place":
])); ]));
listDescription(vars, 1); listDescription(vars, 1);
w(mc+"_off", 0, ([ w(mc+"_off", 0, ([
"_source_relay": source, "_source_relay": source, "_tag_reply": t,
"_nick" : vars["_nick"] ])); "_nick" : vars["_nick"] ]));
return 1; return 1;
case "_status_place_members_none_automatic": case "_status_place_members_none_automatic":
if (beQuiet != -1) { if (beQuiet != -1) {

1
world/net/usercmd.i
View File

@ -1631,6 +1631,7 @@ case "_leave":
, 1, vars["_flag"]); , 1, vars["_flag"]);
return 1; return 1;
case "_invite": case "_invite":
// _focus has been taken care of beforehand in person.c
if (t = vars["_person"]) { if (t = vars["_person"]) {
unless (place) return w("_error_status_place_none", unless (place) return w("_error_status_place_none",
"You aren't in a room"); "You aren't in a room");