Merge pull request #241 from corenting/misc_fixes

fix: handle when user is blocked and other fixes

Author: corenting

.github/FUNDING.yml

@@ -1 +1,2 @@
+github: corenting
 custom: ["https://corenting.fr/donate"]

CHANGELOG.md

@@ -1,3 +1,8 @@
+# Version 0.11.1
+
+- Fix error when trying to access the page of a suspended user
+- Fix error 500 when trying to access some wrong URLs
+
 # Version 0.11.0
 
 - Update login code to reduce the number of requests blocked by Reddit (not fully fixed though)

Dockerfile

@@ -15,7 +15,7 @@ USER eddrit
 # To keep in sync with poetry.lock to speedup CI
 RUN /usr/local/bin/pip install --user \
     uvloop==0.21.0 \
-    lxml==5.3.1 \
+    lxml==5.3.2 \
     httptools==0.6.4 \
     MarkupSafe==3.0.2 \
     pyyaml==6.0.2

README.md

@@ -78,7 +78,7 @@ The following configuration parameters are also available:
 
 ## Donations
 
-If you wish to support the app, donations are possible [here](https://corenting.fr/donate).
+If you wish to support the app, donations are possible on [Github Sponsors](https://github.com/sponsors/corenting/) or [here](https://corenting.fr/donate).
 
 ## Credits
 

eddrit/__init__.py

@@ -4,7 +4,7 @@
 
 from eddrit import config
 
-__version__ = "0.11.0"
+__version__ = "0.11.1"
 
 logger.remove()
 logger.add(sys.stderr, level=config.LOG_LEVEL)

eddrit/exceptions.py

@@ -17,6 +17,14 @@ class UserUnavailableError(Exception):
     detail = "User is not available"
 
 
+class UserSuspendedError(RedditContentUnavailableError):
+    detail = "User suspended"
+
+
+class UserBlockedError(RedditContentUnavailableError):
+    detail = "User blocked"
+
+
 class UserNotFoundError(RedditContentUnavailableError):
     detail = "User not found"
 

eddrit/reddit/fetch.py

@@ -11,7 +11,9 @@
     ContentCannotBeViewedError,
     RateLimitedError,
     SubredditNotFoundError,
+    UserBlockedError,
     UserNotFoundError,
+    UserSuspendedError,
     WikiPageNotFoundError,
 )
 from eddrit.reddit import parser
@@ -289,6 +291,12 @@ async def get_user_information(
         raise UserNotFoundError(res.status_code)
 
     json = res.json()
+
+    if json.get("data", {}).get("is_suspended", False):
+        raise UserSuspendedError(res.status_code)
+    if json.get("data", {}).get("is_blocked", False):
+        raise UserBlockedError(res.status_code)
+
     return parser.parse_user_information(json)
 
 

eddrit/routes/pages/index.py

@@ -1,3 +1,4 @@
+from starlette.exceptions import HTTPException
 from starlette.requests import Request
 from starlette.responses import Response
 from starlette.routing import Route
@@ -25,15 +26,19 @@ def _get_request_context_for_index(
     """
     Get common request context for the index page.
     """
-    # Get sorting mode
-    sorting_mode = models.SubredditSortingMode(
-        request.path_params.get("sorting_mode", models.SubredditSortingMode.HOT)
-    )
-
-    # Get sorting period
-    sorting_period = models.SubredditSortingPeriod(
-        request.query_params.get("t", models.SubredditSortingPeriod.DAY)
-    )
+    try:
+        # Get sorting mode
+        sorting_mode = models.SubredditSortingMode(
+            request.path_params.get("sorting_mode", models.SubredditSortingMode.HOT)
+        )
+
+        # Get sorting period
+        sorting_period = models.SubredditSortingPeriod(
+            request.query_params.get("t", models.SubredditSortingPeriod.DAY)
+        )
+    # In this case it's probably just a wrong URL on the index, return 404
+    except Exception:
+        raise HTTPException(status_code=404)
 
     request_pagination = models.Pagination(
         before_post_id=request.query_params.get("before"),