X-Git-Url: https://git.distorted.org.uk/~mdw/ircbot/blobdiff_plain/31eadeb5d4f9ad2482f1fcda1e3db21d09453b5e..ed982e507ddd5e9ec2d0e7fa3177a25677091a5e:/bot.tcl

diff --git a/bot.tcl b/bot.tcl
index 315163f..f05c738 100755
--- a/bot.tcl
+++ b/bot.tcl
@@ -150,6 +150,9 @@ proc tell_event {nl event} {
     # 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.
+    global calling_nick
+    if {[info exists calling_nick]} { set save $calling_nick }
+puts "[list tell_event $nl $event]"
     switch -exact $event {
 	none { }
 	talk {
@@ -159,40 +162,54 @@ proc tell_event {nl event} {
 	act {
 	    after 750 [list tell_event_core $nl $event]
 	}
-	ident {
+	ident - msgsarrive {
 	    tell_event_core $nl $event
 	}
 	default {
 	    error "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 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
+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
@@ -211,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)
@@ -231,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 [nickdb_get $n tellsec] sec secwhen
+    manyset [tell_effective_sec $nl] sec secwhen
     switch -exact $sec {
 	insecure { append evstate ii }
 	secure { append evstate [expr {$ago<$secwhen ? "sl" : "ss"}] }
@@ -245,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 {
@@ -262,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
@@ -269,16 +296,33 @@ FIXME - document the extra param to recordlastseen
 	}
 	ni????? - naii??? - nas?i?? - mi????? -	pa????l {
 	    # pass and then stuff
-	    
-
-	    return
+	    if {[length $iml] == 3} {
+		manyset $iml sender sentwhen msg
+		sendprivmsg $nl \
+ "$sender asked me [showintervalsecs [expr {$now-$sentwhen}] 0]\
+ to tell you: $msg"
+            } else {
+		sendprivmsg $nl \
+ "Here are the [expr {[llength $iml]/3}] messages there are for you:"
+		while {[llength $iml] >= 3} {
+		    manyset [lrange $iml 0 2] sender sentwhen msg
+		    set iml [lrange $iml 3 end]
+		    sendprivmsg $nl \
+ " [showintervalsecs [expr {$now-$sentwhen}] 1] <$sender> $msg"
+		}
+	    }
+	    if {"$rel" == "unreliable"} {
+		tell_delete_msgs {} $nl
+		return
+	    }
+	    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
@@ -292,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]
@@ -396,7 +444,7 @@ proc chanmode_o1 {m g p chan} {
 	} else {
 	    set chan_initialop([irctolower $chan]) $u
 	    sendprivmsg $n \
- "Thanks. You can use `channel manager ...' to register this channel."
+ "Thanks.  You can use `channel manager ...' to register this channel."
 	    if {![nickdb_exists $n] || ![string length [nickdb_get $n username]]} {
 		sendprivmsg $n \
  "(But to do that you must register your nick securely first.)"
@@ -746,14 +794,9 @@ def_somedb_id delete {} {
 set default_settings_nick {
     timeformat ks
     marktime off
-    tellsec insecure
+    tellsec {secure 600}
     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
@@ -770,6 +813,8 @@ set default_settings_msgs {
 }
 # inbound -> [<nick> <time_t> <message>] ...
 # outbound -> [<nick> <time_t(earliest)> <count>] ...
+#   neither are sorted particularly; only one entry per recipient in
+#   output; both sender and recipient are cased
 
 def_somedb_id set {args} {
     upvar #0 default_settings_$nickchan def
@@ -1164,18 +1209,133 @@ def_ucmd channel {
     channel/$subcmd
 }
 
+proc tell_effective_sec {n} {
+    set l [nickdb_get $n tellsec]
+    set u [nickdb_get $n username]
+    if {"[lindex $l 0]" == "secure" && ![string length $u]} { set l insecure }
+    return $l
+}
+
+proc tell_peernicks {text} {
+    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
+	}
+    }
+    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} {
+    set ninbound {}
+    set ndel 0
+    foreach {s t m} [msgsdb_get $recip inbound] {
+	if {[llength $senders]} {
+	    if {[lsearch -exact $senders [irctolower $s]] == -1} {
+		lappend ninbound $s $t $m
+		continue
+	    }
+	}
+	set rsenders($s) 1
+	incr ndel
+    }
+    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_maydelete $s outbound $noutbound inbound
+    }
+    return $ndel
+}
+
+def_ucmd untell {
+    prefix_nick
+    check_notonchan
+    nick_securitycheck 0
+    set recipients [tell_peernicks $text]
+    if {![llength $recipients]} {
+	usererror "You must say which recipients' messages from you to forget."
+    }
+    set ndel 0
+    foreach recip $recipients {
+	incr ndel [tell_delete_msgs [irctolower $n] $recip]
+    }
+    ucmdr "Removed $ndel as yet undelivered message(s)." {}
+}
+
+def_ucmd delmsg {
+    global errorInfo errorCode
+    prefix_nick
+    set nl [irctolower $n]
+    check_notonchan
+    manyset [tell_effective_sec $n] sec secwhen
+    switch -exact $sec {
+	insecure { }
+	refuse - mailto {
+	    usererror \
+ "There are no messages to delete\
+ because your message disposition prevents them from being left."
+	}
+	secure {
+	    nick_securitycheck 1
+	}
+	default {
+	    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} {
+	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." }
+	default {
+	    ucmdr {} {} "deletes your $ndel message(s) from\
+ [lreplace $senders end end] and [lindex $senders end]."
+	}
+    }
+}
+
 def_ucmd tell {
     global nick_case ownmailaddr ownfullname
     
     prefix_nick
     set target [ta_word]
     if {![string length $text]} { error "tell them what?" }
+    if {[string length $text] > 400} { error "message too long" }
 
     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 [tell_effective_sec $target] sec mailtoint mailwhy
     manyset [nickdb_get $target tellrel] rel relint relwithin
     switch -exact $sec {
 	insecure - secure {
@@ -1216,6 +1376,7 @@ def_ucmd tell {
 		}
 	    }
 	    append msg .
+	    tell_event $ltarget msgsarrive
 	    ucmdr $msg {}
 	}
 	mailto {
@@ -1345,15 +1506,22 @@ proc def_setting {opt show_body set_body} {
         $set_body"
 }
 
-proc tellme_sec_desc {v} {
+proc tellme_sec_desc {v n} {
     manyset $v sec mailtoint
     switch -exact $sec {
 	insecure {
 	    return "I'll tell you your messages whenever I see you."
 	}
 	secure {
-	    return \
+	    if {[string length [nickdb_get $n username]]} {
+		return \
  "I'll keep the bodies of your messages private until you identify yourself, reminding you every [showintervalsecs $mailtoint 1]."
+	    } else {
+		return \
+ "I'll tell you your messages whenever I see you.\
+  (Secure message delivery is enabled, but your nick is not registered\
+ securely.  See `help register'.)"
+	    }
 	}
 	refuse {
 	    return "I shan't accept messages for you."
@@ -1371,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 {}
@@ -1383,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 {
@@ -1437,9 +1607,25 @@ def_setting security {
     }
 } {}
 
+proc tellme_setting_sec_simple {} {
+    uplevel 1 {
+	ta_nomore
+	set sr sec
+	set v $setting
+    }
+}
+
+proc tellme_setting_neednomsgs {} {
+    uplevel 1 {
+	if {[llength [msgsdb_get $n inbound]]} {
+	    usererror "You must delete the messages you have, first."
+	}
+    }
+}
+
 def_setting tellme {
     set secv [nickdb_get $n tellsec]
-    set ms [tellme_sec_desc $secv]
+    set ms [tellme_sec_desc $secv $n]
     manyset $secv sec
     switch -exact $sec {
 	insecure - secure {
@@ -1453,18 +1639,26 @@ def_setting tellme {
 } {
     set setting [string tolower [ta_word]]
     switch -exact $setting {
-	insecure - secure - refuse {
+	insecure {
+	    tellme_setting_sec_simple
+	}
+	secure {
+	    set every [ta_interval_optional 60 600]
 	    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
+	    set v [list secure $every]
+	}
+	refuse {
+	    telling_setting_neednomsgs
+	    telling_setting_sec_simple
 	}
 	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)."
+	    telling_setting_neednomsgs
+            set u [nickdb_get $n username]
+	    if {[string length $u]} {
+		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]
@@ -1473,21 +1667,19 @@ def_setting tellme {
 	    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"
+		    usererror \
+ "You can't change your message delivery conditions when\
+ your message disposition prevents messages from being left."
 		}
 	    }
 	    set sr rel
 	    set v $setting
 	    if {"$setting" != "unreliable"} {
-		set every [parse_interval [ta_word] 300]
+		set every [parse_interval_optional 300 3600]
 		lappend v $every
 	    }
 	    if {"$setting" == "remind"} {
-		if {[ta_anymore]} {
-		    set within [parse_interval [ta_word] 5]
-		} else {
-		    set within 30
-		}
+		set within [ta_interval_optional 5 30]
 		if {$within > $every} {
 		    error "remind interval must be at least time to respond"
 		}
@@ -1565,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." {}
@@ -1680,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
     }