Merge pull request #380 from Der-Henning/dev

Bump Version 1.17.1
Der-Henning · Jun 24, 2023 · 142b32c · 142b32c
2 parents be9b2ff + 8b6ea89
commit 142b32c
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 7 deletions.
diff --git a/DOCKER_README.md b/DOCKER_README.md
@@ -10,8 +10,8 @@ Readme, source, and documentation on [https://github.com/Der-Henning/tgtg](https
 
 - [`edge`](https://github.com/Der-Henning/tgtg/blob/main/Dockerfile)
 - [`edge-alpine`](https://github.com/Der-Henning/tgtg/blob/main/Dockerfile.alpine)
-- [`v1`, `v1.17`, `v1.17.0`, `latest`](https://github.com/Der-Henning/tgtg/blob/v1.17.0/Dockerfile)
-- [`v1-alpine`, `v1.17-alpine`, `v1.17.0-alpine`, `latest-alpine`](https://github.com/Der-Henning/tgtg/blob/v1.17.0/Dockerfile.alpine)
+- [`v1`, `v1.17`, `v1.17.1`, `latest`](https://github.com/Der-Henning/tgtg/blob/v1.17.1/Dockerfile)
+- [`v1-alpine`, `v1.17-alpine`, `v1.17.1-alpine`, `latest-alpine`](https://github.com/Der-Henning/tgtg/blob/v1.17.1/Dockerfile.alpine)
 
 # Quick Start
 
@@ -67,6 +67,10 @@ services:
       #- TELEGRAM_TIMEOUT=60
       #- TELEGRAM_BODY=
 
+      - SCRIPT=false
+      - SCRIPT_COMMAND=
+      #- SCRIPT_CRON=
+
       - IFTTT=false
       - IFTTT_EVENT=tgtg_notification
       - IFTTT_KEY=

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -68,6 +68,12 @@ services:
                                                       ## In some cases you may have to add
                                                       ## 'TELEGRAM_BODY={{` ... `}}'
 
+      - SCRIPT=false                                  ## true = enable running a script
+      - SCRIPT_COMMAND=                               ## Path to custom script. Example:
+                                                      ## SCRIPT_COMMAND=/home/user/tgtg/src/notify.sh
+                                                      ## Make sure the script is executable!
+      #- SCRIPT_CRON=
+
       - IFTTT=false                                   ## true = enable notifications via IFTTT Webhooks
       - IFTTT_EVENT=tgtg_notification                 ## IFTTT Webhooks Event
       - IFTTT_KEY=                                    ## IFTTT Webhooks Key

diff --git a/requirements-build.txt b/requirements-build.txt
@@ -1,4 +1,4 @@
 -r requirements.txt
 altgraph==0.17.3
 pyinstaller==5.12.0
-pyinstaller-hooks-contrib==2023.1
+pyinstaller-hooks-contrib==2023.3
diff --git a/src/_version.py b/src/_version.py
@@ -1,6 +1,6 @@
 __title__ = "TGTG Scanner"
 __description__ = "Provides notifications for TGTG magic bags"
-__version__ = "1.17.0"
+__version__ = "1.17.1"
 __author__ = "Henning Merklinger"
 __author_email__ = "henning.merklinger@gmail.com"
 __license__ = "GPL"

diff --git a/src/notifiers/telegram.py b/src/notifiers/telegram.py
@@ -73,7 +73,7 @@ def __init__(self, config: Config, reservations: Reservations):
                            'Deactivate Telegram Notifications for '
                            '1 or x days'),
                 BotCommand('unmute', 'Reactivate Telegram Notifications'),
-                BotCommand('reserve', 'Reserve the next available Mafic Bag'),
+                BotCommand('reserve', 'Reserve the next available Magic Bag'),
                 BotCommand('reservations', 'List and cancel Reservations'),
                 BotCommand('orders', 'List and cancel active Orders'),
                 BotCommand('cancelall', 'Cancels all active orders')
@@ -106,8 +106,9 @@ def _send(self, item: Item) -> None:
         self._send_message(message, image)
 
     def _send_reservation(self, reservation: Reservation) -> None:
-        display_name = escape_markdown(reservation.display_name, version=2)
-        message = f"{display_name} is reserved for 5 minutes!"
+        message = escape_markdown(
+            f"{reservation.display_name} is reserved for 5 minutes",
+            version=2)
         self._send_message(message)
 
     def _send_message(self, message: str, image: bytes = None) -> None: