fix: correct hasdomain function and increase df update letter

dwarvesf · Apr 5, 2023 · f582765 · f582765
1 parent 16b0b9f
commit f582765
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 3 deletions.
diff --git a/pkg/service/notion/template.go b/pkg/service/notion/template.go
@@ -91,7 +91,7 @@ const MJMLChangelogTemplate = ` <mjml> <mj-head> <mj-title>Changelog Email</mj-t
 
 // MJMLDFUpdateTemplate is the template for the Dwarves Updates email
 const MJMLDFUpdateTemplate = ` <mjml> <mj-head> <mj-title>Changelog Email</mj-title> <mj-attributes> <mj-all font-family="Helvetica, sans-serif"></mj-all> <mj-section padding="0px"></mj-section>
-      <mj-text font-weight="400" font-size="12px" line-height="16px" font-family="helvetica"></mj-text>
+      <mj-text font-weight="400" font-size="13px" line-height="16px" font-family="helvetica"></mj-text>
     </mj-attributes>
   </mj-head>
   <mj-body>

diff --git a/pkg/utils/strings.go b/pkg/utils/strings.go
@@ -49,5 +49,5 @@ func RemoveAllSpace(str string) string {
 
 func HasDomain(str string) bool {
 	u, err := url.Parse(str)
-	return err == nil && u.Scheme != "" && u.Host != "" && regexp.MustCompile(`^[^.]+\.?[^.]+$`).MatchString(u.Host)
+	return err == nil && u.Scheme != "" && u.Host != "" && regexp.MustCompile(`^[^.]+\.[^.]+(\.[^.]+)*$`).MatchString(u.Host)
 }
diff --git a/pkg/utils/strings_test.go b/pkg/utils/strings_test.go
@@ -1,6 +1,8 @@
 package utils
 
-import "testing"
+import (
+	"testing"
+)
 
 func TestIsNumber(t *testing.T) {
 	type args struct {
@@ -34,3 +36,31 @@ func TestIsNumber(t *testing.T) {
 		})
 	}
 }
+
+func TestHasDomain(t *testing.T) {
+	testCases := []struct {
+		url      string
+		expected bool
+	}{
+		{"https://www.example.com", true},
+		{"https://www.facebook.com", true},
+		{"http://google.com", true},
+		{"https://docs.google.co.uk", true},
+		{"https://example.com", true},
+		{"https://example.co.uk", true},
+		{"https://sub.example.co.uk", true},
+		{"https://sub.sub.example.co.uk", true},
+		{"https://example..com", false},
+		{"ftp://example.com", true},
+		{"not a url", false},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.url, func(t *testing.T) {
+			result := HasDomain(tc.url)
+			if result != tc.expected {
+				t.Errorf("HasDomain() = %v, want %v", result, tc.expected)
+			}
+		})
+	}
+}