Merge branch 'master' of https://github.com/marmat8951/bot-irc

# Conflicts:
#	src/main/Bot.java

src/main/Bot.java

@@ -1,7 +1,14 @@
 package main;
 
+import java.io.IOException;
+import java.net.UnknownHostException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
+import java.util.Locale;
 
+import org.jibble.pircbot.IrcException;
+import org.jibble.pircbot.NickAlreadyInUseException;
 import org.jibble.pircbot.PircBot;
 
 import actions.Action;
@@ -15,6 +22,7 @@ public class Bot extends PircBot {
 	private String[] admins;
 	private boolean responseOnPrivateChannel = true;
 	private boolean responseOnPrivateMessages = true;
+	private volatile static long WAIT_BEFORE_RECONNECT = 60;
 	
 
 	public Bot() {
@@ -29,6 +37,7 @@ public class Bot extends PircBot {
 		}
 	}
 	
+	
 	public void onPrivateMessage(String sender, String login, String hostname, String message) {
 		if(responseOnPrivateMessages) {
 			onMessage(sender, sender, login, hostname, message);
@@ -37,6 +46,47 @@ public class Bot extends PircBot {
 		}
 	}
 	
+	
+	public void onDisconnect() {
+		Date d = new Date();
+		System.err.println("Je viens d'être déconnectée!");
+		this.sendMessageToAdmins("Je viens d'être déconnectée!");
+
+		while(!this.isConnected()) {
+		try {
+			Thread.sleep(WAIT_BEFORE_RECONNECT*1000);
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+			try {
+				this.reconnect();
+			}catch (UnknownHostException e) {
+				
+			
+			} catch (NickAlreadyInUseException e) {
+				this.sendMessageToAdmins("Je viens d'être déconnectée et en tentant de me reconnecter mon nom était déjà utilisé!");
+				e.printStackTrace();
+			} catch (IOException e) {
+				this.sendMessageToAdmins("Je viens d'être déconnectée et en tentant de me reconnecter, j'ai eu une IOException: "+e.toString());
+				e.printStackTrace();
+			} catch (IrcException e) {
+				this.sendMessageToAdmins("Je viens d'être déconnectée et en tentant de me reconnecter, j'ai eu une IrcException: "+e.toString());
+				e.printStackTrace();
+			}
+		}
+		
+		SimpleDateFormat sdf = new SimpleDateFormat("EEE, d MMM yyyy HH:mm:ss", Locale.FRENCH);
+		this.sendMessageToAdmins("Je viens de me reconnecter, j'était abscente depuis le "+sdf.format(d));
+		
+	}
+	
+	public final void joinChannels() {
+		String[] channels = Main.getCHANNELS();
+		for(int i = 0; i< channels.length; i++) {
+			joinChannel(channels[i]);
+		}
+	}
+	
 	public void onMessage(String channel, String sender,
 			String login, String hostname, String message) {
 		

src/main/Main.java

@@ -4,9 +4,9 @@ import java.net.ConnectException;
 
 public class Main {
 
-	private static String SERVER = "irc.geeknode.net";
-	private static int PORT = 6667;
-	private static String[] CHANNELS = { "#marmat" };
+	public volatile static String SERVER = "irc.geeknode.net";
+	public volatile static int PORT = 6667;
+	private volatile static String[] CHANNELS = { "#marmat" };
 	private static long TIMEOUT_BEFORE_RECONNECTING = 360;
 	private static int failures = 0;
 	private static boolean DEBUG=true;
@@ -52,7 +52,6 @@ public class Main {
 		}
 	}
 
-
 	public static boolean isDebug () {
 		return Main.DEBUG;
 	}
@@ -62,45 +61,36 @@ public class Main {
 		DEBUG=b;
 	}
 
-
 	public static final String getSERVER() {
 		return SERVER;
 	}
 
-
 	public static final void setSERVER(String sERVER) {
 		SERVER = sERVER;
 	}
 
-
 	public static final int getPORT() {
 		return PORT;
 	}
 
-
 	public static final void setPORT(int pORT) {
 		PORT = pORT;
 	}
 
-
 	public static final String[] getCHANNELS() {
 		return CHANNELS;
 	}
 
-
 	public static final void setCHANNELS(String[] cHANNELS) {
 		CHANNELS = cHANNELS;
 	}
 
-
 	public static final long getTIMEOUT_BEFORE_RECONNECTING() {
 		return TIMEOUT_BEFORE_RECONNECTING;
 	}
 
-
 	public static final void setTIMEOUT_BEFORE_RECONNECTING(long tIMEOUT_BEFORE_RECONNECTING) {
 		TIMEOUT_BEFORE_RECONNECTING = tIMEOUT_BEFORE_RECONNECTING;
 	}
-	
-	
+
 }

src/rss/RSSChecker.java

@@ -0,0 +1,64 @@
+package rss;
+
+import java.io.IOException;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
+
+import data.ISPDAO;
+
+public class RSSChecker implements Runnable {
+
+	private Thread thread;
+	private final String threadName="RssChecker";
+	private long timeout=3600;
+	private String rssaddr;
+	boolean end = false;
+	DocumentBuilderFactory docbfact=DocumentBuilderFactory.newInstance();
+	
+	public RSSChecker(String address) {
+		this.rssaddr = address;
+	}
+
+	public void start() {
+		if(thread == null) {
+			thread = new Thread(this, this.threadName);
+			thread.start();
+		}
+	}
+	
+	@Override
+	public void run() {
+		do {
+			DocumentBuilder db=null;
+			Document doc = null;
+			try {
+				db = docbfact.newDocumentBuilder();
+			} catch (ParserConfigurationException e1) {
+				// TODO Auto-generated catch block
+				e1.printStackTrace();
+			}
+			ISPDAO idao = ISPDAO.getInstance();
+			try {
+				doc = db.parse(idao.executeGet("https://planet.ffdn.org/atom.xml"));
+			} catch (SAXException | IOException e1) {
+				e1.printStackTrace();
+			}
+			NodeList nl = doc.getElementsByTagName("entry");
+			nl.getLength();
+			
+			try {
+				Thread.sleep(1000*timeout);
+			} catch (InterruptedException e) {
+				System.err.println("rss Chacker à été arrété");
+			}
+		}while(!end);
+
+	}
+
+}

src/rss/RssData.java

@@ -0,0 +1,9 @@
+package rss;
+
+public class RssData {
+
+	public RssData() {
+		// TODO Auto-generated constructor stub
+	}
+
+}