فهرست منبع

Add files via upload

Florian 8 سال پیش
والد
کامیت
f4f8ea5b9e

+ 3 - 3
BlackTools 2.5.3/BlackTools/Commands/BT.AddCmds.tcl

@@ -906,7 +906,7 @@ if {![info exists the_usernames]} {
 	set the_usernames ""
 }
 
-foreach user [split $usernames] {
+foreach user $usernames {
 if {$host != "prv"} {
 	foreach n [chanlist $chan] {
 	set id [nick2hand $n]
@@ -1299,9 +1299,9 @@ if {[matchattr $user -|q $chan]} {
 }
 	set getflags [getflags $user $chan]
 if {![string equal -nocase $show_user $user]} {
-	blacktools:tell $nick $host $hand $chan $chan1 info.1 "$show_user\[[black:color 1 $hand $user]\] $flags"
+	blacktools:tell $nick $host $hand $chan $chan1 info.1 "$user\[[black:color 1 $hand $user]\] $flags"
 } else {
-	blacktools:tell $nick $host $hand $chan $chan1 info.1 "$show_user $flags"
+	blacktools:tell $nick $host $hand $chan $chan1 info.1 "$user $flags"
 }
 if {![matchattr $user B]} {
 if {$automode_gl != "N/A"} {

+ 21 - 7
BlackTools 2.5.3/BlackTools/Commands/BT.ChanCmds.tcl

@@ -496,11 +496,13 @@ if {[regexp {^[&#]} $who] && [matchattr $hand nmo|M $who]} {
 vr {
 if {[matchattr $hand nmo|OMA $chan]} {
 	set vr [lindex [split $arg] 1]
+	set com [join [lrange [split $arg] 2 end]]
 	set chan1 "$chan"
 	set type 0
 if {[regexp {^[&#]} $vr] && [matchattr $hand nmo|MAO $vr]} {
 	set chan "$vr"
 	set vr [lindex [split $arg] 2]
+	set com [join [lrange [split $arg] 3 end]]
 }
 foreach c [channels] {
 	set backchan [join [setting:get $c backchan]]
@@ -508,18 +510,20 @@ if {[string match -nocase $chan $backchan]} {
 	set chan "$c"
 	}
 }
-	userhost:act $vr $nick $hand $char $chan $chan1 $type $black(vr:bantime) "vr" "" "0"
+	userhost:act $vr $nick $hand $char $chan $chan1 $type $black(vr:bantime) "vr" "$com" "0"
 	}
 }
 
 dr {
 if {[matchattr $hand nmo|OMA $chan]} {
 	set drone [lindex [split $arg] 1]
+	set com [join [lrange [split $arg] 2 end]]
 	set type 0
 	set chan1 "$chan"
 if {[regexp {^[&#]} $drone] && [matchattr $hand nmo|OMA $drone]} {
 	set chan "$drone"
 	set drone [lindex [split $arg] 2]
+	set com [join [lrange [split $arg] 3 end]]
 }
 foreach c [channels] {
 	set backchan [join [setting:get $c backchan]]
@@ -527,18 +531,20 @@ if {[string match -nocase $chan $backchan]} {
 	set chan "$c"
 	}
 }
-	userhost:act $drone $nick $hand $char $chan $chan1 $type $black(dr:bantime) "dr" "" "0"
+	userhost:act $drone $nick $hand $char $chan $chan1 $type $black(dr:bantime) "dr" "$com" "0"
 	}
 }
 
 bot {
 if {[matchattr $hand nmo|OMA $chan]} {
 	set bot [lindex [split $arg] 1]
+	set com [join [lrange [split $arg] 2 end]]
 	set type 0
 	set chan1 "$chan"
 if {[regexp {^[&#]} $bot] && [matchattr $hand nmo|OMA $bot]} {
 	set chan "$bot"
 	set bot [lindex [split $arg] 2]
+	set com [join [lrange [split $arg] 3 end]]
 }
 foreach c [channels] {
 	set backchan [join [setting:get $c backchan]]
@@ -546,18 +552,20 @@ if {[string match -nocase $chan $backchan]} {
 	set chan "$c"
 	}
 }
-	userhost:act $bot $nick "$hand:bot" $char $chan $chan1 $type $black(bot:bantime) "bot" "" "0"
+	userhost:act $bot $nick "$hand:bot" $char $chan $chan1 $type $black(bot:bantime) "bot" "$com" "0"
 	}
 }
 
 n {
 if {[matchattr $hand nmo|OMA $chan]} {
 	set badnick [lindex [split $arg] 1]
+	set com [join [lrange [split $arg] 2 end]]
 	set type 0
 	set chan1 "$chan"
 if {[regexp {^[&#]} $badnick] && [matchattr $hand nmo|MAO $badnick]} {
 	set chan "$badnick"
 	set badnick [lindex [split $arg] 2]
+	set com [join [lrange [split $arg] 3 end]]
 }
 if {[setting:get $chan nextshortcmd]} {
 	nextpublic:process $nick $char $hand $chan $chan1 $badnick
@@ -577,19 +585,21 @@ if {[string match -nocase $chan $backchan]} {
 	set chan "$c"
 	}
 }
-	bancmds:process $badnick $badnick $nick $hand $char $chan $chan1 $type $black(n:bantime) "n" "" "0"
+	bancmds:process $badnick $badnick $nick $hand $char $chan $chan1 $type $black(n:bantime) "n" "$com" "0"
 	}
 }
 
 id {
 if {[matchattr $hand nmo|OMA $chan]} {
 	set badident [lindex [split $arg] 1]
+	set com [join [lrange [split $arg] 2 end]]
 	set handle [nick2hand $badident]
 	set type 0
 	set chan1 "$chan"
 if {[regexp {^[&#]} $badident] && [matchattr $hand nmo|OMA $badident]} {
 	set chan "$badident"
 	set badident [lindex [split $arg] 2]
+	set com [join [lrange [split $arg] 3 end]]
 }
 foreach c [channels] {
 	set backchan [join [setting:get $c backchan]]
@@ -597,18 +607,20 @@ if {[string match -nocase $chan $backchan]} {
 	set chan "$c"
 	}
 }
-	userhost:act $badident $nick $hand $char $chan $chan1 $type $black(id:bantime) "id" "" "0"
+	userhost:act $badident $nick $hand $char $chan $chan1 $type $black(id:bantime) "id" "$com" "0"
 	}
 }
 
 spam {
 if {[matchattr $hand nmo|OMA $chan]} {
 	set spammer [lindex [split $arg] 1]
+	set com [join [lrange [split $arg] 2 end]]
 	set type 0
 	set chan1 "$chan"
 if {[regexp {^[&#]} $spammer] && [matchattr $hand nmo|OMA $spammer]} {
 	set chan "$spammer"
 	set spammer [lindex [split $arg] 2]
+	set com [join [lrange [split $arg] 3 end]]
 }
 foreach c [channels] {
 	set backchan [join [setting:get $c backchan]]
@@ -616,18 +628,20 @@ if {[string match -nocase $chan $backchan]} {
 	set chan "$c"
 	}
 }
-	userhost:act $spammer $nick $hand $char $chan $chan1 $type $black(spam:bantime) "spam" "" "0"
+	userhost:act $spammer $nick $hand $char $chan $chan1 $type $black(spam:bantime) "spam" "$com" "0"
 	}
 }
 
 bw {
 if {[matchattr $hand nmo|OMA $chan]} {
 	set badw [lindex [split $arg] 1]
+	set com [join [lrange [split $arg] 2 end]]
 	set type 0
 	set chan1 "$chan"
 if {[regexp {^[&#]} $badw] && [matchattr $hand nmo|OMA $badw]} {
 	set chan "$badw"
 	set badw [lindex [split $arg] 2]
+	set com [join [lrange [split $arg] 3 end]]
 }
 foreach c [channels] {
 	set backchan [join [setting:get $c backchan]]
@@ -635,7 +649,7 @@ if {[string match -nocase $chan $backchan]} {
 	set chan "$c"
 	}
 }
-	userhost:act $badw $nick $hand $char $chan $chan1 $type $black(bw:bantime) "bw" "" "0"
+	userhost:act $badw $nick $hand $char $chan $chan1 $type $black(bw:bantime) "bw" "$com" "0"
 	}
 }
 

+ 21 - 7
BlackTools 2.5.3/BlackTools/Commands/BT.ForCmds.tcl

@@ -486,50 +486,58 @@ if {[regexp {^[&#]} $who] && [matchattr $hand nmo|M $who]} {
 vr {
 if {[matchattr $hand nmo|OMA $chan]} {
 	set vr [lindex [split $arg] 3]
+	set com [join [lrange [split $arg] 4 end]]
 	set chan1 "$chan"
 	set type "1"
 if {[regexp {^[&#]} $vr] && [matchattr $hand nmo|MAO $vr]} {
 	set chan "$vr"
 	set vr [lindex [split $arg] 4]
+	set com [join [lrange [split $arg] 5 end]]
 }
-	userhost:act $vr $nick $hand $host $chan $chan1 $type $black(vr:bantime) "vr" "" "0"
+	userhost:act $vr $nick $hand $host $chan $chan1 $type $black(vr:bantime) "vr" "$com" "0"
 	}
 }
 
 dr {
 if {[matchattr $hand nmo|OMA $chan]} {
 	set drone [lindex [split $arg] 3]
+	set com [join [lrange [split $arg] 4 end]]
 	set type "1"
 	set chan1 "$chan"
 if {[regexp {^[&#]} $drone] && [matchattr $hand nmo|OMA $drone]} {
 	set chan "$drone"
 	set drone [lindex [split $arg] 4]
+	set com [join [lrange [split $arg] 5 end]]
 }
-	userhost:act $drone $nick $hand $host $chan $chan1 $type $black(dr:bantime) "dr" "" "0"
+	userhost:act $drone $nick $hand $host $chan $chan1 $type $black(dr:bantime) "dr" "$com" "0"
 	}
 }
 
 bot {
 if {[matchattr $hand nmo|OMA $chan]} {
 	set bot [lindex [split $arg] 3]
+	set com [join [lrange [split $arg] 4 end]]
 	set type 1
 	set chan1 "$chan"
 if {[regexp {^[&#]} $bot] && [matchattr $hand nmo|OMA $bot]} {
 	set chan "$bot"
 	set bot [lindex [split $arg] 4]
+	set com [join [lrange [split $arg] 5 end]]
 }
-	userhost:act $bot $nick "$hand:bot" $host $chan $chan1 $type $black(bot:bantime) "bot" "" "0"
+	userhost:act $bot $nick "$hand:bot" $host $chan $chan1 $type $black(bot:bantime) "bot" "$com" "0"
 	}
 }
 
 n {
 if {[matchattr $hand nmo|OMA $chan]} {
 	set badnick [lindex [split $arg] 3]
+	set com [join [lrange [split $arg] 4 end]]
 	set type 1
 	set chan1 "$chan"
 if {[regexp {^[&#]} $badnick] && [matchattr $hand nmo|MAO $badnick]} {
 	set chan "$badnick"
 	set badnick [lindex [split $arg] 4]
+	set com [join [lrange [split $arg] 5 end]]
 }
 if {[regexp {\*} $badnick]} {
 	blacktools:tell $nick $host $hand $chan $chan1 gl.instr_nick "n"
@@ -539,47 +547,53 @@ if {$badnick == ""} {
 	blacktools:tell $nick $host $hand $chan $chan1 gl.instr_nick "n"
 	return
 }
-	bancmds:process $badnick $badnick $nick $hand $host $chan $chan1 $type $black(n:bantime) "n" "" "0"
+	bancmds:process $badnick $badnick $nick $hand $host $chan $chan1 $type $black(n:bantime) "n" "$com" "0"
 	}
 }
 
 id {
 if {[matchattr $hand nmo|OMA $chan]} {
 	set badident [lindex [split $arg] 3]
+	set com [join [lrange [split $arg] 4 end]]
 	set handle [nick2hand $badident]
 	set type 1
 	set chan1 "$chan"
 if {[regexp {^[&#]} $badident] && [matchattr $hand nmo|OMA $badident]} {
 	set chan "$badident"
 	set badident [lindex [split $arg] 4]
+	set com [join [lrange [split $arg] 5 end]]
 }
-	userhost:act $badident $nick $hand $host $chan $chan1 $type $black(id:bantime) "id" "" "0"
+	userhost:act $badident $nick $hand $host $chan $chan1 $type $black(id:bantime) "id" "$com" "0"
 	}
 }
 
 spam {
 if {[matchattr $hand nmo|OMA $chan]} {
 	set spammer [lindex [split $arg] 3]
+	set com [join [lrange [split $arg] 4 end]]
 	set type 1
 	set chan1 "$chan"
 if {[regexp {^[&#]} $spammer] && [matchattr $hand nmo|OMA $spammer]} {
 	set chan "$spammer"
 	set spammer [lindex [split $arg] 4]
+	set com [join [lrange [split $arg] 5 end]]
 }
-	userhost:act $spammer $nick $hand $host $chan $chan1 $type $black(spam:bantime) "spam" "" "0"
+	userhost:act $spammer $nick $hand $host $chan $chan1 $type $black(spam:bantime) "spam" "$com" "0"
 	}
 }
 
 bw {
 if {[matchattr $hand nmo|OMA $chan]} {
 	set badw [lindex [split $arg] 3]
+	set com [join [lrange [split $arg] 4 end]]
 	set type 1
 	set chan1 "$chan"
 if {[regexp {^[&#]} $badw] && [matchattr $hand nmo|OMA $badw]} {
 	set chan "$badw"
 	set badw [lindex [split $arg] 4]
+	set com [join [lrange [split $arg] 5 end]]
 }
-	userhost:act $badw $nick $hand $host $chan $chan1 $type $black(bw:bantime) "bw" "" "0"
+	userhost:act $badw $nick $hand $host $chan $chan1 $type $black(bw:bantime) "bw" "$com" "0"
 	}
 }
 

+ 21 - 7
BlackTools 2.5.3/BlackTools/Commands/BT.MeCmds.tcl

@@ -484,50 +484,58 @@ if {[regexp {^[&#]} $who] && [matchattr $hand nmo|M $who]} {
 vr {
 if {[matchattr $hand nmo|OMA $chan]} {
 	set vr [lindex [split $arg] 2]
+	set com [join [lrange [split $arg] 3 end]]
 	set chan1 "$chan"
 	set type "1"
 if {[regexp {^[&#]} $vr] && [matchattr $hand nmo|MAO $vr]} {
 	set chan "$vr"
 	set vr [lindex [split $arg] 3]
+	set com [join [lrange [split $arg] 4 end]]
 }
-	userhost:act $vr $nick $hand $host $chan $chan1 $type $black(vr:bantime) "vr" "" "0"
+	userhost:act $vr $nick $hand $host $chan $chan1 $type $black(vr:bantime) "vr" "$com" "0"
 	}
 }
 
 dr {
 if {[matchattr $hand nmo|OMA $chan]} {
 	set drone [lindex [split $arg] 2]
+	set com [join [lrange [split $arg] 3 end]]
 	set type "1"
 	set chan1 "$chan"
 if {[regexp {^[&#]} $drone] && [matchattr $hand nmo|OMA $drone]} {
 	set chan "$drone"
 	set drone [lindex [split $arg] 3]
+	set com [join [lrange [split $arg] 4 end]]
 }
-	userhost:act $drone $nick $hand $host $chan $chan1 $type $black(dr:bantime) "dr" "" "0"
+	userhost:act $drone $nick $hand $host $chan $chan1 $type $black(dr:bantime) "dr" "$com" "0"
 	}
 }
 
 bot {
 if {[matchattr $hand nmo|OMA $chan]} {
 	set bot [lindex [split $arg] 2]
+	set com [join [lrange [split $arg] 3 end]]
 	set type 1
 	set chan1 "$chan"
 if {[regexp {^[&#]} $bot] && [matchattr $hand nmo|OMA $bot]} {
 	set chan "$bot"
 	set bot [lindex [split $arg] 3]
+	set com [join [lrange [split $arg] 4 end]]
 }
-	userhost:act $bot $nick "$hand:bot" $host $chan $chan1 $type $black(bot:bantime) "bot" "" "0"
+	userhost:act $bot $nick "$hand:bot" $host $chan $chan1 $type $black(bot:bantime) "bot" "$com" "0"
 	}
 }
 
 n {
 if {[matchattr $hand nmo|OMA $chan]} {
 	set badnick [lindex [split $arg] 2]
+	set com [join [lrange [split $arg] 3 end]]
 	set type 1
 	set chan1 "$chan"
 if {[regexp {^[&#]} $badnick] && [matchattr $hand nmo|MAO $badnick]} {
 	set chan "$badnick"
 	set badnick [lindex [split $arg] 3]
+	set com [join [lrange [split $arg] 4 end]]
 }
 if {[regexp {\*} $badnick]} {
 	blacktools:tell $nick $host $hand $chan $chan1 gl.instr_nick "n"
@@ -537,47 +545,53 @@ if {$badnick == ""} {
 	blacktools:tell $nick $host $hand $chan $chan1 gl.instr_nick "n"
 	return
 }
-	bancmds:process $badnick $badnick $nick $hand $host $chan $chan1 $type $black(n:bantime) "n" "" "0"
+	bancmds:process $badnick $badnick $nick $hand $host $chan $chan1 $type $black(n:bantime) "n" "$com" "0"
 	}
 }
 
 id {
 if {[matchattr $hand nmo|OMA $chan]} {
 	set badident [lindex [split $arg] 2]
+	set com [join [lrange [split $arg] 3 end]]
 	set handle [nick2hand $badident]
 	set type 1
 	set chan1 "$chan"
 if {[regexp {^[&#]} $badident] && [matchattr $hand nmo|OMA $badident]} {
 	set chan "$badident"
 	set badident [lindex [split $arg] 3]
+	set com [join [lrange [split $arg] 4 end]]
 }
-	userhost:act $badident $nick $hand $host $chan $chan1 $type $black(id:bantime) "id" "" "0"
+	userhost:act $badident $nick $hand $host $chan $chan1 $type $black(id:bantime) "id" "$com" "0"
 	}
 }
 
 spam {
 if {[matchattr $hand nmo|OMA $chan]} {
 	set spammer [lindex [split $arg] 2]
+	set com [join [lrange [split $arg] 3 end]]
 	set type 1
 	set chan1 "$chan"
 if {[regexp {^[&#]} $spammer] && [matchattr $hand nmo|OMA $spammer]} {
 	set chan "$spammer"
 	set spammer [lindex [split $arg] 3]
+	set com [join [lrange [split $arg] 4 end]]
 }
-	userhost:act $spammer $nick $hand $host $chan $chan1 $type $black(spam:bantime) "spam" "" "0"
+	userhost:act $spammer $nick $hand $host $chan $chan1 $type $black(spam:bantime) "spam" "$com" "0"
 	}
 }
 
 bw {
 if {[matchattr $hand nmo|OMA $chan]} {
 	set badw [lindex [split $arg] 2]
+	set com [join [lrange [split $arg] 3 end]]
 	set type 1
 	set chan1 "$chan"
 if {[regexp {^[&#]} $badw] && [matchattr $hand nmo|OMA $badw]} {
 	set chan "$badw"
 	set badw [lindex [split $arg] 3]
+	set com [join [lrange [split $arg] 4 end]]
 }
-	userhost:act $badw $nick $hand $host $chan $chan1 $type $black(bw:bantime) "bw" "" "0"
+	userhost:act $badw $nick $hand $host $chan $chan1 $type $black(bw:bantime) "bw" "$com" "0"
 	}
 }
 

+ 21 - 7
BlackTools 2.5.3/BlackTools/Commands/BT.PrvCmds.tcl

@@ -433,32 +433,38 @@ if {$mychan_use == "1"} {
 dr {
 if {[matchattr $hand nmo|OSMA $chan]} {
 	set drone [lindex [split $arg] 2]
+	set com [join [lrange [split $arg] 3 end]]
 if {$mychan_use == "1"} {
 	set drone [lindex [split $arg] 1]
+	set com [join [lrange [split $arg] 2 end]]
 }
 	set type 2
 	set chan1 "$chan"
-	userhost:act $drone $nick $hand "prv" $chan $chan1 $type $black(dr:bantime) "dr" "" "0"
+	userhost:act $drone $nick $hand "prv" $chan $chan1 $type $black(dr:bantime) "dr" "$com" "0"
 	}
 }
 
 bot {
 if {[matchattr $hand nmo|OSMA $chan]} {
 	set bot [lindex [split $arg] 2]
+	set com [join [lrange [split $arg] 3 end]]
 if {$mychan_use == "1"} {
 	set bot [lindex [split $arg] 1]
+	set com [join [lrange [split $arg] 2 end]]
 }
 	set type 2
 	set chan1 "$chan"
-	userhost:act $bot $nick "$hand:bot" "prv" $chan $chan1 $type $black(bot:bantime) "bot" "" "0"
+	userhost:act $bot $nick "$hand:bot" "prv" $chan $chan1 $type $black(bot:bantime) "bot" "$com" "0"
 	}
 }
 
 n {
 if {[matchattr $hand nmo|OMA $chan]} {
 	set badnick [lindex [split $arg] 2]
+	set com [join [lrange [split $arg] 3 end]]
 if {$mychan_use == "1"} {
 	set badnick [lindex [split $arg] 1]
+	set com [join [lrange [split $arg] 2 end]]
 }
 	set type 0
 	set chan1 "$chan"
@@ -476,32 +482,36 @@ if {$badnick == ""} {
 	blacktools:tell $nick "prv" $hand $chan $chan1 gl.instr_priv "n"
 	return
 		}
-	bancmds:process $badnick $badnick $nick $hand "prv" $chan $chan1 $type $black(n:bantime) "n" "" "0"
+	bancmds:process $badnick $badnick $nick $hand "prv" $chan $chan1 $type $black(n:bantime) "n" "$com" "0"
 	}
 }
 
 id {
 if {[matchattr $hand nmo|OMA $chan]} {
 	set badident [lindex [split $arg] 2]
+	set com [join [lrange [split $arg] 3 end]]
 if {$mychan_use == "1"} {
 	set badident [lindex [split $arg] 1]
+	set com [join [lrange [split $arg] 2 end]]
 }
 	set handle [nick2hand $badident]
 	set type 2
 	set chan1 "$chan"
-	userhost:act $badident $nick $hand "prv" $chan $chan1 $type $black(id:bantime) "id" "" "0"
+	userhost:act $badident $nick $hand "prv" $chan $chan1 $type $black(id:bantime) "id" "$com" "0"
 	}
 }
 
 spam {
 if {[matchattr $hand nmo|OMA $chan]} {
 	set spammer [lindex [split $arg] 2]
+	set com [join [lrange [split $arg] 3 end]]
 if {$mychan_use == "1"} {
 	set spammer [lindex [split $arg] 1]
+	set com [join [lrange [split $arg] 2 end]]
 }
 	set type 2
 	set chan1 "$chan"
-	userhost:act $spammer $nick $hand "prv" $chan $chan1 $type $black(spam:bantime) "spam" "" "0"
+	userhost:act $spammer $nick $hand "prv" $chan $chan1 $type $black(spam:bantime) "spam" "$com" "0"
 	}
 }
 
@@ -509,12 +519,14 @@ if {$mychan_use == "1"} {
 bw {
 if {[matchattr $hand nmo|OMA $chan]} {
 	set badw [lindex [split $arg] 2]
+	set com [join [lrange [split $arg] 3 end]]
 if {$mychan_use == "1"} {
 	set badw [lindex [split $arg] 1]
+	set com [join [lrange [split $arg] 2 end]]
 }
 	set type 2
 	set chan1 "$chan"
-	userhost:act $badw $nick $hand "prv" $chan $chan1 $type $black(bw:bantime) "bw" "" "0"
+	userhost:act $badw $nick $hand "prv" $chan $chan1 $type $black(bw:bantime) "bw" "$com" "0"
 	}
 }
 
@@ -2035,12 +2047,14 @@ if {$mychan_use == "1"} {
 vr {
 if {[matchattr $hand nmo|OMA $chan]} {
 	set vr [lindex [split $arg] 2]
+	set com [join [lrange [split $arg] 3 end]]
 	set chan1 "$chan"
 	set type 2
 if {$mychan_use == "1"} {
 	set vr [lindex [split $arg] 1]
+	set com [join [lrange [split $arg] 2 end]]
 }
-	userhost:act $vr $nick $hand "prv" $chan $chan1 $type $black(vr:bantime) "vr" "" "0"
+	userhost:act $vr $nick $hand "prv" $chan $chan1 $type $black(vr:bantime) "vr" "$com" "0"
 	}
 }