diff options
| author | James Booth <boothj5@gmail.com> | 2013-04-20 20:18:13 +0100 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2013-04-20 20:18:13 +0100 |
| commit | 81020e6d4378e98039f1ba91bbba748c4283e7d1 (patch) | |
| tree | bde9e4eb6e9377a5451275b4a5a9ed46c5f156ba /src/xmpp | |
| parent | 91d587a19fde76a04560b3c100298253fd7d7aa5 (diff) | |
| download | profani-tty-81020e6d4378e98039f1ba91bbba748c4283e7d1.tar.gz | |
Added /invite for direct MUC invitations
Diffstat (limited to 'src/xmpp')
| -rw-r--r-- | src/xmpp/message.c | 29 | ||||
| -rw-r--r-- | src/xmpp/stanza.c | 24 | ||||
| -rw-r--r-- | src/xmpp/stanza.h | 3 | ||||
| -rw-r--r-- | src/xmpp/xmpp.h | 2 |
4 files changed, 41 insertions, 17 deletions
diff --git a/src/xmpp/message.c b/src/xmpp/message.c index ace42a31..d18abd62 100644 --- a/src/xmpp/message.c +++ b/src/xmpp/message.c @@ -94,6 +94,18 @@ message_send_groupchat(const char * const msg, const char * const recipient) } void +message_send_invite(const char * const room, const char * const contact, + const char * const reason) +{ + xmpp_conn_t * const conn = connection_get_conn(); + xmpp_ctx_t * const ctx = connection_get_ctx(); + xmpp_stanza_t *stanza = stanza_create_invite(ctx, room, contact, reason); + + xmpp_send(conn, stanza); + xmpp_stanza_release(stanza); +} + +void message_send_composing(const char * const recipient) { xmpp_conn_t * const conn = connection_get_conn(); @@ -149,23 +161,6 @@ static int _conference_message_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza, void * const userdata) { -/* - * <message to="prof2@panesar" from="test@conference.panesar"> - * <x xmlns="http://jabber.org/protocol/muc#user"> - * <invite from="prof4@panesar/2572c43f-aa3d-42fa-a74e-c322a80a90b8"> - * <reason>Join the room!</reason> - * </invite> - * </x> - * <x jid="test@conference.panesar" xmlns="jabber:x:conference"> - * Join the room! - * </x> - * <body> - * prof4@panesar/2572c43f-aa3d-42fa-a74e-c322a80a90b8 invited you to the room test@conference.panesar (Join the room!) - * </body> - * </message> - * - */ - xmpp_stanza_t *x_muc = xmpp_stanza_get_child_by_ns(stanza, STANZA_NS_MUC_USER); xmpp_stanza_t *x_groupchat = xmpp_stanza_get_child_by_ns(stanza, STANZA_NS_CONFERENCE); char *from = xmpp_stanza_get_attribute(stanza, STANZA_ATTR_FROM); diff --git a/src/xmpp/stanza.c b/src/xmpp/stanza.c index 47f809ae..68232382 100644 --- a/src/xmpp/stanza.c +++ b/src/xmpp/stanza.c @@ -87,6 +87,30 @@ stanza_create_message(xmpp_ctx_t *ctx, const char * const recipient, } xmpp_stanza_t * +stanza_create_invite(xmpp_ctx_t *ctx, const char * const room, + const char * const contact, const char * const reason) +{ + xmpp_stanza_t *message, *x; + + message = xmpp_stanza_new(ctx); + xmpp_stanza_set_name(message, STANZA_NAME_MESSAGE); + xmpp_stanza_set_attribute(message, STANZA_ATTR_TO, contact); + + x = xmpp_stanza_new(ctx); + xmpp_stanza_set_name(x, STANZA_NAME_X); + xmpp_stanza_set_ns(x, STANZA_NS_CONFERENCE); + + xmpp_stanza_set_attribute(x, STANZA_ATTR_JID, room); + if (reason != NULL) { + xmpp_stanza_set_attribute(x, STANZA_ATTR_REASON, reason); + } + + xmpp_stanza_add_child(message, x); + + return message; +} + +xmpp_stanza_t * stanza_create_room_join_presence(xmpp_ctx_t * const ctx, const char * const full_room_jid) { diff --git a/src/xmpp/stanza.h b/src/xmpp/stanza.h index f86b213d..3aa0cf6f 100644 --- a/src/xmpp/stanza.h +++ b/src/xmpp/stanza.h @@ -134,6 +134,9 @@ xmpp_stanza_t* stanza_create_ping_iq(xmpp_ctx_t *ctx); xmpp_stanza_t* stanza_create_disco_info_iq(xmpp_ctx_t *ctx, const char * const id, const char * const to, const char * const node); +xmpp_stanza_t* stanza_create_invite(xmpp_ctx_t *ctx, const char * const room, + const char * const contact, const char * const reason); + gboolean stanza_contains_chat_state(xmpp_stanza_t *stanza); gboolean stanza_get_delay(xmpp_stanza_t * const stanza, GTimeVal *tv_stamp); diff --git a/src/xmpp/xmpp.h b/src/xmpp/xmpp.h index 9b4000ad..0fa8cdf8 100644 --- a/src/xmpp/xmpp.h +++ b/src/xmpp/xmpp.h @@ -97,6 +97,8 @@ void message_send_inactive(const char * const recipient); void message_send_composing(const char * const recipient); void message_send_paused(const char * const recipient); void message_send_gone(const char * const recipient); +void message_send_invite(const char * const room, const char * const contact, + const char * const reason); // presence functions void presence_subscription(const char * const jid, const jabber_subscr_t action); |