about summary refs log tree commit diff stats
path: root/src/command/command.c
diff options
context:
space:
mode:
authorJames Booth <boothj5@gmail.com>2015-03-15 23:18:50 +0000
committerJames Booth <boothj5@gmail.com>2015-03-15 23:19:00 +0000
commit8944a3b5bb1eece467870f90e434134e1a3fb23a (patch)
treedf0bccecae43ab68928b54ef3e8b942984408dca /src/command/command.c
parent6f1119d225835e190bc1ec3e3b006a783aaa8c48 (diff)
downloadprofani-tty-8944a3b5bb1eece467870f90e434134e1a3fb23a.tar.gz
Move common chat logging code to log.c
Diffstat (limited to 'src/command/command.c')
-rw-r--r--src/command/command.c30
1 files changed, 3 insertions, 27 deletions
diff --git a/src/command/command.c b/src/command/command.c
index 5cf3f35d..5a882a20 100644
--- a/src/command/command.c
+++ b/src/command/command.c
@@ -1956,43 +1956,19 @@ _cmd_execute_default(const char * inp)
                     if (encrypted != NULL) {
                         char *id = message_send_chat_encrypted(chatwin->barejid, encrypted);
                         otr_free_message(encrypted);
-                        if (prefs_get_boolean(PREF_CHLOG)) {
-                            const char *jid = jabber_get_fulljid();
-                            Jid *jidp = jid_create(jid);
-                            char *pref_otr_log = prefs_get_string(PREF_OTR_LOG);
-                            if (strcmp(pref_otr_log, "on") == 0) {
-                                chat_log_chat(jidp->barejid, chatwin->barejid, inp, PROF_OUT_LOG, NULL);
-                            } else if (strcmp(pref_otr_log, "redact") == 0) {
-                                chat_log_chat(jidp->barejid, chatwin->barejid, "[redacted]", PROF_OUT_LOG, NULL);
-                            }
-                            prefs_free_string(pref_otr_log);
-                            jid_destroy(jidp);
-                        }
-
+                        chat_log_otr_msg_out(chatwin->barejid, inp);
                         ui_outgoing_chat_msg(chatwin->barejid, inp, id);
                     } else {
                         cons_show_error("Failed to send message.");
                     }
                 } else {
                     char *id = message_send_chat(chatwin->barejid, inp);
-                    if (prefs_get_boolean(PREF_CHLOG)) {
-                        const char *jid = jabber_get_fulljid();
-                        Jid *jidp = jid_create(jid);
-                        chat_log_chat(jidp->barejid, chatwin->barejid, inp, PROF_OUT_LOG, NULL);
-                        jid_destroy(jidp);
-                    }
-
+                    chat_log_msg_out(chatwin->barejid, inp);
                     ui_outgoing_chat_msg(chatwin->barejid, inp, id);
                 }
 #else
                 char *id = message_send_chat(chatwin->barejid, inp);
-                if (prefs_get_boolean(PREF_CHLOG)) {
-                    const char *jid = jabber_get_fulljid();
-                    Jid *jidp = jid_create(jid);
-                    chat_log_chat(jidp->barejid, chatwin->barejid, inp, PROF_OUT_LOG, NULL);
-                    jid_destroy(jidp);
-                }
-
+                chat_log_msg_out(chatwin->barejid, inp);
                 ui_outgoing_chat_msg(chatwin->barejid, inp, id);
 #endif
             }