cswimr/revite
1
0
Fork 0
mirror of https://github.com/revoltchat/revite.git synced 2024-11-22 07:00:58 -05:00
Code Issues Projects Releases Packages Wiki Activity

merge: branch 'master' into production

Browse source
This commit is contained in:
Paul Makles 2022-09-17 13:02:15 +01:00
commit 1a9a2786bb
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/components/common/messaging/Message.tsx
View file

@ -117,7 +117,11 @@ const Message = observer(
} }
contrast={contrast} contrast={contrast}
sending={typeof queued !== "undefined"} sending={typeof queued !== "undefined"}
mention={message.mention_ids?.includes(client.user!._id)} mention={
message.mention_ids && client.user
? message.mention_ids.includes(client.user._id)
: undefined
}
failed={typeof queued?.error !== "undefined"} failed={typeof queued?.error !== "undefined"}
{...(attachContext {...(attachContext
? useTriggerEvents("Menu", { ? useTriggerEvents("Menu", {

8
src/components/markdown/RemarkRenderer.tsx
View file

@ -180,9 +180,9 @@ const Container = styled.div<{ largeEmoji: boolean }>`
`; `;
/** /**
* Regex for matching execessive blockquotes * Regex for matching execessive recursion of blockquotes and lists
*/ */
const RE_QUOTE = /(^(?:>\s?){5})[>\s?]+(.*$)/gm; const RE_RECURSIVE = /(^(?:[>*+-][^\S\r\n]*){5})(?:[>*+-][^\S\r\n]*)+(.*$)/gm;
/** /**
* Regex for matching multi-line blockquotes * Regex for matching multi-line blockquotes
@ -212,8 +212,8 @@ const RE_PLUS = /^\s*\+(?:$|[^+])/gm;
function sanitise(content: string) { function sanitise(content: string) {
return ( return (
content content
// Strip excessive blockquote indentation // Strip excessive blockquote or list indentation
.replace(RE_QUOTE, (_, m0, m1) => m0 + m1) .replace(RE_RECURSIVE, (_, m0, m1) => m0 + m1)
// Append empty character if string starts with html tag // Append empty character if string starts with html tag
// This is to avoid inconsistencies in rendering Markdown inside/after HTML tags // This is to avoid inconsistencies in rendering Markdown inside/after HTML tags