about summary refs log tree commit diff stats
path: root/src/command/command.c
diff options
context:
space:
mode:
authorJames Booth <boothj5@gmail.com>2013-08-17 18:45:51 +0100
committerJames Booth <boothj5@gmail.com>2013-08-17 18:45:51 +0100
commit73eb4baf27d4b12704f6f7eceec24e8a43416256 (patch)
tree578864b7e89b15488a41b2176912a1ff45d8ece1 /src/command/command.c
parent41574ccdc62030cb9d24e6d923ad907754402834 (diff)
downloadprofani-tty-73eb4baf27d4b12704f6f7eceec24e8a43416256.tar.gz
Create fingerprints file, callbacks, and message send
Diffstat (limited to 'src/command/command.c')
-rw-r--r--src/command/command.c20
1 files changed, 20 insertions, 0 deletions
diff --git a/src/command/command.c b/src/command/command.c
index d8b955a2..1d87b7c9 100644
--- a/src/command/command.c
+++ b/src/command/command.c
@@ -38,6 +38,7 @@
 #include "jid.h"
 #include "log.h"
 #include "muc.h"
+#include "otr.h"
 #include "profanity.h"
 #include "tools/autocomplete.h"
 #include "tools/parser.h"
@@ -1129,7 +1130,13 @@ cmd_execute_default(const char * const inp)
             if (status != JABBER_CONNECTED) {
                 ui_current_print_line("You are not currently connected.");
             } else {
+#ifdef HAVE_LIBOTR
+                char *encrypted = otr_encrypt_message(recipient, inp);
+                message_send(encrypted, recipient);
+                otr_free_message(encrypted);
+#else
                 message_send(inp, recipient);
+#endif
 
                 if (prefs_get_boolean(PREF_CHLOG)) {
                     const char *jid = jabber_get_fulljid();
@@ -2151,7 +2158,14 @@ _cmd_msg(gchar **args, struct cmd_help_t help)
             usr_jid = usr;
         }
         if (msg != NULL) {
+#ifdef HAVE_LIBOTR
+            cons_debug("HAVE_LIBOTR, user_jid: %sm msg: %s", usr_jid, msg);
+            char *encrypted = otr_encrypt_message(usr_jid, msg);
+            message_send(encrypted, usr_jid);
+            otr_free_message(encrypted);
+#else
             message_send(msg, usr_jid);
+#endif
             ui_outgoing_msg("me", usr_jid, msg);
 
             if (((win_type == WIN_CHAT) || (win_type == WIN_CONSOLE)) && prefs_get_boolean(PREF_CHLOG)) {
@@ -2874,7 +2888,13 @@ _cmd_tiny(gchar **args, struct cmd_help_t help)
         if (tiny != NULL) {
             if (win_type == WIN_CHAT) {
                 char *recipient = ui_current_recipient();
+#ifdef HAVE_LIBOTR
+                char *encrypted = otr_encrypt_message(recipient, tiny);
+                message_send(encrypted, recipient);
+                otr_free_message(encrypted);
+#else
                 message_send(tiny, recipient);
+#endif
 
                 if (prefs_get_boolean(PREF_CHLOG)) {
                     const char *jid = jabber_get_fulljid();