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

Implemented setting affiliation and listing affiliations

Browse Source
This commit is contained in:
James Booth
2014-10-04 23:40:36 +01:00
parent 719dbfaacc
commit 0b78a9a57e
6 changed files with 63 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/xmpp/iq.c
View File

@@ -276,21 +276,22 @@ _iq_room_config_cancel(const char * const room_jid)
}
static void
_iq_room_owner_add(const char * const room, const char * const jid, const char * const reason)
_iq_room_affiliation_list(const char * const room, const char * const affiliation)
{
xmpp_conn_t * const conn = connection_get_conn();
xmpp_ctx_t * const ctx = connection_get_ctx();
xmpp_stanza_t *iq = stanza_create_room_owner_add_iq(ctx, room, jid, reason);
xmpp_stanza_t *iq = stanza_create_room_affiliation_list_iq(ctx, room, affiliation);
xmpp_send(conn, iq);
xmpp_stanza_release(iq);
}
static void
_iq_room_owner_remove(const char * const room, const char * const jid, const char * const reason)
_iq_room_affiliation_set(const char * const room, const char * const jid, const char * const affiliation,
const char * const reason)
{
xmpp_conn_t * const conn = connection_get_conn();
xmpp_ctx_t * const ctx = connection_get_ctx();
xmpp_stanza_t *iq = stanza_create_room_owner_remove_iq(ctx, room, jid, reason);
xmpp_stanza_t *iq = stanza_create_room_affiliation_set_iq(ctx, room, jid, affiliation, reason);
xmpp_send(conn, iq);
xmpp_stanza_release(iq);
}
@@ -997,6 +998,6 @@ iq_init_module(void)
iq_submit_room_config = _iq_submit_room_config;
iq_send_caps_request = _iq_send_caps_request;
iq_room_info_request = _iq_room_info_request;
iq_room_owner_add = _iq_room_owner_add;
iq_room_owner_remove = _iq_room_owner_remove;
iq_room_affiliation_set = _iq_room_affiliation_set;
iq_room_affiliation_list = _iq_room_affiliation_list;
}

30
src/xmpp/stanza.c
View File

@@ -529,14 +529,13 @@ stanza_create_room_config_cancel_iq(xmpp_ctx_t *ctx, const char * const room_jid
}
xmpp_stanza_t *
stanza_create_room_owner_add_iq(xmpp_ctx_t *ctx, const char * const room, const char * const jid,
const char * const reason)
stanza_create_room_affiliation_list_iq(xmpp_ctx_t *ctx, const char * const room, const char * const affiliation)
{
xmpp_stanza_t *iq = xmpp_stanza_new(ctx);
xmpp_stanza_set_name(iq, STANZA_NAME_IQ);
xmpp_stanza_set_type(iq, STANZA_TYPE_SET);
xmpp_stanza_set_type(iq, STANZA_TYPE_GET);
xmpp_stanza_set_attribute(iq, STANZA_ATTR_TO, room);
char *id = create_unique_id("owner_add");
char *id = create_unique_id("affiliation_get");
xmpp_stanza_set_id(iq, id);
free(id);
@@ -546,20 +545,7 @@ stanza_create_room_owner_add_iq(xmpp_ctx_t *ctx, const char * const room, const
xmpp_stanza_t *item = xmpp_stanza_new(ctx);
xmpp_stanza_set_name(item, STANZA_NAME_ITEM);
xmpp_stanza_set_attribute(item, "affiliation", "owner");
xmpp_stanza_set_attribute(item, STANZA_ATTR_JID, jid);
if (reason) {
xmpp_stanza_t *reason_st = xmpp_stanza_new(ctx);
xmpp_stanza_set_name(reason_st, STANZA_NAME_REASON);
xmpp_stanza_t *reason_text = xmpp_stanza_new(ctx);
xmpp_stanza_set_text(reason_text, reason);
xmpp_stanza_add_child(reason_st, reason_text);
xmpp_stanza_release(reason_text);
xmpp_stanza_add_child(item, reason_st);
xmpp_stanza_release(reason_st);
}
xmpp_stanza_set_attribute(item, "affiliation", affiliation);
xmpp_stanza_add_child(query, item);
xmpp_stanza_release(item);
@@ -570,14 +556,14 @@ stanza_create_room_owner_add_iq(xmpp_ctx_t *ctx, const char * const room, const
}
xmpp_stanza_t *
stanza_create_room_owner_remove_iq(xmpp_ctx_t *ctx, const char * const room, const char * const jid,
const char * const reason)
stanza_create_room_affiliation_set_iq(xmpp_ctx_t *ctx, const char * const room, const char * const jid,
const char * const affiliation, const char * const reason)
{
xmpp_stanza_t *iq = xmpp_stanza_new(ctx);
xmpp_stanza_set_name(iq, STANZA_NAME_IQ);
xmpp_stanza_set_type(iq, STANZA_TYPE_SET);
xmpp_stanza_set_attribute(iq, STANZA_ATTR_TO, room);
char *id = create_unique_id("owner_remove");
char *id = create_unique_id("affiliation_set");
xmpp_stanza_set_id(iq, id);
free(id);
@@ -587,7 +573,7 @@ stanza_create_room_owner_remove_iq(xmpp_ctx_t *ctx, const char * const room, con
xmpp_stanza_t *item = xmpp_stanza_new(ctx);
xmpp_stanza_set_name(item, STANZA_NAME_ITEM);
xmpp_stanza_set_attribute(item, "affiliation", "admin");
xmpp_stanza_set_attribute(item, "affiliation", affiliation);
xmpp_stanza_set_attribute(item, STANZA_ATTR_JID, jid);
if (reason) {

8
src/xmpp/stanza.h
View File

@@ -205,10 +205,10 @@ xmpp_stanza_t* stanza_create_room_config_cancel_iq(xmpp_ctx_t *ctx,
const char * const room_jid);
xmpp_stanza_t* stanza_create_room_config_submit_iq(xmpp_ctx_t *ctx,
const char * const room, DataForm *form);
xmpp_stanza_t* stanza_create_room_owner_add_iq(xmpp_ctx_t *ctx, const char * const room, const char * const jid,
const char * const reason);
xmpp_stanza_t* stanza_create_room_owner_remove_iq(xmpp_ctx_t *ctx, const char * const room, const char * const jid,
const char * const reason);
xmpp_stanza_t* stanza_create_room_affiliation_list_iq(xmpp_ctx_t *ctx, const char * const room,
const char * const affiliation);
xmpp_stanza_t* stanza_create_room_affiliation_set_iq(xmpp_ctx_t *ctx, const char * const room, const char * const jid,
const char * const affiliation, const char * const reason);
int stanza_get_idle_time(xmpp_stanza_t * const stanza);
char * stanza_get_caps_str(xmpp_stanza_t * const stanza);

5
src/xmpp/xmpp.h
View File

@@ -192,8 +192,9 @@ void (*iq_send_ping)(const char * const target);
void (*iq_send_caps_request)(const char * const to, const char * const id,
const char * const node, const char * const ver);
void (*iq_room_info_request)(gchar *room);
void (*iq_room_owner_add)(const char * const room, const char * const jid, const char * const reason);
void (*iq_room_owner_remove)(const char * const room, const char * const jid, const char * const reason);
void (*iq_room_affiliation_list)(const char * const room, const char * const affiliation);
void (*iq_room_affiliation_set)(const char * const room, const char * const jid, const char * const affiliation,
const char * const reason);
// caps functions
Capabilities* (*caps_lookup)(const char * const jid);