4 files changed, 67 insertions, 4 deletions

diff --git a/common/domain/mail.cpp b/common/domain/mail.cpp
index 5a77681..6926711 100644
--- a/common/domain/mail.cpp
+++ b/common/domain/mail.cpp
@@ -68,7 +68,9 @@ void TypeImplementation<Mail>::configure(ReadPropertyMapper<Buffer> &propertyMap
 {
     propertyMapper.addMapping<Mail::Uid, Buffer>(&Buffer::uid);
     propertyMapper.addMapping<Mail::Sender, Buffer>(&Buffer::sender);
-    /* propertyMapper.addMapping<Mail::Recepients, Buffer>(&Buffer::recepients); */
+    propertyMapper.addMapping<Mail::To, Buffer>(&Buffer::to);
+    propertyMapper.addMapping<Mail::Cc, Buffer>(&Buffer::cc);
+    propertyMapper.addMapping<Mail::Bcc, Buffer>(&Buffer::bcc);
     propertyMapper.addMapping<Mail::Subject, Buffer>(&Buffer::subject);
     propertyMapper.addMapping<Mail::Date, Buffer>(&Buffer::date);
     propertyMapper.addMapping<Mail::Unread, Buffer>(&Buffer::unread);
@@ -86,7 +88,9 @@ void TypeImplementation<Mail>::configure(WritePropertyMapper<BufferBuilder> &pro
 {
     propertyMapper.addMapping<Mail::Uid>(&BufferBuilder::add_uid);
     propertyMapper.addMapping<Mail::Sender>(&BufferBuilder::add_sender);
-    /* propertyMapper.addMapping<Mail::Recepients>(&BufferBuilder::add_senderName); */
+    propertyMapper.addMapping<Mail::To>(&BufferBuilder::add_to);
+    propertyMapper.addMapping<Mail::Cc>(&BufferBuilder::add_cc);
+    propertyMapper.addMapping<Mail::Bcc>(&BufferBuilder::add_bcc);
     propertyMapper.addMapping<Mail::Subject>(&BufferBuilder::add_subject);
     propertyMapper.addMapping<Mail::Date>(&BufferBuilder::add_date);
     propertyMapper.addMapping<Mail::Unread>(&BufferBuilder::add_unread);
diff --git a/common/mailpreprocessor.cpp b/common/mailpreprocessor.cpp
index 45f5def..575ff4b 100644
--- a/common/mailpreprocessor.cpp
+++ b/common/mailpreprocessor.cpp
@@ -81,17 +81,29 @@ struct MimeMessageReader {
     qint64 mappedSize;
 };
 
-static Sink::ApplicationDomain::Mail::Contact getContact(const KMime::Headers::From *header)
+static Sink::ApplicationDomain::Mail::Contact getContact(const KMime::Headers::Generics::MailboxList *header)
 {
     const auto name = header->displayNames().isEmpty() ? QString() : header->displayNames().first();
     const auto address = header->addresses().isEmpty() ? QString() : header->addresses().first();
     return Sink::ApplicationDomain::Mail::Contact{name, address};
 }
 
+static QList<Sink::ApplicationDomain::Mail::Contact> getContactList(const KMime::Headers::Generics::AddressList *header)
+{
+    QList<Sink::ApplicationDomain::Mail::Contact> list;
+    for (const auto mb : header->mailboxes()) {
+        list << Sink::ApplicationDomain::Mail::Contact{mb.name(), mb.address()};
+    }
+    return list;
+}
+
 static void updatedIndexedProperties(Sink::ApplicationDomain::Mail &mail, KMime::Message::Ptr msg)
 {
     mail.setExtractedSubject(msg->subject(true)->asUnicodeString());
     mail.setExtractedSender(getContact(msg->from(true)));
+    mail.setExtractedTo(getContactList(msg->to(true)));
+    mail.setExtractedCc(getContactList(msg->cc(true)));
+    mail.setExtractedBcc(getContactList(msg->bcc(true)));
     mail.setExtractedDate(msg->date(true)->dateTime());
 
     //The rest should never change, unless we didn't have the headers available initially.
diff --git a/common/propertymapper.cpp b/common/propertymapper.cpp
index 78c5021..754c874 100644
--- a/common/propertymapper.cpp
+++ b/common/propertymapper.cpp
@@ -70,7 +70,22 @@ flatbuffers::uoffset_t variantToProperty<Sink::ApplicationDomain::Mail::Contact>
 {
     if (property.isValid()) {
         const auto value = property.value<Sink::ApplicationDomain::Mail::Contact>();
-        return Sink::ApplicationDomain::Buffer::CreateMailContactDirect(fbb, value.name.toUtf8().constData(), value.name.toUtf8().constData()).o;
+        return Sink::ApplicationDomain::Buffer::CreateMailContactDirect(fbb, value.name.toUtf8().constData(), value.emailAddress.toUtf8().constData()).o;
+    }
+    return 0;
+}
+
+template <>
+flatbuffers::uoffset_t variantToProperty<QList<Sink::ApplicationDomain::Mail::Contact>>(const QVariant &property, flatbuffers::FlatBufferBuilder &fbb)
+{
+    if (property.isValid()) {
+        const auto list = property.value<QList<Sink::ApplicationDomain::Mail::Contact>>();
+        std::vector<flatbuffers::Offset<Sink::ApplicationDomain::Buffer::MailContact>> vector;
+        for (const auto &value : list) {
+            auto offset = Sink::ApplicationDomain::Buffer::CreateMailContactDirect(fbb, value.name.toUtf8().constData(), value.emailAddress.toUtf8().constData()).o;
+            vector.push_back(offset);
+        }
+        return fbb.CreateVector(vector).o;
     }
     return 0;
 }
@@ -141,6 +156,21 @@ QVariant propertyToVariant<Sink::ApplicationDomain::Mail::Contact>(const Sink::A
 }
 
 template <>
+QVariant propertyToVariant<QList<Sink::ApplicationDomain::Mail::Contact>>(const flatbuffers::Vector<flatbuffers::Offset<Sink::ApplicationDomain::Buffer::MailContact>> *property)
+{
+    if (property) {
+        QList<Sink::ApplicationDomain::Mail::Contact> list;
+        for (auto it = property->begin(); it != property->end();) {
+            // We have to copy the memory, otherwise it would become eventually invalid
+            list << Sink::ApplicationDomain::Mail::Contact{propertyToString(it->name()), propertyToString(it->email())};
+            it.operator++();
+        }
+        return QVariant::fromValue(list);
+    }
+    return QVariant();
+}
+
+template <>
 QVariant propertyToVariant<bool>(uint8_t property)
 {
     return static_cast<bool>(property);
diff --git a/common/propertymapper.h b/common/propertymapper.h
index a63b7e7..70491a1 100644
--- a/common/propertymapper.h
+++ b/common/propertymapper.h
@@ -52,6 +52,8 @@ template <typename T>
 QVariant SINK_EXPORT propertyToVariant(const flatbuffers::Vector<flatbuffers::Offset<flatbuffers::String>> *);
 template <typename T>
 QVariant SINK_EXPORT propertyToVariant(const Sink::ApplicationDomain::Buffer::MailContact *);
+template <typename T>
+QVariant SINK_EXPORT propertyToVariant(const flatbuffers::Vector<flatbuffers::Offset<Sink::ApplicationDomain::Buffer::MailContact>> *);
 
 /**
  * The property mapper is a non-typesafe virtual dispatch.
@@ -123,6 +125,12 @@ public:
         addMapping(T::name, [f](Buffer const *buffer) -> QVariant { return propertyToVariant<typename T::Type>((buffer->*f)()); });
     }
 
+    template <typename T, typename Buffer>
+    void addMapping(const flatbuffers::Vector<flatbuffers::Offset<Sink::ApplicationDomain::Buffer::MailContact>> *(Buffer::*f)() const)
+    {
+        addMapping(T::name, [f](Buffer const *buffer) -> QVariant { return propertyToVariant<typename T::Type>((buffer->*f)()); });
+    }
+
 private:
     QHash<QByteArray, std::function<QVariant(BufferType const *)>> mReadAccessors;
 };
@@ -201,6 +209,15 @@ public:
         });
     }
 
+    template <typename T>
+    void addMapping(void (BufferBuilder::*f)(flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<Sink::ApplicationDomain::Buffer::MailContact>>>))
+    {
+        addMapping(T::name, [f](const QVariant &value, flatbuffers::FlatBufferBuilder &fbb) -> std::function<void(BufferBuilder &)> {
+            auto offset = variantToProperty<typename T::Type>(value, fbb);
+            return [offset, f](BufferBuilder &builder) { (builder.*f)(offset); };
+        });
+    }
+
 private:
     QHash<QByteArray, std::function<std::function<void(BufferBuilder &)>(const QVariant &, flatbuffers::FlatBufferBuilder &)>> mWriteAccessors;
 };