abner/for-legacy-web
1
0
Fork 1
mirror of https://github.com/stoatchat/for-legacy-web.git synced 2026-03-09 18:15:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge: branch 'master' into production

Browse Source
This commit is contained in:
Paul Makles
2022-09-17 13:02:15 +01:00
parent 33da5e43bb 2ee26e839d
commit 860bf59b6b
2 changed files with 9 additions and 5 deletions
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}
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"}
{...(attachContext
? 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
@@ -212,8 +212,8 @@ const RE_PLUS = /^\s*\+(?:$|[^+])/gm;
function sanitise(content: string) {
return (
content
// Strip excessive blockquote indentation
.replace(RE_QUOTE, (_, m0, m1) => m0 + m1)
// Strip excessive blockquote or list indentation
.replace(RE_RECURSIVE, (_, m0, m1) => m0 + m1)
// Append empty character if string starts with html tag
// This is to avoid inconsistencies in rendering Markdown inside/after HTML tags