Merge pull request #95 from opennota/master

Fix GetLead

routers/routers.go

@@ -10,6 +10,7 @@ import (
 	"strconv"
 	"strings"
 	"time"
+	"unicode/utf8"
 
 	jwt "github.com/dgrijalva/jwt-go"
 	humanize "github.com/dustin/go-humanize"
@@ -167,27 +168,34 @@ func ToStr(value interface{}) string {
 	if value == nil {
 		return ""
 	}
-	return fmt.Sprintf("%s", value)
+	return fmt.Sprint(value)
 }
 
 // ToDate convert time 2 date
 func ToDate(t time.Time) string {
-	return fmt.Sprintf("%s", humanize.Time(t))
+	return fmt.Sprint(humanize.Time(t))
 }
 
 // GetLead return first paragraph
 func GetLead(s string) string {
 	if len(s) < 300 {
 		return s + ".."
 	}
-	delim := strings.IndexRune(s, '\n')
+	delim := strings.IndexByte(s, '\n')
 	if delim > 300 || delim < 0 {
 		l := len([]rune(s))
 		if l > 300 {
 			l = 300
 		}
 		delim = strings.LastIndexByte(s[:l], ' ')
 		if delim < 0 {
+			for l > 0 {
+				r, size := utf8.DecodeLastRuneInString(s[:l])
+				if r != utf8.RuneError {
+					break
+				}
+				l -= size
+			}
 			delim = l
 		}
 	}

routers/routers_test.go

@@ -0,0 +1,16 @@
+package routers
+
+import (
+	"strings"
+	"testing"
+	"unicode/utf8"
+)
+
+func TestGetLeadDoesNotSplitRunes(t *testing.T) {
+	lead := GetLead("@" + strings.Repeat("ф", 300))
+	for _, r := range lead {
+		if r == utf8.RuneError {
+			t.Fatalf("want valid UTF-8, got %q", lead)
+		}
+	}
+}