diff options
author | Paul Fariello <paul@fariello.eu> | 2019-06-16 22:55:07 +0200 |
---|---|---|
committer | Paul Fariello <paul@fariello.eu> | 2019-06-20 14:30:37 +0200 |
commit | 3bb3cc625d1714fd5e81ef0adba61a5172c3212d (patch) | |
tree | 1dea4bfe4da4f67d2ba03a70b9bab3ce455763d6 /src/event | |
parent | a650ecc67d700ae14a1bd05ca6196533829ba5ce (diff) | |
download | profani-tty-3bb3cc625d1714fd5e81ef0adba61a5172c3212d.tar.gz |
Use flags in xmmp/message.c for encryption and trust
Diffstat (limited to 'src/event')
-rw-r--r-- | src/event/server_events.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/event/server_events.c b/src/event/server_events.c index 0f238c07..9818a762 100644 --- a/src/event/server_events.c +++ b/src/event/server_events.c @@ -268,7 +268,7 @@ sv_ev_room_subject(const char *const room, const char *const nick, const char *c void sv_ev_room_history(const char *const room_jid, const char *const nick, - GDateTime *timestamp, const char *const message) + GDateTime *timestamp, const char *const message, int flags) { ProfMucWin *mucwin = wins_get_muc(room_jid); if (mucwin) { @@ -290,7 +290,7 @@ sv_ev_room_history(const char *const room_jid, const char *const nick, } void -sv_ev_room_message(const char *const room_jid, const char *const nick, const char *const message, const char *const id, gboolean omemo) +sv_ev_room_message(const char *const room_jid, const char *const nick, const char *const message, const char *const id, int flags) { ProfMucWin *mucwin = wins_get_muc(room_jid); if (!mucwin) { @@ -299,7 +299,7 @@ sv_ev_room_message(const char *const room_jid, const char *const nick, const cha char *mynick = muc_nick(mucwin->roomjid); - if (omemo) { + if (flags & MSG_ENC_OMEMO) { groupchat_log_omemo_msg_in(room_jid, nick, message); } else { groupchat_log_msg_in(room_jid, nick, message); @@ -320,8 +320,8 @@ sv_ev_room_message(const char *const room_jid, const char *const nick, const cha GList *triggers = prefs_message_get_triggers(new_message); - if (omemo) { - mucwin_incoming_msg(mucwin, nick, new_message, id, mentions, triggers, PROF_MSG_OMEMO); + if (flags & MSG_ENC_OMEMO) { + mucwin_incoming_msg(mucwin, nick, new_message, id, mentions, triggers, flags); } else { mucwin_incoming_msg(mucwin, nick, new_message, id, mentions, triggers, PROF_MSG_PLAIN); } |