}
}
-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;
+ 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 (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;
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)
{
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
notmuch_reply_command (void *ctx, int argc, char *argv[])
{
- void *local = talloc_new (ctx);
- notmuch_query_t *query = NULL;
- notmuch_database_t *notmuch = NULL;
- GMimeMessage *reply = NULL;
+ notmuch_config_t *config;
+ notmuch_database_t *notmuch;
+ notmuch_query_t *query;
+ GMimeMessage *reply;
char *query_string;
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;
- 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))
{
reply = g_mime_message_new (1);
if (reply == NULL) {
fprintf (stderr, "Out of memory\n");
- ret = 1;
- goto DONE;
+ 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))
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 && 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));
notmuch_message_destroy (message);
}
- DONE:
- if (local)
- talloc_free (local);
-
- if (query)
- notmuch_query_destroy (query);
-
- if (notmuch)
- notmuch_database_close (notmuch);
-
- if (reply)
- g_object_unref (G_OBJECT (reply));
+ notmuch_query_destroy (query);
+ notmuch_database_close (notmuch);
return ret;
}
projects / notmuch / blobdiff