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

Merge branch 'dd_msg_reader_reply_netmail_Q' into 'master' 

DDMsgReader Fix: After replying to a netmail, pressing Q at the pause prompt would cause the message header not to be displayed when displaying the message again. Reported by Nelgin

See merge request !543
parents 6ae433ba fa943ce9
No related branches found
No related tags found
1 merge request!543DDMsgReader Fix: After replying to a netmail, pressing Q at the pause prompt would cause the message header not to be displayed when displaying the message again. Reported by Nelgin
Show whitespace changes
Inline Side-by-side
xtrn/DDMsgReader/DDMsgReader.js
+ 17
− 2
View file @ e433008f
......@@ -256,6 +256,11 @@
* When getting a message body, return a print mode of P_UTF8
* or P_AUTO_UTF8 to ensure messages with UTF-8 are printed
* correctly
* 2025-05-15 Eric Oulashin Version 1.96s
* Fix: After replying to a netmail, pressing Q at the
* pause prompt would cause the email header not to be
* displayed when showing the message again, due to
* console.aborted
*/
 
"use strict";
......@@ -363,8 +368,8 @@ var hexdump = load('hexdump_lib.js');
 
 
// Reader version information
var READER_VERSION = "1.96r";
var READER_DATE = "2025-05-10";
var READER_VERSION = "1.96s";
var READER_DATE = "2025-05-15";
 
// Keyboard key codes for displaying on the screen
var UP_ARROW = ascii(24);
......@@ -6103,6 +6108,7 @@ function DigDistMsgReader_ReadMessageEnhanced_Scrollable(msgHeader, allowChgMsgA
}
// If the user quit/aborted, then quit out of reader mode now.
// Resetting console.aborted and line_counter to avoid pausing and screen display issues.
var consoleWasAborted = console.aborted;
console.aborted = false;
console.line_counter = 0;
if (userQuitOrAborted)
......@@ -11713,6 +11719,7 @@ function DigDistMsgReader_ReplyToMsg(pMsgHdr, pMsgText, pPrivate, pMsgIdx)
retObj.postSucceeded = privReplRetObj.sendSucceeded;
retObj.msgWasDeleted = privReplRetObj.msgWasDeleted;
retObj.userQuitOrAborted = privReplRetObj.userQuitOrAborted;
console.aborted = false; // To prevent issues displaying text
// If the user successfully saved the message and the message wasn't deleted,
// then apply the 'replied' attribute to the message Header
if (privReplRetObj.sendSucceeded && !privReplRetObj.msgWasDeleted)
......@@ -11809,6 +11816,7 @@ function DigDistMsgReader_ReplyToMsg(pMsgHdr, pMsgText, pPrivate, pMsgIdx)
retObj.postSucceeded = privReplRetObj.sendSucceeded;
retObj.msgWasDeleted = privReplRetObj.msgWasDeleted;
retObj.userQuitOrAborted = privReplRetObj.userQuitOrAborted;
console.aborted = false; // To prevent issues with displaying text
}
else
{
......@@ -11818,6 +11826,7 @@ function DigDistMsgReader_ReplyToMsg(pMsgHdr, pMsgText, pPrivate, pMsgIdx)
retObj.postSucceeded = bbs.post_msg(this.subBoardCode, replyMode, pMsgHdr);
console.pause();
retObj.userQuitOrAborted = console.aborted;
console.aborted = false; // To prevent issues with displaying text
}
// Remove the messagebase info drop file if it exists
if (file_exists(msgbaseInfoDropFileName))
......@@ -11950,6 +11959,8 @@ function DigDistMsgReader_DoPrivateReply(pMsgHdr, pMsgIdx, pReplyMode)
replyMode |= WM_NETMAIL;
retObj.sendSucceeded = bbs.netmail(emailAddr, replyMode, null, pMsgHdr);
console.pause();
// TODO: Pressing Q here causes the header to not be displayed after
// showing the email again
}
else
{
......@@ -11978,6 +11989,7 @@ function DigDistMsgReader_DoPrivateReply(pMsgHdr, pMsgIdx, pReplyMode)
retObj.sendSucceeded = bbs.email(userNumber, replyMode, null, null, pMsgHdr);
console.pause();
retObj.userQuitOrAborted = console.aborted;
console.aborted = false; // To prevent issues displaying text
}
else
{
......@@ -12030,6 +12042,7 @@ function DigDistMsgReader_DoPrivateReply(pMsgHdr, pMsgIdx, pReplyMode)
replyMode |= WM_NETMAIL;
retObj.sendSucceeded = bbs.netmail(msgDest, replyMode, null, pMsgHdr);
retObj.userQuitOrAborted = console.aborted;
console.aborted = false; // To prevent issues displaying text
console.pause();
}
else
......@@ -12037,6 +12050,7 @@ function DigDistMsgReader_DoPrivateReply(pMsgHdr, pMsgIdx, pReplyMode)
console.crlf();
retObj.sendSucceeded = bbs.email(userNumber, replyMode, null, null, pMsgHdr);
retObj.userQuitOrAborted = console.aborted;
console.aborted = false; // To prevent issues displaying text
console.pause();
}
}
......@@ -12076,6 +12090,7 @@ function DigDistMsgReader_DoPrivateReply(pMsgHdr, pMsgIdx, pReplyMode)
if (!console.noyes(bbs.text(DeleteMailQ).replace("%s", pMsgHdr.from)))
retObj.msgWasDeleted = this.PromptAndDeleteOrUndeleteMessage(pMsgIdx, null, true, null, null, false);
retObj.userQuitOrAborted = console.aborted;
console.aborted = false; // To prevent issues displaying text
}
 
return retObj;
xtrn/DDMsgReader/ddmr_cfg.js
+ 1
− 2
View file @ e433008f
......@@ -5,7 +5,6 @@
// If you have DDMsgReader in a directory other than xtrn/DDMsgReader, then the changes to
// DDMsgReader.cfg will be saved in that directory (assuming you're running ddmr_cfg.js from
// that same directory).
// Currently for DDMsgReader 1.96r.
//
// If you're running DDMsgReader from xtrn/DDMsgReader (the standard location) and you want
// to save the configuration file there (rather than sbbs/mods), you can use one of the
......@@ -18,7 +17,7 @@ require("sbbsdefs.js", "P_NONE");
require("uifcdefs.js", "UIFC_INMSG");
if (!uifc.init("DigDist. Message Reader 1.96r Configurator"))
if (!uifc.init("DigDist. Message Reader 1.96s Configurator"))
{
print("Failed to initialize uifc");
exit(1);
......
xtrn/DDMsgReader/readme.txt
+ 2
− 2
View file @ e433008f
Digital Distortion Message Reader
Version 1.96r
Release date: 2025-05-10
Version 1.96s
Release date: 2025-05-15
by
......
xtrn/DDMsgReader/revision_history.txt
+ 3
− 0
View file @ e433008f
......@@ -5,6 +5,9 @@ Revision History (change log)
=============================
Version Date Description
------- ---- -----------
1.96s 2025-05-15 Fix: After replying to a netmail, pressing Q at the pause
prompt would cause the email header not to be displayed
when showing the message again, due to console.aborted
1.96r 2025-05-10 Another UTF-8 update to ensure messages with UTF-8 are
printed correctly
1.96q 2025-04-20 If DDMsgReader.cfg doesn't exist, DDMsgReader will read
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment