Use unicode domain display name for third party chat pushes

Author: jeffyanta

pkg/code/push/notifications.go

@@ -17,6 +17,7 @@ import (
 	code_data "github.com/code-payments/code-server/pkg/code/data"
 	"github.com/code-payments/code-server/pkg/code/data/chat"
 	"github.com/code-payments/code-server/pkg/code/localization"
+	"github.com/code-payments/code-server/pkg/code/thirdparty"
 	"github.com/code-payments/code-server/pkg/kin"
 	push_lib "github.com/code-payments/code-server/pkg/push"
 )
@@ -168,6 +169,13 @@ func SendChatMessagePushNotification(
 	chatProperties, ok := chat_util.InternalChatProperties[chatTitle]
 	if ok {
 		chatTitle = chatProperties.TitleLocalizationKey
+	} else {
+		domainDisplayName, err := thirdparty.GetDomainDisplayName(chatTitle)
+		if err == nil {
+			chatTitle = domainDisplayName
+		} else {
+			log.WithError(err).Warn("failure getting domain display name")
+		}
 	}
 
 	// Best-effort try to update the badge count before pushing message content

pkg/code/thirdparty/domain.go

@@ -10,6 +10,8 @@ import (
 
 	"github.com/pkg/errors"
 	"golang.org/x/net/idna"
+	"golang.org/x/text/cases"
+	"golang.org/x/text/language"
 
 	"github.com/code-payments/code-server/pkg/code/common"
 	"github.com/code-payments/code-server/pkg/netutil"
@@ -87,3 +89,21 @@ func GetAsciiBaseDomain(domain string) (string, error) {
 	}
 	return strings.ToLower(fmt.Sprintf("%s.%s", parts[len(parts)-2], parts[len(parts)-1])), nil
 }
+
+// GetDomainDisplayName gets the display version of a domain within
+// UI elements of the Code app.
+func GetDomainDisplayName(domain string) (string, error) {
+	parts := strings.Split(domain, ".")
+	if len(parts) < 2 {
+		return "", errors.New("value must have base domain and tld")
+	}
+
+	displayName, err := idna.Display.ToUnicode(domain)
+	if err != nil {
+		return "", errors.Wrap(err, "error converting string to unicode")
+	}
+
+	displayName = cases.Title(language.English, cases.NoLower).String(displayName)
+
+	return displayName, nil
+}

pkg/code/thirdparty/domain_test.go

@@ -6,8 +6,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/code-payments/code-server/pkg/testutil"
 	"github.com/code-payments/code-server/pkg/code/common"
+	"github.com/code-payments/code-server/pkg/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -57,6 +57,47 @@ func TestGetAsciiBaseDomain(t *testing.T) {
 	}
 }
 
+func TestGetDomainDisplayValue(t *testing.T) {
+	for _, tc := range []struct {
+		input    string
+		expected string
+		isError  bool
+	}{
+		{
+			input:    "app.getcode.com",
+			expected: "App.getcode.com",
+		},
+		{
+			input:    "getcode.com",
+			expected: "Getcode.com",
+		},
+		{
+			input:    "UPPERCASE.com",
+			expected: "Uppercase.com",
+		},
+		{
+			input:    "xn--bcher-kva.com",
+			expected: "Bücher.com",
+		},
+		{
+			input:    "xn--cher-zra.com",
+			expected: "Ücher.com",
+		},
+		{
+			input:   "localhost",
+			isError: true,
+		},
+	} {
+		actual, err := GetDomainDisplayName(tc.input)
+		if tc.isError {
+			assert.Error(t, err)
+		} else {
+			require.NoError(t, err)
+			assert.Equal(t, tc.expected, actual)
+		}
+	}
+}
+
 func TestVerifyDomainNameOwnership(t *testing.T) {
 	ctx := context.Background()