From de0d8a4d5eddddf00a303f8006eebb599346e5fb Mon Sep 17 00:00:00 2001 From: "Christian P. MOMON" Date: Thu, 15 Apr 2021 00:13:33 +0200 Subject: [PATCH] Fixed !oups feature. Improved stats display. --- .../hebdobot/bot/hooks/CancelPreviousInputHook.java | 2 +- src/org/april/hebdobot/bot/hooks/FinishReviewHook.java | 3 ++- src/org/april/hebdobot/bot/hooks/HelpHook.java | 4 ++-- src/org/april/hebdobot/bot/hooks/StartReviewHook.java | 3 ++- src/org/april/hebdobot/bot/review/CollectiveTopic.java | 6 ++++-- src/org/april/hebdobot/bot/review/IndividualTopic.java | 2 +- src/org/april/hebdobot/bot/stats/ReviewDatas.java | 2 +- .../april/hebdobot/bot/stats/ReviewStatsReporter.java | 10 +++++----- 8 files changed, 18 insertions(+), 14 deletions(-) diff --git a/src/org/april/hebdobot/bot/hooks/CancelPreviousInputHook.java b/src/org/april/hebdobot/bot/hooks/CancelPreviousInputHook.java index c20dc2f..71d3fdb 100644 --- a/src/org/april/hebdobot/bot/hooks/CancelPreviousInputHook.java +++ b/src/org/april/hebdobot/bot/hooks/CancelPreviousInputHook.java @@ -66,7 +66,7 @@ public class CancelPreviousInputHook extends Hook } else { - bot.sendMessage(sender + ", suppressiond de votre précédente entrée : " + previousMessage); + bot.sendMessage(sender + ", suppression de votre précédente entrée : " + previousMessage); } } } diff --git a/src/org/april/hebdobot/bot/hooks/FinishReviewHook.java b/src/org/april/hebdobot/bot/hooks/FinishReviewHook.java index 6a74559..a1dad87 100644 --- a/src/org/april/hebdobot/bot/hooks/FinishReviewHook.java +++ b/src/org/april/hebdobot/bot/hooks/FinishReviewHook.java @@ -1,5 +1,5 @@ /** - * Copyright (C) 2018-2019 Christian Pierre MOMON + * Copyright (C) 2018-2021 Christian Pierre MOMON * * This file is part of (April) Hebdobot. * @@ -159,6 +159,7 @@ public class FinishReviewHook extends Hook } // Send conclusion message in channel. + 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"); diff --git a/src/org/april/hebdobot/bot/hooks/HelpHook.java b/src/org/april/hebdobot/bot/hooks/HelpHook.java index 546bf04..bfc3fb4 100644 --- a/src/org/april/hebdobot/bot/hooks/HelpHook.java +++ b/src/org/april/hebdobot/bot/hooks/HelpHook.java @@ -1,5 +1,5 @@ /** - * Copyright (C) 2018 Christian Pierre MOMON + * Copyright (C) 2018-2021 Christian Pierre MOMON * * 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"); diff --git a/src/org/april/hebdobot/bot/hooks/StartReviewHook.java b/src/org/april/hebdobot/bot/hooks/StartReviewHook.java index 93d26c5..742afba 100644 --- a/src/org/april/hebdobot/bot/hooks/StartReviewHook.java +++ b/src/org/april/hebdobot/bot/hooks/StartReviewHook.java @@ -1,5 +1,5 @@ /** - * Copyright (C) 2018 Christian Pierre MOMON + * Copyright (C) 2018-2021 Christian Pierre MOMON * * 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"); diff --git a/src/org/april/hebdobot/bot/review/CollectiveTopic.java b/src/org/april/hebdobot/bot/review/CollectiveTopic.java index 45e5306..9bd8674 100644 --- a/src/org/april/hebdobot/bot/review/CollectiveTopic.java +++ b/src/org/april/hebdobot/bot/review/CollectiveTopic.java @@ -60,13 +60,15 @@ public class CollectiveTopic extends Topic { String result; - Message previousMessage = this.messages.getByAuthor(author).getLast(); - if (previousMessage == null) + Messages authorMessages = this.messages.getByAuthor(author); + + if (authorMessages.isEmpty()) { result = null; } else { + Message previousMessage = authorMessages.getLast(); this.messages.remove(previousMessage); result = previousMessage.getContent(); } diff --git a/src/org/april/hebdobot/bot/review/IndividualTopic.java b/src/org/april/hebdobot/bot/review/IndividualTopic.java index 46ec9c9..db2e291 100644 --- a/src/org/april/hebdobot/bot/review/IndividualTopic.java +++ b/src/org/april/hebdobot/bot/review/IndividualTopic.java @@ -64,7 +64,7 @@ public class IndividualTopic extends Topic String result; Messages authorMessages = this.messages.get(participant); - if (authorMessages == null) + if ((authorMessages == null) || (authorMessages.isEmpty())) { result = null; } diff --git a/src/org/april/hebdobot/bot/stats/ReviewDatas.java b/src/org/april/hebdobot/bot/stats/ReviewDatas.java index a1d28ff..6bf2ba3 100644 --- a/src/org/april/hebdobot/bot/stats/ReviewDatas.java +++ b/src/org/april/hebdobot/bot/stats/ReviewDatas.java @@ -128,7 +128,7 @@ public class ReviewDatas extends ArrayList if (data.getDuration() != null) { count += 1; - result += data.getUserCount(); + result += data.getDuration(); } } diff --git a/src/org/april/hebdobot/bot/stats/ReviewStatsReporter.java b/src/org/april/hebdobot/bot/stats/ReviewStatsReporter.java index e3618db..a89066e 100644 --- a/src/org/april/hebdobot/bot/stats/ReviewStatsReporter.java +++ b/src/org/april/hebdobot/bot/stats/ReviewStatsReporter.java @@ -135,7 +135,7 @@ public class ReviewStatsReporter if (lastReview.getUserCount() < recordReview.getUserCount()) { double averageUserCount = reviews.getAveratgeUserCount(); - result = String.format("La moyenne de participation est de %02.1f personnes.", averageUserCount); + result = String.format("La participation moyenne aux revues est de %02.1f personnes.", averageUserCount); } else if (lastReview.getUserCount() == recordReview.getUserCount()) { @@ -290,8 +290,8 @@ public class ReviewStatsReporter } else { - result = String.format("Statistiques sur la durée des revues : min.=%d min, moy.=%.1f min, max.=%d min", datas.getMinDuration(), - datas.getAveratgeDuration(), datas.getMaxDuration()); + result = String.format("Durée des revues : min.=%d min, moy.=%.1f min, max=%d min", datas.getMinDuration(), datas.getAveratgeDuration(), + datas.getMaxDuration()); } // @@ -315,8 +315,8 @@ public class ReviewStatsReporter } else { - result = String.format("Statistiques sur la participation des revues : min.=%d, moy.=%.1f, max.=%d)", datas.getMinUserCount(), - datas.getAveratgeUserCount(), datas.getMaxUserCount()); + result = String.format("Participation aux revues : min.=%d, moy.=%.1f, max=%d", datas.getMinUserCount(), datas.getAveratgeUserCount(), + datas.getMaxUserCount()); } //