diff --git a/uqcsbot/dominos_coupons.py b/uqcsbot/dominos_coupons.py index 66ac758..0134a2e 100644 --- a/uqcsbot/dominos_coupons.py +++ b/uqcsbot/dominos_coupons.py @@ -1,9 +1,10 @@ from datetime import datetime -from typing import List +from typing import List, Dict import logging import requests from requests.exceptions import RequestException from bs4 import BeautifulSoup +import random import discord from discord import app_commands @@ -12,9 +13,9 @@ from uqcsbot.bot import UQCSBot from uqcsbot.yelling import yelling_exemptor - MAX_COUPONS = 10 # Prevents abuse COUPONESE_DOMINOS_URL = "https://www.couponese.com/store/dominos.com.au/" +FRUGAL_FEEDS_DOMINOS_URL = "https://www.frugalfeeds.com.au/dominos/" class HTTPResponseException(Exception): @@ -22,9 +23,10 @@ class HTTPResponseException(Exception): An exception for when a HTTP response is not requests.codes.ok """ - def __init__(self, http_code: int, *args: object) -> None: + def __init__(self, http_code: int, url: str, *args: object) -> None: super().__init__(*args) self.http_code = http_code + self.url = url class DominosCoupons(commands.Cog): @@ -36,6 +38,7 @@ def __init__(self, bot: UQCSBot): number_of_coupons="The number of coupons to return. Defaults to 5 with max 10.", ignore_expiry="Indicates to include coupons that have expired. Defaults to True.", keywords="Words to search for within the coupon. All coupons descriptions will mention at least one keyword.", + source="Website to source coupons from (couponese or frugalfeeds). Defaults to both.", ) @yelling_exemptor(input_args=["keywords"]) async def dominoscoupons( @@ -44,6 +47,7 @@ async def dominoscoupons( number_of_coupons: int = 5, ignore_expiry: bool = True, keywords: str = "", + source: str = "", ): """ Returns a list of dominos coupons @@ -54,19 +58,31 @@ async def dominoscoupons( ephemeral=True, ) return + + if source: + if source != "couponese" and source != "frugalfeeds": + await interaction.response.send_message( + content=f"That website isn't recognised. Try couponese or frugalfeeds.", + ephemeral=True, + ) + return + await interaction.response.defer(thinking=True) try: - coupons = _get_coupons(number_of_coupons, ignore_expiry, keywords.split()) + coupons = _get_coupons( + number_of_coupons, ignore_expiry, keywords.split(), source + ) except RequestException as error: resp_content = ( error.response.content if error.response else "No response error given." ) + request_url = error.request.url if error.request else "Unknown site." logging.warning( - f"Could not connect to dominos coupon site ({COUPONESE_DOMINOS_URL}): {resp_content}" + f"Could not connect to dominos coupon site ({request_url}): {resp_content}" ) await interaction.edit_original_response( - content=f"Sadly could not reach the coupon website (<{COUPONESE_DOMINOS_URL}>)..." + content=f"Sadly could not reach the coupon website (<{request_url}>)..." ) return except HTTPResponseException as error: @@ -74,19 +90,19 @@ async def dominoscoupons( f"Received a HTTP response code {error.http_code}. Error information: {error}" ) await interaction.edit_original_response( - content=f"Could not find the coupons on the coupon website (<{COUPONESE_DOMINOS_URL}>)..." + content=f"Could not find the coupons on the coupon website {error.url}..." ) return if not coupons: await interaction.edit_original_response( - content=f"Could not find any coupons matching the given arguments from the coupon website (<{COUPONESE_DOMINOS_URL}>)." + content=f"Could not find any coupons matching the given arguments from the coupon website/s." ) return embed = discord.Embed( title="Domino's Coupons", - url=COUPONESE_DOMINOS_URL, + url=FRUGAL_FEEDS_DOMINOS_URL, description=f"Keywords: *{keywords}*" if keywords else None, timestamp=datetime.now(), ) @@ -123,12 +139,14 @@ def keyword_matches(self, keyword: str) -> bool: return keyword.lower() in self.description.lower() -def _get_coupons(n: int, ignore_expiry: bool, keywords: List[str]) -> List[Coupon]: +def _get_coupons( + n: int, ignore_expiry: bool, keywords: List[str], source: str +) -> List[Coupon]: """ Returns a list of n Coupons """ - coupons = _get_coupons_from_page() + coupons = _get_coupons_from_page(source) if not ignore_expiry: coupons = [coupon for coupon in coupons if coupon.is_valid()] @@ -139,27 +157,88 @@ def _get_coupons(n: int, ignore_expiry: bool, keywords: List[str]) -> List[Coupo for coupon in coupons if any(coupon.keyword_matches(keyword) for keyword in keywords) ] - return coupons[:n] + if not source: + random.shuffle(coupons) + return coupons[:n] -def _get_coupons_from_page() -> List[Coupon]: - """ - Strips results from html page and returns a list of Coupon(s) - """ - http_response = requests.get(COUPONESE_DOMINOS_URL) - if http_response.status_code != requests.codes.ok: - raise HTTPResponseException(http_response.status_code) - soup = BeautifulSoup(http_response.content, "html.parser") - soup_coupons = soup.find_all(class_="ov-coupon") + return coupons[:n] + +def _get_coupons_from_page(source: str) -> List[Coupon]: + urls: List[str] = [] coupons: List[Coupon] = [] - for soup_coupon in soup_coupons: - expiry_date_str = soup_coupon.find(class_="ov-expiry").get_text(strip=True) - description = soup_coupon.find(class_="ov-desc").get_text(strip=True) - code = soup_coupon.find(class_="ov-code").get_text(strip=True) - coupon = Coupon(code, expiry_date_str, description) - coupons.append(coupon) + website_coupon_classes: Dict[str, Dict[str, str]] = { + COUPONESE_DOMINOS_URL: { + "expiry": "ov-expiry", + "description": "ov-desc", + "code": "ov-code", + }, + FRUGAL_FEEDS_DOMINOS_URL: { + "expiry": "column-3", + "description": "column-2", + "code": "column-1", + }, + } + + if source == "couponese": + urls.append(COUPONESE_DOMINOS_URL) + elif source == "frugalfeeds": + urls.append(FRUGAL_FEEDS_DOMINOS_URL) + else: + urls = [FRUGAL_FEEDS_DOMINOS_URL, COUPONESE_DOMINOS_URL] + + for url in urls: + http_response: requests.Response = requests.get(url) + if http_response.status_code != requests.codes.ok: + raise HTTPResponseException(http_response.status_code, url) + + soup = BeautifulSoup(http_response.content, "html.parser") + soup_coupons: List[BeautifulSoup] = [] + + if url == COUPONESE_DOMINOS_URL: + soup_coupons = soup.find_all(class_="ov-coupon") + elif url == FRUGAL_FEEDS_DOMINOS_URL: + tables = soup.select('[class^="tablepress"]') + for table in tables: + # Headers have stuff we don't want + rows = table.find_all("tr")[1:] + soup_coupons.extend(rows) + + siteclass: Dict[str, str] = website_coupon_classes.get(url, {}) + + for soup_coupon in soup_coupons: + expiry_date_container = soup_coupon.find(class_=siteclass.get("expiry")) + description_container = soup_coupon.find( + class_=siteclass.get("description") + ) + code_container = soup_coupon.find(class_=siteclass.get("code")) + + if ( + not expiry_date_container + or not description_container + or not code_container + ): + continue + + expiry_date_str: str = expiry_date_container.get_text(strip=True) + description: str = description_container.get_text(strip=True) + code: str = code_container.get_text(strip=True) + + if url == FRUGAL_FEEDS_DOMINOS_URL: + date_values: List[str] = expiry_date_str.split() + try: + # Convert shortened month to numerical value + month: int = datetime.strptime(date_values[1], "%b").month + except (ValueError, IndexError): + continue + expiry_date_str = "{year}-{month}-{day}".format( + year=int(date_values[2]), month=month, day=int(date_values[0]) + ) + + coupon = Coupon(code, expiry_date_str, description) + coupons.append(coupon) return coupons