From 6f033b7928d717f5972db02d295a869d6433a9fb Mon Sep 17 00:00:00 2001 From: Marnanel Thurman Date: Wed, 25 Nov 2020 18:36:07 +0000 Subject: [PATCH] Status pages are HTML or JSON depending on Accept header. --- kepi/bowler_pub/urls.py | 1 - kepi/tophat_ui/urls.py | 10 ++++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/kepi/bowler_pub/urls.py b/kepi/bowler_pub/urls.py index b0d0575..e66d9ee 100644 --- a/kepi/bowler_pub/urls.py +++ b/kepi/bowler_pub/urls.py @@ -19,6 +19,5 @@ urlpatterns = [ path('users//followers', bowler_pub_views.FollowersView.as_view()), path('users//following', bowler_pub_views.FollowingView.as_view()), path('users//featured', bowler_pub_views.FeaturedView.as_view()), - path('users//', bowler_pub_views.StatusView.as_view()), path('sharedInbox', bowler_pub_views.InboxView.as_view()), ] diff --git a/kepi/tophat_ui/urls.py b/kepi/tophat_ui/urls.py index 97c64af..b23abd1 100644 --- a/kepi/tophat_ui/urls.py +++ b/kepi/tophat_ui/urls.py @@ -7,9 +7,19 @@ from django.urls import path, re_path import django.contrib.auth.views import kepi.tophat_ui.views as tophat_views +import kepi.bowler_pub.views as bowler_views +from kepi.tophat_ui.view_for_mimetype import view_for_mimetype urlpatterns = [ path('', tophat_views.RootPage.as_view()), + path('users//', + view_for_mimetype( + [ + ('application', 'activity+json', + bowler_views.StatusView.as_view()), + ], + default = tophat_views.StatusPage.as_view(), + )), path('login/', django.contrib.auth.views.LoginView.as_view( extra_context = {