moon
/
enigma-bbs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better quote builder

This commit is contained in:
Bryan Ashby 2017-08-24 22:21:37 -06:00
parent dda4ad6698
commit 59716da4d0
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
core/message.js
View File

@ -437,6 +437,11 @@ Message.prototype.getFTNQuotePrefix = function(source) {
return ftnUtil.getQuotePrefix(this[source]); return ftnUtil.getQuotePrefix(this[source]);
}; };
Message.prototype.getTearLinePosition = function(input) {
const m = input.match(/^--- .+$(?![\s\S]*^--- .+$)/m);
return m ? m.index : -1;
};
Message.prototype.getQuoteLines = function(options, cb) { Message.prototype.getQuoteLines = function(options, cb) {
if(!options.termWidth || !options.termHeight || !options.cols) { if(!options.termWidth || !options.termHeight || !options.cols) {
return cb(Errors.MissingParam()); return cb(Errors.MissingParam());
@ -502,7 +507,7 @@ Message.prototype.getQuoteLines = function(options, cb) {
quoteLines.push(`${options.ansiResetSgr}${quotePrefix}${lastSgr}${l}`); quoteLines.push(`${options.ansiResetSgr}${quotePrefix}${lastSgr}${l}`);
focusQuoteLines.push(`${options.ansiFocusPrefixSgr}${quotePrefix}${lastSgr}${l}`); focusQuoteLines.push(`${options.ansiFocusPrefixSgr}${quotePrefix}${lastSgr}${l}`);
lastSgr = (l.match(/(?:\x1b\x5b)[0-9]{1,3}[m](?!.*(?:\x1b\x5b)[0-9]{1,3}[m])/) || [])[0] || ''; // eslint-disable-line no-control-regex lastSgr = (l.match(/(?:\x1b\x5b)[\?=;0-9]*m(?!.*(?:\x1b\x5b)[\?=;0-9]*m)/) || [])[0] || ''; // eslint-disable-line no-control-regex
}); });
quoteLines[quoteLines.length - 1] += options.ansiResetSgr; quoteLines[quoteLines.length - 1] += options.ansiResetSgr;
@ -516,8 +521,8 @@ Message.prototype.getQuoteLines = function(options, cb) {
const input = this.message.trim().replace(/\b/g, ''); const input = this.message.trim().replace(/\b/g, '');
// find *last* tearline // find *last* tearline
let tearLinePos = input.match(/^--- .+$(?![\s\S]*^--- .+$)/m); let tearLinePos = this.getTearLinePosition(input);
tearLinePos = tearLinePos ? tearLinePos.index : input.length; // we just want the index or the entire string tearLinePos = -1 === tearLinePos ? input.length : tearLinePos; // we just want the index or the entire string
input.slice(0, tearLinePos).split(/\r\n\r\n|\n\n/).forEach(paragraph => { input.slice(0, tearLinePos).split(/\r\n\r\n|\n\n/).forEach(paragraph => {
// //
@ -526,7 +531,11 @@ Message.prototype.getQuoteLines = function(options, cb) {
// - New (pre)quoted line - quote_line // - New (pre)quoted line - quote_line
// - Continuation of new/quoted line // - Continuation of new/quoted line
// //
// :TODO: fix extra space in quoted quotes, e.g. "Nu> Su> blah blah" // :TODO: keep lines as-is that
// - have extended ASCII
// - have tabs or " " (3+ spaces), e.g. pre-formatting
// - contain pipe codes
//
let state; let state;
let buf = ''; let buf = '';
let quoteMatch; let quoteMatch;
@ -562,7 +571,7 @@ Message.prototype.getQuoteLines = function(options, cb) {
default : default :
state = quoteMatch ? 'quote_line' : 'line'; state = quoteMatch ? 'quote_line' : 'line';
buf = 'line' === state ? line : _.trimStart(line); buf = 'line' === state ? line : line.replace(/\s/, '');//_.trimStart(line);
break; break;
} }
}); });