Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Revert "Fix Space home post sync cursors"

Anand Baburajan4d5a0e47530a
diff --git a/rust/bindings/wasm/space/src/space.rs b/rust/bindings/wasm/space/src/space.rs
index 83f51aa70d..af52f6d47c 100644
--- a/rust/bindings/wasm/space/src/space.rs
+++ b/rust/bindings/wasm/space/src/space.rs
@@ -139,7 +139,6 @@ struct PostJs {
key_version: i32,
objects: Vec<PostObjectJs>,
created_at: String,
- created_at_micros: i64,
viewer_liked: bool,
is_unavailable: bool,
}
@@ -407,7 +406,6 @@ async fn account_post_to_js(
key_version: post.key_version,
objects: post_objects_to_js(Some(&decrypted.post_key), post.objects)?,
created_at: post.created_at,
- created_at_micros: post.created_at_micros,
viewer_liked: post.viewer_liked,
is_unavailable: false,
})
@@ -424,7 +422,6 @@ fn unavailable_post_to_js(post: PostResponse) -> Result<PostJs, Error> {
key_version: post.key_version,
objects: Vec::new(),
created_at: post.created_at,
- created_at_micros: post.created_at_micros,
viewer_liked: post.viewer_liked,
is_unavailable: true,
})
@@ -491,7 +488,6 @@ fn link_post_to_js(post: PostResponse, decrypted: DecryptedPost) -> Result<PostJ
key_version: post.key_version,
objects: post_objects_to_js(Some(&decrypted.post_key), post.objects)?,
created_at: post.created_at,
- created_at_micros: post.created_at_micros,
viewer_liked: false,
is_unavailable: false,
})
@@ -1505,7 +1501,6 @@ mod tests {
key_version: 1,
objects: Vec::new(),
created_at: format!("2026-08-0{post_id}T00:00:00Z"),
- created_at_micros: 1_775_000_000_000_000 + post_id,
viewer_liked: false,
}
}
diff --git a/rust/crates/space/src/client/tests.rs b/rust/crates/space/src/client/tests.rs
index ccbb2b1351..fac15f37f1 100644
--- a/rust/crates/space/src/client/tests.rs
+++ b/rust/crates/space/src/client/tests.rs
@@ -1788,7 +1788,6 @@ async fn list_home_posts_uses_home_posts_endpoint() {
"keyVersion": 3,
"objects": [],
"createdAt": "2026-04-16T00:00:00Z",
- "createdAtMicros": 1776297600123456_i64,
"viewerLiked": true
}],
"nextCursor": "cursor-2",
@@ -1811,7 +1810,6 @@ async fn list_home_posts_uses_home_posts_endpoint() {
assert_eq!(page.items.len(), 1);
assert_eq!(page.items[0].post_id, 42);
- assert_eq!(page.items[0].created_at_micros, 1776297600123456);
assert_eq!(page.next_cursor, "cursor-2");
assert_eq!(page.sync_cursor, "2000:42");
shares.assert_async().await;
@@ -1846,7 +1844,6 @@ async fn list_posts_uses_space_posts_page_endpoint() {
"keyVersion": 3,
"objects": [],
"createdAt": "2026-04-16T00:00:00Z",
- "createdAtMicros": 1776297600123456_i64,
"viewerLiked": true
}],
"nextCursor": "41"
@@ -1915,7 +1912,6 @@ async fn fetch_post_decrypted_uses_post_by_id_endpoint() {
"keyVersion": 3,
"objects": [],
"createdAt": "2026-04-16T00:00:00Z",
- "createdAtMicros": 1776297600123456_i64,
"viewerLiked": false
})
.to_string(),
diff --git a/rust/crates/space/src/transport.rs b/rust/crates/space/src/transport.rs
index e404e7ed97..5ea905cb23 100644
--- a/rust/crates/space/src/transport.rs
+++ b/rust/crates/space/src/transport.rs
@@ -245,7 +245,6 @@ pub struct PostResponse {
#[serde(default)]
pub objects: Vec<PostObjectPayload>,
pub created_at: String,
- pub created_at_micros: i64,
pub viewer_liked: bool,
}
diff --git a/server/space/controller/helpers.go b/server/space/controller/helpers.go
index d1cf71acca..40dc5c8136 100644
--- a/server/space/controller/helpers.go
+++ b/server/space/controller/helpers.go
@@ -110,7 +110,6 @@ func toPostResponse(post *spacerepo.SpacePostRecord, assets []spacerepo.SpacePos
CaptionCipher: encodeSpaceField(post.CaptionCipher),
KeyVersion: post.KeyVersion,
CreatedAt: formatMicros(post.CreatedAt),
- CreatedAtMicros: post.CreatedAt,
ViewerLiked: post.ViewerLiked,
}
if len(assets) > 0 {
diff --git a/server/space/controller/posts.go b/server/space/controller/posts.go
index 7c21552050..3636fd2116 100644
--- a/server/space/controller/posts.go
+++ b/server/space/controller/posts.go
@@ -5,6 +5,7 @@ import (
"database/sql"
"errors"
"fmt"
+ "strconv"
"strings"
"github.com/ente/museum/ente"
@@ -153,6 +154,10 @@ func (c *PostsController) List(ctx *gin.Context, req models.ListPostsRequest) (*
}
func (c *PostsController) ListHomePosts(ctx context.Context, viewerSpace *repo.SpaceRecord, req models.ListHomePostsRequest) (*models.HomePostPage, error) {
+ syncCreatedAt, err := c.PostsRepo.CurrentDatabaseTimeMicroseconds(ctx)
+ if err != nil {
+ return nil, err
+ }
posts, nextCursor, err := c.PostsRepo.ListHomePosts(ctx, viewerSpace.SpaceID, req.After, req.Cursor, req.Limit)
if err != nil {
return nil, err
@@ -161,15 +166,15 @@ func (c *PostsController) ListHomePosts(ctx context.Context, viewerSpace *repo.S
if err != nil {
return nil, err
}
- syncCreatedAt, syncPostID := int64(0), int64(0)
- if len(posts) > 0 {
+ syncPostID := int64(0)
+ if len(posts) > 0 && posts[0].CreatedAt >= syncCreatedAt {
syncCreatedAt = posts[0].CreatedAt
syncPostID = posts[0].PostID
}
return &models.HomePostPage{
Items: items,
NextCursor: nextCursor,
- SyncCursor: fmt.Sprintf("%d:%d", syncCreatedAt, syncPostID),
+ SyncCursor: strconv.FormatInt(syncCreatedAt, 10) + ":" + strconv.FormatInt(syncPostID, 10),
}, nil
}
diff --git a/server/space/controller/posts_test.go b/server/space/controller/posts_test.go
index e94b690029..247df1ac57 100644
--- a/server/space/controller/posts_test.go
+++ b/server/space/controller/posts_test.go
@@ -3,7 +3,8 @@ package controller
import (
"crypto/sha256"
"database/sql"
- "fmt"
+ "strconv"
+ "strings"
"testing"
timeutil "github.com/ente/museum/pkg/utils/time"
@@ -98,31 +99,26 @@ func TestListPostsHydratesPostAssets(t *testing.T) {
require.Equal(t, int64(123), page.Items[0].Objects[0].Size)
require.Equal(t, 1, page.Items[0].Objects[0].Position)
require.Equal(t, "bWV0YWRhdGE=", page.Items[0].Objects[0].MetadataCipher)
- post, err := repos.Posts.GetPost(ctx, page.Items[0].PostID, aliceSpace.SpaceID)
- require.NoError(t, err)
- require.Equal(t, post.CreatedAt, page.Items[0].CreatedAtMicros)
}
-func TestListHomePostsSyncCursorUsesNewestVisiblePost(t *testing.T) {
+func TestListHomePostsSyncCursorUsesDatabaseTime(t *testing.T) {
controller, repos, ctx := setupPostsControllerTest(t)
aliceID := insertSpaceControllerUser(t, repos, "[email protected]", "alice-public")
aliceSpace, err := testCreateSpace(ctx, repos, aliceID, "alice_home_sync", "alice-space-key", "alice-home-sync-public", "alice-home-sync-secret", "alice-home-sync-secret-nonce", "alice-profile")
require.NoError(t, err)
- page, err := controller.ListHomePosts(ctx, aliceSpace, models.ListHomePostsRequest{Limit: 10})
+ before, err := repos.Posts.CurrentDatabaseTimeMicroseconds(ctx)
require.NoError(t, err)
- require.Equal(t, "0:0", page.SyncCursor)
-
- bobID := insertSpaceControllerUser(t, repos, "[email protected]", "bob-public")
- bobSpace, err := testCreateSpace(ctx, repos, bobID, "bob_home_sync", "bob-space-key", "bob-home-sync-public", "bob-home-sync-secret", "bob-home-sync-secret-nonce", "bob-profile")
- require.NoError(t, err)
- require.NoError(t, testAddFriend(ctx, repos, aliceID, aliceSpace.SpaceID, bobSpace.SpaceID, "bob-share-key", bobSpace.CurrentVersion, "alice-share-key", aliceSpace.CurrentVersion))
- postID, err := testCreatePost(ctx, repos, bobID, bobSpace.SpaceID, "post-key", nil, bobSpace.CurrentVersion, nil)
+ page, err := controller.ListHomePosts(ctx, aliceSpace, models.ListHomePostsRequest{Limit: 10})
require.NoError(t, err)
- post, err := repos.Posts.GetPost(ctx, postID, aliceSpace.SpaceID)
+ after, err := repos.Posts.CurrentDatabaseTimeMicroseconds(ctx)
require.NoError(t, err)
- page, err = controller.ListHomePosts(ctx, aliceSpace, models.ListHomePostsRequest{Limit: 10})
+ createdAt, postID, found := strings.Cut(page.SyncCursor, ":")
+ require.True(t, found)
+ syncCreatedAt, err := strconv.ParseInt(createdAt, 10, 64)
require.NoError(t, err)
- require.Equal(t, fmt.Sprintf("%d:%d", post.CreatedAt, post.PostID), page.SyncCursor)
+ require.Equal(t, "0", postID)
+ require.GreaterOrEqual(t, syncCreatedAt, before)
+ require.LessOrEqual(t, syncCreatedAt, after)
}
diff --git a/server/space/models/models.go b/server/space/models/models.go
index 6baaaeb3de..cd6b677d56 100644
--- a/server/space/models/models.go
+++ b/server/space/models/models.go
@@ -390,7 +390,6 @@ type PostResponse struct {
KeyVersion int `json:"keyVersion"`
Objects []PostObjectPayload `json:"objects,omitempty"`
CreatedAt string `json:"createdAt"`
- CreatedAtMicros int64 `json:"createdAtMicros"`
ViewerLiked bool `json:"viewerLiked"`
}
diff --git a/server/space/repo/module_test.go b/server/space/repo/module_test.go
index cf0efd85fe..745eca90c6 100644
--- a/server/space/repo/module_test.go
+++ b/server/space/repo/module_test.go
@@ -10,7 +10,6 @@ import (
"strconv"
"sync"
"testing"
- "time"
"github.com/ente/museum/ente"
"github.com/ente/museum/internal/testutil"
@@ -29,29 +28,6 @@ func newSpaceTestModule(t *testing.T) *Module {
return NewModule(db, nil)
}
-func waitForSpaceLockWaiter(t *testing.T, db *sql.DB) {
- t.Helper()
- deadline := time.Now().Add(5 * time.Second)
- for time.Now().Before(deadline) {
- var count int
- err := db.QueryRow(`
- SELECT COUNT(*)
- FROM pg_stat_activity
- WHERE datname = current_database()
- AND pid <> pg_backend_pid()
- AND wait_event_type = 'Lock'
- AND query LIKE '%FROM spaces%'
- AND query LIKE '%FOR UPDATE%'
- `).Scan(&count)
- require.NoError(t, err)
- if count > 0 {
- return
- }
- time.Sleep(10 * time.Millisecond)
- }
- t.Fatal("timed out waiting for space-lock waiter")
-}
-
type SpaceMessageConversationRecord struct {
Friend SpaceActorRecord
LatestActivity SpaceMessageConversationActivityRecord
@@ -308,44 +284,6 @@ func TestCreatePostEnforcesSpacePostLimit(t *testing.T) {
require.Equal(t, MaxPostsPerSpace, postCount)
}
-func TestCreatePostStampsAfterSpaceLock(t *testing.T) {
- module := newSpaceTestModule(t)
- ctx := context.Background()
- userID := insertSpaceUser(t, module, "[email protected]", "post-lock-public")
- space, err := testCreateSpace(ctx, module, userID, "post_lock", "root", "public", "secret", "nonce", "profile")
- require.NoError(t, err)
-
- blocker, err := module.Posts.DB.BeginTx(ctx, nil)
- require.NoError(t, err)
- defer blocker.Rollback()
- _, err = blocker.ExecContext(ctx, `
- SELECT space_id
- FROM spaces
- WHERE space_id = $1
- FOR UPDATE
- `, space.SpaceID)
- require.NoError(t, err)
-
- type result struct {
- postID int64
- err error
- }
- created := make(chan result, 1)
- go func() {
- postID, _, err := module.Posts.CreatePost(ctx, space.SpaceID, testSpaceBytes("post-key"), nil, space.CurrentVersion, nil)
- created <- result{postID, err}
- }()
-
- waitForSpaceLockWaiter(t, module.Posts.DB)
- lockReleaseTime := time.Now().UnixMicro()
- require.NoError(t, blocker.Commit())
- createResult := <-created
- require.NoError(t, createResult.err)
- post, err := module.Posts.GetPost(ctx, createResult.postID, space.SpaceID)
- require.NoError(t, err)
- require.GreaterOrEqual(t, post.CreatedAt, lockReleaseTime)
-}
-
func TestCreateMessageEnforcesSenderLimit(t *testing.T) {
module := newSpaceTestModule(t)
ctx := context.Background()
@@ -2146,14 +2084,6 @@ func TestListHomePostsReturnsFriendLatestAndPostsAfterCursor(t *testing.T) {
require.False(t, page[0].ViewerLiked)
require.Empty(t, nextCursor)
- page, nextCursor, err = module.Posts.ListHomePosts(ctx, aliceSpace.SpaceID, "0:0", "", 10)
- require.NoError(t, err)
- require.Len(t, page, 3)
- require.Equal(t, first, page[0].PostID)
- require.Equal(t, second, page[1].PostID)
- require.Equal(t, third, page[2].PostID)
- require.Empty(t, nextCursor)
-
page, nextCursor, err = module.Posts.ListHomePosts(ctx, aliceSpace.SpaceID, "1500:0", "", 10)
require.NoError(t, err)
require.Len(t, page, 2)
diff --git a/server/space/repo/posts.go b/server/space/repo/posts.go
index 7ac22feafa..c097edb9d5 100644
--- a/server/space/repo/posts.go
+++ b/server/space/repo/posts.go
@@ -8,7 +8,6 @@ import (
"strings"
"github.com/ente/museum/ente/base"
- timeutil "github.com/ente/museum/pkg/utils/time"
"github.com/ente/stacktrace"
)
@@ -16,6 +15,14 @@ const MaxPostsPerSpace = 250
var ErrSpacePostLimitReached = errors.New("space post limit reached")
+func (r *PostsRepository) CurrentDatabaseTimeMicroseconds(ctx context.Context) (int64, error) {
+ var currentTime int64
+ if err := r.DB.QueryRowContext(ctx, `SELECT now_utc_micro_seconds()`).Scan(&currentTime); err != nil {
+ return 0, stacktrace.Propagate(err, "")
+ }
+ return currentTime, nil
+}
+
func (r *PostsRepository) CountPosts(ctx context.Context, spaceID string) (int64, error) {
var count int64
if err := r.DB.QueryRowContext(ctx, `
@@ -97,13 +104,12 @@ func (r *PostsRepository) CreatePost(ctx context.Context, spaceID string, encryp
if captionCipher != nil {
caption = captionCipher
}
- createdAt := timeutil.Microseconds()
var postID int64
if err := tx.QueryRowContext(ctx, `
- INSERT INTO space_posts (space_id, encrypted_post_key, caption_cipher, key_version, created_at, updated_at)
- VALUES ($1, $2, $3, $4, $5, $5)
+ INSERT INTO space_posts (space_id, encrypted_post_key, caption_cipher, key_version)
+ VALUES ($1, $2, $3, $4)
RETURNING post_id
- `, spaceID, encryptedPostKey, caption, keyVersion, createdAt).Scan(&postID); err != nil {
+ `, spaceID, encryptedPostKey, caption, keyVersion).Scan(&postID); err != nil {
return 0, 0, stacktrace.Propagate(err, "")
}
for _, obj := range objects {
@@ -411,17 +417,17 @@ func parsePostBoundary(cursor string) (int64, int64, bool) {
return parsePostPosition(cursor, true)
}
-func parsePostPosition(cursor string, allowZero bool) (int64, int64, bool) {
+func parsePostPosition(cursor string, allowZeroPostID bool) (int64, int64, bool) {
createdAtText, postIDText, ok := strings.Cut(strings.TrimSpace(cursor), ":")
if !ok {
return 0, 0, false
}
createdAt, err := strconv.ParseInt(createdAtText, 10, 64)
- if err != nil || createdAt < 0 || (!allowZero && createdAt == 0) {
+ if err != nil || createdAt <= 0 {
return 0, 0, false
}
postID, err := strconv.ParseInt(postIDText, 10, 64)
- if err != nil || postID < 0 || (!allowZero && postID == 0) {
+ if err != nil || postID < 0 || (!allowZeroPostID && postID == 0) {
return 0, 0, false
}
return createdAt, postID, true
diff --git a/web/apps/space/src/components/AuthenticatedFriendProfile.tsx b/web/apps/space/src/components/AuthenticatedFriendProfile.tsx
index dab9708a36..95c7a81ed8 100644
--- a/web/apps/space/src/components/AuthenticatedFriendProfile.tsx
+++ b/web/apps/space/src/components/AuthenticatedFriendProfile.tsx
@@ -180,7 +180,7 @@ export const AuthenticatedFriendProfile: React.FC<
if (!post.postId) return;
void markSpaceHomePostRead(actorSpaceId, {
postId: post.postId,
- timestampMicros: post.timestampMicros,
+ timestampMs: post.timestampMs,
}).catch((error: unknown) =>
log.warn("Failed to mark Space post as read", error),
);
diff --git a/web/apps/space/src/components/FileViewer.tsx b/web/apps/space/src/components/FileViewer.tsx
index 3abfba37c4..3f8e02710f 100644
--- a/web/apps/space/src/components/FileViewer.tsx
+++ b/web/apps/space/src/components/FileViewer.tsx
@@ -138,7 +138,6 @@ export interface SpaceViewerPhoto {
name: string;
postId?: number;
spaceId?: string;
- timestampMicros?: number;
timestampMs: number;
username?: string;
viewerLiked?: boolean;
diff --git a/web/apps/space/src/pages/app/posts/[spaceId]/[postId].tsx b/web/apps/space/src/pages/app/posts/[spaceId]/[postId].tsx
index c5b1117083..e38c906234 100644
--- a/web/apps/space/src/pages/app/posts/[spaceId]/[postId].tsx
+++ b/web/apps/space/src/pages/app/posts/[spaceId]/[postId].tsx
@@ -59,7 +59,6 @@ const viewerPhotoFromPost = (post: SpacePost) => ({
name: post.name,
postId: post.postId,
spaceId: post.spaceId,
- timestampMicros: post.timestampMicros,
timestampMs: post.timestampMs,
viewerLiked: post.viewerLiked,
width: post.width,
diff --git a/web/apps/space/src/screens/HomeScreen.tsx b/web/apps/space/src/screens/HomeScreen.tsx
index 17e56a3f42..9ac4bfd5ee 100644
--- a/web/apps/space/src/screens/HomeScreen.tsx
+++ b/web/apps/space/src/screens/HomeScreen.tsx
@@ -159,7 +159,6 @@ const viewerPhotoForPost = (
name: displayName,
postId: post.postId,
spaceId: post.spaceId,
- timestampMicros: post.timestampMicros,
timestampMs: post.timestampMs,
username: friend.username,
viewerLiked: post.viewerLiked,
@@ -479,7 +478,6 @@ export const FriendPostCircle: React.FC<FriendPostCircleProps> = ({
name: displayName,
postId: post.postId,
spaceId: post.spaceId,
- timestampMicros: post.timestampMicros,
timestampMs: post.timestampMs,
username: friend.username,
viewerLiked: post.viewerLiked,
@@ -872,9 +870,7 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({
}
for (const posts of postsByFriendID.values()) {
posts.sort(
- (a, b) =>
- b.timestampMicros - a.timestampMicros ||
- b.postId - a.postId,
+ (a, b) => b.timestampMs - a.timestampMs || b.postId - a.postId,
);
}
return postsByFriendID;
@@ -975,7 +971,7 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({
}
};
const markPostRead = React.useCallback(
- (post: Pick<SpacePost, "postId" | "timestampMicros">) => {
+ (post: Pick<SpacePost, "postId" | "timestampMs">) => {
if (!viewerSpaceId) return;
setOpenedPostIds((current) => new Set(current).add(post.postId));
void markSpaceHomePostRead(viewerSpaceId, post).catch(
@@ -990,10 +986,10 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({
posts: SpacePost[],
photo: SpaceViewerPhoto,
) => {
- if (photo.postId && photo.timestampMicros) {
+ if (photo.postId) {
markPostRead({
postId: photo.postId,
- timestampMicros: photo.timestampMicros,
+ timestampMs: photo.timestampMs,
});
}
const isOwnPost =
@@ -1758,8 +1754,8 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({
whiteSpace: "nowrap",
}}
>
- Every friend you add gets their own
- tile, showing their latest post
+ Each person gets their own tile with
+ their latest post
</Box>
<Box
component="button"
diff --git a/web/apps/space/src/screens/ProfileScreen.tsx b/web/apps/space/src/screens/ProfileScreen.tsx
index d93e7bb0dd..7339af657f 100644
--- a/web/apps/space/src/screens/ProfileScreen.tsx
+++ b/web/apps/space/src/screens/ProfileScreen.tsx
@@ -95,7 +95,6 @@ export interface ProfilePostItem {
name?: string;
postId?: number;
spaceId?: string;
- timestampMicros: number;
timestampMs: number;
thumbHash?: string;
viewerLiked?: boolean;
@@ -811,7 +810,6 @@ export const ProfileScreen: React.FC<ProfileScreenProps> = ({
name: displayName,
postId: item.postId,
spaceId: item.spaceId,
- timestampMicros: item.timestampMicros,
timestampMs: item.timestampMs,
viewerLiked: item.viewerLiked,
width: dimensions.width,
@@ -839,7 +837,6 @@ export const ProfileScreen: React.FC<ProfileScreenProps> = ({
name: displayName,
postId: item.postId,
spaceId: item.spaceId,
- timestampMicros: item.timestampMicros,
timestampMs: item.timestampMs,
viewerLiked: item.viewerLiked,
width: dimensions.width,
diff --git a/web/apps/space/src/services/home-posts.ts b/web/apps/space/src/services/home-posts.ts
index cf0ca082c8..9fbf4db043 100644
--- a/web/apps/space/src/services/home-posts.ts
+++ b/web/apps/space/src/services/home-posts.ts
@@ -6,7 +6,7 @@ import { apiOrigin } from "ente-base/origins";
import { loadCurrentHomePostsPage, type SpacePost } from "services/space";
import { z } from "zod";
-const homePostsVersion = 2;
+const homePostsVersion = 1;
const CachedSpacePostAsset = z.object({
encryptedPostKey: z.string(),
@@ -31,7 +31,6 @@ const CachedSpacePost = z.object({
postId: z.number(),
spaceId: z.string(),
thumbHash: z.string().optional(),
- timestampMicros: z.number().int().nonnegative(),
timestampMs: z.number(),
username: z.string().optional(),
viewerLiked: z.boolean(),
@@ -40,7 +39,7 @@ const CachedSpacePost = z.object({
const PostMarker = z.object({
postId: z.number().int().positive(),
- timestampMicros: z.number().int().nonnegative(),
+ timestampMs: z.number().nonnegative(),
});
const SpaceHomePostsStateSchema = z.object({
@@ -65,7 +64,7 @@ export interface SpaceHomePostsState {
interface SpacePostMarker {
postId: number;
- timestampMicros: number;
+ timestampMs: number;
}
const memoryCache = new Map<string, SpaceHomePostsState | undefined>();
@@ -112,16 +111,15 @@ const cloneState = (state: SpaceHomePostsState): SpaceHomePostsState => ({
});
const descendingPostOrder = (a: SpacePostMarker, b: SpacePostMarker) =>
- b.timestampMicros - a.timestampMicros || b.postId - a.postId;
+ b.timestampMs - a.timestampMs || b.postId - a.postId;
const isAfter = (post: SpacePostMarker, marker: SpacePostMarker) =>
- post.timestampMicros > marker.timestampMicros ||
- (post.timestampMicros == marker.timestampMicros &&
- post.postId > marker.postId);
+ post.timestampMs > marker.timestampMs ||
+ (post.timestampMs == marker.timestampMs && post.postId > marker.postId);
const markerFor = (post: SpacePostMarker): SpacePostMarker => ({
postId: post.postId,
- timestampMicros: post.timestampMicros,
+ timestampMs: post.timestampMs,
});
const markerFromCursor = (cursor: string): SpacePostMarker | undefined => {
@@ -130,21 +128,13 @@ const markerFromCursor = (cursor: string): SpacePostMarker | undefined => {
const postId = Number(parts[1]);
if (
!Number.isSafeInteger(createdAt) ||
- createdAt < 0 ||
+ createdAt <= 0 ||
!Number.isSafeInteger(postId) ||
postId < 0
) {
return undefined;
}
- return { postId, timestampMicros: createdAt };
-};
-
-const laterCursor = (first: string, second: string) => {
- const firstMarker = markerFromCursor(first);
- const secondMarker = markerFromCursor(second);
- if (!firstMarker) return second;
- if (!secondMarker || isAfter(firstMarker, secondMarker)) return first;
- return second;
+ return { postId, timestampMs: Math.floor(createdAt / 1000) };
};
const normalizedState = (state: SpaceHomePostsState): SpaceHomePostsState => ({
@@ -304,7 +294,7 @@ const loadAllHomePosts = async (viewerSpaceId: string, after?: string) => {
const refreshAfterCursor = (state: SpaceHomePostsState) => {
const oldestUnreadPost = state.unreadPosts[state.unreadPosts.length - 1];
return oldestUnreadPost
- ? `${oldestUnreadPost.timestampMicros}:0`
+ ? `${oldestUnreadPost.timestampMs * 1000}:0`
: state.syncCursor;
};
@@ -393,29 +383,14 @@ export const refreshSpaceHomePosts = async (
refreshAfterCursor(savedState),
);
const latestPosts = latestPostsFor(result.items, currentFriendSpaceIdSet);
- const savedLatestPosts = new Map(
- savedState.latestPosts.map((post) => [post.spaceId, post]),
- );
const returnedPostsByID = new Map(
result.items.map((post) => [post.postId, post]),
);
const discoveredPosts = savedMarker
- ? result.items.filter((post) => {
- if (isAfter(post, savedMarker)) return true;
- if (latestPosts.get(post.spaceId)?.postId != post.postId) {
- return false;
- }
- const savedLatestPost = savedLatestPosts.get(post.spaceId);
- return (
- !savedLatestPost ||
- (savedLatestPost.postId != post.postId &&
- isAfter(post, savedLatestPost))
- );
- })
+ ? result.items.filter((post) => isAfter(post, savedMarker))
: [];
+ const nextMarker = markerFromCursor(result.syncCursor);
return updateState(viewerSpaceId, (state) => {
- const syncCursor = laterCursor(state.syncCursor, result.syncCursor);
- const nextMarker = markerFromCursor(syncCursor);
const readAheadPostIds = new Set(
state.readAheadPosts.map((post) => post.postId),
);
@@ -450,7 +425,7 @@ export const refreshSpaceHomePosts = async (
isAfter(post, nextMarker),
)
: state.readAheadPosts,
- syncCursor,
+ syncCursor: result.syncCursor,
unreadPosts: [...unreadPostsByID.values()],
};
});
diff --git a/web/apps/space/src/services/space.ts b/web/apps/space/src/services/space.ts
index 405064f628..f6d06a8c00 100644
--- a/web/apps/space/src/services/space.ts
+++ b/web/apps/space/src/services/space.ts
@@ -75,7 +75,6 @@ interface SpacePostResponse {
author: SpaceActor;
caption?: string;
createdAt: string;
- createdAtMicros: number;
encryptedPostKey: string;
keyVersion: number;
objects?: SpacePostObject[];
@@ -190,7 +189,6 @@ interface SpacePostBase {
name: string;
postId: number;
timestampMs: number;
- timestampMicros: number;
thumbHash?: string;
username?: string;
viewerLiked: boolean;
@@ -623,8 +621,7 @@ const postBaseFromResponse = (
name: author.fullName || author.username,
postId: post.postId,
spaceId: post.spaceId,
- timestampMicros: post.createdAtMicros,
- timestampMs: Math.floor(post.createdAtMicros / 1000),
+ timestampMs: timestampMsFromSpaceDate(post.createdAt),
username: author.username,
viewerLiked: post.viewerLiked,
});
diff --git a/web/apps/space/src/utils/post-display.ts b/web/apps/space/src/utils/post-display.ts
index 2037564b74..a565b92478 100644
--- a/web/apps/space/src/utils/post-display.ts
+++ b/web/apps/space/src/utils/post-display.ts
@@ -16,7 +16,6 @@ export const profilePostItemsFromPosts = (
name: post.name,
postId: post.postId,
spaceId: post.spaceId,
- timestampMicros: post.timestampMicros,
timestampMs: post.timestampMs,
thumbHash: post.thumbHash,
viewerLiked: post.viewerLiked,