misc bug fixes

api/views/__init__.py

@@ -0,0 +1,10 @@
+from django.http import Http404
+from django.shortcuts import get_object_or_404 as _get_object_or_404
+
+
+def get_object_or_404(*args, **kwargs):
+    """Wrapper that returns 404 for invalid PK types (e.g. non-numeric IDs)."""
+    try:
+        return _get_object_or_404(*args, **kwargs)
+    except (ValueError, TypeError):
+        raise Http404

api/views/accounts.py

@@ -5,7 +5,7 @@
 from core.models import Config
 from django.core.files import File
 from django.http import HttpRequest
-from django.shortcuts import get_object_or_404
+from api.views import get_object_or_404
 from hatchway import ApiResponse, QueryOrBody, api_view
 from users.services import IdentityService
 from users.shortcuts import by_handle_or_404

api/views/announcements.py

@@ -1,4 +1,4 @@
-from django.shortcuts import get_object_or_404
+from api.views import get_object_or_404
 from hatchway import api_view
 
 from api import schemas

api/views/conversations.py

@@ -1,5 +1,5 @@
 from django.http import HttpRequest
-from django.shortcuts import get_object_or_404
+from api.views import get_object_or_404
 
 from activities.models.conversation import Conversation, ConversationMembership
 from activities.services import TimelineService

api/views/follow_requests.py

@@ -1,5 +1,5 @@
 from django.http import HttpRequest
-from django.shortcuts import get_object_or_404
+from api.views import get_object_or_404
 from hatchway import api_view
 
 from api import schemas

api/views/lists.py

@@ -1,7 +1,7 @@
 from typing import Literal
 
 from django.http import HttpRequest
-from django.shortcuts import get_object_or_404
+from api.views import get_object_or_404
 from hatchway import Schema, api_view
 
 from api import schemas

api/views/media.py

@@ -1,7 +1,7 @@
 import mimetypes
 
 from django.core.files import File
-from django.shortcuts import get_object_or_404
+from api.views import get_object_or_404
 from hatchway import ApiError, QueryOrBody, api_view
 
 from activities.models import PostAttachment, PostAttachmentStates

api/views/notifications.py

@@ -3,7 +3,7 @@
 from activities.models import PostInteraction, TimelineEvent
 from activities.services import TimelineService
 from django.http import Http404, HttpRequest
-from django.shortcuts import get_object_or_404
+from api.views import get_object_or_404
 from hatchway import ApiResponse, QueryOrBody, api_view
 
 from api import schemas

api/views/polls.py

@@ -1,5 +1,5 @@
 from django.http import Http404
-from django.shortcuts import get_object_or_404
+from api.views import get_object_or_404
 from hatchway import api_view, QueryOrBody
 
 from activities.models import Post, PostInteraction

api/views/push.py

@@ -1,6 +1,6 @@
 from django.conf import settings
 from django.http import Http404
-from django.shortcuts import get_object_or_404
+from api.views import get_object_or_404
 
 from api import schemas
 from api.decorators import scope_required

api/views/report.py

@@ -1,4 +1,4 @@
-from django.shortcuts import get_object_or_404
+from api.views import get_object_or_404
 
 from activities.models import Post
 from api import schemas

api/views/statuses.py

@@ -4,7 +4,7 @@
 
 from django.db.models import Q
 from django.http import HttpRequest
-from django.shortcuts import get_object_or_404
+from api.views import get_object_or_404
 from django.utils import timezone
 from pydantic import ConfigDict
 

api/views/tags.py

@@ -1,7 +1,7 @@
 import datetime
 
 from django.http import HttpRequest
-from django.shortcuts import get_object_or_404
+from api.views import get_object_or_404
 from django.utils import timezone
 
 from activities.models import FanOut, Hashtag, Post

api/views/timelines.py

@@ -1,5 +1,5 @@
 from django.http import HttpRequest
-from django.shortcuts import get_object_or_404
+from api.views import get_object_or_404
 
 from activities.models import Post, TimelineEvent
 from activities.services import TimelineService

core/signatures.py

@@ -343,7 +343,7 @@ def signed_request(
                 method == "post"
                 and response.status_code >= 400
                 and response.status_code < 500
-                and response.status_code != 404
+                and response.status_code not in [404, 410]
             ):
                 raise ValueError(
                     f"POST error to {uri}: {response.status_code} {response.content!r}"

users/models/block.py

@@ -301,13 +301,11 @@ def handle_undo_ap(cls, data):
         """
         Handles an incoming Block Undo
         """
-        # Resolve source and target and see if a Follow exists (it hopefully does)
         try:
             block = cls.by_ap(data["object"])
-        except KeyError:
-            raise ValueError("No Block locally for incoming Undo", data)
+        except (KeyError, cls.DoesNotExist):
+            return
         # Check the block's source is the actor
         if data["actor"] != block.source.actor_uri:
             raise ValueError("Undo actor does not match its Block object", data)
-        # Delete the follow
         block.delete()

users/models/domain.py

@@ -231,7 +231,7 @@ def fetch_nodeinfo(self) -> NodeInfo | None:
                         ):
                             nodeinfo20_url = link.get("href", nodeinfo20_url)
                             break
-                except (json.JSONDecodeError, AttributeError):
+                except (json.JSONDecodeError, AttributeError, UnicodeDecodeError):
                     pass
 
             try: