mirror of
https://github.com/samuelclay/NewsBlur.git
synced 2025-09-18 21:50:56 +00:00
change mimetype to content_type and stop using request.REQUEST
This commit is contained in:
parent
63dbaa82b3
commit
3f8b0655d4
10 changed files with 156 additions and 155 deletions
|
@ -119,7 +119,7 @@ def add_site_load_script(request, token):
|
||||||
'new_folder_image': new_folder_image,
|
'new_folder_image': new_folder_image,
|
||||||
},
|
},
|
||||||
context_instance=RequestContext(request),
|
context_instance=RequestContext(request),
|
||||||
mimetype='application/javascript')
|
content_type='application/javascript')
|
||||||
|
|
||||||
def add_site(request, token):
|
def add_site(request, token):
|
||||||
code = 0
|
code = 0
|
||||||
|
@ -281,12 +281,12 @@ def check_share_on_site(request, token):
|
||||||
@required_params('story_url', 'comments', 'title')
|
@required_params('story_url', 'comments', 'title')
|
||||||
def share_story(request, token=None):
|
def share_story(request, token=None):
|
||||||
code = 0
|
code = 0
|
||||||
story_url = request.REQUEST['story_url']
|
story_url = request.POST['story_url']
|
||||||
comments = request.REQUEST['comments']
|
comments = request.POST['comments']
|
||||||
title = request.REQUEST['title']
|
title = request.POST['title']
|
||||||
content = request.REQUEST.get('content', None)
|
content = request.POST.get('content', None)
|
||||||
rss_url = request.REQUEST.get('rss_url', None)
|
rss_url = request.POST.get('rss_url', None)
|
||||||
feed_id = request.REQUEST.get('feed_id', None) or 0
|
feed_id = request.POST.get('feed_id', None) or 0
|
||||||
feed = None
|
feed = None
|
||||||
message = None
|
message = None
|
||||||
profile = None
|
profile = None
|
||||||
|
|
|
@ -15,7 +15,7 @@ def subscribe(request):
|
||||||
user = request.user
|
user = request.user
|
||||||
categories = MCategory.serialize()
|
categories = MCategory.serialize()
|
||||||
category_titles = [c['title'] for c in categories['categories']]
|
category_titles = [c['title'] for c in categories['categories']]
|
||||||
subscribe_category_titles = request.REQUEST.getlist('category') or request.REQUEST.getlist('category[]')
|
subscribe_category_titles = request.POST.getlist('category') or request.POST.getlist('category[]')
|
||||||
|
|
||||||
invalid_category_title = False
|
invalid_category_title = False
|
||||||
for category_title in subscribe_category_titles:
|
for category_title in subscribe_category_titles:
|
||||||
|
|
|
@ -77,8 +77,8 @@ def opml_upload(request):
|
||||||
def opml_export(request):
|
def opml_export(request):
|
||||||
user = get_user(request)
|
user = get_user(request)
|
||||||
now = datetime.datetime.now()
|
now = datetime.datetime.now()
|
||||||
if request.REQUEST.get('user_id') and user.is_staff:
|
if request.GET.get('user_id') and user.is_staff:
|
||||||
user = User.objects.get(pk=request.REQUEST['user_id'])
|
user = User.objects.get(pk=request.GET['user_id'])
|
||||||
exporter = OPMLExporter(user)
|
exporter = OPMLExporter(user)
|
||||||
opml = exporter.process()
|
opml = exporter.process()
|
||||||
|
|
||||||
|
|
|
@ -99,7 +99,7 @@ def login(request):
|
||||||
|
|
||||||
return render_to_response('accounts/login.html', {
|
return render_to_response('accounts/login.html', {
|
||||||
'form': form,
|
'form': form,
|
||||||
'next': request.REQUEST.get('next', "")
|
'next': request.POST.get('next', "")
|
||||||
}, context_instance=RequestContext(request))
|
}, context_instance=RequestContext(request))
|
||||||
|
|
||||||
@csrf_exempt
|
@csrf_exempt
|
||||||
|
@ -131,7 +131,7 @@ def signup(request):
|
||||||
return render_to_response('accounts/signup.html', {
|
return render_to_response('accounts/signup.html', {
|
||||||
'form': form,
|
'form': form,
|
||||||
'recaptcha_error': recaptcha_error,
|
'recaptcha_error': recaptcha_error,
|
||||||
'next': request.REQUEST.get('next', "")
|
'next': request.POST.get('next', "")
|
||||||
}, context_instance=RequestContext(request))
|
}, context_instance=RequestContext(request))
|
||||||
|
|
||||||
@login_required
|
@login_required
|
||||||
|
@ -150,8 +150,8 @@ def redeem_code(request):
|
||||||
|
|
||||||
return render_to_response('accounts/redeem_code.html', {
|
return render_to_response('accounts/redeem_code.html', {
|
||||||
'form': form,
|
'form': form,
|
||||||
'code': request.REQUEST.get('code', ""),
|
'code': request.POST.get('code', ""),
|
||||||
'next': request.REQUEST.get('next', "")
|
'next': request.POST.get('next', "")
|
||||||
}, context_instance=RequestContext(request))
|
}, context_instance=RequestContext(request))
|
||||||
|
|
||||||
|
|
||||||
|
@ -328,7 +328,7 @@ def profile_is_premium(request):
|
||||||
@ajax_login_required
|
@ajax_login_required
|
||||||
@json.json_view
|
@json.json_view
|
||||||
def save_ios_receipt(request):
|
def save_ios_receipt(request):
|
||||||
receipt = request.REQUEST.get('receipt')
|
receipt = request.POST.get('receipt')
|
||||||
product_identifier = request.POST.get('product_identifier')
|
product_identifier = request.POST.get('product_identifier')
|
||||||
transaction_identifier = request.POST.get('transaction_identifier')
|
transaction_identifier = request.POST.get('transaction_identifier')
|
||||||
|
|
||||||
|
|
|
@ -241,10 +241,10 @@ def autologin(request, username, secret):
|
||||||
def load_feeds(request):
|
def load_feeds(request):
|
||||||
user = get_user(request)
|
user = get_user(request)
|
||||||
feeds = {}
|
feeds = {}
|
||||||
include_favicons = is_true(request.REQUEST.get('include_favicons', False))
|
include_favicons = is_true(request.GET.get('include_favicons', False))
|
||||||
flat = is_true(request.REQUEST.get('flat', False))
|
flat = is_true(request.GET.get('flat', False))
|
||||||
update_counts = is_true(request.REQUEST.get('update_counts', True))
|
update_counts = is_true(request.GET.get('update_counts', True))
|
||||||
version = int(request.REQUEST.get('v', 1))
|
version = int(request.GET.get('v', 1))
|
||||||
|
|
||||||
if include_favicons == 'false': include_favicons = False
|
if include_favicons == 'false': include_favicons = False
|
||||||
if update_counts == 'false': update_counts = False
|
if update_counts == 'false': update_counts = False
|
||||||
|
@ -334,7 +334,7 @@ def load_feeds(request):
|
||||||
@json.json_view
|
@json.json_view
|
||||||
def load_feed_favicons(request):
|
def load_feed_favicons(request):
|
||||||
user = get_user(request)
|
user = get_user(request)
|
||||||
feed_ids = request.REQUEST.getlist('feed_ids') or request.REQUEST.getlist('feed_ids[]')
|
feed_ids = request.GET.getlist('feed_ids') or request.GET.getlist('feed_ids[]')
|
||||||
|
|
||||||
if not feed_ids:
|
if not feed_ids:
|
||||||
user_subs = UserSubscription.objects.select_related('feed').filter(user=user, active=True)
|
user_subs = UserSubscription.objects.select_related('feed').filter(user=user, active=True)
|
||||||
|
@ -346,10 +346,10 @@ def load_feed_favicons(request):
|
||||||
|
|
||||||
def load_feeds_flat(request):
|
def load_feeds_flat(request):
|
||||||
user = request.user
|
user = request.user
|
||||||
include_favicons = is_true(request.REQUEST.get('include_favicons', False))
|
include_favicons = is_true(request.GET.get('include_favicons', False))
|
||||||
update_counts = is_true(request.REQUEST.get('update_counts', True))
|
update_counts = is_true(request.GET.get('update_counts', True))
|
||||||
include_inactive = is_true(request.REQUEST.get('include_inactive', False))
|
include_inactive = is_true(request.GET.get('include_inactive', False))
|
||||||
background_ios = is_true(request.REQUEST.get('background_ios', False))
|
background_ios = is_true(request.GET.get('background_ios', False))
|
||||||
|
|
||||||
feeds = {}
|
feeds = {}
|
||||||
inactive_feeds = {}
|
inactive_feeds = {}
|
||||||
|
@ -468,9 +468,9 @@ def refresh_feeds(request):
|
||||||
start = datetime.datetime.now()
|
start = datetime.datetime.now()
|
||||||
start_time = time.time()
|
start_time = time.time()
|
||||||
user = get_user(request)
|
user = get_user(request)
|
||||||
feed_ids = request.REQUEST.getlist('feed_id') or request.REQUEST.getlist('feed_id[]')
|
feed_ids = request.GET.getlist('feed_id') or request.GET.getlist('feed_id[]')
|
||||||
check_fetch_status = request.REQUEST.get('check_fetch_status')
|
check_fetch_status = request.GET.get('check_fetch_status')
|
||||||
favicons_fetching = request.REQUEST.getlist('favicons_fetching') or request.REQUEST.getlist('favicons_fetching[]')
|
favicons_fetching = request.GET.getlist('favicons_fetching') or request.GET.getlist('favicons_fetching[]')
|
||||||
social_feed_ids = [feed_id for feed_id in feed_ids if 'social:' in feed_id]
|
social_feed_ids = [feed_id for feed_id in feed_ids if 'social:' in feed_id]
|
||||||
feed_ids = list(set(feed_ids) - set(social_feed_ids))
|
feed_ids = list(set(feed_ids) - set(social_feed_ids))
|
||||||
|
|
||||||
|
@ -597,18 +597,18 @@ def refresh_feed(request, feed_id):
|
||||||
def load_single_feed(request, feed_id):
|
def load_single_feed(request, feed_id):
|
||||||
start = time.time()
|
start = time.time()
|
||||||
user = get_user(request)
|
user = get_user(request)
|
||||||
# offset = int(request.REQUEST.get('offset', 0))
|
# offset = int(request.GET.get('offset', 0))
|
||||||
# limit = int(request.REQUEST.get('limit', 6))
|
# limit = int(request.GET.get('limit', 6))
|
||||||
limit = 6
|
limit = 6
|
||||||
page = int(request.REQUEST.get('page', 1))
|
page = int(request.GET.get('page', 1))
|
||||||
delay = int(request.REQUEST.get('delay', 0))
|
delay = int(request.GET.get('delay', 0))
|
||||||
offset = limit * (page-1)
|
offset = limit * (page-1)
|
||||||
order = request.REQUEST.get('order', 'newest')
|
order = request.GET.get('order', 'newest')
|
||||||
read_filter = request.REQUEST.get('read_filter', 'all')
|
read_filter = request.GET.get('read_filter', 'all')
|
||||||
query = request.REQUEST.get('query', '').strip()
|
query = request.GET.get('query', '').strip()
|
||||||
include_story_content = is_true(request.REQUEST.get('include_story_content', True))
|
include_story_content = is_true(request.GET.get('include_story_content', True))
|
||||||
include_hidden = is_true(request.REQUEST.get('include_hidden', False))
|
include_hidden = is_true(request.GET.get('include_hidden', False))
|
||||||
include_feeds = is_true(request.REQUEST.get('include_feeds', False))
|
include_feeds = is_true(request.GET.get('include_feeds', False))
|
||||||
message = None
|
message = None
|
||||||
user_search = None
|
user_search = None
|
||||||
|
|
||||||
|
@ -617,7 +617,7 @@ def load_single_feed(request, feed_id):
|
||||||
now = localtime_for_timezone(datetime.datetime.now(), user.profile.timezone)
|
now = localtime_for_timezone(datetime.datetime.now(), user.profile.timezone)
|
||||||
if not feed_id: raise Http404
|
if not feed_id: raise Http404
|
||||||
|
|
||||||
feed_address = request.REQUEST.get('feed_address')
|
feed_address = request.GET.get('feed_address')
|
||||||
feed = Feed.get_by_id(feed_id, feed_address=feed_address)
|
feed = Feed.get_by_id(feed_id, feed_address=feed_address)
|
||||||
if not feed:
|
if not feed:
|
||||||
raise Http404
|
raise Http404
|
||||||
|
@ -876,15 +876,15 @@ def load_feed_page(request, feed_id):
|
||||||
@json.json_view
|
@json.json_view
|
||||||
def load_starred_stories(request):
|
def load_starred_stories(request):
|
||||||
user = get_user(request)
|
user = get_user(request)
|
||||||
offset = int(request.REQUEST.get('offset', 0))
|
offset = int(request.GET.get('offset', 0))
|
||||||
limit = int(request.REQUEST.get('limit', 10))
|
limit = int(request.GET.get('limit', 10))
|
||||||
page = int(request.REQUEST.get('page', 0))
|
page = int(request.GET.get('page', 0))
|
||||||
query = request.REQUEST.get('query', '').strip()
|
query = request.GET.get('query', '').strip()
|
||||||
order = request.REQUEST.get('order', 'newest')
|
order = request.GET.get('order', 'newest')
|
||||||
tag = request.REQUEST.get('tag')
|
tag = request.GET.get('tag')
|
||||||
story_hashes = request.REQUEST.getlist('h') or request.REQUEST.getlist('h[]')
|
story_hashes = request.GET.getlist('h') or request.GET.getlist('h[]')
|
||||||
story_hashes = story_hashes[:100]
|
story_hashes = story_hashes[:100]
|
||||||
version = int(request.REQUEST.get('v', 1))
|
version = int(request.GET.get('v', 1))
|
||||||
now = localtime_for_timezone(datetime.datetime.now(), user.profile.timezone)
|
now = localtime_for_timezone(datetime.datetime.now(), user.profile.timezone)
|
||||||
message = None
|
message = None
|
||||||
order_by = '-' if order == "newest" else ""
|
order_by = '-' if order == "newest" else ""
|
||||||
|
@ -994,7 +994,7 @@ def load_starred_stories(request):
|
||||||
@json.json_view
|
@json.json_view
|
||||||
def starred_story_hashes(request):
|
def starred_story_hashes(request):
|
||||||
user = get_user(request)
|
user = get_user(request)
|
||||||
include_timestamps = is_true(request.REQUEST.get('include_timestamps', False))
|
include_timestamps = is_true(request.GET.get('include_timestamps', False))
|
||||||
|
|
||||||
mstories = MStarredStory.objects(
|
mstories = MStarredStory.objects(
|
||||||
user_id=user.pk
|
user_id=user.pk
|
||||||
|
@ -1201,11 +1201,11 @@ def folder_rss_feed(request, user_id, secret_token, unread_filter, folder_slug):
|
||||||
@json.json_view
|
@json.json_view
|
||||||
def load_read_stories(request):
|
def load_read_stories(request):
|
||||||
user = get_user(request)
|
user = get_user(request)
|
||||||
offset = int(request.REQUEST.get('offset', 0))
|
offset = int(request.GET.get('offset', 0))
|
||||||
limit = int(request.REQUEST.get('limit', 10))
|
limit = int(request.GET.get('limit', 10))
|
||||||
page = int(request.REQUEST.get('page', 0))
|
page = int(request.GET.get('page', 0))
|
||||||
order = request.REQUEST.get('order', 'newest')
|
order = request.GET.get('order', 'newest')
|
||||||
query = request.REQUEST.get('query', '').strip()
|
query = request.GET.get('query', '').strip()
|
||||||
now = localtime_for_timezone(datetime.datetime.now(), user.profile.timezone)
|
now = localtime_for_timezone(datetime.datetime.now(), user.profile.timezone)
|
||||||
message = None
|
message = None
|
||||||
if page: offset = limit * (page - 1)
|
if page: offset = limit * (page - 1)
|
||||||
|
@ -1283,28 +1283,28 @@ def load_read_stories(request):
|
||||||
|
|
||||||
@json.json_view
|
@json.json_view
|
||||||
def load_river_stories__redis(request):
|
def load_river_stories__redis(request):
|
||||||
limit = int(request.REQUEST.get('limit', 12))
|
limit = int(request.GET.get('limit', 12))
|
||||||
start = time.time()
|
start = time.time()
|
||||||
user = get_user(request)
|
user = get_user(request)
|
||||||
message = None
|
message = None
|
||||||
feed_ids = request.REQUEST.getlist('feeds') or request.REQUEST.getlist('feeds[]')
|
feed_ids = request.GET.getlist('feeds') or request.GET.getlist('feeds[]')
|
||||||
feed_ids = [int(feed_id) for feed_id in feed_ids if feed_id]
|
feed_ids = [int(feed_id) for feed_id in feed_ids if feed_id]
|
||||||
if not feed_ids:
|
if not feed_ids:
|
||||||
feed_ids = request.REQUEST.getlist('f') or request.REQUEST.getlist('f[]')
|
feed_ids = request.GET.getlist('f') or request.GET.getlist('f[]')
|
||||||
feed_ids = [int(feed_id) for feed_id in request.REQUEST.getlist('f') if feed_id]
|
feed_ids = [int(feed_id) for feed_id in request.GET.getlist('f') if feed_id]
|
||||||
story_hashes = request.REQUEST.getlist('h') or request.REQUEST.getlist('h[]')
|
story_hashes = request.GET.getlist('h') or request.GET.getlist('h[]')
|
||||||
story_hashes = story_hashes[:100]
|
story_hashes = story_hashes[:100]
|
||||||
original_feed_ids = list(feed_ids)
|
original_feed_ids = list(feed_ids)
|
||||||
page = int(request.REQUEST.get('page', 1))
|
page = int(request.GET.get('page', 1))
|
||||||
order = request.REQUEST.get('order', 'newest')
|
order = request.GET.get('order', 'newest')
|
||||||
read_filter = request.REQUEST.get('read_filter', 'unread')
|
read_filter = request.GET.get('read_filter', 'unread')
|
||||||
query = request.REQUEST.get('query', '').strip()
|
query = request.GET.get('query', '').strip()
|
||||||
include_hidden = is_true(request.REQUEST.get('include_hidden', False))
|
include_hidden = is_true(request.GET.get('include_hidden', False))
|
||||||
include_feeds = is_true(request.REQUEST.get('include_feeds', False))
|
include_feeds = is_true(request.GET.get('include_feeds', False))
|
||||||
initial_dashboard = is_true(request.REQUEST.get('initial_dashboard', False))
|
initial_dashboard = is_true(request.GET.get('initial_dashboard', False))
|
||||||
infrequent = is_true(request.REQUEST.get('infrequent', False))
|
infrequent = is_true(request.GET.get('infrequent', False))
|
||||||
if infrequent:
|
if infrequent:
|
||||||
infrequent = request.REQUEST.get('infrequent')
|
infrequent = request.GET.get('infrequent')
|
||||||
now = localtime_for_timezone(datetime.datetime.now(), user.profile.timezone)
|
now = localtime_for_timezone(datetime.datetime.now(), user.profile.timezone)
|
||||||
usersubs = []
|
usersubs = []
|
||||||
code = 1
|
code = 1
|
||||||
|
@ -1572,11 +1572,11 @@ def unread_story_hashes__old(request):
|
||||||
@json.json_view
|
@json.json_view
|
||||||
def unread_story_hashes(request):
|
def unread_story_hashes(request):
|
||||||
user = get_user(request)
|
user = get_user(request)
|
||||||
feed_ids = request.REQUEST.getlist('feed_id') or request.REQUEST.getlist('feed_id[]')
|
feed_ids = request.GET.getlist('feed_id') or request.GET.getlist('feed_id[]')
|
||||||
feed_ids = [int(feed_id) for feed_id in feed_ids if feed_id]
|
feed_ids = [int(feed_id) for feed_id in feed_ids if feed_id]
|
||||||
include_timestamps = is_true(request.REQUEST.get('include_timestamps', False))
|
include_timestamps = is_true(request.GET.get('include_timestamps', False))
|
||||||
order = request.REQUEST.get('order', 'newest')
|
order = request.GET.get('order', 'newest')
|
||||||
read_filter = request.REQUEST.get('read_filter', 'unread')
|
read_filter = request.GET.get('read_filter', 'unread')
|
||||||
|
|
||||||
story_hashes = UserSubscription.story_hashes(user.pk, feed_ids=feed_ids,
|
story_hashes = UserSubscription.story_hashes(user.pk, feed_ids=feed_ids,
|
||||||
order=order, read_filter=read_filter,
|
order=order, read_filter=read_filter,
|
||||||
|
@ -1592,17 +1592,17 @@ def unread_story_hashes(request):
|
||||||
def mark_all_as_read(request):
|
def mark_all_as_read(request):
|
||||||
code = 1
|
code = 1
|
||||||
try:
|
try:
|
||||||
days = int(request.REQUEST.get('days', 0))
|
days = int(request.POST.get('days', 0))
|
||||||
except ValueError:
|
except ValueError:
|
||||||
return dict(code=-1, message="Days parameter must be an integer, not: %s" %
|
return dict(code=-1, message="Days parameter must be an integer, not: %s" %
|
||||||
request.REQUEST.get('days'))
|
request.POST.get('days'))
|
||||||
read_date = datetime.datetime.utcnow() - datetime.timedelta(days=days)
|
read_date = datetime.datetime.utcnow() - datetime.timedelta(days=days)
|
||||||
|
|
||||||
feeds = UserSubscription.objects.filter(user=request.user)
|
feeds = UserSubscription.objects.filter(user=request.user)
|
||||||
|
|
||||||
infrequent = is_true(request.REQUEST.get('infrequent', False))
|
infrequent = is_true(request.POST.get('infrequent', False))
|
||||||
if infrequent:
|
if infrequent:
|
||||||
infrequent = request.REQUEST.get('infrequent')
|
infrequent = request.POST.get('infrequent')
|
||||||
feed_ids = Feed.low_volume_feeds([usersub.feed.pk for usersub in feeds], stories_per_month=infrequent)
|
feed_ids = Feed.low_volume_feeds([usersub.feed.pk for usersub in feeds], stories_per_month=infrequent)
|
||||||
feeds = UserSubscription.objects.filter(user=request.user, feed_id__in=feed_ids)
|
feeds = UserSubscription.objects.filter(user=request.user, feed_id__in=feed_ids)
|
||||||
|
|
||||||
|
@ -1626,12 +1626,12 @@ def mark_all_as_read(request):
|
||||||
@ajax_login_required
|
@ajax_login_required
|
||||||
@json.json_view
|
@json.json_view
|
||||||
def mark_story_as_read(request):
|
def mark_story_as_read(request):
|
||||||
story_ids = request.REQUEST.getlist('story_id') or request.REQUEST.getlist('story_id[]')
|
story_ids = request.POST.getlist('story_id') or request.POST.getlist('story_id[]')
|
||||||
try:
|
try:
|
||||||
feed_id = int(get_argument_or_404(request, 'feed_id'))
|
feed_id = int(get_argument_or_404(request, 'feed_id'))
|
||||||
except ValueError:
|
except ValueError:
|
||||||
return dict(code=-1, errors=["You must pass a valid feed_id: %s" %
|
return dict(code=-1, errors=["You must pass a valid feed_id: %s" %
|
||||||
request.REQUEST.get('feed_id')])
|
request.POST.get('feed_id')])
|
||||||
|
|
||||||
try:
|
try:
|
||||||
usersub = UserSubscription.objects.select_related('feed').get(user=request.user, feed=feed_id)
|
usersub = UserSubscription.objects.select_related('feed').get(user=request.user, feed=feed_id)
|
||||||
|
@ -1662,7 +1662,7 @@ def mark_story_hashes_as_read(request):
|
||||||
retrying_failed = is_true(request.POST.get('retrying_failed', False))
|
retrying_failed = is_true(request.POST.get('retrying_failed', False))
|
||||||
r = redis.Redis(connection_pool=settings.REDIS_PUBSUB_POOL)
|
r = redis.Redis(connection_pool=settings.REDIS_PUBSUB_POOL)
|
||||||
try:
|
try:
|
||||||
story_hashes = request.REQUEST.getlist('story_hash') or request.REQUEST.getlist('story_hash[]')
|
story_hashes = request.POST.getlist('story_hash') or request.POST.getlist('story_hash[]')
|
||||||
except UnreadablePostError:
|
except UnreadablePostError:
|
||||||
return dict(code=-1, message="Missing `story_hash` list parameter.")
|
return dict(code=-1, message="Missing `story_hash` list parameter.")
|
||||||
|
|
||||||
|
@ -1704,7 +1704,7 @@ def mark_story_hashes_as_read(request):
|
||||||
@json.json_view
|
@json.json_view
|
||||||
def mark_feed_stories_as_read(request):
|
def mark_feed_stories_as_read(request):
|
||||||
r = redis.Redis(connection_pool=settings.REDIS_PUBSUB_POOL)
|
r = redis.Redis(connection_pool=settings.REDIS_PUBSUB_POOL)
|
||||||
feeds_stories = request.REQUEST.get('feeds_stories', "{}")
|
feeds_stories = request.POST.get('feeds_stories', "{}")
|
||||||
feeds_stories = json.decode(feeds_stories)
|
feeds_stories = json.decode(feeds_stories)
|
||||||
data = {
|
data = {
|
||||||
'code': -1,
|
'code': -1,
|
||||||
|
@ -1742,7 +1742,7 @@ def mark_social_stories_as_read(request):
|
||||||
errors = []
|
errors = []
|
||||||
data = {}
|
data = {}
|
||||||
r = redis.Redis(connection_pool=settings.REDIS_PUBSUB_POOL)
|
r = redis.Redis(connection_pool=settings.REDIS_PUBSUB_POOL)
|
||||||
users_feeds_stories = request.REQUEST.get('users_feeds_stories', "{}")
|
users_feeds_stories = request.POST.get('users_feeds_stories', "{}")
|
||||||
users_feeds_stories = json.decode(users_feeds_stories)
|
users_feeds_stories = json.decode(users_feeds_stories)
|
||||||
|
|
||||||
for social_user_id, feeds in users_feeds_stories.items():
|
for social_user_id, feeds in users_feeds_stories.items():
|
||||||
|
@ -1781,8 +1781,8 @@ def mark_social_stories_as_read(request):
|
||||||
@ajax_login_required
|
@ajax_login_required
|
||||||
@json.json_view
|
@json.json_view
|
||||||
def mark_story_as_unread(request):
|
def mark_story_as_unread(request):
|
||||||
story_id = request.REQUEST.get('story_id', None)
|
story_id = request.POST.get('story_id', None)
|
||||||
feed_id = int(request.REQUEST.get('feed_id', 0))
|
feed_id = int(request.POST.get('feed_id', 0))
|
||||||
|
|
||||||
try:
|
try:
|
||||||
usersub = UserSubscription.objects.select_related('feed').get(user=request.user, feed=feed_id)
|
usersub = UserSubscription.objects.select_related('feed').get(user=request.user, feed=feed_id)
|
||||||
|
@ -1831,7 +1831,7 @@ def mark_story_as_unread(request):
|
||||||
@required_params('story_hash')
|
@required_params('story_hash')
|
||||||
def mark_story_hash_as_unread(request):
|
def mark_story_hash_as_unread(request):
|
||||||
r = redis.Redis(connection_pool=settings.REDIS_PUBSUB_POOL)
|
r = redis.Redis(connection_pool=settings.REDIS_PUBSUB_POOL)
|
||||||
story_hash = request.REQUEST.get('story_hash')
|
story_hash = request.POST.get('story_hash')
|
||||||
feed_id, _ = MStory.split_story_hash(story_hash)
|
feed_id, _ = MStory.split_story_hash(story_hash)
|
||||||
story, _ = MStory.find_story(feed_id, story_hash)
|
story, _ = MStory.find_story(feed_id, story_hash)
|
||||||
if not story:
|
if not story:
|
||||||
|
@ -1873,11 +1873,11 @@ def mark_story_hash_as_unread(request):
|
||||||
def mark_feed_as_read(request):
|
def mark_feed_as_read(request):
|
||||||
r = redis.Redis(connection_pool=settings.REDIS_PUBSUB_POOL)
|
r = redis.Redis(connection_pool=settings.REDIS_PUBSUB_POOL)
|
||||||
feed_ids = request.POST.getlist('feed_id') or request.POST.getlist('feed_id[]')
|
feed_ids = request.POST.getlist('feed_id') or request.POST.getlist('feed_id[]')
|
||||||
cutoff_timestamp = int(request.REQUEST.get('cutoff_timestamp', 0))
|
cutoff_timestamp = int(request.POST.get('cutoff_timestamp', 0))
|
||||||
direction = request.REQUEST.get('direction', 'older')
|
direction = request.POST.get('direction', 'older')
|
||||||
infrequent = is_true(request.REQUEST.get('infrequent', False))
|
infrequent = is_true(request.POST.get('infrequent', False))
|
||||||
if infrequent:
|
if infrequent:
|
||||||
infrequent = request.REQUEST.get('infrequent')
|
infrequent = request.POST.get('infrequent')
|
||||||
multiple = len(feed_ids) > 1
|
multiple = len(feed_ids) > 1
|
||||||
code = 1
|
code = 1
|
||||||
errors = []
|
errors = []
|
||||||
|
@ -2072,7 +2072,7 @@ def delete_feed_by_url(request):
|
||||||
def delete_folder(request):
|
def delete_folder(request):
|
||||||
folder_to_delete = request.POST.get('folder_name') or request.POST.get('folder_to_delete')
|
folder_to_delete = request.POST.get('folder_name') or request.POST.get('folder_to_delete')
|
||||||
in_folder = request.POST.get('in_folder', None)
|
in_folder = request.POST.get('in_folder', None)
|
||||||
feed_ids_in_folder = request.REQUEST.getlist('feed_id') or request.REQUEST.getlist('feed_id[]')
|
feed_ids_in_folder = request.POST.getlist('feed_id') or request.POST.getlist('feed_id[]')
|
||||||
feed_ids_in_folder = [int(f) for f in feed_ids_in_folder if f]
|
feed_ids_in_folder = [int(f) for f in feed_ids_in_folder if f]
|
||||||
|
|
||||||
request.user.profile.send_opml_export_email(reason="You have deleted an entire folder of feeds, so here's a backup of all of your subscriptions just in case.")
|
request.user.profile.send_opml_export_email(reason="You have deleted an entire folder of feeds, so here's a backup of all of your subscriptions just in case.")
|
||||||
|
@ -2259,7 +2259,7 @@ def save_feed_order(request):
|
||||||
@json.json_view
|
@json.json_view
|
||||||
def feeds_trainer(request):
|
def feeds_trainer(request):
|
||||||
classifiers = []
|
classifiers = []
|
||||||
feed_id = request.REQUEST.get('feed_id')
|
feed_id = request.GET.get('feed_id')
|
||||||
user = get_user(request)
|
user = get_user(request)
|
||||||
usersubs = UserSubscription.objects.filter(user=user, active=True)
|
usersubs = UserSubscription.objects.filter(user=user, active=True)
|
||||||
|
|
||||||
|
@ -2386,10 +2386,10 @@ def mark_story_hash_as_starred(request):
|
||||||
|
|
||||||
def _mark_story_as_starred(request):
|
def _mark_story_as_starred(request):
|
||||||
code = 1
|
code = 1
|
||||||
feed_id = int(request.REQUEST.get('feed_id', 0))
|
feed_id = int(request.POST.get('feed_id', 0))
|
||||||
story_id = request.REQUEST.get('story_id', None)
|
story_id = request.POST.get('story_id', None)
|
||||||
story_hash = request.REQUEST.get('story_hash', None)
|
story_hash = request.POST.get('story_hash', None)
|
||||||
user_tags = request.REQUEST.getlist('user_tags') or request.REQUEST.getlist('user_tags[]')
|
user_tags = request.POST.getlist('user_tags') or request.POST.getlist('user_tags[]')
|
||||||
message = ""
|
message = ""
|
||||||
if story_hash:
|
if story_hash:
|
||||||
story, _ = MStory.find_story(story_hash=story_hash)
|
story, _ = MStory.find_story(story_hash=story_hash)
|
||||||
|
|
|
@ -36,8 +36,8 @@ IGNORE_AUTOCOMPLETE = [
|
||||||
@ajax_login_required
|
@ajax_login_required
|
||||||
@json.json_view
|
@json.json_view
|
||||||
def search_feed(request):
|
def search_feed(request):
|
||||||
address = request.REQUEST.get('address')
|
address = request.GET.get('address')
|
||||||
offset = int(request.REQUEST.get('offset', 0))
|
offset = int(request.GET.get('offset', 0))
|
||||||
if not address:
|
if not address:
|
||||||
return dict(code=-1, message="Please provide a URL/address.")
|
return dict(code=-1, message="Please provide a URL/address.")
|
||||||
|
|
||||||
|
@ -83,7 +83,7 @@ def load_feed_favicon(request, feed_id):
|
||||||
return HttpResponseRedirect(settings.MEDIA_URL + 'img/icons/circular/world.png')
|
return HttpResponseRedirect(settings.MEDIA_URL + 'img/icons/circular/world.png')
|
||||||
|
|
||||||
icon_data = feed_icon.data.decode('base64')
|
icon_data = feed_icon.data.decode('base64')
|
||||||
return HttpResponse(icon_data, mimetype='image/png')
|
return HttpResponse(icon_data, content_type='image/png')
|
||||||
|
|
||||||
@json.json_view
|
@json.json_view
|
||||||
def feed_autocomplete(request):
|
def feed_autocomplete(request):
|
||||||
|
@ -511,11 +511,11 @@ def status(request):
|
||||||
|
|
||||||
@json.json_view
|
@json.json_view
|
||||||
def original_text(request):
|
def original_text(request):
|
||||||
story_id = request.REQUEST.get('story_id')
|
story_id = request.GET.get('story_id')
|
||||||
feed_id = request.REQUEST.get('feed_id')
|
feed_id = request.GET.get('feed_id')
|
||||||
story_hash = request.REQUEST.get('story_hash', None)
|
story_hash = request.GET.get('story_hash', None)
|
||||||
force = request.REQUEST.get('force', False)
|
force = request.GET.get('force', False)
|
||||||
debug = request.REQUEST.get('debug', False)
|
debug = request.GET.get('debug', False)
|
||||||
|
|
||||||
if story_hash:
|
if story_hash:
|
||||||
story, _ = MStory.find_story(story_hash=story_hash)
|
story, _ = MStory.find_story(story_hash=story_hash)
|
||||||
|
@ -558,8 +558,8 @@ def original_story(request):
|
||||||
@required_params('story_hash')
|
@required_params('story_hash')
|
||||||
@json.json_view
|
@json.json_view
|
||||||
def story_changes(request):
|
def story_changes(request):
|
||||||
story_hash = request.REQUEST.get('story_hash', None)
|
story_hash = request.GET.get('story_hash', None)
|
||||||
show_changes = is_true(request.REQUEST.get('show_changes', True))
|
show_changes = is_true(request.GET.get('show_changes', True))
|
||||||
story, _ = MStory.find_story(story_hash=story_hash)
|
story, _ = MStory.find_story(story_hash=story_hash)
|
||||||
if not story:
|
if not story:
|
||||||
logging.user(request, "~FYFetching ~FGoriginal~FY story page: ~FRstory not found")
|
logging.user(request, "~FYFetching ~FGoriginal~FY story page: ~FRstory not found")
|
||||||
|
|
|
@ -42,13 +42,13 @@ def load_social_stories(request, user_id, username=None):
|
||||||
user = get_user(request)
|
user = get_user(request)
|
||||||
social_user_id = int(user_id)
|
social_user_id = int(user_id)
|
||||||
social_user = get_object_or_404(User, pk=social_user_id)
|
social_user = get_object_or_404(User, pk=social_user_id)
|
||||||
offset = int(request.REQUEST.get('offset', 0))
|
offset = int(request.GET.get('offset', 0))
|
||||||
limit = int(request.REQUEST.get('limit', 6))
|
limit = int(request.GET.get('limit', 6))
|
||||||
page = request.REQUEST.get('page')
|
page = request.GET.get('page')
|
||||||
order = request.REQUEST.get('order', 'newest')
|
order = request.GET.get('order', 'newest')
|
||||||
read_filter = request.REQUEST.get('read_filter', 'all')
|
read_filter = request.GET.get('read_filter', 'all')
|
||||||
query = request.REQUEST.get('query', '').strip()
|
query = request.GET.get('query', '').strip()
|
||||||
include_story_content = is_true(request.REQUEST.get('include_story_content', True))
|
include_story_content = is_true(request.GET.get('include_story_content', True))
|
||||||
stories = []
|
stories = []
|
||||||
message = None
|
message = None
|
||||||
|
|
||||||
|
@ -191,14 +191,14 @@ def load_river_blurblog(request):
|
||||||
limit = 10
|
limit = 10
|
||||||
start = time.time()
|
start = time.time()
|
||||||
user = get_user(request)
|
user = get_user(request)
|
||||||
social_user_ids = request.REQUEST.getlist('social_user_ids') or request.REQUEST.getlist('social_user_ids[]')
|
social_user_ids = request.GET.getlist('social_user_ids') or request.GET.getlist('social_user_ids[]')
|
||||||
social_user_ids = [int(uid) for uid in social_user_ids if uid]
|
social_user_ids = [int(uid) for uid in social_user_ids if uid]
|
||||||
original_user_ids = list(social_user_ids)
|
original_user_ids = list(social_user_ids)
|
||||||
page = int(request.REQUEST.get('page', 1))
|
page = int(request.GET.get('page', 1))
|
||||||
order = request.REQUEST.get('order', 'newest')
|
order = request.GET.get('order', 'newest')
|
||||||
read_filter = request.REQUEST.get('read_filter', 'unread')
|
read_filter = request.GET.get('read_filter', 'unread')
|
||||||
relative_user_id = request.REQUEST.get('relative_user_id', None)
|
relative_user_id = request.GET.get('relative_user_id', None)
|
||||||
global_feed = request.REQUEST.get('global_feed', None)
|
global_feed = request.GET.get('global_feed', None)
|
||||||
now = localtime_for_timezone(datetime.datetime.now(), user.profile.timezone)
|
now = localtime_for_timezone(datetime.datetime.now(), user.profile.timezone)
|
||||||
|
|
||||||
if global_feed:
|
if global_feed:
|
||||||
|
@ -344,15 +344,15 @@ def load_social_page(request, user_id, username=None, **kwargs):
|
||||||
user = get_user(request.user)
|
user = get_user(request.user)
|
||||||
social_user_id = int(user_id)
|
social_user_id = int(user_id)
|
||||||
social_user = get_object_or_404(User, pk=social_user_id)
|
social_user = get_object_or_404(User, pk=social_user_id)
|
||||||
offset = int(request.REQUEST.get('offset', 0))
|
offset = int(request.GET.get('offset', 0))
|
||||||
limit = int(request.REQUEST.get('limit', 6))
|
limit = int(request.GET.get('limit', 6))
|
||||||
try:
|
try:
|
||||||
page = int(request.REQUEST.get('page', 1))
|
page = int(request.GET.get('page', 1))
|
||||||
except ValueError:
|
except ValueError:
|
||||||
page = 1
|
page = 1
|
||||||
format = request.REQUEST.get('format', None)
|
format = request.GET.get('format', None)
|
||||||
has_next_page = False
|
has_next_page = False
|
||||||
feed_id = kwargs.get('feed_id') or request.REQUEST.get('feed_id')
|
feed_id = kwargs.get('feed_id') or request.GET.get('feed_id')
|
||||||
if page:
|
if page:
|
||||||
offset = limit * (page-1)
|
offset = limit * (page-1)
|
||||||
social_services = None
|
social_services = None
|
||||||
|
@ -510,10 +510,10 @@ def load_social_page(request, user_id, username=None, **kwargs):
|
||||||
|
|
||||||
@required_params('story_id', feed_id=int)
|
@required_params('story_id', feed_id=int)
|
||||||
def story_public_comments(request):
|
def story_public_comments(request):
|
||||||
format = request.REQUEST.get('format', 'json')
|
format = request.GET.get('format', 'json')
|
||||||
relative_user_id = request.REQUEST.get('user_id', None)
|
relative_user_id = request.GET.get('user_id', None)
|
||||||
feed_id = int(request.REQUEST['feed_id'])
|
feed_id = int(request.GET.get('feed_id'))
|
||||||
story_id = request.REQUEST['story_id']
|
story_id = request.GET.get('story_id')
|
||||||
|
|
||||||
if not relative_user_id:
|
if not relative_user_id:
|
||||||
relative_user_id = get_user(request).pk
|
relative_user_id = get_user(request).pk
|
||||||
|
@ -550,7 +550,7 @@ def mark_story_as_shared(request):
|
||||||
source_user_id = request.POST.get('source_user_id')
|
source_user_id = request.POST.get('source_user_id')
|
||||||
relative_user_id = request.POST.get('relative_user_id') or request.user.pk
|
relative_user_id = request.POST.get('relative_user_id') or request.user.pk
|
||||||
post_to_services = request.POST.getlist('post_to_services') or request.POST.getlist('post_to_services[]')
|
post_to_services = request.POST.getlist('post_to_services') or request.POST.getlist('post_to_services[]')
|
||||||
format = request.REQUEST.get('format', 'json')
|
format = request.POST.get('format', 'json')
|
||||||
now = datetime.datetime.now()
|
now = datetime.datetime.now()
|
||||||
nowtz = localtime_for_timezone(now, request.user.profile.timezone)
|
nowtz = localtime_for_timezone(now, request.user.profile.timezone)
|
||||||
|
|
||||||
|
@ -689,7 +689,7 @@ def mark_story_as_unshared(request):
|
||||||
feed_id = int(request.POST['feed_id'])
|
feed_id = int(request.POST['feed_id'])
|
||||||
story_id = request.POST['story_id']
|
story_id = request.POST['story_id']
|
||||||
relative_user_id = request.POST.get('relative_user_id') or request.user.pk
|
relative_user_id = request.POST.get('relative_user_id') or request.user.pk
|
||||||
format = request.REQUEST.get('format', 'json')
|
format = request.POST.get('format', 'json')
|
||||||
original_story_found = True
|
original_story_found = True
|
||||||
|
|
||||||
story, original_story_found = MStory.find_story(story_feed_id=feed_id,
|
story, original_story_found = MStory.find_story(story_feed_id=feed_id,
|
||||||
|
@ -734,7 +734,7 @@ def save_comment_reply(request):
|
||||||
comment_user_id = request.POST['comment_user_id']
|
comment_user_id = request.POST['comment_user_id']
|
||||||
reply_comments = request.POST.get('reply_comments')
|
reply_comments = request.POST.get('reply_comments')
|
||||||
reply_id = request.POST.get('reply_id')
|
reply_id = request.POST.get('reply_id')
|
||||||
format = request.REQUEST.get('format', 'json')
|
format = request.POST.get('format', 'json')
|
||||||
original_message = None
|
original_message = None
|
||||||
|
|
||||||
if not reply_comments:
|
if not reply_comments:
|
||||||
|
@ -841,7 +841,7 @@ def remove_comment_reply(request):
|
||||||
story_id = request.POST['story_id']
|
story_id = request.POST['story_id']
|
||||||
comment_user_id = request.POST['comment_user_id']
|
comment_user_id = request.POST['comment_user_id']
|
||||||
reply_id = request.POST.get('reply_id')
|
reply_id = request.POST.get('reply_id')
|
||||||
format = request.REQUEST.get('format', 'json')
|
format = request.POST.get('format', 'json')
|
||||||
original_message = None
|
original_message = None
|
||||||
|
|
||||||
shared_story = MSharedStory.objects.get(user_id=comment_user_id,
|
shared_story = MSharedStory.objects.get(user_id=comment_user_id,
|
||||||
|
@ -920,7 +920,7 @@ def profile(request):
|
||||||
user = get_user(request.user)
|
user = get_user(request.user)
|
||||||
user_id = int(request.GET.get('user_id', user.pk))
|
user_id = int(request.GET.get('user_id', user.pk))
|
||||||
categories = request.GET.getlist('category') or request.GET.getlist('category[]')
|
categories = request.GET.getlist('category') or request.GET.getlist('category[]')
|
||||||
include_activities_html = request.REQUEST.get('include_activities_html', None)
|
include_activities_html = request.GET.get('include_activities_html', None)
|
||||||
|
|
||||||
user_profile = MSocialProfile.get_user(user_id)
|
user_profile = MSocialProfile.get_user(user_id)
|
||||||
user_profile.count_follows()
|
user_profile.count_follows()
|
||||||
|
@ -1216,7 +1216,7 @@ def like_comment(request):
|
||||||
feed_id = int(request.POST['story_feed_id'])
|
feed_id = int(request.POST['story_feed_id'])
|
||||||
story_id = request.POST['story_id']
|
story_id = request.POST['story_id']
|
||||||
comment_user_id = int(request.POST['comment_user_id'])
|
comment_user_id = int(request.POST['comment_user_id'])
|
||||||
format = request.REQUEST.get('format', 'json')
|
format = request.POST.get('format', 'json')
|
||||||
|
|
||||||
if comment_user_id == request.user.pk:
|
if comment_user_id == request.user.pk:
|
||||||
return json.json_response(request, {'code': -1, 'message': 'You cannot favorite your own shared story comment.'})
|
return json.json_response(request, {'code': -1, 'message': 'You cannot favorite your own shared story comment.'})
|
||||||
|
@ -1268,7 +1268,7 @@ def remove_like_comment(request):
|
||||||
feed_id = int(request.POST['story_feed_id'])
|
feed_id = int(request.POST['story_feed_id'])
|
||||||
story_id = request.POST['story_id']
|
story_id = request.POST['story_id']
|
||||||
comment_user_id = request.POST['comment_user_id']
|
comment_user_id = request.POST['comment_user_id']
|
||||||
format = request.REQUEST.get('format', 'json')
|
format = request.POST.get('format', 'json')
|
||||||
|
|
||||||
shared_story = MSharedStory.objects.get(user_id=comment_user_id,
|
shared_story = MSharedStory.objects.get(user_id=comment_user_id,
|
||||||
story_feed_id=feed_id,
|
story_feed_id=feed_id,
|
||||||
|
@ -1373,7 +1373,7 @@ def shared_stories_rss_feed(request, user_id, username):
|
||||||
@required_params('user_id')
|
@required_params('user_id')
|
||||||
@json.json_view
|
@json.json_view
|
||||||
def social_feed_trainer(request):
|
def social_feed_trainer(request):
|
||||||
social_user_id = request.REQUEST['user_id']
|
social_user_id = request.GET['user_id']
|
||||||
social_profile = MSocialProfile.get_user(social_user_id)
|
social_profile = MSocialProfile.get_user(social_user_id)
|
||||||
social_user = get_object_or_404(User, pk=social_user_id)
|
social_user = get_object_or_404(User, pk=social_user_id)
|
||||||
user = get_user(request)
|
user = get_user(request)
|
||||||
|
@ -1431,15 +1431,15 @@ def load_social_settings(request, social_user_id, username=None):
|
||||||
|
|
||||||
@ajax_login_required
|
@ajax_login_required
|
||||||
def load_interactions(request):
|
def load_interactions(request):
|
||||||
user_id = request.REQUEST.get('user_id', None)
|
user_id = request.GET.get('user_id', None)
|
||||||
categories = request.GET.getlist('category') or request.GET.getlist('category[]')
|
categories = request.GET.getlist('category') or request.GET.getlist('category[]')
|
||||||
if not user_id or 'null' in user_id:
|
if not user_id or 'null' in user_id:
|
||||||
user_id = get_user(request).pk
|
user_id = get_user(request).pk
|
||||||
page = max(1, int(request.REQUEST.get('page', 1)))
|
page = max(1, int(request.GET.get('page', 1)))
|
||||||
limit = request.REQUEST.get('limit')
|
limit = request.GET.get('limit')
|
||||||
interactions, has_next_page = MInteraction.user(user_id, page=page, limit=limit,
|
interactions, has_next_page = MInteraction.user(user_id, page=page, limit=limit,
|
||||||
categories=categories)
|
categories=categories)
|
||||||
format = request.REQUEST.get('format', None)
|
format = request.GET.get('format', None)
|
||||||
|
|
||||||
data = {
|
data = {
|
||||||
'interactions': interactions,
|
'interactions': interactions,
|
||||||
|
@ -1457,7 +1457,7 @@ def load_interactions(request):
|
||||||
|
|
||||||
@ajax_login_required
|
@ajax_login_required
|
||||||
def load_activities(request):
|
def load_activities(request):
|
||||||
user_id = request.REQUEST.get('user_id', None)
|
user_id = request.GET.get('user_id', None)
|
||||||
categories = request.GET.getlist('category') or request.GET.getlist('category[]')
|
categories = request.GET.getlist('category') or request.GET.getlist('category[]')
|
||||||
if user_id and 'null' not in user_id:
|
if user_id and 'null' not in user_id:
|
||||||
user_id = int(user_id)
|
user_id = int(user_id)
|
||||||
|
@ -1467,11 +1467,11 @@ def load_activities(request):
|
||||||
user_id = user.pk
|
user_id = user.pk
|
||||||
|
|
||||||
public = user_id != request.user.pk
|
public = user_id != request.user.pk
|
||||||
page = max(1, int(request.REQUEST.get('page', 1)))
|
page = max(1, int(request.GET.get('page', 1)))
|
||||||
limit = request.REQUEST.get('limit', 4)
|
limit = request.GET.get('limit', 4)
|
||||||
activities, has_next_page = MActivity.user(user_id, page=page, limit=limit, public=public,
|
activities, has_next_page = MActivity.user(user_id, page=page, limit=limit, public=public,
|
||||||
categories=categories)
|
categories=categories)
|
||||||
format = request.REQUEST.get('format', None)
|
format = request.GET.get('format', None)
|
||||||
|
|
||||||
data = {
|
data = {
|
||||||
'activities': activities,
|
'activities': activities,
|
||||||
|
|
|
@ -4,6 +4,7 @@ from utils import log as logging
|
||||||
class DumpRequestMiddleware:
|
class DumpRequestMiddleware:
|
||||||
def process_request(self, request):
|
def process_request(self, request):
|
||||||
if settings.DEBUG:
|
if settings.DEBUG:
|
||||||
request_items = request.REQUEST.items()
|
request_data = request.POST or request.GET
|
||||||
|
request_items = request_data.items()
|
||||||
if request_items:
|
if request_items:
|
||||||
logging.debug("~BC~FK%s" % dict(request_items))
|
logging.debug("~BC~FK%s" % dict(request_items))
|
|
@ -99,8 +99,8 @@ class S3Store:
|
||||||
return self.s3.create_bucket(bucket_name)
|
return self.s3.create_bucket(bucket_name)
|
||||||
|
|
||||||
def save_profile_picture(self, user_id, filename, image_body):
|
def save_profile_picture(self, user_id, filename, image_body):
|
||||||
mimetype, extension = self._extract_mimetype(filename)
|
content_type, extension = self._extract_content_type(filename)
|
||||||
if not mimetype or not extension:
|
if not content_type or not extension:
|
||||||
return
|
return
|
||||||
|
|
||||||
image_name = 'profile_%s.%s' % (int(time.time()), extension)
|
image_name = 'profile_%s.%s' % (int(time.time()), extension)
|
||||||
|
@ -108,39 +108,39 @@ class S3Store:
|
||||||
image = ImageOps.resize_image(image_body, 'fullsize', fit_to_size=False)
|
image = ImageOps.resize_image(image_body, 'fullsize', fit_to_size=False)
|
||||||
if image:
|
if image:
|
||||||
key = 'avatars/%s/large_%s' % (user_id, image_name)
|
key = 'avatars/%s/large_%s' % (user_id, image_name)
|
||||||
self._save_object(key, image, mimetype=mimetype)
|
self._save_object(key, image, content_type=content_type)
|
||||||
|
|
||||||
image = ImageOps.resize_image(image_body, 'thumbnail', fit_to_size=True)
|
image = ImageOps.resize_image(image_body, 'thumbnail', fit_to_size=True)
|
||||||
if image:
|
if image:
|
||||||
key = 'avatars/%s/thumbnail_%s' % (user_id, image_name)
|
key = 'avatars/%s/thumbnail_%s' % (user_id, image_name)
|
||||||
self._save_object(key, image, mimetype=mimetype)
|
self._save_object(key, image, content_type=content_type)
|
||||||
|
|
||||||
return image and image_name
|
return image and image_name
|
||||||
|
|
||||||
def _extract_mimetype(self, filename):
|
def _extract_content_type(self, filename):
|
||||||
mimetype = mimetypes.guess_type(filename)[0]
|
content_type = mimetypes.guess_type(filename)[0]
|
||||||
extension = None
|
extension = None
|
||||||
|
|
||||||
if mimetype == 'image/jpeg':
|
if content_type == 'image/jpeg':
|
||||||
extension = 'jpg'
|
extension = 'jpg'
|
||||||
elif mimetype == 'image/png':
|
elif content_type == 'image/png':
|
||||||
extension = 'png'
|
extension = 'png'
|
||||||
elif mimetype == 'image/gif':
|
elif content_type == 'image/gif':
|
||||||
extension = 'gif'
|
extension = 'gif'
|
||||||
|
|
||||||
return mimetype, extension
|
return content_type, extension
|
||||||
|
|
||||||
def _make_key(self):
|
def _make_key(self):
|
||||||
return Key(bucket=self.bucket)
|
return Key(bucket=self.bucket)
|
||||||
|
|
||||||
def _save_object(self, key, file_object, mimetype=None):
|
def _save_object(self, key, file_object, content_type=None):
|
||||||
k = self._make_key()
|
k = self._make_key()
|
||||||
k.key = key
|
k.key = key
|
||||||
file_object.seek(0)
|
file_object.seek(0)
|
||||||
|
|
||||||
if mimetype:
|
if content_type:
|
||||||
k.set_contents_from_file(file_object, headers={
|
k.set_contents_from_file(file_object, headers={
|
||||||
'Content-Type': mimetype,
|
'Content-Type': content_type,
|
||||||
})
|
})
|
||||||
else:
|
else:
|
||||||
k.set_contents_from_file(file_object)
|
k.set_contents_from_file(file_object)
|
||||||
|
|
|
@ -96,4 +96,4 @@ class required_params(object):
|
||||||
return HttpResponse(json.encode({
|
return HttpResponse(json.encode({
|
||||||
'message': message,
|
'message': message,
|
||||||
'code': -1,
|
'code': -1,
|
||||||
}), mimetype="application/json", status=status_code)
|
}), content_type="application/json", status=status_code)
|
Loading…
Add table
Reference in a new issue