X-Git-Url: https://git.distorted.org.uk/~mdw/ircbot/blobdiff_plain/534e26a9446218a12c0ac24ab6c95fb451d48a07..574abac6430df672a6ad566fffcce7422933c68a:/bot.tcl

diff --git a/bot.tcl b/bot.tcl
index 140ff1c..da2a472 100755
--- a/bot.tcl
+++ b/bot.tcl
@@ -1,265 +1,27 @@
 # Core bot code
 
-proc defset {varname val} {
-    upvar #0 $varname var
-    if {![info exists var]} { set var $val }
-}
-
-# must set host
-defset port 6667
-
-defset nick testbot
-defset ownfullname "testing bot"
-defset ownmailaddr test-irc-bot@example.com
-
-defset musthaveping_ms 10000
-defset out_maxburst 6
-defset out_interval 2100
-defset out_lag_lag 5000
-defset out_lag_very 25000
-
-proc manyset {list args} {
-    foreach val $list var $args {
-	upvar 1 $var my
-	set my $val
-    }
-}
-
-proc try_except_finally {try except finally} {
-    global errorInfo errorCode
-    set er [catch { uplevel 1 $try } emsg]
-    if {$er} {
-	set ei $errorInfo
-	set ec $errorCode
-	if {[catch { uplevel 1 $except } emsg3]} {
-	    append ei "\nALSO ERROR HANDLING ERROR:\n$emsg3"
-	}
-    }
-    set er2 [catch { uplevel 1 $finally } emsg2]
-    if {$er} {
-	if {$er2} {
-	    append ei "\nALSO ERROR CLEANING UP:\n$emsg2"
-	}
-	return -code $er -errorinfo $ei -errorcode $ec $emsg
-    } elseif {$er2} {
-	return -code $er2 -errorinfo $errorInfo -errorcode $errorCode $emsg2
-    } else {
-	return $emsg
-    }
-}
+source irccore.tcl
 
-proc out__vars {} {
-    uplevel 1 {
-	global out_queue out_creditms out_creditat out_interval out_maxburst
-	global out_lag_lag out_lag_very
-#set pr [lindex [info level 0] 0]
-#puts $pr>[clock seconds]|$out_creditat|$out_creditms|[llength $out_queue]<
-    }
-}
-
-proc out_lagged {} {
-    out__vars
-    if {[llength $out_queue]*$out_interval > $out_lag_very} {
-	return 2
-    } elseif {[llength $out_queue]*$out_interval > $out_lag_lag} {
+proc unlogged_content_msg {prefix params} {
+    if {![regexp {^[&#+!]} [lindex $params 0]] ||
+        [regexp {^![a-z][-a-z]*[a-z]( .*)?$} [lindex $params 1]]} {
 	return 1
-    } else {
-	return 0
-    }
-}
-
-proc out_restart {} {
-    out__vars
-    
-    set now [clock seconds]
-    incr out_creditms [expr {($now - $out_creditat) * 1000}]
-    set out_creditat $now
-    if {$out_creditms > $out_maxburst*$out_interval} {
-	set out_creditms [expr {$out_maxburst*$out_interval}]
-    }
-    out_runqueue $now
-}
-
-proc out_runqueue {now} {
-    global sock
-    out__vars
-    
-    while {[llength $out_queue] && $out_creditms >= $out_interval} {
-#puts rq>$now|$out_creditat|$out_creditms|[llength $out_queue]<
-	manyset [lindex $out_queue 0] orgwhen msg
-	set out_queue [lrange $out_queue 1 end]
-	if {[llength $out_queue]} {
-	    append orgwhen "+[expr {$now - $orgwhen}]"
-	    append orgwhen ([llength $out_queue])"
-	}
-	puts "$orgwhen -> $msg"
-	puts $sock $msg
-	incr out_creditms -$out_interval
-    }
-    if {[llength $out_queue]} {
-	after $out_interval out_nextmessage
-    }
-}
-
-proc out_nextmessage {} {
-    out__vars
-    set now [clock seconds]
-    incr out_creditms $out_interval
-    set out_creditat $now
-    out_runqueue $now
-}
-
-proc sendout_priority {priority command args} {
-    global sock out_queue
-    if {[llength $args]} {
-	set la [lindex $args end]
-	set args [lreplace $args end end]
-	foreach i $args {
-	    if {[regexp {[: ]} $i]} {
-		error "bad argument in output $i ($command $args)"
-	    }
-	}
-	lappend args :$la
-    }
-    set args [lreplace $args 0 -1 $command]
-    set string [join $args { }]
-    set now [clock seconds]
-    set newe [list $now $string]
-    if {$priority} {
-	set out_queue [concat [list $newe] $out_queue]
-    } else {
-	lappend out_queue $newe
-    }
-    if {[llength $out_queue] == 1} {
-	out_restart
-    }
-}
-
-proc sendout {command args} { eval sendout_priority [list 0 $command] $args }
-    
-proc log {data} {
-    puts $data
-}
-
-proc logerror {data} {
-    log $data
-}
-
-proc saveeic {} {
-    global saveei saveec errorInfo errorCode
-
-    set saveei $errorInfo
-    set saveec $errorCode
-
-    puts ">$saveec|$saveei<"
-}
-
-proc bgerror {msg} {
-    global save
-    logerror $msg
-    saveeic
-}
-
-proc onread {args} {
-    global sock nick calling_nick errorInfo errorCode
-    
-    if {[gets $sock line] == -1} { fail "EOF/error on input" }
-    regsub -all "\[^ -\176\240-\376\]" $line ? line
-    set org $line
-    
-    set ei $errorInfo
-    set ec $errorCode
-    catch { unset calling_nick }
-    set errorInfo $ei
-    set errorCode $ec
-    
-    if {[regexp -nocase {^:([^ ]+) (.*)} $line dummy prefix remain]} {
-	set line $remain
-	if {[regexp {^([^!]+)!} $prefix dummy maybenick]} {
-	    set calling_nick $maybenick
-	    if {"[irctolower $maybenick]" == "[irctolower $nick]"} return
-	}
-    } else {
-	set prefix {}
-    }
-    if {![string length $line]} { return }
-    if {![regexp -nocase {^([0-9a-z]+) *(.*)} $line dummy command line]} {
-	log "bad command: $org"
-	return
-    }
-    set command [string toupper $command]
-    set params {}
-    while {[regexp {^([^ :]+) *(.*)} $line dummy thisword line]} {
-	lappend params $thisword
-    }
-    if {[regexp {^:(.*)} $line dummy thisword]} {
-	lappend params $thisword
-    } elseif {[string length $line]} {
-	log "junk at end: $org"
-	return
-    }
-    if {"$command" == "PRIVMSG" &&
-        [regexp {^[&#+!]} [lindex $params 0]] &&
-        ![regexp {^!} [lindex $params 1]]} {
-	# on-channel message, ignore
-	catch {
-	    recordlastseen_p $prefix "talking on [lindex $params 0]" 1
-	}
-	return
-    }
-    log "[clock seconds] <- $org"
-    set procname msg_$command
-    if {[catch { info body $procname }]} { return }
-    if {[catch {
-	eval [list $procname $prefix $command] $params
-    } emsg]} {
-	logerror "error: $emsg ($prefix $command $params)"
-	saveeic
     }
+    # on-channel message, ignore
+    set chan [lindex $params 0]
+    upvar #0 chan_lastactivity([irctolower $chan]) la
+    set la [clock seconds]
+    catch { recordlastseen_p $prefix "talking on $chan" 1 }
+    return
 }
 
-proc sendprivmsg {dest l} {
-    foreach v [split $l "\n"] {
-	sendout [expr {[ischan $dest] ? "PRIVMSG" : "NOTICE"}] $dest $v
-    }
-}
-proc sendaction_priority {priority dest what} {
-    sendout_priority $priority PRIVMSG $dest "\001ACTION $what\001"
-}
-proc msendprivmsg {dest ll} { foreach l $ll { sendprivmsg $dest $l } }
-proc msendprivmsg_delayed {delay dest ll} { after $delay [list msendprivmsg $dest $ll] }
+proc usererror {emsg} { error $emsg {} {BLIGHT USER} }
 
 proc prefix_none {} {
     upvar 1 p p
     if {[string length $p]} { error "prefix specified" }
 }
 
-proc msg_PING {p c s1} {
-    global musthaveping_after
-    prefix_none
-    sendout PONG $s1
-    if {[info exists musthaveping_after]} connected
-}
-
-proc check_nick {n} {
-    if {[regexp -nocase {[^][\\`_^{|}a-z0-9-]} $n]} { error "bad char in nick" }
-    if {[regexp {^[-0-9]} $n]} { error "bad nick start" }
-}
-
-proc ischan {dest} {
-    return [regexp {^[&#+!]} $dest]
-}
-
-proc irctolower {v} {
-    foreach {from to} [list "\\\[" "{" \
-			  "\\\]" "}" \
-	                  "\\\\" "|" \
-			  "~"    "^"] {
-	regsub -all $from $v $to v
-    }
-    return [string tolower $v]
-}
-
 proc prefix_nick {} {
     global nick
     upvar 1 p p
@@ -271,11 +33,11 @@ proc prefix_nick {} {
     }
 }
 
-proc showintervalsecs {howlong} {
-    return [showintervalsecs/[opt timeformat] $howlong]
+proc showintervalsecs {howlong abbrev} {
+    return [showintervalsecs/[opt timeformat] $howlong $abbrev]
 }
 
-proc showintervalsecs/ks {howlong} {
+proc showintervalsecs/ks {howlong abbrev} {
     if {$howlong < 1000} {
 	return "${howlong}s"
     } else {
@@ -294,15 +56,19 @@ proc showintervalsecs/ks {howlong} {
     }
 }
 
-proc format_qty {qty unit} {
+proc format_qty {qty unit abbrev} {
     set o $qty
-    append o " "
-    append o $unit
-    if {$qty != 1} { append o s }
+    if {$abbrev} {
+	append o [string range $unit 0 0]
+    } else {
+	append o " "
+	append o $unit
+	if {$qty != 1} { append o s }
+    }
     return $o
 }
 
-proc showintervalsecs/hms {qty} {
+proc showintervalsecs/hms {qty abbrev} {
     set ul {second 60 minute 60 hour 24 day 7 week}
     set remainv 0
     while {[llength $ul] > 1 && $qty >= [set uv [lindex $ul 1]]} {
@@ -311,10 +77,10 @@ proc showintervalsecs/hms {qty} {
 	set qty [expr {($qty-$remainv)/$uv}]
 	set ul [lreplace $ul 0 1]
     }
-    set o [format_qty $qty [lindex $ul 0]]
+    set o [format_qty $qty [lindex $ul 0] $abbrev]
     if {$remainv} {
-	append o " "
-	append o [format_qty $remainv $remainu]
+	if {!$abbrev} { append o " " }
+	append o [format_qty $remainv $remainu $abbrev]
     }
     return $o
 }
@@ -323,7 +89,7 @@ proc showinterval {howlong} {
     if {$howlong <= 0} {
 	return {just now}
     } else {
-	return "[showintervalsecs $howlong] ago"
+	return "[showintervalsecs $howlong 0] ago"
     }
 }
 
@@ -413,7 +179,31 @@ proc recordlastseen_n {n how here} {
 	msendprivmsg_delayed 1000 $n $ml
     }
 }
-		
+
+proc note_topic {showoff whoby topic} {
+    set msg "FYI, $whoby has changed the topic on $showoff"
+    if {[string length $topic] < 160} {
+	append msg " to $topic"
+    } else {
+	append msg " but it is too long to reproduce here !"
+    }
+    set showoff [irctolower $showoff]
+    set tell [chandb_get $showoff topictell]
+    if {[lsearch -exact $tell *] >= 0} {
+	set tryspies [chandb_list]
+    } else {
+	set tryspies $tell
+    }
+    foreach spy $tryspies {
+	set see [chandb_get $spy topicsee]
+	if {[lsearch -exact $see $showoff] >= 0 || \
+		([lsearch -exact $see *] >= 0 && \
+		[lsearch -exact $tell $spy] >= 0)} {
+	    sendprivmsg $spy $msg
+	}
+    }
+}
+
 proc recordlastseen_p {p how here} {
     prefix_nick
     recordlastseen_n $n $how $here
@@ -486,6 +276,13 @@ proc leaving {lchan} {
     }
     upvar #0 chan_nicks($lchan) nlist
     unset nlist
+    upvar #0 chan_lastactivity($lchan) la
+    catch { unset la }
+}
+
+proc doleave {lchan} {
+    sendout PART $lchan
+    leaving $lchan
 }
 
 proc dojoin {lchan} {
@@ -498,15 +295,18 @@ proc check_justme {lchan} {
     global nick
     upvar #0 chan_nicks($lchan) nlist
     if {[llength $nlist] != 1} return
-    if {"[lindex $nlist 0]" != "$nick"} return
+    if {"[lindex $nlist 0]" != "[irctolower $nick]"} return
     if {[chandb_exists $lchan]} {
 	set mode [chandb_get $lchan mode]
 	if {"$mode" != "*"} {
 	    sendout MODE $lchan $mode
 	}
+	set topic [chandb_get $lchan topicset]
+	if {[string length $topic]} {
+	    sendout TOPIC $lchan $topic
+	}
     } else {
-	sendout PART $lchan
-	leaving $lchan
+	doleave $lchan
     }
 }
 
@@ -532,6 +332,13 @@ proc process_kickpart {chan user} {
     }
 }
 
+proc msg_TOPIC {p c dest topic} {
+    prefix_nick
+    if {![ischan $dest]} return
+    recordlastseen_n $n "changing the topic on $dest" 1
+    note_topic [irctolower $dest] $n $topic
+}
+
 proc msg_KICK {p c chans users comment} {
     set chans [split $chans ,]
     set users [split $users ,]
@@ -552,11 +359,14 @@ set nick_arys {onchans username unique}
 # nick_username($luser) -> <securely known local username>
 # nick_unique($luser) -> <counter>
 # nick_case($luser) -> $user  (valid even if no longer visible)
+# nick_markid($luser) -> <after id for marktime>
 
 # chan_nicks($lchan) -> [list ... $luser ...]
+# chan_lastactivity($lchan) -> [clock seconds]
 
 proc lnick_forget {luser} {
     global nick_arys chan_nicks
+    lnick_marktime_cancel $luser
     foreach ary $nick_arys {
 	upvar #0 nick_${ary}($luser) av
 	catch { unset av }
@@ -584,20 +394,22 @@ proc msg_NICK {p c newnick} {
     prefix_nick
     recordlastseen_n $n "changing nicks to $newnick" 0
     recordlastseen_n $newnick "changing nicks from $n" 1
+    set luser [irctolower $n]
+    lnick_marktime_cancel $luser
+    set lusernew [irctolower $newnick]
     foreach ary $nick_arys {
-	upvar #0 nick_${ary}($n) old
-	upvar #0 nick_${ary}($newnick) new
+	upvar #0 nick_${ary}($luser) old
+	upvar #0 nick_${ary}($lusernew) new
 	if {[info exists new]} { error "nick collision ?! $ary $n $newnick" }
 	if {[info exists old]} { set new $old; unset old }
     }
-    upvar #0 nick_onchans($new)
-    set luser [irctolower $n]
-    set lusernew [irctolower $newnick]
+    upvar #0 nick_onchans($lusernew) oc
     foreach ch $oc {
 	upvar #0 chan_nicks($ch) nlist
 	set nlist [grep tn {"$tn" != "$luser"} $nlist]
 	lappend nlist $lusernew
     }
+    lnick_marktime_start $lusernew "Hi." 500
     nick_case $newnick
 }
 
@@ -611,8 +423,16 @@ proc nick_ishere {n} {
 proc msg_JOIN {p c chan} {
     prefix_nick
     recordlastseen_n $n "joining $chan" 1
-    upvar #0 nick_onchans([irctolower $n]) oc
-    lappend oc [irctolower $chan]
+    set nl [irctolower $n]
+    set lchan [irctolower $chan]
+    upvar #0 nick_onchans($nl) oc
+    upvar #0 chan_nicks($lchan) nlist
+    if {![info exists oc]} {
+	global marktime_join_startdelay
+	lnick_marktime_start $nl "Welcome." $marktime_join_startdelay
+    }
+    lappend oc $lchan
+    lappend nlist $nl
     nick_ishere $n
 }
 proc msg_PART {p c chan} {
@@ -627,6 +447,8 @@ proc msg_QUIT {p c why} {
 }
 
 proc msg_PRIVMSG {p c dest text} {
+    global errorCode
+    
     prefix_nick
     if {[ischan $dest]} {
 	recordlastseen_n $n "invoking me in $dest" 1
@@ -642,11 +464,12 @@ proc msg_PRIVMSG {p c dest text} {
 	set ucmd [ta_word]
 	set procname ucmd/[string tolower $ucmd]
 	if {[catch { info body $procname }]} {
-	    error "unknown command; try help for help"
+	    usererror "Unknown command; try help for help."
 	}
 	$procname $p $dest
     } rv]} {
-	sendprivmsg $n "error: $rv"
+	if {"$errorCode" != "BLIGHT USER"} { set rv "error: $rv" }
+	sendprivmsg $n $rv
     } else {
 	manyset $rv priv_msgs pub_msgs priv_acts pub_acts
 	foreach {td val} [list $n $priv_acts $output $pub_acts] {
@@ -748,7 +571,7 @@ proc ucmdr {priv pub args} {
 }
 
 proc loadhelp {} {
-    global help_topics
+    global help_topics errorInfo
 
     catch { unset help_topics }
     set f [open helpinfos r]
@@ -763,40 +586,54 @@ proc loadhelp {} {
 		    unset topic
 		    unset lines
 		}
-	    } elseif {[regexp {^!([-+._0-9a-z]*)$} $l dummy newtopic]} {
+	    } elseif {[regexp {^\:\:} $l]} {
+	    } elseif {[regexp {^\:([-+._0-9a-z]*)$} $l dummy newtopic]} {
 		if {[info exists topic]} {
 		    error "help $newtopic while in $topic"
 		}
 		set topic $newtopic
 		set lines {}
-	    } elseif {[regexp {^[^!#]} $l]} {
+	    } elseif {[regexp {^[^:#]} $l]} {
 		set topic
+		regsub -all {([^\\])\!\$?} _$l {\1} l
+		regsub -all {\\(.)} $l {\1} l
+		regsub {^_} $l {} l
 		lappend lines [string trimright $l]
 	    } else {
 		error "eh ? $lno: $l"
 	    }
 	}
 	if {[info exists topic]} { error "unfinished topic $topic" }
-    } {} {
+    } {
+	set errorInfo "in helpinfos line $lno\n$errorInfo"
+    } {
 	close $f
     }
 }
 
 def_ucmd help {
+    upvar 1 n n
+
+    set topic [irctolower [string trim $text]]
+    if {[string length $topic]} {
+	set ontopic " on `$topic'"
+    } else {
+	set ontopic ""
+    }
     if {[set lag [out_lagged]]} {
 	if {[ischan $dest]} { set replyto $dest } else { set replyto $n }
 	if {$lag > 1} {
 	    sendaction_priority 1 $replyto \
-		"is very lagged.  Please ask for help again later."
+		"is very lagged.  Please ask for help$ontopic again later."
 	    ucmdr {} {}
 	} else {
 	    sendaction_priority 1 $replyto \
-		"is lagged.  Your help will arrive shortly ..."
+		"is lagged.  Your help$ontopic will arrive shortly ..."
 	}
     }
     
-    upvar #0 help_topics([irctolower [string trim $text]]) info
-    if {![info exists info]} { ucmdr "No help on $text, sorry." {} }
+    upvar #0 help_topics($topic) info
+    if {![info exists info]} { ucmdr "No help on $topic, sorry." {} }
     ucmdr $info {}
 }
 
@@ -858,8 +695,15 @@ def_somedb_id delete {} {
     file delete $idfn
 }
 
-set default_settings_nick {timeformat ks}
-set default_settings_chan {autojoin 1  mode *}
+set default_settings_nick {timeformat ks  marktime off}
+set default_settings_chan {
+    autojoin 1
+    mode *
+    userinvite pub
+    topicset {}
+    topicsee {}
+    topictell {}
+}
 
 def_somedb_id set {args} {
     upvar #0 default_settings_$nickchan def
@@ -900,16 +744,18 @@ proc opt {key} {
 
 proc check_notonchan {} {
     upvar 1 dest dest
-    if {[ischan $dest]} { error "that command must be sent privately" }
+    if {[ischan $dest]} { usererror "That command must be sent privately." }
 }
 
 proc nick_securitycheck {strict} {
     upvar 1 n n
-    if {![nickdb_exists $n]} { error "you are unknown to me, use `register'." }
+    if {![nickdb_exists $n]} {
+	usererror "You are unknown to me, use `register'."
+    }
     set wantu [nickdb_get $n username]
     if {![string length $wantu]} {
 	if {$strict} {
-	    error "that feature is only available to secure users, sorry."
+	    usererror "That feature is only available to secure users, sorry."
 	} else {
 	    return
 	}
@@ -917,19 +763,25 @@ proc nick_securitycheck {strict} {
     set luser [irctolower $n]
     upvar #0 nick_username($luser) nu
     if {![info exists nu]} {
-	error "nick $n is secure, you must identify yourself first."
+	usererror "Nick $n is secure, you must identify yourself first."
     }
     if {"$wantu" != "$nu"} {
-	error "you are the wrong user - the nick $n belongs to $wantu, not $nu"
+	usererror "You are the wrong user -\
+		the nick $n belongs to $wantu, not $nu."
     }
 }
 
-proc channel_securitycheck {channel n} {
-    # You must also call `nick_securitycheck 1'
+proc channel_ismanager {channel n} {
     set mgrs [chandb_get $channel managers]
-    if {[lsearch -exact [irctolower $mgrs] [irctolower $n]] < 0} {
-	error "you are not a manager of $channel"
+    return [expr {[lsearch -exact [irctolower $mgrs] [irctolower $n]] >= 0}]
+}
+
+proc channel_securitycheck {channel} {
+    upvar n n
+    if {![channel_ismanager $channel $n]} {
+	usererror "You are not a manager of $channel."
     }
+    nick_securitycheck 1
 }
 
 proc def_chancmd {name body} {
@@ -937,34 +789,52 @@ proc def_chancmd {name body} {
 	    "    upvar 1 target chan; upvar 1 n n; upvar 1 text text; $body"
 }
 
-def_chancmd manager {
+proc ta_listop {findnow procvalue} {
+    # findnow and procvalue are code fragments which will be executed
+    # in the caller's level.  findnow should set ta_listop_ev to
+    # the current list, and procvalue should treat ta_listop_ev as
+    # a proposed value in the list and check and possibly modify
+    # (canonicalise?) it.  After ta_listop, ta_listop_ev will
+    # be the new value of the list.
+    upvar 1 ta_listop_ev exchg
+    upvar 1 text text
     set opcode [ta_word]
     switch -exact _$opcode {
-	_= { set ml {} }
+	_= { }
 	_+ - _- {
-	    if {[chandb_exists $chan]} {
-		set ml [chandb_get $chan managers]
-	    } else {
-		set ml [list [irctolower $n]]
-	    }
+	    uplevel 1 $findnow
+	    foreach item $exchg { set array($item) 1 }
 	}
 	default {
-	    error "`channel manager' opcode must be one of + - ="
+	    error "list change opcode must be one of + - ="
 	}
     }
-    foreach nn [split $text " "] {
-	if {![string length $nn]} continue
-	check_nick $nn
-	set nn [irctolower $nn]
+    foreach exchg [split $text " "] {
+	if {![string length $exchg]} continue
+	uplevel 1 $procvalue
 	if {"$opcode" != "-"} {
-	    lappend ml $nn
+	    set array($exchg) 1
 	} else {
-	    set ml [grep nq {"$nq" != "$nn"} $ml]
+	    catch { unset array($exchg) }
 	}
     }
-    if {[llength $ml]} {
-	chandb_set $chan managers $ml
-	ucmdr "Managers of $chan: $ml" {}
+    set exchg [lsort [array names array]]
+}
+
+def_chancmd manager {
+    ta_listop {
+	if {[chandb_exists $chan]} {
+	    set ta_listop_ev [chandb_get $chan managers]
+	} else {
+	    set ta_listop_ev [list [irctolower $n]]
+	}
+    } {
+	check_nick $ta_listop_ev
+	set ta_listop_ev [irctolower $ta_listop_ev]
+    }
+    if {[llength $ta_listop_ev]} {
+	chandb_set $chan managers $ta_listop_ev
+	ucmdr "Managers of $chan: $ta_listop_ev" {}
     } else {
 	chandb_delete $chan
 	ucmdr {} {} "forgets about managing $chan." {}
@@ -979,8 +849,59 @@ def_chancmd autojoin {
 	default { error "channel autojoin must be `yes' or `no' }
     }
     chandb_set $chan autojoin $nv
-    ucmdr [expr {$nv ? "I will join #chan when I'm restarted " : \
-	    "I won't join #chan when I'm restarted "}] {}
+    ucmdr [expr {$nv ? "I will join $chan when I'm restarted " : \
+	    "I won't join $chan when I'm restarted "}] {}
+}
+
+def_chancmd userinvite {
+    set nv [string tolower [ta_word]]
+    switch -exact $nv {
+	pub { set txt "!invite will work for $chan, but it won't work by /msg" }
+	here { set txt "!invite and /msg invite will work, but only for users who are already on $chan." }
+	all { set txt "Any user will be able to invite themselves or anyone else to $chan." }
+	none { set txt "I will not invite anyone to $chan." }
+	default {
+	    error "channel userinvite must be `pub', `here', `all' or `none'
+	}
+    }
+    chandb_set $chan userinvite $nv
+    ucmdr $txt {}
+}
+
+def_chancmd topic {
+    set what [ta_word]
+    switch -exact $what {
+	leave {
+	    ta_nomore
+	    chandb_set $chan topicset {}
+	    ucmdr "I won't ever change the topic of $chan." {}
+	}
+	set {
+	    set t [string trim $text]
+	    if {![string length $t]} {
+		error "you must specific the topic to set"
+	    }
+	    chandb_set $chan topicset $t
+	    ucmdr "Whenever I'm alone on $chan, I'll set the topic to $t." {}
+	}
+	see - tell {
+	    ta_listop {
+		set ta_listop_ev [chandb_get $chan topic$what]
+	    } {
+		if {"$ta_listop_ev" != "*"} {
+		    if {![ischan $ta_listop_ev]} {
+			error "bad channel \`$ta_listop_ev' in topic $what"
+		    }
+		    set ta_listop_ev [irctolower $ta_listop_ev]
+		}
+	    }
+	    chandb_set $chan topic$what $ta_listop_ev
+	    ucmdr "Topic $what list for $chan: $ta_listop_ev" {}
+	}
+	default {
+	    usererror "Unknown channel topic subcommand - see help channel."
+	}
+    }
 }
 
 def_chancmd mode {
@@ -990,9 +911,9 @@ def_chancmd mode {
     }
     chandb_set $chan mode $mode
     if {"$mode" == "*"} {
-	ucmdr "I won't ever change the mode of #chan." {}
+	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." {}
+	ucmdr "Whenever I'm alone on $chan, I'll set the mode to $mode." {}
     }
 }
 
@@ -1000,28 +921,141 @@ def_chancmd show {
     if {[chandb_exists $chan]} {
 	set l "Settings for $chan: autojoin "
 	append l [lindex {no yes} [chandb_get $chan autojoin]]
-	append l ", mode " [chandb_get $chan mode] "."
+	append l ", mode " [chandb_get $chan mode]
+	append l ", userinvite " [chandb_get $chan userinvite] "."
 	append l "\nManagers: "
 	append l [join [chandb_get $chan managers] " "]
+	foreach {ts sep} {see "\n" tell "  "} {
+	    set t [chandb_get $chan topic$ts]
+	    append l $sep
+	    if {[llength $t]} {
+		append l "Topic $ts list: $t."
+	    } else {
+		append l "Topic $ts list is empty."
+	    }
+	}
+	append l "\n"
+	set t [chandb_get $chan topicset]
+	if {[string length $t]} {
+	    append l "Topic to set: $t"
+	} else {
+	    append l "I will not change the topic."
+	}
 	ucmdr {} $l
     } else {
 	ucmdr {} "The channel $chan is not managed."
     }
 }
 
-def_ucmd op {
+proc channelmgr_monoop {} {
+    upvar 1 dest dest
+    upvar 1 text text
+    upvar 1 n n
+    upvar 1 p p
+    upvar 1 target target
+    global chan_nicks
+
+    prefix_nick
+
     if {[ischan $dest]} { set target $dest }
     if {[ta_anymore]} { set target [ta_word] }
     ta_nomore
-    if {![info exists target]} { error "you must specify, or !... on, the channel" }
+    if {![info exists target]} {
+	usererror "You must specify, or invoke me on, the relevant channel."
+    }
+    if {![info exists chan_nicks([irctolower $target])]} {
+	usererror "I am not on $target."
+    }
     if {![ischan $target]} { error "not a valid channel" }
-    if {![chandb_exists $target]} { error "$target is not a managed channel." }
-    prefix_nick
-    nick_securitycheck 1
-    channel_securitycheck $target $n
+
+    if {![chandb_exists $target]} {
+	usererror "$target is not a managed channel."
+    }
+    channel_securitycheck $target
+}
+
+def_ucmd op {
+    channelmgr_monoop
     sendout MODE $target +o $n
 }
 
+def_ucmd leave {
+    channelmgr_monoop
+    doleave $target
+}
+
+def_ucmd invite {
+    global chan_nicks errorCode errorInfo
+    prefix_nick
+    
+    if {[ischan $dest]} {
+	set target $dest
+	set onchan 1
+    } else {
+	set target [ta_word]
+	set onchan 0
+    }
+    set ltarget [irctolower $target]
+    if {![ischan $target]} { error "$target is not a channel" }
+    if {![info exists chan_nicks($ltarget)]} {
+	usererror "I am not on $target."
+    }
+    set ui [chandb_get $ltarget userinvite]
+    if {[catch {
+	if {"$ui" == "pub" && !$onchan} {
+	    usererror "Invitations to $target must be made there with !invite."
+	}
+	if {"$ui" != "all"} {
+	    if {[lsearch -exact $chan_nicks($ltarget) [irctolower $n]] < 0} {
+		usererror "Invitations to $target may only be made\
+			by a user on the channel."
+	    }
+	}
+	if {"$ui" == "none"} {
+	    usererror "Sorry, I've not been authorised\
+		    to invite people to $target."
+	}
+    } emsg]} {
+	if {"$errorCode" == "BLIGHT USER" && [channel_ismanager $target $n]} {
+	    if {[catch {
+		nick_securitycheck 1
+	    } emsg2]} {
+		if {"$errorCode" == "BLIGHT USER"} {
+		    usererror "$emsg2  Therefore you can't use your\
+			    channel manager privilege.  $emsg"
+		} else {
+		    error $error $errorInfo $errorCode
+		}
+	    }
+	} else {
+	    error $emsg $errorInfo $errorCode
+	}
+    }
+    if {![ta_anymore]} {
+	usererror "You have to say who to invite."
+    }
+    set invitees {}
+    while {[ta_anymore]} {
+	set invitee [ta_word]
+	check_nick $invitee
+	lappend invitees $invitee
+    }
+    foreach invitee $invitees {
+	sendout INVITE $invitee $ltarget
+    }
+    set who [lindex $invitees 0]
+    switch -exact llength $invitees {
+	0 { error "zero invitees" }
+	1 { }
+	2 { append who " and [lindex $invitees 1]" }
+	* {
+	    set who [join [lreplace $invitees end end] ", "]
+	    append who " and [lindex $invitees [llength $invitees]]"
+	}
+    }
+    ucmdr {} {} {} "invites $who to $target."
+}
+
 def_ucmd channel {
     if {[ischan $dest]} { set target $dest }
     if {![ta_anymore]} {
@@ -1040,17 +1074,25 @@ def_ucmd channel {
     if {![info exists target]} { error "privately, you must specify a channel" }
     set procname channel/$subcmd
     if {"$subcmd" != "show"} {
-	if {[catch { info body $procname }]} { error "unknown channel setting $subcmd" }
+	if {[catch { info body $procname }]} {
+	    usererror "unknown channel setting $subcmd."
+	}
 	prefix_nick
-	nick_securitycheck 1
 	if {[chandb_exists $target]} {
-	    channel_securitycheck $target $n
+	    channel_securitycheck $target
 	} else {
+	    nick_securitycheck 1
 	    upvar #0 chan_initialop([irctolower $target]) io
 	    upvar #0 nick_unique([irctolower $n]) u
-	    if {![info exists io]} { error "$target is not a managed channel" }
-	    if {"$io" != "$u"} { error "you are not the interim manager of $target" }
-	    if {"$subcmd" != "manager"} { error "use `channel manager' first" }
+	    if {![info exists io]} {
+		usererror "$target is not a managed channel."
+	    }
+	    if {"$io" != "$u"} {
+		usererror "You are not the interim manager of $target."
+	    }
+	    if {"$subcmd" != "manager"} {
+		usererror "Please use `channel manager' first."
+	    }
 	}
     }
     channel/$subcmd
@@ -1161,6 +1203,48 @@ def_setting timeformat {
     ucmdr {} $desc
 }
 
+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]."
+    }
+}
+
+def_setting marktime {
+    set mt [nickdb_get $n marktime]
+    set p $mt
+    if {[string match {[0-9]*} $mt]} { append p s }
+    append p ": "
+    append p [marktime_desc $mt]
+    return $p
+} {
+    global marktime_min
+    set mt [string tolower [ta_word]]
+    ta_nomore
+
+    if {"$mt" == "off" || "$mt" == "once"} {
+    } elseif {[regexp {^([0-9]+)([a-z]+)$} $mt dummy value unit]} {
+	switch -exact $unit {
+	    s { set u 1 }
+	    ks { set u 1000 }
+	    m { set u 60 }
+	    h { set u 3600 }
+	    default { error "unknown unit of time $unit" }
+	}
+	if {$value > 86400*21/$u} { error "marktime interval too large" }
+	set mt [expr {$value*$u}]
+	if {$mt < $marktime_min} { error "marktime interval too small" }
+    } else {
+	error "invalid syntax for marktime"
+    }
+    nickdb_set $n marktime $mt
+    lnick_marktime_start [irctolower $n] "So:" 500
+    ucmdr {} [marktime_desc $mt]
+}
+
 def_setting security {
     set s [nickdb_get $n username]
     if {[string length $s]} {
@@ -1249,7 +1333,7 @@ def_ucmd summon {
 	set idletime [expr {$now - $idlesince}]
 	set ls $now
 	ucmdr {} {} {} "invites $target ($tty[expr {
-	    $idletime > 10 ? ", idle for [showintervalsecs $idletime]" : ""
+	    $idletime > 10 ? ", idle for [showintervalsecs $idletime 0]" : ""
 	}]) to [expr {
 	    [ischan $dest] ? "join us here" : "talk to you"
 	}]."
@@ -1268,7 +1352,7 @@ def_ucmd seen {
     ta_nomore
     set now [clock seconds]
     if {"$nlower" == "[irctolower $nick]"} {
-	error "I am not self-aware."
+	usererror "I am not self-aware."
     } elseif {![info exists lastseen($nlower)]} {
 	set rstr "I've never seen $ncase."
     } else {
@@ -1292,6 +1376,91 @@ def_ucmd seen {
     ucmdr {} $rstr
 }
 
+proc lnick_marktime_cancel {luser} {
+    upvar #0 nick_markid($luser) mi
+    if {![info exists mi]} return
+    catch { after cancel $mi }
+    catch { unset mi }
+}
+
+proc lnick_marktime_doafter {luser why ms} {
+    lnick_marktime_cancel $luser
+    upvar #0 nick_markid($luser) mi
+    set mi [after $ms [list lnick_marktime_now $luser $why]]
+}
+
+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}]
+}
+
+proc lnick_marktime_start {luser why ms} {
+    set mt [nickdb_get $luser marktime]
+    if {"$mt" == "off"} {
+	lnick_marktime_cancel $luser
+    } else {
+	lnick_marktime_doafter $luser $why $ms
+    }
+}
+
+proc lnick_marktime_now {luser why} {
+    upvar #0 nick_onchans($luser) oc
+    global calling_nick
+    set calling_nick $luser
+    sendprivmsg $luser [lnick_pingstring $why $oc ""]
+    lnick_marktime_reset $luser
+}    
+
+proc lnick_pingstring {why oc apstring} {
+    global nick_onchans
+    catch { exec uptime } uptime
+    set nnicks [llength [array names nick_onchans]]
+    if {[regexp \
+ {^ *([0-9:apm]+) +up.*, +(\d+) users, +load average: +([0-9., ]+) *$} \
+            $uptime dummy time users load]} {
+	regsub -all , $load {} load
+        set uptime "$time  $nnicks/$users  $load"
+    } else {
+	append uptime ", $nnicks nicks"
+    }
+    if {[llength $oc]} {
+	set best_la 0
+	set activity quiet
+	foreach ch $oc {
+	    upvar #0 chan_lastactivity($ch) la
+	    if {![info exists la]} continue
+	    if {$la <= $best_la} continue
+	    set since [showintervalsecs [expr {[clock seconds]-$la}] 1]
+	    set activity "$ch $since"
+	    set best_la $la
+	}
+    } else {
+	set activity unseen
+    }
+    set str $why
+    append str "  " $uptime "  " $activity
+    if {[string length $apstring]} { append str "  " $apstring }
+    return $str
+}
+
+def_ucmd ping {
+    if {[ischan $dest]} {
+	set oc [irctolower $dest]
+    } else {
+	global nick_onchans
+	prefix_nick
+	set ln [irctolower $n]
+	if {[info exists nick_onchans($ln)]} {
+	    set oc $nick_onchans($ln)
+	} else {
+	    set oc {}
+	}
+	if {[llength $oc]} { lnick_marktime_reset $ln }
+    }
+    ucmdr {} [lnick_pingstring "Pong!" $oc $text]
+}
+
 proc ensure_globalsecret {} {
     global globalsecret
     
@@ -1307,7 +1476,7 @@ proc ensure_globalsecret {} {
 proc ensure_outqueue {} {
     out__vars
     if {[info exists out_queue]} return
-    set out_creditms [expr {$out_maxburst*$out_interval}]
+    set out_creditms 0
     set out_creditat [clock seconds]
     set out_queue {}
     set out_lag_reported 0
@@ -1320,11 +1489,11 @@ proc fail {msg} {
 }
 
 proc ensure_connecting {} {
-    global sock ownfullname host port nick
+    global sock ownfullname host port nick socketargs
     global musthaveping_ms musthaveping_after
     
     if {[info exists sock]} return
-    set sock [socket $host $port]
+    set sock [eval socket $socketargs [list $host $port]]
     fconfigure $sock -buffering line
     fconfigure $sock -translation crlf