Add missing ucmdr {} {}

[ircbot] / bot.tcl

diff --git a/bot.tcl b/bot.tcl
index c473ce1cb66d1e287db26018003355dfa85835e4..4ec949dfcef980787ba6b6b23947e4533174bef5 100755 (executable)
--- a/bot.tcl
+++ b/bot.tcl
@@ -233,7 +233,9 @@ proc tell_event_core {nl event} {
        log_intern "tell event error" "$emsg >$errorInfo<"
        set emsg ERROR
     } else {
-       log_intern "tell event" "done $tell_event_teventi $emsg"
+       if {"$emsg" != "nomsgs"} {
+           log_intern "tell event" "done $tell_event_teventi $emsg"
+       }
     }
     return $emsg
 }
@@ -1145,11 +1147,13 @@ proc channelmgr_monoop {} {
 def_ucmd op {
     channelmgr_monoop
     sendout MODE $target +o $n
+    ucmdr {} {}
 }
 
 def_ucmd leave {
     channelmgr_monoop
     doleave $target
+    ucmdr {} {}
 }
 
 def_ucmd invite {
@@ -1328,7 +1332,7 @@ proc tell_delete_msgs {lsenders lrecip} {
 def_ucmd untell {
     prefix_nick
     check_notonchan
-    nick_securitycheck 0
+    if {[nickdb_exists $n]} { nick_securitycheck 0 }
     set recipients [tell_peernicks $text]
     if {![llength $recipients]} {
        usererror "You must say which recipients' messages from you to forget."
@@ -1349,7 +1353,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 +1402,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 +1488,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 +1615,7 @@ proc tellme_sec_desc {v n} {
  securely.  See `help register'.)"
            }
        }
-       refuse {
+       reject {
            return "I shan't accept messages for you."
        }
        mailto {
@@ -1720,7 +1724,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 +1741,7 @@ def_setting tellme {
            set sr sec
            set v [list secure $every]
        }
-       refuse {
+       reject {
            tellme_setting_neednomsgs
            tellme_setting_sec_simple
        }
@@ -1756,10 +1760,11 @@ 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."
+ "Sorry, I shan't change when I'll consider a message delivered, because\
+ you've asked me not to keep messages, or to mail them to you.\
+  You should say `set tellme secure' or some such, first."
                }
            }
            set sr rel
@@ -1883,6 +1888,7 @@ def_ucmd kill {
     set reason "at request of user $nu"
     if {[ta_anymore]} { append reason "; $text" }
     sendout KILL $target $reason
+    ucmdr {} {}
 }
 
 def_ucmd summon {