From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 14 Feb 2002 19:19:02 +0000 (+0000)
Subject: tellme refuse -> reject.  bugfix
X-Git-Tag: merge-2001-10-09-tell~4
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/ircbot/commitdiff_plain/470968c3916010e5e4ebe135120c52543af9dba8

tellme refuse -> reject.  bugfix
---

diff --git a/bot.tcl b/bot.tcl
index c473ce1..b0d7a7e 100755
--- 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 9d920d2..bc96581 100644
--- 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'):