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
(Generate patch)

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.33 by tdb, Tue May 21 16:47:16 2002 UTC

# Line 1 | Line 1
1 + /*
2 + * i-scream central monitoring system
3 + * http://www.i-scream.org.uk
4 + * Copyright (C) 2000-2002 i-scream
5 + *
6 + * This program is free software; you can redistribute it and/or
7 + * modify it under the terms of the GNU General Public License
8 + * as published by the Free Software Foundation; either version 2
9 + * of the License, or (at your option) any later version.
10 + *
11 + * This program is distributed in the hope that it will be useful,
12 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14 + * GNU General Public License for more details.
15 + *
16 + * You should have received a copy of the GNU General Public License
17 + * along with this program; if not, write to the Free Software
18 + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
19 + */
20 +
21   //---PACKAGE DECLARATION---
22   package uk.org.iscream.cms.server.client.alerters;
23  
# Line 10 | Line 30 | import java.io.*;
30   import java.net.*;
31   import java.util.*;
32   import java.text.DateFormat;
33 + import org.jibble.pircbot.*;
34  
35   /**
36   * This Alert sends an IRC message.
# Line 34 | Line 55 | public class IRC__Alerter extends AlerterSkeleton {
55       */
56      public final String DESC = "Sends alerts on an IRC channel";
57      
37    /**
38     * The default reconnect delay in seconds
39     */
40    public final int DEFAULT_RECONNECT_DELAY = 30;
41    
58   //---STATIC METHODS---
59  
60   //---CONSTRUCTORS---
61 <
61 >    
62      public IRC__Alerter() {
63          super();
64 <        // connect to the IRC server
64 >        // construct and initialise the bot
65          _ircbot = new IRCBot();
66 +        _ircbot.setVerbose(false);
67 +        Thread ircThread = new Thread(_ircbot);
68          // set it's name and start it
69 <        _ircbot.setName("client.IRC__Alerter$IRCBot");
70 <        _ircbot.start();
69 >        ircThread.setName("client.IRC__Alerter$IRCBot");
70 >        ircThread.start();
71 >        // log our start time
72          _startTime = System.currentTimeMillis();
73          _logger.write(toString(), Logger.SYSINIT, "IRC Alerter started");
74      }
# Line 78 | Line 97 | public class IRC__Alerter extends AlerterSkeleton {
97          if(_active) {          
98              // send the message
99              _logger.write(toString(), Logger.DEBUG, "Sending " + _name + " at "+ alertType + " level");
100 <            _ircbot.sendMsg(message);
100 >            _ircbot.sendMessage(message);
101              // count sent alerts
102              _alertCount++;
103          } else {
# Line 169 | Line 188 | public class IRC__Alerter extends AlerterSkeleton {
188      private long _startTime;
189      
190      /**
191 +     * This holds a reference to the
192 +     * system logger that is being used.
193 +     */
194 +    protected Logger _logger = ReferenceManager.getInstance().getLogger();
195 +    
196 +    /**
197       * This is the friendly identifier of the
198       * component this class is running in.
199       * eg, a Filter may be called "filter1",
# Line 183 | Line 208 | public class IRC__Alerter extends AlerterSkeleton {
208  
209   //---INNER CLASSES---
210  
211 <    /**
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 {
211 >    class IRCBot extends PircBot implements Runnable {
212          
213 <        public static final String DEFAULT_STARTUP_NOTICE = "i-scream ircbot starting...";
213 >        /**
214 >         * The default reconnect delay in seconds
215 >         */
216 >        public final int DEFAULT_RECONNECT_DELAY = 30;
217          
218          /**
219 <         * Main thread loop, this part of the class listens for
220 <         * messages from the server, and acts accordingly. At the
221 <         * present moment it only responds to pings.
219 >         * Attempt to kick-start the IRCBot into action. Will
220 >         * keep calling init() until it doesn't throw an
221 >         * an IOException (which will only be thrown if there
222 >         * is an error initialising). After a successful call
223 >         * to init() the method finishes.
224           */
225          public void run() {
226 <            // 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;
226 >            while(true) {
227                  try {
228 <                    startupNotice = ConfigurationProxy.getInstance().getProperty(_name, "Alerter.IRC.startupNotice");
229 <                } catch (PropertyNotFoundException e) {
212 <                    startupNotice = DEFAULT_STARTUP_NOTICE;
213 <                    _logger.write(this.toString(), Logger.WARNING, "Configuration error: "+e);
228 >                    init();
229 >                    break;
230                  }
231 <                // connect to the IRC server
232 <                try {
233 <                    connect();
234 <                    sendNotice(startupNotice);
219 <                } catch(IOException e) {
220 <                    doRead=false;
221 <                    _logger.write(this.toString(), Logger.ERROR, "Error connecting: "+e);
231 >                catch (IOException e) {
232 >                    _logger.write(this.toString(), Logger.ERROR, "Error initialising IRCBot: "+e);
233 >                    // wait for a while, defined in the config
234 >                    reconnectSleep();
235                  }
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) {}
236              }
262            // maybe disconnect here ? - shutdown method not implemented yet
263            //disconnect();
237          }
238          
239          /**
240 <         * Sends a message to the channel.
240 >         * Connects the bot to an irc server and joins a channel,
241 >         * using details supplied from the i-scream configuration
242 >         * system. If this method completes without an exception
243 >         * one can presume the bot is ready for use.
244           *
245 <         * @param msg The message to send
245 >         * @throws IOException if there is any problem initialising
246           */
247 <        public void sendMsg(String msg) {
248 <            _socketOut.println("PRIVMSG "+_channel+" :"+msg);
249 <            // wait a second before returning...
250 <            // 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 {
247 >        private void init() throws IOException {
248 >            _logger.write(this.toString(), Logger.DEBUG, "Initialising IRCBot...");
249 >            
250 >            // get a hook on the configuration system
251              ConfigurationProxy cp = ConfigurationProxy.getInstance();
252 <            // setup the socket, reader and writer
252 >            
253 >            // get hold of the server details
254              String server;
255              int port;
256              try {
# Line 333 | Line 263 | public class IRC__Alerter extends AlerterSkeleton {
263                  _logger.write(this.toString(), Logger.ERROR, "Configuration error: "+e);
264                  throw new IOException("Can't get irc server details due to malformed configuration");
265              }
266 <            _socket = new Socket(server, port);
267 <            _socketIn = new BufferedReader(new InputStreamReader(_socket.getInputStream()));
268 <            _socketOut = new PrintWriter(_socket.getOutputStream(), true);
339 <            //_socketOut.println("PASS");
340 <            // send USER details
341 <            String user, comment;
266 >            
267 >            // get hold of the user details and nickname list
268 >            String user, nickList;
269              try {
270                  user = cp.getProperty(_name, "Alerter.IRC.user");
271 <                comment = cp.getProperty(_name, "Alerter.IRC.comment");
271 >                nickList = cp.getProperty(_name, "Alerter.IRC.nickList");
272              } catch (PropertyNotFoundException e) {
273                  _logger.write(this.toString(), Logger.ERROR, "Configuration error: "+e);
274 <                throw new IOException("Can't get user details due to configuration error");
274 >                throw new IOException("Can't get user/nickname details due to configuration error");
275              }
276 <            _socketOut.println("USER "+user+" 8 * :"+comment);
277 <            // attempt to get a nick
278 <            String nickList;
276 >            
277 >            // get hold of comment and finger information
278 >            //  -- we're not too fussed if these aren't set
279 >            String comment = "Alerter.IRC.comment is undefined";
280 >            String finger = "Alerter.IRC.finger is undefined";
281              try {
282 <                nickList = cp.getProperty(_name, "Alerter.IRC.nickList");
282 >                comment = cp.getProperty(_name, "Alerter.IRC.comment");
283 >                finger = cp.getProperty(_name, "Alerter.IRC.finger");
284              } catch (PropertyNotFoundException e) {
285 <                _logger.write(this.toString(), Logger.ERROR, "Configuration error: "+e);
356 <                throw new IOException("Can't get nickname due to configuration error");
285 >                _logger.write(this.toString(), Logger.WARNING, "Configuration warning, using default: "+e);
286              }
287 +            
288 +            // put these details into the bot
289 +            this.setLogin(user);
290 +            this.setVersion("[" + getRevision() + "] " + comment);
291 +            this.setFinger(finger);
292 +            
293 +            // attempt to connect, trying each nickname
294 +            // in turn until sucessfully connected
295              StringTokenizer st = new StringTokenizer(nickList, ";");
296              boolean ok = false;
360            // try until we exhaust our list
297              while(!ok && st.hasMoreTokens()) {
298                  String nick = st.nextToken();
299 <                _socketOut.println("NICK "+nick);
300 <                // get a "yes" or "no" response back
301 <                String response = "";
302 <                do {
303 <                    response = _socketIn.readLine();
304 <                    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
299 >                try {
300 >                    // try to connect with a nickname
301 >                    _logger.write(this.toString(), Logger.DEBUG, "Trying nick: "+nick);
302 >                    this.setName(nick);
303 >                    this.connect(server, port);
304 >                    // at this point we know the nickname was accepted
305                      _nickname = nick;
306 +                    ok = true;
307                  }
308 <                else {
309 <                    // log we couldn't get the name
310 <                    _logger.write(this.toString(), Logger.WARNING, "Nickname in use: "+nick);
308 >                catch(IOException e) {
309 >                    _logger.write(this.toString(), Logger.ERROR, "IO error when connecting to server: "+e);
310 >                    throw new IOException("IO error when connecting to server");
311                  }
312 +                catch(IrcException e) {
313 +                    _logger.write(this.toString(), Logger.ERROR, "IRC error when connecting to server: "+e);
314 +                    throw new IOException("IRC error when connecting to server");
315 +                }
316 +                catch(NickAlreadyInUseException e) {
317 +                    _logger.write(this.toString(), Logger.ERROR, "Nickname "+nick+" is already in use: "+e);
318 +                    // don't do anything, instead just loop round
319 +                    // and try the next nickname in the list
320 +                }
321              }
322              if(!ok) {
323 <                // oh dear, we couldn't get on.
324 <                throw new IOException("All nicknames in use");
323 >                // must have tried all the nicknames, best bail out
324 >                _logger.write(this.toString(), Logger.ERROR, "All nicknames already in use");
325 >                throw new IOException("All nicknames already in use");
326              }
327 <            // join the channel
327 >            
328 >            // get hold of the channel details, and attempt
329 >            // to join the specified channel
330              try {
331                  _channel = cp.getProperty(_name, "Alerter.IRC.channel");
332 +                this.joinChannel(_channel);
333              } catch (PropertyNotFoundException e) {
334                  _logger.write(this.toString(), Logger.ERROR, "Configuration error: "+e);
335                  throw new IOException("Can't get channel name due to configuration error");
336              }
337 <            _socketOut.println("JOIN "+_channel);
338 <            // allow alerts
337 >            
338 >            // get hold of the startup notice, and send
339 >            // it if it's defined
340 >            String startupNotice;
341 >            try {
342 >                startupNotice = ConfigurationProxy.getInstance().getProperty(_name, "Alerter.IRC.startupNotice");
343 >                sendNotice(_channel, startupNotice);
344 >            } catch (PropertyNotFoundException e) {
345 >                _logger.write(this.toString(), Logger.DEBUG, "Startup notice not defined, so not sending: "+e);
346 >            }
347 >            
348 >            // at this point initialisation is complete, so
349 >            // we can return and set this flag to allow alerts
350              _active = true;
351          }
352          
353          /**
354 <         * Disconnect "nicely" from the IRC server.
354 >         * Send a message to the current channel.
355           *
356 <         * @throws IOException if the disconnection fails
356 >         * @param message The message to send
357           */
358 <        public void disconnect() throws IOException {
359 <            // stop alerts
358 >        private void sendMessage(String message) {
359 >            sendMessage(_channel, message);
360 >        }
361 >        
362 >        /**
363 >         * If we get disconnected this method will be
364 >         * called, so we must take action. We'll simply
365 >         * keep trying to reinitialise, and thus
366 >         * reconnect to the server.
367 >         */
368 >        public void onDisconnect() {
369 >            // stop alerts being sent for now
370              _active = false;
371 <            // send proper QUIT
372 <            _socketOut.println("QUIT : iscreamBot component shutting down...");
373 <            // close the socket
374 <            _socketOut.close();
375 <            _socketIn.close();
376 <            _socket.close();
371 >            while(true) {
372 >                // wait for a while, defined in the config
373 >                reconnectSleep();
374 >                try {
375 >                    init();
376 >                    break;
377 >                }
378 >                catch (IOException e) {
379 >                    _logger.write(this.toString(), Logger.ERROR, "Error initialising IRCBot: "+e);
380 >                }
381 >            }
382          }
383          
384          /**
385 <         * Overrides the {@link java.lang.Object#toString() Object.toString()}
386 <         * method to provide clean logging (every class should have this).
385 >         * If we receive a message this method will
386 >         * be called. We'll check if the message is
387 >         * for us, and call handleInput if it is.
388           *
389 <         * This uses the uk.org.iscream.cms.server.util.NameFormat class
390 <         * to format the toString()
389 >         * @param channel The channel the message came from
390 >         * @param sender The sender of the message
391 >         * @param login The login of the sender
392 >         * @param hostname The hostname of the sender
393 >         * @param message The message sent
394 >         */
395 >        public void onMessage(String channel, String sender, String login, String hostname, String message) {
396 >            String trimmedMessage = isForMe(message);
397 >            // if trimmedMessage is null, it's not for us
398 >            if(trimmedMessage != null) {
399 >                handleInput(trimmedMessage, channel);
400 >            }
401 >        }
402 >        
403 >        /**
404 >         * If we receive a private message this method
405 >         * will be called. No need to check if it's for
406 >         * us -- it has to be if it's a private message.
407           *
408 <         * @return the name of this class and its CVS revision
408 >         * @param sender The sender of the message
409 >         * @param login The login of the sender
410 >         * @param hostname The hostname of the sender
411 >         * @param message The message sent
412           */
413 <        public String toString() {
414 <            return FormatName.getName(
427 <                _name,
428 <                getClass().getName(),
429 <                REVISION);
413 >        public void onPrivateMessage(String sender, String login, String hostname, String message) {
414 >            handleInput(message, sender);
415          }
416          
417          /**
418 <         * Deals with incoming lines from the server.
418 >         * If we receive a nick change message, this
419 >         * method gets called. We don't care about
420 >         * other users changing their nick, so we only
421 >         * take notice if our nick changes. If it does
422 >         * we need to change our internal nickname
423 >         * state.
424           *
425 <         * @param line the line to deal with
425 >         * @param oldNick the old nickname
426 >         * @param login the login of the nick changer
427 >         * @param hostname the hostname of the nick changer
428 >         * @param newNick the new nickname
429           */
430 <        private void handleInput(String line) {
431 <            ConfigurationProxy cp = ConfigurationProxy.getInstance();
432 <            // if it's a PING...
433 <            if(line.startsWith("PING")) {
434 <                // ...send a PONG
442 <                _socketOut.println("PONG" + line.substring(4));
430 >        public void onNickChange(String oldNick, String login, String hostname, String newNick) {
431 >            if(oldNick.equals(_nickname)) {
432 >                _nickname = newNick;
433 >                // tell the underlying pircbot that our nick has changed too :)
434 >                setName(newNick);
435              }
436 <            // see if it's for us
437 <            else if(getMsg(line).toLowerCase().startsWith(_nickname.toLowerCase()+",") ||
438 <                    getMsg(line).toLowerCase().startsWith(_nickname.toLowerCase()+":") ||
439 <                    getMsg(line).toLowerCase().startsWith(_nickname.toLowerCase()+" ")) {
440 <                // setup some String's
441 <                String stopCommand, startCommand, timeSinceLastAlertCommand, lastAlertCommand, joinCommand;
442 <                String nickChangeCommand, versionCommand, helpCommand, statCommand, uptimeCommand;
443 <                // get the command set
436 >        }
437 >        
438 >        /**
439 >         * If we receive a kick message this method
440 >         * gets called. We only take notice if it's
441 >         * us getting kicked, and then we'll rejoin
442 >         * the channel after a short wait.
443 >         *
444 >         * @param channel the channel the kick happened on
445 >         * @param kickerNick the person who performed the kick
446 >         * @param kickerLogin the login of the person who performed the kick
447 >         * @param kickerHostname the hostname of the person who performed the kick
448 >         * @param recipientNick the nickname of the person being kicked
449 >         * @param reason the reason for the kick
450 >         */
451 >        public void onKick(String channel, String kickerNick, String kickerLogin, String kickerHostname, String recipientNick, String reason) {
452 >            if(recipientNick.equals(_nickname) && channel.equals(_channel)) {
453 >                // remind the person it's not very nice :)
454 >                sendMessage(kickerNick, "That wasn't a nice thing to do...");
455 >                // get hold of the channel details, in case they've changed
456                  try {
457 <                    stopCommand = cp.getProperty(_name, "Alerter.IRC.stopCommand");
458 <                    startCommand = cp.getProperty(_name, "Alerter.IRC.startCommand");
459 <                    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) {
464 <                    _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;
457 >                    _channel = ConfigurationProxy.getInstance().getProperty(_name, "Alerter.IRC.channel");
458 >                } catch(PropertyNotFoundException e) {
459 >                    _logger.write(this.toString(), Logger.ERROR, "Can't get channel name due to configuration error: "+e);
460                  }
461 <                
462 <                // we have a message for us
463 <                String message = getMsg(line).substring(_nickname.length());
464 <                if(message.indexOf(stopCommand)!=-1) {
465 <                    _active = false;
466 <                    sendMsg(getMsgSender(line)+", alerts have been stopped");
461 >                // wait for a while, defined in the config
462 >                reconnectSleep();
463 >                // we'll try and rejoin the channel regardless
464 >                // otherwise we might end up doing nothing!
465 >                joinChannel(_channel);
466 >            }
467 >        }
468 >        
469 >        /**
470 >         * This method handles input directed to us, and
471 >         * responds accordingly if required.
472 >         *
473 >         * @param message the message from someone
474 >         * @param source where the message came from, so we know where to send the response
475 >         */
476 >        private void handleInput(String message, String source) {
477 >            // get hold of the configuration system
478 >            ConfigurationProxy cp = ConfigurationProxy.getInstance();
479 >            // setup some String's
480 >            String stopCommand, startCommand, timeSinceLastAlertCommand, lastAlertCommand, joinCommand;
481 >            String nickChangeCommand, versionCommand, helpCommand, statCommand, uptimeCommand;
482 >            // get the command set from the configuration
483 >            try {
484 >                stopCommand = cp.getProperty(_name, "Alerter.IRC.stopCommand");
485 >                startCommand = cp.getProperty(_name, "Alerter.IRC.startCommand");
486 >                timeSinceLastAlertCommand = cp.getProperty(_name, "Alerter.IRC.timeSinceLastAlertCommand");
487 >                lastAlertCommand = cp.getProperty(_name, "Alerter.IRC.lastAlertCommand");
488 >                joinCommand = cp.getProperty(_name, "Alerter.IRC.joinCommand");
489 >                nickChangeCommand = cp.getProperty(_name, "Alerter.IRC.nickChangeCommand");
490 >                versionCommand = cp.getProperty(_name, "Alerter.IRC.versionCommand");
491 >                helpCommand = cp.getProperty(_name, "Alerter.IRC.helpCommand");
492 >                statCommand = cp.getProperty(_name, "Alerter.IRC.statCommand");
493 >                uptimeCommand = cp.getProperty(_name, "Alerter.IRC.uptimeCommand");
494 >            } catch (PropertyNotFoundException e) {
495 >                _logger.write(this.toString(), Logger.ERROR, "Configuration error: "+e);
496 >                // lets bail from handling this line...
497 >                // ...it's gonna be hard without a command set!
498 >                return;
499 >            }
500 >            
501 >            if(message.equalsIgnoreCase(stopCommand)) {
502 >                _active = false;
503 >                sendMessage(source, "alerts have been stopped");
504 >            }
505 >            else if(message.equalsIgnoreCase(startCommand)) {
506 >                _active = true;
507 >                sendMessage(source, "alerts have been activated");
508 >            }
509 >            // this needs to go before lastAlertCommand if it contains
510 >            // the same words as the lastAlertCommand.
511 >            else if(message.equalsIgnoreCase(timeSinceLastAlertCommand)) {
512 >                if(_lastAlertTime != -1) {
513 >                    long uptime = (System.currentTimeMillis() - _lastAlertTime) / 1000;
514 >                    String uptimeText = DateUtils.formatTime(uptime, "%DAYS% days, %HOURS% hours, %MINS% mins, and %SECS% secs");
515 >                    sendMessage(source, "I last sent an alert "+uptimeText+ " ago");
516                  }
517 <                else if(message.indexOf(startCommand)!=-1) {
518 <                    _active = true;
478 <                    sendMsg(getMsgSender(line)+", alerts have been activated");
517 >                else {
518 >                    sendMessage(source, "I've never sent an alert!");
519                  }
520 <                // this needs to go here if it contains the same words as the lastAlertCommand
521 <                else if(message.indexOf(timeSinceLastAlertCommand)!=-1) {
522 <                    if(_lastAlertTime != -1) {
523 <                        long uptime = (System.currentTimeMillis() - _lastAlertTime) / 1000;
524 <                        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 <                    }
520 >            }
521 >            else if(message.equalsIgnoreCase(lastAlertCommand)) {
522 >                if(_lastAlertTime != -1) {
523 >                    String date = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT, Locale.UK).format(new Date(_lastAlertTime));
524 >                    sendMessage(source, "last alert was at "+date+"; "+_lastAlert);
525                  }
526 <                else if(message.indexOf(lastAlertCommand)!=-1) {
527 <                    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 <                    
526 >                else {
527 >                    sendMessage(source, "I've never sent an alert!");
528                  }
529 <                else if(message.indexOf(joinCommand)!=-1) {
530 <                    String joinCmd = joinCommand;
531 <                    String newChan = message.substring(message.indexOf(joinCmd) + joinCmd.length() + 1);
532 <                    int endOfChan = newChan.indexOf(" ");
533 <                    if(endOfChan == -1) {
534 <                        endOfChan = newChan.length();
535 <                    }
536 <                    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 <                    }
529 >                
530 >            }
531 >            else if(message.toLowerCase().startsWith(joinCommand.toLowerCase())) {
532 >                String joinCmd = joinCommand;
533 >                String newChan = message.substring(message.indexOf(joinCmd) + joinCmd.length() + 1);
534 >                int endOfChan = newChan.indexOf(" ");
535 >                if(endOfChan == -1) {
536 >                    endOfChan = newChan.length();
537                  }
538 <                else if(message.indexOf(nickChangeCommand)!=-1) {
539 <                    String nickChangeCmd = nickChangeCommand;
540 <                    String newNick = message.substring(message.indexOf(nickChangeCmd) + nickChangeCmd.length() + 1);
541 <                    int endOfNick = newNick.indexOf(" ");
542 <                    if(endOfNick == -1) {
543 <                        endOfNick = newNick.length();
544 <                    }
525 <                    newNick = newNick.substring(0, endOfNick);
526 <                    sendMsg(getMsgSender(line)+", okay, changing my nickname to "+newNick);
527 <                    _socketOut.println("NICK "+newNick);
528 <                    _nickname = newNick;
538 >                newChan = newChan.substring(0, endOfChan);
539 >                if(newChan.equals(_channel)) {
540 >                    sendMessage(source, "I'm already on "+newChan+"!");
541 >                } else {
542 >                    partChannel(_channel);
543 >                    joinChannel(newChan);
544 >                    _channel = newChan;
545                  }
546 <                else if(message.indexOf(versionCommand)!=-1) {
547 <                    sendMsg(getMsgSender(line)+", I am version "+REVISION.substring(11, REVISION.length() -2)+" of the i-scream alerting bot");
546 >            }
547 >            else if(message.toLowerCase().startsWith(nickChangeCommand.toLowerCase())) {
548 >                String nickChangeCmd = nickChangeCommand;
549 >                String newNick = message.substring(message.indexOf(nickChangeCmd) + nickChangeCmd.length() + 1);
550 >                int endOfNick = newNick.indexOf(" ");
551 >                if(endOfNick == -1) {
552 >                    endOfNick = newNick.length();
553                  }
554 <                else if(message.indexOf(helpCommand)!=-1) {
555 <                    sendPrivMsg(getMsgSender(line), "Hello, I am the i-scream alerting bot version "+REVISION.substring(11, REVISION.length() -2));
535 <                    sendPrivMsg(getMsgSender(line), "I understand the following commands;");
536 <                    sendPrivMsg(getMsgSender(line), stopCommand);
537 <                    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 <                }
554 >                newNick = newNick.substring(0, endOfNick);
555 >                changeNick(newNick);
556              }
557 <            else if(line.indexOf(_nickname)!=-1 && line.indexOf(_channel)!=-1 && line.indexOf("KICK")!=-1) {
558 <                sendPrivMsg(getMsgSender(line), "That wasn't a nice thing to do...");
557 >            else if(message.equalsIgnoreCase(versionCommand)) {
558 >                sendMessage(source, "I am version " + getRevision() + " of the i-scream alerting bot");
559 >            }
560 >            else if(message.equalsIgnoreCase(helpCommand)) {
561 >                sendMessage(source, "Hello, I am the i-scream alerting bot version "+REVISION.substring(11, REVISION.length() -2));
562 >                sendMessage(source, "I understand the following commands;");
563 >                sendMessage(source, stopCommand);
564 >                sendMessage(source, startCommand);
565 >                sendMessage(source, lastAlertCommand);
566 >                sendMessage(source, joinCommand);
567 >                sendMessage(source, nickChangeCommand);
568 >                sendMessage(source, statCommand);
569 >                sendMessage(source, uptimeCommand);
570 >                sendMessage(source, timeSinceLastAlertCommand);
571 >                sendMessage(source, helpCommand);
572 >            }
573 >            else if(message.equalsIgnoreCase(statCommand)) {
574 >                sendMessage(source, "I have sent a total of "+_alertCount+" alerts, and ignored a total of "+_ignoredCount+"!");
575 >            }
576 >            else if(message.equalsIgnoreCase(uptimeCommand)) {
577 >                long uptime = (System.currentTimeMillis() - _startTime) / 1000;
578 >                String uptimeText = DateUtils.formatTime(uptime, "%DAYS% days, %HOURS% hours, %MINS% mins, and %SECS% secs");
579 >                sendMessage(source, "I have been running for "+uptimeText);
580 >            }
581 >            else if(message.equalsIgnoreCase("ping")) {
582 >                sendMessage(source, "pong");
583 >            }
584 >            else if(message.equalsIgnoreCase("do a jibble dance")) {
585 >                // little joke :)
586 >                sendAction(source, "jives to the funky beat shouting \"ii--screeeaaammm\"");
587 >            }
588 >            else {
589 >                String rejectMessage = NOT_CONFIGURED;
590                  try {
591 <                    _channel = cp.getProperty(_name, "Alerter.IRC.channel");
591 >                    rejectMessage = cp.getProperty(_name, "Alerter.IRC.rejectMessage");
592                  } catch(PropertyNotFoundException e) {
593                      _logger.write(this.toString(), Logger.ERROR, "Configuration error: "+e);
594                  }
595 <                _socketOut.println("JOIN "+_channel);
595 >                sendMessage(source, rejectMessage);
596              }
597          }
598          
599          /**
600 <         * Strips the header from a message line
600 >         * Quick method to check if the message appears
601 >         * to be directed at us. We simply check to see
602 >         * if it starts with our nick in some fashion.
603 >         * This will return null if the message is not
604 >         * for us - thus allowing this method to perform
605 >         * two tasks at once.
606           *
607 <         * @param line the line to strip
608 <         * @return the message from the line
607 >         * @param message the message to check
608 >         * @return the message (with our nick removed), or null if it's not for us.
609           */
610 <        private String getMsg(String line) {
611 <            String result = "";
612 <            if(line.indexOf("PRIVMSG")!=-1) {
613 <                int firstColon = line.indexOf(":");
614 <                if(firstColon != -1) {
615 <                    int secondColon = line.indexOf(":", firstColon+1);
616 <                    if(secondColon != -1) {
617 <                        result = line.substring(secondColon+1);
618 <                    }
619 <                }
610 >        private String isForMe(String message) {
611 >            // change to lower case to remove
612 >            // case ambiguities
613 >            String nick = _nickname.toLowerCase();
614 >            String msg = message.toLowerCase();
615 >            if(msg.startsWith(nick + ", ") ||
616 >               msg.startsWith(nick + ": ") ||
617 >               msg.startsWith(nick + " ")) {
618 >                // NOTE that the 1 here is hardcoded to be the length
619 >                // of the above 'extra' character (eg , or :)
620 >                return message.substring(nick.length()+1).trim();
621              }
622 <            return result;
622 >            else {
623 >                return null;
624 >            }
625          }
626          
627          /**
628 <         * Finds out the sender of the message
629 <         *
630 <         * @param line the line to look for a sender in
606 <         * @return the sender
628 >         * Sleep for a configurable amount of time and
629 >         * then return. This is used when reconnecting
630 >         * to the server or a channel.
631           */
632 <        private String getMsgSender(String line) {
633 <            String result = "";
634 <            int colon = line.indexOf(":");
635 <            int excl = line.indexOf("!");
636 <            if(colon!=-1 && excl!=-1) {
637 <                result = line.substring(colon+1, excl);
632 >        private void reconnectSleep() {
633 >            int delayTime = 0;
634 >            try {
635 >                delayTime = Integer.parseInt(ConfigurationProxy.getInstance().getProperty(_name, "Alerter.IRC.reconnectDelay"));
636 >            } catch (NumberFormatException e) {
637 >                delayTime = DEFAULT_RECONNECT_DELAY;
638 >                _logger.write(this.toString(), Logger.WARNING, "Erronous Alerter.IRC.reconnectDelay value in configuration using default of " + delayTime + " seconds");
639 >            } catch (PropertyNotFoundException e) {
640 >                delayTime = DEFAULT_RECONNECT_DELAY;
641 >                _logger.write(this.toString(), Logger.WARNING, "Alerter.IRC.reconnectDelay value unavailable using default of " + delayTime + " seconds");
642              }
643 <            return result;
643 >            _logger.write(this.toString(), Logger.ERROR, "Waiting "+delayTime+" seconds for reconnect...");
644 >            try {
645 >                Thread.sleep(delayTime * 1000);
646 >            } catch (InterruptedException e) {}
647          }
648          
649          /**
650 <         * The socket connected to the server
650 >         * Returns the revision of the bot.
651 >         *
652 >         * @return the revision of this bot
653           */
654 <        private Socket _socket;
654 >        private String getRevision() {
655 >            return REVISION.substring(11, REVISION.length()-2);
656 >        }
657          
658          /**
659 <         * The writer
659 >         * Overrides the {@link java.lang.Object#toString() Object.toString()}
660 >         * method to provide clean logging (every class should have this).
661 >         *
662 >         * This uses the uk.org.iscream.cms.server.util.NameFormat class
663 >         * to format the toString()
664 >         *
665 >         * @return the name of this class and its CVS revision
666           */
667 <        private PrintWriter _socketOut;
667 >        public String toString() {
668 >            return FormatName.getName(
669 >                _name,
670 >                getClass().getName(),
671 >                REVISION);
672 >        }
673          
674          /**
629         * The reader
630         */
631        private BufferedReader _socketIn;
632        
633        /**
675           * Just a reminder to what channel we're on...
676           * this can't be dynamic :)
677           */
# Line 640 | Line 681 | public class IRC__Alerter extends AlerterSkeleton {
681           * A reminder of our current nickname...
682           */
683          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();
684          
685      }
686  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines