return $str
}
-proc check_telling_core {nl event} {
- # event is `talk', `act' or `come'
-FIXME - delay 750ms when you invoke this, except for `talk'
- which causes `talk' now and `act' later
-FIXME - make it be called with come
-FIXME -
+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 }
+ switch -exact $event {
+ none { }
+ talk {
+ tell_event_core $nl talk
+ tell_event $nl act
+ }
+ act {
+ after 750 [list tell_event_core $nl $event]
+ }
+ ident {
+ tell_event_core $nl $event
+ }
+ default {
+ error "tell_event $nl $event"
+ }
+ }
+ if {[info exists save]} { set calling_nick $save }
+}
+
+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
upvar #0 nick_unique($nl) u
if {[info exists telling]} {
- manyset $telling u2 stt telling_when
- if {"$u2" != "$u"} { unset telling; unset stt; unset telling_when }
+ 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 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
+ # 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)
+ # m MENTIONED
+ # p PASSED
# event
# t talk
# a act
- # c come
+ # i ident
# security level and timing
# ii Insecure
# ss Secure and soon (before interval)
# sl Secure and late (after interval)
- # current state
- # n NORECORD
- # m MENTIONED
- # p PASSED
+ # current identification
+ # i Identified
+ # u Unidentified
# reliability and timing
# uu Unreliable
# rv Remind, very soon (before within-interval)
# rs Remind, soon (between)
- # rl Remind, late (aftr every-interval)
+ # rl Remind, late (after every-interval)
# ps Pester, soon (before interval)
# pl Pester, late (after interval)
- # current identification
- # i Identified
- # u Unidentified
- # current visibility
- # v Visible
- # h Hidden (invisible, no unique)
+
+ set evstate {}
+
+ append evstate [string range $stt 0 0]
+ append evstate [string range $event 0 0]
manyset [nickdb_get $n tellsec] sec secwhen
switch -exact $sec {
- insecure { set evstate ii }
- secure { set evstate [expr {$ago<$secwhen ? "sl" : "ss"}] }
- default { set evstate "#$sec#" }
+ insecure { append evstate ii }
+ secure { append evstate [expr {$ago<$secwhen ? "sl" : "ss"}] }
+ default { append evstate "#$sec#" }
}
- append evstate [string range $stt 0 0]
+ upvar #0 nick_username($nl) nu
+ if {[info exists nu] && "$nu" == "[nickdb_get $nl username]"} {
+ append evstate i
+ } else {
+ append evstate u
+ }
manyset [nickdb_set $n tellrel] rel relint relwithin
switch -exact $rel {
default { append evstate "#$rel#" }
}
- upvar #0 nick_username($nl) nu
- if {[info exists nu] && "$nu" == "[nickdb_get $nl username]"} {
- append evstate i
- } else {
- append evstate u
- }
-
- append evstate [expr {[info exists u] ? "v" : "h"}]
-
switch -glob $evstate {
- t??prv?v {
+ pt???rv {
# consider delivered:
# (very recently passed, and the user talks)
- tell_delete {} $nl
- }
- t??????? {
- # ignore
- # (any other `talk's)
- }
- ?iin???? - ?iip?l?? - ?ii????? -
- ?s?n??iv - ?s?m??iv - ?s?p?liv {
- # pass messages
- # (insecure and not passed recently, or just arriving;
- # secure and not passed recently)
- tells_deliver $nl
- }
- ?ssp???? - ???p?s?? - ???p?v?? {
- # ignore
- # (recently mentioned or passed
- # immediate `talk' thing)
- }
- ?s?n???? - ?slm???? - cs?????? {
- # mention messages
- # (secure and not mentioned recently or just arriving,
- # and should not pass)
- sendprivmsg $nl \
- {You have messages (so identify yourself please).}]
+ tell_delete_msgs {} $nl
+ return
}
- * {
- error "check_telling_core nl=$nl evstate=$evstate ?"
+ nt????? - mt????? -
+ pt???uu - pt???rs - pt???rl - pt???p? {
+ # ignore (any other `talk's) - act handles these
+ return
}
- }
-}
-
-
-
+ ni????? - naii??? - nas?i?? - mi????? - pa????l {
+ # pass and then stuff
+ 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).}]
+ set stt mentioned
+ }
+ masl??? {
+ sendprivmsg $nl {Don't forget about your messages.}]
+ }
+ pi????? {
+ return
+ }
+ mass??? - pa????v - pa????s {
+ # too soon
+ return
+ }
+ * {
+ error "tell_event_core nl=$nl evstate=$evstate ?"
}
- ns???u
-
-
-
- if {[
- set security
-
- switch -exact
-
- if {![info exists u]} { catch { unset telling } }
- && [info exists telling]} {
-
-
}
-
- if {![info exists telling]} {
-
+ if {![info exists u]} {
+ catch { unset telling }
+ } else {
+ set telling [list $u $stt $now]
+ }
+}
proc recordlastseen_n {n how here} {
global lastseen lookedfor
if {!$here} return
- check_telling $nl [lindex {x act talk} $here]
+ tell_event $nl [lindex {none act talk} $here]
upvar #0 lookedfor($nl) lf
if {[info exists lf]} {
}
# 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
channel/$subcmd
}
+def_ucmd delmsg {
+ prefix_nick
+ check_notonchan
+ manyset [nickdb_get $n tellsec] sec
+ switch -exact $sec {
+ insecure { }
+ refuse - mailto { error "you cannot
+ if {"$sec" == "
+}
+
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
}
} {}
+proc tellme_setting_needsecure {n ue} {
+ set u [nickdb_get $n username]
+ if {[string length $u]} { usererror $ue }
+ return $u
+}
+
+proc telling_setting_sec_simple {} {
+ uplevel 1 {
+ ta_nomore
+ set sr sec
+ set v $setting
+ }
+}
+
+proc telling_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 setting [string tolower [ta_word]]
switch -exact $setting {
- insecure - secure - refuse {
- 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
+ insecure {
+ telling_setting_sec_simple
+ }
+ secure {
+ telling_setting_sec_simple
+ }
+ 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)."
- }
+FIXME - working here, check needsecure for secure
+FIXME - what if user makes themselves insecure or deletes themselves while they have msgs ?
+ telling_setting_neednomsgs
+ set u [tellme_setting_needsecure $n \
+ "Sorry, you must register secure to have your messages mailed\
+ (to prevent the use of this feature for spamming)."]
set sr sec
set v [list mailto [ta_word] $u]
}
upvar #0 nick_username($luser) rec_username
set rec_username $username
ucmdr "Pleased to see you, $username." {}
+ tell_event $luser ident
}
def_ucmd summon {
~mdw / ircbot / blobdiff