增加群聊置顶、免打扰和应用内提醒

This commit is contained in:
xhgit committed 2026-11-14 16:00:46 +08:00
1 parent ced6e9030d
commit f54077ce46
17 files changed
+228 -42

No files matched your search

+21 -14
View File
@@ -150,7 +150,12 @@ func retryEpoch(ctx context.Context, tx pgx.Tx, group, sender string, input Epoc
return tx.Commit(ctx)
}
func lockSendingEpoch(ctx context.Context, tx pgx.Tx, group, user, device, epoch string) ([]string, error) {
type EpochDevice struct {
ID string
Muted bool
}
func lockSendingEpoch(ctx context.Context, tx pgx.Tx, group, user, device, epoch string) ([]EpochDevice, error) {
version, _, err := lockTransport(ctx, tx, group, user, device)
if err != nil {
return nil, err
@@ -171,37 +176,38 @@ func lockSendingEpoch(ctx context.Context, tx pgx.Tx, group, user, device, epoch
// Match the device revocation transaction's row lock. Once a bound device is
// revoked the generation cannot accept any further application ciphertext.
rows, err := tx.Query(ctx, `
SELECT d.id,d.revoked_at IS NULL FROM group_epoch_devices e JOIN devices d ON d.id=e.device_id
SELECT d.id,d.revoked_at IS NULL,m.muted FROM group_epoch_devices e JOIN devices d ON d.id=e.device_id
JOIN group_members m ON m.group_id=e.group_id AND m.user_id=d.user_id AND m.state='active'
WHERE e.group_id=$1 AND e.epoch_id=$2 ORDER BY d.id FOR UPDATE OF d
`, group, epoch)
if err != nil {
return nil, err
}
defer rows.Close()
devices := make([]string, 0, 32)
devices := make([]EpochDevice, 0, 32)
for rows.Next() {
var id string
var member EpochDevice
var active bool
if err = rows.Scan(&id, &active); err != nil {
if err = rows.Scan(&member.ID, &active, &member.Muted); err != nil {
return nil, err
}
if !active {
return nil, ErrVersion
}
devices = append(devices, id)
devices = append(devices, member)
}
return devices, rows.Err()
}
func (s *Store) Send(ctx context.Context, group, user, device string, message Message) (string, []string, error) {
func (s *Store) Send(ctx context.Context, group, user, device string, message Message) (string, []EpochDevice, bool, error) {
tx, err := s.db.Begin(ctx)
if err != nil {
return "", nil, err
return "", nil, false, err
}
defer tx.Rollback(ctx)
devices, err := lockSendingEpoch(ctx, tx, group, user, device, message.Epoch)
if err != nil {
return "", nil, err
return "", nil, false, err
}
if message.AttachmentID != nil {
var found string
@@ -209,10 +215,10 @@ func (s *Store) Send(ctx context.Context, group, user, device string, message Me
SELECT id FROM group_attachments WHERE group_id=$1 AND epoch_id=$2 AND sender_device=$3 AND id=$4 FOR KEY SHARE
`, group, message.Epoch, device, message.AttachmentID).Scan(&found)
if errors.Is(err, pgx.ErrNoRows) {
return "", nil, ErrAttachment
return "", nil, false, ErrAttachment
}
if err != nil {
return "", nil, err
return "", nil, false, err
}
}
@@ -221,6 +227,7 @@ func (s *Store) Send(ctx context.Context, group, user, device string, message Me
INSERT INTO group_messages(group_id,epoch_id,sender_device,message_id,ciphertext,attachment_id)
VALUES($1,$2,$3,$4,$5,$6) ON CONFLICT DO NOTHING RETURNING sequence::text
`, group, message.Epoch, device, message.ID, message.Wire, message.AttachmentID).Scan(&sequence)
created := err == nil
if errors.Is(err, pgx.ErrNoRows) {
var same bool
err = tx.QueryRow(ctx, `
@@ -228,13 +235,13 @@ func (s *Store) Send(ctx context.Context, group, user, device string, message Me
WHERE group_id=$1 AND epoch_id=$2 AND sender_device=$3 AND message_id=$4
`, group, message.Epoch, device, message.ID, message.Wire, message.AttachmentID).Scan(&sequence, &same)
if errors.Is(err, pgx.ErrNoRows) || err == nil && !same {
return "", nil, ErrVersion
return "", nil, false, ErrVersion
}
}
if err != nil {
return "", nil, err
return "", nil, false, err
}
return sequence, devices, tx.Commit(ctx)
return sequence, devices, created, tx.Commit(ctx)
}
func (s *Store) Inbox(ctx context.Context, group, user, device string, after int64) ([]Message, error) {