From 65b045371cf543af38f6d0629aac266f5a2a8c81 Mon Sep 17 00:00:00 2001
From: peterksts <peterk@silvertreesystems.com>
Date: Sun, 27 May 2018 08:53:19 +0300
Subject: [PATCH 1/2] add to []smtp.server.email

---
 .DS_Store                           | Bin 0 -> 6148 bytes
 gomail/.DS_Store                    | Bin 0 -> 6148 bytes
 send_mail.go => gomail/send_mail.go |  52 ++++++++++++++++------------
 main.go                             |  15 ++++++--
 4 files changed, 41 insertions(+), 26 deletions(-)
 create mode 100644 .DS_Store
 create mode 100644 gomail/.DS_Store
 rename send_mail.go => gomail/send_mail.go (64%)

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..855e0a3860401974a750b5a31d0ed7d1da6aeab2
GIT binary patch
literal 6148
zcmeHK!EO^V5FNLn-3>zIP>HH1UqC%XrI7+DLP$&49(q7RT?7Y;+TCnOR@$tiWJ3gL
z(EbMe0iVJb^vaRHfEjy=x(QU`f)Mpc<7azjyz#R<69a%~PvQnZ4FDWe!b%mJUkKSr
zmt=)!TtuPQNFY5(RVPYSwB&6kECZH-e~kgUyKB$`1p^47e19=1h%L0=`L0F(^pbBh
z9S`}ge~E@^GR}8*&&0}V<=Wc1<5ZpMjq2;5uckpB=96(d9KE8^voP;R+<&fA`m-NK
zFOu%`xVG^`WqFun-H{GX;x4)zy-c!LP1|ac#bdorU<{7qI_`08b2e-4-K)z+vo){F
zS!=IZm-kx_=5yD%b-VHC;AHUb{p@u9;iEYLfeA~?O~!Nhgq_kR(_SO!sKM~uVbMNN
zz8_EW4#3&nuW!B`E!*Qu?Zf`%>%R>~S*o%gu1mjpoewI59XhrP>6UW%L)7gH$K}Ey
z?89U5;VI${#>NW~pBEx<Xys}!z*oSzel@mhcWD{04EzBDlpiE2p~qMl)Tsj-{RBX)
z;ItO(Qyroh$>=c_2GN2dOemrW75u~yCLHG_`+1CoK@$#wA0L9hEck^Y^w)8Hsog<%
z25oB@und$LST(~M)&Kq9zyHfYc4Qf_4E$FNh>9QhZQK&q)}_r+t(B-Js3hc97}O!y
ja5>f;D#e?qTF@q`gXl3925|<({t?hL*v2yOR~h&LjY5>D

literal 0
HcmV?d00001

diff --git a/gomail/.DS_Store b/gomail/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..b57a77465838c3ae857b492ea4add163ab7df2d4
GIT binary patch
literal 6148
zcmeHKJxjz;5S-O34z#$^@|9MCwM{tA!rC98o+l#YOd<BE{9XPto&7)v(MGV5S=gQT
zHamIA6xl2QTfgqkffaxy-4Smd=H}PkXLe8-Bhq<~8|-n1C-gX*Rezsw?lE5QfM@I`
z{6`E|{cykShb?RT0WavMA7Na{q<|EV0#ZN<NP*ud;Juf&JW5oQ0#ZN<d@11Hhemho
z3dh9wbTGsSKwK~##&ygR#O4WNS2!jzL$jn3lWH|$SkjqqRo4}ciAjgW$-GaUY&D@+
zoX&iUa#)wBC<UazRDr|XuDt(W(tnu$rzGv9fE4&w3fN+Ey;<{>s<+Nw&U<a6-_pJ2
so$khUP#B^e6Qdn-<L&q)in6Zxn%BF+F)`@O2c4*&0oO$)1^!xrPoF~^4FCWD

literal 0
HcmV?d00001

diff --git a/send_mail.go b/gomail/send_mail.go
similarity index 64%
rename from send_mail.go
rename to gomail/send_mail.go
index d33dece..ce5b889 100644
--- a/send_mail.go
+++ b/gomail/send_mail.go
@@ -1,4 +1,4 @@
-package main
+package gomail
 
 import (
 	"bytes"
@@ -13,44 +13,50 @@ import (
 	Thank you very much.
 **/
 
-const (
-	/**
-		Gmail SMTP Server
-	**/
-	SMTPServer = "smtp.gmail.com"
-)
-
-type Sender struct {
-	User     string
-	Password string
+// SMTPServer stores host, port for SMTP map
+type SMTPServer struct {
+	Host string
+	Port string
 }
 
-func NewSender(Username, Password string) Sender {
+// SMTP Servers
+var SMTP = map[string]*SMTPServer{
+	"mail.ru":    &SMTPServer{Host: "smtp.mail.ru", Port: "465"},
+	"yandex.com": &SMTPServer{Host: "smtp.yandex.com", Port: "465"},
+	"gmail.com":  &SMTPServer{Host: "smtp.gmail.com", Port: "465"},
+}
 
-	return Sender{Username, Password}
+// Sender client request
+type Sender struct {
+	User       string
+	Password   string
+	SMTPServer string
+	SMTPPort   string
 }
 
-func (sender Sender) SendMail(Dest []string, Subject, bodyMessage string) {
+// NewSender create Sender
+func NewSender(Username, Password, SMTPServer, SMTPPort string) Sender {
+	return Sender{Username, Password, SMTPServer, SMTPPort}
+}
 
+// SendMail send mail to client
+func (sender Sender) SendMail(Dest []string, Subject, bodyMessage string) (err error) {
 	msg := "From: " + sender.User + "\n" +
 		"To: " + strings.Join(Dest, ",") + "\n" +
 		"Subject: " + Subject + "\n" + bodyMessage
 
-	err := smtp.SendMail(SMTPServer+":587",
-		smtp.PlainAuth("", sender.User, sender.Password, SMTPServer),
+	err = smtp.SendMail(sender.SMTPServer+":"+sender.SMTPPort,
+		smtp.PlainAuth("", sender.User, sender.Password, sender.SMTPServer),
 		sender.User, Dest, []byte(msg))
 
 	if err != nil {
-
-		fmt.Printf("smtp error: %s", err)
 		return
 	}
-
-	fmt.Println("Mail sent successfully!")
+	return
 }
 
+// WriteEmail to message
 func (sender Sender) WriteEmail(dest []string, contentType, subject, bodyMessage string) string {
-
 	header := make(map[string]string)
 	header["From"] = sender.User
 
@@ -84,12 +90,12 @@ func (sender Sender) WriteEmail(dest []string, contentType, subject, bodyMessage
 	return message
 }
 
+// WriteHTMLEmail to html email
 func (sender *Sender) WriteHTMLEmail(dest []string, subject, bodyMessage string) string {
-
 	return sender.WriteEmail(dest, "text/html", subject, bodyMessage)
 }
 
+// WritePlainEmail to plain email
 func (sender *Sender) WritePlainEmail(dest []string, subject, bodyMessage string) string {
-
 	return sender.WriteEmail(dest, "text/plain", subject, bodyMessage)
 }
diff --git a/main.go b/main.go
index 3e64bcf..e1a1f98 100644
--- a/main.go
+++ b/main.go
@@ -1,11 +1,17 @@
 package main
 
+import (
+	"fmt"
+
+	"github.com/darkfoxs96/go_smtp/gomail"
+)
+
 func main() {
 
-	sender := NewSender("<YOUR EMAIL ADDRESS>", "<YOUR EMAIL PASSWORD>")
+	sender := gomail.NewSender("dark@yandex.com", "123456qwe", gomail.SMTP["yandex.com"].Host, gomail.SMTP["yandex.com"].Port)
 
 	//The receiver needs to be in slice as the receive supports multiple receiver
-	Receiver := []string{"abc@gmail.com", "xyz@gmail.com", "larrypage@googlemail.com"}
+	Receiver := []string{"dark@yandex.com"}
 
 	Subject := "Testing HTLML Email from golang"
 	message := `
@@ -25,5 +31,8 @@ func main() {
 	`
 	bodyMessage := sender.WriteHTMLEmail(Receiver, Subject, message)
 
-	sender.SendMail(Receiver, Subject, bodyMessage)
+	err := sender.SendMail(Receiver, Subject, bodyMessage)
+	if err != nil {
+		fmt.Println("Error: ", err)
+	}
 }

From f309efd7980fc8a60398a46628a47bfc2397164c Mon Sep 17 00:00:00 2001
From: peterksts <peterk@silvertreesystems.com>
Date: Sun, 27 May 2018 08:59:34 +0300
Subject: [PATCH 2/2] fix main.go

---
 main.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/main.go b/main.go
index e1a1f98..85b5be2 100644
--- a/main.go
+++ b/main.go
@@ -8,10 +8,10 @@ import (
 
 func main() {
 
-	sender := gomail.NewSender("dark@yandex.com", "123456qwe", gomail.SMTP["yandex.com"].Host, gomail.SMTP["yandex.com"].Port)
+	sender := gomail.NewSender("<YOUR EMAIL ADDRESS>", "<YOUR EMAIL PASSWORD>", gomail.SMTP["yandex.com"].Host, gomail.SMTP["yandex.com"].Port)
 
 	//The receiver needs to be in slice as the receive supports multiple receiver
-	Receiver := []string{"dark@yandex.com"}
+	Receiver := []string{"abc@yandex.com", "xyz@gmail.com", "larrypage@googlemail.com"}
 
 	Subject := "Testing HTLML Email from golang"
 	message := `