projects
/
citadel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
start defining stuff that could handle subtokens - message-chatstate here.
[citadel.git]
/
citadel
/
modules
/
xmpp
/
token.def
diff --git
a/citadel/modules/xmpp/token.def
b/citadel/modules/xmpp/token.def
index a0013ef76f4085a566f0628490d72fe1e86c6602..d4470e02d38c89012d7027c4756d86013b927c69 100644
(file)
--- a/
citadel/modules/xmpp/token.def
+++ b/
citadel/modules/xmpp/token.def
@@
-6,7
+6,7
@@
TOKEN(iq,
STRPROP(iq, id);
STRPROP(iq, from);
STRPROP(iq, to);
STRPROP(iq, id);
STRPROP(iq, from);
STRPROP(iq, to);
- })
+ })
;
#define NAMESPACE_piq "bub"
#define NAMESPACE_piq "bub"
@@
-17,7
+17,7
@@
TOKEN(piq,
STRPROP(piq, id);
STRPROP(piq, from);
STRPROP(piq, to);
STRPROP(piq, id);
STRPROP(piq, from);
STRPROP(piq, to);
- })
+ })
;
#define NAMESPACE_message "jabber:client"
TOKEN(message,
#define NAMESPACE_message "jabber:client"
TOKEN(message,
@@
-26,8
+26,44
@@
TOKEN(message,
STRPROP(message, type);
STRPROP(message, id);
PAYLOAD(message, body);
STRPROP(message, type);
STRPROP(message, id);
PAYLOAD(message, body);
- })
+ })
;
+#define NAMESPACE_message_chatstate "http://jabber.org/protocol/chatstates"
+
+SUBTOKEN(message,
+ chatstate,
+ active,
+ {
+ CALLBACK(active);
+ });
+
+SUBTOKEN(message,
+ chatstate,
+ composing,
+ {
+ CALLBACK(composing);
+ });
+
+SUBTOKEN(message,
+ chatstate,
+ paused,
+ {
+ CALLBACK(paused);
+ });
+
+SUBTOKEN(message,
+ chatstate,
+ inactive,
+ {
+ CALLBACK(inactive);
+ });
+
+SUBTOKEN(message,
+ chatstate,
+ gone,
+ {
+ CALLBACK(gone);
+ });
// <message type='chat' id='purplef5a7ed34' to='testuser@blarg.potzblitz.outgesourced.org'><active xmlns='http://jabber.org/protocol/chatstates'/><body>gci</body></message>
// <message type='chat' id='purplef5a7ed34' to='testuser@blarg.potzblitz.outgesourced.org'><active xmlns='http://jabber.org/protocol/chatstates'/><body>gci</body></message>