1 files changed, 46 insertions, 45 deletions

diff --git a/src/server_events.c b/src/server_events.c
index 335ecf2d..be0b7d5e 100644
--- a/src/server_events.c
+++ b/src/server_events.c
@@ -292,96 +292,97 @@ handle_room_message(const char * const room_jid, const char * const nick,
 }
 
 void
-handle_incoming_message(char *from, char *message, gboolean priv)
+handle_incoming_private_message(char *fulljid, char *message)
+{
+    ui_incoming_private_msg(fulljid, message, NULL);
+}
+
+void
+handle_incoming_message(char *barejid, char *message)
 {
 #ifdef HAVE_LIBOTR
     gboolean was_decrypted = FALSE;
     char *newmessage;
 
-    prof_otrpolicy_t policy = otr_get_policy(from);
+    prof_otrpolicy_t policy = otr_get_policy(barejid);
     char *whitespace_base = strstr(message,OTRL_MESSAGE_TAG_BASE);
 
-    if (!priv) {
-        //check for OTR whitespace (opportunistic or always)
-        if (policy == PROF_OTRPOLICY_OPPORTUNISTIC || policy == PROF_OTRPOLICY_ALWAYS) {
-            if (whitespace_base) {
-                if (strstr(message, OTRL_MESSAGE_TAG_V2) || strstr(message, OTRL_MESSAGE_TAG_V1)) {
-                    // Remove whitespace pattern for proper display in UI
-                    // Handle both BASE+TAGV1/2(16+8) and BASE+TAGV1+TAGV2(16+8+8)
-                    int tag_length	=	24;
-                    if (strstr(message, OTRL_MESSAGE_TAG_V2) && strstr(message, OTRL_MESSAGE_TAG_V1)) {
-                        tag_length = 32;
-                    }
-                    memmove(whitespace_base, whitespace_base+tag_length, tag_length);
-                    char *otr_query_message = otr_start_query();
-                    cons_show("OTR Whitespace pattern detected. Attempting to start OTR session...");
-                    message_send(otr_query_message, from);
+    //check for OTR whitespace (opportunistic or always)
+    if (policy == PROF_OTRPOLICY_OPPORTUNISTIC || policy == PROF_OTRPOLICY_ALWAYS) {
+        if (whitespace_base) {
+            if (strstr(message, OTRL_MESSAGE_TAG_V2) || strstr(message, OTRL_MESSAGE_TAG_V1)) {
+                // Remove whitespace pattern for proper display in UI
+                // Handle both BASE+TAGV1/2(16+8) and BASE+TAGV1+TAGV2(16+8+8)
+                int tag_length	=	24;
+                if (strstr(message, OTRL_MESSAGE_TAG_V2) && strstr(message, OTRL_MESSAGE_TAG_V1)) {
+                    tag_length = 32;
                 }
+                memmove(whitespace_base, whitespace_base+tag_length, tag_length);
+                char *otr_query_message = otr_start_query();
+                cons_show("OTR Whitespace pattern detected. Attempting to start OTR session...");
+                message_send(otr_query_message, barejid);
             }
         }
-        newmessage = otr_decrypt_message(from, message, &was_decrypted);
+    }
+    newmessage = otr_decrypt_message(barejid, message, &was_decrypted);
 
-        // internal OTR message
-        if (newmessage == NULL) {
-            return;
-        }
-    } else {
-        newmessage = message;
+    // internal OTR message
+    if (newmessage == NULL) {
+        return;
     }
+
     if (policy == PROF_OTRPOLICY_ALWAYS && !was_decrypted && !whitespace_base) {
         char *otr_query_message = otr_start_query();
         cons_show("Attempting to start OTR session...");
-        message_send(otr_query_message, from);
+        message_send(otr_query_message, barejid);
     }
 
-    ui_incoming_msg(from, newmessage, NULL, priv);
+    ui_incoming_msg(barejid, newmessage, NULL);
 
-    if (prefs_get_boolean(PREF_CHLOG) && !priv) {
-        Jid *from_jid = jid_create(from);
+    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 (!was_decrypted || (strcmp(pref_otr_log, "on") == 0)) {
-            chat_log_chat(jidp->barejid, from_jid->barejid, newmessage, PROF_IN_LOG, NULL);
+            chat_log_chat(jidp->barejid, barejid, newmessage, PROF_IN_LOG, NULL);
         } else if (strcmp(pref_otr_log, "redact") == 0) {
-            chat_log_chat(jidp->barejid, from_jid->barejid, "[redacted]", PROF_IN_LOG, NULL);
+            chat_log_chat(jidp->barejid, barejid, "[redacted]", PROF_IN_LOG, NULL);
         }
         prefs_free_string(pref_otr_log);
 
         jid_destroy(jidp);
-        jid_destroy(from_jid);
     }
 
-    if (!priv)
-        otr_free_message(newmessage);
+    otr_free_message(newmessage);
 #else
-    ui_incoming_msg(from, message, NULL, priv);
+    ui_incoming_msg(barejid, message, NULL);
 
-    if (prefs_get_boolean(PREF_CHLOG) && !priv) {
-        Jid *from_jid = jid_create(from);
+    if (prefs_get_boolean(PREF_CHLOG)) {
         const char *jid = jabber_get_fulljid();
         Jid *jidp = jid_create(jid);
-        chat_log_chat(jidp->barejid, from_jid->barejid, message, PROF_IN_LOG, NULL);
+        chat_log_chat(jidp->barejid, barejid, message, PROF_IN_LOG, NULL);
         jid_destroy(jidp);
-        jid_destroy(from_jid);
     }
 #endif
 }
 
 void
-handle_delayed_message(char *from, char *message, GTimeVal tv_stamp,
-    gboolean priv)
+handle_delayed_private_message(char *fulljid, char *message, GTimeVal tv_stamp)
+{
+    ui_incoming_private_msg(fulljid, message, &tv_stamp);
+}
+
+void
+handle_delayed_message(char *barejid, char *message, GTimeVal tv_stamp)
 {
-    ui_incoming_msg(from, message, &tv_stamp, priv);
+    ui_incoming_msg(barejid, message, &tv_stamp);
 
-    if (prefs_get_boolean(PREF_CHLOG) && !priv) {
-        Jid *from_jid = jid_create(from);
+    if (prefs_get_boolean(PREF_CHLOG)) {
         const char *jid = jabber_get_fulljid();
         Jid *jidp = jid_create(jid);
-        chat_log_chat(jidp->barejid, from_jid->barejid, message, PROF_IN_LOG, &tv_stamp);
+        chat_log_chat(jidp->barejid, barejid, message, PROF_IN_LOG, &tv_stamp);
         jid_destroy(jidp);
-        jid_destroy(from_jid);
     }
 }