}
proc onread {args} {
- global sock nick
+ global sock nick calling_nick errorInfo errorCode
if {[gets $sock line] == -1} { set terminate 1; return }
regsub -all "\[^ -\176\240-\376\]" $line ? line
set org $line
+
+ set ei $errorInfo
+ set ec $errorCode
+ catch { unset calling_nick }
+ set errorInfo $ei
+ set errorCode $ec
+
if {[regexp -nocase {^:([^ ]+) (.*)} $line dummy prefix remain]} {
set line $remain
- if {[regexp {^([^!]+)!} $prefix dummy maybenick] &&
- "[irctolower $maybenick]" == "[irctolower $nick]"} return
+ if {[regexp {^([^!]+)!} $prefix dummy maybenick]} {
+ set calling_nick $maybenick
+ if {"[irctolower $maybenick]" == "[irctolower $nick]"} return
+ }
} else {
set prefix {}
}
}
proc showintervalsecs {howlong} {
+ return [showintervalsecs/[opt timeformat] $howlong]
+}
+
+proc showintervalsecs/ks {howlong} {
if {$howlong < 1000} {
return "${howlong}s"
} else {
}
}
+proc format_qty {qty unit} {
+ set o $qty
+ append o " "
+ append o $unit
+ if {$qty != 1} { append o s }
+ return $o
+}
+
+proc showintervalsecs/hms {qty} {
+ set ul {second 60 minute 60 hour 24 day 7 week}
+ set remainv 0
+ while {[llength $ul] > 1 && $qty >= [set uv [lindex $ul 1]]} {
+ set remainu [lindex $ul 0]
+ set remainv [expr {$qty % $uv}]
+ set qty [expr {($qty-$remainv)/$uv}]
+ set ul [lreplace $ul 0 1]
+ }
+ set o [format_qty $qty [lindex $ul 0]]
+ if {$remainv} {
+ append o " "
+ append o [format_qty $remainv $remainu]
+ }
+ return $o
+}
+
proc showinterval {howlong} {
if {$howlong <= 0} {
return {just now}
}
}
+proc channel_noone_seen {chan} {
+ global nick_onchans
+ foreach n [array names nick_onchans] {
+ upvar #0 nick_onchans($n) oc
+ set oc [grep tc {"$tc" != "$chan"} $oc]
+ }
+}
+
proc process_kickpart {chan user} {
+ global nick
check_nick $user
if {![ischan $chan]} { error "not a channel" }
-
+ if {"[irctolower $user]" == "[irctolower $nick]"} {
+ channel_noone_seen $chan
+ }
upvar #0 nick_onchans($user) oc
set lc [irctolower $chan]
set oc [grep tc {"$tc" != "$lc"} $oc]
+ if {![llength $oc]} { nick_forget $user }
+ nick_case $user
}
proc msg_KICK {p c chans users comment} {
upvar #0 nick_${ary}($n) av
catch { unset av }
}
+ nick_case $n
+}
+
+proc nick_case {n} {
+ global nick_case
+ set nick_case([irctolower $n]) $n
}
proc msg_NICK {p c newnick} {
- global nick_arys
+ global nick_arys nick_case
prefix_nick
recordlastseen_n $n "changing nicks to $newnick" 0
recordlastseen_n $newnick "changing nicks from $n" 1
if {[info exists new]} { error "nick collision ?! $ary $n $newnick" }
if {[info exists old]} { set new $old; unset old }
}
+ nick_case $newnick
}
proc msg_JOIN {p c chan} {
recordlastseen_n $n "joining $chan" 1
upvar #0 nick_onchans($n) oc
lappend oc [irctolower $chan]
+ nick_case $n
}
proc msg_PART {p c chan} {
prefix_nick
recordlastseen_n $n "talking to me" 1
set output $n
}
+ nick_case $n
if {[catch {
regsub {^! *} $text {} text
if {![info exists names_chans]} { set names_chans {} }
set chan [irctolower $chan]
lappend names_chans $chan
- foreach n [array names nick_onchans] {
- upvar #0 nick_onchans($n) oc
- set oc [grep tc {"$tc" != "$chan"} $oc]
- }
+ channel_noone_seen $chan
foreach n [split $nicklist { }] {
regsub {^[@+]} $n {} n
- check_nick $n
if {![string length $n]} continue
+ check_nick $n
upvar #0 nick_onchans($n) oc
lappend oc $chan
+ nick_case $n
}
}
unset names_chans
}
+proc ta_anymore {} {
+ upvar 1 text text
+ return [expr {!![string length $text]}]
+}
+
proc ta_nomore {} {
upvar 1 text text
if {[string length $text]} { error "too many parameters" }
catch { unset help_topics }
set f [open helpinfos r]
- set lno 0
- while {[gets $f l] >= 0} {
- incr lno
- if {[regexp {^#.*} $l]} {
- } elseif {[regexp {^ *$} $l]} {
- if {[info exists topic]} {
- set help_topics($topic) [join $lines "\n"]
- unset topic
- unset lines
+ try_except_finally {
+ set lno 0
+ while {[gets $f l] >= 0} {
+ incr lno
+ if {[regexp {^#.*} $l]} {
+ } elseif {[regexp {^ *$} $l]} {
+ if {[info exists topic]} {
+ set help_topics($topic) [join $lines "\n"]
+ unset topic
+ unset lines
+ }
+ } elseif {[regexp {^!([-+._0-9a-z]*)$} $l dummy newtopic]} {
+ if {[info exists topic]} {
+ error "help $newtopic while in $topic"
+ }
+ set topic $newtopic
+ set lines {}
+ } elseif {[regexp {^[^!#]} $l]} {
+ set topic
+ lappend lines [string trimright $l]
+ } else {
+ error "eh ? $lno: $l"
}
- } elseif {[regexp {^!([-+._0-9a-z]*)$} $l dummy newtopic]} {
- if {[info exists topic]} { error "help $newtopic while in $topic" }
- set topic $newtopic
- set lines {}
- } elseif {[regexp {^[^!#]} $l]} {
- set topic
- lappend lines [string trimright $l]
- } else {
- error "eh ? $lno: $l"
}
+ if {[info exists topic]} { error "unfinished topic $topic" }
+ } {} {
+ close $f
}
- if {[info exists topic]} { error "unfinished topic $topic" }
}
def_ucmd help {
set nl [irctolower $n]
upvar #0 nickdb($nl) ndbe
binary scan $nl H* nh
- set nfn users/$nh
+ set nfn users/n$nh
if {![info exists ndbe] && [file exists $nfn]} {
- set f [file open $nfn r]
+ set f [open $nfn r]
try_except_finally { set newval [read $f] } {} { close $f }
if {[llength $newval] % 2} { error "invalid length" }
set ndbe $newval
close $f
file rename -force $nfn.new $nfn
} {
- catch { close $f }
} {
+ catch { close $f }
}
set ndbe $newval
}
+proc opt {key} {
+ global calling_nick
+ if {[info exists calling_nick]} { set n $calling_nick } { set n {} }
+ return [nickdb_opt $n $key]
+}
+
def_nickdb opt {n key} {
global default_settings
if {[info exists ndbe]} {
}
}
+def_ucmd who {
+ if {[ta_anymore]} {
+ set target [ta_word]; ta_nomore
+ set myself 1
+ } else {
+ prefix_nick
+ set target $n
+ set myself [expr {"$target" != "$n"}]
+ }
+ upvar #0 nick_case([irctolower $target]) nc
+ set nshow $target
+ if {[info exists nc]} {
+ upvar #0 nick_onchans($nc) oc
+ upvar #0 nick_username($nc) nu
+ if {[info exists oc]} { set nshow $nc }
+ }
+ if {![nickdb_exists $target]} {
+ set ol "$nshow is not a registered nick."
+ } elseif {[string length [set username [nickdb_opt $target username]]]} {
+ set ol "The nick $nshow belongs to the user $username."
+ } else {
+ set ol "The nick $nshow is registered (but not to a username)."
+ }
+ if {![info exists nc] || ![info exists oc]} {
+ if {$myself} {
+ append ol "\nI can't see $nshow on anywhere."
+ } else {
+ append ol "\nYou aren't on any channels with me."
+ }
+ } elseif {![info exists nu]} {
+ append ol "\n$nshow has not identified themselves."
+ } elseif {![info exists username]} {
+ append ol "\n$nshow has identified themselves as the user $nu."
+ } elseif {"$nu" != "$username"} {
+ append ol "\nHowever, $nshow is being used by the user $nu."
+ } else {
+ append ol "\n$nshow has identified themselves to me."
+ }
+ ucmdr {} $ol
+}
+
def_ucmd register {
prefix_nick
check_notonchan
upvar #0 nick_username($n) nu
if {![info exists nu]} {
ucmdr {} \
- "You must identify yourself before using `register'. See `help identify'."
+ "You must identify yourself before using `register'. See `help identify', or use `register insecure'."
}
nickdb_set $n username $nu
ucmdr {} {} "makes a note of your username." {}
}
}
}
-}
+}
+
+proc timeformat_desc {tf} {
+ switch -exact $tf {
+ ks { return "Times will be displayed in seconds or kiloseconds." }
+ hms { return "Times will be displayed in hours, minutes, etc." }
+ default { error "invalid timeformat: $v" }
+ }
+}
+
+proc def_setting {opt show_body set_body} {
+ proc set_show/$opt {} "
+ upvar 1 n n
+ set opt $opt
+ $show_body"
+ if {![string length $set_body]} return
+ proc set_set/$opt {} "
+ upvar 1 n n
+ upvar 1 text text
+ set opt $opt
+ $set_body"
+}
+
+def_setting timeformat {
+ set tf [nickdb_opt $n timeformat]
+ return "$tf: [timeformat_desc $tf]"
+} {
+ set tf [string tolower [ta_word]]
+ ta_nomore
+ set desc [timeformat_desc $tf]
+ nickdb_set $n timeformat $tf
+ ucmdr {} $desc
+}
+
+def_setting security {
+ set s [nickdb_opt $n username]
+ if {[string length $s]} {
+ return "Your nick, $n, is controlled by the user $s."
+ } else {
+ return "Your nick, $n, is not secure."
+ }
+} {}
+
+def_ucmd set {
+ prefix_nick
+ check_notonchan
+ if {![nickdb_exists $n]} {
+ ucmdr {} "You are unknown to me and so have no settings. (Use `register'.)"
+ }
+ if {![ta_anymore]} {
+ set ol {}
+ foreach proc [lsort [info procs]] {
+ if {![regexp {^set_show/(.*)$} $proc dummy opt]} continue
+ lappend ol [format "%-10s %s" $opt [set_show/$opt]]
+ }
+ ucmdr {} [join $ol "\n"]
+ } else {
+ set opt [ta_word]
+ if {[catch { info body set_show/$opt }]} {
+ error "no setting $opt"
+ }
+ if {![ta_anymore]} {
+ ucmdr {} "$opt [set_show/$opt]"
+ } else {
+ nick_securitycheck 0
+ if {[catch { info body set_set/$opt }]} {
+ error "setting $opt cannot be set with `set'"
+ }
+ set_set/$opt
+ }
+ }
+}
def_ucmd identpass {
set username [ta_word]
- set passmd5 [md5sum [ta_word]]
+ set passmd5 [md5sum "[ta_word]\n"]
ta_nomore
prefix_nick
- check_isprivmsg
+ check_notonchan
upvar #0 nick_onchans($n) onchans
if {![info exists onchans] || ![llength $onchans]} {
ucmdr "You must be on a channel with me to identify yourself." {}
~mdw / ircbot / blobdiff