From a2818241f6b6d489de6151046f619e6e7e3879bf Mon Sep 17 00:00:00 2001 From: Sheldan <5037282+Sheldan@users.noreply.github.com> Date: Mon, 25 Jul 2022 19:14:07 +0200 Subject: [PATCH] [SIS-xxx] adapting dashboard to show better command information --- .../moderation/listener/ReactionReportReactionListener.java | 3 +++ .../grafana/dashboards/r-austria-bot-status-dashboard.json | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/application/sissi-customizations/moderation-custom/src/main/java/dev/sheldan/sissi/module/custom/moderation/listener/ReactionReportReactionListener.java b/application/sissi-customizations/moderation-custom/src/main/java/dev/sheldan/sissi/module/custom/moderation/listener/ReactionReportReactionListener.java index c3e31e7f..e3d3ab76 100644 --- a/application/sissi-customizations/moderation-custom/src/main/java/dev/sheldan/sissi/module/custom/moderation/listener/ReactionReportReactionListener.java +++ b/application/sissi-customizations/moderation-custom/src/main/java/dev/sheldan/sissi/module/custom/moderation/listener/ReactionReportReactionListener.java @@ -26,6 +26,9 @@ public class ReactionReportReactionListener implements ReportMessageCreatedListe @Override public DefaultListenerResult execute(ReportMessageCreatedModel model) { + if(model.getReportMessage() == null) { + return DefaultListenerResult.IGNORED; + } Long reactionAmount = configService.getLongValueOrConfigDefault(REACTION_REPORT_REACTION_AMOUNT_CONFIG_KEY, model.getServerId()); for (int i = 0; i < reactionAmount; i++) { String emoteKey = buildReactionEmoteName(i + 1); diff --git a/deployment/image-packaging/src/main/docker/grafana/dashboards/r-austria-bot-status-dashboard.json b/deployment/image-packaging/src/main/docker/grafana/dashboards/r-austria-bot-status-dashboard.json index 47f29924..24865f0f 100644 --- a/deployment/image-packaging/src/main/docker/grafana/dashboards/r-austria-bot-status-dashboard.json +++ b/deployment/image-packaging/src/main/docker/grafana/dashboards/r-austria-bot-status-dashboard.json @@ -159,7 +159,7 @@ { "expr": "increase(command_processed_total[1m])", "interval": "", - "legendFormat": "{{status}}", + "legendFormat": "{{type}}-{{status}}", "refId": "A" } ],