Lisa_Stuff/pvtchat
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add Anchor Tag Markdown

Browse Source
This commit is contained in:
ADAMJR 2021-09-29 22:00:37 +01:00
parent 030362afb6
commit 7e535999b1
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
frontend/src/components/channel/message/message.tsx
View File

@ -12,6 +12,7 @@ import { getMember } from '../../../store/members';
import { ContextMenuTrigger } from 'react-contextmenu';
import MessageMenu from '../../ctx-menus/message-menu';
import classNames from 'classnames';
import defaultPatterns from '../../../types/patterns';
export interface MessageProps {
message: Entity.Message;
@ -39,6 +40,7 @@ const Message: React.FunctionComponent<MessageProps> = ({ message }: MessageProp
codeLine: /`(.*?)`/gs,
blockQuoteMultiline: />>> (.*)/gs,
blockQuoteLine: /^> (.*)$/gm,
url: /http:\/\/(.*)|https:\/\//gm,
}
const format = (content: string) => content
@ -53,8 +55,9 @@ const Message: React.FunctionComponent<MessageProps> = ({ message }: MessageProp
// FIXME: don't add message formatting in a code block
.replace(patterns.codeMultiline, '<pre><code class="facade">$1</code></pre>')
.replace(patterns.codeLine, '<code class="facade">$1</code>')
.replace(patterns.blockQuoteLine,'<span class="blockquote pl-1">$1</span>')
.replace(patterns.blockQuoteMultiline,'<div class="blockquote pl-1">$1</div>');
.replace(patterns.blockQuoteLine, '<span class="blockquote pl-1">$1</span>')
.replace(patterns.blockQuoteMultiline, '<div class="blockquote pl-1">$1</div>')
.replace(defaultPatterns.url, '<a href="$1" target="_blank">$1</div>');
const isExtra = () => {
const i = messages.findIndex(m => m.id === message.id);

1
types/patterns.ts
View File

@ -7,4 +7,5 @@ export default {
textChannelName: /^[A-Za-z\-\d]{2,32}$/,
username: /(^(?! |^everyone$|^here$|^me$|^someone$)[A-Za-z\d\-\_ ]{2,32}(?<! )$)/,
roleName: /(^(?! |^everyone$|^here$|^me$|^someone$)(.*){2,32}(?<! )$)/,
url: /(https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&//=]*))/gm,
}