-# Core bot code
+# Actual IRC 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
+set helpfile helpinfos
-defset musthaveping_ms 10000
-defset out_maxburst 6
-defset out_interval 2100
-defset out_lag_lag 5000
-defset out_lag_very 25000
+source irccore.tcl
+source parsecmd.tcl
+source stdhelp.tcl
defset marktime_min 300
defset marktime_join_startdelay 5000
-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
- }
-}
-
-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} {
- return 1
- } else {
+proc privmsg_unlogged {prefix ischan params} {
+ if {!$ischan ||
+ [regexp {^![a-z][-a-z]*[a-z]( .*)?$} [lindex $params 1]]} {
return 0
}
+ # on-channel message, ignore
+ set chan [lindex $params 0]
+ upvar #0 chan_lastactivity([irctolower $chan]) la
+ set la [clock seconds]
+ catch_logged { recordlastseen_p $prefix "talking on $chan" 2 }
+ return 1
}
-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 showintervalsecs {howlong abbrev} {
+ return [showintervalsecs/[opt timeformat] $howlong $abbrev]
}
-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 {^![a-z][-a-z]*[a-z]( .*)?$} [lindex $params 1]]} {
- # 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
- }
- 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
- }
-}
-
-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 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
- upvar 1 n n
- if {![regexp {^([^!]+)!} $p dummy n]} { error "not from nick" }
- check_nick $n
- if {"[irctolower $n]" == "[irctolower $nick]"} {
- error "from myself" {} {}
- }
-}
-
-proc showintervalsecs {howlong} {
- return [showintervalsecs/[opt timeformat] $howlong]
-}
-
-proc showintervalsecs/ks {howlong} {
+proc showintervalsecs/ks {howlong abbrev} {
if {$howlong < 1000} {
return "${howlong}s"
} else {
}
}
-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]]} {
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
}
if {$howlong <= 0} {
return {just now}
} else {
- return "[showintervalsecs $howlong] ago"
+ return "[showintervalsecs $howlong 0] ago"
}
}
return [showinterval [expr {[clock seconds] - $when}]]
}
+proc parse_interval {specified min} {
+ if {![regexp {^([0-9]+)([a-z]+)$} $specified dummy value unit]} {
+ error "invalid syntax for interval"
+ }
+ 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 "interval too large" }
+ set result [expr {$value*$u}]
+ if {$result < $min} { error "interval too small (<${min}s)" }
+ return $result
+}
+
proc def_msgproc {name argl body} {
proc msg_$name "varbase $argl" "\
upvar #0 msg/\$varbase/dest d\n\
return $str
}
+proc telling_event {nl event} {
+ # For `act' we *haven't* yet done the 750ms delay; we implement
+ # that here. Also, here we turn `talk' into `talk' now and `act'
+ # later. We also support the psuedo-event `none'. The del msg
+ # and new msg events are handled by the command procedures, not here.
+ switch -exact $event {
+ none { }
+ talk {
+ telling_event_core $nl talk
+ telling_event $nl act
+ }
+ act {
+ after 750 [list telling_event_core $nl $event]
+ }
+ ident {
+ telling_event_core $nl $event
+ }
+ default {
+ error "telling_event $nl $event"
+ }
+ }
+}
+
+proc telling_event_core {nl event} {
+ # event is `talk', `act' or `ident'
+ # When user talks we actually get talk now and act later
+FIXME - fix calls to check_telling to telling_event
+FIXME - implement all cmds
+FIXME - implement tells_deliver set stt [list $u passed $now]
+FIXME - implement tells_delete catch { unset stt } ?
+FIXME - document the extra param to recordlastseen
+ set iml [msgdb_get $nl inbound]
+ if {![llength $iml]} return
+
+ upvar #0 nick_telling($nl) telling
+ upvar #0 nick_unique($nl) u
+
+ if {[info exists telling]} {
+ manyset $telling u_last stt telling_when
+ if {"$u_last" != "$u"} { unset telling; unset stt; unset telling_when }
+ }
+
+ if {![info exists stt]} {
+ set stt norecord
+ set telling_when $now
+ }
+
+ set ago [expr {$now - $telling_when}]
+
+ # Now we have the components of a telling state
+ # u - nick_unique
+ # stt - state: norecord, mentioned, passede
+ # ago - how long ago since we did anything
+
+ # We compute an evstate to dispatch on as follows:
+
+ # evstate is string of letters
+ # current state
+ # n NORECORD
+ # m MENTIONED
+ # p PASSED
+ # event
+ # t talk
+ # a act
+ # i ident
+ # security level and timing
+ # ii Insecure
+ # ss Secure and soon (before interval)
+ # sl Secure and late (after interval)
+ # current identification
+ # i Identified
+ # u Unidentified
+ # reliability and timing
+ # uu Unreliable
+ # rv Remind, very soon (before within-interval)
+ # rs Remind, soon (between)
+ # rl Remind, late (after every-interval)
+ # ps Pester, soon (before interval)
+ # pl Pester, late (after interval)
+
+ set evstate {}
+
+ append evstate [string range $stt 0 0]
+ append evstate [string range $event 0 0]
+
+ manyset [nickdb_get $n tellsec] sec secwhen
+ switch -exact $sec {
+ insecure { append evstate ii }
+ secure { append evstate [expr {$ago<$secwhen ? "sl" : "ss"}] }
+ default { append evstate "#$sec#" }
+ }
+
+ upvar #0 nick_username($nl) nu
+ if {[info exists nu] && "$nu" == "[nickdb_get $nl username]"} {
+ append evstate i
+ } else {
+ append evstate u
+ }
+
+ manyset [nickdb_set $n tellrel] rel relint relwithin
+ switch -exact $rel {
+ unreliable { append evstate uu }
+ remind { append evstate [expr {
+ $ago<$relwithin ? "rv" : $ago<$relint ? "rs" : "rl"
+ }]}
+ pester { append evstate [expr {$ago<$relint ? "ps" : "pl"}] }
+ default { append evstate "#$rel#" }
+ }
+
+ switch -glob $evstate {
+ pt???rv {
+ # consider delivered:
+ # (very recently passed, and the user talks)
+ telling_delete_msgs {} $nl
+ return
+ }
+ ?t????? {
+ # ignore (any other `talk's) - act handles these
+ return
+ }
+ ni???uu - naii?uu - nas?iuu - mi???uu {
+ # pass, but unreliable
+ telling_pass $nl
+ telling_delete_msgs {} $nl
+ return
+ }
+ ni????? - naii??? - nas?i?? - mi????? {
+ # pass, reliable
+ telling_pass $nl
+ set stt passed
+ }
+ UP TO HERE
+ FIXME print out state diagram and tick off traces
+
+
+
+ set telling [list $u passed
+
+ ?iin???? - ?iip?l?? - ?ii????? -
+ ?s?n??iv - ?s?m??iv - ?s?p?liv {
+ # pass messages
+ # (insecure and not passed recently, or just arriving;
+ # secure and not passed recently)
+ tells_deliver $nl
+ }
+ ?ssp???? - ???p?s?? - ???p?v?? {
+ # ignore
+ # (recently mentioned or passed
+ # immediate `talk' thing)
+ }
+ ?s?n???? - ?slm???? - cs?????? {
+ # mention messages
+ # (secure and not mentioned recently or just arriving,
+ # and should not pass)
+ sendprivmsg $nl \
+ {You have messages (so identify yourself please).}]
+ set stt [list $u mentioned $now]
+ }
+ * {
+ error "check_telling_core nl=$nl evstate=$evstate ?"
+ }
+ }
+
+ # current visibility
+ # v Visible
+ # h Hidden (invisible, no unique)
+ go back to norecord if invisible
+
+}
+
proc recordlastseen_n {n how here} {
global lastseen lookedfor
- set lastseen([irctolower $n]) [list $n [clock seconds] $how]
+ set nl [irctolower $n]
+ set now [clock seconds]
+ set lastseen($nl) [list $n $now $how]
+
if {!$here} return
- upvar #0 lookedfor([irctolower $n]) lf
+
+ check_telling $nl [lindex {none act talk} $here]
+
+ upvar #0 lookedfor($nl) lf
if {[info exists lf]} {
switch -exact [llength $lf] {
0 {
set nick_arys {onchans username unique}
# nick_onchans($luser) -> [list ... $lchan ...]
# nick_username($luser) -> <securely known local username>
-# nick_unique($luser) -> <counter>
+# nick_unique($luser) -> <includes-counter>
# nick_case($luser) -> $user (valid even if no longer visible)
# nick_markid($luser) -> <after id for marktime>
+# nick_telling($luser) -> <unique> mentioned|passed <when>
# chan_nicks($lchan) -> [list ... $luser ...]
# chan_lastactivity($lchan) -> [clock seconds]
}
proc msg_NICK {p c newnick} {
- global nick_arys nick_case
+ global nick_arys nick_case calling_nick
prefix_nick
recordlastseen_n $n "changing nicks to $newnick" 0
+ set calling_nick $newnick
recordlastseen_n $newnick "changing nicks from $n" 1
set luser [irctolower $n]
lnick_marktime_cancel $luser
set nlist [grep tn {"$tn" != "$luser"} $nlist]
lappend nlist $lusernew
}
- lnick_marktime_start $lusernew "Hi." 500
+ lnick_marktime_start $lusernew "Hi." 500 1
nick_case $newnick
}
proc msg_JOIN {p c chan} {
prefix_nick
+ nick_ishere $n
recordlastseen_n $n "joining $chan" 1
set nl [irctolower $n]
set lchan [irctolower $chan]
upvar #0 chan_nicks($lchan) nlist
if {![info exists oc]} {
global marktime_join_startdelay
- lnick_marktime_start $nl "Welcome." $marktime_join_startdelay
+ lnick_marktime_start $nl "Welcome." $marktime_join_startdelay 1
}
lappend oc $lchan
lappend nlist $nl
- nick_ishere $n
}
-proc msg_PART {p c chan} {
+proc msg_PART {p c chan args} {
prefix_nick
- recordlastseen_n $n "leaving $chan" 1
+ set msg "leaving $chan"
+ if {[llength $args]} {
+ set why [lindex $args 0]
+ if {"[irctolower $why]" != "[irctolower $n]"} { append msg " ($why)" }
+ }
+ recordlastseen_n $n $msg 1
process_kickpart $chan $n
}
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
}
nick_case $n
- if {[catch {
- regsub {^! *} $text {} text
- set ucmd [ta_word]
- set procname ucmd/[string tolower $ucmd]
- if {[catch { info body $procname }]} {
- error "unknown command; try help for help"
- }
- $procname $p $dest
- } rv]} {
- sendprivmsg $n "error: $rv"
- } else {
- manyset $rv priv_msgs pub_msgs priv_acts pub_acts
- foreach {td val} [list $n $priv_acts $output $pub_acts] {
- foreach l [split $val "\n"] {
- sendaction_priority 0 $td $l
- }
- }
- foreach {td val} [list $n $priv_msgs $output $pub_msgs] {
- foreach l [split $val "\n"] {
- sendprivmsg $td $l
- }
- }
- }
+ execute_usercommand $p $c $n $output $dest $text
}
proc msg_INVITE {p c n chan} {
unset names_chans
}
-proc ta_anymore {} {
- upvar 1 text text
- return [expr {!![string length $text]}]
-}
-
-proc ta_nomore {} {
- upvar 1 text text
- if {[string length $text]} { error "too many parameters" }
-}
-
-proc ta_word {} {
- upvar 1 text text
- if {![regexp {^([^ ]+) *(.*)} $text dummy firstword text]} {
- error "too few parameters"
- }
- return $firstword
-}
-
-proc ta_nick {} {
- upvar 1 text text
- set v [ta_word]
- check_nick $v
- return $v
-}
-
-proc def_ucmd {cmdname body} {
- proc ucmd/$cmdname {p dest} " upvar 1 text text\n$body"
-}
-
-proc ucmdr {priv pub args} {
- return -code return [concat [list $priv $pub] $args]
-}
-
-proc loadhelp {} {
- global help_topics errorInfo
-
- catch { unset help_topics }
- set f [open helpinfos r]
- try_except_finally {
- set lno 0
- while {[gets $f l] >= 0} {
- incr lno
- if {[regexp {^#.*} $l]} {
- } elseif {[regexp {^ *$} $l]} {
- if {[info exists topic]} {
- set help_topics($topic) [join $lines "\n"]
- unset topic
- unset lines
- }
- } 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]} {
- 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$ontopic again later."
- ucmdr {} {}
- } else {
- sendaction_priority 1 $replyto \
- "is lagged. Your help$ontopic will arrive shortly ..."
- }
- }
-
- upvar #0 help_topics($topic) info
- if {![info exists info]} { ucmdr "No help on $topic, sorry." {} }
- ucmdr $info {}
-}
-
-def_ucmd ? {
- global help_topics
- ucmdr $help_topics() {}
-}
-
proc check_username {target} {
if {
[string length $target] > 8 ||
}
proc def_somedb {name arglist body} {
- foreach {nickchan fprefix} {nick users/n chan chans/c} {
+ foreach {nickchan fprefix} {
+ nick users/n
+ chan chans/c
+ msgs users/m
+ } {
proc ${nickchan}db_$name $arglist \
"set nickchan $nickchan; set fprefix $fprefix; $body"
}
file delete $idfn
}
-set default_settings_nick {timeformat ks marktime off}
+set default_settings_nick {
+ timeformat ks
+ marktime off
+ tellsec insecure
+ tellrel {remind 3600 30}
+}
+
set default_settings_chan {
autojoin 1
mode *
topictell {}
}
+set default_settings_msgs {
+ inbound {}
+ outbound {}
+}
+# inbound -> [<nick> <time_t> <message>] ...
+# outbound -> [<nick> <time_t(earliest)> <count>] ...
+
def_somedb_id set {args} {
upvar #0 default_settings_$nickchan def
if {![info exists iddbe]} { set iddbe $def }
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
}
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} {
ucmdr "Topic $what list for $chan: $ta_listop_ev" {}
}
default {
- error "unknown channel topic subcommand - see help channel"
+ usererror "Unknown channel topic subcommand - see help channel."
}
}
}
if {[ta_anymore]} { set target [ta_word] }
ta_nomore
if {![info exists target]} {
- error "you must specify, or invoke me on, the relevant channel"
+ usererror "You must specify, or invoke me on, the relevant channel."
}
if {![info exists chan_nicks([irctolower $target])]} {
- error "I am not on $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." }
- nick_securitycheck 1
- channel_securitycheck $target $n
+ if {![chandb_exists $target]} {
+ usererror "$target is not a managed channel."
+ }
+ channel_securitycheck $target
}
def_ucmd op {
}
def_ucmd invite {
- global chan_nicks
+ global chan_nicks errorCode errorInfo
+ prefix_nick
if {[ischan $dest]} {
set target $dest
set onchan 0
}
set ltarget [irctolower $target]
- if {![ischan $target]} { error "$target is not a channel." }
- if {![info exists chan_nicks($ltarget)]} { error "I am not on $target." }
- set ui [chandb_get $ltarget userinvite]
- if {"$ui" == "pub" && !$onchan} {
- error "Invitations to $target must be made with !invite."
+ if {![ischan $target]} { error "$target is not a channel" }
+ if {![info exists chan_nicks($ltarget)]} {
+ usererror "I am not on $target."
}
- if {"$ui" != "all"} {
- prefix_nick
- if {[lsearch -exact $chan_nicks($ltarget) [irctolower $n]] < 0} {
- error "Invitations to $target may only be made by a user on the channel."
+ 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 {"$ui" == "none"} {
- error "Sorry, I've not been authorised to invite people to $target."
}
if {![ta_anymore]} {
- error "You have to say who to invite."
+ usererror "You have to say who to invite."
}
set invitees {}
while {[ta_anymore]} {
append who " and [lindex $invitees [llength $invitees]]"
}
}
- ucmdr {} "invites $who to $target."
+ ucmdr {} {} {} "invites $who to $target."
}
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
}
+def_ucmd tell {
+ global nick_case ownmailaddr ownfullname
+
+ prefix_nick
+ set target [ta_word]
+ if {![string length $text]} { error "tell them what?" }
+
+ set ltarget [irctolower $target]
+ set ctarget $target
+ if {[info exists nick_case($ltarget)]} { set ctarget $nick_case($ltarget) }
+
+ manyset [nickdb_get $target tellsec] sec mailtoint mailwhy
+ manyset [nickdb_get $target tellrel] rel relint relwithin
+ switch -exact $sec {
+ insecure - secure {
+ set now [clock seconds]
+ set inbound [msgsdb_get $ltarget inbound]
+ lappend inbound $n $now $text
+ msgsdb_set $ltarget inbound $inbound
+
+ set outbound [msgsdb_get $n outbound]
+ set noutbound {}
+ set found 0
+ foreach {recip time count} $outbound {
+ if {"[irctolower $recip]" == "$ltarget"} {
+ incr count
+ set recip $ctarget
+ set found 1
+ }
+ lappend noutbound $recip $time $count
+ }
+ if {!$found} {
+ lappend noutbound $ctarget $now 1
+ }
+ msgsdb_set $n outbound $noutbound
+ set msg "OK, I'll tell $ctarget"
+ if {$found} { append msg " that too" }
+ append msg ", "
+ if {"$sec" != "secure"} {
+ switch -exact $rel {
+ unreliable { append msg "neither reliably nor securely" }
+ remind { append msg "pretty reliably, but not securely" }
+ pester { append msg "reliably but not securely" }
+ }
+ } else {
+ switch -exact $rel {
+ unreliable { append msg "securely but not reliably" }
+ remind { append msg "securely and pretty reliably" }
+ pester { append msg "reliably and securely" }
+ }
+ }
+ append msg .
+ ucmdr $msg {}
+ }
+ mailto {
+ set fmtmsg [exec fmt << " $text"]
+ exec /usr/sbin/sendmail -odb -oi -t -oee -f $mailwhy \
+ > /dev/null << \
+ "From: $ownmailaddr ($ownfullname)
+To: $mailtoint
+Subject: IRC tell from $n
+
+$n asked me[expr {[ischan $dest] ? " on $dest" : ""}] to tell you:
+[exec fmt << " $text"]
+
+(This message was for your nick $ctarget; your account $mailwhy
+ arranged for it to be forwarded to $mailtoint.)
+"
+ ucmdr \
+ "I've mailed $ctarget, which is what they prefer." \
+ {}
+ }
+ refuse {
+ usererror "Sorry, $ctarget does not want me to take messages."
+ }
+ default {
+ error "bad tellsec $sec"
+ }
+ }
+}
+
def_ucmd who {
if {[ta_anymore]} {
set target [ta_word]; ta_nomore
ucmdr {} "This is fine, but bear in mind that people will be able to mess with your settings. Channel management features need a secure registration." "makes an insecure registration for your nick."
}
}
+ default {
+ error "you mean register / register delete / register insecure"
+ }
}
}
}
}
+set settings {}
proc def_setting {opt show_body set_body} {
+ global settings
+ lappend settings $opt
proc set_show/$opt {} "
upvar 1 n n
set opt $opt
$set_body"
}
+proc tellme_sec_desc {v} {
+ manyset $v sec mailtoint
+ switch -exact $sec {
+ insecure {
+ return "I'll tell you your messages whenever I see you."
+ }
+ secure {
+ return \
+ "I'll keep the bodies of your messages private until you identify yourself, reminding you every [showintervalsecs $mailtoint 1]."
+ }
+ refuse {
+ return "I shan't accept messages for you."
+ }
+ mailto {
+ return "I'll forward your messages by email to $mailtoint."
+ }
+ default {
+ error "bad tellsec $sec"
+ }
+ }
+}
+
+proc tellme_rel_desc {v} {
+ manyset $v rel every within
+ switch -exact $rel {
+ unreliable {
+ return "As soon as I've told you, I'll forget the message - note that this means messages can get lost !"
+ }
+ pester {
+ set u {}
+ }
+ remind {
+ set u ", or talk on channel within [showintervalsecs $within 1] of me having told you"
+ }
+ default {
+ error "bad tellrel $rel"
+ }
+ }
+ return "I'll remind you every [showintervalsecs $every 1] until you say delmsg$u."
+}
+
def_setting timeformat {
set tf [nickdb_get $n timeformat]
return "$tf: [timeformat_desc $tf]"
} 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]."
+ return "I'll send you a message every [showintervalsecs $mt 0]."
}
}
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"
+ set mt [parse_interval $mt $marktime_min]
}
nickdb_set $n marktime $mt
- lnick_marktime_start [irctolower $n] "So:" 500
+ lnick_marktime_start [irctolower $n] "So:" 500 0
ucmdr {} [marktime_desc $mt]
}
}
} {}
+def_setting tellme {
+ set secv [nickdb_get $n tellsec]
+ set ms [tellme_sec_desc $secv]
+ manyset $secv sec
+ switch -exact $sec {
+ insecure - secure {
+ set mr [tellme_rel_desc [nickdb_get $n tellrel]]
+ return "$ms $mr"
+ }
+ refuse - mailto {
+ return $ms
+ }
+ }
+} {
+ set setting [string tolower [ta_word]]
+ switch -exact $setting {
+ insecure - secure - refuse {
+ ta_nomore
+ if {"$setting" == "refuse" && [llength [msgsdb_get $n inbound]]} {
+ usererror "You must delete the messages you have, first."
+ }
+ set sr sec
+ set v $setting
+ }
+ mailto {
+ set u [nickdb_get $n username]
+ if {![string length $u]} {
+ usererror "Sorry, you must register secure to have your messages mailed (to prevent the use of this feature for spamming)."
+ }
+ set sr sec
+ set v [list mailto [ta_word] $u]
+ }
+ unreliable - pester - remind {
+ manyset [nickdb_get $n tellsec] sec
+ switch -exact $sec {
+ refuse - mailto {
+ error "can't change message delivery conditions when message disposition prevents messages from being left"
+ }
+ }
+ set sr rel
+ set v $setting
+ if {"$setting" != "unreliable"} {
+ set every [parse_interval [ta_word] 300]
+ lappend v $every
+ }
+ if {"$setting" == "remind"} {
+ if {[ta_anymore]} {
+ set within [parse_interval [ta_word] 5]
+ } else {
+ set within 30
+ }
+ if {$within > $every} {
+ error "remind interval must be at least time to respond"
+ }
+ lappend v $within
+ }
+ ta_nomore
+ }
+ default {
+ error "invalid tellme setting $setting"
+ }
+ }
+ nickdb_set $n tell$sr $v
+ ucmdr [tellme_${sr}_desc $v] {}
+}
+
+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 ol {}
+ set now [clock seconds]
+ while {[llength $ml]} {
+ manyset $ml r t n
+ set ml [lreplace $ml 0 2]
+ set td [expr {$now-$t}]
+ if {$n == 1} {
+ set iv [showinterval $td]
+ set ifo "$r, $iv"
+ set if1 "message to $r, $iv."
+ } else {
+ set iv [showintervalsecs $td 0]
+ set ifo "$r, $n messages, oldest $iv"
+ set if1 "$n messages to $r, oldest $iv."
+ }
+ if {$is1} {
+ sendprivmsg $luser "$m1 $if1"
+ return
+ } else {
+ lappend ol " to $ifo[expr {[llength $ml] ? ";" : "."}]"
+ }
+ }
+ sendprivmsg $luser "$m1 messages:"
+ msendprivmsg $luser $ol
+}
+
def_ucmd set {
+ global settings
prefix_nick
check_notonchan
if {![nickdb_exists $n]} {
}
if {![ta_anymore]} {
set ol {}
- foreach proc [lsort [info procs]] {
- if {![regexp {^set_show/(.*)$} $proc dummy opt]} continue
+ foreach opt $settings {
lappend ol [format "%-10s %s" $opt [set_show/$opt]]
}
ucmdr {} [join $ol "\n"]
error "no setting $opt"
}
if {![ta_anymore]} {
- ucmdr {} "$opt [set_show/$opt]"
+ ucmdr {} "$opt: [set_show/$opt]"
} else {
nick_securitycheck 0
if {[catch { info body set_set/$opt }]} {
upvar #0 nick_username($luser) rec_username
set rec_username $username
ucmdr "Pleased to see you, $username." {}
+ telling_event $luser ident
}
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"
}]."
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 {
catch { unset mi }
}
-proc lnick_marktime_doafter {luser why ms} {
+proc lnick_marktime_doafter {luser why ms mentiontold} {
lnick_marktime_cancel $luser
upvar #0 nick_markid($luser) mi
- set mi [after $ms [list lnick_marktime_now $luser $why]]
+ set mi [after $ms [list lnick_marktime_now $luser $why 0]]
}
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}]
+ lnick_marktime_doafter $luser "Time passes." [expr {$mt*1000}] 0
}
-proc lnick_marktime_start {luser why ms} {
+proc lnick_marktime_start {luser why ms mentiontold} {
set mt [nickdb_get $luser marktime]
if {"$mt" == "off"} {
lnick_marktime_cancel $luser
+ after $ms [list lnick_checktold $luser]
} else {
- lnick_marktime_doafter $luser $why $ms
+ lnick_marktime_doafter $luser $why $ms $mentiontold
}
}
-proc lnick_marktime_now {luser why} {
+proc lnick_marktime_now {luser why mentiontold} {
upvar #0 nick_onchans($luser) oc
global calling_nick
set calling_nick $luser
sendprivmsg $luser [lnick_pingstring $why $oc ""]
+ if {$mentiontold} { lnick_checktold $luser }
lnick_marktime_reset $luser
}
catch { exec uptime } uptime
set nnicks [llength [array names nick_onchans]]
if {[regexp \
- {^ *([0-9:apm]+) +up.*, +(\d+) users, +load average: +([0-9., ]+) *$} \
+ {^ *([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"
upvar #0 chan_lastactivity($ch) la
if {![info exists la]} continue
if {$la <= $best_la} continue
- set activity "$ch [showintervalsecs [expr {[clock seconds]-$la}]]"
+ set since [showintervalsecs [expr {[clock seconds]-$la}] 1]
+ set activity "$ch $since"
set best_la $la
}
} else {
}
def_ucmd ping {
+ prefix_nick
+ set ln [irctolower $n]
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 {
}
if {[llength $oc]} { lnick_marktime_reset $ln }
}
+ lnick_checktold $ln
ucmdr {} [lnick_pingstring "Pong!" $oc $text]
}
unset gsfile
}
-proc ensure_outqueue {} {
- out__vars
- if {[info exists out_queue]} return
- set out_creditms 0
- set out_creditat [clock seconds]
- set out_queue {}
- set out_lag_reported 0
- set out_lag_reportwhen $out_creditat
-}
-
-proc fail {msg} {
- logerror "failing: $msg"
- exit 1
-}
-
-proc ensure_connecting {} {
- global sock ownfullname host port nick socketargs
- global musthaveping_ms musthaveping_after
-
- if {[info exists sock]} return
- set sock [eval socket $socketargs [list $host $port]]
- fconfigure $sock -buffering line
- fconfigure $sock -translation crlf
-
- sendout USER blight 0 * $ownfullname
- sendout NICK $nick
- fileevent $sock readable onread
-
- set musthaveping_after [after $musthaveping_ms \
- {fail "no ping within timeout"}]
-}
-
proc connected {} {
- global musthaveping_after
-
- after cancel $musthaveping_after
- unset musthaveping_after
-
foreach chan [chandb_list] {
if {[chandb_get $chan autojoin]} { dojoin $chan }
}
}
ensure_globalsecret
-ensure_outqueue
loadhelp
ensure_connecting
~mdw / ircbot / blobdiff