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

Tidy/DRY

This commit is contained in:
Bryan Ashby 2022-09-25 14:00:52 -06:00
parent 1626db3d52
commit c4518c7b94
No known key found for this signature in database
GPG Key ID: C2C1B501E4EFD994
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
core/servers/content/nntp.js
View File

@ -273,6 +273,7 @@ class NNTPServer extends NNTPServerBase {
message.nntpHeaders = { message.nntpHeaders = {
From: this.getJAMStyleFrom(message, fromName), From: this.getJAMStyleFrom(message, fromName),
'X-Comment-To': toName, 'X-Comment-To': toName,
To: toName, // JAM-ish
Newsgroups: session.group.name, Newsgroups: session.group.name,
Subject: message.subject, Subject: message.subject,
Date: this.getMessageDate(message), Date: this.getMessageDate(message),
@ -384,7 +385,7 @@ class NNTPServer extends NNTPServerBase {
messageUuid = msg && msg.messageUuid; messageUuid = msg && msg.messageUuid;
} else { } else {
// <Message-ID> request // <Message-ID> request
[, messageUuid] = this.getMessageIdentifierParts(messageId); [, messageUuid] = NNTPServer.getMessageIdentifierParts(messageId);
} }
if (!_.isString(messageUuid)) { if (!_.isString(messageUuid)) {
@ -920,7 +921,7 @@ class NNTPServer extends NNTPServerBase {
return this.makeMessageIdentifier(message.messageId, message.messageUuid); return this.makeMessageIdentifier(message.messageId, message.messageUuid);
} }
getMessageIdentifierParts(messageId) { static getMessageIdentifierParts(messageId) {
const m = messageId.match( const m = messageId.match(
/<([0-9]+)\.([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})@enigma-bbs>/ /<([0-9]+)\.([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})@enigma-bbs>/
); );
@ -999,9 +1000,11 @@ class NNTPServer extends NNTPServerBase {
(parsed, callback) => { (parsed, callback) => {
// gather some initially important bits // gather some initially important bits
const subject = parsed.header.get('subject'); const subject = parsed.header.get('subject');
const to = parsed.header.get('to'); // non-standard, may be missing const to = parsed.header.get('to') || parsed.header.get('x-jam-to'); // non-standard, may be missing
const from = tidyFrom( const from = tidyFrom(
parsed.header.get('from') || parsed.header.get('sender') parsed.header.get('from') ||
parsed.header.get('sender') ||
parsed.header.get('x-jam-from')
); );
const date = parsed.header.get('date'); // if not present we'll use 'now' const date = parsed.header.get('date'); // if not present we'll use 'now'
const newsgroups = parsed.header const newsgroups = parsed.header
@ -1085,18 +1088,15 @@ class NNTPServer extends NNTPServerBase {
msgData.parsed.header.get('in-reply-to') || msgData.parsed.header.get('in-reply-to') ||
msgData.parsed.header.get('references') || msgData.parsed.header.get('references') ||
'' ''
) ).split(' ')[0];
.split(' ')[0]
.replace(/[\<\>]/g, '');
if (parentMessageId) { if (parentMessageId) {
let m = /[0-9]+\.([0-9a-f\-]{36})@enigma-bbs/.exec( let [_, messageUuid] =
parentMessageId NNTPServer.getMessageIdentifierParts(parentMessageId);
); if (messageUuid) {
if (m && m[1]) {
const filter = { const filter = {
resultType: 'messageList', resultType: 'messageList',
uuids: m[1], uuids: messageUuid,
limit: 1, limit: 1,
}; };
@ -1131,6 +1131,7 @@ class NNTPServer extends NNTPServerBase {
Message.AddressFlavor.NNTP; Message.AddressFlavor.NNTP;
// :TODO: investigate JAMNTTP clients/etc. // :TODO: investigate JAMNTTP clients/etc.
// :TODO: slurp in various X-XXXX kludges/etc. and bring them in
persistMessage(message, err => { persistMessage(message, err => {
if (!err) { if (!err) {