Fixed !oups feature. Improved stats display.

src/org/april/hebdobot/bot/Hebdobot.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2017-2019 Christian Pierre MOMON <cmomon@april.org>
+ * Copyright (C) 2017-2021 Christian Pierre MOMON <cmomon@april.org>
  * Copyright (C) 2011-2013,2017 Nicolas Vinot <aeris@imirhil.fr>
  *
  * This file is part of (April) Hebdobot.
@@ -22,6 +22,7 @@ package org.april.hebdobot.bot;
 import java.io.File;
 import java.io.IOException;
 import java.text.ParseException;
+import java.time.LocalDate;
 import java.time.LocalTime;
 
 import org.apache.commons.lang3.StringUtils;
@@ -166,6 +167,27 @@ public class Hebdobot extends PircBot
         this.hooker.add(new DefaultHook());
     }
 
+    /**
+     * Check anniversary.
+     */
+    public void checkReviewAnniversary()
+    {
+        LocalDate now = LocalDate.now();
+        LocalDate creation = LocalDate.of(2010, 04, 30);
+        LocalDate anniv = LocalDate.of(now.getYear(), creation.getMonth(), creation.getDayOfMonth());
+
+        logger.debug("now     ={}", now.toString());
+        logger.debug("creation={}", creation.toString());
+        logger.debug("anniv   ={}", anniv.toString());
+
+        if ((!now.isBefore(anniv)) && (now.isBefore(anniv.plusDays(7))))
+        {
+            logger.info("Review anniversary detected.");
+            int year = anniv.getYear() - creation.getYear();
+            sendMessage("% \\o/ Joyeux " + year + "e anniversaire la revue hebdo \\o/");
+        }
+    }
+
     /**
      * Close.
      */
@@ -331,7 +353,7 @@ public class Hebdobot extends PircBot
                 this.review.addRaw(new Message(sender, text));
             }
 
-            text = message.replaceAll("^" + getName().replace("[", "\\[").replaceAll("]", "\\]") + "[,:]\\s*", "!");
+            text = text.replaceAll("^" + getName().replace("[", "\\[").replaceAll("]", "\\]") + "[,:]\\s*", "!");
 
             try
             {
@@ -400,6 +422,7 @@ public class Hebdobot extends PircBot
      */
     public void run() throws HebdobotException
     {
+        //
         try
         {
             logger.info("Cron initializing.");
@@ -408,46 +431,59 @@ public class Hebdobot extends PircBot
                 this.cronManager.start();
             }
             logger.info("Cron initialized.");
-
-            logger.info("Bot connection.");
-            this.connect(this.host, this.port);
-            logger.info("Bot connected.");
-
-            if (this.identifyPassword == null)
-            {
-                logger.info("Skipped identify.");
-            }
-            else
-            {
-                logger.info("Apply identify.");
-                sendMessage("NickServ", "identify " + this.identifyNick + " " + this.identifyPassword);
-                logger.info("Applied identify.");
-            }
-
-            logger.info("Bot joining channel ({}).", this.channel);
-            this.joinChannel(this.channel);
-            logger.info("Bot ready.");
         }
-        catch (NickAlreadyInUseException exception)
-        {
-            throw new HebdobotException(exception);
-        }
-        catch (IOException exception)
-        {
-            throw new HebdobotException(exception);
-        }
-        catch (IrcException exception)
-        {
-            throw new HebdobotException(exception);
-        }
-        catch (SchedulerException exception)
+        catch (SchedulerException | ParseException exception)
         {
             throw new HebdobotException("Error in cron settings.", exception);
         }
-        catch (ParseException exception)
+
+        // Manage "Caused by: java.net.UnknownHostException: irc.freenode.org".
+        boolean ended = false;
+        while (!ended)
         {
-            throw new HebdobotException(exception);
+            try
+            {
+                logger.info("Bot connection.");
+                this.connect(this.host, this.port);
+                logger.info("Bot connected.");
+                ended = true;
+            }
+            catch (NickAlreadyInUseException exception)
+            {
+                throw new HebdobotException(exception);
+            }
+            catch (IOException exception)
+            {
+                try
+                {
+                    Thread.sleep(60000);
+                }
+                catch (InterruptedException subException)
+                {
+                    subException.printStackTrace();
+                }
+            }
+            catch (IrcException exception)
+            {
+                throw new HebdobotException(exception);
+            }
         }
+
+        //
+        if (this.identifyPassword == null)
+        {
+            logger.info("Skipped identify.");
+        }
+        else
+        {
+            logger.info("Apply identify.");
+            sendMessage("NickServ", "identify " + this.identifyNick + " " + this.identifyPassword);
+            logger.info("Applied identify.");
+        }
+
+        logger.info("Bot joining channel ({}).", this.channel);
+        this.joinChannel(this.channel);
+        logger.info("Bot ready.");
     }
 
     /**

src/org/april/hebdobot/bot/hooks/CancelPreviousInputHook.java

@@ -18,12 +18,13 @@
  */
 package org.april.hebdobot.bot.hooks;
 
-import org.apache.commons.lang3.StringUtils;
 import org.april.hebdobot.bot.Hebdobot;
 import org.april.hebdobot.bot.review.Topic;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import fr.devinsy.strings.StringsUtils;
+
 /**
  * The Class CancelPreviousInputHook.
  */
@@ -40,9 +41,9 @@ public class CancelPreviousInputHook extends Hook
     {
         boolean result;
 
-        if (StringUtils.equalsIgnoreCase(message, "!cancelprevious"))
+        if (StringsUtils.containsAnyIgnoreCase(message, "!cancelprevious", "!oops", "!oups"))
         {
-            logger.info("!cancelprevious caught.");
+            logger.info("!cancelprevious/!oops caught.");
 
             // Missing.
             if (bot.getReview() == null)
@@ -58,13 +59,14 @@ public class CancelPreviousInputHook extends Hook
                 }
                 else
                 {
-                    if (bot.getReview().getParticipants().contains(sender))
+                    String previousMessage = topic.cancelPreviousMessage(sender);
+                    if (previousMessage == null)
                     {
-                        topic.cancelPreviousMessage(sender);
+                        bot.sendMessage(sender + ", vous n'avez pas d'entrée en cours.");
                     }
                     else
                     {
-                        bot.sendMessage("Vous n'avez pas d'entrée en cours.");
+                        bot.sendMessage(sender + ", suppression de votre précédente entrée : " + previousMessage);
                     }
                 }
             }

src/org/april/hebdobot/bot/hooks/FinishReviewHook.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2019 Christian Pierre MOMON <cmomon@april.org>
+ * Copyright (C) 2018-2021 Christian Pierre MOMON <cmomon@april.org>
  *
  * This file is part of (April) Hebdobot.
  *
@@ -159,12 +159,13 @@ public class FinishReviewHook extends Hook
                 }
 
                 // Send conclusion message in channel.
-                bot.sendMessage("% " + ReviewStatsReporter.reportReviewCount(datas));
+                bot.checkReviewAnniversary();
+                bot.sendMessage("% " + ReviewStatsReporter.reportCurrentReviewCount(datas));
                 bot.sendMessage("% Compte-rendu de la revue : " + pastebinUrl);
                 bot.sendMessage("% Durée de la revue : " + bot.getReview().getDurationInMinutes() + " minutes");
                 bot.sendMessage("% Nombre de personnes participantes : " + bot.getReview().getParticipants().size());
 
-                bot.sendMessage("% " + ReviewStatsReporter.reportNewUserCountRecord(datas));
+                bot.sendMessage("% " + ReviewStatsReporter.reportCheckUserCountRecord(datas));
                 bot.sendMessage(bot.getReview().getOwner(), ReviewStatsReporter.reportUserCount(datas, bot.getReview().getParticipants().size()));
                 bot.sendMessage(bot.getReview().getOwner(), ReviewStatsReporter.reportDuration(datas, bot.getReview().getDurationInMinutes()));
 

src/org/april/hebdobot/bot/hooks/HelpHook.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018 Christian Pierre MOMON <cmomon@april.org>
+ * Copyright (C) 2018-2021 Christian Pierre MOMON <cmomon@april.org>
  *
  * This file is part of (April) Hebdobot.
  *
@@ -45,7 +45,7 @@ public class HelpHook extends Hook
 
             // Help.
             bot.sendMessage(sender, "Bienvenue " + sender);
-            bot.sendMessage(sender, "Je suis " + bot.getName() + ", le robot de gestion des revues hebdomadaires de l'APRIL.");
+            bot.sendMessage(sender, "Je suis " + bot.getName() + ", le robot de gestion des revues hebdomadaires de l'April.");
             bot.sendMessage(sender, "Voici les commandes que je comprends :");
             bot.sendMessage(sender, " ");
             bot.sendMessage(sender, "  !aide,!help   : afficher cette aide");

src/org/april/hebdobot/bot/hooks/StartReviewHook.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018 Christian Pierre MOMON <cmomon@april.org>
+ * Copyright (C) 2018-2021 Christian Pierre MOMON <cmomon@april.org>
  *
  * This file is part of (April) Hebdobot.
  *
@@ -74,6 +74,7 @@ public class StartReviewHook extends Hook
                     bot.setReview(new Review(sender, bot.getAliases()));
                     bot.sendMessage(sender, "Bonjour " + sender + ", vous êtes le conducteur de réunion.");
                     bot.sendMessage(sender, "Pour terminer la réunion, tapez \"!fin\"");
+                    bot.checkReviewAnniversary();
                     bot.sendMessage("% Début de la réunion hebdomadaire");
                     bot.sendMessage(
                             "% rappel : toute ligne commençant par % sera considérée comme un commentaire et non prise en compte dans la synthèse");

src/org/april/hebdobot/bot/hooks/StatsHook.java

@@ -56,6 +56,9 @@ public class StatsHook extends Hook
                 {
                     ReviewDatas datas = ReviewDatasFile.load(reviewDataFile);
                     datas.clean();
+                    bot.sendMessage("% " + ReviewStatsReporter.reportReviewCount(datas));
+                    bot.sendMessage("% " + ReviewStatsReporter.reportReviewUserCount(datas));
+                    bot.sendMessage("% " + ReviewStatsReporter.reportReviewDuration(datas));
                     bot.sendMessage("% " + ReviewStatsReporter.reportUserCountBoard(datas));
                     bot.sendMessage("% " + ReviewStatsReporter.reportDurationBoard(datas));
                 }

src/org/april/hebdobot/bot/review/CollectiveTopic.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2017-2019 Christian Pierre MOMON <cmomon@april.org>
+ * Copyright (C) 2017-2021 Christian Pierre MOMON <cmomon@april.org>
  * Copyright (C) 2011-2013 Nicolas Vinot <aeris@imirhil.fr>
  *
  * This file is part of (April) Hebdobot.
@@ -56,13 +56,25 @@ public class CollectiveTopic extends Topic
      * @see org.april.hebdobot.bot.review.Topic#cancelPrevious(java.lang.String)
      */
     @Override
-    public void cancelPreviousMessage(final String author)
+    public String cancelPreviousMessage(final String author)
     {
-        Message previousMessage = this.messages.getByAuthor(author).getLast();
-        if (previousMessage != null)
+        String result;
+
+        Messages authorMessages = this.messages.getByAuthor(author);
+
+        if (authorMessages.isEmpty())
         {
-            this.messages.remove(previousMessage);
+            result = null;
         }
+        else
+        {
+            Message previousMessage = authorMessages.getLast();
+            this.messages.remove(previousMessage);
+            result = previousMessage.getContent();
+        }
+
+        //
+        return result;
     }
 
     /**
@@ -90,4 +102,23 @@ public class CollectiveTopic extends Topic
         //
         return result;
     }
+
+    /**
+     * Checks for message.
+     *
+     * @param author
+     *            the author
+     * @return true, if successful
+     */
+    @Override
+    public boolean hasMessage(final String author)
+    {
+        boolean result;
+
+        Messages authorMessage = this.messages.getByAuthor(author);
+        result = authorMessage.isEmpty();
+
+        //
+        return result;
+    }
 }

src/org/april/hebdobot/bot/review/IndividualTopic.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2017-2019 Christian Pierre MOMON <cmomon@april.org>
+ * Copyright (C) 2017-2021 Christian Pierre MOMON <cmomon@april.org>
  * Copyright (C) 2011-2013 Nicolas Vinot <aeris@imirhil.fr>
  *
  * This file is part of (April) Hebdobot.
@@ -19,9 +19,6 @@
  */
 package org.april.hebdobot.bot.review;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import fr.devinsy.strings.StringSet;
 
 /**
@@ -29,7 +26,7 @@ import fr.devinsy.strings.StringSet;
  */
 public class IndividualTopic extends Topic
 {
-    private final Map<String, Messages> messages;
+    private final MessageMap messages;
 
     /**
      * Instantiates a new individual topic.
@@ -41,7 +38,7 @@ public class IndividualTopic extends Topic
     {
         super(title);
 
-        this.messages = new HashMap<>();
+        this.messages = new MessageMap();
     }
 
     /* (non-Javadoc)
@@ -62,13 +59,23 @@ public class IndividualTopic extends Topic
      * @see org.april.hebdobot.bot.review.Topic#cancelPrevious(java.lang.String)
      */
     @Override
-    public void cancelPreviousMessage(final String participant)
+    public String cancelPreviousMessage(final String participant)
     {
+        String result;
+
         Messages authorMessages = this.messages.get(participant);
-        if (authorMessages != null)
+        if ((authorMessages == null) || (authorMessages.isEmpty()))
         {
-            authorMessages.removeLast();
+            result = null;
         }
+        else
+        {
+            Message removed = authorMessages.removeLast();
+            result = removed.getContent();
+        }
+
+        //
+        return result;
     }
 
     /**
@@ -102,6 +109,33 @@ public class IndividualTopic extends Topic
         return result;
     }
 
+    /**
+     * Checks for message.
+     *
+     * @param participant
+     *            the participant
+     * @return true, if successful
+     */
+    @Override
+    public boolean hasMessage(final String participant)
+    {
+        boolean result;
+
+        Messages messages = this.messages.get(participant);
+
+        if ((messages == null) || (messages.isEmpty()))
+        {
+            result = false;
+        }
+        else
+        {
+            result = true;
+        }
+
+        //
+        return result;
+    }
+
     /**
      * Checks for participant.
      *

src/org/april/hebdobot/bot/review/MessageMap.java

@@ -0,0 +1,37 @@
+/**
+ * Copyright (C) 2021 Christian Pierre MOMON <cmomon@april.org>
+ *
+ * This file is part of (April) Hebdobot.
+ *
+ * Hebdobot is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Hebdobot is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Hebdobot.  If not, see <http://www.gnu.org/licenses/>
+ */
+package org.april.hebdobot.bot.review;
+
+import java.util.HashMap;
+
+/**
+ * The Class MessageMap.
+ */
+public class MessageMap extends HashMap<String, Messages>
+{
+    private static final long serialVersionUID = 2324236890989710448L;
+
+    /**
+     * Instantiates a new message map.
+     */
+    public MessageMap()
+    {
+        super();
+    }
+}

src/org/april/hebdobot/bot/review/ReviewReporter.java

@@ -343,12 +343,12 @@ public class ReviewReporter
         addEmpty(buffer);
         addCenter(buffer, "Statistiques");
         addEmpty(buffer);
-        addChunk(buffer, ReviewStatsReporter.reportReviewCount(datas));
+        addChunk(buffer, ReviewStatsReporter.reportCurrentReviewCount(datas));
         addChunk(buffer, "Horaire de début de la revue : " + review.getFormattedStartTime());
         addChunk(buffer, "Horaire de fin de la revue   : " + review.getFormattedEndTime());
         addChunk(buffer, "Durée de la revue : " + review.getDurationInMinutes() + " minutes");
         addChunk(buffer, "Nombre de personnes participantes : " + review.getParticipants().size());
-        addChunk(buffer, ReviewStatsReporter.reportNewUserCountRecord(datas));
+        addChunk(buffer, ReviewStatsReporter.reportCheckUserCountRecord(datas));
         addChunk(buffer, ReviewStatsReporter.reportUserCount(datas, review.getParticipants().size()));
         addChunk(buffer, ReviewStatsReporter.reportDuration(datas, review.getDurationInMinutes()));
 

src/org/april/hebdobot/bot/review/Topic.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2017-2019 Christian Pierre MOMON <cmomon@april.org>
+ * Copyright (C) 2017-2021 Christian Pierre MOMON <cmomon@april.org>
  * Copyright (C) 2011-2013 Nicolas Vinot <aeris@imirhil.fr>
  *
  * This file is part of (April) Hebdobot.
@@ -53,7 +53,7 @@ public abstract class Topic
      * @param participant
      *            the participant
      */
-    public abstract void cancelPreviousMessage(final String participant);
+    public abstract String cancelPreviousMessage(final String participant);
 
     /**
      * Gets the participants.
@@ -71,4 +71,13 @@ public abstract class Topic
     {
         return this.title;
     }
+
+    /**
+     * Checks for message from.
+     *
+     * @param author
+     *            the author
+     * @return true, if successful
+     */
+    public abstract boolean hasMessage(String author);
 }

src/org/april/hebdobot/bot/stats/ReviewDatas.java

@@ -106,6 +106,70 @@ public class ReviewDatas extends ArrayList<ReviewData>
         return result;
     }
 
+    /**
+     * Gets the averatge duration.
+     *
+     * @return the averatge duration
+     */
+    public double getAveratgeDuration()
+    {
+        double result;
+
+        if (isEmpty())
+        {
+            result = 0;
+        }
+        else
+        {
+            result = 0;
+            int count = 0;
+            for (ReviewData data : this)
+            {
+                if (data.getDuration() != null)
+                {
+                    count += 1;
+                    result += data.getDuration();
+                }
+            }
+
+            if (count != 0)
+            {
+                result = result / count;
+            }
+        }
+
+        //
+        return result;
+    }
+
+    /**
+     * Gets the averatge user count.
+     *
+     * @return the averatge user count
+     */
+    public double getAveratgeUserCount()
+    {
+        double result;
+
+        if (isEmpty())
+        {
+            result = 0;
+        }
+        else
+        {
+            result = 0;
+            for (ReviewData data : this)
+            {
+                result += data.getUserCount();
+            }
+
+            result = result / size();
+        }
+
+        //
+        return result;
+    }
+
     /**
      * Gets the by year.
      *
@@ -183,6 +247,35 @@ public class ReviewDatas extends ArrayList<ReviewData>
         return result;
     }
 
+    /**
+     * Gets the max duration.
+     *
+     * @return the max duration
+     */
+    public long getMaxDuration()
+    {
+        long result;
+
+        if (isEmpty())
+        {
+            result = 0;
+        }
+        else
+        {
+            result = Long.MIN_VALUE;
+            for (ReviewData data : this)
+            {
+                if ((data.getDuration() != null) && (data.getUserCount() > result))
+                {
+                    result = data.getDuration();
+                }
+            }
+        }
+
+        //
+        return result;
+    }
+
     /**
      * Gets the max user count.
      *
@@ -212,6 +305,35 @@ public class ReviewDatas extends ArrayList<ReviewData>
         return result;
     }
 
+    /**
+     * Gets the min duration.
+     *
+     * @return the min duration
+     */
+    public long getMinDuration()
+    {
+        long result;
+
+        if (isEmpty())
+        {
+            result = 0;
+        }
+        else
+        {
+            result = Long.MAX_VALUE;
+            for (ReviewData data : this)
+            {
+                if ((data.getDuration() != null) && (data.getDuration() < result))
+                {
+                    result = data.getDuration();
+                }
+            }
+        }
+
+        //
+        return result;
+    }
+
     /**
      * Gets the min user count.
      *
@@ -298,32 +420,60 @@ public class ReviewDatas extends ArrayList<ReviewData>
     /**
      * Reverse.
      */
-    public void reverse()
+    public ReviewDatas reverse()
     {
+        ReviewDatas result;
+
         Collections.reverse(this);
+
+        result = this;
+
+        //
+        return result;
     }
 
     /**
      * Sort by date.
      */
-    public void sortByDate()
+    public ReviewDatas sortByDate()
     {
+        ReviewDatas result;
+
         Collections.sort(this, new ReviewDataComparator(Sorting.DATE));
+
+        result = this;
+
+        //
+        return result;
     }
 
     /**
      * Sort by duration.
      */
-    public void sortByDuration()
+    public ReviewDatas sortByDuration()
     {
+        ReviewDatas result;
+
         Collections.sort(this, new ReviewDataComparator(Sorting.DURATION));
+
+        result = this;
+
+        //
+        return result;
     }
 
     /**
      * Sort by user count.
      */
-    public void sortByUserCount()
+    public ReviewDatas sortByUserCount()
     {
+        ReviewDatas result;
+
         Collections.sort(this, new ReviewDataComparator(Sorting.USERCOUNT));
+
+        result = this;
+
+        //
+        return result;
     }
 }

src/org/april/hebdobot/bot/stats/ReviewStatsReporter.java

@@ -108,6 +108,82 @@ public class ReviewStatsReporter
         return result;
     }
 
+    /**
+     * Report new max. The current user count is found in last review by date.
+     *
+     * @param datas
+     *            the datas
+     * @return the string
+     */
+    public static String reportCheckUserCountRecord(final ReviewDatas datas)
+    {
+        String result;
+
+        if ((datas == null) || (datas.isEmpty()) || (datas.size() == 1))
+        {
+            result = "Absence de statistique sur la participation.";
+        }
+        else
+        {
+            ReviewDatas reviews = new ReviewDatas(datas);
+            reviews.sortByDate();
+            ReviewData lastReview = datas.getLastByIndex();
+            reviews.removeLast();
+            reviews.sortByUserCount();
+            ReviewData recordReview = reviews.getLastByIndex();
+
+            if (lastReview.getUserCount() < recordReview.getUserCount())
+            {
+                double averageUserCount = reviews.getAveratgeUserCount();
+                result = String.format("La participation moyenne aux revues est de %02.1f personnes.", averageUserCount);
+            }
+            else if (lastReview.getUserCount() == recordReview.getUserCount())
+            {
+                String lastRecordDate = recordReview.getDate().format(DateTimeFormatter.ofPattern("EEEE dd MMMM yyyy", Locale.FRENCH));
+                result = String.format("\\o/ Record de participation égalé \\o/ Le précédent record de %d personnes était le %s.",
+                        recordReview.getUserCount(), lastRecordDate);
+            }
+            else
+            {
+                String lastRecordDate = recordReview.getDate().format(DateTimeFormatter.ofPattern("EEEE dd MMMM yyyy", Locale.FRENCH));
+                result = String.format(
+                        "*\\o/* Nouveau record de participation : %d personnes ! *\\o/* Le précédent record était de %d personnes le %s.",
+                        lastReview.getUserCount(), recordReview.getUserCount(), lastRecordDate);
+            }
+        }
+
+        //
+        return result;
+    }
+
+    /**
+     * Report review count.
+     *
+     * @param datas
+     *            the datas
+     * @return the string
+     */
+    public static String reportCurrentReviewCount(final ReviewDatas datas)
+    {
+        String result;
+
+        if ((datas == null) || (datas.isEmpty()))
+        {
+            result = "Pas de statistique sur le nombre de revues.";
+        }
+        else
+        {
+            long currentYear = LocalDateTime.now().getYear();
+            long reviewYearCount = datas.countByYear(currentYear);
+
+            result = String.format("C'était la %d%s revue hebdomadaire de l'April, la %d%s de l'année %d.", datas.size(), numberSuffix(datas.size()),
+                    reviewYearCount, numberSuffix(reviewYearCount), currentYear);
+        }
+
+        //
+        return result;
+    }
+
     /**
      * Report duration.
      *
@@ -169,55 +245,6 @@ public class ReviewStatsReporter
         return result;
     }
 
-    /**
-     * Report new max. The current user count is found in last review by date.
-     *
-     * @param datas
-     *            the datas
-     * @return the string
-     */
-    public static String reportNewUserCountRecord(final ReviewDatas datas)
-    {
-        String result;
-
-        if ((datas == null) || (datas.isEmpty()) || (datas.size() == 1))
-        {
-            result = "Absence de statistique sur la participation.";
-        }
-        else
-        {
-            ReviewDatas reviews = new ReviewDatas(datas);
-            reviews.sortByDate();
-            ReviewData lastReview = datas.getLastByIndex();
-            reviews.removeLast();
-            reviews.sortByUserCount();
-            ReviewData recordReview = reviews.getLastByIndex();
-
-            if (lastReview.getUserCount() < recordReview.getUserCount())
-            {
-                String lastRecordDate = recordReview.getDate().format(DateTimeFormatter.ofPattern("EEEE dd MMMM yyyy", Locale.FRENCH));
-                result = String.format("Le dernier record de participation est de %d personnes le %s.", recordReview.getUserCount(), lastRecordDate);
-            }
-            else if (lastReview.getUserCount() == recordReview.getUserCount())
-            {
-                result = "Record de participation égalé.";
-                String lastRecordDate = recordReview.getDate().format(DateTimeFormatter.ofPattern("EEEE dd MMMM yyyy", Locale.FRENCH));
-                result = String.format("\\o/ Record de participation égalé \\o/ Le précédent record était de %d personnes le %s.",
-                        recordReview.getUserCount(), lastRecordDate);
-            }
-            else
-            {
-                String lastRecordDate = recordReview.getDate().format(DateTimeFormatter.ofPattern("EEEE dd MMMM yyyy", Locale.FRENCH));
-                result = String.format(
-                        "*\\o/* Nouveau record de participation : %d personnes ! *\\o/* Le précédent record était de %d personnes le %s.",
-                        lastReview.getUserCount(), recordReview.getUserCount(), lastRecordDate);
-            }
-        }
-
-        //
-        return result;
-    }
-
     /**
      * Report review count.
      *
@@ -235,11 +262,61 @@ public class ReviewStatsReporter
         }
         else
         {
-            long currentYear = LocalDateTime.now().getYear();
-            long reviewYearCount = datas.countByYear(currentYear);
+            ReviewData firstReview = datas.sortByDate().get(0);
+            long reviewCount = datas.size();
+            String firstDate = firstReview.getDate().format(DateTimeFormatter.ofPattern("EEEE dd MMMM yyyy", Locale.FRENCH));
 
-            result = String.format("C'était la %d%s revue hebdomadaire de l'April, la %d%s de l'année %d.", datas.size(), numberSuffix(datas.size()),
-                    reviewYearCount, numberSuffix(reviewYearCount), currentYear);
+            result = String.format("Il y a eu %d revues. La première date du %s.", reviewCount, firstDate);
+        }
+
+        //
+        return result;
+    }
+
+    /**
+     * Report review duration.
+     *
+     * @param datas
+     *            the datas
+     * @return the string
+     */
+    public static String reportReviewDuration(final ReviewDatas datas)
+    {
+        String result;
+
+        if ((datas == null) || (datas.isEmpty()))
+        {
+            result = "Pas de statistique sur la durée des revues.";
+        }
+        else
+        {
+            result = String.format("Durée des revues : min.=%d min, moy.=%.1f min, max=%d min", datas.getMinDuration(), datas.getAveratgeDuration(),
+                    datas.getMaxDuration());
+        }
+
+        //
+        return result;
+    }
+
+    /**
+     * Report review user count.
+     *
+     * @param datas
+     *            the datas
+     * @return the string
+     */
+    public static String reportReviewUserCount(final ReviewDatas datas)
+    {
+        String result;
+
+        if ((datas == null) || (datas.isEmpty()))
+        {
+            result = "Absence de statistique sur les participations.";
+        }
+        else
+        {
+            result = String.format("Participation aux revues : min.=%d, moy.=%.1f, max=%d", datas.getMinUserCount(), datas.getAveratgeUserCount(),
+                    datas.getMaxUserCount());
         }
 
         //

test/org/april/hebdobot/bot/stats/ReviewStatsReporterTest.java

@@ -72,7 +72,7 @@ public class ReviewStatsReporterTest
         logger.debug("File loaded.");
         ReviewData currentReview = new ReviewData(LocalDateTime.now(), 12, 17L);
         datas.add(currentReview);
-        String report = ReviewStatsReporter.reportNewUserCountRecord(datas);
+        String report = ReviewStatsReporter.reportCheckUserCountRecord(datas);
         logger.debug("Report=" + report);
         Assert.assertTrue(StringUtils.startsWith(report, "Le dernier record de"));
     }
@@ -92,7 +92,7 @@ public class ReviewStatsReporterTest
         logger.debug("File loaded.");
         ReviewData currentReview = new ReviewData(LocalDateTime.now(), 42000, 17L);
         datas.add(currentReview);
-        String report = ReviewStatsReporter.reportNewUserCountRecord(datas);
+        String report = ReviewStatsReporter.reportCheckUserCountRecord(datas);
         logger.debug("Report=" + report);
         Assert.assertTrue(StringUtils.startsWith(report, "*\\o/* Nouveau record de participation"));
     }