Merge pull request #825 from mouse-reeve/misc-server-errors
Misc server errors
This commit is contained in:
@ -36,4 +36,4 @@ from .tag import Tag, AddTag, RemoveTag
|
||||
from .updates import get_notification_count, get_unread_status_count
|
||||
from .user import User, EditUser, Followers, Following
|
||||
from .user_admin import UserAdmin
|
||||
from .wellknown import webfinger, nodeinfo_pointer, nodeinfo, instance_info, peers
|
||||
from .wellknown import *
|
||||
|
@ -21,7 +21,7 @@ def get_user_from_username(viewer, username):
|
||||
|
||||
def is_api_request(request):
|
||||
""" check whether a request is asking for html or data """
|
||||
return "json" in request.headers.get("Accept") or request.path[-5:] == ".json"
|
||||
return "json" in request.headers.get("Accept", "") or request.path[-5:] == ".json"
|
||||
|
||||
|
||||
def is_bookwyrm_request(request):
|
||||
|
@ -3,6 +3,7 @@
|
||||
from dateutil.relativedelta import relativedelta
|
||||
from django.http import HttpResponseNotFound
|
||||
from django.http import JsonResponse
|
||||
from django.template.response import TemplateResponse
|
||||
from django.utils import timezone
|
||||
from django.views.decorators.http import require_GET
|
||||
|
||||
@ -118,3 +119,9 @@ def peers(_):
|
||||
""" list of federated servers this instance connects with """
|
||||
names = models.FederatedServer.objects.values_list("server_name", flat=True)
|
||||
return JsonResponse(list(names), safe=False)
|
||||
|
||||
|
||||
@require_GET
|
||||
def host_meta(request):
|
||||
""" meta of the host """
|
||||
return TemplateResponse(request, "host_meta.xml", {"DOMAIN": DOMAIN})
|
||||
|
Reference in New Issue
Block a user