Invent secure interval.

diff --git a/bot.tcl b/bot.tcl
index ab788e2fc4716d957e1e1ebd0311c2bc73ab5d46..4ea4fd8cdd1702be8c2f0f992b17d671683a5181 100755 (executable)
--- a/bot.tcl
+++ b/bot.tcl
@@ -1010,7 +1010,7 @@ def_ucmd tell {
     set ctarget $target
     if {[info exists nick_case($ltarget)]} { set ctarget $nick_case($ltarget) }
 
-    manyset [nickdb_get $target tellsec] sec mailto mailwhy
+    manyset [nickdb_get $target tellsec] sec mailtoint mailwhy
     manyset [nickdb_get $target tellrel] rel relint relwithin
     switch -exact $sec {
        insecure - secure {
@@ -1058,17 +1058,17 @@ def_ucmd tell {
            exec /usr/sbin/sendmail -odb -oi -t -oee -f $mailwhy \
                    > /dev/null << \
  "From: $ownmailaddr ($ownfullname)
-To: $mailto
+To: $mailtoint
 Subject: IRC tell from $n
 
 $n asked me[expr {[ischan $dest] ? " on $dest" : ""}] to tell you:
 [exec fmt << " $text"]
 
 (This message was for your nick $ctarget; your account $mailwhy
- arranged for it to be forwarded to $mailto.)
+ arranged for it to be forwarded to $mailtoint.)
 "
             ucmdr \
- "I've mailed $ctarget at $mailto, which is what they prefer." \
+ "I've mailed $ctarget, which is what they prefer." \
                 {}
        }
        refuse {
@@ -1181,20 +1181,20 @@ proc def_setting {opt show_body set_body} {
 }
 
 proc tellme_sec_desc {v} {
-    manyset $v sec mailto
+    manyset $v sec mailtoint
     switch -exact $sec {
        insecure {
            return "I'll tell you your messages whenever I see you."
        }
        secure {
            return \
- "I'll keep the bodies of your messages private until you identify yourself."
+ "I'll keep the bodies of your messages private until you identify yourself, reminding you every [showintervalsecs $mailtoint 1]."
        }
        refuse {
            return "I shan't accept messages for you."
        }
        mailto {
-           return "I'll forward your messages by email to $mailto."
+           return "I'll forward your messages by email to $mailtoint."
        }
        default {
            error "bad tellsec $sec"

diff --git a/helpinfos b/helpinfos
index b81718b0e1dd1b17295181cdb7093904236136a9..5bbbb03fc3c2a55f19818fecd36ef45a7ae432bc 100644 (file)
--- a/helpinfos
+++ b/helpinfos
@@ -42,12 +42,12 @@ tell <nick> <message ...>
 !tellme  repeats any messages you have outstanding.
 !set tellme configures how you receive messages sent with !tell:
  set tellme insecure              When I see you.  (Default.)
- set tellme secure                Hide body until secure ident.
+ set tellme secure [<!interval>]   Hide body (reminding) until ident.
  set tellme refuse                Do not accept messages.
  set tellme mailto <email-addr>   By email.  (Secure nicks only.)
 and also when to consider them delivered (see `help !untell'):
  set tellme unreliable            Tell you once, then forget.
- set tellme pester <!interval>     Remind until you say !delmsg
+ set tellme pester <interval>     Remind until you say !delmsg
  set tellme remind <every-interval> [<within-interval>]
     Remind until you talk on channel within <within-interval>
     of me having told you.  (Default is remind 1h 30s.)