From 446819e4ac405393ae7834107adc5761afce8a34 Mon Sep 17 00:00:00 2001
From: Till <2353100+S7evinK@users.noreply.github.com>
Date: Mon, 25 Apr 2022 11:56:50 +0200
Subject: [PATCH] Store the EDU type in the database (#2370)

---
 federationapi/queue/destinationqueue.go      | 1 +
 federationapi/storage/interface.go           | 2 +-
 federationapi/storage/shared/storage_edus.go | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/federationapi/queue/destinationqueue.go b/federationapi/queue/destinationqueue.go
index 09814b31f..a5f8c03b9 100644
--- a/federationapi/queue/destinationqueue.go
+++ b/federationapi/queue/destinationqueue.go
@@ -125,6 +125,7 @@ func (oq *destinationQueue) sendEDU(event *gomatrixserverlib.EDU, receipt *share
 		context.TODO(),
 		oq.destination, // the destination server name
 		receipt,        // NIDs from federationapi_queue_json table
+		event.Type,
 	); err != nil {
 		logrus.WithError(err).Errorf("failed to associate EDU with destination %q", oq.destination)
 		return
diff --git a/federationapi/storage/interface.go b/federationapi/storage/interface.go
index 3fa8d1f7a..e3038651b 100644
--- a/federationapi/storage/interface.go
+++ b/federationapi/storage/interface.go
@@ -39,7 +39,7 @@ type Database interface {
 	GetPendingEDUs(ctx context.Context, serverName gomatrixserverlib.ServerName, limit int) (edus map[*shared.Receipt]*gomatrixserverlib.EDU, err error)
 
 	AssociatePDUWithDestination(ctx context.Context, transactionID gomatrixserverlib.TransactionID, serverName gomatrixserverlib.ServerName, receipt *shared.Receipt) error
-	AssociateEDUWithDestination(ctx context.Context, serverName gomatrixserverlib.ServerName, receipt *shared.Receipt) error
+	AssociateEDUWithDestination(ctx context.Context, serverName gomatrixserverlib.ServerName, receipt *shared.Receipt, eduType string) error
 
 	CleanPDUs(ctx context.Context, serverName gomatrixserverlib.ServerName, receipts []*shared.Receipt) error
 	CleanEDUs(ctx context.Context, serverName gomatrixserverlib.ServerName, receipts []*shared.Receipt) error
diff --git a/federationapi/storage/shared/storage_edus.go b/federationapi/storage/shared/storage_edus.go
index 6e3c7e367..02a23338f 100644
--- a/federationapi/storage/shared/storage_edus.go
+++ b/federationapi/storage/shared/storage_edus.go
@@ -31,12 +31,13 @@ func (d *Database) AssociateEDUWithDestination(
 	ctx context.Context,
 	serverName gomatrixserverlib.ServerName,
 	receipt *Receipt,
+	eduType string,
 ) error {
 	return d.Writer.Do(d.DB, nil, func(txn *sql.Tx) error {
 		if err := d.FederationQueueEDUs.InsertQueueEDU(
 			ctx,         // context
 			txn,         // SQL transaction
-			"",          // TODO: EDU type for coalescing
+			eduType,     // EDU type for coalescing
 			serverName,  // destination server name
 			receipt.nid, // NID from the federationapi_queue_json table
 		); err != nil {