actually send rich content pushes

Author: or-else

server/drafty/drafty.go

@@ -2,6 +2,7 @@
 package drafty
 
 import (
+	"encoding/json"
 	"errors"
 	"sort"
 	"strings"
@@ -115,7 +116,7 @@ var tags = map[string]spanfmt{
 
 // Preview shortens Drafty to the specified length (in runes) and removes large content from entities making them
 // suitable for a one-line preview, for example for showing in push notifications.
-func Preview(content interface{}, length int) (interface{}, error) {
+func Preview(content interface{}, length int) (string, error) {
 	if content == nil {
 		return "", nil
 	}
@@ -210,7 +211,9 @@ func Preview(content interface{}, length int) (interface{}, error) {
 		}
 	}
 
-	return preview, nil
+	data, err := json.Marshal(preview)
+
+	return string(data), err
 }
 
 var lightData = []string{"mime", "name", "width", "height", "size"}

server/drafty/drafty_test.go

@@ -2,13 +2,12 @@ package drafty
 
 import (
 	"encoding/json"
-	"reflect"
 	"testing"
 )
 
 var validInputs = []string{
 	`{
-		"ent":[{"data":{"mime":"image/jpeg","name":"hello.jpg","val":"<38992, bytes: ...>"},"tp":"EX"}],
+		"ent":[{"data":{"mime":"image/jpeg","name":"hello.jpg","val":"<38992, bytes: ...>","width":100, "height":80},"tp":"EX"}],
 		"fmt":[{"at":-1, "key":0}]
 	}`,
 	`{
@@ -96,50 +95,14 @@ func TestToPlainText(t *testing.T) {
 }
 
 func TestPreview(t *testing.T) {
-	expect := []map[string]interface{}{
-		map[string]interface{}{
-			"fmt": []map[string]interface{}{map[string]interface{}{"at": -1, "key": 0}},
-			"ent": []map[string]interface{}{map[string]interface{}{
-				"tp":   "EX",
-				"data": map[string]interface{}{"mime": "image/jpeg", "name": "hello.jpg"}},
-			},
-		},
-		map[string]interface{}{
-			"txt": "https://api.tin",
-			"fmt": []map[string]interface{}{map[string]interface{}{"len": 22, "key": 0}},
-			"ent": []map[string]interface{}{map[string]interface{}{"tp": "LN"}},
-		},
-		map[string]interface{}{
-			"txt": "https://api.tin",
-			"fmt": []map[string]interface{}{map[string]interface{}{"len": 22, "key": 0}},
-			"ent": []map[string]interface{}{map[string]interface{}{"tp": "LN"}},
-		},
-		map[string]interface{}{
-			"txt": " ",
-			"fmt": []map[string]interface{}{map[string]interface{}{"len": 1, "key": 0}},
-			"ent": []map[string]interface{}{map[string]interface{}{
-				"tp": "IM",
-				"data": map[string]interface{}{
-					"width":  638.0,
-					"height": 213.0,
-					"mime":   "image/jpeg",
-					"name":   "roses.jpg",
-				},
-			}},
-		},
-		map[string]interface{}{
-			"txt": "This text is fo",
-			"fmt": []map[string]interface{}{
-				map[string]interface{}{"at": 5, "len": 4, "tp": "ST"},
-				map[string]interface{}{"at": 13, "len": 9, "tp": "EM"},
-			},
-		},
-		map[string]interface{}{
-			"txt": "мультибайтовый ",
-			"fmt": []map[string]interface{}{map[string]interface{}{"tp": "ST", "len": 14}},
-		},
+	expect := []string{
+		`{"ent":[{"data":{"height":80,"mime":"image/jpeg","name":"hello.jpg","width":100},"tp":"EX"}],"fmt":[{"at":-1,"key":0}]}`,
+		`{"ent":[{"tp":"LN"}],"fmt":[{"key":0,"len":22}],"txt":"https://api.tin"}`,
+		`{"ent":[{"tp":"LN"}],"fmt":[{"key":0,"len":22}],"txt":"https://api.tin"}`,
+		`{"ent":[{"data":{"height":213,"mime":"image/jpeg","name":"roses.jpg","width":638},"tp":"IM"}],"fmt":[{"key":0,"len":1}],"txt":" "}`,
+		`{"fmt":[{"at":5,"len":4,"tp":"ST"},{"at":13,"len":9,"tp":"EM"}],"txt":"This text is fo"}`,
+		`{"fmt":[{"len":14,"tp":"ST"}],"txt":"мультибайтовый "}`,
 	}
-
 	for i := range validInputs {
 		var val interface{}
 		json.Unmarshal([]byte(validInputs[i]), &val)
@@ -148,7 +111,7 @@ func TestPreview(t *testing.T) {
 			t.Error(err)
 		}
 
-		if !reflect.DeepEqual(res, expect[i]) {
+		if res != expect[i] {
 			t.Errorf("%d output '%s' does not match '%s'", i, res, expect[i])
 		}
 	}

server/push/fcm/payload.go

@@ -151,19 +151,26 @@ func payloadToData(pl *push.Payload) (map[string]string, error) {
 	if pl.What == push.ActMsg {
 		data["seq"] = strconv.Itoa(pl.SeqId)
 		data["mime"] = pl.ContentType
+
+		// Convert Drafty content to plain text (clients 0.16 and below).
 		data["content"], err = drafty.ToPlainText(pl.Content)
 		if err != nil {
 			return nil, err
 		}
-
-		// Trim long strings to 80 runes.
+		// Trim long strings to 128 runes.
 		// Check byte length first and don't waste time converting short strings.
-		if len(data["content"]) > maxMessageLength {
+		if len(data["content"]) > push.MaxPayloadLength {
 			runes := []rune(data["content"])
-			if len(runes) > maxMessageLength {
-				data["content"] = string(runes[:maxMessageLength]) + "…"
+			if len(runes) > push.MaxPayloadLength {
+				data["content"] = string(runes[:push.MaxPayloadLength]) + "…"
 			}
 		}
+
+		// Rich content for clients version 0.17 and above.
+		data["rc"], err = drafty.Preview(pl.Content, push.MaxPayloadLength)
+		if err != nil {
+			return nil, err
+		}
 	} else if pl.What == push.ActSub {
 		data["modeWant"] = pl.ModeWant.String()
 		data["modeGiven"] = pl.ModeGiven.String()

server/push/fcm/push_fcm.go

@@ -32,10 +32,6 @@ const (
 
 	// The number of sub/unsub requests sent in one batch. FCM constant.
 	subBatchSize = 1000
-
-	// Maximum length of a text message in runes. The message is clipped if length is exceeded.
-	// TODO: implement intelligent clipping of Drafty messages.
-	maxMessageLength = 80
 )
 
 // Handler represents the push handler; implements push.PushHandler interface.

server/push/push.go

@@ -17,6 +17,9 @@ const (
 	ActSub = "sub"
 )
 
+// Maximum length of push payload in multibyte characters.
+const MaxPayloadLength = 128
+
 // Recipient is a user targeted by the push.
 type Recipient struct {
 	// Count of user's connections that were live when the packet was dispatched from the server