ztr/TelegramPWA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support Markdown links in changelogs

Browse Source
This commit is contained in:
Alexander Zinchuk 2022-04-19 15:12:30 +02:00
parent 47a26ab9f1
commit 733d84c781
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/global/actions/ui/messages.ts
View File

@ -608,7 +608,7 @@ addActionHandler('checkVersionNotification', (global, actions) => {
chatId: SERVICE_NOTIFICATIONS_USER_ID, chatId: SERVICE_NOTIFICATIONS_USER_ID,
date: getServerTime(global.serverTimeOffset), date: getServerTime(global.serverTimeOffset),
content: { content: {
text: parseMessageInput(versionNotification), text: parseMessageInput(versionNotification, true),
}, },
isOutgoing: false, isOutgoing: false,
}; };

12
src/util/parseMessageInput.ts
View File

@ -1,5 +1,6 @@
import { ApiMessageEntity, ApiMessageEntityTypes, ApiFormattedText } from '../api/types'; import { ApiMessageEntity, ApiMessageEntityTypes, ApiFormattedText } from '../api/types';
import { IS_EMOJI_SUPPORTED } from './environment'; import { IS_EMOJI_SUPPORTED } from './environment';
import { RE_LINK_TEMPLATE } from '../config';
const ENTITY_CLASS_BY_NODE_NAME: Record<string, string> = { const ENTITY_CLASS_BY_NODE_NAME: Record<string, string> = {
B: ApiMessageEntityTypes.Bold, B: ApiMessageEntityTypes.Bold,
@ -17,9 +18,9 @@ const ENTITY_CLASS_BY_NODE_NAME: Record<string, string> = {
const MAX_TAG_DEEPNESS = 3; const MAX_TAG_DEEPNESS = 3;
export default function parseMessageInput(html: string): ApiFormattedText { export default function parseMessageInput(html: string, withMarkdownLinks = false): ApiFormattedText {
const fragment = document.createElement('div'); const fragment = document.createElement('div');
fragment.innerHTML = parseMarkdown(html); fragment.innerHTML = withMarkdownLinks ? parseMarkdown(parseMarkdownLinks(html)) : parseMarkdown(html);
const text = fragment.innerText.trim().replace(/\u200b+/g, ''); const text = fragment.innerText.trim().replace(/\u200b+/g, '');
let textIndex = 0; let textIndex = 0;
let recursionDeepness = 0; let recursionDeepness = 0;
@ -101,6 +102,13 @@ function parseMarkdown(html: string) {
return parsedHtml; return parsedHtml;
} }
function parseMarkdownLinks(html: string) {
return html.replace(new RegExp(`\\[([^\\]]+?)]\\((${RE_LINK_TEMPLATE}+?)\\)`, 'g'), (_, text, link) => {
const url = link.includes('://') ? link : link.includes('@') ? `mailto:${link}` : `http://${link}`;
return `<a href="${url}">${text}</a>`;
});
}
function getEntityDataFromNode( function getEntityDataFromNode(
node: ChildNode, node: ChildNode,
rawText: string, rawText: string,