From 991cc3855d208c28869e3f0f826142162f8fbd4c Mon Sep 17 00:00:00 2001
From: Jonathan Math <jonathanamath@gmail.com>
Date: Mon, 12 Oct 2020 12:30:40 +0700
Subject: [PATCH] bug fixes from missed django/python upgrade

---
 apps/api/views.py             | 2 +-
 apps/feed_import/views.py     | 4 ++--
 apps/reader/views.py          | 4 ++--
 apps/recommendations/views.py | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/api/views.py b/apps/api/views.py
index b378a0355..f7c24e7be 100644
--- a/apps/api/views.py
+++ b/apps/api/views.py
@@ -399,7 +399,7 @@ def share_story(request, token=None):
 def save_story(request, token=None):
     code      = 0
     story_url = request.POST['story_url']
-    user_tags = request.POST.getlist('user_tags') or request.REQUEST.getlist('user_tags[]') or []
+    user_tags = request.POST.getlist('user_tags') or request.POST.getlist('user_tags[]') or []
     add_user_tag = request.POST.get('add_user_tag', None)
     title     = request.POST['title']
     content   = request.POST.get('content', None)
diff --git a/apps/feed_import/views.py b/apps/feed_import/views.py
index bee11fe25..d7e255cff 100644
--- a/apps/feed_import/views.py
+++ b/apps/feed_import/views.py
@@ -68,7 +68,7 @@ def opml_upload(request):
             code = -1
             
     return HttpResponse(json.encode(dict(message=message, code=code, payload=payload)),
-                        mimetype='text/html')
+                        content_type='text/html')
 
 def opml_export(request):
     user     = get_user(request)
@@ -78,7 +78,7 @@ def opml_export(request):
     exporter = OPMLExporter(user)
     opml     = exporter.process()
     
-    response = HttpResponse(opml, mimetype='text/xml')
+    response = HttpResponse(opml, content_type='text/xml')
     response['Content-Disposition'] = 'attachment; filename=NewsBlur-%s-%s' % (
         user.username,
         now.strftime('%Y-%m-%d')
diff --git a/apps/reader/views.py b/apps/reader/views.py
index fe983f1a5..fc275ce3a 100644
--- a/apps/reader/views.py
+++ b/apps/reader/views.py
@@ -1567,9 +1567,9 @@ def complete_river(request):
 @json.json_view
 def unread_story_hashes__old(request):
     user              = get_user(request)
-    feed_ids          = request.REQUEST.getlist('feed_id') or request.REQUEST.getlist('feed_id[]')
+    feed_ids          = request.POST.getlist('feed_id') or request.POST.getlist('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.POST.get('include_timestamps', False))
     usersubs = {}
     
     if not feed_ids:
diff --git a/apps/recommendations/views.py b/apps/recommendations/views.py
index 2c70f203b..b7bd277c0 100644
--- a/apps/recommendations/views.py
+++ b/apps/recommendations/views.py
@@ -15,7 +15,7 @@ def load_recommended_feed(request):
     page        = max(int(request.GET.get('page', 0)), 0)
     usersub     = None
     refresh     = request.GET.get('refresh')
-    now         = datetime.datetime.now
+    now         = datetime.datetime.now()
     unmoderated = request.GET.get('unmoderated', False) == 'true'
     
     if unmoderated: