From f557e5b6e0d3616a517ef530d4562cf311e3f7e3 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Mon, 16 Apr 2018 17:10:19 -0600
Subject: [PATCH] Minor Gopher updates

---
 core/message.js                |  1 +
 core/servers/content/gopher.js | 10 ++++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/core/message.js b/core/message.js
index d7204e13..f1fa2db8 100644
--- a/core/message.js
+++ b/core/message.js
@@ -497,6 +497,7 @@ module.exports = class Message {
 		});
 	}
 
+	//	:TODO: this should only take a UUID...
 	load(options, cb) {
 		assert(_.isString(options.uuid));
 
diff --git a/core/servers/content/gopher.js b/core/servers/content/gopher.js
index 0a20b0aa..4d1e3f6a 100644
--- a/core/servers/content/gopher.js
+++ b/core/servers/content/gopher.js
@@ -153,7 +153,7 @@ exports.getModule = class GopherModule extends ServerModule {
 	}
 
 	defaultGenerator(selectorMatch, cb) {
-		let bannerFile = _.get(Config, 'contentServers.gopher.banner', 'startup_banner.asc');
+		let bannerFile = _.get(Config, 'contentServers.gopher.bannerFile', 'startup_banner.asc');
 		bannerFile = paths.isAbsolute(bannerFile) ? bannerFile : paths.join(__dirname, '../../../misc', bannerFile);
 		fs.readFile(bannerFile, 'utf8', (err, banner) => {
 			if(err) {
@@ -194,6 +194,10 @@ exports.getModule = class GopherModule extends ServerModule {
 		}
 	}
 
+	shortenSubject(subject) {
+		return _.truncate(subject, { length : 30 } );
+	}
+
 	messageAreaGenerator(selectorMatch, cb) {
 		//
 		//	Selector should be:
@@ -222,7 +226,6 @@ exports.getModule = class GopherModule extends ServerModule {
 				}
 
 				this.prepareMessageBody(message.message, msgBody => {
-					//	:TODO: create DRY for subject trimming...
 					const response = `${'-'.repeat(70)}
 To     : ${message.toUserName}
 From   : ${message.fromUserName}
@@ -256,8 +259,7 @@ ${msgBody}
 					this.makeItem(ItemTypes.InfoMessage, '-'.repeat(70)),
 					...msgList.map(msg => this.makeItem(
 						ItemTypes.TextFile,
-						//	:TODO: reasonably trim string
-						`${moment(msg.modTimestamp).format('YYYY-MM-DD hh:mma')}  ${msg.subject} (${msg.fromUserName} to ${msg.toUserName})`,
+						`${moment(msg.modTimestamp).format('YYYY-MM-DD hh:mma')}: ${this.shortenSubject(msg.subject)}  (${msg.fromUserName} to ${msg.toUserName})`,
 						`/msgarea/${confTag}/${areaTag}/${msg.messageUuid}`
 					))
 				].join('');