Multiple refactors: config set, RSSDataRemainder data as observer + bots

.gitignore

@@ -1,5 +1,6 @@
 # Ignore Gradle project-specific cache directory
 .gradle
-
+twitter4j.properties
+/ressources/config/
 # Ignore Gradle build output directory
 build

build.gradle

@@ -1,7 +1,11 @@
 apply plugin: 'java'
 apply plugin: 'eclipse'
 apply plugin: 'application'
+compileJava.options.encoding = 'UTF-8'
 
+tasks.withType(JavaCompile) {
+    options.encoding = 'UTF-8'
+}
 
 sourceCompatibility = 1.8
 version = '1.0'

ressources/config/config.properties

@@ -31,4 +31,7 @@ Debug=true
 #Time between each +reload allowed in seconds
 Minimum_time_beetween_+reload=360
 #Time between each autoreload in seconds
-CacheReloader_timeout=3600
+CacheReloader_timeout=3600
+
+Mastodon_access_token=f23fb685d0b36a0667c000b393be06631162c7e016af82c39a3454fa29d596ea
+Mastodon_instance=toot.aquilenet.fr

ressources/config/default.properties

@@ -51,5 +51,10 @@ listeall=true
 infoall=false
 
 ##RSS settings
-RSS_adress = https://planet.ffdn.org/atom.xml
+RSS_address = https://planet.ffdn.org/atom.xml
 RSS_new_article_check=3600
+
+
+#Mastodon
+Mastodon_access_token=""
+Mastodon_instance=toot.aquilenet.fr

src/main/java/bot/irc/action/Action.java

@@ -5,12 +5,13 @@ import java.util.List;
 
 import bot.irc.data.Message;
 import bot.irc.main.Bot;
+import bot.irc.main.Config;
 
 public abstract class Action {
 
 	public List<String> keyWords;
 	public Bot bot;
-	public volatile static char CARACTERE_COMMANDE = '+';
+	public volatile static char CARACTERE_COMMANDE = Config.getProperty("Caractere_commande").charAt(0);
 	
 	protected Action(Bot b, List<String> keywords) {
 		this.keyWords = keywords;

src/main/java/bot/irc/action/Info.java

@@ -9,6 +9,7 @@ import bot.irc.data.ISPDAO;
 import bot.irc.data.Message;
 import bot.irc.main.Bot;
 import bot.irc.main.Cache;
+import bot.irc.main.Config;
 import bot.irc.verif_saisie.EntierPositifNonVide;
 /**
  * Classe d'Action servant à gérer une demande d'info sur un FAI
@@ -17,7 +18,7 @@ import bot.irc.verif_saisie.EntierPositifNonVide;
  */
 public class Info extends Action {
 	
-	public static boolean INFO_ALL = false;
+	public static boolean INFO_ALL = Config.getPropertyAsBoolean("infoall", false);
 
 	public Info(Bot b) {
 		super(b);

src/main/java/bot/irc/action/Liste.java

@@ -10,6 +10,7 @@ import bot.irc.data.Message;
 import bot.irc.main.AffichableSurIRC;
 import bot.irc.main.Bot;
 import bot.irc.main.Cache;
+import bot.irc.main.Config;
 
 /**
  * Classe servant à la récuperation d'une liste des FAI présents dans la base de donnée.
@@ -18,7 +19,7 @@ import bot.irc.main.Cache;
  */
 public class Liste extends Action {
 	
-	public static volatile boolean allAllowed=true;
+	public static volatile boolean allAllowed=Config.getPropertyAsBoolean("listeall",true);
 
 	public Liste(Bot b) {
 		super(b);

src/main/java/bot/irc/action/RP.java

@@ -11,8 +11,8 @@ import java.util.List;
 
 import bot.irc.data.Message;
 import bot.irc.main.Bot;
+import bot.irc.main.Config;
 import bot.irc.main.Main;
-import bot.irc.main.PropertiesSetter;
 
 /**
  * Méthode pour gérer la sauvegarde de liens dans un fichier pour en faire une revue de presse.
@@ -34,7 +34,7 @@ public class RP extends Action {
 		ar.add("rp");
 		ar.add("citation");
 		this.keyWords = ar;
-		rpFile = new File(PropertiesSetter.here+File.separator+"ressources"+File.separator+"rp"+File.separator+"index.txt");
+		rpFile = new File(Config.here+File.separator+"ressources"+File.separator+"rp"+File.separator+"index.txt");
 		boolean fileExists = rpFile.exists();
 		if(!fileExists) {
 			if(Main.isDebug()) {

src/main/java/bot/irc/comportement/Cafe.java

@@ -1,9 +1,12 @@
 package bot.irc.comportement;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
+import bot.irc.main.Bot;
 import bot.irc.main.IRCBot;
 import bot.irc.main.Main;
 
@@ -19,7 +22,7 @@ public class Cafe extends Comportement {
 	public static final long MAX_THE = 30;
 	public static final long MAX_CAFE = 360;
 	
-	private Cafe(IRCBot b) {
+	private Cafe(Bot b) {
 		super(b);
 	}
 	
@@ -29,39 +32,38 @@ public class Cafe extends Comportement {
 		return m.contains(getBotNick())&&(m.contains("fais") || m.contains("fait")) && (m.contains("café")||m.contains("thé"));
 	}
 
-	@Override
-	public void react(String channel, String sender, String login, String hostname, String message) {
+	public List<String> react(String channel, String sender, String login, String hostname, String message) {
+		List<String> res = new ArrayList<>();
 		Long lastone;
 		Date d = new Date();
-		IRCBot b = this.getBot();
 		if(istheorcafe(message.toLowerCase())) {
 			lastone = lastthe.get(sender);
 			if(lastone == null) {
-			b.sendMessage(channel, "Ok pour le thé");
+				res.add("Ok pour le thé");
 			}else {
 				if(d.getTime()-lastone < MAX_THE*1000) {
-					b.sendMessage(channel, "Ok, mais la dernière fois c'était il y a moins de "+MAX_THE+" secondes, tu devrais y aller plus doucement...");
+					res.add("Ok, mais la dernière fois c'était il y a moins de "+MAX_THE+" secondes, tu devrais y aller plus doucement...");
 				}else {
-					b.sendMessage(channel, "Ok, pas de problème. La dernière fois c'était le "+Main.DATE_FORMAT_OUT.format(new Date(lastone)));
+					res.add("Ok, pas de problème. La dernière fois c'était le "+Main.DATE_FORMAT_OUT.format(new Date(lastone)));
 				}
 			}
 			lastthe.put(sender, d.getTime());
 		}else {
 			lastone = lastcafe.get(sender);
-			if(sender.equals("quota_atypique")) {
-				b.sendMessage(channel, "Ok Quota!");
+			if(sender.toLowerCase().contains("quota_atypique")) {
+				res.add("Ok Quota!");
 			}else if(lastone == null) {
-				b.sendMessage(channel, "Ok pour le café!");
+				res.add("Ok pour le café!");
 			}else {
 				if(d.getTime()-lastone < MAX_CAFE*1000) {
-					b.sendMessage(channel, "Eu... ok, mais, tu devrai plutôt prendre un thé, ça fait vraiment trop peu de temps la... ");
+					res.add("Eu... ok, mais, tu devrai plutôt prendre un thé, ça fait vraiment trop peu de temps la... ");
 				}else {
-					b.sendMessage(channel, "Ok, pas de problème, la dernière fois c'était le "+Main.DATE_FORMAT_OUT.format(new Date(lastone)));
+					res.add("Ok, pas de problème, la dernière fois c'était le "+Main.DATE_FORMAT_OUT.format(new Date(lastone)));
 				}
 			}
 			lastcafe.put(sender, d.getTime());
 		}
-			
+		return res;
 	}
 	/**
 	 * Indique si il s'agit de thé ou de café qui est demandé
@@ -77,7 +79,7 @@ public class Cafe extends Comportement {
 	 * @param b
 	 * @return
 	 */
-	public final static Cafe getInstance(IRCBot b) {
+	public final static Cafe getInstance(Bot b) {
 		if (Cafe.instance == null) {
 			synchronized (Cafe.class) {
 				if(Cafe.instance == null) {

src/main/java/bot/irc/comportement/Comportement.java

@@ -3,13 +3,15 @@ package bot.irc.comportement;
 import java.util.ArrayList;
 import java.util.List;
 
+import bot.irc.main.Bot;
 import bot.irc.main.IRCBot;
 
+
 public abstract class Comportement {
 
-	private IRCBot iRCBot;
-	public Comportement(IRCBot b) {
-		this.iRCBot = b;
+	private Bot bot;
+	public Comportement(Bot b) {
+		this.bot = b;
 	}
 
 	/**
@@ -24,25 +26,25 @@ public abstract class Comportement {
 		return liste;
 	}
 	
+	
 	public abstract boolean hastoreact(String message);
 	
-	public abstract void react(String channel, String sender,
+	public abstract List<String> react(String channel, String sender,
 			String login, String hostname, String message);
-
-
+	
 	/**
 	 * @return the bot
 	 */
-	public IRCBot getBot() {
-		return iRCBot;
+	public Bot getBot() {
+		return bot;
 	}
 
 
 	/**
 	 * @param iRCBot the bot to set
 	 */
-	public void setBot(IRCBot iRCBot) {
-		this.iRCBot = iRCBot;
+	public void setBot(Bot bot) {
+		this.bot = bot;
 	}
 
 	/**
@@ -50,6 +52,6 @@ public abstract class Comportement {
 	 * @return le nom actuel du bot placé en minuscules
 	 */
 	public String getBotNick() {
-		return iRCBot.getNick().toLowerCase();
+		return bot.getBotName().toLowerCase();
 	}
 }

src/main/java/bot/irc/comportement/Philo.java

@@ -3,6 +3,7 @@ package bot.irc.comportement;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.Random;
 
 import org.apache.commons.io.FileUtils;
@@ -11,6 +12,7 @@ import org.json.JSONException;
 import org.json.JSONObject;
 
 import bot.irc.action.Action;
+import bot.irc.main.Bot;
 import bot.irc.main.IRCBot;
 import bot.irc.main.Main;
 
@@ -28,12 +30,12 @@ public class Philo extends Comportement {
 	private final String[] files = folder.list();
 	private final Random random = new Random();
 	
-	private Philo(IRCBot b) {
+	private Philo(Bot b) {
 		super(b);
 		load();
 	}
 	
-	public final static Philo getInstance(IRCBot b) {
+	public final static Philo getInstance(Bot b) {
 		if (Philo.instance == null) {
 			synchronized (Philo.class) {
 				if(Philo.instance == null) {
@@ -116,8 +118,8 @@ public class Philo extends Comportement {
 	}
 	
 	@Override
-	public void react(String channel, String sender, String login, String hostname, String message) {
-		IRCBot b = this.getBot();
+	public List<String> react(String channel, String sender, String login, String hostname, String message) {
+		List<String> ret= new ArrayList<>();
 		String res = ""+sender;
 		JSONObject jo;
 		if(message.toLowerCase().replaceAll(" ", "").equals(Action.CARACTERE_COMMANDE+"philo")) {
@@ -132,8 +134,9 @@ public class Philo extends Comportement {
 			res += jo.getString("topic")+":";
 			
 		}
-		b.sendMessage(channel, res);
-		b.sendMessage(channel, giveMeAQuoteFrom(jo));
+		ret.add(res);
+		ret.add(giveMeAQuoteFrom(jo));
+		return ret;
 	}
 
 }

src/main/java/bot/irc/main/Bot.java

@@ -18,4 +18,6 @@ public interface Bot {
 	public void sendMessageToAdmins(String string);
 	
 	public void sendRSSMessage(List<String> messages);
+
+	
 }

src/main/java/bot/irc/main/Cache.java

@@ -19,7 +19,7 @@ public class Cache implements AffichableSurIRC {
 	public static volatile Cache instance = null;
 	private Date lastCacheUpdate;
 	private List<ISP> cache;
-	private static long TIME_BETWEEN_RELOADS = 360000;
+	private static long TIME_BETWEEN_RELOADS = 1000*Config.getPropertyAsLong("Minimum_time_beetween_+reload");
 	
 	/**
 	 * Constructeur de cache. Celui ci est privé car la classe utilise le Design Patern singleton.

src/main/java/bot/irc/main/Config.java

@@ -0,0 +1,90 @@
+package bot.irc.main;
+
+import java.io.File;
+import java.io.FileReader;
+import java.util.Properties;
+
+public class Config {
+	
+	
+	  private static Properties props;
+	  public final static String DEFAULT_PROPERTIES_FILE = "default.properties";
+	  public final static String PROPERTIES_FILE = "config.properties";
+	  public final static String here = (new File(".")).getAbsolutePath();
+	  
+	  static {
+	    try {
+	    	FileReader defaultProperties = new FileReader(new File(here+File.separator+"ressources"+File.separator+"config"+File.separator+DEFAULT_PROPERTIES_FILE));
+			Properties defaultProp = new Properties();
+			defaultProp.load(defaultProperties);
+			props=new Properties(defaultProp);
+	        FileReader in = new FileReader(new File(here+File.separator+"ressources"+File.separator+"config"+File.separator+PROPERTIES_FILE));
+	        props.load(in);
+	        in.close();
+	        System.out.println("Config ready");
+	        for(String s:defaultProp.stringPropertyNames()) System.out.println(s+"="+getProperty(s));
+	       
+	    } catch (Exception e) {
+	        e.printStackTrace();
+	    }
+	  }
+	  
+	  public static String getProperty(String key) {
+		  return props.getProperty(key);
+	  }
+	  
+	  public static String getProperty(String key,String defaultValue) {
+		  return props.getProperty(key, defaultValue);
+	  }
+	  
+	  
+	  public static int getPropertyAsInt(String key) {
+			  return Integer.parseInt(props.getProperty(key));
+	  }
+	  
+	  public static int getPropertyAsInt(String key, int defaultValue) {
+		  try {
+			  return Integer.parseInt(props.getProperty(key));
+		  }catch(Exception e) {
+			  return defaultValue;
+		  }
+	  }
+	  
+	  public static int getPropertyAsUnsignedInt(String key) {
+		  return Integer.parseUnsignedInt(props.getProperty(key));
+	  }
+	  
+	  
+	  
+		public static String[] getMultipleValues(String key) {
+			return props.getProperty(key).split(",");
+		}
+		
+		
+		public static long getPropertyAsLong(String key) {
+			return Long.parseLong(props.getProperty(key));
+		}
+		
+		public static long getPropertyAsLong(String key,long defaultValue) {
+			try {
+				return Long.parseLong(props.getProperty(key));
+			}catch(Exception e) {
+				return defaultValue;
+			}
+		}
+		
+		public static boolean getPropertyAsBoolean(String key) {
+			return Boolean.parseBoolean(props.getProperty(key));
+		}
+		
+		public static boolean getPropertyAsBoolean(String key,boolean defaultValue) {
+			if(props.containsKey(key)) {
+				return getPropertyAsBoolean(key);
+			}else {
+				return defaultValue;
+			}
+			
+		}
+		
+		
+}

src/main/java/bot/irc/main/IRCBot.java

@@ -4,6 +4,8 @@ import java.io.IOException;
 import java.net.UnknownHostException;
 import java.util.Date;
 import java.util.List;
+import java.util.Observable;
+import java.util.Observer;
 
 import org.jibble.pircbot.IrcException;
 import org.jibble.pircbot.NickAlreadyInUseException;
@@ -12,15 +14,17 @@ import org.jibble.pircbot.PircBot;
 import bot.irc.action.Action;
 import bot.irc.comportement.Comportement;
 import bot.irc.data.Message;
+import bot.irc.rss.RssData;
+import bot.irc.rss.RssDataRemainder;
 
-public class IRCBot extends PircBot implements Bot {
+public class IRCBot extends PircBot implements Bot, Observer {
 
-	private volatile static long TIME_BETWEEN_MESSAGES = 200;
+	private volatile static long TIME_BETWEEN_MESSAGES = Config.getPropertyAsLong("Time_between_messages");
 	private List<Action> actions = Action.getAllActions(this);
 	private List<Comportement> comportements = Comportement.getAllComportements(this);
-	private String[] admins;
-	private boolean responseOnPrivateChannel = true;
-	private boolean responseOnPrivateMessages = true;
+	private String[] admins = Config.getMultipleValues("Admins");
+	private boolean responseOnPrivateChannel = Config.getPropertyAsBoolean("Respond_using_private_channel", true);
+	private boolean responseOnPrivateMessages = Config.getPropertyAsBoolean("Allow_private_messages", true);
 	private volatile static long WAIT_BEFORE_RECONNECT = 60;
 	private String BotName = "IRC";
 
@@ -265,4 +269,15 @@ public class IRCBot extends PircBot implements Bot {
 		
 	}
 
+
+	@Override
+	public void update(Observable o, Object arg) {
+			if(o.getClass().equals(RssDataRemainder.class)) {
+				RssData data = (RssData) arg;
+				this.sendRSSMessage(data.toStringIRC());
+			}
+		
+	}
+
+
 }

src/main/java/bot/irc/main/Main.java

@@ -8,20 +8,22 @@ import java.util.Locale;
 
 import bot.irc.rss.RSSChecker;
 import bot.irc.rss.RssDataRemainder;
+import bot.irc.socials.MastodonBot;
 import bot.irc.socials.TwitterBot;
 
 
 public class Main {
-
-	public volatile static String SERVER = "irc.geeknode.net";
-	public volatile static int PORT = 6667;
-	private volatile static String[] CHANNELS = { "#marmat" };
+	private static volatile Config CONFIG;
+	public volatile static String SERVER = Config.getProperty("SERVER", "irc.geeknode.net");
+	public volatile static int PORT = Config.getPropertyAsUnsignedInt("PORT");
+	private volatile static String[] CHANNELS = Config.getMultipleValues("CHANNELS");
 	private static long TIMEOUT_BEFORE_RECONNECTING = 360;
 	private static int failures = 0;
-	private static volatile boolean DEBUG=true;
+	private static volatile boolean DEBUG=Boolean.parseBoolean(Config.getProperty("Debug"));
 	private static CacheReloader CR;
 	private static IRCBot IRCBOT;
 	private static TwitterBot TWITTER;
+	private static MastodonBot MASTODON;
 	private static List<Bot> BOTS = new ArrayList<>();
 	private static RssDataRemainder RSS_DATA_REMAINDER;
 	
@@ -30,28 +32,34 @@ public class Main {
 	public static void main(String[] args) throws Exception {
 
 		try {
+
+			CONFIG = new Config();
+			CR = new CacheReloader(Config.getPropertyAsUnsignedInt("CacheReloader_timeout")); // Met à jour la base toute les heures.
+			// Get All the infomations and store in a cache
+			Cache c = Cache.getInstance();
+			
 			
-			CR = new CacheReloader(3600); // Met à jour la base toute les heures.
 			// Now start our bot up.
 			IRCBOT = new IRCBot();
 			BOTS.add(IRCBOT);
 			
 			TWITTER = new TwitterBot();
 			BOTS.add(TWITTER);
+			TWITTER.start();
 			
-			RSSChecker rcheck = new RSSChecker("https://planet.ffdn.org/atom.xml", BOTS);
+			RSSChecker rcheck = new RSSChecker(Config.getProperty("RSS_address"), BOTS);
 			RSS_DATA_REMAINDER = rcheck.getRemainder();
-					
-			//Properties Setter
-			PropertiesSetter ps = new PropertiesSetter("../../ressources/config/config.properties");
 			
-			ps.setPropertiesOn(CR, IRCBOT,rcheck);
-
+			
+			MASTODON = new MastodonBot();
+			BOTS.add(MASTODON);
+			MASTODON.start();
+			
+			
 			// Connect to the IRC server.
 			IRCBOT.connect(SERVER,PORT);
 
-			// Get All the infomations and store in a cache
-			Cache c = Cache.getInstance();
+			
 
 			// Join the #pircbot channel.
 			for(int i = 0; i< CHANNELS.length; i++) {

src/main/java/bot/irc/main/PropertiesSetter.java

@@ -1,101 +0,0 @@
-package bot.irc.main;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.Properties;
-
-import bot.irc.action.Action;
-import bot.irc.action.Info;
-import bot.irc.action.Liste;
-import bot.irc.rss.RSSChecker;
-import bot.irc.verif_saisie.EntierPositifNonVide;
-
-
-public class PropertiesSetter {
-
-	private String f;
-	public final static String DEFAULT_PROPERTIES_FILE = "default.properties";
-	public final static String here = (new File(".")).getAbsolutePath();
-	
-	public PropertiesSetter(String configFile) {
-		f = configFile;
-	}
-	
-	public void setFile(String configFile) {
-		f=configFile;
-	}
-
-	public boolean setPropertiesOn(CacheReloader cr, IRCBot b, RSSChecker rssc) throws IOException,NumberFormatException {
-		System.out.println(here);
-		System.out.println(here+File.separator+"ressources"+File.separator+"config"+File.separator+DEFAULT_PROPERTIES_FILE);
-		FileReader defaultProperties = new FileReader(new File(here+File.separator+"ressources"+File.separator+"config"+File.separator+DEFAULT_PROPERTIES_FILE));
-		Properties defaultProp = new Properties();
-		Properties prop;
-		defaultProp.load(defaultProperties);
-		if(defaultProp !=null) {
-			prop = new Properties(defaultProp);
-			for(Object o: prop.keySet()) {
-				String s = (String) o;
-				System.out.println(s+":"+prop.getProperty(s));
-			}
-		}else {
-			System.err.println("Pas de default properties : fichier default.properties manquant?");
-			prop = new Properties();
-		}
-		
-		FileReader is = new FileReader(new File(here+File.separator+"ressources"+File.separator+"config"+File.separator+f));
-		if(is == null) {
-			throw new FileNotFoundException("property file: "+f);
-		}
-		prop.load(is);
-		Main.setSERVER(prop.getProperty("SERVER"));
-		String port =prop.getProperty("PORT", "6667");
-		if(EntierPositifNonVide.entre(port, 0, 65536)) {
-			Main.setPORT(Integer.parseInt(port));
-		}
-		Main.setCHANNELS(getMultipleValues(prop, "CHANNELS"));
-		Main.setTIMEOUT_BEFORE_RECONNECTING(Long.parseLong(prop.getProperty("Timeout_before_reconnecting")));
-		Main.setDebug(Boolean.parseBoolean(prop.getProperty("Debug")));
-		
-		IRCBot.setTIME_BETWEEN_MESSAGES(Long.parseLong(prop.getProperty("Time_between_messages")));
-		b.setAdmins(getMultipleValues(prop, "Admins"));
-		b.setResponseOnPrivateChannel(Boolean.parseBoolean(prop.getProperty("Respond_using_private_channel")));
-		b.setResponseOnPrivateMessages(Boolean.parseBoolean(prop.getProperty("Allow_private_messages")));
-		
-		
-		
-		RejoinThread.setDEFAULT_WAIT_BEFORE_RECONNECT(Long.parseLong(prop.getProperty("Wait_before_reconnecting_when_kicked")));
-		
-		Cache.setTIME_BETWEEN_RELOADS(1000*Long.parseLong(prop.getProperty("Minimum_time_beetween_+reload")));
-		
-		cr.setTimeout(Long.parseLong(prop.getProperty("CacheReloader_timeout")));
-		
-		if(prop.getProperty("Caractere_commande") != null) {
-			Action.CARACTERE_COMMANDE=prop.getProperty("Caractere_commande").charAt(0);
-		}
-		if(prop.getProperty("listeall") != null) {
-			Liste.allAllowed = Boolean.parseBoolean(prop.getProperty("listeall"));
-		}
-		if(prop.getProperty("infoall") != null) {
-			Info.INFO_ALL = Boolean.parseBoolean(prop.getProperty("infoall"));
-		}
-		
-		setPropertiesOnRSS(prop, rssc);
-		
-		return true;
-	}
-	
-	public boolean setPropertiesOnRSS(Properties prop, RSSChecker rss) {
-		rss.setRssaddr(prop.getProperty("RSS_adress"));
-		rss.setTimeout(Integer.parseInt(prop.getProperty("RSS_new_article_check")));
-		return true;
-	}
-	
-	private String[] getMultipleValues(Properties prop, String key) {
-		return prop.getProperty(key).split(",");
-	}
-	
-	
-}

src/main/java/bot/irc/main/RejoinThread.java

@@ -11,7 +11,7 @@ public class RejoinThread implements Runnable{
 
 	private volatile PircBot pb;
 	private String chan;
-	private static long DEFAULT_WAIT_BEFORE_RECONNECT = 10000;
+	private static long DEFAULT_WAIT_BEFORE_RECONNECT = Config.getPropertyAsLong("Wait_before_reconnecting_when_kicked");
 	private static long DELAY_BEFORE_MESSAGE_AFTER_RECONNECT = 360;
 	private Thread thread;
 	private String threadName;

src/main/java/bot/irc/rss/RssDataRemainder.java

@@ -2,6 +2,7 @@ package bot.irc.rss;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Observable;
 
 import bot.irc.main.AffichableSurIRC;
 
@@ -10,7 +11,7 @@ import bot.irc.main.AffichableSurIRC;
  * Celleçi agit comme un espace de taille fixe, dans lequel l'élément le plus ancien est supprimé au profit du plus récent.
  * @author marmat
  */
-public class RssDataRemainder implements AffichableSurIRC{
+public class RssDataRemainder extends Observable implements AffichableSurIRC{
 
 	public RssData[] data;
 	public static final int DEFAULT_SIZE=10;
@@ -40,6 +41,8 @@ public class RssDataRemainder implements AffichableSurIRC{
 				newData[i]=data[i];
 			}
 		}
+		this.setChanged();
+		this.notifyObservers();
 	}
 
 	/**
@@ -47,6 +50,8 @@ public class RssDataRemainder implements AffichableSurIRC{
 	 */
 	public void clear() {
 		data = new RssData[data.length];
+		this.setChanged();
+		this.countObservers();
 	}
 
 	/**
@@ -78,6 +83,8 @@ public class RssDataRemainder implements AffichableSurIRC{
 	public void push(RssData newdata) {
 		movetoright();
 		this.data[0]=newdata;
+		this.setChanged();
+		this.notifyObservers(newdata);
 	}
 	
 	/**

src/main/java/bot/irc/socials/MastodonBot.java

@@ -1,46 +1,240 @@
 package bot.irc.socials;
 
+import java.io.IOException;
+import java.util.List;
+import java.util.Observable;
+import java.util.Observer;
+
 import org.jetbrains.annotations.NotNull;
+import org.json.JSONArray;
+import org.json.JSONObject;
 
 import com.google.gson.Gson;
 import com.sys1yagi.mastodon4j.MastodonClient;
+import com.sys1yagi.mastodon4j.Parameter;
 import com.sys1yagi.mastodon4j.api.Handler;
+import com.sys1yagi.mastodon4j.api.Shutdownable;
 import com.sys1yagi.mastodon4j.api.entity.Notification;
 import com.sys1yagi.mastodon4j.api.entity.Status;
+import com.sys1yagi.mastodon4j.api.exception.Mastodon4jRequestException;
+import com.sys1yagi.mastodon4j.api.method.Streaming;
 
+import bot.irc.main.AffichableSurIRC;
+import bot.irc.main.Bot;
+import bot.irc.main.Config;
+import bot.irc.main.Main;
+import bot.irc.rss.RssData;
+import bot.irc.rss.RssDataRemainder;
+import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
+import okhttp3.RequestBody;
+import okhttp3.Response;
+import okio.BufferedSink;
 
 
-public class MastodonBot {
+public class MastodonBot implements Bot, Runnable,Observer {
 	MastodonClient client;
-	String accessToken="";
+	private String accessToken=Config.getProperty("Mastodon_access_token");
+	private String BotName = "Mastodon";
+	private Streaming streaming;
+	private Thread thread;
+	private long timeout;
+	boolean end = false;
+	private String lastDmId = null;
+	private final String INSTANCE_ADRESS = Config.getProperty("Mastodon_instance");
+	public  Handler handler = new Handler() {
+	    
+		@Override
+	    public void onStatus(@NotNull Status status) {
+	       // System.out.println(status.getContent());
+	    }
+
+		@Override
+		public void onDelete(long arg0) {
+			// TODO Auto-generated method stub	
+		}
+
+		@Override
+		public void onNotification(@NotNull Notification arg0) {
+			System.out.println(arg0.getType()+" | "+arg0.getStatus().getContent()+" | "+arg0.getStatus().getVisibility());
+			if(arg0.getType().equals(Notification.Type.Mention.getValue()) && arg0.getStatus().getVisibility().equals("direct")) {
+				System.out.println(arg0.getAccount().getUserName() + " | "+ arg0.getAccount().getAcct());
+				sendMessage(arg0.getAccount().getAcct(), ""+arg0.getStatus().getId(), "testRep");
+			}
+		}
+	};
+	
 	public MastodonBot() {
-		 client = new MastodonClient.Builder("mstdn.jp", new OkHttpClient.Builder(), new Gson())
+		this.init();
+	}
+	
+	
+	
+	public MastodonBot(String accessTk,boolean streaming) {
+		this();
+		setAccessToken(accessTk);
+	}
+	
+	private void init() {
+		//TODO Refaire la gestion de l'activation ou non du streaming.
+		client = new MastodonClient.Builder(INSTANCE_ADRESS, new OkHttpClient.Builder(), new Gson())
 		        .accessToken(accessToken)
 		        .useStreamingApi()
 		        .build();
-		 
-		Handler handler = new Handler() {
-		    @Override
-		    public void onStatus(@NotNull Status status) {
-		        System.out.println(status.getContent());
-		    }
-
+		streaming = new Streaming(client);
+		try {
+			streaming.user(handler);
+		} catch (Mastodon4jRequestException e) {
+			e.printStackTrace();
+		}
+	}
+		
+	
+	
+	/**
+	 * @param accessToken the accessToken to set
+	 */
+	public void setAccessToken(String accessToken) {
+		this.accessToken = accessToken;
+		
+		init();
+	}
+	
+	
+	public void start() {
+		System.out.println("Démarage du Bot Mastodon. Mise à jour toute les "+timeout+" secondes.");
+		if(thread == null) {
+			thread = new Thread(this, this.BotName);
+			thread.start();
+		}
+	}
+	
+	
+	
+	public void run() {
+		do {
+			System.out.println("==== Mastodonbot: ====");
+			Parameter requParma = new Parameter();
+			if(lastDmId != null) {
+				requParma.append("since_id", lastDmId);
+			}
+			System.out.println("URL: "+client.getBaseUrl());
+			Response response = client.get("/timelines/direct", requParma);
+			if(response.isSuccessful()) {
+				System.out.println("sucess");
+			}else {
+				System.err.println("erreur");
+			}
+			try {
+				treatResponse(response);
+			}catch (Exception e) {
+				e.printStackTrace();
+			}
+			System.out.println("==== FIN Mastodonbot ====");
+			try {
+				Thread.sleep(60000);
+			} catch (InterruptedException e) {
+				e.printStackTrace();
+			}
+		} while(!end);
+		
+	}
+	
+	
+	public void run2() {
+		try {
+			Shutdownable shutdownable = streaming.user(handler);
+			Thread.sleep(10000L);
+			shutdownable.shutdown();
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+	
+	private void treatResponse(Response r) throws IOException {
+		JSONArray json = new JSONArray(r.body().string());
+		int len = json.length();
+		for(int i=0;i<len;++i) {
+			JSONObject jo = json.getJSONObject(i);
+			System.out.println("traitement de "+jo.toString());
+			lastDmId = jo.getString("id");
+		}
+	}
+	
+	@Override
+	public void onMessage(String channel, String sender, String login, String hostname, String message) {
+		// TODO Auto-generated method stub
+		
+	}
+	@Override
+	public void sendMessage(String sender, String channel, String message) {
+	
+		Response r = client.post("statuses", new RequestBody() {
+			
 			@Override
-			public void onDelete(long arg0) {
-				// TODO Auto-generated method stub
+			public void writeTo(BufferedSink sink) throws IOException {
+				JSONObject jo = new JSONObject();
+				jo.put("status", sender+" "+message);
+				jo.put("in_reply_to_id", channel);
+				jo.put("visibility", "direct");
+				sink.writeUtf8(jo.toString());
+				sink.flush();
 				
 			}
-
+			
 			@Override
-			public void onNotification(Notification arg0) {
-				// TODO Auto-generated method stub
-				
+			public MediaType contentType() {
+				return MediaType.parse("application/json");
 			}
+		});
+		if(Main.isDebug()) {
+			System.out.println(r.networkResponse());
+		}
+	}
+	
+	@Override
+	public void sendMessages(String sender, String channel, List<String> messages) {	
+		String m="";
+		for(String s : messages) {
+			m=m+s+'\n';
+		}
+		if(!m.equals("")) {
+			sendMessage(sender, channel, m);
+		}
+	}
+	
+	@Override
+	public void sendMessages(String sender, String channel, AffichableSurIRC affichable) {
+		sendMessages(sender, channel, affichable.toStringIRC());
+	}
+	
+	@Override
+	public String getBotName() {
+		return BotName;
+	}
+	
+	@Override
+	public void sendMessageToAdmins(String string) {
+		// TODO Auto-generated method stub
+		
+	}
+	@Override
+	public void sendRSSMessage(List<String> messages) {
+		// TODO Auto-generated method stub
+		
+	}
+
 
-			
-		};
 
+	@Override
+	public void update(Observable o, Object arg) {
+		if(o.getClass().equals(RssDataRemainder.class)) {
+			RssData data = (RssData) arg;
+			this.sendRSSMessage(data.toStringIRC());
+		}
 	}
 
+
+	
+
 }

src/main/java/bot/irc/socials/TwitterBot.java

@@ -1,34 +1,100 @@
 package bot.irc.socials;
 
 import java.util.List;
+import java.util.Observable;
+import java.util.Observer;
 
 import bot.irc.action.Action;
 import bot.irc.data.Message;
 import bot.irc.main.AffichableSurIRC;
 import bot.irc.main.Bot;
+import bot.irc.rss.RssData;
+import bot.irc.rss.RssDataRemainder;
 import twitter4j.DirectMessage;
+import twitter4j.DirectMessageList;
 import twitter4j.IDs;
+import twitter4j.StallWarning;
+import twitter4j.Status;
+import twitter4j.StatusDeletionNotice;
 import twitter4j.StatusUpdate;
 import twitter4j.Twitter;
 import twitter4j.TwitterAdapter;
 import twitter4j.TwitterException;
 import twitter4j.TwitterFactory;
+import twitter4j.TwitterStream;
+import twitter4j.TwitterStreamFactory;
+import twitter4j.User;
+import twitter4j.UserList;
+import twitter4j.UserStreamListener;
 
-public class TwitterBot extends TwitterAdapter implements Bot {
+public class TwitterBot extends TwitterAdapter implements Bot, UserStreamListener, Runnable, Observer {
 	
-	private Twitter sender;
+	private Twitter twitter;
+	private TwitterStream twitterStream;
 	private String login;
 	private String BotName = "Twitter";
+	private List<Action> actions = Action.getAllActions(this);
+	private Thread thread;
+	private long timeout = 100;
+	private String cursor = null;
+	private final int COUNT = 50;
+	
+	boolean end = false;
 	
 	public TwitterBot() {
 		super();
-		this.sender = TwitterFactory.getSingleton();
+		TwitterFactory factory = new TwitterFactory();
+		twitter = factory.getInstance();
+		this.twitter = new TwitterFactory().getInstance();
+		
 		try {
-			this.login = sender.getScreenName();
+			this.login = twitter.getScreenName();
 		} catch (IllegalStateException | TwitterException e) {
 			this.login = "UneFede";
 			e.printStackTrace();
 		}
+		
+		TwitterStreamFactory twitterStreamFactory = new TwitterStreamFactory();
+        twitterStream = twitterStreamFactory.getInstance();
+        twitterStream.addListener(this);
+
+	}
+	
+	public void start() {
+		System.out.println("Démarage du Bot Mastodon. Mise à jour toute les "+timeout+" secondes.");
+		if(thread == null) {
+			thread = new Thread(this, this.BotName);
+			thread.start();
+		}
+	}
+	
+	public void run() {
+		do {
+			try {
+				
+			DirectMessageList messages = twitter.getDirectMessages(COUNT);
+			 for (DirectMessage message : messages) {
+				 this.onDirectMessage(message);
+				 twitter.destroyDirectMessage(message.getId());
+				 String cr = messages.getNextCursor();
+				 if(cr != null) {
+					 cursor = cr;
+				 }
+			 }
+			
+			 
+			}catch (TwitterException e) {
+				e.printStackTrace();
+			}finally {
+				try {
+					Thread.sleep(timeout*1000);
+				 } catch (InterruptedException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				 }
+			}
+		} while(!end);
+		
 	}
 
 	/* (non-Javadoc)
@@ -38,14 +104,23 @@ public class TwitterBot extends TwitterAdapter implements Bot {
 	public void gotDirectMessage(DirectMessage message) {
 		super.gotDirectMessage(message);
 		String s = message.getText();
+		System.out.println("reçu sur twitter: "+s);
 		Message m = new Message(s);
+		String envoyeur="";
 		try {
-			onMessage("", sender.showUser(message.getId()).getName(), s, "", s);
-		} catch (TwitterException e) {
+			envoyeur = twitter.showUser(message.getSenderId()).getName();
+		} catch (TwitterException e1) {
 			
-			e.printStackTrace();
+			e1.printStackTrace();
+		}finally {
+			for (Action a: actions) {
+				if(a.hasToReact(m)) {
+					sendMessages(envoyeur, null, a.reactL("", envoyeur, s, login, m));
+				}
+			}
 		}
 		
+		
 	}
 
 	
@@ -59,7 +134,7 @@ public class TwitterBot extends TwitterAdapter implements Bot {
 		super.gotIncomingFriendships(ids);
 		do{
 			try {
-				sender.sendDirectMessage(ids.getNextCursor(), "Bonjour! Pour apprendre toutes mes commandes, envoyez moi "+Action.CARACTERE_COMMANDE+"help");
+				twitter.sendDirectMessage(ids.getNextCursor(), "Bonjour! Pour apprendre toutes mes commandes, envoyez moi "+Action.CARACTERE_COMMANDE+"help");
 			} catch (TwitterException e) {
 				e.printStackTrace();
 			}
@@ -75,8 +150,8 @@ public class TwitterBot extends TwitterAdapter implements Bot {
 	@Override
 	public void sendMessage(String sender, String channel, String message) {
 		try {
-			DirectMessage msg = this.sender.sendDirectMessage(sender, message);
-			System.out.println(BotName+": Envoyé: "+ msg.getText() + " à @" + msg.getRecipientScreenName());
+			DirectMessage msg = this.twitter.sendDirectMessage(sender, message);
+			System.out.println(BotName+": Envoyé: "+ msg.getText());
 		} catch (TwitterException e) {
 			System.err.println(BotName+"Twitter : Impossible d'envoyer le message");
 			e.printStackTrace();
@@ -120,14 +195,189 @@ public class TwitterBot extends TwitterAdapter implements Bot {
 		}
 		StatusUpdate status = new StatusUpdate(aff);
 		try {
-			sender.updateStatus(status);
+			twitter.updateStatus(status);
 		} catch (TwitterException e) {
 			System.err.println(BotName+": Erreur: impossible de twitter");
 			e.printStackTrace();
 		}
 		
 	}
+
 	
+	@Override
+	public void onDirectMessage(DirectMessage directMessage) {
+		gotDirectMessage(directMessage);
+	}
 	
+	@Override
+	public void onStatus(Status status) {
+		// donothing
+		
+	}
 
+	@Override
+	public void onDeletionNotice(StatusDeletionNotice statusDeletionNotice) {
+		// donothing
+		
+	}
+
+	@Override
+	public void onTrackLimitationNotice(int numberOfLimitedStatuses) {
+		// donothing
+		
+	}
+
+	@Override
+	public void onScrubGeo(long userId, long upToStatusId) {
+		// donothing
+		
+	}
+
+	@Override
+	public void onStallWarning(StallWarning warning) {
+		// donothing
+		
+	}
+
+	@Override
+	public void onException(Exception ex) {
+		// donothing
+		
+	}
+
+	@Override
+	public void onDeletionNotice(long directMessageId, long userId) {
+		// donothing
+		
+	}
+
+	@Override
+	public void onFriendList(long[] friendIds) {
+		// donothing
+		
+	}
+
+	@Override
+	public void onFavorite(User source, User target, Status favoritedStatus) {
+		// donothing
+		
+	}
+
+	@Override
+	public void onUnfavorite(User source, User target, Status unfavoritedStatus) {
+		// donothing
+		
+	}
+
+	@Override
+	public void onFollow(User source, User followedUser) {
+		// donothing
+		
+	}
+
+	@Override
+	public void onUnfollow(User source, User unfollowedUser) {
+		// donothing
+		
+	}
+
+
+
+	@Override
+	public void onUserListMemberAddition(User addedMember, User listOwner, UserList list) {
+		// donothing
+		
+	}
+
+	@Override
+	public void onUserListMemberDeletion(User deletedMember, User listOwner, UserList list) {
+		// donothing
+		
+	}
+
+	@Override
+	public void onUserListSubscription(User subscriber, User listOwner, UserList list) {
+		// donothing
+		
+	}
+
+	@Override
+	public void onUserListUnsubscription(User subscriber, User listOwner, UserList list) {
+		// donothing
+		
+	}
+
+	@Override
+	public void onUserListCreation(User listOwner, UserList list) {
+		// donothing
+		
+	}
+
+	@Override
+	public void onUserListUpdate(User listOwner, UserList list) {
+		// donothing
+		
+	}
+
+	@Override
+	public void onUserListDeletion(User listOwner, UserList list) {
+		// donothing
+		
+	}
+
+	@Override
+	public void onUserProfileUpdate(User updatedUser) {
+		// donothing
+		
+	}
+
+	@Override
+	public void onUserSuspension(long suspendedUser) {
+		// donothing
+		
+	}
+
+	@Override
+	public void onUserDeletion(long deletedUser) {
+		// donothing
+		
+	}
+
+	@Override
+	public void onBlock(User source, User blockedUser) {
+		// donothing
+		
+	}
+
+	@Override
+	public void onUnblock(User source, User unblockedUser) {
+		// donothing
+		
+	}
+
+	@Override
+	public void onRetweetedRetweet(User source, User target, Status retweetedStatus) {
+		// donothing
+		
+	}
+
+	@Override
+	public void onFavoritedRetweet(User source, User target, Status favoritedRetweeet) {
+		// do nothing
+		
+	}
+
+	@Override
+	public void onQuotedTweet(User source, User target, Status quotingTweet) {
+		// do nothing
+		
+	}
+
+	@Override
+	public void update(Observable o, Object arg) {
+		if(o.getClass().equals(RssDataRemainder.class)) {
+			RssData data = (RssData) arg;
+			this.sendRSSMessage(data.toStringIRC());
+		}
+	}
 }