devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 8 Actions Packages Projects 1 Releases Wiki Activity

Added /invite for direct MUC invitations

Browse Source
This commit is contained in:
James Booth
2013-04-20 20:18:13 +01:00
parent 91d587a19f
commit 81020e6d43
5 changed files with 85 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/xmpp/message.c
View File

@@ -93,6 +93,18 @@ message_send_groupchat(const char * const msg, const char * const recipient)
xmpp_stanza_release(message);
}
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)
{
@@ -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);

24
src/xmpp/stanza.c
View File

@@ -86,6 +86,30 @@ stanza_create_message(xmpp_ctx_t *ctx, const char * const recipient,
return msg;
}
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)

3
src/xmpp/stanza.h
View File

@@ -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);

2
src/xmpp/xmpp.h
View File

@@ -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);