String select function and other improvements

address/expand.go

@@ -38,8 +38,6 @@ func ExpandAlias(email string) string {
 	if rfc5322.IsQuotedAddress(email) == true       { return "" } // Do not expand "neko+cat"@example.org
 
 	// neko+straycat@example.org => neko@example.org
-	lpart := email[0:strings.Index(email, "+")]
-	dpart := strings.SplitN(email, "@", 2)[1]
-	return lpart + "@" + dpart
+	return email[0:strings.Index(email, "+")] + "@" + strings.SplitN(email, "@", 2)[1]
 }
 

address/find.go

@@ -216,8 +216,7 @@
 			// Try to use the string like an email address in the display name
 			for _, e := range strings.Split(readbuffer[1], " ") {
 				// Find an email address
-				if rfc5322.IsEmailAddress(e) == false { continue }
-				readbuffer[0] = e; break
+				if rfc5322.IsEmailAddress(e) { readbuffer[0] = e; break }
 			}
 		} else if IsMailerDaemon(readbuffer[1]) == true {
 			// Allow if the string is MAILER-DAEMON
@@ -230,10 +229,7 @@
 		// - (cat)nekochan@example.org
 		// - nekochan(cat)cat@example.org
 		// - nekochan(cat)@example.org
-		p1 := strings.Index(readbuffer[0], "(")
-		p2 := strings.Index(readbuffer[0], ")")
-		ce := readbuffer[0][p1:p2 + 1]
-
+		ce := "(" + sisimoji.Select(readbuffer[0], "(", ")", 0) + ")"
 		readbuffer[0] = strings.Replace(readbuffer[0], ce, "", 1)
 		if len(readbuffer[2]) == 0 { readbuffer[2] = ce } else { readbuffer[2] += " " + ce }
 	}

address/lib.go

@@ -60,7 +60,7 @@ func IsIncluded(argv0 string) bool {
 		// Such as "nekochan (kijitora) neko@example.jp"
 		for _, e := range strings.Split(argv0, " ") {
 			// Is there any email address string in each element?
-			e = strings.Trim(e, "<>"); if rfc5322.IsEmailAddress(e) { return true }
+			if rfc5322.IsEmailAddress(strings.Trim(e, "<>")) { return true }
 		}
 	}
 	return false
@@ -71,7 +71,6 @@ func IsMailerDaemon(email string) bool {
 	// @param    string email    Email address
 	// @return   bool            true:  is a mailer-daemon
 	//                           false: is not a mailer-daemon
-	match := false
 	value := strings.ToLower(email)
 	table := []string{
 		"mailer-daemon@", "(mailer-daemon)", "<mailer-daemon>", "mailer-daemon ",
@@ -80,5 +79,5 @@ func IsMailerDaemon(email string) bool {
 	for _, e := range table {
 		if strings.Contains(value, e) || value == "mailer-daemon" || value == "postmaster" { return true }
 	}
-	return match
+	return false
 }

address/rise.go

@@ -10,7 +10,7 @@ package address
 import "strings"
 import "libsisimai.org/sisimai/sis"
 
-// Rise() is a constructor of Sisimai::Address
+// Rise() is a constructor of sis.EmailAddress
 func Rise(argvs [3]string) sis.EmailAddress {
 	// @param    [3]string argvs  ["Email address", "name", "comment"]
 	// @return   sis.EmailAddress EmailAddress struct when the email address was not valid

arf/lib.go

@@ -182,8 +182,7 @@
 			} else if strings.HasPrefix(e, "Reporting-MTA: ") {
 				// The header is optional and MUST NOT appear more than once.
 				// Reporting-MTA: dns; mx.example.jp
-				cv := rfc1894.Field(e); if len(cv) == 0 { continue }
-				reportedby = cv[2]
+				if cv := rfc1894.Field(e); len(cv) > 0 { reportedby = cv[2] }
 
 			} else if strings.HasPrefix(e, "Source-IP: ") {
 				// The header is optional and MUST NOT appear more than once.
@@ -216,9 +215,7 @@
 
 		} else {
 			// Pick it from the original message part
-			p1 := strings.Index(emailparts[1], "\nTo:");               if p1  < 0  { break }
-			p2 := sisimoji.IndexOnTheWay(emailparts[1], "\n", p1 + 4); if p2  < 0  { break }
-			cv := sisiaddr.S3S4(emailparts[1][p1 + 4:p2])
+			cv := sisiaddr.S3S4(sisimoji.Select(emailparts[1], "\nTo:", "\n", 0))
 
 			// There is no valid email address in the To: header of the original message such as
 			// To: <Undisclosed Recipients>

fact/rise.go

@@ -103,8 +103,7 @@ func Rise(email *string, origin string, args *sis.DecodingArgs) ([]sis.Fact, []s
 			}
 			for _, v := range datevalues {
 				// Parse each date string using net/mail.ParseDate()
-				times, nyaan := mail.ParseDate(v); if nyaan != nil { continue }
-				clock = times; break
+				if times, nyaan := mail.ParseDate(v); nyaan == nil { clock = times; break }
 			}
 			if clock.IsZero() {
 				// Failed to parse the date string at the previous loop,
@@ -113,8 +112,7 @@ func Rise(email *string, origin string, args *sis.DecodingArgs) ([]sis.Fact, []s
 					// Try to parse the date string tidied by rfc5322.Date()
 					j := rfc5322.Date(v); if j != "" {
 						// rfc5322.Date() returned a valid date string
-						times, nyaan := mail.ParseDate(j); if nyaan != nil { continue }
-						clock = times; break
+						if times, nyaan := mail.ParseDate(j); nyaan == nil { clock = times; break }
 					}
 				}
 			}
@@ -146,8 +144,7 @@ func Rise(email *string, origin string, args *sis.DecodingArgs) ([]sis.Fact, []s
 				for li := 0; li < le; li++ {
 					// Check the Received: headers forwards and get a local hostnaame
 					cv := rfc5322.Received((*beforefact).Headers["received"][li])
-					if rfc1123.IsInternetHost(cv[0]) == false { continue }
-					e.Lhost = cv[0]; break
+					if rfc1123.IsInternetHost(cv[0]) { e.Lhost = cv[0]; break }
 				}
 			}
 
@@ -167,8 +164,7 @@ func Rise(email *string, origin string, args *sis.DecodingArgs) ([]sis.Fact, []s
 					for _, w := range ee {
 						// Get a hostname from the string like "127.0.0.1 x109-20.example.com 192.0.2.20"
 						// or "mx.sp.example.jp 192.0.2.135"
-						if rfc791.IsIPv4Address(w) { continue }
-						*v = w; break
+						if rfc791.IsIPv4Address(w) == false { *v = w; break }
 					}
 					if strings.Index(*v, " ") > 0 { *v = ee[0] }
 				}
@@ -191,10 +187,7 @@ func Rise(email *string, origin string, args *sis.DecodingArgs) ([]sis.Fact, []s
 			// Get the value of List-Id header: "List name <list-id@example.org>"
 			if len(rfc822data["list-id"])                                          == 0     { break LIST_ID }
 			if sisimoji.Aligned(rfc822data["list-id"][0], []string{"<", ".", ">"}) == false { break LIST_ID }
-			p0 := strings.Index(rfc822data["list-id"][0], "<");                   if p0 < 0 { break LIST_ID }
-			p1 := strings.Index(rfc822data["list-id"][0], ">");                   if p1 < 0 { break LIST_ID }
-
-			piece["listid"] = rfc822data["list-id"][0][p0 + 1:p1]; break LIST_ID
+			piece["listid"] = sisimoji.Select(rfc822data["list-id"][0], "<", ">", 0);         break LIST_ID
 		}
 
 		DIAGNOSTICCODE: for {
@@ -319,7 +312,7 @@ func Rise(email *string, origin string, args *sis.DecodingArgs) ([]sis.Fact, []s
 			hops := len(recv)
 			for i := hops - 1; hops >= 0; hops-- {
 				// Search for the string " for " from the Received: header
-				if strings.Index(recv[i], " for ") == -1   { continue }
+				if strings.Index(recv[i], " for ") == -1  { continue }
 				or := rfc5322.Received(recv[i])
 
 				if len(or) == 0 || or[5] == ""            { continue }
@@ -335,7 +328,7 @@ func Rise(email *string, origin string, args *sis.DecodingArgs) ([]sis.Fact, []s
 		REASON: for thing.Reason == "" || RetryIndex[thing.Reason] {
 			// Decide the reason of the email bounce
 			// The value of thing.Reason is empty or is needed to check with other values again
-			re := thing.Reason;        if re == "" { re = "undefined" }
+			re := thing.Reason;        if re == ""              { re = "undefined"                }
 			or := lda.Find(&thing);    if reason.IsExplicit(or) { thing.Reason = or; break REASON }
 			or  = rhost.Find(&thing);  if reason.IsExplicit(or) { thing.Reason = or; break REASON }
 			or  = reason.Find(&thing); if reason.IsExplicit(or) { thing.Reason = or; break REASON }
@@ -352,9 +345,8 @@ func Rise(email *string, origin string, args *sis.DecodingArgs) ([]sis.Fact, []s
 
 			} else {
 				// The Reason is not "delivered", or "feedback", or "vacation"
-				smtperrors := piece["deliverystatus"] + " " + piece["diagnosticcode"]
-				if len(smtperrors) < 4 { smtperrors = "" }
-				thing.HardBounce = failure.IsHardBounce(thing.Reason, smtperrors)
+				cv := piece["deliverystatus"] + " " + piece["diagnosticcode"]; if len(cv) < 4 { cv = "" }
+				thing.HardBounce = failure.IsHardBounce(thing.Reason, cv)
 			}
 			break HARDBOUNCE
 		}
@@ -363,10 +355,9 @@ func Rise(email *string, origin string, args *sis.DecodingArgs) ([]sis.Fact, []s
 			// Set a pseudo status code
 			if thing.DeliveryStatus != "" { break DELIVERYSTATUS }
 
-			smtperrors := thing.ReplyCode + " " + piece["diagnosticcode"]
-			if len(smtperrors) < 4 { smtperrors = "" }
-			permanent0 := failure.IsPermanent(smtperrors)
-			temporary0 := failure.IsTemporary(smtperrors)
+			ce := thing.ReplyCode + " " + piece["diagnosticcode"]; if len(ce) < 4 { ce = "" }
+			permanent0 := failure.IsPermanent(ce)
+			temporary0 := failure.IsTemporary(ce)
 			temporary1 := temporary0; if !permanent0 && !temporary0 { temporary1 = false }
 			thing.DeliveryStatus = status.Code(thing.Reason, temporary1)
 			break DELIVERYSTATUS

lhost/order.go

@@ -51,9 +51,7 @@ func OrderBySubject(title string) []string {
 	}
 
 	// The following order is decided by the first 2 words of Subject: header
-	title = strings.Replace(title, "[", " ", -1)
-	title = strings.Replace(title, "]", " ", -1)
-	title = strings.Replace(title, "_", " ", -1)
+	for _, e := range []string{"[", "]", "_"} { title = strings.Replace(title, e, " ", -1) }
 
 	// Squeeze duplicated space characters
 	for strings.Contains(title, "  ") { title = strings.ReplaceAll(title, "  ", " ") }
@@ -70,11 +68,7 @@ func OrderBySubject(title string) []string {
 		// Postmaster notify, returned mail, ...
 		first = strings.Join(words[0:2], "-")
 	}
-
-	first = strings.ReplaceAll(first, `:`, "")
-	first = strings.ReplaceAll(first, `,`, "")
-	first = strings.ReplaceAll(first, `*`, "")
-	first = strings.ReplaceAll(first, `"`, "")
+	for _, e := range []string{`:`, `,`, `*`, `"`} { first = strings.ReplaceAll(first, e, "") }
 	return table[first]
 }
 

lhost/via-activehunter.go

@@ -40,8 +40,7 @@
 				if strings.HasPrefix(e, startingof["message"][0]) { readcursor |= indicators["deliverystatus"] }
 				continue
 			}
-			if readcursor & indicators["deliverystatus"] == 0 { continue }
-			if e == ""                                        { continue }
+			if readcursor & indicators["deliverystatus"] == 0 || e == "" { continue }
 
 			//  ----- The following addresses had permanent fatal errors -----
 			//
@@ -63,9 +62,8 @@
 				//  ----- Transcript of session follows -----
 				// 550 sorry, no mailbox here by that name (#5.1.1 - chkusr)
 				cr := []rune(e[0:1])
-				if cr[0] < 48 || cr[0] > 122 { continue } // 48 = '0', 122 = 'z'
-				if v.Diagnosis != ""         { continue }
-				v.Diagnosis = e
+				if cr[0] < 48 || cr[0] > 122 { continue        } // 48 = '0', 122 = 'z'
+				if v.Diagnosis == ""         { v.Diagnosis = e }
 			}
 		}
 		if recipients == 0 { return sis.RisingUnderway{} }

lhost/via-amazonses.go

@@ -46,9 +46,7 @@
 				//  "TopicArn" : "arn:aws:sns:us-west-2:123456789012:SES-EJ-B",
 				//  "Message" : "{\"notificationType\"...
 				if strings.Contains(sespayload, "\\") { sespayload = strings.ReplaceAll(sespayload, "\\",   "") }
-				p3 := sisimoji.IndexOnTheWay(sespayload, "{",  p2 + 9)
-				p4 := sisimoji.IndexOnTheWay(sespayload, "\n", p2 + 9)
-				sespayload = sespayload[p3:p4]
+				sespayload = "{" + sisimoji.Select(sespayload, "{", "\n", p2 + 9)
 				sespayload = strings.TrimRight(sespayload, ",")
 				sespayload = strings.TrimRight(sespayload, `"`)
 			}
@@ -288,8 +286,7 @@
 
 				for f := range reasonpair {
 					// Try to find the bounce reason by "bounceSubType"
-					if reasonpair[f] != (*o).BounceSubType { continue }
-					v.Reason = f; break
+					if reasonpair[f] == (*o).BounceSubType { v.Reason = f; break }
 				}
 			}
 		} else if whatnotify == "C" {

lhost/via-apachejames.go

@@ -29,7 +29,7 @@
 			for _, e := range bf.Headers["received"] {
 				// Received: from localhost ([127.0.0.1])
 				//    by mx.example.org (JAMES SMTP Server 2.3.2) with SMTP ID 220...
-				if strings.Contains(e, "JAMES SMTP Server") == true     { proceedsto = true; break ISJAMES }
+				if strings.Contains(e, "JAMES SMTP Server") == true        { proceedsto = true; break ISJAMES }
 			}
 			break
 		}
@@ -64,8 +64,7 @@
 				if e != "" { v.Diagnosis += e + " " }
 				continue
 			}
-			if readcursor & indicators["deliverystatus"] == 0 { continue }
-			if len(e) == 0                                    { continue }
+			if readcursor & indicators["deliverystatus"] == 0 || e == "" { continue }
 
 			// Message details:
 			//   Subject: Nyaaan

lhost/via-biglobe.go

@@ -54,8 +54,7 @@
 				if strings.HasPrefix(e, startingof["message"][0]) { readcursor |= indicators["deliverystatus"] }
 				continue
 			}
-			if readcursor & indicators["deliverystatus"] == 0 { continue }
-			if len(e) == 0                                    { continue }
+			if readcursor & indicators["deliverystatus"] == 0 || e == "" { continue }
 
 			// This is a MIME-encapsulated message.
 			//
@@ -85,8 +84,7 @@
 
 			} else {
 				// The boundary string or the error messages
-				if strings.Contains(e, "--") { continue }
-				v.Diagnosis += e + " "
+				if strings.Contains(e, "--") == false { v.Diagnosis += e + " " }
 			}
 		}
 		if recipients == 0 { return sis.RisingUnderway{} }
@@ -100,13 +98,12 @@
 				// The key name is a bounce reason name
 				for _, f := range messagesof[r] {
 					// Try to find an error message including lower-cased string listed in messagesof
-					if strings.Contains(e.Diagnosis, f) == false { continue }
-					e.Reason = r; break FINDREASON
+					if strings.Contains(e.Diagnosis, f) { e.Reason = r; break FINDREASON }
 				}
 			}
 		}
 
 		return sis.RisingUnderway{ Digest: dscontents, RFC822: emailparts[1] }
-    }
+	}
 }
 

lhost/via-courier.go

@@ -71,8 +71,7 @@
 				if sisimoji.ContainsAny(e, startingof["message"]) { readcursor |= indicators["deliverystatus"] }
 				continue
 			}
-			if readcursor & indicators["deliverystatus"] == 0 { continue }
-			if len(e) == 0                                    { continue }
+			if readcursor & indicators["deliverystatus"] == 0 || e == "" { continue }
 
 			f := rfc1894.Match(e); if f > 0 {
 				// "e" matched with any field defined in RFC3464
@@ -160,8 +159,7 @@
 				// The key name is a bounce reason name
 				for _, f := range messagesof[r] {
 					// Try to find an error message including lower-cased string listed in messagesof
-					if strings.Contains(e.Diagnosis, f) == false { continue }
-					e.Reason = r; break FINDREASON
+					if strings.Contains(e.Diagnosis, f) { e.Reason = r; break FINDREASON }
 				}
 			}
 			e.Command = thecommand

lhost/via-domino.go

@@ -70,8 +70,7 @@
 				if strings.HasPrefix(e, startingof["message"][0]) { readcursor |= indicators["deliverystatus"] }
 				continue
 			}
-			if readcursor & indicators["deliverystatus"] == 0 { continue }
-			if len(e) == 0                                    { continue }
+			if readcursor & indicators["deliverystatus"] == 0 || e == "" { continue }
 
 			// Your message
 			//
@@ -169,9 +168,7 @@
 				if e.Reason != "" { break EXCEPTUTF8 }
 				for _, f := range exceptutf8[r] {
 					// Try to find an error message including lower-cased string listed in messagesof
-					if sisimoji.Aligned(e.Diagnosis, f) == false { continue }
-					e.Reason = r
-					break EXCEPTUTF8
+					if sisimoji.Aligned(e.Diagnosis, f) { e.Reason = r; break EXCEPTUTF8 }
 				}
 			}
 		}

lhost/via-dragonfly.go

@@ -73,8 +73,7 @@
 				if strings.HasPrefix(e, startingof["message"][0]) { readcursor |= indicators["deliverystatus"] }
 				continue
 			}
-			if readcursor & indicators["deliverystatus"] == 0 { continue }
-			if len(e) == 0                                    { continue }
+			if readcursor & indicators["deliverystatus"] == 0 || e == "" { continue }
 
 			// This is the DragonFly Mail Agent v0.13 at df.example.jp.
 			//
@@ -120,8 +119,7 @@
 				// The key name is a bounce reason name
 				for _, f := range messagesof[r] {
 					// Try to find an error message including lower-cased string listed in messagesof
-					if strings.Contains(e.Diagnosis, f) == false { continue }
-					e.Reason = r; break FINDREASON
+					if strings.Contains(e.Diagnosis, f) { e.Reason = r; break FINDREASON }
 				}
 			}
 		}

lhost/via-einsundeins.go

@@ -47,8 +47,7 @@
 				if strings.HasPrefix(e, startingof["message"][0]) { readcursor |= indicators["deliverystatus"] }
 				continue
 			}
-			if readcursor & indicators["deliverystatus"] == 0 { continue }
-			if e == ""                                        { continue }
+			if readcursor & indicators["deliverystatus"] == 0 || e == "" { continue }
 
 			// The following address failed:
 			//
@@ -117,8 +116,7 @@
 				// The key name is a bounce reason name
 				for _, f := range messagesof[r] {
 					// Try to find an error message including lower-cased string listed in messagesof
-					if strings.Contains(e.Diagnosis, f) == false { continue }
-					e.Reason = r; break FINDREASON
+					if strings.Contains(e.Diagnosis, f) { e.Reason = r; break FINDREASON }
 				}
 			}
 		}