Skip to content

armgit / ente

Public Imported from GitHub
0

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

Add waves and post prompts to Space

Anand Baburajane76e051c006a
diff --git a/rust/bindings/wasm/space/src/space.rs b/rust/bindings/wasm/space/src/space.rs
index 109c3b5910..3015242ef0 100644
--- a/rust/bindings/wasm/space/src/space.rs
+++ b/rust/bindings/wasm/space/src/space.rs
@@ -259,6 +259,7 @@ struct ConversationsJs {
friends: Vec<FriendJs>,
pending_requests: Vec<FriendRequestJs>,
chat_summaries: BTreeMap<String, ConversationChatSummaryJs>,
+ latest_post_created_at: Option<String>,
}
#[derive(Serialize)]
@@ -1352,6 +1353,7 @@ impl SpaceAccountCtxHandle {
friends,
pending_requests,
chat_summaries,
+ latest_post_created_at: response.latest_post_created_at,
})
.map_err(Into::into)
}
diff --git a/rust/crates/space/src/client/messages.rs b/rust/crates/space/src/client/messages.rs
index f711a12421..72e9ab5869 100644
--- a/rust/crates/space/src/client/messages.rs
+++ b/rust/crates/space/src/client/messages.rs
@@ -13,6 +13,9 @@ use crate::transport::{
};
use ente_core::b64;
+const MESSAGE_NOTIFICATION_KIND_WAVE: &str = "wave";
+const WAVE_MESSAGE_TEXT: &str = "πŸ‘‹";
+
impl AccountSpaceCtx {
pub async fn list_conversations(&self, space_id: &str) -> Result<ConversationsResponse> {
let path = format!("/spaces/{space_id}/conversations");
@@ -67,7 +70,13 @@ impl AccountSpaceCtx {
text: text.to_owned(),
};
let request = self
- .message_request_for_payload(sender_space_id, &friend.public_key, &payload, None)
+ .message_request_for_payload(
+ sender_space_id,
+ &friend.public_key,
+ &payload,
+ None,
+ (text == WAVE_MESSAGE_TEXT).then(|| MESSAGE_NOTIFICATION_KIND_WAVE.to_owned()),
+ )
.await?;
let path = format!("/spaces/{sender_space_id}/friends/{space_id}/messages");
Ok(self
@@ -106,6 +115,7 @@ impl AccountSpaceCtx {
&friend.public_key,
&payload,
Some(reply_message_id),
+ None,
)
.await?;
let path = format!("/spaces/{sender_space_id}/friends/{space_id}/messages");
@@ -150,7 +160,13 @@ impl AccountSpaceCtx {
text: text.to_owned(),
};
let request = self
- .message_request_for_payload(sender_space_id, &post.author.public_key, &payload, None)
+ .message_request_for_payload(
+ sender_space_id,
+ &post.author.public_key,
+ &payload,
+ None,
+ None,
+ )
.await?;
let path = format!("/spaces/{sender_space_id}/posts/{post_id}/reply");
Ok(self
@@ -248,6 +264,7 @@ impl AccountSpaceCtx {
recipient_public_key: &str,
payload: &MessagePayload,
reply_message_id: Option<&str>,
+ notification_kind: Option<String>,
) -> Result<CreateMessageRequest> {
let identity = self.space_identity_for(sender_space_id).await?;
let recipient_public_key = b64::decode(recipient_public_key)?;
@@ -263,6 +280,7 @@ impl AccountSpaceCtx {
sender_encrypted_message_key: b64::encode(&sender_key),
recipient_encrypted_message_key: b64::encode(&recipient_key),
reply_message_id: reply_message_id.map(ToOwned::to_owned),
+ notification_kind,
})
}
}
diff --git a/rust/crates/space/src/client/tests.rs b/rust/crates/space/src/client/tests.rs
index 1c703de132..84885f076c 100644
--- a/rust/crates/space/src/client/tests.rs
+++ b/rust/crates/space/src/client/tests.rs
@@ -1466,6 +1466,72 @@ async fn message_actions_use_message_endpoints() {
delete.assert_async().await;
}
+#[tokio::test]
+async fn wave_message_requests_special_notification() {
+ let mut server = Server::new_async().await;
+ let space_root_key = generate_key();
+ let ctx = test_account_ctx_with_space_root_key(&server.url(), space_root_key);
+ let (friend_public_key, _) = generate_keypair().expect("valid friend keypair");
+
+ let friends = server
+ .mock("GET", "/spaces/space_owner_main/friends")
+ .match_header("x-space-session-token", "space-session-token")
+ .with_status(200)
+ .with_body(
+ json!([{
+ "friend": {
+ "spaceId": "space_friend",
+ "spaceSlug": "friend",
+ "publicKey": b64::encode(&friend_public_key),
+ "keyVersion": 2
+ },
+ "shareKeyVersion": 2,
+ "createdAt": "2026-04-16T00:00:00Z"
+ }])
+ .to_string(),
+ )
+ .create_async()
+ .await;
+ let wave = server
+ .mock(
+ "POST",
+ "/spaces/space_owner_main/friends/space_friend/messages",
+ )
+ .match_header("x-space-session-token", "space-session-token")
+ .match_body(Matcher::AllOf(vec![
+ Matcher::Regex("\"notificationKind\":\"wave\"".into()),
+ Matcher::Regex("\"messageCipher\":\"[^\"]+\"".into()),
+ Matcher::Regex("\"senderEncryptedMessageKey\":\"[^\"]+\"".into()),
+ Matcher::Regex("\"recipientEncryptedMessageKey\":\"[^\"]+\"".into()),
+ ]))
+ .with_status(200)
+ .with_body(
+ json!({
+ "messageId": "wmsg_wave",
+ "kind": "regular",
+ "senderSpaceId": "space_owner_main",
+ "recipientSpaceId": "space_friend",
+ "liked": false,
+ "viewerLiked": false,
+ "isDeleted": false,
+ "createdAt": "2026-04-16T00:00:00Z",
+ "updatedAt": "2026-04-16T00:00:00Z"
+ })
+ .to_string(),
+ )
+ .create_async()
+ .await;
+
+ let message = ctx
+ .send_message("space_owner_main", "space_friend", "πŸ‘‹")
+ .await
+ .expect("wave should be sent");
+
+ assert_eq!(message.message_id, "wmsg_wave");
+ friends.assert_async().await;
+ wave.assert_async().await;
+}
+
#[test]
fn message_payload_limits_reject_oversized_text_and_payload() {
let valid = MessagePayload {
diff --git a/rust/crates/space/src/transport.rs b/rust/crates/space/src/transport.rs
index 4986d20d4d..01013b0a56 100644
--- a/rust/crates/space/src/transport.rs
+++ b/rust/crates/space/src/transport.rs
@@ -136,6 +136,8 @@ pub struct CreateMessageRequest {
pub recipient_encrypted_message_key: String,
#[serde(skip_serializing_if = "Option::is_none")]
pub reply_message_id: Option<String>,
+ #[serde(skip_serializing_if = "Option::is_none")]
+ pub notification_kind: Option<String>,
}
#[derive(Debug, Clone, Serialize, Deserialize)]
@@ -218,6 +220,8 @@ pub struct ConversationsResponse {
pub pending_requests: Vec<SpaceFriendRequestResponse>,
#[serde(default)]
pub chat_summaries: std::collections::BTreeMap<String, ConversationChatSummaryResponse>,
+ #[serde(default)]
+ pub latest_post_created_at: Option<String>,
}
#[derive(Debug, Clone, Serialize)]
@@ -532,6 +536,7 @@ mod tests {
r#"{
"friends":[{"friend":{"spaceId":"space_friend","spaceSlug":"friend-main"},"createdAt":"2026-05-25T00:00:00Z"}],
"pendingRequests":[],
+ "latestPostCreatedAt":"2026-05-26T00:00:00Z",
"chatSummaries":{
"space_friend":{
"latestActivity":{
@@ -551,6 +556,10 @@ mod tests {
let activity = &response.chat_summaries["space_friend"].latest_activity;
assert_eq!(activity.message_id.as_deref(), Some("msg_1"));
assert_eq!(activity.post_id, None);
+ assert_eq!(
+ response.latest_post_created_at.as_deref(),
+ Some("2026-05-26T00:00:00Z")
+ );
}
}
diff --git a/server/space/controller/messages.go b/server/space/controller/messages.go
index bc9086d4f9..86955a56d1 100644
--- a/server/space/controller/messages.go
+++ b/server/space/controller/messages.go
@@ -18,6 +18,8 @@ const (
spaceMessageKindPostLike = "post_like"
spaceMessageKindFriendAdded = "friend_added"
+ spaceMessageNotificationKindWave = "wave"
+
maxSpaceMessageCipherEncodedBytes = 8 * 1024
maxSpaceMessageCipherDecodedBytes = 6 * 1024
maxSpaceMessageKeyEncodedBytes = 1024
@@ -41,6 +43,10 @@ func (c *MessagesController) Create(ctx context.Context, senderSpace *repo.Space
if err != nil {
return nil, err
}
+ notificationKind, err := normalizeMessageNotificationKind(req.NotificationKind)
+ if err != nil {
+ return nil, err
+ }
messageID, err := normalizeOptionalMessageID(req.MessageID)
if err != nil {
return nil, err
@@ -53,6 +59,9 @@ func (c *MessagesController) Create(ctx context.Context, senderSpace *repo.Space
if err != nil {
return nil, err
}
+ if notificationKind == spaceMessageNotificationKindWave && replyMessageID.Valid {
+ return nil, ente.NewBadRequestWithMessage("wave notification is not supported for replies")
+ }
message, err := c.MessagesRepo.CreateMessage(ctx, repo.CreateSpaceMessageRecord{
MessageID: messageID,
Kind: spaceMessageKindRegular,
@@ -69,11 +78,18 @@ func (c *MessagesController) Create(ctx context.Context, senderSpace *repo.Space
}
return nil, err
}
- go c.ActivityNotifier.OnSpaceMessageSent(spaceActivityActor(senderSpace), recipientSpace.OwnerID)
+ if notificationKind == spaceMessageNotificationKindWave {
+ go c.ActivityNotifier.OnSpaceWaveSent(spaceActivityActor(senderSpace), recipientSpace.OwnerID)
+ } else {
+ go c.ActivityNotifier.OnSpaceMessageSent(spaceActivityActor(senderSpace), recipientSpace.OwnerID)
+ }
return toMessageResponse(*message), nil
}
func (c *MessagesController) ReplyToPost(ctx context.Context, senderSpace *repo.SpaceRecord, postID int64, req models.CreateMessageRequest) (*models.MessageResponse, error) {
+ if strings.TrimSpace(req.NotificationKind) != "" {
+ return nil, ente.NewBadRequestWithMessage("notificationKind is not supported for post replies")
+ }
messageCipher, senderEncryptedMessageKey, recipientEncryptedMessageKey, err := decodeCreateMessageRequest(req)
if err != nil {
return nil, err
@@ -146,6 +162,10 @@ func (c *MessagesController) ListConversations(ctx context.Context, viewerSpace
if err != nil {
return nil, err
}
+ latestPostCreatedAt, err := c.PostsRepo.LatestPostCreatedAt(ctx, viewerSpace.SpaceID)
+ if err != nil {
+ return nil, err
+ }
chatSummaries := make(map[string]models.ConversationChatSummaryResponse, len(summaries))
for friendSpaceID, summary := range summaries {
unreadActivities := make([]models.MessageConversationActivityResponse, 0, len(summary.UnreadActivities))
@@ -165,11 +185,15 @@ func (c *MessagesController) ListConversations(ctx context.Context, viewerSpace
CreatedAt: formatMicros(request.CreatedAt),
})
}
- return &models.ConversationsResponse{
+ response := &models.ConversationsResponse{
Friends: friendResponses,
PendingRequests: requestResponses,
ChatSummaries: chatSummaries,
- }, nil
+ }
+ if latestPostCreatedAt > 0 {
+ response.LatestPostCreatedAt = formatMicros(latestPostCreatedAt)
+ }
+ return response, nil
}
func (c *MessagesController) ListThread(ctx context.Context, viewerSpace *repo.SpaceRecord, targetSpaceID string, req models.ListMessageThreadRequest) (*models.MessagePage, error) {
@@ -327,6 +351,14 @@ func normalizeOptionalMessageID(messageID string) (string, error) {
return messageID, nil
}
+func normalizeMessageNotificationKind(notificationKind string) (string, error) {
+ notificationKind = strings.TrimSpace(notificationKind)
+ if notificationKind == "" || notificationKind == spaceMessageNotificationKindWave {
+ return notificationKind, nil
+ }
+ return "", ente.NewBadRequestWithMessage("notificationKind is invalid")
+}
+
func decodeCreateMessageRequest(req models.CreateMessageRequest) ([]byte, []byte, []byte, error) {
if strings.TrimSpace(req.MessageCipher) == "" ||
strings.TrimSpace(req.SenderEncryptedMessageKey) == "" ||
diff --git a/server/space/controller/messages_test.go b/server/space/controller/messages_test.go
index f2297dd2b1..69e11f4429 100644
--- a/server/space/controller/messages_test.go
+++ b/server/space/controller/messages_test.go
@@ -57,6 +57,16 @@ func TestMessageReplyValidation(t *testing.T) {
require.NotNil(t, reply.ReplyMessageID)
require.Equal(t, bobMessage.MessageID, *reply.ReplyMessageID)
+ _, err = controller.Create(ctx, aliceSpace, bobSpace.SpaceID, models.CreateMessageRequest{
+ MessageCipher: spaceTestB64("wave-reply-cipher"),
+ SenderEncryptedMessageKey: spaceTestB64("wave-reply-sender-key"),
+ RecipientEncryptedMessageKey: spaceTestB64("wave-reply-recipient-key"),
+ ReplyMessageID: bobMessage.MessageID,
+ NotificationKind: spaceMessageNotificationKindWave,
+ })
+ require.Error(t, err)
+ require.Contains(t, err.Error(), "wave notification is not supported for replies")
+
require.NoError(t, repos.Messages.DeleteMessage(ctx, bobMessage.MessageID, bobSpace.SpaceID))
_, err = controller.Create(ctx, aliceSpace, bobSpace.SpaceID, models.CreateMessageRequest{
MessageCipher: spaceTestB64("reply-after-delete-cipher"),
@@ -120,6 +130,29 @@ func TestListThreadHidesDeletedTargetOwner(t *testing.T) {
require.True(t, errors.Is(err, ente.ErrNotFound))
}
+func TestListConversationsIncludesLatestActivePostCreatedAt(t *testing.T) {
+ controller, repos, ctx := setupMessagesControllerTest(t)
+ aliceID, aliceSpace := createMessageControllerUserAndSpace(t, repos, "alice-conversation-post", "alice-post-public")
+
+ page, err := controller.ListConversations(ctx, aliceSpace)
+ require.NoError(t, err)
+ require.Empty(t, page.LatestPostCreatedAt)
+
+ postID, err := testCreatePost(ctx, repos, aliceID, aliceSpace.SpaceID, "post-key", nil, aliceSpace.CurrentVersion, nil)
+ require.NoError(t, err)
+ var createdAt int64
+ require.NoError(t, repos.Posts.DB.QueryRow(`SELECT created_at FROM space_posts WHERE post_id = $1`, postID).Scan(&createdAt))
+
+ page, err = controller.ListConversations(ctx, aliceSpace)
+ require.NoError(t, err)
+ require.Equal(t, formatMicros(createdAt), page.LatestPostCreatedAt)
+
+ require.NoError(t, repos.Posts.DeletePost(ctx, postID, aliceSpace.SpaceID))
+ page, err = controller.ListConversations(ctx, aliceSpace)
+ require.NoError(t, err)
+ require.Empty(t, page.LatestPostCreatedAt)
+}
+
func TestValidateCreateMessageRequestLimits(t *testing.T) {
valid := models.CreateMessageRequest{
MessageCipher: spaceTestB64("cipher"),
diff --git a/server/space/controller/notifications.go b/server/space/controller/notifications.go
index 8eccb044ff..aefce01f45 100644
--- a/server/space/controller/notifications.go
+++ b/server/space/controller/notifications.go
@@ -26,6 +26,7 @@ const (
spaceActivityPostLiked = "post_liked"
spaceActivityPostReplied = "post_replied"
spaceActivityMessageSent = "message_sent"
+ spaceActivityWaveSent = "wave_sent"
spaceActivityMessageLiked = "message_liked"
spaceActivityFriendAdded = "friend_added"
spaceActivityFriendRequested = "friend_requested"
@@ -58,6 +59,7 @@ type SpaceActivityNotifier interface {
OnSpacePostLiked(actor SpaceActivityActor, recipientUserID int64)
OnSpacePostReplied(actor SpaceActivityActor, recipientUserID int64)
OnSpaceMessageSent(actor SpaceActivityActor, recipientUserID int64)
+ OnSpaceWaveSent(actor SpaceActivityActor, recipientUserID int64)
OnSpaceMessageLiked(actor SpaceActivityActor, recipientUserID int64)
OnSpaceFriendAdded(actor SpaceActivityActor, recipientUserID int64)
OnSpaceFriendRequested(actor SpaceActivityActor, recipientUserID int64)
@@ -136,6 +138,10 @@ func (n *SpaceWebPushSender) OnSpaceMessageSent(actor SpaceActivityActor, recipi
n.sendAccountActivity(actor, "sent you a message", "Check it out", spaceActivityMessageSent, conversationURL(actor.SpaceID), recipientUserID)
}
+func (n *SpaceWebPushSender) OnSpaceWaveSent(actor SpaceActivityActor, recipientUserID int64) {
+ n.sendAccountActivity(actor, "waved at you πŸ‘‹", "Post something", spaceActivityWaveSent, "/app/post", recipientUserID)
+}
+
func (n *SpaceWebPushSender) OnSpaceMessageLiked(actor SpaceActivityActor, recipientUserID int64) {
n.sendAccountActivity(actor, "liked a message", "View conversation", spaceActivityMessageLiked, conversationURL(actor.SpaceID), recipientUserID)
}
diff --git a/server/space/controller/notifications_test.go b/server/space/controller/notifications_test.go
index 413ba91bc2..7e8df1d4d2 100644
--- a/server/space/controller/notifications_test.go
+++ b/server/space/controller/notifications_test.go
@@ -53,6 +53,10 @@ func (n *recordingSpaceActivityNotifier) OnSpaceMessageSent(actor SpaceActivityA
n.record(spaceActivityMessageSent, actor, recipientUserID)
}
+func (n *recordingSpaceActivityNotifier) OnSpaceWaveSent(actor SpaceActivityActor, recipientUserID int64) {
+ n.record(spaceActivityWaveSent, actor, recipientUserID)
+}
+
func (n *recordingSpaceActivityNotifier) OnSpaceMessageLiked(actor SpaceActivityActor, recipientUserID int64) {
n.record(spaceActivityMessageLiked, actor, recipientUserID)
}
@@ -238,6 +242,18 @@ func TestMessageActivitiesAndLikeTransition(t *testing.T) {
recipientIDs: []int64{bobID},
}, requireSpaceActivity(t, notifier))
+ waveRequest := request
+ waveRequest.NotificationKind = spaceMessageNotificationKindWave
+ _, err = messages.Create(ctx, aliceSpace, bobSpace.SpaceID, waveRequest)
+ require.NoError(t, err)
+ require.Equal(t, recordedSpaceActivity{
+ event: spaceActivityWaveSent,
+ actorUserID: aliceID,
+ actorSpaceID: aliceSpace.SpaceID,
+ actorSlug: aliceSpace.SpaceSlug,
+ recipientIDs: []int64{bobID},
+ }, requireSpaceActivity(t, notifier))
+
_, err = messages.SetLike(ctx, bobSpace, message.MessageID, true)
require.NoError(t, err)
expectedLike := recordedSpaceActivity{
@@ -314,7 +330,7 @@ func TestFriendActivitiesOnlyOnRelationshipTransitions(t *testing.T) {
}, requireSpaceActivity(t, notifier))
}
-func TestSpaceWebPushSenderUsesGenericPayloadAndPrunesDeadEndpoint(t *testing.T) {
+func TestSpaceWebPushSenderUsesWavePayloadAndPrunesDeadEndpoint(t *testing.T) {
_, repos, ctx := setupPostsControllerTest(t)
recipientID := insertSpaceControllerUser(t, repos, "[email protected]", "recipient-public")
sessionHash := []byte("space-push-session-hash")
@@ -338,12 +354,12 @@ func TestSpaceWebPushSenderUsesGenericPayloadAndPrunesDeadEndpoint(t *testing.T)
}
sender := NewSpaceWebPushSender(repos.WebPush, config)
- sender.OnSpacePostReplied(SpaceActivityActor{UserID: 1, SpaceID: "alice_space", Slug: "alice"}, recipientID)
+ sender.OnSpaceWaveSent(SpaceActivityActor{UserID: 1, SpaceID: "alice_space", Slug: "alice"}, recipientID)
require.Equal(t, spaceWebPushPayload{
Title: "Ente Space",
- Body: "@alice replied to your post",
- Action: "Check it out",
- URL: "/app/messages/alice_space",
+ Body: "@alice waved at you πŸ‘‹",
+ Action: "Post something",
+ URL: "/app/post",
}, payload)
var count int
require.NoError(t, repos.WebPush.DB.QueryRow(`SELECT COUNT(*) FROM space_web_push_subscriptions`).Scan(&count))
diff --git a/server/space/controller/test_helpers_test.go b/server/space/controller/test_helpers_test.go
index 8de5b1fe50..b31733b15f 100644
--- a/server/space/controller/test_helpers_test.go
+++ b/server/space/controller/test_helpers_test.go
@@ -32,6 +32,7 @@ func (noopSpaceActivityNotifier) OnSpacePostCreated(SpaceActivityActor)
func (noopSpaceActivityNotifier) OnSpacePostLiked(SpaceActivityActor, int64) {}
func (noopSpaceActivityNotifier) OnSpacePostReplied(SpaceActivityActor, int64) {}
func (noopSpaceActivityNotifier) OnSpaceMessageSent(SpaceActivityActor, int64) {}
+func (noopSpaceActivityNotifier) OnSpaceWaveSent(SpaceActivityActor, int64) {}
func (noopSpaceActivityNotifier) OnSpaceMessageLiked(SpaceActivityActor, int64) {}
func (noopSpaceActivityNotifier) OnSpaceFriendAdded(SpaceActivityActor, int64) {}
func (noopSpaceActivityNotifier) OnSpaceFriendRequested(SpaceActivityActor, int64) {}
diff --git a/server/space/models/models.go b/server/space/models/models.go
index 79ca7322c2..60cf55c9c2 100644
--- a/server/space/models/models.go
+++ b/server/space/models/models.go
@@ -315,6 +315,7 @@ type CreateMessageRequest struct {
SenderEncryptedMessageKey string `json:"senderEncryptedMessageKey" binding:"required"`
RecipientEncryptedMessageKey string `json:"recipientEncryptedMessageKey" binding:"required"`
ReplyMessageID string `json:"replyMessageId,omitempty"`
+ NotificationKind string `json:"notificationKind,omitempty"`
}
type LikeMessageResponse struct {
@@ -365,9 +366,10 @@ type ConversationChatSummaryResponse struct {
}
type ConversationsResponse struct {
- Friends []SpaceFriendResponse `json:"friends"`
- PendingRequests []SpaceFriendRequestResponse `json:"pendingRequests"`
- ChatSummaries map[string]ConversationChatSummaryResponse `json:"chatSummaries"`
+ Friends []SpaceFriendResponse `json:"friends"`
+ PendingRequests []SpaceFriendRequestResponse `json:"pendingRequests"`
+ ChatSummaries map[string]ConversationChatSummaryResponse `json:"chatSummaries"`
+ LatestPostCreatedAt string `json:"latestPostCreatedAt,omitempty"`
}
type PostObjectPayload struct {
diff --git a/server/space/repo/posts.go b/server/space/repo/posts.go
index 4badc52ce6..a7e02626e4 100644
--- a/server/space/repo/posts.go
+++ b/server/space/repo/posts.go
@@ -27,6 +27,18 @@ func (r *PostsRepository) CountPosts(ctx context.Context, spaceID string) (int64
return count, nil
}
+func (r *PostsRepository) LatestPostCreatedAt(ctx context.Context, spaceID string) (int64, error) {
+ var createdAt sql.NullInt64
+ if err := r.DB.QueryRowContext(ctx, `
+ SELECT MAX(created_at)
+ FROM space_posts
+ WHERE space_id = $1 AND is_deleted = FALSE
+ `, spaceID).Scan(&createdAt); err != nil {
+ return 0, stacktrace.Propagate(err, "")
+ }
+ return createdAt.Int64, nil
+}
+
func postRecordSelectSQL(viewerLikedExpr string) string {
return `
SELECT p.post_id, p.space_id, w.space_slug, w.owner_id,
diff --git a/web/apps/space/public/_redirects b/web/apps/space/public/_redirects
index 9e5219e78c..552facd23c 100644
--- a/web/apps/space/public/_redirects
+++ b/web/apps/space/public/_redirects
@@ -10,6 +10,7 @@
/app/profile/photo-edit /app/profile/photo-edit 200
/app/settings /app/settings 200
/app/settings/profile/name /app/settings/profile/name 200
+/app/post /app/post 200
/login /login 200
/manifest.webmanifest /manifest.webmanifest 200
/manifest-public.webmanifest /manifest-public.webmanifest 200
diff --git a/web/apps/space/src/components/SpaceMessagesPage.tsx b/web/apps/space/src/components/SpaceMessagesPage.tsx
index 4a93fb4901..9b0cdf16b8 100644
--- a/web/apps/space/src/components/SpaceMessagesPage.tsx
+++ b/web/apps/space/src/components/SpaceMessagesPage.tsx
@@ -50,6 +50,22 @@ const isFriendRequestConversation = (conversation: SpaceMessageConversation) =>
let nextLocalMessageID = 0;
const localMessageIdPrefix = "space-local-message-";
+const waveMessageText = "πŸ‘‹";
+
+const isUnreadIncomingWaveConversation = (
+ conversation: SpaceMessageConversation,
+) => {
+ const activity = conversation.latestActivity;
+ return (
+ (activity.type == "message" || activity.type == "post_reply") &&
+ !activity.outgoing &&
+ !activity.isUnavailable &&
+ activity.text?.trim() == waveMessageText &&
+ conversation.unreadActivities.some(
+ (unreadActivity) => unreadActivity.id == activity.id,
+ )
+ );
+};
const createLocalMessageID = () =>
`${localMessageIdPrefix}${Date.now()}-${nextLocalMessageID++}`;
@@ -111,17 +127,32 @@ export const SpaceMessagesPage: React.FC<SpaceMessagesPageProps> = ({
selectedSpaceId,
}) => {
const router = useSpaceRouter();
- const { profile, profileLoadError, profileLoadStatus, setFriends } =
- useSpaceAppState();
+ const {
+ profile,
+ profileLoadError,
+ profileLoadStatus,
+ setFriends,
+ setPendingPostPhotoFile,
+ setSkipNextHomeFeedSkeleton,
+ } = useSpaceAppState();
const [conversations, setConversations] = React.useState<
SpaceMessageConversation[]
>([]);
+ const [latestPostCreatedAtMs, setLatestPostCreatedAtMs] = React.useState<
+ number | null
+ >();
const [isConversationsLoading, setIsConversationsLoading] =
React.useState(true);
const [isThreadLoading, setIsThreadLoading] = React.useState(false);
const [showFriendRequestCanceledToast, setShowFriendRequestCanceledToast] =
React.useState(false);
const [messages, setMessages] = React.useState<SpaceMessage[]>([]);
+ const [
+ previewWaveAnimationActivityIds,
+ setPreviewWaveAnimationActivityIds,
+ ] = React.useState<string[]>([]);
+ const [waveAnimationMessageId, setWaveAnimationMessageId] =
+ React.useState<string>();
const [selectedFriendProfile, setSelectedFriendProfile] =
React.useState<SpaceMessageConversation["friend"]>();
const [
@@ -136,6 +167,9 @@ export const SpaceMessagesPage: React.FC<SpaceMessagesPageProps> = ({
);
const markedReadSpaceIdRef = React.useRef<string | undefined>(undefined);
const conversationsLoadGenerationRef = React.useRef(0);
+ const animatedPreviewWaveActivityIdsRef = React.useRef<Set<string>>(
+ new Set(),
+ );
const previousSelectedSpaceIdRef = React.useRef<string | undefined>(
selectedSpaceId,
);
@@ -244,6 +278,7 @@ export const SpaceMessagesPage: React.FC<SpaceMessagesPageProps> = ({
const generation = ++conversationsLoadGenerationRef.current;
setIsConversationsLoading(true);
+ setLatestPostCreatedAtMs(undefined);
try {
const page = await loadCurrentMessageConversations(actorSpaceId);
if (conversationsLoadGenerationRef.current != generation) {
@@ -265,8 +300,29 @@ export const SpaceMessagesPage: React.FC<SpaceMessagesPageProps> = ({
),
)
.map(conversationId);
+ const nextPreviewWaveAnimationActivityIds = items
+ .filter(isUnreadIncomingWaveConversation)
+ .map((conversation) => conversation.latestActivity.id)
+ .filter(
+ (activityId) =>
+ !animatedPreviewWaveActivityIdsRef.current.has(
+ activityId,
+ ),
+ );
+ if (nextPreviewWaveAnimationActivityIds.length > 0) {
+ nextPreviewWaveAnimationActivityIds.forEach((activityId) =>
+ animatedPreviewWaveActivityIdsRef.current.add(activityId),
+ );
+ setPreviewWaveAnimationActivityIds((currentIds) => [
+ ...new Set([
+ ...currentIds,
+ ...nextPreviewWaveAnimationActivityIds,
+ ]),
+ ]);
+ }
setNewConversationIds(unreadConversationIds);
setConversations(items);
+ setLatestPostCreatedAtMs(page.latestPostCreatedAtMs);
setFriends(
items
.filter(
@@ -579,6 +635,7 @@ export const SpaceMessagesPage: React.FC<SpaceMessagesPageProps> = ({
React.useEffect(() => {
markedReadSpaceIdRef.current = undefined;
+ setWaveAnimationMessageId(undefined);
const actorSpaceId = profile?.spaceId;
if (!profile || !actorSpaceId || !selectedSpaceId) {
@@ -628,6 +685,24 @@ export const SpaceMessagesPage: React.FC<SpaceMessagesPageProps> = ({
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [profile?.spaceId, selectedFriendSpaceId, selectedSpaceId]);
+ React.useEffect(() => {
+ if (!waveAnimationMessageId) return;
+ const timeoutID = window.setTimeout(
+ () => setWaveAnimationMessageId(undefined),
+ 700,
+ );
+ return () => window.clearTimeout(timeoutID);
+ }, [waveAnimationMessageId]);
+
+ React.useEffect(() => {
+ if (previewWaveAnimationActivityIds.length == 0) return;
+ const timeoutID = window.setTimeout(
+ () => setPreviewWaveAnimationActivityIds([]),
+ 950,
+ );
+ return () => window.clearTimeout(timeoutID);
+ }, [previewWaveAnimationActivityIds]);
+
if (profileLoadStatus != "ready" || !profile) {
return (
<SpaceRouteFallback
@@ -658,6 +733,11 @@ export const SpaceMessagesPage: React.FC<SpaceMessagesPageProps> = ({
isThreadRecipientLoading={isThreadRecipientLoading}
messages={messages}
newConversationIds={newConversationIds}
+ latestPostCreatedAtMs={latestPostCreatedAtMs}
+ previewWaveAnimationActivityIds={
+ previewWaveAnimationActivityIds
+ }
+ waveAnimationMessageId={waveAnimationMessageId}
onBack={() => void router.push(spaceRoutes.home)}
onCloseThread={closeConversation}
onConfirmFriendRequest={confirmFriendRequest}
@@ -676,6 +756,16 @@ export const SpaceMessagesPage: React.FC<SpaceMessagesPageProps> = ({
)
}
onOpenThread={openConversation}
+ onPostPhotoSelect={(file) => {
+ setPendingPostPhotoFile(file);
+ setSkipNextHomeFeedSkeleton(true);
+ void router
+ .push(spaceRoutes.home)
+ .catch((error: unknown) => {
+ log.error("Failed to open post photo draft", error);
+ setPendingPostPhotoFile(null);
+ });
+ }}
onLoadActivityPost={(post) =>
loadCurrentMessageActivityPostPreview(post, actorSpaceId)
}
@@ -697,6 +787,12 @@ export const SpaceMessagesPage: React.FC<SpaceMessagesPageProps> = ({
sender,
recipient,
);
+ if (
+ text.trim() == waveMessageText &&
+ selectedFriendSpaceIdRef.current == spaceId
+ ) {
+ setWaveAnimationMessageId(message.id);
+ }
replaceMessageIfThreadIsCurrent(
spaceId,
optimisticMessage.id,
@@ -731,6 +827,12 @@ export const SpaceMessagesPage: React.FC<SpaceMessagesPageProps> = ({
sender,
recipient,
);
+ if (
+ text.trim() == waveMessageText &&
+ selectedFriendSpaceIdRef.current == spaceId
+ ) {
+ setWaveAnimationMessageId(message.id);
+ }
replaceMessageIfThreadIsCurrent(
spaceId,
optimisticMessage.id,
diff --git a/web/apps/space/src/pages/app/index.tsx b/web/apps/space/src/pages/app/index.tsx
index 3002a8493e..2651a64cc2 100644
--- a/web/apps/space/src/pages/app/index.tsx
+++ b/web/apps/space/src/pages/app/index.tsx
@@ -46,11 +46,13 @@ const Page: React.FC = () => {
const {
friends,
localFeedPosts,
+ pendingPostPhotoFile,
profile,
profileLoadError,
profileLoadStatus,
setFriends,
setLocalFeedPosts,
+ setPendingPostPhotoFile,
setSkipNextHomeFeedSkeleton,
skipNextHomeFeedSkeleton,
} = useSpaceAppState();
@@ -266,6 +268,7 @@ const Page: React.FC = () => {
friendRequestSentToastName={friendRequestSentToastName}
hasFeedLoadMoreError={hasFeedLoadMoreError}
hasUnreadMessages={hasUnreadMessages}
+ initialPostPhotoFile={pendingPostPhotoFile}
hasMoreFeedItems={Boolean(feedNextCursor)}
isFeedLoading={isHomeFeedLoading}
isFeedLoadingMore={isFeedLoadingMore}
@@ -284,6 +287,7 @@ const Page: React.FC = () => {
}
onFriendRequestSentToastClose={closeFriendRequestSentToast}
onInviteFriendsToastClose={closeInviteFriendsToast}
+ onInitialPostPhotoConsumed={() => setPendingPostPhotoFile(null)}
onCreatePost={
profile
? async (image, caption) => {
diff --git a/web/apps/space/src/pages/app/post.tsx b/web/apps/space/src/pages/app/post.tsx
new file mode 100644
index 0000000000..95af78956b
--- /dev/null
+++ b/web/apps/space/src/pages/app/post.tsx
@@ -0,0 +1,219 @@
+import { AddSquareIcon } from "@hugeicons/core-free-icons";
+import { HugeiconsIcon } from "@hugeicons/react";
+import { Box } from "@mui/material";
+import { SpaceBackIcon } from "components/SpaceBackIcon";
+import { SpacePageMeta } from "components/SpacePageMeta";
+import { SpaceRouteFallback } from "components/SpaceRouteFallback";
+import log from "ente-base/log";
+import React from "react";
+import { useSpaceAppState } from "state/spaceAppState";
+import { spaceTouchTargetSize } from "styles/touchTargets";
+import { spacePostImageInputAccept } from "utils/spacePostImage";
+import { spaceRoutes } from "utils/spaceRoutes";
+import { useSpaceRouter } from "utils/spaceRouteTransitions";
+
+const background = "#F5F5F7";
+const green = "#08C225";
+const textBase = "#000000";
+const textSecondary = "#6B6B6B";
+
+const Page: React.FC = () => {
+ const router = useSpaceRouter();
+ const {
+ profile,
+ profileLoadError,
+ profileLoadStatus,
+ setPendingPostPhotoFile,
+ setSkipNextHomeFeedSkeleton,
+ } = useSpaceAppState();
+ const inputRef = React.useRef<HTMLInputElement | null>(null);
+ const [isOpeningPost, setIsOpeningPost] = React.useState(false);
+
+ React.useEffect(() => {
+ if (profileLoadStatus == "ready" && !profile) {
+ void router.replace(spaceRoutes.onboarding);
+ }
+ }, [profile, profileLoadStatus, router]);
+
+ if (profileLoadStatus != "ready" || !profile) {
+ return (
+ <SpaceRouteFallback
+ background={background}
+ message={profileLoadError}
+ />
+ );
+ }
+
+ const handlePhotoSelect: React.ChangeEventHandler<HTMLInputElement> = (
+ event,
+ ) => {
+ const file = event.target.files?.[0];
+ event.target.value = "";
+ if (!file) return;
+
+ setIsOpeningPost(true);
+ setPendingPostPhotoFile(file);
+ setSkipNextHomeFeedSkeleton(true);
+ void router.push(spaceRoutes.home).catch((error: unknown) => {
+ log.error("Failed to open post photo draft", error);
+ setPendingPostPhotoFile(null);
+ setIsOpeningPost(false);
+ });
+ };
+
+ return (
+ <>
+ <SpacePageMeta themeColor={background} />
+ <Box
+ component="main"
+ sx={{
+ bgcolor: background,
+ color: textBase,
+ display: "grid",
+ minHeight: "100svh",
+ placeItems: { xs: "stretch", sm: "start center" },
+ }}
+ >
+ <Box
+ sx={{
+ boxSizing: "border-box",
+ display: "grid",
+ gridTemplateRows: "56px minmax(0, 1fr)",
+ minHeight: "100svh",
+ mx: "auto",
+ width: "100%",
+ "@media (min-width: 600px)": { maxWidth: 390 },
+ }}
+ >
+ <Box
+ component="header"
+ sx={{
+ alignItems: "center",
+ display: "flex",
+ height: 56,
+ px: 2,
+ }}
+ >
+ <Box
+ component="button"
+ type="button"
+ aria-label="Back to Space"
+ onClick={() => void router.push(spaceRoutes.home)}
+ sx={{
+ alignItems: "center",
+ bgcolor: "transparent",
+ border: 0,
+ borderRadius: "50%",
+ color: textBase,
+ cursor: "pointer",
+ display: "flex",
+ height: spaceTouchTargetSize,
+ justifyContent: "flex-start",
+ ml: "-2px",
+ p: 0,
+ width: spaceTouchTargetSize,
+ "&:focus-visible": {
+ outline: `2px solid ${green}`,
+ outlineOffset: 2,
+ },
+ }}
+ >
+ <SpaceBackIcon />
+ </Box>
+ </Box>
+ <Box
+ component="section"
+ sx={{
+ alignItems: "center",
+ alignSelf: "center",
+ display: "flex",
+ flexDirection: "column",
+ px: "28px",
+ pb: "48px",
+ textAlign: "center",
+ }}
+ >
+ <Box
+ component="h1"
+ sx={{
+ fontFamily: '"Nunito", sans-serif',
+ fontSize: 28,
+ fontWeight: 800,
+ lineHeight: "34px",
+ m: 0,
+ }}
+ >
+ What&apos;s up?
+ </Box>
+ <Box
+ component="p"
+ sx={{
+ color: textSecondary,
+ fontFamily:
+ '"Inter Variable", Inter, sans-serif',
+ fontSize: 15,
+ fontWeight: 500,
+ lineHeight: "22px",
+ m: 0,
+ mt: "10px",
+ maxWidth: 280,
+ }}
+ >
+ Post a moment, big or small.
+ </Box>
+ <Box
+ ref={inputRef}
+ component="input"
+ type="file"
+ accept={spacePostImageInputAccept}
+ onChange={handlePhotoSelect}
+ sx={{ display: "none" }}
+ />
+ <Box
+ className="green-bg"
+ component="button"
+ type="button"
+ disabled={isOpeningPost}
+ onClick={() => inputRef.current?.click()}
+ sx={{
+ alignItems: "center",
+ bgcolor: green,
+ border: 0,
+ borderRadius: "22px",
+ color: "#FFFFFF",
+ cursor: isOpeningPost ? "default" : "pointer",
+ display: "inline-flex",
+ fontFamily:
+ '"Inter Variable", Inter, sans-serif',
+ fontSize: 15,
+ fontWeight: 700,
+ gap: "8px",
+ height: 48,
+ justifyContent: "center",
+ mt: "28px",
+ opacity: isOpeningPost ? 0.65 : 1,
+ px: "22px",
+ "&:focus-visible": {
+ outline: `2px solid ${green}`,
+ outlineOffset: 3,
+ },
+ "&:hover": isOpeningPost
+ ? undefined
+ : { bgcolor: "#07AE22" },
+ }}
+ >
+ <HugeiconsIcon
+ icon={AddSquareIcon}
+ size={20}
+ strokeWidth={1.8}
+ />
+ Post
+ </Box>
+ </Box>
+ </Box>
+ </Box>
+ </>
+ );
+};
+
+export default Page;
diff --git a/web/apps/space/src/screens/HomeScreen.tsx b/web/apps/space/src/screens/HomeScreen.tsx
index ac40c2d9b4..81d773f906 100644
--- a/web/apps/space/src/screens/HomeScreen.tsx
+++ b/web/apps/space/src/screens/HomeScreen.tsx
@@ -103,6 +103,7 @@ interface HomeScreenProps {
hasFeedLoadMoreError?: boolean;
hasMoreFeedItems?: boolean;
hasUnreadMessages?: boolean;
+ initialPostPhotoFile?: File | null;
isFeedLoading?: boolean;
isFeedLoadingMore?: boolean;
localFeedPosts?: LocalSpaceFeedPost[];
@@ -118,6 +119,7 @@ interface HomeScreenProps {
onLoadPostImage?: SpacePostAssetURLLoader;
onFriendRequestSentToastClose?: () => void;
onInviteFriendsToastClose?: () => void;
+ onInitialPostPhotoConsumed?: () => void;
onOpenFriend?: (friendID: string, username?: string) => void;
onOpenMessages?: () => void;
onOpenProfile?: () => void;
@@ -1490,6 +1492,7 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({
hasFeedLoadMoreError = false,
hasMoreFeedItems = false,
hasUnreadMessages,
+ initialPostPhotoFile,
isFeedLoading = false,
isFeedLoadingMore = false,
localFeedPosts = [],
@@ -1502,6 +1505,7 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({
onLoadPostImage,
onFriendRequestSentToastClose,
onInviteFriendsToastClose,
+ onInitialPostPhotoConsumed,
onOpenFriend,
onOpenMessages,
onOpenProfile,
@@ -1530,6 +1534,7 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({
>({});
const [feedScrollRequest, setFeedScrollRequest] = useState(0);
const postInputRef = React.useRef<HTMLInputElement | null>(null);
+ const initialPostPhotoFileRef = React.useRef<File | null>(null);
const feedLoadMoreRef = React.useRef<HTMLDivElement | null>(null);
const localPostObjectUrlsRef = React.useRef<Set<string>>(new Set());
const activeLocalPostObjectUrlRef = React.useRef<string | null>(null);
@@ -1874,88 +1879,119 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({
onLoadMoreFeedItems,
]);
- const prepareSelectedPostPhoto = async (file: File) => {
- if (!profile) return;
+ const prepareSelectedPostPhoto = React.useCallback(
+ async (file: File) => {
+ if (!profile) return;
+
+ const canShowLocalPreview = canPreviewSpaceImageFile(file);
+ if (!canShowLocalPreview) {
+ const timestampMs = Date.now();
+ const draftKey = `pending-preview-${timestampMs}`;
+ activeLocalPostObjectUrlRef.current = draftKey;
+ setSelectedViewer({
+ draftFile: file,
+ isDraftImagePreviewPending: true,
+ localObjectUrl: draftKey,
+ photo: {
+ alt: `${profileDisplayName || "You"} post`,
+ avatarUrl: profile.avatarUrl,
+ imageUrl: "",
+ name: profileDisplayName || "You",
+ timestampMs,
+ },
+ postActionMode: "draft-post",
+ });
- const canShowLocalPreview = canPreviewSpaceImageFile(file);
- if (!canShowLocalPreview) {
- const timestampMs = Date.now();
- const draftKey = `pending-preview-${timestampMs}`;
- activeLocalPostObjectUrlRef.current = draftKey;
+ window.setTimeout(() => {
+ if (activeLocalPostObjectUrlRef.current != draftKey) return;
+
+ void spacePostPreviewImageForFile(file)
+ .then((preview) => {
+ if (
+ activeLocalPostObjectUrlRef.current != draftKey
+ ) {
+ URL.revokeObjectURL(preview.url);
+ return;
+ }
+
+ localPostObjectUrlsRef.current.add(preview.url);
+ activeLocalPostObjectUrlRef.current = preview.url;
+ setSelectedViewer((currentViewer) => {
+ if (currentViewer?.localObjectUrl != draftKey)
+ return currentViewer;
+
+ return {
+ ...currentViewer,
+ isDraftImagePreviewPending: false,
+ localObjectUrl: preview.url,
+ photo: {
+ ...currentViewer.photo,
+ height: preview.height,
+ imageUrl: preview.url,
+ width: preview.width,
+ },
+ };
+ });
+ })
+ .catch((error: unknown) => {
+ log.error("Failed to prepare post preview", error);
+ const message = spacePostImageErrorMessage(error);
+ setSelectedViewer((currentViewer) => {
+ if (currentViewer?.localObjectUrl != draftKey)
+ return currentViewer;
+
+ return {
+ ...currentViewer,
+ draftImageError: message,
+ };
+ });
+ });
+ }, 0);
+ return;
+ }
+
+ const localPost = await createLoadedLocalPostPhoto({
+ avatarUrl: profile.avatarUrl,
+ file,
+ name: profileDisplayName || "You",
+ });
+ localPostObjectUrlsRef.current.add(localPost.objectUrl);
+ activeLocalPostObjectUrlRef.current = localPost.objectUrl;
setSelectedViewer({
draftFile: file,
- isDraftImagePreviewPending: true,
- localObjectUrl: draftKey,
- photo: {
- alt: `${profileDisplayName || "You"} post`,
- avatarUrl: profile.avatarUrl,
- imageUrl: "",
- name: profileDisplayName || "You",
- timestampMs,
- },
+ localObjectUrl: localPost.objectUrl,
+ photo: localPost.photo,
postActionMode: "draft-post",
});
+ },
+ [profile, profileDisplayName],
+ );
- window.setTimeout(() => {
- if (activeLocalPostObjectUrlRef.current != draftKey) return;
-
- void spacePostPreviewImageForFile(file)
- .then((preview) => {
- if (activeLocalPostObjectUrlRef.current != draftKey) {
- URL.revokeObjectURL(preview.url);
- return;
- }
-
- localPostObjectUrlsRef.current.add(preview.url);
- activeLocalPostObjectUrlRef.current = preview.url;
- setSelectedViewer((currentViewer) => {
- if (currentViewer?.localObjectUrl != draftKey)
- return currentViewer;
-
- return {
- ...currentViewer,
- isDraftImagePreviewPending: false,
- localObjectUrl: preview.url,
- photo: {
- ...currentViewer.photo,
- height: preview.height,
- imageUrl: preview.url,
- width: preview.width,
- },
- };
- });
- })
- .catch((error: unknown) => {
- log.error("Failed to prepare post preview", error);
- const message = spacePostImageErrorMessage(error);
- setSelectedViewer((currentViewer) => {
- if (currentViewer?.localObjectUrl != draftKey)
- return currentViewer;
-
- return {
- ...currentViewer,
- draftImageError: message,
- };
- });
- });
- }, 0);
+ React.useEffect(() => {
+ if (
+ !initialPostPhotoFile ||
+ initialPostPhotoFileRef.current == initialPostPhotoFile ||
+ isPostPhotoButtonDisabled
+ ) {
return;
}
- const localPost = await createLoadedLocalPostPhoto({
- avatarUrl: profile.avatarUrl,
- file,
- name: profileDisplayName || "You",
- });
- localPostObjectUrlsRef.current.add(localPost.objectUrl);
- activeLocalPostObjectUrlRef.current = localPost.objectUrl;
- setSelectedViewer({
- draftFile: file,
- localObjectUrl: localPost.objectUrl,
- photo: localPost.photo,
- postActionMode: "draft-post",
- });
- };
+ initialPostPhotoFileRef.current = initialPostPhotoFile;
+ setIsPostPhotoOpening(true);
+ void prepareSelectedPostPhoto(initialPostPhotoFile)
+ .catch((error: unknown) => {
+ log.error("Failed to open post photo draft", error);
+ })
+ .finally(() => {
+ onInitialPostPhotoConsumed?.();
+ setIsPostPhotoOpening(false);
+ });
+ }, [
+ initialPostPhotoFile,
+ isPostPhotoButtonDisabled,
+ onInitialPostPhotoConsumed,
+ prepareSelectedPostPhoto,
+ ]);
const handlePostPhotoSelect: React.ChangeEventHandler<HTMLInputElement> = (
event,
@@ -2246,7 +2282,7 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({
width: "100%",
}}
>
- {hasFeedItems ? (
+ {initialPostPhotoFile ? null : hasFeedItems ? (
<>
<FeedMotionList
entries={desiredFeedEntries}
diff --git a/web/apps/space/src/screens/MessagesScreen.tsx b/web/apps/space/src/screens/MessagesScreen.tsx
index 143e796b5e..fd40063ceb 100644
--- a/web/apps/space/src/screens/MessagesScreen.tsx
+++ b/web/apps/space/src/screens/MessagesScreen.tsx
@@ -31,6 +31,7 @@ import type {
import { spaceTouchTargetSize } from "styles/touchTargets";
import { firstNameFrom } from "utils/spaceDisplay";
import { clampSpaceMessageText } from "utils/spaceMessageLimits";
+import { spacePostImageInputAccept } from "utils/spacePostImage";
export const messagesBackground = "#FFFFFF";
@@ -64,6 +65,26 @@ const messageLongPressMs = 520;
const messageLongPressMoveTolerancePx = 10;
const messageActionsTouchOpenMouseSuppressMs = 900;
const dayMs = 24 * 60 * 60 * 1000;
+const waveMessageText = "πŸ‘‹";
+
+const isWaveMessageText = (text: string | undefined) =>
+ text?.trim() == waveMessageText;
+
+const shouldShowPostSomething = (
+ conversation: SpaceMessageConversation,
+ latestPostCreatedAtMs: number | null | undefined,
+) => {
+ const activity = conversation.latestActivity;
+ return (
+ latestPostCreatedAtMs !== undefined &&
+ (latestPostCreatedAtMs === null ||
+ latestPostCreatedAtMs < activity.createdAtMs) &&
+ (activity.type == "message" || activity.type == "post_reply") &&
+ !activity.outgoing &&
+ !activity.isUnavailable &&
+ isWaveMessageText(activity.text)
+ );
+};
interface MessagesScreenProps {
conversations: SpaceMessageConversation[];
@@ -72,6 +93,7 @@ interface MessagesScreenProps {
isThreadLoading?: boolean;
isThreadReadOnly?: boolean;
isThreadRecipientLoading?: boolean;
+ latestPostCreatedAtMs?: number | null;
messages: SpaceMessage[];
onBack?: () => void;
onCloseThread: () => void;
@@ -87,6 +109,7 @@ interface MessagesScreenProps {
) => void;
onOpenQuotePost: (quote: SpaceMessageQuote) => void;
onOpenThread: (conversation: SpaceMessageConversation) => void;
+ onPostPhotoSelect: (file: File) => void;
onLoadActivityPost?: (
post: SpaceMessageActivityPost,
) => Promise<SpaceMessageActivityPost | undefined>;
@@ -97,11 +120,13 @@ interface MessagesScreenProps {
) => Promise<void>;
onSendMessage: (spaceId: string, text: string) => Promise<void>;
onSetMessageLiked: (messageId: string, liked: boolean) => Promise<void>;
+ previewWaveAnimationActivityIds?: string[];
profileLink?: string;
newConversationIds?: string[];
profile: SetupProfile;
selectedFriend?: SpaceMessageConversation["friend"];
threadBackLabel?: string;
+ waveAnimationMessageId?: string;
}
interface MessageContextMenuState {
@@ -222,7 +247,8 @@ const conversationPreview = (conversation: SpaceMessageConversation) => {
const ConversationPreviewLine: React.FC<{
conversation: SpaceMessageConversation;
-}> = ({ conversation }) => {
+ shouldAnimateWave: boolean;
+}> = ({ conversation, shouldAnimateWave }) => {
const activity = conversation.latestActivity;
const previewLineSx = {
color: textSecondary,
@@ -236,6 +262,34 @@ const ConversationPreviewLine: React.FC<{
whiteSpace: "nowrap",
};
+ if (shouldAnimateWave) {
+ return (
+ <Box sx={previewLineSx}>
+ <Box
+ component="span"
+ sx={{
+ animation:
+ "spaceConversationPreviewWave 900ms ease-in-out",
+ display: "inline-block",
+ transformOrigin: "70% 70%",
+ "@keyframes spaceConversationPreviewWave": {
+ "0%, 100%": { transform: "rotate(0deg)" },
+ "20%": { transform: "rotate(-18deg)" },
+ "40%": { transform: "rotate(14deg)" },
+ "60%": { transform: "rotate(-10deg)" },
+ "80%": { transform: "rotate(6deg)" },
+ },
+ "@media (prefers-reduced-motion: reduce)": {
+ animation: "none",
+ },
+ }}
+ >
+ {waveMessageText}
+ </Box>
+ </Box>
+ );
+ }
+
if (activity.type == "message_like" && activity.text) {
return (
<Box sx={{ ...previewLineSx, display: "flex" }}>
@@ -406,6 +460,8 @@ const MessageTimeSeparator: React.FC<{ timestampMs: number }> = ({
const ConversationListItem: React.FC<{
activityPost?: SpaceMessageActivityPost;
conversation: SpaceMessageConversation;
+ latestPostCreatedAtMs?: number | null;
+ shouldAnimateWave: boolean;
onConfirmFriendRequest: (
conversation: SpaceMessageConversation,
) => Promise<void>;
@@ -415,14 +471,18 @@ const ConversationListItem: React.FC<{
onLoadActivityPost?: (post: SpaceMessageActivityPost) => void;
onOpenFriendProfile: (friend: SpaceMessageConversation["friend"]) => void;
onOpenThread: (conversation: SpaceMessageConversation) => void;
+ onPostSomething: () => void;
}> = ({
activityPost,
conversation,
+ latestPostCreatedAtMs,
+ shouldAnimateWave,
onConfirmFriendRequest,
onDeleteFriendRequest,
onLoadActivityPost,
onOpenFriendProfile,
onOpenThread,
+ onPostSomething,
}) => {
const name =
conversation.friend.fullName.trim() || conversation.friend.username;
@@ -438,6 +498,10 @@ const ConversationListItem: React.FC<{
Boolean(post?.isDeleted) ||
Boolean(activityPost && !activityPost.imageUrl);
const unreadCount = conversation.unreadCount;
+ const showPostSomething = shouldShowPostSomething(
+ conversation,
+ latestPostCreatedAtMs,
+ );
React.useEffect(() => {
if (!post || post.isDeleted || post.imageUrl || activityPost) {
return;
@@ -470,9 +534,10 @@ const ConversationListItem: React.FC<{
color: textBase,
display: "grid",
gap: "10px",
- gridTemplateColumns: isFriendRequest
- ? "44px minmax(0, 1fr) auto"
- : "44px minmax(0, 1fr)",
+ gridTemplateColumns:
+ isFriendRequest || showPostSomething
+ ? "44px minmax(0, 1fr) auto"
+ : "44px minmax(0, 1fr)",
minHeight: 64,
p: "8px 0",
textAlign: "left",
@@ -576,7 +641,11 @@ const ConversationListItem: React.FC<{
cursor: isFriendRequest ? "default" : "pointer",
display: "grid",
gap: "10px",
- gridColumn: isFriendRequest ? undefined : "2 / -1",
+ gridColumn: isFriendRequest
+ ? undefined
+ : showPostSomething
+ ? "2"
+ : "2 / -1",
gridTemplateColumns: showPostThumbnailSlot
? "minmax(0, 1fr) 44px"
: "minmax(0, 1fr)",
@@ -652,7 +721,10 @@ const ConversationListItem: React.FC<{
{timestampLabel}
</Box>
</Box>
- <ConversationPreviewLine conversation={conversation} />
+ <ConversationPreviewLine
+ conversation={conversation}
+ shouldAnimateWave={shouldAnimateWave}
+ />
</Box>
{showPostThumbnailSlot &&
(postThumbnailUrl ? (
@@ -698,6 +770,34 @@ const ConversationListItem: React.FC<{
</Box>
))}
</Box>
+ {showPostSomething && (
+ <Box
+ className="green-bg"
+ component="button"
+ type="button"
+ onClick={onPostSomething}
+ sx={{
+ bgcolor: green,
+ border: 0,
+ borderRadius: "16px",
+ color: "#FFFFFF",
+ cursor: "pointer",
+ fontFamily: '"Inter Variable", Inter, sans-serif',
+ fontSize: 12,
+ fontWeight: 700,
+ height: 36,
+ px: "12px",
+ whiteSpace: "nowrap",
+ "&:focus-visible": {
+ outline: `2px solid ${green}`,
+ outlineOffset: 2,
+ },
+ "&:hover": { bgcolor: "#07A820" },
+ }}
+ >
+ Post something
+ </Box>
+ )}
{isFriendRequest && (
<Box sx={{ display: "flex", flexShrink: 0, gap: "6px" }}>
<Box
@@ -757,6 +857,7 @@ const ConversationListItem: React.FC<{
const ConversationSection: React.FC<{
activityPostsByKey: Record<string, SpaceMessageActivityPost>;
+ latestPostCreatedAtMs?: number | null;
onConfirmFriendRequest: (
conversation: SpaceMessageConversation,
) => Promise<void>;
@@ -766,15 +867,20 @@ const ConversationSection: React.FC<{
onLoadActivityPost?: (post: SpaceMessageActivityPost) => void;
onOpenFriendProfile: (friend: SpaceMessageConversation["friend"]) => void;
onOpenThread: (conversation: SpaceMessageConversation) => void;
+ onPostSomething: () => void;
section: ConversationSection;
+ waveAnimationActivityIds: ReadonlySet<string>;
}> = ({
activityPostsByKey,
+ latestPostCreatedAtMs,
onConfirmFriendRequest,
onDeleteFriendRequest,
onLoadActivityPost,
onOpenFriendProfile,
onOpenThread,
+ onPostSomething,
section,
+ waveAnimationActivityIds,
}) => {
if (section.items.length == 0) return null;
@@ -809,11 +915,16 @@ const ConversationSection: React.FC<{
: undefined
}
conversation={conversation}
+ latestPostCreatedAtMs={latestPostCreatedAtMs}
+ shouldAnimateWave={waveAnimationActivityIds.has(
+ conversation.latestActivity.id,
+ )}
onConfirmFriendRequest={onConfirmFriendRequest}
onDeleteFriendRequest={onDeleteFriendRequest}
onLoadActivityPost={onLoadActivityPost}
onOpenFriendProfile={onOpenFriendProfile}
onOpenThread={onOpenThread}
+ onPostSomething={onPostSomething}
/>
))}
</Box>
@@ -1286,6 +1397,7 @@ const MessageBubble: React.FC<{
ownSpaceID?: string;
parentMessage?: SpaceMessage;
profile: SetupProfile;
+ shouldAnimateWave: boolean;
}> = ({
activityPost,
groupsWithNext,
@@ -1298,9 +1410,11 @@ const MessageBubble: React.FC<{
ownSpaceID,
parentMessage,
profile,
+ shouldAnimateWave,
}) => {
const isOwn = message.sender.spaceId == ownSpaceID;
const isUnavailable = Boolean(message.isUnavailable);
+ const isWave = !isUnavailable && isWaveMessageText(message.text);
const bubbleBorderRadius = isOwn
? `20px ${groupsWithPrevious ? "6px" : "20px"} ${groupsWithNext ? "6px" : "20px"} 20px`
: `${groupsWithPrevious ? "6px" : "20px"} 20px 20px ${groupsWithNext ? "6px" : "20px"}`;
@@ -1526,13 +1640,31 @@ const MessageBubble: React.FC<{
: incomingMessageText,
fontFamily:
'"Inter Variable", Inter, sans-serif',
- fontSize: 14,
+ fontSize: isWave ? 40 : 14,
fontStyle: isUnavailable
? "italic"
: "normal",
fontWeight: 600,
- lineHeight: "21px",
+ lineHeight: isWave ? "48px" : "21px",
overflowWrap: "anywhere",
+ ...(isWave &&
+ shouldAnimateWave && {
+ animation:
+ "spaceMessageBubbleWave 650ms ease-in-out",
+ transformOrigin: "70% 70%",
+ }),
+ "@keyframes spaceMessageBubbleWave": {
+ "0%, 100%": {
+ transform: "rotate(0deg)",
+ },
+ "20%": { transform: "rotate(-18deg)" },
+ "40%": { transform: "rotate(14deg)" },
+ "60%": { transform: "rotate(-10deg)" },
+ "80%": { transform: "rotate(6deg)" },
+ },
+ "@media (prefers-reduced-motion: reduce)": {
+ animation: "none",
+ },
whiteSpace: "pre-wrap",
}}
>
@@ -1578,6 +1710,7 @@ export const MessagesScreen: React.FC<MessagesScreenProps> = ({
isThreadLoading = false,
isThreadReadOnly = false,
isThreadRecipientLoading = false,
+ latestPostCreatedAtMs,
messages,
newConversationIds = [],
onBack,
@@ -1588,14 +1721,17 @@ export const MessagesScreen: React.FC<MessagesScreenProps> = ({
onOpenSelectedFriendProfile,
onOpenQuotePost,
onOpenThread,
+ onPostPhotoSelect,
onLoadActivityPost,
onReplyToMessage,
onSendMessage,
onSetMessageLiked,
+ previewWaveAnimationActivityIds = [],
profile,
profileLink,
selectedFriend,
threadBackLabel = "Back to messages",
+ waveAnimationMessageId,
}) => {
const [messageText, setMessageText] = React.useState("");
const [messageContextMenu, setMessageContextMenu] =
@@ -1611,6 +1747,7 @@ export const MessagesScreen: React.FC<MessagesScreenProps> = ({
Record<string, SpaceMessageActivityPost>
>({});
const composerRef = React.useRef<HTMLTextAreaElement | null>(null);
+ const postPhotoInputRef = React.useRef<HTMLInputElement | null>(null);
const threadScrollRef = React.useRef<HTMLDivElement | null>(null);
const stickToThreadBottomRef = React.useRef(true);
const smoothNextMessageScrollRef = React.useRef(false);
@@ -1628,6 +1765,7 @@ export const MessagesScreen: React.FC<MessagesScreenProps> = ({
isThreadOpen && !isThreadReadOnly && !isThreadRecipientLoading;
const canSend =
canInteract && messageText.trim().length > 0 && sendPhase == "idle";
+ const canWave = canInteract && sendPhase == "idle";
const selectedName = selectedFriend
? selectedFriend.fullName.trim() || selectedFriend.username
: "";
@@ -1640,6 +1778,10 @@ export const MessagesScreen: React.FC<MessagesScreenProps> = ({
() => conversationTimeSections(conversations, newConversationIds),
[conversations, newConversationIds],
);
+ const previewWaveAnimationActivityIdSet = React.useMemo(
+ () => new Set(previewWaveAnimationActivityIds),
+ [previewWaveAnimationActivityIds],
+ );
const loadActivityPost = React.useCallback(
(post: SpaceMessageActivityPost) => {
if (!onLoadActivityPost) return;
@@ -1697,6 +1839,19 @@ export const MessagesScreen: React.FC<MessagesScreenProps> = ({
messageContextMenu?.message &&
isCurrentProfileMessage(messageContextMenu.message, profile),
);
+ const isContextMessageWave = Boolean(
+ messageContextMenu?.message &&
+ isWaveMessageText(messageContextMenu.message.text),
+ );
+
+ const handlePostPhotoSelect: React.ChangeEventHandler<HTMLInputElement> = (
+ event,
+ ) => {
+ const file = event.target.files?.[0];
+ event.target.value = "";
+ if (file) onPostPhotoSelect(file);
+ };
+ const openPostPhotoPicker = () => postPhotoInputRef.current?.click();
const sendMessage = () => {
const text = messageText.trim();
@@ -1726,11 +1881,32 @@ export const MessagesScreen: React.FC<MessagesScreenProps> = ({
});
};
+ const sendWave = () => {
+ if (!selectedFriend || !canWave) return;
+ const spaceId = selectedFriend.spaceId ?? selectedFriend.id;
+ stickToThreadBottomRef.current = true;
+ smoothNextMessageScrollRef.current = true;
+ setSendPhase("sending");
+ void onSendMessage(spaceId, waveMessageText)
+ .then(() => setSendPhase("idle"))
+ .catch((error: unknown) => {
+ smoothNextMessageScrollRef.current = false;
+ log.error("Failed to send wave", error);
+ setSendPhase("idle");
+ });
+ };
+
const openMessageActions = (
message: SpaceMessage,
anchorEl: HTMLElement,
source: MessageActionsOpenSource,
) => {
+ if (
+ isWaveMessageText(message.text) &&
+ (!canInteract || !isCurrentProfileMessage(message, profile))
+ ) {
+ return;
+ }
ignoreMessageActionsMouseAwayUntilRef.current =
source == "touch"
? Date.now() + messageActionsTouchOpenMouseSuppressMs
@@ -1953,7 +2129,7 @@ export const MessagesScreen: React.FC<MessagesScreenProps> = ({
);
const messageActionMenuItems = [
- canInteract && !isContextMessageOwn ? (
+ !isContextMessageWave && canInteract && !isContextMessageOwn ? (
<MessageActionMenuItem
key="like"
icon={<HeartIcon small />}
@@ -1961,7 +2137,7 @@ export const MessagesScreen: React.FC<MessagesScreenProps> = ({
onClick={() => handleMessageAction("like")}
/>
) : null,
- canInteract ? (
+ !isContextMessageWave && canInteract ? (
<MessageActionMenuItem
key="reply"
icon={<ReplyIcon />}
@@ -1969,12 +2145,14 @@ export const MessagesScreen: React.FC<MessagesScreenProps> = ({
onClick={() => handleMessageAction("reply")}
/>
) : null,
- <MessageActionMenuItem
- key="copy"
- icon={<CopyIcon />}
- label="Copy"
- onClick={() => handleMessageAction("copy")}
- />,
+ !isContextMessageWave ? (
+ <MessageActionMenuItem
+ key="copy"
+ icon={<CopyIcon />}
+ label="Copy"
+ onClick={() => handleMessageAction("copy")}
+ />
+ ) : null,
canInteract && messageContextMenu?.message && isContextMessageOwn ? (
<MessageActionMenuItem
key="delete"
@@ -1988,6 +2166,14 @@ export const MessagesScreen: React.FC<MessagesScreenProps> = ({
return (
<>
+ <Box
+ ref={postPhotoInputRef}
+ component="input"
+ type="file"
+ accept={spacePostImageInputAccept}
+ onChange={handlePostPhotoSelect}
+ sx={{ display: "none" }}
+ />
<Box
component="main"
sx={{
@@ -2155,7 +2341,53 @@ export const MessagesScreen: React.FC<MessagesScreenProps> = ({
Messages
</Box>
)}
- <Box aria-hidden />
+ {isThreadOpen && selectedFriend && canInteract ? (
+ <Box
+ component="button"
+ type="button"
+ aria-label={
+ selectedName
+ ? `Wave at ${selectedName}`
+ : "Send wave"
+ }
+ disabled={!canWave}
+ onClick={sendWave}
+ sx={{
+ alignItems: "center",
+ appearance: "none",
+ bgcolor: "transparent",
+ border: 0,
+ borderRadius: "50%",
+ cursor: canWave ? "pointer" : "default",
+ display: "flex",
+ height: spaceTouchTargetSize,
+ justifyContent: "center",
+ justifySelf: "end",
+ mr: "-8px",
+ opacity: canWave ? 1 : 0.5,
+ p: 0,
+ width: spaceTouchTargetSize,
+ "&:focus-visible": {
+ outline: `2px solid ${green}`,
+ outlineOffset: 2,
+ },
+ }}
+ >
+ <Box
+ component="span"
+ aria-hidden
+ sx={{
+ display: "block",
+ fontSize: 23,
+ lineHeight: 1,
+ }}
+ >
+ {waveMessageText}
+ </Box>
+ </Box>
+ ) : (
+ <Box aria-hidden />
+ )}
</Box>
{isThreadOpen && selectedFriend ? (
@@ -2316,6 +2548,10 @@ export const MessagesScreen: React.FC<MessagesScreenProps> = ({
profile={
profile
}
+ shouldAnimateWave={
+ message.id ==
+ waveAnimationMessageId
+ }
/>
</React.Fragment>
);
@@ -2754,6 +2990,9 @@ export const MessagesScreen: React.FC<MessagesScreenProps> = ({
activityPostsByKey={
activityPostsByKey
}
+ latestPostCreatedAtMs={
+ latestPostCreatedAtMs
+ }
onConfirmFriendRequest={
onConfirmFriendRequest
}
@@ -2767,7 +3006,13 @@ export const MessagesScreen: React.FC<MessagesScreenProps> = ({
onOpenSelectedFriendProfile
}
onOpenThread={onOpenThread}
+ onPostSomething={
+ openPostPhotoPicker
+ }
section={section}
+ waveAnimationActivityIds={
+ previewWaveAnimationActivityIdSet
+ }
/>
))}
</Box>
diff --git a/web/apps/space/src/services/space.ts b/web/apps/space/src/services/space.ts
index c063be24d7..34cdc84402 100644
--- a/web/apps/space/src/services/space.ts
+++ b/web/apps/space/src/services/space.ts
@@ -167,6 +167,7 @@ type SpaceConversationChatSummaries =
interface SpaceConversationsResponse {
chatSummaries?: SpaceConversationChatSummaries;
friends?: SpaceFriend[];
+ latestPostCreatedAt?: string | null;
pendingRequests?: SpaceFriendRequestResponse[];
}
@@ -328,6 +329,7 @@ export interface SpaceMessageConversation {
export interface SpaceMessageConversationList {
items: SpaceMessageConversation[];
+ latestPostCreatedAtMs: number | null;
}
export interface SpaceFriendRequest {
@@ -980,13 +982,22 @@ const messageActivityFromSpaceActivity = (
};
};
+const isWaveMessageActivity = (activity: SpaceMessageActivity) =>
+ (activity.type == "message" || activity.type == "post_reply") &&
+ activity.text?.trim() == "πŸ‘‹";
+
const isPassiveAutoReadMessageActivity = (activity: SpaceMessageActivity) =>
activity.type == "friend_added" ||
activity.type == "message_like" ||
- activity.type == "post_like";
+ activity.type == "post_like" ||
+ isWaveMessageActivity(activity);
const messageConversationUnreadCount = (activities: SpaceMessageActivity[]) => {
- if (activities.length == 1 && activities[0]?.type == "post_like") {
+ const onlyActivity = activities.length == 1 ? activities[0] : undefined;
+ if (
+ onlyActivity?.type == "post_like" ||
+ (onlyActivity && isWaveMessageActivity(onlyActivity))
+ ) {
return 0;
}
@@ -1486,19 +1497,25 @@ export const loadCurrentMessageConversations = async (
summaries,
friendSpaceID,
);
+ const latestActivity = summary
+ ? messageActivityFromSpaceActivity(summary.latestActivity)
+ : undefined;
const unreadActivities = summary
- ? (summary.unreadActivities ?? []).map(
- messageActivityFromSpaceActivity,
- )
+ ? (summary.unreadActivities ?? [])
+ .map(messageActivityFromSpaceActivity)
+ .map((activity) =>
+ activity.id == latestActivity?.id &&
+ isWaveMessageActivity(latestActivity)
+ ? { ...activity, text: latestActivity.text }
+ : activity,
+ )
: [];
const unreadCount =
messageConversationUnreadCount(unreadActivities);
return {
friend,
- latestActivity: summary
- ? messageActivityFromSpaceActivity(
- summary.latestActivity,
- )
+ latestActivity: latestActivity
+ ? latestActivity
: {
createdAtMs: timestampMsFromSpaceDate(
conversation.createdAt,
@@ -1529,7 +1546,12 @@ export const loadCurrentMessageConversations = async (
unreadCount: 1,
}),
);
- return { items: [...requestItems, ...friendItems] };
+ return {
+ items: [...requestItems, ...friendItems],
+ latestPostCreatedAtMs: response.latestPostCreatedAt
+ ? timestampMsFromSpaceDate(response.latestPostCreatedAt)
+ : null,
+ };
} finally {
releaseCurrentSpaceContext(ctx);
}
diff --git a/web/apps/space/src/state/SpaceAppStateProvider.tsx b/web/apps/space/src/state/SpaceAppStateProvider.tsx
index 25998517c2..d0eb5dc0e8 100644
--- a/web/apps/space/src/state/SpaceAppStateProvider.tsx
+++ b/web/apps/space/src/state/SpaceAppStateProvider.tsx
@@ -49,6 +49,8 @@ export const SpaceAppStateProvider: React.FC<React.PropsWithChildren> = ({
useState<SpaceLoginCredentials | null>(null);
const [pendingPasskeyVerification, setPendingPasskeyVerification] =
useState<PendingSpacePasskeyVerification | null>(null);
+ const [pendingPostPhotoFile, setPendingPostPhotoFile] =
+ useState<File | null>(null);
const [pendingProfileAvatarFile, setPendingProfileAvatarFile] =
useState<File | null>(null);
const [pendingProfileCoverFile, setPendingProfileCoverFile] =
@@ -231,6 +233,7 @@ export const SpaceAppStateProvider: React.FC<React.PropsWithChildren> = ({
setProfileLoadStatus("ready");
setPendingLoginCredentials(null);
setPendingPasskeyVerification(null);
+ setPendingPostPhotoFile(null);
setPendingProfileAvatarFile(null);
setPendingProfileCoverFile(null);
setPendingCreateProfile(null);
@@ -283,6 +286,7 @@ export const SpaceAppStateProvider: React.FC<React.PropsWithChildren> = ({
onboardingEntrySource,
pendingLoginCredentials,
pendingPasskeyVerification,
+ pendingPostPhotoFile,
pendingProfileAvatarFile,
pendingProfileCoverFile,
pendingCreateProfile,
@@ -298,6 +302,7 @@ export const SpaceAppStateProvider: React.FC<React.PropsWithChildren> = ({
setOnboardingEntrySource,
setPendingLoginCredentials,
setPendingPasskeyVerification,
+ setPendingPostPhotoFile,
setPendingProfileAvatarFile,
setPendingProfileCoverFile,
setPendingCreateProfile,
@@ -313,6 +318,7 @@ export const SpaceAppStateProvider: React.FC<React.PropsWithChildren> = ({
onboardingEntrySource,
pendingLoginCredentials,
pendingPasskeyVerification,
+ pendingPostPhotoFile,
pendingProfileAvatarFile,
pendingProfileCoverFile,
pendingCreateProfile,
diff --git a/web/apps/space/src/state/spaceAppState.tsx b/web/apps/space/src/state/spaceAppState.tsx
index 61ef6720c4..8e2590424b 100644
--- a/web/apps/space/src/state/spaceAppState.tsx
+++ b/web/apps/space/src/state/spaceAppState.tsx
@@ -63,6 +63,7 @@ export interface SpaceAppState {
onboardingEntrySource: OnboardingEntrySource;
pendingLoginCredentials: SpaceLoginCredentials | null;
pendingPasskeyVerification: PendingSpacePasskeyVerification | null;
+ pendingPostPhotoFile: File | null;
pendingProfileAvatarFile: File | null;
pendingProfileCoverFile: File | null;
pendingCreateProfile: PendingCreateProfile | null;
@@ -89,6 +90,7 @@ export interface SpaceAppState {
setPendingPasskeyVerification: React.Dispatch<
React.SetStateAction<PendingSpacePasskeyVerification | null>
>;
+ setPendingPostPhotoFile: React.Dispatch<React.SetStateAction<File | null>>;
setPendingProfileAvatarFile: React.Dispatch<
React.SetStateAction<File | null>
>;