Merge branch 'dev'

Author: axsddlr

Procfile

@@ -9,6 +9,7 @@ Built by [Andre Saddler](https://github.com/axsddlr/)
 All endpoints are relative to [https://vlrggapi.vercel.app](https://vlrggapi.vercel.app).
 
 ### `/news`
+
 - Method: `GET`
 - Description: Fetches the latest news articles related to Valorant Esports.
 - Response Example:
@@ -30,6 +31,7 @@ All endpoints are relative to [https://vlrggapi.vercel.app](https://vlrggapi.ver
   ```
 
 ### `/match/results`
+
 - Method: `GET`
 - Description: Fetches recent match results.
 - Response Example:
@@ -57,6 +59,7 @@ All endpoints are relative to [https://vlrggapi.vercel.app](https://vlrggapi.ver
   ```
 
 ### `/rankings/{region}`
+
 - Method: `GET`
 - Description: Fetches rankings for a specific region.
 - Response Example:
@@ -82,6 +85,7 @@ All endpoints are relative to [https://vlrggapi.vercel.app](https://vlrggapi.ver
   ```
 
 ### `/stats/{region}/{timespan}`
+
 - Method: `GET`
 - Description: Fetches player statistics for a specific region and timespan.
 - Response Example:
@@ -109,6 +113,7 @@ All endpoints are relative to [https://vlrggapi.vercel.app](https://vlrggapi.ver
   ```
 
 ### `/match/upcoming`
+
 - Method: `GET`
 - Description: Fetches upcoming matches.
 - Response Example:
@@ -122,20 +127,23 @@ All endpoints are relative to [https://vlrggapi.vercel.app](https://vlrggapi.ver
           "team2": "Team 2 Name",
           "flag1": "Team 1 Country Flag",
           "flag2": "Team 2 Country Flag",
-          "score1": "-",
-          "score2": "-",
           "time_until_match": "Time Until Match",
           "round_info": "Round Information",
           "tournament_name": "Tournament Name",
+          "unix_timestamp": "Match Start Time UNIX Timestamp",
           "match_page": "/path/to/match",
           "tournament_icon": "URL to Tournament Icon"
         }
       ]
     }
   }
   ```
+  ```
+
+  ```
 
 ### `/match/live_score`
+
 - Method: `GET`
 - Description: Fetches live scores for ongoing matches.
 - Response Example:

README.md

@@ -266,137 +266,56 @@ def vlr_stats(region: str, timespan: int):
         return data
 
     @staticmethod
-    def vlr_upcoming():
-        url = "https://www.vlr.gg/matches"
-        resp = requests.get(url, headers=headers)
-        html = HTMLParser(resp.text)
-        status = resp.status_code
-
-        result = []
-        for item in html.css("a.wf-module-item"):
-            url_path = item.attributes["href"]
-            eta = item.css_first(".match-item-eta").text().strip()
-            eta = eta.replace("\t", " ").replace("\n", " ").split()
-
-            try:
-                if eta[0] == "ago" or "LIVE":
-                    eta = "LIVE"
-                else:
-                    eta = eta[1] + " " + eta[2] + " from now"
-            except IndexError:
-                eta = "Unknown"
-
-            rounds = item.css_first(".match-item-event-series").text().strip()
-
-            tourney = item.css_first(".match-item-event").text().strip()
-            tourney = tourney.replace("\t", " ")
-            tourney = tourney.strip().split("\n")[1]
-            tourney = tourney.strip()
-
-            tourney_icon_url = item.css_first("img").attributes["src"]
-            tourney_icon_url = f"https:{tourney_icon_url}"
-
-            flag_list = [
-                flag_parent.attributes["class"].replace(" mod-", "_")
-                for flag_parent in item.css(".flag")
-            ]
-            flag1 = flag_list[0]
-            flag2 = flag_list[1]
-
-            try:
-                team_array = (
-                    item.css_first("div.match-item-vs")
-                    .css_first("div:nth-child(2)")
-                    .text()
-                )
-            except Exception:  # Replace bare except with except Exception
-                team_array = "TBD"
-            team_array = team_array.replace("\t", " ").replace("\n", " ")
-            team_array = team_array.strip().split("                                  ")
-
-            team1 = "TBD"
-            team2 = "TBD"
-            if team_array is not None and len(team_array) > 1:
-                team1 = team_array[0]
-                team2 = team_array[4].strip()
-
-            score1 = "-"
-            score2 = "-"
-            if team_array is not None and len(team_array) > 1:
-                score1 = team_array[1].replace(" ", "").strip()
-                score2 = team_array[-1].replace(" ", "").strip()
-
-            result.append(
-                {
-                    "team1": team1,
-                    "team2": team2,
-                    "flag1": flag1,
-                    "flag2": flag2,
-                    "score1": score1,
-                    "score2": score2,
-                    "time_until_match": eta,
-                    "round_info": rounds,
-                    "tournament_name": tourney,
-                    "match_page": url_path,
-                    "tournament_icon": tourney_icon_url,
-                }
-            )
-        segments = {"status": status, "segments": result}
-
-        data = {"data": segments}
-
-        if status != 200:
-            raise Exception("API response: {}".format(status))
-        return data
-
-    @staticmethod
-    def vlr_upcoming_index():
+    def vlr_upcoming_matches():
         url = "https://www.vlr.gg"
         resp = requests.get(url, headers=headers)
         html = HTMLParser(resp.text)
         status = resp.status_code
 
         result = []
         for item in html.css(".js-home-matches-upcoming a.wf-module-item"):
-            teams = []
-            flags = []
-            scores = []
-            for team in item.css(".h-match-team"):
-                teams.append(team.css_first(".h-match-team-name").text().strip())
-                flags.append(
-                    team.css_first(".flag")
-                    .attributes["class"]
-                    .replace(" mod-", "")
-                    .replace("16", "_")
-                )
-                scores.append(team.css_first(".h-match-team-score").text().strip())
+            # Check if the match is upcoming
+            is_upcoming = item.css_first(".h-match-eta.mod-upcoming")
+            if is_upcoming:
+                teams = []
+                flags = []
+                scores = []
+                for team in item.css(".h-match-team"):
+                    teams.append(team.css_first(".h-match-team-name").text().strip())
+                    flags.append(
+                        team.css_first(".flag")
+                        .attributes["class"]
+                        .replace(" mod-", "")
+                        .replace("16", "_")
+                    )
+                    scores.append(team.css_first(".h-match-team-score").text().strip())
 
-            eta = item.css_first(".h-match-eta").text().strip()
-            if eta != "LIVE":
-                eta = eta + " from now"
+                eta = item.css_first(".h-match-eta").text().strip()
+                if eta != "LIVE":
+                    eta = eta + " from now"
 
-            rounds = item.css_first(".h-match-preview-event").text().strip()
-            tournament = item.css_first(".h-match-preview-series").text().strip()
-            timestamp = int(
-                item.css_first(".moment-tz-convert").attributes["data-utc-ts"]
-            )
-            url_path = url + "/" + item.attributes["href"]
+                rounds = item.css_first(".h-match-preview-event").text().strip()
+                tournament = item.css_first(".h-match-preview-series").text().strip()
+                timestamp = datetime.fromtimestamp(
+                    int(item.css_first(".moment-tz-convert").attributes["data-utc-ts"]),
+                    tz=timezone.utc,
+                ).strftime("%Y-%m-%d %H:%M:%S")
+                url_path = "https://www.vlr.gg" + item.attributes["href"]
+
+                result.append(
+                    {
+                        "team1": teams[0],
+                        "team2": teams[1],
+                        "flag1": flags[0],
+                        "flag2": flags[1],
+                        "time_until_match": eta,
+                        "round_info": rounds,
+                        "tournament_name": tournament,
+                        "unix_timestamp": timestamp,
+                        "match_page": url_path,
+                    }
+                )
 
-            result.append(
-                {
-                    "team1": teams[0],
-                    "team2": teams[1],
-                    "flag1": flags[0],
-                    "flag2": flags[1],
-                    "score1": scores[0],
-                    "score2": scores[1],
-                    "time_until_match": eta,
-                    "round_info": rounds,
-                    "tournament_name": tournament,
-                    "unix_timestamp": timestamp,
-                    "match_page": url_path,
-                }
-            )
         segments = {"status": status, "segments": result}
 
         data = {"data": segments}
@@ -488,13 +407,6 @@ def vlr_live_score():
             raise Exception("API response: {}".format(status))
         return data
 
-        segments = {"status": status, "segments": result}
-        data = {"data": segments}
-
-        if status != 200:
-            raise Exception("API response: {}".format(status))
-        return data
-
 
 if __name__ == "__main__":
     print(Vlr.vlr_live_score(self=Vlr()))

api/scrape.py

@@ -12,8 +12,7 @@
 app = FastAPI(
     title="vlrggapi",
     description="An Unofficial REST API for [vlr.gg](https://www.vlr.gg/), a site for Valorant Esports match and news "
-                "coverage. Made by [Rehkloos](https://github.com/Rehkloos)",
-    version="1.0.5",
+    "coverage. Made by [axsddlr](https://github.com/axsddlr)",
     docs_url="/",
     redoc_url=None,
 )
@@ -83,19 +82,16 @@ async def VLR_ranks(region, request: Request):
 @app.get("/match/upcoming")
 @limiter.limit("250/minute")
 async def VLR_upcoming(request: Request):
-    return vlr.vlr_upcoming()
+    return vlr.vlr_upcoming_matches()
 
-@app.get("/match/upcoming_index")
-@limiter.limit("250/minute")
-async def VLR_upcoming_index(request: Request):
-    return vlr.vlr_upcoming_index()
 
 @app.get("/match/live_score")
 @limiter.limit("250/minute")
 async def VLR_live_score(request: Request):
     return vlr.vlr_live_score()
 
-@app.get('/health')
+
+@app.get("/health")
 def health():
     return "Healthy: OK"