Skip to content
Snippets Groups Projects
Commit e4b6cfaa authored by Rob Swindell's avatar Rob Swindell :speech_balloon:
Browse files

Merge branch 'dd_msg_reader_save_msg_time' into 'master'

DDMsgReader: When saving a message on the local BBS PC without all the headers, the date is now included

See merge request !322
parents 3cae636c 8815f10d
No related branches found
No related tags found
2 merge requests!463MRC mods by Codefenix (2024-10-20),!322DDMsgReader: When saving a message on the local BBS PC without all the headers, the date is now included
...@@ -144,6 +144,8 @@ ...@@ -144,6 +144,8 @@
* 2023-08-20 Eric Oulashin Version 1.77 * 2023-08-20 Eric Oulashin Version 1.77
* Including all message headers when saving a message (sysop only) is now * Including all message headers when saving a message (sysop only) is now
* optional. * optional.
* 2023-08-26 Eric Oulashin Version 1.77a
* When saving a message on the local BBS PC without all the headers, the date is now included
*/ */
   
"use strict"; "use strict";
...@@ -250,8 +252,8 @@ var ansiterm = require("ansiterm_lib.js", 'expand_ctrl_a'); ...@@ -250,8 +252,8 @@ var ansiterm = require("ansiterm_lib.js", 'expand_ctrl_a');
   
   
// Reader version information // Reader version information
var READER_VERSION = "1.77"; var READER_VERSION = "1.77a";
var READER_DATE = "2023-08-20"; var READER_DATE = "2023-08-26";
   
// Keyboard key codes for displaying on the screen // Keyboard key codes for displaying on the screen
var UP_ARROW = ascii(24); var UP_ARROW = ascii(24);
...@@ -14779,7 +14781,13 @@ function DigDistMsgReader_SaveMsgToFile(pMsgHdr, pFilename, pPromptPos) ...@@ -14779,7 +14781,13 @@ function DigDistMsgReader_SaveMsgToFile(pMsgHdr, pFilename, pPromptPos)
{ {
// Write to, from, subjetc, etc. to the file // Write to, from, subjetc, etc. to the file
if (this.subBoardCode == "mail") if (this.subBoardCode == "mail")
messageSaveFile.writeln("From " + pMsgHdr.from + "'s personal email"); {
if (!msgIsToCurrentUserByName(pMsgHdr))
{
messageSaveFile.writeln("From " + pMsgHdr.to + "'s personal email");
messageSaveFile.writeln("=======================");
}
}
else else
{ {
var line = format("From sub-board: %s, %s", var line = format("From sub-board: %s, %s",
...@@ -14790,6 +14798,15 @@ function DigDistMsgReader_SaveMsgToFile(pMsgHdr, pFilename, pPromptPos) ...@@ -14790,6 +14798,15 @@ function DigDistMsgReader_SaveMsgToFile(pMsgHdr, pFilename, pPromptPos)
messageSaveFile.writeln("From: " + pMsgHdr.from); messageSaveFile.writeln("From: " + pMsgHdr.from);
messageSaveFile.writeln("To: " + pMsgHdr.to); messageSaveFile.writeln("To: " + pMsgHdr.to);
messageSaveFile.writeln("Subject: " + pMsgHdr.subject); messageSaveFile.writeln("Subject: " + pMsgHdr.subject);
// Message time
var msgWrittenLocalTime = msgWrittenTimeToLocalBBSTime(pMsgHdr);
var dateTimeStr = "";
if (msgWrittenLocalTime != -1)
dateTimeStr = strftime("%a, %d %b %Y %H:%M:%S", msgWrittenLocalTime);
else
dateTimeStr = pMsgHdr.date.replace(/ [-+][0-9]+$/, "");
messageSaveFile.writeln("Date: " + dateTimeStr);
} }
messageSaveFile.writeln("==============================="); messageSaveFile.writeln("===============================");
   
...@@ -17703,7 +17720,7 @@ function searchMsgbase(pSubCode, pSearchType, pSearchString, pListingPersonalEma ...@@ -17703,7 +17720,7 @@ function searchMsgbase(pSubCode, pSearchType, pSearchString, pListingPersonalEma
// deleted. // deleted.
function msgIsToUserByNum(pMsgHdr, pUserNum) function msgIsToUserByNum(pMsgHdr, pUserNum)
{ {
if (typeof(pMsgHdr) != "object") if (typeof(pMsgHdr) !== "object")
return false; return false;
// Return false if the message is marked as deleted and the user can't read deleted messages // Return false if the message is marked as deleted and the user can't read deleted messages
if (((pMsgHdr.attr & MSG_DELETE) == MSG_DELETE) && !canViewDeletedMsgs()) if (((pMsgHdr.attr & MSG_DELETE) == MSG_DELETE) && !canViewDeletedMsgs())
...@@ -17723,6 +17740,16 @@ function msgIsToUserByNum(pMsgHdr, pUserNum) ...@@ -17723,6 +17740,16 @@ function msgIsToUserByNum(pMsgHdr, pUserNum)
return msgIsToUser; return msgIsToUser;
} }
   
// Returns whether or not a message header is to the current logged-in user by name, alias, or handle
function msgIsToCurrentUserByName(pMsgHdr)
{
if (typeof(pMsgHdr) !== "object" || !pMsgHdr.hasOwnProperty("to"))
return false;
var msgToUpper = pMsgHdr.to.toUpperCase();
return (msgToUpper == user.name.toUpperCase() || msgToUpper == user.alias.toUpperCase() || msgToUpper == user.handle.toUpperCase());
}
// Returns whether or not a message is from the current user (either the current // Returns whether or not a message is from the current user (either the current
// logged-in user or the user specified by the userNum command-line argument) // logged-in user or the user specified by the userNum command-line argument)
// and is not deleted. // and is not deleted.
......
Digital Distortion Message Reader Digital Distortion Message Reader
Version 1.77 Version 1.77a
Release date: 2023-08-20 Release date: 2023-08-26
by by
......
...@@ -5,7 +5,9 @@ Revision History (change log) ...@@ -5,7 +5,9 @@ Revision History (change log)
============================= =============================
Version Date Description Version Date Description
------- ---- ----------- ------- ---- -----------
1.77 2023-07-20 Including all message headers when saving a message (sysop 1.77a 2023-08-26 When saving a message on the local BBS PC without all the
headers, the date is now included
1.77 2023-08-20 Including all message headers when saving a message (sysop
only) is now optional. only) is now optional.
1.76 2023-08-18 Fix for "Message header has 'expanded fields'" error when 1.76 2023-08-18 Fix for "Message header has 'expanded fields'" error when
updating message header attributes in certain conditions updating message header attributes in certain conditions
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment