mirror of
https://github.com/matrix-org/dendrite.git
synced 2024-11-23 14:51:56 -06:00
bcb89ada5e
* fix conversion from int to string yields a string of one rune, not a string of digits * Add receipts table to syncapi * Use StreamingToken as the since value * Add required method to testEDUProducer * Make receipt json creation "easier" to read * Add receipts api to the eduserver * Add receipts endpoint * Add eduserver kafka consumer * Add missing kafka config * Add passing tests to whitelist Signed-off-by: Till Faelligen <tfaelligen@gmail.com> * Fix copy & paste error * Fix column count error * Make outbound federation receipts pass * Make "Inbound federation rejects receipts from wrong remote" pass * Don't use errors package * - Add TODO for batching requests - Rename variable * Return a better error message * - Use OutputReceiptEvent instead of InputReceiptEvent as result - Don't use the errors package for errors - Defer CloseAndLogIfError to close rows - Fix Copyright * Better creation/usage of JoinResponse * Query all joined rooms instead of just one * Update gomatrixserverlib * Add sqlite3 migration * Add postgres migration * Ensure required sequence exists before running migrations * Clarification on comment * - Fix a bug when creating client receipts - Use concrete types instead of interface{} * Remove dead code Use key for timestamp * Fix postgres query... * Remove single purpose struct * Use key/value directly * Only apply receipts on initial sync or if edu positions differ, otherwise we'll be sending the same receipts over and over again. * Actually update the id, so it is correctly send in syncs * Set receipt on request to /read_markers * Fix issue with receipts getting overwritten * Use fmt.Errorf instead of pkg/errors * Revert "Add postgres migration" This reverts commit722fe5a046
. * Revert "Add sqlite3 migration" This reverts commitd113b03f64
. * Fix selectRoomReceipts query * Make golangci-lint happy Co-authored-by: Neil Alexander <neilalexander@users.noreply.github.com>
88 lines
2.8 KiB
Go
88 lines
2.8 KiB
Go
// Copyright 2017 Vector Creations Ltd
|
|
// Copyright 2017-2018 New Vector Ltd
|
|
// Copyright 2019-2020 The Matrix.org Foundation C.I.C.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package api
|
|
|
|
import (
|
|
"time"
|
|
|
|
"github.com/matrix-org/gomatrixserverlib"
|
|
)
|
|
|
|
// OutputTypingEvent is an entry in typing server output kafka log.
|
|
// This contains the event with extra fields used to create 'm.typing' event
|
|
// in clientapi & federation.
|
|
type OutputTypingEvent struct {
|
|
// The Event for the typing edu event.
|
|
Event TypingEvent `json:"event"`
|
|
// ExpireTime is the interval after which the user should no longer be
|
|
// considered typing. Only available if Event.Typing is true.
|
|
ExpireTime *time.Time
|
|
}
|
|
|
|
// TypingEvent represents a matrix edu event of type 'm.typing'.
|
|
type TypingEvent struct {
|
|
Type string `json:"type"`
|
|
RoomID string `json:"room_id"`
|
|
UserID string `json:"user_id"`
|
|
Typing bool `json:"typing"`
|
|
}
|
|
|
|
// OutputSendToDeviceEvent is an entry in the send-to-device output kafka log.
|
|
// This contains the full event content, along with the user ID and device ID
|
|
// to which it is destined.
|
|
type OutputSendToDeviceEvent struct {
|
|
UserID string `json:"user_id"`
|
|
DeviceID string `json:"device_id"`
|
|
gomatrixserverlib.SendToDeviceEvent
|
|
}
|
|
|
|
type ReceiptEvent struct {
|
|
UserID string `json:"user_id"`
|
|
RoomID string `json:"room_id"`
|
|
EventID string `json:"event_id"`
|
|
Type string `json:"type"`
|
|
Timestamp gomatrixserverlib.Timestamp `json:"timestamp"`
|
|
}
|
|
|
|
// OutputReceiptEvent is an entry in the receipt output kafka log
|
|
type OutputReceiptEvent struct {
|
|
UserID string `json:"user_id"`
|
|
RoomID string `json:"room_id"`
|
|
EventID string `json:"event_id"`
|
|
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"`
|
|
}
|