return [showintervalsecs/[opt timeformat] $howlong $abbrev]
}
+proc formatsf {pfx value} {
+ foreach {min format} { 100 %.0f 10 %.1f 0 %.2f} {
+ set fval [format $format $value]
+ if {$fval < $min} continue
+ return [format "$fval${pfx}" $value]
+ }
+}
+
+proc showintervalsecs/beat {howlong abbrev} {
+ # We split in two to avoid overflow problems.
+ if {$howlong < 86 } {
+ # mB's
+ set pfx mB
+ return [format "%.0fmB" [expr {round($howlong * 1.157)*10} ]]
+ } else {
+ if {$howlong < 86400 } {
+ # B's
+ set pfx B
+ set value [expr {$howlong / 86.4}]
+ } else {
+ # kB's
+ set pfx kB
+ set value [expr {$howlong / 86400.0}]
+ }
+ }
+ return [formatsf $pfx $value]
+}
+
proc showintervalsecs/ks {howlong abbrev} {
if {$howlong < 1000} {
return "${howlong}s"
} else {
if {$howlong < 1000000} {
- set pfx k
+ set pfx ks
set scale 1000
} else {
- set pfx M
+ set pfx Ms
set scale 1000000
}
set value [expr "$howlong.0 / $scale"]
- foreach {min format} {100 %.0f 10 %.1f 1 %.2f} {
- if {$value < $min} continue
- return [format "$format${pfx}s" $value]
- }
+ return [formatsf $pfx $value]
}
}
ks { set u 1000 }
m { set u 60 }
h { set u 3600 }
+ mb { set u 0.0864 }
+ b { set u 86.4 }
+ kb { set u 86400 }
default { error "unknown unit of time $unit" }
}
if {$value > 86400*21/$u} { error "interval too large" }
- set result [expr {$value*$u}]
+ set result [expr {round($value*$u)}]
if {$result < $min} { error "interval too small (<${min}s)" }
return $result
}
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 {
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_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"} {
- unset telling; unset stt; unset telling_when
- }
- }
-
- if {![info exists stt]} {
- set stt norecord
- set telling_when $now
- }
+proc tell_event_core {nl event} {
+ 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_core {nl event} {
- # event is `talk', `act', `ident' or `msgsarrive'
+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
global calling_nick
set calling_nick $nl
- set iml [msgdb_get $nl inbound]
- if {![llength $iml]} return
+ 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
# 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
+ set ndel [tell_delete_msgs {} $nl]
+ sendprivmsg $nl \
+ "I'm assuming you got the $ndel message(s) I just passed on."
+ return delivered
}
pm????? {
# oops, messages passed are now out of date
- catch { unset telling }
- return
+ catch_restoreei { unset telling }
+ return reset
}
?m????? {
# ignore new msgs if we haven't passed yet
- return
+ 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?iuu - 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} {
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.)"
}
}
set invitees {}
while {[ta_anymore]} {
- set invitee [ta_word]
- check_nick $invitee
+ set invitee [ta_nick]
lappend invitees $invitee
}
foreach invitee $invitees {
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
}
proc tell_peernicks {text} {
+ global errorInfo errorCode
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
+ error "invalid nick `$sender': $emsg" $errorInfo $errorCode
}
}
return $senders
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} {
+ 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_maydelete $recip inbound $ninbound outbound
+ msgsdb_set_maydelete $lrecip inbound $ninbound outbound
if {![llength $ninbound]} {
upvar #0 nick_telling($lrecip) telling
catch { unset telling }
def_ucmd untell {
prefix_nick
check_notonchan
- nick_securitycheck 0
+ if {[nickdb_exists $n]} { nick_securitycheck 0 }
set recipients [tell_peernicks $text]
if {![llength $recipients]} {
usererror "You must say which recipients' messages from you to forget."
ucmdr "Removed $ndel as yet undelivered message(s)." {}
}
+def_ucmd_alias delmsgs delmsg
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 {
+ reject - mailto {
usererror \
"There are no messages to delete\
because your message disposition prevents them from being left."
error "delmsg sec $sec"
}
}
+ if {![llength [msgsdb_get $n inbound]]} {
+ ucmdr "No incoming messages to delete." {}
+ }
tell_getcstate
+ if {![info exists u]} {
+ usererror \
+ "I can't delete your messages unless I can see you on a channel with me.\
+ Otherwise I might delete a message I hadn't told you about yet."
+ }
if {"$stt" != "passed"} {
+ set telling [list $u undelivered 0]
usererror \
- "There are message(s) you've not yet seen; I'll deliver them to you now.\
+ "There are message(s) you may not yet have 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]
if {!$ndel} {
if {[llength $senders]} {
ucmdr "No relevant incoming messages to delete." {}
- } else {
- ucmdr "No incoming messages to delete." {}
}
}
switch -exact [llength $senders] {
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]."
+ [lreplace $senders end end] and/or [lindex $senders end]."
}
}
}
+def_ucmd tellme {
+ prefix_nick
+ ta_nomore
+ check_notonchan
+ manyset [nickdb_get $n tellsec] sec
+ switch -exact $sec {
+ reject { ucmdr "But, you asked me to reject messages for you !" {} }
+ mailto { ucmdr "But, you asked me to mail your messages to you !" {} }
+ }
+ 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
prefix_nick
- set target [ta_word]
+ set target [ta_nick]
if {![string length $text]} { error "tell them what?" }
if {[string length $text] > 400} { error "message too long" }
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 {
"I've mailed $ctarget, which is what they prefer." \
{}
}
- refuse {
+ reject {
usererror "Sorry, $ctarget does not want me to take messages."
}
default {
def_ucmd who {
if {[ta_anymore]} {
- set target [ta_word]; ta_nomore
+ set target [ta_nick]; ta_nomore
set myself 1
} else {
prefix_nick
switch -exact $tf {
ks { return "Times will be displayed in seconds or kiloseconds." }
hms { return "Times will be displayed in hours, minutes, etc." }
+ beat { return "Times will be displayed in beats (1000B = 1d)." }
default { error "invalid timeformat: $v" }
}
}
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 {
securely. See `help register'.)"
}
}
- refuse {
+ reject {
return "I shan't accept messages for you."
}
mailto {
}
}
-proc tellme_rel_desc {v} {
+proc tellme_rel_desc {v n} {
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 {
proc tellme_setting_neednomsgs {} {
uplevel 1 {
if {[llength [msgsdb_get $n inbound]]} {
- usererror "You must delete the messages you have, first."
+ usererror "You must delete the incoming messages you have, first."
}
}
}
manyset $secv sec
switch -exact $sec {
insecure - secure {
- set mr [tellme_rel_desc [nickdb_get $n tellrel]]
+ set mr [tellme_rel_desc [nickdb_get $n tellrel] $n]
return "$ms $mr"
}
- refuse - mailto {
+ reject - mailto {
return $ms
}
}
} {
set setting [string tolower [ta_word]]
+ set nl [irctolower $n]
switch -exact $setting {
insecure {
tellme_setting_sec_simple
set sr sec
set v [list secure $every]
}
- refuse {
- telling_setting_neednomsgs
- telling_setting_sec_simple
+ reject {
+ tellme_setting_neednomsgs
+ tellme_setting_sec_simple
}
mailto {
- telling_setting_neednomsgs
- set u [nickdb_get $n username]
- if {[string length $u]} {
+ tellme_setting_neednomsgs
+
+ upvar #0 nick_username($nl) nu
+ if {!([info exists nu] && [string length $nu])} {
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]
+ set v [list mailto [ta_word] $nu]
}
unreliable - pester - remind {
manyset [nickdb_get $n tellsec] sec
switch -exact $sec {
- refuse - mailto {
+ reject - mailto {
usererror \
- "You can't change your message delivery conditions when\
- your message disposition prevents messages from being left."
+ "Sorry, I shan't change when I'll consider a message delivered, because\
+ you've asked me not to keep messages, or to mail them to you.\
+ You should say `set tellme secure' or some such, first."
}
}
set sr rel
set v $setting
if {"$setting" != "unreliable"} {
- set every [parse_interval_optional 300 3600]
+ set every [ta_interval_optional 300 3600]
lappend v $every
}
if {"$setting" == "remind"} {
}
}
nickdb_set $n tell$sr $v
- ucmdr [tellme_${sr}_desc $v] {}
+ upvar #0 nick_telling($nl) telling
+ catch { unset telling }
+ ucmdr [tellme_${sr}_desc $v $n] {}
}
proc lnick_checktold {luser} {
set ml [msgsdb_get $luser outbound]
if {![llength $ml]} return
set is1 [expr {[llength $ml]==3}]
- set m1 "FYI, I haven't yet passed on your"
+ set m1 "FYI, I haven't yet delivered your"
set ol {}
set now [clock seconds]
while {[llength $ml]} {
}
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." {}
irc-identpass $n
upvar #0 nick_username($luser) rec_username
set rec_username $username
+ after 50 [list tell_event $luser ident]
ucmdr "Pleased to see you, $username." {}
- tell_event $luser ident
+}
+
+def_ucmd kill {
+ global nick
+ prefix_nick
+ set target [ta_nick]
+ if {![nickdb_exists $target]} { error "$target is not a registered nick." }
+ set wantu [nickdb_get $target username]
+ if {![string length $wantu]} { error "$target is insecurely registred." }
+ upvar #0 nick_username([irctolower $n]) nu
+ if {![info exists nu]} { error "You must identify yourself first." }
+ if {"$wantu" != "$nu"} {
+ error "You are the wrong user, $nu - $target belongs to $wantu."
+ }
+ set reason "at request of user $nu"
+ if {[ta_anymore]} { append reason "; $text" }
+ sendout KILL $target $reason
}
def_ucmd summon {
set target [ta_word]
ta_nomore
+ # fixme would be nice if the rest of the text was passed on instead
check_username $target
prefix_nick
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]
}
}
proc connected {} {
+ global operuserpass
+ if {[info exists operuserpass]} {
+ eval sendout OPER $operuserpass
+ }
foreach chan [chandb_list] {
if {[chandb_get $chan autojoin]} { dojoin $chan }
}
~mdw / ircbot / blobdiff