Florian 8 лет назад
Родитель
Сommit
5223b514ac

+ 14 - 1
BlackTools 2.5.3/BlackTools/Modules/BT.Gag.tcl

@@ -233,7 +233,7 @@ if {[string match -nocase $read_host $host]} {
 ################################# ungag ###############################
 
 proc ungag:process {gagger nick hand host chan chan1 type} {
-	global black
+	global black botnick
 	set cmd_status [btcmd:status $chan $hand "ungag" 0]
 if {$cmd_status == "1"} { 
 	return 
@@ -291,6 +291,19 @@ if {[ischanban $mask $chan]} {
 
 	putserv "PRIVMSG $gagger :$ungag_user_message"
 	putserv "PRIVMSG $chan :$ungag_chan_message"
+	set backchan [join [setting:get $chan backchan]]
+if {$backchan == ""} { 
+	return
+}
+if {!([validchan $backchan]) || !([onchan $botnick $backchan])} {
+	return
+}
+	set replace(%banmask%) $mask
+	set replace(%chan%) $chan
+	set replace(%nick%) $hand
+	set text [black:color:set "" $black(say.$getlang.reportchan.4)]
+	set reply [join $text]
+	puthelp "PRIVMSG $backchan :[string map [array get replace] $reply]"
 	}
 }
 

+ 9 - 9
BlackTools 2.5.3/BlackTools/Modules/BT.Next.tcl

@@ -290,13 +290,13 @@ if {[matchattr $handle $black(exceptflags) $chan]} {
 if {$user == ""} {
 switch $type {
 	0 {
-	blacktools:tell $nick $host $hand $chan $chan1 gl.instr "helped"
+	blacktools:tell $nick $host $hand $chan $chan1 gl.instr "next"
 	}
 	1 {
-	blacktools:tell $nick $host $hand $chan $chan1 gl.instr_nick "helped"
+	blacktools:tell $nick $host $hand $chan $chan1 gl.instr_nick "next"
 	}
 	2 {
-	blacktools:tell $nick $host $hand $chan $chan1 gl.instr_priv "helped"
+	blacktools:tell $nick $host $hand $chan $chan1 gl.instr_priv "next"
 		}
 	}
 	return
@@ -366,13 +366,13 @@ if {[matchattr $handle $black(exceptflags) $chan]} {
 if {$user == ""} {
 switch $type {
 	0 {
-	blacktools:tell $nick $host $hand $chan $chan1 gl.instr "noidle"
+	blacktools:tell $nick $host $hand $chan $chan1 gl.instr "next"
 	}
 	1 {
-	blacktools:tell $nick $host $hand $chan $chan1 gl.instr_nick "noidle"
+	blacktools:tell $nick $host $hand $chan $chan1 gl.instr_nick "next"
 	}
 	2 {
-	blacktools:tell $nick $host $hand $chan $chan1 gl.instr_priv "noidle"
+	blacktools:tell $nick $host $hand $chan $chan1 gl.instr_priv "next"
 		}
 	}
 	return
@@ -411,13 +411,13 @@ if {$cmd_status == "1"} {
 if {$user == ""} {
 switch $type {
 	0 {
-	blacktools:tell $nick $host $hand $chan $chan1 gl.instr "skip"
+	blacktools:tell $nick $host $hand $chan $chan1 gl.instr "next"
 	}
 	1 {
-	blacktools:tell $nick $host $hand $chan $chan1 gl.instr_nick "skip"
+	blacktools:tell $nick $host $hand $chan $chan1 gl.instr_nick "next"
 	}
 	2 {
-	blacktools:tell $nick $host $hand $chan $chan1 gl.instr_priv "skip"
+	blacktools:tell $nick $host $hand $chan $chan1 gl.instr_priv "next"
 		}
 	}
 	return

+ 1 - 1
BlackTools 2.5.3/BlackTools/Modules/BT.TCL.tcl

@@ -181,7 +181,7 @@ if {$found_it == 0} {
 	puts $file [join $delete "\n"]
 	close $file
 	rehash
-	blacktools:tell $nick $host $hand $chan $chan1 tcl.8 $the_script
+	blacktools:tell $nick $host $hand $chan $chan1 tcl.8 [split $the_script]
 }
 
 list {