Ticket #1244: history-since-last-message_3.4.1.patch

protocols/jabber/conference.c

@@ -26 +26 @@
 
 static xt_status jabber_chat_join_failed(struct im_connection *ic, struct xt_node *node, struct xt_node *orig);
 
+void jabber_chat_update_last_message(struct groupchat *chat, time_t date)
+{
+        char path[512];
+        FILE *fp;
+
+        g_snprintf(path, sizeof(path) - 1, "%slast_message_%s_%s", global.conf->configdir, chat->ic->acc->tag, chat->title);
+
+        if ((fp = fopen(path, "w"))) {
+                fprintf(fp, "%ld", (long)date);
+                fclose(fp);
+        }
+}
+
+char *jabber_chat_get_last_message(struct groupchat *chat)
+{
+        char path[512];
+        char *buf = NULL;
+        time_t date;
+        FILE *fp;
+
+        g_snprintf(path, sizeof(path) - 1, "%slast_message_%s_%s", global.conf->configdir, chat->ic->acc->tag, chat->title);
+
+        if ((fp = fopen(path, "r"))) {
+                fscanf(fp, "%ld", &date);
+                /* receive messages starting one second after this date */
+                date += 1;
+                buf = g_malloc(64);
+                strftime(buf, 63, "%Y-%m-%dT%H:%M:%SZ", gmtime(&date));
+                fclose(fp);
+        }
+        
+        return buf;
+}
+
 struct groupchat *jabber_chat_join(struct im_connection *ic, const char *room, const char *nick, const char *password)
 {
         struct jabber_chat *jc;
         struct xt_node *node;
         struct groupchat *c;
         char *roomjid;
+        char *last_message_date;
+
+        c = imcb_chat_new(ic, room);
 
         roomjid = g_strdup_printf("%s/%s", room, nick);
         node = xt_new_node("x", NULL, NULL);
@@ -39 +76 @@
         if (password) {
                 xt_add_child(node, xt_new_node("password", password, NULL));
         }
+        
+        last_message_date = jabber_chat_get_last_message(c);
+        if (last_message_date) {
+                struct xt_node *history;
+                history = xt_new_node("history", NULL, NULL);
+                xt_add_attr(history, "since", last_message_date);
+                xt_add_child(node, history);
+                g_free(last_message_date);
+        }
+        
         node = jabber_make_packet("presence", NULL, roomjid, node);
         jabber_cache_add(ic, node, jabber_chat_join_failed);
 
@@ -61 +108 @@
            of the nick to send a proper presence update. */
         jc->my_full_jid = roomjid;
 
-        c = imcb_chat_new(ic, room);
         c->data = jc;
 
         return c;
@@ -359 +405 @@
         char *nick = NULL;
         char *final_from = NULL;
         char *bare_jid = NULL;
+        time_t date;
 
         from = (bud) ? bud->full_jid : xt_find_attr(node, "from");
 
@@ -433 +480 @@
         } else {
                 final_from = nick;
         }
-
-        imcb_chat_msg(chat, final_from, body->text, 0, jabber_get_timestamp(node));
+        
+        date = jabber_get_timestamp(node);
+        jabber_chat_update_last_message(chat, date);
+        imcb_chat_msg(chat, final_from, body->text, 0, date);
 
         g_free(bare_jid);
 }