Fix other instances of request.REQUEST

This commit is contained in:
jmath1 2020-06-11 02:43:05 -04:00
parent cd953e8872
commit 08f0ffd12e
5 changed files with 15 additions and 12 deletions

3
.vscode/settings.json vendored Normal file
View file

@ -0,0 +1,3 @@
{
"python.pythonPath": "venv/bin/python3.7"
}

View file

@ -103,7 +103,7 @@ def force_push(request):
"""
user = get_user(request)
feed_id = request.GET['feed_id']
count = int(request.REQUEST.get('count', 1))
count = int(request.GET.get('count', 1))
logging.user(user, "~BM~FWForce pushing %s stories: ~SB%s" % (count, Feed.get_by_id(feed_id)))
sent_count, user_count = MUserFeedNotification.push_feed_notifications(feed_id, new_stories=count, force=True)

View file

@ -551,8 +551,8 @@ def interactions_count(request):
def feed_unread_count(request):
start = time.time()
user = request.user
feed_ids = request.REQUEST.getlist('feed_id') or request.REQUEST.getlist('feed_id[]')
force = request.REQUEST.get('force', False)
feed_ids = request.GET.getlist('feed_id') or request.GET.getlist('feed_id[]')
force = request.GET.get('force', False)
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))
@ -2231,7 +2231,7 @@ def add_feature(request):
@json.json_view
def load_features(request):
user = get_user(request)
page = max(int(request.REQUEST.get('page', 0)), 0)
page = max(int(request.GET.get('page', 0)), 0)
if page > 1:
logging.user(request, "~FBBrowse features: ~SBPage #%s" % (page+1))
features = Feature.objects.all()[page*3:(page+1)*3+1].values()
@ -2612,7 +2612,7 @@ def send_story_email(request):
@json.json_view
def load_tutorial(request):
if request.REQUEST.get('finished'):
if request.GET.get('finished'):
logging.user(request, '~BY~FW~SBFinishing Tutorial')
return {}
else:

View file

@ -13,11 +13,11 @@ from utils.user_functions import get_user, ajax_login_required, admin_only
def load_recommended_feed(request):
user = get_user(request)
page = max(int(request.REQUEST.get('page', 0)), 0)
page = max(int(request.GET.get('page', 0)), 0)
usersub = None
refresh = request.REQUEST.get('refresh')
refresh = request.GET.get('refresh')
now = datetime.datetime.now
unmoderated = request.REQUEST.get('unmoderated', False) == 'true'
unmoderated = request.GET.get('unmoderated', False) == 'true'
if unmoderated:
recommended_feeds = RecommendedFeed.objects.filter(is_public=False, declined_date__isnull=True)[page:page+2]
@ -102,7 +102,7 @@ def approve_feed(request):
@admin_only
@ajax_login_required
def decline_feed(request):
feed_id = request.POST['feed_id']
feed_id = request.GET['feed_id']
feed = get_object_or_404(Feed, pk=int(feed_id))
recommended_feeds = RecommendedFeed.objects.filter(feed=feed)

View file

@ -540,9 +540,9 @@ def original_text(request):
@required_params('story_hash')
def original_story(request):
story_hash = request.REQUEST.get('story_hash')
force = request.REQUEST.get('force', False)
debug = request.REQUEST.get('debug', False)
story_hash = request.GET.get('story_hash')
force = request.GET.get('force', False)
debug = request.GET.get('debug', False)
story, _ = MStory.find_story(story_hash=story_hash)