接入群成员与邀请实时同步
This commit is contained in:
1 parent
b2e04e8174
commit
5cae19a256
9 files changed
+175
-38
No files matched your search
@@ -115,10 +115,10 @@ func (s *Store) Detail(ctx context.Context, user, id string) (Detail, error) {
|
||||
return result, tx.Commit(ctx)
|
||||
}
|
||||
|
||||
func (s *Store) Change(ctx context.Context, user, id string, change Change) error {
|
||||
func (s *Store) Change(ctx context.Context, user, id string, change Change) ([]string, error) {
|
||||
tx, err := s.db.Begin(ctx)
|
||||
if err != nil {
|
||||
return err
|
||||
return nil, err
|
||||
}
|
||||
defer tx.Rollback(ctx)
|
||||
|
||||
@@ -127,22 +127,29 @@ func (s *Store) Change(ctx context.Context, user, id string, change Change) erro
|
||||
var version int64
|
||||
err = tx.QueryRow(ctx, "SELECT owner_id,membership_version FROM chat_groups WHERE id=$1 FOR UPDATE", id).Scan(&owner, &version)
|
||||
if errors.Is(err, pgx.ErrNoRows) {
|
||||
return ErrUnavailable
|
||||
return nil, ErrUnavailable
|
||||
}
|
||||
if err != nil {
|
||||
return err
|
||||
return nil, err
|
||||
}
|
||||
var state, role string
|
||||
err = tx.QueryRow(ctx, "SELECT state,role FROM group_members WHERE group_id=$1 AND user_id=$2", id, user).Scan(&state, &role)
|
||||
if errors.Is(err, pgx.ErrNoRows) {
|
||||
return ErrUnavailable
|
||||
return nil, ErrUnavailable
|
||||
}
|
||||
if err != nil {
|
||||
return err
|
||||
return nil, err
|
||||
}
|
||||
if owner == user {
|
||||
role = "owner"
|
||||
}
|
||||
var users []string
|
||||
if change.Action == "disband" && role == "owner" {
|
||||
users, err = groupChangeAudience(ctx, tx, id, owner, "all")
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
|
||||
activeChanged := false
|
||||
if state == "invited" {
|
||||
@@ -153,20 +160,50 @@ func (s *Store) Change(ctx context.Context, user, id string, change Change) erro
|
||||
case "decline":
|
||||
_, err = tx.Exec(ctx, "DELETE FROM group_members WHERE group_id=$1 AND user_id=$2", id, user)
|
||||
default:
|
||||
return ErrAction
|
||||
return nil, ErrAction
|
||||
}
|
||||
} else {
|
||||
activeChanged, err = changeActive(ctx, tx, user, id, owner, role, change)
|
||||
}
|
||||
if err != nil {
|
||||
return err
|
||||
return nil, err
|
||||
}
|
||||
if activeChanged {
|
||||
if _, err = tx.Exec(ctx, "UPDATE chat_groups SET membership_version=membership_version+1 WHERE id=$1", id); err != nil {
|
||||
return err
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
return tx.Commit(ctx)
|
||||
if change.Action != "disband" {
|
||||
audience := "active"
|
||||
switch {
|
||||
case change.Action == "rename":
|
||||
audience = "all"
|
||||
case change.Action == "invite", change.Action == "decline", change.Action == "remove" && !activeChanged:
|
||||
audience = "managers"
|
||||
}
|
||||
users, err = groupChangeAudience(ctx, tx, id, owner, audience)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
// Removed and invited users need to refresh their own group list as well.
|
||||
users = append(users, user)
|
||||
if change.Action == "invite" || change.Action == "remove" {
|
||||
users = append(users, change.Target)
|
||||
}
|
||||
}
|
||||
return users, tx.Commit(ctx)
|
||||
}
|
||||
|
||||
func groupChangeAudience(ctx context.Context, tx pgx.Tx, group, owner, audience string) ([]string, error) {
|
||||
rows, err := tx.Query(ctx, `
|
||||
SELECT user_id::text FROM group_members WHERE group_id=$1 AND (
|
||||
$3='all' OR (state='active' AND ($3='active' OR user_id=$2 OR role='admin'))
|
||||
)
|
||||
`, group, owner, audience)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return pgx.CollectRows(rows, pgx.RowTo[string])
|
||||
}
|
||||
|
||||
func changeActive(ctx context.Context, tx pgx.Tx, user, id, owner, role string, change Change) (bool, error) {
|
||||
|
||||
@@ -1,9 +1,11 @@
|
||||
package httpapi
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"net/http"
|
||||
"strings"
|
||||
"time"
|
||||
"unicode"
|
||||
"unicode/utf8"
|
||||
|
||||
@@ -52,6 +54,7 @@ func (a *API) createGroup(w http.ResponseWriter, r *http.Request, _ string, id a
|
||||
groupError(w, err)
|
||||
return
|
||||
}
|
||||
a.hintGroupList(r.Context(), []string{id.User.ID})
|
||||
respond(w, 201, group)
|
||||
}
|
||||
|
||||
@@ -109,9 +112,25 @@ func (a *API) changeGroup(w http.ResponseWriter, r *http.Request, _ string, id a
|
||||
if !a.limit(w, r, "group-change:"+id.User.ID, 60) {
|
||||
return
|
||||
}
|
||||
if err := a.groups.Change(r.Context(), id.User.ID, group, change); err != nil {
|
||||
users, err := a.groups.Change(r.Context(), id.User.ID, group, change)
|
||||
if err != nil {
|
||||
groupError(w, err)
|
||||
return
|
||||
}
|
||||
a.hintGroupList(r.Context(), users)
|
||||
w.WriteHeader(204)
|
||||
}
|
||||
|
||||
func (a *API) hintGroupList(ctx context.Context, users []string) {
|
||||
ctx, cancel := context.WithTimeout(context.WithoutCancel(ctx), 250*time.Millisecond)
|
||||
defer cancel()
|
||||
pipe := a.redis.Pipeline()
|
||||
seen := make(map[string]bool, len(users))
|
||||
for _, user := range users {
|
||||
if !seen[user] {
|
||||
pipe.Publish(ctx, "xhchat:groups:"+user, "changed")
|
||||
seen[user] = true
|
||||
}
|
||||
}
|
||||
_, _ = pipe.Exec(ctx)
|
||||
}
|
||||
@@ -64,11 +64,14 @@ func (a *API) realtime(w http.ResponseWriter, r *http.Request) {
|
||||
return
|
||||
}
|
||||
inboxChannel := "xhchat:inbox:" + identity.Device.ID
|
||||
subscription := a.redis.Subscribe(r.Context(), "xhchat:contacts:"+identity.User.ID, inboxChannel)
|
||||
groupsChannel := "xhchat:groups:" + identity.User.ID
|
||||
subscription := a.redis.Subscribe(r.Context(), "xhchat:contacts:"+identity.User.ID, inboxChannel, groupsChannel)
|
||||
defer subscription.Close()
|
||||
if _, err = subscription.Receive(r.Context()); err != nil {
|
||||
unavailable(w, err)
|
||||
return
|
||||
for range 3 {
|
||||
if _, err = subscription.Receive(r.Context()); err != nil {
|
||||
unavailable(w, err)
|
||||
return
|
||||
}
|
||||
}
|
||||
changes := subscription.Channel()
|
||||
// The exact Origin was checked before consuming the ticket.
|
||||
@@ -101,7 +104,10 @@ func (a *API) realtime(w http.ResponseWriter, r *http.Request) {
|
||||
}
|
||||
writeCtx, cancel := context.WithTimeout(ctx, 5*time.Second)
|
||||
event := map[string]string{"type": "contacts_changed"}
|
||||
if change.Channel == inboxChannel {
|
||||
switch change.Channel {
|
||||
case groupsChannel:
|
||||
event["type"] = "group_list_changed"
|
||||
case inboxChannel:
|
||||
event["type"] = "inbox_changed"
|
||||
if group, found := strings.CutPrefix(change.Payload, "group:"); found && uuidPattern.MatchString(group) {
|
||||
event["type"] = "group_changed"
|
||||
|
||||
Reference in new issue
Block a user