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

diff --git a/bot.tcl b/bot.tcl
index 8a10d05..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
@@ -26,22 +27,47 @@ proc showintervalsecs {howlong abbrev} {
     return [showintervalsecs/[opt timeformat] $howlong $abbrev]
 }
 
+proc formatsf {pfx value} {
+   foreach {min format} { 100 %.0f 10 %.1f 0 %.2f} {
+	set fval [format $format $value]
+	if {$fval < $min} continue
+	return [format "$fval${pfx}" $value]
+   }
+}
+
+proc showintervalsecs/beat {howlong abbrev} {
+    # We split in two to avoid overflow problems.
+    if {$howlong < 86 } {
+	# mB's
+	set pfx mB
+	return [format "%.0fmB" [expr {round($howlong * 1.157)*10} ]]
+    } else {
+	if {$howlong < 86400 } {
+	    # B's
+	    set pfx B
+	    set value [expr {$howlong / 86.4}]
+	} else {
+	    # kB's
+	    set pfx kB
+	    set value [expr {$howlong / 86400.0}]
+	}
+    }
+    return [formatsf $pfx $value]
+}
+
 proc showintervalsecs/ks {howlong abbrev} {
     if {$howlong < 1000} {
 	return "${howlong}s"
     } else {
 	if {$howlong < 1000000} {
-	    set pfx k
+	    set pfx ks
 	    set scale 1000
 	} else {
-	    set pfx M
+	    set pfx Ms
 	    set scale 1000000
 	}
 	set value [expr "$howlong.0 / $scale"]
-	foreach {min format} {100 %.0f 10 %.1f 1 %.2f} {
-	    if {$value < $min} continue
-	    return [format "$format${pfx}s" $value]
-	}
+	return [formatsf $pfx $value]
     }
 }
 
@@ -95,10 +121,13 @@ proc parse_interval {specified min} {
 	ks { set u 1000 }
 	m { set u 60 }
 	h { set u 3600 }
+	mb { set u 0.0864 }
+	b { set u 86.4 }
+	kb { set u 86400 }
 	default { error "unknown unit of time $unit" }
     }
     if {$value > 86400*21/$u} { error "interval too large" }
-    set result [expr {$value*$u}]
+    set result [expr {round($value*$u)}]
     if {$result < $min} { error "interval too small (<${min}s)" }
     return $result
 }
@@ -205,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
 }
@@ -268,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
@@ -290,7 +321,9 @@ proc tell_event_core1 {nl event} {
 	pt???rv {
 	    # consider delivered:
 	    #  (very recently passed, and the user talks)
-	    tell_delete_msgs {} $nl
+	    set ndel [tell_delete_msgs {} $nl]
+	    sendprivmsg $nl \
+ "I'm assuming you got the $ndel message(s) I just passed on."
 	    return delivered
 	}
 	pm????? {
@@ -308,7 +341,7 @@ proc tell_event_core1 {nl event} {
 	    return ignoretalk
 	}
 	ui????? -
-	uaii?uu - uaii??l - uas?i?l -
+	uaii?uu - uaii??l - uas?iuu - uas?i?l -
 	mi????? - pa????l -
 	?Tii??? - ?Ts?i?? {
 	    # pass and then stuff
@@ -327,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
 	    }
@@ -345,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
@@ -461,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]} {
@@ -485,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]
     }
 }
@@ -510,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]
@@ -556,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
@@ -756,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]
@@ -869,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"
 }
@@ -1048,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." {}
@@ -1115,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 {
@@ -1140,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"} {
@@ -1149,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 {
@@ -1174,8 +1203,7 @@ def_ucmd invite {
     }
     set invitees {}
     while {[ta_anymore]} {
-	set invitee [ta_word]
-	check_nick $invitee
+	set invitee [ta_nick]
 	lappend invitees $invitee
     }
     foreach invitee $invitees {
@@ -1244,16 +1272,18 @@ 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
 }
 
 proc tell_peernicks {text} {
+    global errorInfo errorCode
     set text [irctolower [string trim $text]]
     set senders [split $text " "]
     foreach sender $senders {
 	if {[catch { check_nick $sender } emsg]} {
-	    error "invalid sender nick `$sender': $emsg" $errorInfo $errorCode
+	    error "invalid nick `$sender': $emsg" $errorInfo $errorCode
 	}
     }
     return $senders
@@ -1267,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
 }
@@ -1298,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."
@@ -1310,6 +1340,7 @@ def_ucmd untell {
     ucmdr "Removed $ndel as yet undelivered message(s)." {}
 }
 
+def_ucmd_alias delmsgs delmsg
 def_ucmd delmsg {
     global errorInfo errorCode
     prefix_nick
@@ -1318,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."
@@ -1330,10 +1361,20 @@ def_ucmd delmsg {
 	    error "delmsg sec $sec"
 	}
     }
+    if {![llength [msgsdb_get $n inbound]]} {
+	ucmdr "No incoming messages to delete." {}
+    }
     tell_getcstate
+    if {![info exists u]} {
+	usererror \
+ "I can't delete your messages unless I can see you on a channel with me.\
+  Otherwise I might delete a message I hadn't told you about yet."
+    }
     if {"$stt" != "passed"} {
+	set telling [list $u undelivered 0]
 	usererror \
- "There are message(s) you've not yet seen; I'll deliver them to you now.\
+ "There are message(s) you may not yet have seen;\
+ I'll deliver them to you now.\
   If you actually want to delete them, just tell me `delmsg' again."
     }
     set senders [tell_peernicks $text]
@@ -1341,8 +1382,6 @@ def_ucmd delmsg {
     if {!$ndel} {
 	if {[llength $senders]} {
 	    ucmdr "No relevant incoming messages to delete." {}
-	} else {
-	    ucmdr "No incoming messages to delete." {}
 	}
     }
     switch -exact [llength $senders] {
@@ -1350,7 +1389,7 @@ def_ucmd delmsg {
 	1 { ucmdr {} {} "deletes your $ndel message(s) from $senders." }
 	default {
 	    ucmdr {} {} "deletes your $ndel message(s) from\
- [lreplace $senders end end] and [lindex $senders end]."
+ [lreplace $senders end end] and/or [lindex $senders end]."
 	}
     }
 }
@@ -1359,6 +1398,11 @@ def_ucmd tellme {
     prefix_nick
     ta_nomore
     check_notonchan
+    manyset [nickdb_get $n tellsec] sec
+    switch -exact $sec {
+	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] {
 	ERROR - INVALID { ucmdr {} {is ill.  Help!} }
 	nomsgs { ucmdr {You have no messages.} {} }
@@ -1370,7 +1414,7 @@ def_ucmd tell {
     global nick_case ownmailaddr ownfullname
     
     prefix_nick
-    set target [ta_word]
+    set target [ta_nick]
     if {![string length $text]} { error "tell them what?" }
     if {[string length $text] > 400} { error "message too long" }
 
@@ -1391,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
@@ -1440,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 {
@@ -1451,7 +1495,7 @@ $n asked me[expr {[ischan $dest] ? " on $dest" : ""}] to tell you:
 
 def_ucmd who {
     if {[ta_anymore]} {
-	set target [ta_word]; ta_nomore
+	set target [ta_nick]; ta_nomore
 	set myself 1
     } else {
 	prefix_nick
@@ -1529,6 +1573,7 @@ proc timeformat_desc {tf} {
     switch -exact $tf {
 	ks { return "Times will be displayed in seconds or kiloseconds." }
 	hms { return "Times will be displayed in hours, minutes, etc." }
+	beat { return "Times will be displayed in beats (1000B = 1d)." }
 	default { error "invalid timeformat: $v" }
     }
 }
@@ -1566,7 +1611,7 @@ proc tellme_sec_desc {v n} {
  securely.  See `help register'.)"
 	    }
 	}
-	refuse {
+	reject {
 	    return "I shan't accept messages for you."
 	}
 	mailto {
@@ -1578,7 +1623,7 @@ proc tellme_sec_desc {v n} {
     }
 }
 
-proc tellme_rel_desc {v} {
+proc tellme_rel_desc {v n} {
     manyset $v rel every within
     switch -exact $rel {
 	unreliable {
@@ -1611,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]."
+	}
     }
 }
 
@@ -1632,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
@@ -1661,7 +1713,7 @@ proc tellme_setting_sec_simple {} {
 proc tellme_setting_neednomsgs {} {
     uplevel 1 {
 	if {[llength [msgsdb_get $n inbound]]} {
-	    usererror "You must delete the messages you have, first."
+	    usererror "You must delete the incoming messages you have, first."
 	}
     }
 }
@@ -1672,15 +1724,16 @@ def_setting tellme {
     manyset $secv sec
     switch -exact $sec {
 	insecure - secure {
-	    set mr [tellme_rel_desc [nickdb_get $n tellrel]]
+	    set mr [tellme_rel_desc [nickdb_get $n tellrel] $n]
 	    return "$ms  $mr"
 	}
-	refuse - mailto {
+	reject - mailto {
 	    return $ms
 	}
     }
 } {
     set setting [string tolower [ta_word]]
+    set nl [irctolower $n]
     switch -exact $setting {
 	insecure {
 	    tellme_setting_sec_simple
@@ -1691,37 +1744,39 @@ def_setting tellme {
 	    set sr sec
 	    set v [list secure $every]
 	}
-	refuse {
-	    telling_setting_neednomsgs
-	    telling_setting_sec_simple
+	reject {
+	    tellme_setting_neednomsgs
+	    tellme_setting_sec_simple
 	}
 	mailto {
-	    telling_setting_neednomsgs
+	    tellme_setting_neednomsgs
             
-	    if {[string length [set u [nickdb_get_username $n]]]} {
+	    upvar #0 nick_username($nl) nu
+	    if {!([info exists nu] && [string length $nu])} {
 		usererror \
  "Sorry, you must register securely to have your messages mailed\
  (to prevent the use of this feature for spamming).  See `help register'."
 	    }
 	    set sr sec
-	    set v [list mailto [ta_word] $u]
+	    set v [list mailto [ta_word] $nu]
 	}
 	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
 	    set v $setting
 	    if {"$setting" != "unreliable"} {
-		set every [parse_interval_optional 300 3600]
+		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"
@@ -1735,14 +1790,16 @@ def_setting tellme {
 	}
     }
     nickdb_set $n tell$sr $v
-    ucmdr [tellme_${sr}_desc $v] {}
+    upvar #0 nick_telling($nl) telling
+    catch { unset telling }
+    ucmdr [tellme_${sr}_desc $v $n] {}
 }
 
 proc lnick_checktold {luser} {
     set ml [msgsdb_get $luser outbound]
     if {![llength $ml]} return
     set is1 [expr {[llength $ml]==3}]
-    set m1 "FYI, I haven't yet passed on your"
+    set m1 "FYI, I haven't yet delivered your"
     set ol {}
     set now [clock seconds]
     while {[llength $ml]} {
@@ -1815,13 +1872,32 @@ def_ucmd identpass {
 	    irc-identpass $n
     upvar #0 nick_username($luser) rec_username
     set rec_username $username
-    tell_event $luser ident
+    after 50 [list tell_event $luser ident]
     ucmdr "Pleased to see you, $username." {}
 }
 
+def_ucmd kill {
+    global nick
+    prefix_nick
+    set target [ta_nick]
+    if {![nickdb_exists $target]} { error "$target is not a registered nick." }
+    set wantu [nickdb_get $target username]
+    if {![string length $wantu]} { error "$target is insecurely registred." }
+    upvar #0 nick_username([irctolower $n]) nu
+    if {![info exists nu]} { error "You must identify yourself first." }
+    if {"$wantu" != "$nu"} {
+	error "You are the wrong user, $nu - $target belongs to $wantu."
+    }
+    set reason "at request of user $nu"
+    if {[ta_anymore]} { append reason "; $text" }
+    sendout KILL $target $reason
+    ucmdr {} {}
+}
+
 def_ucmd summon {
     set target [ta_word]
     ta_nomore
+    # fixme would be nice if the rest of the text was passed on instead
     check_username $target
     prefix_nick
 
@@ -1867,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."
@@ -1886,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
@@ -1907,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
+	}
     }
 }
 
@@ -1993,6 +2076,10 @@ proc ensure_globalsecret {} {
 }
 
 proc connected {} {
+    global operuserpass
+    if {[info exists operuserpass]} {
+	eval sendout OPER $operuserpass
+    }
     foreach chan [chandb_list] {
 	if {[chandb_get $chan autojoin]} { dojoin $chan }
     }