aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-11-03 19:37:16 -05:00
Code

muc: save oldest timestamp

Browse Source 
So far we saved the timestamp which also had the `from`.
But we need this only to find out whether it's MUC history.

For displaying we should use the oldest delay timestamp.

Also in
61f66966dd (diff-4926fd4577a336bd3eb240f8104a5c5bL837)
a error was introduced.

Before we saved the timestamp in all cases. And only if timestamp AND
from was given we went into MUC history case.
Normal timestamp saving was not done anymore only if it also had a from
attribute.

Regards https://github.com/profanity-im/profanity/issues/1254
This commit is contained in:
Michael Vetter 2020-01-30 11:46:19 +01:00
parent bf2e09feee
commit 8a9488245b
3 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/xmpp/message.c
View File

@ -831,14 +831,19 @@ _handle_groupchat(xmpp_stanza_t *const stanza)
message->plain = strdup(message->body);
}
// determine if the notifications happened whilst offline
// determine if the notifications happened whilst offline (MUC history)
message->timestamp = stanza_get_delay_from(stanza, jid->barejid);
if (message->timestamp == NULL) {
// checking the domainpart is a workaround for some prosody versions (gh#1190)
message->timestamp = stanza_get_delay_from(stanza, jid->domainpart);
}
if (message->timestamp) {
bool is_muc_history = message->timestamp != NULL;
// we want to display the oldest delay
message->timestamp = stanza_get_oldest_delay(stanza);
if (is_muc_history) {
sv_ev_room_history(message);
} else {
sv_ev_room_message(message);

31
src/xmpp/stanza.c
View File

@ -1244,7 +1244,7 @@ _stanza_get_delay_timestamp_xep0091(xmpp_stanza_t *const x_stanza)
GDateTime*
stanza_get_delay_from(xmpp_stanza_t *const stanza, gchar *from)
{
xmpp_stanza_t *delay;
xmpp_stanza_t *delay = NULL;
// first check for XEP-0203 delayed delivery
if (from) {
@ -1272,6 +1272,35 @@ stanza_get_delay_from(xmpp_stanza_t *const stanza, gchar *from)
return NULL;
}
GDateTime*
stanza_get_oldest_delay(xmpp_stanza_t *const stanza)
{
xmpp_stanza_t *child;
const char *child_name;
GDateTime* oldest;
for (child = xmpp_stanza_get_children(stanza); child; child = xmpp_stanza_get_next(child)) {
child_name = xmpp_stanza_get_name(child);
if (child_name && strcmp(child_name, STANZA_NAME_DELAY) == 0) {
GDateTime *tmp = _stanza_get_delay_timestamp_xep0203(stanza);
if (!oldest || g_date_time_compare(oldest, tmp) == 1)
oldest = tmp;
}
if (child_name && strcmp(child_name, STANZA_NAME_X) == 0) {
GDateTime *tmp = _stanza_get_delay_timestamp_xep0091(stanza);
if (!oldest || g_date_time_compare(oldest, tmp) == 1)
oldest = tmp;
}
}
return oldest;
}
char*
stanza_get_status(xmpp_stanza_t *stanza, char *def)
{

1
src/xmpp/stanza.h
View File

@ -271,6 +271,7 @@ gboolean stanza_contains_chat_state(xmpp_stanza_t *stanza);
GDateTime* stanza_get_delay(xmpp_stanza_t *const stanza);
GDateTime* stanza_get_delay_from(xmpp_stanza_t *const stanza, gchar *from);
GDateTime* stanza_get_oldest_delay(xmpp_stanza_t *const stanza);
gboolean stanza_is_muc_presence(xmpp_stanza_t *const stanza);
gboolean stanza_is_muc_self_presence(xmpp_stanza_t *const stanza,