Andreas/LibreChat
1
0
Fork 0
mirror of https://github.com/danny-avila/LibreChat.git synced 2025-12-23 11:50:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🌿 fix: forking a long conversation breaks chat structure (#4778)

Browse source 
* fix: branching and forking sometimes break conversation structure

* fix test for forking.

* chore: message type issues

* test: add conversation structure tests for message handling

---------

Co-authored-by: xyqyear <xyqyear@gmail.com>
This commit is contained in:
Danny Avila 2024-11-22 16:10:59 -05:00 • committed by GitHub
parent 7d5be68747
commit c87a51eaab
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 248 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
client/src/components/Chat/Messages/SearchMessage.tsx
View file

@ -24,10 +24,10 @@ export default function Message({ message }: Pick<TMessageProps, 'message'>) {
let messageLabel = '';
if (isCreatedByUser) {
messageLabel = UsernameDisplay
? (user?.name ?? '') || user?.username
? (user?.name ?? '') || (user?.username ?? '')
: localize('com_user_message');
} else {
messageLabel = message.sender;
messageLabel = message.sender || '';
}
return (

15
client/src/components/Share/Message.tsx
View file

@ -28,13 +28,20 @@ export default function Message(props: TMessageProps) {
return null;
}
const { text, children, messageId = null, isCreatedByUser, error, unfinished } = message ?? {};
const {
text = '',
children,
messageId = null,
isCreatedByUser = true,
error = false,
unfinished = false,
} = message;
let messageLabel = '';
if (isCreatedByUser) {
messageLabel = 'anonymous';
} else {
messageLabel = message.sender;
messageLabel = message.sender || '';
}
return (
@ -67,12 +74,12 @@ export default function Message(props: TMessageProps) {
error={error}
isLast={false}
ask={() => ({})}
text={text ?? ''}
text={text}
message={message}
isSubmitting={false}
enterEdit={() => ({})}
unfinished={!!unfinished}
isCreatedByUser={isCreatedByUser ?? true}
isCreatedByUser={isCreatedByUser}
siblingIdx={siblingIdx ?? 0}
setSiblingIdx={setSiblingIdx ?? (() => ({}))}
/>

4
client/src/hooks/Conversations/useExportConversation.ts
View file

@ -67,11 +67,11 @@ export default function useExportConversation({
};
if (!message.content) {
return formatText(message.sender, message.text);
return formatText(message.sender || '', message.text);
}
return message.content
.map((content) => getMessageContent(message.sender, content))
.map((content) => getMessageContent(message.sender || '', content))
.map((text) => {
return formatText(text[0], text[1]);
})