Skip to content

fix(mam): Prevent duplicated and out-of-order history messages #2183

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jubalh merged 1 commit into from
Jul 4, 2026
+35 −15
Merged

fix(mam): Prevent duplicated and out-of-order history messages #2183

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 35 additions & 15 deletions src/event/server_events.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,9 +358,13 @@ sv_ev_room_message(ProfMessage* message)
}

if (message->is_mam) {
// For MAM, print to window but disable all notifications, unread count increment etc
// And don't filter reflection of our own sent messages (so they get displayed)
mucwin_incoming_msg(mucwin, message, mentions, triggers, FALSE);
// For MAM, do not print to screen immediately. It is loaded and sorted upon query completion.
g_slist_free(mentions);
if (triggers) {
g_list_free_full(triggers, free);
}
message->plain = old_plain;
return;
} else {
mucwin_incoming_msg(mucwin, message, mentions, triggers, TRUE);

Expand Down Expand Up @@ -515,9 +519,11 @@ _sv_ev_incoming_pgp(ProfChatWin* chatwin, gboolean new_win, ProfMessage* message
if (message->plain) {
message->enc = PROF_MSG_ENC_PGP;
_clean_incoming_message(message);
chatwin_incoming_msg(chatwin, message, new_win);
if (!message->is_mam) {
chatwin_incoming_msg(chatwin, message, new_win);
}
log_database_add_incoming(message);
if (logit) {
if (logit && !message->is_mam) {
chat_log_pgp_msg_in(message);
}
chatwin->pgp_recv = TRUE;
Expand All @@ -531,9 +537,13 @@ _sv_ev_incoming_pgp(ProfChatWin* chatwin, gboolean new_win, ProfMessage* message
message->enc = PROF_MSG_ENC_NONE;
message->plain = strdup(message->body);
_clean_incoming_message(message);
chatwin_incoming_msg(chatwin, message, new_win);
if (!message->is_mam) {
chatwin_incoming_msg(chatwin, message, new_win);
}
log_database_add_incoming(message);
chat_log_msg_in(message);
if (!message->is_mam) {
chat_log_msg_in(message);
}
chatwin->pgp_recv = FALSE;
}
#endif
Expand All @@ -552,9 +562,11 @@ _sv_ev_incoming_ox(ProfChatWin* chatwin, gboolean new_win, ProfMessage* message,
}

//_clean_incoming_message(message);
chatwin_incoming_msg(chatwin, message, new_win);
if (!message->is_mam) {
chatwin_incoming_msg(chatwin, message, new_win);
}
log_database_add_incoming(message);
if (logit) {
if (logit && !message->is_mam) {
chat_log_pgp_msg_in(message);
}
chatwin->pgp_recv = TRUE;
Expand All @@ -578,10 +590,14 @@ _sv_ev_incoming_otr(ProfChatWin* chatwin, gboolean new_win, ProfMessage* message
}

_clean_incoming_message(message);
chatwin_incoming_msg(chatwin, message, new_win);
if (!message->is_mam) {
chatwin_incoming_msg(chatwin, message, new_win);
}
log_database_add_incoming(message);

chat_log_otr_msg_in(message);
if (!message->is_mam) {
chat_log_otr_msg_in(message);
}
otr_free_message(message->plain);
message->plain = NULL;
chatwin->pgp_recv = FALSE;
Expand All @@ -596,9 +612,11 @@ _sv_ev_incoming_omemo(ProfChatWin* chatwin, gboolean new_win, ProfMessage* messa
{
#ifdef HAVE_OMEMO
_clean_incoming_message(message);
chatwin_incoming_msg(chatwin, message, new_win);
if (!message->is_mam) {
chatwin_incoming_msg(chatwin, message, new_win);
}
log_database_add_incoming(message);
if (logit) {
if (logit && !message->is_mam) {
chat_log_omemo_msg_in(message);
}
chatwin->pgp_recv = FALSE;
Expand All @@ -617,9 +635,11 @@ _sv_ev_incoming_plain(ProfChatWin* chatwin, gboolean new_win, ProfMessage* messa
return;
}
_clean_incoming_message(message);
chatwin_incoming_msg(chatwin, message, new_win);
if (!message->is_mam) {
chatwin_incoming_msg(chatwin, message, new_win);
}
log_database_add_incoming(message);
if (logit) {
if (logit && !message->is_mam) {
chat_log_msg_in(message);
}
chatwin->pgp_recv = FALSE;
Expand Down
Loading