X-Git-Url: https://git.distorted.org.uk/~mdw/ircbot/blobdiff_plain/b36ab2da7886b10b668a08b56e201ba4fa54c4f0..ed982e507ddd5e9ec2d0e7fa3177a25677091a5e:/bot.tcl?ds=sidebyside

diff --git a/bot.tcl b/bot.tcl
index dc8ed93..f05c738 100755
--- a/bot.tcl
+++ b/bot.tcl
@@ -151,7 +151,8 @@ proc tell_event {nl event} {
     # later.  We also support the psuedo-event `none'.  The del msg
     # and new msg events are handled by the command procedures, not here.
     global calling_nick
-    if {[info exists calling_nick] { set save $calling_nick }
+    if {[info exists calling_nick]} { set save $calling_nick }
+puts "[list tell_event $nl $event]"
     switch -exact $event {
 	none { }
 	talk {
@@ -161,7 +162,7 @@ proc tell_event {nl event} {
 	act {
 	    after 750 [list tell_event_core $nl $event]
 	}
-	ident {
+	ident - msgsarrive {
 	    tell_event_core $nl $event
 	}
 	default {
@@ -169,34 +170,46 @@ proc tell_event {nl event} {
 	}
     }
     if {[info exists save]} { set calling_nick $save }
+global errorInfo
+puts "[list tell_event $nl $event] $errorInfo"
 }
 
-proc tell_event_core {nl event} {
-    # event is `talk', `act' or `ident'
-    # When user talks we actually get talk now and act later
-FIXME - implement all cmds
-FIXME - implement tells_delete_msgs catch { unset stt }   ?
-FIXME - document the extra param to recordlastseen
-    global calling_nick
-    set calling_nick $nl
-    set iml [msgdb_get $nl inbound]
-    if {![llength $iml]} return
+proc tell_getcstate {} {
+    # uses nl from caller's context
+    # imports telling (as the nick_telling) and u
+    # sets stt, telling_when
+    uplevel 1 {
+	upvar #0 nick_telling($nl) telling
+	upvar #0 nick_unique($nl) u
 
-    upvar #0 nick_telling($nl) telling
-    upvar #0 nick_unique($nl) u
+	if {[info exists telling]} {
+	    manyset $telling u_last stt telling_when
+	    if {![info exists u] || "$u_last" != "$u"} {
+		unset telling; unset stt; unset telling_when
+	    }
+	}
 
-    if {[info exists telling]} {
-	manyset $telling u_last stt telling_when
-	if {![info exists u] || "$u_last" != "$u"} {
-	    unset telling; unset stt; unset telling_when
+	if {![info exists stt]} {
+	    set stt norecord
+	    set telling_when $now
 	}
     }
+}
 
-    if {![info exists stt]} {
-	set stt norecord
-	set telling_when $now
-    }
+proc tell_event_core {nl event} {
+    catch_logged { tell_event_core1 $nl $event }
+}
+
+proc tell_event_core1 {nl event} {
+    # event is `talk', `act', `ident' or `msgsarrive'
+    # When user talks we actually get talk now and act later
+    global calling_nick
+    set calling_nick $nl
+    set iml [msgsdb_get $nl inbound]
+    if {![llength $iml]} return
 
+    set now [clock seconds]
+    tell_getcstate
     set ago [expr {$now - $telling_when}]
 
     # Now we have the components of a telling state
@@ -215,6 +228,7 @@ FIXME - document the extra param to recordlastseen
     #      t   talk
     #      a   act
     #      i   ident
+    #      m   msgsarrive
     #   security level and timing
     #      ii  Insecure
     #      ss  Secure and soon (before interval)
@@ -235,7 +249,7 @@ FIXME - document the extra param to recordlastseen
     append evstate [string range $stt 0 0]
     append evstate [string range $event 0 0]
 
-    manyset [tell_effective_sec $n] sec secwhen
+    manyset [tell_effective_sec $nl] sec secwhen
     switch -exact $sec {
 	insecure { append evstate ii }
 	secure { append evstate [expr {$ago<$secwhen ? "sl" : "ss"}] }
@@ -249,7 +263,7 @@ FIXME - document the extra param to recordlastseen
 	append evstate u
     }
     
-    manyset [nickdb_set $n tellrel] rel relint relwithin
+    manyset [nickdb_get $nl tellrel] rel relint relwithin
     switch -exact $rel {
 	unreliable { append evstate uu }
 	remind { append evstate [expr {
@@ -266,6 +280,15 @@ FIXME - document the extra param to recordlastseen
 	    tell_delete_msgs {} $nl
 	    return
 	}
+	pm????? {
+	    # oops, messages passed are now out of date
+	    catch_restoreei { unset telling }
+	    return
+	}
+	?m????? {
+	    # ignore new msgs if we haven't passed yet
+	    return
+	}
 	nt????? - mt????? -
 	pt???uu - pt???rs - pt???rl - pt???p? {
 	    # ignore (any other `talk's) - act handles these
@@ -295,11 +318,11 @@ FIXME - document the extra param to recordlastseen
 	    set stt passed
 	}
 	nas?u?? {
-	    sendprivmsg $nl {You have messages (so identify yourself please).}]
+	    sendprivmsg $nl {You have messages (so identify yourself please).}
 	    set stt mentioned
 	}
 	masl??? {
-	    sendprivmsg $nl {Don't forget about your messages.}]
+	    sendprivmsg $nl {Don't forget about your messages.}
 	}
 	pi????? {
 	    return
@@ -313,13 +336,17 @@ FIXME - document the extra param to recordlastseen
 	}
     }
     if {![info exists u]} {
-	catch { unset telling }
+	catch_restoreei { unset telling }
     } else {
 	set telling [list $u $stt $now]
     }
 }
 
 proc recordlastseen_n {n how here} {
+    # here is:
+    #   0 - nick was seen leaving (or changing to another nicks or some such)
+    #   1 - nick was seen doing something else
+    #   2 - nick was seen talking on channel
     global lastseen lookedfor
     set nl [irctolower $n]
     set now [clock seconds]
@@ -1200,8 +1227,14 @@ proc tell_peernicks {text} {
     return $senders
 }
 
+proc msgsdb_set_maydelete {n key l otherkey} {
+    msgsdb_set $n $key $l
+    if {[llength $l]} return
+    if {[llength [msgsdb_get $n $otherkey]]} return
+    msgsdb_delete $n
+}
+
 proc tell_delete_msgs {lsenders lrecip} {
-FIXME - check callers pass l* not mixed case
     set ninbound {}
     set ndel 0
     foreach {s t m} [msgsdb_get $recip inbound] {
@@ -1214,14 +1247,18 @@ FIXME - check callers pass l* not mixed case
 	set rsenders($s) 1
 	incr ndel
     }
-    msgsdb_set $recip inbound $ninbound
+    msgsdb_set_maydelete $recip inbound $ninbound outbound
+    if {![llength $ninbound]} {
+	upvar #0 nick_telling($lrecip) telling
+	catch { unset telling }
+    }
     foreach s [array names rsenders] {
 	set noutbound {}
 	foreach {r t c} [msgsdb_get $s outbound] {
 	    if {"[irctolower $r]" == "$lrecip"} continue
 	    lappend noutbound $r $t $c
 	}
-	msgsdb_set $s outbound $noutbound
+	msgsdb_set_maydelete $s outbound $noutbound inbound
     }
     return $ndel
 }
@@ -1236,7 +1273,7 @@ def_ucmd untell {
     }
     set ndel 0
     foreach recip $recipients {
-	incr ndel [tell_delete_msgs $n $recip]
+	incr ndel [tell_delete_msgs [irctolower $n] $recip]
     }
     ucmdr "Removed $ndel as yet undelivered message(s)." {}
 }
@@ -1244,6 +1281,7 @@ def_ucmd untell {
 def_ucmd delmsg {
     global errorInfo errorCode
     prefix_nick
+    set nl [irctolower $n]
     check_notonchan
     manyset [tell_effective_sec $n] sec secwhen
     switch -exact $sec {
@@ -1260,9 +1298,21 @@ def_ucmd delmsg {
 	    error "delmsg sec $sec"
 	}
     }
+    tell_getcstate
+    if {"$stt" != "passed"} {
+	usererror \
+ "There are message(s) you've not yet 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]
     set ndel [tell_delete_msgs [irctolower $senders] [irctolower $n]]
-    if {!$ndel} { ucmdr "No incoming messages deleted." {} }
+    if {!$ndel} {
+	if {[llength $senders]} {
+	    ucmdr "No relevant incoming messages to delete." {}
+	} else {
+	    ucmdr "No incoming messages to delete." {}
+	}
+    }
     switch -exact [llength $senders] {
 	0 { ucmdr {} {} "deletes your $ndel message(s)." }
 	1 { ucmdr {} {} "deletes your $ndel message(s) from $senders." }
@@ -1326,6 +1376,7 @@ def_ucmd tell {
 		}
 	    }
 	    append msg .
+	    tell_event $ltarget msgsarrive
 	    ucmdr $msg {}
 	}
 	mailto {
@@ -1488,7 +1539,8 @@ 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 !"
+	    return "As soon as I've told you message(s), I'll forget them\
+ - note that this means messages can get lost !"
 	}
 	pester {
 	    set u {}
@@ -1500,7 +1552,8 @@ proc tellme_rel_desc {v} {
 	    error "bad tellrel $rel"
 	}
     }
-    return "I'll remind you every [showintervalsecs $every 1] until you say delmsg$u."
+    return "After delivering messages, I'll remind you every\
+ [showintervalsecs $every 1] until you say delmsg$u."
 }
 
 def_setting timeformat {
@@ -1704,12 +1757,12 @@ def_ucmd set {
 }
 
 def_ucmd identpass {
-    set username [ta_word]
-    set passmd5 [md5sum "[ta_word]\n"]
-    ta_nomore
     prefix_nick
     check_notonchan
     set luser [irctolower $n]
+    set username [ta_word]
+    set passmd5 [md5sum "[ta_word]\n"]
+    ta_nomore
     upvar #0 nick_onchans($luser) onchans
     if {![info exists onchans] || ![llength $onchans]} {
 	ucmdr "You must be on a channel with me to identify yourself." {}
@@ -1819,7 +1872,7 @@ 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]
+	if {$mentiontold} { after $ms [list lnick_checktold $luser] }
     } else {
 	lnick_marktime_doafter $luser $why $ms $mentiontold
     }