Merge branches 'feat/amazon' and 'master' of https://github.com/Hari-…

…Nagarajan/nvidia-bot

README.md

@@ -200,9 +200,11 @@ valid, the notification handler will send you an sms when it carts or purchases
 #### Discord
 To enable Discord notifications, first get your wehbook url. Use the directions [here](https://support.discord.com/hc/en-us/articles/228383668-Intro-to-Webhooks) to get the webhook url.
 Make a copy of the `discord_config.template_json` file and name it `discord_config.json` and place the webhook url here. 
+Optionally a [user id](https://support.discord.com/hc/en-us/articles/206346498-Where-can-I-find-my-User-Server-Message-ID-) can be added to ping someone (like yourself).
 ```
 {
-  "webhook_url": "Discord webhook url here"
+  "webhook_url": "Discord webhook url here",
+  "user_id": "Optional user id to ping here"
 }
 ```
 

discord_config.template_json

@@ -1,3 +1,4 @@
 {
-  "webhook_url": "Discord webhook url here"
+  "webhook_url": "Discord webhook url here",
+  "user_id": "Optional user id to ping here"
 }

notifications/notifications.py

@@ -1,3 +1,5 @@
+from concurrent.futures import ThreadPoolExecutor
+
 from notifications.providers.audio import AudioHandler
 from notifications.providers.discord import DiscordHandler
 from notifications.providers.pavlok import PavlokHandler
@@ -35,15 +37,18 @@ def get_enabled_handlers(self):
         return enabled_handlers
 
     def send_notification(self, message):
-        if self.audio_handler.enabled:
-            self.audio_handler.play()
-        if self.twilio_handler.enabled:
-            self.twilio_handler.send(message)
-        if self.discord_handler.enabled:
-            self.discord_handler.send(message)
-        if self.telegram_handler.enabled:
-            self.telegram_handler.send(message)
-        if self.slack_handler.enabled:
-            self.slack_handler.send(message)
-        if self.pavlok_handler.enabled:
-            self.pavlok_handler.zap()
+        with ThreadPoolExecutor(
+            max_workers=len(self.get_enabled_handlers())
+        ) as executor:
+            if self.audio_handler.enabled:
+                executor.submit(self.audio_handler.play)
+            if self.twilio_handler.enabled:
+                executor.submit(self.twilio_handler.send, message)
+            if self.discord_handler.enabled:
+                executor.submit(self.discord_handler.send, message)
+            if self.telegram_handler.enabled:
+                executor.submit(self.telegram_handler.send, message)
+            if self.slack_handler.enabled:
+                executor.submit(self.slack_handler.send, message)
+            if self.pavlok_handler.enabled:
+                executor.submit(self.pavlok_handler.zap)

notifications/providers/discord.py

@@ -20,13 +20,19 @@ def __init__(self):
                 self.config = json.load(json_file)
                 if self.config["webhook_url"]:
                     self.webhook_url = self.config["webhook_url"]
+                    self.user_id = self.config.get("user_id", "N/A")
                     self.enabled = True
         else:
             log.debug("No Discord creds found.")
 
     def send(self, message_body):
         try:
-            web_hook = DiscordWebhook(url=self.webhook_url, content=message_body)
+            message = (
+                f"<@{self.user_id}> {message_body}"
+                if self.user_id.isdigit()
+                else message_body
+            )
+            web_hook = DiscordWebhook(url=self.webhook_url, content=message)
             response = web_hook.execute()
             log.info(f"Discord hook status: {response.status_code}")
         except Exception as e:

notifications/providers/telegram.py

@@ -1,5 +1,6 @@
 import json
 from os import path
+from urllib.parse import quote
 
 import requests
 
@@ -21,22 +22,18 @@ def __init__(self):
                 if self.config["BOT_TOKEN"] and self.config["BOT_CHAT_ID"]:
                     self.bot_token = self.config["BOT_TOKEN"]
                     self.bot_chat_id = self.config["BOT_CHAT_ID"]
+                    if not isinstance(self.bot_chat_id, list):
+                        self.bot_chat_id = [self.bot_chat_id]
                     self.enabled = True
         else:
             log.debug("No Telegram config found.")
 
     def send(self, message_body):
         try:
-            if type(self.bot_chat_id) is list:
-                for chat_id in self.bot_chat_id:
-                    requests.get(
-                        f"https://api.telegram.org/bot{self.bot_token}/sendMessage?"
-                        f"chat_id={chat_id}&parse_mode=Markdown&text={message_body}"
-                    )
-            else:
+            for chat_id in self.bot_chat_id:
                 requests.get(
                     f"https://api.telegram.org/bot{self.bot_token}/sendMessage?"
-                    f"chat_id={self.bot_chat_id}&parse_mode=Markdown&text={message_body}"
+                    f"chat_id={chat_id}&text={quote(message_body)}"
                 )
         except Exception as e:
             log.error(e)

stores/amazon.py

@@ -61,7 +61,7 @@ def __init__(self, headless=False):
         else:
             log.info("Lets log in.")
             selenium_utils.button_click_using_xpath(self.driver, '//*[@id="nav-link-accountList"]/div/span')
-            selenium_utils.wait_for_page(self.driver, "Amazon Sign In")
+            selenium_utils.wait_for_any_title(self.driver, SIGN_IN_TITLES)
             self.login()
             log.info("Waiting 15 seconds.")
             time.sleep(15)  # We can remove this once I get more info on the phone verification page.

stores/nvidia.py

@@ -238,9 +238,7 @@ def run_items(self):
     def buy(self, product_id):
         pass
         try:
-            log.info(
-                f"Stock Check {product_id} at {self.interval} second intervals."
-            )
+            log.info(f"Stock Check {product_id} at {self.interval} second intervals.")
             while not self.is_in_stock(product_id):
                 self.attempt = self.attempt + 1
                 time_delta = str(datetime.now() - self.started_at).split(".")[0]
@@ -296,7 +294,9 @@ def get_cart_url(self, product_id):
                 return True, response_json["location"]
         else:
             log.error(response.text)
-            log.error(f"Add to cart failed with {response.status_code}. This is likely an error with nvidia's API.")
+            log.error(
+                f"Add to cart failed with {response.status_code}. This is likely an error with nvidia's API."
+            )
         return False, ""
 
     def get_session_token(self):
@@ -314,4 +314,4 @@ def get_session_token(self):
                 return False, ""
             return True, response_json["session_token"]
         else:
-            log.debug(f"Get Session Token: {response.status_code}")
+            log.debug(f"Get Session Token: {response.status_code}")