fix tests

biostar/__init__.py

@@ -2,6 +2,6 @@
     from .celery import app as celery_app
     __all__ = ['celery_app']
 except ImportError as exc:
-    print(f'celery error {exc}')
+    pass
 
 VERSION = '2.3.6'

biostar/accounts/settings.py

@@ -9,9 +9,6 @@
 # Should the site allow signup.
 ALLOW_SIGNUP = False
 
-# Private key used to validate external logins. Must be changed in production
-LOGIN_PRIVATE_KEY = "private-key"
-
 ADMINS = [
     ("Admin User", "admin@localhost")
 ]
@@ -151,4 +148,3 @@
 ]
 
 GOOGLE_TRACKER = ""
-

biostar/accounts/test/test_accounts.py

@@ -111,25 +111,6 @@ def test_invalid_creds(self):
 
             self.assertEqual(resp.status_code, 200)
 
-    def test_external_login(self):
-        """Test login with external login"""
-
-        signer = signing.Signer(settings.LOGIN_PRIVATE_KEY)
-        payload = signer.sign("[email protected]")
-
-        data = {"payload": payload}
-        url = reverse("external")
-
-        request = fake_request(url=url, data=data, user=self.user, method="GET")
-        response = views.external_login(request=request)
-
-        self.assertEqual(response.status_code, 302)
-
-        user = models.User.objects.filter(email="[email protected]")
-        self.assertTrue(user.exists())
-
-        return
-
 
 @override_settings(RECAPTCHA_PRIVATE_KEY="", RECAPTCHA_PUBLIC_KEY="")
 class SignUpTest(TestCase):

biostar/accounts/urls.py

@@ -33,9 +33,6 @@
     # Message urls
     path(r'inbox/', views.message_list, name='inbox'),
 
-    # External url login
-    path(r'external/', views.external_login, name="external"),
-
     # Used for 3rd party logins.
     path("social/", include('allauth.urls')),
 

biostar/accounts/views.py

@@ -234,7 +234,7 @@ def debug_user(request):
     user = profile.user
     login(request, user, backend="django.contrib.auth.backends.ModelBackend")
 
-    logger.info(f"""uid={request.user.profile.uid} impersonated 
+    logger.info(f"""uid={request.user.profile.uid} impersonated
                     uid={profile.uid}.""")
 
     return redirect("/")
@@ -317,34 +317,6 @@ def email_verify_account(request, uidb64, token):
     return redirect("/")
 
 
-def external_login(request):
-    """Login or signup a user."""
-    payload = request.GET.get("payload", "")
-
-    try:
-        signer = signing.Signer(settings.LOGIN_PRIVATE_KEY)
-        user_email = signer.unsign(payload)
-        user = User.objects.filter(email=user_email).first()
-
-        if not user:
-            name = user_email.split("@")[0]
-            user = User.objects.create(email=user_email, first_name=name,
-                                       password=str(get_uuid(16)))
-            user.username = name.split()[0] + str(get_uuid(8))
-            user.save()
-            msg = f"Signed up, <a href={reverse('password_reset')}><b> Please reset your password.</b></a>"
-            messages.success(request, mark_safe(msg))
-
-        login(request, user, backend="django.contrib.auth.backends.ModelBackend")
-        messages.success(request, "Logged in!")
-        return redirect("/")
-
-    except Exception as exc:
-        logger.error(f"Error:{exc}")
-        messages.error(request, "Error unsigning.")
-
-    return redirect("/")
-
 
 #@limited(key=RATELIMIT_KEY, rate=PASSWORD_RESET_RATE)
 def password_reset(request):
@@ -380,4 +352,3 @@ def password_reset_complete(request):
 
     return PasswordResetCompleteView.as_view(extra_context=context,
                                              template_name="accounts/password_reset_complete.html")(request=request)
-

biostar/forum/api.py

@@ -181,7 +181,7 @@ def traffic(request):
     """
     now = datetime.now()
     start = now - timedelta(minutes=60)
-
+    start = start.now()
     post_views = PostView.objects.filter(date__gt=start).exclude(date__gt=now).distinct('ip').count()
 
     data = {

biostar/forum/tasks.py

@@ -222,6 +222,9 @@ def spam_check(uid):
     post = Post.objects.filter(uid=uid).first()
     author = post.author
 
+    if not settings.CLASSIFY_SPAM:
+        return
+
     # Automated spam disabled in for trusted user
     if author.profile.trusted or author.profile.score > 50:
         return
@@ -316,8 +319,8 @@ def herald_emails(uid):
         # Get the next set of emails
         end = idx + batch_size
         rec_list = emails[idx:end]
-        send_email(template_name=email_template, extra_context=context, name=author, from_email=from_email,
-                   recipient_list=rec_list, mass=True)
+        send_email(template_name=email_template, extra_context=context, name=author,
+        from_email=from_email,recipient_list=rec_list, mass=True)
 
     return
 

biostar/forum/templates/banners/menu-header.html

@@ -57,7 +57,7 @@
     </a>
 
     <a class="item {% activate tab "planet" %} " href="{% url 'blog_list' %}">
-        <i class="rss icon"></i> Planet {% count_badge counts.planet_count %}
+        <i class="rss icon"></i> Planet
     </a>
 
     {% if request.user.profile.is_moderator %}

biostar/forum/templatetags/forum_tags.py

@@ -362,7 +362,7 @@ def form_errors(form, wmd_prefix='', override_content=False):
         for field in form:
             for error in field.errors:
                 # wmd_prefix is required when dealing with 'content' field.
-                field_id = wmd_prefix if (override_content and field.name is 'content') else field.id_for_label
+                field_id = wmd_prefix if (override_content and field.name == 'content') else field.id_for_label
                 errorlist.append((f'{field.name}:', error, field_id))
 
     except Exception as exc:

biostar/recipes/factory.py

@@ -259,7 +259,6 @@ def get_field_types(project=None):
         const.TEXTBOX: char_field,
         const.FLOAT: float_field,
         const.CHECKBOX: checkbox_field,
-        const.SQL: sqlfield,
         const.UPLOAD: upload_field
     }
 

biostar/recipes/settings.py

@@ -5,9 +5,6 @@
 # Django debug flag.
 DEBUG = True
 
-# Private key used to validate external logins
-LOGIN_PRIVATE_KEY = SECRET_KEY
-
 SEARCH_CHAR_MIN = 2
 
 SOCIALACCOUNT_EMAIL_VERIFICATION = None