diff --git a/core/ftn_util.js b/core/ftn_util.js index e46ee12c..f1d0860e 100644 --- a/core/ftn_util.js +++ b/core/ftn_util.js @@ -220,8 +220,8 @@ function getQuotePrefix(name) { // http://ftsc.org/docs/fts-0004.001 // function getOrigin(address) { - const origin = _.has(Config.messageNetworks.originName) ? - Config.messageNetworks.originName : + const origin = _.has(Config, 'messageNetworks.originLine') ? + Config.messageNetworks.originLine : Config.general.boardName; const addrStr = new Address(address).toString('5D'); diff --git a/core/scanner_tossers/ftn_bso.js b/core/scanner_tossers/ftn_bso.js index 18ef9f45..d3cda0f7 100644 --- a/core/scanner_tossers/ftn_bso.js +++ b/core/scanner_tossers/ftn_bso.js @@ -734,7 +734,7 @@ function FTNMessageScanTossModule() { } Message.getMessageIdsByMetaValue('FtnKludge', 'MSGID', message.meta.FtnKludge.REPLY, (err, msgIds) => { - if(!err) { + if(msgIds && msgIds.length > 0) { assert(1 === msgIds.length); message.replyToMsgId = msgIds[0]; } @@ -874,10 +874,13 @@ function FTNMessageScanTossModule() { }, function importPacketFiles(packetFiles, callback) { let rejects = []; - async.each(packetFiles, (packetFile, nextFile) => { - self.importMessagesFromPacketFile(paths.join(importDir, packetFile), '', err => { - // :TODO: check err -- log / track rejects, etc. + async.eachSeries(packetFiles, (packetFile, nextFile) => { + self.importMessagesFromPacketFile(paths.join(importDir, packetFile), '', err => { if(err) { + Log.debug( + { path : paths.join(importDir, packetFile), error : err.toString() }, + 'Failed to import packet file'); + rejects.push(packetFile); } nextFile(); @@ -920,7 +923,15 @@ function FTNMessageScanTossModule() { }, function discoverBundles(callback) { fs.readdir(importDir, (err, files) => { - files = files.filter(f => '.pkt' !== paths.extname(f)); + // :TODO: Need to be explicit about files to attempt an extract, e.g. *.su?, *.mo?, ... + // :TODO: if we do much more of this, probably just use the glob module + //files = files.filter(f => '.pkt' !== paths.extname(f)); + + const bundleRegExp = /\.(su|mo|tu|we|th|fr|sa)[0-9A-Za-z]/; + files = files.filter(f => { + const fext = paths.extname(f); + return bundleRegExp.test(fext); + }); async.map(files, (file, transform) => { const fullPath = paths.join(importDir, file); diff --git a/mods/themes/luciano_blocktronics/CCHANGE.ANS b/mods/themes/luciano_blocktronics/CCHANGE.ANS new file mode 100644 index 00000000..885b3cc9 Binary files /dev/null and b/mods/themes/luciano_blocktronics/CCHANGE.ANS differ