mirrors/element-web
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2026-01-05 16:41:24 +01:00
Code Issues Projects Releases Wiki Activity

fix: make url in topic in room intro clickable

Browse Source
This commit is contained in:
Florian Duros 2025-09-03 17:44:23 +02:00
parent 9a315177db
commit e55665cd62
No known key found for this signature in database
GPG Key ID: A5BBB4041B493F15
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/components/views/rooms/NewRoomIntro.tsx
View File

@ -30,6 +30,8 @@ import { privateShouldBeEncrypted } from "../../../utils/rooms";
import { LocalRoom } from "../../../models/LocalRoom";
import { shouldEncryptRoomWithSingle3rdPartyInvite } from "../../../utils/room/shouldEncryptRoomWithSingle3rdPartyInvite";
import { useScopedRoomContext } from "../../../contexts/ScopedRoomContext.tsx";
import { useTopic } from "../../../hooks/room/useTopic";
import { topicToHtml } from "../../../HtmlUtils";
function hasExpectedEncryptionSettings(matrixClient: MatrixClient, room: Room): boolean {
const isEncrypted: boolean = matrixClient.isRoomEncrypted(room.roomId);
@ -52,6 +54,7 @@ const determineIntroMessage = (room: Room, encryptedSingle3rdPartyInvite: boolea
const NewRoomIntro: React.FC = () => {
const cli = useContext(MatrixClientContext);
const { room, roomId } = useScopedRoomContext("room", "roomId");
const topic = useTopic(room);
if (!room || !roomId) {
throw new Error("Unable to create a NewRoomIntro without room and roomId");
@ -106,7 +109,7 @@ const NewRoomIntro: React.FC = () => {
);
} else {
const inRoom = room && room.getMyMembership() === KnownMembership.Join;
const topic = room.currentState.getStateEvents(EventType.RoomTopic, "")?.getContent()?.topic;
const htmlTopic = topicToHtml(topic?.text, topic?.html);
const canAddTopic = inRoom && room.currentState.maySendStateEvent(EventType.RoomTopic, cli.getSafeUserId());
const onTopicClick = (): void => {
@ -127,7 +130,7 @@ const NewRoomIntro: React.FC = () => {
if (canAddTopic && topic) {
topicText = _t(
"room|intro|topic_edit",
{ topic },
{ htmlTopic },
{
a: (sub) => (
<AccessibleButton element="a" kind="link_inline" onClick={onTopicClick}>
@ -137,7 +140,7 @@ const NewRoomIntro: React.FC = () => {
},
);
} else if (topic) {
topicText = _t("room|intro|topic", { topic });
topicText = _t("room|intro|topic", { htmlTopic });
} else if (canAddTopic) {
topicText = _t(
"room|intro|no_topic",