devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-30 20:06:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Encrypt /tiny command when in OTR session

Browse Source 
fixes #292
This commit is contained in:
James Booth
2014-01-23 19:25:53 +00:00
parent 21ab182151
commit 3f31c1a4e7
2 changed files with 35 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/command/command.c
View File

@@ -1199,6 +1199,7 @@ cmd_execute_default(const char * const inp)
win_type_t win_type = ui_current_win_type(); win_type_t win_type = ui_current_win_type();
jabber_conn_status_t status = jabber_get_connection_status(); jabber_conn_status_t status = jabber_get_connection_status();
char *recipient = ui_current_recipient(); char *recipient = ui_current_recipient();
cons_debug("Recipient: %s", recipient);
switch (win_type) switch (win_type)
{ {

35
src/command/commands.c
View File

@@ -1838,8 +1838,40 @@ cmd_tiny(gchar **args, struct cmd_help_t help)
if (tiny != NULL) { if (tiny != NULL) {
if (win_type == WIN_CHAT) { if (win_type == WIN_CHAT) {
char *recipient = ui_current_recipient(); char *recipient = ui_current_recipient();
message_send(tiny, recipient); #ifdef HAVE_LIBOTR
if (otr_is_secure(recipient)) {
char *encrypted = otr_encrypt_message(recipient, tiny);
if (encrypted != NULL) {
message_send(encrypted, recipient);
otr_free_message(encrypted);
if (prefs_get_boolean(PREF_CHLOG)) {
const char *jid = jabber_get_fulljid();
Jid *jidp = jid_create(jid);
if (strcmp(prefs_get_string(PREF_OTR_LOG), "on") == 0) {
chat_log_chat(jidp->barejid, recipient, tiny, PROF_OUT_LOG, NULL);
} else if (strcmp(prefs_get_string(PREF_OTR_LOG), "redact") == 0) {
chat_log_chat(jidp->barejid, recipient, "[redacted]", PROF_OUT_LOG, NULL);
}
jid_destroy(jidp);
}
ui_outgoing_msg("me", recipient, tiny);
} else {
cons_show_error("Failed to send message.");
}
} else {
message_send(tiny, recipient);
if (prefs_get_boolean(PREF_CHLOG)) {
const char *jid = jabber_get_fulljid();
Jid *jidp = jid_create(jid);
chat_log_chat(jidp->barejid, recipient, tiny, PROF_OUT_LOG, NULL);
jid_destroy(jidp);
}
ui_outgoing_msg("me", recipient, tiny);
}
#else
message_send(tiny, recipient);
if (prefs_get_boolean(PREF_CHLOG)) { if (prefs_get_boolean(PREF_CHLOG)) {
const char *jid = jabber_get_fulljid(); const char *jid = jabber_get_fulljid();
Jid *jidp = jid_create(jid); Jid *jidp = jid_create(jid);
@@ -1848,6 +1880,7 @@ cmd_tiny(gchar **args, struct cmd_help_t help)
} }
ui_outgoing_msg("me", recipient, tiny); ui_outgoing_msg("me", recipient, tiny);
#endif
} else if (win_type == WIN_PRIVATE) { } else if (win_type == WIN_PRIVATE) {
char *recipient = ui_current_recipient(); char *recipient = ui_current_recipient();
message_send(tiny, recipient); message_send(tiny, recipient);