๐ End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Add Space message emoji picker and reaction handling
Anand Baburajanf70475287111
diff --git a/rust/bindings/wasm/space/src/space.rs b/rust/bindings/wasm/space/src/space.rsindex 35e173beff..6773b52b5c 100644--- a/rust/bindings/wasm/space/src/space.rs+++ b/rust/bindings/wasm/space/src/space.rs@@ -267,6 +267,7 @@ pub struct MessageResponse {reply_message_id: Option<String>,liked: bool,viewer_liked: bool,+ reaction: Option<String>,is_deleted: bool,created_at: String,updated_at: String,@@ -300,6 +301,7 @@ struct MessageConversationActivity {outgoing: bool,message_id: Option<String>,text: Option<String>,+ reaction: Option<String>,post_id: Option<i64>,reply_object_key: Option<String>,post_space_id: Option<String>,@@ -686,6 +688,14 @@ impl From<ente_space::Message> for MessageResponse {(String::new(), None, false, true)}};+ let reaction = message.reaction.unwrap_or_else(|error| {+ log::warn!(+ "Space message {} reaction is unavailable: {}",+ message.message_id,+ ente_core::error::chain(&error)+ );+ None+ });Self {message_id: message.message_id,kind: message.kind,@@ -695,6 +705,7 @@ impl From<ente_space::Message> for MessageResponse {reply_post_id: message.reply_post_id,reply_object_key,reply_message_id: message.reply_message_id,+ reaction,liked: message.liked,viewer_liked: message.viewer_liked,is_deleted,@@ -719,7 +730,16 @@ impl From<ente_space::MessageActivity> for MessageConversationActivity {(None, None, true)}};+ let reaction = activity.reaction.unwrap_or_else(|error| {+ log::warn!(+ "Space conversation activity {} reaction is unavailable: {}",+ activity.id,+ ente_core::error::chain(&error)+ );+ None+ });Self {+ reaction,id: activity.id,activity_type: activity.activity_type,kind: activity.kind,@@ -1258,6 +1278,20 @@ impl SpaceAccountCtxHandle {.map_err(Into::into)}+ #[wasm_bindgen(js_name = setMessageReaction)]+ pub async fn set_message_reaction(+ &self,+ space_id: String,+ sender_space_id: String,+ message_id: String,+ emoji: Option<String>,+ ) -> Result<(), Error> {+ self.inner+ .set_message_reaction(&space_id, &sender_space_id, &message_id, emoji.as_deref())+ .await+ .map_err(Into::into)+ }+#[wasm_bindgen(js_name = deleteMessage)]pub async fn delete_message(&self, space_id: String, message_id: String) -> Result<(), Error> {self.innerdiff --git a/rust/crates/space/src/client/messages.rs b/rust/crates/space/src/client/messages.rsindex a187e8e0dc..82d9c6c0ef 100644--- a/rust/crates/space/src/client/messages.rs+++ b/rust/crates/space/src/client/messages.rs@@ -114,7 +114,21 @@ impl AccountSpaceCtx {})};let content = retain_content_error(content)?;+ let reaction = if message.is_deleted {+ Ok(None)+ } else {+ retain_content_error(+ self.open_message_reaction(+ viewer_space_id,+ &message.message_id,+ &message.encrypted_reaction,+ message.liked,+ )+ .await,+ )?+ };Ok(Message {+ reaction,message_id: message.message_id,kind,sender_space_id: message.sender_space_id,@@ -204,7 +218,17 @@ impl AccountSpaceCtx {})};let content = retain_content_error(content)?;+ let reaction = retain_content_error(+ self.open_message_reaction(+ viewer_space_id,+ activity.message_id.as_deref().unwrap_or_default(),+ &activity.encrypted_reaction,+ activity.activity_type == "message_like",+ )+ .await,+ )?;Ok(MessageActivity {+ reaction,id: activity.id,activity_type: activity.activity_type,kind,diff --git a/rust/crates/space/src/client/mod.rs b/rust/crates/space/src/client/mod.rsindex 24c15520fe..a13bee31af 100644--- a/rust/crates/space/src/client/mod.rs+++ b/rust/crates/space/src/client/mod.rs@@ -7,6 +7,7 @@ mod media;mod messages;mod posts;mod profiles;+mod reactions;#[cfg(test)]mod test_support;diff --git a/rust/crates/space/src/client/reactions.rs b/rust/crates/space/src/client/reactions.rsnew file mode 100644index 0000000000..27c456a066--- /dev/null+++ b/rust/crates/space/src/client/reactions.rs@@ -0,0 +1,261 @@+use super::AccountSpaceCtx;+use crate::crypto::{open_with_keypair, seal_with_public_key};+use crate::error::{Error, Result};+use ente_core::b64;+use serde::{Deserialize, Serialize};++const REACTION_PAYLOAD_BYTES: usize = 256;++#[derive(Serialize, Deserialize)]+#[serde(rename_all = "camelCase")]+struct ReactionPayload {+ message_id: String,+ emoji: String,+}++impl AccountSpaceCtx {+ pub async fn set_message_reaction(+ &self,+ space_id: &str,+ sender_space_id: &str,+ message_id: &str,+ emoji: Option<&str>,+ ) -> Result<()> {+ if message_id.trim().is_empty() {+ return Err(Error::InvalidInput("message id is required".into()));+ }+ let path = format!("/spaces/{space_id}/messages/{message_id}/reaction");+ let Some(emoji) = emoji else {+ self.api().delete(&path).send().await?.error_for_status()?;+ return Ok(());+ };+ let payload = pack_reaction(message_id, emoji)?;+ let identity = self.space_identity_for(space_id).await?;+ let sender = self+ .friend_actor_for_space(space_id, sender_space_id)+ .await?;+ let sender_cipher = seal_with_public_key(&payload, &b64::decode(&sender.public_key)?)?;+ let recipient_cipher = seal_with_public_key(&payload, &identity.public_key)?;+ self.api()+ .put(&path)+ .json(&serde_json::json!({+ "senderEncryptedReaction": b64::encode(&sender_cipher),+ "recipientEncryptedReaction": b64::encode(&recipient_cipher),+ }))+ .send()+ .await?+ .error_for_status()?;+ Ok(())+ }++ pub(super) async fn open_message_reaction(+ &self,+ space_id: &str,+ message_id: &str,+ encrypted_reaction: &str,+ liked: bool,+ ) -> Result<Option<String>> {+ if encrypted_reaction.is_empty() {+ return Ok(liked.then(|| "โค๏ธ".to_owned()));+ }+ let identity = self.space_identity_for(space_id).await?;+ let plaintext = open_with_keypair(+ &b64::decode(encrypted_reaction)?,+ &identity.public_key,+ &identity.secret_key,+ )?;+ Ok(Some(unpack_reaction(message_id, &plaintext)?))+ }+}++fn pack_reaction(message_id: &str, emoji: &str) -> Result<Vec<u8>> {+ validate_emoji(emoji)?;+ let mut payload = serde_json::to_vec(&ReactionPayload {+ message_id: message_id.to_owned(),+ emoji: emoji.to_owned(),+ })+ .map_err(|_| Error::InvalidInput("invalid reaction".into()))?;+ if payload.len() > REACTION_PAYLOAD_BYTES {+ return Err(Error::InvalidInput("reaction is too large".into()));+ }+ payload.resize(REACTION_PAYLOAD_BYTES, b' ');+ Ok(payload)+}++fn unpack_reaction(message_id: &str, plaintext: &[u8]) -> Result<String> {+ if plaintext.len() != REACTION_PAYLOAD_BYTES {+ return Err(Error::InvalidInput("invalid reaction size".into()));+ }+ let payload: ReactionPayload = serde_json::from_slice(plaintext)+ .map_err(|_| Error::InvalidInput("invalid reaction".into()))?;+ if payload.message_id != message_id {+ return Err(Error::InvalidInput(+ "reaction belongs to another message".into(),+ ));+ }+ validate_emoji(&payload.emoji)?;+ Ok(payload.emoji)+}++fn validate_emoji(emoji: &str) -> Result<()> {+ if emoji.is_empty() || emoji.len() > 64 || !is_emoji_sequence(emoji) {+ return Err(Error::InvalidInput("a single emoji is required".into()));+ }+ Ok(())+}++fn is_emoji_sequence(emoji: &str) -> bool {+ let mut chars = emoji.chars().peekable();+ let Some(first) = chars.next() else {+ return false;+ };+ if ('\u{1f1e6}'..='\u{1f1ff}').contains(&first) {+ return chars+ .next()+ .is_some_and(|c| ('\u{1f1e6}'..='\u{1f1ff}').contains(&c))+ && chars.next().is_none();+ }+ if first.is_ascii_digit() || first == '#' || first == '*' {+ if chars.peek() == Some(&'\u{fe0f}') {+ chars.next();+ }+ return chars.next() == Some('\u{20e3}') && chars.next().is_none();+ }+ let mut base = first;+ loop {+ if !matches!(base as u32, 0xa9 | 0xae | 0x203c | 0x2049 | 0x2122 | 0x2139 | 0x2194..=0x21ff | 0x2300..=0x23ff | 0x25a0..=0x27bf | 0x2934..=0x2935 | 0x2b00..=0x2bff | 0x3030 | 0x303d | 0x3297 | 0x3299 | 0x1f000..=0x1faff)+ || matches!(base as u32, 0x1f1e6..=0x1f1ff | 0x1f3fb..=0x1f3ff)+ {+ return false;+ }+ if chars.peek() == Some(&'\u{fe0f}') {+ chars.next();+ }+ if chars+ .peek()+ .is_some_and(|c| ('\u{1f3fb}'..='\u{1f3ff}').contains(c))+ {+ chars.next();+ }+ match chars.next() {+ None => return true,+ Some('\u{200d}') => match chars.next() {+ Some(next) => base = next,+ None => return false,+ },+ _ => return false,+ }+ }+}++#[cfg(test)]+mod tests {+ use super::*;+ use crate::crypto::generate_keypair;++ #[tokio::test]+ async fn reaction_endpoint_encrypts_for_both_participants_and_removes() {+ use super::super::test_support::{test_account_ctx, test_public_key};+ use mockito::Server;+ use serde_json::json;+ use std::sync::{Arc, Mutex};++ let mut server = Server::new_async().await;+ let recipient = test_account_ctx(&server.url());+ let sender = test_account_ctx(&server.url());+ let friends = server.mock("GET", "/spaces/space_owner_main/friends")+ .with_status(200)+ .with_body(json!([{+ "friend": { "spaceId": "space_friend", "spaceSlug": "friend", "publicKey": b64::encode(&test_public_key(&sender)), "keyVersion": 1 },+ "shareKeyVersion": 1, "createdAt": "2026-09-29T00:00:00Z"+ }]).to_string()).create_async().await;+ let captured = Arc::new(Mutex::new(serde_json::Value::Null));+ let captured_request = captured.clone();+ let put = server+ .mock(+ "PUT",+ "/spaces/space_owner_main/messages/wmsg_test/reaction",+ )+ .match_header("x-space-session-token", "space-session-token")+ .with_status(200)+ .with_body_from_request(move |request| {+ *captured_request.lock().unwrap() =+ serde_json::from_slice(request.body().unwrap()).unwrap();+ b"{\"liked\":true}".to_vec()+ })+ .create_async()+ .await;+ recipient+ .set_message_reaction("space_owner_main", "space_friend", "wmsg_test", Some("๐๐ฝ"))+ .await+ .unwrap();+ let body = captured.lock().unwrap().clone();+ for (ctx, field) in [+ (&sender, "senderEncryptedReaction"),+ (&recipient, "recipientEncryptedReaction"),+ ] {+ let cipher = body[field].as_str().unwrap();+ assert_eq!(b64::decode(cipher).unwrap().len(), 304);+ assert_eq!(+ ctx.open_message_reaction("space_owner_main", "wmsg_test", cipher, true)+ .await+ .unwrap()+ .as_deref(),+ Some("๐๐ฝ")+ );+ }+ assert_eq!(+ recipient+ .open_message_reaction("space_owner_main", "wmsg_test", "", true)+ .await+ .unwrap()+ .as_deref(),+ Some("โค๏ธ")+ );+ assert_eq!(+ recipient+ .open_message_reaction("space_owner_main", "wmsg_test", "", false)+ .await+ .unwrap(),+ None+ );+ let delete = server+ .mock(+ "DELETE",+ "/spaces/space_owner_main/messages/wmsg_test/reaction",+ )+ .match_header("x-space-session-token", "space-session-token")+ .with_status(200)+ .create_async()+ .await;+ recipient+ .set_message_reaction("space_owner_main", "space_friend", "wmsg_test", None)+ .await+ .unwrap();+ put.assert_async().await;+ delete.assert_async().await;+ friends.assert_async().await;+ }++ #[test]+ fn reaction_is_padded_and_readable_only_with_participant_key() {+ let (public, secret) = generate_keypair().unwrap();+ let (other_public, other_secret) = generate_keypair().unwrap();+ for emoji in ["โค๏ธ", "๐๐ฝ", "๐จโ๐ฉโ๐งโ๐ฆ", "๐ฎ๐ณ", "1๏ธโฃ"] {+ let packed = pack_reaction("wmsg_test", emoji).unwrap();+ let cipher = seal_with_public_key(&packed, &public).unwrap();+ assert_eq!(cipher.len(), 304);+ assert!(open_with_keypair(&cipher, &other_public, &other_secret).is_err());+ let opened = open_with_keypair(&cipher, &public, &secret).unwrap();+ assert_eq!(unpack_reaction("wmsg_test", &opened).unwrap(), emoji);+ assert!(unpack_reaction("wmsg_other", &opened).is_err());+ }+ }++ #[test]+ fn reaction_rejects_text_multiple_emojis_and_incomplete_sequences() {+ for emoji in ["", "hello", "๐๐", "๐\u{200d}", "๐ฝ", "๐ฎ", "1", "\n"] {+ assert!(validate_emoji(emoji).is_err(), "{emoji:?}");+ }+ }+}diff --git a/rust/crates/space/src/client/tests.rs b/rust/crates/space/src/client/tests.rsindex 5245de86cd..2cab2c2beb 100644--- a/rust/crates/space/src/client/tests.rs+++ b/rust/crates/space/src/client/tests.rs@@ -60,6 +60,7 @@ async fn message_thread_keeps_content_failures_local_to_each_message() {sender_space_id: "space_friend".into(),recipient_space_id: "space_owner_main".into(),message_cipher: b64::encode(&encrypt_secretbox_payload(&key, plaintext).unwrap()),+ encrypted_reaction: String::new(),encrypted_message_key: encrypted_key.clone(),text: String::new(),reply_post_id: None,@@ -70,11 +71,12 @@ async fn message_thread_keeps_content_failures_local_to_each_message() {created_at: "2026-09-23T00:00:00Z".into(),updated_at: "2026-09-23T00:00:00Z".into(),};- let readable = message(+ let mut readable = message("readable","regular",br#"{"version":1,"kind":"regular","text":"hello","replyObjectKey":"photo"}"#,);+ readable.encrypted_reaction = "invalid".into();let poke = message("poke","regular",@@ -105,6 +107,7 @@ async fn message_thread_keeps_content_failures_local_to_each_message() {assert_eq!(opened.next_cursor, "next");assert_eq!(opened.items.len(), 6);assert_eq!(content(&opened.items[0]).text, "hello");+ assert!(opened.items[0].reaction.is_err());assert_eq!(content(&opened.items[0]).reply_object_key.as_deref(),Some("photo")@@ -136,6 +139,7 @@ async fn unread_poke_uses_latest_activity_kind() {sender_space_id: "space_friend".into(),recipient_space_id: "space_owner_main".into(),message_cipher: String::new(),+ encrypted_reaction: String::new(),encrypted_message_key: String::new(),reply_message_id: None,post_id: None,@@ -185,6 +189,7 @@ async fn conversation_activities_open_content_and_preserve_server_kind() {sender_space_id: "space_friend".into(),recipient_space_id: "space_owner_main".into(),message_cipher: b64::encode(&encrypt_secretbox_payload(&key, &plaintext).unwrap()),+ encrypted_reaction: String::new(),encrypted_message_key: encrypted_key.clone(),reply_message_id: None,post_id: None,@@ -216,6 +221,7 @@ async fn conversation_activities_open_content_and_preserve_server_kind() {sender_space_id: "space_friend".into(),recipient_space_id: "space_owner_main".into(),message_cipher: b64::encode(&encrypt_secretbox_payload(&key, b"not-json").unwrap()),+ encrypted_reaction: String::new(),encrypted_message_key: encrypted_key,reply_message_id: None,post_id: None,diff --git a/rust/crates/space/src/models.rs b/rust/crates/space/src/models.rsindex 1a5610558e..a67bf45ec2 100644--- a/rust/crates/space/src/models.rs+++ b/rust/crates/space/src/models.rs@@ -195,6 +195,7 @@ pub struct Message {pub sender_space_id: String,pub recipient_space_id: String,pub content: Result<Option<MessageContent>>,+ pub reaction: Result<Option<String>>,pub reply_post_id: Option<i64>,pub reply_message_id: Option<String>,pub liked: bool,@@ -221,6 +222,7 @@ pub struct MessageActivity {pub outgoing: bool,pub message_id: Option<String>,pub content: Result<Option<MessageContent>>,+ pub reaction: Result<Option<String>>,pub post_id: Option<i64>,pub post_space_id: Option<String>,}diff --git a/rust/crates/space/src/transport.rs b/rust/crates/space/src/transport.rsindex e20441789f..c2ae655a94 100644--- a/rust/crates/space/src/transport.rs+++ b/rust/crates/space/src/transport.rs@@ -156,6 +156,8 @@ pub struct MessageResponse {#[serde(default)]pub encrypted_message_key: String,#[serde(default)]+ pub encrypted_reaction: String,+ #[serde(default)]pub text: String,#[serde(default)]pub reply_post_id: Option<i64>,@@ -201,6 +203,8 @@ pub struct MessageConversationActivity {#[serde(default)]pub encrypted_message_key: String,#[serde(default)]+ pub encrypted_reaction: String,+ #[serde(default)]pub reply_message_id: Option<String>,#[serde(default)]pub post_id: Option<i64>,diff --git a/web/apps/space/src/components/HomeHeader.tsx b/web/apps/space/src/components/HomeHeader.tsxindex bd6b9f13e3..ace078ebf3 100644--- a/web/apps/space/src/components/HomeHeader.tsx+++ b/web/apps/space/src/components/HomeHeader.tsx@@ -218,7 +218,7 @@ export const SpaceHomeHeader: React.FC<SpaceHomeHeaderProps> = ({<HugeiconsIconicon={BubbleChatIcon}size={headerIconSize}- strokeWidth={2.5}+ strokeWidth={2.2}/>{showUnreadIndicator && (<Boxdiff --git a/web/apps/space/src/components/MessageReactionPicker.tsx b/web/apps/space/src/components/MessageReactionPicker.tsxnew file mode 100644index 0000000000..175309c8a0--- /dev/null+++ b/web/apps/space/src/components/MessageReactionPicker.tsx@@ -0,0 +1,523 @@+import { Add01Icon, Search01Icon } from "@hugeicons/core-free-icons";+import { HugeiconsIcon } from "@hugeicons/react";+import { Box, Dialog, Popover, useMediaQuery } from "@mui/material";+import { SpaceBottomSheetTransition } from "components/BottomSheetTransition";+import {+ emojiName,+ emojiWithSkinTone,+ quickReactionEmojis,+ searchEmojis,+ spaceEmojis,+ type SpaceEmoji,+} from "data/emojis";+import { useBrowserBackClose } from "hooks/use-browser-back-close";+import React from "react";+import {+ spaceControlBackground,+ spaceDialogBackground,+ spaceMenuBackground,+ spaceMenuHover,+ spaceSurface,+ spaceSurfaceHover,+ spaceText,+ spaceTextMuted,+} from "styles/colors";++const emojiFont =+ '"Apple Color Emoji", "Segoe UI Emoji", "Noto Color Emoji", sans-serif';+const buttonSx = {+ alignItems: "center",+ appearance: "none",+ bgcolor: "transparent",+ border: 0,+ borderRadius: "12px",+ color: spaceText,+ cursor: "pointer",+ display: "flex",+ flexShrink: 0,+ fontFamily: emojiFont,+ fontSize: 26,+ height: 40,+ justifyContent: "center",+ lineHeight: 1,+ p: 0,+ width: 40,+ "&:hover, &[aria-pressed=true]": { bgcolor: spaceMenuHover },+ "&:focus-visible": {+ outline: `2px solid ${spaceTextMuted}`,+ outlineOffset: -2,+ },+};++export const MessageQuickReactions: React.FC<{+ selected?: string;+ onSelect: (emoji: string) => void;+ onMore: () => void;+}> = ({ selected, onSelect, onMore }) => {+ const groupRef = React.useRef<HTMLDivElement>(null);+ React.useEffect(() => {+ groupRef.current?.focus({ preventScroll: true });+ }, []);++ return (+ <Box+ ref={groupRef}+ role="group"+ aria-label="React to message"+ tabIndex={-1}+ sx={{+ bgcolor: spaceMenuBackground,+ borderRadius: "999px",+ boxShadow:+ "0 0 0 1px rgba(255, 255, 255, 0.08), 0 8px 24px rgba(0, 0, 0, 0.32)",+ display: "flex",+ gap: "2px",+ outline: 0,+ p: "4px",+ }}+ >+ {quickReactionEmojis(selected).map((emoji) => {+ const name = emojiName(emoji);+ const label =+ selected == emoji ? `Remove ${name} reaction` : name;+ return (+ <Box+ key={emoji}+ component="button"+ type="button"+ aria-label={label}+ aria-pressed={selected == emoji}+ title={label}+ onClick={() => onSelect(emoji)}+ sx={{+ ...buttonSx,+ borderRadius: "50%",+ fontSize: 22,+ height: 36,+ pt: "2px",+ width: 36,+ }}+ >+ {emoji}+ </Box>+ );+ })}+ <Box+ component="button"+ type="button"+ aria-label="More reactions"+ title="More reactions"+ onClick={onMore}+ sx={{+ ...buttonSx,+ bgcolor: spaceControlBackground,+ borderRadius: "50%",+ height: 36,+ width: 36,+ }}+ >+ <HugeiconsIcon icon={Add01Icon} size={20} strokeWidth={1.8} />+ </Box>+ </Box>+ );+};++const skinTones = [+ { tone: "", name: "Default" },+ { tone: "๐ป", name: "Light" },+ { tone: "๐ผ", name: "Medium light" },+ { tone: "๐ฝ", name: "Medium" },+ { tone: "๐พ", name: "Medium dark" },+ { tone: "๐ฟ", name: "Dark" },+];+const tonePickerWidth = skinTones.length * 40 + 8;++export const MessageReactionPicker: React.FC<{+ selected?: string;+ onSelect: (emoji: string) => void;+ onClose: () => void;+}> = ({ selected, onSelect, onClose }) => {+ const isBottomSheet = useMediaQuery("(max-width: 599px)");+ const resultsID = React.useId();+ const [open, setOpen] = React.useState(true);+ useBrowserBackClose({+ open,+ onClose: () => setOpen(false),+ stateKey: "space-message-reaction-picker",+ });+ const [query, setQuery] = React.useState("");+ const [tonePicker, setTonePicker] = React.useState<{+ entry: SpaceEmoji;+ position: { top: number; left: number };+ } | null>(null);+ const tone = selected?.match(/[\u{1F3FB}-\u{1F3FF}]/u)?.[0] ?? "";+ const [focusedIndex, setFocusedIndex] = React.useState(0);+ const gridRef = React.useRef<HTMLDivElement>(null);+ const dragStartY = React.useRef<number | undefined>(undefined);+ const wasDragged = React.useRef(false);+ const [isDragging, setIsDragging] = React.useState(false);+ const [dragOffset, setDragOffset] = React.useState(0);+ const entries = query.trim()+ ? searchEmojis(spaceEmojis, query)+ : spaceEmojis;++ const select = (entry: SpaceEmoji, selectedTone = tone) => {+ onSelect(emojiWithSkinTone(entry, selectedTone));+ setOpen(false);+ };++ const navigate = (event: React.KeyboardEvent<HTMLDivElement>) => {+ const grid = gridRef.current;+ if (!grid) return;+ const columns =+ getComputedStyle(grid).gridTemplateColumns.split(" ").length;+ const offsets: Record<string, number> = {+ ArrowLeft: -1,+ ArrowRight: 1,+ ArrowUp: -columns,+ ArrowDown: columns,+ Home: -focusedIndex,+ End: entries.length - 1 - focusedIndex,+ };+ const offset = offsets[event.key];+ if (offset == undefined) return;+ event.preventDefault();+ const next = Math.max(+ 0,+ Math.min(entries.length - 1, focusedIndex + offset),+ );+ setFocusedIndex(next);+ grid.querySelectorAll<HTMLButtonElement>("button")[next]?.focus();+ };++ return (+ <Dialog+ open={open}+ onClose={() => setOpen(false)}+ maxWidth={false}+ slots={+ isBottomSheet+ ? { transition: SpaceBottomSheetTransition }+ : undefined+ }+ sx={{ zIndex: 1500 }}+ slotProps={{+ paper: {+ "aria-label": "React to message",+ style: {+ translate: `0 ${dragOffset}px`,+ transition: isDragging+ ? "none"+ : "translate 160ms ease-out",+ },+ sx: {+ bgcolor: spaceDialogBackground,+ borderRadius: "28px 28px 0 0",+ bottom: 0,+ boxShadow: "none",+ boxSizing: "border-box",+ display: "flex",+ flexDirection: "column",+ height: "min(420px, 60dvh)",+ left: 0,+ m: 0,+ maxHeight: "calc(100dvh - 16px)",+ maxWidth: "none",+ overflow: "hidden",+ p: "0 16px max(16px, env(safe-area-inset-bottom))",+ position: "fixed",+ width: "100vw",+ "@media (min-width: 600px)": {+ borderRadius: "20px",+ bottom: "auto",+ left: "50%",+ p: "0 20px 20px",+ top: "50%",+ transform: "translate(-50%, -50%)",+ width: 420,+ },+ },+ },+ transition: { onExited: onClose },+ }}+ >+ <Box+ component="button"+ type="button"+ aria-label="Dismiss emoji picker"+ onClick={(event: React.MouseEvent<HTMLButtonElement>) => {+ if (event.detail == 0 || !wasDragged.current)+ setOpen(false);+ wasDragged.current = false;+ }}+ onPointerDown={(+ event: React.PointerEvent<HTMLButtonElement>,+ ) => {+ if (event.button != 0) return;+ dragStartY.current = event.clientY;+ wasDragged.current = false;+ setIsDragging(true);+ event.currentTarget.setPointerCapture(event.pointerId);+ }}+ onPointerMove={(+ event: React.PointerEvent<HTMLButtonElement>,+ ) => {+ if (dragStartY.current == undefined) return;+ const distance = event.clientY - dragStartY.current;+ if (Math.abs(distance) > 4) wasDragged.current = true;+ setDragOffset(Math.max(0, distance));+ }}+ onPointerUp={(event: React.PointerEvent<HTMLButtonElement>) => {+ if (dragStartY.current == undefined) return;+ const distance = event.clientY - dragStartY.current;+ dragStartY.current = undefined;+ setIsDragging(false);+ if (distance > 80) setOpen(false);+ else setDragOffset(0);+ }}+ onPointerCancel={() => {+ dragStartY.current = undefined;+ wasDragged.current = true;+ setIsDragging(false);+ setDragOffset(0);+ }}+ sx={{+ ...buttonSx,+ borderRadius: "999px",+ cursor: isDragging ? "grabbing" : "grab",+ height: 32,+ touchAction: "none",+ width: "100%",+ "&:hover": { bgcolor: "transparent" },+ }}+ >+ <Box+ component="span"+ sx={{+ bgcolor: "#686868",+ borderRadius: "999px",+ height: 4,+ width: 32,+ }}+ />+ </Box>+ <Box+ sx={{+ alignItems: "center",+ bgcolor: spaceSurface,+ borderRadius: "12px",+ display: "flex",+ flexShrink: 0,+ gap: "8px",+ mb: "12px",+ px: "12px",+ }}+ >+ <HugeiconsIcon+ icon={Search01Icon}+ size={16}+ color={spaceTextMuted}+ />+ <Box+ component="input"+ type="search"+ aria-label="Search emojis"+ aria-controls={resultsID}+ autoFocus={!isBottomSheet}+ placeholder="Search"+ value={query}+ onChange={(event: React.ChangeEvent<HTMLInputElement>) => {+ setQuery(event.target.value);+ setFocusedIndex(0);+ gridRef.current?.scrollTo({ top: 0 });+ }}+ sx={{+ bgcolor: "transparent",+ border: 0,+ color: spaceText,+ fontFamily: "inherit",+ fontSize: 14,+ height: 40,+ minWidth: 0,+ outline: 0,+ width: "100%",+ "&::placeholder": { color: spaceTextMuted, opacity: 1 },+ }}+ />+ </Box>+ <Box+ id={resultsID}+ ref={gridRef}+ role="group"+ aria-label={query.trim() ? "Emoji search results" : "Emojis"}+ onKeyDown={navigate}+ sx={{+ alignContent: "start",+ display: "grid",+ gap: "4px",+ gridTemplateColumns: "repeat(auto-fill, minmax(38px, 1fr))",+ minHeight: 0,+ overflowY: "auto",+ overscrollBehavior: "contain",+ p: "2px",+ }}+ >+ {entries.map((entry, index) => {+ const emoji = emojiWithSkinTone(entry, tone);+ return (+ <Box+ key={entry.emoji}+ component="button"+ type="button"+ aria-label={entry.name}+ aria-pressed={selected == emoji}+ aria-haspopup={+ entry.skinTone ? "dialog" : undefined+ }+ aria-expanded={+ entry.skinTone+ ? tonePicker?.entry.emoji == entry.emoji+ : undefined+ }+ tabIndex={index == focusedIndex ? 0 : -1}+ title={entry.name}+ onFocus={() => setFocusedIndex(index)}+ onClick={(+ event: React.MouseEvent<HTMLButtonElement>,+ ) => {+ if (entry.skinTone) {+ const anchor =+ event.currentTarget.getBoundingClientRect();+ const grid =+ gridRef.current!.getBoundingClientRect();+ setTonePicker({+ entry,+ position: {+ top: anchor.top,+ left: Math.max(+ grid.left + tonePickerWidth / 2,+ Math.min(+ grid.right -+ tonePickerWidth / 2,+ anchor.left ++ anchor.width / 2,+ ),+ ),+ },+ });+ } else select(entry);+ }}+ sx={{+ ...buttonSx,+ height: 42,+ position: "relative",+ width: "100%",+ }}+ >+ {emoji}+ {entry.skinTone && (+ <Box+ component="span"+ aria-hidden+ sx={{+ borderRight: `5px solid ${spaceTextMuted}`,+ borderTop: "5px solid transparent",+ bottom: 5,+ position: "absolute",+ right: 5,+ }}+ />+ )}+ </Box>+ );+ })}+ {!entries.length && (+ <Box+ role="status"+ sx={{+ color: spaceTextMuted,+ fontSize: 14,+ gridColumn: "1 / -1",+ py: "36px",+ textAlign: "center",+ }}+ >+ No emojis found. Try another search.+ </Box>+ )}+ </Box>+ <Popover+ open={open && Boolean(tonePicker)}+ anchorReference="anchorPosition"+ anchorPosition={tonePicker?.position}+ onClose={() => setTonePicker(null)}+ transformOrigin={{ vertical: "bottom", horizontal: "center" }}+ sx={{ zIndex: 1501 }}+ slotProps={{+ paper: {+ role: "dialog",+ "aria-label": `Skin tones for ${tonePicker?.entry.name ?? "emoji"}`,+ sx: {+ bgcolor: spaceSurfaceHover,+ backgroundImage: "none",+ borderRadius: "999px",+ boxShadow: "0 8px 24px rgba(0, 0, 0, 0.3)",+ display: "flex",+ p: "4px",+ width: tonePickerWidth,+ },+ },+ }}+ >+ {tonePicker &&+ skinTones.map((item, index) => {+ const emoji = emojiWithSkinTone(+ tonePicker.entry,+ item.tone,+ );+ return (+ <Box+ key={item.tone}+ component="button"+ type="button"+ autoFocus={item.tone == tone}+ aria-label={`${tonePicker.entry.name}: ${item.name.toLowerCase()} skin tone`}+ aria-pressed={selected == emoji}+ onClick={() =>+ select(tonePicker.entry, item.tone)+ }+ onKeyDown={(+ event: React.KeyboardEvent<HTMLButtonElement>,+ ) => {+ const offsets: Record<string, number> = {+ ArrowLeft: -1,+ ArrowRight: 1,+ Home: -index,+ End: skinTones.length - 1 - index,+ };+ const offset = offsets[event.key];+ if (offset == undefined) return;+ event.preventDefault();+ const next = Math.max(+ 0,+ Math.min(+ skinTones.length - 1,+ index + offset,+ ),+ );+ const buttons =+ event.currentTarget.parentElement?.querySelectorAll<HTMLButtonElement>(+ "button",+ );+ buttons?.[next]?.focus();+ }}+ sx={{ ...buttonSx, borderRadius: "50%" }}+ >+ {emoji}+ </Box>+ );+ })}+ </Popover>+ </Dialog>+ );+};diff --git a/web/apps/space/src/components/MessagesPage.tsx b/web/apps/space/src/components/MessagesPage.tsxindex 12dbcda4c7..8d96a40b75 100644--- a/web/apps/space/src/components/MessagesPage.tsx+++ b/web/apps/space/src/components/MessagesPage.tsx@@ -19,7 +19,7 @@ import {replyToCurrentMessage,sendCurrentMessage,sendCurrentPoke,- setCurrentMessageLiked,+ setCurrentMessageReaction,shouldAutoReadMessageActivities,type SpaceMessage,type SpaceMessageConversation,@@ -135,6 +135,10 @@ export const SpaceMessagesPage: React.FC<SpaceMessagesPageProps> = ({const [showFriendRequestCanceledToast, setShowFriendRequestCanceledToast] =React.useState(false);const [messages, setMessages] = React.useState<SpaceMessage[]>([]);+ const reactionQueues = React.useRef(new Map<string, Promise<void>>());+ const savedReactions = React.useRef(new Map<string, string | undefined>());+ const localReactions = React.useRef(new Map<string, string | undefined>());+const [selectedFriendProfile, setSelectedFriendProfile] =React.useState<SpaceMessageConversation["friend"]>();const [@@ -611,6 +615,10 @@ export const SpaceMessagesPage: React.FC<SpaceMessagesPageProps> = ({let cancelled = false;selectedFriendSpaceIdRef.current = selectedSpaceId;+ for (const messageId of localReactions.current.keys()) {+ if (!reactionQueues.current.has(messageId))+ localReactions.current.delete(messageId);+ }setMessages([]);setIsThreadLoading(true);const viewer = currentProfileMessageActor(profile);@@ -627,7 +635,19 @@ export const SpaceMessagesPage: React.FC<SpaceMessagesPageProps> = ({page.items.map((message) => message.id),);setMessages((currentMessages) => [- ...page.items,+ ...page.items.map((message) => {+ if (!localReactions.current.has(message.id))+ return message;+ const reaction = localReactions.current.get(+ message.id,+ );+ return {+ ...message,+ reaction,+ liked: Boolean(reaction),+ viewerLiked: Boolean(reaction),+ };+ }),...currentMessages.filter((message) => !loadedMessageIds.has(message.id),),@@ -815,20 +835,56 @@ export const SpaceMessagesPage: React.FC<SpaceMessagesPageProps> = ({}void refreshConversations();}}- onSetMessageLiked={async (messageId, liked) => {- await setCurrentMessageLiked(- actorSpaceId,- messageId,- liked,- );- setMessages((currentMessages) =>- currentMessages.map((message) =>- message.id == messageId- ? { ...message, liked, viewerLiked: liked }- : message,- ),- );- void refreshConversations();+ onSetMessageReaction={async (messageId, emoji) => {+ const message = messages.find(+ (item) => item.id == messageId,+ )!;+ const previous = reactionQueues.current.get(messageId);+ if (!previous)+ savedReactions.current.set(messageId, message.reaction);+ const update = (reaction: string | undefined) => {+ localReactions.current.set(messageId, reaction);+ setMessages((items) =>+ items.map((item) =>+ item.id == messageId+ ? {+ ...item,+ reaction,+ liked: Boolean(reaction),+ viewerLiked: Boolean(reaction),+ }+ : item,+ ),+ );+ };+ update(emoji);+ const request = (previous ?? Promise.resolve())+ .catch(() => undefined)+ .then(async () => {+ await setCurrentMessageReaction(+ actorSpaceId,+ message.sender.spaceId!,+ messageId,+ emoji,+ );+ savedReactions.current.set(messageId, emoji);+ });+ reactionQueues.current.set(messageId, request);+ try {+ await request;+ if (reactionQueues.current.get(messageId) == request)+ update(emoji);+ } catch (error) {+ if (reactionQueues.current.get(messageId) == request)+ update(savedReactions.current.get(messageId));+ throw error;+ } finally {+ if (reactionQueues.current.get(messageId) == request) {+ reactionQueues.current.delete(messageId);+ savedReactions.current.delete(messageId);+ void refreshConversations();+ }+ }}}profileLink={spaceInviteURL({spaceUsername: profile.username,diff --git a/web/apps/space/src/data/emojis.ts b/web/apps/space/src/data/emojis.tsnew file mode 100644index 0000000000..046190ef91--- /dev/null+++ b/web/apps/space/src/data/emojis.ts@@ -0,0 +1,871 @@+export interface SpaceEmoji {+ emoji: string;+ name: string;+ keywords: string;+ skinTone: boolean;+}++export interface SpaceEmojiCategory {+ name: string;+ emojis: SpaceEmoji[];+}++const category = (name: string, entries: string): SpaceEmojiCategory => ({+ name,+ emojis: entries+ .trim()+ .split("\n")+ .map((entry) => {+ const [emoji = "", label = "", keywords = ""] = entry.split("|");+ return {+ emoji,+ name: label.replace("*", ""),+ keywords,+ skinTone: label.endsWith("*"),+ };+ }),+});++const regionNames = new Intl.DisplayNames(["en"], { type: "region" });+const flagRegions =+ "AD AE AF AG AI AL AM AO AQ AR AS AT AU AW AX AZ BA BB BD BE BF BG BH BI BJ BL BM BN BO BQ BR BS BT BV BW BY BZ CA CC CD CF CG CH CI CK CL CM CN CO CR CU CV CW CX CY CZ DE DJ DK DM DO DZ EC EE EG EH ER ES ET FI FJ FK FM FO FR GA GB GD GE GF GG GH GI GL GM GN GP GQ GR GS GT GU GW GY HK HM HN HR HT HU ID IE IL IM IN IO IQ IR IS IT JE JM JO JP KE KG KH KI KM KN KP KR KW KY KZ LA LB LC LI LK LR LS LT LU LV LY MA MC MD ME MF MG MH MK ML MM MN MO MP MQ MR MS MT MU MV MW MX MY MZ NA NC NE NF NG NI NL NO NP NR NU NZ OM PA PE PF PG PH PK PL PM PN PR PS PT PW PY QA RE RO RS RU RW SA SB SC SD SE SG SH SI SJ SK SL SM SN SO SR SS ST SV SX SY SZ TC TD TF TG TH TJ TK TL TM TN TO TR TT TV TW TZ UA UG UM US UY UZ VA VC VE VG VI VN VU WF WS YE YT ZA ZM ZW EU UN";++export const spaceEmojiCategories = [+ category(+ "Faces",+ `+๐|Big smile|happy grin+๐|Happy face|smile joy+๐|Beaming smile|happy laugh+๐|Grinning eyes|happy teeth+๐|Laughing|haha lol+๐ |Nervous laugh|sweat relief+๐|Tears of laughter|joy funny lol haha+๐คฃ|Rolling with laughter|rofl funny lol+๐|Warm smile|blush happy+๐|Little smile|happy+๐|Upside down|sarcasm silly+๐|Wink|playful+๐|Relieved|calm peace+๐|Heart eyes|love crush+๐ฅฐ|Feeling loved|hearts love+๐|Blowing a kiss|love+๐|Kiss|love+๐|Smiling kiss|love+๐|Blushing kiss|love+๐|Yummy|delicious food+๐|Tongue out|silly+๐|Winking tongue|silly playful+๐คช|Goofy|crazy silly+๐|Squinting tongue|silly+๐ค|Money face|rich cash+๐ค|Hug|thanks cuddle+๐คญ|Hand over mouth|oops giggle+๐ซข|Surprised gasp|shock+๐ซฃ|Peeking|shy scared+๐คซ|Shush|quiet secret+๐ค|Thinking|hmm question+๐ซก|Salute|respect yes+๐ค|Sealed lips|secret quiet+๐คจ|Raised eyebrow|skeptical+๐|Neutral|blank+๐|Unimpressed|expressionless+๐ถ|Speechless|silent+๐ซฅ|Invisible|awkward+๐|Smirk|sly+๐|Not amused|annoyed+๐|Eye roll|whatever+๐ฌ|Awkward grin|oops+๐ฎโ๐จ|Sigh|relief exhausted+๐คฅ|Lying|pinocchio+๐|Downhearted|sad+๐ช|Sleepy|tired+๐คค|Drooling|hungry+๐ด|Sleeping|tired snooze+๐ท|Face mask|sick+๐ค|Fever|sick ill+๐ค|Injured|hurt bandage+๐คข|Nauseous|sick gross+๐คฎ|Vomiting|sick gross+๐คง|Sneezing|cold sick+๐ฅต|Too hot|sweating+๐ฅถ|Freezing|cold+๐ฅด|Woozy|dizzy+๐ต|Dizzy|shock+๐คฏ|Mind blown|amazing wow+๐ค |Cowboy|hat+๐ฅณ|Party face|celebrate birthday+๐ฅธ|Disguise|glasses mustache+๐|Cool|sunglasses+๐ค|Nerd|glasses clever+๐ง|Monocle|curious+๐|Confused|unsure+๐ซค|Unsure|uneasy+๐|Worried|concern+๐|Frown|sad+โน๏ธ|Sad face|unhappy+๐ฎ|Surprised|wow oh+๐ฏ|Hushed|surprise+๐ฒ|Astonished|wow shock+๐ณ|Flushed|embarrassed+๐ฅบ|Pleading|please puppy+๐ฅน|Holding back tears|touched grateful+๐ฆ|Worried gasp|shock+๐ง|Anguished|worried+๐จ|Fearful|scared+๐ฐ|Anxious|sweat nervous+๐ฅ|Sad and relieved|disappointed+๐ข|Crying|sad tear+๐ญ|Sobbing|cry sad+๐ฑ|Screaming|scared shock+๐|Frustrated|upset+๐ฃ|Struggling|persevere+๐|Disappointed|sad+๐|Cold sweat|stress+๐ฉ|Weary|tired+๐ซ|Exhausted|tired+๐ฅฑ|Yawning|bored sleepy+๐ค|Huffing|angry proud+๐ก|Angry|mad rage+๐ |Annoyed|angry+๐คฌ|Swearing|angry rage+๐|Cheeky devil|mischief+๐ฟ|Angry devil|mad+๐|Skull|dead dying laugh+โ ๏ธ|Skull and bones|danger+๐ฉ|Poop|silly+๐คก|Clown|silly joke+๐ป|Ghost|boo spooky+๐ฝ|Alien|space+๐ค|Robot|technology+๐บ|Smiling cat|happy+๐ธ|Grinning cat|happy+๐น|Laughing cat|funny lol+๐ป|Heart eyes cat|love+๐ผ|Smirking cat|sly+๐ฝ|Kissing cat|love+๐|Shocked cat|surprise+๐ฟ|Crying cat|sad+๐พ|Angry cat|mad+๐|See no evil|shy monkey+๐|Hear no evil|monkey+๐|Speak no evil|secret monkey+`,+ ),+ category(+ "People",+ `+๐|Wave*|hello goodbye hi+๐ค|Raised back of hand*|stop+๐๏ธ|Open hand*|five+โ|Raised hand*|stop high five+๐|Vulcan salute*|live prosper+๐ซฑ|Hand right*|handshake+๐ซฒ|Hand left*|handshake+๐|Okay*|ok perfect+๐ค|Pinched fingers*|chef kiss+๐ค|Tiny amount*|small+โ๏ธ|Peace*|victory two+๐ค|Crossed fingers*|luck hope+๐ซฐ|Finger heart*|love+๐ค|Love you*|hand+๐ค|Rock on*|metal+๐ค|Call me*|hang loose+๐|Point left*|direction+๐|Point right*|direction+๐|Point up*|direction+๐|Point down*|direction+โ๏ธ|One moment*|up attention+๐ซต|You*|point+๐|Thumbs up*|yes good like approve+๐|Thumbs down*|no dislike+โ|Raised fist*|solidarity+๐|Fist bump*|punch+๐ค|Left fist*|bump+๐ค|Right fist*|bump+๐|Clapping*|bravo applause congratulations+๐|Celebration hands*|hooray praise+๐ซถ|Heart hands*|love+๐|Open hands*|welcome+๐คฒ|Palms together*|hope+๐ค|Handshake|deal agreement+๐|Folded hands*|please thanks pray grateful+โ๏ธ|Writing*|note+๐ |Nail polish*|beauty fancy+๐คณ|Selfie*|camera+๐ช|Strong arm*|strength flex workout+๐ฆพ|Mechanical arm|strength+๐ฆต|Leg*|kick+๐ฆถ|Foot*|step+๐|Ear*|listen+๐|Nose*|smell+๐ง |Brain|think smart+๐ซ|Anatomical heart|health+๐ฆท|Tooth|dentist+๐|Eyes|look watching+๐๏ธ|Eye|watch+๐ |Tongue|taste+๐|Lips|kiss+๐ถ|Baby*|child+๐ง|Child*|young+๐ง|Person*|adult+๐ฉ|Woman*|adult+๐จ|Man*|adult+๐ง|Older person*|elder+๐ต|Grandmother*|elder+๐ด|Grandfather*|elder+๐|Frowning person*|sad+๐|Pouting person*|angry+๐ |No gesture*|stop+๐|Okay gesture*|yes+๐|Helping hand*|information+๐|Hand raised*|question+๐ง|Deaf person*|hearing+๐|Bowing*|sorry respect+๐คฆ|Facepalm*|oops disbelief+๐คท|Shrug*|idk whatever+๐ฎ|Police officer*|law+๐ต๏ธ|Detective*|mystery+๐|Guard*|royal+๐ท|Builder*|construction+๐งโโ๏ธ|Health worker*|doctor nurse+๐งโ๐|Graduate*|student school+๐งโ๐ซ|Teacher*|school+๐งโ๐ณ|Cook*|chef food+๐งโ๐ป|Developer*|computer work coding+๐งโ๐จ|Artist*|paint creative+๐งโ๐|Astronaut*|space+๐ผ|Angel*|innocent+๐ |Santa*|christmas+๐ฆธ|Superhero*|hero+๐ฆน|Villain*|evil+๐ง|Wizard*|magic+๐ง|Fairy*|magic+๐ง|Vampire*|halloween+๐ง|Merperson*|sea+๐ง|Elf*|fantasy+๐ง|Genie|wish+๐ง|Zombie|halloween+๐|Dancing woman*|party+๐บ|Dancing man*|party+๐ถ|Walking*|stroll+๐|Running*|exercise+๐ง|Meditating*|calm yoga+๐|In bed*|sleep+๐จโ๐ฉโ๐งโ๐ฆ|Family|parents children+`,+ ),+ category(+ "Nature",+ `+๐ถ|Dog|puppy pet+๐ฑ|Cat|kitten pet+๐ญ|Mouse|animal+๐น|Hamster|pet+๐ฐ|Rabbit|bunny+๐ฆ|Fox|animal+๐ป|Bear|animal+๐ผ|Panda|bear+๐ปโโ๏ธ|Polar bear|snow+๐จ|Koala|animal+๐ฏ|Tiger|cat+๐ฆ|Lion|cat+๐ฎ|Cow|moo+๐ท|Pig|oink+๐ธ|Frog|animal+๐ต|Monkey|animal+๐|Chicken|bird+๐ง|Penguin|bird+๐ฆ|Bird|tweet+๐ค|Chick|baby bird+๐ฆ|Duck|quack+๐ฆ |Eagle|bird+๐ฆ|Owl|bird wise+๐ฆ|Bat|night+๐บ|Wolf|howl+๐|Boar|pig+๐ด|Horse|pony+๐ฆ|Unicorn|magic+๐|Bee|honey+๐ฆ|Butterfly|insect+๐|Snail|slow+๐|Ladybug|luck+๐|Ant|insect+๐ท๏ธ|Spider|web+๐ฆ|Scorpion|animal+๐ข|Turtle|slow+๐|Snake|reptile+๐ฆ|Lizard|reptile+๐ฆ|Dinosaur|t rex+๐|Octopus|sea+๐ฆ|Squid|sea+๐ฆ|Crab|sea+๐ |Tropical fish|sea+๐|Fish|sea+๐ฌ|Dolphin|sea+๐ณ|Whale|sea+๐ฆ|Shark|sea+๐|Crocodile|reptile+๐|Elephant|animal+๐ฆ|Giraffe|animal+๐ฆ|Zebra|stripes+๐ฆ|Gorilla|ape+๐ฆง|Orangutan|ape+๐ช|Camel|desert+๐ฆ|Llama|animal+๐ฆ|Kangaroo|animal+๐ฆฅ|Sloth|slow+๐ฆฆ|Otter|water+๐ฆ|Hedgehog|animal+๐พ|Paw prints|pet+๐|Dragon|fantasy+๐ต|Cactus|desert plant+๐|Christmas tree|holiday+๐ฒ|Evergreen|tree forest+๐ณ|Tree|forest+๐ด|Palm tree|tropical beach+๐ฑ|Seedling|growth plant+๐ฟ|Herb|green plant+โ๏ธ|Shamrock|luck+๐|Four leaf clover|luck+๐|Maple leaf|autumn+๐|Falling leaves|autumn+๐|Leaf in wind|breeze+๐|Mushroom|nature+๐น|Rose|flower love+๐ฅ|Wilted flower|sad+๐ท|Tulip|flower+๐ธ|Cherry blossom|flower spring+๐ผ|Blossom|flower+๐ป|Sunflower|flower sun+๐บ|Hibiscus|flower+๐|Bouquet|flowers thanks+๐|Earth|world globe+๐|Americas globe|world earth+๐|Asia globe|world earth+๐|Crescent moon|night+๐|Full moon|night+โญ|Star|favorite+๐|Glowing star|sparkle+โจ|Sparkles|magic beautiful+โ๏ธ|Sun|bright sunny+๐ค๏ธ|Partly sunny|weather+โ๏ธ|Cloud|weather+๐ง๏ธ|Rain|weather+โ๏ธ|Storm|thunder+๐|Rainbow|color+โ๏ธ|Snowflake|winter cold+โ๏ธ|Snowman|winter+โก|Lightning|energy fast+๐ฅ|Fire|hot lit amazing+๐ง|Droplet|water+๐|Wave|ocean water+`,+ ),+ category(+ "Food",+ `+๐|Apple|fruit+๐|Green apple|fruit+๐|Pear|fruit+๐|Orange|fruit+๐|Lemon|fruit+๐|Banana|fruit+๐|Watermelon|fruit+๐|Grapes|fruit+๐|Strawberry|fruit+๐ซ|Blueberries|fruit+๐|Cherries|fruit+๐|Peach|fruit+๐ฅญ|Mango|fruit+๐|Pineapple|fruit+๐ฅฅ|Coconut|fruit+๐ฅ|Kiwi|fruit+๐ |Tomato|vegetable+๐ฅ|Avocado|food+๐ฅฆ|Broccoli|vegetable+๐ฅฌ|Leafy greens|salad+๐ฅ|Cucumber|vegetable+๐ถ๏ธ|Chili|spicy pepper+๐ซ|Bell pepper|vegetable+๐ฝ|Corn|vegetable+๐ฅ|Carrot|vegetable+๐ง|Garlic|food+๐ง |Onion|food+๐ฅ|Potato|vegetable+๐|Bread|toast+๐ฅ|Croissant|pastry+๐ฅฏ|Bagel|bread+๐ง|Cheese|food+๐ฅ|Egg|breakfast+๐ณ|Fried egg|breakfast cooking+๐ฅ|Pancakes|breakfast+๐ง|Waffle|breakfast+๐ฅ|Bacon|food+๐|Chicken leg|food+๐|Burger|food+๐|Fries|food+๐|Pizza|food+๐ญ|Hot dog|food+๐ฅช|Sandwich|lunch+๐ฎ|Taco|food+๐ฏ|Burrito|food+๐ฅ|Salad|healthy+๐|Pasta|spaghetti+๐|Noodles|ramen soup+๐ฒ|Stew|soup+๐|Curry rice|food+๐ฃ|Sushi|food+๐ฅ|Dumpling|food+๐|Rice|food+๐|Rice ball|food+๐ฟ|Popcorn|movie+๐ง|Salt|food+๐ฆ|Ice cream cone|dessert+๐จ|Ice cream|dessert+๐ฉ|Doughnut|dessert+๐ช|Cookie|dessert+๐|Birthday cake|celebrate+๐ฐ|Cake slice|dessert+๐ง|Cupcake|dessert+๐ฅง|Pie|dessert+๐ซ|Chocolate|sweet+๐ฌ|Candy|sweet+๐ญ|Lollipop|sweet+๐ฏ|Honey|sweet+๐ฅ|Milk|drink+โ|Coffee|tea drink+๐ซ|Teapot|tea+๐ต|Tea|drink+๐ง|Juice|drink+๐ฅค|Soft drink|soda+๐ง|Bubble tea|boba drink+๐บ|Beer|drink+๐ป|Beer cheers|celebrate+๐ฅ|Cheers|celebrate toast+๐ท|Wine|drink+๐ธ|Cocktail|drink+๐น|Tropical drink|vacation+๐พ|Champagne|celebrate+`,+ ),+ category(+ "Travel",+ `+๐|Car|drive+๐|Taxi|ride+๐|Bus|transport+๐|Trolleybus|transport+๐๏ธ|Racing car|fast+๐|Police car|transport+๐|Ambulance|health+๐|Fire engine|rescue+๐|Delivery truck|transport+๐|Tractor|farm+๐ต|Scooter|ride+๐๏ธ|Motorcycle|ride+๐ฒ|Bicycle|cycle+๐ด|Kick scooter|ride+๐|Locomotive|train+๐|Train|transport+๐|Metro|subway+โ๏ธ|Airplane|flight vacation+๐ซ|Taking off|flight+๐ฌ|Landing|flight+๐|Helicopter|flight+๐|Rocket|space launch+๐ธ|Flying saucer|ufo alien+โต|Sailboat|sea+๐ค|Speedboat|sea+๐ข|Ship|cruise sea+โ|Anchor|sea+๐ฆ|Traffic light|road+๐บ๏ธ|Map|travel+๐งญ|Compass|direction+โฐ๏ธ|Mountain|hike+๐๏ธ|Snowy mountain|hike+๐|Volcano|lava+๐๏ธ|Camping|tent+๐๏ธ|Beach|vacation+๐๏ธ|Desert|sand+๐๏ธ|Island|vacation+๐ |Home|house+๐ก|House and garden|home+๐ข|Office|work+๐ฅ|Hospital|health+๐ซ|School|education+๐ฐ|Castle|royal+๐ผ|Tower|tokyo+๐ฝ|Statue of liberty|new york+โช|Church|building+๐|Mosque|building+๐|Temple|building+โฉ๏ธ|Shrine|building+๐ |Sunrise|morning+๐|Mountain sunrise|morning+๐|Sunset|evening+๐|City at night|stars+๐|Galaxy|space stars+๐|Bridge at night|city+๐ก|Ferris wheel|fun fair+๐ข|Roller coaster|fun+โฒ|Fountain|water+โบ|Tent|camping+๐งณ|Luggage|travel+โ|Hourglass|time waiting+โฐ|Alarm clock|time+โ|Watch|time+`,+ ),+ category(+ "Activities",+ `+โฝ|Football|soccer sport+๐|Basketball|sport+๐|American football|sport+โพ|Baseball|sport+๐พ|Tennis|sport+๐|Volleyball|sport+๐|Rugby|sport+๐ฅ|Flying disc|frisbee+๐ฑ|Pool|billiards+๐|Table tennis|ping pong+๐ธ|Badminton|sport+๐|Cricket|sport+๐|Ice hockey|sport+๐|Field hockey|sport+โณ|Golf|sport+๐น|Archery|bow arrow+๐ฃ|Fishing|sport+๐ฅ|Boxing glove|sport+๐ฅ|Martial arts|sport+๐ฝ|Running shirt|sport+๐น|Skateboard|sport+๐ผ|Roller skates|sport+โธ๏ธ|Ice skate|sport+๐ฟ|Skiing|snow sport+๐|Snowboarder*|snow sport+๐|Surfing*|wave sport+๐|Swimming*|water sport+๐ด|Cycling*|bike sport+๐ง|Climbing*|sport+๐|Trophy|winner award+๐ฅ|Gold medal|first winner+๐ฅ|Silver medal|second+๐ฅ|Bronze medal|third+๐ |Medal|award+๐๏ธ|Military medal|award+๐ฏ|Bullseye|target goal+๐ฎ|Video game|play gaming+๐น๏ธ|Joystick|gaming+๐ฒ|Dice|luck game+๐งฉ|Puzzle|piece+โ๏ธ|Chess pawn|game+๐ญ|Theater|drama acting+๐จ|Paint palette|art creative+๐งต|Thread|sewing+๐งถ|Yarn|knitting+๐ผ|Music score|song+๐ต|Music note|song+๐ถ|Music notes|song+๐ค|Microphone|sing karaoke+๐ง|Headphones|music listen+๐ท|Saxophone|music+๐ธ|Guitar|music rock+๐น|Piano|music+๐บ|Trumpet|music+๐ป|Violin|music+๐ฅ|Drum|music+๐ฌ|Movie clapper|film+๐ช|Circus|show+๐๏ธ|Tickets|event+๐|Party popper|congratulations celebrate tada+๐|Confetti|celebrate+๐|Balloon|birthday party+๐|Gift|present birthday+๐|Ribbon|gift+๐|Fireworks|celebrate+๐|Sparkler|celebrate+๐ช|Oil lamp|diwali+๐|Pumpkin|halloween+`,+ ),+ category(+ "Objects",+ `+๐ฑ|Phone|mobile+โ๏ธ|Telephone|call+๐ป|Laptop|computer work+๐ฅ๏ธ|Desktop computer|work+โจ๏ธ|Keyboard|computer+๐ฑ๏ธ|Computer mouse|click+๐จ๏ธ|Printer|paper+๐ท|Camera|photo+๐ธ|Taking a photo|camera flash+๐น|Video camera|film+๐ฅ|Movie camera|film+๐บ|Television|watch+๐ป|Radio|music+๐ก|Light bulb|idea+๐ฆ|Flashlight|torch light+๐ฏ๏ธ|Candle|light+๐|Battery|energy+๐|Plug|power+๐ธ|Flying money|spending+๐ฐ|Money bag|rich cash+๐ณ|Credit card|pay+๐|Gem|diamond+โ๏ธ|Scales|balance justice+๐ง|Wrench|tool fix+๐จ|Hammer|tool+๐ ๏ธ|Tools|fix build+โ๏ธ|Gear|settings+๐งฒ|Magnet|attract+๐งช|Test tube|science+๐ฌ|Microscope|science+๐ญ|Telescope|space+๐|Pill|medicine+๐|Syringe|medicine+๐ฉน|Bandage|healing+๐ฉบ|Stethoscope|doctor+๐๏ธ|Bed|sleep+๐๏ธ|Sofa|relax+๐ช|Door|entry+๐ช|Chair|seat+๐ช|Window|home+๐งน|Broom|clean+๐งผ|Soap|clean+๐งฝ|Sponge|clean+๐งด|Lotion|care+๐ชฅ|Toothbrush|clean+๐งป|Paper roll|tissue+๐งบ|Basket|laundry+๐งธ|Teddy bear|cuddle toy+๐ช|Kite|play+๐ช|Magic wand|wish+๐ชฉ|Disco ball|dance party+๐ฆ|Package|delivery box+โ๏ธ|Envelope|mail+๐|Love letter|mail+๐ฉ|Incoming mail|email+๐|Books|read study+๐|Open book|read+๐|Notebook|notes+๐|Page|document+๐ฐ|Newspaper|news+๐|Memo|write notes+โ๏ธ|Pencil|write+๐๏ธ|Pen|write+๐๏ธ|Paintbrush|art+๐ |Calendar|date+๐|Tear off calendar|date+๐|Chart rising|growth+๐|Chart falling|decline+๐|Bar chart|data+๐|Pin|save+๐|Location pin|place+๐|Paperclip|attachment+โ๏ธ|Scissors|cut+๐|Locked|private secure+๐|Unlocked|open+๐|Key|password+๐๏ธ|Old key|unlock+๐|Bell|notification+๐|Muted bell|quiet+๐ข|Loudspeaker|announcement+๐ฃ|Megaphone|cheer+๐|Magnifier|search+`,+ ),+ category(+ "Symbols",+ `+โค๏ธ|Red heart|love like+๐งก|Orange heart|love+๐|Yellow heart|love friendship+๐|Green heart|love+๐|Blue heart|love+๐|Purple heart|love+๐ค|Black heart|love+๐ค|White heart|love+๐ค|Brown heart|love+๐ฉท|Pink heart|love+๐ฉต|Light blue heart|love+๐ฉถ|Gray heart|love+๐|Broken heart|sad heartbreak+โค๏ธโ๐ฅ|Heart on fire|passion love+โค๏ธโ๐ฉน|Healing heart|care recovery+๐|Two hearts|love+๐|Spinning hearts|love+๐|Beating heart|love+๐|Growing heart|love+๐|Sparkling heart|love+๐|Heart and arrow|love cupid+๐|Heart gift|love+๐|Heart decoration|love+โฃ๏ธ|Heart exclamation|love+๐|Kiss mark|love+๐ฏ|Hundred|perfect agree+๐ข|Anger symbol|mad+๐ฅ|Boom|explosion impact+๐ซ|Dizzy stars|sparkle+๐ฆ|Sweat drops|water+๐จ|Dash|fast wind+๐ณ๏ธ|Hole|empty+๐ฌ|Speech bubble|chat message+๐ญ|Thought bubble|thinking+๐ฏ๏ธ|Angry bubble|shout+๐ค|Sleep symbol|zzz tired+โ |Check mark|yes done correct+โ๏ธ|Checked box|done+โ๏ธ|Check|yes correct+โ|Cross|no wrong+โ|Crossed box|no+โ|Plus|add+โ|Minus|remove+โ๏ธ|Multiply|times+โ|Divide|math+โพ๏ธ|Infinity|forever+โ|Question|what+โ|Light question|what+โ|Exclamation|attention+โ|Light exclamation|attention+โผ๏ธ|Double exclamation|wow+โ๏ธ|Question and exclamation|what wow+โ ๏ธ|Warning|caution+โ|No entry|stop+๐ซ|Prohibited|no+๐|Adults only|eighteen+โป๏ธ|Recycle|green environment+โ๏ธ|Fleur de lis|symbol+๐ฑ|Trident|symbol+โ๏ธ|Medical symbol|health+โฎ๏ธ|Peace symbol|peace+โฏ๏ธ|Yin yang|balance+โธ๏ธ|Dharma wheel|religion+โก๏ธ|Star of David|religion+โ๏ธ|Cross symbol|religion+โช๏ธ|Crescent and star|religion+๐๏ธ|Om|religion+๐ชฏ|Khanda|religion+๐ด|Red circle|color+๐ |Orange circle|color+๐ก|Yellow circle|color+๐ข|Green circle|color+๐ต|Blue circle|color+๐ฃ|Purple circle|color+โซ|Black circle|color+โช|White circle|color+๐ค|Brown circle|color+๐ฅ|Red square|color+๐ง|Orange square|color+๐จ|Yellow square|color+๐ฉ|Green square|color+๐ฆ|Blue square|color+๐ช|Purple square|color+โฌ|Black square|color+โฌ|White square|color+๐ซ|Brown square|color+๐ถ|Orange diamond|shape+๐ท|Blue diamond|shape+๐บ|Up triangle|shape+๐ป|Down triangle|shape+โฌ๏ธ|Up arrow|direction+โฌ๏ธ|Down arrow|direction+โฌ ๏ธ|Left arrow|direction+โก๏ธ|Right arrow|direction+โ๏ธ|Up right arrow|direction+โ๏ธ|Down right arrow|direction+โ๏ธ|Down left arrow|direction+โ๏ธ|Up left arrow|direction+๐|Repeat|refresh+๐|Back|arrow+๐|Soon|arrow+๐|Top|arrow+๐|New|fresh+๐|Cool button|nice+๐|OK button|yes+๐|SOS|help+๐|Up button|level+0๏ธโฃ|Zero|number+1๏ธโฃ|One|number+2๏ธโฃ|Two|number+3๏ธโฃ|Three|number+4๏ธโฃ|Four|number+5๏ธโฃ|Five|number+6๏ธโฃ|Six|number+7๏ธโฃ|Seven|number+8๏ธโฃ|Eight|number+9๏ธโฃ|Nine|number+๐|Ten|number+#๏ธโฃ|Hash|number key+*๏ธโฃ|Asterisk|key+๐|Finish flag|racing+๐ฉ|Red flag|warning+๐ณ๏ธ|White flag|surrender+๐ด|Black flag|flag+๐ณ๏ธโ๐|Rainbow flag|pride+๐ณ๏ธโโง๏ธ|Transgender flag|pride+๐ดโโ ๏ธ|Pirate flag|skull+`,+ ),+ {+ name: "Flags",+ emojis: flagRegions+ .split(" ")+ .map((region) => ({+ emoji: String.fromCodePoint(+ region.charCodeAt(0) + 127397,+ region.charCodeAt(1) + 127397,+ ),+ name: regionNames.of(region)!,+ keywords: `flag ${region.toLowerCase()}`,+ skinTone: false,+ })),+ },+];++export const spaceEmojis = spaceEmojiCategories.flatMap(({ emojis }) => emojis);++export const emojiWithSkinTone = (entry: SpaceEmoji, tone: string) => {+ if (!tone || !entry.skinTone) return entry.emoji;+ const first = String.fromCodePoint(entry.emoji.codePointAt(0)!);+ return `${first}${tone}${entry.emoji.slice(first.length).replace("\uFE0F", "")}`;+};++export const quickReactionEmojis = (selected?: string) => {+ const tone = selected?.match(/[\u{1F3FB}-\u{1F3FF}]/u)?.[0] ?? "";+ const emojis = ["โค๏ธ", "๐", "๐ฎ", "๐ข", "๐", "๐"].map((emoji) =>+ emojiWithSkinTone(+ spaceEmojis.find((entry) => entry.emoji == emoji)!,+ tone,+ ),+ );+ return selected && !emojis.includes(selected)+ ? [...emojis.slice(0, 5), selected]+ : emojis;+};++export const searchEmojis = (entries: SpaceEmoji[], query: string) => {+ const normalized = query+ .trim()+ .toLowerCase()+ .replace(/[\u{1F3FB}-\u{1F3FF}]/gu, "");+ const terms = normalized.split(/\s+/u);+ return entries.filter((entry) =>+ terms.every((term) =>+ `${entry.emoji} ${entry.name} ${entry.keywords}`+ .toLowerCase()+ .includes(term),+ ),+ );+};++export const emojiName = (emoji: string) =>+ spaceEmojis.find(+ (entry) =>+ entry.emoji.replace(/\uFE0F/gu, "") ==+ emoji+ .replace(/[\u{1F3FB}-\u{1F3FF}]/gu, "")+ .replace(/\uFE0F/gu, ""),+ )?.name ?? "Emoji";diff --git a/web/apps/space/src/screens/HomeScreen.tsx b/web/apps/space/src/screens/HomeScreen.tsxindex efff120330..5798cee8b0 100644--- a/web/apps/space/src/screens/HomeScreen.tsx+++ b/web/apps/space/src/screens/HomeScreen.tsx@@ -612,7 +612,7 @@ const FeedLikeButton: React.FC<FeedLikeButtonProps> = ({icon={FavouriteIcon}primaryColor={isLiked ? green : feedActionForeground}size={feedActionIconSize}- strokeWidth={2}+ strokeWidth={2.2}/></Box></Box>diff --git a/web/apps/space/src/screens/MessagesScreen.tsx b/web/apps/space/src/screens/MessagesScreen.tsxindex 8c99ae07fc..e0cab345cd 100644--- a/web/apps/space/src/screens/MessagesScreen.tsx+++ b/web/apps/space/src/screens/MessagesScreen.tsx@@ -15,13 +15,19 @@ import {MenuList,Popper,} from "@mui/material";+import { SpaceActionToast } from "components/ActionToast";import { SpaceAvatarImage } from "components/AvatarImage";import { SpaceLiveStatus } from "components/LiveStatus";+import {+ MessageQuickReactions,+ MessageReactionPicker,+} from "components/MessageReactionPicker";import { SpacePostPhotoInput } from "components/PostPhotoInput";import { SpacePostPhotosBadge } from "components/PostPhotosBadge";import { SpaceLoadingSpinner } from "components/RouteFallback";import { SpaceShareInviteButton } from "components/ShareInviteButton";import { SpaceSkipLink } from "components/SkipLink";+import { emojiName } from "data/emojis";import { formatTimeAgo } from "ente-base/date";import log from "ente-base/log";import React from "react";@@ -37,6 +43,8 @@ import {spaceAppBackground,spaceAppBackgroundColor,spaceDialogBackground,+ spaceMenuBackground,+ spaceMenuHover,spaceOnAccent,spaceSurface,spaceSurfaceHover,@@ -129,7 +137,10 @@ interface MessagesScreenProps {) => Promise<void>;onSendPoke: (spaceId: string) => Promise<void>;onSendMessage: (spaceId: string, text: string) => Promise<void>;- onSetMessageLiked: (messageId: string, liked: boolean) => Promise<void>;+ onSetMessageReaction: (+ messageId: string,+ emoji: string | undefined,+ ) => Promise<void>;profileLink?: string;newConversationIds?: string[];profile: SetupProfile;@@ -240,11 +251,11 @@ const conversationPreview = (conversation: SpaceMessageConversation) => {if (activity.type == "message_like") {return text? activity.outgoing- ? `You liked "${text}"`- : `Liked "${text}"`+ ? `You reacted ${activity.reaction ?? ""} to "${text}"`+ : `Reacted ${activity.reaction ?? ""} to "${text}"`: activity.outgoing- ? "You liked a message"- : "Liked a message";+ ? `You reacted ${activity.reaction ?? ""} to a message`+ : `Reacted ${activity.reaction ?? ""} to a message`;}if (activity.kind == "poke") {return activity.outgoing@@ -278,7 +289,7 @@ const ConversationPreviewLine: React.FC<{return (<Box sx={{ ...previewLineSx, display: "flex" }}><Box component="span" sx={{ flexShrink: 0 }}>- {activity.outgoing ? 'You liked "' : 'Liked "'}+ {`${activity.outgoing ? "You reacted" : "Reacted"} ${activity.reaction ?? ""} to "`}</Box><Boxcomponent="span"@@ -932,6 +943,7 @@ const bodyBubblesCanGroup = () => {if (!first || !second) return false;if (!sameMessageSender(first, second)) return false;+ if (first.reaction) return false;if (first.kind == "post_like" || first.kind == "friend_added") return false;if ((second.kind != "regular" && second.kind != "poke") ||@@ -969,54 +981,6 @@ const ReplyIcon: React.FC = () => (</svg>);-const HeartIcon: React.FC<{ filled?: boolean; small?: boolean }> = ({- filled,- small,-}) => (- <svg- width={small ? "13" : "16"}- height={small ? "11" : "14"}- viewBox="0 0 16 14"- fill={filled ? green : "none"}- xmlns="http://www.w3.org/2000/svg"- >- <path- d="M6.63749 12.3742C4.66259 10.885 0.75 7.4804 0.75 4.41664C0.75 2.39161 2.22368 0.75 4.25 0.75C5.3 0.75 6.35 1.10294 7.75 2.51469C9.15 1.10294 10.2 0.75 11.25 0.75C13.2763 0.75 14.75 2.39161 14.75 4.41664C14.75 7.4804 10.8374 10.885 8.86251 12.3742C8.19793 12.8753 7.30207 12.8753 6.63749 12.3742Z"- stroke={filled ? green : "currentColor"}- strokeWidth="1.5"- strokeLinecap="round"- strokeLinejoin="round"- />- </svg>-);--const MessageLikeHeartIcon: React.FC = () => (- <svg- width="17"- height="15"- viewBox="-2 -2 20 18"- fill="none"- xmlns="http://www.w3.org/2000/svg"- >- <path- d="M6.63749 12.3742C4.66259 10.885 0.75 7.4804 0.75 4.41664C0.75 2.39161 2.22368 0.75 4.25 0.75C5.3 0.75 6.35 1.10294 7.75 2.51469C9.15 1.10294 10.2 0.75 11.25 0.75C13.2763 0.75 14.75 2.39161 14.75 4.41664C14.75 7.4804 10.8374 10.885 8.86251 12.3742C8.19793 12.8753 7.30207 12.8753 6.63749 12.3742Z"- fill={green}- stroke={spaceAppBackgroundColor}- strokeWidth="4"- strokeLinecap="round"- strokeLinejoin="round"- />- <path- d="M6.63749 12.3742C4.66259 10.885 0.75 7.4804 0.75 4.41664C0.75 2.39161 2.22368 0.75 4.25 0.75C5.3 0.75 6.35 1.10294 7.75 2.51469C9.15 1.10294 10.2 0.75 11.25 0.75C13.2763 0.75 14.75 2.39161 14.75 4.41664C14.75 7.4804 10.8374 10.885 8.86251 12.3742C8.19793 12.8753 7.30207 12.8753 6.63749 12.3742Z"- fill={green}- stroke={green}- strokeWidth="1.5"- strokeLinecap="round"- strokeLinejoin="round"- />- </svg>-);-const DeleteIcon: React.FC = () => (<svgwidth="13"@@ -1050,11 +1014,6 @@ const CopyIcon: React.FC = () => (</svg>);-const messageActionsPopperModifiers = [- { name: "offset", options: { offset: [0, 6] } },- { name: "preventOverflow", options: { padding: 14 } },- { name: "flip", options: { padding: 14 } },-];const messageActionsTransitionDuration = { enter: 140, exit: 100 };const MessageActionMenuItem: React.FC<{@@ -1077,14 +1036,18 @@ const MessageActionMenuItem: React.FC<{py: "7px","&.Mui-focusVisible": {bgcolor:- tone == "danger" ? "rgba(246, 58, 58, 0.14)" : spaceSurface,+ tone == "danger"+ ? "rgba(246, 58, 58, 0.14)"+ : spaceMenuHover,outline: 0,},"&:focus": { outline: 0 },"&:focus-visible": { outline: 0 },"&:hover": {bgcolor:- tone == "danger" ? "rgba(246, 58, 58, 0.14)" : spaceSurface,+ tone == "danger"+ ? "rgba(246, 58, 58, 0.14)"+ : spaceMenuHover,},}}>@@ -1651,8 +1614,12 @@ const MessageBubble: React.FC<{maxWidth: "100%",minWidth: 0,position: "relative",+ transition: "margin-bottom 180ms ease-out",width: "100%",- zIndex: isHighlighted ? 3 : message.liked ? 1 : "auto",+ zIndex: isHighlighted ? 3 : message.reaction ? 1 : "auto",+ "@media (prefers-reduced-motion: reduce)": {+ transition: "none",+ },}}>{isFriendAdded ? (@@ -1717,6 +1684,21 @@ const MessageBubble: React.FC<{)}<Boxdata-message-bubble+ tabIndex={isUnavailable ? undefined : 0}+ onKeyDown={(+ event: React.KeyboardEvent<HTMLElement>,+ ) => {+ if (+ event.key == "ContextMenu" ||+ (event.shiftKey && event.key == "F10")+ ) {+ event.preventDefault();+ openActions(+ event.currentTarget,+ "contextmenu",+ );+ }+ }}onContextMenu={handleContextMenu}onPointerCancel={cancelGesture}onPointerDown={handlePointerDown}@@ -1728,6 +1710,10 @@ const MessageBubble: React.FC<{? outgoingBubble: incomingBubble,borderRadius: bubbleBorderRadius,+ "&:focus-visible": {+ outline: `2px solid ${green}`,+ outlineOffset: 2,+ },color: isOwn? outgoingMessageText: incomingMessageText,@@ -1736,7 +1722,7 @@ const MessageBubble: React.FC<{: "context-menu",display: "block",maxWidth: "100%",- minWidth: 0,+ minWidth: message.reaction ? 48 : 0,ml: 0,overflow: "visible",position: "relative",@@ -1747,8 +1733,11 @@ const MessageBubble: React.FC<{transform: `translateX(${swipeOffset}px)`,transition:swipeOffset > 0- ? "none"- : "transform 160ms ease-out",+ ? "border-radius 180ms ease-out"+ : "transform 160ms ease-out, border-radius 180ms ease-out",+ "@media (prefers-reduced-motion: reduce)": {+ transition: "none",+ },userSelect: "none",WebkitTouchCallout: "none",WebkitUserSelect: "none",@@ -1784,27 +1773,37 @@ const MessageBubble: React.FC<{? pokeText: message.text}</Box>- {!isUnavailable && message.liked && (+ {!isUnavailable && message.reaction && (<Boxcomponent="span"role="img"- aria-label="Liked"+ aria-label={`Reaction: ${emojiName(message.reaction)}`}sx={{alignItems: "center",- bottom: -5,+ bottom: -16,+ bgcolor: spaceDialogBackground,+ border: `2px solid ${spaceAppBackgroundColor}`,+ borderRadius: "12px",+ fontFamily:+ '"Apple Color Emoji", "Segoe UI Emoji", "Noto Color Emoji", sans-serif',+ fontSize: 14,+ minHeight: 24,+ minWidth: 28,+ pt: "2px",+ px: "3px",color: green,display: "inline-flex",justifyContent: "center",- lineHeight: 0,+ lineHeight: 1,pointerEvents: "none",position: "absolute",zIndex: 2,...(isOwn- ? { left: -2 }- : { right: -2 }),+ ? { right: 14 }+ : { left: 14 }),}}>- <MessageLikeHeartIcon />+ {message.reaction}</Box>)}</Box>@@ -1839,7 +1838,7 @@ export const MessagesScreen: React.FC<MessagesScreenProps> = ({onReplyToMessage,onSendPoke,onSendMessage,- onSetMessageLiked,+ onSetMessageReaction,profile,profileLink,selectedFriend,@@ -1848,6 +1847,9 @@ export const MessagesScreen: React.FC<MessagesScreenProps> = ({const [messageText, setMessageText] = React.useState("");const [messageContextMenu, setMessageContextMenu] =React.useState<MessageContextMenuState | null>(null);+ const [reactionPickerMessage, setReactionPickerMessage] =+ React.useState<MessageContextMenuState | null>(null);+ const [reactionError, setReactionError] = React.useState(false);const [replyingTo, setReplyingTo] = React.useState<SpaceMessage | null>(null,);@@ -1979,9 +1981,6 @@ export const MessagesScreen: React.FC<MessagesScreenProps> = ({() => new Map(messages.map((message) => [message.id, message])),[messages],);- const isContextMessageLiked = Boolean(- messageContextMenu?.message.viewerLiked,- );const isContextMessageOwn = Boolean(messageContextMenu?.message &&isCurrentProfileMessage(messageContextMenu.message, profile),@@ -2098,9 +2097,27 @@ export const MessagesScreen: React.FC<MessagesScreenProps> = ({composerRef.current?.focus();};- const handleMessageAction = (- action: "copy" | "delete" | "like" | "reply",- ) => {+ const reactToMessage = (message: SpaceMessage, emoji: string) => {+ if (!canInteract || isCurrentProfileMessage(message, profile)) return;+ closeMessageActions();+ setReactionError(false);+ const current = messageByID.get(message.id) ?? message;+ const reaction = current.reaction == emoji ? undefined : emoji;+ void onSetMessageReaction(message.id, reaction)+ .then(() => {+ setActionStatus(+ reaction+ ? `Reacted with ${emojiName(reaction)}`+ : "Reaction removed",+ );+ })+ .catch((error: unknown) => {+ log.error("Failed to update message reaction", error);+ setReactionError(true);+ });+ };++ const handleMessageAction = (action: "copy" | "delete" | "reply") => {const targetMessage = messageContextMenu?.message;if (!targetMessage) return;if (!canInteract && action != "copy") {@@ -2116,16 +2133,6 @@ export const MessagesScreen: React.FC<MessagesScreenProps> = ({log.error("Failed to copy message", error),);break;- case "like":- closeMessageActions();- if (isCurrentProfileMessage(targetMessage, profile)) return;- void onSetMessageLiked(- targetMessage.id,- !targetMessage.viewerLiked,- ).catch((error: unknown) =>- log.error("Failed to update message like", error),- );- break;case "reply":startReply(targetMessage);break;@@ -2212,6 +2219,8 @@ export const MessagesScreen: React.FC<MessagesScreenProps> = ({React.useEffect(() => {setReplyingTo(null);setMessageContextMenu(null);+ setReactionPickerMessage(null);+ setReactionError(false);setMessageText("");stickToThreadBottomRef.current = true;smoothNextMessageScrollRef.current = false;@@ -2276,14 +2285,6 @@ export const MessagesScreen: React.FC<MessagesScreenProps> = ({);const messageActionMenuItems = [- !isContextMessagePoke && canInteract && !isContextMessageOwn ? (- <MessageActionMenuItem- key="like"- icon={<HeartIcon small />}- label={isContextMessageLiked ? "Unlike" : "Like"}- onClick={() => handleMessageAction("like")}- />- ) : null,!isContextMessagePoke && canInteract ? (<MessageActionMenuItemkey="reply"@@ -2314,6 +2315,37 @@ export const MessagesScreen: React.FC<MessagesScreenProps> = ({return (<><SpaceLiveStatus>{actionStatus}</SpaceLiveStatus>+ {reactionPickerMessage && (+ <MessageReactionPicker+ selected={+ messageByID.get(reactionPickerMessage.message.id)+ ?.reaction+ }+ onSelect={(emoji) =>+ reactToMessage(reactionPickerMessage.message, emoji)+ }+ onClose={() => {+ reactionPickerMessage.anchorEl.focus();+ setReactionPickerMessage(null);+ }}+ />+ )}+ {reactionError && (+ <SpaceActionToast+ animateEntrance+ closeLabel="Dismiss reaction error"+ icon={+ <HugeiconsIcon+ icon={Cancel01Icon}+ size={20}+ color={dangerColor}+ />+ }+ message="Couldnโt update your reaction. Try again."+ onClose={() => setReactionError(false)}+ zIndex={1600}+ />+ )}<SpacePostPhotoInputinputRef={postPhotoInputRef}onSelect={onPostPhotoSelect}@@ -2722,9 +2754,47 @@ export const MessagesScreen: React.FC<MessagesScreenProps> = ({</Box><PopperanchorEl={messageContextMenu?.anchorEl ?? null}- modifiers={messageActionsPopperModifiers}+ modifiers={[+ {+ name: "offset",+ options: {+ offset: [+ 0,+ messageContextMenu?.message+ .reaction+ ? 24+ : 8,+ ],+ },+ },+ {+ name: "preventOverflow",+ options: {+ altAxis: true,+ boundary: threadScrollRef.current,+ padding: 8,+ },+ },+ {+ name: "flip",+ options: {+ boundary: threadScrollRef.current,+ padding: 8,+ fallbackPlacements: [+ isContextMessageOwn+ ? "top-end"+ : "top-start",+ ],+ flipVariations: false,+ },+ },+ ]}open={Boolean(messageContextMenu?.open)}- placement="bottom-end"+ placement={+ isContextMessageOwn+ ? "bottom-end"+ : "bottom-start"+ }sx={{ outline: 0, zIndex: 1300 }}transition>@@ -2739,10 +2809,15 @@ export const MessagesScreen: React.FC<MessagesScreenProps> = ({<Grow{...(TransitionProps ?? {})}style={{- transformOrigin:+ transformOrigin: `${+ placement.endsWith("end")+ ? "right"+ : "left"+ } ${placement.startsWith("top")- ? "right bottom"- : "right top",+ ? "bottom"+ : "top"+ }`,}}onExited={() => {TransitionProps?.onExited();@@ -2753,28 +2828,68 @@ export const MessagesScreen: React.FC<MessagesScreenProps> = ({}><Box+ onKeyDown={(+ event: React.KeyboardEvent<HTMLElement>,+ ) => {+ if (event.key == "Escape") {+ closeMessageActions();+ messageContextMenu?.anchorEl.focus();+ }+ }}sx={{WebkitTapHighlightColor:"transparent",- bgcolor:- spaceDialogBackground,- borderRadius: "16px",- boxShadow:- "0 14px 40px rgba(0, 0, 0, 0.14)",- minWidth: 132,+ display: "flex",+ flexDirection: "column",+ gap: "4px",outline: 0,- p: "4px",}}>+ {!isContextMessagePoke &&+ canInteract &&+ !isContextMessageOwn &&+ messageContextMenu && (+ <MessageQuickReactions+ selected={+ messageContextMenu+ .message+ .reaction+ }+ onSelect={(emoji) =>+ reactToMessage(+ messageContextMenu.message,+ emoji,+ )+ }+ onMore={() => {+ setReactionPickerMessage(+ messageContextMenu,+ );+ closeMessageActions();+ }}+ />+ )}<MenuListaria-label="Message actions"- autoFocus+ autoFocus={+ isContextMessagePoke ||+ !canInteract ||+ isContextMessageOwn+ }onKeyDown={handleMessageActionsKeyDown}sx={{+ alignSelf: "flex-start",+ bgcolor:+ spaceMenuBackground,+ borderRadius: "16px",+ boxShadow:+ "0 0 0 1px rgba(255, 255, 255, 0.08), 0 8px 24px rgba(0, 0, 0, 0.32)",+ minWidth: 132,outline: 0,- p: 0,+ p: "4px",+ width: "max-content","&:focus": {outline: 0,},diff --git a/web/apps/space/src/services/space.ts b/web/apps/space/src/services/space.tsindex 3291a0b257..a4dc8b2946 100644--- a/web/apps/space/src/services/space.ts+++ b/web/apps/space/src/services/space.ts@@ -149,6 +149,7 @@ export interface SpaceMessage {isDeleted: boolean;kind: SpaceMessageKind;liked: boolean;+ reaction?: string;quote?: SpaceMessageQuote;recipient: FriendProfile;replyMessageId?: string;@@ -174,6 +175,7 @@ export interface SpaceMessageActivity {post?: SpaceMessageActivityPost;text?: string;type: SpaceMessageActivityType;+ reaction?: string;isUnavailable?: boolean;}@@ -689,6 +691,7 @@ const messageFromSpaceMessage = async (isUnavailable: message.isUnavailable,kind: message.kind,liked: message.liked,+ reaction: message.reaction ?? undefined,quote,recipient,replyMessageId: message.replyMessageId,@@ -750,6 +753,7 @@ const messageActivityFromSpaceActivity = (post,text: activity.text?.trim() || undefined,type: activity.type,+ reaction: activity.reaction ?? undefined,isUnavailable: activity.isUnavailable,};};@@ -1255,14 +1259,20 @@ export const replyToCurrentMessage = async (}};-export const setCurrentMessageLiked = async (+export const setCurrentMessageReaction = async (spaceId: string,+ senderSpaceId: string,messageId: string,- liked: boolean,+ emoji: string | undefined,) => {const ctx = await ensureCurrentSpaceContext();try {- await ctx.likeMessage(spaceId, messageId, liked);+ await ctx.setMessageReaction(+ spaceId,+ senderSpaceId,+ messageId,+ emoji ?? null,+ );} finally {releaseCurrentSpaceContext(ctx);}diff --git a/web/apps/space/src/styles/colors.ts b/web/apps/space/src/styles/colors.tsindex 142531ce2a..1139e6fd13 100644--- a/web/apps/space/src/styles/colors.ts+++ b/web/apps/space/src/styles/colors.ts@@ -7,6 +7,8 @@ export const spaceSurface = "#28282B";export const spaceSurfaceHover = "#3A3A3A";export const spaceControlBackground = "#343434";export const spaceControlBackgroundHover = "#3E3E3E";+export const spaceMenuBackground = "#424242";+export const spaceMenuHover = "#505050";export const spaceText = "#F2F2F2";export const spaceTextMuted = "#B0B0B0";export const spaceOnAccent = "#FFFFFF";diff --git a/web/apps/space/tests/emoji-picker.test.ts b/web/apps/space/tests/emoji-picker.test.tsnew file mode 100644index 0000000000..6bedbb1535--- /dev/null+++ b/web/apps/space/tests/emoji-picker.test.ts@@ -0,0 +1,104 @@+import { describe, expect, test } from "vitest";+import {+ emojiName,+ emojiWithSkinTone,+ quickReactionEmojis,+ searchEmojis,+ spaceEmojis,+} from "../src/data/emojis";++describe("quick reactions", () => {+ test("keeps the defaults when no reaction is selected", () => {+ expect(quickReactionEmojis()).toEqual([+ "โค๏ธ",+ "๐",+ "๐ฎ",+ "๐ข",+ "๐",+ "๐",+ ]);+ });++ test.each(["โค๏ธ", "๐", "๐ฎ", "๐ข", "๐", "๐"])(+ "keeps selected default %s in its usual slot",+ (selected) => {+ expect(quickReactionEmojis(selected)).toEqual([+ "โค๏ธ",+ "๐",+ "๐ฎ",+ "๐ข",+ "๐",+ "๐",+ ]);+ },+ );++ test.each(["๐ฅ", "๐ชฟ"])(+ "includes a selected %s outside the defaults",+ (selected) => {+ expect(quickReactionEmojis(selected)).toEqual([+ "โค๏ธ",+ "๐",+ "๐ฎ",+ "๐ข",+ "๐",+ selected,+ ]);+ },+ );++ test("preserves skin tones and the selected variant's usual slot", () => {+ expect(quickReactionEmojis("๐๐ฝ")).toEqual([+ "โค๏ธ",+ "๐",+ "๐ฎ",+ "๐ข",+ "๐๐ฝ",+ "๐๐ฝ",+ ]);+ });+});++describe("emoji search", () => {+ test("finds aliases, multiple words and literal toned emoji", () => {+ expect(+ searchEmojis(spaceEmojis, " LOL ").map((item) => item.emoji),+ ).toContain("๐");+ expect(+ searchEmojis(spaceEmojis, "blue heart").map((item) => item.emoji),+ ).toEqual(["๐", "๐ฉต"]);+ expect(+ searchEmojis(spaceEmojis, "๐๐ฝ").map((item) => item.emoji),+ ).toEqual(["๐"]);+ expect(searchEmojis(spaceEmojis, "no-such-emoji")).toEqual([]);+ });++ test("inserts tones before joined professions and drops the text selector", () => {+ const peace = spaceEmojis.find((entry) => entry.emoji == "โ๏ธ")!;+ const developer = spaceEmojis.find((entry) => entry.emoji == "๐งโ๐ป")!;+ expect(emojiWithSkinTone(peace, "๐ฝ")).toBe("โ๐ฝ");+ expect(emojiWithSkinTone(developer, "๐ฟ")).toBe("๐ง๐ฟโ๐ป");+ expect(emojiName("๐ง๐ฟโ๐ป")).toBe("Developer");+ expect(+ emojiWithSkinTone(+ spaceEmojis.find((entry) => entry.emoji == "โค๏ธ")!,+ "๐ฝ",+ ),+ ).toBe("โค๏ธ");+ });++ test("catalog entries and all tone variants contain a single grapheme", () => {+ const segmenter = new Intl.Segmenter("en", { granularity: "grapheme" });+ expect(new Set(spaceEmojis.map((entry) => entry.emoji)).size).toBe(+ spaceEmojis.length,+ );+ for (const entry of spaceEmojis) {+ for (const tone of ["", "๐ป", "๐ผ", "๐ฝ", "๐พ", "๐ฟ"]) {+ expect(+ [...segmenter.segment(emojiWithSkinTone(entry, tone))],+ entry.name,+ ).toHaveLength(1);+ }+ }+ });+});