mirror of
https://github.com/matrix-org/dendrite
synced 2024-12-15 10:13:45 +01: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>
106 lines
3.6 KiB
Go
106 lines
3.6 KiB
Go
// Copyright 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 postgres
|
|
|
|
import (
|
|
"context"
|
|
"database/sql"
|
|
"fmt"
|
|
|
|
"github.com/lib/pq"
|
|
|
|
"github.com/matrix-org/dendrite/eduserver/api"
|
|
"github.com/matrix-org/dendrite/internal"
|
|
"github.com/matrix-org/dendrite/internal/sqlutil"
|
|
"github.com/matrix-org/dendrite/syncapi/storage/tables"
|
|
"github.com/matrix-org/dendrite/syncapi/types"
|
|
"github.com/matrix-org/gomatrixserverlib"
|
|
)
|
|
|
|
const receiptsSchema = `
|
|
CREATE SEQUENCE IF NOT EXISTS syncapi_stream_id;
|
|
-- Stores data about receipts
|
|
CREATE TABLE IF NOT EXISTS syncapi_receipts (
|
|
-- The ID
|
|
id BIGINT PRIMARY KEY DEFAULT nextval('syncapi_stream_id'),
|
|
room_id TEXT NOT NULL,
|
|
receipt_type TEXT NOT NULL,
|
|
user_id TEXT NOT NULL,
|
|
event_id TEXT NOT NULL,
|
|
receipt_ts BIGINT NOT NULL,
|
|
CONSTRAINT syncapi_receipts_unique UNIQUE (room_id, receipt_type, user_id)
|
|
);
|
|
CREATE INDEX IF NOT EXISTS syncapi_receipts_room_id ON syncapi_receipts(room_id);
|
|
`
|
|
|
|
const upsertReceipt = "" +
|
|
"INSERT INTO syncapi_receipts" +
|
|
" (room_id, receipt_type, user_id, event_id, receipt_ts)" +
|
|
" VALUES ($1, $2, $3, $4, $5)" +
|
|
" ON CONFLICT (room_id, receipt_type, user_id)" +
|
|
" DO UPDATE SET id = nextval('syncapi_stream_id'), event_id = $4, receipt_ts = $5" +
|
|
" RETURNING id"
|
|
|
|
const selectRoomReceipts = "" +
|
|
"SELECT room_id, receipt_type, user_id, event_id, receipt_ts" +
|
|
" FROM syncapi_receipts" +
|
|
" WHERE room_id = ANY($1) AND id > $2"
|
|
|
|
type receiptStatements struct {
|
|
db *sql.DB
|
|
upsertReceipt *sql.Stmt
|
|
selectRoomReceipts *sql.Stmt
|
|
}
|
|
|
|
func NewPostgresReceiptsTable(db *sql.DB) (tables.Receipts, error) {
|
|
_, err := db.Exec(receiptsSchema)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
r := &receiptStatements{
|
|
db: db,
|
|
}
|
|
if r.upsertReceipt, err = db.Prepare(upsertReceipt); err != nil {
|
|
return nil, fmt.Errorf("unable to prepare upsertReceipt statement: %w", err)
|
|
}
|
|
if r.selectRoomReceipts, err = db.Prepare(selectRoomReceipts); err != nil {
|
|
return nil, fmt.Errorf("unable to prepare selectRoomReceipts statement: %w", err)
|
|
}
|
|
return r, nil
|
|
}
|
|
|
|
func (r *receiptStatements) UpsertReceipt(ctx context.Context, txn *sql.Tx, roomId, receiptType, userId, eventId string, timestamp gomatrixserverlib.Timestamp) (pos types.StreamPosition, err error) {
|
|
stmt := sqlutil.TxStmt(txn, r.upsertReceipt)
|
|
err = stmt.QueryRowContext(ctx, roomId, receiptType, userId, eventId, timestamp).Scan(&pos)
|
|
return
|
|
}
|
|
|
|
func (r *receiptStatements) SelectRoomReceiptsAfter(ctx context.Context, roomIDs []string, streamPos types.StreamPosition) ([]api.OutputReceiptEvent, error) {
|
|
rows, err := r.selectRoomReceipts.QueryContext(ctx, pq.Array(roomIDs), streamPos)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("unable to query room receipts: %w", err)
|
|
}
|
|
defer internal.CloseAndLogIfError(ctx, rows, "SelectRoomReceiptsAfter: rows.close() failed")
|
|
var res []api.OutputReceiptEvent
|
|
for rows.Next() {
|
|
r := api.OutputReceiptEvent{}
|
|
err = rows.Scan(&r.RoomID, &r.Type, &r.UserID, &r.EventID, &r.Timestamp)
|
|
if err != nil {
|
|
return res, fmt.Errorf("unable to scan row to api.Receipts: %w", err)
|
|
}
|
|
res = append(res, r)
|
|
}
|
|
return res, rows.Err()
|
|
}
|