Rename NOTMUCH_DATABASE_MODE_WRITABLE to NOTMUCH_DATABASE_MODE_READ_WRITE
[notmuch] / notmuch-reply.c
index fe8ee1784a7fd33c7975ef85adc74bf68033d46e..44e17661ea8a4cbc16c40727b61846e639e294bd 100644 (file)
 #include "gmime-filter-reply.h"
 
 static void
-reply_part(GMimeObject *part, int *part_count)
+reply_part_content (GMimeObject *part)
+{
+    GMimeStream *stream_stdout = NULL, *stream_filter = NULL;
+    GMimeDataWrapper *wrapper;
+
+    stream_stdout = g_mime_stream_file_new (stdout);
+    if (stream_stdout) {
+       g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream_stdout), FALSE);
+       stream_filter = g_mime_stream_filter_new(stream_stdout);
+    }
+    g_mime_stream_filter_add(GMIME_STREAM_FILTER(stream_filter),
+                            g_mime_filter_reply_new(TRUE));
+    wrapper = g_mime_part_get_content_object (GMIME_PART (part));
+    if (wrapper && stream_filter)
+       g_mime_data_wrapper_write_to_stream (wrapper, stream_filter);
+    if (stream_filter)
+       g_object_unref(stream_filter);
+    if (stream_stdout)
+       g_object_unref(stream_stdout);
+}
+
+static void
+reply_part (GMimeObject *part, int *part_count)
 {
     GMimeContentDisposition *disposition;
     GMimeContentType *content_type;
-    GMimeDataWrapper *wrapper;
 
     (void) part_count;
     disposition = g_mime_object_get_content_disposition (part);
@@ -38,8 +59,17 @@ reply_part(GMimeObject *part, int *part_count)
        const char *filename = g_mime_part_get_filename (GMIME_PART (part));
        content_type = g_mime_object_get_content_type (GMIME_OBJECT (part));
 
-       printf ("Attachment: %s (%s)\n", filename,
-               g_mime_content_type_to_string (content_type));
+       if (g_mime_content_type_is_type (content_type, "text", "*") &&
+           !g_mime_content_type_is_type (content_type, "text", "html"))
+       {
+           reply_part_content (part);
+       }
+       else
+       {
+           printf ("Attachment: %s (%s)\n", filename,
+                   g_mime_content_type_to_string (content_type));
+       }
+
        return;
     }
 
@@ -48,21 +78,7 @@ reply_part(GMimeObject *part, int *part_count)
     if (g_mime_content_type_is_type (content_type, "text", "*") &&
        !g_mime_content_type_is_type (content_type, "text", "html"))
     {
-       GMimeStream *stream_stdout = NULL, *stream_filter = NULL;
-       stream_stdout = g_mime_stream_file_new (stdout);
-       if (stream_stdout) {
-           g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream_stdout), FALSE);
-           stream_filter = g_mime_stream_filter_new(stream_stdout);
-       }
-       g_mime_stream_filter_add(GMIME_STREAM_FILTER(stream_filter),
-                                g_mime_filter_reply_new(TRUE));
-       wrapper = g_mime_part_get_content_object (GMIME_PART (part));
-       if (wrapper && stream_filter)
-           g_mime_data_wrapper_write_to_stream (wrapper, stream_filter);
-       if (stream_filter)
-           g_object_unref(stream_filter);
-       if (stream_stdout)
-           g_object_unref(stream_stdout);
+       reply_part_content (part);
     }
     else
     {
@@ -71,13 +87,43 @@ reply_part(GMimeObject *part, int *part_count)
     }
 }
 
-static void
+/* Is the given address configured as one of the user's "personal" or
+ * "other" addresses. */
+static int
+address_is_users (const char *address, notmuch_config_t *config)
+{
+    const char *primary;
+    char **other;
+    size_t i, other_len;
+
+    primary = notmuch_config_get_user_primary_email (config);
+    if (strcmp (primary, address) == 0)
+       return 1;
+
+    other = notmuch_config_get_user_other_email (config, &other_len);
+    for (i = 0; i < other_len; i++)
+       if (strcmp (other[i], address) == 0)
+           return 1;
+
+    return 0;
+}
+
+/* For each address in 'list' that is not configured as one of the
+ * user's addresses in 'config', add that address to 'message' as an
+ * address of 'type'.
+ *
+ * The first address encountered that *is* the user's address will be
+ * returned, (otherwise NULL is returned).
+ */
+static const char *
 add_recipients_for_address_list (GMimeMessage *message,
+                                notmuch_config_t *config,
                                 GMimeRecipientType type,
                                 InternetAddressList *list)
 {
     InternetAddress *address;
     int i;
+    const char *ret = NULL;
 
     for (i = 0; i < internet_address_list_length (list); i++) {
        address = internet_address_list_get_address (list, i);
@@ -90,7 +136,8 @@ add_recipients_for_address_list (GMimeMessage *message,
            if (group_list == NULL)
                continue;
 
-           add_recipients_for_address_list (message, type, group_list);
+           add_recipients_for_address_list (message, config,
+                                            type, group_list);
        } else {
            InternetAddressMailbox *mailbox;
            const char *name;
@@ -101,13 +148,28 @@ add_recipients_for_address_list (GMimeMessage *message,
            name = internet_address_get_name (address);
            addr = internet_address_mailbox_get_addr (mailbox);
 
-           g_mime_message_add_recipient (message, type, name, addr);
+           if (address_is_users (addr, config)) {
+               if (ret == NULL)
+                   ret = addr;
+           } else {
+               g_mime_message_add_recipient (message, type, name, addr);
+           }
        }
     }
+
+    return ret;
 }
 
-static void
+/* For each address in 'recipients' that is not configured as one of
+ * the user's addresses in 'config', add that address to 'message' as
+ * an address of 'type'.
+ *
+ * The first address encountered that *is* the user's address will be
+ * returned, (otherwise NULL is returned).
+ */
+static const char *
 add_recipients_for_string (GMimeMessage *message,
+                          notmuch_config_t *config,
                           GMimeRecipientType type,
                           const char *recipients)
 {
@@ -115,9 +177,9 @@ add_recipients_for_string (GMimeMessage *message,
 
     list = internet_address_list_parse_string (recipients);
     if (list == NULL)
-       return;
+       return NULL;
 
-    add_recipients_for_address_list (message, type, list);
+    return add_recipients_for_address_list (message, config, type, list);
 }
 
 int
@@ -131,17 +193,18 @@ notmuch_reply_command (void *ctx, int argc, char *argv[])
     notmuch_messages_t *messages;
     notmuch_message_t *message;
     int ret = 0;
-    const char *subject, *recipients;
+    const char *subject, *recipients, *from_addr = NULL;
     const char *in_reply_to, *orig_references, *references;
     char *reply_headers;
     struct {
        const char *header;
+       const char *fallback;
        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 }
+       { "reply-to", "from", GMIME_RECIPIENT_TYPE_TO  },
+       { "to",         NULL, GMIME_RECIPIENT_TYPE_TO  },
+       { "cc",         NULL, GMIME_RECIPIENT_TYPE_CC  },
+       { "bcc",        NULL, GMIME_RECIPIENT_TYPE_BCC }
     };
     unsigned int i;
 
@@ -149,23 +212,29 @@ notmuch_reply_command (void *ctx, int argc, char *argv[])
     if (config == NULL)
        return 1;
 
-    notmuch = notmuch_database_open (notmuch_config_get_database_path (config));
-    if (notmuch == NULL)
-       return 1;
-
     query_string = query_string_from_args (ctx, argc, argv);
     if (query_string == NULL) {
        fprintf (stderr, "Out of memory\n");
        return 1;
     }
 
+    if (*query_string == '\0') {
+       fprintf (stderr, "Error: notmuch reply requires at least one search term.\n");
+       return 1;
+    }
+
+    notmuch = notmuch_database_open (notmuch_config_get_database_path (config),
+                                    NOTMUCH_DATABASE_MODE_READ_ONLY);
+    if (notmuch == NULL)
+       return 1;
+
     query = notmuch_query_create (notmuch, query_string);
     if (query == NULL) {
        fprintf (stderr, "Out of memory\n");
        return 1;
     }
 
-    for (messages = notmuch_query_search_messages (query);
+    for (messages = notmuch_query_search_messages (query, 0, -1);
         notmuch_messages_has_more (messages);
         notmuch_messages_advance (messages))
     {
@@ -178,13 +247,6 @@ notmuch_reply_command (void *ctx, int argc, char *argv[])
            return 1;
        }
 
-       /* 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))
@@ -192,13 +254,33 @@ notmuch_reply_command (void *ctx, int argc, char *argv[])
        g_mime_message_set_subject (reply, subject);
 
        for (i = 0; i < ARRAY_SIZE (reply_to_map); i++) {
+           const char *addr;
+
            recipients = notmuch_message_get_header (message,
                                                     reply_to_map[i].header);
-           add_recipients_for_string (reply,
-                                      reply_to_map[i].recipient_type,
-                                      recipients);
+           if ((recipients == NULL || recipients[0] == '\0') && reply_to_map[i].fallback)
+               recipients = notmuch_message_get_header (message,
+                                                        reply_to_map[i].fallback);
+
+           addr = add_recipients_for_string (reply, config,
+                                             reply_to_map[i].recipient_type,
+                                             recipients);
+           if (from_addr == NULL)
+               from_addr = addr;
        }
 
+       if (from_addr == NULL)
+           from_addr = notmuch_config_get_user_primary_email (config);
+
+       from_addr = talloc_asprintf (ctx, "%s <%s>",
+                                    notmuch_config_get_user_name (config),
+                                    from_addr);
+       g_mime_object_set_header (GMIME_OBJECT (reply),
+                                 "From", from_addr);
+
+       g_mime_object_set_header (GMIME_OBJECT (reply), "Bcc",
+                          notmuch_config_get_user_primary_email (config));
+
        in_reply_to = talloc_asprintf (ctx, "<%s>",
                             notmuch_message_get_message_id (message));