Merge branch '0.11.x' into pr-849-wip

Author: evgenyfadeev

askbot/conf/email.py

@@ -13,10 +13,10 @@
 EMAIL_SUBJECT_PREFIX = getattr(django_settings, 'EMAIL_SUBJECT_PREFIX', '')
 
 EMAIL = livesettings.ConfigurationGroup(
-            'EMAIL',
-            _('Email and email alert settings'),
-            super_group=LOGIN_USERS_COMMUNICATION
-        )
+    'EMAIL',
+    _('Email and email alert settings'),
+    super_group=LOGIN_USERS_COMMUNICATION
+)
 
 settings.register(
     livesettings.StringValue(
@@ -25,18 +25,18 @@
         default=EMAIL_SUBJECT_PREFIX,
         description=_('Prefix for the email subject line'),
         help_text=_(
-                'This setting takes default from the django setting '
-                'EMAIL_SUBJECT_PREFIX. A value entered here will override '
-                'the default.'
-            )
+            'This setting takes default from the django setting '
+            'EMAIL_SUBJECT_PREFIX. A value entered here will override '
+            'the default.'
+        )
     )
 )
 
 
 def get_default_admin_email():
     try:
         return django_settings.ADMINS[0][1]
-    except:
+    except (AttributeError, IndexError):
         return ''
 
 settings.register(
@@ -148,8 +148,6 @@ def get_default_admin_email():
         default='w',
         choices=const.NOTIFICATION_DELIVERY_SCHEDULE_CHOICES,
         description=_('Default notification frequency all questions'),
-        help_text=_('Option to define frequency of emailed updates for: '
-                    'all questions.')
     )
 )
 
@@ -160,9 +158,7 @@ def get_default_admin_email():
         default='i',
         choices=const.NOTIFICATION_DELIVERY_SCHEDULE_CHOICES,
         description=_('Default notification frequency questions asked by the '
-                      'user'),
-        help_text=_('Option to define frequency of emailed updates for: '
-                    'Question asked by the user.')
+                      'user')
     )
 )
 
@@ -173,9 +169,17 @@ def get_default_admin_email():
         default='d',
         choices=const.NOTIFICATION_DELIVERY_SCHEDULE_CHOICES,
         description=_('Default notification frequency questions answered by '
-                      'the user'),
-        help_text=_('Option to define frequency of emailed updates for: '
-                    'Question answered by the user.')
+                      'the user')
+    )
+)
+
+settings.register(
+    livesettings.StringValue(
+        EMAIL,
+        'DEFAULT_NOTIFICATION_DELIVERY_SCHEDULE_Q_NOANS',
+        default='n',
+        choices=const.NOTIFICATION_DELIVERY_SCHEDULE_CHOICES_Q_NOANS,
+        description=_('Default notification frequency on unanswered questions')
     )
 )
 
@@ -185,10 +189,8 @@ def get_default_admin_email():
         'DEFAULT_NOTIFICATION_DELIVERY_SCHEDULE_Q_SEL',
         default='i',
         choices=const.NOTIFICATION_DELIVERY_SCHEDULE_CHOICES,
-        description=_('Default notification frequency questions individually \
-                       selected by the user'),
-        help_text=_('Option to define frequency of emailed updates for: '
-                    'Question individually selected by the user.')
+        description=_('Default notification frequency questions individually'
+                      'selected by the user')
     )
 )
 
@@ -198,10 +200,8 @@ def get_default_admin_email():
         'DEFAULT_NOTIFICATION_DELIVERY_SCHEDULE_M_AND_C',
         default='i',
         choices=const.NOTIFICATION_DELIVERY_SCHEDULE_CHOICES,
-        description=_('Default notification frequency for mentions \
-                       and comments'),
-        help_text=_('Option to define frequency of emailed updates for: '
-                    'Mentions and comments.')
+        description=_('Default notification frequency for mentions'
+                      'and comments')
     )
 )
 
@@ -351,13 +351,10 @@ def get_default_admin_email():
     livesettings.BooleanValue(
         EMAIL,
         'REPLY_BY_EMAIL',
-        default = False,
+        default=False,
         description=_('Enable posting and replying by email'),
         #TODO give a better explanation depending on lamson startup procedure
-        help_text=_(
-            'To enable this feature make sure lamson is running'
-
-        )
+        help_text=_('To enable this feature make sure lamson is running')
     )
 )
 

askbot/conf/social_sharing.py

@@ -71,12 +71,3 @@
         description=_('Check to enable sharing of questions on Identi.ca')
     )
 )
-
-settings.register(
-    BooleanValue(
-        SOCIAL_SHARING,
-        'ENABLE_SHARING_GOOGLE',
-        default=True,
-        description=_('Check to enable sharing of questions on Google+')
-    )
-)

askbot/conf/static_settings.py

@@ -1,5 +1,6 @@
 from django.conf import settings
 from django.utils.translation import pgettext
+from django.utils import timezone
 from appconf import AppConf
 import os
 from askbot import const
@@ -28,6 +29,10 @@ class AskbotStaticSettings(AppConf):
             'tinymce': 'askbot.utils.markup.tinymce_input_converter',
         }
 
+    # only report on updates after this date, useful when
+    # enabling delayed email alerts on a site with a lot of content
+    # in order to prevent sending too many outdated alerts
+    DELAYED_EMAIL_ALERTS_CUTOFF_TIMESTAMP = timezone.datetime.fromtimestamp(0)
     QUESTION_PAGE_BASE_URL = pgettext('urls', 'question') + '/'
     SERVICE_URL_PREFIX = 's/' # prefix for non-UI urls
     SELF_TEST = True # if true - run startup self-test

askbot/const/__init__.py

@@ -4,16 +4,15 @@
 For reasons that models, views can't have unicode
 text in this project, all unicode text go here.
 """
-from django.utils.translation import ugettext_lazy as _
 import os
 import re
+from django.utils.translation import ugettext_lazy as _
 from askbot import get_install_directory
+#an exception import * because that file has only strings
+from askbot.const.message_keys import * #pylint: disable=wildcard-import
 
 DEFAULT_USER_DATA_EXPORT_DIR = os.path.abspath(
-                                    os.path.join(get_install_directory(),
-                                                 '..',
-                                                 'user_data')
-                                              )
+    os.path.join(get_install_directory(), '..', 'user_data'))
 
 #todo: customize words
 CLOSE_REASONS = (
@@ -116,7 +115,7 @@
 REPLY_SEPARATOR_REGEX = re.compile(r'==== .* -=-==', re.MULTILINE|re.DOTALL)
 
 ANSWER_SORT_METHODS = (
-    ('latest' , _('latest first')),
+    ('latest', _('latest first')),
     ('oldest', _('oldest first')),
     ('votes', _('most voted first')),
 )
@@ -313,15 +312,15 @@
     TYPE_ACTIVITY_UPDATE_ANSWER,
     TYPE_ACTIVITY_UPDATE_QUESTION,
     TYPE_ACTIVITY_POST_SHARED,
-#    TYPE_ACTIVITY_PRIZE,
-#    TYPE_ACTIVITY_MARK_ANSWER,
-#    TYPE_ACTIVITY_VOTE_UP,
-#    TYPE_ACTIVITY_VOTE_DOWN,
-#    TYPE_ACTIVITY_CANCEL_VOTE,
-#    TYPE_ACTIVITY_DELETE_QUESTION,
-#    TYPE_ACTIVITY_DELETE_ANSWER,
-#    TYPE_ACTIVITY_MARK_OFFENSIVE,
-#    TYPE_ACTIVITY_FAVORITE,
+    #    TYPE_ACTIVITY_PRIZE,
+    #    TYPE_ACTIVITY_MARK_ANSWER,
+    #    TYPE_ACTIVITY_VOTE_UP,
+    #    TYPE_ACTIVITY_VOTE_DOWN,
+    #    TYPE_ACTIVITY_CANCEL_VOTE,
+    #    TYPE_ACTIVITY_DELETE_QUESTION,
+    #    TYPE_ACTIVITY_DELETE_ANSWER,
+    #    TYPE_ACTIVITY_MARK_OFFENSIVE,
+    #    TYPE_ACTIVITY_FAVORITE,
 )
 
 RESPONSE_ACTIVITY_TYPE_MAP_FOR_TEMPLATES = {
@@ -467,31 +466,35 @@
 )
 
 NOTIFICATION_DELIVERY_SCHEDULE_CHOICES = (
-                            ('i',_('instantly')),
-                            ('d',_('daily')),
-                            ('w',_('weekly')),
-                            ('n',_('never')),
-                        )
+    ('i', _('instantly')),
+    ('d', _('daily')),
+    ('w', _('weekly')),
+    ('n', _('never')),
+)
+
+NOTIFICATION_DELIVERY_SCHEDULE_CHOICES_Q_NOANS = (
+    ('d', _('daily')),
+    ('w', _('weekly')),
+    ('n', _('never')),
+)
 
 USERNAME_REGEX_STRING = r'^[\w \-.@+\']+$'
 
-GRAVATAR_TYPE_CHOICES = (
-                            ('identicon',_('identicon')),
-                            ('monsterid',_('monsterid')),
-                            ('wavatar',_('wavatar')),
-                            ('retro',_('retro')),
-                            ('mm',_('mystery-man')),
-                        )
+GRAVATAR_TYPE_CHOICES = (('identicon', _('identicon')),
+                         ('monsterid', _('monsterid')),
+                         ('wavatar', _('wavatar')),
+                         ('retro', _('retro')),
+                         ('mm', _('mystery-man')))
 
 AVATAR_TYPE_CHOICES_FOR_NEW_USERS = (
     ('n', _('Default avatar')),
     ('g', _('Gravatar')),#only if user has real uploaded gravatar
 )
 
 AVATAR_TYPE_CHOICES = AVATAR_TYPE_CHOICES_FOR_NEW_USERS + (
-                    #avatar uploaded locally - with django-avatar app
-                    ('a', _('Uploaded Avatar')),
-                )
+    #avatar uploaded locally - with django-avatar app
+    ('a', _('Uploaded Avatar')),
+)
 
 #chars that can go before or after @mention
 TWITTER_STYLE_MENTION_TERMINATION_CHARS = '\n ;:,.!?<>"\''
@@ -500,12 +503,12 @@
 
 #user status ch
 USER_STATUS_CHOICES = (
-        ('d', _('administrator')), #admin = moderator + access to settings
-        ('m', _('moderator')), #user with moderation privilege
-        ('a', _('approved')), #regular user
-        ('w', _('watched')), #regular user placed on the moderation watch
-        ('s', _('suspended')), #suspended user who cannot post new stuff
-        ('b', _('blocked')), #blocked
+    ('d', _('administrator')), #admin = moderator + access to settings
+    ('m', _('moderator')), #user with moderation privilege
+    ('a', _('approved')), #regular user
+    ('w', _('watched')), #regular user placed on the moderation watch
+    ('s', _('suspended')), #suspended user who cannot post new stuff
+    ('b', _('blocked')), #blocked
 )
 DEFAULT_USER_STATUS = 'w'
 
@@ -539,11 +542,10 @@
 GOLD_BADGE = 1
 SILVER_BADGE = 2
 BRONZE_BADGE = 3
-BADGE_TYPE_CHOICES = (
-    (GOLD_BADGE,   _('gold')),
-    (SILVER_BADGE, _('silver')),
-    (BRONZE_BADGE, _('bronze')),
-)
+BADGE_TYPE_CHOICES = ((GOLD_BADGE, _('gold')),
+                      (SILVER_BADGE, _('silver')),
+                      (BRONZE_BADGE, _('bronze')))
+
 BADGE_CSS_CLASSES = {
     GOLD_BADGE: 'badge1',
     SILVER_BADGE: 'badge2',
@@ -553,16 +555,14 @@
 
 MIN_REPUTATION = 1
 
-SEARCH_ORDER_BY = (
-                    ('-added_at', _('date descendant')),
-                    ('added_at', _('date ascendant')),
-                    ('-last_activity_at', _('most recently active')),
-                    ('last_activity_at', _('least recently active')),
-                    ('-answer_count', _('more responses')),
-                    ('answer_count', _('fewer responses')),
-                    ('-points', _('more votes')),
-                    ('points', _('less votes')),
-                  )
+SEARCH_ORDER_BY = (('-added_at', _('date descendant')),
+                   ('added_at', _('date ascendant')),
+                   ('-last_activity_at', _('most recently active')),
+                   ('last_activity_at', _('least recently active')),
+                   ('-answer_count', _('more responses')),
+                   ('answer_count', _('fewer responses')),
+                   ('-points', _('more votes')),
+                   ('points', _('less votes')))
 
 DEFAULT_QUESTION_WIDGET_STYLE = """
 @import url('http://fonts.googleapis.com/css?family=Yanone+Kaffeesatz:300,400,700');
@@ -594,6 +594,3 @@
     font-size: 15px;
 }
 """
-
-#an exception import * because that file has only strings
-from askbot.const.message_keys import *

askbot/deps/django_authopenid/migrations/0002_auto_20190911_0735.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.2.5 on 2019-09-11 07:35
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('django_authopenid', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='userassociation',
+            name='provider_name',
+            field=models.CharField(default='unknown', max_length=64),
+        ),
+    ]

askbot/deps/django_authopenid/views.py

@@ -1307,7 +1307,8 @@ def verify_email_and_register(request):
             cleanup_post_register_session(request)
 
             return HttpResponseRedirect(get_next_url(request))
-        except Exception as e:
+        except Exception as error:
+            logging.critical('Could not verify account: %s', unicode(error).encode('utf-8'))
             message = _(
                 'Sorry, registration failed. '
                 'The token can be already used or has expired. Please try again'

askbot/deps/group_messaging/migrations/0002_auto_20190911_0735.py

@@ -0,0 +1,38 @@
+# Generated by Django 2.2.5 on 2019-09-11 07:35
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('group_messaging', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='message',
+            name='html',
+            field=models.TextField(blank=True, help_text='rendered html of the message', null=True),
+        ),
+        migrations.AlterField(
+            model_name='message',
+            name='message_type',
+            field=models.SmallIntegerField(choices=[(0, 'email-like message, stored in the inbox'), (2, 'will be shown just once'), (1, 'will be shown until certain time')], default=0),
+        ),
+        migrations.AlterField(
+            model_name='message',
+            name='senders_info',
+            field=models.TextField(default=''),
+        ),
+        migrations.AlterField(
+            model_name='message',
+            name='text',
+            field=models.TextField(blank=True, help_text='source text for the message, e.g. in markdown format', null=True),
+        ),
+        migrations.AlterField(
+            model_name='messagememo',
+            name='status',
+            field=models.SmallIntegerField(choices=[(0, 'seen'), (1, 'archived'), (2, 'deleted')], default=0),
+        ),
+    ]