psyc-mirrors/psyced
1
0
Fork 0
mirror of git://git.psyced.org/git/psyced synced 2024-08-15 03:25:10 +00:00
Code Issues 2 Releases Wiki Activity

use the UNick

Browse source
This commit is contained in:
psyc://psyced.org/~lynX 2009-03-04 11:27:19 +01:00
parent 8e4e990261
commit 6fd2423ff9
17 changed files with 52 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

2
world/net/jabber/common.c
View file

@ -150,7 +150,7 @@ varargs string mkjid(mixed who, mixed vars, mixed ignore_context, string target
t = PLACEPREFIX + NODEPREP(vars["_nick_place"]) +"@"+ NAMEPREP(jabberhost);
} else if (u = parse_uniform(vars["_context"])) {
if (u[UScheme] == "psyc")
t = PLACEPREFIX + NODEPREP(u[UResource][1..]) + "@" + NAMEPREP(u[UHost]);
t = PLACEPREFIX + NODEPREP(u[UNick]) + "@" + NAMEPREP(u[UHost]);
else // here we presume we have a u@h or xmpp:
t = NODEPREP(u[UUser]) + "@" + NAMEPREP(u[UHost]);
} else {

2
world/net/jabber/mixin_render.c
View file

@ -404,7 +404,7 @@ int msg(string source, string mc, string data,
break;
case "kick": // TODO: we could add a callback for this
mc = "_request_execute_kick";
vars["_nick_target"] = is_formal(args[1]) ? parse_uniform(args[1])[UResource] : args[1];
vars["_nick_target"] = is_formal(args[1]) ? parse_uniform(args[1])[UNick] : args[1];
vars["_reason"] = ARGS(2);
break;
case "ban": // TODO: we could add a callback for this

6
world/net/jabber/user.c
View file

@ -532,7 +532,7 @@ message(XMLNode node) {
P0(("private message in place.. from %O to %O\n",
ME, o))
sendmsg(o, "_message_public_whisper",
node["/body"][Cdata], ([ "_nick_target": u[UResource] || u[UUser]]));
node["/body"][Cdata], ([ "_nick_target": u[UNick]]));
}
#endif
return 1;
@ -1164,9 +1164,9 @@ varargs string mkjid(mixed who, mixed vars, mixed ignore_nick, mixed ignore_cont
// or let psyc users be the same person as on xmpp?
// YES we want transparent upgrades from xmpp to psyc!
if (t[0] == '@')
t = PLACEPREFIX+ t[1..] +"@"+ u[UHost];
t = PLACEPREFIX+ u[UNick] +"@"+ u[UHost];
else
t = t[1..] +"@"+ u[UHost];
t = u[UNick] +"@"+ u[UHost];
} else {
// the usual "shouldn't happen" case which however does
t = u[UHost];