From 3e26364579d49aae70fa54addbd271b3aee3d968 Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Tue, 8 Dec 2020 12:26:36 +0100 Subject: Fix chatlogs for outgoing carbons Doesn't make sense to log if plain is not set in all cases. Regards https://github.com/profanity-im/profanity/issues/1439 --- src/event/server_events.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/event/server_events.c b/src/event/server_events.c index 27f142eb..3e51d969 100644 --- a/src/event/server_events.c +++ b/src/event/server_events.c @@ -448,16 +448,6 @@ sv_ev_outgoing_carbon(ProfMessage* message) chat_state_active(chatwin->state); - if (message->plain) { - if (message->type == PROF_MSG_TYPE_MUCPM) { - // MUC PM, should have resource (nick) in filename - chat_log_msg_out(message->to_jid->barejid, message->plain, message->from_jid->resourcepart); - } else { - chat_log_msg_out(message->to_jid->barejid, message->plain, NULL); - } - log_database_add_incoming(message); - } - if (message->enc == PROF_MSG_ENC_OMEMO) { chatwin_outgoing_carbon(chatwin, message); } else if (message->encrypted) { @@ -481,6 +471,16 @@ sv_ev_outgoing_carbon(ProfMessage* message) message->plain = strdup(message->body); chatwin_outgoing_carbon(chatwin, message); } + + if (message->plain) { + if (message->type == PROF_MSG_TYPE_MUCPM) { + // MUC PM, should have resource (nick) in filename + chat_log_msg_out(message->to_jid->barejid, message->plain, message->from_jid->resourcepart); + } else { + chat_log_msg_out(message->to_jid->barejid, message->plain, NULL); + } + log_database_add_incoming(message); + } return; } -- cgit 1.4.1-2-gfad0 rm class='right' method='get' action='/akspecs/aerc/log/commands/msg/archive.go'>

path: root/commands/msg/archive.go

blob: 6bf231d6ff16590fd270844c03c97d065a80c364 (plain) (blame)