From dbc659c6ceccec730ed06e5b33c3350055bbd1a2 Mon Sep 17 00:00:00 2001
From: Rob Swindell <rob@synchro.net>
Date: Sun, 13 Sep 2020 16:14:26 -0700
Subject: [PATCH] Display helpful message when denying telegram-sent-to-self
Previously, just the NodeNIsNotInUse message would be displayed.
Instead, display the NoNeedToSendMsgToSelf message.
Sysops are free to message themselves.
---
exec/privatemsg.js | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/exec/privatemsg.js b/exec/privatemsg.js
index 67416ee2e7..02b4222f1e 100644
--- a/exec/privatemsg.js
+++ b/exec/privatemsg.js
@@ -1,4 +1,4 @@
-// $Id: privatemsg.js,v 1.10 2020/04/21 20:30:19 rswindell Exp $
+// $Id: privatemsg.js,v 1.10 2020/09/13 20:30:19 rswindell Exp $
// Private Message Module
// Installed in SCFG->System->Loadable Modules->Private Msg
@@ -67,8 +67,6 @@ while(bbs.online && !(console.aborted)) {
continue;
if(node.misc & NODE_POFF)
continue;
- if(node.useron == user.number)
- continue;
if(!shown) {
writeln();
write(bbs.text(NodeLstHdr));
@@ -81,8 +79,6 @@ while(bbs.online && !(console.aborted)) {
var web_users = presence.web_users();
for(w = 0; w < web_users.length; w++) {
var web_user = web_users[w];
- if(web_user.name == user.alias)
- continue;
if(web_user.do_not_disturb)
continue;
if(!shown) {
@@ -103,11 +99,11 @@ while(bbs.online && !(console.aborted)) {
var node_num = parseInt(str, 10);
var user_num;
if(node_num > 0) {
- if(users[node_num - 1] == undefined) {
+ user_num = users[node_num - 1];
+ if(user_num == undefined) {
write(format(bbs.text(NodeNIsNotInUse), node_num));
break;
}
- user_num = users[node_num - 1];
}
else if(str.charAt(0) == '#')
user_num = parseInt(str.slice(1), 10);
@@ -122,6 +118,10 @@ while(bbs.online && !(console.aborted)) {
break;
}
}
+ if(user_num == user.number && !user.is_sysop) {
+ write(format(bbs.text(NoNeedToSendMsgToSelf)));
+ break;
+ }
var user_name = system.username(user_num);
write(format(bbs.text(SendingTelegramToUser), user_name, user_num));
var msg = [];
--
GitLab