mirror of
https://github.com/1f349/dendrite.git
synced 2024-11-10 06:53:00 +00:00
a574ed5369
…ce {}, a slice of interface` in new notifications select The sqlite3 version was just not working, original pr here: https://github.com/matrix-org/dendrite/pull/2688 signed off by: austin ellis <austin@hntlabs.com> This doesn't fix the notification counts, they still only work about 1 out of every 5 times in my tests. I will stick with my other fix locally for reliable notification delivery: https://github.com/matrix-org/dendrite/pull/2701
122 lines
4.3 KiB
Go
122 lines
4.3 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 sqlite3
|
|
|
|
import (
|
|
"context"
|
|
"database/sql"
|
|
"strings"
|
|
|
|
"github.com/matrix-org/dendrite/internal"
|
|
"github.com/matrix-org/dendrite/internal/eventutil"
|
|
"github.com/matrix-org/dendrite/internal/sqlutil"
|
|
"github.com/matrix-org/dendrite/syncapi/storage/tables"
|
|
"github.com/matrix-org/dendrite/syncapi/types"
|
|
)
|
|
|
|
func NewSqliteNotificationDataTable(db *sql.DB, streamID *StreamIDStatements) (tables.NotificationData, error) {
|
|
_, err := db.Exec(notificationDataSchema)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
r := ¬ificationDataStatements{
|
|
streamIDStatements: streamID,
|
|
db: db,
|
|
}
|
|
return r, sqlutil.StatementList{
|
|
{&r.upsertRoomUnreadCounts, upsertRoomUnreadNotificationCountsSQL},
|
|
{&r.selectMaxID, selectMaxNotificationIDSQL},
|
|
// {&r.selectUserUnreadCountsForRooms, selectUserUnreadNotificationsForRooms}, // used at runtime
|
|
}.Prepare(db)
|
|
}
|
|
|
|
type notificationDataStatements struct {
|
|
db *sql.DB
|
|
streamIDStatements *StreamIDStatements
|
|
upsertRoomUnreadCounts *sql.Stmt
|
|
selectMaxID *sql.Stmt
|
|
//selectUserUnreadCountsForRooms *sql.Stmt
|
|
}
|
|
|
|
const notificationDataSchema = `
|
|
CREATE TABLE IF NOT EXISTS syncapi_notification_data (
|
|
id INTEGER PRIMARY KEY,
|
|
user_id TEXT NOT NULL,
|
|
room_id TEXT NOT NULL,
|
|
notification_count BIGINT NOT NULL DEFAULT 0,
|
|
highlight_count BIGINT NOT NULL DEFAULT 0,
|
|
CONSTRAINT syncapi_notifications_unique UNIQUE (user_id, room_id)
|
|
);`
|
|
|
|
const upsertRoomUnreadNotificationCountsSQL = `INSERT INTO syncapi_notification_data
|
|
(user_id, room_id, notification_count, highlight_count)
|
|
VALUES ($1, $2, $3, $4)
|
|
ON CONFLICT (user_id, room_id)
|
|
DO UPDATE SET id = $5, notification_count = $6, highlight_count = $7`
|
|
|
|
const selectUserUnreadNotificationsForRooms = `SELECT room_id, notification_count, highlight_count
|
|
FROM syncapi_notification_data
|
|
WHERE user_id = $1 AND
|
|
room_id IN ($2)`
|
|
|
|
const selectMaxNotificationIDSQL = `SELECT CASE COUNT(*) WHEN 0 THEN 0 ELSE MAX(id) END FROM syncapi_notification_data`
|
|
|
|
func (r *notificationDataStatements) UpsertRoomUnreadCounts(ctx context.Context, txn *sql.Tx, userID, roomID string, notificationCount, highlightCount int) (pos types.StreamPosition, err error) {
|
|
pos, err = r.streamIDStatements.nextNotificationID(ctx, nil)
|
|
if err != nil {
|
|
return
|
|
}
|
|
_, err = r.upsertRoomUnreadCounts.ExecContext(ctx, userID, roomID, notificationCount, highlightCount, pos, notificationCount, highlightCount)
|
|
return
|
|
}
|
|
|
|
func (r *notificationDataStatements) SelectUserUnreadCountsForRooms(
|
|
ctx context.Context, txn *sql.Tx, userID string, roomIDs []string,
|
|
) (map[string]*eventutil.NotificationData, error) {
|
|
params := make([]interface{}, len(roomIDs)+1)
|
|
params[0] = userID
|
|
for i := range roomIDs {
|
|
params[i+1] = roomIDs[i]
|
|
}
|
|
sql := strings.Replace(selectUserUnreadNotificationsForRooms, "($2)", sqlutil.QueryVariadicOffset(len(roomIDs), 1), 1)
|
|
rows, err := r.db.QueryContext(ctx, sql, params...)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
defer internal.CloseAndLogIfError(ctx, rows, "SelectUserUnreadCountsForRooms: rows.close() failed")
|
|
|
|
roomCounts := map[string]*eventutil.NotificationData{}
|
|
var roomID string
|
|
var notificationCount, highlightCount int
|
|
for rows.Next() {
|
|
if err = rows.Scan(&roomID, ¬ificationCount, &highlightCount); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
roomCounts[roomID] = &eventutil.NotificationData{
|
|
RoomID: roomID,
|
|
UnreadNotificationCount: notificationCount,
|
|
UnreadHighlightCount: highlightCount,
|
|
}
|
|
}
|
|
return roomCounts, rows.Err()
|
|
}
|
|
|
|
func (r *notificationDataStatements) SelectMaxID(ctx context.Context, txn *sql.Tx) (int64, error) {
|
|
var id int64
|
|
err := sqlutil.TxStmt(txn, r.selectMaxID).QueryRowContext(ctx).Scan(&id)
|
|
return id, err
|
|
}
|