X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/ircbot/blobdiff_plain/65aff3a3a7ac86da7aca85a10ab0193c935e6f61..82d3b72ff9cfc17527b7a649ba4c6f537e02544d:/bot.tcl diff --git a/bot.tcl b/bot.tcl index ab788e2..4ea4fd8 100755 --- 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"