Merge pull request #2 from jcastro/main

Version Updated

Author: ghosthvj

Dockerfile

@@ -1,5 +1,5 @@
 ARG PYTHON_BASE=python:3.12-slim@sha256:804ddf3251a60bbf9c92e73b7566c40428d54d0e79d3428194edf40da6521286
-ARG VERSION=0.1.10
+ARG VERSION=0.1.11
 ARG BUILD_DATE=unknown
 ARG VCS_REF=unknown
 ARG SOURCE_URL=https://github.com/jcastro/stopliga
@@ -31,7 +31,7 @@ RUN python -m pytest tests/ -v
 
 FROM ${PYTHON_BASE} AS runtime
 
-ARG VERSION=0.1.10
+ARG VERSION=0.1.11
 ARG BUILD_DATE=unknown
 ARG VCS_REF=unknown
 ARG SOURCE_URL=https://github.com/jcastro/stopliga

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "stopliga"
-version = "0.1.10"
+version = "0.1.11"
 description = "Synchronize a UniFi policy-based route with a public GitHub IP feed."
 readme = "README.md"
 requires-python = ">=3.11"

src/stopliga/config.py

@@ -536,8 +536,8 @@ def validate_config(config: Config, *, validate_connection: bool) -> None:
         raise ConfigError(
             "Telegram notifications require STOPLIGA_TELEGRAM_BOT_TOKEN and either STOPLIGA_TELEGRAM_CHAT_ID or STOPLIGA_TELEGRAM_GROUP_ID"
         )
-    if config.telegram_topic_id is not None and not telegram_target:
-        raise ConfigError("STOPLIGA_TELEGRAM_TOPIC_ID requires STOPLIGA_TELEGRAM_GROUP_ID or STOPLIGA_TELEGRAM_CHAT_ID")
+    if config.telegram_topic_id is not None and not config.telegram_group_id:
+        raise ConfigError("STOPLIGA_TELEGRAM_TOPIC_ID requires STOPLIGA_TELEGRAM_GROUP_ID")
     if config.telegram_topic_id is not None and config.telegram_topic_id <= 0:
         raise ConfigError("STOPLIGA_TELEGRAM_TOPIC_ID must be > 0")
     if validate_connection:

tests/test_config.py

@@ -172,6 +172,21 @@ def test_telegram_topic_requires_chat_target(self) -> None:
                 },
             )
 
+    def test_telegram_topic_requires_group_target(self) -> None:
+        parser = build_parser()
+        args = parser.parse_args([])
+        with self.assertRaises(ConfigError):
+            load_config(
+                args,
+                {
+                    "UNIFI_HOST": "10.0.0.2",
+                    "UNIFI_API_KEY": "test-api-key",
+                    "STOPLIGA_TELEGRAM_BOT_TOKEN": "123456:test",
+                    "STOPLIGA_TELEGRAM_CHAT_ID": "1234",
+                    "STOPLIGA_TELEGRAM_TOPIC_ID": "42",
+                },
+            )
+
     def test_telegram_group_and_topic_load_successfully(self) -> None:
         parser = build_parser()
         args = parser.parse_args([])