diff --git a/app/assets/javascripts/discourse/components/bbcode.js b/app/assets/javascripts/discourse/components/bbcode.js index e53d3483aae..7a17830544f 100644 --- a/app/assets/javascripts/discourse/components/bbcode.js +++ b/app/assets/javascripts/discourse/components/bbcode.js @@ -1,4 +1,4 @@ -/*global HANDLEBARS_TEMPLATES:true*/ +/*global HANDLEBARS_TEMPLATES:true md5:true*/ /** Support for BBCode rendering @@ -145,6 +145,44 @@ Discourse.BBCode = { return result; }, + /** + We want to remove quotes from a string before applying markdown to avoid + weird stuff with newlines and such. This will return an object that + contains a new version of the text with the quotes replaced with + unique ids and `template()` function for reapplying them later. + + @method extractQuotes + @param {String} text The text inside which we want to replace quotes + @returns {Object} object containing the new string and template function + **/ + extractQuotes: function(text) { + var result = {text: "" + text, replacements: []}; + + var replacements = [] + + var matches; + while (matches = Discourse.BBCode.QUOTE_REGEXP.exec(result.text)) { + var key = md5(matches[0]); + replacements.push({ + key: key, + value: matches[0], + content: matches[2].trim() + }); + result.text = result.text.replace(matches[0], key + "\n"); + } + + result.template = function(input) { + replacements.each(function(r) { + var val = r.value.trim(); + val = val.replace(r.content, r.content.replace(/\n/g, '
')); + input = input.replace(r.key, val); + }); + return input; + } + + return(result); + }, + /** Replace quotes with appropriate markup @@ -171,13 +209,17 @@ Discourse.BBCode = { }); username = paramsSplit[0]; + // remove leading
s + var content = matches[2].trim(); + // Arguments for formatting args = { username: username, params: params, - quote: matches[2].trim(), + quote: content, avatarImg: opts.lookupAvatar ? opts.lookupAvatar(username) : void 0 }; + // Name of the template templateName = 'quote'; if (opts && opts.environment) templateName = "quote_" + opts.environment; diff --git a/app/assets/javascripts/discourse/components/markdown.js b/app/assets/javascripts/discourse/components/markdown.js index ff87bfb3ce4..dc1001d7941 100644 --- a/app/assets/javascripts/discourse/components/markdown.js +++ b/app/assets/javascripts/discourse/components/markdown.js @@ -99,12 +99,21 @@ Discourse.Markdown = { var converter = new Markdown.Converter(); var mentionLookup = opts.mentionLookup || Discourse.Mention.lookupCache; + var quoteTemplate = null; + // Before cooking callbacks converter.hooks.chain("preConversion", function(text) { Discourse.Markdown.trigger('beforeCook', { detail: text, opts: opts }); return Discourse.Markdown.textResult || text; }); + // Extract quotes so their contents are not passed through markdown. + converter.hooks.chain("preConversion", function(text) { + var extracted = Discourse.BBCode.extractQuotes(text); + quoteTemplate = extracted.template; + return extracted.text; + }); + // Support autolinking of www.something.com converter.hooks.chain("preConversion", function(text) { return text.replace(/(^|[\s\n])(www\.[a-z\.\-\_\(\)\/\?\=\%0-9]+)/gim, function(full, _, rest) { @@ -168,6 +177,12 @@ Discourse.Markdown = { }); converter.hooks.chain("postConversion", function(text) { + + // reapply quotes + if (quoteTemplate) { + text = quoteTemplate(text); + } + return Discourse.BBCode.format(text, opts); }); diff --git a/app/assets/javascripts/external/md5.js b/app/assets/javascripts/external/md5.js new file mode 100644 index 00000000000..bebcdacc26c --- /dev/null +++ b/app/assets/javascripts/external/md5.js @@ -0,0 +1,180 @@ +/*! + * Joseph Myer's md5() algorithm wrapped in a self-invoked function to prevent + * global namespace polution, modified to hash unicode characters as UTF-8. + * + * Copyright 1999-2010, Joseph Myers, Paul Johnston, Greg Holt, Will Bond + * http://www.myersdaily.org/joseph/javascript/md5-text.html + * http://pajhome.org.uk/crypt/md5 + * + * Released under the BSD license + * http://www.opensource.org/licenses/bsd-license + */ +(function() { + function md5cycle(x, k) { + var a = x[0], b = x[1], c = x[2], d = x[3]; + + a = ff(a, b, c, d, k[0], 7, -680876936); + d = ff(d, a, b, c, k[1], 12, -389564586); + c = ff(c, d, a, b, k[2], 17, 606105819); + b = ff(b, c, d, a, k[3], 22, -1044525330); + a = ff(a, b, c, d, k[4], 7, -176418897); + d = ff(d, a, b, c, k[5], 12, 1200080426); + c = ff(c, d, a, b, k[6], 17, -1473231341); + b = ff(b, c, d, a, k[7], 22, -45705983); + a = ff(a, b, c, d, k[8], 7, 1770035416); + d = ff(d, a, b, c, k[9], 12, -1958414417); + c = ff(c, d, a, b, k[10], 17, -42063); + b = ff(b, c, d, a, k[11], 22, -1990404162); + a = ff(a, b, c, d, k[12], 7, 1804603682); + d = ff(d, a, b, c, k[13], 12, -40341101); + c = ff(c, d, a, b, k[14], 17, -1502002290); + b = ff(b, c, d, a, k[15], 22, 1236535329); + + a = gg(a, b, c, d, k[1], 5, -165796510); + d = gg(d, a, b, c, k[6], 9, -1069501632); + c = gg(c, d, a, b, k[11], 14, 643717713); + b = gg(b, c, d, a, k[0], 20, -373897302); + a = gg(a, b, c, d, k[5], 5, -701558691); + d = gg(d, a, b, c, k[10], 9, 38016083); + c = gg(c, d, a, b, k[15], 14, -660478335); + b = gg(b, c, d, a, k[4], 20, -405537848); + a = gg(a, b, c, d, k[9], 5, 568446438); + d = gg(d, a, b, c, k[14], 9, -1019803690); + c = gg(c, d, a, b, k[3], 14, -187363961); + b = gg(b, c, d, a, k[8], 20, 1163531501); + a = gg(a, b, c, d, k[13], 5, -1444681467); + d = gg(d, a, b, c, k[2], 9, -51403784); + c = gg(c, d, a, b, k[7], 14, 1735328473); + b = gg(b, c, d, a, k[12], 20, -1926607734); + + a = hh(a, b, c, d, k[5], 4, -378558); + d = hh(d, a, b, c, k[8], 11, -2022574463); + c = hh(c, d, a, b, k[11], 16, 1839030562); + b = hh(b, c, d, a, k[14], 23, -35309556); + a = hh(a, b, c, d, k[1], 4, -1530992060); + d = hh(d, a, b, c, k[4], 11, 1272893353); + c = hh(c, d, a, b, k[7], 16, -155497632); + b = hh(b, c, d, a, k[10], 23, -1094730640); + a = hh(a, b, c, d, k[13], 4, 681279174); + d = hh(d, a, b, c, k[0], 11, -358537222); + c = hh(c, d, a, b, k[3], 16, -722521979); + b = hh(b, c, d, a, k[6], 23, 76029189); + a = hh(a, b, c, d, k[9], 4, -640364487); + d = hh(d, a, b, c, k[12], 11, -421815835); + c = hh(c, d, a, b, k[15], 16, 530742520); + b = hh(b, c, d, a, k[2], 23, -995338651); + + a = ii(a, b, c, d, k[0], 6, -198630844); + d = ii(d, a, b, c, k[7], 10, 1126891415); + c = ii(c, d, a, b, k[14], 15, -1416354905); + b = ii(b, c, d, a, k[5], 21, -57434055); + a = ii(a, b, c, d, k[12], 6, 1700485571); + d = ii(d, a, b, c, k[3], 10, -1894986606); + c = ii(c, d, a, b, k[10], 15, -1051523); + b = ii(b, c, d, a, k[1], 21, -2054922799); + a = ii(a, b, c, d, k[8], 6, 1873313359); + d = ii(d, a, b, c, k[15], 10, -30611744); + c = ii(c, d, a, b, k[6], 15, -1560198380); + b = ii(b, c, d, a, k[13], 21, 1309151649); + a = ii(a, b, c, d, k[4], 6, -145523070); + d = ii(d, a, b, c, k[11], 10, -1120210379); + c = ii(c, d, a, b, k[2], 15, 718787259); + b = ii(b, c, d, a, k[9], 21, -343485551); + + x[0] = add32(a, x[0]); + x[1] = add32(b, x[1]); + x[2] = add32(c, x[2]); + x[3] = add32(d, x[3]); + } + + function cmn(q, a, b, x, s, t) { + a = add32(add32(a, q), add32(x, t)); + return add32((a << s) | (a >>> (32 - s)), b); + } + + function ff(a, b, c, d, x, s, t) { + return cmn((b & c) | ((~b) & d), a, b, x, s, t); + } + + function gg(a, b, c, d, x, s, t) { + return cmn((b & d) | (c & (~d)), a, b, x, s, t); + } + + function hh(a, b, c, d, x, s, t) { + return cmn(b ^ c ^ d, a, b, x, s, t); + } + + function ii(a, b, c, d, x, s, t) { + return cmn(c ^ (b | (~d)), a, b, x, s, t); + } + + function md51(s) { + // Converts the string to UTF-8 "bytes" when necessary + if (/[\x80-\xFF]/.test(s)) { + s = unescape(encodeURI(s)); + } + txt = ''; + var n = s.length, state = [1732584193, -271733879, -1732584194, 271733878], i; + for (i = 64; i <= s.length; i += 64) { + md5cycle(state, md5blk(s.substring(i - 64, i))); + } + s = s.substring(i - 64); + var tail = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]; + for (i = 0; i < s.length; i++) + tail[i >> 2] |= s.charCodeAt(i) << ((i % 4) << 3); + tail[i >> 2] |= 0x80 << ((i % 4) << 3); + if (i > 55) { + md5cycle(state, tail); + for (i = 0; i < 16; i++) tail[i] = 0; + } + tail[14] = n * 8; + md5cycle(state, tail); + return state; + } + + function md5blk(s) { /* I figured global was faster. */ + var md5blks = [], i; /* Andy King said do it this way. */ + for (i = 0; i < 64; i += 4) { + md5blks[i >> 2] = s.charCodeAt(i) + + (s.charCodeAt(i + 1) << 8) + + (s.charCodeAt(i + 2) << 16) + + (s.charCodeAt(i + 3) << 24); + } + return md5blks; + } + + var hex_chr = '0123456789abcdef'.split(''); + + function rhex(n) { + var s = '', j = 0; + for (; j < 4; j++) + s += hex_chr[(n >> (j * 8 + 4)) & 0x0F] + + hex_chr[(n >> (j * 8)) & 0x0F]; + return s; + } + + function hex(x) { + for (var i = 0; i < x.length; i++) + x[i] = rhex(x[i]); + return x.join(''); + } + + md5 = function (s) { + return hex(md51(s)); + } + + /* this function is much faster, so if possible we use it. Some IEs are the + only ones I know of that need the idiotic second function, generated by an + if clause. */ + function add32(a, b) { + return (a + b) & 0xFFFFFFFF; + } + + if (md5('hello') != '5d41402abc4b2a76b9719d911017c592') { + function add32(x, y) { + var lsw = (x & 0xFFFF) + (y & 0xFFFF), + msw = (x >> 16) + (y >> 16) + (lsw >> 16); + return (msw << 16) | (lsw & 0xFFFF); + } + } +})(); \ No newline at end of file diff --git a/lib/pretty_text.rb b/lib/pretty_text.rb index 7a4720c7bc2..da16c88af70 100644 --- a/lib/pretty_text.rb +++ b/lib/pretty_text.rb @@ -79,6 +79,7 @@ module PrettyText @ctx["helpers"] = Helpers.new + @ctx.load(app_root + "app/assets/javascripts/external/md5.js") @ctx.load(app_root + "app/assets/javascripts/external/Markdown.Converter.js") @ctx.load(app_root + "app/assets/javascripts/external/twitter-text-1.5.0.js") @ctx.load(app_root + "lib/headless-ember.js") diff --git a/spec/components/pretty_text_spec.rb b/spec/components/pretty_text_spec.rb index 943bf0d73ec..0d72813647b 100644 --- a/spec/components/pretty_text_spec.rb +++ b/spec/components/pretty_text_spec.rb @@ -15,15 +15,15 @@ test end it "produces a quote even with new lines in it" do - PrettyText.cook("[quote=\"EvilTrout, post:123, topic:456, full:true\"]ddd\n[/quote]").should == "

" + PrettyText.cook("[quote=\"EvilTrout, post:123, topic:456, full:true\"]ddd\n[/quote]").should == "

" end it "should produce a quote" do - PrettyText.cook("[quote=\"EvilTrout, post:123, topic:456, full:true\"]ddd[/quote]").should == "

" + PrettyText.cook("[quote=\"EvilTrout, post:123, topic:456, full:true\"]ddd[/quote]").should == "

" end it "trims spaces on quote params" do - PrettyText.cook("[quote=\"EvilTrout, post:555, topic: 666\"]ddd[/quote]").should == "

" + PrettyText.cook("[quote=\"EvilTrout, post:555, topic: 666\"]ddd[/quote]").should == "

" end diff --git a/spec/javascripts/components/bbcode_spec.js b/spec/javascripts/components/bbcode_spec.js index bcc5f23a78b..f4b566fc737 100644 --- a/spec/javascripts/components/bbcode_spec.js +++ b/spec/javascripts/components/bbcode_spec.js @@ -202,14 +202,19 @@ describe("Discourse.BBCode", function() { describe("quoting", function() { + // Format text without an avatar lookup + function formatQuote(text) { + return format(text, {lookupAvatar: false}); + } + it("can quote", function() { - expect(format("[quote=\"eviltrout, post:1, topic:1\"]abc[/quote]", { lookupAvatar: false })). + expect(formatQuote("[quote=\"eviltrout, post:1, topic:1\"]abc[/quote]")). toBe("

\n

"); }); it("can nest quotes", function() { - expect(format("[quote=\"eviltrout, post:1, topic:1\"]abc[quote=\"eviltrout, post:2, topic:2\"]nested[/quote][/quote]", { lookupAvatar: false })). + expect(formatQuote("[quote=\"eviltrout, post:1, topic:1\"]abc[quote=\"eviltrout, post:2, topic:2\"]nested[/quote][/quote]")). toBe("

\n


\n2

"); }); it("includes no avatar if none is found", function() { @@ -33,7 +33,7 @@ describe("Discourse.Markdown", function() { lookupAvatar: function(name) { return null; } }); expect(cooked).toBe("

1

\n

2

"); + " \n bob\n said:\n \n
my quote
\n\n


\n2

"); }); describe("Links", function() {