ViewVC Help

View File | Revision Log | Show Annotations | Revision Graph | Root Listing

root/i-scream/projects/cms/source/server/uk/org/iscream/cms/server/client/alerters/IRC__Alerter.java

Comparing projects/cms/source/server/uk/org/iscream/cms/server/client/alerters/IRC__Alerter.java (file contents):
Revision 1.30 by tdb, Thu Jan 17 17:58:12 2002 UTC vs.
Revision 1.30.2.2 by tdb, Mon Feb 4 23:14:38 2002 UTC

#	Line 10 | Line 10 | import java.io.*;
10		import java.net.*;
11		import java.util.*;
12		import java.text.DateFormat;
13	+	import org.jibble.pircbot.*;
14
15		/**
16		* This Alert sends an IRC message.
#	Line 34 | Line 35 | public class IRC__Alerter extends AlerterSkeleton {
35		*/
36		public final String DESC = "Sends alerts on an IRC channel";
37
37	–	/**
38	–	* The default reconnect delay in seconds
39	–	*/
40	–	public final int DEFAULT_RECONNECT_DELAY = 30;
41	–
38		//---STATIC METHODS---
39
40		//---CONSTRUCTORS---
41	<
41	>
42		public IRC__Alerter() {
43		super();
44	<	// connect to the IRC server
44	>	// construct and initialise the bot
45		_ircbot = new IRCBot();
46	+	//_ircbot.setVerbose(true);
47	+	Thread ircThread = new Thread(_ircbot);
48		// set it's name and start it
49	<	_ircbot.setName("client.IRC__Alerter$IRCBot");
50	<	_ircbot.start();
49	>	ircThread.setName("client.IRC__Alerter$IRCBot");
50	>	ircThread.start();
51	>	// log our start time
52		_startTime = System.currentTimeMillis();
53		_logger.write(toString(), Logger.SYSINIT, "IRC Alerter started");
54		}
#	Line 169 | Line 168 | public class IRC__Alerter extends AlerterSkeleton {
168		private long _startTime;
169
170		/**
171	+	* This holds a reference to the
172	+	* system logger that is being used.
173	+	*/
174	+	protected Logger _logger = ReferenceManager.getInstance().getLogger();
175	+
176	+	/**
177		* This is the friendly identifier of the
178		* component this class is running in.
179		* eg, a Filter may be called "filter1",
#	Line 183 | Line 188 | public class IRC__Alerter extends AlerterSkeleton {
188
189		//---INNER CLASSES---
190
191	<	/**
187	<	* This class provides some basic IRCBot functionality. It connects
188	<	* to a specified server, and will remain there until told to
189	<	* leave. Whilst connected it can send a message or a notice to
190	<	* the server.
191	<	*/
192	<	class IRCBot extends Thread {
191	>	class IRCBot extends PircBot implements Runnable {
192
194	–	public static final String DEFAULT_STARTUP_NOTICE = "i-scream ircbot starting...";
195	–
193		/**
194	<	* Main thread loop, this part of the class listens for
198	<	* messages from the server, and acts accordingly. At the
199	<	* present moment it only responds to pings.
194	>	* The default reconnect delay in seconds
195		*/
196	+	public final int DEFAULT_RECONNECT_DELAY = 30;
197	+
198		public void run() {
199	<	// so we can stop if required
203	<	boolean run = true;
204	<	while(run) {
205	<	// flag so we can stop the loop
206	<	boolean doRead = true;
207	<	// get the startup notice
208	<	String startupNotice;
199	>	while(true) {
200		try {
201	<	startupNotice = ConfigurationProxy.getInstance().getProperty(_name, "Alerter.IRC.startupNotice");
202	<	} catch (PropertyNotFoundException e) {
212	<	startupNotice = DEFAULT_STARTUP_NOTICE;
213	<	_logger.write(this.toString(), Logger.WARNING, "Configuration error: "+e);
201	>	init();
202	>	break;
203		}
204	<	// connect to the IRC server
205	<	try {
206	<	connect();
218	<	sendNotice(startupNotice);
219	<	} catch(IOException e) {
220	<	doRead=false;
221	<	_logger.write(this.toString(), Logger.ERROR, "Error connecting: "+e);
204	>	catch (IOException e) {
205	>	_logger.write(this.toString(), Logger.ERROR, "Error initialising IRCBot: "+e);
206	>	reconnectSleep();
207		}
223	–	while(doRead) {
224	–	try {
225	–	// read a command
226	–	String cmd = _socketIn.readLine();
227	–	// if we have a null, we've lost contact
228	–	if(cmd == null) {
229	–	throw new IOException("End of stream reached");
230	–	}
231	–	// let another method deal with the input
232	–	handleInput(cmd);
233	–	} catch (IOException e) {
234	–	// comms failure, maybe our link is dead.
235	–	_logger.write(this.toString(), Logger.ERROR, "Communication error: "+e);
236	–	// stop, and loop round for a reconnect.
237	–	doRead = false;
238	–	}
239	–	}
240	–	// make sure we're disconnected
241	–	try {
242	–	disconnect();
243	–	} catch (IOException e) {
244	–	_logger.write(this.toString(), Logger.ERROR, "Communication error: "+e);
245	–	}
246	–
247	–	// comms have failed, so wait a while and reconnect
248	–	int delayTime = 0;
249	–	try {
250	–	delayTime = Integer.parseInt(ConfigurationProxy.getInstance().getProperty(_name, "Alerter.IRC.reconnectDelay"));
251	–	} catch (NumberFormatException e) {
252	–	delayTime = DEFAULT_RECONNECT_DELAY;
253	–	_logger.write(this.toString(), Logger.WARNING, "Erronous Alerter.IRC.reconnectDelay value in configuration using default of " + delayTime + " seconds");
254	–	} catch (PropertyNotFoundException e) {
255	–	delayTime = DEFAULT_RECONNECT_DELAY;
256	–	_logger.write(this.toString(), Logger.WARNING, "Alerter.IRC.reconnectDelay value unavailable using default of " + delayTime + " seconds");
257	–	}
258	–	try {
259	–	Thread.sleep(delayTime * 1000);
260	–	} catch (InterruptedException e) {}
208		}
209	<	// maybe disconnect here ? - shutdown method not implemented yet
263	<	//disconnect();
209	>	//System.out.println("falling out!");
210		}
211
212	<	/**
213	<	* Sends a message to the channel.
268	<	*
269	<	* @param msg The message to send
270	<	*/
271	<	public void sendMsg(String msg) {
272	<	_socketOut.println("PRIVMSG "+_channel+" :"+msg);
273	<	// wait a second before returning...
274	<	// this ensures messages can't be sent too fast
275	<	try {Thread.sleep(1000);} catch (InterruptedException e) {}
276	<	}
277	<
278	<	/**
279	<	* Sends a message to the channel.
280	<	*
281	<	* @param user The user to send to
282	<	* @param msg The message to send
283	<	*/
284	<	public void sendPrivMsg(String user, String msg) {
285	<	_socketOut.println("PRIVMSG "+user+" :"+msg);
286	<	// wait a second before returning...
287	<	// this ensures messages can't be sent too fast
288	<	try {Thread.sleep(1000);} catch (InterruptedException e) {}
289	<	}
290	<
291	<	/**
292	<	* Sends an action to the channel.
293	<	*
294	<	* @param msg the action message
295	<	*/
296	<	public void sendAction(String msg) {
297	<	char esc = 001;
298	<	sendMsg(esc+"ACTION "+msg+esc);
299	<	// wait a second before returning...
300	<	// this ensures messages can't be sent too fast
301	<	try {Thread.sleep(1000);} catch (InterruptedException e) {}
302	<	}
303	<
304	<	/**
305	<	* Sends a notice to the channel.
306	<	*
307	<	* @param msg The notice to send
308	<	*/
309	<	public void sendNotice(String msg) {
310	<	_socketOut.println("NOTICE "+_channel+" :"+msg);
311	<	// wait a second before returning...
312	<	// this ensures messages can't be sent too fast
313	<	try {Thread.sleep(1000);} catch (InterruptedException e) {}
314	<	}
315	<
316	<	/**
317	<	* Connect to the IRC server, log in, and join the channel.
318	<	*
319	<	* @throws IOException if the connection fails
320	<	*/
321	<	public void connect() throws IOException {
212	>	public void init() throws IOException {
213	>	_logger.write(this.toString(), Logger.DEBUG, "Initialising IRCBot...");
214		ConfigurationProxy cp = ConfigurationProxy.getInstance();
323	–	// setup the socket, reader and writer
215		String server;
216		int port;
217		try {
#	Line 333 | Line 224 | public class IRC__Alerter extends AlerterSkeleton {
224		_logger.write(this.toString(), Logger.ERROR, "Configuration error: "+e);
225		throw new IOException("Can't get irc server details due to malformed configuration");
226		}
336	–	_socket = new Socket(server, port);
337	–	_socketIn = new BufferedReader(new InputStreamReader(_socket.getInputStream()));
338	–	_socketOut = new PrintWriter(_socket.getOutputStream(), true);
339	–	//_socketOut.println("PASS");
340	–	// send USER details
227		String user, comment;
228		try {
229		user = cp.getProperty(_name, "Alerter.IRC.user");
#	Line 346 | Line 232 | public class IRC__Alerter extends AlerterSkeleton {
232		_logger.write(this.toString(), Logger.ERROR, "Configuration error: "+e);
233		throw new IOException("Can't get user details due to configuration error");
234		}
235	<	_socketOut.println("USER "+user+" 8 * :"+comment);
236	<	// attempt to get a nick
235	>	this.setLogin(user);
236	>	this.setVersion(comment);
237	>	this.setFinger(comment); // ?
238		String nickList;
239		try {
240		nickList = cp.getProperty(_name, "Alerter.IRC.nickList");
#	Line 357 | Line 244 | public class IRC__Alerter extends AlerterSkeleton {
244		}
245		StringTokenizer st = new StringTokenizer(nickList, ";");
246		boolean ok = false;
360	–	// try until we exhaust our list
247		while(!ok && st.hasMoreTokens()) {
248		String nick = st.nextToken();
249	<	_socketOut.println("NICK "+nick);
250	<	// get a "yes" or "no" response back
251	<	String response = "";
252	<	do {
253	<	response = _socketIn.readLine();
368	<	if(response==null) {
369	<	throw new IOException("Communication error whilst logging in");
370	<	}
371	<	} while(response.indexOf("001")==-1 && response.indexOf("433")==-1);
372	<	// see if it was a yes
373	<	if(response.indexOf("001")!=-1) {
374	<	// great, we're logged in !
375	<	ok = true;
376	<	// store the name we're using
249	>	try {
250	>	_logger.write(this.toString(), Logger.DEBUG, "Trying nick: "+nick);
251	>	this.setName(nick);
252	>	this.connect(server, port);
253	>	// must be ok if we get here
254		_nickname = nick;
255	+	ok = true;
256		}
257	<	else {
258	<	// log we couldn't get the name
259	<	_logger.write(this.toString(), Logger.WARNING, "Nickname in use: "+nick);
257	>	catch(IOException e) {
258	>	_logger.write(this.toString(), Logger.ERROR, "IO error when connecting to server: "+e);
259	>	throw new IOException("IO error when connecting to server");
260		}
261	+	catch(IrcException e) {
262	+	_logger.write(this.toString(), Logger.ERROR, "IRC error when connecting to server: "+e);
263	+	throw new IOException("IRC error when connecting to server");
264	+	}
265	+	catch(NickAlreadyInUseException e) {
266	+	_logger.write(this.toString(), Logger.ERROR, "Nickname "+nick+" is already in use: "+e);
267	+	// just carry on around while loop
268	+	}
269		}
270		if(!ok) {
271		// oh dear, we couldn't get on.
272	<	throw new IOException("All nicknames in use");
272	>	_logger.write(this.toString(), Logger.ERROR, "All nicknames already in use");
273	>	throw new IOException("All nicknames already in use");
274		}
388	–	// join the channel
275		try {
276		_channel = cp.getProperty(_name, "Alerter.IRC.channel");
277	+	this.joinChannel(_channel);
278		} catch (PropertyNotFoundException e) {
279		_logger.write(this.toString(), Logger.ERROR, "Configuration error: "+e);
280		throw new IOException("Can't get channel name due to configuration error");
281		}
282	<	_socketOut.println("JOIN "+_channel);
283	<	// allow alerts
282	>
283	>	String startupNotice;
284	>	try {
285	>	startupNotice = ConfigurationProxy.getInstance().getProperty(_name, "Alerter.IRC.startupNotice");
286	>	sendNotice(_channel, startupNotice);
287	>	} catch (PropertyNotFoundException e) {
288	>	_logger.write(this.toString(), Logger.DEBUG, "Startup notice not defined, so not sending: "+e);
289	>	}
290	>
291	>	// we should set this when all is ready!
292		_active = true;
293	+	//System.out.println("leaving init");
294		}
295
296	<	/**
297	<	* Disconnect "nicely" from the IRC server.
298	<	*
299	<	* @throws IOException if the disconnection fails
300	<	*/
405	<	public void disconnect() throws IOException {
406	<	// stop alerts
296	>	public void sendMsg(String msg) {
297	>	sendMessage(_channel, msg);
298	>	}
299	>
300	>	public void onDisconnect() {
301		_active = false;
302	<	// send proper QUIT
303	<	_socketOut.println("QUIT : iscreamBot component shutting down...");
304	<	// close the socket
305	<	_socketOut.close();
306	<	_socketIn.close();
307	<	_socket.close();
302	>	while(true) {
303	>	reconnectSleep();
304	>	try {
305	>	init();
306	>	break;
307	>	}
308	>	catch (IOException e) {
309	>	_logger.write(this.toString(), Logger.ERROR, "Error initialising IRCBot: "+e);
310	>	}
311	>	}
312	>	//System.out.println("falling out of disconnect!");
313		}
314
315	<	/**
316	<	* Overrides the {@link java.lang.Object#toString() Object.toString()}
317	<	* method to provide clean logging (every class should have this).
318	<	*
420	<	* This uses the uk.org.iscream.cms.server.util.NameFormat class
421	<	* to format the toString()
422	<	*
423	<	* @return the name of this class and its CVS revision
424	<	*/
425	<	public String toString() {
426	<	return FormatName.getName(
427	<	_name,
428	<	getClass().getName(),
429	<	REVISION);
315	>	public void onMessage(String channel, String sender, String login, String hostname, String message) {
316	>	if(isForMe(message)) {
317	>	handleInput(message, channel);
318	>	}
319		}
320
321	<	/**
322	<	* Deals with incoming lines from the server.
323	<	*
324	<	* @param line the line to deal with
325	<	*/
326	<	private void handleInput(String line) {
327	<	ConfigurationProxy cp = ConfigurationProxy.getInstance();
439	<	// if it's a PING...
440	<	if(line.startsWith("PING")) {
441	<	// ...send a PONG
442	<	_socketOut.println("PONG" + line.substring(4));
321	>	public void onPrivateMessage(String sender, String login, String hostname, String message) {
322	>	handleInput(message, sender);
323	>	}
324	>
325	>	public void onNickChange(String oldNick, String login, String hostname, String newNick) {
326	>	if(oldNick.equals(_nickname)) {
327	>	_nickname = newNick;
328		}
329	<	// see if it's for us
330	<	else if(getMsg(line).toLowerCase().startsWith(_nickname.toLowerCase()+",") ||
331	<	getMsg(line).toLowerCase().startsWith(_nickname.toLowerCase()+":") ||
332	<	getMsg(line).toLowerCase().startsWith(_nickname.toLowerCase()+" ")) {
333	<	// setup some String's
449	<	String stopCommand, startCommand, timeSinceLastAlertCommand, lastAlertCommand, joinCommand;
450	<	String nickChangeCommand, versionCommand, helpCommand, statCommand, uptimeCommand;
451	<	// get the command set
329	>	}
330	>
331	>	public void onKick(String channel, String kickerNick, String kickerLogin, String kickerHostname, String recipientNick, String reason) {
332	>	if(recipientNick.equals(_nickname) && channel.equals(_channel)) {
333	>	sendMessage(kickerNick, "That wasn't a nice thing to do...");
334		try {
335	<	stopCommand = cp.getProperty(_name, "Alerter.IRC.stopCommand");
336	<	startCommand = cp.getProperty(_name, "Alerter.IRC.startCommand");
455	<	timeSinceLastAlertCommand = cp.getProperty(_name, "Alerter.IRC.timeSinceLastAlertCommand");
456	<	lastAlertCommand = cp.getProperty(_name, "Alerter.IRC.lastAlertCommand");
457	<	joinCommand = cp.getProperty(_name, "Alerter.IRC.joinCommand");
458	<	nickChangeCommand = cp.getProperty(_name, "Alerter.IRC.nickChangeCommand");
459	<	versionCommand = cp.getProperty(_name, "Alerter.IRC.versionCommand");
460	<	helpCommand = cp.getProperty(_name, "Alerter.IRC.helpCommand");
461	<	statCommand = cp.getProperty(_name, "Alerter.IRC.statCommand");
462	<	uptimeCommand = cp.getProperty(_name, "Alerter.IRC.uptimeCommand");
463	<	} catch (PropertyNotFoundException e) {
335	>	_channel = ConfigurationProxy.getInstance().getProperty(_name, "Alerter.IRC.channel");
336	>	} catch(PropertyNotFoundException e) {
337		_logger.write(this.toString(), Logger.ERROR, "Configuration error: "+e);
465	–	// lets bail from handling this line...
466	–	// ...it's gonna be hard without a command set!
467	–	return;
338		}
339	<
340	<	// we have a message for us
341	<	String message = getMsg(line).substring(_nickname.length());
342	<	if(message.indexOf(stopCommand)!=-1) {
343	<	_active = false;
344	<	sendMsg(getMsgSender(line)+", alerts have been stopped");
339	>	// should this be in the try?
340	>	joinChannel(_channel);
341	>	}
342	>	}
343	>
344	>	private void handleInput(String message, String source) {
345	>	System.out.println("message: "+message);
346	>	System.out.println("from: "+source);
347	>	ConfigurationProxy cp = ConfigurationProxy.getInstance();
348	>	// setup some String's
349	>	String stopCommand, startCommand, timeSinceLastAlertCommand, lastAlertCommand, joinCommand;
350	>	String nickChangeCommand, versionCommand, helpCommand, statCommand, uptimeCommand;
351	>	// get the command set
352	>	try {
353	>	stopCommand = cp.getProperty(_name, "Alerter.IRC.stopCommand");
354	>	startCommand = cp.getProperty(_name, "Alerter.IRC.startCommand");
355	>	timeSinceLastAlertCommand = cp.getProperty(_name, "Alerter.IRC.timeSinceLastAlertCommand");
356	>	lastAlertCommand = cp.getProperty(_name, "Alerter.IRC.lastAlertCommand");
357	>	joinCommand = cp.getProperty(_name, "Alerter.IRC.joinCommand");
358	>	nickChangeCommand = cp.getProperty(_name, "Alerter.IRC.nickChangeCommand");
359	>	versionCommand = cp.getProperty(_name, "Alerter.IRC.versionCommand");
360	>	helpCommand = cp.getProperty(_name, "Alerter.IRC.helpCommand");
361	>	statCommand = cp.getProperty(_name, "Alerter.IRC.statCommand");
362	>	uptimeCommand = cp.getProperty(_name, "Alerter.IRC.uptimeCommand");
363	>	} catch (PropertyNotFoundException e) {
364	>	_logger.write(this.toString(), Logger.ERROR, "Configuration error: "+e);
365	>	// lets bail from handling this line...
366	>	// ...it's gonna be hard without a command set!
367	>	return;
368	>	}
369	>
370	>	if(message.indexOf(stopCommand) != -1) {
371	>	_active = false;
372	>	sendMessage(source, "alerts have been stopped");
373	>	}
374	>	else if(message.indexOf(startCommand) != -1) {
375	>	_active = true;
376	>	sendMessage(source, "alerts have been activated");
377	>	}
378	>	// this needs to go here if it contains the same words as the lastAlertCommand
379	>	else if(message.indexOf(timeSinceLastAlertCommand) != -1) {
380	>	if(_lastAlertTime != -1) {
381	>	long uptime = (System.currentTimeMillis() - _lastAlertTime) / 1000;
382	>	String uptimeText = DateUtils.formatTime(uptime, "%DAYS% days, %HOURS% hours, %MINS% mins, and %SECS% secs");
383	>	sendMessage(source, "I last sent an alert "+uptimeText+ " ago");
384		}
385	<	else if(message.indexOf(startCommand)!=-1) {
386	<	_active = true;
478	<	sendMsg(getMsgSender(line)+", alerts have been activated");
385	>	else {
386	>	sendMessage(source, "I've never sent an alert!");
387		}
388	<	// this needs to go here if it contains the same words as the lastAlertCommand
389	<	else if(message.indexOf(timeSinceLastAlertCommand)!=-1) {
390	<	if(_lastAlertTime != -1) {
391	<	long uptime = (System.currentTimeMillis() - _lastAlertTime) / 1000;
392	<	String uptimeText = DateUtils.formatTime(uptime, "%DAYS% days, %HOURS% hours, %MINS% mins, and %SECS% secs");
485	<	sendMsg(getMsgSender(line)+", I last sent an alert "+uptimeText+ " ago");
486	<	}
487	<	else {
488	<	sendMsg(getMsgSender(line)+", I've never sent an alert!");
489	<	}
388	>	}
389	>	else if(message.indexOf(lastAlertCommand) != -1) {
390	>	if(_lastAlertTime != -1) {
391	>	String date = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT, Locale.UK).format(new Date(_lastAlertTime));
392	>	sendMessage(source, "last alert was at "+date+"; "+_lastAlert);
393		}
394	<	else if(message.indexOf(lastAlertCommand)!=-1) {
395	<	if(_lastAlertTime != -1) {
493	<	String date = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT, Locale.UK).format(new Date(_lastAlertTime));
494	<	sendMsg(getMsgSender(line)+", last alert was at "+date+"; "+_lastAlert);
495	<	}
496	<	else {
497	<	sendMsg(getMsgSender(line)+", I've never sent an alert!");
498	<	}
499	<
394	>	else {
395	>	sendMessage(source, "I've never sent an alert!");
396		}
397	<	else if(message.indexOf(joinCommand)!=-1) {
398	<	String joinCmd = joinCommand;
399	<	String newChan = message.substring(message.indexOf(joinCmd) + joinCmd.length() + 1);
400	<	int endOfChan = newChan.indexOf(" ");
401	<	if(endOfChan == -1) {
402	<	endOfChan = newChan.length();
403	<	}
404	<	newChan = newChan.substring(0, endOfChan);
509	<	if(newChan.equals(_channel)) {
510	<	sendMsg(getMsgSender(line)+", I'm already on "+newChan+"!");
511	<	} else {
512	<	sendMsg(getMsgSender(line)+", okay, I'm off to "+newChan);
513	<	_socketOut.println("PART "+_channel);
514	<	_socketOut.println("JOIN "+newChan);
515	<	_channel = newChan;
516	<	}
397	>
398	>	}
399	>	else if(message.indexOf(joinCommand) != -1) {
400	>	String joinCmd = joinCommand;
401	>	String newChan = message.substring(message.indexOf(joinCmd) + joinCmd.length() + 1);
402	>	int endOfChan = newChan.indexOf(" ");
403	>	if(endOfChan == -1) {
404	>	endOfChan = newChan.length();
405		}
406	<	else if(message.indexOf(nickChangeCommand)!=-1) {
407	<	String nickChangeCmd = nickChangeCommand;
408	<	String newNick = message.substring(message.indexOf(nickChangeCmd) + nickChangeCmd.length() + 1);
409	<	int endOfNick = newNick.indexOf(" ");
410	<	if(endOfNick == -1) {
411	<	endOfNick = newNick.length();
412	<	}
413	<	newNick = newNick.substring(0, endOfNick);
526	<	sendMsg(getMsgSender(line)+", okay, changing my nickname to "+newNick);
527	<	_socketOut.println("NICK "+newNick);
528	<	_nickname = newNick;
406	>	newChan = newChan.substring(0, endOfChan);
407	>	if(newChan.equals(_channel)) {
408	>	sendMessage(source, "I'm already on "+newChan+"!");
409	>	} else {
410	>	partChannel(_channel);
411	>	joinChannel(newChan);
412	>	_channel = newChan;
413	>	//return null; // ???
414		}
415	<	else if(message.indexOf(versionCommand)!=-1) {
416	<	sendMsg(getMsgSender(line)+", I am version "+REVISION.substring(11, REVISION.length() -2)+" of the i-scream alerting bot");
415	>	}
416	>	else if(message.indexOf(nickChangeCommand) != -1) {
417	>	String nickChangeCmd = nickChangeCommand;
418	>	String newNick = message.substring(message.indexOf(nickChangeCmd) + nickChangeCmd.length() + 1);
419	>	int endOfNick = newNick.indexOf(" ");
420	>	if(endOfNick == -1) {
421	>	endOfNick = newNick.length();
422		}
423	<	else if(message.indexOf(helpCommand)!=-1) {
424	<	sendPrivMsg(getMsgSender(line), "Hello, I am the i-scream alerting bot version "+REVISION.substring(11, REVISION.length() -2));
425	<	sendPrivMsg(getMsgSender(line), "I understand the following commands;");
426	<	sendPrivMsg(getMsgSender(line), stopCommand);
427	<	sendPrivMsg(getMsgSender(line), startCommand);
538	<	sendPrivMsg(getMsgSender(line), lastAlertCommand);
539	<	sendPrivMsg(getMsgSender(line), joinCommand);
540	<	sendPrivMsg(getMsgSender(line), nickChangeCommand);
541	<	sendPrivMsg(getMsgSender(line), statCommand);
542	<	sendPrivMsg(getMsgSender(line), uptimeCommand);
543	<	sendPrivMsg(getMsgSender(line), timeSinceLastAlertCommand);
544	<	sendPrivMsg(getMsgSender(line), helpCommand);
545	<	}
546	<	else if(message.indexOf(statCommand)!=-1) {
547	<	sendMsg(getMsgSender(line)+", I have sent a total of "+_alertCount+" alerts, and ignored a total of "+_ignoredCount+"!");
548	<	}
549	<	else if(message.indexOf(uptimeCommand)!=-1) {
550	<	long uptime = (System.currentTimeMillis() - _startTime) / 1000;
551	<	String uptimeText = DateUtils.formatTime(uptime, "%DAYS% days, %HOURS% hours, %MINS% mins, and %SECS% secs");
552	<	sendMsg(getMsgSender(line)+", I have been running for "+uptimeText);
553	<	}
554	<	else if(message.indexOf("ping")!=-1) {
555	<	sendMsg("pong");
556	<	}
557	<	else if(message.indexOf("do a jibble dance")!=-1) {
558	<	// little joke :)
559	<	sendAction("jives to the funky beat shouting \"ii--screeeaaammm\"");
560	<	}
561	<	else {
562	<	String rejectMessage = NOT_CONFIGURED;
563	<	try {
564	<	rejectMessage = cp.getProperty(_name, "Alerter.IRC.rejectMessage");
565	<	} catch(PropertyNotFoundException e) {
566	<	_logger.write(this.toString(), Logger.ERROR, "Configuration error: "+e);
567	<	}
568	<	sendMsg(getMsgSender(line)+", "+rejectMessage);
569	<	}
423	>	newNick = newNick.substring(0, endOfNick);
424	>	changeNick(newNick);
425	>	// should we check this worked?
426	>	//_nickname = newNick;
427	>	//return null; // ???
428		}
429	<	else if(line.indexOf(_nickname)!=-1 && line.indexOf(_channel)!=-1 && line.indexOf("KICK")!=-1) {
430	<	sendPrivMsg(getMsgSender(line), "That wasn't a nice thing to do...");
429	>	else if(message.indexOf(versionCommand) != -1) {
430	>	sendMessage(source, "I am version "+REVISION.substring(11, REVISION.length() -2)+" of the i-scream alerting bot");
431	>	}
432	>	else if(message.indexOf(helpCommand) != -1) {
433	>	//System.out.println("--starting help");
434	>	sendMessage(source, "Hello, I am the i-scream alerting bot version "+REVISION.substring(11, REVISION.length() -2));
435	>	sendMessage(source, "I understand the following commands;");
436	>	sendMessage(source, stopCommand);
437	>	sendMessage(source, startCommand);
438	>	sendMessage(source, lastAlertCommand);
439	>	sendMessage(source, joinCommand);
440	>	sendMessage(source, nickChangeCommand);
441	>	sendMessage(source, statCommand);
442	>	sendMessage(source, uptimeCommand);
443	>	sendMessage(source, timeSinceLastAlertCommand);
444	>	sendMessage(source, helpCommand);
445	>	//System.out.println("--ending help");
446	>	}
447	>	else if(message.indexOf(statCommand) != -1) {
448	>	sendMessage(source, "I have sent a total of "+_alertCount+" alerts, and ignored a total of "+_ignoredCount+"!");
449	>	}
450	>	else if(message.indexOf(uptimeCommand) != -1) {
451	>	long uptime = (System.currentTimeMillis() - _startTime) / 1000;
452	>	String uptimeText = DateUtils.formatTime(uptime, "%DAYS% days, %HOURS% hours, %MINS% mins, and %SECS% secs");
453	>	sendMessage(source, "I have been running for "+uptimeText);
454	>	}
455	>	else if(message.indexOf("ping") != -1) {
456	>	sendMessage(source, "pong");
457	>	}
458	>	else if(message.indexOf("do a jibble dance") != -1) {
459	>	// little joke :)
460	>	sendAction(source, "jives to the funky beat shouting \"ii--screeeaaammm\"");
461	>	}
462	>
463	>	else {
464	>	String rejectMessage = NOT_CONFIGURED;
465		try {
466	<	_channel = cp.getProperty(_name, "Alerter.IRC.channel");
466	>	rejectMessage = cp.getProperty(_name, "Alerter.IRC.rejectMessage");
467		} catch(PropertyNotFoundException e) {
468		_logger.write(this.toString(), Logger.ERROR, "Configuration error: "+e);
469		}
470	<	_socketOut.println("JOIN "+_channel);
470	>	sendMessage(source, rejectMessage);
471		}
472		}
473
474	<	/**
475	<	* Strips the header from a message line
476	<	*
477	<	* @param line the line to strip
478	<	* @return the message from the line
479	<	*/
480	<	private String getMsg(String line) {
481	<	String result = "";
590	<	if(line.indexOf("PRIVMSG")!=-1) {
591	<	int firstColon = line.indexOf(":");
592	<	if(firstColon != -1) {
593	<	int secondColon = line.indexOf(":", firstColon+1);
594	<	if(secondColon != -1) {
595	<	result = line.substring(secondColon+1);
596	<	}
597	<	}
474	>	private boolean isForMe(String message) {
475	>	// change this!
476	>	String nick = _nickname.toLowerCase();
477	>	String msg = message.toLowerCase();
478	>	if(msg.startsWith(nick + ", ") ||
479	>	msg.startsWith(nick + ": ") ||
480	>	msg.startsWith(nick + " ")) {
481	>	return true;
482		}
483	<	return result;
483	>	else {
484	>	return false;
485	>	}
486		}
487
488	<	/**
489	<	* Finds out the sender of the message
490	<	*
491	<	* @param line the line to look for a sender in
492	<	* @return the sender
493	<	*/
494	<	private String getMsgSender(String line) {
495	<	String result = "";
496	<	int colon = line.indexOf(":");
497	<	int excl = line.indexOf("!");
612	<	if(colon!=-1 && excl!=-1) {
613	<	result = line.substring(colon+1, excl);
488	>	private void reconnectSleep() {
489	>	int delayTime = 0;
490	>	try {
491	>	delayTime = Integer.parseInt(ConfigurationProxy.getInstance().getProperty(_name, "Alerter.IRC.reconnectDelay"));
492	>	} catch (NumberFormatException e) {
493	>	delayTime = DEFAULT_RECONNECT_DELAY;
494	>	_logger.write(this.toString(), Logger.WARNING, "Erronous Alerter.IRC.reconnectDelay value in configuration using default of " + delayTime + " seconds");
495	>	} catch (PropertyNotFoundException e) {
496	>	delayTime = DEFAULT_RECONNECT_DELAY;
497	>	_logger.write(this.toString(), Logger.WARNING, "Alerter.IRC.reconnectDelay value unavailable using default of " + delayTime + " seconds");
498		}
499	<	return result;
499	>	_logger.write(this.toString(), Logger.ERROR, "Waiting "+delayTime+" seconds for reconnect...");
500	>	try {
501	>	Thread.sleep(delayTime * 1000);
502	>	} catch (InterruptedException e) {}
503		}
504
505		/**
506	<	* The socket connected to the server
506	>	* Overrides the {@link java.lang.Object#toString() Object.toString()}
507	>	* method to provide clean logging (every class should have this).
508	>	*
509	>	* This uses the uk.org.iscream.cms.server.util.NameFormat class
510	>	* to format the toString()
511	>	*
512	>	* @return the name of this class and its CVS revision
513		*/
514	<	private Socket _socket;
514	>	public String toString() {
515	>	return FormatName.getName(
516	>	_name,
517	>	getClass().getName(),
518	>	REVISION);
519	>	}
520
521		/**
624	–	* The writer
625	–	*/
626	–	private PrintWriter _socketOut;
627	–
628	–	/**
629	–	* The reader
630	–	*/
631	–	private BufferedReader _socketIn;
632	–
633	–	/**
522		* Just a reminder to what channel we're on...
523		* this can't be dynamic :)
524		*/
#	Line 640 | Line 528 | public class IRC__Alerter extends AlerterSkeleton {
528		* A reminder of our current nickname...
529		*/
530		private String _nickname;
643	–
644	–	/**
645	–	* This holds a reference to the
646	–	* system logger that is being used.
647	–	*/
648	–	protected Logger _logger = ReferenceManager.getInstance().getLogger();
531
532		}
533

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines