]> git.notmuchmail.org Git - notmuch/blobdiff - notmuch-reply.c
notmuch reply: Prefer "Reply-To" header over "From" for choosing recipient.
[notmuch] / notmuch-reply.c
index 0c3ea13ff451825611c40130bcae5925fb8828e9..42060665743e24534f0bb8db52e8b8110697f81b 100644 (file)
@@ -71,71 +71,226 @@ reply_part(GMimeObject *part, int *part_count)
     }
 }
 
+/* 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;
+    unsigned int 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);
+       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, config,
+                                            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);
+
+           if (address_is_users (addr, config)) {
+               if (ret == NULL)
+                   ret = addr;
+           } else {
+               g_mime_message_add_recipient (message, type, name, addr);
+           }
+       }
+    }
+
+    return ret;
+}
+
+/* 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)
+{
+    InternetAddressList *list;
+
+    list = internet_address_list_parse_string (recipients);
+    if (list == NULL)
+       return NULL;
+
+    return add_recipients_for_address_list (message, config, type, list);
+}
+
 int
 notmuch_reply_command (void *ctx, int argc, char *argv[])
 {
-    void *local = talloc_new (ctx);
+    notmuch_config_t *config;
+    notmuch_database_t *notmuch;
+    notmuch_query_t *query;
+    GMimeMessage *reply;
     char *query_string;
-    notmuch_database_t *notmuch = NULL;
-    notmuch_query_t *query = NULL;
     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, *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[] = {
+       { "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 }
     };
-    const char *name, *value;
     unsigned int i;
 
-    notmuch = notmuch_database_open (NULL);
-    if (notmuch == NULL) {
-       ret = 1;
-       goto DONE;
-    }
+    config = notmuch_config_open (ctx, NULL, NULL);
+    if (config == NULL)
+       return 1;
 
-    query_string = query_string_from_args (local, argc, argv);
+    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");
-       ret = 1;
-       goto DONE;
+       return 1;
     }
 
     query = notmuch_query_create (notmuch, query_string);
     if (query == NULL) {
        fprintf (stderr, "Out of memory\n");
-       ret = 1;
-       goto DONE;
+       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))
     {
        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");
+           return 1;
+       }
+
+       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++) {
+           const char *addr;
+
+           recipients = notmuch_message_get_header (message,
+                                                    reply_to_map[i].header);
+           if (recipients == NULL && 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));
+
+       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);
     }
 
-  DONE:
-    if (local)
-       talloc_free (local);
-
-    if (query)
-       notmuch_query_destroy (query);
-
-    if (notmuch)
-       notmuch_database_close (notmuch);
+    notmuch_query_destroy (query);
+    notmuch_database_close (notmuch);
 
     return ret;
 }