Merge lp:~cjohnston/ubuntu-classroom/voice-devoice into lp:~ubuntu-classroom/ubuntu-classroom/classbot

[Chris Johnston]

[Chris Johnston (cjohnston)]

!voice|!devoice work for both -classroom and -chat

[Nathan Handler (nhandler)]

Instead of modifying the voice sub to voice in $chan and $qchan, make 2 calls to &voice, passing $chan first and $qchan second.

review: Needs Fixing

[Nathan Handler (nhandler)]

I went ahead and made the change I suggested in order to get this feature implemented in time for tomorrow's test.

=== modified file 'classbot.pl'
--- classbot.pl	2010-02-20 22:10:26 +0000
+++ classbot.pl	2010-02-21 04:30:28 +0000
@@ -268,15 +268,17 @@
 		Irssi::print("$nick is already voiced in $chan. Doing Nothing.")	if($debug);
 	}
 	elsif($bool && $nick->{voice}==0) {
-		Irssi::print("Voicing $name in $chan.")	if($debug);
+		Irssi::print("Voicing $name in $chan &qchan.")	if($debug);
 		$server->command("^MSG ChanServ VOICE $chan $name");
+		$server->command("^MSG ChanServ VOICE $qchan $name");
 	}
 	elsif(!$bool && $nick->{voice}==0) {
 		Irssi::print("$nick is already devoiced in $chan. Doing Nothing.")	if($debug);
 	}
 	elsif(!$bool && $nick->{voice}==1) {
-		Irssi::print("DeVoicing $name in $chan.")	if($debug);
+		Irssi::print("DeVoicing $name in $chan and $qchan.")	if($debug);
 		$server->command("^MSG ChanServ DEVOICE $chan $name");
+		$server->command("^MSG ChanServ DEVOICE $qchan $name");
 	}
 }
 
@@ -372,7 +374,8 @@
 			$person=$nick;
 		}
 		&voice($chan, $person, 1);
-		$server->command("^MSG $nick $person has been voiced in $chan.");
+		&voice($qchan, $person, 1);
+		$server->command("^MSG $nick $person has been voiced in $chan and $qchan.");
 	}
 	elsif($target =~ m/^$mynick$/i && $text =~ m/^!(voice|v)\s*(.*?)$/i) {
 		Irssi::print("$nick is not an admin, so they cannot use !voice.")	if($debug);
@@ -384,7 +387,8 @@
 			$person=$nick;
 		}
 		&voice($chan, $person, 0);
-		$server->command("^MSG $nick $person has been devoiced in $chan.");
+		&voice($qchan, $person, 0);
+		$server->command("^MSG $nick $person has been devoiced in $chan and $qchan.");
 	}
 	elsif($target =~ m/^$mynick$/i && $text =~ m/^!(devoice|dv)\s*(.*?)$/i) {
 		Irssi::print("$nick is not an admin, so they cannot use !devoice.")	if($debug);