Merge pull request 'Fixed bug where the default unit was "m" instead of sending None' (#27 ) from default_unit_patch into master

Reviewed-on: #27
Fixed bug where the default unit was "m" instead of sending None
2026-08-31 20:53:48 +02:00 · 2026-08-31 20:48:51 +02:00 · 2026-08-02 13:50:28 +02:00 · 2026-08-02 13:50:09 +02:00 · 2026-08-02 13:41:23 +02:00 · 2026-08-02 13:40:52 +02:00
2 changed files with 40 additions and 2 deletions
@@ -0,0 +1,38 @@
+{
+    "convertable": true,
+    "units": {
+        "kilogram": {
+            "factor": 1,
+            "aliases": [
+                "kg",
+                "kgs",
+                "kilogram",
+                "kilograms",
+                "kilogramme",
+                "kilogrammes",
+                "kg.",
+                "kgs."
+            ]
+        },
+        "pound": {
+            "factor": 0.45,
+            "aliases": [
+                "lb",
+                "lb.",
+                "lbs",
+                "lbs.",
+                "pound",
+                "pounds"
+            ]
+        },
+        "tonne": {
+            "factor": 1000,
+            "aliases": [
+                "t",
+                "t.",
+                "tonne",
+                "tonnes"
+            ]
+        }
+    }
+}
@@ -12,7 +12,7 @@ class FitnessCog(commands.Cog):
    def __init__(self, bot):
        self.bot = bot

-        default_threads = "1457402451530350727,1328363409648910356"
+        default_threads = "1457402451530350727,1328363409648910356,1533433244186443827"
        threads_raw = os.getenv("THREADS_ID", default_threads)

        self.threads_id: list[int] = []
@@ -117,7 +117,7 @@ class FitnessCog(commands.Cog):
                )
                return

-            unit = parts[2] if len(parts) > 2 else "m"
+            unit = parts[2] if len(parts) > 2 else None

            timestamp = int(message.created_at.timestamp())
            username = message.author.name
Author	SHA1	Message	Date
AllfatherHatt	5c018ab81b	Merge pull request 'Fixed bug where the default unit was "m" instead of sending None' (#27 ) from default_unit_patch into master Reviewed-on: #27	2026-08-31 20:53:48 +02:00
T-BENZIN	d63d03aead	Fixed bug where the default unit was "m" instead of sending None When the log_activity function receives a value of None for the unit parameter, it logs value without applying a conversion multiplier.	2026-08-31 20:48:51 +02:00
T-BENZIN	fffedeccbd	Merge pull request 'Fixed typo in aliases key for tonnes' (#26 ) from tonnes-patch-1 into master Reviewed-on: #26	2026-08-02 13:50:28 +02:00
T-BENZIN	b7bf9494aa	Fixed typo in aliases key for tonnes	2026-08-02 13:50:09 +02:00
T-BENZIN	dbba4533c3	Merge pull request 'added tonnes, fixed ye-olde kilogramme spelling' (#25 ) from lift-tonnes into master Reviewed-on: #25	2026-08-02 13:41:23 +02:00
T-BENZIN	e7c0d8485d	added tonnes, fixed ye-olde kilogramme spelling	2026-08-02 13:40:52 +02:00
T-BENZIN	b5d292e6ca	Merge pull request 'Added thread ID for Gainium challenge' (#24 ) from gainium-thread into master Reviewed-on: #24	2026-08-02 13:28:13 +02:00
T-BENZIN	e19a3b4378	Added thread ID for Gainium challenge I regert hard-coding thread IDs.	2026-08-02 13:27:50 +02:00
T-BENZIN	5013fffa59	Merge pull request 'added lift.json for lifting activity' (#23 ) from lifting-activity into master Reviewed-on: #23	2026-08-02 13:24:58 +02:00
T-BENZIN	69cedfc114	added lift.json for lifting activity	2026-08-02 13:21:04 +02:00