Merge lp:~cjohnston/ubuntu-classroom/force-calendar into lp:~ubuntu-classroom/ubuntu-classroom/classbot

[Chris Johnston]

[Chris Johnston (cjohnston)]

Fixes Bug #525111 by allowing admins to run !cal to redownload the calendar.

[Chris Johnston (cjohnston)]

I'm not sure if it needs the sleep or not.. If it doesn't please remove.

[Nathan Handler (nhandler)]

I made a few small changes and merged the branch. Thanks for your contribution.

review: Approve

=== modified file 'classbot.pl'
--- classbot.pl	2010-02-20 22:10:26 +0000
+++ classbot.pl	2010-02-21 02:06:15 +0000
@@ -390,6 +390,16 @@
 		Irssi::print("$nick is not an admin, so they cannot use !devoice.")	if($debug);
 		$server->command("^MSG $nick You are not currently an admin, so you cannot use !devoice.");
 	}
+	elsif($target =~ m/^$mynick$/i && $admins{lc($nick)}  && $text =~ m/^!(cal)\s*(.*?)$/i) {
+		Irssi::print("Forced new calendar download by $nick") if($debug);
+		&fetch_ical;
+		sleep(1);
+		&refresh_settings;
+	}
+	elsif($target =~ m/^$mynick$/i && $text =~ m/^!(cal)\s*(.*?)$/i) {
+		Irssi::print("$nick is not an admin, so they cannot use !cal.")	if($debug);
+		$server->command("^MSG $nick You are not currently an admin, so you cannot use !cal.");
+	}
 }
 
 sub cmd_help {