mirror of
https://github.com/samuelclay/NewsBlur.git
synced 2025-09-18 21:50:56 +00:00
missed some mimetype edits in django upgrade
This commit is contained in:
parent
f2811cb2d7
commit
5877fd979e
2 changed files with 9 additions and 10 deletions
|
@ -158,7 +158,7 @@ def add_site(request, token):
|
||||||
'code': code,
|
'code': code,
|
||||||
'message': message,
|
'message': message,
|
||||||
'usersub': us and us.feed_id,
|
'usersub': us and us.feed_id,
|
||||||
}) + ')', mimetype='text/plain')
|
}) + ')', content_type='text/plain')
|
||||||
|
|
||||||
@ajax_login_required
|
@ajax_login_required
|
||||||
def add_site_authed(request):
|
def add_site_authed(request):
|
||||||
|
@ -193,7 +193,7 @@ def add_site_authed(request):
|
||||||
'code': code,
|
'code': code,
|
||||||
'message': message,
|
'message': message,
|
||||||
'usersub': us and us.feed_id,
|
'usersub': us and us.feed_id,
|
||||||
}) + ')', mimetype='text/plain')
|
}) + ')', content_type='text/plain')
|
||||||
|
|
||||||
def check_share_on_site(request, token):
|
def check_share_on_site(request, token):
|
||||||
code = 0
|
code = 0
|
||||||
|
@ -274,7 +274,7 @@ def check_share_on_site(request, token):
|
||||||
'other_stories' : other_stories,
|
'other_stories' : other_stories,
|
||||||
'previous_stories' : previous_stories,
|
'previous_stories' : previous_stories,
|
||||||
'users' : users,
|
'users' : users,
|
||||||
}) + ')', mimetype='text/plain')
|
}) + ')', content_type='text/plain')
|
||||||
response['Access-Control-Allow-Origin'] = '*'
|
response['Access-Control-Allow-Origin'] = '*'
|
||||||
response['Access-Control-Allow-Methods'] = 'GET'
|
response['Access-Control-Allow-Methods'] = 'GET'
|
||||||
|
|
||||||
|
@ -310,7 +310,7 @@ def share_story(request, token=None):
|
||||||
'code': code,
|
'code': code,
|
||||||
'message': message,
|
'message': message,
|
||||||
'story': None,
|
'story': None,
|
||||||
}), mimetype='text/plain')
|
}), content_type='text/plain')
|
||||||
|
|
||||||
if feed_id:
|
if feed_id:
|
||||||
feed = Feed.get_by_id(feed_id)
|
feed = Feed.get_by_id(feed_id)
|
||||||
|
@ -389,7 +389,7 @@ def share_story(request, token=None):
|
||||||
'code': code,
|
'code': code,
|
||||||
'message': message,
|
'message': message,
|
||||||
'story': shared_story,
|
'story': shared_story,
|
||||||
}), mimetype='text/plain')
|
}), content_type='text/plain')
|
||||||
response['Access-Control-Allow-Origin'] = '*'
|
response['Access-Control-Allow-Origin'] = '*'
|
||||||
response['Access-Control-Allow-Methods'] = 'POST'
|
response['Access-Control-Allow-Methods'] = 'POST'
|
||||||
|
|
||||||
|
@ -427,7 +427,7 @@ def save_story(request, token=None):
|
||||||
'code': code,
|
'code': code,
|
||||||
'message': message,
|
'message': message,
|
||||||
'story': None,
|
'story': None,
|
||||||
}), mimetype='text/plain')
|
}), content_type='text/plain')
|
||||||
|
|
||||||
if feed_id:
|
if feed_id:
|
||||||
feed = Feed.get_by_id(feed_id)
|
feed = Feed.get_by_id(feed_id)
|
||||||
|
@ -492,7 +492,7 @@ def save_story(request, token=None):
|
||||||
'code': code,
|
'code': code,
|
||||||
'message': message,
|
'message': message,
|
||||||
'story': starred_story,
|
'story': starred_story,
|
||||||
}), mimetype='text/plain')
|
}), content_type='text/plain')
|
||||||
response['Access-Control-Allow-Origin'] = '*'
|
response['Access-Control-Allow-Origin'] = '*'
|
||||||
response['Access-Control-Allow-Methods'] = 'POST'
|
response['Access-Control-Allow-Methods'] = 'POST'
|
||||||
|
|
||||||
|
|
|
@ -362,7 +362,6 @@ class UserAgentBanMiddleware:
|
||||||
if 'account' in request.path: return
|
if 'account' in request.path: return
|
||||||
if 'push' in request.path: return
|
if 'push' in request.path: return
|
||||||
if getattr(settings, 'TEST_DEBUG'): return
|
if getattr(settings, 'TEST_DEBUG'): return
|
||||||
|
|
||||||
if any(ua in user_agent for ua in BANNED_USER_AGENTS):
|
if any(ua in user_agent for ua in BANNED_USER_AGENTS):
|
||||||
data = {
|
data = {
|
||||||
'error': 'User agent banned: %s' % user_agent,
|
'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))
|
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):
|
if request.user.is_authenticated and any(username == request.user.username for username in BANNED_USERNAMES):
|
||||||
data = {
|
data = {
|
||||||
|
@ -379,7 +378,7 @@ class UserAgentBanMiddleware:
|
||||||
}
|
}
|
||||||
logging.user(request, "~FB~SN~BBBanned Username: ~SB%s / %s (%s)" % (request.user, request.path, request.META))
|
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):
|
def __call__(self, request):
|
||||||
response = None
|
response = None
|
||||||
|
|
Loading…
Add table
Reference in a new issue