diff --git a/.classpath b/.classpath index f0b1f98..cd51b45 100644 --- a/.classpath +++ b/.classpath @@ -46,7 +46,7 @@ - + diff --git a/lib/devinsy-strings-0.4.2-sources.zip b/lib/devinsy-strings-0.4.4-sources.zip similarity index 82% rename from lib/devinsy-strings-0.4.2-sources.zip rename to lib/devinsy-strings-0.4.4-sources.zip index 144cfbf..8ccb845 100644 Binary files a/lib/devinsy-strings-0.4.2-sources.zip and b/lib/devinsy-strings-0.4.4-sources.zip differ diff --git a/lib/devinsy-strings-0.4.2.jar b/lib/devinsy-strings-0.4.4.jar similarity index 65% rename from lib/devinsy-strings-0.4.2.jar rename to lib/devinsy-strings-0.4.4.jar index 1cf5fed..01ced79 100644 Binary files a/lib/devinsy-strings-0.4.2.jar and b/lib/devinsy-strings-0.4.4.jar differ diff --git a/src/org/april/hebdobot/identica/IdenticaSettings.java b/src/org/april/hebdobot/identica/IdenticaSettings.java index 35807f7..ad9a258 100644 --- a/src/org/april/hebdobot/identica/IdenticaSettings.java +++ b/src/org/april/hebdobot/identica/IdenticaSettings.java @@ -19,6 +19,8 @@ */ package org.april.hebdobot.identica; +import org.apache.commons.lang3.StringUtils; + /** * The Class IdenticaSettings. */ @@ -37,6 +39,29 @@ public class IdenticaSettings return this.apiSecret; } + /** + * Checks if is valid. + * + * @return true, if is valid + */ + public boolean isValid() + { + boolean result; + + if ((StringUtils.isBlank(this.apiKey)) || (StringUtils.isBlank(this.apiSecret)) || (StringUtils.containsOnly(this.apiKey, 'X')) + || (StringUtils.containsOnly(this.apiSecret, 'X'))) + { + result = false; + } + else + { + result = true; + } + + // + return result; + } + public void setApiKey(final String apiKey) { this.apiKey = apiKey; diff --git a/src/org/april/hebdobot/model/Hebdobot.java b/src/org/april/hebdobot/model/Hebdobot.java index 0e32c13..36e6ac0 100644 --- a/src/org/april/hebdobot/model/Hebdobot.java +++ b/src/org/april/hebdobot/model/Hebdobot.java @@ -207,7 +207,7 @@ public class Hebdobot extends PircBot } catch (InterruptedException exception) { - logger.warn("Pause abord: " + exception.getMessage()); + logger.warn("Pause abort: " + exception.getMessage()); } } else @@ -419,6 +419,26 @@ public class Hebdobot extends PircBot } } } + else if (StringUtils.equalsIgnoreCase(text, "!statut")) + { + logger.info("!status caught."); + + sendMessage(sender, sender + ", voici l'état d'Hebdobot :"); + sendMessage(sender, " revue en cours : " + (this.review == null)); + if (this.review == null) + { + sendMessage(sender, " animateur revue : none"); + } + else + { + sendMessage(sender, " animateur revue : " + this.review.getOwner()); + } + sendMessage(sender, " Alias settings : " + (this.aliases.size())); + sendMessage(sender, " Identica settings : " + (this.identicaSettings.isValid())); + sendMessage(sender, " Pastebin settings : " + (this.pastebinSettings.isValid())); + sendMessage(sender, " Twitter settings : " + (this.twitterSettings.isValid())); + sendMessage(sender, " Cron settings : " + (this.cronSettings.size())); + } else if (text.startsWith("%")) { logger.info("% caught."); @@ -439,7 +459,7 @@ public class Hebdobot extends PircBot // Topic message. if (this.review == null) { - if ((StringUtils.containsIgnoreCase(text, "bonjour")) && (StringUtils.containsIgnoreCase(text, "hebdobot"))) + if ((StringsUtils.containsAnyIgnoreCase(text, "bonjour", "salut", "hello")) && (StringUtils.containsIgnoreCase(text, "hebdobot"))) { sendMessage(sender + ", bonjour \\o/"); }