diff --git a/apps/api/views.py b/apps/api/views.py index f7c24e7be..5cf0c529f 100644 --- a/apps/api/views.py +++ b/apps/api/views.py @@ -158,7 +158,7 @@ def add_site(request, token): 'code': code, 'message': message, 'usersub': us and us.feed_id, - }) + ')', mimetype='text/plain') + }) + ')', content_type='text/plain') @ajax_login_required def add_site_authed(request): @@ -193,7 +193,7 @@ def add_site_authed(request): 'code': code, 'message': message, 'usersub': us and us.feed_id, - }) + ')', mimetype='text/plain') + }) + ')', content_type='text/plain') def check_share_on_site(request, token): code = 0 @@ -274,7 +274,7 @@ def check_share_on_site(request, token): 'other_stories' : other_stories, 'previous_stories' : previous_stories, 'users' : users, - }) + ')', mimetype='text/plain') + }) + ')', content_type='text/plain') response['Access-Control-Allow-Origin'] = '*' response['Access-Control-Allow-Methods'] = 'GET' @@ -310,7 +310,7 @@ def share_story(request, token=None): 'code': code, 'message': message, 'story': None, - }), mimetype='text/plain') + }), content_type='text/plain') if feed_id: feed = Feed.get_by_id(feed_id) @@ -389,7 +389,7 @@ def share_story(request, token=None): 'code': code, 'message': message, 'story': shared_story, - }), mimetype='text/plain') + }), content_type='text/plain') response['Access-Control-Allow-Origin'] = '*' response['Access-Control-Allow-Methods'] = 'POST' @@ -427,7 +427,7 @@ def save_story(request, token=None): 'code': code, 'message': message, 'story': None, - }), mimetype='text/plain') + }), content_type='text/plain') if feed_id: feed = Feed.get_by_id(feed_id) @@ -492,7 +492,7 @@ def save_story(request, token=None): 'code': code, 'message': message, 'story': starred_story, - }), mimetype='text/plain') + }), content_type='text/plain') response['Access-Control-Allow-Origin'] = '*' response['Access-Control-Allow-Methods'] = 'POST' diff --git a/apps/profile/middleware.py b/apps/profile/middleware.py index 631bd79ca..4a180b00c 100644 --- a/apps/profile/middleware.py +++ b/apps/profile/middleware.py @@ -362,7 +362,6 @@ class UserAgentBanMiddleware: if 'account' in request.path: return if 'push' in request.path: return if getattr(settings, 'TEST_DEBUG'): return - if any(ua in user_agent for ua in BANNED_USER_AGENTS): data = { 'error': 'User agent banned: %s' % user_agent, @@ -370,7 +369,7 @@ class UserAgentBanMiddleware: } logging.user(request, "~FB~SN~BBBanned UA: ~SB%s / %s (%s)" % (user_agent, request.path, request.META)) - return HttpResponse(json.encode(data), status=403, mimetype='text/json') + return HttpResponse(json.encode(data), status=403, content_type='text/json') if request.user.is_authenticated and any(username == request.user.username for username in BANNED_USERNAMES): data = { @@ -379,7 +378,7 @@ class UserAgentBanMiddleware: } logging.user(request, "~FB~SN~BBBanned Username: ~SB%s / %s (%s)" % (request.user, request.path, request.META)) - return HttpResponse(json.encode(data), status=403, mimetype='text/json') + return HttpResponse(json.encode(data), status=403, content_type='text/json') def __call__(self, request): response = None