diff options
| -rw-r--r-- | src/ui/window.c | 6 | ||||
| -rw-r--r-- | src/xmpp/message.c | 8 |
2 files changed, 13 insertions, 1 deletions
diff --git a/src/ui/window.c b/src/ui/window.c index d5578b2a..7bd403da 100644 --- a/src/ui/window.c +++ b/src/ui/window.c @@ -60,6 +60,7 @@ #include "ui/screen.h" #include "xmpp/xmpp.h" #include "xmpp/roster_list.h" +#include "xmpp/connection.h" #define CONS_WIN_TITLE "Profanity. Type /help for help information." #define XML_WIN_TITLE "XML Console" @@ -1192,7 +1193,10 @@ win_print_incoming(ProfWin* window, const char* const display_name_from, ProfMes if (prefs_get_boolean(PREF_CORRECTION_ALLOW) && message->replace_id) { _win_correct(window, message->plain, message->id, message->replace_id, message->from_jid->barejid); } else { - _win_printf(window, enc_char, 0, message->timestamp, flags, THEME_TEXT_THEM, display_name_from, message->from_jid->barejid, message->id, "%s", message->plain); + // Prevent duplicate messages when current client is sending a message + if (g_strcmp0(message->from_jid->fulljid, connection_get_fulljid()) != 0) { + _win_printf(window, enc_char, 0, message->timestamp, flags, THEME_TEXT_THEM, display_name_from, message->from_jid->barejid, message->id, "%s", message->plain); + } } free(enc_char); diff --git a/src/xmpp/message.c b/src/xmpp/message.c index dc3bc14f..97a1132e 100644 --- a/src/xmpp/message.c +++ b/src/xmpp/message.c @@ -1314,6 +1314,14 @@ _handle_carbons(xmpp_stanza_t* const stanza) return NULL; } + // Eliminate duplicate messages in chat with oneself when another client is sending a message + char* bare_from = xmpp_jid_bare(connection_get_ctx(), xmpp_stanza_get_from(message_stanza)); + if (g_strcmp0(bare_from, xmpp_stanza_get_to(message_stanza)) == 0) { + free(bare_from); + return NULL; + } + free(bare_from); + return message_stanza; } |