Skip to content

Open markdown links in blank target, disallow empty messages #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Open markdown links in blank target, disallow empty messages #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
72db5e7
Disallow empty messages
jensen Jan 12, 2025
1dd9b32
Open markdown links with blank target
jensen Jan 12, 2025
c9f5df6
Formatting
jensen Jan 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions react-chat/src/components/CreateMessage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ type CreateMessageOptions = {
export const CreateMessage = ({ onSubmit }: CreateMessageOptions) => {
const [text, setText] = useState('')
const handleSubmit = async () => {
if (text === "") return;

onSubmit(text)
setText('')
}
Expand Down
38 changes: 35 additions & 3 deletions react-chat/src/components/MessageList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,41 @@
import { useEffect, useRef } from "react"
import { ChatDocument, Message, User } from "../utils"
import { DocHandle } from "@automerge/automerge-repo"
import { marked } from 'marked';
import { marked, type Tokens} from 'marked';
import DOMPurify from 'dompurify';

marked.use({
renderer: {
/* This is basically what marked is doing, just inlined */
link({ href, title, tokens }: Tokens.Link): string {
const text = this.parser.parseInline(tokens);

let cleanHref

try {
cleanHref = encodeURI(href).replace(/%25/g, '%');
} catch {
cleanHref = null
}

if (cleanHref === null) {
return text;
}

let out = '<a target="_blank" rel="noopener noreferrer" href="' + cleanHref + '"';

if (title) {
out += ' title="' + title + '"';
}

out += '>' + text + '</a>';

return out;
}

}
})

type MessageListProps = {
messages: Message[]
users: User[]
Expand All @@ -28,7 +60,7 @@ export const MessageList = ({ messages, users, user, handle }: MessageListProps)
return message.likes?.length || 0;
}

// Update the message's Like
// Update the message's Like
const createLike = (messageId: string) => {
if (handle && user) {
handle.change(doc => {
Expand Down Expand Up @@ -64,7 +96,7 @@ export const MessageList = ({ messages, users, user, handle }: MessageListProps)
<time className="text-xs opacity-50">{formatDate(message.createdAt)}</time>
</div>
<div className="chat-bubble break-words"
dangerouslySetInnerHTML={{__html: DOMPurify.sanitize(marked.parse(message.text, { async: false }))}} />
dangerouslySetInnerHTML={{__html: DOMPurify.sanitize(marked.parse(message.text, { async: false }), { ADD_ATTR: ['target'] })}} />
<div className="chat-footer">
{/* Swap icons based on whether users have liked it or not */}
<span className="text-xs cursor-pointer" onClick={() => createLike(message.id)}>
Expand Down