aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2025-01-03 14:57:42 -05:00
Code

Merge pull request #1504 from xenrox/request-voice

Browse Source 
MUC: Add voice request
This commit is contained in:
Michael Vetter 2021-03-16 13:15:38 +01:00 committed by GitHub
commit 0044da01ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 107 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/command/cmd_ac.c
View File

@ -206,7 +206,8 @@ static Autocomplete rooms_list_ac;
static Autocomplete rooms_cache_ac;
static Autocomplete affiliation_ac;
static Autocomplete role_ac;
static Autocomplete privilege_cmd_ac;
static Autocomplete affiliation_cmd_ac;
static Autocomplete role_cmd_ac;
static Autocomplete subject_ac;
static Autocomplete form_ac;
static Autocomplete form_field_multi_ac;
@ -752,9 +753,14 @@ cmd_ac_init(void)
autocomplete_add(role_ac, "visitor");
autocomplete_add(role_ac, "none");
privilege_cmd_ac = autocomplete_new();
autocomplete_add(privilege_cmd_ac, "list");
autocomplete_add(privilege_cmd_ac, "set");
affiliation_cmd_ac = autocomplete_new();
autocomplete_add(affiliation_cmd_ac, "list");
autocomplete_add(affiliation_cmd_ac, "request");
autocomplete_add(affiliation_cmd_ac, "set");
role_cmd_ac = autocomplete_new();
autocomplete_add(role_cmd_ac, "list");
autocomplete_add(role_cmd_ac, "set");
subject_ac = autocomplete_new();
autocomplete_add(subject_ac, "set");
@ -1300,7 +1306,8 @@ cmd_ac_reset(ProfWin* window)
autocomplete_reset(rooms_cache_ac);
autocomplete_reset(affiliation_ac);
autocomplete_reset(role_ac);
autocomplete_reset(privilege_cmd_ac);
autocomplete_reset(affiliation_cmd_ac);
autocomplete_reset(role_cmd_ac);
autocomplete_reset(subject_ac);
autocomplete_reset(form_ac);
autocomplete_reset(form_field_multi_ac);
@ -1457,7 +1464,8 @@ cmd_ac_uninit(void)
autocomplete_free(rooms_cache_ac);
autocomplete_free(affiliation_ac);
autocomplete_free(role_ac);
autocomplete_free(privilege_cmd_ac);
autocomplete_free(affiliation_cmd_ac);
autocomplete_free(role_cmd_ac);
autocomplete_free(subject_ac);
autocomplete_free(form_ac);
autocomplete_free(form_field_multi_ac);
@ -3106,7 +3114,7 @@ _affiliation_autocomplete(ProfWin* window, const char* const input, gboolean pre
return result;
}
result = autocomplete_param_with_ac(input, "/affiliation", privilege_cmd_ac, TRUE, previous);
result = autocomplete_param_with_ac(input, "/affiliation", affiliation_cmd_ac, TRUE, previous);
if (result) {
return result;
}
@ -3156,7 +3164,7 @@ _role_autocomplete(ProfWin* window, const char* const input, gboolean previous)
return result;
}
result = autocomplete_param_with_ac(input, "/role", privilege_cmd_ac, TRUE, previous);
result = autocomplete_param_with_ac(input, "/role", role_cmd_ac, TRUE, previous);
if (result) {
return result;
}

6
src/command/cmd_defs.c
View File

@ -692,13 +692,15 @@ static struct cmd_t command_defs[] = {
CMD_TAG_GROUPCHAT)
CMD_SYN(
"/affiliation set <affiliation> <jid> [<reason>]",
"/affiliation list [<affiliation>]")
"/affiliation list [<affiliation>]",
"/affiliation request")
CMD_DESC(
"Manage room affiliations. "
"Affiliation may be one of owner, admin, member, outcast or none.")
CMD_ARGS(
{ "set <affiliation> <jid> [<reason>]", "Set the affiliation of user with jid, with an optional reason." },
{ "list [<affiliation>]", "List all users with the specified affiliation, or all if none specified." })
{ "list [<affiliation>]", "List all users with the specified affiliation, or all if none specified." },
{ "request", "Request voice."})
CMD_NOEXAMPLES
},

5
src/command/cmd_funcs.c
View File

@ -4161,6 +4161,11 @@ cmd_affiliation(ProfWin* window, const char* const command, gchar** args)
}
}
if (g_strcmp0(cmd, "request") == 0) {
message_request_voice(mucwin->roomjid);
return TRUE;
}
cons_bad_cmd_usage(command);
return TRUE;
}

12
src/xmpp/message.c
View File

@ -1560,3 +1560,15 @@ _openpgp_signcrypt(xmpp_ctx_t* ctx, const char* const to, const char* const text
return signcrypt;
}
#endif // HAVE_LIBGPGME
void
message_request_voice(const char* const roomjid)
{
xmpp_ctx_t* const ctx = connection_get_ctx();
xmpp_stanza_t* stanza = stanza_request_voice(ctx, roomjid);
log_debug("Requesting voice in %s", roomjid);
_send_message_stanza(stanza);
xmpp_stanza_release(stanza);
}

58
src/xmpp/stanza.c
View File

@ -2755,3 +2755,61 @@ stanza_change_password(xmpp_ctx_t* ctx, const char* const user, const char* cons
return iq;
}
xmpp_stanza_t*
stanza_request_voice(xmpp_ctx_t* ctx, const char* const room)
{
char* id = connection_create_stanza_id();
xmpp_stanza_t* message = xmpp_message_new(ctx, NULL, room, id);
free(id);
xmpp_stanza_t* request_voice_st = xmpp_stanza_new(ctx);
xmpp_stanza_set_name(request_voice_st, STANZA_NAME_X);
xmpp_stanza_set_type(request_voice_st, STANZA_TYPE_SUBMIT);
xmpp_stanza_set_ns(request_voice_st, STANZA_NS_DATA);
xmpp_stanza_t* form_type = xmpp_stanza_new(ctx);
xmpp_stanza_set_name(form_type, STANZA_NAME_FIELD);
xmpp_stanza_set_attribute(form_type, STANZA_ATTR_VAR, "FORM_TYPE");
xmpp_stanza_t* value_request = xmpp_stanza_new(ctx);
xmpp_stanza_set_name(value_request, STANZA_NAME_VALUE);
xmpp_stanza_t* request_text = xmpp_stanza_new(ctx);
xmpp_stanza_set_text(request_text, STANZA_NS_VOICEREQUEST);
xmpp_stanza_add_child(value_request, request_text);
xmpp_stanza_release(request_text);
xmpp_stanza_add_child(form_type, value_request);
xmpp_stanza_release(value_request);
xmpp_stanza_add_child(request_voice_st, form_type);
xmpp_stanza_release(form_type);
xmpp_stanza_t* request_role = xmpp_stanza_new(ctx);
xmpp_stanza_set_name(request_role, STANZA_NAME_FIELD);
xmpp_stanza_set_attribute(request_role, STANZA_ATTR_VAR, "muc#role");
xmpp_stanza_set_attribute(request_role, STANZA_ATTR_TYPE, "list-single");
xmpp_stanza_set_attribute(request_role, STANZA_ATTR_LABEL, "Requested role");
xmpp_stanza_t* value_role = xmpp_stanza_new(ctx);
xmpp_stanza_set_name(value_role, STANZA_NAME_VALUE);
xmpp_stanza_t* role_text = xmpp_stanza_new(ctx);
xmpp_stanza_set_text(role_text, "participant");
xmpp_stanza_add_child(value_role, role_text);
xmpp_stanza_release(role_text);
xmpp_stanza_add_child(request_role, value_role);
xmpp_stanza_release(value_role);
xmpp_stanza_add_child(request_voice_st, request_role);
xmpp_stanza_release(request_role);
xmpp_stanza_add_child(message, request_voice_st);
xmpp_stanza_release(request_voice_st);
return message;
}

7
src/xmpp/stanza.h
View File

@ -158,6 +158,7 @@
#define STANZA_TYPE_SET "set"
#define STANZA_TYPE_ERROR "error"
#define STANZA_TYPE_RESULT "result"
#define STANZA_TYPE_SUBMIT "submit"
#define STANZA_ATTR_TO "to"
#define STANZA_ATTR_FROM "from"
@ -186,6 +187,7 @@
#define STANZA_ATTR_FILENAME "filename"
#define STANZA_ATTR_SIZE "size"
#define STANZA_ATTR_CONTENTTYPE "content-type"
#define STANZA_ATTR_LABEL "label"
#define STANZA_TEXT_AWAY "away"
#define STANZA_TEXT_DND "dnd"
@ -233,6 +235,7 @@
#define STANZA_NS_EXT_GAJIM_BOOKMARKS "xmpp:gajim.org/bookmarks"
#define STANZA_NS_RSM "http://jabber.org/protocol/rsm"
#define STANZA_NS_REGISTER "jabber:iq:register"
#define STANZA_NS_VOICEREQUEST "http://jabber.org/protocol/muc#request"
#define STANZA_DATAFORM_SOFTWARE "urn:xmpp:dataforms:softwareinfo"
@ -338,7 +341,6 @@ xmpp_stanza_t* stanza_create_command_config_submit_iq(xmpp_ctx_t* ctx, const cha
void stanza_attach_publish_options_va(xmpp_ctx_t* const ctx, xmpp_stanza_t* const iq, int count, ...);
void stanza_attach_publish_options(xmpp_ctx_t* const ctx, xmpp_stanza_t* const iq, const char* const option, const char* const value);
xmpp_stanza_t* stanza_create_omemo_devicelist_request(xmpp_ctx_t* ctx, const char* const id, const char* const jid);
xmpp_stanza_t* stanza_create_omemo_devicelist_subscribe(xmpp_ctx_t* ctx, const char* const jid);
xmpp_stanza_t* stanza_create_omemo_devicelist_publish(xmpp_ctx_t* ctx, GList* const ids);
@ -396,4 +398,7 @@ xmpp_stanza_t* stanza_create_mam_iq(xmpp_ctx_t* ctx, const char* const jid, cons
xmpp_stanza_t* stanza_change_password(xmpp_ctx_t* ctx, const char* const user, const char* const password);
xmpp_stanza_t*
stanza_request_voice(xmpp_ctx_t* ctx, const char* const room);
#endif

1
src/xmpp/xmpp.h
View File

@ -214,6 +214,7 @@ void message_send_composing(const char* const jid);
void message_send_paused(const char* const jid);
void message_send_gone(const char* const jid);
void message_send_invite(const char* const room, const char* const contact, const char* const reason);
void message_request_voice(const char* const roomjid);
bool message_is_sent_by_us(const ProfMessage* const message, bool checkOID);

5
tests/unittests/xmpp/stub_xmpp.c
View File

@ -213,6 +213,11 @@ message_send_invite(const char* const room, const char* const contact,
{
}
void
message_request_voice(const char* const roomjid)
{
}
bool
message_is_sent_by_us(const ProfMessage* const message, bool checkOID)
{