X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=blobdiff_plain;f=bot.tcl;h=d89e18e76e5263d60b6b8d090b60e8c35037b5b3;hb=8302ed4182baca25b405db08a1e88ecba1dbb966;hp=c473ce1cb66d1e287db26018003355dfa85835e4;hpb=8196ac34646309b636d4d7eba3df6f24fa646e85;p=ircbot.git

diff --git a/bot.tcl b/bot.tcl
index c473ce1..d89e18e 100755
--- a/bot.tcl
+++ b/bot.tcl
@@ -5,6 +5,7 @@ set helpfile helpinfos
 source irccore.tcl
 source parsecmd.tcl
 source stdhelp.tcl
+source userv.tcl
 
 defset marktime_min 300
 defset marktime_join_startdelay 5000
@@ -233,7 +234,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
 }
@@ -296,7 +299,7 @@ proc tell_event_core1 {nl event} {
     }
 
     upvar #0 nick_username($nl) nu
-    if {[info exists nu] && "$nu" == "[nickdb_get_username $nl]"} {
+    if {[info exists nu] && ![string compare $nu [nickdb_get_username $nl]]} {
 	append evstate i
     } else {
 	append evstate u
@@ -357,7 +360,7 @@ proc tell_event_core1 {nl event} {
  " [showintervalsecs [expr {$now-$sentwhen}] 1] <$sender> $msg"
 		}
 	    }
-	    if {"$rel" == "unreliable"} {
+	    if {![string compare $rel "unreliable"]} {
 		tell_delete_msgs {} $nl
 		return toldunreliable
 	    }
@@ -375,7 +378,7 @@ proc tell_event_core1 {nl event} {
 	}
 	masl??? {
 	    sendprivmsg $nl {Don't forget about your messages.}
-	    return remind
+	    set re remind
 	}
 	pi????? {
 	    return ignorepi
@@ -491,7 +494,7 @@ proc chanmode_o1 {m g p chan} {
     prefix_nick
     set who [chanmode_arg]
     recordlastseen_n $n "being nice to $who" 1
-    if {"[irctolower $who]" == "[irctolower $nick]"} {
+    if {![ircnick_compare $who $nick]} {
 	set nlower [irctolower $n]
 	upvar #0 nick_unique($nlower) u
 	if {[chandb_exists $chan]} {
@@ -515,7 +518,7 @@ proc chanmode_o0 {m g p chan} {
     prefix_nick
     set who [chanmode_arg]
     recordlastseen_p $p "being mean to $who" 1
-    if {"[irctolower $who]" == "[irctolower $nick]"} {
+    if {![ircnick_compare $who $nick]} {
 	set chandeop($chan) [list [clock seconds] $p]
     }
 }
@@ -540,6 +543,7 @@ proc msg_MODE {p c dest modelist args} {
 }
 
 proc leaving {lchan} {
+    global nick_onchans
     foreach luser [array names nick_onchans] {
 	upvar #0 nick_onchans($luser) oc
 	set oc [grep tc {"$tc" != "$lchan"} $oc]
@@ -586,7 +590,7 @@ proc process_kickpart {chan user} {
     set luser [irctolower $user]
     set lchan [irctolower $chan]
     if {![ischan $chan]} { error "not a channel" }
-    if {"$luser" == "[irctolower $nick]"} {
+    if {![ircnick_compare $luser $nick]} {
 	leaving $lchan
     } else {
 	upvar #0 nick_onchans($luser) oc
@@ -786,19 +790,11 @@ proc msg_366 {p c args} {
 	if {[llength names_chans] > 1} {
 	    set oc [grep tc {[lsearch -exact $tc $names_chans] >= 0} $oc]
 	}
-	if {![llength $oc]} { lnick_forget $n }
+	if {![llength $oc]} { lnick_forget $luser }
     }
     unset names_chans
 }
 
-proc check_username {target} {
-    if {
-	[string length $target] > 8 ||
-        [regexp {[^-0-9a-z]} $target] ||
-        ![regexp {^[a-z]} $target]
-    } { error "invalid username" }
-}
-
 proc somedb__head {} {
     uplevel 1 {
 	set idl [irctolower $id]
@@ -899,7 +895,7 @@ def_somedb_id get {key} {
 	set l $def
     }
     foreach {tkey value} $l {
-	if {"$tkey" == "$key"} { return $value }
+	if {![string compare $tkey $key]} { return $value }
     }
     error "unset setting $key"
 }
@@ -1078,7 +1074,7 @@ def_chancmd mode {
 	error {channel mode must be * or match ([-+][imnpst]+)+}
     }
     chandb_set $chan mode $mode
-    if {"$mode" == "*"} {
+    if {![string compare $mode "*"]} {
 	ucmdr "I won't ever change the mode of $chan." {}
     } else {
 	ucmdr "Whenever I'm alone on $chan, I'll set the mode to $mode." {}
@@ -1145,11 +1141,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 {
@@ -1170,7 +1168,7 @@ def_ucmd invite {
     }
     set ui [chandb_get $ltarget userinvite]
     if {[catch {
-	if {"$ui" == "pub" && !$onchan} {
+	if {![string compare $ui "pub"] && !$onchan} {
 	    usererror "Invitations to $target must be made there with !invite."
 	}
 	if {"$ui" != "all"} {
@@ -1179,16 +1177,17 @@ def_ucmd invite {
 			by a user on the channel."
 	    }
 	}
-	if {"$ui" == "none"} {
+	if {[!string compare $ui "none"]} {
 	    usererror "Sorry, I've not been authorised\
 		    to invite people to $target."
 	}
     } emsg]} {
-	if {"$errorCode" == "BLIGHT USER" && [channel_ismanager $target $n]} {
+	if {![string compare $errorCode "BLIGHT USER"] &&
+	     [channel_ismanager $target $n]} {
 	    if {[catch {
 		nick_securitycheck 1
 	    } emsg2]} {
-		if {"$errorCode" == "BLIGHT USER"} {
+		if {![string compare $errorCode "BLIGHT USER"]} {
 		    usererror "$emsg2  Therefore you can't use your\
 			    channel manager privilege.  $emsg"
 		} else {
@@ -1273,7 +1272,8 @@ proc nickdb_get_username {n} {
 proc nickdb_get_sec_effective {n} {
     set l [nickdb_get $n tellsec]
     set u [nickdb_get_username $n]
-    if {"[lindex $l 0]" == "secure" && ![string length $u]} { set l insecure }
+    if {![string compare [lindex $l 0] "secure"] &&
+        ![string length $u]} { set l insecure }
     return $l
 }
 
@@ -1297,30 +1297,30 @@ proc msgsdb_set_maydelete {n key l otherkey} {
 }
 
 proc tell_delete_msgs {lsenders lrecip} {
-    set ninbound {}
+    set new_inbound {}
     set ndel 0
     foreach {s t m} [msgsdb_get $lrecip inbound] {
 	if {[llength $lsenders]} {
 	    if {[lsearch -exact $lsenders [irctolower $s]] == -1} {
-		lappend ninbound $s $t $m
+		lappend new_inbound $s $t $m
 		continue
 	    }
 	}
 	set rsenders($s) 1
 	incr ndel
     }
-    msgsdb_set_maydelete $lrecip inbound $ninbound outbound
-    if {![llength $ninbound]} {
+    msgsdb_set_maydelete $lrecip inbound $new_inbound outbound
+    if {![llength $new_inbound]} {
 	upvar #0 nick_telling($lrecip) telling
 	catch { unset telling }
     }
     foreach s [array names rsenders] {
-	set noutbound {}
+	set new_outbound {}
 	foreach {r t c} [msgsdb_get $s outbound] {
-	    if {"[irctolower $r]" == "$lrecip"} continue
-	    lappend noutbound $r $t $c
+	    if {![ircnick_compare $r $lrecip]} continue
+	    lappend new_outbound $r $t $c
 	}
-	msgsdb_set_maydelete $s outbound $noutbound inbound
+	msgsdb_set_maydelete $s outbound $new_outbound inbound
     }
     return $ndel
 }
@@ -1328,7 +1328,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 +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] {
@@ -1435,7 +1435,7 @@ def_ucmd tell {
 	    set noutbound {}
 	    set found 0
 	    foreach {recip time count} $outbound {
-		if {"[irctolower $recip]" == "$ltarget"} {
+		if {![ircnick_compare $recip $ltarget]} {
 		    incr count
 		    set recip $ctarget
 		    set found 1
@@ -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 {
@@ -1656,12 +1656,16 @@ def_setting timeformat {
 }
 
 proc marktime_desc {mt} {
-    if {"$mt" == "off"} {
-	return "I will not send you periodic messages."
-    } elseif {"$mt" == "once"} {
-	return "I will send you one informational message when I see you."
-    } else {
-	return "I'll send you a message every [showintervalsecs $mt 0]."
+    switch -exact $mt {
+	off {
+	    return "I will not send you periodic messages."
+	}
+	once {
+	    return "I will send you one informational message when I see you."
+	}
+	default {
+	    return "I'll send you a message every [showintervalsecs $mt 0]."
+	}
     }
 }
 
@@ -1677,9 +1681,12 @@ def_setting marktime {
     set mt [string tolower [ta_word]]
     ta_nomore
 
-    if {"$mt" == "off" || "$mt" == "once"} {
-    } else {
-	set mt [parse_interval $mt $marktime_min]
+    switch -exact $mt {
+	off - once {
+	}
+	default {
+	    set mt [parse_interval $mt $marktime_min]
+	}
     }
     nickdb_set $n marktime $mt
     lnick_marktime_start [irctolower $n] "So:" 500 0
@@ -1720,7 +1727,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 +1744,7 @@ def_setting tellme {
 	    set sr sec
 	    set v [list secure $every]
 	}
-	refuse {
+	reject {
 	    tellme_setting_neednomsgs
 	    tellme_setting_sec_simple
 	}
@@ -1756,10 +1763,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
@@ -1768,7 +1776,7 @@ def_setting tellme {
 		set every [ta_interval_optional 300 3600]
 		lappend v $every
 	    }
-	    if {"$setting" == "remind"} {
+	    if {![string compare $setting remind]} {
 		set within [ta_interval_optional 5 30]
 		if {$within > $every} {
 		    error "remind interval must be at least time to respond"
@@ -1883,6 +1891,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 {
@@ -1934,7 +1943,7 @@ def_ucmd seen {
     set nlower [irctolower $ncase]
     ta_nomore
     set now [clock seconds]
-    if {"$nlower" == "[irctolower $nick]"} {
+    if {![ircnick_compare $nlower $nick]} {
 	usererror "I am not self-aware."
     } elseif {![info exists lastseen($nlower)]} {
 	set rstr "I've never seen $ncase."
@@ -1953,7 +1962,7 @@ def_ucmd seen {
     if {[info exists lf]} { set oldvalue $lf } else { set oldvalue {} }
     set lf [list [list $now $n $where]]
     foreach v $oldvalue {
-	if {"[irctolower [lindex $v 1]]" == "[irctolower $n]"} continue
+	if {![ircnick_compare [lindex $v 1] $n]} continue
 	lappend lf $v
     }
     ucmdr {} $rstr
@@ -1974,17 +1983,24 @@ proc lnick_marktime_doafter {luser why ms mentiontold} {
 
 proc lnick_marktime_reset {luser} {
     set mt [nickdb_get $luser marktime]
-    if {"$mt" == "off" || "$mt" == "once"} return
-    lnick_marktime_doafter $luser "Time passes." [expr {$mt*1000}] 0
+    switch -exact $mt {
+	off - once { }
+	default {
+	    lnick_marktime_doafter $luser "Time passes." [expr {$mt*1000}] 0
+	}
+    }
 }
 
 proc lnick_marktime_start {luser why ms mentiontold} {
     set mt [nickdb_get $luser marktime]
-    if {"$mt" == "off"} {
-	lnick_marktime_cancel $luser
-	if {$mentiontold} { after $ms [list lnick_checktold $luser] }
-    } else {
-	lnick_marktime_doafter $luser $why $ms $mentiontold
+    switch -exact $mt {
+	off {
+	    lnick_marktime_cancel $luser
+	    if {$mentiontold} { after $ms [list lnick_checktold $luser] }
+	}
+	default {
+	    lnick_marktime_doafter $luser $why $ms $mentiontold
+	}
     }
 }