# 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 {
act {
after 750 [list tell_event_core $nl $event]
}
- ident {
+ ident - msgsarrive {
tell_event_core $nl $event
}
default {
}
}
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
# t talk
# a act
# i ident
+ # m msgsarrive
# security level and timing
# ii Insecure
# ss Secure and soon (before interval)
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"}] }
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 {
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
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
}
}
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]
return $l
}
-proc tell_peernicks {
--- FIXME HERE
+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 peernicks
+ 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 {
error "delmsg sec $sec"
}
}
- 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
+ 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." {}
}
}
- tell_delete_msgs [irctolower $senders] [irctolower $n]
switch -exact [llength $senders] {
- 0 { ucmdr {} {} "deletes your message(s)." }
- 1 { ucmdr {} {} "deletes your message(s) from $senders." }
+ 0 { ucmdr {} {} "deletes your $ndel message(s)." }
+ 1 { ucmdr {} {} "deletes your $ndel message(s) from $senders." }
default {
- ucmdr {} {} "deletes your message(s) from\
+ ucmdr {} {} "deletes your $ndel message(s) from\
[lreplace $senders end end] and [lindex $senders end]."
}
}
}
}
append msg .
+ tell_event $ltarget msgsarrive
ucmdr $msg {}
}
mailto {
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 {}
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 {
}
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." {}
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
}
~mdw / ircbot / blobdiff