Mirrors/gomuks
1
0
Fork 1
mirror of https://github.com/tulir/gomuks.git synced 2025-04-19 18:13:41 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix style and join link

Browse source
This commit is contained in:
Tulir Asokan 2025-03-28 13:03:53 +02:00
parent 4176cc38ed
commit 5192003e17
2 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
web/src/ui/composer/MessageComposer.css
View file

@ -14,6 +14,11 @@ div.message-composer {
text-wrap: auto !important; text-wrap: auto !important;
} }
&.tombstoned {
min-height: unset;
padding: .5rem;
}
> div.input-area { > div.input-area {
display: flex; display: flex;
align-items: center; align-items: center;

19
web/src/ui/composer/MessageComposer.tsx
View file

@ -38,6 +38,7 @@ import type {
import { PartialEmoji, emojiToMarkdown } from "@/util/emoji" import { PartialEmoji, emojiToMarkdown } from "@/util/emoji"
import { isMobileDevice } from "@/util/ismobile.ts" import { isMobileDevice } from "@/util/ismobile.ts"
import { escapeMarkdown } from "@/util/markdown.ts" import { escapeMarkdown } from "@/util/markdown.ts"
import { getServerName } from "@/util/validation.ts"
import ClientContext from "../ClientContext.ts" import ClientContext from "../ClientContext.ts"
import EmojiPicker from "../emojipicker/EmojiPicker.tsx" import EmojiPicker from "../emojipicker/EmojiPicker.tsx"
import GIFPicker from "../emojipicker/GIFPicker.tsx" import GIFPicker from "../emojipicker/GIFPicker.tsx"
@ -592,25 +593,27 @@ const MessageComposer = () => {
const hasReplacement = content.replacement_room?.startsWith("!") ?? false const hasReplacement = content.replacement_room?.startsWith("!") ?? false
let link: JSX.Element | null = null let link: JSX.Element | null = null
if (hasReplacement) { if (hasReplacement) {
const via = getServerName(tombstoneEvent.sender)
const handleNavigate = (e: React.MouseEvent<HTMLAnchorElement, MouseEvent>) => { const handleNavigate = (e: React.MouseEvent<HTMLAnchorElement, MouseEvent>) => {
e.preventDefault() e.preventDefault()
if (content.replacement_room) { window.mainScreenContext.setActiveRoom(content.replacement_room, {
window.mainScreenContext.setActiveRoom(content.replacement_room) via: [via],
})
} }
} const url = `matrix:roomid/${content.replacement_room.slice(1)}?via=${via}`
const via = tombstoneEvent.sender.split(":", 1)[1]
const url = `matrix:roomid/${content.replacement_room.slice(1)}?action=join&via=${via}`
link = <a className="hicli-matrix-uri-room-alias" href={url} onClick={handleNavigate}> link = <a className="hicli-matrix-uri-room-alias" href={url} onClick={handleNavigate}>
Join the new one here.</a> Join the new one here
</a>
} }
let body = content.body let body = content.body
if (!body) { if (!body) {
body = hasReplacement ? "This room has been replaced." : "This room has been shut down." body = hasReplacement ? "This room has been replaced." : "This room has been shut down."
} }
if (!body.endsWith(".")) {
body += "."
}
return <div className="message-composer tombstoned" ref={composerRef}> return <div className="message-composer tombstoned" ref={composerRef}>
<p>
{body} {link} {body} {link}
</p>
</div> </div>
} }
return <> return <>