psyc-mirrors
/
psyced
mirror of git://git.psyced.org/git/psyced
1
0
Fork 0
Code Issues 2 Releases Wiki Activity

route local xmpp: uniforms (thx indigo6)

This commit is contained in:
psyc://psyced.org/~lynX 2009-12-31 21:39:07 +01:00
parent 7c9a7e82dd
commit 0050ebd46b
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
world/default/en/plain.textdb
View File

@ -1353,7 +1353,7 @@ _notice_link_service
_notice_link
|[_location] linked to [_identification].
|You are now connected to this big marshmellow in the sky.
|## You are now connected to this big marshmellow in the sky.
_notice_unlink_exit
|I wish you good sleep or a fun night-out.

15
world/net/library.i
View File

@ -812,10 +812,23 @@ varargs mixed sendmsg(mixed target, string mc, mixed data, vamapping vars,
// fall thru
case "xmpp":
#ifdef SWITCH2PSYC
// maybe we should treat all of this just as if
// no scheme was given (jid treatment below)
P4(("LOOKing for %O in %O\n",
"psyc://"+u[UHost]+"/", targets))
tmp = targets["psyc://"+u[UHost]+"/"];
if (tmp) { // && interactive(tmp)) {
if (tmp) {
// are we talking to our own net/root?
// in the past we used interactive() here
unless (clonep(tmp)) {
tmp = summon_person(u[UNick]);
unless (tmp) {
// doesn't have to be an error.. use jid treatment below?
sendmsg(source, "_failure_unavailable_route_place_XMPP",
"Sorry, you can't talk to a local chatroom via XMPP uniform.");
return 0;
}
}
PT(("SWITCH2PSYC delivery %O for %O (%s)\n", tmp, target,
mc || "0"))
// we should very probably generate a redirect here instead! TODO