devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-25 14:26:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix chatlogs for outgoing carbons

Browse Source 
Doesn't make sense to log if plain is not set in all cases.

Regards https://github.com/profanity-im/profanity/issues/1439
This commit is contained in:
Michael Vetter
2020-12-08 12:26:36 +01:00
parent f023d56b02
commit 3e26364579
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/event/server_events.c
View File

@@ -448,16 +448,6 @@ sv_ev_outgoing_carbon(ProfMessage* message)
chat_state_active(chatwin->state); 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) { if (message->enc == PROF_MSG_ENC_OMEMO) {
chatwin_outgoing_carbon(chatwin, message); chatwin_outgoing_carbon(chatwin, message);
} else if (message->encrypted) { } else if (message->encrypted) {
@@ -481,6 +471,16 @@ sv_ev_outgoing_carbon(ProfMessage* message)
message->plain = strdup(message->body); message->plain = strdup(message->body);
chatwin_outgoing_carbon(chatwin, message); 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; return;
} }