- Fix a bug when creating client receipts

- Use concrete types instead of interface{}

eduserver/api/output.go

@@ -66,3 +66,22 @@ type OutputReceiptEvent struct {
 	Type      string                      `json:"type"`
 	Timestamp gomatrixserverlib.Timestamp `json:"timestamp"`
 }
+
+// Helper structs for receipts json creation
+type ReceiptMRead struct {
+	User map[string]ReceiptTS `json:"m.read"`
+}
+
+type ReceiptTS struct {
+	TS gomatrixserverlib.Timestamp `json:"ts"`
+}
+
+// FederationSender output
+type FederationReceiptMRead struct {
+	User map[string]FederationReceiptData `json:"m.read"`
+}
+
+type FederationReceiptData struct {
+	Data     ReceiptTS `json:"data"`
+	EventIDs []string  `json:"event_ids"`
+}

federationsender/consumers/eduserver.go

@@ -228,15 +228,14 @@ func (t *OutputEDUConsumer) onReceiptEvent(msg *sarama.ConsumerMessage) error {
 		names[i] = joined[i].ServerName
 	}
 
-	// TODO: easier/nicer creation of receipt EDUs
+	content := map[string]api.FederationReceiptMRead{}
-	content := map[string]interface{}{}
+	content[receipt.RoomID] = api.FederationReceiptMRead{
-	content[receipt.RoomID] = map[string]interface{}{
+		User: map[string]api.FederationReceiptData{
-		"m.read": map[string]interface{}{
+			receipt.UserID: {
-			receipt.UserID: userData{
+				Data: api.ReceiptTS{
-				Data: struct {
+					TS: receipt.Timestamp,
-					Ts gomatrixserverlib.Timestamp `json:"ts"`
+				},
-				}{receipt.Timestamp},
+				EventIDs: []string{receipt.EventID},
-				EventIds: []string{receipt.EventID},
 			},
 		},
 	}

syncapi/storage/shared/syncserver.go

@@ -599,17 +599,13 @@ func (d *Database) addReceiptDeltaToResponse(
 			Type:   gomatrixserverlib.MReceipt,
 			RoomID: roomID,
 		}
-		content := map[string]interface{}{}
+		content := make(map[string]eduAPI.ReceiptMRead)
-		for _, receipt := range receipts {
+		read := eduAPI.ReceiptMRead{
-			content[receipt.EventID] = map[string]interface{}{
+			User: make(map[string]eduAPI.ReceiptTS),
-				"m.read": map[string]interface{}{
-					receipt.UserID: struct {
-						gomatrixserverlib.Timestamp `json:"ts"`
-					}{
-						receipt.Timestamp,
-					},
-				},
 		}
+		for _, receipt := range receipts {
+			read.User[receipt.UserID] = eduAPI.ReceiptTS{receipt.Timestamp}
+			content[receipt.EventID] = read
 		}
 		ev.Content, err = json.Marshal(content)
 		if err != nil {