devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 8 Actions Packages Projects 1 Releases Wiki Activity

Don't render (all) delayed messages as MUC history

Browse Source 
Double-check that a <delay/> tag on a groupchat message was actually
added by the MUC service (rather than the sending client) before
assuming it was received from the MUC history.

Fixes #1173.
This commit is contained in:
Holger Weiß
2019-08-20 17:51:26 +02:00
parent d8d6aa4b88
commit 3228ab47d3
3 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/xmpp/stanza.c
View File

@@ -1173,6 +1173,12 @@ stanza_create_caps_sha1_from_query(xmpp_stanza_t *const query)
GDateTime*
stanza_get_delay(xmpp_stanza_t *const stanza)
{
return stanza_get_delay_from(stanza, NULL);
}
GDateTime*
stanza_get_delay_from(xmpp_stanza_t *const stanza, gchar **from)
{
GTimeVal utc_stamp;
// first check for XEP-0203 delayed delivery
@@ -1185,6 +1191,9 @@ stanza_get_delay(xmpp_stanza_t *const stanza)
GDateTime *utc_datetime = g_date_time_new_from_timeval_utc(&utc_stamp);
GDateTime *local_datetime = g_date_time_to_local(utc_datetime);
g_date_time_unref(utc_datetime);
if (from) {
*from = g_strdup(xmpp_stanza_get_attribute(delay, STANZA_ATTR_FROM));
}
return local_datetime;
}
}
@@ -1201,11 +1210,17 @@ stanza_get_delay(xmpp_stanza_t *const stanza)
GDateTime *utc_datetime = g_date_time_new_from_timeval_utc(&utc_stamp);
GDateTime *local_datetime = g_date_time_to_local(utc_datetime);
g_date_time_unref(utc_datetime);
if (from) {
*from = g_strdup(xmpp_stanza_get_attribute(x, STANZA_ATTR_FROM));
}
return local_datetime;
}
}
}
if (from) {
*from = NULL;
}
return NULL;
}