Skip to content

feat(discussion): auto detect email address #21

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

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

feat(discussion): auto detect email address #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ae3f0a3
feat(discussion): auto detect email address
renbaoshuo Dec 4, 2021
52d61a8
fix: 5b8eedaf4c3aa9b87ec3fb08649464bedcd49e7a
renbaoshuo Dec 4, 2021
dd17586
fix: add tlds
renbaoshuo Dec 5, 2021
49a001e
fix: ae3f0a382f101b179f7f8f9bd22e9963ba98e7f5
renbaoshuo Dec 5, 2021
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
3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
"@types/flat": "^5.0.1",
"@types/gravatar": "^1.8.0",
"@types/js-yaml": "^4.0.0",
"@types/linkify-it": "^3.0.2",
"@types/lodash.clonedeep": "^4.5.6",
"@types/lodash.isequal": "^4.5.5",
"@types/lodash.merge": "^4.6.6",
Expand Down Expand Up @@ -76,7 +77,6 @@
"lodash.merge": "^4.6.2",
"markdown-it": "^12.0.4",
"markdown-it-math-loose": "^4.1.1",
"markdown-it-mentions": "^1.0.0",
"markdown-it-merge-cells": "^1.0.1",
"mathjax-full": "^3.1.2",
"mobx": "^4.15.4",
Expand Down Expand Up @@ -116,6 +116,7 @@
"svgo": "^1.3.2",
"svgo-loader": "^2.2.1",
"timeago.js": "^4.0.2",
"tlds": "^1.227.0",
"twemoji": "^13.0.1",
"typeface-lato": "^1.1.13",
"typeface-saira": "^1.1.13",
Expand Down
10 changes: 0 additions & 10 deletions patches/markdown-it-mentions+1.0.0.patch
View file
Open in desktop

This file was deleted.

27 changes: 23 additions & 4 deletions src/markdown/markdown.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@ import { v4 as uuid } from "uuid";

import MarkdownItMath from "markdown-it-math-loose";
import MarkdownItMergeCells from "markdown-it-merge-cells/src";
import MarkdownItMentions from "markdown-it-mentions";
import MarkdownItTaskLists from "@hackmd/markdown-it-task-lists";
import LinkifyIt from "linkify-it";

import tlds from "tlds";

export interface MarkdownHighlightPlaceholder {
id: string;
Expand Down Expand Up @@ -84,13 +86,30 @@ export function renderMarkdown(
blockRenderer: (code: string) => addMathPlaceholder(code, true)
});
renderer.use(MarkdownItMergeCells);
renderer.use(MarkdownItMentions, {
parseURL: (username: string) => `/u/${username}`
});
renderer.use(MarkdownItTaskLists, {
enabled: true
});

renderer.linkify.add("@", {
validate: (text: string, pos: number, self: LinkifyIt.LinkifyIt): number | boolean => {
var tail: string = text.slice(pos);
const re: RegExp = /^[a-zA-Z0-9\-_.#$]{3,24}$/;

if (re.test(tail)) {
if (pos >= 2 && tail[pos - 2] === "@") {
return false;
}
return tail.match(re)[0].length;
}
return 0;
},
normalize: (match: LinkifyIt.Match): void => {
match.url = "/u/" + encodeURIComponent(match.url.replace(/^@/, ""));
}
});

renderer.linkify.tlds(tlds);

if (onPatchRenderer) onPatchRenderer(renderer);

return [renderer.render(text), highlightPlaceholders, mathPlaceholders, findPlaceholderElement];
Expand Down
1 change: 0 additions & 1 deletion src/utils/validators.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import validator from "validator";

// Change `/patches/markdown-it-mentions+1.0.0.patch` together if you change this regex
export function isValidUsername(username: string): boolean {
return /^[a-zA-Z0-9\-_.#$]{3,24}$/.test(username);
}
Expand Down
22 changes: 10 additions & 12 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1862,6 +1862,11 @@
resolved "https://registry.yarnpkg.com/@types/linkify-it/-/linkify-it-2.1.0.tgz#ea3dd64c4805597311790b61e872cbd1ed2cd806"
integrity sha512-Q7DYAOi9O/+cLLhdaSvKdaumWyHbm7HAk/bFwwyTuU0arR5yyCeW5GOoqt4tJTpDRxhpx9Q8kQL6vMpuw9hDSw==

"@types/linkify-it@^3.0.2":
version "3.0.2"
resolved "https://registry.yarnpkg.com/@types/linkify-it/-/linkify-it-3.0.2.tgz#fd2cd2edbaa7eaac7e7f3c1748b52a19143846c9"
integrity sha512-HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA==

"@types/lodash.clonedeep@^4.5.6":
version "4.5.6"
resolved "https://registry.yarnpkg.com/@types/lodash.clonedeep/-/lodash.clonedeep-4.5.6.tgz#3b6c40a0affe0799a2ce823b440a6cf33571d32b"
Expand Down Expand Up @@ -8794,25 +8799,13 @@ markdown-it-math-loose@^4.1.1:
optionalDependencies:
ascii2mathml "^0.6.2"

markdown-it-mentions@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/markdown-it-mentions/-/markdown-it-mentions-1.0.0.tgz#2dc6a06d0604bfbf57ac22efb3558f338098990a"
integrity sha512-zZnkEWHfnIXCwzgv9WJh0Wo6iuwLJaApfOMQfKEqjYM5A98XXEChPRqI7jvZAdzPGfCfaBFv0GUQqUYw4DeSjg==
dependencies:
markdown-it-regexp "^0.4.0"

markdown-it-merge-cells@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/markdown-it-merge-cells/-/markdown-it-merge-cells-1.0.1.tgz#ad375a09fa709213c19a354e537e560789ae2be8"
integrity sha512-4I6wBy8OPgPRSYAw7VC3SEgIcuM7HiFvTi1AW9bbPYRoXoAsr6inyjX723gyDUUj9dQT7ICNWtxrom9ULOW46A==
dependencies:
babel-runtime "^6.26.0"

markdown-it-regexp@^0.4.0:
version "0.4.0"
resolved "https://registry.yarnpkg.com/markdown-it-regexp/-/markdown-it-regexp-0.4.0.tgz#d64d713eecec55ce4cfdeb321750ecc099e2c2dc"
integrity sha1-1k1xPuzsVc5M/esyF1DswJniwtw=

markdown-it@^12.0.4:
version "12.0.4"
resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-12.0.4.tgz#eec8247d296327eac3ba9746bdeec9cfcc751e33"
Expand Down Expand Up @@ -12953,6 +12946,11 @@ tiny-warning@^1.0.0:
resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754"
integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==

tlds@^1.227.0:
version "1.227.0"
resolved "https://registry.yarnpkg.com/tlds/-/tlds-1.227.0.tgz#6352577d74c4b7f6f80ebdeebafdf28c10aee8c0"
integrity sha512-H6KXre7PSkfZyPiGzHvdG/p42LCfPmmyH3MhmZnULiVGEGXKBe8vzyLrw6q0UAtXOL0eNScA9vC4DcfhrcaPlg==

tmp@^0.0.33:
version "0.0.33"
resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
Expand Down