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

jabber/user: fixed outgoing presence support (announce)

Browse Source
This commit is contained in:
psyc://psyced.org/~lynX 2009-03-02 19:34:31 +01:00
parent 85c3ee031d
commit beeea117bf
2 changed files with 15 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGESTODO
View File

@ -3921,4 +3921,4 @@ archetype
+ when joe says "/nick joe" it is understood as removing the /nick + when joe says "/nick joe" it is understood as removing the /nick
jabber/user jabber/user
- fixed major bug in output of presence state (showFriends) - fixed major bug in output of presence state (showFriends)
- fixed outgoing presence support (announce)

38
world/net/jabber/user.c
View File

@ -19,7 +19,8 @@ volatile int isplacemsg;
volatile int hasroster = 0; // client has requested roster volatile int hasroster = 0; // client has requested roster
volatile mapping affiliations = ([ ]); // hack to support affiliations volatile mapping jabber2avail,
affiliations = ([ ]); // hack to support affiliations
#include JABBER_PATH "disco.c" #include JABBER_PATH "disco.c"
// #include NET_PATH "members.i" // isn't this include redundant? // #include NET_PATH "members.i" // isn't this include redundant?
@ -30,6 +31,11 @@ qResource() { return resource; }
qHasCurrentPlace() { return 0; } qHasCurrentPlace() { return 0; }
void create() {
jabber2avail = shared_memory("jabber2avail");
return ::create();
}
/* it should be posible to do some things in a way that can be shared between /* it should be posible to do some things in a way that can be shared between
* user and active/gateway... mostly stuff like MUC-support, version requests * user and active/gateway... mostly stuff like MUC-support, version requests
* and such -- TODO * and such -- TODO
@ -400,32 +406,16 @@ presence(XMLNode node) {
} }
} /* end of directed presence handling */ } /* end of directed presence handling */
#endif // _flag_disable_presence_directed_XMPP #endif // _flag_disable_presence_directed_XMPP
#ifdef AVAILABILITY_AWAY else if (node["@type"] == "unavailable") {
else if (node["/show"]) {
// else this is one of the so-called "presence broadcasts"
// we will never support stupid broadcasts although we could
// do some fancy castmsg now
switch (node["/show"][Cdata]) {
case "away":
case "xa":
case "dnd":
// we simply map them to away
vSet("me", (node["/status"] &&
node["/status"][Cdata]) || "away");
announce(AVAILABILITY_AWAY);
break;
case "chat":
// chattativ? ab in den flirt-raum mit dir!
break;
default:
// away loeschen wenn gesetzt
break;
}
} else if (node["@type"] == "unavailable") {
// hey... we should logout those guys ;)
// announce OFFLINE manually here? no.. see comment in person:quit() // announce OFFLINE manually here? no.. see comment in person:quit()
// _flag_enable_manual_announce_XMPP is nothing we really need.. i think // _flag_enable_manual_announce_XMPP is nothing we really need.. i think
return quit(); return quit();
}
#ifdef AVAILABILITY_AWAY
else if (node["/show"]) {
// this is one of the so-called "presence broadcasts"
announce(jabber2avail[node["/show"] && node["/show"][Cdata]], 0, 0,
node["/status"] && node["/status"][Cdata]);
} else { } else {
// TODO: quiet? // TODO: quiet?
announce(AVAILABILITY_HERE); announce(AVAILABILITY_HERE);