From: Ian Jackson Date: Fri, 8 Feb 2002 21:59:58 +0000 (+0000) Subject: Change telling => tell in many places. Improve some comments. X-Git-Tag: merge-2001-10-09-tell~20 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/ircbot/commitdiff_plain/31eadeb5d4f9ad2482f1fcda1e3db21d09453b5e Change telling => tell in many places. Improve some comments. --- diff --git a/bot.tcl b/bot.tcl index 25c7b51..315163f 100755 --- a/bot.tcl +++ b/bot.tcl @@ -145,7 +145,7 @@ proc looking_whenwhere {when where} { return $str } -proc telling_event {nl event} { +proc tell_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 @@ -153,28 +153,27 @@ proc telling_event {nl event} { switch -exact $event { none { } talk { - telling_event_core $nl talk - telling_event $nl act + tell_event_core $nl talk + tell_event $nl act } act { - after 750 [list telling_event_core $nl $event] + after 750 [list tell_event_core $nl $event] } ident { - telling_event_core $nl $event + tell_event_core $nl $event } default { - error "telling_event $nl $event" + error "tell_event $nl $event" } } } -proc telling_event_core {nl event} { +proc tell_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 - implement pass stuff set stt [list $u passed $now] +FIXME - implement tells_delete_msgs catch { unset stt } ? FIXME - document the extra param to recordlastseen set iml [msgdb_get $nl inbound] if {![llength $iml]} return @@ -260,7 +259,7 @@ FIXME - document the extra param to recordlastseen pt???rv { # consider delivered: # (very recently passed, and the user talks) - telling_delete_msgs {} $nl + tell_delete_msgs {} $nl return } nt????? - mt????? - @@ -270,7 +269,8 @@ FIXME - document the extra param to recordlastseen } ni????? - naii??? - nas?i?? - mi????? - pa????l { # pass and then stuff - telling_pass $nl + + return } nas?u?? { @@ -288,7 +288,7 @@ FIXME - document the extra param to recordlastseen return } * { - error "check_telling_core nl=$nl evstate=$evstate ?" + error "tell_event_core nl=$nl evstate=$evstate ?" } } if {![info exists u]} { @@ -306,7 +306,7 @@ proc recordlastseen_n {n how here} { if {!$here} return - check_telling $nl [lindex {none act talk} $here] + tell_event $nl [lindex {none act talk} $here] upvar #0 lookedfor($nl) lf if {[info exists lf]} { @@ -749,6 +749,11 @@ set default_settings_nick { tellsec insecure tellrel {remind 3600 30} } +# also: +# inbound: concatenation of many sender time_t text +# outbound: concatenation of many recipient time_t count +# neither are sorted particularly; only one entry per recipient in +# output; both sender and recipient are cased set default_settings_chan { autojoin 1 @@ -1576,7 +1581,7 @@ def_ucmd identpass { upvar #0 nick_username($luser) rec_username set rec_username $username ucmdr "Pleased to see you, $username." {} - telling_event $luser ident + tell_event $luser ident } def_ucmd summon {