tellme refuse -> reject. bugfix

diff --git a/bot.tcl b/bot.tcl
index c473ce1cb66d1e287db26018003355dfa85835e4..b0d7a7eaad8a5e90eb3c955cecd7976e45680d76 100755 (executable)
--- a/bot.tcl
+++ b/bot.tcl
@@ -1349,7 +1349,7 @@ def_ucmd delmsg {
     manyset [nickdb_get_sec_effective $n] sec secwhen
     switch -exact $sec {
        insecure { }
-       refuse - mailto {
+       reject - mailto {
            usererror \
  "There are no messages to delete\
  because your message disposition prevents them from being left."
@@ -1398,9 +1398,9 @@ def_ucmd tellme {
     prefix_nick
     ta_nomore
     check_notonchan
-    manyset [msgsdb_get $n tellsec] sec
+    manyset [nickdb_get $n tellsec] sec
     switch -exact $sec {
-       refuse { ucmdr "But, you asked me to refuse messages for you !" {} }
+       reject { ucmdr "But, you asked me to reject messages for you !" {} }
        mailto { ucmdr "But, you asked me to mail your messages to you !" {} }
     }
     switch -exact [tell_event [irctolower $n] tellme] {
@@ -1484,7 +1484,7 @@ $n asked me[expr {[ischan $dest] ? " on $dest" : ""}] to tell you:
  "I've mailed $ctarget, which is what they prefer." \
                 {}
        }
-       refuse {
+       reject {
            usererror "Sorry, $ctarget does not want me to take messages."
        }
        default {
@@ -1611,7 +1611,7 @@ proc tellme_sec_desc {v n} {
  securely.  See `help register'.)"
            }
        }
-       refuse {
+       reject {
            return "I shan't accept messages for you."
        }
        mailto {
@@ -1720,7 +1720,7 @@ def_setting tellme {
            set mr [tellme_rel_desc [nickdb_get $n tellrel] $n]
            return "$ms  $mr"
        }
-       refuse - mailto {
+       reject - mailto {
            return $ms
        }
     }
@@ -1737,7 +1737,7 @@ def_setting tellme {
            set sr sec
            set v [list secure $every]
        }
-       refuse {
+       reject {
            tellme_setting_neednomsgs
            tellme_setting_sec_simple
        }
@@ -1756,7 +1756,7 @@ def_setting tellme {
        unreliable - pester - remind {
            manyset [nickdb_get $n tellsec] sec
            switch -exact $sec {
-               refuse - mailto {
+               reject - mailto {
                    usererror \
  "You can't change your message delivery conditions when\
  your message disposition prevents messages from being left."

diff --git a/helpinfos b/helpinfos
index 9d920d2d114c2033d4811a139dec1f35cd58d2a7..bc96581833e46c9a58034b07f7cf908983a99ee1 100644 (file)
--- a/helpinfos
+++ b/helpinfos
@@ -43,7 +43,7 @@ The !tellme command repeats any messages you have outstanding.
 !set tellme configures how you receive messages sent with !tell:
  set tellme insecure              When I see you.
  set tellme secure [<!interval>]   Hide body (reminding) until ident.
- set tellme refuse                Do not accept messages.
+ set tellme reject                Do not accept messages.
  set tellme mailto <email-addr>   By email.  (Secure nicks only.)
 Default: `secure 600'.  For insecure nicks `secure' == `insecure'.
 To set when to consider messages delivered (see `help !untell'):