Merge remote-tracking branch 'upstream/dev' into feat/thread-enhancements

Just-Insane · Just-Insane · commit 29282cb167c8 · 2026-03-27T22:22:00.000-04:00
# Conflicts:
#	src/app/hooks/timeline/useTimelineEventRenderer.tsx
diff --git a/.changeset/add_ability_to_click_on_usernames_in_member_and_state_events_to_view_user_info.md b/.changeset/add_ability_to_click_on_usernames_in_member_and_state_events_to_view_user_info.md
@@ -0,0 +1,5 @@
+---
+default: minor
+---
+
+# Add ability to click on usernames in member and state events to view user info
diff --git a/.changeset/adds_a_html_command_to_send_html_messages.md b/.changeset/adds_a_html_command_to_send_html_messages.md
@@ -0,0 +1,5 @@
+---
+default: minor
+---
+
+# Adds a `/html` command to send HTML messages
diff --git a/.changeset/feat-msc4440-bio-compat.md b/.changeset/feat-msc4440-bio-compat.md
@@ -0,0 +1,5 @@
+---
+default: note
+---
+
+new/changed bios will now also be saved in the format MSC4440 expects
diff --git a/.changeset/fix_confusing_ui_with_client_side_embeds_setting.md b/.changeset/fix_confusing_ui_with_client_side_embeds_setting.md
@@ -0,0 +1,5 @@
+---
+default: patch
+---
+
+# Fix confusing ui with `Client Side Embeds in Encrypted Rooms` setting
diff --git a/.changeset/fix_forwarding_relations.md b/.changeset/fix_forwarding_relations.md
@@ -0,0 +1,5 @@
+---
+default: patch
+---
+
+fix forwarding issue for users on synapse homeservers, by removing the relation
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/app/components/message/modals/MessageForward.tsx b/src/app/components/message/modals/MessageForward.tsx
@@ -224,6 +224,8 @@ export function MessageForwardInternal({
         }
       : {};
     const baseContent = { ...mEvent.getContent() };
+    delete baseContent['m.relates_to']; // remove relations from the forwarded message
+    delete baseContent['m.mentions']; // remove mentions from forwarded message
     delete baseContent['com.beeper.per_message_profile']; // remove per-message profile as that could confuse clients in the target room
     let content;
     // handle privacy stuff
@@ -232,8 +234,6 @@ export function MessageForwardInternal({
       // we can still include the original message content in the body of the message, so we'll just use a fallback text/plain content with the original message body
       content = {
         ...baseContent,
-        'm.relates_to': null, // remove any relations to avoid confusion in the target room
-        'm.mentions': null, // remove mentions to avoid leaking information about users in the original room
         ...forwardedTextContent,
         'moe.sable.message.forward': {
           v: 1,
@@ -249,10 +249,6 @@ export function MessageForwardInternal({
       content = {
         ...baseContent,
         ...forwardedTextContent,
-        'm.relates_to': {
-          rel_type: 'm.reference',
-          event_id: eventId,
-        },
         'moe.sable.message.forward': {
           v: 1,
           is_forwarded: true,
diff --git a/src/app/features/room/RoomTimeline.tsx b/src/app/features/room/RoomTimeline.tsx
@@ -150,7 +150,7 @@ export function RoomTimeline({
 
   const showUrlPreview = room.hasEncryptionStateEvent() ? encUrlPreview : urlPreview;
   const showClientUrlPreview = room.hasEncryptionStateEvent()
-    ? encClientUrlPreview
+    ? clientUrlPreview && encClientUrlPreview
     : clientUrlPreview;
 
   const nicknames = useAtomValue(nicknamesAtom);
diff --git a/src/app/features/settings/account/BioEditor.tsx b/src/app/features/settings/account/BioEditor.tsx
@@ -44,7 +44,7 @@ type BioEditorProps = {
   value?: string | any;
   isSaving?: boolean;
   imagePackRooms?: any[];
-  onSave: (htmlContent: string) => void;
+  onSave: (htmlContent: string, plainText: string) => void;
 };
 
 const BIO_LIMIT = 1024;
@@ -81,7 +81,7 @@ export function BioEditor({ value, isSaving, imagePackRooms, onSave }: BioEditor
       })
     );
 
-    onSave(customHtml || plainText);
+    onSave(customHtml || plainText, plainText);
     setHasChanged(false);
   }, [editor, isMarkdown, onSave]);
 
diff --git a/src/app/features/settings/account/Profile.tsx b/src/app/features/settings/account/Profile.tsx
@@ -29,7 +29,7 @@ import { useSetAtom } from 'jotai';
 import { SequenceCard } from '$components/sequence-card';
 import { SettingTile } from '$components/setting-tile';
 import { useMatrixClient } from '$hooks/useMatrixClient';
-import { UserProfile, useUserProfile } from '$hooks/useUserProfile';
+import { UserProfile, useUserProfile, MSC4440Bio } from '$hooks/useUserProfile';
 import { getMxIdLocalPart, mxcUrlToHttp } from '$utils/matrix';
 import { UserAvatar } from '$components/user-avatar';
 import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
@@ -46,6 +46,7 @@ import { useCapabilities } from '$hooks/useCapabilities';
 import { profilesCacheAtom } from '$state/userRoomProfile';
 import { SequenceCardStyle } from '$features/settings/styles.css';
 import { useUserPresence } from '$hooks/useUserPresence';
+import { MSC1767Text } from '$types/matrix/common';
 import { TimezoneEditor } from './TimezoneEditor';
 import { PronounEditor } from './PronounEditor';
 import { BioEditor } from './BioEditor';
@@ -576,13 +577,27 @@ function ProfileExtended({ profile, userId }: Readonly<ProfileProps>) {
       >
         <BioEditor
           value={
+            (profile.extended?.['gay.fomx.biography'] satisfies MSC4440Bio)?.formatted_body ||
             profile.extended?.['moe.sable.app.bio'] ||
             profile.extended?.['chat.commet.profile_bio'] ||
             profile.bio
           }
-          onSave={(htmlBio) => {
+          onSave={(htmlBio, plainTextBio) => {
             handleSaveField('moe.sable.app.bio', htmlBio);
 
+            // MSC4440
+            handleSaveField('gay.fomx.biography', {
+              'm.text': [
+                {
+                  body: htmlBio,
+                  mimetype: 'text/html',
+                } satisfies MSC1767Text,
+                {
+                  body: plainTextBio,
+                } satisfies MSC1767Text,
+              ],
+            } satisfies MSC4440Bio);
+
             const cleanedHtml = htmlBio.replaceAll('<br/></blockquote>', '</blockquote>');
             handleSaveField('chat.commet.profile_bio', {
               format: 'org.matrix.custom.html',
diff --git a/src/app/hooks/timeline/useTimelineEventRenderer.tsx b/src/app/hooks/timeline/useTimelineEventRenderer.tsx
@@ -1,4 +1,4 @@
-import { MouseEventHandler, useEffect, useMemo, useState } from 'react';
+import { MouseEventHandler, useCallback, useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useAtomValue } from 'jotai';
 import {
@@ -23,6 +23,7 @@ import { useMemberEventParser } from '$hooks/useMemberEventParser';
 import { useMatrixClient } from '$hooks/useMatrixClient';
 import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
 import { useMatrixEventRenderer } from '$hooks/useMatrixEventRenderer';
+import { useOpenUserRoomProfile } from '$state/hooks/userRoomProfile';
 import {
   EventContent,
   ImageContent,
@@ -62,9 +63,25 @@ import { useSableCosmetics } from '$hooks/useSableCosmetics';
 
 function DecoratedUser({ room, userId, userName }: DecoratedUserProps) {
   const { color, font } = useSableCosmetics(userId, room ?? ({} as Room));
+
+  const openUserRoomProfile = useOpenUserRoomProfile();
+  const handleUserClick: MouseEventHandler = useCallback(
+    (evt) => {
+      evt.preventDefault();
+      evt.stopPropagation();
+      openUserRoomProfile(
+        room.roomId,
+        undefined,
+        userId,
+        evt.currentTarget.getBoundingClientRect()
+      );
+    },
+    [room, userId, openUserRoomProfile]
+  );
+
   return (
-    <Text truncate>
-      <b style={{ color, font }}> {userName ?? userId} </b>
+    <Text as="a" onClick={handleUserClick} truncate>
+      <b style={{ color, font }}>{userName ?? userId} </b>
     </Text>
   );
 }
diff --git a/src/app/hooks/useCommands.ts b/src/app/hooks/useCommands.ts
@@ -252,6 +252,7 @@ export enum Command {
   SetExt = 'setext',
   DelExt = 'delext',
   DiscardSession = 'discardsession',
+  Html = 'html',
   // Cute Events
   Hug = 'hug',
   Cuddle = 'cuddle',
@@ -1323,6 +1324,26 @@ export const useCommands = (mx: MatrixClient, room: Room): CommandRecord => {
           }
         },
       },
+      [Command.Html]: {
+        name: Command.Html,
+        description:
+          'Send a message with HTML content. Example: /html <span data-mx-color="#ff0000">Red</span>',
+        exe: async (payload) => {
+          await mx.sendMessage(room.roomId, {
+            msgtype: MsgType.Text,
+            body: payload
+              .replaceAll('<br>', '\n')
+              .replaceAll('<li>', '\n- ')
+              .replaceAll(
+                /<a(.*?)href="(?<link>(.*?))"(.*?)>(?<text>(.*?))<\/a>/g,
+                '[$<text>]($<link>)'
+              )
+              .replaceAll(/<[^>]*>/g, ''),
+            format: 'org.matrix.custom.html',
+            formatted_body: payload,
+          });
+        },
+      },
       // Sharing E2EE History of a room with a user
       [Command.ShareE2EEHistory]: {
         name: Command.ShareE2EEHistory,
diff --git a/src/app/hooks/useMemberEventParser.tsx b/src/app/hooks/useMemberEventParser.tsx
@@ -1,9 +1,10 @@
-import { ReactNode } from 'react';
+import { MouseEventHandler, useCallback, ReactNode } from 'react';
 import { IconSrc, Icons, Text } from 'folds';
 import { MatrixEvent, Room } from '$types/matrix-sdk';
 import { IMemberContent, Membership } from '$types/matrix/room';
 import { getMxIdLocalPart } from '$utils/matrix';
 import { isMembershipChanged } from '$utils/room';
+import { useOpenUserRoomProfile } from '$state/hooks/userRoomProfile';
 import { useSableCosmetics } from './useSableCosmetics';
 import { useMatrixClient } from './useMatrixClient';
 
@@ -17,8 +18,19 @@ function DecoratedUser({ roomId, userId, userName }: DecoratedUserProps) {
   const mx = useMatrixClient();
   const room = mx.getRoom(roomId);
   const { color, font } = useSableCosmetics(userId, room ?? ({} as Room));
+
+  const openUserRoomProfile = useOpenUserRoomProfile();
+  const handleUserClick: MouseEventHandler = useCallback(
+    (evt) => {
+      evt.preventDefault();
+      evt.stopPropagation();
+      openUserRoomProfile(roomId, undefined, userId, evt.currentTarget.getBoundingClientRect());
+    },
+    [roomId, userId, openUserRoomProfile]
+  );
+
   return (
-    <Text truncate>
+    <Text as="a" onClick={handleUserClick} truncate>
       <b style={{ color, font }}>{userName ?? userId} </b>
     </Text>
   );
diff --git a/src/app/hooks/useUserProfile.ts b/src/app/hooks/useUserProfile.ts
@@ -7,10 +7,15 @@ import colorMXID from '$utils/colorMXID';
 import { profilesCacheAtom } from '$state/userRoomProfile';
 import { useSetting } from '$state/hooks/settings';
 import { settingsAtom } from '$state/settings';
+import { MSC1767Text } from '$types/matrix/common';
 import { useMatrixClient } from './useMatrixClient';
 
 const inFlightProfiles = new Map<string, Promise<any>>();
 
+export type MSC4440Bio = {
+  'm.text': Array<MSC1767Text>;
+};
+
 export type UserProfile = {
   avatarUrl?: string;
   displayName?: string;
@@ -35,6 +40,7 @@ const normalizeInfo = (info: any): UserProfile => {
     'm.tz',
     'moe.sable.app.bio',
     'chat.commet.profile_bio',
+    'gay.fomx.biography',
     'chat.commet.profile_banner',
     'chat.commet.profile_status',
     'moe.sable.app.name_color',
@@ -54,7 +60,10 @@ const normalizeInfo = (info: any): UserProfile => {
     displayName: info.displayname,
     pronouns: info['io.fsky.nyx.pronouns'],
     timezone: info['us.cloke.msc4175.tz'] || info['m.tz'],
-    bio: info['moe.sable.app.bio'] || info['chat.commet.profile_bio'],
+    bio:
+      (info['gay.fomx.biography'] satisfies MSC4440Bio)['m.text'][0].body ||
+      info['moe.sable.app.bio'] ||
+      info['chat.commet.profile_bio'],
     status: info['chat.commet.profile_status'],
     bannerUrl: info['chat.commet.profile_banner'],
     nameColor: info['moe.sable.app.name_color'],
diff --git a/src/types/matrix/common.ts b/src/types/matrix/common.ts
@@ -14,6 +14,11 @@ export type IImageInfo = {
   [MATRIX_BLUR_HASH_PROPERTY_NAME]?: string;
 };
 
+export type MSC1767Text = {
+  body: string;
+  mimetype?: string;
+};
+
 export type IVideoInfo = {
   w?: number;
   h?: number;

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +default: minor
 +---
++
 +# Add ability to click on usernames in member and state events to view user info