π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Bound retained Space pokes
Anand Baburajan5aeaa7bbffde
diff --git a/server/space/controller/pokes_test.go b/server/space/controller/pokes_test.goindex 943336463e..10441f4b69 100644--- a/server/space/controller/pokes_test.go+++ b/server/space/controller/pokes_test.go@@ -27,4 +27,11 @@ func TestPokesRequireFriendshipAndNotifyOnlyOnce(t *testing.T) {require.Equal(t, []int64{bobID}, event.recipientIDs)require.NoError(t, controller.Create(ctx, alice, bob.SpaceID, request))requireNoSpaceActivity(t, notifier)+ request.ClientRequestID = "poke-request-2"+ require.NoError(t, controller.Create(ctx, alice, bob.SpaceID, request))+ event = requireSpaceActivity(t, notifier)+ require.Equal(t, spaceActivityPokeSent, event.event)+ require.Equal(t, []int64{bobID}, event.recipientIDs)+ require.NoError(t, controller.Create(ctx, alice, bob.SpaceID, request))+ requireNoSpaceActivity(t, notifier)}diff --git a/server/space/repo/friends.go b/server/space/repo/friends.goindex 62a2d5e2fd..fff6db2cf8 100644--- a/server/space/repo/friends.go+++ b/server/space/repo/friends.go@@ -500,7 +500,14 @@ func (r *FriendsRepository) DeleteFriendship(ctx context.Context, actorSpaceID sreturn stacktrace.Propagate(err, "")}if _, err := tx.ExecContext(ctx, `- DELETE FROM space_notifications WHERE kind IN ('friend_accepted', 'poke')+ DELETE FROM space_pokes+ WHERE (sender_space_id = $1 AND recipient_space_id = $2)+ OR (sender_space_id = $2 AND recipient_space_id = $1)+ `, actorSpaceID, targetSpaceID); err != nil {+ return stacktrace.Propagate(err, "")+ }+ if _, err := tx.ExecContext(ctx, `+ DELETE FROM space_notifications WHERE kind = 'friend_accepted'AND ((recipient_space_id = $1 AND actor_space_id = $2) OR (recipient_space_id = $2 AND actor_space_id = $1))`, actorSpaceID, targetSpaceID); err != nil {return stacktrace.Propagate(err, "")diff --git a/server/space/repo/pokes.go b/server/space/repo/pokes.goindex c961829fcc..d814a5b2c0 100644--- a/server/space/repo/pokes.go+++ b/server/space/repo/pokes.go@@ -29,7 +29,7 @@ func (r *PokesRepository) Create(ctx context.Context, senderSpaceID, recipientSpSELECT friend_space_id FROM space_friend_sharesWHERE space_id = $2 AND friend_space_id = $1AND (SELECT COUNT(*) FROM locked_spaces) = 2- FOR SHARE+ FOR UPDATE`, senderSpaceID, recipientSpaceID).Scan(&friendSpaceID); err != nil {return false, stacktrace.Propagate(err, "")}@@ -50,6 +50,12 @@ func (r *PokesRepository) Create(ctx context.Context, senderSpaceID, recipientSpreturn false, nil}if _, err := tx.ExecContext(ctx, `+ DELETE FROM space_pokes+ WHERE sender_space_id = $1 AND recipient_space_id = $2 AND poke_id <> $3+ `, senderSpaceID, recipientSpaceID, pokeID); err != nil {+ return false, stacktrace.Propagate(err, "")+ }+ if _, err := tx.ExecContext(ctx, `INSERT INTO space_notifications (notification_id, recipient_space_id, actor_space_id, kind, poke_id, created_at)SELECT $1, recipient_space_id, sender_space_id, 'poke', poke_id, created_atFROM space_pokes WHERE poke_id = $2diff --git a/server/space/repo/pokes_test.go b/server/space/repo/pokes_test.goindex 57892ee89e..c75500dd31 100644--- a/server/space/repo/pokes_test.go+++ b/server/space/repo/pokes_test.go@@ -3,6 +3,7 @@ package repoimport ("context""database/sql"+ "strconv""sync""testing""time"@@ -76,7 +77,7 @@ func TestPokesCreateDuringShareChanges(t *testing.T) {}}-func TestPokesCreateNotificationsOnceAndGroupReadState(t *testing.T) {+func TestPokesKeepLatestNotificationAndReadState(t *testing.T) {module := newSpaceTestModule(t)ctx := t.Context()alice, bob := notificationTestSpaces(t, module)@@ -111,6 +112,10 @@ func TestPokesCreateNotificationsOnceAndGroupReadState(t *testing.T) {unread, err := module.Read.HasUnreadNotifications(ctx, alice.SpaceID)require.NoError(t, err)require.False(t, unread)+ first, _, err := module.Notifications.List(ctx, alice.SpaceID, "", 20)+ require.NoError(t, err)+ require.Len(t, first, 1)+ require.NoError(t, module.Notifications.MarkRead(ctx, alice.SpaceID, first[0].NotificationIDs))_, err = module.Pokes.Create(ctx, bob.SpaceID, alice.SpaceID, "second")require.NoError(t, err)page, cursor, err := module.Notifications.List(ctx, alice.SpaceID, "", 1)@@ -121,7 +126,11 @@ func TestPokesCreateNotificationsOnceAndGroupReadState(t *testing.T) {require.Equal(t, bob.SpaceID, page[0].Actors[0].SpaceID)require.Equal(t, int64(1), page[0].ActorCount)require.True(t, page[0].Unread)- require.Len(t, page[0].NotificationIDs, 2)+ require.Len(t, page[0].NotificationIDs, 1)+ require.NotEqual(t, first[0].NotificationID, page[0].NotificationID)+ require.Greater(t, page[0].CreatedAt, first[0].CreatedAt)+ require.Equal(t, int64(1), countSpaceRows(t, module, `SELECT COUNT(*) FROM space_pokes`))+ require.Equal(t, int64(1), countSpaceRows(t, module, `SELECT COUNT(*) FROM space_notifications WHERE kind = 'poke'`))require.NoError(t, module.Notifications.MarkRead(ctx, bob.SpaceID, page[0].NotificationIDs))unread, err = module.Notifications.HasUnread(ctx, alice.SpaceID)require.NoError(t, err)@@ -148,9 +157,19 @@ func TestPokesCreateNotificationsOnceAndGroupReadState(t *testing.T) {require.Equal(t, latest.NotificationID, page[0].NotificationID)require.Equal(t, latest.CreatedAt, page[0].CreatedAt)require.Equal(t, latest.Actors, page[0].Actors)- _, err = module.Pokes.DB.ExecContext(ctx, `DELETE FROM space_pokes WHERE client_request_id = 'third'`)+ created, err := module.Pokes.Create(ctx, bob.SpaceID, alice.SpaceID, "third")+ require.NoError(t, err)+ require.False(t, created)+ page, _, err = module.Notifications.List(ctx, alice.SpaceID, "", 20)+ require.NoError(t, err)+ require.Len(t, page, 1)+ require.False(t, page[0].Unread)+ require.Equal(t, latest.NotificationID, page[0].NotificationID)+ require.Equal(t, latest.CreatedAt, page[0].CreatedAt)+ _, err = module.Pokes.Create(ctx, alice.SpaceID, bob.SpaceID, "reverse")require.NoError(t, err)- require.Equal(t, int64(2), countSpaceRows(t, module, `SELECT COUNT(*) FROM space_notifications`))+ require.Equal(t, int64(2), countSpaceRows(t, module, `SELECT COUNT(*) FROM space_pokes`))+ require.Equal(t, int64(2), countSpaceRows(t, module, `SELECT COUNT(*) FROM space_notifications WHERE kind = 'poke'`))require.NoError(t, module.Friends.DeleteFriendship(ctx, alice.SpaceID, bob.SpaceID))_, err = module.Pokes.Create(ctx, bob.SpaceID, alice.SpaceID, "not-friends")require.Error(t, err)@@ -158,4 +177,43 @@ func TestPokesCreateNotificationsOnceAndGroupReadState(t *testing.T) {require.NoError(t, err)require.Empty(t, page)require.Equal(t, int64(0), countSpaceRows(t, module, `SELECT COUNT(*) FROM space_notifications`))+ require.Equal(t, int64(0), countSpaceRows(t, module, `SELECT COUNT(*) FROM space_pokes`))+}++func TestPokesConcurrentRequestsKeepOneRowPerDirection(t *testing.T) {+ module := newSpaceTestModule(t)+ alice, bob := notificationTestSpaces(t, module)+ ctx, cancel := context.WithTimeout(t.Context(), 10*time.Second)+ defer cancel()+ results := make(chan bool, 32)+ failures := make(chan error, 32)+ var workers sync.WaitGroup+ for i := range 32 {+ workers.Add(1)+ go func() {+ defer workers.Done()+ sender, recipient := alice.SpaceID, bob.SpaceID+ if i%2 == 0 {+ sender, recipient = recipient, sender+ }+ created, err := module.Pokes.Create(ctx, sender, recipient, strconv.Itoa(i))+ results <- created+ failures <- err+ }()+ }+ workers.Wait()+ close(results)+ close(failures)+ for err := range failures {+ require.NoError(t, err)+ }+ for created := range results {+ require.True(t, created)+ }+ require.Equal(t, int64(2), countSpaceRows(t, module, `SELECT COUNT(*) FROM space_pokes`))+ require.Equal(t, int64(2), countSpaceRows(t, module, `SELECT COUNT(*) FROM space_notifications WHERE kind = 'poke'`))+ require.Equal(t, int64(0), countSpaceRows(t, module, `+ SELECT COUNT(*) FROM space_pokes p JOIN space_notifications n ON n.poke_id = p.poke_id+ WHERE n.created_at <> p.created_at OR n.read_at IS NOT NULL+ `))}