diff --git a/src/app/features/room/message/Message.tsx b/src/app/features/room/message/Message.tsx index 9a95fe23..736a66f4 100644 --- a/src/app/features/room/message/Message.tsx +++ b/src/app/features/room/message/Message.tsx @@ -1033,7 +1033,7 @@ export const Message = as<'div', MessageProps>( size="300" radii="300" > - + )} {canEditEvent(ct, event) && onEditId && ( @@ -1118,7 +1118,7 @@ export const Message = as<'div', MessageProps>( {canThread && ( } + after={} radii="300" data-event-id={event.event_id} onClick={(evt: any) => { diff --git a/src/app/features/room/thread-view/TimelineView.tsx b/src/app/features/room/thread-view/TimelineView.tsx index d3f11f5f..e3cf4d14 100644 --- a/src/app/features/room/thread-view/TimelineView.tsx +++ b/src/app/features/room/thread-view/TimelineView.tsx @@ -128,6 +128,7 @@ export function TimelineView({ threadTimeline }: TimelineViewProps) { const permissions = useRoomPermissions(creators, powerLevels); const canRedact = permissions.action('redact', ct.session.userId); + const canDeleteOwn = permissions.event(MessageEvent.RoomRedaction, ct.session.userId); const canSendReaction = permissions.event(MessageEvent.Reaction, ct.session.userId); const canPinEvent = permissions.stateEvent(StateEvent.RoomPinnedEvents, ct.session.userId); const [editId, setEditId] = useState(); @@ -357,7 +358,7 @@ export function TimelineView({ threadTimeline }: TimelineViewProps) { highlight={highlighted} selected={replyDraft?.eventId === event.event_id} edit={editId === event.event_id} - canDelete={canRedact || event.sender === ct.session.userId} + canDelete={canRedact || (canDeleteOwn && event.sender === ct.session.userId)} canSendReaction={canSendReaction} canPinEvent={canPinEvent} imagePackRooms={imagePackRooms} @@ -478,7 +479,7 @@ export function TimelineView({ threadTimeline }: TimelineViewProps) { ✦ A Thread Begins - +