Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

fix(mobile): align group attachments with message authors

zqchris786b2e0def13
diff --git a/apps/mobile/src/__tests__/BotGroupChatScreen.test.tsx b/apps/mobile/src/__tests__/BotGroupChatScreen.test.tsx
index 4a0a560662..72c8309db6 100644
--- a/apps/mobile/src/__tests__/BotGroupChatScreen.test.tsx
+++ b/apps/mobile/src/__tests__/BotGroupChatScreen.test.tsx
@@ -773,6 +773,18 @@ describe('offline computer', () => {
describe('direct server group presentation', () => {
+ it.each([true, false])('aligns attachments with their message author (server=%s)', async (server) => {
+ h.chat = { ...h.chat, server, ...(server ? { media: vi.fn() } : {}) };
+ const attachment = { id: 'media', name: 'brief.pdf', mimeType: 'application/pdf', size: 10, category: 'pdf' as const, url: null, path: null };
+ await render(group({ messages: [
+ message('mine', 1, { authorKind: 'user', isSelf: true, attachments: [attachment] }),
+ message('other', 2, { authorKind: 'user', isSelf: false, authorName: 'Other member', attachments: [attachment] }),
+ message('bot', 3, { authorBotId: 'mimi', authorName: '咪咪', attachments: [attachment] }),
+ ], plans: [], openPlan: null }));
+ expect(all('botGroup.message.user')).toHaveLength(1);
+ expect(all('botGroup.message.bot')).toHaveLength(2);
+ expect(all('attachmentStrip').map(strip => strip.getAttribute('data-align'))).toEqual(['right', 'left', 'left']);
+ });
it('uses server failure copy, keeps other humans incoming and loads older history', async () => {
h.chat = { ...h.chat, server: true, online: false, loadOlder: vi.fn(async () => {}) };
await render(null, 'error');
diff --git a/apps/mobile/src/__tests__/BotGroupMessageAttachments.test.tsx b/apps/mobile/src/__tests__/BotGroupMessageAttachments.test.tsx
index 5270b3d7d0..be7c3d63f0 100644
--- a/apps/mobile/src/__tests__/BotGroupMessageAttachments.test.tsx
+++ b/apps/mobile/src/__tests__/BotGroupMessageAttachments.test.tsx
@@ -98,6 +98,7 @@ async function renderAttachment(messageId: string) {
root = createRoot(host);
await act(async () => root!.render(createElement(BotGroupMessageAttachments, {
messageId,
+ align: 'right',
attachments: [{ id: 'attachment', size: 10, path: null, category: 'image', name: 'group-picture.png', url: imageUrl, mimeType: 'image/png' }],
onResolveRemoteMedia: resolveMedia,
})));
diff --git a/apps/mobile/src/session/BotGroupChatScreen.tsx b/apps/mobile/src/session/BotGroupChatScreen.tsx
index 6f3f1e7fa2..1aba12611a 100644
--- a/apps/mobile/src/session/BotGroupChatScreen.tsx
+++ b/apps/mobile/src/session/BotGroupChatScreen.tsx
@@ -468,7 +468,7 @@ function BotGroupTimelineItem({
return <View style={styles.userRow} testID="botGroup.message.user">
<View style={styles.userColumn}>
{attachments.length > 0
- ? <BotGroupMessageAttachments messageId={message.id} attachments={attachments} onResolveRemoteMedia={resolveMedia} resolveServerMedia={resolveServerMedia} />
+ ? <BotGroupMessageAttachments messageId={message.id} attachments={attachments} align="right" onResolveRemoteMedia={resolveMedia} resolveServerMedia={resolveServerMedia} />
: null}
{bubble ? <View style={[styles.userBubble, compact && styles.userBubbleCompact]} testID="botGroup.message.userBubble">
<BotGroupUserText content={message.content} mentionLabels={mentionLabels} />
@@ -493,7 +493,7 @@ function BotGroupTimelineItem({
actionable={planActionable} reassignable={planReassignable} pending={planPending}
onStart={() => onPlanAction('start')} onDismiss={() => onPlanAction('dismiss')} onEditStep={onEditStep} />
: <>
- {message.attachments?.length ? <BotGroupMessageAttachments messageId={message.id} attachments={message.attachments} onResolveRemoteMedia={resolveMedia} resolveServerMedia={resolveServerMedia} /> : null}
+ {message.attachments?.length ? <BotGroupMessageAttachments messageId={message.id} attachments={message.attachments} align="left" onResolveRemoteMedia={resolveMedia} resolveServerMedia={resolveServerMedia} /> : null}
{message.content.trim() ? <BotGroupMarkdownText content={message.content} /> : null}
<BotGroupHandoffFiles files={message.files} />
</>}
diff --git a/apps/mobile/src/session/BotGroupMessageAttachments.tsx b/apps/mobile/src/session/BotGroupMessageAttachments.tsx
index 7053e03ddd..45327a5a8c 100644
--- a/apps/mobile/src/session/BotGroupMessageAttachments.tsx
+++ b/apps/mobile/src/session/BotGroupMessageAttachments.tsx
@@ -37,9 +37,10 @@ export function botGroupAttachmentGallery(messageId: string, attachments: readon
});
}
-export function BotGroupMessageAttachments({ messageId, attachments, onResolveRemoteMedia, resolveServerMedia }: {
+export function BotGroupMessageAttachments({ messageId, attachments, align, onResolveRemoteMedia, resolveServerMedia }: {
messageId: string;
attachments: readonly BotGroupAttachment[];
+ align: 'left' | 'right';
onResolveRemoteMedia: ResolveRemoteMediaFn;
resolveServerMedia?: (id: string) => Promise<BotGroupAttachment>;
}) {
@@ -49,7 +50,7 @@ export function BotGroupMessageAttachments({ messageId, attachments, onResolveRe
const items = useMemo(() => attachments.map(botGroupAttachmentForDisplay), [attachments]);
const gallery = useMemo(() => botGroupAttachmentGallery(messageId, items), [items, messageId]);
const [openUrl, setOpenUrl] = useState<string | null>(null);
- if (resolveServerMedia) return <ServerAttachments attachments={attachments} resolve={resolveServerMedia} />;
+ if (resolveServerMedia) return <ServerAttachments attachments={attachments} align={align} resolve={resolveServerMedia} />;
const open = (payload: MessagePayload) => {
if (payload.kind === 'media' && payload.media.kind === 'image') {
setOpenUrl(payload.media.url);
@@ -58,7 +59,7 @@ export function BotGroupMessageAttachments({ messageId, attachments, onResolveRe
Alert.alert(payload.kind === 'file' ? payload.title : '', t('groupChat.files.onComputer'));
};
return <>
- <AttachmentStrip attachments={items} messageKey={messageId} align="right" layout={layout} onOpen={open}
+ <AttachmentStrip attachments={items} messageKey={messageId} align={align} layout={layout} onOpen={open}
onResolveRemoteMedia={onResolveRemoteMedia} usePreviewState={useState} />
{openUrl ? <ImageLightbox images={gallery} initialUrl={openUrl} onClose={() => setOpenUrl(null)}
onResolveRemoteMedia={onResolveRemoteMedia} /> : null}
@@ -66,7 +67,8 @@ export function BotGroupMessageAttachments({ messageId, attachments, onResolveRe
}
/** Signed download URLs are acquired on tap and kept only in the open viewer. */
-function ServerAttachments({ attachments, resolve }: {
+function ServerAttachments({ attachments, align, resolve }: {
+ align: 'left' | 'right';
attachments: readonly BotGroupAttachment[]; resolve(id: string): Promise<BotGroupAttachment>;
}) {
const { t } = useTranslation();
@@ -93,7 +95,7 @@ function ServerAttachments({ attachments, resolve }: {
return <>
{attachments.map(attachment => <View key={attachment.id}>
<AttachmentStrip attachments={[{ kind: 'file', name: attachment.name, previewable: false }]}
- messageKey={attachment.id} align="right" layout={layout} onOpen={() => { void open(attachment.id); }} usePreviewState={useState} />
+ messageKey={attachment.id} align={align} layout={layout} onOpen={() => { void open(attachment.id); }} usePreviewState={useState} />
{busy === attachment.id ? <ActivityIndicator color={colors.textSecondary} /> : null}
</View>)}
{image?.url ? <ImageLightbox images={botGroupAttachmentGallery(image.id, [botGroupAttachmentForDisplay(image)])}