MrBesen
/
tweb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't parse markdown inside of monospace

This commit is contained in:
Eduard Kuzmenko 2023-03-07 22:21:57 +04:00
parent 2e3ab76c7f
commit 5b1097d7f9
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/richTextProcessor/findConflictingEntity.ts
View File

@ -4,7 +4,7 @@
* https://github.com/morethanwords/tweb/blob/master/LICENSE
*/
import {PASS_CONFLICTING_ENTITIES} from '.';
import {MARKDOWN_ENTITIES_TYPES, PASS_CONFLICTING_ENTITIES} from '.';
import {MessageEntity} from '../../layer';
const SINGLE_ENTITIES: Set<MessageEntity['_']> = new Set(['messageEntityPre', 'messageEntityCode']);
@ -16,12 +16,12 @@ export default function findConflictingEntity(currentEntities: MessageEntity[],
singleEnd = currentEntity.offset + currentEntity.length;
}
if(newEntity.offset < singleEnd && !PASS_CONFLICTING_ENTITIES.has(newEntity._)) {
if(newEntity.offset < singleEnd && MARKDOWN_ENTITIES_TYPES.has(newEntity._)) {
return true;
}
const isConflictingTypes = newEntity._ === currentEntity._ ||
(!PASS_CONFLICTING_ENTITIES.has(newEntity._) && !PASS_CONFLICTING_ENTITIES.has(currentEntity._));
(!PASS_CONFLICTING_ENTITIES.has(newEntity._) && !PASS_CONFLICTING_ENTITIES.has(currentEntity._));
if(!isConflictingTypes) {
return false;

2
src/lib/richTextProcessor/index.ts
View File

@ -99,6 +99,8 @@ export const MARKDOWN_ENTITIES: {[markdown: string]: MessageEntity['_']} = {
'||': 'messageEntitySpoiler'
};
export const MARKDOWN_ENTITIES_TYPES = new Set(Object.values(MARKDOWN_ENTITIES));
export const PASS_CONFLICTING_ENTITIES: Set<MessageEntity['_']> = new Set([
'messageEntityEmoji',
'messageEntityLinebreak',