return $str
}
+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
+
+ if {[info exists telling]} {
+ manyset $telling u_last stt telling_when
+ if {![info exists u] || "$u_last" != "$u"} {
+ set stt undelivered
+ }
+ } else {
+ set stt undelivered
+ set telling_when 0
+ }
+ }
+}
+
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
# 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 }
+ set r DELAYED
switch -exact $event {
none { }
talk {
act {
after 750 [list tell_event_core $nl $event]
}
- ident {
+ ident - msgsarrive {
tell_event_core $nl $event
}
+ tellme {
+ set r [tell_event_core $nl TELLME]
+ }
default {
error "tell_event $nl $event"
}
}
if {[info exists save]} { set calling_nick $save }
+ return $r
}
proc tell_event_core {nl event} {
- # event is `talk', `act' or `ident'
+ global tell_event_teventi errorInfo
+ set tell_event_teventi "*$event* $nl"
+ if {[catch {
+ tell_event_core1 $nl $event
+ } emsg]} {
+ log_intern "tell event error" "$emsg >$errorInfo<"
+ set emsg ERROR
+ } else {
+ log_intern "tell event" "done $tell_event_teventi $emsg"
+ }
+ return $emsg
+}
+
+proc tell_event_core1 {nl event} {
+ # event is `talk', `act', `ident', `msgsarrive' or `TELLME'
# 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
-
- 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 stt]} {
- set stt norecord
- set telling_when $now
- }
+ set iml [msgsdb_get $nl inbound]
+ if {![llength $iml]} { return nomsgs }
+ set now [clock seconds]
+ tell_getcstate
set ago [expr {$now - $telling_when}]
# Now we have the components of a telling state
# u - nick_unique (unset if not visible)
- # stt - state: norecord, mentioned, passede
+ # stt - state: undelivered, 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 (MESSAGES)
+ # u UNDELIVERED (MESSAGES)
# m MENTIONED
# p PASSED
# event
# t talk
# a act
# i ident
+ # m msgsarrive
+ # T tellme (user command)
# 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 [nickdb_get_sec_effective $nl] sec secwhen
switch -exact $sec {
insecure { append evstate ii }
- secure { append evstate [expr {$ago<$secwhen ? "sl" : "ss"}] }
+ secure { append evstate [expr {$ago<$secwhen ? "ss" : "sl"}] }
default { append evstate "#$sec#" }
}
upvar #0 nick_username($nl) nu
- if {[info exists nu] && "$nu" == "[nickdb_get $nl username]"} {
+ if {[info exists nu] && "$nu" == "[nickdb_get_username $nl]"} {
append evstate i
} else {
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 {
default { append evstate "#$rel#" }
}
+ global tell_event_teventi
+ set tell_event_teventi "$evstate $ago $nl"
switch -glob $evstate {
pt???rv {
# consider delivered:
# (very recently passed, and the user talks)
tell_delete_msgs {} $nl
- return
+ return delivered
+ }
+ pm????? {
+ # oops, messages passed are now out of date
+ catch_restoreei { unset telling }
+ return reset
+ }
+ ?m????? {
+ # ignore new msgs if we haven't passed yet
+ return ignorenew
}
- nt????? - mt????? -
+ ut????? - mt????? -
pt???uu - pt???rs - pt???rl - pt???p? {
# ignore (any other `talk's) - act handles these
- return
+ return ignoretalk
}
- ni????? - naii??? - nas?i?? - mi????? - pa????l {
+ ui????? -
+ uaii?uu - uaii??l - uas?i?l -
+ mi????? - pa????l -
+ ?Tii??? - ?Ts?i?? {
# pass and then stuff
- if {[length $iml] == 3} {
+ if {[llength $iml] == 3} {
manyset $iml sender sentwhen msg
sendprivmsg $nl \
- "$sender asked me [showintervalsecs [expr {$now-$sentwhen}] 0]\
+ "$sender asked me [showinterval [expr {$now-$sentwhen}]]\
to tell you: $msg"
} else {
sendprivmsg $nl \
- "Here are the [expr {[llength $iml]/3}] messages there are for you:"
+ "I have [expr {[llength $iml]/3}] messages for you:"
while {[llength $iml] >= 3} {
manyset [lrange $iml 0 2] sender sentwhen msg
set iml [lrange $iml 3 end]
}
if {"$rel" == "unreliable"} {
tell_delete_msgs {} $nl
- return
+ return toldunreliable
}
set stt passed
+ set re passed
}
- nas?u?? {
- sendprivmsg $nl {You have messages (so identify yourself please).}]
+ uaslu?? {
+ sendprivmsg $nl {You have messages (so identify yourself please).}
set stt mentioned
+ set re mentioned
+ }
+ ?Ts?u?? {
+ sendprivmsg $nl {You must identify yourself to see your messages.}
+ return ignoreuitm
}
masl??? {
- sendprivmsg $nl {Don't forget about your messages.}]
+ sendprivmsg $nl {Don't forget about your messages.}
+ return remind
}
pi????? {
- return
+ return ignorepi
}
- mass??? - pa????v - pa????s {
+ mass??? - pa????v - pa????s -
+ uaii??v - uaii??s -
+ uas?i?v - uas?i?s -
+ uassu?? {
# too soon
- return
+ return ignoresoon
}
* {
error "tell_event_core nl=$nl evstate=$evstate ?"
}
}
if {![info exists u]} {
- catch { unset telling }
+ set telling [list {} undelivered $now]
} else {
set telling [list $u $stt $now]
}
+ return $re
}
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]
set chan_initialop([irctolower $chan]) $u
sendprivmsg $n \
"Thanks. You can use `channel manager ...' to register this channel."
- if {![nickdb_exists $n] || ![string length [nickdb_get $n username]]} {
+ if {![string length [nickdb_get_username $n username]]} {
sendprivmsg $n \
"(But to do that you must register your nick securely first.)"
}
channel/$subcmd
}
-proc tell_effective_sec {n} {
+proc nickdb_get_username {n} {
+ if {![nickdb_exists $n]} { return "" }
+ return [nickdb_get $n username]
+}
+
+proc nickdb_get_sec_effective {n} {
set l [nickdb_get $n tellsec]
- set u [nickdb_get $n username]
+ set u [nickdb_get_username $n]
if {"[lindex $l 0]" == "secure" && ![string length $u]} { set l insecure }
return $l
}
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] {
- if {[llength $senders]} {
- if {[lsearch -exact $senders [irctolower $s]] == -1} {
+ foreach {s t m} [msgsdb_get $lrecip inbound] {
+ if {[llength $lsenders]} {
+ if {[lsearch -exact $lsenders [irctolower $s]] == -1} {
lappend ninbound $s $t $m
continue
}
set rsenders($s) 1
incr ndel
}
- msgsdb_set $recip inbound $ninbound
+ msgsdb_set_maydelete $lrecip 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
}
}
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)." {}
}
def_ucmd delmsg {
global errorInfo errorCode
prefix_nick
+ set nl [irctolower $n]
check_notonchan
- manyset [tell_effective_sec $n] sec secwhen
+ manyset [nickdb_get_sec_effective $n] sec secwhen
switch -exact $sec {
insecure { }
refuse - mailto {
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." }
}
}
+def_ucmd tellme {
+ prefix_nick
+ ta_nomore
+ check_notonchan
+ switch -exact [tell_event [irctolower $n] tellme] {
+ ERROR - INVALID { ucmdr {} {is ill. Help!} }
+ nomsgs { ucmdr {You have no messages.} {} }
+ default { }
+ }
+}
+
def_ucmd tell {
global nick_case ownmailaddr ownfullname
set ctarget $target
if {[info exists nick_case($ltarget)]} { set ctarget $nick_case($ltarget) }
- manyset [tell_effective_sec $target] sec mailtoint mailwhy
+ manyset [nickdb_get_sec_effective $target] sec mailtoint mailwhy
manyset [nickdb_get $target tellrel] rel relint relwithin
switch -exact $sec {
insecure - secure {
}
}
append msg .
+ tell_event $ltarget msgsarrive
ucmdr $msg {}
}
mailto {
return "I'll tell you your messages whenever I see you."
}
secure {
- if {[string length [nickdb_get $n username]]} {
+ if {[string length [nickdb_get_username $n]]} {
return \
"I'll keep the bodies of your messages private until you identify yourself, reminding you every [showintervalsecs $mailtoint 1]."
} else {
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 {
}
mailto {
telling_setting_neednomsgs
- set u [nickdb_get $n username]
- if {[string length $u]} {
+
+ if {[string length [set u [nickdb_get_username $n]]]} {
usererror \
"Sorry, you must register securely to have your messages mailed\
(to prevent the use of this feature for spamming). See `help register'."
}
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
}
global calling_nick
set calling_nick $luser
sendprivmsg $luser [lnick_pingstring $why $oc ""]
- if {$mentiontold} { lnick_checktold $luser }
+ if {$mentiontold} { after 150 [list lnick_checktold $luser] }
lnick_marktime_reset $luser
}
}
if {[llength $oc]} { lnick_marktime_reset $ln }
}
- lnick_checktold $ln
+ after 150 [list lnick_checktold $ln]
ucmdr {} [lnick_pingstring "Pong!" $oc $text]
}
~mdw / ircbot / blobdiff