summaryrefslogtreecommitdiff
path: root/src/message
diff options
context:
space:
mode:
Diffstat (limited to 'src/message')
-rw-r--r--src/message/sender.cpp13
-rw-r--r--src/message/sender.hpp4
2 files changed, 13 insertions, 4 deletions
diff --git a/src/message/sender.cpp b/src/message/sender.cpp
index 4f903e8..5b3a421 100644
--- a/src/message/sender.cpp
+++ b/src/message/sender.cpp
@@ -16,7 +16,7 @@ namespace smtp::message
//
// Constructors/Destructors
//
- Sender::Sender( manage::Settings const& settings_storage, manage::Mail const& mail_to )
+ Sender::Sender( manage::Settings& settings_storage, manage::Mail const& mail_to )
: mSettingsStorage( settings_storage ),
mMailTo( mail_to )
{
@@ -33,12 +33,21 @@ namespace smtp::message
curl_slist *recipients = NULL;
WriteThis upload_ctx{};
auto curl = curl_easy_init();
+
//TODO сделать инициализацию через регистратор инициализаторов
+ mSettingsStorage.ReloadSettings();
if( !InitCurl( curl, upload_ctx, mail_from ) )
{
manage::Logger::LogError("Error to initializate curl");
return false;
}
+ //TODO раздать mail_to другим методам
+ auto mail_to = mMailTo.GetMailToSend();
+ if( mail_to.empty() )
+ {
+ manage::Logger::LogError("We haven't any mail to");
+ return false;
+ }
FillRecipients( curl, recipients );
UpdateMailText( mail_from, subject, text);
@@ -46,7 +55,7 @@ namespace smtp::message
if ( result != CURLE_OK )
{
- std::string message = "Error to send messge: " + std::to_string( *curl_easy_strerror( result ));
+ std::string message = "Error to send messge: " + std::string( curl_easy_strerror( result ));
manage::Logger::LogError(message);
return false;
}
diff --git a/src/message/sender.hpp b/src/message/sender.hpp
index 11afd6f..ca2c3ff 100644
--- a/src/message/sender.hpp
+++ b/src/message/sender.hpp
@@ -17,7 +17,7 @@ namespace smtp::message
class Sender
{
public:
- Sender( manage::Settings const& settings_storage, manage::Mail const& mail_to );
+ Sender( manage::Settings& settings_storage, manage::Mail const& mail_to );
~Sender() = default;
bool Send( std::string const& mail_from, std::string const& subject, std::string const& text );
@@ -28,7 +28,7 @@ namespace smtp::message
std::string GetHostPortData() const;
static size_t ReadCallBack( void *ptr, size_t size, size_t nmemb, void *userp );
- manage::Settings const& mSettingsStorage;
+ manage::Settings& mSettingsStorage;
manage::Mail const& mMailTo;
bool InitCurl( CURL* curl, WriteThis const& upload_ctx, std::string const& mail_from );