mirror of
https://github.com/SableClient/Sable.git
synced 2026-11-20 09:01:17 -08:00
4 files changed
+281
-6
No files matched your search
@@ -1,5 +1,5 @@
|
||||
import { memo, useMemo, useCallback } from 'react';
|
||||
import type { IPreviewUrlResponse } from '$types/matrix-sdk';
|
||||
import type { IPreviewUrlResponse, MatrixEvent } from '$types/matrix-sdk';
|
||||
import { MsgType } from '$types/matrix-sdk';
|
||||
import { parseSettingsLink } from '$features/settings/settingsLink';
|
||||
import { useSettingsLinkBaseUrl } from '$features/settings/useSettingsLinkBaseUrl';
|
||||
@@ -45,6 +45,7 @@ import { PdfViewer } from './Pdf-viewer';
|
||||
import { TextViewer } from './text-viewer';
|
||||
import { ClientSideHoverFreeze } from './ClientSideHoverFreeze';
|
||||
import { CuteEventType, MCuteEvent } from './message/MCuteEvent';
|
||||
import { PollEvent } from './message/PollEvent';
|
||||
|
||||
type RenderMessageContentProps = {
|
||||
displayName: string;
|
||||
@@ -61,6 +62,7 @@ type RenderMessageContentProps = {
|
||||
linkifyOpts: Opts;
|
||||
outlineAttachment?: boolean;
|
||||
hideCaption?: boolean;
|
||||
mEvent?: MatrixEvent;
|
||||
};
|
||||
|
||||
const getMediaType = (url: string) => {
|
||||
@@ -92,6 +94,7 @@ function RenderMessageContentInternal({
|
||||
linkifyOpts,
|
||||
outlineAttachment,
|
||||
hideCaption,
|
||||
mEvent,
|
||||
}: RenderMessageContentProps) {
|
||||
const content = useMemo(() => getContent() as Record<string, unknown>, [getContent]);
|
||||
|
||||
@@ -441,7 +444,17 @@ function RenderMessageContentInternal({
|
||||
}
|
||||
/>
|
||||
);
|
||||
return <UnsupportedContent body={(content as { body?: string }).body ?? ''} />;
|
||||
if (content['org.matrix.msc3381.poll.start'])
|
||||
return <PollEvent content={content} mEvent={mEvent} />;
|
||||
return (
|
||||
<UnsupportedContent
|
||||
body={
|
||||
(content as { body?: string }).body ??
|
||||
(content as { 'org.matrix.msc1767.text'?: string })['org.matrix.msc1767.text'] ??
|
||||
''
|
||||
}
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
||||
export const RenderMessageContent = memo(RenderMessageContentInternal);
|
||||
@@ -0,0 +1,87 @@
|
||||
import { useMatrixClient } from '$hooks/useMatrixClient';
|
||||
import { Box, config, Header, Icon, Icons, Menu, MenuItem } from 'folds';
|
||||
import type { MatrixEvent } from 'matrix-js-sdk';
|
||||
|
||||
type PollEventProps = {
|
||||
content: Record<string, unknown>;
|
||||
mEvent?: MatrixEvent;
|
||||
};
|
||||
|
||||
type PollAnswers = {
|
||||
id: string;
|
||||
'org.matrix.msc1767.text': string;
|
||||
};
|
||||
|
||||
type PollVotes = {
|
||||
[vote: string]: number;
|
||||
};
|
||||
export function PollEvent({ content, mEvent }: PollEventProps) {
|
||||
const mx = useMatrixClient();
|
||||
if (!content || !mEvent) return null;
|
||||
|
||||
const roomId = mEvent.getRoomId();
|
||||
const room = mx.getRoom(roomId);
|
||||
const eventId = mEvent.getId();
|
||||
|
||||
const poll = content['org.matrix.msc3381.poll.start'];
|
||||
const question = (poll as { question?: string })?.question;
|
||||
const questionBody = (question as { body?: string })?.body ?? '';
|
||||
const answers = (poll as { answers: PollAnswers[] })?.answers;
|
||||
const maxSelections = (poll as { max_selections: number })?.max_selections;
|
||||
const isDisclosed = (poll as { kind: string })?.kind === 'org.matrix.msc3381.poll.disclosed';
|
||||
// oxlint-disable-next-line no-console
|
||||
console.log(content);
|
||||
|
||||
let votes: PollVotes = {};
|
||||
answers.forEach((item) => (votes[item.id] = 0));
|
||||
|
||||
const childEvents = room
|
||||
?.getUnfilteredTimelineSet()
|
||||
.relations.getAllChildEventsForEvent(eventId ?? '');
|
||||
const sortedChildEvents = childEvents?.toSorted((a: MatrixEvent, b:MatrixEvent) =>
|
||||
a.event.origin_server_ts && b.event.origin_server_ts ? b.event.origin_server_ts - a.event.origin_server_ts : 0
|
||||
);
|
||||
let filteredChildEvents: MatrixEvent[] = [];
|
||||
sortedChildEvents?.forEach((item) => {
|
||||
if (!filteredChildEvents.find((fCE) => fCE.event.sender === item.event.sender))
|
||||
filteredChildEvents.push(item);
|
||||
});
|
||||
// oxlint-disable-next-line no-console
|
||||
console.log(childEvents, sortedChildEvents);
|
||||
|
||||
filteredChildEvents?.map((item) => {
|
||||
const VoteContent = item.getContent();
|
||||
const response = VoteContent['org.matrix.msc3381.poll.response'];
|
||||
const selections = response.answers;
|
||||
if (selections.length > maxSelections) return;
|
||||
|
||||
selections.forEach((selection: string) => {
|
||||
if (votes[selection] !== undefined) votes[selection] += 1;
|
||||
});
|
||||
});
|
||||
// oxlint-disable-next-line no-console
|
||||
console.log('answers', votes, maxSelections, isDisclosed);
|
||||
return (
|
||||
<Box>
|
||||
<Menu>
|
||||
<Header variant="Primary" style={{ padding: config.space.S400 }}>
|
||||
<Box gap="200">
|
||||
<Icon size="50" src={Icons.UnorderList} />
|
||||
{questionBody}
|
||||
</Box>
|
||||
</Header>
|
||||
{answers.map((item) => {
|
||||
const optionBody = item['org.matrix.msc1767.text'];
|
||||
const voteCount = votes[item.id];
|
||||
return (
|
||||
<MenuItem key={item.id}>
|
||||
<p>
|
||||
{optionBody} has {voteCount}
|
||||
</p>
|
||||
</MenuItem>
|
||||
);
|
||||
})}
|
||||
</Menu>
|
||||
</Box>
|
||||
);
|
||||
}
|
||||
@@ -623,7 +623,10 @@ function MessageInternal(
|
||||
</AvatarBase>
|
||||
);
|
||||
|
||||
const stableContent = useMemo(() => mEvent.getContent().body || '', [mEvent]);
|
||||
const stableContent = useMemo(
|
||||
() => mEvent.getContent().body || mEvent.getContent()['org.matrix.msc3381.poll.start'] || '',
|
||||
[mEvent]
|
||||
);
|
||||
const isPendingSend =
|
||||
sendStatus === EventStatus.ENCRYPTING ||
|
||||
sendStatus === EventStatus.QUEUED ||
|
||||
|
||||
@@ -525,7 +525,9 @@ export function useTimelineEventRenderer({
|
||||
const explicitInReplyTo = mEvent.getWireContent()?.['m.relates_to']?.['m.in_reply_to']
|
||||
?.event_id as unknown;
|
||||
const threadReplyTargetId =
|
||||
isThreadRel && typeof explicitInReplyTo === 'string' ? explicitInReplyTo : undefined;
|
||||
isThreadRel && typeof explicitInReplyTo === 'RenderMessageContentstring'
|
||||
? explicitInReplyTo
|
||||
: undefined;
|
||||
const replyEventId =
|
||||
hideThreadChip && mEvent.getWireContent()?.['m.relates_to']?.is_falling_back
|
||||
? undefined
|
||||
@@ -665,7 +667,11 @@ export function useTimelineEventRenderer({
|
||||
<RenderMessageContent
|
||||
displayName={senderDisplayName}
|
||||
msgType={
|
||||
((editedNewContent ?? safeContent) as { msgtype?: string }).msgtype ?? ''
|
||||
(
|
||||
(editedNewContent ?? safeContent) as {
|
||||
msgtype?: string;
|
||||
}
|
||||
).msgtype ?? ''
|
||||
}
|
||||
ts={mEvent.getTs()}
|
||||
edited={!!editedEvent}
|
||||
@@ -1118,7 +1124,9 @@ export function useTimelineEventRenderer({
|
||||
''}
|
||||
{(pinsAdded?.length > 0 && pinsRemoved?.length > 0 && ` and `) || ''}
|
||||
{(pinsRemoved?.length > 0 &&
|
||||
`unpinned ${pinsRemoved.length} message${pinsRemoved.length > 1 ? 's' : ''}`) ||
|
||||
`unpinned ${pinsRemoved.length} message${
|
||||
pinsRemoved.length > 1 ? 's' : ''
|
||||
}`) ||
|
||||
''}
|
||||
{((!pinsAdded || pinsAdded.length <= 0) &&
|
||||
(!pinsRemoved || pinsRemoved.length <= 0) &&
|
||||
@@ -1147,6 +1155,170 @@ export function useTimelineEventRenderer({
|
||||
</Event>
|
||||
);
|
||||
},
|
||||
['org.matrix.msc3381.poll.start']: (mEventId, mEvent, item, timelineSet, collapse) => {
|
||||
const { replyEventId: rawReplyEventId, threadRootId } = mEvent;
|
||||
const isThreadRel = isThreadRelationEvent(mEvent, threadRootId);
|
||||
const actualThreadRootId = isThreadRel ? threadRootId : undefined;
|
||||
const explicitInReplyTo = mEvent.getWireContent()?.['m.relates_to']?.['m.in_reply_to']
|
||||
?.event_id as unknown;
|
||||
const threadReplyTargetId =
|
||||
isThreadRel && typeof explicitInReplyTo === 'string' ? explicitInReplyTo : undefined;
|
||||
// In the thread drawer (hideThreadChip=true), suppress reply headers for events
|
||||
// that only have m.in_reply_to as a non-thread-client fallback (is_falling_back: true).
|
||||
const replyEventId =
|
||||
hideThreadChip && mEvent.getWireContent()?.['m.relates_to']?.is_falling_back
|
||||
? undefined
|
||||
: (threadReplyTargetId ?? rawReplyEventId);
|
||||
|
||||
const reactionRelations = getEventReactions(timelineSet, mEventId);
|
||||
const reactions = reactionRelations?.getSortedAnnotationsByKey();
|
||||
const hasReactions = reactions && reactions.length > 0;
|
||||
const highlighted = focusItem?.index === item && focusItem.highlight;
|
||||
const marked = activeReplyId === mEventId;
|
||||
|
||||
const pushActions = pushProcessor.actionsForEvent(mEvent);
|
||||
let notifyHighlight: 'silent' | 'loud' | undefined;
|
||||
if (pushActions?.notify && pushActions.tweaks?.highlight) {
|
||||
notifyHighlight = pushActions.tweaks?.sound ? 'loud' : 'silent';
|
||||
}
|
||||
|
||||
const editedEvent = getEditedEvent(mEventId, mEvent, timelineSet);
|
||||
let editedNewContent: unknown;
|
||||
if (editedEvent) {
|
||||
editedNewContent = editedEvent.getContent()['m.new_content'];
|
||||
}
|
||||
|
||||
const baseContent = mEvent.getContent() || {};
|
||||
const safeContent =
|
||||
Object.keys(baseContent).length > 0 ? baseContent : mEvent.getOriginalContent();
|
||||
|
||||
const getContent = (() => editedNewContent ?? safeContent) as GetContentCallback;
|
||||
|
||||
const senderId = mEvent.getSender() ?? '';
|
||||
const senderDisplayName =
|
||||
getMemberDisplayName(room, senderId, nicknames) ?? getMxIdLocalPart(senderId) ?? senderId;
|
||||
|
||||
const forwardContent = safeContent['moe.sable.message.forward'] as
|
||||
| {
|
||||
original_timestamp?: unknown;
|
||||
original_room_id?: string;
|
||||
original_event_id?: string;
|
||||
original_event_private?: boolean;
|
||||
}
|
||||
| undefined;
|
||||
|
||||
const messageForwardedProps: ForwardedMessageProps | undefined = forwardContent
|
||||
? {
|
||||
isForwarded: true,
|
||||
originalTimestamp:
|
||||
typeof forwardContent.original_timestamp === 'number'
|
||||
? forwardContent.original_timestamp
|
||||
: mEvent.getTs(),
|
||||
originalRoomId: forwardContent.original_room_id ?? room.roomId,
|
||||
originalEventId: forwardContent.original_event_id ?? '',
|
||||
originalEventPrivate: forwardContent.original_event_private ?? false,
|
||||
}
|
||||
: undefined;
|
||||
|
||||
return (
|
||||
<Message
|
||||
key={mEventId}
|
||||
data-message-item={item}
|
||||
data-message-id={mEventId}
|
||||
room={room}
|
||||
mEvent={mEvent}
|
||||
messageSpacing={messageSpacing}
|
||||
messageLayout={messageLayout}
|
||||
highlight={highlighted}
|
||||
isMarked={marked}
|
||||
notifyHighlight={notifyHighlight}
|
||||
edit={editId === mEventId}
|
||||
canDelete={canRedact || (canDeleteOwn && senderId === mx.getUserId())}
|
||||
canSendReaction={canSendReaction}
|
||||
canPinEvent={canPinEvent}
|
||||
imagePackRooms={imagePackRooms}
|
||||
relations={hasReactions ? reactionRelations : undefined}
|
||||
onUserClick={onUserClick}
|
||||
onUsernameClick={onUsernameClick}
|
||||
onReplyClick={onReplyClick}
|
||||
onReactionToggle={onReactionToggle}
|
||||
senderId={senderId}
|
||||
senderDisplayName={senderDisplayName}
|
||||
messageForwardedProps={messageForwardedProps}
|
||||
sendStatus={mEvent.getAssociatedStatus()}
|
||||
onResend={onResend}
|
||||
onDeleteFailedSend={onDeleteFailedSend}
|
||||
onEditId={onEditId}
|
||||
collapse={collapse}
|
||||
activeReplyId={activeReplyId}
|
||||
reply={
|
||||
replyEventId && (
|
||||
<Reply
|
||||
room={room}
|
||||
timelineSet={timelineSet}
|
||||
replyEventId={replyEventId}
|
||||
threadRootId={hideThreadChip ? undefined : actualThreadRootId}
|
||||
mentions={baseContent['m.mentions']}
|
||||
onClick={handleOpenReply}
|
||||
/>
|
||||
)
|
||||
}
|
||||
reactions={(() => {
|
||||
const threadChip =
|
||||
!hideThreadChip && (room.getThread(mEventId) || threadRootId) ? (
|
||||
<ThreadReplyChip
|
||||
room={room}
|
||||
mEventId={mEventId}
|
||||
openThreadId={openThreadId}
|
||||
onToggle={() => setOpenThread(openThreadId === mEventId ? undefined : mEventId)}
|
||||
/>
|
||||
) : null;
|
||||
if (!reactionRelations && !threadChip) return undefined;
|
||||
return (
|
||||
<>
|
||||
{reactionRelations && (
|
||||
<Reactions
|
||||
style={{ marginTop: config.space.S200 }}
|
||||
room={room}
|
||||
relations={reactionRelations}
|
||||
mEventId={mEventId}
|
||||
canSendReaction={canSendReaction}
|
||||
canDeleteOwn={canDeleteOwn}
|
||||
onReactionToggle={onReactionToggle}
|
||||
/>
|
||||
)}
|
||||
{threadChip}
|
||||
</>
|
||||
);
|
||||
})()}
|
||||
hideReadReceipts={hideReads}
|
||||
showDeveloperTools={showDeveloperTools}
|
||||
memberPowerTag={getMemberPowerTag(senderId)}
|
||||
hour24Clock={hour24Clock}
|
||||
dateFormatString={dateFormatString}
|
||||
>
|
||||
{mEvent.isRedacted() ? (
|
||||
<RedactedContent reason={mEvent.getUnsigned().redacted_because?.content.reason} />
|
||||
) : (
|
||||
<RenderMessageContent
|
||||
displayName={senderDisplayName}
|
||||
msgType={((editedNewContent ?? safeContent) as { msgtype?: string }).msgtype ?? ''}
|
||||
ts={mEvent.getTs()}
|
||||
edited={!!editedEvent}
|
||||
getContent={getContent}
|
||||
mediaAutoLoad={mediaAutoLoad}
|
||||
urlPreview={showUrlPreview}
|
||||
bundledPreview={showBundledPreview}
|
||||
clientUrlPreview={showClientUrlPreview}
|
||||
htmlReactParserOptions={htmlReactParserOptions}
|
||||
linkifyOpts={linkifyOpts}
|
||||
outlineAttachment={messageLayout === MessageLayout.Bubble}
|
||||
mEvent={mEvent}
|
||||
/>
|
||||
)}
|
||||
</Message>
|
||||
);
|
||||
},
|
||||
},
|
||||
(mEventId, mEvent, item, timelineSet, collapse) => {
|
||||
if (!showHiddenEvents) return null;
|
||||
|
||||
Reference in new issue
Block a user