Fix some imports now hatchway is third party

api/pagination.py

@@ -5,9 +5,9 @@ from typing import Any, Generic, Protocol, TypeVar
 
 from django.db import models
 from django.http import HttpRequest
+from hatchway.http import ApiResponse
 
 from activities.models import PostInteraction
-from hatchway.http import ApiResponse
 
 T = TypeVar("T")
 

api/views/announcements.py

@@ -1,8 +1,8 @@
 from django.shortcuts import get_object_or_404
+from hatchway import api_view
 
 from api import schemas
 from api.decorators import identity_required
-from hatchway import api_view
 from users.models import Announcement
 from users.services import AnnouncementService
 

api/views/emoji.py

@@ -1,6 +1,7 @@
+from hatchway import api_view
+
 from activities.models import Emoji
 from api.schemas import CustomEmoji
-from hatchway import api_view
 
 
 @api_view.get

api/views/filters.py

@@ -1,6 +1,7 @@
-from api.decorators import identity_required
 from hatchway import api_view
 
+from api.decorators import identity_required
+
 
 @identity_required
 @api_view.get

api/views/instance.py

@@ -1,9 +1,9 @@
 from django.conf import settings
+from hatchway import api_view
 
 from activities.models import Post
 from api import schemas
 from core.models import Config
-from hatchway import api_view
 from takahe import __version__
 from users.models import Domain, Identity
 

api/views/notifications.py

@@ -1,11 +1,11 @@
 from django.http import HttpRequest
+from hatchway import ApiResponse, api_view
 
 from activities.models import TimelineEvent
 from activities.services import TimelineService
 from api import schemas
 from api.decorators import identity_required
 from api.pagination import MastodonPaginator, PaginatingApiResponse, PaginationResult
-from hatchway import ApiResponse, api_view
 
 
 @identity_required

api/views/search.py

@@ -1,10 +1,11 @@
 from typing import Literal
 
+from hatchway import Field, api_view
+
 from activities.models import PostInteraction
 from activities.services.search import SearchService
 from api import schemas
 from api.decorators import identity_required
-from hatchway import Field, api_view
 
 
 @identity_required

api/views/timelines.py

@@ -1,4 +1,5 @@
 from django.http import HttpRequest
+from hatchway import ApiError, ApiResponse, api_view
 
 from activities.models import Post
 from activities.services import TimelineService
@@ -6,7 +7,6 @@ from api import schemas
 from api.decorators import identity_required
 from api.pagination import MastodonPaginator, PaginatingApiResponse, PaginationResult
 from core.models import Config
-from hatchway import ApiError, ApiResponse, api_view
 
 
 @identity_required

api/views/trends.py

@@ -1,8 +1,8 @@
 from django.http import HttpRequest
+from hatchway import api_view
 
 from api import schemas
 from api.decorators import identity_required
-from hatchway import api_view
 
 
 @identity_required