v3.2.1 Hotfix - Fixed Discord role issues on SKU change + language fallback strategy #14

Merged
Djeex merged 1 commits from wip into main 2025-07-10 10:08:29 +02:00
3 changed files with 55 additions and 35 deletions

View File

@ -27,11 +27,13 @@
## ✨ Features ## ✨ Features
- Discord `@everyone` notification on SKU change (possible imminent drop) - Selectable GPU models
- Discord `@everyone` notification when stock is detected, including model, price, and link - Discord `@everyone` or specified role on SKU change (possible imminent drop)
- Discord `@everyone` or specified role notification when stock is detected, including model, price, and link
- Silent Discord notification when no stock is detected - Silent Discord notification when no stock is detected
- Selectable notification language
- Selectable notification server name in footer
- Selectable check frequency - Selectable check frequency
- Selectable GPU model
## 🐳 Docker Installation without the repo (quick) ## 🐳 Docker Installation without the repo (quick)

View File

@ -8,7 +8,7 @@
"time": "Time", "time": "Time",
"footer": "NviBot • {DISCORD_SERVER_NAME}", "footer": "NviBot • {DISCORD_SERVER_NAME}",
"sku_description": "**Old SKU** : `{old_sku}`\n**New SKU** : `{new_sku}`", "sku_description": "**Old SKU** : `{old_sku}`\n**New SKU** : `{new_sku}`",
"imminent_drop": "⚠️ Possible imminent drop!" "imminent_drop": "{DISCORD_ROLE} ⚠️ Possible imminent drop!"
}, },
"bg": { "bg": {
"in_stock_title": "🚀 {gpu_name} ИМА НАЛИЧНОСТ!", "in_stock_title": "🚀 {gpu_name} ИМА НАЛИЧНОСТ!",
@ -19,7 +19,7 @@
"time": "Час", "time": "Час",
"footer": "NviBot • {DISCORD_SERVER_NAME}", "footer": "NviBot • {DISCORD_SERVER_NAME}",
"sku_description": "**Стар SKU**: `{old_sku}`\n**Нов SKU**: `{new_sku}`", "sku_description": "**Стар SKU**: `{old_sku}`\n**Нов SKU**: `{new_sku}`",
"imminent_drop": "⚠️ Възможен наближаващ спад!" "imminent_drop": "{DISCORD_ROLE} ⚠️ Възможен наближаващ спад!"
}, },
"cs": { "cs": {
"in_stock_title": "🚀 {gpu_name} SKLADEM!", "in_stock_title": "🚀 {gpu_name} SKLADEM!",
@ -30,7 +30,7 @@
"time": "Čas", "time": "Čas",
"footer": "NviBot • {DISCORD_SERVER_NAME}", "footer": "NviBot • {DISCORD_SERVER_NAME}",
"sku_description": "**Starý SKU**: `{old_sku}`\n**Nový SKU**: `{new_sku}`", "sku_description": "**Starý SKU**: `{old_sku}`\n**Nový SKU**: `{new_sku}`",
"imminent_drop": "⚠️ Možný blížící se pokles!" "imminent_drop": "{DISCORD_ROLE} ⚠️ Možný blížící se pokles!"
}, },
"da": { "da": {
"in_stock_title": "🚀 {gpu_name} PÅ LAGER!", "in_stock_title": "🚀 {gpu_name} PÅ LAGER!",
@ -41,7 +41,7 @@
"time": "Tid", "time": "Tid",
"footer": "NviBot • {DISCORD_SERVER_NAME}", "footer": "NviBot • {DISCORD_SERVER_NAME}",
"sku_description": "**Gammelt SKU**: `{old_sku}`\n**Nyt SKU**: `{new_sku}`", "sku_description": "**Gammelt SKU**: `{old_sku}`\n**Nyt SKU**: `{new_sku}`",
"imminent_drop": "⚠️ Muligt snarligt drop!" "imminent_drop": "{DISCORD_ROLE} ⚠️ Muligt snarligt drop!"
}, },
"de": { "de": {
"in_stock_title": "🚀 {gpu_name} AUF LAGER!", "in_stock_title": "🚀 {gpu_name} AUF LAGER!",
@ -52,7 +52,7 @@
"time": "Zeit", "time": "Zeit",
"footer": "NviBot • {DISCORD_SERVER_NAME}", "footer": "NviBot • {DISCORD_SERVER_NAME}",
"sku_description": "**Alte SKU**: `{old_sku}`\n**Neue SKU**: `{new_sku}`", "sku_description": "**Alte SKU**: `{old_sku}`\n**Neue SKU**: `{new_sku}`",
"imminent_drop": "⚠️ Möglicher bevorstehender Drop!" "imminent_drop": "{DISCORD_ROLE} ⚠️ Möglicher bevorstehender Drop!"
}, },
"el": { "el": {
"in_stock_title": "🚀 {gpu_name} ΔΙΑΘΕΣΙΜΟ!", "in_stock_title": "🚀 {gpu_name} ΔΙΑΘΕΣΙΜΟ!",
@ -63,7 +63,7 @@
"time": "Ώρα", "time": "Ώρα",
"footer": "NviBot • {DISCORD_SERVER_NAME}", "footer": "NviBot • {DISCORD_SERVER_NAME}",
"sku_description": "**Παλαιό SKU**: `{old_sku}`\n**Νέο SKU**: `{new_sku}`", "sku_description": "**Παλαιό SKU**: `{old_sku}`\n**Νέο SKU**: `{new_sku}`",
"imminent_drop": "⚠️ Πιθανή επικείμενη πτώση!" "imminent_drop": "{DISCORD_ROLE} ⚠️ Πιθανή επικείμενη πτώση!"
}, },
"es": { "es": {
"in_stock_title": "🚀 {gpu_name} ¡EN STOCK!", "in_stock_title": "🚀 {gpu_name} ¡EN STOCK!",
@ -74,7 +74,7 @@
"time": "Hora", "time": "Hora",
"footer": "NviBot • {DISCORD_SERVER_NAME}", "footer": "NviBot • {DISCORD_SERVER_NAME}",
"sku_description": "**SKU antiguo**: `{old_sku}`\n**SKU nuevo**: `{new_sku}`", "sku_description": "**SKU antiguo**: `{old_sku}`\n**SKU nuevo**: `{new_sku}`",
"imminent_drop": "⚠️ ¡Posible drop inminente!" "imminent_drop": "{DISCORD_ROLE} ⚠️ ¡Posible drop inminente!"
}, },
"et": { "et": {
"in_stock_title": "🚀 {gpu_name} LAOS!", "in_stock_title": "🚀 {gpu_name} LAOS!",
@ -85,7 +85,7 @@
"time": "Aeg", "time": "Aeg",
"footer": "NviBot • {DISCORD_SERVER_NAME}", "footer": "NviBot • {DISCORD_SERVER_NAME}",
"sku_description": "**Vana SKU**: `{old_sku}`\n**Uus SKU**: `{new_sku}`", "sku_description": "**Vana SKU**: `{old_sku}`\n**Uus SKU**: `{new_sku}`",
"imminent_drop": "⚠️ Võimalik varsti tulemas drop!" "imminent_drop": "{DISCORD_ROLE} ⚠️ Võimalik varsti tulemas drop!"
}, },
"fi": { "fi": {
"in_stock_title": "🚀 {gpu_name} VARASTOSSA!", "in_stock_title": "🚀 {gpu_name} VARASTOSSA!",
@ -96,7 +96,7 @@
"time": "Aika", "time": "Aika",
"footer": "NviBot • {DISCORD_SERVER_NAME}", "footer": "NviBot • {DISCORD_SERVER_NAME}",
"sku_description": "**Vanha SKU**: `{old_sku}`\n**Uusi SKU**: `{new_sku}`", "sku_description": "**Vanha SKU**: `{old_sku}`\n**Uusi SKU**: `{new_sku}`",
"imminent_drop": "⚠️ Mahdollinen lähestyvä drop!" "imminent_drop": "{DISCORD_ROLE} ⚠️ Mahdollinen lähestyvä drop!"
}, },
"fr": { "fr": {
"in_stock_title": "🚀 {gpu_name} EN STOCK !", "in_stock_title": "🚀 {gpu_name} EN STOCK !",
@ -107,7 +107,7 @@
"time": "Heure", "time": "Heure",
"footer": "NviBot • {DISCORD_SERVER_NAME}", "footer": "NviBot • {DISCORD_SERVER_NAME}",
"sku_description": "**Ancien SKU** : `{old_sku}`\n**Nouveau SKU** : `{new_sku}`", "sku_description": "**Ancien SKU** : `{old_sku}`\n**Nouveau SKU** : `{new_sku}`",
"imminent_drop": "⚠️ Éventuel drop imminent!" "imminent_drop": "{DISCORD_ROLE} ⚠️ Éventuel drop imminent!"
}, },
"hr": { "hr": {
"in_stock_title": "🚀 {gpu_name} NA ZALIHI!", "in_stock_title": "🚀 {gpu_name} NA ZALIHI!",
@ -118,7 +118,7 @@
"time": "Vrijeme", "time": "Vrijeme",
"footer": "NviBot • {DISCORD_SERVER_NAME}", "footer": "NviBot • {DISCORD_SERVER_NAME}",
"sku_description": "**Stari SKU**: `{old_sku}`\n**Novi SKU**: `{new_sku}`", "sku_description": "**Stari SKU**: `{old_sku}`\n**Novi SKU**: `{new_sku}`",
"imminent_drop": "⚠️ Mogući nadolazeći drop!" "imminent_drop": "{DISCORD_ROLE} ⚠️ Mogući nadolazeći drop!"
}, },
"hu": { "hu": {
"in_stock_title": "🚀 {gpu_name} RAKTÁRON!", "in_stock_title": "🚀 {gpu_name} RAKTÁRON!",
@ -129,7 +129,7 @@
"time": "Idő", "time": "Idő",
"footer": "NviBot • {DISCORD_SERVER_NAME}", "footer": "NviBot • {DISCORD_SERVER_NAME}",
"sku_description": "**Régi SKU**: `{old_sku}`\n**Új SKU**: `{new_sku}`", "sku_description": "**Régi SKU**: `{old_sku}`\n**Új SKU**: `{new_sku}`",
"imminent_drop": "⚠️ Lehetséges közelgő drop!" "imminent_drop": "{DISCORD_ROLE} ⚠️ Lehetséges közelgő drop!"
}, },
"ga": { "ga": {
"in_stock_title": "🚀 {gpu_name} I STOC!", "in_stock_title": "🚀 {gpu_name} I STOC!",
@ -140,7 +140,7 @@
"time": "Am", "time": "Am",
"footer": "NviBot • {DISCORD_SERVER_NAME}", "footer": "NviBot • {DISCORD_SERVER_NAME}",
"sku_description": "**Sean SKU**: `{old_sku}`\n**SKU Nua**: `{new_sku}`", "sku_description": "**Sean SKU**: `{old_sku}`\n**SKU Nua**: `{new_sku}`",
"imminent_drop": "⚠️ I bhfad is gaire drop féideartha!" "imminent_drop": "{DISCORD_ROLE} ⚠️ I bhfad is gaire drop féideartha!"
}, },
"it": { "it": {
"in_stock_title": "🚀 {gpu_name} DISPONIBILE!", "in_stock_title": "🚀 {gpu_name} DISPONIBILE!",
@ -151,7 +151,7 @@
"time": "Ora", "time": "Ora",
"footer": "NviBot • {DISCORD_SERVER_NAME}", "footer": "NviBot • {DISCORD_SERVER_NAME}",
"sku_description": "**Vecchio SKU**: `{old_sku}`\n**Nuovo SKU**: `{new_sku}`", "sku_description": "**Vecchio SKU**: `{old_sku}`\n**Nuovo SKU**: `{new_sku}`",
"imminent_drop": "⚠️ Possibile drop imminente!" "imminent_drop": "{DISCORD_ROLE} ⚠️ Possibile drop imminente!"
}, },
"lv": { "lv": {
"in_stock_title": "🚀 {gpu_name} KRĀJUMĀ!", "in_stock_title": "🚀 {gpu_name} KRĀJUMĀ!",
@ -162,7 +162,7 @@
"time": "Laiks", "time": "Laiks",
"footer": "NviBot • {DISCORD_SERVER_NAME}", "footer": "NviBot • {DISCORD_SERVER_NAME}",
"sku_description": "**Vecais SKU**: `{old_sku}`\n**Jaunais SKU**: `{new_sku}`", "sku_description": "**Vecais SKU**: `{old_sku}`\n**Jaunais SKU**: `{new_sku}`",
"imminent_drop": "⚠️ Iespējams gaidāms drop!" "imminent_drop": "{DISCORD_ROLE} ⚠️ Iespējams gaidāms drop!"
}, },
"lt": { "lt": {
"in_stock_title": "🚀 {gpu_name} SANDĖLYJE!", "in_stock_title": "🚀 {gpu_name} SANDĖLYJE!",
@ -173,7 +173,7 @@
"time": "Laikas", "time": "Laikas",
"footer": "NviBot • {DISCORD_SERVER_NAME}", "footer": "NviBot • {DISCORD_SERVER_NAME}",
"sku_description": "**Senas SKU**: `{old_sku}`\n**Naujas SKU**: `{new_sku}`", "sku_description": "**Senas SKU**: `{old_sku}`\n**Naujas SKU**: `{new_sku}`",
"imminent_drop": "⚠️ Rugsėjo drop'as gali artėti!" "imminent_drop": "{DISCORD_ROLE} ⚠️ Rugsėjo drop'as gali artėti!"
}, },
"mt": { "mt": {
"in_stock_title": "🚀 {gpu_name} F'ĠESTA!", "in_stock_title": "🚀 {gpu_name} F'ĠESTA!",
@ -184,7 +184,7 @@
"time": "Ħin", "time": "Ħin",
"footer": "NviBot • {DISCORD_SERVER_NAME}", "footer": "NviBot • {DISCORD_SERVER_NAME}",
"sku_description": "**SKU Antik**: `{old_sku}`\n**SKU Ġdid**: `{new_sku}`", "sku_description": "**SKU Antik**: `{old_sku}`\n**SKU Ġdid**: `{new_sku}`",
"imminent_drop": "⚠️ Possibbli drop imminenti!" "imminent_drop": "{DISCORD_ROLE} ⚠️ Possibbli drop imminenti!"
}, },
"nl": { "nl": {
"in_stock_title": "🚀 {gpu_name} OP VOORRAAD!", "in_stock_title": "🚀 {gpu_name} OP VOORRAAD!",
@ -195,7 +195,7 @@
"time": "Tijd", "time": "Tijd",
"footer": "NviBot • {DISCORD_SERVER_NAME}", "footer": "NviBot • {DISCORD_SERVER_NAME}",
"sku_description": "**Oude SKU**: `{old_sku}`\n**Nieuwe SKU**: `{new_sku}`", "sku_description": "**Oude SKU**: `{old_sku}`\n**Nieuwe SKU**: `{new_sku}`",
"imminent_drop": "⚠️ Mogelijke aanstaande drop!" "imminent_drop": "{DISCORD_ROLE} ⚠️ Mogelijke aanstaande drop!"
}, },
"pl": { "pl": {
"in_stock_title": "🚀 {gpu_name} DOSTĘPNE!", "in_stock_title": "🚀 {gpu_name} DOSTĘPNE!",
@ -206,7 +206,7 @@
"time": "Czas", "time": "Czas",
"footer": "NviBot • {DISCORD_SERVER_NAME}", "footer": "NviBot • {DISCORD_SERVER_NAME}",
"sku_description": "**Stare SKU**: `{old_sku}`\n**Nowe SKU**: `{new_sku}`", "sku_description": "**Stare SKU**: `{old_sku}`\n**Nowe SKU**: `{new_sku}`",
"imminent_drop": "⚠️ Możliwy nadchodzący drop!" "imminent_drop": "{DISCORD_ROLE} ⚠️ Możliwy nadchodzący drop!"
}, },
"pt": { "pt": {
"in_stock_title": "🚀 {gpu_name} EM STOCK!", "in_stock_title": "🚀 {gpu_name} EM STOCK!",
@ -217,7 +217,7 @@
"time": "Hora", "time": "Hora",
"footer": "NviBot • {DISCORD_SERVER_NAME}", "footer": "NviBot • {DISCORD_SERVER_NAME}",
"sku_description": "**SKU antigo**: `{old_sku}`\n**SKU novo**: `{new_sku}`", "sku_description": "**SKU antigo**: `{old_sku}`\n**SKU novo**: `{new_sku}`",
"imminent_drop": "⚠️ Possível drop iminente!" "imminent_drop": "{DISCORD_ROLE} ⚠️ Possível drop iminente!"
}, },
"ro": { "ro": {
"in_stock_title": "🚀 {gpu_name} ÎN STOC!", "in_stock_title": "🚀 {gpu_name} ÎN STOC!",
@ -228,7 +228,7 @@
"time": "Timp", "time": "Timp",
"footer": "NviBot • {DISCORD_SERVER_NAME}", "footer": "NviBot • {DISCORD_SERVER_NAME}",
"sku_description": "**SKU vechi**: `{old_sku}`\n**SKU nou**: `{new_sku}`", "sku_description": "**SKU vechi**: `{old_sku}`\n**SKU nou**: `{new_sku}`",
"imminent_drop": "⚠️ Posibil drop iminent!" "imminent_drop": "{DISCORD_ROLE} ⚠️ Posibil drop iminent!"
}, },
"sk": { "sk": {
"in_stock_title": "🚀 {gpu_name} NA SKLADE!", "in_stock_title": "🚀 {gpu_name} NA SKLADE!",
@ -239,7 +239,7 @@
"time": "Čas", "time": "Čas",
"footer": "NviBot • {DISCORD_SERVER_NAME}", "footer": "NviBot • {DISCORD_SERVER_NAME}",
"sku_description": "**Starý SKU**: `{old_sku}`\n**Nový SKU**: `{new_sku}`", "sku_description": "**Starý SKU**: `{old_sku}`\n**Nový SKU**: `{new_sku}`",
"imminent_drop": "⚠️ Možný nadchádzajúci drop!" "imminent_drop": "{DISCORD_ROLE} ⚠️ Možný nadchádzajúci drop!"
}, },
"sl": { "sl": {
"in_stock_title": "🚀 {gpu_name} NA ZALOGI!", "in_stock_title": "🚀 {gpu_name} NA ZALOGI!",
@ -250,7 +250,7 @@
"time": "Čas", "time": "Čas",
"footer": "NviBot • {DISCORD_SERVER_NAME}", "footer": "NviBot • {DISCORD_SERVER_NAME}",
"sku_description": "**Stari SKU**: `{old_sku}`\n**Novi SKU**: `{new_sku}`", "sku_description": "**Stari SKU**: `{old_sku}`\n**Novi SKU**: `{new_sku}`",
"imminent_drop": "⚠️ Možen prihajajoči drop!" "imminent_drop": "{DISCORD_ROLE} ⚠️ Možen prihajajoči drop!"
}, },
"sv": { "sv": {
"in_stock_title": "🚀 {gpu_name} I LAGER!", "in_stock_title": "🚀 {gpu_name} I LAGER!",
@ -261,6 +261,6 @@
"time": "Tid", "time": "Tid",
"footer": "NviBot • {DISCORD_SERVER_NAME}", "footer": "NviBot • {DISCORD_SERVER_NAME}",
"sku_description": "**Gammalt SKU**: `{old_sku}`\n**Nytt SKU**: `{new_sku}`", "sku_description": "**Gammalt SKU**: `{old_sku}`\n**Nytt SKU**: `{new_sku}`",
"imminent_drop": "⚠️ Möjlig förestående drop!" "imminent_drop": "{DISCORD_ROLE} ⚠️ Möjlig förestående drop!"
} }
} }

View File

@ -86,10 +86,34 @@ except FileNotFoundError:
exit(1) exit(1)
language = os.environ.get("DISCORD_NOTIFICATION_LANGUAGE", "en").lower() language = os.environ.get("DISCORD_NOTIFICATION_LANGUAGE", "en").lower()
required_keys = [
"in_stock_title", "out_of_stock_title", "sku_change_title",
"buy_now", "price", "time", "footer",
"sku_description", "imminent_drop"
]
loc = localization.get(language, localization["en"]) loc = localization.get(language, localization["en"])
logging.info(f"Notification language: {language}")
if language not in localization: if not loc:
logging.warning(f"⚠️ Language '{language}' not found. Falling back to English.") logging.warning(f"⚠️ Language '{language}' not found. Falling back to English.")
loc = localization.get("en")
language = "en"
if not loc:
logging.error("❌ No localization found for language 'en'. Cannot continue.")
sys.exit(1)
fallback = localization.get("en", {})
missing_keys = [key for key in required_keys if key not in loc]
if missing_keys:
logging.warning(f"⚠️ Missing keys in localization for '{language}': {', '.join(missing_keys)}. Falling back to English for those.")
for key in missing_keys:
if key in fallback:
loc[key] = fallback[key]
else:
logging.error(f"❌ Missing required key '{key}' in both '{language}' and fallback 'en'.")
sys.exit(1)
in_stock_title = loc["in_stock_title"] in_stock_title = loc["in_stock_title"]
out_of_stock_title = loc["out_of_stock_title"] out_of_stock_title = loc["out_of_stock_title"]
@ -101,12 +125,6 @@ footer = loc["footer"]
sku_description = loc["sku_description"] sku_description = loc["sku_description"]
imminent_drop = loc["imminent_drop"] imminent_drop = loc["imminent_drop"]
required_keys = ["in_stock_title", "out_of_stock_title", "sku_change_title", "buy_now", "price", "time", "footer", "sku_description", "imminent_drop"]
for key in required_keys:
if key not in loc:
logging.error(f"❌ Missing localization key: '{key}' in language '{language}'")
exit(1)
# Display URLs and configurations # Display URLs and configurations
logging.info(f"GPU: {PRODUCT_NAMES}") logging.info(f"GPU: {PRODUCT_NAMES}")
logging.info(f"Discord Webhook URL: {wh_masked_url}") logging.info(f"Discord Webhook URL: {wh_masked_url}")
@ -274,7 +292,7 @@ def send_sku_change_notification(gpu_name: str, old_sku: str, new_sku: str, prod
} }
payload = { payload = {
"content": imminent_drop, "content": imminent_drop.format(DISCORD_ROLE=DISCORD_ROLE_MAP.get(gpu_name, '@everyone')),
"username": "NviBot", "username": "NviBot",
"avatar_url": "https://git.djeex.fr/Djeex/nvidia-stock-bot/raw/branch/main/assets/img/ds_wh_pp.jpg", "avatar_url": "https://git.djeex.fr/Djeex/nvidia-stock-bot/raw/branch/main/assets/img/ds_wh_pp.jpg",
"embeds": [embed] "embeds": [embed]