aboutsummaryrefslogtreecommitdiff
path: root/syncapi/streams/stream_receipt.go
diff options
context:
space:
mode:
authorS7evinK <2353100+S7evinK@users.noreply.github.com>2022-03-29 14:14:35 +0200
committerGitHub <noreply@github.com>2022-03-29 14:14:35 +0200
commit49dc49b232432d52c082646cc6f778593f4cb8b4 (patch)
treee809deedcae2127e930b0d382c863561b61fd9d2 /syncapi/streams/stream_receipt.go
parent7972915806348847ecd9a9b8a1b1ff0609cb883c (diff)
Remove eduserver (#2306)
* Move receipt sending to own JetStream producer * Move SendToDevice to producer * Remove most parts of the EDU server * Fix SendToDevice & copyrights * Move structs, cleanup EDU Server traces * Use HeadersOnly subscription * Missing file * Fix linter issues * Move consumers to own files * Rename durable consumer; Consumer cleanup * Docs/config cleanup
Diffstat (limited to 'syncapi/streams/stream_receipt.go')
-rw-r--r--syncapi/streams/stream_receipt.go19
1 files changed, 13 insertions, 6 deletions
diff --git a/syncapi/streams/stream_receipt.go b/syncapi/streams/stream_receipt.go
index 35ffd3a1..680f8cd8 100644
--- a/syncapi/streams/stream_receipt.go
+++ b/syncapi/streams/stream_receipt.go
@@ -4,7 +4,6 @@ import (
"context"
"encoding/json"
- eduAPI "github.com/matrix-org/dendrite/eduserver/api"
"github.com/matrix-org/dendrite/syncapi/types"
"github.com/matrix-org/gomatrixserverlib"
)
@@ -53,7 +52,7 @@ func (p *ReceiptStreamProvider) IncrementalSync(
}
// Group receipts by room, so we can create one ClientEvent for every room
- receiptsByRoom := make(map[string][]eduAPI.OutputReceiptEvent)
+ receiptsByRoom := make(map[string][]types.OutputReceiptEvent)
for _, receipt := range receipts {
receiptsByRoom[receipt.RoomID] = append(receiptsByRoom[receipt.RoomID], receipt)
}
@@ -68,15 +67,15 @@ func (p *ReceiptStreamProvider) IncrementalSync(
Type: gomatrixserverlib.MReceipt,
RoomID: roomID,
}
- content := make(map[string]eduAPI.ReceiptMRead)
+ content := make(map[string]ReceiptMRead)
for _, receipt := range receipts {
read, ok := content[receipt.EventID]
if !ok {
- read = eduAPI.ReceiptMRead{
- User: make(map[string]eduAPI.ReceiptTS),
+ read = ReceiptMRead{
+ User: make(map[string]ReceiptTS),
}
}
- read.User[receipt.UserID] = eduAPI.ReceiptTS{TS: receipt.Timestamp}
+ read.User[receipt.UserID] = ReceiptTS{TS: receipt.Timestamp}
content[receipt.EventID] = read
}
ev.Content, err = json.Marshal(content)
@@ -91,3 +90,11 @@ func (p *ReceiptStreamProvider) IncrementalSync(
return lastPos
}
+
+type ReceiptMRead struct {
+ User map[string]ReceiptTS `json:"m.read"`
+}
+
+type ReceiptTS struct {
+ TS gomatrixserverlib.Timestamp `json:"ts"`
+}