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

Fix carbon logging

Browse Source 
Regards https://github.com/profanity-im/profanity/issues/1342
This commit is contained in:
Michael Vetter
2020-05-27 22:06:04 +02:00
parent d240eb629c
commit d4692b1b2d
3 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/event/server_events.c
View File

@@ -440,20 +440,19 @@ sv_ev_delayed_private_message(ProfMessage *message)
void
sv_ev_outgoing_carbon(ProfMessage *message)
{
ProfChatWin *chatwin = wins_get_chat(message->from_jid->barejid);
ProfChatWin *chatwin = wins_get_chat(message->to_jid->barejid);
if (!chatwin) {
chatwin = chatwin_new(message->from_jid->barejid);
chatwin = chatwin_new(message->to_jid->barejid);
}
chat_state_active(chatwin->state);
//TODO: check whether we need to change from and to for carbon. now that we have profmessage->to_jid?
if (message->plain) {
if (message->type == PROF_MSG_TYPE_MUCPM) {
// MUC PM, should have resource (nick) in filename
chat_log_msg_out(message->from_jid->barejid, message->plain, message->from_jid->resourcepart);
chat_log_msg_out(message->to_jid->barejid, message->plain, message->from_jid->resourcepart);
} else {
chat_log_msg_out(message->from_jid->barejid, message->plain, NULL);
chat_log_msg_out(message->to_jid->barejid, message->plain, NULL);
}
log_database_add_incoming(message);
}
@@ -782,7 +781,6 @@ sv_ev_incoming_message(ProfMessage *message)
void
sv_ev_incoming_carbon(ProfMessage *message)
{
//TODO: check whether we need to change from and to for carbon. now that we have profmessage->to_jid?
gboolean new_win = FALSE;
ProfChatWin *chatwin = wins_get_chat(message->from_jid->barejid);
if (!chatwin) {