resolves OSQA-729, encode OpenID query dict using the django smart unicode utility...

[osqa.git] / forum / management / commands / send_email_alerts.py

diff --git a/forum/management/commands/send_email_alerts.py b/forum/management/commands/send_email_alerts.py
index 6f68f2c3060914ff5ba93added0b52c066123f22..06cad53e1903d4956406d99d535a8d6967fbb96a 100644 (file)
--- a/forum/management/commands/send_email_alerts.py
+++ b/forum/management/commands/send_email_alerts.py
@@ -1,5 +1,6 @@
 import datetime
 from forum.models import *
 import datetime
 from forum.models import *

+from forum import settings

 from django.db import models
 from forum.utils.mail import send_template_email
 from django.core.management.base import NoArgsCommand
 from django.db import models
 from forum.utils.mail import send_template_email
 from django.core.management.base import NoArgsCommand


@@ -11,8 +12,6 @@ SHOW_N_MORE_ACTIVE_NEW_MEMBERS = 5
 SUB_QUESTION_LIST_LENGTH = 5
 TRY_N_USER_TAGS = 5
 
 SUB_QUESTION_LIST_LENGTH = 5
 TRY_N_USER_TAGS = 5
 

-
-

 class DigestQuestionsIndex(object):
     def __init__(self, from_date):
         self.from_date = from_date
 class DigestQuestionsIndex(object):
     def __init__(self, from_date):
         self.from_date = from_date


@@ -92,11 +91,24 @@ class Command(NoArgsCommand):
 
         EMAIL_DIGEST_FLAG.set_value(digest_control)
 
 
         EMAIL_DIGEST_FLAG.set_value(digest_control)
 

-        users = User.objects.filter(subscription_settings__enable_notifications=True, subscription_settings__send_digest=True)
+        users = User.objects.filter(subscription_settings__enable_notifications=True,
+                                    subscription_settings__send_digest=True)
+
+        # Send digest only to active users
+        if settings.SEND_DIGEST_ONLY_TO_ACTIVE_USERS:
+            users = users.filter(is_active=True)
+
+        # Send digest only to users with validated emails
+        if settings.SEND_DIGEST_ONLY_TO_VALIDATED_USERS:
+            users = users.filter(email_isvalid=True)
+

         new_members = User.objects.filter(is_active=True, date_joined__gt=from_date).annotate(n_actions=models.Count('actions')).order_by('-n_actions')
 
         new_member_count = new_members.count()
 
         new_members = User.objects.filter(is_active=True, date_joined__gt=from_date).annotate(n_actions=models.Count('actions')).order_by('-n_actions')
 
         new_member_count = new_members.count()
 

+        # The number of the flagged content for the day
+        flagged_count = Flag.objects.filter(flagged_at__gt=datetime.datetime.today()-datetime.timedelta(days=1)).count()
+

         if new_member_count >= SHOW_N_MORE_ACTIVE_NEW_MEMBERS:
             new_members = new_members[:SHOW_N_MORE_ACTIVE_NEW_MEMBERS]
             show_all_users = True
         if new_member_count >= SHOW_N_MORE_ACTIVE_NEW_MEMBERS:
             new_members = new_members[:SHOW_N_MORE_ACTIVE_NEW_MEMBERS]
             show_all_users = True


@@ -105,6 +117,9 @@ class Command(NoArgsCommand):
 
         digest = DigestQuestionsIndex(from_date)
 
 
         digest = DigestQuestionsIndex(from_date)
 

+        if (not new_member_count) and (not digest.count):
+            return
+

         send_template_email(users, "notifications/digest.html", locals())
 
 
         send_template_email(users, "notifications/digest.html", locals())