🐛 Another bugfix

Author: Kile

grafana/dashboards/main.json

@@ -1058,7 +1058,7 @@
                 "size": {
                   "field": "Value (lastNotNull)",
                   "fixed": 5,
-                  "max": 15,
+                  "max": 30,
                   "min": 2
                 },
                 "symbol": {
@@ -1464,7 +1464,7 @@
       "fieldConfig": {
         "defaults": {
           "color": {
-            "mode": "palette-classic"
+            "mode": "continuous-purples"
           },
           "custom": {
             "axisBorderShow": false,
@@ -1474,7 +1474,7 @@
             "axisPlacement": "auto",
             "barAlignment": 0,
             "drawStyle": "line",
-            "fillOpacity": 0,
+            "fillOpacity": 10,
             "gradientMode": "none",
             "hideFrom": {
               "legend": false,
@@ -1489,7 +1489,7 @@
               "type": "linear"
             },
             "showPoints": "auto",
-            "spanNulls": false,
+            "spanNulls": true,
             "stacking": {
               "group": "A",
               "mode": "none"
@@ -1505,10 +1505,6 @@
               {
                 "color": "green",
                 "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
               }
             ]
           }
@@ -1540,8 +1536,8 @@
             "type": "prometheus",
             "uid": "prometheusdatasource"
           },
-          "editorMode": "builder",
-          "expr": "discord_event_on_interaction_total{job=\"$job\"}",
+          "editorMode": "code",
+          "expr": "round(delta(discord_event_on_interaction_total{job=\"$job\"}[1h]))",
           "instant": false,
           "legendFormat": "__auto",
           "range": true,
@@ -1553,7 +1549,7 @@
             "uid": "prometheusdatasource"
           },
           "editorMode": "code",
-          "expr": "discord_event_on_command_total{job=\"$job\"}",
+          "expr": "round(delta(discord_event_on_command_total{job=\"$job\"}[1h]))",
           "hide": false,
           "instant": false,
           "legendFormat": "__auto",
@@ -1574,6 +1570,24 @@
             },
             "replaceFields": true
           }
+        },
+        {
+          "id": "filterByValue",
+          "options": {
+            "filters": [
+              {
+                "config": {
+                  "id": "lower",
+                  "options": {
+                    "value": 0
+                  }
+                },
+                "fieldName": "Command usage"
+              }
+            ],
+            "match": "any",
+            "type": "exclude"
+          }
         }
       ],
       "type": "timeseries"
@@ -2676,6 +2690,6 @@
   "timezone": "",
   "title": "Killua statistics",
   "uid": "TGkTuzD4zA",
-  "version": 1,
+  "version": 2,
   "weekStart": ""
 }

killua/cogs/cards.py

@@ -694,7 +694,7 @@ async def discard(self, ctx: commands.Context, card: str):
     async def cardinfo(self, ctx: commands.Context, card: str):
         """Check card info out about any card you own"""
         try:
-            c = await Card.new(card)
+            c: Card = await Card.new(card)
         except CardNotFound:
             return await ctx.send("Invalid card")
 

killua/static/cards.py

@@ -222,7 +222,7 @@ async def _get_analysis_embed(
         ]
         if card.type == "spell":
             fields.append(
-                {"name": "Class", "value": ", ".join(card.cls), "inline": True}
+                {"name": "Class", "value": ", ".join(card._cls), "inline": True}
             )
             fields.append({"name": "Range", "value": card.range, "inline": True})
 

killua/utils/classes/card.py

@@ -36,7 +36,7 @@ class PartialCard:
     available: bool
     type: str = "normal"
     range: str = None
-    cls: List[str] = None
+    _cls: List[str] = None
 
     cache: ClassVar[Dict[int, PartialCard]] = {}
     cached_raw: ClassVar[List[Tuple[str, int]]] = []
@@ -84,7 +84,7 @@ async def new(cls, name_or_id: str) -> Type[PartialCard]:
             available=raw.get("available", True),
             type=raw.get("type", "normal"),
             range=raw.get("range", None),
-            cls=raw.get("class", None),
+            _cls=raw.get("class", None),
         )
 
         cls.cache[cards_id] = card

requirements.txt

@@ -10,7 +10,7 @@ blinker==1.8.2
 braceexpand==0.1.7
 bs4==0.0.2
 cachetools==5.3.3
-certifi==2024.6.2
+certifi==2024.7.4
 charset-normalizer==3.3.2
 click==8.1.7
 colorclass==2.2.2
@@ -80,7 +80,7 @@ toml==0.10.2
 tomli==2.0.1
 typed-ast==1.5.5
 typing_extensions==4.12.1
-urllib3==2.2.1
+urllib3==2.2.2
 uvicorn==0.30.1
 Werkzeug==3.0.3
 wsproto==1.2.0