aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Merge branch 'master' into plugins

Browse Source
This commit is contained in:
James Booth 2014-01-23 19:28:21 +00:00
commit 6fcece3263
1 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/command/commands.c
View File

@ -1841,8 +1841,29 @@ 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)) { 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);
@ -1851,6 +1872,18 @@ cmd_tiny(gchar **args, struct cmd_help_t help)
} }
ui_outgoing_msg("me", recipient, tiny); ui_outgoing_msg("me", recipient, tiny);
}
#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);
#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);