Merge branch 'evgenyfadeev/master'

Conflicts:
	.gitignore
	INSTALL
	TODO
	cnprog.wsgi
	django_authopenid/urls.py
	django_authopenid/views.py
	drop-all-tables.sh
	forum/auth.py
	forum/managers.py
	forum/models.py
	forum/templatetags/extra_tags.py
	forum/views.py
	locale/es/LC_MESSAGES/django.mo
	locale/es/LC_MESSAGES/django.po
	settings.py
	settings_local.py.dist
	sql_scripts/update_2009_01_25_001.sql
	sql_scripts/update_2009_02_26_001.sql
	sql_scripts/update_2009_04_10_001.sql
	templates/authopenid/confirm_email.txt
	templates/authopenid/sendpw_email.txt
	templates/content/js/compress.bat
	templates/content/js/flot-build.bat
	templates/content/style/style.css
	templates/footer.html
	templates/question.html
	templates/user_reputation.html
	templates/user_stats.html
	templates/user_votes.html
	templates/users_questions.html
	urls.py

2 files changed, 295 insertions, 23 deletions

diff --git a/forum/management/commands/send_email_alerts.py b/forum/management/commands/send_email_alerts.py
index 3c37aaa3..283d5683 100644
--- a/forum/management/commands/send_email_alerts.py
+++ b/forum/management/commands/send_email_alerts.py
@@ -1,10 +1,21 @@
 from django.core.management.base import NoArgsCommand
 from django.db import connection
+from django.db.models import Q, F
 from forum.models import *
-import collections
+<<<<<<< HEAD:forum/management/commands/send_email_alerts.py
+=======
+from forum import const 
+>>>>>>> 82d35490db90878f013523c4d1a5ec3af2df8b23:forum/management/commands/send_email_alerts.py
 from django.core.mail import EmailMessage
 from django.utils.translation import ugettext as _
+from django.utils.translation import ungettext
+import datetime
 import settings
+<<<<<<< HEAD:forum/management/commands/send_email_alerts.py
+=======
+import logging
+from utils.odict import OrderedDict
+>>>>>>> 82d35490db90878f013523c4d1a5ec3af2df8b23:forum/management/commands/send_email_alerts.py
 
 class Command(NoArgsCommand):
     def handle_noargs(self,**options):
@@ -15,27 +26,257 @@ class Command(NoArgsCommand):
         finally:
             connection.close()
 
+    def get_updated_questions_for_user(self,user):
+<<<<<<< HEAD:forum/management/commands/send_email_alerts.py
+        q_sel = []
+        q_ask = []
+        q_ans = []
+        q_all = []
+=======
+        q_sel = None 
+        q_ask = None 
+        q_ans = None 
+        q_all = None 
+>>>>>>> 82d35490db90878f013523c4d1a5ec3af2df8b23:forum/management/commands/send_email_alerts.py
+        now = datetime.datetime.now()
+        Q_set1 = Question.objects.exclude(
+                                        last_activity_by=user,
+                                  ).exclude(
+                                        last_activity_at__lt=user.date_joined
+                                  ).filter(
+                                        Q(viewed__who=user,viewed__when__lt=F('last_activity_at')) | \
+                                        ~Q(viewed__who=user)
+                                  ).exclude(
+                                        deleted=True
+                                  ).exclude(
+                                        closed=True
+                                  )
+<<<<<<< HEAD:forum/management/commands/send_email_alerts.py
+=======
+            
+>>>>>>> 82d35490db90878f013523c4d1a5ec3af2df8b23:forum/management/commands/send_email_alerts.py
+        user_feeds = EmailFeedSetting.objects.filter(subscriber=user).exclude(frequency='n')
+        for feed in user_feeds:
+            cutoff_time = now - EmailFeedSetting.DELTA_TABLE[feed.frequency]
+            if feed.reported_at == None or feed.reported_at <= cutoff_time:
+<<<<<<< HEAD:forum/management/commands/send_email_alerts.py
+                Q_set = Q_set1.exclude(last_activity_at__gt=cutoff_time)
+=======
+                Q_set = Q_set1.exclude(last_activity_at__gt=cutoff_time)#report these excluded later
+>>>>>>> 82d35490db90878f013523c4d1a5ec3af2df8b23:forum/management/commands/send_email_alerts.py
+                feed.reported_at = now
+                feed.save()#may not actually report anything, depending on filters below
+                if feed.feed_type == 'q_sel':
+                    q_sel = Q_set.filter(followed_by=user)
+<<<<<<< HEAD:forum/management/commands/send_email_alerts.py
+                    q_sel.cutoff_time = cutoff_time
+=======
+                    q_sel.cutoff_time = cutoff_time #store cutoff time per query set
+>>>>>>> 82d35490db90878f013523c4d1a5ec3af2df8b23:forum/management/commands/send_email_alerts.py
+                elif feed.feed_type == 'q_ask':
+                    q_ask = Q_set.filter(author=user)
+                    q_ask.cutoff_time = cutoff_time
+                elif feed.feed_type == 'q_ans':
+                    q_ans = Q_set.filter(answers__author=user)
+                    q_ans.cutoff_time = cutoff_time
+                elif feed.feed_type == 'q_all':
+<<<<<<< HEAD:forum/management/commands/send_email_alerts.py
+                    q_all = Q_set
+                    q_all.cutoff_time = cutoff_time
+        #build list in this order
+        q_tbl = {} 
+        def extend_question_list(src, dst):
+            if isinstance(src,list):
+                return
+            cutoff_time = src.cutoff_time
+            for q in src:
+                if q in dst:
+                    if cutoff_time < dst[q]:
+                        dst[q] = cutoff_time
+                else:
+                    dst[q] = cutoff_time
+
+        extend_question_list(q_sel, q_tbl)
+        extend_question_list(q_ask, q_tbl)
+        extend_question_list(q_ans, q_tbl)
+        extend_question_list(q_all, q_tbl)
+
+        ctype = ContentType.objects.get_for_model(Question)
+        out = {}
+        for q, cutoff_time in q_tbl.items():
+            #todo use Activity, but first start keeping more Activity records
+            #act = Activity.objects.filter(content_type=ctype, object_id=q.id)
+            #get info on question edits, answer edits, comments
+            out[q] = {}
+            q_rev = QuestionRevision.objects.filter(question=q,revised_at__lt=cutoff_time)
+            q_rev = q_rev.exclude(author=user)
+            out[q]['q_rev'] = len(q_rev)
+            if len(q_rev) > 0 and q.added_at == q_rev[0].revised_at:
+                out[q]['q_rev'] = 0
+                out[q]['new_q'] = True
+            else:
+                out[q]['new_q'] = False
+                
+            new_ans = Answer.objects.filter(question=q,added_at__lt=cutoff_time)
+            new_ans = new_ans.exclude(author=user)
+            out[q]['new_ans'] = len(new_ans)
+            ans_rev = AnswerRevision.objects.filter(answer__question=q,revised_at__lt=cutoff_time)
+            ans_rev = ans_rev.exclude(author=user)
+            out[q]['ans_rev'] = len(ans_rev)
+        return out 
+
+    def __act_count(self,string,number,output):
+=======
+                    if user.tag_filter_setting == 'ignored':
+                        ignored_tags = Tag.objects.filter(user_selections___reason='bad',user_selections__user=user)
+                        q_all = Q_set.exclude( tags__in=ignored_tags )
+                    else:
+                        selected_tags = Tag.objects.filter(user_selections___reason='good',user_selections__user=user)
+                        q_all = Q_set.filter( tags__in=selected_tags )
+                    q_all.cutoff_time = cutoff_time
+        #build list in this order
+        q_list = OrderedDict()
+        def extend_question_list(src, dst):
+            """src is a query set with questions
+               or an empty list
+                dst - is an ordered dictionary
+            """
+            if src is None:
+                return #will not do anything if subscription of this type is not used
+            cutoff_time = src.cutoff_time
+            for q in src:
+                if q in dst:
+                    if cutoff_time < dst[q]['cutoff_time']:
+                        dst[q]['cutoff_time'] = cutoff_time
+                else:
+                    #initialise a questions metadata dictionary to use for email reporting
+                    dst[q] = {'cutoff_time':cutoff_time}
+
+        extend_question_list(q_sel, q_list)
+        extend_question_list(q_ask, q_list)
+        extend_question_list(q_ans, q_list)
+        extend_question_list(q_all, q_list)
+
+        ctype = ContentType.objects.get_for_model(Question)
+        EMAIL_UPDATE_ACTIVITY = const.TYPE_ACTIVITY_QUESTION_EMAIL_UPDATE_SENT
+        for q, meta_data in q_list.items():
+            #todo use Activity, but first start keeping more Activity records
+            #act = Activity.objects.filter(content_type=ctype, object_id=q.id)
+            #because currently activity is not fully recorded to through
+            #revision records to see what kind modifications were done on
+            #the questions and answers
+            try:
+                update_info = Activity.objects.get(content_type=ctype, 
+                                                    object_id=q.id,
+                                                    activity_type=EMAIL_UPDATE_ACTIVITY)
+                emailed_at = update_info.active_at
+            except Activity.DoesNotExist:
+                update_info = Activity(user=user, content_object=q, activity_type=EMAIL_UPDATE_ACTIVITY)
+                emailed_at = datetime.datetime(1970,1,1)#long time ago
+            except Activity.MultipleObjectsReturned:
+                raise Exception('server error - multiple question email activities found per user-question pair')
+
+            q_rev = QuestionRevision.objects.filter(question=q,\
+                                                    revised_at__lt=cutoff_time,\
+                                                    revised_at__gt=emailed_at)
+            q_rev = q_rev.exclude(author=user)
+            meta_data['q_rev'] = len(q_rev)
+            if len(q_rev) > 0 and q.added_at == q_rev[0].revised_at:
+                meta_data['q_rev'] = 0
+                meta_data['new_q'] = True
+            else:
+                meta_data['new_q'] = False
+                
+            new_ans = Answer.objects.filter(question=q,\
+                                            added_at__lt=cutoff_time,\
+                                            added_at__gt=emailed_at)
+            new_ans = new_ans.exclude(author=user)
+            meta_data['new_ans'] = len(new_ans)
+            ans_rev = AnswerRevision.objects.filter(answer__question=q,\
+                                            revised_at__lt=cutoff_time,\
+                                            revised_at__gt=emailed_at)
+            ans_rev = ans_rev.exclude(author=user)
+            meta_data['ans_rev'] = len(ans_rev)
+            if len(q_rev) == 0 and len(new_ans) == 0 and len(ans_rev) == 0:
+                meta_data['nothing_new'] = True
+            else:
+                meta_data['nothing_new'] = False
+                update_info.active_at = now
+                update_info.save() #save question email update activity 
+        return q_list 
+
+    def __action_count(self,string,number,output):
+>>>>>>> 82d35490db90878f013523c4d1a5ec3af2df8b23:forum/management/commands/send_email_alerts.py
+        if number > 0:
+            output.append(_(string) % {'num':number})
+
     def send_email_alerts(self):
-        report_time = datetime.datetime.now()
-        feeds = EmailFeed.objects.all()
-        user_ctype = ContentType.objects.get_for_model(User)
-
-        #lists of update messages keyed by email address
-        update_collection = collections.defaultdict(list) 
-        for feed in feeds:
-            update_summary = feed.get_update_summary()
-            if update_summary != None:
-                email = feed.get_email()
-                update_collection[email].append(update_summary)
-                feed.reported_at = report_time
-                feed.save()
-
-        for email, updates in update_collection.items():
-            text = '\n'.join(updates)
-            subject = _('updates from website')
-            print 'sent %s to %s' % (updates,email)
-            msg = EmailMessage(subject, text, settings.DEFAULT_FROM_EMAIL, [email])
-            msg.content_subtype = 'html'
-            msg.send()
 
-            
+<<<<<<< HEAD:forum/management/commands/send_email_alerts.py
+        for user in User.objects.all():
+            q_list = self.get_updated_questions_for_user(user)
+            num_q = len(q_list)
+=======
+        #todo: move this to template
+        for user in User.objects.all():
+            q_list = self.get_updated_questions_for_user(user)
+            num_q = 0
+            num_moot = 0
+            for meta_data in q_list.values():
+                if meta_data['nothing_new'] == False:
+                    num_q += 1
+                else:
+                    num_moot += 1
+>>>>>>> 82d35490db90878f013523c4d1a5ec3af2df8b23:forum/management/commands/send_email_alerts.py
+            if num_q > 0:
+                url_prefix = settings.APP_URL
+                subject = _('email update message subject')
+                text = ungettext('%(name)s, this is an update message header for a question', 
+                            '%(name)s, this is an update message header for %(num)d questions',num_q) \
+                                % {'num':num_q, 'name':user.username}
+
+                text += '<ul>'
+<<<<<<< HEAD:forum/management/commands/send_email_alerts.py
+                for q, act in q_list.items():
+                    act_list = []
+                    if act['new_q']:
+                        act_list.append(_('new question'))
+                    self.__act_count('%(num)d rev', act['q_rev'],act_list)
+                    self.__act_count('%(num)d ans', act['new_ans'],act_list)
+                    self.__act_count('%(num)d ans rev',act['ans_rev'],act_list)
+                    act_token = ', '.join(act_list)
+                    text += '<li><a href="%s?sort=latest">%s</a> <font color="#777777">(%s)</font></li>' \
+                                % (url_prefix + q.get_absolute_url(), q.title, act_token)
+                text += '</ul>'
+=======
+                for q, meta_data in q_list.items():
+                    act_list = []
+                    if meta_data['nothing_new']:
+                        continue
+                    else:
+                        if meta_data['new_q']:
+                            act_list.append(_('new question'))
+                        self.__action_count('%(num)d rev', meta_data['q_rev'],act_list)
+                        self.__action_count('%(num)d ans', meta_data['new_ans'],act_list)
+                        self.__action_count('%(num)d ans rev',meta_data['ans_rev'],act_list)
+                        act_token = ', '.join(act_list)
+                        text += '<li><a href="%s?sort=latest">%s</a> <font color="#777777">(%s)</font></li>' \
+                                    % (url_prefix + q.get_absolute_url(), q.title, act_token)
+                text += '</ul>'
+                if num_moot > 0:
+                    text += '<p></p>'
+                    text += ungettext('There is also one question which was recently '\
+                                +'updated but you might not have seen its latest version.',
+                            'There are also %(num)d more questions which were recently updated '\
+                            +'but you might not have seen their latest version.',num_moot) \
+                                % {'num':num_moot,}
+                    text += _('Perhaps you could look up previously sent forum reminders in your mailbox.')
+                    text += '</p>'
+
+>>>>>>> 82d35490db90878f013523c4d1a5ec3af2df8b23:forum/management/commands/send_email_alerts.py
+                link = url_prefix + user.get_profile_url() + '?sort=email_subscriptions'
+                text += _('go to %(link)s to change frequency of email updates or %(email)s administrator') \
+                                % {'link':link, 'email':settings.ADMINS[0][1]}
+                msg = EmailMessage(subject, text, settings.DEFAULT_FROM_EMAIL, [user.email])
+                msg.content_subtype = 'html'
+                msg.send()
diff --git a/forum/management/commands/subscribe_everyone.py b/forum/management/commands/subscribe_everyone.py
new file mode 100644
index 00000000..3f8da9ec
--- /dev/null
+++ b/forum/management/commands/subscribe_everyone.py
@@ -0,0 +1,31 @@
+from django.core.management.base import NoArgsCommand
+from django.db import connection
+from django.db.models import Q, F
+from forum.models import *
+from django.core.mail import EmailMessage
+from django.utils.translation import ugettext as _
+from django.utils.translation import ungettext
+import datetime
+import settings
+
+class Command(NoArgsCommand):
+    def handle_noargs(self,**options):
+        try:
+            self.subscribe_everyone()
+        except Exception, e:
+            print e
+        finally:
+            connection.close()
+
+    def subscribe_everyone(self):
+
+        feed_type_info = EmailFeedSetting.FEED_TYPES
+        for user in User.objects.all():
+            for feed_type in feed_type_info:
+                try:
+                    feed_setting = EmailFeedSetting.objects.get(subscriber=user,feed_type = feed_type[0])
+                except EmailFeedSetting.DoesNotExist:
+                    feed_setting = EmailFeedSetting(subscriber=user,feed_type=feed_type[0])
+                feed_setting.frequency = 'w'
+                feed_setting.reported_at = None
+                feed_setting.save()