X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-reply.c;h=35a735f13f321924eec34ac9d0a2b26c74df04a9;hp=0c3ea13ff451825611c40130bcae5925fb8828e9;hb=8136e15229adc99197e4b4617e849180a66d6049;hpb=357aba3ec8177c11a7ce22cbe26d92482f6a5e53

diff --git a/notmuch-reply.c b/notmuch-reply.c
index 0c3ea13f..35a735f1 100644
--- a/notmuch-reply.c
+++ b/notmuch-reply.c
@@ -71,22 +71,78 @@ reply_part(GMimeObject *part, int *part_count)
     }
 }
 
+static void
+add_recipients_for_address_list (GMimeMessage *message,
+				 GMimeRecipientType type,
+				 InternetAddressList *list)
+{
+    InternetAddress *address;
+    int i;
+
+    for (i = 0; i < internet_address_list_length (list); i++) {
+	address = internet_address_list_get_address (list, i);
+	if (INTERNET_ADDRESS_IS_GROUP (address)) {
+	    InternetAddressGroup *group;
+	    InternetAddressList *group_list;
+
+	    group = INTERNET_ADDRESS_GROUP (address);
+	    group_list = internet_address_group_get_members (group);
+	    if (group_list == NULL)
+		continue;
+
+	    add_recipients_for_address_list (message, type, group_list);
+	} else {
+	    InternetAddressMailbox *mailbox;
+	    const char *name;
+	    const char *addr;
+
+	    mailbox = INTERNET_ADDRESS_MAILBOX (address);
+
+	    name = internet_address_get_name (address);
+	    addr = internet_address_mailbox_get_addr (mailbox);
+
+	    g_mime_message_add_recipient (message, type, name, addr);
+	}
+    }
+}
+
+static void
+add_recipients_for_string (GMimeMessage *message,
+			   GMimeRecipientType type,
+			   const char *recipients)
+{
+    InternetAddressList *list;
+
+    list = internet_address_list_parse_string (recipients);
+    if (list == NULL)
+	return;
+
+    add_recipients_for_address_list (message, type, list);
+}
+
 int
 notmuch_reply_command (void *ctx, int argc, char *argv[])
 {
     void *local = talloc_new (ctx);
-    char *query_string;
-    notmuch_database_t *notmuch = NULL;
     notmuch_query_t *query = NULL;
+    notmuch_database_t *notmuch = NULL;
+    GMimeMessage *reply = NULL;
+    char *query_string;
     notmuch_messages_t *messages;
     notmuch_message_t *message;
     int ret = 0;
-
-    const char *headers[] = {
-	    "Subject", "From", "To", "Cc", "Bcc", "Date",
-	    "In-Reply-To", "References"
+    const char *subject, *recipients;
+    const char *in_reply_to, *orig_references, *references;
+    char *reply_headers;
+    struct {
+	const char *header;
+	GMimeRecipientType recipient_type;
+    } reply_to_map[] = {
+	{ "from", GMIME_RECIPIENT_TYPE_TO  },
+	{ "to",   GMIME_RECIPIENT_TYPE_TO  },
+	{ "cc",   GMIME_RECIPIENT_TYPE_CC  },
+	{ "bcc",  GMIME_RECIPIENT_TYPE_BCC }
     };
-    const char *name, *value;
     unsigned int i;
 
     notmuch = notmuch_database_open (NULL);
@@ -115,13 +171,60 @@ notmuch_reply_command (void *ctx, int argc, char *argv[])
     {
 	message = notmuch_messages_get (messages);
 
-	for (i = 0; i < ARRAY_SIZE (headers); i++) {
-	    name = headers[i];
-	    value = notmuch_message_get_header (message, name);
-	    if (value)
-		printf ("%s: %s\n", name, value);
+	/* The 1 means we want headers in a "pretty" order. */
+	reply = g_mime_message_new (1);
+	if (reply == NULL) {
+	    fprintf (stderr, "Out of memory\n");
+	    ret = 1;
+	    goto DONE;
+	}
+
+	/* XXX: We need a configured email address (or addresses) for
+	 * the user here, so that we can prevent replying to the user,
+	 * and also call _mime_message_set_sender to set From: (either
+	 * from the first "owned" address mentioned as a recipient in
+	 * the original message, or else some default address).
+	 */
+
+	subject = notmuch_message_get_header (message, "subject");
+
+	if (strncasecmp (subject, "Re:", 3))
+	    subject = talloc_asprintf (ctx, "Re: %s", subject);
+	g_mime_message_set_subject (reply, subject);
+
+	for (i = 0; i < ARRAY_SIZE (reply_to_map); i++) {
+	    recipients = notmuch_message_get_header (message,
+						     reply_to_map[i].header);
+	    add_recipients_for_string (reply,
+				       reply_to_map[i].recipient_type,
+				       recipients);
 	}
 
+	in_reply_to = talloc_asprintf (ctx, "<%s>",
+			     notmuch_message_get_message_id (message));
+
+	g_mime_object_set_header (GMIME_OBJECT (reply),
+				  "In-Reply-To", in_reply_to);
+
+	orig_references = notmuch_message_get_header (message, "references");
+	references = talloc_asprintf (ctx, "%s%s%s",
+				      orig_references ? orig_references : "",
+				      orig_references ? " " : "",
+				      in_reply_to);
+	g_mime_object_set_header (GMIME_OBJECT (reply),
+				  "References", references);
+
+	reply_headers = g_mime_object_to_string (GMIME_OBJECT (reply));
+	printf ("%s", reply_headers);
+	free (reply_headers);
+
+	g_object_unref (G_OBJECT (reply));
+	reply = NULL;
+
+	printf ("On %s, %s wrote:\n",
+		notmuch_message_get_header (message, "date"),
+		notmuch_message_get_header (message, "from"));
+
 	show_message_body (notmuch_message_get_filename (message), reply_part);
 
 	notmuch_message_destroy (message);
@@ -137,5 +240,8 @@ notmuch_reply_command (void *ctx, int argc, char *argv[])
     if (notmuch)
 	notmuch_database_close (notmuch);
 
+    if (reply)
+	g_object_unref (G_OBJECT (reply));
+
     return ret;
 }