Merge pull request #7 from hashbangblob/master

Fix rules for protonmail & add alternative domain names

domains.go

@@ -200,3 +200,10 @@ var yandexDomains = []string{
 	"yandex.asia",
 	"yandex.mobi",
 }
+
+var protonmailDomains = []string{
+	"protonmail.ch",
+	"protonmail.com",
+	"proton.me",
+	"pm.me",
+}

normalizer.go

@@ -43,10 +43,14 @@ func NewNormalizer() *Normalizer {
 		rules[domain] = yandexRule
 	}
 
+	protonmailRule := &ProtonmailRule{}
+	for _, domain := range protonmailDomains {
+		rules[domain] = protonmailRule
+	}
+
 	appleRule := &AppleRule{}
 	rules["icloud.com"] = appleRule
 	rules["me.com"] = appleRule
-	rules["protonmail.ch"] = &ProtonmailRule{}
 	rules["emailsrvr.com"] = &RackspaceRule{}
 	rules["zoho.com"] = &ZohoRule{}
 	return &Normalizer{rules: rules}

protonmail_rule.go

@@ -8,7 +8,14 @@ type ProtonmailRule struct {
 
 func (rule *ProtonmailRule) ProcessUsername(username string) string {
 	result := strings.ToLower(username)
-	return strings.Replace(result, "+", "", -1)
+	result = strings.Replace(result, ".", "", -1)
+
+	plusSignIndex := strings.Index(result, "+")
+	if plusSignIndex != -1 {
+		result = result[0:plusSignIndex]
+	}
+
+	return result
 }
 
 func (rule *ProtonmailRule) ProcessDomain(domain string) string {

protonmail_rule_test.go

@@ -7,7 +7,7 @@ import (
 
 func TestProtonmailUsername(t *testing.T) {
 	rule := ProtonmailRule{}
-	assert.Equal(t, "t.est", rule.ProcessUsername("t+.est"))
+	assert.Equal(t, "t", rule.ProcessUsername("t+.est"))
 }
 
 func TestProtonmailDomain(t *testing.T) {