feat: Trim whitespace from message bodies and enhance emoji usage integration

This commit is contained in:
2026-05-13 05:17:23 +10:00
parent 38a43a3a99
commit aaf8089ba6
5 changed files with 50 additions and 4 deletions

View File

@@ -54,6 +54,7 @@ import {
import { EmojiBoardTab, EmojiType } from './types';
import { VirtualTile } from '../virtualizer';
const MOST_USED_GROUP_ID = 'most_used_group';
const RECENT_GROUP_ID = 'recent_group';
const SEARCH_GROUP_ID = 'search_group';
@@ -73,6 +74,7 @@ const useGroups = (
imagePacks: ImagePack[]
): [EmojiGroupItem[], StickerGroupItem[]] => {
const mx = useMatrixClient();
const { getTopEmojis } = useEmojiUsage();
const recentEmojis = useRecentEmoji(mx, 21);
const labels = useEmojiGroupLabels();
@@ -81,6 +83,22 @@ const useGroups = (
const g: EmojiGroupItem[] = [];
if (tab !== EmojiBoardTab.Emoji) return g;
// Add most-used emojis
const topShortcodes = getTopEmojis(21);
if (topShortcodes.length > 0) {
const mostUsedEmojis = topShortcodes
.map((shortcode) => emojis.find((e) => e.shortcode === shortcode))
.filter((e): e is IEmoji => e !== undefined);
if (mostUsedEmojis.length > 0) {
g.push({
id: MOST_USED_GROUP_ID,
name: 'Most Used',
items: mostUsedEmojis,
});
}
}
g.push({
id: RECENT_GROUP_ID,
name: 'Recent',
@@ -187,6 +205,13 @@ function EmojiSidebar({ activeGroupAtom, packs, onScrollToGroup }: EmojiSidebarP
return (
<Sidebar>
<SidebarStack>
<GroupIcon
active={activeGroupId === MOST_USED_GROUP_ID}
id={MOST_USED_GROUP_ID}
label="Most Used"
icon={Icons.Heart}
onClick={handleScrollToGroup}
/>
<GroupIcon
active={activeGroupId === RECENT_GROUP_ID}
id={RECENT_GROUP_ID}

View File

@@ -80,7 +80,7 @@ export function MText({ edited, content, renderBody, renderUrlsPreview, style }:
const { body, formatted_body: customBody } = content;
if (typeof body !== 'string') return <BrokenContent />;
const trimmedBody = trimReplyFromBody(body);
const trimmedBody = trimReplyFromBody(body).trim();
const urlsMatch = renderUrlsPreview && trimmedBody.match(URL_REG);
const urls = urlsMatch ? [...new Set(urlsMatch)] : undefined;

View File

@@ -407,8 +407,8 @@ export const RoomInput = forwardRef<HTMLDivElement, RoomInputProps>(
if (plainText === '') return;
let body = plainText;
let formattedBody = customHtml;
let body = plainText.trim();
let formattedBody = customHtml.trim();
// Apply emoticon conversion if enabled
if (autoConvertEmoticons) {

View File

@@ -71,6 +71,8 @@ import { ReactionViewer } from '../reaction-viewer';
import { MessageEditor } from './MessageEditor';
import { UserAvatar } from '../../../components/user-avatar';
import { copyToClipboard } from '../../../utils/dom';
import { useEmojiUsage } from '../../../hooks/useEmojiUsage';
import { emojis } from '../../../plugins/emoji';
import { stopPropagation } from '../../../utils/keyboard';
import { getMatrixToRoomEvent } from '../../../plugins/matrix-to';
import { getViaServers } from '../../../plugins/via-servers';
@@ -774,6 +776,7 @@ export const Message = as<'div', MessageProps>(
const useAuthentication = useMediaAuthentication();
const senderId = mEvent.getSender() ?? '';
const senderPresence = useUserPresence(senderId);
const { getMostUsedEmoji } = useEmojiUsage();
const [hover, setHover] = useState(false);
const { hoverProps } = useHover({ onHoverChange: setHover });
@@ -975,6 +978,24 @@ export const Message = as<'div', MessageProps>(
<div className={css.MessageOptionsBase}>
<Menu className={css.MessageOptionsBar} variant="SurfaceVariant">
<Box gap="100">
{canSendReaction && (() => {
const mostUsedShortcode = getMostUsedEmoji();
const mostUsedEmoji = mostUsedShortcode
? emojis.find((e) => e.shortcode === mostUsedShortcode)
: null;
return mostUsedEmoji ? (
<IconButton
onClick={() => onReactionToggle(mEvent.getId()!, mostUsedEmoji.unicode)}
variant="SurfaceVariant"
size="300"
radii="300"
title={`Quick react with ${mostUsedEmoji.unicode}`}
>
<Text size="T300">{mostUsedEmoji.unicode}</Text>
</IconButton>
) : null;
})()}
{canSendReaction && (
<PopOut
position="Bottom"

View File

@@ -344,7 +344,7 @@ async function sendMessage(matrixClient: any, roomId: string, message: string) {
const content = {
msgtype: 'm.text',
body: message,
body: message.trim(),
};
const result = await matrixClient.sendMessage(roomId, content);