diff options
author | eportnov <eportnov@ibs.ru> | 2022-09-13 15:03:29 +0300 |
---|---|---|
committer | eportnov <eportnov@ibs.ru> | 2022-09-13 15:03:29 +0300 |
commit | bab12f829beb53feb6f48db7a0ef33574740989c (patch) | |
tree | b99540f810072b746d033d6cd8d06aabb75afcad /src/message/builder | |
parent | a58088ec7a45bb86b155a8ef9514b35b0ba8d1c9 (diff) | |
parent | e8aeea36e6b48e18d27f9d7857cd29524cc8aa1f (diff) | |
download | obmc-sila-smtp-bab12f829beb53feb6f48db7a0ef33574740989c.tar.xz |
Merge branch 'bugfix/write_file'
Diffstat (limited to 'src/message/builder')
-rw-r--r-- | src/message/builder/cc.cpp | 4 | ||||
-rw-r--r-- | src/message/builder/cc.hpp | 7 | ||||
-rw-r--r-- | src/message/builder/mail_to.cpp | 11 | ||||
-rw-r--r-- | src/message/builder/mail_to.hpp | 8 |
4 files changed, 17 insertions, 13 deletions
diff --git a/src/message/builder/cc.cpp b/src/message/builder/cc.cpp index 9863abf..3cf3276 100644 --- a/src/message/builder/cc.cpp +++ b/src/message/builder/cc.cpp @@ -2,7 +2,7 @@ namespace smtp::message::builder { - Cc::Cc( std::list<std::string> const& mail_to ) + Cc::Cc( manage::MailsSet const& mail_to ) : mMailTo( mail_to ) { @@ -34,6 +34,6 @@ namespace smtp::message::builder bool Cc::IsFirstElement( std::string const& cc ) const { - return cc == mMailTo.front(); + return cc == *mMailTo.begin(); } } diff --git a/src/message/builder/cc.hpp b/src/message/builder/cc.hpp index a06b374..dbca4b7 100644 --- a/src/message/builder/cc.hpp +++ b/src/message/builder/cc.hpp @@ -1,22 +1,21 @@ #pragma once -#include <list> - #include "types/idecorator.hpp" #include "types/imessage_builder.hpp" +#include "managment/general.hpp" namespace smtp::message::builder { class Cc : public types::IDecorator<types::IMessageBuilder> { public: - explicit Cc( std::list<std::string> const& mail_to ); + explicit Cc( manage::MailsSet const& mail_to ); ~Cc() override = default; std::string Get() const override; private: bool IsFirstElement( std::string const& cc ) const; - std::list<std::string> const& mMailTo; + manage::MailsSet const& mMailTo; }; } diff --git a/src/message/builder/mail_to.cpp b/src/message/builder/mail_to.cpp index dab1b7f..3ef7e0e 100644 --- a/src/message/builder/mail_to.cpp +++ b/src/message/builder/mail_to.cpp @@ -2,8 +2,8 @@ namespace smtp::message::builder { - MailTo::MailTo( std::string const& mail_to) - : mMailTo( mail_to ) + MailTo::MailTo( manage::MailsSet const& mails ) + : mMailTo( mails ) { } @@ -16,8 +16,13 @@ namespace smtp::message::builder result = mBase->Get(); } - result += "To: " + mMailTo +"\r\n"; + result += "To: " + GetFirstMail() +"\r\n"; return result; } + + std::string MailTo::GetFirstMail() const + { + return *mMailTo.begin(); + } } diff --git a/src/message/builder/mail_to.hpp b/src/message/builder/mail_to.hpp index 5d60d97..1c21684 100644 --- a/src/message/builder/mail_to.hpp +++ b/src/message/builder/mail_to.hpp @@ -1,21 +1,21 @@ #pragma once -#include <list> - #include "types/idecorator.hpp" #include "types/imessage_builder.hpp" +#include "managment/general.hpp" namespace smtp::message::builder { class MailTo : public types::IDecorator<types::IMessageBuilder> { public: - explicit MailTo( std::string const& mail_to ); + explicit MailTo( manage::MailsSet const& mails ); ~MailTo() override = default; std::string Get() const override; private: - std::string const& mMailTo; + std::string GetFirstMail() const; + manage::MailsSet const& mMailTo; }; } |