third-party-mirrors/Discord-History-Tracker
1
0
Fork 0
mirror of https://github.com/chylex/Discord-History-Tracker.git synced 2025-04-14 23:50:33 +03:00
Code Issues Projects Releases Wiki Activity

Rewrite escaped formatting character handling in renderer

Browse Source
This commit is contained in:
chylex 2016-11-15 13:49:44 +01:00
parent 6a480f7e91
commit f0de2709c2
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/renderer/scr.discord.js
View File

@ -8,8 +8,9 @@ var DISCORD = (function(){
formatCodeBlock: /```(?:([A-z0-9\-]+?)\n+)?\n*([^]+?)\n*```/g,
formatUrl: /(\b(?:https?|ftp|file):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/ig,
formatUrlNoEmbed: /<(\b(?:https?|ftp|file):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])>/ig,
specialEscaped: /\\([*_~`\\])/g,
specialUnescaped: /([*_~`\\])/g,
specialEscapedBacktick: /\\`/g,
specialEscapedOther: /\\([*_~\\])/g,
specialUnescaped: /([*_~\\])/g,
mentionRole: /&lt;@&(\d+?)&gt;/g,
mentionUser: /&lt;@!?(\d+?)&gt;/g,
mentionChannel: /&lt;#(\d+?)&gt;/g
@ -79,9 +80,13 @@ var DISCORD = (function(){
var processed = DOM.escapeHTML(value.replace(REGEX.formatUrlNoEmbed, "$1"));
if (STATE.settings.enableFormatting){
var escapeHtmlMatch = (full, match) => "&#"+match.charCodeAt(0)+";";
processed = processed
.replace(REGEX.formatCodeBlock, (full, ignore, match) => "<code class='block'>"+match.replace(REGEX.specialUnescaped, "\\$1")+"</code>")
.replace(REGEX.formatCodeInline, (full, ignore, match) => "<code class='inline'>"+match.replace(REGEX.specialUnescaped, "\\$1")+"</code>")
.replace(REGEX.specialEscapedBacktick, "&#96;")
.replace(REGEX.formatCodeBlock, (full, ignore, match) => "<code class='block'>"+match.replace(REGEX.specialUnescaped, escapeHtmlMatch)+"</code>")
.replace(REGEX.formatCodeInline, (full, ignore, match) => "<code class='inline'>"+match.replace(REGEX.specialUnescaped, escapeHtmlMatch)+"</code>")
.replace(REGEX.specialEscapedOther, escapeHtmlMatch)
.replace(REGEX.formatBold, "<b>$1</b>")
.replace(REGEX.formatItalic, (full, pre, match) => pre === '\\' ? full : pre+"<i>"+match+"</i>")
.replace(REGEX.formatUnderline, "<u>$1</u>")
@ -93,10 +98,6 @@ var DISCORD = (function(){
.replace(REGEX.mentionChannel, (full, match) => "<span class='link mention-chat'>#"+STATE.getChannelName(match)+"</span>")
.replace(REGEX.mentionUser, (full, match) => "<span class='link mention-user'>@"+STATE.getUserName(match)+"</span>");
if (STATE.settings.enableFormatting){
processed = processed.replace(REGEX.specialEscaped, "$1");
}
return "<p>"+processed+"</p>";
}
else if (property === "embeds"){