mirror of
https://github.com/SableClient/Sable.git
synced 2026-11-20 09:01:17 -08:00
added encrypted room support
This commit is contained in:
1 parent
e933a456e8
commit
b09709deb6
2 files changed
+5
-8
No files matched your search
@@ -123,7 +123,7 @@ export const EventHistory = as<'div', EventHistoryProps>(
|
||||
<Box className={css.Content} direction="Column">
|
||||
{mEvents.map((mEvent) => {
|
||||
if (!mEvent.event.sender) return <div />;
|
||||
|
||||
const EventContent = mEvent.getOriginalContent();
|
||||
return (
|
||||
<Box className={css.EventItem}>
|
||||
<Time
|
||||
@@ -133,14 +133,10 @@ export const EventHistory = as<'div', EventHistoryProps>(
|
||||
/>
|
||||
<Text size="T400" style={{ paddingLeft: '10px', wordBreak: 'break-word' }}>
|
||||
<RenderBody
|
||||
body={
|
||||
mEvent?.event?.content?.['m.new_content']?.body ??
|
||||
mEvent.event?.content?.body ??
|
||||
''
|
||||
}
|
||||
body={EventContent?.['m.new_content']?.body ?? EventContent?.body ?? ''}
|
||||
customBody={
|
||||
mEvent?.event?.content?.['m.new_content']?.formatted_body ??
|
||||
mEvent.event?.content?.formatted_body ??
|
||||
EventContent?.['m.new_content']?.formatted_body ??
|
||||
EventContent?.formatted_body ??
|
||||
''
|
||||
}
|
||||
htmlReactParserOptions={htmlReactParserOptions}
|
||||
|
||||
@@ -50,6 +50,7 @@ export function MessageEditHistoryInternal({
|
||||
evtTimeline &&
|
||||
getEventEdits(evtTimeline.getTimelineSet(), evtId, mEvent.getType())?.getRelations();
|
||||
if (!edits) return [mEvent];
|
||||
edits.sort((a, b) => a.getTs() - b.getTs());
|
||||
return [mEvent, ...edits];
|
||||
};
|
||||
|
||||
|
||||
Reference in new issue
Block a user