krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-16 06:07:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix empty link bug and proper error logging in highlightMentions.js (#12228)

Browse Source 
* fix(chat) - Don't insert user link in url-less link and properly log source-mapping failures

* fix(chat) - Add link to markdown spec and list of known issues

* fix(chat) - Log regular expression as String
This commit is contained in:
Bart Enkelaar
2020-05-31 18:09:43 +02:00
committed by GitHub
parent 61d970db86
commit 1c00d7de5b
2 changed files with 34 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
website/server/libs/highlightMentions.js
View File

@@ -2,6 +2,7 @@ import escapeRegExp from 'lodash/escapeRegExp';
import habiticaMarkdown from 'habitica-markdown';
import { model as User } from '../models/user';
import logger from './logger';
const mentionRegex = /\B@[-\w]+/g;
const ignoreTokenTypes = ['code_block', 'code_inline', 'fence', 'link_open'];
@@ -70,8 +71,17 @@ function withOptionalIndentation (content) {
return content.split('\n').map(line => `\\s*${line}`).join('\n');
}
// This is essentially a workaround around the fact that markdown-it doesn't
// provide sourcemap functionality and is the most brittle part of this code.
/* This is essentially a workaround around the fact that markdown-it doesn't
* provide sourcemap functionality and is the most brittle part of this code.
*
* Known errors (Not supported markdown link variants):
* - [a](<b)c>) https://spec.commonmark.org/0.29/#example-489
* - [link](\(foo\)) https://spec.commonmark.org/0.29/#example-492
* - [link](foo(and(bar))) https://spec.commonmark.org/0.29/#example-493
* - [link](foo\(and\(bar\)) https://spec.commonmark.org/0.29/#example-494
* - [link](<foo(and(bar)>) https://spec.commonmark.org/0.29/#example-495
* - [link](foo\)\:) https://spec.commonmark.org/0.29/#example-496
*/
function toSourceMapRegex (token) {
const { type, content, markup } = token;
const contentRegex = escapeRegExp(content);
@@ -86,7 +96,7 @@ function toSourceMapRegex (token) {
} else if (type === 'link_open') {
const texts = token.textContents.map(escapeRegExp);
regexStr = markup === 'linkify' || markup === 'autolink' ? texts[0]
: `\\[[^\\]]*${texts.join('[^\\]]*')}[^\\]]*\\]\\([^)]+\\)`;
: `\\[[^\\]]*${texts.join('[^\\]]*')}[^\\]]*\\]\\([^)]*\\)`;
} else {
throw new Error(`No source mapping regex defined for ignore blocks of type ${type}`);
}
@@ -112,7 +122,10 @@ function findTextBlocks (text) {
const match = targetText.match(regex);
if (!match) {
// Should not happen, but insert to handle bugs gracefully
logger.error(
new Error('Failed to match source-mapping regex to find ignore block'),
{ text, targetText, regex: String(regex) },
);
return;
}